--- rpm-4.1.1/configure.orig 2003-03-07 19:17:41.000000000 +0000 +++ rpm-4.1.1/configure 2003-03-08 21:46:50.000000000 +0000 @@ -467,7 +467,7 @@ # include #endif" -ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib elfutils file db3" +ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib file db3" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE AS RPMUSER RPMUID RPMGROUP RPMGID CTAGS CSCOPE LDFLAGS_STATIC LDFLAGS_NPTL FIXPERMS MKDIR MKDIR_P U ANSI2KNR LN_S ECHO RANLIB ac_ct_RANLIB LIBTOOL AR ac_ct_AR BZIP2BIN __CAT __CHGRP __CHMOD __CHOWN __CP __CPIO __FILE __GPG __GREP GZIPBIN UNZIPBIN __ID __ID_U __INSTALL __MAKE __MKDIR __MV __PATCH __PERL PGPBIN __PYTHON __RM __RSH __SED __SSH __TAR __LD __NM __OBJCOPY __OBJDUMP __STRIP WITH_ZLIB_SUBDIR WITH_ZLIB_INCLUDE WITH_ZLIB_LIB WITH_ELFUTILS_SUBDIR WITH_LIBELF_INCLUDE WITH_LIBELF_LIB WITH_LIBDWARF_INCLUDE WITH_DB_SUBDIR WITH_INTERNAL_DB DBLIBSRCS DBLIBOBJS libdb3 libdb3a WITH_BZIP2 MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS WITH_PYTHON_SUBDIR WITH_PYTHON_SUBPACKAGE WITH_PYTHON_VERSION __DOXYGEN WITH_APIDOCS_TARGET WITH_APIDOCS __CHOWN_RHF __CHGRP_RHF ROOT_GROUP varprefix tmpdir MARK64 RPMCANONCOLOR RPMCANONARCH RPMCANONVENDOR RPMCANONOS LOCALEDIR LIBDIR RPMCONFIGDIR SYSCONFIGDIR MACROFILES LIBRPMRC_FILENAME VENDORRPMRC_FILENAME LIBRPMALIAS_FILENAME FINDREQUIRES FINDPROVIDES testdir INCPATH LIBMISC RPM OBJDUMP subdirs LTLIBOBJS' ac_subst_files='' --- rpm-4.1.1/db3/configure.orig 2003-03-08 21:46:50.000000000 +0000 +++ rpm-4.1.1/db3/configure 2003-03-08 21:46:50.000000000 +0000 @@ -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.1.1/file/Makefile.in.orig 2003-03-07 19:17:08.000000000 +0000 +++ rpm-4.1.1/file/Makefile.in 2003-03-08 21:46:50.000000000 +0000 @@ -684,10 +684,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.1.1/lib/signature.c.orig 2003-03-03 16:21:13.000000000 +0000 +++ rpm-4.1.1/lib/signature.c 2003-03-08 21:46:50.000000000 +0000 @@ -27,5 +27,5 @@ /*@access pgpDigParams@*/ -#if !defined(__GLIBC__) +#if !defined(__GLIBC__) && !defined(__CYGWIN__) char ** environ = NULL; #endif --- rpm-4.1.1/popt/Makefile.in.orig 2003-03-08 21:46:51.000000000 +0000 +++ rpm-4.1.1/popt/Makefile.in 2003-03-08 21:46:51.000000000 +0000 @@ -169,7 +169,7 @@ LTLIBRARIES = $(usrlib_LTLIBRARIES) libpopt_la_LDFLAGS = -libpopt_la_LIBADD = +libpopt_la_LIBADD = -lintl am_libpopt_la_OBJECTS = popt.lo findme.lo poptparse.lo poptconfig.lo \ popthelp.lo libpopt_la_OBJECTS = $(am_libpopt_la_OBJECTS) --- rpm-4.1.1/rpmdb/Makefile.in.orig 2003-03-07 19:17:35.000000000 +0000 +++ rpm-4.1.1/rpmdb/Makefile.in 2003-03-08 21:46:50.000000000 +0000 @@ -231,7 +231,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 \ @@ -366,7 +366,7 @@ rpmdb_printlog$(EXEEXT) rpmdb_recover$(EXEEXT) \ rpmdb_upgrade$(EXEEXT) pkgbin_PROGRAMS = rpmdb_deadlock$(EXEEXT) rpmdb_dump$(EXEEXT) \ - rpmdb_load$(EXEEXT) rpmdb_svc$(EXEEXT) rpmdb_stat$(EXEEXT) \ + rpmdb_load$(EXEEXT) rpmdb_stat$(EXEEXT) \ rpmdb_verify$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) $(pkgbin_PROGRAMS) --- rpm-4.1.1/rpmio/fts.c.orig 2003-01-18 16:13:17.000000000 +0000 +++ rpm-4.1.1/rpmio/fts.c 2003-03-08 21:46:50.000000000 +0000 @@ -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.1.1/rpmio/fts.h.orig 2003-01-18 16:13:17.000000000 +0000 +++ rpm-4.1.1/rpmio/fts.h 2003-03-08 21:46:50.000000000 +0000 @@ -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.1.1/rpmio/Makefile.in.orig 2003-03-07 19:17:35.000000000 +0000 +++ rpm-4.1.1/rpmio/Makefile.in 2003-03-08 21:46:51.000000000 +0000 @@ -237,9 +237,9 @@ librpmio_la_LDFLAGS = -release 4.1 -L/var/tmp/rpm-root$(usrlibdir) \ $(top_builddir)/file/libfmagic.la \ @WITH_ZLIB_LIB@ \ - -lrt -lpthread + -lpthread -librpmio_la_LIBADD = $(BEECRYPTLOBJS) +librpmio_la_LIBADD = $(BEECRYPTLOBJS) -lintl librpmio_la_DEPENDENCIES = .created tdigest_SOURCES = tdigest.c --- rpm-4.1.1/rpmio/rpmio.h.orig 2002-08-13 21:42:43.000000000 +0100 +++ rpm-4.1.1/rpmio/rpmio.h 2003-03-08 21:46:50.000000000 +0000 @@ -10,7 +10,6 @@ #include #include /*@-noparams@*/ -#include /*@=noparams@*/ #include #include --- rpm-4.1.1/rpmio/rpmrpc.c.orig 2003-02-28 16:24:09.000000000 +0000 +++ rpm-4.1.1/rpmio/rpmrpc.c 2003-03-08 21:46:50.000000000 +0000 @@ -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.1.1/rpmqv.c.orig 2003-03-04 15:32:57.000000000 +0000 +++ rpm-4.1.1/rpmqv.c 2003-03-08 21:46:50.000000000 +0000 @@ -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.1.1/tools/Makefile.in.orig 2003-03-07 19:17:37.000000000 +0000 +++ rpm-4.1.1/tools/Makefile.in 2003-03-08 21:46:50.000000000 +0000 @@ -237,7 +237,7 @@ pkgbindir = @RPMCONFIGDIR@ -pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile +pkgbin_PROGRAMS = javadeps rpmcache rpmdeps rpmfile bin_PROGRAMS = rpmgraph @@ -273,7 +273,7 @@ noinst_PROGRAMS = convertdb1$(EXEEXT) dump$(EXEEXT) dumpdb$(EXEEXT) \ rpmarchive$(EXEEXT) rpmheader$(EXEEXT) rpmlead$(EXEEXT) \ rpmsignature$(EXEEXT) -pkgbin_PROGRAMS = debugedit$(EXEEXT) javadeps$(EXEEXT) rpmcache$(EXEEXT) \ +pkgbin_PROGRAMS = javadeps$(EXEEXT) rpmcache$(EXEEXT) \ rpmdeps$(EXEEXT) rpmfile$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkgbin_PROGRAMS)