--- rpm-4.2/beecrypt/beecrypt.c.orig 2002-07-07 21:21:12.000000000 +0100 +++ rpm-4.2/beecrypt/beecrypt.c 2003-05-25 11:37:27.000000000 +0100 @@ -856,7 +856,6 @@ } #if WIN32 -__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hInst, DWORD wDataSeg, LPVOID lpReserved) { switch (wDataSeg) --- rpm-4.2/beecrypt/Makefile.am.orig 2002-12-07 18:58:39.000000000 +0000 +++ rpm-4.2/beecrypt/Makefile.am 2003-05-25 11:37:27.000000000 +0100 @@ -53,9 +53,9 @@ libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) $(BEECRYPT_JAVA_OBJECTS) -libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mp32opt.lo sha1opt.lo +libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mp32opt.lo sha1opt.lo -lwinmm -libbeecrypt_la_LDFLAGS = -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) +libbeecrypt_la_LDFLAGS = -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) -no-undefined pkginclude_HEADERS = aes.h base64.h beecrypt.h blockmode.h blockpad.h blowfish.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha1.h sha256.h timestamp.h --- rpm-4.2/build/Makefile.am.orig 2003-03-06 21:48:37.000000000 +0000 +++ rpm-4.2/build/Makefile.am 2003-05-25 11:37:28.000000000 +0100 @@ -32,7 +32,9 @@ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ + -no-undefined \ @WITH_LIBELF_LIB@ +librpmbuild_la_LIBADD = $(INTLLIBS) $(top_builddir)/popt/libpopt.la rpmfile.h: @ln -sf $(top_builddir)/file/file.h $@ --- rpm-4.2/configure.ac.orig 2003-02-14 22:53:37.000000000 +0000 +++ rpm-4.2/configure.ac 2003-05-25 11:37:27.000000000 +0100 @@ -7,9 +7,9 @@ AC_INIT(rpmqv.c) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) dnl Minimum Autoconf version required. -AC_CONFIG_HEADERS + AM_INIT_AUTOMAKE(rpm, 4.2) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) dnl XXX AM_MAINTAINER_MODE @@ -1226,7 +1226,7 @@ dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) +AC_CONFIG_SUBDIRS(popt beecrypt zlib file db3) AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile --- rpm-4.2/db/dist/configure.ac.orig 2002-09-20 15:02:22.000000000 +0100 +++ rpm-4.2/db/dist/configure.ac 2003-05-25 11:37:27.000000000 +0100 @@ -213,7 +213,6 @@ # # AC_PROG_CXX sets CXX, but it uses $CXX and $CCC (in that order) as its # first choices. -if test "$db_cv_cxx" = "yes"; then if test "$GCC" != "yes"; then case "$host_os" in aix*) AC_CHECK_TOOL(CCC, xlC_r) @@ -226,6 +225,12 @@ esac fi AC_PROG_CXX + +# Expanding but not running AC_PROG_CXX breaks AC_PROG_LIBTOOL +# (at least it does with ac-2.57, lt-1.5). Hence, we have to keep the above +# outside the conditional, even though it is useless the conditional is true. + +if test "$db_cv_cxx" = "yes"; then AC_CXX_HAVE_STDHEADERS MAKEFILE_CXX="${CXX}" MAKEFILE_CXXLINK="${CXX}" @@ -267,10 +272,10 @@ INSTALLER="\$(LIBTOOL) --mode=install cp -p" MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" -MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" +MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version -no-undefined" MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" -MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" +MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version -no-undefined" MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" # Configure for shared libraries, static libraries, or both. If both are --- rpm-4.2/db3/configure.orig 2002-12-20 14:36:49.000000000 +0000 +++ rpm-4.2/db3/configure 2003-05-25 11:37:27.000000000 +0100 @@ -5,10 +5,10 @@ rm -f config.cache # XXX edit CFLAGS= ... out of invocation args ??? -ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`" +ARGS="`echo " $*" | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`" CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ - --enable-shared --enable-static --enable-rpc \ + --enable-shared --enable-static --disable-rpc \ --with-uniquename=_rpmdb --srcdir=$db_dist mv Makefile Makefile.orig --- rpm-4.2/file/Makefile.am.orig 2003-02-13 16:57:49.000000000 +0000 +++ rpm-4.2/file/Makefile.am 2003-05-25 11:37:27.000000000 +0100 @@ -21,6 +21,7 @@ libfmagic_la_SOURCES = \ apprentice.c ascmagic.c fsmagic.c compress.c \ print.c readelf.c softmagic.c +libfmagic_la_LDFLAGS = -no-undefined #bin_PROGRAMS = file noinst_PROGRAMS = file @@ -54,10 +55,10 @@ cat $$f; \ done >> $@ -magic.mgc: magic file +magic.mgc: magic file$(EXEEXT) ./file -C -m magic -magic.mime.mgc: magic.mime file +magic.mime.mgc: magic.mime file$(EXEEXT) ./file -C -m $(srcdir)/magic.mime file.1: Makefile file.man --- rpm-4.2/lib/Makefile.am.orig 2003-03-06 21:48:26.000000000 +0000 +++ rpm-4.2/lib/Makefile.am 2003-05-25 11:37:28.000000000 +0100 @@ -39,7 +39,8 @@ librpm_la_LDFLAGS = -release @VERSION@ \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ - $(top_builddir)/popt/libpopt.la + $(top_builddir)/popt/libpopt.la -no-undefined +librpm_la_LIBADD = $(INTLLIBS) getdate.c: getdate.y @echo expect 10 shift/reduce conflicts --- rpm-4.2/lib/signature.c.orig 2003-01-23 17:28:26.000000000 +0000 +++ rpm-4.2/lib/signature.c 2003-05-25 11:37:27.000000000 +0100 @@ -26,7 +26,7 @@ /*@access pgpDig@*/ /*@access pgpDigParams@*/ -#if !defined(__GLIBC__) +#if !defined(__GLIBC__) && !defined(__CYGWIN__) char ** environ = NULL; #endif --- rpm-4.2/popt/configure.ac.orig 2002-12-19 23:41:07.000000000 +0000 +++ rpm-4.2/popt/configure.ac 2003-05-25 11:37:27.000000000 +0100 @@ -1,9 +1,9 @@ AC_INIT(popt.h) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) -AC_CONFIG_HEADERS + AM_INIT_AUTOMAKE(popt, 1.8) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312" --- rpm-4.2/popt/Makefile.am.orig 2002-12-01 19:02:30.000000000 +0000 +++ rpm-4.2/popt/Makefile.am 2003-05-25 11:37:27.000000000 +0100 @@ -38,6 +38,8 @@ usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = libpopt.la libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c +libpopt_la_LIBADD = $(INTLLIBS) +libpopt_la_LDFLAGS = -no-undefined man_MANS = popt.3 --- rpm-4.2/rpmdb/Makefile.am.orig 2003-03-06 21:59:16.000000000 +0000 +++ rpm-4.2/rpmdb/Makefile.am 2003-05-25 11:37:28.000000000 +0100 @@ -27,7 +27,7 @@ pkgbindir = @RPMCONFIGDIR@ pkgbin_PROGRAMS = \ - rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify + rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_stat rpmdb_verify noinst_PROGRAMS = \ rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \ rpmdb_upgrade @@ -50,9 +50,10 @@ librpmdb_la_LDFLAGS = -release @VERSION@ \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la \ + -no-undefined \ @WITH_LIBELF_LIB@ \ @libdb3@ -librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) +librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) $(INTLLIBS) librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created # XXX make sure that db.h symlink is generated @@ -83,6 +84,10 @@ for lo in $(DB3LOBJS); do \ [ -f $$lo ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$lo $$lo ; \ done + for o in `echo $(DB3LOBJS) | sed 's/\.lo\>/\.o/g'`; do \ + [ -f $$o ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$o $$o ; \ + [ -f .libs/$$o ] || $(LN_S) ../$(top_builddir)/$(WITH_DB_SUBDIR)/$$o .libs/$$o ; \ + done touch $@ rpmdb_archive_SOURCES = @@ -139,14 +144,14 @@ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \ librpmdb.la -rpmdb_svc_SOURCES = -rpmdb_svc_LDADD = \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.lo \ - $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \ - librpmdb.la +# rpmdb_svc_SOURCES = +# rpmdb_svc_LDADD = \ +# $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.lo \ +# $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.lo \ +# $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.lo \ +# $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.lo \ +# $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \ +# librpmdb.la rpmdb_upgrade_SOURCES = rpmdb_upgrade_LDADD = \ --- rpm-4.2/rpmio/fts.c.orig 2003-01-06 17:32:46.000000000 +0000 +++ rpm-4.2/rpmio/fts.c 2003-05-25 11:37:27.000000000 +0100 @@ -59,6 +59,12 @@ # define _STAT_VER 0 # define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp)) #endif +#if defined(__CYGWIN__) +# define __errno_location() (&errno) +# define stat64 stat +# define _STAT_VER 0 +# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp)) +#endif #include "system.h" #include "fts.h" #include "rpmio.h" --- rpm-4.2/rpmio/fts.h.orig 2003-01-06 17:32:46.000000000 +0000 +++ rpm-4.2/rpmio/fts.h 2003-05-25 11:37:27.000000000 +0100 @@ -55,6 +55,10 @@ # define _D_EXACT_NAMLEN(d) ((d)->d_reclen) #endif +#if defined(__CYGWIN__) +# define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name)) +#endif + #endif #include --- rpm-4.2/rpmio/Makefile.am.orig 2003-03-06 21:48:13.000000000 +0000 +++ rpm-4.2/rpmio/Makefile.am 2003-05-25 11:37:28.000000000 +0100 @@ -33,8 +33,11 @@ librpmio_la_LDFLAGS = -release @VERSION@ \ $(top_builddir)/file/libfmagic.la \ @WITH_ZLIB_LIB@ \ - -lrt -lpthread -librpmio_la_LIBADD = $(BEECRYPTLOBJS) + -lpthread -no-undefined \ + -Wl,--exclude-symbols=getopt \ + -Wl,--exclude-symbols=getopt_long + +librpmio_la_LIBADD = $(BEECRYPTLOBJS) $(INTLLIBS) -lwinmm librpmio_la_DEPENDENCIES = .created $(top_builddir)/beecrypt/listobjs: @@ -44,6 +47,10 @@ for lo in $(BEECRYPTLOBJS); do \ [ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \ done + for o in `echo $(BEECRYPTLOBJS) | sed 's/\.lo\>/\.o/g'`; do \ + [ -f $$o ] || $(LN_S) $(top_builddir)/beecrypt/$$o $$o ; \ + [ -f .libs/$$o ] || $(LN_S) ../$(top_builddir)/beecrypt/$$o .libs/$$o ; \ + done touch $@ clean-local: --- rpm-4.2/rpmio/rpmio.h.orig 2002-08-13 20:43:43.000000000 +0100 +++ rpm-4.2/rpmio/rpmio.h 2003-05-25 11:37:28.000000000 +0100 @@ -10,7 +10,6 @@ #include #include /*@-noparams@*/ -#include /*@=noparams@*/ #include #include --- rpm-4.2/rpmio/rpmrpc.c.orig 2003-01-06 17:32:46.000000000 +0000 +++ rpm-4.2/rpmio/rpmrpc.c 2003-05-25 11:37:28.000000000 +0100 @@ -1284,6 +1284,7 @@ /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */ dp->d_ino = i + 1; /* W2DO? */ +#if !defined(__CYGWIN__) dp->d_reclen = 0; /* W2DO? */ #if !defined(hpux) && !defined(sun) @@ -1292,6 +1293,7 @@ dp->d_type = dt[i]; /*@=boundsread@*/ #endif +#endif strncpy(dp->d_name, av[i], sizeof(dp->d_name)); /*@+voidabstract@*/ --- rpm-4.2/rpmqv.c.orig 2003-01-28 12:23:39.000000000 +0000 +++ rpm-4.2/rpmqv.c 2003-05-25 11:37:28.000000000 +0100 @@ -153,7 +153,7 @@ /*@-bounds@*/ /* LCL: segfault */ /*@-mods@*/ /* FIX: shrug */ -#if !defined(__GLIBC__) && !defined(__LCLINT__) +#if !defined(__GLIBC__) && !defined(__LCLINT__) && !defined(__CYGWIN__) int main(int argc, const char ** argv, /*@unused@*/ char ** envp) #else int main(int argc, const char ** argv) @@ -210,7 +210,7 @@ #endif setprogname(argv[0]); /* Retrofit glibc __progname */ -#if !defined(__GLIBC__) && !defined(__LCLINT__) +#if !defined(__GLIBC__) && !defined(__LCLINT__) && !defined(__CYGWIN__) environ = envp; #endif --- rpm-4.2/tools/Makefile.am.orig 2003-03-07 18:21:19.000000000 +0000 +++ rpm-4.2/tools/Makefile.am 2003-05-25 11:37:28.000000000 +0100 @@ -29,15 +29,15 @@ convertdb1 dump dumpdb rpmarchive rpmheader rpmlead rpmsignature pkgbindir = @RPMCONFIGDIR@ -pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile +pkgbin_PROGRAMS = javadeps rpmcache rpmdeps rpmfile bin_PROGRAMS = rpmgraph convertdb1_SOURCES = convertdb1.c -debugedit_SOURCES = debugedit.c hashtab.c -debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ - $(top_builddir)/popt/libpopt.la +# debugedit_SOURCES = debugedit.c hashtab.c +# debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ +# $(top_builddir)/popt/libpopt.la javadeps_SOURCES = javadeps.c --- rpm-4.2/zlib/configure.in.orig 2003-03-06 21:49:44.000000000 +0000 +++ rpm-4.2/zlib/configure.in 2003-05-25 11:37:28.000000000 +0100 @@ -1,8 +1,8 @@ AC_INIT(gzio.c) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) -AC_CONFIG_HEADERS AM_INIT_AUTOMAKE(zlib, 1.1.4) +AC_CONFIG_HEADERS(config.h) dnl Check for programs. AC_PROG_CC