OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Aug-2003 10:50:57
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082609505600
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
move manual sed(1) based patching into official RPM patch set
Summary:
Revision Changes Path
1.192.2.18 +39 -71 openpkg-src/openpkg/openpkg.spec
1.4.2.4 +12 -12 openpkg-src/openpkg/rpm.patch.bugfix
1.4.2.7 +458 -14 openpkg-src/openpkg/rpm.patch.feature
1.5.2.8 +194 -27 openpkg-src/openpkg/rpm.patch.porting
1.3.2.5 +96 -7 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.17 -r1.192.2.18 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 25 Aug 2003 18:55:22 -0000 1.192.2.17
+++ openpkg-src/openpkg/openpkg.spec 26 Aug 2003 08:50:56 -0000 1.192.2.18
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030824
+%define V_openpkg 20030826
# the used software versions
%define V_rpm 4.2.1
@@ -356,10 +356,11 @@
# apply OpenPKG patches to distribution trees
( cd rpm-%{V_rpm}
- ${l_patch} -p0 <`SOURCE rpm.patch.bugfix`
- ${l_patch} -p0 <`SOURCE rpm.patch.feature`
- ${l_patch} -p0 <`SOURCE rpm.patch.porting`
- ${l_patch} -p0 <`SOURCE rpm.patch.regen`
+ sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.bugfix` | ${l_patch}
-p0
+ sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.feature` | ${l_patch}
-p0
+ sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.porting` | ${l_patch}
-p0
+ sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.regen` | ${l_patch}
-p0
+ rm -rf db/docs # just reduce disk size of source tree
) || exit $?
( cd make-%{V_make}
${l_patch} -p0 <`SOURCE make.patch`
@@ -473,61 +474,29 @@
) || exit $?
# build RPM
- # - we make sure RPM builds without NLS/gettext problems :-(
- # - we make sure RPM finds and uses our own BZIP2/ZLIB/DB libraries
- # - we speed up building by skipping the NLS/gettext data
( br=`pwd`
cd rpm-%{V_rpm}
- sed -e 's;(aclocal --version);false;' \
- -e 's;(automake --version);false;' \
- -e 's;(autoconf --version);false;' \
- -e 's;(autoheader --version);false;' \
- -e 's;(makeinfo --version);false;' \
- -e 's;/lib/rpm;/lib/openpkg;' \
- -e "s;MKDIR_P=.*;MKDIR_P='%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m
755';" \
- -e 's;LDFLAGS_STATIC="[^"]*";LDFLAGS_STATIC="";g' \
- -e "s;SYSCONFIGDIR=.*;SYSCONFIGDIR='%{l_prefix}/etc/openpkg';" \
- -e 's;db-[0-9][0-9.]*;db;g' \
- -e 's;/rpmpopt-${VERSION};/rpmpopt;g' \
- <configure >configure.n && \
- mv configure.n configure
- sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
- <tools/Makefile.in >tools/Makefile.in.n && \
- mv tools/Makefile.in.n tools/Makefile.in
- sed -e 's;^\(SUBDIRS[ ]*=.*\) po \(.*\)$;\1 \2;' \
- -e 's;^\(SUBDIRS[ ]*=.*\) tools \(.*\)$;\1 \2;' \
- -e 's;$(varprefix)/lib/rpm;$(varprefix)/openpkg;' \
- -e 's;$(libdir)/rpm;$(libdir)/openpkg;' \
- -e 's;/lib/rpm;/lib/openpkg;' \
- -e 's;rpmpopt-$(VERSION):;rpmpopt-dummy:;' \
- -e 's;rpmpopt-$(VERSION);rpmpopt;g' \
- <Makefile.in >Makefile.in.n && \
- mv Makefile.in.n Makefile.in
- sed -e 's;/lib/rpm;/lib/openpkg;' \
- <scripts/Makefile.in >scripts/Makefile.in.n && \
- mv scripts/Makefile.in.n scripts/Makefile.in
- sed -e 's;/lib/rpm;/lib/openpkg;' \
- -e 's;-all-static;-static;g' \
- <file/Makefile.in >file/Makefile.in.n && \
- mv file/Makefile.in.n file/Makefile.in
- sed -e 's;^\(SUBDIRS[ ]*=.*\) po$;\1;' \
- -e 's;-all-static;-static;g' \
- <popt/Makefile.in >popt/Makefile.in.n && \
- mv popt/Makefile.in.n popt/Makefile.in
- sed -e 's;^\(PROGRAMS[ ]*=\).*$;\1;' \
- -e 's;-all-static;-static;g' \
- <rpmdb/Makefile.in >rpmdb/Makefile.in.n && \
- mv rpmdb/Makefile.in.n rpmdb/Makefile.in
- sed -e 's;-all-static;-static;g' \
- <rpmio/Makefile.in >rpmio/Makefile.in.n && \
- mv rpmio/Makefile.in.n rpmio/Makefile.in
- -e 's;-all-static;-static;g' \
- sed -e 's;BUFSIZ;8192;g' \
- <rpmio/macro.c >rpmio/macro.c.n && \
- mv rpmio/macro.c.n rpmio/macro.c
- sed -e 's;/etc/rpm/platform;%{l_prefix}/etc/openpkg/platform;g' \
- <lib/rpmrc.c >lib/rpmrc.c.n && \
- mv lib/rpmrc.c.n lib/rpmrc.c
+
+ # remove embedded zlib (we are linking with an external one)
+ rm -rf zlib
+
+ # kill Linux-based preconfigured DB header, to allow the Makefiles to
+ # symlink to it the header that is configured for the current system.
+ rm -f rpmdb/db.h
+
+ # make sure we do not trigger Autoconf/Automake tools
+ touch configure
+ touch config.h.in
+
+ # disable running of any Autoconf/Automake tools
+ export ACLOCAL=true
+ export AUTOCONF=true
+ export AUTOMAKE=true
+ export AUTOHEADER=true
+ export MAKEINFO=true
+ export AMTAR=true
+
+ # cheat GNU Autoconf
( echo 'ac_cv_path_MSGFMT=${ac_cv_path_MSGFMT=no}'
echo 'ac_cv_path_GMSGFMT=${ac_cv_path_GMSGFMT=no}'
echo "ac_cv_path_MKDIR='%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m 755'"
@@ -536,19 +505,15 @@
echo "ac_cv_path___DOXYGEN=true"
echo "acl_cv_rpath=no"
) >config.cache
- rm -rf db/docs
- # move embedded zlib out of the way, we are linking with our own zlib
- rm -rf zlib
- # kill linux-preconfigured db header, the makefile will symlink the
- # header that is configured for the current system
- rm -f rpmdb/db.h
- touch configure
- touch config.h.in
- CC="${l_cc} -DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
- CFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
- CPPFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
- LDFLAGS="-L$br/zlib-%{V_zlib} -L$br/bzip2-%{V_bzip2}
-L$br/beecrypt-%{V_beecrypt} -lbeecrypt" \
- LIBS="-L$br/zlib-%{V_zlib} -lz -L$br/bzip2-%{V_bzip2} -lbz2
-L$br/beecrypt-%{V_beecrypt} -lbeecrypt" \
+
+ # set build tool flags
+ export CPPFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}"
+ export CFLAGS="$CPPFLAGS"
+ export CC="${l_cc} $CPPFLAGS"
+ export LDFLAGS="-L$br/zlib-%{V_zlib} -L$br/bzip2-%{V_bzip2}
-L$br/beecrypt-%{V_beecrypt}"
+ export LIBS="$LDFLAGS -lz -lbz2 -lbeecrypt"
+
+ # configure the package
sh ./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ -559,7 +524,10 @@
--without-python \
--without-apidocs \
--disable-nls
+
+ # build the package
${l_make}
+
) || exit $?
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.4.2.3 -r1.4.2.4 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 25 Aug 2003 10:48:07 -0000 1.4.2.3
+++ openpkg-src/openpkg/rpm.patch.bugfix 26 Aug 2003 08:50:56 -0000 1.4.2.4
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Aug-2003
+## Created on: 26-Aug-2003
##
+---------------------------------------------------------------------------
@@ -42,8 +42,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 25 Aug 2003 10:24:18 -0000
-@@ -1274,7 +1275,6 @@
++++ configure.ac 26 Aug 2003 08:06:43 -0000
+@@ -1274,7 +1276,6 @@
python/rpmdb/Makefile
python/test/Makefile
], [ echo timestamp > popt/stamp-h.in
@@ -101,8 +101,8 @@
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
-+++ rpmio/macro.c 24 Aug 2003 13:10:11 -0000
-@@ -879,7 +879,7 @@
++++ rpmio/macro.c 26 Aug 2003 07:31:04 -0000
+@@ -879,7 +882,7 @@
*/
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/ static const char *
@@ -111,7 +111,7 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext @*/
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext @*/
{
-@@ -900,7 +900,7 @@
+@@ -900,7 +903,7 @@
/* Copy args into buf until lastc */
*be++ = ' ';
@@ -120,7 +120,7 @@
/[EMAIL PROTECTED]@*/
if (!isblank(c)) {
*be++ = c;
-@@ -968,6 +968,8 @@
+@@ -968,6 +971,8 @@
/[EMAIL PROTECTED]@*/
optind = 0; /* XXX but posix != glibc */
/[EMAIL PROTECTED]@*/
@@ -129,7 +129,7 @@
#endif
opts = me->opts;
-@@ -1168,7 +1170,7 @@
+@@ -1168,7 +1173,7 @@
int c;
int rc = 0;
int negate;
@@ -138,7 +138,7 @@
int chkexist;
if (++mb->depth > max_macro_depth) {
-@@ -1202,7 +1204,7 @@
+@@ -1202,7 +1207,7 @@
if (mb->depth > 1) /* XXX full expansion for outermost level */
t = mb->t; /* save expansion pointer for printExpand */
negate = 0;
@@ -147,7 +147,7 @@
chkexist = 0;
switch ((c = *s)) {
default: /* %name substitution */
-@@ -1237,7 +1239,8 @@
+@@ -1237,7 +1242,8 @@
/* For "%name " macros ... */
/[EMAIL PROTECTED]@*/
if ((c = *fe) && isblank(c))
@@ -157,7 +157,7 @@
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/ break;
case '(': /* %(...) shell escape */
-@@ -1284,7 +1287,7 @@
+@@ -1284,7 +1290,7 @@
ge = se - 1;
/[EMAIL PROTECTED]@*/ break;
case ' ':
@@ -166,7 +166,7 @@
/[EMAIL PROTECTED]@*/ break;
default:
/[EMAIL PROTECTED]@*/ break;
-@@ -1438,7 +1441,7 @@
+@@ -1438,7 +1444,7 @@
/* Setup args for "%name " macros with opts */
if (me && me->opts != NULL) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.4.2.6 -r1.4.2.7 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 25 Aug 2003 18:55:22 -0000 1.4.2.6
+++ openpkg-src/openpkg/rpm.patch.feature 26 Aug 2003 08:50:56 -0000 1.4.2.7
@@ -10,26 +10,231 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Aug-2003
+## Created on: 26-Aug-2003
##
+---------------------------------------------------------------------------
| Remove "tools" directory from sub-directory list because it contains
| things we are not interested in and which cause some build trouble
| anyway.
+| Use a plain "rpmpopt" file without any trailing version.
+| Adjust paths to conform to OpenPKG filesystem layout.
++---------------------------------------------------------------------------
+Index: Makefile.am
+--- Makefile.am 29 May 2003 18:20:28 -0000 1.1.1.17
++++ Makefile.am 26 Aug 2003 08:14:57 -0000
+@@ -12,9 +12,9 @@
+ xmlspec/examples/*.sh xmlspec/examples/*.lst \
+ xmlspec/examples/*.xmlspec \
+ po/*.in po/*.po po/rpm.pot \
+- rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
++ rpm.magic rpmpopt rpmqv.c rpm.c
+
+-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@
popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools
scripts tests doc .
++SUBDIRS = intl @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@
popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ scripts
tests doc .
+
+ INCLUDES = \
+ -I$(top_srcdir)/build \
+@@ -47,13 +47,10 @@
+
+ pkglibdir = @RPMCONFIGDIR@
+ pkglib_PROGRAMS = rpmb rpmd rpmi rpmk rpmq
+-pkglib_DATA = rpmrc rpmpopt-$(VERSION) macros
++pkglib_DATA = rpmrc rpmpopt macros
+ pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \
+ config.guess config.sub config.site
+
+-rpmpopt-$(VERSION): rpmpopt
+- cp rpmpopt $@
+-
+ noinst_HEADERS = build.h debug.h system.h
+
+ rpm_SOURCES =
+@@ -124,32 +121,32 @@
+ pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR)
+
+ install-data-local:
+- @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
++ @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/openpkg
+ @rm -f $(DESTDIR)$(libdir)/rpmrc
+ @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc
+ @rm -f $(DESTDIR)$(libdir)/rpmpopt
+ @@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt
+ @rm -f $(DESTDIR)$(libdir)/rpm/rpmt
+- @@LN_S@ rpmb $(DESTDIR)$(libdir)/rpm/rpmt
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpme
+- @@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpme
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpmu
+- @@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpmu
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpmv
+- @@LN_S@ rpmq $(DESTDIR)$(libdir)/rpm/rpmv
++ @@LN_S@ rpmb $(DESTDIR)$(libdir)/openpkg/rpmt
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpme
++ @@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpme
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpmu
++ @@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpmu
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpmv
++ @@LN_S@ rpmq $(DESTDIR)$(libdir)/openpkg/rpmv
+ rm -f $(DESTDIR)$(bindir)/rpmbuild
+- @LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
++ @LN_S@ ../lib/openpkg/rpmb $(DESTDIR)$(bindir)/rpmbuild
+ rm -f $(DESTDIR)$(bindir)/rpmquery
+- @LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
++ @LN_S@ ../lib/openpkg/rpmq $(DESTDIR)$(bindir)/rpmquery
+ rm -f $(DESTDIR)$(bindir)/rpmverify
+- @LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
++ @LN_S@ ../lib/openpkg/rpmv $(DESTDIR)$(bindir)/rpmverify
+ rm -f $(DESTDIR)$(bindir)/rpmsign
+- @LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
++ @LN_S@ ../lib/openpkg/rpmk $(DESTDIR)$(bindir)/rpmsign
+ rm -f $(DESTDIR)$(bindir)/rpmdb ; \
+- @LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
++ @LN_S@ ../lib/openpkg/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
+ for bf in e i u ; do \
+ rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
+- @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
++ @LN_S@ ../lib/openpkg/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
+ done
+ @for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
+@@ -198,10 +195,10 @@
+ $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\
+ done
+ @$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
+- @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
+- [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
+- [EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
+- [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
++ @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/openpkg
++ [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/[A-Z]*
++ [EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/openpkg
++ [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/__db.*
+
+ .PHONY: unsetgid
+ unsetgid:
+@@ -244,7 +241,7 @@
+ @sudo ./rpm -ta rpm-$(VERSION).tar.gz
+
+ .PHONY: doxygen
+-doxygen @WITH_APIDOCS_TARGET@: Doxyfile [EMAIL PROTECTED]@
++doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt
+ rm -rf $@
+ mkdir -p $@
+ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@
+
++---------------------------------------------------------------------------
+| Remove "tools" directory from sub-directory list because it contains
+| things we are not interested in and which cause some build trouble
+| anyway.
+| Use a plain "rpmpopt" file without any trailing version.
+| Adjust paths to conform to OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: Makefile.in
--- Makefile.in 16 Jul 2003 17:05:42 -0000 1.1.1.23
-+++ Makefile.in 24 Aug 2003 13:10:21 -0000
-@@ -268,7 +268,7 @@
- rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
++++ Makefile.in 26 Aug 2003 08:15:04 -0000
+@@ -265,10 +265,10 @@
+ xmlspec/examples/*.sh xmlspec/examples/*.lst \
+ xmlspec/examples/*.xmlspec \
+ po/*.in po/*.po po/rpm.pot \
+- rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
++ rpm.magic rpmpopt rpmqv.c rpm.c
-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@
popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools
scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@
popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ scripts
tests doc .
++SUBDIRS = intl @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@
popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ scripts
tests doc .
INCLUDES = \
-I$(top_srcdir)/build \
+@@ -301,7 +301,7 @@
+ bin_PROGRAMS = rpm2cpio
+ bin_SCRIPTS = gendiff
+ pkglib_PROGRAMS = rpmb rpmd rpmi rpmk rpmq
+-pkglib_DATA = rpmrc rpmpopt-$(VERSION) macros
++pkglib_DATA = rpmrc rpmpopt macros
+ pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \
+ config.guess config.sub config.site
+
+@@ -1058,8 +1058,6 @@
+ uninstall-rpmbinPROGRAMS
+
+
+-rpmpopt-$(VERSION): rpmpopt
+- cp rpmpopt $@
+ rpm.o: rpmqv.c
+ $(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c
+ rpmb.o: rpmqv.c
+@@ -1097,32 +1095,32 @@
+ `make -s sources -C popt`
+
+ install-data-local:
+- @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
++ @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/openpkg
+ @rm -f $(DESTDIR)$(libdir)/rpmrc
+ @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc
+ @rm -f $(DESTDIR)$(libdir)/rpmpopt
+ @@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpmt
+- @@LN_S@ rpmb $(DESTDIR)$(libdir)/rpm/rpmt
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpme
+- @@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpme
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpmu
+- @@LN_S@ rpmi $(DESTDIR)$(libdir)/rpm/rpmu
+- @rm -f $(DESTDIR)$(libdir)/rpm/rpmv
+- @@LN_S@ rpmq $(DESTDIR)$(libdir)/rpm/rpmv
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpmt
++ @@LN_S@ rpmb $(DESTDIR)$(libdir)/openpkg/rpmt
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpme
++ @@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpme
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpmu
++ @@LN_S@ rpmi $(DESTDIR)$(libdir)/openpkg/rpmu
++ @rm -f $(DESTDIR)$(libdir)/openpkg/rpmv
++ @@LN_S@ rpmq $(DESTDIR)$(libdir)/openpkg/rpmv
+ rm -f $(DESTDIR)$(bindir)/rpmbuild
+- @LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
++ @LN_S@ ../lib/openpkg/rpmb $(DESTDIR)$(bindir)/rpmbuild
+ rm -f $(DESTDIR)$(bindir)/rpmquery
+- @LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
++ @LN_S@ ../lib/openpkg/rpmq $(DESTDIR)$(bindir)/rpmquery
+ rm -f $(DESTDIR)$(bindir)/rpmverify
+- @LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
++ @LN_S@ ../lib/openpkg/rpmv $(DESTDIR)$(bindir)/rpmverify
+ rm -f $(DESTDIR)$(bindir)/rpmsign
+- @LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
++ @LN_S@ ../lib/openpkg/rpmk $(DESTDIR)$(bindir)/rpmsign
+ rm -f $(DESTDIR)$(bindir)/rpmdb ; \
+- @LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
++ @LN_S@ ../lib/openpkg/rpmd $(DESTDIR)$(bindir)/rpmdb ; \
+ for bf in e i u ; do \
+ rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
+- @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
++ @LN_S@ ../lib/openpkg/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
+ done
+ @for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
+@@ -1171,10 +1169,10 @@
+ $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\
+ done
+ @$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
+- @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
+- [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
+- [EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
+- [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
++ @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/openpkg
++ [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/[A-Z]*
++ [EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/openpkg
++ [EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/openpkg/__db.*
+
+ .PHONY: unsetgid
+ unsetgid:
+@@ -1217,7 +1215,7 @@
+ @sudo ./rpm -ta rpm-$(VERSION).tar.gz
+
+ .PHONY: doxygen
+-doxygen @WITH_APIDOCS_TARGET@: Doxyfile [EMAIL PROTECTED]@
++doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt
+ rm -rf $@
+ mkdir -p $@
+ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@
+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
@@ -366,12 +571,64 @@
sprintf(buf, "%s%d",
+---------------------------------------------------------------------------
-| Use "sysconfdir".
+| Do not build with warnings on, because we do no RPM development
+| (so warnings are useless here), they cause some confusion inside
+| Berkeley-DB and also slow down building. Instead, increase the
+| optimization level. Additionally, disable static linking of RPM
+| tools. Finally, use "shtool mkdir" as the "mkdir -p" fallback.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 25 Aug 2003 10:24:18 -0000
-@@ -1215,12 +1216,12 @@
++++ configure.ac 26 Aug 2003 08:06:43 -0000
+@@ -53,7 +53,7 @@
+ AS=${AS-as}
+ AC_SUBST(AS)
+ if test "$ac_cv_prog_gcc" = yes; then
+- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
++ CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
+ fi
+ export CFLAGS
+
+@@ -142,6 +142,7 @@
+ # just link it dynamically
+ LDFLAGS_STATIC=""
+ fi
++LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools
+ LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format
+ AC_MSG_RESULT($LDFLAGS_STATIC)
+ AC_SUBST(LDFLAGS_STATIC)
+@@ -201,7 +202,7 @@
+
+ if test X"$MKDIR_P" = X0 ; then
+ AC_MSG_RESULT(no)
+- MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
++ MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755"
+ else
+ AC_MSG_RESULT(yes)
+ fi
+
++---------------------------------------------------------------------------
+| Adjust paths for OpenPKG filesystem layout.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 26 Aug 2003 08:06:43 -0000
+@@ -1200,12 +1202,12 @@
+ AC_SUBST(LOCALEDIR)
+ LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
+ AC_SUBST(LIBDIR)
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="@l_prefix@/lib/openpkg"
+ AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
+ [Full path to rpm global configuration directory (usually /usr/lib/rpm)])
+ AC_SUBST(RPMCONFIGDIR)
+
+-SYSCONFIGDIR="`echo /etc/rpm`"
++SYSCONFIGDIR="@l_prefix@/etc/openpkg"
+ AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
+ [Full path to rpm system configuration directory (usually /etc/rpm)])
+ AC_SUBST(SYSCONFIGDIR)
+@@ -1215,17 +1217,17 @@
[Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES)
@@ -386,6 +643,12 @@
AC_DEFINE_UNQUOTED(VENDORRPMRC_FILENAME, "$VENDORRPMRC_FILENAME",
[Full path to vendor rpmrc configuration file (usually
/usr/lib/rpm/vendor/rpmrc)])
AC_SUBST(VENDORRPMRC_FILENAME)
+
+-LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
++LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
+ AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME",
+ [Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)])
+ AC_SUBST(LIBRPMALIAS_FILENAME)
+---------------------------------------------------------------------------
| RPM has two platform id canonicalizations: hard-coded ones in
@@ -395,15 +658,25 @@
| canonicalizations and use only the defined ones. The only thing we
| do inside RPM is to reduce the platform version to major and minor
| version numbers in order to simplify the "rpmrc" files. Then, RPM
-| allows to read the platform from an external program. Allow the
-| hard-coded path to this program to be overridden with the macro
-| %{__platform}. Finally, change the default definition of %{_host}
-| to not contain the vendor stuff to more conform to what %{_target}
-| usually is defined to and what we are using throughout OpenPKG, too.
+| allows to read the platform from an external program. Adjust the
+| hard-coded path to this program and allow it to be overridden with
+| the macro %{__platform}. Finally, change the default definition of
+| %{_host} to not contain the vendor stuff to more conform to what
+| %{_target} usually is defined to and what we are using throughout
+| OpenPKG, too.
+---------------------------------------------------------------------------
Index: lib/rpmrc.c
--- lib/rpmrc.c 4 Jun 2003 18:18:45 -0000 1.1.1.25
-+++ lib/rpmrc.c 25 Aug 2003 18:38:25 -0000
++++ lib/rpmrc.c 26 Aug 2003 07:25:49 -0000
+@@ -27,7 +27,7 @@
+ const char * macrofiles = MACROFILES;
+
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+-static const char * platform = "/etc/rpm/platform";
++static const char * platform = "@l_prefix@/etc/openpkg/platform";
+ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+ static const char ** platpat = NULL;
+ /[EMAIL PROTECTED]@*/
@@ -861,7 +861,11 @@
platpat = xrealloc(platpat, (nplatpat + 2) * sizeof(*platpat));
@@ -513,6 +786,157 @@
%_target_cpu %{_host_cpu}
+---------------------------------------------------------------------------
+| Adjust path for OpenPKG filesystem layout.
++---------------------------------------------------------------------------
+Index: scripts/Makefile.am
+--- scripts/Makefile.am 20 Jun 2003 19:04:49 -0000 1.1.1.11
++++ scripts/Makefile.am 26 Aug 2003 07:45:36 -0000
+@@ -22,7 +22,7 @@
+
+ all:
+
+-configdir = ${prefix}/lib/rpm
++configdir = ${prefix}/lib/openpkg
+ config_SCRIPTS = \
+ brp-compress brp-python-bytecompile brp-redhat \
+ brp-strip brp-strip-comment-note \
+
++---------------------------------------------------------------------------
+| Adjust path for OpenPKG filesystem layout.
++---------------------------------------------------------------------------
+Index: scripts/Makefile.in
+--- scripts/Makefile.in 16 Jul 2003 17:05:49 -0000 1.1.1.14
++++ scripts/Makefile.in 26 Aug 2003 07:45:45 -0000
+@@ -273,7 +273,7 @@
+
+ installprefix = $(DESTDIR)
+
+-configdir = ${prefix}/lib/rpm
++configdir = ${prefix}/lib/openpkg
+ config_SCRIPTS = \
+ brp-compress brp-python-bytecompile brp-redhat \
+ brp-strip brp-strip-comment-note \
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, adjust the path to file(1)'s "magic" file.
++---------------------------------------------------------------------------
+Index: file/Makefile.am
+--- file/Makefile.am 24 Jan 2003 19:41:56 -0000 1.1.1.1
++++ file/Makefile.am 26 Aug 2003 07:44:31 -0000
+@@ -36,7 +36,7 @@
+ #MAGIC = @datadir@/magic
+ #data_DATA = magic magic.mime magic.mgc magic.mime.mgc
+
+-pkglibdir = @prefix@/lib/rpm
++pkglibdir = @prefix@/lib/openpkg
+ pkglib_DATA = magic magic.mime magic.mgc magic.mime.mgc
+ MAGIC = $(pkglibdir)/magic
+ CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, adjust the path to file(1)'s "magic" file.
++---------------------------------------------------------------------------
+Index: file/Makefile.in
+--- file/Makefile.in 16 Jul 2003 17:05:23 -0000 1.1.1.2
++++ file/Makefile.in 26 Aug 2003 07:44:20 -0000
+@@ -39,7 +39,7 @@
+
+ #MAGIC = @datadir@/magic
+ #data_DATA = magic magic.mime magic.mgc magic.mime.mgc
+-pkglibdir = @prefix@/lib/rpm
++pkglibdir = @prefix@/lib/openpkg
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -159,7 +159,7 @@
+ noinst_PROGRAMS = file
+
+ file_SOURCES = file.c
+-file_LDFLAGS = -all-static
++file_LDFLAGS = -static
+ file_LDADD = libfmagic.la
+
+ man_MAGIC = [EMAIL PROTECTED]@
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, disable the building of gettext stuff we don't need.
++---------------------------------------------------------------------------
+Index: popt/Makefile.am
+--- popt/Makefile.am 6 Mar 2003 23:16:43 -0000 1.1.1.9
++++ popt/Makefile.am 26 Aug 2003 07:42:34 -0000
+@@ -9,7 +9,7 @@
+ po/*.in po/*.po po/popt.pot \
+ popt.ps
+
+-SUBDIRS = intl po
++SUBDIRS = intl
+
+ INCLUDES = -I. -I$(top_srcdir)
+
+@@ -17,13 +17,13 @@
+
+ noinst_PROGRAMS = test1 test2 test3
+ test1_SOURCES = test1.c
+-test1_LDFLAGS = -all-static
++test1_LDFLAGS = -static
+ test1_LDADD = $(usrlib_LTLIBRARIES)
+ test2_SOURCES = test2.c
+-test2_LDFLAGS = -all-static
++test2_LDFLAGS = -static
+ test2_LDADD = $(usrlib_LTLIBRARIES)
+ test3_SOURCES = test3.c
+-test3_LDFLAGS = -all-static
++test3_LDFLAGS = -static
+ test3_LDADD = $(usrlib_LTLIBRARIES)
+
+ noinst_SCRIPTS = testit.sh
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, disable the building of gettext stuff we don't need.
++---------------------------------------------------------------------------
+Index: popt/Makefile.in
+--- popt/Makefile.in 16 Jul 2003 17:04:49 -0000 1.1.1.14
++++ popt/Makefile.in 26 Aug 2003 07:42:51 -0000
+@@ -163,7 +163,7 @@
+ popt.ps
+
+
+-SUBDIRS = intl po
++SUBDIRS = intl
+
+ INCLUDES = -I. -I$(top_srcdir)
+
+@@ -171,13 +171,13 @@
+
+ noinst_PROGRAMS = test1 test2 test3
+ test1_SOURCES = test1.c
+-test1_LDFLAGS = -all-static
++test1_LDFLAGS = -static
+ test1_LDADD = $(usrlib_LTLIBRARIES)
+ test2_SOURCES = test2.c
+-test2_LDFLAGS = -all-static
++test2_LDFLAGS = -static
+ test2_LDADD = $(usrlib_LTLIBRARIES)
+ test3_SOURCES = test3.c
+-test3_LDFLAGS = -all-static
++test3_LDFLAGS = -static
+ test3_LDADD = $(usrlib_LTLIBRARIES)
+
+ noinst_SCRIPTS = testit.sh
+
++---------------------------------------------------------------------------
| Revert back to the old behaviour of passing to "exec" programs an
| extra "--" argument to separate options and arguments. Additionally,
| allow the "!#:+" constructs to be used multiple times and then each
@@ -543,6 +967,26 @@
s += 3;
alen = strlen(a);
+
++---------------------------------------------------------------------------
+| Dedefine the stdio variable BUFSIZ because it is usually just 1024
+| on some platforms (on Linux it is 8192) and unfortunately RPM uses
+| it here for the macro expansion buffer. For OpenPKG the size 1024 is
+| definetely too small. So increase this to a 16KB buffer.
++---------------------------------------------------------------------------
+Index: rpmio/macro.c
+--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
++++ rpmio/macro.c 26 Aug 2003 07:31:04 -0000
+@@ -50,6 +50,9 @@
+
+ #include "debug.h"
+
++#undef BUFSIZ
++#define BUFSIZ 16384
++
+ #if defined(__LCLINT__)
+ /[EMAIL PROTECTED]@*/
+ extern const unsigned short int **__ctype_b_loc (void) /[EMAIL PROTECTED]/;
+---------------------------------------------------------------------------
| Reactivate build mode aliases which were removed in rpm-4.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.5.2.7 -r1.5.2.8 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 25 Aug 2003 10:48:07 -0000 1.5.2.7
+++ openpkg-src/openpkg/rpm.patch.porting 26 Aug 2003 08:50:56 -0000 1.5.2.8
@@ -10,35 +10,16 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Aug-2003
+## Created on: 26-Aug-2003
##
+---------------------------------------------------------------------------
-| Do not build with warnings on, because we do no RPM development
-| (so warnings are useless here), they cause some confusion inside
-| Berkeley-DB and also slow down building. Instead, increase the
-| optimization level.
-+---------------------------------------------------------------------------
-Index: configure.ac
---- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 25 Aug 2003 10:24:18 -0000
-@@ -53,7 +53,7 @@
- AS=${AS-as}
- AC_SUBST(AS)
- if test "$ac_cv_prog_gcc" = yes; then
-- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
-+ CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
- fi
- export CFLAGS
-
-
-+---------------------------------------------------------------------------
| Add support for BSD getmntinfo(3).
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 25 Aug 2003 10:24:18 -0000
-@@ -963,12 +963,13 @@
++++ configure.ac 26 Aug 2003 08:06:43 -0000
+@@ -963,12 +964,13 @@
AC_CHECK_FUNCS(getpassphrase)
AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the
getmntent() function]), [
@@ -159,14 +140,166 @@
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
+---------------------------------------------------------------------------
-| Remove hard-coded Linux'ism of linking against POSIX rt/pthread
-| libraries (is not needed even under Linux itself) and make sure the
-| build does not break by an empty argument list when iterating over
-| (the not existing) BeeCrypt objects.
+| Add libmisc.a for platform portability.
++---------------------------------------------------------------------------
+Index: tools/Makefile.am
+--- tools/Makefile.am 29 May 2003 17:40:17 -0000 1.1.1.14
++++ tools/Makefile.am 26 Aug 2003 07:57:50 -0000
+@@ -22,7 +22,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/librpm.la \
+- @INTLLIBS@
++ @INTLLIBS@ @LIBMISC@
+
+ staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+
+
++---------------------------------------------------------------------------
+| Add libmisc.a for platform portability.
++---------------------------------------------------------------------------
+Index: tools/Makefile.in
+--- tools/Makefile.in 16 Jul 2003 17:05:51 -0000 1.1.1.20
++++ tools/Makefile.in 26 Aug 2003 07:57:42 -0000
+@@ -275,7 +275,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/librpm.la \
+- @INTLLIBS@
++ @INTLLIBS@ @LIBMISC@
+
+
+ staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, disable the building of programs we don't need.
++---------------------------------------------------------------------------
+Index: rpmdb/Makefile.am
+--- rpmdb/Makefile.am 2 Jul 2003 20:14:07 -0000 1.1.1.7
++++ rpmdb/Makefile.am 26 Aug 2003 07:40:42 -0000
+@@ -18,7 +18,7 @@
+ EXTRA_PROGRAMS = tjfn
+
+ tjfn_SOURCES = tjfn.c
+-tjfn_LDFLAGS = -all-static
++tjfn_LDFLAGS = -static
+ tjfn_LDADD = librpmdb.la
+
+ pkgincdir = $(pkgincludedir)
+@@ -26,11 +26,6 @@
+ noinst_HEADERS = fprint.h header_internal.h legacy.h
+
+ pkgbindir = @RPMCONFIGDIR@
+-pkgbin_PROGRAMS = \
+- rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify
+-noinst_PROGRAMS = \
+- rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \
+- rpmdb_upgrade
+
+ mylibs = librpmdb.la
+
+@@ -180,4 +175,4 @@
+ $(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES)
+
+ tdbi: librpmdb.la tdbi.o
+- $(LINK) -all-static [EMAIL PROTECTED] $< $(mylibpaths) $(mylibs) $(LIBS)
++ $(LINK) -static [EMAIL PROTECTED] $< $(mylibpaths) $(mylibs) $(LIBS)
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, disable the building of programs we don't need.
++---------------------------------------------------------------------------
+Index: rpmdb/Makefile.in
+--- rpmdb/Makefile.in 16 Jul 2003 17:05:48 -0000 1.1.1.7
++++ rpmdb/Makefile.in 26 Aug 2003 07:39:42 -0000
+@@ -273,7 +273,7 @@
+ EXTRA_PROGRAMS = tjfn
+
+ tjfn_SOURCES = tjfn.c
+-tjfn_LDFLAGS = -all-static
++tjfn_LDFLAGS = -static
+ tjfn_LDADD = librpmdb.la
+
+ pkgincdir = $(pkgincludedir)
+@@ -418,7 +418,7 @@
+ pkgbin_PROGRAMS = rpmdb_deadlock$(EXEEXT) rpmdb_dump$(EXEEXT) \
+ rpmdb_load$(EXEEXT) rpmdb_svc$(EXEEXT) rpmdb_stat$(EXEEXT) \
+ rpmdb_verify$(EXEEXT)
+-PROGRAMS = $(noinst_PROGRAMS) $(pkgbin_PROGRAMS)
++PROGRAMS =
+
+ am_rpmdb_archive_OBJECTS =
+ rpmdb_archive_OBJECTS = $(am_rpmdb_archive_OBJECTS)
+@@ -952,7 +952,7 @@
+ $(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES)
+
+ tdbi: librpmdb.la tdbi.o
+- $(LINK) -all-static [EMAIL PROTECTED] $< $(mylibpaths) $(mylibs) $(LIBS)
++ $(LINK) -static [EMAIL PROTECTED] $< $(mylibpaths) $(mylibs) $(LIBS)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
++---------------------------------------------------------------------------
+Index: rpmio/Makefile.am
+--- rpmio/Makefile.am 5 Jun 2003 12:05:23 -0000 1.1.1.9
++++ rpmio/Makefile.am 26 Aug 2003 07:34:21 -0000
+@@ -68,27 +68,27 @@
+ tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tdir_SOURCES = tdir.c
+-tdir_LDFLAGS = -all-static
++tdir_LDFLAGS = -static
+ tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tfts_SOURCES = tfts.c
+-tfts_LDFLAGS = -all-static
++tfts_LDFLAGS = -static
+ tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tglob_SOURCES = tglob.c
+-tglob_LDFLAGS = -all-static
++tglob_LDFLAGS = -static
+ tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tinv_SOURCES = tinv.c
+-tinv_LDFLAGS = -all-static
++tinv_LDFLAGS = -static
+ tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tkey_SOURCES = tkey.c
+-tkey_LDFLAGS = -all-static
++tkey_LDFLAGS = -static
+ tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tring_SOURCES = tring.c
+-tring_LDFLAGS = -all-static
++tring_LDFLAGS = -static
+ tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ trpmio_SOURCES = trpmio.c
+
++---------------------------------------------------------------------------
+| Use GNU libtool's weaker -static (link with own static libraries)
+| instead of the strong -all-static (link even with static libc, etc),
+| because OpenPKG does not need to be fully static.
+| Additionally, remove hard-coded Linux'ism of linking against POSIX
+| rt/pthread libraries (is not needed even under Linux itself) and
+| make sure the build does not break by an empty argument list when
+| iterating over (the not existing) BeeCrypt objects.
+---------------------------------------------------------------------------
Index: rpmio/Makefile.in
--- rpmio/Makefile.in 16 Jul 2003 17:05:49 -0000 1.1.1.9
-+++ rpmio/Makefile.in 24 Aug 2003 13:10:21 -0000
++++ rpmio/Makefile.in 26 Aug 2003 07:34:30 -0000
@@ -288,8 +288,7 @@
librpmio_la_LDFLAGS = -release 4.2 \
@WITH_BEECRYPT_LIB@ \
@@ -177,6 +310,40 @@
librpmio_la_LIBADD = $(BEECRYPTLOBJS)
librpmio_la_DEPENDENCIES = .created
+@@ -298,27 +297,27 @@
+ tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tdir_SOURCES = tdir.c
+-tdir_LDFLAGS = -all-static
++tdir_LDFLAGS = -static
+ tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tfts_SOURCES = tfts.c
+-tfts_LDFLAGS = -all-static
++tfts_LDFLAGS = -static
+ tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tglob_SOURCES = tglob.c
+-tglob_LDFLAGS = -all-static
++tglob_LDFLAGS = -static
+ tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tinv_SOURCES = tinv.c
+-tinv_LDFLAGS = -all-static
++tinv_LDFLAGS = -static
+ tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tkey_SOURCES = tkey.c
+-tkey_LDFLAGS = -all-static
++tkey_LDFLAGS = -static
+ tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tring_SOURCES = tring.c
+-tring_LDFLAGS = -all-static
++tring_LDFLAGS = -static
+ tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+
+ trpmio_SOURCES = trpmio.c
@@ -743,8 +742,8 @@
.created:
if test X"@WITH_BEECRYPT_SUBDIR@" != X; then \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.3.2.4 -r1.3.2.5 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 25 Aug 2003 10:48:07 -0000 1.3.2.4
+++ openpkg-src/openpkg/rpm.patch.regen 26 Aug 2003 08:50:56 -0000 1.3.2.5
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Aug-2003
+## Created on: 26-Aug-2003
##
+---------------------------------------------------------------------------
@@ -37,7 +37,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 25 Aug 2003 10:24:29 -0000
++++ configure 26 Aug 2003 08:22:10 -0000
@@ -4040,7 +4040,7 @@
AS=${AS-as}
@@ -47,7 +47,69 @@
fi
export CFLAGS
-@@ -22911,6 +22911,86 @@
+@@ -4837,6 +4837,7 @@
+ # just link it dynamically
+ LDFLAGS_STATIC=""
+ fi
++LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools
+ LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format
+ echo "$as_me:$LINENO: result: $LDFLAGS_STATIC" >&5
+ echo "${ECHO_T}$LDFLAGS_STATIC" >&6
+@@ -4937,7 +4938,7 @@
+ if test X"$MKDIR_P" = X0 ; then
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
++ MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755"
+ else
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+@@ -6682,7 +6683,7 @@
+ case $host in
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6685 "configure"' > conftest.$ac_ext
++ echo '#line 6686 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7211,7 +7212,7 @@
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+ compiler_c_o=no
+-if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++if { (eval echo configure:7215: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s out/conftest.err; then
+@@ -8395,7 +8396,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*)
+- echo '#line 8398 "configure"' > conftest.$ac_ext
++ echo '#line 8399 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9067,7 +9068,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9070 "configure"
++#line 9071 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -9165,7 +9166,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9168 "configure"
++#line 9169 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -22911,6 +22912,86 @@
else
@@ -134,7 +196,7 @@
echo "$as_me:$LINENO: checking for mntctl" >&5
echo $ECHO_N "checking for mntctl... $ECHO_C" >&6
if test "${ac_cv_func_mntctl+set}" = set; then
-@@ -23148,6 +23228,8 @@
+@@ -23148,6 +23229,8 @@
fi
@@ -143,7 +205,25 @@
echo "$as_me:$LINENO: checking for lchown" >&5
echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23539,7 +23621,7 @@
+@@ -23515,7 +23598,7 @@
+
+ LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
+
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="@l_prefix@/lib/openpkg"
+
+ cat >>confdefs.h <<_ACEOF
+ #define RPMCONFIGDIR "$RPMCONFIGDIR"
+@@ -23523,7 +23606,7 @@
+
+
+
+-SYSCONFIGDIR="`echo /etc/rpm`"
++SYSCONFIGDIR="@l_prefix@/etc/openpkg"
+
+ cat >>confdefs.h <<_ACEOF
+ #define SYSCONFIGDIR "$SYSCONFIGDIR"
+@@ -23539,7 +23622,7 @@
@@ -152,7 +232,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23629,7 @@
+@@ -23547,7 +23630,7 @@
@@ -161,7 +241,16 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -25157,7 +25239,6 @@
+@@ -23555,7 +23638,7 @@
+
+
+
+-LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
++LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
+
+ cat >>confdefs.h <<_ACEOF
+ #define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
+@@ -25157,7 +25240,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
