Update of /cvsroot/fink/experimental/dazjorz/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1465
Added Files:
apt.info dpkg.info apt.patch dpkg.patch
Log Message:
Copying my apt and dpkg packages to my own experimental. First commit! Woo! :)
--- NEW FILE: dpkg.patch ---
diff -Nurd dpkg-1.15.5.6/configure dpkg-1.15.5.6-patched/configure
--- dpkg-1.15.5.6/configure 2010-01-08 19:02:47.000000000 +0100
+++ dpkg-1.15.5.6-patched/configure 2010-05-09 05:10:12.000000000 +0200
@@ -9745,11 +9745,7 @@
if test "${enable_linker_optimisations+set}" = set; then :
enableval=$enable_linker_optimisations; if test
"x$enable_linker_optimisations" = "xno"; then
LDFLAGS=$(echo "$LDFLAGS" | sed -e "s/ -Wl,-O[0-9]*\b//g")
-else
- LDFLAGS="$LDFLAGS -Wl,-O1"
fi
-else
- LDFLAGS="$LDFLAGS -Wl,-O1"
fi
diff -Nurd dpkg-1.15.5.6/dpkg-deb/build.c dpkg-1.15.5.6-patched/dpkg-deb/build.c
--- dpkg-1.15.5.6/dpkg-deb/build.c 2010-01-08 18:23:06.000000000 +0100
+++ dpkg-1.15.5.6-patched/dpkg-deb/build.c 2010-05-09 04:23:57.000000000
+0200
@@ -67,6 +67,7 @@
[...1065 lines suppressed...]
+ virt_pkg = virt_pkg->next;
+ }
+
+/*
+ if (0==strcmp(possi->ed->name,"darwin") && darwin_version.version) {
+ debug(dbg_depcondetail," pseudo package darwin");
+ found=
check_pseudo_package(&darwin_version,possi,&interestingwarnings,&oemsgs);
+ break;
+ }
+ else if (0==strcmp(possi->ed->name,"macosx") && macsox_version.version) {
+ debug(dbg_depcondetail," pseudo package macosx");
+ found=
check_pseudo_package(&macosx_version,possi,&interestingwarnings,&oemsgs);
+ break;
+ }
+*/
+ /* FINK LOCAL end */
+
if (possi->cyclebreak) {
debug(dbg_depcondetail," break cycle so ok and found");
found= 3; break;
--- NEW FILE: apt.patch ---
diff -Nurd apt-0.7.25.3/apt-inst/contrib/extracttar.cc
apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc
--- apt-0.7.25.3/apt-inst/contrib/extracttar.cc 2010-02-01 20:44:40.000000000
+0100
+++ apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc 2010-05-14
17:31:52.000000000 +0200
@@ -148,6 +148,18 @@
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 = ntohl(*((unsigned long *)(Str + Len - sizeof(unsigned long))));
+ return true;
+ default:
+ return StrToNum(Str+1, Res, Len-1, 8);
+ }
+}
+
[...1084 lines suppressed...]
+ #define NI_DATAGRAM NI_DGRAM
+ #endif
#define sockaddr_storage sockaddr_in
#endif
diff -Nurd apt-0.7.25.3/patch_flush apt-0.7.25.3-patched/patch_flush
--- apt-0.7.25.3/patch_flush 1970-01-01 01:00:00.000000000 +0100
+++ apt-0.7.25.3-patched/patch_flush 2010-05-13 23:27:54.000000000 +0200
@@ -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.15.5.6
Revision: 6
GCC: 4.0
BuildDepends: fink (>= 0.24.12), libgettext8-dev, gettext-tools
Conflicts: dpkg-bootstrap
Replaces: dpkg-bootstrap
Depends: libgettext8-shlibs, libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
Essential: yes
Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
Source:
http://snapshot.debian.org/archive/debian/20100108T213813Z/pool/main/d/dpkg/dpkg_1.15.5.6.tar.bz2
SourceDirectory: dpkg-%v
Source-MD5: 4dcb0de9af234d16a62272bcc61b8873
PatchFile: %n.patch
PatchFile-MD5: a9b7dc03bb85e68b9a66104c3a71cdbf
PatchScript: <<
cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p0
# fix paths in the manpages
perl -pi -e 's|/usr|%p|g' $(find . -name '*.1' -or -name '*.3' -or \
-name '*.5' -or -name '*.8') scripts/dpkg-name.pl;
perl -pi -e 's|/etc|%p/etc|g' $(find . -name '*.1' -or -name '*.3' -or \
-name '*.5' -or -name '*.8') scripts/update-alternatives.pl;
<<
SetCFLAGS: -I%p/include -F/System/Library/Frameworks/CoreFoundation.framework
SetLDFLAGS: -framework CoreFoundation
CompileScript: <<
PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
/usr/bin/make
<<
ConfigureParams: --without-start-stop-daemon --with-admindir=%p/var/lib/dpkg
--mandir=%p/share/man --infodir=%p/share/info --srcdir=%b --disable-silent-rules
InstallScript: <<
mkdir -p %i/share/doc/dpkg
/usr/bin/make install DESTDIR=%d
mkdir -p %i/etc/dpkg/origins
install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
rm -rf %i/lib/dpkg/methods/*
# some files that were previously installed in sbin are now in bin
# but some stuff still expects it in sbin
ln -s %i/bin/dpkg-divert %i/sbin/dpkg-divert
ln -s %i/bin/dpkg-statoverride %i/sbin/dpkg-statoverride
ln -s %i/bin/update-alternatives %i/sbin/update-alternatives
cp fink/md5sum %i/bin
chmod +x %i/bin/md5sum
# and move the Perl libraries, 'cause they are consistently installed in the
# wrong place whatever PERL_LIBDIR is
mkdir -p %i/lib/perl5
mv %d/Network/Library/Perl/*/* %i/lib/perl5
rmdir %d/Network/Library/Perl/* %d/Network/Library/Perl \
%d/Network/Library %d/Network
<<
DocFiles: <<
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS
README README.translators THANKS TODO
<<
Description: The Debian package manager
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.
<<
DescPackaging: <<
In may of 2010, version 1.10.21 which had been used by Fink since 2002, was
bumped to 1.15.5.6. Between those versions, some files were removed and some
were added. For example, 822-date, md5sum and cleanup-info were removed from
the package, and dpkg-trigger, dpkg-vendor and dpkg-gensymbols were removed.
Because 'md5sum' is often used and no longer available, this package adds
an md5sum tool in the patch. This tool, written in Perl and using the standard
Perl on OSX, does not have any dependencies apart from the 'md5' executable
installed on every OS X system.
Current dpkg also ships with some Perl libraries. These are by default
installed in lib/$PERL_VERSION, i.e. lib/5.8.8 or lib/5.10.0 depending on
OSX dist, Leopard and Snow Leopard respectively. This infofile installs
these files in lib/, so people updating from Leopard to Snow Leopard will
not get any dpkg Perl file errors.
<<
DescPort: <<
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
Patch 'dpkg -b' tar invocation to avoid warning under tar>=1.16
See: http://permalink.gmane.org/gmane.os.apple.fink.core/1281
Patch 'dpkg -b' tar invocation to not die if tar returns exit code 1.
(Exit 1 is a non-fatal error for tar; exit 2 is fatal.) patch written by vasi
Fink's make-3.81-1 breaks compiling so use Apple's to be safe.
The on-board getopt needs tweaking for darwin, but isn't needed at all
because libSystem has what dpkg needs, so just scrap it.
Remove un/misused variable in dpkg enquiry.c (solve bus error in --architecture)
Filesystem may be case-insensitive, so do case-insensitive check for
"dpkg -i" replacing files in an already-installed other package
1.15.5.6 adds a new 'md5sum' tool, see DescPackaging for more information.
Also the COPYING filename was updated to point to a Fink path, so
'dpkg --license' works correctly.
<<
#
PostInstScript: <<
if [ ! -f %p/var/lib/dpkg/diversions ]; then
touch %p/var/lib/dpkg/diversions
chmod 644 %p/var/lib/dpkg/diversions
fi
<<
License: GPL
Homepage: http://packages.qa.debian.org/d/dpkg.html
--- NEW FILE: apt.info ---
Package: apt
Version: 0.7.25.3
Revision: 2
GCC: 4.0
BuildDepends: fink (>= 0.24.12), libtool2, docbook-xsl
Depends: %N-shlibs (= %v-%r), dpkg (>= 1.15.5.6-1)
Source: http://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.25.3.tar.gz
Source-MD5: ee59a90b91764aefeb5eb0f29d5cab96
SourceDirectory: %n-%v
PatchFile: %n.patch
PatchFile-MD5: 8eab70b75b0c261ca06f7ac6206ea3bc
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
sh patch_flush
perl -pi -e 's|/usr|%p|g' doc/*.8.xml
for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi -e 's/#ifdef
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings
-DHAVE_SOCKLEN_T=1
SetLDFLAGS: -liconv
ConfigureParams: --host=%m-apple-darwin`uname -r|cut -f1 -d.`
CompileScript: <<
rm buildlib/config.guess buildlib/config.sub
ln -s %p/share/libtool/config/config.sub buildlib/config.sub
ln -s %p/share/libtool/config/config.guess buildlib/config.guess
./configure %c
#make -f makefile.wrap NOISY=1
mkdir -p build/doc/doxygen
make NOISY=1
<<
InstallScript: <<
mkdir -p %i/bin
install -m 755 bin/apt-cache %i/bin/
install -m 755 bin/apt-cdrom %i/bin/
install -m 755 bin/apt-config %i/bin/
install -m 755 bin/apt-extracttemplates %i/bin/
install -m 755 bin/apt-get %i/bin/
install -m 755 bin/apt-key %i/bin/
install -m 755 bin/apt-sortpkgs %i/bin/
install -m 755 bin/apt-mark %i/bin/
mkdir -p %i/lib
install -m 644 bin/libapt-pkg.4.8.0.dylib %i/lib
cd %i/lib/ && ln -s libapt-pkg.4.8.0.dylib libapt-pkg.4.8.dylib && \
ln -s libapt-pkg.4.8.0.dylib libapt-pkg.dylib
install -m 644 bin/libapt-inst.1.1.0.dylib %i/lib
cd %i/lib/ && ln -s libapt-inst.1.1.0.dylib libapt-inst.1.1.dylib && \
ln -s libapt-inst.1.1.0.dylib libapt-inst.dylib
mkdir -p %i/lib/apt/methods
install -m 755 bin/methods/cdrom %i/lib/apt/methods/
install -m 755 bin/methods/copy %i/lib/apt/methods/
install -m 755 bin/methods/file %i/lib/apt/methods/
install -m 755 bin/methods/ftp %i/lib/apt/methods/
install -m 755 bin/methods/gpgv %i/lib/apt/methods/
install -m 755 bin/methods/gzip %i/lib/apt/methods/
install -m 755 bin/methods/http %i/lib/apt/methods/
install -m 755 bin/methods/https %i/lib/apt/methods/
install -m 755 bin/methods/rred %i/lib/apt/methods/
install -m 755 bin/methods/rsh %i/lib/apt/methods/
cd %i/lib/apt/methods && ln -s gzip bzip2 && ln -s gzip lzma && ln -s rsh ssh
mkdir -p %i/lib/dpkg/methods/apt
install -m 644 scripts/dselect/desc.apt %i/lib/dpkg/methods/apt/
install -m 755 scripts/dselect/install %i/lib/dpkg/methods/apt/
install -m 644 scripts/dselect/names %i/lib/dpkg/methods/apt/
install -m 755 scripts/dselect/setup %i/lib/dpkg/methods/apt/
install -m 755 scripts/dselect/update %i/lib/dpkg/methods/apt/
mkdir -p %i/include/apt-pkg
cp include/apt-pkg/*.h %i/include/apt-pkg/
mkdir -p %i/share/man
mkdir -p %i/share/man/man1
mkdir -p %i/share/man/man5
mkdir -p %i/share/man/man8
install -m 644 doc/*.1 %i/share/man/man1/
install -m 644 doc/*.5 %i/share/man/man5/
install -m 644 doc/*.8 %i/share/man/man8/
mkdir -p %i/etc/apt/apt.conf.d
cp fink/fink_unauthenticated.conf %i/etc/apt/apt.conf.d
mkdir -p %i/etc/apt/preferences.d
mkdir -p %i/etc/apt/sources.list.d
mkdir -p %i/var/cache/apt/archives/partial
mkdir -p %i/var/lib/apt/lists/partial
mkdir -p %i/var/log/apt
<<
SplitOff: <<
Package: %N-shlibs
Depends: dpkg (>= 1.15.5.6-1), fink (>= 0.24.12)
Files: <<
lib/libapt-inst.1.1.dylib lib/libapt-inst.1.1.0.dylib
lib/libapt-pkg.4.8.dylib lib/libapt-pkg.4.8.0.dylib
<<
Shlibs: <<
%p/lib/libapt-inst.1.1.dylib 1.1.0 %n (>= 0.7.25.3-1)
%p/lib/libapt-pkg.4.8.dylib 4.8.0 %n (>= 0.7.25.3-1)
<<
DocFiles: COPYING* AUTHORS README.*
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Files: lib/libapt-inst.dylib lib/libapt-pkg.dylib include
DocFiles: COPYING* AUTHORS README.*
<<
DocFiles: COPYING* AUTHORS README.*
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
/bin/echo ""
/bin/echo "dselect is not set up to use apt as its access method.
Downloading binary"
/bin/echo "packages will likely not work. Do you want to use apt instead?\c"
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
<<
#
Description: Advanced front-end for dpkg
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.
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)
Patch extracttar.cc so it understands negative UIDs, such as -2 for 'nobody'.
Sjors - __deprecated is already defined in sys/cdefs.h. MAP_ANONYMOUS is called
MAP_ANON on Mac. strdupa() doesn't exist on Mac, so use strdup() instead and
free everything ourselves. memrchr() doesn't exist on Mac, so add a public
domain implementation. sighandler_t is called sig_t on Mac.
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer. Version 0.7.25.3 by Sjors Gielen.
Raise cachesize limit. See:
http://permalink.gmane.org/gmane.os.apple.fink.core/2025
config.sub and config.guess are symlinks to /usr/share/misc. This path does
not contain these files on a standard Mac installation. This package links
them to the right files, provided by libtool2 (not libtool14, those files are
older and in different places). Therefore, this package build-depends on
libtool2, but does not depend on libtool2-shlibs.
Sjors - The TODO in libversion.mak regarding the ABI break after libc6.9-6,
doesn't apply on Mac, so remove the LIBEXT.
Sjors - APT now supports GPG, so use the correct paths for the trustdb's too.
Because Fink doesn't cryptosign any of its packages at this moment, ignore
authentication errors because of unsigned packages. Hopefully we can enable it
again as soon as possible.
Sjors - IssuerCert and CrlFile require a version of Curl that is in 10.6, but
not in 10.5. Therefore, IssuerCert and CrlFile support are only compiled in on
platforms where the CURLOPTs are defined. Also, add a WARNING to the docs.
Sjors - Fix docs, since docbook.xsl is in another location on Mac. Also depend
on docbook-xsl to create the documentation.
<<
License: GPL
Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
Homepage: http://packages.qa.debian.org/a/apt.html
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
