SOURCES (rpm-4_5): rpm-debuginfo.patch, rpm-disable-features.patch, rpm-etc...
glen
glen at pld-linux.org
Tue Jul 29 15:04:41 CEST 2008
Author: glen Date: Tue Jul 29 13:04:41 2008 GMT
Module: SOURCES Tag: rpm-4_5
---- Log message:
- update for 4.5
---- Files affected:
SOURCES:
rpm-debuginfo.patch (1.15.6.7 -> 1.15.6.7.2.1) , rpm-disable-features.patch (1.1.2.1 -> 1.1.2.1.2.1) , rpm-etc_dir.patch (1.13 -> 1.13.4.1) , rpm-macros.patch (1.41.2.4 -> 1.41.2.4.2.1) , rpm-nopie.patch (1.1.2.1.4.1 -> 1.1.2.1.4.1.2.1) , rpm-pld-autodep.patch (1.21 -> 1.21.4.1) , rpm-po.patch (1.18 -> 1.18.4.1) , rpm-popt-coreutils.patch (1.1.2.1 -> 1.1.2.1.2.1) , rpm-provides-dont-obsolete.patch (1.2 -> 1.2.6.1) , rpm-rpmpopt.patch (1.25 -> 1.25.4.1) , rpm-system_libs-more.patch (1.9 -> 1.9.4.1) , rpm-system_libs.patch (1.18 -> 1.18.6.1) , rpm-tar_as_secondary_source.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.15.6.7 SOURCES/rpm-debuginfo.patch:1.15.6.7.2.1
--- SOURCES/rpm-debuginfo.patch:1.15.6.7 Mon Feb 11 18:07:37 2008
+++ SOURCES/rpm-debuginfo.patch Tue Jul 29 15:04:31 2008
@@ -45,9 +45,9 @@
%{__arch_install_post}\
%{__os_install_post}\
%{nil}
---- rpm-4.4.9.orig/scripts/find-debuginfo.sh 2006-02-12 16:59:51.000000000 +0200
-+++ rpm-4.4.9/scripts/find-debuginfo.sh 2008-01-31 19:20:50.852568146 +0200
-@@ -1,36 +1,49 @@
+--- rpm-4.5/scripts/find-debuginfo.sh~ 2008-06-10 01:31:33.274524622 +0300
++++ rpm-4.5/scripts/find-debuginfo.sh 2008-05-22 14:11:01.000000000 +0300
+@@ -1,36 +1,54 @@
#!/bin/sh
-#find-debuginfo.sh - automagically generate debug info and file list
-#for inclusion in an rpm spec file.
@@ -78,6 +78,11 @@
+ objcopy --add-gnu-debuglink="$1" "$2"
}
++if [ ! -d $RPM_BUILD_ROOT ]; then
++ # no buildroot, exit
++ exit 0
++fi
++
+filelist=$(find $RPM_BUILD_ROOT ! -path "$RPM_BUILD_ROOT/usr/lib/debug/*.debug" -type f '(' -perm -0100 -or -perm -0010 -or -perm -0001 ')')
+if [ -z "$filelist" ]; then
+ # no files, exit
@@ -110,58 +115,8 @@
+ [ -f "$debugfn" ] && continue
echo extracting debug info from $f
-- /usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
+- /usr/lib/rpm/4.5/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.
-@@ -38,20 +51,27 @@
- /usr/lib/debug/*) continue ;;
- esac
-
-- mkdir -p "${debugdn}"
-+ mkdir -p "$debugdn"
- if test -w "$f"; then
-- strip_to_debug "${debugfn}" "$f"
-+ strip_to_debug "$debugfn" "$f"
- else
- chmod u+w "$f"
-- strip_to_debug "${debugfn}" "$f"
-+ strip_to_debug "$debugfn" "$f"
- chmod u-w "$f"
- fi
- done
-
--mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug
--cat $SOURCEFILE | (cd $RPM_BUILD_DIR; LANG=C sort -z -u | cpio -pd0mL ${RPM_BUILD_ROOT}/usr/src/debug)
-+mkdir -p $RPM_BUILD_ROOT/usr/src/debug
-+cat $SOURCEFILE | (cd $RPM_BUILD_DIR; LANG=C sort -z -u | fgrep -zv '<built-in>' | cpio --quiet -pd0mL $RPM_BUILD_ROOT/usr/src/debug)
- # stupid cpio creates new directories in mode 0700, fixup
--find ${RPM_BUILD_ROOT}/usr/src/debug -type d -print0 | xargs -0 chmod a+rx
-+find $RPM_BUILD_ROOT/usr/src/debug -type d -print0 | xargs -0 chmod a+rx
-
--find ${RPM_BUILD_ROOT}/usr/lib/debug -type f | sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE
--find ${RPM_BUILD_ROOT}/usr/src/debug -mindepth 1 -maxdepth 1 | sed -n -e "s#^$RPM_BUILD_ROOT##p" >> $LISTFILE
-+find $RPM_BUILD_ROOT/usr/lib/debug -type f | sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE
-+find $RPM_BUILD_ROOT/usr/lib/debug -mindepth 1 -type d | sed -n -e "s#^$RPM_BUILD_ROOT#%dir #p" >> $LISTFILE
-+find $RPM_BUILD_ROOT/usr/src/debug -mindepth 1 -maxdepth 1 | sed -n -e "s#^$RPM_BUILD_ROOT##p" >> $LISTFILE
-+
-+# add dirs already in filesystem-debuginfo package to exclude
-+cat /usr/src/debug/filesystem-debuginfo.files | while read dir; do
-+ [ -d $RPM_BUILD_ROOT$dir ] || continue
-+ echo "%exclude %dir $dir"
-+done >> $LISTFILE
---- rpm-4.4.9.orig/scripts/find-debuginfo.sh 2008-02-11 18:51:12.304461614 +0200
-+++ rpm-4.4.9/scripts/find-debuginfo.sh 2008-02-11 18:50:17.000000000 +0200
-@@ -20,6 +20,11 @@
- objcopy --add-gnu-debuglink="$1" "$2"
- }
-
-+if [ ! -d $RPM_BUILD_ROOT ]; then
-+ # no buildroot, exit
-+ exit 0
-+fi
-+
- filelist=$(find $RPM_BUILD_ROOT ! -path "$RPM_BUILD_ROOT/usr/lib/debug/*.debug" -type f '(' -perm -0100 -or -perm -0010 -or -perm -0001 ')')
- if [ -z "$filelist" ]; then
- # no files, exit
================================================================
Index: SOURCES/rpm-disable-features.patch
diff -u SOURCES/rpm-disable-features.patch:1.1.2.1 SOURCES/rpm-disable-features.patch:1.1.2.1.2.1
--- SOURCES/rpm-disable-features.patch:1.1.2.1 Wed Feb 6 23:09:11 2008
+++ SOURCES/rpm-disable-features.patch Tue Jul 29 15:04:31 2008
@@ -1,5 +1,5 @@
---- rpm-4.4.9/macros.in 2008-01-13 19:07:45.023017755 +0200
-+++ rpm-4.4.9/macros.in 2008-01-10 13:18:10.454983604 +0200
+--- rpm-4.5/macros.in~ 2008-06-10 02:17:16.000000000 +0300
++++ rpm-4.5/macros.in 2008-06-10 02:17:47.682505213 +0300
@@ -350,7 +350,7 @@
# "w9.lzdio" lzma level 9.
#
@@ -9,25 +9,25 @@
# Archive formats to use for source/binary package payloads.
# "cpio" cpio archive (default)
-@@ -1426,8 +1426,8 @@
+@@ -1448,8 +1448,8 @@
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
--%__libtool_provides %{_usrlibrpm}/libtooldeps.sh --provides %{buildroot} %{name}
--%__libtool_requires %{_usrlibrpm}/libtooldeps.sh --requires %{buildroot} %{name}
-+#%__libtool_provides %{_usrlibrpm}/libtooldeps.sh --provides %{buildroot} %{name}
-+#%__libtool_requires %{_usrlibrpm}/libtooldeps.sh --requires %{buildroot} %{name}
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-%__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
+-%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
++#%__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
++#%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
#------------------------------------------------------------------------
# pkgconfig(...) configuration.
-@@ -1436,8 +1436,8 @@
+@@ -1458,8 +1458,8 @@
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
--%__pkgconfig_provides %{_usrlibrpm}/pkgconfigdeps.sh --provides
--%__pkgconfig_requires %{_usrlibrpm}/pkgconfigdeps.sh --requires
-+#%__pkgconfig_provides %{_usrlibrpm}/pkgconfigdeps.sh --provides
-+#%__pkgconfig_requires %{_usrlibrpm}/pkgconfigdeps.sh --requires
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-%__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
+-%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
++#%__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
++#%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
#------------------------------------------------------------------------
# executable(...) configuration.
================================================================
Index: SOURCES/rpm-etc_dir.patch
diff -u SOURCES/rpm-etc_dir.patch:1.13 SOURCES/rpm-etc_dir.patch:1.13.4.1
--- SOURCES/rpm-etc_dir.patch:1.13 Sun Apr 8 16:27:20 2007
+++ SOURCES/rpm-etc_dir.patch Tue Jul 29 15:04:32 2008
@@ -54,16 +54,16 @@
}
strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
fn[sizeof(fn)-1] = '\0';
---- rpm-4.4.8/po/pl.po.orig 2007-04-08 16:11:42.125435004 +0200
-+++ rpm-4.4.8/po/pl.po 2007-04-08 16:25:11.343549717 +0200
-@@ -3251,6 +3251,10 @@
- msgid "Cannot expand %s\n"
- msgstr "Nie mo¿na rozwin±æ %s\n"
+--- rpm-4.5/po/pl.po~ 2008-04-13 03:27:17.000000000 +0300
++++ rpm-4.5/po/pl.po 2008-04-13 03:27:53.561742210 +0300
+@@ -3088,6 +3088,10 @@
+ msgid "Cannot read %s, HOME is too large.\n"
+ msgstr "Nie mo¿na odczytaæ %s, HOME jest zbyt du¿e.\n"
+#: lib/rpmrc.c:1935
+msgid "Cannot read %s, HOME_ETC is too large.\n"
+msgstr "Nie mo¿na odczytaæ %s, HOME_ETC jest zbyt du¿e.\n"
+
- #: lib/rpmrc.c:1924
+ #: lib/rpmrc.c:1961
#, c-format
- msgid "Cannot read %s, HOME is too large.\n"
+ msgid "Unable to open %s for reading: %s.\n"
================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.41.2.4 SOURCES/rpm-macros.patch:1.41.2.4.2.1
--- SOURCES/rpm-macros.patch:1.41.2.4 Fri Apr 4 22:28:06 2008
+++ SOURCES/rpm-macros.patch Tue Jul 29 15:04:32 2008
@@ -56,11 +56,11 @@
# Archive formats to use for source/binary package payloads.
# "cpio" cpio archive (default)
-@@ -498,7 +502,7 @@
+@@ -512,7 +512,7 @@
#
# Path to magic file used for file classification.
--%_rpmfc_magic_path %{_usr}/lib/rpm/magic
+-%_rpmfc_magic_path %{_rpmhome}/magic
+%_rpmfc_magic_path /usr/share/file/magic
#==============================================================================
@@ -130,13 +130,13 @@
+
# \endverbatim
#*/
---- rpm-4.4.8/configure.ac.orig 2007-04-08 20:24:47.210783702 +0200
-+++ rpm-4.4.8/configure.ac 2007-04-08 20:32:18.216485052 +0200
-@@ -1462,7 +1462,7 @@
+--- rpm-4.5/configure.ac~ 2008-06-10 02:03:07.000000000 +0300
++++ rpm-4.5/configure.ac 2008-06-10 02:04:18.395836371 +0300
+@@ -1479,7 +1479,7 @@
[Full path to rpm system configuration directory (usually /etc/rpm)])
AC_SUBST(SYSCONFIGDIR)
--MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
+-MACROFILES="${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/%{_host_vendor}/macros:${SYSCONFIGDIR}/%{_host_vendor}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros.d/*.macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
+MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
[Colon separated paths of macro files to read.])
================================================================
Index: SOURCES/rpm-nopie.patch
diff -u SOURCES/rpm-nopie.patch:1.1.2.1.4.1 SOURCES/rpm-nopie.patch:1.1.2.1.4.1.2.1
--- SOURCES/rpm-nopie.patch:1.1.2.1.4.1 Sun Jan 13 18:06:12 2008
+++ SOURCES/rpm-nopie.patch Tue Jul 29 15:04:32 2008
@@ -1,58 +1,29 @@
---- rpm-4.4.9.org/configure.ac 2007-05-19 21:26:29.000000000 +0200
-+++ rpm-4.4.9/configure.ac 2007-11-15 01:11:58.263879867 +0100
-@@ -35,7 +35,6 @@
- AC_SUBST(AS)
+--- rpm-4.5/configure.ac~ 2008-06-10 01:59:21.000000000 +0300
++++ rpm-4.5/configure.ac 2008-06-10 01:59:51.820465028 +0300
+@@ -36,7 +36,7 @@
if test "$ac_cv_c_compiler_gnu" = yes; then
CFLAGS="$CFLAGS -fPIC -DPIC -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
-- LDFLAGS="-pie"
+ case "$target" in
+- *-*-linux* ) LDFLAGS="$LDFLAGS -pie" ;;
++ *-*-linux* ) LDFLAGS="$LDFLAGS" ;;
+ esac
fi
export CFLAGS LDFLAGS
-
---- rpm-4.4.9/Makefile.am~ 2008-01-10 11:08:04.000000000 +0200
-+++ rpm-4.4.9/Makefile.am 2008-01-10 11:30:56.897013850 +0200
-@@ -62,19 +62,19 @@
- #rpm_LDFLAGS = $(myLDFLAGS)
- #rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
+--- rpm-4.5/Makefile.am~ 2008-06-11 01:11:33.000000000 +0300
++++ rpm-4.5/Makefile.am 2008-06-11 01:33:49.737107691 +0300
+@@ -55,13 +55,13 @@
+ rpm_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
+ rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
rpm.o: $(top_srcdir)/rpmqv.c
-- $(COMPILE) -fpie -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $<
-+ $(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $<
+- $(COMPILE) -fpie -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $<
++ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $<
- rpmb_SOURCES = $(top_srcdir)/build.c
- rpmb_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
- rpmb_LDADD = rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
- rpmb.o: $(top_srcdir)/rpmqv.c
+ rpmbuild_SOURCES = $(top_srcdir)/build.c
+ rpmbuild_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
+ rpmbuild_LDADD = rpmbuild.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
+ rpmbuild.o: $(top_srcdir)/rpmqv.c
- $(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $<
+ $(COMPILE) -DIAM_RPMBT -o $@ -c $<
-
- rpmd_SOURCES =
- rpmd_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
- rpmd_LDADD = rpmd.o $(myLDADD)
- rpmd.o: $(top_srcdir)/rpmqv.c
-- $(COMPILE) -fpie -DIAM_RPMDB -o $@ -c $<
-+ $(COMPILE) -DIAM_RPMDB -o $@ -c $<
-
- rpmi_SOURCES =
- rpmi_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS)
-@@ -82,19 +82,19 @@
- #rpmi_LDFLAGS = $(myLDFLAGS)
- #rpmi_LDADD = rpmi.o $(myLDADD)
- rpmi.o: $(top_srcdir)/rpmqv.c
-- $(COMPILE) -fpie -DIAM_RPMEIU -o $@ -c $<
-+ $(COMPILE) -DIAM_RPMEIU -o $@ -c $<
-
- rpmk_SOURCES =
- rpmk_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
- rpmk_LDADD = rpmk.o $(myLDADD)
- rpmk.o: $(top_srcdir)/rpmqv.c
-- $(COMPILE) -fpie -DIAM_RPMK -o $@ -c $<
-+ $(COMPILE) -DIAM_RPMK -o $@ -c $<
-
- rpmq_SOURCES =
- rpmq_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS)
- rpmq_LDADD = rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
- rpmq.o: $(top_srcdir)/rpmqv.c
-- $(COMPILE) -fpie -DIAM_RPMQV -o $@ -c $<
-+ $(COMPILE) -DIAM_RPMQV -o $@ -c $<
$(PROGRAMS): @WITH_APIDOCS_TARGET@
================================================================
Index: SOURCES/rpm-pld-autodep.patch
diff -u SOURCES/rpm-pld-autodep.patch:1.21 SOURCES/rpm-pld-autodep.patch:1.21.4.1
--- SOURCES/rpm-pld-autodep.patch:1.21 Tue May 22 19:29:14 2007
+++ SOURCES/rpm-pld-autodep.patch Tue Jul 29 15:04:33 2008
@@ -20,8 +20,8 @@
};
/**
---- rpm-4.4.9/lib/rpmfc.c.orig 2007-05-22 08:11:41.155736775 +0200
-+++ rpm-4.4.9/lib/rpmfc.c 2007-05-22 08:23:39.964699364 +0200
+--- rpm-4.5/lib/rpmfc.c~ 2008-06-10 14:06:23.000000000 +0300
++++ rpm-4.5/lib/rpmfc.c 2008-06-10 14:21:53.097663262 +0300
@@ -15,6 +15,8 @@
#define _RPMDS_INTERNAL
#include <rpmds.h>
@@ -134,73 +134,6 @@
/* Add to package requires. */
ds = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
xx = rpmdsMerge(&fc->requires, ds);
-@@ -743,44 +816,52 @@
-
- if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
- if (strncmp(fn, "/usr/share/doc/", sizeof("/usr/share/doc/")-1)) {
-- if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
-- xx = rpmfcHelper(fc, 'P', "perl");
-- if (is_executable || (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
-- xx = rpmfcHelper(fc, 'R', "perl");
-+ if (fc->findprov && (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
-+ xx = rpmfcHelper(fc, 'P', "perl", fc->noautoprov, fc->noautoprov_c);
-+ if (fc->findreq && (is_executable || (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)))
-+ xx = rpmfcHelper(fc, 'R', "perl", fc->noautoreq, fc->noautoreq_c);
- }
- } else
- if (fc->fcolor->vals[fc->ix] & RPMFC_PYTHON) {
-- xx = rpmfcHelper(fc, 'P', "python");
-+ if (fc->findprov)
-+ xx = rpmfcHelper(fc, 'P', "python", fc->noautoprov, fc->noautoprov_c);
- #ifdef NOTYET
- if (is_executable)
- #endif
-- xx = rpmfcHelper(fc, 'R', "python");
-+ if (fc->findreq)
-+ xx = rpmfcHelper(fc, 'R', "python", fc->noautoreq, fc->noautoreq_c);
- } else
- if (fc->fcolor->vals[fc->ix] & RPMFC_LIBTOOL) {
-- xx = rpmfcHelper(fc, 'P', "libtool");
-+ if (fc->findprov)
-+ xx = rpmfcHelper(fc, 'P', "libtool", fc->noautoprov, fc->noautoprov_c);
- #ifdef NOTYET
- if (is_executable)
- #endif
-- xx = rpmfcHelper(fc, 'R', "libtool");
-+ if (fc->findreq)
-+ xx = rpmfcHelper(fc, 'R', "libtool", fc->noautoreq, fc->noautoreq_c);
- } else
- if (fc->fcolor->vals[fc->ix] & RPMFC_PKGCONFIG) {
-- xx = rpmfcHelper(fc, 'P', "pkgconfig");
-+ if (fc->findprov)
-+ xx = rpmfcHelper(fc, 'P', "pkgconfig", fc->noautoprov, fc->noautoprov_c);
- #ifdef NOTYET
- if (is_executable)
- #endif
-- xx = rpmfcHelper(fc, 'R', "pkgconfig");
-+ if (fc->findreq)
-+ xx = rpmfcHelper(fc, 'R', "pkgconfig", fc->noautoreq, fc->noautoreq_c);
- } else
- if (fc->fcolor->vals[fc->ix] & RPMFC_BOURNE) {
- #ifdef NOTYET
- xx = rpmfcHelper(fc, 'P', "executable");
- #endif
-- if (is_executable)
-- xx = rpmfcHelper(fc, 'R', "executable");
-+ if (fc->findreq && is_executable)
-+ xx = rpmfcHelper(fc, 'R', "executable", fc->noautoreq, fc->noautoreq_c);
- } else
- if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
-- xx = rpmfcHelper(fc, 'P', "php");
-+ if (fc->findprov)
-+ xx = rpmfcHelper(fc, 'P', "php", fc->noautoprov, fc->noautoprov_c);
- /* not only executable, files run by httpd usually are not */
-- xx = rpmfcHelper(fc, 'R', "php");
-+ if (fc->findreq)
-+ xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
- }
-
- return 0;
@@ -808,20 +889,26 @@
default:
break;
@@ -409,95 +342,94 @@
/*@-boundswrite@*/
/* Generate per-file indices into package dependencies. */
---- rpm-4.4.9/po/pl.po.orig 2007-05-22 08:11:40.947724921 +0200
-+++ rpm-4.4.9/po/pl.po 2007-05-22 08:24:24.091213990 +0200
-@@ -2937,6 +2937,86 @@
- msgid "Failed to find %s:\n"
- msgstr "Nie uda³o siê odnale¼æ %s:\n"
-
-+#: lib/rpmfc.c:334
-+#, c-format
-+msgid "Compilation of regular expresion '%s' (expanded from '%s') failed. Skipping it.\n"
-+msgstr "Kompilacja wyra¿enia regularnego '%s' (powsta³ego z '%s') nie powiod³a siê; pominiêto.\n"
-+
-+#: lib/rpmfc.c:395
-+#, c-format
-+msgid "%i _noautoprov patterns.\n"
-+msgstr "%i wzorców _noautoprov.\n"
-+
-+#: lib/rpmfc.c:405
-+#, c-format
-+msgid "%i _noautoreq patterns.\n"
-+msgstr "%i wzorców _noautoreq.\n"
-+
-+#: lib/rpmfc.c:459
-+#, c-format
-+msgid "Checking %c: '%s' against _noauto expr. #%i\n"
-+msgstr "Sprawdzanie %c: '%s' z wyra¿eniem _noauto #%i\n"
-+
-+#: lib/rpmfc.c:462
-+#, c-format
-+msgid "Skipping %c: '%s' as it matches _noauto expr. #%i\n"
-+msgstr "Pominiêto %c: '%s' pasuj±ce do wyra¿enia _noauto #%i\n"
-+
-+#. XXX ts created in main() should be used
-+#: lib/rpmfc.c:1173
-+msgid "Searching for required packages....\n"
-+msgstr "Poszukiwanie wymaganych pakietów...\n"
-+
-+#: lib/rpmfc.c:1197
-+#, c-format
-+msgid "#%i requires: %s,%s,%i\n"
-+msgstr "#%i wymaga: %s,%s,%i\n"
-+
-+#: lib/rpmfc.c:1199
-+#, c-format
-+msgid "skipping #%i require\n"
-+msgstr "pominiêto zale¿no¶æ #%i\n"
-+
-+#: lib/rpmfc.c:1205
-+#, c-format
-+msgid "skipping %s requirement processing (matches noautoreqdep pattern #%i)\n"
-+msgstr "pominiêto przetwarzanie zale¿no¶ci %s (pasuje do wzorca noautoreqdep #%i)\n"
-+
-+#: lib/rpmfc.c:1211
-+#, c-format
-+msgid "skipping #%i require (is file requirement)\n"
-+msgstr "pominiêto zale¿no¶æ #%i (zale¿no¶æ od pliku)\n"
-+
-+#: lib/rpmfc.c:1216
-+#, c-format
-+msgid "%s -> not found\n"
-+msgstr "%s -> nie znaleziono\n"
-+
-+#: lib/rpmfc.c:1219
-+#, c-format
-+msgid "Iterator: %p\n"
-+msgstr "Iterator: %p\n"
-+
-+#: lib/rpmfc.c:1221
-+#, c-format
-+msgid "%s -> multiple (skipping)\n"
-+msgstr "%s -> wiele (pominiêto)\n"
-+
-+#: lib/rpmfc.c:1230
-+#, c-format
-+msgid "%s -> %s (skipping)\n"
-+msgstr "%s -> %s (pominiêto)\n"
-+
-+#: lib/rpmfc.c:1295
-+#, c-format
-+msgid "skipping %s provides detection (matches noautoprovfiles pattern #%i)\n"
-+msgstr "pominiêto wykrywanie w³asno¶ci %s (pasuje do wzorca noautoprovfiles #%i)\n"
-+
-+#: lib/rpmfc.c:1306
-+#, c-format
-+msgid "skipping %s requires detection (matches noautoreqfiles pattern #%i)\n"
-+msgstr "pominiêto wykrywanie w³asno¶ci %s (pasuje do wzorca noautoreqfiles #%i)\n"
-+
- #: lib/rpmfi.c:622
- #, c-format
- msgid "%s skipped due to missingok flag\n"
+#--- rpm-4.4.9/po/pl.po.orig 2007-05-22 08:11:40.947724921 +0200
+#+++ rpm-4.4.9/po/pl.po 2007-05-22 08:24:24.091213990 +0200
+#@@ -2937,6 +2937,86 @@
+# msgid "Failed to find %s:\n"
+# msgstr "Nie uda³o siê odnale¼æ %s:\n"
+#
+#+#: lib/rpmfc.c:334
+#+#, c-format
+#+msgid "Compilation of regular expresion '%s' (expanded from '%s') failed. Skipping it.\n"
+#+msgstr "Kompilacja wyra¿enia regularnego '%s' (powsta³ego z '%s') nie powiod³a siê; pominiêto.\n"
+#+
+#+#: lib/rpmfc.c:395
+#+#, c-format
+#+msgid "%i _noautoprov patterns.\n"
+#+msgstr "%i wzorców _noautoprov.\n"
+#+
+#+#: lib/rpmfc.c:405
+#+#, c-format
+#+msgid "%i _noautoreq patterns.\n"
+#+msgstr "%i wzorców _noautoreq.\n"
+#+
+#+#: lib/rpmfc.c:459
+#+#, c-format
+#+msgid "Checking %c: '%s' against _noauto expr. #%i\n"
+#+msgstr "Sprawdzanie %c: '%s' z wyra¿eniem _noauto #%i\n"
+#+
+#+#: lib/rpmfc.c:462
+#+#, c-format
+#+msgid "Skipping %c: '%s' as it matches _noauto expr. #%i\n"
+#+msgstr "Pominiêto %c: '%s' pasuj±ce do wyra¿enia _noauto #%i\n"
+#+
+#+#. XXX ts created in main() should be used
+#+#: lib/rpmfc.c:1173
+#+msgid "Searching for required packages....\n"
+#+msgstr "Poszukiwanie wymaganych pakietów...\n"
+#+
+#+#: lib/rpmfc.c:1197
+#+#, c-format
+#+msgid "#%i requires: %s,%s,%i\n"
+#+msgstr "#%i wymaga: %s,%s,%i\n"
+#+
+#+#: lib/rpmfc.c:1199
+#+#, c-format
+#+msgid "skipping #%i require\n"
+#+msgstr "pominiêto zale¿no¶æ #%i\n"
+#+
+#+#: lib/rpmfc.c:1205
+#+#, c-format
+#+msgid "skipping %s requirement processing (matches noautoreqdep pattern #%i)\n"
+#+msgstr "pominiêto przetwarzanie zale¿no¶ci %s (pasuje do wzorca noautoreqdep #%i)\n"
+#+
+#+#: lib/rpmfc.c:1211
+#+#, c-format
+#+msgid "skipping #%i require (is file requirement)\n"
+#+msgstr "pominiêto zale¿no¶æ #%i (zale¿no¶æ od pliku)\n"
+#+
+#+#: lib/rpmfc.c:1216
+#+#, c-format
+#+msgid "%s -> not found\n"
+#+msgstr "%s -> nie znaleziono\n"
+#+
+#+#: lib/rpmfc.c:1219
+#+#, c-format
+#+msgid "Iterator: %p\n"
+#+msgstr "Iterator: %p\n"
+#+
+#+#: lib/rpmfc.c:1221
+#+#, c-format
+#+msgid "%s -> multiple (skipping)\n"
+#+msgstr "%s -> wiele (pominiêto)\n"
+#+
+#+#: lib/rpmfc.c:1230
+#+#, c-format
+#+msgid "%s -> %s (skipping)\n"
+#+msgstr "%s -> %s (pominiêto)\n"
+#+
+#+#: lib/rpmfc.c:1295
+#+#, c-format
+#+msgid "skipping %s provides detection (matches noautoprovfiles pattern #%i)\n"
+#+msgstr "pominiêto wykrywanie w³asno¶ci %s (pasuje do wzorca noautoprovfiles #%i)\n"
+#+
+#+#: lib/rpmfc.c:1306
+#+#, c-format
+#+msgid "skipping %s requires detection (matches noautoreqfiles pattern #%i)\n"
+#+msgstr "pominiêto wykrywanie w³asno¶ci %s (pasuje do wzorca noautoreqfiles #%i)\n"
+#+
+# #: lib/rpmfi.c:622
+# #, c-format
--- rpm/configure.ac.orig 2004-08-22 13:02:30.000000000 +0200
+++ rpm/configure.ac 2004-08-22 13:25:37.000000000 +0200
@@ -971,6 +971,18 @@
@@ -519,3 +451,113 @@
dnl figure out what root's primary group is
dnl
AC_MSG_CHECKING(root's primary group)
+--- rpm-4.5/lib/rpmfc.c~ 2008-06-11 01:02:40.000000000 +0300
++++ rpm-4.5/lib/rpmfc.c 2008-06-11 01:04:54.048916180 +0300
+@@ -382,12 +382,9 @@
+ * @param fc file classifier
+ * @param deptype 'P' == Provides:, 'R' == Requires:, helper
+ * @param nsdep class name for interpreter (e.g. "perl")
+- * @param noauto _noauto* regexps
+- * @param noauto_c # of _noauto* regexps
+ * @return 0 on success
+ */
+-static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep,
+- regex_t * noauto, int noauto_c)
++static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
+ /*@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @*/
+ {
+@@ -405,6 +402,8 @@
+ int pac;
+ int xx;
+ int i;
++ regex_t * noauto = fc->noauto;
++ int noauto_c = fc->noauto_c;
+
+ switch (deptype) {
+ default:
+--- rpm-4.5/lib/rpmfc.c~ 2008-06-11 01:04:54.000000000 +0300
++++ rpm-4.5/lib/rpmfc.c 2008-06-11 01:10:06.222936657 +0300
+@@ -410,7 +410,7 @@
+ return -1;
+ /*@notreached@*/ break;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-debuginfo.patch?r1=1.15.6.7&r2=1.15.6.7.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-disable-features.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-etc_dir.patch?r1=1.13&r2=1.13.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-macros.patch?r1=1.41.2.4&r2=1.41.2.4.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-nopie.patch?r1=1.1.2.1.4.1&r2=1.1.2.1.4.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-pld-autodep.patch?r1=1.21&r2=1.21.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-po.patch?r1=1.18&r2=1.18.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-popt-coreutils.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-provides-dont-obsolete.patch?r1=1.2&r2=1.2.6.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-rpmpopt.patch?r1=1.25&r2=1.25.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-system_libs-more.patch?r1=1.9&r2=1.9.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-system_libs.patch?r1=1.18&r2=1.18.6.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-tar_as_secondary_source.patch?r1=1.1&r2=1.1.2.1&f=u
More information about the pld-cvs-commit
mailing list