SOURCES (AC-branch): rpm-arch.patch, rpm-debuginfo.patch, rpm-doxy...
arekm
arekm at pld-linux.org
Mon Aug 15 20:29:52 CEST 2005
Author: arekm Date: Mon Aug 15 18:29:52 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- up for 4.4.2
---- Files affected:
SOURCES:
rpm-arch.patch (1.5.4.1 -> 1.5.4.2) , rpm-debuginfo.patch (1.10 -> 1.10.2.1) , rpm-doxygen_hack.patch (1.2.2.1 -> 1.2.2.2) , rpm-epoch0.patch (1.3.4.1 -> 1.3.4.2) , rpm-etc_dir.patch (1.5 -> 1.5.2.1) , rpm-no-neon.patch (1.2 -> 1.2.2.1) , rpm-no-sqlite.patch (1.1 -> 1.1.2.1) , rpm-php-deps.patch (1.1.4.1 -> 1.1.4.2) , rpm-pl.po.patch (1.8.4.1 -> 1.8.4.2) , rpm-po.patch (1.8.4.1 -> 1.8.4.2) , rpm-rpmpopt.patch (1.15.4.1 -> 1.15.4.2) , rpm-rpmrc.patch (1.20.2.1 -> 1.20.2.2) , rpm-system_libs-more.patch (1.3.4.1 -> 1.3.4.2) , rpm-system_libs.patch (1.10.4.1 -> 1.10.4.2)
---- Diffs:
================================================================
Index: SOURCES/rpm-arch.patch
diff -u SOURCES/rpm-arch.patch:1.5.4.1 SOURCES/rpm-arch.patch:1.5.4.2
--- SOURCES/rpm-arch.patch:1.5.4.1 Fri Jun 17 16:37:10 2005
+++ SOURCES/rpm-arch.patch Mon Aug 15 20:29:46 2005
@@ -20,13 +20,14 @@
buildarchtranslate: i386: i386
buildarchtranslate: alphaev5: alpha
-@@ -205,7 +205,8 @@
+@@ -204,8 +204,9 @@
+ buildarchtranslate: sun4d: sparc
buildarchtranslate: sun4m: sparc
buildarchtranslate: sparcv8: sparc
- buildarchtranslate: sparcv9: sparc
--buildarchtranslate: sun4u: sparc64
-+buildarchtranslate: sun4u: sparc
-+buildarchtranslate: sparc64: sparc
+-buildarchtranslate: sparcv9: sparc
++buildarchtranslate: sparcv9: sparc64
+ buildarchtranslate: sun4u: sparc64
++buildarchtranslate: sparc64: sparc64
buildarchtranslate: osfmach3_ppc: ppc
buildarchtranslate: powerpc: ppc
================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.10 SOURCES/rpm-debuginfo.patch:1.10.2.1
--- SOURCES/rpm-debuginfo.patch:1.10 Wed Jul 28 23:17:00 2004
+++ SOURCES/rpm-debuginfo.patch Mon Aug 15 20:29:46 2005
@@ -55,15 +55,20 @@
elfexelist=`echo $filelist | xargs -r file | \
awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
elfsharedlist=`echo $filelist | xargs -r file | \
-diff -urN rpm-4.3.org/scripts/find-debuginfo.sh rpm-4.3/scripts/find-debuginfo.sh
---- rpm-4.3.org/scripts/find-debuginfo.sh 2004-05-31 17:16:16.146175184 +0200
-+++ rpm-4.3/scripts/find-debuginfo.sh 2004-05-31 17:16:51.153853208 +0200
-@@ -26,12 +26,14 @@
+--- rpm-4.4.2/scripts/find-debuginfo.sh.orig 2005-07-14 17:52:31.000000000 +0200
++++ rpm-4.4.2/scripts/find-debuginfo.sh 2005-07-23 13:57:04.542906944 +0200
+@@ -25,7 +25,7 @@
+ [ -f "${debugfn}" ] && continue
- mkdir -p "${debugdn}"
echo extracting debug info from $f
- /usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
+ /usr/bin/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
+
+ # A binary already copied into /usr/lib/debug doesn't get stripped,
+ # just has its file names collected and adjusted.
+@@ -35,10 +35,12 @@
+
+ mkdir -p "${debugdn}"
if test -w "$f"; then
- eu-strip -f "${debugfn}" "$f" || :
+ eu-strip -f "${debugfn}" -o "$f.tmp" "$f" || :
================================================================
Index: SOURCES/rpm-doxygen_hack.patch
diff -u SOURCES/rpm-doxygen_hack.patch:1.2.2.1 SOURCES/rpm-doxygen_hack.patch:1.2.2.2
--- SOURCES/rpm-doxygen_hack.patch:1.2.2.1 Fri Jun 24 20:35:18 2005
+++ SOURCES/rpm-doxygen_hack.patch Mon Aug 15 20:29:46 2005
@@ -1,5 +1,5 @@
---- rpm-4.4.1/Doxyfile.in~ 2005-06-24 20:11:49.175736352 +0200
-+++ rpm-4.4.1/Doxyfile.in 2005-06-24 20:12:00.480017840 +0200
+--- rpm-4.4.2/Doxyfile.in.orig 2005-07-04 21:00:46.000000000 +0200
++++ rpm-4.4.2/Doxyfile.in 2005-07-23 14:02:43.454384568 +0200
@@ -383,29 +383,7 @@
@top_srcdir@/rpmrc \
@top_srcdir@/rpm2cpio.c \
@@ -31,7 +31,7 @@
@top_srcdir@/doc/manual/builddependencies \
@top_srcdir@/doc/manual/buildroot \
@top_srcdir@/doc/manual/conditionalbuilds \
-@@ -420,196 +398,13 @@
+@@ -420,195 +398,13 @@
@top_srcdir@/doc/manual/spec \
@top_srcdir@/doc/manual/triggers \
@top_srcdir@/doc/manual/tsort \
@@ -191,7 +191,6 @@
- @top_srcdir@/popt/popthelp.c \
- @top_srcdir@/popt/poptint.h \
- @top_srcdir@/popt/poptparse.c \
-- @top_srcdir@/python/_rpmdb.c \
- @top_srcdir@/python/header-py.c \
- @top_srcdir@/python/header-py.h \
- @top_srcdir@/python/rpmal-py.c \
@@ -227,15 +226,15 @@
- @top_srcdir@/tools/rpmxp.c
+ @top_srcdir@/file/src/ \
+ @top_srcdir@/lib/ \
-+ @top_srcdir@/lua/ \
++ @top_srcdir@/lua/ \
+ @top_srcdir@/rpmdb/ \
+ @top_srcdir@/rpmio/ \
+ @top_srcdir@/python/ \
-+ @top_srcdir@/tools/
++ @top_srcdir@/tools/
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-@@ -618,8 +413,8 @@
+@@ -617,8 +413,8 @@
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
================================================================
Index: SOURCES/rpm-epoch0.patch
diff -u SOURCES/rpm-epoch0.patch:1.3.4.1 SOURCES/rpm-epoch0.patch:1.3.4.2
--- SOURCES/rpm-epoch0.patch:1.3.4.1 Thu Oct 21 12:54:16 2004
+++ SOURCES/rpm-epoch0.patch Mon Aug 15 20:29:46 2005
@@ -1,12 +1,13 @@
--- rpm-4.3.orig/build/parsePreamble.c 2003-11-16 13:47:23.000000000 +0100
+++ rpm-4.3/build/parsePreamble.c 2004-02-29 15:40:58.466804704 +0100
-@@ -942,6 +943,11 @@
+@@ -942,6 +943,12 @@
headerCopyTags(spec->packages->header, pkg->header,
(int_32 *)copyTagsDuringParse);
+ if (headerGetEntry(pkg->header, RPMTAG_EPOCH, NULL, NULL, NULL) == 0) {
+ int num = 0;
+ headerAddEntry(pkg->header, RPMTAG_EPOCH, RPM_INT32_TYPE, &num, 1);
++ addMacro(spec->macros, "epoch", NULL, "0", RMIL_SPEC);
+ }
+
if (checkForRequired(pkg->header, NVR))
================================================================
Index: SOURCES/rpm-etc_dir.patch
diff -u SOURCES/rpm-etc_dir.patch:1.5 SOURCES/rpm-etc_dir.patch:1.5.2.1
--- SOURCES/rpm-etc_dir.patch:1.5 Tue Jul 19 19:05:51 2005
+++ SOURCES/rpm-etc_dir.patch Mon Aug 15 20:29:46 2005
@@ -62,28 +62,26 @@
if (_debug)
fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL);
argv[argc++] = xstrdup(globURL);
---- rpm-4.4.1/lib/Makefile.am.orig 2005-07-19 18:53:08.705529696 +0200
-+++ rpm-4.4.1/lib/Makefile.am 2005-07-19 19:04:59.525468640 +0200
-@@ -44,7 +44,7 @@
- librpm_la_LDFLAGS = -release 4.4 $(LDFLAGS) \
- $(top_builddir)/rpmdb/librpmdb.la \
+--- rpm-4.4.2/lib/Makefile.am.orig 2005-07-23 13:40:23.191135552 +0200
++++ rpm-4.4.2/lib/Makefile.am 2005-07-23 13:41:49.474018560 +0200
+@@ -46,6 +46,7 @@
$(top_builddir)/rpmio/librpmio.la \
-- -lpopt \
-+ -lpopt @HOME_ETC_LIB@ \
+ @WITH_POPT_LIB@ \
@WITH_SELINUX_LIB@ \
++ @HOME_ETC_LIB@ \
@INTLLIBS@
---- rpm-4.4.1/rpmio/Makefile.am.orig 2005-07-19 18:53:09.387426032 +0200
-+++ rpm-4.4.1/rpmio/Makefile.am 2005-07-19 19:04:42.440066016 +0200
-@@ -37,7 +37,7 @@
+ getdate.c: getdate.y
+--- rpm-4.4.2/rpmio/Makefile.am.orig 2005-07-23 13:40:23.194135096 +0200
++++ rpm-4.4.2/rpmio/Makefile.am 2005-07-23 13:42:06.205474992 +0200
+@@ -40,6 +40,7 @@
@WITH_LUA_LIB@ \
- $(top_builddir)/file/src/libmagic.la \
+ @WITH_MAGIC_LIB@ \
@WITH_ZLIB_LIB@ \
-- -lneon -lpthread
-+ -lneon -lpthread @HOME_ETC_LIB@
++ @HOME_ETC_LIB@ \
+ -lpthread
librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
librpmio_la_DEPENDENCIES = # .created
-
--- rpm-4.4.1/configure.ac.orig 2005-07-19 18:53:09.385426000 +0200
+++ rpm-4.4.1/configure.ac 2005-07-19 19:10:49.732229120 +0200
@@ -945,6 +945,14 @@
================================================================
Index: SOURCES/rpm-no-neon.patch
diff -u SOURCES/rpm-no-neon.patch:1.2 SOURCES/rpm-no-neon.patch:1.2.2.1
--- SOURCES/rpm-no-neon.patch:1.2 Tue Jul 19 19:06:33 2005
+++ SOURCES/rpm-no-neon.patch Mon Aug 15 20:29:46 2005
@@ -1,67 +1,62 @@
-diff -ur rpm-4.4.1/configure.ac rpm-4.4.1-no-neon/configure.ac
---- rpm-4.4.1/configure.ac 2005-06-19 20:37:35.675035608 +0200
-+++ rpm-4.4.1-no-neon/configure.ac 2005-06-19 20:34:07.022755576 +0200
-@@ -448,26 +448,6 @@
+--- rpm-4.4.2/configure.ac.orig 2005-07-23 14:06:59.692430464 +0200
++++ rpm-4.4.2/configure.ac 2005-07-23 14:08:45.591331384 +0200
+@@ -516,28 +516,6 @@
WITH_NEON_SUBDIR=
WITH_NEON_INCLUDE=
WITH_NEON_LIB=
-AC_CHECK_HEADER([neon/ne_session.h], [
-- AC_CHECK_LIB(neon, ne_session_create, [
-- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the `neon' library (-lneon).])
-- AC_CHECK_LIB(neon, ne_get_response_header, [
-- AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
-- ])
-- AC_CHECK_LIB(neon, ne_send_request_chunk, [
-- AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.])
-- ])
-- WITH_NEON_INCLUDE="-I${includedir}/neon"
-- WITH_NEON_LIB="-lneon"
-- ])
-- ], [
-- if test -d neon ; then
-- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the `neon' library (-lneon).])
-- WITH_NEON_SUBDIR=neon
-- WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
-- WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
-- fi
+- AC_CHECK_LIB(neon, ne_session_create, [
+- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).])
+- AC_CHECK_LIB(neon, ne_get_response_header, [
+- AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
+- ])
+- AC_CHECK_LIB(neon, ne_send_request_chunk, [
+- AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.])
+- ])
+- WITH_NEON_INCLUDE="-I${includedir}/neon"
+- WITH_NEON_LIB="-lneon"
+- ])
+-],[
+- if test -d neon ; then
+- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).])
+-# XXX HAVE_NEON_NE_GET_RESPONSE_HEADER assumes libneon-0.25 devel internal
+- AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
+- WITH_NEON_SUBDIR=neon
+- WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
+- WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
+- fi
-])
AC_SUBST(WITH_NEON_SUBDIR)
AC_SUBST(WITH_NEON_INCLUDE)
AC_SUBST(WITH_NEON_LIB)
-diff -ur rpm-4.4.1/rpmio/Makefile.am rpm-4.4.1-no-neon/rpmio/Makefile.am
---- rpm-4.4.1/rpmio/Makefile.am 2005-06-19 20:37:35.322089264 +0200
-+++ rpm-4.4.1-no-neon/rpmio/Makefile.am 2005-06-19 20:34:06.996759528 +0200
-@@ -37,7 +37,7 @@
- @WITH_LUA_LIB@ \
- $(top_builddir)/file/src/libmagic.la \
- @WITH_ZLIB_LIB@ \
-- -lneon -lpthread @HOME_ETC_LIB@
-+ -lpthread @HOME_ETC_LIB@
- librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
- librpmio_la_DEPENDENCIES = # .created
-
-diff -ur rpm-4.4.1/rpmio/rpmdav.c rpm-4.4.1-no-neon/rpmio/rpmdav.c
---- rpm-4.4.1/rpmio/rpmdav.c 2005-01-17 19:46:27.000000000 +0100
-+++ rpm-4.4.1-no-neon/rpmio/rpmdav.c 2005-06-19 20:35:12.340825720 +0200
-@@ -9,17 +9,6 @@
+--- rpm-4.4.2/rpmio/rpmdav.c.orig 2005-02-17 02:07:18.000000000 +0100
++++ rpm-4.4.2/rpmio/rpmdav.c 2005-07-23 14:11:17.251275568 +0200
+@@ -9,24 +9,6 @@
#include <pthread.h>
#endif
--#include <neon/ne_alloc.h>
--#include <neon/ne_auth.h>
--#include <neon/ne_basic.h>
--#include <neon/ne_dates.h>
--#include <neon/ne_locks.h>
--#include <neon/ne_props.h>
--#include <neon/ne_request.h>
--#include <neon/ne_socket.h>
--#include <neon/ne_string.h>
--#include <neon/ne_utils.h>
+-#include "ne_alloc.h"
+-#include "ne_auth.h"
+-#include "ne_basic.h"
+-#include "ne_dates.h"
+-#include "ne_locks.h"
+-
+-#define NEONBLOWSCHUNKS
+-#ifndef NEONBLOWSCHUNKS
+-/* HACK: include ne_private.h to access sess->socket for now. */
+-#include "../neon/src/ne_private.h"
+-#endif
+-
+-#include "ne_props.h"
+-#include "ne_request.h"
+-#include "ne_socket.h"
+-#include "ne_string.h"
+-#include "ne_utils.h"
-
#include <rpmio_internal.h>
#define _RPMDAV_INTERNAL
-@@ -55,1304 +44,6 @@
+@@ -62,1315 +44,6 @@
}
/* =============================================================== */
@@ -946,7 +941,7 @@
-#endif
-
- if (!strcmp(httpCmd, "PUT")) {
--#ifdef NOTYET /* XXX HACK no wr_chunked until libneon supports */
+-#if defined(HAVE_NEON_NE_SEND_REQUEST_CHUNK)
- ctrl->wr_chunked = 1;
- ne_add_request_header(ctrl->req, "Transfer-Encoding", "chunked");
- ne_set_request_chunked(ctrl->req, 1);
@@ -1075,13 +1070,28 @@
-
-ssize_t davWrite(void * cookie, const char * buf, size_t count)
-{
--#ifdef NOTYET /* XXX HACK no wr_chunked until libneon supports */
- FD_t fd = cookie;
- ssize_t rc;
- int xx;
-
+-#ifndef NEONBLOWSCHUNKS
+- ne_session * sess;
+-
+-assert(fd->req != NULL);
+- sess = ne_get_session(fd->req);
+-assert(sess != NULL);
+-
+- /* HACK: include ne_private.h to access sess->socket for now. */
+- xx = ne_sock_fullwrite(sess->socket, buf, count);
+-#else
+-#if defined(HAVE_NEON_NE_SEND_REQUEST_CHUNK)
-assert(fd->req != NULL);
- xx = ne_send_request_chunk(fd->req, buf, count);
+-#else
+- errno = EIO; /* HACK */
+- return -1;
+-#endif
+-#endif
-
- /* HACK: stupid error impedence matching. */
- rc = (xx == 0 ? count : -1);
@@ -1094,10 +1104,6 @@
-#endif
-
- return rc;
--#else
-- errno = EIO; /* HACK */
-- return -1;
--#endif
-}
-
-int davSeek(void * cookie, /*@unused@*/ _libio_pos_t pos, int whence)
@@ -1366,7 +1372,7 @@
/*@unchecked@*/
int avmagicdir = 0x3607113;
-@@ -1475,172 +166,3 @@
+@@ -1493,172 +166,3 @@
/*@=kepttrans@*/
}
/*@=boundswrite@*/
================================================================
Index: SOURCES/rpm-no-sqlite.patch
diff -u SOURCES/rpm-no-sqlite.patch:1.1 SOURCES/rpm-no-sqlite.patch:1.1.2.1
--- SOURCES/rpm-no-sqlite.patch:1.1 Sun Jun 19 20:58:05 2005
+++ SOURCES/rpm-no-sqlite.patch Mon Aug 15 20:29:46 2005
@@ -1,23 +1,27 @@
---- rpm-4.4.1/configure.ac~ 2005-06-19 16:27:34.713451864 +0200
-+++ rpm-4.4.1/configure.ac 2005-06-19 16:28:06.515617200 +0200
-@@ -514,17 +514,9 @@
- WITH_INTERNAL_DB=1
- DBLIBSRCS="db3.c"
+--- rpm-4.4.2/configure.ac.orig 2005-07-23 14:12:39.097833000 +0200
++++ rpm-4.4.2/configure.ac 2005-07-23 14:14:23.972889568 +0200
+@@ -588,24 +588,6 @@
+ WITH_SQLITE3_INCLUDE=
+ WITH_SQLITE3_LIB=
-AC_CHECK_HEADER([sqlite3.h], [
-- AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
-- WITH_SQLITE3=1
-- WITH_SQLITE3_INCLUDE=
-- WITH_SQLITE3_LIB=-lsqlite3
-- DBLIBSRCS="$DBLIBSRCS sqlite.c"
+- AC_CHECK_LIB(sqlite3, sqlite3_open, [
+- AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
+- WITH_SQLITE3_SUBDIR=
+- WITH_SQLITE3_INCLUDE=
+- WITH_SQLITE3_LIB="-lsqlite3"
+- DBLIBSRCS="$DBLIBSRCS sqlite.c"
+- ])
-],[
-- WITH_SQLITE3=0
-- WITH_SQLITE3_INCLUDE=
-- WITH_SQLITE3_LIB=
+- if test -d sqlite ; then
+- AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
+- WITH_SQLITE3_SUBDIR=sqlite
+- WITH_SQLITE3_INCLUDE="-I\${top_srcdir}/${WITH_SQLITE3_SUBDIR}/src"
+- WITH_SQLITE3_LIB="\${top_builddir}/${WITH_SQLITE3_SUBDIR}/libsqlite3.la"
+- DBLIBSRCS="$DBLIBSRCS sqlite.c"
+- fi
-])
-+WITH_SQLITE3=0
-+WITH_SQLITE3_INCLUDE=
-+WITH_SQLITE3_LIB=
-
- AC_SUBST(WITH_DB_SUBDIR)
- AC_SUBST(WITH_INTERNAL_DB)
+-
+ AC_SUBST(WITH_SQLITE3_SUBDIR)
+ AC_SUBST(WITH_SQLITE3_INCLUDE)
+ AC_SUBST(WITH_SQLITE3_LIB)
================================================================
Index: SOURCES/rpm-php-deps.patch
diff -u SOURCES/rpm-php-deps.patch:1.1.4.1 SOURCES/rpm-php-deps.patch:1.1.4.2
--- SOURCES/rpm-php-deps.patch:1.1.4.1 Fri Jun 17 16:39:32 2005
+++ SOURCES/rpm-php-deps.patch Mon Aug 15 20:29:46 2005
@@ -1,15 +1,15 @@
---- rpm-4.2/build/rpmfc.c.wiget Mon Jan 20 23:16:09 2003
-+++ rpm-4.2/build/rpmfc.c Tue Apr 1 09:56:51 2003
-@@ -450,6 +450,8 @@
+--- rpm-4.4.2/build/rpmfc.c.orig 2005-07-21 03:04:55.000000000 +0200
++++ rpm-4.4.2/build/rpmfc.c 2005-07-23 13:48:23.419129800 +0200
+@@ -451,6 +451,8 @@
{ "perl script text", RPMFC_PERL|RPMFC_INCLUDE },
{ "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
+
+ { "PHP script text", RPMFC_PHP|RPMFC_INCLUDE },
- { "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
+ { " /usr/bin/python", RPMFC_PYTHON|RPMFC_INCLUDE },
-@@ -618,6 +621,7 @@
+@@ -624,6 +626,7 @@
fc->sb_java = freeStringBuf(fc->sb_java);
fc->sb_perl = freeStringBuf(fc->sb_perl);
@@ -17,17 +17,17 @@
fc->sb_python = freeStringBuf(fc->sb_python);
}
-@@ -705,6 +709,8 @@
+@@ -711,6 +714,8 @@
fc->fcolor->vals[fc->ix] |= RPMFC_PERL;
- else if (!strcmp(bn, "python"))
+ else if (!strncmp(bn, "python", sizeof("python")-1))
fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
+ else if (!strcmp(bn, "php"))
+ fc->fcolor->vals[fc->ix] |= RPMFC_PHP;
break;
}
-@@ -723,6 +729,10 @@
- if (is_executable)
+@@ -731,6 +736,10 @@
+ #endif
xx = rpmfcHelper(fc, 'R', "python");
}
+ if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
@@ -37,7 +37,7 @@
return 0;
}
-@@ -1068,6 +1068,7 @@
+@@ -1059,6 +1068,7 @@
{ rpmfcELF, RPMFC_ELF },
{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL) },
{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PYTHON) },
@@ -45,16 +45,16 @@
{ NULL, 0 }
};
-@@ -1227,6 +1227,9 @@
+@@ -1228,6 +1238,9 @@
/*@-branchstate@*/
- if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
- ftype = "Perl5 module source text";
-+ /* XXX all files with extension ".php" are PHP modules for now. */
-+ else if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
-+ ftype = "PHP script text";
- /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
- else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
- ftype = "";
+ if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
+ ftype = "Perl5 module source text";
++ /* XXX all files with extension ".php" are PHP modules for now. */
++ else if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
++ ftype = "PHP script text";
+ /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
+ else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
+ ftype = "";
--- rpm-4.2/build/rpmfc.h.wiget Tue Apr 1 10:00:23 2003
+++ rpm-4.2/build/rpmfc.h Tue Apr 1 10:01:22 2003
@@ -40,6 +40,7 @@
================================================================
Index: SOURCES/rpm-pl.po.patch
diff -u SOURCES/rpm-pl.po.patch:1.8.4.1 SOURCES/rpm-pl.po.patch:1.8.4.2
--- SOURCES/rpm-pl.po.patch:1.8.4.1 Fri Jun 17 16:40:01 2005
+++ SOURCES/rpm-pl.po.patch Mon Aug 15 20:29:46 2005
@@ -1,5 +1,5 @@
---- rpm-4.4.1/po/pl.po.orig 2005-02-20 22:55:20.582883096 +0100
-+++ rpm-4.4.1/po/pl.po 2005-02-20 23:15:22.831113584 +0100
+--- rpm-4.4.2/po/pl.po.orig 2005-07-23 14:25:48.771784312 +0200
++++ rpm-4.4.2/po/pl.po 2005-07-23 14:58:42.313760328 +0200
@@ -1,18 +1,19 @@
-# Polskie komunikaty dla RPM
+# Polish translation for rpm.
@@ -15,12 +15,12 @@
msgid ""
msgstr ""
-"Project-Id-Version: rpm 4.3-20030515\n"
-+"Project-Id-Version: rpm 4.4.1\n"
++"Project-Id-Version: rpm 4.4.2\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-02-13 17:18-0500\n"
+ "POT-Creation-Date: 2005-07-17 11:08-0400\n"
-"PO-Revision-Date: 2003-06-08 22:42+0200\n"
-"Last-Translator: Arkadiusz Miskiewicz <arekm at pld-linux.org>\n"
-+"PO-Revision-Date: 2005-02-20 22:52+0100\n"
++"PO-Revision-Date: 2005-07-23 14:30+0200\n"
+"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -41,32 +41,14 @@
#: rpmqv.c:90
msgid "Signature options:"
-@@ -613,7 +613,7 @@
- "Znaleziono zainstalowane (ale niespakietowane) pliki:\n"
- "%s"
-
--#: build/files.c:2469
-+#: build/files.c:2481
- #, c-format
- msgid "Processing files: %s-%s-%s\n"
- msgstr "Przetwarzanie plików: %s-%s-%s\n"
-@@ -933,7 +933,7 @@
- msgid "line %d: Illegal char '-' in %s: %s\n"
- msgstr "linia %d: Nielegalny znak '-' w %s: %s\n"
-
--#: build/parsePreamble.c:590 build/parseSpec.c:472
-+#: build/parsePreamble.c:590 build/parseSpec.c:489
- #, c-format
- msgid "BuildRoot can not be \"/\": %s\n"
- msgstr "BuildRoot nie może być \"/\": %s\n"
@@ -971,7 +971,7 @@
- #: build/parsePreamble.c:815
+ #: build/parsePreamble.c:819
#, c-format
msgid "Legacy syntax is unsupported: %s\n"
-msgstr ""
+msgstr "Przestarzała składnia nie jest obsługiwana: %s\n"
- #: build/parsePreamble.c:882
+ #: build/parsePreamble.c:886
#, c-format
@@ -1109,47 +1109,47 @@
msgid "line %d: unsupported internal script: %s\n"
@@ -241,13 +223,13 @@
-msgstr "pominięto wykrywanie własności %s (pasuje do wzorca noautoreqfiles #%i)\n"
+msgstr ""
+"pominięto wykrywanie własności %s (pasuje do wzorca noautoreqfiles #%i)\n"
-
--#: build/rpmfc.c:1642
++
+#: build/rpmfc.c:1455
+#, c-format
+msgid "magic_open(0x%x) failed: %s\n"
+msgstr "magic_open(0x%x) powiodło się: %s\n"
-+
+
+-#: build/rpmfc.c:1642
+#: build/rpmfc.c:1463
+#, c-format
+msgid "magic_load(ms, \"%s\") failed: %s\n"
@@ -317,19 +299,31 @@
#: lib/misc.c:41
#, c-format
-@@ -1761,9 +1782,9 @@
+@@ -1755,9 +1776,9 @@
+ msgstr "hdr SHA1: BŁĘDNY, nie szesnastkowy\n"
- #: lib/package.c:538 lib/package.c:579 lib/package.c:913 lib/package.c:939
- #: lib/package.c:971
+ #: lib/package.c:470
+-#, fuzzy, c-format
++#, c-format
+ msgid "hdr RSA: BAD, not binary\n"
+-msgstr "hdr DSA: BŁĘDNY, nie binarny\n"
++msgstr "hdr RSA: BŁĘDNY, nie binarny\n"
+
+ #: lib/package.c:482
+ #, c-format
+@@ -1766,9 +1787,9 @@
+
+ #: lib/package.c:546 lib/package.c:586 lib/package.c:920 lib/package.c:946
+ #: lib/package.c:978
-#, fuzzy, c-format
+#, c-format
msgid "only V3 and V4 signatures can be verified, skipping V%u signature\n"
-msgstr "tylko sygnatury V3 mogą być sprawdzone, sygnatura V%u jest pomijana\n"
+msgstr "tylko sygnatury V3 i V4 mogą być sprawdzone, sygnatura V%u jest pomijana\n"
- #: lib/package.c:666
+ #: lib/package.c:673
#, c-format
-@@ -1826,44 +1847,36 @@
+@@ -1831,44 +1852,36 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-arch.patch?r1=1.5.4.1&r2=1.5.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-debuginfo.patch?r1=1.10&r2=1.10.2.1&f=u
http://cvs.pld-linux.org/SOURCES/rpm-doxygen_hack.patch?r1=1.2.2.1&r2=1.2.2.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-epoch0.patch?r1=1.3.4.1&r2=1.3.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-etc_dir.patch?r1=1.5&r2=1.5.2.1&f=u
http://cvs.pld-linux.org/SOURCES/rpm-no-neon.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/SOURCES/rpm-no-sqlite.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/rpm-php-deps.patch?r1=1.1.4.1&r2=1.1.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-pl.po.patch?r1=1.8.4.1&r2=1.8.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-po.patch?r1=1.8.4.1&r2=1.8.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-rpmpopt.patch?r1=1.15.4.1&r2=1.15.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-rpmrc.patch?r1=1.20.2.1&r2=1.20.2.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-system_libs-more.patch?r1=1.3.4.1&r2=1.3.4.2&f=u
http://cvs.pld-linux.org/SOURCES/rpm-system_libs.patch?r1=1.10.4.1&r2=1.10.4.2&f=u
More information about the pld-cvs-commit
mailing list