Update of /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21395/10.3/main/finkinfo/base
Added Files: apt-shlibs.info apt-shlibs.patch apt.info apt.patch dpkg.info dpkg.patch Log Message: gonna work on these some again --- NEW FILE: dpkg.patch --- diff -uNr dpkg-1.13.16/dpkg-deb/Makefile.in dpkg-1.13.16-new/dpkg-deb/Makefile.in --- dpkg-1.13.16/dpkg-deb/Makefile.in 2006-02-18 12:10:25.000000000 -0500 +++ dpkg-1.13.16-new/dpkg-deb/Makefile.in 2006-03-11 12:22:35.000000000 -0500 @@ -85,7 +85,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(EXEFLAGS) -o $@ SOURCES = $(dpkg_deb_SOURCES) DIST_SOURCES = $(dpkg_deb_SOURCES) ETAGS = etags @@ -232,7 +232,7 @@ main.c dpkg_deb_LDADD = \ - $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) + $(LIBINTL) ../lib/libdpkg.a ../getopt/libopt.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) [...2197 lines suppressed...] + if (verbose) + fprintf(stderr, _("FAILED\n")); + else + fprintf(stderr, _("%s: MD5 check failed for '%s'\n"), progname, filename); + ++failed; + } else if (verbose) + fprintf(stderr, _("OK\n")); + ++checked; + } + if (verbose && failed) + fprintf(stderr, _("%s: %d of %d file(s) failed MD5 check\n"), progname, failed, checked); + if (!checked) { + fprintf(stderr, _("%s: no files checked\n"), progname); + return 3; + } + if (!ex && failed) + ex = 1; + return ex; +} + --- NEW FILE: apt-shlibs.patch --- --- apt-0.5.4/Makefile Tue Feb 20 02:03:16 2001 +++ apt-0.5.4-new/Makefile Wed Aug 17 17:41:17 2005 @@ -13,11 +13,6 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ - $(MAKE) -C methods $@ - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ # Some very common aliases .PHONY: maintainer-clean dist-clean distclean pristine sanity --- apt-0.5.4/apt-inst/makefile Mon Feb 26 23:16:05 2001 +++ apt-0.5.4-new/apt-inst/makefile Wed Aug 17 17:41:12 2005 @@ -10,6 +10,7 @@ include ../buildlib/defaults.mak [...967 lines suppressed...] + #endif + #ifndef NI_DATAGRAM + #define NI_DATAGRAM NI_DGRAM #endif #define sockaddr_storage sockaddr_in --- apt-0.5.4/patch_flush Wed Dec 31 19:00:00 1969 +++ apt-0.5.4-new/patch_flush Wed Aug 17 17:41:12 2005 @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +files=`find . -name '*.cc' -print | xargs grep -l 'flush;'` + +for i in $files ; do + sed 's/<< flush;/<< flush, fflush(NULL);/g' <$i >$i.tmp + mv $i.tmp $i +done + +exit 0 --- NEW FILE: apt.patch --- diff -uNr apt-0.6.43.3/apt-inst/contrib/extracttar.cc apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc --- apt-0.6.43.3/apt-inst/contrib/extracttar.cc 2005-10-19 15:19:09.000000000 -0400 +++ apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc 2006-03-11 12:27:33.000000000 -0500 @@ -149,6 +149,17 @@ close(Pipes[1]); return true; } + +// Handle the ridiculous way that tar stores large numbers +static bool TarUIDToNum(const char *Str, unsigned long &Res, unsigned Len) { + switch (*Str) { + case '\200': + Res = *((unsigned long *)(Str + Len - sizeof(unsigned long))); + return true; + default: + return StrToNum(Str+1, Res, Len-1, 8); + } +} /*}}}*/ [...1360 lines suppressed...] + #define NI_DATAGRAM NI_DGRAM + #endif #define sockaddr_storage sockaddr_in #endif diff -uNr apt-0.6.43.3/patch_flush apt-0.6.43.3-new/patch_flush --- apt-0.6.43.3/patch_flush 1969-12-31 19:00:00.000000000 -0500 +++ apt-0.6.43.3-new/patch_flush 2006-03-11 12:27:33.000000000 -0500 @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +files=`find . -name '*.cc' -print | xargs grep -l 'flush;'` + +for i in $files ; do + sed 's/<< flush;/<< flush, fflush(NULL);/g' <$i >$i.tmp + mv $i.tmp $i +done + +exit 0 --- NEW FILE: dpkg.info --- Package: dpkg Version: 1.13.16 Revision: 11 Description: The Debian package manager License: GPL Maintainer: Fink Core Group <[EMAIL PROTECTED]> Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs Essential: yes GCC: 3.3 Source: mirror:sourceforge:fink/dpkg_%v.tar.gz SourceDirectory: dpkg-%v Source-MD5: bf16c7c5efe5025320c73c862ffeb1d3 PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1 SetCFLAGS: -no-cpp-precomp -I%p/include SetMAKEFLAGS: -j1 NoSetMAKEFLAGS: true ConfigureParams: --without-start-stop-daemon --without-sgml-doc --with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info --srcdir=%b --disable-linker-optimisations CompileScript: << %p/bin/fink -y install libgettext3-dev gettext-tools libiconv-dev libncurses5 PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c make EXEFLAGS="-force_flat_namespace -framework CoreFoundation" << InstallScript: << #!/bin/sh -ex mkdir -p %i/share/doc/dpkg make install DESTDIR=%d for lang in de es ja sv; do install -d -m 755 %i/share/man/$lang/man1 install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/ done install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink rm -rf %i/lib/dpkg/methods/* << PostInstScript: << if [ ! -f %p/var/lib/dpkg/diversions ]; then touch %p/var/lib/dpkg/diversions chmod 644 %p/var/lib/dpkg/diversions fi << Homepage: http://packages.qa.debian.org/d/dpkg.html DescDetail: << dpkg installs and removes binary packages; it is the base of the distribution. This package also contains some helper programs and dselect, a full-screen console frontend to dpkg. << DescPort: << 1.13.16 - forward-ported changes to 1.13.16 1.13.11 - forward-ported changes to 1.13.11 - md5sum was removed, had to be re-added - getopt was needed, but not automatically included, so had to be added to the Makefile.in's 1.10.9 - Removed --without-zlib flag - Gets confused about top_srcdir without the --srcdir arg. - Fixed bug with BR manpage - Patched update-rc.d out of the app check code, not needed on OS X. Pre-Jaguar: Needed fixes to use the right architecture, disable code that uses unimplemented functions on Darwin and other stuff. Added code to support the pseudo package 'macosx' and 'darwin'. Fix to install-info script to prevent a certain problem with section titles. Patched to run 'fink-virtual-pkgs' to see what packages we have outside of $prefix. Patched to suppress warning about BuildDependsOnly control field. Previous versions by Christoph Pfisterer. Patched to not remove Darwin's system-critical symlinks (/etc /tmp /var) Patched to hardcode complete paths to our component executables instead of relying on PATH << --- NEW FILE: apt.info --- Package: apt Version: 0.6.43.3 Revision: 11 Description: Advanced front-end for dpkg License: GPL Maintainer: Fink Core Group <[EMAIL PROTECTED]> Depends: apt0.6.40-shlibs (>= %v-%r), gzip, libftw0-shlibs BuildDepends: fink-prebinding, libftw0, libiconv-dev, libgettext3-dev, gettext-tools Conflicts: apt-ftparchive Replaces: apt-ftparchive GCC: 3.3 Source: mirror:sourceforge:fink/%n_%v.tar.gz Source2: http://downloads.sleepycat.com/db-4.3.29.tar.gz SourceDirectory: %n-%v Source-MD5: 7d607342ffce8ba8705ae7797cb1a15c Source2-MD5: 200b9f5d74175875fcb3ee54adbf0007 PatchScript: << #!/bin/sh -ex DISTRIBUTION=`grep -i -E '^Distribution:' %p/etc/fink.conf | awk '{ print $2 }'` sed -e 's|@PREFIX@|%p|g' -e "s|@DIST@|${DISTRIBUTION}|g" <%a/%n.patch | patch -p1 sh patch_flush for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done << SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings -g SetLIBS: -L%p/lib -undefined dynamic_lookup NoSetCPPFLAGS: true NoSetLDFLAGS: true CompileScript: << #!/bin/sh -ex export DBDIR=`pwd`/../db-4.3.28 pushd $DBDIR/build_unix LIBS="" LDFLAGS="" CFLAGS="" CXXFLAGS="" F77=no ../dist/configure --enable-static=yes --enable-shared=no make libdb.a popd export CPPFLAGS="-I$DBDIR/build_unix -I%p/include/ftw" export LDFLAGS="-L$DBDIR/build_unix" ./configure %c make -f makefile.wrap NOISY=1 GLIBC_VER= LIBSTDCPP_VER= INTLLIBS="-L%p/lib -lintl" BDBLIB="$DBDIR/build_unix/libdb.a" << InstallScript: << #!/bin/sh -ex install -d -m 755 %i/bin install -d -m 755 %i/lib install -d -m 755 %i/lib/apt/methods install -d -m 755 %i/lib/dpkg/methods/apt install -d -m 755 %i/include/apt-pkg install -d -m 755 %i/share/man/man{1,5,8} install -d -m 755 %i/etc/apt/apt.conf.d install -d -m 755 %i/var/cache/apt/archives/partial install -d -m 755 %i/var/lib/apt/lists/partial install -c -m 644 ftparchive-conf %i/etc/apt/apt.conf.d/ for binfile in cache cdrom config extracttemplates ftparchive get sortpkgs; do install -c -m 755 bin/apt-$binfile %i/bin/ done install -c -m 644 bin/libapt-pkg.0.6.40.0.dylib %i/lib/ pushd %i/lib/ && ln -s libapt-pkg.0.6.40.0.dylib libapt-pkg.0.6.40.dylib && ln -s libapt-pkg.0.6.40.0.dylib libapt-pkg.dylib && popd install -c -m 644 bin/libapt-inst.0.6.40.0.dylib %i/lib/ pushd %i/lib/ && ln -s libapt-inst.0.6.40.0.dylib libapt-inst.0.6.40.dylib && ln -s libapt-inst.0.6.40.0.dylib libapt-inst.dylib && popd for method in bin/methods/*; do install -c -m 755 $method %i/lib/apt/methods/ done for method in scripts/dselect/*; do install -c $method %i/lib/dpkg/methods/apt/ done install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/ for ext in 1 5 8; do for file in doc/*.$ext docs/*.$ext; do cp -f $file %i/share/man/man$ext/ done done << DocFiles: COPYING* AUTHORS SplitOff: << Package: apt0.6.40-shlibs Depends: dpkg, fink (>= 0.20.6-1), libgettext3-shlibs Replaces: apt-shlibs DocFiles: COPYING* AUTHORS Files: lib/lib*0.6.40*.dylib Shlibs: << %p/lib/libapt-pkg.0.6.40.dylib 0.6.40 %n (>= 0.6.40.1-1) %p/lib/libapt-inst.0.6.40.dylib 0.6.40 %n (>= 0.6.40.1-1) << << SplitOff2: << Package: apt0.6.40-dev Depends: apt0.6.40-shlibs (>= %v-%r) Conflicts: apt-dev Replaces: apt-dev Recommends: libiconv-dev, libgettext3-dev BuildDependsOnly: true DocFiles: COPYING* AUTHORS Files: lib/*.dylib include << PostInstScript: << if [ ! -f %p/var/lib/dpkg/cmethopt ]; then echo "apt apt" >%p/var/lib/dpkg/cmethopt chmod 644 %p/var/lib/dpkg/cmethopt else read a b <%p/var/lib/dpkg/cmethopt if [ "$a" != "apt" -o "$b" != "apt" ]; then echo echo "dselect is not set up to use apt as its access method. Downloading binary" echo -n "package will likely not work. Do you want to use apt instead?" read answer answer=`echo $answer | sed 's/^[yY].*$/y/'` if [ -z "$answer" -o "x$answer" = "xy" ]; then echo "apt apt" >%p/var/lib/dpkg/cmethopt chmod 644 %p/var/lib/dpkg/cmethopt fi fi fi rm -f %p/var/cache/apt/pkgcache.bin %p/var/cache/apt/srcpkgcache.bin << Homepage: http://packages.qa.debian.org/a/apt.html DescPackaging: << Previous versions by Christoph Pfisterer. We don't do anything with docbook2man even though it's detected, we just patch and install the man pages directly. << DescPort: << There are three troublemakers when porting apt: - It was written for Linux/ELF/glibc. - It was written to maintain a distribution that is in charge of the system and hardcodes paths like /usr/bin, /usr/lib and /var/lib. - There is no install target in the Makefiles because the Debian packaging files take care of what goes where. There's also the usual trouble like not recognizing Darwin and depending on a case-sensitive file system. All of this amounts to a big, bad patch. The patch also fixes some potential and some real crashing bugs. Oh, one more thing: mmap() is broken for non-trivial uses in OS X 10.1. Luckily apt uses a wrapper class that can be equipped with a workaround (malloc() + read() + write()...). The -fno-rtti works around a bug in GCC 3.1 on Jaguar. Ben Hines - added patch to make apt recognize macosx and darwin pkgs The sources.list file is now supplied by the fink program rather than by apt-get. The type of the fifth parameter for getsocklen keeps changing. The original code uses unsigned int, which was never correct for darwin, so we patch several choices. Through OS X 10.3, it was int; starting in 10.4 it is socklen_t, a symbol that first appeared in 10.3 but was an int. So starting in 10.3 we can just use socklen_t. See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=323716 dmacks - Implemented "--ignore-breakage" cmdline flag to 'apt-get install' (first appears in: 10.2-gcc3.3/0.5.4-41, 10.3/0.5.4-51) rangerrick -- Updated everything to 0.6.41, including enabling ftparchive. Be afraid! << --- NEW FILE: apt-shlibs.info --- Package: apt-shlibs Version: 0.5.4 Revision: 63 Description: Shared libraries for APT License: GPL Maintainer: Fink Core Group <[EMAIL PROTECTED]> Depends: dpkg, fink (>= 0.20.6-1), libiconv, libgettext3-shlibs BuildDepends: fink-prebinding, libiconv-dev, libgettext3-dev Replaces: apt (<= 0.5.4-1) GCC: 3.3 Source: mirror:sourceforge:fink/apt_%v.tar.gz SourceDirectory: apt-%v Source-MD5: 274fb64e2e67318b4c9c94599785c37d PatchScript: << #!/bin/sh -ex DISTRIBUTION=`grep -i -E '^Distribution:' %p/etc/fink.conf | awk '{ print $2 }'` sed -e 's|@PREFIX@|%p|g' -e "s|@DIST@|${DISTRIBUTION}|g" <%a/%n.patch | patch -p1 sh patch_flush for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done << SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings -DHAVE_SOCKLEN_T=1 NoSetCPPFLAGS: true NoSetLDFLAGS: true CompileScript: << ./configure %c make -f makefile.wrap NOISY=1 << InstallScript: << install -d -m 755 %i/lib install -d -m 755 %i/include/apt-pkg install -m 644 bin/libapt-pkg.3.2.0.dylib %i/lib/ cd %i/lib/ && ln -s libapt-pkg.3.2.0.dylib libapt-pkg.3.2.dylib && ln -s libapt-pkg.3.2.0.dylib libapt-pkg.dylib install -m 644 bin/libapt-inst.1.0.0.dylib %i/lib/ cd %i/lib/ && ln -s libapt-inst.1.0.0.dylib libapt-inst.1.0.dylib && ln -s libapt-inst.1.0.0.dylib libapt-inst.dylib install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/ << DocFiles: COPYING* AUTHORS SplitOff: << Package: apt-dev Depends: %N (>= %v-%r) Conflicts: apt0.6.40-dev Replaces: apt0.6.40-dev Recommends: libiconv-dev, libgettext3-dev BuildDependsOnly: true DocFiles: COPYING* AUTHORS Files: lib/libapt-pkg.dylib lib/libapt-inst.dylib include << Shlibs: << %p/lib/libapt-pkg.3.2.dylib 3.2.0 apt-shlibs (>= 0.5.4-24) %p/lib/libapt-inst.1.0.dylib 1.0.0 apt-shlibs (>= 0.5.4-24) << Homepage: http://packages.qa.debian.org/a/apt.html DescPackaging: Previous versions by Christoph Pfisterer. DescPort: << This is just a repackaging of apt 0.5.4-52 for just the shared libs, for backwards-compatibility purposes. The original DescPort is as follows: There are three troublemakers when porting apt: - It was written for Linux/ELF/glibc. - It was written to maintain a distribution that is in charge of the system and hardcodes paths like /usr/bin, /usr/lib and /var/lib. - There is no install target in the Makefiles because the Debian packaging files take care of what goes where. There's also the usual trouble like not recognizing Darwin and depending on a case-sensitive file system. All of this amounts to a big, bad patch. The patch also fixes some potential and some real crashing bugs. Oh, one more thing: mmap() is broken for non-trivial uses in OS X 10.1. Luckily apt uses a wrapper class that can be equipped with a workaround (malloc() + read() + write()...). The -fno-rtti works around a bug in GCC 3.1 on Jaguar. Ben Hines - added patch to make apt recognize macosx and darwin pkgs The sources.list file is now supplied by the fink program rather than by apt-get. The type of the fifth parameter for getsocklen keeps changing. The original code uses unsigned int, which was never correct for darwin, so we patch several choices. Through OS X 10.3, it was int; starting in 10.4 it is socklen_t, a symbol that first appeared in 10.3 but was an int. So starting in 10.3 we can just use socklen_t. See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=323716 dmacks - Implemented "--ignore-breakage" cmdline flag to 'apt-get install' (first appears in: 10.2-gcc3.3/0.5.4-41, 10.3/0.5.4-51) << ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits