diff options
author | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2006-07-31 20:45:44 +0000 |
---|---|---|
committer | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2006-07-31 20:45:44 +0000 |
commit | 3ae891bbbaa3f96365f4c9fbe49e5cee26183fbc (patch) | |
tree | 59f0163f13e99eefb959385243c564c5662bc5c2 /patches | |
download | slackbuilds-3ae891bbbaa3f96365f4c9fbe49e5cee26183fbc.tar.gz slackbuilds-3ae891bbbaa3f96365f4c9fbe49e5cee26183fbc.tar.bz2 |
initial import
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'patches')
81 files changed, 7380 insertions, 0 deletions
diff --git a/patches/apache/_apache.tar.gz b/patches/apache/_apache.tar.gz Binary files differnew file mode 100644 index 00000000..9243ce41 --- /dev/null +++ b/patches/apache/_apache.tar.gz diff --git a/patches/apache/apache.SlackBuild b/patches/apache/apache.SlackBuild new file mode 100755 index 00000000..07c8e84b --- /dev/null +++ b/patches/apache/apache.SlackBuild @@ -0,0 +1,215 @@ +#!/bin/bash +# +# Build and package an EAPI-enabled Apache on Slackware. +# (libmm is also installed with this package) +# by: David Cantrell <david@slackware.com> +# Maintained by: Patrick Volkerding <volkerdi@slackware.com> +# Small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +APACHE_VER=${APACHE_VER:=1.3.37} +MM_VER=${MM_VER:=1.3.1} +MODSSL_VER=${MODSSL_VER:=2.8.28-1.3.37} + +PACKAGE="apache" +ARCH=${ARCH:=i486} +BUILD=${BUILD:=1rha} +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} +REPOS=${REPOS:=$TMP} + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +RTOOL="wget" +PACKAGE_EXT="gz" +SRC="$PACKAGE"_"$APACHE_VER.tar.$PACKAGE_EXT" +URL="http://ftp.unicamp.br/pub/apache/httpd/$SRC" +MM="mm-$MM_VER.tar.gz" +MM_URL="ftp://ftp.ossp.org/pkg/lib/mm/$MM" +MODSSL="mod_ssl-$MODSSL_VER.tar.gz" +MODSSL_URL="http://www.modssl.org/source/$MODSSL" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +SRC_DIR="$SRC_DIR/$PACKAGE" +mkdir -p $SRC_DIR + +if [ "$RTOOL" == "wget" ]; then + + if [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" + fi + + if [ ! -f "$SRC_DIR/$MM" ]; then + wget "$MM_URL" -O "$SRC_DIR/$MM" + fi + + if [ ! -f "$SRC_DIR/$MODSSL" ]; then + wget "$MODSSL_URL" -O "$SRC_DIR/$MODSSL" + fi + +fi + +TMP="$TMP/$PACKAGE" +rm -rf $TMP +mkdir -p $TMP +cd $TMP + +PKG=$TMP/package-$PACKAGE +mkdir -p $PKG +( cd $PKG ; explodepkg $CWD/_apache.tar.gz ) + +cd $TMP +rm -rf mm-$MM_VER apache_$APACHE_VER mod_ssl-$MODSSL_VER +tar xvzf $SRC_DIR/$MM +tar xvzf $SRC_DIR/$SRC +tar xvzf $SRC_DIR/$MODSSL + +# build libmm +cd $TMP/mm-$MM_VER +chown -R root.root . +./configure \ + --prefix=/usr \ + --enable-static \ + --libdir=$LIBDIR \ + --enable-shared +make -j3 + +# EAPI is not part of Apache by default, it comes from mod_ssl. It +# allows us to build and package mod_ssl seperately. We pull out the +# EAPI patch and apply it to Apache so that our build will have that +# support enabled. We also apply a few other patches from mod_ssl. +( cd $TMP/apache_$APACHE_VER + cat $TMP/mod_ssl-$MODSSL_VER/pkg.eapi/eapi.patch | patch -p0 + cat $TMP/mod_ssl-$MODSSL_VER/pkg.addon/addon.patch | patch -p0 ) +( cd $TMP/mod_ssl-$MODSSL_VER/pkg.eapi + cp -a *.h $TMP/apache_$APACHE_VER/src/include + cp -a *.c $TMP/apache_$APACHE_VER/src/ap ) +( cd $TMP/mod_ssl-$MODSSL_VER/pkg.addon + cp -a *.c $TMP/apache_$APACHE_VER/src/modules/extra + cp -a *.html $TMP/apache_$APACHE_VER/htdocs/manual/mod ) + +# build apache +cd $TMP/apache_$APACHE_VER +# Stop using old obsolete DB1. +zcat $CWD/apache.dbm.diff.gz | patch -p1 --verbose || exit 1 + +if [ "$APACHE_VER" == "1.3.35" ]; then + # Clearly 1.3.35 got minimal testing... + zcat $CWD/apache_1.3.35.stupid.include.bug.diff.gz | patch -p1 --verbose || exit 1 +fi + +chown -R root.root . +cat $CWD/config.layout.slack >> config.layout +EAPI=SYSTEM \ +./configure \ + --with-layout=Slackware \ + --enable-module=most \ + --enable-shared=max \ + --manualdir=/var/www/htdocs/manual \ + --enable-rule=eapi +make -j3 + +# install libmm +cd $TMP/mm-$MM_VER +make DESTDIR=$PKG install +chmod 755 $PKG/usr/lib/libmm.so.* +mkdir -p $PKG/usr/doc/mm-$MM_VER +cp -a \ + ChangeLog INSTALL LICENSE PORTING README THANKS \ + $PKG/usr/doc/mm-$MM_VER + +# install apahe +cd $TMP/apache_$APACHE_VER +make install root=$PKG +mkdir -p $PKG/usr/doc/apache-$APACHE_VER +cp -a \ + ABOUT_APACHE Announcement INSTALL KEYS LICENSE README README.configure \ + $PKG/usr/doc/apache-$APACHE_VER +cp -a \ + $TMP/mod_ssl-$MODSSL_VER/pkg.eapi/README.EAPI \ + $PKG/usr/doc/apache-$APACHE_VER + +# we do not want these in the package, if they don't exist on the system +# then we copy the default one in place as the real file +( cd $PKG/etc/apache + rm -rf access.conf httpd.conf magic mime.types srm.conf ) + +# we add a block to the end of httpd.conf and touch zero length files +# for the SSL and PHP module packages +cat << EOF >> $PKG/etc/apache/httpd.conf.default + +# By default, all external Apache modules are disabled. To enable a particular +# module for Apache, make sure the necessary packages are installed. Then +# uncomment the appropriate Include line below, save the file, and restart +# Apache. Note that some modules may need additional configuration steps. For +# example, mod_ssl requires a site certificate which you may need to generate. +# +# Lastly, if you remove a module package, be sure to edit this file and comment +# out the appropriate Include line. + +# ==> mod_php configuration settings <== +# +# PACKAGES REQUIRED: openssl-solibs (A series) and/or openssl (N series), +# mysql (AP series), gmp (L series), mhash (L series), +# and apache (N series) +# +#Include /etc/apache/mod_php.conf + +# ==> mod_ssl configuration settings <== +# +# PACKAGES REQUIRED: apache (N series) and openssl (N series) +# +#Include /etc/apache/mod_ssl.conf + +EOF + +# some housekeeping +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) +gzip -9 $PKG/usr/man/*/* +chown -R root.bin $PKG/usr/bin +chown -R root.bin $PKG/usr/sbin + +# This is a point of overlap with the mod_ssl package, so we'll make it +# a symlink so that it's less of a trap for the unsuspecting admin: +( cd $PKG/usr/sbin + mv apachectl apachectl-standard + # Better to use some custom code in doinst.sh. + #ln -sf apachectl-standard apachectl +) + +# Add slack-desc: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# make the package +cd $PKG +makepkg -l y -c n $REPOS/apache-$APACHE_VER-$ARCH-$BUILD.tgz + +# clean up +if [ "$1" = "--cleanup" ]; then + cd $CWD + rm -rf $TMP + rm -rf $PKG +fi diff --git a/patches/apache/apache.dbm.diff.gz b/patches/apache/apache.dbm.diff.gz Binary files differnew file mode 100644 index 00000000..aad1ee0c --- /dev/null +++ b/patches/apache/apache.dbm.diff.gz diff --git a/patches/apache/apache_1.3.35.stupid.include.bug.diff.gz b/patches/apache/apache_1.3.35.stupid.include.bug.diff.gz Binary files differnew file mode 100644 index 00000000..9a38f518 --- /dev/null +++ b/patches/apache/apache_1.3.35.stupid.include.bug.diff.gz diff --git a/patches/apache/config.layout.slack b/patches/apache/config.layout.slack new file mode 100644 index 00000000..e40a1bbd --- /dev/null +++ b/patches/apache/config.layout.slack @@ -0,0 +1,19 @@ +# Layout for Slackware Linux +<Layout Slackware> + prefix: /usr + exec_prefix: $prefix + bindir: $exec_prefix/bin + sbindir: $exec_prefix/sbin + libexecdir: $exec_prefix/libexec/apache + mandir: $prefix/man + sysconfdir: /etc/apache + datadir: /var/www + iconsdir: $datadir/icons + htdocsdir: $datadir/htdocs + cgidir: $datadir/cgi-bin + includedir: $prefix/include/apache + localstatedir: /var + runtimedir: $localstatedir/run + logfiledir: $localstatedir/log/apache + proxycachedir: $localstatedir/cache/proxy +</Layout> diff --git a/patches/apache/slack-desc b/patches/apache/slack-desc new file mode 100644 index 00000000..515121c8 --- /dev/null +++ b/patches/apache/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +apache: apache (The Apache HTTP Server) +apache: +apache: Apache is an HTTP server designed as a plug-in replacement for the +apache: NCSA HTTP server. It fixes numerous bugs in the NCSA server and +apache: includes many frequently requested new features, and has an API which +apache: allows it to be extended to meet users' needs more easily. +apache: +apache: Apache is the most popular web server in the known universe; over +apache: half of the servers on the Internet are running Apache or one of +apache: its variants. +apache: diff --git a/patches/bin/bin.SlackBuild b/patches/bin/bin.SlackBuild new file mode 100755 index 00000000..12c7c8c2 --- /dev/null +++ b/patches/bin/bin.SlackBuild @@ -0,0 +1,444 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/bin/bin.SlackBuild +# small changes by rhatto +# + +# Set initial variables: + +CWD="`pwd`" + +VERSION=10.2 +ARCH=${ARCH:=x86_64} +BUILD="1rha" +SRC_DIR=${SRC:=$CWD} + +DUTILS=2.7 +DOSFS=2.10 +WHICH=2.16 +EJECT=2.1.4 +FILE=4.15 + +TMP=${TMP:=/tmp} +PKG=$TMP/package-bin + +rm -rf $PKG +mkdir -p $SRC_DIR +# REPO="ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/bin" +REPO="ftp://mirror.pacific.net.au/linux/slackware/slackware-10.2/patches/source/bin" +if [ "$GET" != "no" ]; then ( cd $SRC_DIR && ncftpget $REPO/*gz ) ; fi + +if [ ! -d $TMP ]; then + mkdir -p $TMP # location to build the source +fi +if [ ! -d $PKG ]; then + mkdir -p $PKG # place for the package to be built +fi + +if [ "$ARCH" == "x86_64" ]; then + LIB="lib64" +else + LIB="lib" +fi + +# Explode the package framework: +cd $PKG +explodepkg $SRC_DIR/_bin.tar.gz + +echo "+=============+" +echo "| debianutils |" +echo "+=============+" +cd $TMP +tar xzvf $SRC_DIR/debianutils_$DUTILS.tar.gz +cd debianutils-$DUTILS +chown -R root.root . +./configure --prefix=/usr +make +## We actually use our own very simple run-parts script instead... +#cat run-parts > $PKG/usr/bin/run-parts +#cat run-parts.8 | gzip -9c > $PKG/usr/man/man8/run-parts.8.gz +cat mktemp > $PKG/usr/bin/mktemp +cat mktemp.1 | gzip -9c > $PKG/usr/man/man1/mktemp.1.gz +cat savelog > $PKG/usr/bin/savelog +cat savelog.8 | gzip -9c > $PKG/usr/man/man8/savelog.8.gz +cat tempfile > $PKG/usr/bin/tempfile +cat tempfile.1 | gzip -9c > $PKG/usr/man/man1/tempfile.1.gz + +echo "+=======+" +echo "| eject |" +echo "+=======+" +cd $TMP +rm -rf eject +tar xzvf $SRC_DIR/eject-$EJECT.tar.gz +cd eject +chown -R root:root . +if [ "$ARCH" == "x86_64" ]; then + zcat $CWD/eject-x86_64.diff.gz | patch -p1 --verbose +fi +CFLAGS= ./configure --prefix=/usr +make +cat eject > $PKG/usr/bin/eject +cat eject.1 | gzip -9c > $PKG/usr/man/man1/eject.1.gz +cat volname > $PKG/usr/bin/volname +cat volname.1 | gzip -9c > $PKG/usr/man/man1/volname.1.gz +mkdir -p $PKG/usr/doc/eject-$EJECT +cp -a AUTHORS COPYING NEWS PORTING PROBLEMS README TODO eject-$EJECT.lsm \ + $PKG/usr/doc/eject-$EJECT +chmod 644 $PKG/usr/doc/eject-$EJECT/* + +echo "+===========+" +echo "| fbset-2.1 |" +echo "+===========+" +cd $TMP +tar xzvf $SRC_DIR/fbset-2.1.tar.gz +cd fbset-2.1 +chown -R root.root . +make +mkdir -p $PKG/usr/sbin +cat fbset > $PKG/usr/sbin/fbset +chmod 755 $PKG/usr/sbin/fbset +mkdir -p $PKG/etc +cat etc/fb.modes.ATI > $PKG/etc/fb.modes +mkdir -p $PKG/usr/man/man5 +cat fb.modes.5 | gzip -9c > $PKG/usr/man/man5/fb.modes.5.gz +mkdir -p $PKG/usr/man/man8 +cat fbset.8 | gzip -9c > $PKG/usr/man/man8/fbset.8.gz + +echo "+===========+" +echo "| lha-1.14i |" +echo "+===========+" +cd $TMP +tar xzvf $SRC_DIR/lha-114i.tar.gz +cd lha-114i +zcat $SRC_DIR/lha-114i-sec.patch.gz | patch -p1 --verbose +zcat $SRC_DIR/lha-114i-symlink.patch.gz | patch -p1 --verbose +chown -R root.root . +make +cat src/lha > $PKG/usr/bin/lha + +echo "+========+" +echo "| ed-0.2 |" +echo "+========+" +cd $TMP +tar xzvf $SRC_DIR/ed-0.2.tar.gz +cd ed-0.2 +chown -R root.root . +zcat $SRC_DIR/ed-0.2.mkstemp.diff.gz | patch -p1 -E --backup --verbose +CFLAGS=-O2 \ +./configure \ + --prefix=/usr \ + $ARCH-slackware-linux +make +cat ed > $PKG/bin/ed +cat ed.1 | gzip -9c > $PKG/usr/man/man1/ed.1.gz +cat ed.info | gzip -9c > $PKG/usr/info/ed.info.gz + +echo "+==========+" +echo "| compress |" +echo "+==========+" +cd $TMP +tar xzvf $SRC_DIR/compress.tar.gz +cd compress +chown -R root.root . +zcat $SRC_DIR/compress.diff.gz | patch -p0 -E --backup --verbose +if [ "$ARCH" == "x86_64" ]; then + echo 450000 > USERMEM # the default from the source file +fi +make +cat compress > $PKG/usr/bin/compress +cat compress.1 | gzip -9c > $PKG/usr/man/man1/compress.1.gz +echo '.so man1/compress.1' | gzip -9c > $PKG/usr/man/man1/uncompress.1.gz + +echo "+=========+" +echo "| banners |" +echo "+=========+" +cd $TMP +tar xzvf $SRC_DIR/banners.tar.gz +cd banners +chown -R root.root . +make +cat bban > $PKG/usr/bin/bban +cat sysvbanner > $PKG/usr/bin/sysvbanner + +echo "+===========+" +echo "| file-$FILE |" +echo "+===========+" +cd $TMP +tar xzvf $SRC_DIR/file-$FILE.tar.gz +cd file-$FILE +chown -R root.root . +zcat $SRC_DIR/file.quiet.diff.gz | patch -p1 -E --verbose +zcat $SRC_DIR/file.short.diff.gz | patch -p1 -E --verbose +zcat $SRC_DIR/file.rzip.magic.gz >> magic/Magdir/compress +zcat $SRC_DIR/file.zisofs.magic.gz >> magic/Magdir/compress +./configure \ + --prefix=/usr \ + --libdir=/usr/$LIB \ + --sysconfdir=/etc \ + --datadir=/etc \ + --enable-fsect-man5 \ + --enable-shared=no \ + $ARCH-slackware-linux +make +make install DESTDIR=$PKG +# Is file really this much of a processing bottleneck? Doubtful. +rm -f $PKG/etc/file/magic.mgc $PKG/etc/file/magic.mime.mgc +strip -g $PKG/usr/$LIB/libmagic.a +mkdir -p $PKG/usr/doc/file-$FILE +cp -a \ + LEGAL.NOTICE README \ + $PKG/usr/doc/file-$FILE +chmod 644 $PKG/usr/doc/file-$FILE/* +gzip -9 $PKG/usr/man/man1/file.1 \ + $PKG/usr/man/man3/libmagic.3 \ + $PKG/usr/man/man5/magic.5 +# /etc/magic has been traditional for so long that it seems like a +# real good idea to provide a link: +( cd $PKG/etc + ln -sf file/magic magic +) + +echo "+============+" +echo "| dosfstools |" +echo "+============+" +cd $TMP +tar xzvf $SRC_DIR/dosfstools-$DOSFS.tar.gz +cd dosfstools-$DOSFS +if [ "$ARCH" == "x86_64" ]; then zcat $CWD/dosfstools-x86_64.diff.gz | patch -p1 --verbose; fi +chown -R root.root . +mkdir -p $PKG/usr/doc/dosfstools-$DOSFS +cp -a CHANGES README.Atari TODO $PKG/usr/doc/dosfstools-$DOSFS +mkdir -p $PKG/usr/doc/dosfstools-$DOSFS/mkdosfs +( cd mkdosfs ; cp -a ANNOUNCE COPYING ChangeLog README mkdosfs-ygg-0.3b.lsm $PKG/usr/doc/dosfstools-$DOSFS/mkdosfs ) +mkdir -p $PKG/usr/doc/dosfstools-$DOSFS/dosfsck +( cd dosfsck ; cp -a CHANGES COPYING README $PKG/usr/doc/dosfstools-$DOSFS/dosfsck ) +make +cd mkdosfs +cat mkdosfs > $PKG/sbin/mkdosfs +cat mkdosfs.8 | gzip -9c > $PKG/usr/man/man8/mkdosfs.8.gz +cd ../dosfsck +cat dosfsck > $PKG/sbin/dosfsck +cat dosfsck.8 | gzip -9c > $PKG/usr/man/man8/dosfsck.8.gz + +echo "+=============+" +echo "| patch-2.5.4 |" +echo "+=============+" +cd $TMP +tar xzvf $SRC_DIR/patch-2.5.4.tar.gz +cd patch-2.5.4 +chown -R root.root . +mkdir -p $PKG/usr/doc/patch-2.5.4 +cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/patch-2.5.4 +chmod 644 $PKG/usr/doc/patch-2.5.4/* +./configure \ + --prefix=/usr \ + $ARCH-slackware-linux +make CFLAGS=-O2 +cat patch > $PKG/usr/bin/patch +cat patch.man | gzip -9c > $PKG/usr/man/man1/patch.1.gz + +echo "+===========+" +echo "| rpm2targz |" +echo "+===========+" +cd $TMP +cc -o rpmoffset $CWD/rpmoffset.c +cat rpmoffset > $PKG/usr/bin/rpmoffset +rm rpmoffset +cat $CWD/rpm2targz > $PKG/usr/bin/rpm2targz +mkdir -p $PKG/usr/doc/rpm2targz +cp -a $CWD/rpm2targz.README $PKG/usr/doc/rpm2targz/rpm2targz.README +chmod 644 $PKG/usr/doc/rpm2targz/rpm2targz.README + +echo "+===========+" +echo "| run-parts |" +echo "+===========+" +zcat $SRC_DIR/run-parts.gz > $PKG/usr/bin/run-parts +chmod 755 $PKG/usr/bin/run-parts +cat $SRC_DIR/run-parts.8.gz > $PKG/usr/man/man8/run-parts.8.gz + +echo "+=================+" +echo "| sharutils-4.2.1 |" +echo "+=================+" +cd $TMP +tar xzvf $SRC_DIR/sharutils-4.2.1.tar.gz +cd sharutils-4.2.1 +chown -R root.root . +mkdir -p $PKG/usr/doc/sharutils-4.2.1 +cp -a ABOUT-NLS AUTHORS BACKLOG COPYING INSTALL NEWS README \ + README.OLD THANKS TODO $PKG/usr/doc/sharutils-4.2.1 +chmod 644 $PKG/usr/doc/sharutils-4.2.1/* +# For now, NLS seems to cause build errors on this one... +CFLAGS=-O2 \ +./configure \ + --disable-nls \ + --prefix=/usr \ + $ARCH-slackware-linux +make +cd src +cat shar > $PKG/usr/bin/shar +cat unshar > $PKG/usr/bin/unshar +cat uuencode > $PKG/usr/bin/uuencode +cat uudecode > $PKG/usr/bin/uudecode +cd ../doc +cat sharutils.info | gzip -9c > $PKG/usr/info/sharutils.info.gz +# Include old manpages, since the source package doesn't have them anymore: +for page in shar.1.gz unshar.1.gz uuencode.1.gz ; do + cat $SRC_DIR/$page > $PKG/usr/man/man1/$page +done +echo '.so man1/uuencode.1' | gzip -9c > $PKG/usr/man/man1/uudecode.1.gz +cat $SRC_DIR/uuencode.5.gz > $PKG/usr/man/man5/uuencode.5.gz + +echo "+===============+" +echo "| splitvt-1.6.5 |" +echo "+===============+" +cd $TMP +rm -rf splitvt-1.6.5 +tar xzvf $SRC_DIR/splitvt-1.6.5.tar.gz +cd splitvt-1.6.5 +zcat $SRC_DIR/splitvt.devpts.diff.gz | patch -p1 --verbose +chown -R root.root . +./configure +make +cat splitvt > $PKG/usr/bin/splitvt +cat splitvt.1 | gzip -9c > $PKG/usr/man/man1/splitvt.1.gz +mkdir -p $PKG/usr/doc/splitvt-1.6.5 +cp -a examples ANNOUNCE CHANGES NOTES README TODO \ + $PKG/usr/doc/splitvt-1.6.5 +( cd $PKG/usr/doc/splitvt-1.6.5 + find . -type d | xargs chmod 755 + find . -type f | xargs chmod 644 ) + +echo "+==========+" +echo "| time-1.7 |" +echo "+==========+" +cd $TMP +tar xvzf $SRC_DIR/time-1.7.tar.gz +cd time-1.7 +chown -R root.root . +./configure \ + --prefix=/usr \ + $ARCH-slackware-linux +make CFLAGS=-O2 +cat time > $PKG/usr/bin/time +cat time.info | gzip -9c > $PKG/usr/info/time.info.gz + +echo "+===============+" +echo "| todos/fromdos |" +echo "+===============+" +cd $TMP +tar xzvf $SRC_DIR/todos.tar.gz +cd todos +chown -R root.root . +make +cat todos > $PKG/usr/bin/todos +cat fromdos > $PKG/usr/bin/fromdos +cat todos.1.gz > $PKG/usr/man/man1/todos.1.gz +cat fromdos.1.gz > $PKG/usr/man/man1/fromdos.1.gz + +echo "+============+" +echo "| tree-1.4b3 |" +echo "+============+" +cd $TMP +tar xzvf $SRC_DIR/tree-1.4b3.tar.gz +cd tree-1.4 +if [ "$ARCH" == "x86_64" ]; then zcat $CWD/tree-x86_64.diff.gz | patch -p1 --verbose; fi +chown -R root.root . +make clean +make +cat tree > $PKG/usr/bin/tree +chmod 755 $PKG/usr/bin/tree +cat tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz +mkdir -p $PKG/usr/doc/tree-1.4b3 +cp -a CHANGES LICENSE README README.sacl $PKG/usr/doc/tree-1.4b3 +chmod 644 $PKG/usr/doc/tree-1.4b3/* + +echo "+==========+" +echo "| unarj230 |" +echo "+==========+" +cd $TMP +tar xzvf $SRC_DIR/unarj230.tar.gz +cd unarj230 +chown -R root.root . +zcat $SRC_DIR/unarj230.diff.gz | patch -p0 -E --verbose --backup +make +cat unarj > $PKG/usr/bin/unarj + +echo "+============+" +echo "| which-$WHICH |" +echo "+============+" +cd $TMP +tar xzvf $SRC_DIR/which-$WHICH.tar.gz +cd which-$WHICH +chown -R root.root . +./configure --prefix=/usr +make CFLAGS=-O2 +cat which > $PKG/bin/which +cat which.1 | gzip -9c > $PKG/usr/man/man1/which.1.gz +cat which.info | gzip -9c > $PKG/usr/info/which.info.gz +mkdir -p $PKG/usr/doc/which-$WHICH +cp -a AUTHORS COPYING EXAMPLES INSTALL NEWS README README.alias $PKG/usr/doc/which-$WHICH + +echo "+==========+" +echo "| zoo-2.10 |" +echo "+==========+" +cd $TMP +rm -rf zoo-2.10 +tar xzvf $SRC_DIR/zoo-2.10.tar.gz +cd zoo-2.10 +chown -R root:root . +zcat $SRC_DIR/zoo_2.10-17.diff.gz | patch -p1 -E --verbose --backup || exit 1 +for diff in debian/patches/*.dpatch ; do + cat $diff | patch -p1 --verbose || exit 1 +done +if [ "$ARCH" == "x86_64" ]; then zcat $CWD/zoo-x86_64.diff.gz | patch -p1 --verbose; fi +make linux +cat fiz > $PKG/usr/bin/fiz +cat zoo > $PKG/usr/bin/zoo +for page in fiz.1 zoo.1 ; do + cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz +done + +# Add a very handy tool for scanning new SCSI devices. Most useful for +# finding new USB and Firewire storage devices which show up as SCSI. +cp -a $CWD/rescan-scsi-bus $PKG/sbin/rescan-scsi-bus +chmod 755 $PKG/sbin/rescan-scsi-bus + +# Strip everything for good measure: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +chown -R root.bin $PKG/bin $PKG/usr/bin $PKG/sbin $PKG/usr/sbin + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/bin-$VERSION-$ARCH-$BUILD.tgz + +# Clean up the extra stuff: +if [ "$1" = "--cleanup" ]; then + rm -rf $TMP/pwd + rm -rf $TMP/ed-0.2 + rm -rf $TMP/banners + rm -rf $TMP/debianutils-$DUTILS + rm -rf $TMP/eject-$EJECT + rm -rf $TMP/fbset-2.1 + rm -rf $TMP/file-$FILE + rm -rf $TMP/gencat + rm -rf $TMP/lha-1.00 + rm -rf $TMP/dosfstools-$DOSFS + rm -rf $TMP/patch-2.5.4 + rm -rf $TMP/sharutils-4.2.1 + rm -rf $TMP/time-1.7 + rm -rf $TMP/todos + rm -rf $TMP/unarj230 + rm -rf $TMP/which-$WHICH + rm -rf $TMP/zoo-2.10 + rm -rf $TMP/compress + rm -rf $TMP/splitvt-1.6.5 + rm -rf $TMP/tree-1.4 + rm -rf $PKG +fi diff --git a/patches/bin/debianutils_2.7.dsc b/patches/bin/debianutils_2.7.dsc new file mode 100644 index 00000000..25a643a7 --- /dev/null +++ b/patches/bin/debianutils_2.7.dsc @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +Format: 1.0 +Source: debianutils +Version: 2.7 +Binary: debianutils +Maintainer: Clint Adams <schizo@debian.org> +Architecture: any +Standards-Version: 3.6.1 +Files: + e966d93a3ee20068197104049ebd7d70 165590 debianutils_2.7.tar.gz + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.4 (GNU/Linux) +Comment: Debian! + +iD8DBQFAO4b85m0u66uWM3ARAotWAKCE/B4HoDVZ5rHi4AISWwHO59cEgwCgqQ6d +Rt+5nuJdAgkcQgKDQu52RwI= +=2QDD +-----END PGP SIGNATURE----- diff --git a/patches/bin/dosfstools-x86_64.diff.gz b/patches/bin/dosfstools-x86_64.diff.gz Binary files differnew file mode 100644 index 00000000..1b4c48fe --- /dev/null +++ b/patches/bin/dosfstools-x86_64.diff.gz diff --git a/patches/bin/eject-x86_64.diff.gz b/patches/bin/eject-x86_64.diff.gz Binary files differnew file mode 100644 index 00000000..fbee7500 --- /dev/null +++ b/patches/bin/eject-x86_64.diff.gz diff --git a/patches/bin/rescan-scsi-bus b/patches/bin/rescan-scsi-bus new file mode 100644 index 00000000..f1745bd9 --- /dev/null +++ b/patches/bin/rescan-scsi-bus @@ -0,0 +1,119 @@ +#!/bin/sh +# Skript to rescan SCSI bus, using the +# scsi add-single-device mechanism +# (w) 98/03/19 Kurt Garloff <kurt@garloff.de> (c) GNU GPL + +# This script is useful for automatically scanning for new +# USB and IEEE1394 devices which will not show up automatically +# if they use a LUN (logical unit number) other than 0. +# To search all LUNS for new devices to enable, run like this: +# +# rescan-scsi-bus -l + +found=0 +rmvd=0 + +# Return hosts. /proc/scsi/HOSTADAPTER/? must exist +findhosts() { + hosts= + for name in /proc/scsi/*/?; do + name=${name#/proc/scsi/} + if test ! $name = scsi ; then + hosts="$hosts ${name#*/}" + echo "Host adapter ${name#*/} (${name%/*}) found." + fi + done +} + +# Test if SCSI device $host $channen $id $lun exists +# Outputs description from /proc/scsi/scsi, returns new +testexist() { + grepstr="scsi$host Channel: 0$channel Id: 0*$id Lun: 0$lun" + new=`cat /proc/scsi/scsi | grep -e "$grepstr"` + if test ! -z "$new" ; then + cat /proc/scsi/scsi | grep -e "$grepstr" + cat /proc/scsi/scsi | grep -A2 -e "$grepstr" | tail -n 2 + fi +} + +# Perform search (scan $host) +dosearch() { + for channel in $channelsearch; do + for id in $idsearch; do + for lun in $lunsearch; do + new= + devnr="$host $channel $id $lun" + echo "Scanning for device $devnr ..." + printf "OLD: " + testexist + if test ! -z "$remove" -a ! -z "$new" ; then + echo "scsi remove-single-device $devnr" > /proc/scsi/scsi + echo "scsi add-single-device $devnr" > /proc/scsi/scsi + printf "\r\x1b[A\x1b[A\x1b[AOLD: " + testexist + if test -z "$new"; then + printf "\rDEL: \r\n\n\n\n" + rmvd=$(($rmvd+1)) + fi + fi + if test -z "$new" ; then + printf "\rNEW: " + echo "scsi add-single-device $devnr" > /proc/scsi/scsi + testexist + if test -z "$new"; then + printf "\r\x1b[A" + else + found=$(($found+1)) + fi + fi + done + done + done +} + + +# main +if test @$1 = @--help -o @$1 = @-h ; then + echo "Usage: rescan-scsi-bus.sh [-l] [-w] [-c] [host [host ...]]" + echo " -l activates scanning for LUNs 0 .. 7 [default: 0]" + echo " -w enables scanning for device IDs 0 .. 15 [def.: 0 .. 7]" + echo " -r enables removing of devices [default: disabled]" + echo " -c enables scanning of channels 0 1 [default: 0]" + echo " If hosts are given, only these are scanned [default: all]" + exit 0 +fi + +# defaults +lunsearch="0" +idsearch="0 1 2 3 4 5 6 7" +channelsearch="0" +remove="" + +# Scan options +opt="$1" +while test ! -z "$opt" -a -z "${opt##-*}"; do + opt=${opt#-} + case "$opt" in + l) lunsearch="0 1 2 3 4 5 6 7" ;; + w) idsearch="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15" ;; + c) channelsearch="0 1" ;; + r) remove=1 ;; + *) echo "Unknown option -$opt !" ;; + esac + shift + opt="$1" +done + +# Hosts given ? +if test @$1 = @; then + findhosts +else + hosts=$* +fi + +for host in $hosts; do + dosearch +done +echo "$found new device(s) found. " +echo "$rmvd device(s) removed. " + diff --git a/patches/bin/rpm2targz b/patches/bin/rpm2targz new file mode 100644 index 00000000..4df00d7c --- /dev/null +++ b/patches/bin/rpm2targz @@ -0,0 +1,123 @@ +#!/bin/sh +# Copyright 1997, 1998 Patrick Volkerding, Moorhead, MN USA +# Copyright 2002, 2004 Slackware Linux, Inc., Concord, CA USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +if [ "$1" = "" ]; then + echo "$0: Converts RPM format to standard GNU tar + GNU zip format." + echo " (view converted packages with \"less\", install and remove" + echo " with \"installpkg\", \"removepkg\", \"pkgtool\", or manually" + echo " with \"tar\")" + echo + echo "Usage: $0 <file.rpm>" + if [ "`basename $0`" = "rpm2tgz" ]; then + echo " (Outputs \"file.tgz\")" + else + echo " (Outputs \"file.tar.gz\")" + fi + exit 1; +fi + +# Create a new temporary directory with a secure filename: +make_temp_dir() { + if [ -x "$(which mcookie)" ]; then + tempd=/tmp/tmp.$(mcookie) + mkdir -p -m 0755 $tempd + elif [ -x "$(which openssl)" ]; then + tempd=/tmp/tmp.$(dd if=/dev/urandom bs=1k count=1 2> /dev/null | openssl dgst -md5) + mkdir -p -m 0755 $tempd + elif [ -x "$(which md5)" ]; then + tempd=/tmp/tmp.$(dd if=/dev/urandom bs=1k count=1 2> /dev/null | md5) + mkdir -p -m 0755 $tempd + elif [ -x "$(which mktemp)" ]; then + tempd=$(mktemp -d) + chmod 755 $tempd + ## Uncomment for insecure use, but don't blame me: + #else + # tempd=/tmp/tmp.$$ + # mkdir -p -m 0755 $tempd + fi + if [ -d $tempd ]; then # success, return the name of the directory: + echo $tempd + else + echo "ERROR: Could not find mcookie, openssl, or md5." + echo " Exiting since a secure temporary directory could not be made." + exit 1 + fi +} + +for i in $* ; do + + # Determine if this is a source or binary RPM. + # If we have getrpmtype, use that. Otherwise, try "file". + if which getrpmtype 1> /dev/null 2> /dev/null; then + if getrpmtype -n $i | grep source 1> /dev/null 2> /dev/null ; then + isSource=1 + else + isSource=0 + fi + else # use file. This works fine on Slackware, and is the default. + if file $i | grep RPM | grep " src " 1> /dev/null 2> /dev/null ; then + isSource=1 + else + isSource=0 + fi + fi + + # Create a temporary directory: + TMPDIR=$(make_temp_dir) + + # Extract the RPM: + ofn=$TMPDIR/$(basename $i .rpm).cpio + if which rpm2cpio 1> /dev/null 2> /dev/null ; then + rpm2cpio $i > $ofn 2> /dev/null + if [ ! $? = 0 ]; then + echo "ERROR: rpm2cpio failed. (maybe $i is not an RPM?)" + rm -rf $TMPDIR + continue + fi + else # less reliable than rpm2cpio... + ( dd ibs=`rpmoffset < $i` skip=1 if=$i 2> /dev/null | gzip -dc > $ofn 2>/dev/null ) || \ + ( dd ibs=`rpmoffset < $i` skip=1 if=$i 2> /dev/null | bzip2 -dc > $ofn 2>/dev/null ) + fi + DEST=$TMPDIR + if [ "$isSource" = "1" ]; then + DEST=$DEST/$(basename $(basename $i .rpm) .src) + fi + mkdir -p $DEST + ( cd $DEST + cpio -i -m -d < $ofn 1> /dev/null 2> /dev/null + rm -f $ofn + find . -type d -perm 700 -exec chmod 755 {} \; + ) + + # Repack the files in a tar+gz archive: + ( cd $TMPDIR ; tar cf - . ) > `basename $i .rpm`.tar + gzip -9 `basename $i .rpm`.tar + if [ "`basename $0`" = "rpm2tgz" ]; then + mv `basename $i .rpm`.tar.gz `basename $i .rpm`.tgz + fi + + # Remove temporary directory: + rm -rf $TMPDIR + +done + diff --git a/patches/bin/rpm2targz.README b/patches/bin/rpm2targz.README new file mode 100644 index 00000000..9936f052 --- /dev/null +++ b/patches/bin/rpm2targz.README @@ -0,0 +1,16 @@ + +This package contains 'rpm2targz', a simple utility to convert Red Hat-style +RPM packages into standard tar.gz archives. Converted binary packages can then +be installed/removed using the 'installpkg/removepkg' commands, or 'pkgtool'. + +It's advisable to at least examine the converted package with 'less' to make +sure it won't do anything too crazy to your system. + +By default, rpm2targz will attempt to use "file" to detect source RPMS, and will +put the contents into a subdirectory in the resulting package. This may not be +portable to other operating systems -- if you're trying to run rpm2targz on an +OS that doesn't have a file that knows RPM types, and you care about this source +RPM feature, you can compile and install David Cantrell's standalone getrpmtype +utility. The getrpmtype.tar.gz source archive can be found in Slackware's +source tree in source/a/bin/. + diff --git a/patches/bin/rpmoffset.c b/patches/bin/rpmoffset.c new file mode 100644 index 00000000..57af397c --- /dev/null +++ b/patches/bin/rpmoffset.c @@ -0,0 +1,24 @@ + +/* Find how deeply inside an .RPM the real data is */ +/* kept, and report the offset in bytes */ + +/* Wouldn't it be a lot more sane if we could just untar these things? */ + +#include <stdlib.h> + +/* These offsets keep getting bigger, so we're going to just bite a 2MB */ +/* chunk of RAM right away so that we have enough. Yeah, horrible */ +/* quick and dirty implementation, but hey -- it gets the job done. */ + +#define RPMBUFSIZ 2097152 + +main() +{ + char *buff = malloc(RPMBUFSIZ),*eb,*p; + for (p = buff, eb = buff + read(0,buff,RPMBUFSIZ); p < eb; p++) + if ((*p == '\037' && p[1] == '\213' && p[2] == '\010') || + (*p == 'B' && p[1] == 'Z' && p[2] == 'h' && '1' <= p[3] && p[3] <= '9' )) + printf("%d\n",p - buff), + exit(0); + exit(1); +} diff --git a/patches/bin/slack-desc b/patches/bin/slack-desc new file mode 100644 index 00000000..4fc4151d --- /dev/null +++ b/patches/bin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +bin: bin (some common system utilities) +bin: +bin: The "bin" package is a collection of utilities for handling various +bin: kinds of archives, identifying file types, and processing data. +bin: Several of these tools are used by system scripts, so this is a +bin: required package. The bin package contains these programs: +bin: +bin: bban compress diskcopy dosfsck ed eject fbset file fiz fromdos lha +bin: mkdosfs mktemp patch rescan-scsi-bus rpm2targz rpmoffset run-parts +bin: savelog shar splitvt sysvbanner tempfile time todos tree unarj unshar +bin: uudecode uuencode volname which xx zoo diff --git a/patches/bin/tree-x86_64.diff.gz b/patches/bin/tree-x86_64.diff.gz Binary files differnew file mode 100644 index 00000000..9d2f6170 --- /dev/null +++ b/patches/bin/tree-x86_64.diff.gz diff --git a/patches/bin/zoo-x86_64.diff.gz b/patches/bin/zoo-x86_64.diff.gz Binary files differnew file mode 100644 index 00000000..efd5b095 --- /dev/null +++ b/patches/bin/zoo-x86_64.diff.gz diff --git a/patches/curl/curl.SlackBuild b/patches/curl/curl.SlackBuild new file mode 100755 index 00000000..6da1c96d --- /dev/null +++ b/patches/curl/curl.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/curl/curl.SlackBuild +# small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="curl" +VERSION=7.12.2 +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} + +PKG=$TMP/package-curl + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +RTOOL="wget" +PACKAGE_EXT="bz2" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="http://curl.haxx.se/download/$SRC" +KEY="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x279D5C91" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + rm -f $SRC_DIR/$SRC.asc + wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL.asc" -O "$SRC_DIR/$SRC.asc" +fi + +lynx -dump "$KEY" | gpg --import +gpg --verify $SRC_DIR/$SRC.asc || echo "WARNING: gpg check failed" + +# Uncomment to build a no-SSL version: +#SSLOPT=--without-ssl + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +fi + +rm -rf $PKG +mkdir -p $PKG +cd $TMP +rm -rf curl-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd curl-$VERSION + +zcat $CWD/libcurl-ntlmbuf.patch.gz | patch -p0 --verbose || exit + +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 664 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=$LIBDIR \ + $SSLOPT +make -j3 +make install DESTDIR=$PKG +chown -R root.bin $PKG/usr/bin +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +if [ "$ARCH" == "x86_64" ]; then + strip -g $PKG/usr/lib64/libcurl.a +else + strip -g $PKG/usr/lib/libcurl.a +fi + +mkdir -p $PKG/usr/doc/curl-$VERSION +cp -a \ + CHANGES COPYING README UPGRADE \ + $PKG/usr/doc/curl-$VERSION +( cd docs + rm -rf Makefile* curl-config.1 curl-config.html curl.1 curl.html libcurl + cp -a \ + BUGS CONTRIBUTE FAQ FEATURES INSTALL INTERNALS MANUAL README.win32 RESOURCES THANKS TODO examples \ + $PKG/usr/doc/curl-$VERSION ) +gzip -9 $PKG/usr/man/man?/*.? +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +makepkg -l y -c n ../curl-$VERSION-$ARCH-$BUILD.tgz + diff --git a/patches/curl/libcurl-ntlmbuf.patch.gz b/patches/curl/libcurl-ntlmbuf.patch.gz Binary files differnew file mode 100644 index 00000000..ef678dd7 --- /dev/null +++ b/patches/curl/libcurl-ntlmbuf.patch.gz diff --git a/patches/curl/slack-desc b/patches/curl/slack-desc new file mode 100644 index 00000000..d09b2555 --- /dev/null +++ b/patches/curl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +curl: curl +curl: +curl: Curl is a command line tool for transferring data specified with URL +curl: syntax. The command is designed to work without user interaction or +curl: any kind of interactivity. Curl offers a busload of useful tricks +curl: like proxy support, user authentication, ftp upload, HTTP post, SSL +curl: (https:) connections, cookies, file transfer resume and more. +curl: +curl: libcurl is a library that Curl uses to do its job. It is readily +curl: available to be used by your software, too. +curl: diff --git a/patches/fetchmail/fetchmail.SlackBuild b/patches/fetchmail/fetchmail.SlackBuild new file mode 100755 index 00000000..b5c34ad8 --- /dev/null +++ b/patches/fetchmail/fetchmail.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/fetchmail/fetchmail.SlackBuild +# small changes by rhatto +# + +# Set initial variables: + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="fetchmail" +VERSION=${VERSION:=6.3.4} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} + +RTOOL="wget" +PACKAGE_EXT="bz2" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="http://download.berlios.de/fetchmail/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" +fi + +PKG=$TMP/package-fetchmail + +LIBDIR="/usr/lib" +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIR="/usr/lib64" +fi + +rm -rf $PKG +mkdir -p $PKG + +cd $TMP +rm -rf fetchmail-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd fetchmail-$VERSION + +# this is the sloppiest source tarball ever +chown -R root.root . +find . -perm 664 -exec chmod 644 {} \; +find . -perm 600 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +find . -perm 400 -exec chmod 644 {} \; +find . -perm 440 -exec chmod 644 {} \; +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 511 -exec chmod 755 {} \; +find . -perm 711 -exec chmod 755 {} \; +find . -perm 555 -exec chmod 755 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --enable-nls \ + --with-ssl \ + --program-prefix="" \ + --program-suffix="" \ + $ARCH-slackware-linux +make +make install DESTDIR=$PKG +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) +chown -R root.bin $PKG/usr/bin +( cd $PKG/usr/man/man1 + rm fetchmailconf.1 + gzip -9 * + ln -sf fetchmail.1.gz fetchmailconf.1.gz +) +mkdir -p $PKG/usr/doc/fetchmail-$VERSION +cp -a \ + ABOUT-NLS COPYING FAQ FEATURES INSTALL NEWS NOTES README README.NTLM README.SSL TODO \ + *.html contrib *.lsm \ + $PKG/usr/doc/fetchmail-$VERSION + +rm -rf $PKG/usr/doc/fetchmail-$VERSION/RCS \ + $PKG/usr/doc/fetchmail-$VERSION/contrib/RCS \ + $PKG/usr/doc/fetchmail-$VERSION/fetchmail-man.html + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +makepkg -l y -c n $TMP/fetchmail-$VERSION-$ARCH-$BUILD.tgz diff --git a/patches/fetchmail/slack-desc b/patches/fetchmail/slack-desc new file mode 100644 index 00000000..ac4c7c90 --- /dev/null +++ b/patches/fetchmail/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +fetchmail: fetchmail (mail retrieval and forwarding utility) +fetchmail: +fetchmail: fetchmail is a mail retrieval and forwarding utility. It fetches +fetchmail: mail from a POP, IMAP, or ETRN-capable remote mailserver and forwards +fetchmail: it to your local (client) machine's delivery system. You can then +fetchmail: handle the retrieved mail using normal mail user agents such as elm, +fetchmail: pine, or mutt. The fetchmail utility can be run in a daemon mode to +fetchmail: repeatedly poll one or more systems at a specified interval. +fetchmail: +fetchmail: +fetchmail: diff --git a/patches/gnupg/gnupg.SlackBuild b/patches/gnupg/gnupg.SlackBuild new file mode 100755 index 00000000..172e573a --- /dev/null +++ b/patches/gnupg/gnupg.SlackBuild @@ -0,0 +1,364 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/gnupg/gnupg.SlackBuild +# small changes by rhatto + +# Set initial variables: +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="gnupg" +VERSION=${VERSION:=1.4.4} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +PKG=$TMP/package-gnupg + +# signing key from http://www.gnupg.org/(en)/signature_key.html +gpg --import << EOGPG +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.3rc1 (GNU/Linux) + +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 +=82ni +-----END PGP PUBLIC KEY BLOCK----- +EOGPG + +RTOOL="wget" +PACKAGE_EXT="bz2" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="ftp://ftp.gnupg.org/gcrypt/gnupg/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + rm -f $SRC_DIR/$SRC.sig + wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" +fi + +gpg --verify $SRC_DIR/$SRC.sig || echo WARNING: error checking signature! +sleep 2 + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2" +fi + +if [ ! -d $TMP ]; then + mkdir -p $TMP # location to build the source +fi +rm -rf $PKG +mkdir -p $PKG + +cd $TMP +rm -rf gnupg-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd gnupg-$VERSION +chown -R root.root . +find . -perm 664 -exec chmod 644 {} \; +find . -perm 600 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +find . -perm 400 -exec chmod 644 {} \; +find . -perm 440 -exec chmod 644 {} \; +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 511 -exec chmod 755 {} \; +find . -perm 711 -exec chmod 755 {} \; +find . -perm 555 -exec chmod 755 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr --libdir=$LIBDIR +make -j3 +make install DESTDIR=$PKG +strip --strip-unneeded $PKG/usr/bin/* +chown -R root.bin $PKG/usr/bin +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* +gzip -9 $PKG/usr/man/*/* +mkdir -p $PKG/usr/doc/gnupg-$VERSION +cp -a \ + ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS README THANKS TODO VERSION \ + $PKG/usr/doc/gnupg-$VERSION +( cd $PKG/usr/doc/gnupg-$VERSION + ln -sf /usr/share/gnupg/FAQ . + ln -sf /usr/share/gnupg/faq.html . ) +# Add slack-desc files: +mkdir -p $PKG/install +cat $CWD/slack-desc.gnupg > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/gnupg-$VERSION-$ARCH-$BUILD.tgz + +# Clean up the extra stuff: +if [ "$1" = "--cleanup" ]; then + rm -rf $TMP/gnupg-$VERSION + rm -rf $PKG +fi diff --git a/patches/gnupg/slack-desc.gnupg b/patches/gnupg/slack-desc.gnupg new file mode 100644 index 00000000..496005e9 --- /dev/null +++ b/patches/gnupg/slack-desc.gnupg @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gnupg: gnupg (The GNU Privacy Guard) +gnupg: +gnupg: GnuPG is GNU's tool for secure communication and data storage. It can +gnupg: be used to encrypt data and to create digital signatures. It includes +gnupg: an advanced key management facility and is compliant with the proposed +gnupg: OpenPGP Internet standard as described in RFC2440. +gnupg: +gnupg: +gnupg: +gnupg: +gnupg: diff --git a/patches/imagemagick/imagemagick.CVE-2005-4601.CVE-2006-0082.diff.gz b/patches/imagemagick/imagemagick.CVE-2005-4601.CVE-2006-0082.diff.gz Binary files differnew file mode 100644 index 00000000..54a61cf5 --- /dev/null +++ b/patches/imagemagick/imagemagick.CVE-2005-4601.CVE-2006-0082.diff.gz diff --git a/patches/imagemagick/imagemagick.SlackBuild b/patches/imagemagick/imagemagick.SlackBuild new file mode 100755 index 00000000..82340a52 --- /dev/null +++ b/patches/imagemagick/imagemagick.SlackBuild @@ -0,0 +1,151 @@ +#!/bin/bash +# +# Got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/imagemagick/imagemagick.SlackBuild +# Small changes by rhatto. +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="imagemagick" +TMP=${TMP:=/tmp} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +SRC_DIR=${SRC:=$CWD} + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +PKG=$TMP/package-imagemagick +rm -rf $PKG +mkdir -p $PKG + +# NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4, +# which occur fairly often (but not always). If these numbers are all the same, +# then this is not one of those versions. + +# This is a bit messy, so we'll explain it well. :-) + +# This is the base version number, which is needed to cd into the source tree +BASEVER=6.2.3 + +# This is the version number used in the source tarball filename +FILEVER=6.2.3-3 + +# This is the version number used in the package, where a version number cannot +# contain a '-' +PKGVER=6.2.3_3 + +RTOOL="wget" +PACKAGE_EXT="bz2" +SRC="ImageMagick-$FILEVER.tar.$PACKAGE_EXT" +URL="http://slamd64.he.net/slamd64-10.2b/source/xap/imagemagick/ImageMagick-6.2.3-3.tar.bz2" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" +fi + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2" +fi + +# --with-x or not --with-x, that is the question. It seems many other +# distributions don't compile with X support, but it's been traditional +# here. I am moving the prefix to /usr (instead of /usr/X11R6) though, +# because many X-linked things are put into /usr now (like GNOME), and +# I've heard a few reports of compile failures when this isn't in /usr. +# Everyone else does it -- time to follow the path of least resistance. + +cd $TMP +rm -rf ImageMagick-$BASEVER +tar xvf$tarflag $SRC_DIR/$SRC +cd ImageMagick-$BASEVER + +zcat $CWD/imagemagick.CVE-2005-4601.CVE-2006-0082.diff.gz | patch -p1 --verbose || exit + +chown -R root.root . +find . -perm 664 -exec chmod 644 {} \; +find . -perm 600 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +find . -perm 400 -exec chmod 644 {} \; +find . -perm 440 -exec chmod 644 {} \; +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 511 -exec chmod 755 {} \; +find . -perm 711 -exec chmod 755 {} \; +find . -perm 555 -exec chmod 755 {} \; +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr \ + --program-prefix= \ + --libdir=$LIBDIR \ + --enable-16bit-pixel \ + --with-x \ + --with-frozenpaths=no \ + --enable-static=no \ + --enable-shared \ + --with-perl \ + $ARCH-slackware-linux +make +make install DESTDIR=$PKG + +# Lately ImageMagick has been smoking crack: +rm -f $PKG/usr/lib/libltdl.* + +( cd $PKG + # Nothing but a perl upgrade should replace this (and maybe not even that) + find . -name perllocal.pod | xargs rm -f +) + +# DESTDIR is still broken about this, but works well enough otherwise: +chmod 644 $PKG/usr/share/man/man3/* +mv $PKG/usr/share/man/man3 $PKG/usr/man +rmdir $PKG/usr/share/man + +( cd $PKG/usr/lib/perl5 + # Ditch empty dirs: + rmdir */* 2> /dev/null + rmdir * 2> /dev/null +) + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) +chown -R root.bin $PKG/usr/bin +gzip -9 $PKG/usr/man/man?/*.? + +mkdir -p $PKG/usr +mv $PKG/usr/share/doc $PKG/usr +cp -a \ + AUTHORS LICENSE NEWS NOTICE Platforms.txt QuickStart.txt README.txt \ + $PKG/usr/doc/Imag* + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +makepkg -l y -c n ../imagemagick-$PKGVER-$ARCH-$BUILD.tgz + diff --git a/patches/imagemagick/slack-desc b/patches/imagemagick/slack-desc new file mode 100644 index 00000000..80ac9a67 --- /dev/null +++ b/patches/imagemagick/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +imagemagick: imagemagick (a robust collection of image processing tools) +imagemagick: +imagemagick: ImageMagick is a collection of tools for manipulating and displaying +imagemagick: digital images. It can merge images, transform image dimensions, +imagemagick: do screen captures, create animation sequences, and convert between +imagemagick: many different image formats. +imagemagick: +imagemagick: ImageMagick was written by John Cristy of ImageMagick Studio. +imagemagick: +imagemagick: Home page: http://www.imagemagick.org/ +imagemagick: diff --git a/patches/mod_ssl/_mod_ssl.tar.gz b/patches/mod_ssl/_mod_ssl.tar.gz Binary files differnew file mode 100644 index 00000000..da20236a --- /dev/null +++ b/patches/mod_ssl/_mod_ssl.tar.gz diff --git a/patches/mod_ssl/libssl.module.diff.gz b/patches/mod_ssl/libssl.module.diff.gz Binary files differnew file mode 100644 index 00000000..a04fb079 --- /dev/null +++ b/patches/mod_ssl/libssl.module.diff.gz diff --git a/patches/mod_ssl/mod_ssl.SlackBuild b/patches/mod_ssl/mod_ssl.SlackBuild new file mode 100755 index 00000000..612583cb --- /dev/null +++ b/patches/mod_ssl/mod_ssl.SlackBuild @@ -0,0 +1,194 @@ +#!/bin/bash +# +# Build and package mod_ssl on Slackware. +# by: David Cantrell <david@slackware.com> +# Currently maintained by: PJV <volkerdi@slackware.com> +# +# Small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="mod_ssl" +MODSSL_VER=${MODSSL_VER:=2.8.28} +APACHE_VER=${APACHE_VER:=1.3.37} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +REPOS=${REPOS:=$TMP} + +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} + +cat << EOCAT + +Pleasy check if the apache version installed system-wide is $APACHE_VER, +otherwise upgrade your apache. + +Press ENTER to continue. +EOCAT + +read garbage + +RTOOL="wget" +MODSSL="mod_ssl-$MODSSL_VER-$APACHE_VER.tar.gz" +MODSSL_URL="http://www.modssl.org/source/$MODSSL" +APACHE="apache_$APACHE_VER.tar.gz" +APACHE_URL="http://ftp.unicamp.br/pub/apache/httpd/$APACHE" + +SRC_DIR="$SRC_DIR/$PACKAGE" +mkdir -p $SRC_DIR + +if [ "$RTOOL" == "wget" ]; then + + if [ ! -f "$SRC_DIR/$MODSSL" ]; then + wget "$MODSSL_URL" -O "$SRC_DIR/$MODSSL" + fi + + if [ ! -f "$SRC_DIR/$APACHE" ]; then + wget "$APACHE_URL" -O "$SRC_DIR/$APACHE" + fi + +fi + +TMP="$TMP/$PACKAGE" +rm -rf $TMP +mkdir -p $TMP +cd $TMP + +PKG=$TMP/package-$PACKAGE +mkdir -p $PKG +( cd $PKG ; explodepkg $CWD/_mod_ssl.tar.gz ) +# Install sample config file: +cat $CWD/mod_ssl.conf.example > $PKG/etc/apache/mod_ssl.conf.new + +cd $TMP +rm -rf mod_ssl-$MODSSL_VER-$APACHE_VER +rm -rf apache_$APACHE_VER +tar xvzf $SRC_DIR/apache_$APACHE_VER.tar.gz +tar xvzf $SRC_DIR/mod_ssl-$MODSSL_VER-$APACHE_VER.tar.gz + +# build mod_ssl +cd $TMP/mod_ssl-$MODSSL_VER-$APACHE_VER +chown -R root.root . + +if [ "$ARCH" == "x86_64" ]; then + ( cd pkg.sslmod ; zcat $CWD/libssl.module.diff.gz | patch -p0 --verbose ) +fi + +./configure --with-apxs=/usr/sbin/apxs \ + --with-crt=/etc/apache/mod_ssl/server.crt \ + --with-key=/etc/apache/mod_ssl/server.key \ + --with-patch=/usr/bin/patch + +# Enjoy this kludge! :-) +if [ "$ARCH" == "x86_64" ]; then + echo "SSL_CFLAGS= -DSSL_ENGINE -DSSL_USE_SDBM -L/usr/lib64" >> pkg.sslmod/Makefile +else + echo "SSL_CFLAGS= -DSSL_ENGINE -DSSL_USE_SDBM" >> pkg.sslmod/Makefile +fi + +make -j3 + +# go back to the Apache tree and generate the additional package components +cd $TMP/apache_$APACHE_VER +cat $TMP/mod_ssl-$MODSSL_VER-$APACHE_VER/pkg.sslcfg/sslcfg.patch | patch -p0 +cat $TMP/mod_ssl-$MODSSL_VER-$APACHE_VER/pkg.ssldoc/ssldoc.patch | patch -p0 +cat $TMP/mod_ssl-$MODSSL_VER-$APACHE_VER/pkg.sslsup/sslsup.patch | patch -p0 +zcat $CWD/../apache/apache.dbm.diff.gz | patch -p1 +( cd $TMP/apache_$APACHE_VER/src/support + cat apachectl | sed -e "s|PIDFILE=/usr/local/apache/logs/httpd.pid|PIDFILE=/var/run/httpd.pid|g" | sed -e "s|HTTPD='/usr/local/apache/src/httpd'|HTTPD=/usr/sbin/httpd|g" > apachectl.new + mv apachectl.new apachectl ) + +# install mod_ssl +cd $TMP/mod_ssl-$MODSSL_VER-$APACHE_VER +make -j3 +make install +mkdir -p $PKG/usr/doc/mod_ssl-$MODSSL_VER-$APACHE_VER +cp -a ANNOUNCE CREDITS INSTALL LICENSE NEWS README* \ + $PKG/usr/doc/mod_ssl-$MODSSL_VER-$APACHE_VER + +# install the other components for this package +cd $TMP/mod_ssl-$MODSSL_VER-$APACHE_VER +( cd pkg.sslcfg + cp -a README.CRT Makefile.crt ca-bundle.crt snakeoil-ca-rsa.crt \ + snakeoil-ca-dsa.crt snakeoil-rsa.crt snakeoil-dsa.crt \ + server.crt $PKG/etc/apache/ssl.crt ) +( cd pkg.sslcfg + cp -a README.CSR server.csr $PKG/etc/apache/ssl.csr ) +( cd pkg.sslcfg + cp -a README.PRM snakeoil-ca-dsa.prm snakeoil-dsa.prm \ + $PKG/etc/apache/ssl.prm ) +( cd pkg.sslcfg + cp -a Makefile.crl README.CRL $PKG/etc/apache/ssl.crl ) +( cd pkg.sslcfg + cp -a README.KEY snakeoil-ca-rsa.key snakeoil-ca-dsa.key snakeoil-rsa.key \ + snakeoil-dsa.key server.key $PKG/etc/apache/ssl.key ) + +( cd pkg.ssldoc + cp -a index.html ssl_* $PKG/var/www/htdocs/manual/mod/mod_ssl ) +( cd pkg.ssldoc + cp -a apache_pb.gif feather.jpg mod_ssl_sb.gif openssl_ics.gif \ + $PKG/var/www/htdocs/manual/images ) + +cd $TMP/apache_$APACHE_VER +( cd htdocs + cp -a index.html.en $PKG/var/www/htdocs ) +( cd htdocs/manual/mod + cp -a index.html.en index-bytype.html.en directives.html.en \ + $PKG/var/www/htdocs/manual/mod ) +( cd src/support + cp -a apachectl $PKG/usr/sbin ) +# This is a point of overlap with the apache package, so we'll make it +# a symlink so that it's less of a trap for the unsuspecting admin: +( cd $PKG/usr/sbin + mv apachectl apachectl-mod_ssl + ln -sf apachectl-mod_ssl apachectl +) + +# Make key files that we wouldn't want overwritten use .new: +for file in \ +$PKG/etc/apache/ssl.crt/server.crt \ +$PKG/etc/apache/ssl.csr/server.csr \ +$PKG/etc/apache/ssl.key/server.key ; do + mv $file ${file}.new +done + +# get the module in the package +mkdir -p $PKG/usr/libexec/apache +cp -a /usr/libexec/apache/libssl.so $PKG/usr/libexec/apache + +# attributes +chmod 700 $PKG/etc/apache/ssl.key + +# strip: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# some housekeeping +chown -R root.bin $PKG/usr/sbin +chmod 755 $PKG/usr/sbin/* + +# Install slack-desc: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# make the package +cd $PKG +makepkg -l y -c n $REPOS/mod_ssl-${MODSSL_VER}_${APACHE_VER}-$ARCH-$BUILD.tgz + +# clean up +if [ "$1" = "--cleanup" ]; then + cd $CWD + rm -rf $TMP + rm -rf $PKG +fi diff --git a/patches/mod_ssl/mod_ssl.conf.example b/patches/mod_ssl/mod_ssl.conf.example new file mode 100644 index 00000000..79cce3b9 --- /dev/null +++ b/patches/mod_ssl/mod_ssl.conf.example @@ -0,0 +1,266 @@ +## _ _ +## _ __ ___ ___ __| | ___ ___| | mod_ssl +## | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL +## | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org +## |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org +## |_____| +## ____________________________________________________________________________ +## +## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. + +## +## Load the mod_ssl module: +## +LoadModule ssl_module libexec/apache/libssl.so + +## +## SSL Support +## +## When we also provide SSL we have to listen to the +## standard HTTP port (see above) and to the HTTPS port +## +<IfDefine SSL> +Listen 80 +Listen 443 +</IfDefine> + +#<VirtualHost _default_:*> +#</VirtualHost> + +## +## SSL Global Context +## +## All SSL configuration in this context applies both to +## the main server and all SSL-enabled virtual hosts. +## + +# +# Some MIME-types for downloading Certificates and CRLs +# +<IfDefine SSL> +AddType application/x-x509-ca-cert .crt +AddType application/x-pkcs7-crl .crl +</IfDefine> + +<IfModule mod_ssl.c> + +# Pass Phrase Dialog: +# Configure the pass phrase gathering process. +# The filtering dialog program (`builtin' is a internal +# terminal dialog) has to provide the pass phrase on stdout. +SSLPassPhraseDialog builtin + +# Inter-Process Session Cache: +# Configure the SSL Session Cache: First either `none' +# or `dbm:/path/to/file' for the mechanism to use and +# second the expiring timeout (in seconds). +#SSLSessionCache none +#SSLSessionCache shm:/var/log/apache/ssl_scache(512000) +SSLSessionCache dbm:/var/log/apache/ssl_scache +SSLSessionCacheTimeout 300 + +# Semaphore: +# Configure the path to the mutual explusion semaphore the +# SSL engine uses internally for inter-process synchronization. +SSLMutex file:/var/log/apache/ssl_mutex + +# Pseudo Random Number Generator (PRNG): +# Configure one or more sources to seed the PRNG of the +# SSL library. The seed data should be of good random quality. +# WARNING! On some platforms /dev/random blocks if not enough entropy +# is available. This means you then cannot use the /dev/random device +# because it would lead to very long connection times (as long as +# it requires to make more entropy available). But usually those +# platforms additionally provide a /dev/urandom device which doesn't +# block. So, if available, use this one instead. Read the mod_ssl User +# Manual for more details. +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin +#SSLRandomSeed startup file:/dev/random 512 +#SSLRandomSeed startup file:/dev/urandom 512 +#SSLRandomSeed connect file:/dev/random 512 +#SSLRandomSeed connect file:/dev/urandom 512 + +# Logging: +# The home of the dedicated SSL protocol logfile. Errors are +# additionally duplicated in the general error log file. Put +# this somewhere where it cannot be used for symlink attacks on +# a real server (i.e. somewhere where only root can write). +# Log levels are (ascending order: higher ones include lower ones): +# none, error, warn, info, trace, debug. +SSLLog /var/log/apache/ssl_engine_log +SSLLogLevel info + +</IfModule> + +<IfDefine SSL> + +## +## SSL Virtual Host Context +## + +<VirtualHost _default_:443> + +# General setup for the virtual host +DocumentRoot "/var/www/htdocs" +ServerName new.host.name +ServerAdmin you@your.address +ErrorLog /var/log/apache/error_log +TransferLog /var/log/apache/access_log + +# SSL Engine Switch: +# Enable/Disable SSL for this virtual host. +SSLEngine on + +# SSL Cipher Suite: +# List the ciphers that the client is permitted to negotiate. +# See the mod_ssl documentation for a complete list. +SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + +# Server Certificate: +# Point SSLCertificateFile at a PEM encoded certificate. If +# the certificate is encrypted, then you will be prompted for a +# pass phrase. Note that a kill -HUP will prompt again. A test +# certificate can be generated with `make certificate' under +# built time. Keep in mind that if you've both a RSA and a DSA +# certificate you can configure both in parallel (to also allow +# the use of DSA ciphers, etc.) +SSLCertificateFile /etc/apache/ssl.crt/server.crt +#SSLCertificateFile /etc/apache/ssl.crt/server-dsa.crt + +# Server Private Key: +# If the key is not combined with the certificate, use this +# directive to point at the key file. Keep in mind that if +# you've both a RSA and a DSA private key you can configure +# both in parallel (to also allow the use of DSA ciphers, etc.) +SSLCertificateKeyFile /etc/apache/ssl.key/server.key +#SSLCertificateKeyFile /etc/apache/ssl.key/server-dsa.key + +# Server Certificate Chain: +# Point SSLCertificateChainFile at a file containing the +# concatenation of PEM encoded CA certificates which form the +# certificate chain for the server certificate. Alternatively +# the referenced file can be the same as SSLCertificateFile +# when the CA certificates are directly appended to the server +# certificate for convinience. +#SSLCertificateChainFile /etc/apache/ssl.crt/ca.crt + +# Certificate Authority (CA): +# Set the CA certificate verification path where to find CA +# certificates for client authentication or alternatively one +# huge file containing all of them (file must be PEM encoded) +# Note: Inside SSLCACertificatePath you need hash symlinks +# to point to the certificate files. Use the provided +# Makefile to update the hash symlinks after changes. +#SSLCACertificatePath /etc/apache/ssl.crt +#SSLCACertificateFile /etc/apache/ssl.crt/ca-bundle.crt + +# Certificate Revocation Lists (CRL): +# Set the CA revocation path where to find CA CRLs for client +# authentication or alternatively one huge file containing all +# of them (file must be PEM encoded) +# Note: Inside SSLCARevocationPath you need hash symlinks +# to point to the certificate files. Use the provided +# Makefile to update the hash symlinks after changes. +#SSLCARevocationPath /etc/apache/ssl.crl +#SSLCARevocationFile /etc/apache/ssl.crl/ca-bundle.crl + +# Client Authentication (Type): +# Client certificate verification type and depth. Types are +# none, optional, require and optional_no_ca. Depth is a +# number which specifies how deeply to verify the certificate +# issuer chain before deciding the certificate is not valid. +#SSLVerifyClient require +#SSLVerifyDepth 10 + +# Access Control: +# With SSLRequire you can do per-directory access control based +# on arbitrary complex boolean expressions containing server +# variable checks and other lookup directives. The syntax is a +# mixture between C and Perl. See the mod_ssl documentation +# for more details. +#<Location /> +#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ +# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ +# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ +# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ +# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ +# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ +#</Location> + +# SSL Engine Options: +# Set various options for the SSL engine. +# o FakeBasicAuth: +# Translate the client X.509 into a Basic Authorisation. This means that +# the standard Auth/DBMAuth methods can be used for access control. The +# user name is the `one line' version of the client's X.509 certificate. +# Note that no password is obtained from the user. Every entry in the user +# file needs this password: `xxj31ZMTZzkVA'. +# o ExportCertData: +# This exports two additional environment variables: SSL_CLIENT_CERT and +# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the +# server (always existing) and the client (only existing when client +# authentication is used). This can be used to import the certificates +# into CGI scripts. +# o StdEnvVars: +# This exports the standard SSL/TLS related `SSL_*' environment variables. +# Per default this exportation is switched off for performance reasons, +# because the extraction step is an expensive operation and is usually +# useless for serving static content. So one usually enables the +# exportation for CGI and SSI requests only. +# o CompatEnvVars: +# This exports obsolete environment variables for backward compatibility +# to Apache-SSL 1.x, mod_ssl 2.0.x, Sioux 1.0 and Stronghold 2.x. Use this +# to provide compatibility to existing CGI scripts. +# o StrictRequire: +# This denies access when "SSLRequireSSL" or "SSLRequire" applied even +# under a "Satisfy any" situation, i.e. when it applies access is denied +# and no other module can change it. +# o OptRenegotiate: +# This enables optimized SSL connection renegotiation handling when SSL +# directives are used in per-directory context. +#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire +<Files ~ "\.(cgi|shtml|phtml|php3?)$"> + SSLOptions +StdEnvVars +</Files> +<Directory "/var/www/cgi-bin"> + SSLOptions +StdEnvVars +</Directory> + +# SSL Protocol Adjustments: +# The safe and default but still SSL/TLS standard compliant shutdown +# approach is that mod_ssl sends the close notify alert but doesn't wait for +# the close notify alert from client. When you need a different shutdown +# approach you can use one of the following variables: +# o ssl-unclean-shutdown: +# This forces an unclean shutdown when the connection is closed, i.e. no +# SSL close notify alert is send or allowed to received. This violates +# the SSL/TLS standard but is needed for some brain-dead browsers. Use +# this when you receive I/O errors because of the standard approach where +# mod_ssl sends the close notify alert. +# o ssl-accurate-shutdown: +# This forces an accurate shutdown when the connection is closed, i.e. a +# SSL close notify alert is send and mod_ssl waits for the close notify +# alert of the client. This is 100% SSL/TLS standard compliant, but in +# practice often causes hanging connections with brain-dead browsers. Use +# this only for browsers where you know that their SSL implementation +# works correctly. +# Notice: Most problems of broken clients are also related to the HTTP +# keep-alive facility, so you usually additionally want to disable +# keep-alive for those clients, too. Use variable "nokeepalive" for this. +# Similarly, one has to force some clients to use HTTP/1.0 to workaround +# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and +# "force-response-1.0" for this. +SetEnvIf User-Agent ".*MSIE.*" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + +# Per-Server Logging: +# The home of a custom SSL log file. Use this when you want a +# compact non-error SSL logfile on a virtual host basis. +CustomLog /var/log/apache/ssl_request_log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" + +</VirtualHost> + +</IfDefine> diff --git a/patches/mod_ssl/slack-desc b/patches/mod_ssl/slack-desc new file mode 100644 index 00000000..e137e2ef --- /dev/null +++ b/patches/mod_ssl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +mod_ssl: mod_ssl (Apache module for SSL) +mod_ssl: +mod_ssl: mod_ssl provides provides strong cryptography for the Apache web +mod_ssl: server via the Secure Sockets Layer (SSL v2/v3) and Transport Layer +mod_ssl: Security (TLS v1). It is based on OpenSSL and provides support for +mod_ssl: all major security needs through HTTP. +mod_ssl: +mod_ssl: mod_ssl is written by Ralf S. Engelschall. +mod_ssl: +mod_ssl: +mod_ssl: diff --git a/patches/mozilla-firefox/default.xpm b/patches/mozilla-firefox/default.xpm new file mode 100644 index 00000000..ce4a3cdf --- /dev/null +++ b/patches/mozilla-firefox/default.xpm @@ -0,0 +1,299 @@ +/* XPM */ +static char * default_xpm[] = { +"48 48 248 2", +" c None", +". c #7980B8", +"+ c #5269AA", +"@ c #133988", +"# c #155AA7", +"$ c #1181BC", +"% c #13508E", +"& c #2773AF", +"* c #6976B1", +"= c #146CAB", +"- c #1785C4", +"; c #35A7E4", +"> c #5988A8", +", c #1A639C", +"' c #618380", +") c #7F896D", +"! c #576768", +"~ c #414E6D", +"{ c #2882BB", +"] c #36A2DD", +"^ c #41AEE7", +"/ c #2D8FCF", +"( c #2A4D6F", +"_ c #DDC563", +": c #FDFA57", +"< c #F7CC2C", +"[ c #D0A634", +"} c #EEB88A", +"| c #E86918", +"1 c #40A3DD", +"2 c #296599", +"3 c #23568D", +"4 c #164778", +"5 c #16395A", +"6 c #072558", +"7 c #2C3B4D", +"8 c #9D8D2F", +"9 c #F8D801", +"0 c #FAE800", +"a c #F6B704", +"b c #FBD46D", +"c c #A5A5C9", +"d c #062C70", +"e c #061646", +"f c #0A2E62", +"g c #123D74", +"h c #6D6D6C", +"i c #A99269", +"j c #EDB16B", +"k c #BABCA3", +"l c #907241", +"m c #B27A1C", +"n c #F69B08", +"o c #F6A706", +"p c #F7A613", +"q c #E15707", +"r c #E58836", +"s c #AE99A3", +"t c #111A54", +"u c #05122B", +"v c #061538", +"w c #142646", +"x c #17334F", +"y c #4F4B50", +"z c #D28D3D", +"A c #F0AC4C", +"B c #756D57", +"C c #CEA753", +"D c #FDE55B", +"E c #FEFA7A", +"F c #F9E641", +"G c #F9C617", +"H c #FCD9A3", +"I c #E98B66", +"J c #D64804", +"K c #E17B25", +"L c #D86A27", +"M c #685049", +"N c #795B48", +"O c #635B5B", +"P c #E48529", +"Q c #E99737", +"R c #B8832E", +"S c #214357", +"T c #45402F", +"U c #CB8F1C", +"V c #FCF604", +"W c #F7C603", +"X c #FBE5B6", +"Y c #E36743", +"Z c #D63003", +"` c #E99C4C", +" . c #E17919", +".. c #172B5B", +"+. c #202A74", +"@. c #0D223C", +"#. c #7F5A1C", +"$. c #FDE56F", +"%. c #D15D41", +"&. c #B83404", +"*. c #D9782A", +"=. c #E27A06", +"-. c #277BC4", +";. c #624B23", +">. c #FBD659", +",. c #F1E084", +"'. c #DE7317", +"). c #E99725", +"!. c #F6B12B", +"~. c #EEA716", +"{. c #EB9515", +"]. c #E68714", +"^. c #CC590A", +"/. c #192963", +"(. c #66572F", +"_. c #E9A603", +":. c #AC320A", +"<. c #8D564E", +"[. c #4F6E8B", +"}. c #4A9DC9", +"|. c #FEFE92", +"1. c #D95708", +"2. c #4D2B18", +"3. c #E79209", +"4. c #FEFA86", +"5. c #FDE6A6", +"6. c #E6880C", +"7. c #DA6917", +"8. c #A4853C", +"9. c #D47350", +"0. c #CAAE8C", +"a. c #D1B76B", +"b. c #FCE424", +"c. c #F08F0D", +"d. c #FBEA3A", +"e. c #0B345A", +"f. c #836735", +"g. c #AB8B53", +"h. c #FEFD25", +"i. c #B9571B", +"j. c #C15822", +"k. c #B66F38", +"l. c #971703", +"m. c #532725", +"n. c #C09123", +"o. c #FEFD39", +"p. c #F9B517", +"q. c #FAC94B", +"r. c #A52504", +"s. c #38313D", +"t. c #9A8854", +"u. c #FEFC17", +"v. c #F9CA59", +"w. c #D35B23", +"x. c #B92707", +"y. c #113A6F", +"z. c #CC4621", +"A. c #BE4910", +"B. c #CD9750", +"C. c #C12A11", +"D. c #C8470A", +"E. c #C63605", +"F. c #A46F48", +"G. c #C97A36", +"H. c #89978D", +"I. c #0F3C75", +"J. c #A70209", +"K. c #D35615", +"L. c #E0650A", +"M. c #BC7036", +"N. c #0E3468", +"O. c #9A1124", +"P. c #25317F", +"Q. c #FCDB47", +"R. c #9B4967", +"S. c #D77707", +"T. c #CE5D15", +"U. c #A84515", +"V. c #342222", +"W. c #0A2543", +"X. c #A57736", +"Y. c #F9D515", +"Z. c #662817", +"`. c #040B26", +" + c #A06E32", +".+ c #C19471", +"++ c #970314", +"@+ c #D04911", +"#+ c #7E240E", +"$+ c #2D212E", +"%+ c #020935", +"&+ c #6C4538", +"*+ c #875F39", +"=+ c #FFFE6A", +"-+ c #883F67", +";+ c #291B1D", +">+ c #00071F", +",+ c #5C393C", +"'+ c #FEF2AE", +")+ c #FEFD4E", +"!+ c #CC9438", +"~+ c #B50501", +"{+ c #8B4B22", +"]+ c #7D4224", +"^+ c #FFFFC6", +"/+ c #BF9E8E", +"(+ c #762C5A", +"_+ c #C93B10", +":+ c #8B4E30", +"<+ c #543C54", +"[+ c #C66823", +"}+ c #D29A1D", +"|+ c #8E041A", +"1+ c #BC652C", +"2+ c #AE5B2C", +"3+ c #AF9393", +"4+ c #6E447E", +"5+ c #C11E00", +"6+ c #C32907", +"7+ c #FAE217", +"8+ c #650E41", +"9+ c #DF7931", +"0+ c #D86407", +"a+ c #7B0727", +"b+ c #DE9005", +"c+ c #DC8505", +"d+ c #EAB402", +"e+ c #EDC602", +"f+ c #A0776B", +"g+ c #B9140C", +"h+ c #C94617", +"i+ c #D04F22", +"j+ c #9C706E", +"k+ c #91697A", +"l+ c #850520", +"m+ c #79495B", +"n+ c #551D5F", +"o+ c #655191", +"p+ c #560D43", +"q+ c #81142A", +"r+ c #A81615", +"s+ c #A8371E", +"t+ c #8D362F", +"u+ c #632C4A", +"v+ c #563D7B", +"w+ c #453786", +"x+ c #471552", +"y+ c #3C185B", +" ", +" ", +" . + @ # # $ # % @ & * ", +" + @ = $ $ $ - ; ; $ = = = = = @ > ", +" + = $ $ $ $ $ $ ; ; ; - = # # , ' ) ! ~ ~ ", +" + % = = = = & & & { ] ^ ^ ; / = , % ( ! ) _ : < [ } ", +" | @ % % % % , , , , & & 1 ^ ^ ^ / & 2 3 4 5 6 6 7 8 9 0 a b ", +" | | } c d 6 e f g 4 4 h i j k & / ^ ^ ^ ^ { & 2 3 ( l m m n n o a a p ", +" q | r s t e u v w x y z A A i ( 3 / ^ ^ ^ 1 { & & & 2 ~ B C D E F G o n n H ", +" I J | K L M N y x 7 O P Q Q R x S & 1 ^ ^ { { & & & { 2 3 ( 5 T U < V V W n p X b ", +" Y Z J K j j j j j b ` .K Q y ..+./ ^ / & & { & { / ^ 1 & ( 5 w @.#.o 9 9 9 o A $. ", +" %.&.*.j A j A A Q Q K =. . .4 & -.] ^ -.-.& / ; ^ ^ ^ ^ / 3 3 ( ..w ;.n W W a n >.,. ", +" %.'.` ` A ).!.~.{.].=.=.'.^.y -.-.1 ^ ^ ] / ; ; ; ; ^ ^ 1 & 2 3 ( /.w (.n a _.o !.$. ", +" *.Q Q Q ~.~.{.{.].]. .'.'.^.:.<.[.> }.}.; ; ; ; ; ; ; ; ^ ^ { 3 { 2 3 S m n _.n !.|.X ", +" } P Q ~.{.{.{.].{.].]. . .'.1.:.J 1.q q 2.{ ] ; ; ; / ; ; ; ; 1 ] 1 1 { 2 S 3.n 3.n 4.5. ", +" Q ).).{.{.6.].].].K ]. .'.7.7.&.1.J q K i / ] ; ; ; ; ] / ] ] ] ] ] ] / & 8.m n !.o : $. ", +" Q ).].3.].].].].]. . .K '.K K 9.X X } 0.[.$ ] ] / ] ] { = , { / / / / / $ a.[ n $.a V b. ", +" j Q {.{.3.c.].].].]. . .'.| K K ` } j h 5 % - ; / $ { / / , , , { / / / / & i E c.$.d.0 9 ", +" Q ).].3.].].].].K . .'. .K K Q r I 7 e.% = / / - # , = { , , , , / / / -.3 f.E < $.D 9 W b ", +"j Q ).].{.].].].].]. . .'.K P Q Q A g.f @ = / / ; / = , & , , , , , & / -., @ f.h.G $.4.9 W !. ", +"` r ].{.{.6.].].].K .'. .P r Q ` A C @ # = - / / / = , , , , , , % { / { # % l 0 9 4.|.G a !. ", +"` ).].3.].6.].c. . . .K L i.j.j.k.C b % # $ -./ / / -., , , , , 3 % , { = , & R 9 W E |.< o !. ", +"j P ].3.].6.].K . .7.:.l.l.l.m.@.@.( @ # = -./ / / / / & , , 3 % % % % 4 ! & n.W G o.: p.n q. ", +"j K ].c.6.]. . . .'.r.l.l.l.r.s.f f f @ # = -.-./ -./ / 3 , , 3 % % % % 4 a.t.o o W V u.p.!.v. ", +"9.w.=.].]. . . . .7.l.l.r.r.x.N 4 @ @ # & -.-.-.-.{ -./ % 3 % % % @ % 4 y.C q.n n 9 0 V a >._ ", +"9.z.'. .K . .'.7.A.r.r.x.&.&. .O # # 2 & -.-.-.-.-.-.{ & % % 4 % 4 4 @ 4 B.E n n 9 9 0 p 4.j ", +" C.'.'. .K '.'.K D.:.&.&.E.E.7. .F.2 # # 2 h G.r A a.H.{ % 4 4 I.4 I.I., B.|.!.o W 9 9 q.|.j ", +" J.7. .'.'.'.'.'.K.E.E.D.J J L.'.K 7.M.M.'.K '.K r A ,.H.4 4 y.N.y.N.N.3 [ |.q.a a W G 4.$. ", +" O.K.'.'.L. .'.K '.D.Z J J q q '.'.K 7.'.'. . . .7.7.j g.I.y.f f 6 6 P.3 !.E Q.o < a >.|.>. ", +" R.z.w.'.S.'.'.'.| 7.q q q q q &.A.7.'.K '.L T.A.U.V.u W.e.N.6 t e w X.O Y.h.G n v.p.4.|.C ", +" x.L L.'.'.'.'. .7. .q q L.q K.l.l.l.r.r.:.:.Z.`.`.u e t t e e e + + +9 V W n b D 4.4..+ ", +" ++L @+'.'.S.'. .'.'.'.L.L.L.L.D.l.l.r.#+Z.$+@.u %+v e e e %+e &+6.*+n 9 9 a q.4.: =+Q. ", +" -+z.E. .'.'.S.L.'. .L. .7.'.L. .i.;+>+>+u w /.%+%+e e %+%+%+,+ .].c.a W W o '+)+o.)+!+ ", +" J.~+7.'.'.'.'.'.'.S.L. .L.'. .7. .{+v %+/.t %+%+%+%+%+%+]+| L .c._._._.v.^+V u.b./+ ", +" (+~+_+K 1.'.'. .'.'.S.'.'.S.L. .'.'.'.:+<+P.+.t %+%+m.[+'.'.'.'.6.3.3.~.|.4.V V }+ ", +" |+~+@+7.7.'.K '.'.'.'.'.'.S.=.L.'.'.'.'.'.1+2+[+ . .'.'. . .'.=.=.=.d.E d.0 9 3+ ", +" 4+~+5+K.6+7.K P 7. .'.'.'.'.'.'.'.'.'.'. .'.'.7.K 7.K 7. .7.L.L.S.7+o.: 9 9 R ", +" 8+~+5+J 5+K.9+K C.1.'. . .'.'.L.'. .K K P r r r r r K 7.q 0+S.9 V h.Y.9 _. ", +" a+~+6+Z ~+6+r 9+~+E.7.K K 7.K. .'.K K K K K K '.'.'.0+0+b+9 0 V V W a 3+ ", +" ++~+E.6+~+~+z.r C.~+_+w.P 9+K.@+K.7.'.'. . .'.7.0+c+_.d+e+0 0 e+_.f+ ", +" ++~+6+5+~+~+g+z.g+g+g+C.h+%.r L i+@+@+T.T.0+S.c+b+_.d+e+e+e+3.j+ ", +" a+~+~+~+~+~+~+g+g+g+g+g+g+g+_+h+w._+D.^.^.0+S.c+b+d+d+_.'.k+ ", +" 8+J.~+~+~+~+g+g+g+g+g+g+g+g+C.6+&.D.D.^.0+S.S.b+3.].2+ ", +" l+~+~+~+g+~+g+g+g+g+g+g+C.C.6+_+D.D.^.0+S.S.[+m+ ", +" n+a+~+g+g+g+g+g+g+g+g+g+C.6+E._+D.^.0+2+m+ ", +" o+p+q+r+g+g+g+g+g+g+x.C.E.s+t+u+v+ ", +" w+x+x+x+x+x+x+y+w+ ", +" "}; diff --git a/patches/mozilla-firefox/doinst.sh b/patches/mozilla-firefox/doinst.sh new file mode 100644 index 00000000..e716135b --- /dev/null +++ b/patches/mozilla-firefox/doinst.sh @@ -0,0 +1,7 @@ + +FIREFOXDIR=usr/lib64/firefox-VERSION +REGXPCOM=../../../$FIREFOXDIR/regxpcom +FIREFOX=../../../$FIREFOXDIR/firefox-bin + +# Register the default extensions +( cd $FIREFOXDIR && ./run-mozilla.sh $REGXPCOM && ./run-mozilla.sh $FIREFOX -register ) diff --git a/patches/mozilla-firefox/firefox.desktop b/patches/mozilla-firefox/firefox.desktop new file mode 100644 index 00000000..cf3303db --- /dev/null +++ b/patches/mozilla-firefox/firefox.desktop @@ -0,0 +1,81 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=firefox %u +Icon=/usr/share/pixmaps/firefox.png +Type=Application +Categories=Application;Network; +Name=Firefox +Name[bn]=ফায়ারফক্স +Name[eo]=Mozilo Fajrovulpo +Name[fi]=Mozilla Firefox +Name[pa]=ਫਾਇਰਫੋਕਸ +Name[tg]=Рӯбоҳи оташин +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +MimeType=text/html +X-KDE-StartupNotify=true diff --git a/patches/mozilla-firefox/firefox.png b/patches/mozilla-firefox/firefox.png Binary files differnew file mode 100644 index 00000000..399040b0 --- /dev/null +++ b/patches/mozilla-firefox/firefox.png diff --git a/patches/mozilla-firefox/mozilla-firefox.SlackBuild b/patches/mozilla-firefox/mozilla-firefox.SlackBuild new file mode 100755 index 00000000..0d24fdd2 --- /dev/null +++ b/patches/mozilla-firefox/mozilla-firefox.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/bash +# +# based on slamd64 slackbuild script +# rhatto usage: TMP=/phreak/apps/build/net/mozilla-firefox SRC=/phreak/apps/src/net/mozilla-firefox ./mozilla-firefox.SlackBuild +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +# default settings +PACKAGE="firefox" +VERSION=${VERSION:=1.5.0.5} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +# adjust to your package build dir +TMP="$TMP/$PACKAGE" +PKG=$TMP/package-firefox + +if [ ! -d $TMP ]; then + mkdir -p $TMP +fi +rm -rf $PKG +mkdir -p $PKG + +SRC_DIR="$SRC_DIR/$PACKAGE" +mkdir -p $SRC_DIR + +PACKAGE_EXT="bz2" +SRC="$PACKAGE-$VERSION-source.tar.$PACKAGE_EXT" +URL="ftp://ftp.mozilla.org/pub/mozilla.org/$PACKAGE/releases/$VERSION/source/$SRC" +RTOOL="wget" + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" +fi + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +cd $TMP +tar xf$tarflag $SRC_DIR/$SRC || exit 1 +echo foo +if [ -d $PACKAGE-$VERSION ]; then + rm -rf $PACKAGE-$VERSION +fi +mv mozilla $PACKAGE-$VERSION +cd $PACKAGE-$VERSION +cp $CWD/default.xpm ./widget/src/gtk2/default.xpm + +CFLAGS="-O2 -fPIC" MOZ_PHOENIX=1 \ + ./configure --prefix=/usr --libdir=$LIBDIR --enable-optimize="-pipe -w -O2" \ + --disable-debug \ + --with-default-mozilla-five-home=$LIBDIR/firefox-${VERSION} \ + --enable-strip-libs --enable-strip --disable-tests --enable-crypto --disable-ldap \ + --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs \ + --disable-mailnews --disable-composer --enable-single-profile --disable-profilesharing \ + --enable-xft --enable-xinerama --disable-freetype2 --enable-default-toolkit=gtk2 \ + --disable-installer --with-pthreads --disable-jsd \ + --enable-application=browser || exit 1 + +MOZ_PHOENIX=1 make -s export || exit 1 +MOZ_PHOENIX=1 make -s libs || exit 1 +MOZ_PHOENIX=1 make DESTDIR=$PKG install || exit 1 + +find $PKG/ -name '*.so' | xargs chmod -x +chmod -x ${PKG}${LIBDIR}/firefox-${VERSION}/components/*.js +# rm -rf ${PKG}${LIBDIR}/firefox-${VERSION}/defaults/profile/extensions/installed-extensions.txt 2>/dev/null +# mv ${PKG}${LIBDIR}/firefox-${VERSION}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf ${PKG}${LIBDIR}/firefox-${VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/ +# rm -rf ${PKG}${LIBDIR}/firefox-${VERSION}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + +mkdir -p $PKG/usr/share/applications +cat $CWD/firefox.desktop > $PKG/usr/share/applications/firefox.desktop +mkdir -p $PKG/usr/share/pixmaps +cat $CWD/firefox.png > $PKG/usr/share/pixmaps/firefox.png +mkdir $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/slack-required > $PKG/install/slack-required +sed -e "s/VERSION/$VERSION/g" $CWD/doinst.sh > $PKG/install/doinst.sh +(cd ${PKG}${LIBDIR}/firefox-$VERSION; mv lib* ../; ln -s ../lib* ./ ) +(cd ${PKG}${LIBDIR}/firefox-$VERSION; ln -s mozilla-xremote-client mozilla-firefox-xremote-client) +(cd ${PKG}${LIBDIR}/firefox-$VERSION; ln -sf mozilla-xremote-client firefox-xremote-client) + +cd $PKG +makepkg -l y -c n $TMP/mozilla-firefox-$VERSION-$ARCH-$BUILD.tgz + diff --git a/patches/mozilla-firefox/slack-desc b/patches/mozilla-firefox/slack-desc new file mode 100644 index 00000000..1f064265 --- /dev/null +++ b/patches/mozilla-firefox/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +mozilla-firefox: mozilla-firefox (Mozilla Firefox Web browser) +mozilla-firefox: +mozilla-firefox: This project is a redesign of the Mozilla browser component written +mozilla-firefox: using the XUL user interface language. Firefox empowers you to +mozilla-firefox: browse faster, more safely and more efficiently than with any other +mozilla-firefox: browser. +mozilla-firefox: +mozilla-firefox: +mozilla-firefox: +mozilla-firefox: +mozilla-firefox: diff --git a/patches/mysql/doinst.sh.gz b/patches/mysql/doinst.sh.gz Binary files differnew file mode 100644 index 00000000..6f83b274 --- /dev/null +++ b/patches/mysql/doinst.sh.gz diff --git a/patches/mysql/mysql.SlackBuild b/patches/mysql/mysql.SlackBuild new file mode 100755 index 00000000..ef0eeb7f --- /dev/null +++ b/patches/mysql/mysql.SlackBuild @@ -0,0 +1,178 @@ +#!/bin/bash +# Build and install MySQL on Slackware +# +# by: David Cantrell <david@slackware.com> +# Currently maintained by: Patrick Volkerding <volkerdi@slackware.com> +# +# Small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="mysql" +VERSION=${VERSION:=4.1.21} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:-1rha} +TMP=${TMP:-/tmp} +SRC_DIR=${SRC:=$CWD} +REPOS=${REPOS:=$TMP} + +RTOOL="wget" +PACKAGE_EXT="bz2" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="http://mirror.pacific.net.au/linux/slackware/slackware-10.2/patches/source/mysql/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +SRC_DIR="$SRC_DIR/$PACKAGE" +mkdir -p $SRC_DIR + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" +fi + +if [ ! -d $TMP ]; then + mkdir -p $TMP +fi + +TMP="$TMP/$PACKAGE" +PKG=$TMP/package-$PACKAGE +rm -rf $TMP +mkdir -p $PKG +cd $TMP + +LIBDIR="lib" +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIR="lib64" +fi + +cd $TMP +rm -rf mysql-$VERSION +tar xjvf $SRC_DIR/$SRC +cd mysql-$VERSION +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 666 -exec chmod 644 {} \; +find . -perm 664 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" CXX=gcc CXXFLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/$LIBDIR + --with-mysqld-user=mysql \ + --with-unix-socket-path=/var/run/mysql/mysql.sock \ + --localstatedir=/var/lib/mysql \ + --enable-assembler \ + --with-raid \ + --without-debug \ + --enable-thread-safe-client \ + --without-bench \ + --with-extra-charsets=complex \ + --with-vio \ + --with-openssl \ + --program-prefix="" \ + --program-suffix="" \ + $ARCH-slackware-linux +# +# --without-readline + +make -j3 +make install DESTDIR=$PKG + +# Strip ELF objects: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +mkdir -p $PKG/etc +( cd support-files + cp my-huge.cnf my-large.cnf my-medium.cnf my-small.cnf $PKG/etc ) + +# install docs +mkdir -p $PKG/usr/doc/mysql-$VERSION/Docs +# Don't need the (huge) INSTALL-SOURCE... the source is installed already. +#cp -a COPYING* INSTALL-SOURCE MIRRORS README /usr/doc/mysql-$VERSION +cp -a COPYING* MIRRORS README $PKG/usr/doc/mysql-$VERSION +( cd Docs + cp -a INSTALL-BINARY *.html *.txt Flags \ + $PKG/usr/doc/mysql-$VERSION/Docs ) +# Also too large to justify since the .html version is right there: +rm $PKG/usr/doc/mysql-$VERSION/Docs/manual.txt +find $PKG/usr/doc/mysql-$VERSION -type f -exec chmod 644 {} \; + +# this is the directory where databases are stored +mkdir -p $PKG/var/lib/mysql +chown mysql.mysql $PKG/var/lib/mysql +chmod 750 $PKG/var/lib/mysql + +# this is where the socket is stored +mkdir -p $PKG/var/run/mysql +chown mysql.mysql $PKG/var/run/mysql +chmod 755 $PKG/var/run/mysql + +# Do not include the test suite: +rm -r $PKG/usr/mysql-test + +# Add init script: +mkdir -p $PKG/etc/rc.d +# This is intentionally chmod 644. +zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new + +# Install script: +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Add some handy library symlinks: +if [ -r $PKG/usr/$LIBDIR/mysql/libmysqlclient.so.14 ]; then + mkdir -p $PKG/usr/$LIBDIR + ( cd $PKG/usr/$LIBDIR + rm -f libmysqlclient.so libmysqlclient.so.14 + ln -sf mysql/libmysqlclient.so . + ln -sf mysql/libmysqlclient.so.14 . + ) +fi +if [ -r $PKG/usr/$LIBDIR/mysql/libmysqlclient_r.so.14 ]; then + mkdir -p $PKG/usr/$LIBDIR + ( cd $PKG/usr/$LIBDIR + rm -f libmysqlclient_r.so libmysqlclient_r.so.14 + ln -sf mysql/libmysqlclient_r.so . + ln -sf mysql/libmysqlclient_r.so.14 . + ) +fi + +# Packaging standards: +chown -R root.bin $PKG/usr/bin +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* +gzip -9 $PKG/usr/man/man?/*.? + +# Build package: +cd $PKG +makepkg -l y -c n $REPOS/mysql-$VERSION-$ARCH-$BUILD.tgz + +if [ "$1" == "--cleanup" ]; then + cd $TMP + rm -rf mysql-$VERSION +fi diff --git a/patches/mysql/rc.mysqld.gz b/patches/mysql/rc.mysqld.gz Binary files differnew file mode 100644 index 00000000..38da4f2c --- /dev/null +++ b/patches/mysql/rc.mysqld.gz diff --git a/patches/mysql/slack-desc b/patches/mysql/slack-desc new file mode 100644 index 00000000..29e1b8be --- /dev/null +++ b/patches/mysql/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +mysql: mysql (SQL-based relational database server) +mysql: +mysql: MySQL is a fast, multi-threaded, multi-user, and robust SQL +mysql: (Structured Query Language) database server. It comes with a nice API +mysql: which makes it easy to integrate into other applications. +mysql: +mysql: The home page for MySQL is http://www.mysql.com/ +mysql: +mysql: +mysql: +mysql: diff --git a/patches/openssh/doinst.sh.gz b/patches/openssh/doinst.sh.gz Binary files differnew file mode 100644 index 00000000..6deb310f --- /dev/null +++ b/patches/openssh/doinst.sh.gz diff --git a/patches/openssh/openssh.SlackBuild b/patches/openssh/openssh.SlackBuild new file mode 100755 index 00000000..5a096c6e --- /dev/null +++ b/patches/openssh/openssh.SlackBuild @@ -0,0 +1,210 @@ +#!/bin/bash +# Copyright 2000 BSDi, Inc. Concord, CA, USA +# Copyright 2001, 2002, 2003, 2004 Slackware Linux, Inc. Concord, CA, USA +# Copyright 2006 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Small changes by rhatto. +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="openssh" +VERSION=${VERSION:=4.3p2} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +RTOOL="wget" +PACKAGE_EXT="gz" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="ftp://ftp.openbsd.org.br/pub/OpenBSD/OpenSSH/portable/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + rm -f $SRC_DIR/$SRC.asc + wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL.asc" -O "$SRC_DIR/$SRC.asc" +fi + +gpg --import << EOGPG +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.4 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBDqa5pwRBADJSEyXXsgXiyytN93prDPTPmrueRP9lQQfgaQvCvqK0bN0AF1Z +Vxxk9wlSXQp3+Qw5+qqsN5ovzsn39r9pqGslfCqQn9ACTmsn42+VCyW4hdwUGSBS +5myh65ZJTK1ufWCZFssxQ0EiALagu4DlH6Z2O7tFDnJNagF55vlnK0uMQwCg/8RU +QYDmisEHjkarAapPaupxjhkD/j9riCVasWPYJwAuhiQWAKxGRwp/ZyTaWCSERUBR +4Dg9QxpuwHKIT8BeDA3hJa/9Yxu5jec2NVKbtVSZvRkgUfRNOkrcH2eiY8Iz6est +J64dGWuGMKQW0GEqW+OXpRTTPJZ0mgPmU16qDzLPdx6F3BAk2LG+TTwlKUPuGqOt +6u2EA/4+1CBYZ8mXq9GJnLRBPAoYwSJJzbQnMm9Jat/yg9N6nigSIiFyG8ixh167 +gGGKfzvpjY7DeJzDI0Cub+tRova8gFg+T15AcPMST5v7v6O/ug9aYWERZ0zjUhRH +ybtYLYhUUbdYM29PwGBNfZhGIOYwfFE9UpPS5LeXHs28oVLlH7QuRGFtaWVuIE1p +bGxlciAoUGVyc29uYWwgS2V5KSA8ZGptQG1pbmRyb3Qub3JnPohXBBMRAgAXBQI6 +muacBQsHCgMEAxUDAgMWAgECF4AACgkQzo7LA4b/nEiDMgCZAUzKq241h5GTJxC0 +guS6ht9i9ZsAoL/oXCmFsofARehZF6AakIdasvS9uQINBDqa5tQQCADz/XnCcyle +9hmxgyntr35ZQJKx9g6ftBw178JSwM3O7JNOGp398Eh4Q9rkEp5NH1qVecG953Fu +edT9IAXqr8pjp5tdqMYCcaKy+aJ0Sw1zVD2VOY3h7SyfU25pcYiHEa1grfKPVoWm +53IwWGVVtquF5dimAe75+D0aXyVCOv0Ez9wgJR6H69lp4/cD2GyNaGarwY9HLvHF +vXONY2qm/GV5OjyOUO41gmQ4pyXQh+gocFFHrM0AzveIswgNpJ0xNWXX8iXGsr3Y +Cvqm7JoIU9JKxDV+96bxDLfTdKpoLYKb68WdtmAylsio5+iZfWtdOb/Xpk2Yx5Ld +ady9/+n3m6cvAAURCACrvoVSbd0MR0FWX+bBZ0NjScNBo3kPSSCnQ6jRHokkz55r ++MHe7dqxCJ3pmu7aROl2fgug6wob+7+qXfKke/TdT6wuCb4CdFS6tPgPrfYV+iwq +2NB/BatePGg7Z6UALaULQ0m83DCEVLJNnjemEdIouShelikAAO7QDKMr7vAjH8n0 +zwMpwRMXnvCM6zYlS9i1kOm8LVATk0WyihpQGSaTukdPjKlG7sKwMu20ssK9DGVp +PgulTZ7rHqXl4juY8LQ2j4dPNaPoKWG8JuBVCsyf2D6GNW97PfKQSkzFeZsbVB4S +RQrVTchgBSYoxRVW3fLk/yc3TC5Abh6Gpj4izawUiEYEGBECAAYFAjqa5tQACgkQ +zo7LA4b/nEgftgCdHIZUDVAWDRa5siSi8Aos+IiyAgAAn02wGOl1Wo/YJ+RY+c6K +N58TmAPE +=rCFY +-----END PGP PUBLIC KEY BLOCK----- +EOGPG + +gpg --verify $SRC.asc $SRC || echo WARNING: Could not check signature or WRONG signature found. + +PKG=$TMP/package-openssh + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +fi + +# Clean target location: +rm -rf $PKG +mkdir -p $PKG + +# Prepare the framework and extract the package: +cd $TMP +rm -rf $PKG openssh-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd openssh-$VERSION +chown -R root.root . + +# Compile package: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc/ssh \ + --libdir=$LIBDIR \ + --without-pam \ + --with-md5-passwords \ + --with-tcp-wrappers \ + --with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin \ + --with-ipv4-default \ + --with-privsep-path=/var/empty \ + --with-privsep-user=sshd \ + $ARCH-slackware-linux + +make + +# Install the package: +make install DESTDIR=$PKG + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress the installed manpages: +find $PKG/usr/man -type f -exec gzip -9 {} \; + +# Relink the slogin(1) man page +( cd $PKG/usr/man/man1 + rm -f slogin.1 + ln -sf ssh.1.gz slogin.1.gz +) + +# Install directory used with PrivilegeSeparation option: +mkdir -p $PKG/var/empty +chmod 755 $PKG/var/empty + +# Install docs: +mkdir -p $PKG/usr/doc/openssh-$VERSION +cp -a \ + CREDITS ChangeLog INSTALL LICENCE OVERVIEW README README.privsep README.smartcard RFC.nroff TODO WARNING.RNG \ + $PKG/usr/doc/openssh-$VERSION +chmod 644 $PKG/usr/doc/openssh-$VERSION/* + +# Install also 'ssh-copy-id' and its manpage from contrib: +( cd contrib + cp -a ssh-copy-id $PKG/usr/bin/ssh-copy-id + chown root.bin $PKG/usr/bin/ssh-copy-id + chmod 755 $PKG/usr/bin/ssh-copy-id + cat ssh-copy-id.1 | gzip -9c > $PKG/usr/man/man1/ssh-copy-id.1.gz +) + +# Fix some ownerships per FSSTND: +chown -R root.bin $PKG/usr/bin $PKG/usr/sbin + +( cd $PKG + + # Ditch the new host keys, since these have to be uniquely prepared on each machine: + rm -f etc/ssh/ssh_host_dsa_key + rm -f etc/ssh/ssh_host_dsa_key.pub + rm -f etc/ssh/ssh_host_rsa_key + rm -f etc/ssh/ssh_host_rsa_key.pub + rm -f etc/ssh/ssh_host_key + rm -f etc/ssh/ssh_host_key.pub + + # Set up the config script installation: + mv etc/ssh/ssh_config etc/ssh/ssh_config.new + mv etc/ssh/sshd_config etc/ssh/sshd_config.new + + # Add the init script: + mkdir -p etc/rc.d + cat $CWD/rc.sshd > etc/rc.d/rc.sshd + chmod 755 etc/rc.d/rc.sshd + + # Copy runtime installation files: + mkdir -p install + zcat $CWD/doinst.sh.gz > install/doinst.sh + cat $CWD/slack-desc > install/slack-desc +) + +# Create the package itself: +cd $PKG +makepkg -l y -c n $TMP/openssh-$VERSION-$ARCH-$BUILD.tgz + diff --git a/patches/openssh/rc.sshd b/patches/openssh/rc.sshd new file mode 100644 index 00000000..a3707e36 --- /dev/null +++ b/patches/openssh/rc.sshd @@ -0,0 +1,50 @@ +#!/bin/sh +# Start/stop/restart the secure shell server: + +sshd_start() { + # Create host keys if needed. + if [ ! -r /etc/ssh/ssh_host_key ]; then + /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' + fi + if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then + /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' + fi + /usr/sbin/sshd +} + +sshd_stop() { + killall sshd +} + +sshd_restart() { + if [ -r /var/run/sshd.pid ]; then + echo "WARNING: killing listener process only. To kill every sshd process, you must" + echo " use 'rc.sshd stop'. 'rc.sshd restart' kills only the parent sshd to" + echo " allow an admin logged in through sshd to use 'rc.sshd restart' without" + echo " being cut off. If sshd has been upgraded, new connections will now" + echo " use the new version, which should be a safe enough approach." + kill `cat /var/run/sshd.pid` + else + killall sshd + fi + sleep 1 + sshd_start +} + +case "$1" in +'start') + sshd_start + ;; +'stop') + sshd_stop + ;; +'restart') + sshd_restart + ;; +*) + echo "usage $0 start|stop|restart" +esac + diff --git a/patches/openssh/slack-desc b/patches/openssh/slack-desc new file mode 100644 index 00000000..04277a72 --- /dev/null +++ b/patches/openssh/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +openssh: openssh (Secure Shell daemon and clients) +openssh: +openssh: ssh (Secure Shell) is a program for logging into a remote machine and +openssh: for executing commands on a remote machine. It is intended to replace +openssh: rlogin and rsh, and provide secure encrypted communications between +openssh: two untrusted hosts over an insecure network. sshd (SSH Daemon) is +openssh: the daemon program for ssh. OpenSSH is based on the last free version +openssh: of Tatu Ylonen's SSH, further enhanced and cleaned up by Aaron +openssh: Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de Raadt, and +openssh: Dug Song. It has a homepage at http://www.openssh.com/ +openssh: diff --git a/patches/openssl/doinst.sh.gz b/patches/openssl/doinst.sh.gz Binary files differnew file mode 100644 index 00000000..60a38797 --- /dev/null +++ b/patches/openssl/doinst.sh.gz diff --git a/patches/openssl/openssl.SlackBuild b/patches/openssl/openssl.SlackBuild new file mode 100755 index 00000000..e3995ce4 --- /dev/null +++ b/patches/openssl/openssl.SlackBuild @@ -0,0 +1,307 @@ +#!/bin/bash +# Copyright 2000 BSDi, Inc. Concord, CA, USA +# Copyright 2001, 2002 Slackware Linux, Inc. Concord, CA, USA +# Copyright 2005 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +VERSION=${VERSION:=0.9.7g} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} + +RTOOL="wget" +PACKAGE_EXT="gz" +SRC="openssl-$VERSION.tar.$PACKAGE_EXT" +URL="http://www.openssl.org/source/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + rm -f $SRC_DIR/$SRC.asc + wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL.asc" -O "$SRC_DIR/$SRC.asc" +fi + +gpg --import << EOGPG +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: PGP Key Server 0.9.6 + +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 +=N1Yk +-----END PGP PUBLIC KEY BLOCK----- +EOGPG + +gpg --verify $SRC_DIR/$SRC.asc $SRC || echo WARNING: Could not check signature or WRONG signature found. + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +PKG1=/tmp/package-openssl +PKG2=/tmp/package-ossllibs +NAME1=openssl-$VERSION-$ARCH-$BUILD +NAME2=openssl-solibs-$VERSION-$ARCH-$BUILD + +# So that ls has the right field counts for parsing... +export LC_ALL=C + +# This is used to fix manpage links: +relink() { + ORIGLINE=`/bin/ls -l $1` + LINK=`echo $ORIGLINE | cut -f 9 -d ' '`.gz + FILE=`echo $ORIGLINE | cut -f 11 -d ' '`.gz + rm $1 + if [ -r $FILE ]; then + ln -sf $FILE $LINK + fi +} + +cd /tmp +rm -rf $PKG1 $PKG2 openssl-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd openssl-$VERSION +# Use .so.0, not .so.0.9.7: +zcat $CWD/openssl.soname.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit +# Fix CAN-2005-2969 (SSL 2.0 rollback bug): +zcat $CWD/patch-CAN-2005-2969.diff.gz | patch -p0 --backup --verbose --suffix=.orig || exit +if [ "$ARCH" = "i486" ]; then + # Build with -march=i486 -mcpu=i686: + zcat $CWD/openssl.optsx86.diff.gz | patch -p1 --backup --verbose --suffix=.orig || exit +fi +chown -R root.root . +mkdir -p $PKG1/usr/doc/openssl-$VERSION +cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \ + LICENSE NEWS README README.ENGINE doc $PKG1/usr/doc/openssl-$VERSION +find $PKG1/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \; +find $PKG1/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \; +# These are the known patent issues with OpenSSL: +# name # expires +# MDC-2: 4,908,861 13/03/2007, not included. +# IDEA: 5,214,703 25/05/2010, not included. +# RC5: 5,724,428 03/03/2015, not included. +./config --prefix=/usr --openssldir=/etc/ssl no-mdc2 no-idea no-rc5 shared +make -j4 +make install INSTALL_PREFIX=$PKG1 +mv $PKG1/etc/ssl/openssl.cnf $PKG1/etc/ssl/openssl.cnf.new + +if [ "$ARCH" == "x86_64" ]; then + ( cd $PKG1/usr; mv lib lib64; mkdir lib; mv lib64/pkgconfig lib/pkgconfig ) + strip --strip-unneeded $PKG1/usr/lib64/lib*.so.*.*.* $PKG1/usr/bin/* + ( cd $PKG1/usr/lib64 ; ln -sf libcrypto.so.0 libcrypto.so ) + ( cd $PKG1/usr/lib64 ; ln -sf libssl.so.0 libssl.so ) +else + strip --strip-unneeded $PKG1/usr/lib/lib*.so.*.*.* $PKG1/usr/bin/* + ( cd $PKG1/usr/lib ; ln -sf libcrypto.so.0 libcrypto.so ) + ( cd $PKG1/usr/lib ; ln -sf libssl.so.0 libssl.so ) +fi + +chown -R root.bin $PKG1/usr/bin +mv $PKG1/etc/ssl/man $PKG1/usr +( cd $PKG1/usr/man/man1 ; mv passwd.1 ssl_passwd.1 ) +( cd $PKG1/usr/man/man3 ; mv rand.3 ssl_rand.3 ) +gzip -9 $PKG1/usr/man/man?/* +for mandir in man1 man3 man7 ; do + ( cd $PKG1/usr/man/$mandir + for page in *.? ; do + relink $page + done + ) +done +cd $PKG1 +chmod 755 usr/lib/pkgconfig +mkdir -p install +zcat $CWD/doinst.sh.gz > install/doinst.sh +cat $CWD/slack-desc.openssl > install/slack-desc +makepkg -l y -c n ../${NAME1}.tgz + +# Make runtime package: + +if [ "$ARCH" == "x86_64" ]; then + mkdir -p $PKG2/usr/lib64 + ( cd usr/lib64 ; cp -a lib*.so.*.*.* $PKG2/usr/lib64 ) + ( cd $PKG2/usr/lib64 ; ldconfig -l * ) +else + mkdir -p $PKG2/usr/lib + ( cd usr/lib ; cp -a lib*.so.*.*.* $PKG2/usr/lib ) + ( cd $PKG2/usr/lib ; ldconfig -l * ) +fi + +mkdir -p $PKG2/etc +( cd $PKG2/etc ; cp -a $PKG1/etc/ssl . ) +mkdir -p $PKG2/usr/doc/openssl-$VERSION +( cd /tmp/openssl-$VERSION + cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \ + LICENSE NEWS README README.ENGINE $PKG2/usr/doc/openssl-$VERSION +) +find $PKG2/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \; +find $PKG2/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \; +cd $PKG2 +mkdir -p install +zcat $CWD/doinst.sh.gz > install/doinst.sh +cat $CWD/slack-desc.openssl-solibs > install/slack-desc +makepkg -l y -c n ../${NAME2}.tgz + diff --git a/patches/openssl/openssl.optsx86.diff.gz b/patches/openssl/openssl.optsx86.diff.gz Binary files differnew file mode 100644 index 00000000..2140f2f8 --- /dev/null +++ b/patches/openssl/openssl.optsx86.diff.gz diff --git a/patches/openssl/openssl.soname.diff.gz b/patches/openssl/openssl.soname.diff.gz Binary files differnew file mode 100644 index 00000000..c45092b0 --- /dev/null +++ b/patches/openssl/openssl.soname.diff.gz diff --git a/patches/openssl/patch-CAN-2005-2969.diff.gz b/patches/openssl/patch-CAN-2005-2969.diff.gz Binary files differnew file mode 100644 index 00000000..80af11ee --- /dev/null +++ b/patches/openssl/patch-CAN-2005-2969.diff.gz diff --git a/patches/openssl/slack-desc.openssl b/patches/openssl/slack-desc.openssl new file mode 100644 index 00000000..57227c04 --- /dev/null +++ b/patches/openssl/slack-desc.openssl @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +openssl: openssl (Secure Sockets Layer toolkit) +openssl: +openssl: The OpenSSL certificate management tool and the shared libraries that +openssl: provide various encryption and decryption algorithms and protocols. +openssl: +openssl: This product includes software developed by the OpenSSL Project for +openssl: use in the OpenSSL Toolkit (http://www.openssl.org). This product +openssl: includes cryptographic software written by Eric Young +openssl: (eay@cryptsoft.com). This product includes software written by Tim +openssl: Hudson (tjh@cryptsoft.com). +openssl: diff --git a/patches/openssl/slack-desc.openssl-solibs b/patches/openssl/slack-desc.openssl-solibs new file mode 100644 index 00000000..f65bf12c --- /dev/null +++ b/patches/openssl/slack-desc.openssl-solibs @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +openssl-solibs: openssl-solibs (OpenSSL shared libraries) +openssl-solibs: +openssl-solibs: These shared libraries provide encryption routines required by +openssl-solibs: programs such as openssh. They are also used by KDE's Konqueror web +openssl-solibs: browser to provide secure web connections. +openssl-solibs: +openssl-solibs: This product includes software developed by the OpenSSL Project for +openssl-solibs: use in the OpenSSL Toolkit (http://www.openssl.org). This product +openssl-solibs: includes cryptographic software written by Eric Young +openssl-solibs: (eay@cryptsoft.com). This product includes software written by Tim +openssl-solibs: Hudson (tjh@cryptsoft.com). diff --git a/patches/php/diffao b/patches/php/diffao new file mode 100644 index 00000000..46f308dd --- /dev/null +++ b/patches/php/diffao @@ -0,0 +1,2421 @@ +diff -ur php-4.4.1.orig/TSRM/tsrm.m4 php-4.4.1/TSRM/tsrm.m4 +--- php-4.4.1.orig/TSRM/tsrm.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/TSRM/tsrm.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -53,7 +53,7 @@ + AC_DEFUN([TSRM_CHECK_ST],[ + if test -r "$1/include/st.h"; then + CPPFLAGS="$CPPFLAGS -I$1/include" +- LDFLAGS="$LDFLAGS -L$1/lib" ++ LDFLAGS="$LDFLAGS -L$1/$with__lib" + elif test -r "$1/st.h"; then + CPPFLAGS="$CPPFLAGS -I$1" + LDFLAGS="$LDFLAGS -L$1" +diff -ur php-4.4.1.orig/acinclude.m4 php-4.4.1/acinclude.m4 +--- php-4.4.1.orig/acinclude.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/acinclude.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -194,7 +194,7 @@ + unset ac_new_flags + for i in [$]$1; do + case [$]i in +- -L/usr/lib|-L/usr/lib/[)] ;; ++ -L/usr/$with__lib|-L/usr/$with__lib/[)] ;; + *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; + esac + done +@@ -645,7 +645,7 @@ + ]) + + AC_DEFUN([PHP_PROG_SENDMAIL],[ +-PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib ++PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/$with__lib + AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) + if test -n "$PROG_SENDMAIL"; then + AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail]) +@@ -657,7 +657,7 @@ + AC_MSG_CHECKING([if compiler supports -R]) + AC_CACHE_VAL(php_cv_cc_dashr,[ + SAVE_LIBS=$LIBS +- LIBS="-R /usr/lib $LIBS" ++ LIBS="-R /usr/$with__lib $LIBS" + AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) + LIBS=$SAVE_LIBS]) + AC_MSG_RESULT([$php_cv_cc_dashr]) +@@ -667,7 +667,7 @@ + AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) + AC_CACHE_VAL(php_cv_cc_rpath,[ + SAVE_LIBS=$LIBS +- LIBS="-Wl,-rpath,/usr/lib $LIBS" ++ LIBS="-Wl,-rpath,/usr/$with__lib $LIBS" + AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) + LIBS=$SAVE_LIBS]) + AC_MSG_RESULT([$php_cv_cc_rpath]) +@@ -856,7 +856,7 @@ + dnl add a library to linkpath/runpath + dnl + AC_DEFUN([PHP_ADD_LIBPATH],[ +- if test "$1" != "/usr/lib"; then ++ if test "$1" != "/usr/$with__lib"; then + PHP_EXPAND_PATH($1, ai_p) + ifelse([$2],,[ + _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) +@@ -1748,8 +1748,8 @@ + if test -r $i/include/openssl/evp.h; then + OPENSSL_INCDIR=$i/include + fi +- if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then +- OPENSSL_LIBDIR=$i/lib ++ if test -r $i/$with__lib/libssl.a -o -r $i/$with__lib/libssl.$SHLIB_SUFFIX_NAME; then ++ OPENSSL_LIBDIR=$i/$with__lib + fi + test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break + done +@@ -1870,8 +1870,8 @@ + AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) + fi + +- if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || +- test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME ++ if test -f $ICONV_DIR/$with__lib/lib$iconv_lib_name.a || ++ test -f $ICONV_DIR/$with__lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME + then + PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ + found_iconv=yes +@@ -1881,10 +1881,10 @@ + found_iconv=yes + PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) + ], [], [ +- -L$ICONV_DIR/lib ++ -L$ICONV_DIR/$with__lib + ]) + ], [ +- -L$ICONV_DIR/lib ++ -L$ICONV_DIR/$with__lib + ]) + fi + fi +@@ -1892,7 +1892,7 @@ + if test "$found_iconv" = "yes"; then + if test -n "$ICONV_DIR"; then + AC_DEFINE(HAVE_ICONV, 1, [ ]) +- PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) ++ PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$with__lib, $1) + PHP_ADD_INCLUDE($ICONV_DIR/include) + fi + $2 +diff -ur php-4.4.1.orig/aclocal.m4 php-4.4.1/aclocal.m4 +--- php-4.4.1.orig/aclocal.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/aclocal.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -194,7 +194,7 @@ + unset ac_new_flags + for i in [$]$1; do + case [$]i in +- -L/usr/lib|-L/usr/lib/[)] ;; ++ -L/usr/$with__lib|-L/usr/$with__lib/[)] ;; + *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; + esac + done +@@ -645,7 +645,7 @@ + ]) + + AC_DEFUN([PHP_PROG_SENDMAIL],[ +-PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib ++PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/$with__lib + AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) + if test -n "$PROG_SENDMAIL"; then + AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail]) +@@ -657,7 +657,7 @@ + AC_MSG_CHECKING([if compiler supports -R]) + AC_CACHE_VAL(php_cv_cc_dashr,[ + SAVE_LIBS=$LIBS +- LIBS="-R /usr/lib $LIBS" ++ LIBS="-R /usr/$with__lib $LIBS" + AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) + LIBS=$SAVE_LIBS]) + AC_MSG_RESULT([$php_cv_cc_dashr]) +@@ -667,7 +667,7 @@ + AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) + AC_CACHE_VAL(php_cv_cc_rpath,[ + SAVE_LIBS=$LIBS +- LIBS="-Wl,-rpath,/usr/lib $LIBS" ++ LIBS="-Wl,-rpath,/usr/$with__lib $LIBS" + AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) + LIBS=$SAVE_LIBS]) + AC_MSG_RESULT([$php_cv_cc_rpath]) +@@ -856,7 +856,7 @@ + dnl add a library to linkpath/runpath + dnl + AC_DEFUN([PHP_ADD_LIBPATH],[ +- if test "$1" != "/usr/lib"; then ++ if test "$1" != "/usr/$with__lib"; then + PHP_EXPAND_PATH($1, ai_p) + ifelse([$2],,[ + _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) +@@ -1748,8 +1748,8 @@ + if test -r $i/include/openssl/evp.h; then + OPENSSL_INCDIR=$i/include + fi +- if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then +- OPENSSL_LIBDIR=$i/lib ++ if test -r $i/$with__lib/libssl.a -o -r $i/$with__lib/libssl.$SHLIB_SUFFIX_NAME; then ++ OPENSSL_LIBDIR=$i/$with__lib + fi + test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break + done +@@ -1870,8 +1870,8 @@ + AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) + fi + +- if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || +- test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME ++ if test -f $ICONV_DIR/$with__lib/lib$iconv_lib_name.a || ++ test -f $ICONV_DIR/$with__lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME + then + PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ + found_iconv=yes +@@ -1881,10 +1881,10 @@ + found_iconv=yes + PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) + ], [], [ +- -L$ICONV_DIR/lib ++ -L$ICONV_DIR/$with__lib + ]) + ], [ +- -L$ICONV_DIR/lib ++ -L$ICONV_DIR/$with__lib + ]) + fi + fi +@@ -1892,7 +1892,7 @@ + if test "$found_iconv" = "yes"; then + if test -n "$ICONV_DIR"; then + AC_DEFINE(HAVE_ICONV, 1, [ ]) +- PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) ++ PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$with__lib, $1) + PHP_ADD_INCLUDE($ICONV_DIR/include) + fi + $2 +@@ -2915,7 +2915,7 @@ + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' + else +- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' ++ lt_cv_prog_cc_static='-bnso -bI:/$with__lib/syscalls.exp' + fi + ;; + +@@ -3314,7 +3314,7 @@ + else $CC -o impgen impgen.c ; fi)~ + $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' + +- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' ++ old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-$with__lib $output_objdir/$newlib' + + # cygwin and mingw dlls have different entry points and sets of symbols + # to exclude. +@@ -3374,7 +3374,7 @@ + $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ + $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ + $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ +- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ ++ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-$with__lib $output_objdir/$libname.dll.a~ + $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' + ;; + +@@ -3540,15 +3540,15 @@ + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/$with__lib:/$with__lib' + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/$with__lib:/$with__lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else +- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ++ hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/$with__lib:/$with__lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' +@@ -3575,13 +3575,13 @@ + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. +- libext=lib ++ libext=$with__lib + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ # FIXME: Should let the user specify the $with__lib program. ++ old_archive_cmds='$with__lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + ;; + +@@ -3598,7 +3598,7 @@ + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +- archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' ++ archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${$with__lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${$with__lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' + # We need to add '_' to the symbols in $export_symbols first + #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' + hardcode_direct=yes +@@ -3615,7 +3615,7 @@ + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/$with__lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no +@@ -3949,8 +3949,8 @@ + shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++sys_lib_dlsearch_path_spec="/$with__lib /usr/$with__lib" ++sys_lib_search_path_spec="/$with__lib /usr/$with__lib /usr/local/$with__lib" + + case $host_os in + aix3*) +@@ -3993,8 +3993,8 @@ + # add versioning support to collect2, so additional links can + # be useful in future. + if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib<name>.so +- # instead of lib<name>.a to let people know that these are not ++ # If using run time linking (on AIX 4.2 or later) use $with__lib<name>.so ++ # instead of $with__lib<name>.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + else +@@ -4027,11 +4027,11 @@ + soname_spec='${libname}${release}.so$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ sys_lib_search_path_spec="/shlib /usr/$with__lib /usr/X11/$with__lib /usr/contrib/$with__lib /$with__lib /usr/local/$with__lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/$with__lib /usr/local/$with__lib" + export_dynamic_flag_spec=-rdynamic +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # the default ld.so.conf also contains /usr/contrib/$with__lib and ++ # /usr/X11R6/$with__lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +@@ -4042,7 +4042,7 @@ + case $GCC,$host_os in + yes,cygwin*) + library_names_spec='$libname.dll.a' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' ++ soname_spec='`echo ${libname} | sed -e 's/^$with__lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' + postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ +@@ -4056,7 +4056,7 @@ + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` + ;; + yes,pw32*) +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ++ library_names_spec='`echo ${libname} | sed -e 's/^$with__lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' + ;; + *) + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' +@@ -4164,7 +4164,7 @@ + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + ;; + +-# No shared lib support for Linux oldld, aout, or coff. ++# No shared $with__lib support for Linux oldld, aout, or coff. + linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) + dynamic_linker=no + ;; +@@ -4184,7 +4184,7 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # We used to test for /$with__lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and +@@ -4273,7 +4273,7 @@ + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/$with__lib /usr/$with__lib/cmplrs/cc /usr/$with__lib /usr/local/$with__lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes + ;; +@@ -4329,7 +4329,7 @@ + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ sys_lib_search_path_spec='/$with__lib /usr/$with__lib /usr/ccs/$with__lib' + ;; + esac + ;; +@@ -4662,7 +4662,7 @@ + # Must we lock files when doing compilation ? + need_locks=$lt_need_locks + +-# Do we need the lib prefix for modules? ++# Do we need the $with__lib prefix for modules? + need_lib_prefix=$need_lib_prefix + + # Do we need a version for libraries? +@@ -5353,7 +5353,7 @@ + ;; + + bsdi4*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic $with__lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; +@@ -5371,7 +5371,7 @@ + lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` + ;; + *) # Darwin 1.3 on +- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' ++ lt_cv_file_magic_test_file='/usr/$with__lib/libSystem.dylib' + ;; + esac + ;; +@@ -5384,7 +5384,7 @@ + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ lt_cv_file_magic_test_file=`echo /usr/$with__lib/libc.so.*` + ;; + esac + else +@@ -5399,14 +5399,14 @@ + hpux10.20*|hpux11*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ lt_cv_file_magic_test_file=/usr/$with__lib/libc.sl + ;; + + irix5* | irix6* | nonstopux*) + case $host_os in + irix5* | nonstopux*) + # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ++ lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic $with__lib MIPS - version 1" + ;; + *) + case $LD in +@@ -5416,7 +5416,7 @@ + *) libmagic=never-match;; + esac + # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ++ lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic $with__lib MIPS - version 1" + ;; + esac + lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` +@@ -5430,28 +5430,28 @@ + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic $with__lib )' ;; + esac +- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ++ lt_cv_file_magic_test_file=`echo /$with__lib/libc.so* /$with__lib/libc-*.so` + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' ++ lt_cv_deplibs_check_method='match_pattern /$with__lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' + else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' ++ lt_cv_deplibs_check_method='match_pattern /$with__lib[[^/\.]]+\.so$' + fi + ;; + + newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic $with__lib)' + lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ lt_cv_file_magic_test_file=/usr/$with__lib/libnls.so + ;; + + openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ lt_cv_file_magic_test_file=`echo /usr/$with__lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else +@@ -5472,7 +5472,7 @@ + + solaris*) + lt_cv_deplibs_check_method=pass_all +- lt_cv_file_magic_test_file=/lib/libc.so ++ lt_cv_file_magic_test_file=/$with__lib/libc.so + ;; + + sysv5* | sysv4*uw2*) +@@ -5483,20 +5483,20 @@ + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + case $host_vendor in + motorola) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic $with__lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/$with__lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic $with__lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic $with__lib" ++ lt_cv_file_magic_test_file=/$with__lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all +diff -ur php-4.4.1.orig/configure.in php-4.4.1/configure.in +--- php-4.4.1.orig/configure.in 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/configure.in 2006-01-08 11:49:26.000000000 +0000 +@@ -248,7 +248,11 @@ + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) + +- ++AC_ARG_WITH([_lib], ++[ --with-_lib library name [[default: lib]]], ++[], ++[with__lib=lib] ++) + + divert(2) + +@@ -314,11 +318,11 @@ + PHP_PROG_SENDMAIL + dnl Check whether the system uses EBCDIC (not ASCII) as its native codeset + PHP_EBCDIC +-dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary ++dnl Check for /usr/pkg/{$with__lib,include} which is where NetBSD puts binary + dnl and source packages. This should be harmless on other OSs. +-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then ++if test -d /usr/pkg/include -a -d /usr/pkg/$with__lib ; then + CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" +- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" ++ LDFLAGS="$LDFLAGS -L/usr/pkg/$with__lib" + fi + test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib) + +@@ -684,7 +688,7 @@ + PHP_ARG_WITH(config-file-path,[path to configuration file], + [ --with-config-file-path=PATH + Sets the path in which to look for php.ini, +- defaults to PREFIX/lib], DEFAULT, no) ++ defaults to PREFIX/$with__lib], DEFAULT, no) + + if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then + case $PHP_LAYOUT in +@@ -906,7 +910,7 @@ + fi + + PHP_ARG_WITH(pear, [whether to install PEAR], +-[ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php) ++[ --with-pear=DIR Install PEAR in DIR (default PREFIX/$with__lib/php) + --without-pear Do not install PEAR], DEFAULT, yes) + + if test "$PHP_PEAR" != "no"; then +@@ -995,7 +999,7 @@ + test "$program_suffix" = "NONE" && program_suffix= + + case $libdir in +- '${exec_prefix}/lib') ++ '${exec_prefix}/$with__lib') + libdir=$libdir/php + ;; + esac +@@ -1076,7 +1080,7 @@ + AC_SUBST(EXPANDED_PHP_CONFIG_FILE_SCAN_DIR) + + if test -n "$php_ldflags_add_usr_lib"; then +- PHP_RPATHS="$PHP_RPATHS /usr/lib" ++ PHP_RPATHS="$PHP_RPATHS /usr/$with__lib" + fi + + PHP_UTILIZE_RPATHS +diff -ur php-4.4.1.orig/ext/bz2/config.m4 php-4.4.1/ext/bz2/config.m4 +--- php-4.4.1.orig/ext/bz2/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/bz2/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -27,12 +27,12 @@ + PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, + [ + PHP_ADD_INCLUDE($BZIP_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$with__lib, BZ2_SHARED_LIBADD) + AC_DEFINE(HAVE_BZ2,1,[ ]) + ], [ + AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0) + ], [ +- -L$BZIP_DIR/lib ++ -L$BZIP_DIR/$with__lib + ]) + + PHP_NEW_EXTENSION(bz2, bz2.c, $ext_shared) +diff -ur php-4.4.1.orig/ext/cpdf/config.m4 php-4.4.1/ext/cpdf/config.m4 +--- php-4.4.1.orig/ext/cpdf/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/cpdf/config.m4 2006-01-08 11:56:29.000000000 +0000 +@@ -4,7 +4,7 @@ + AC_ARG_WITH(jpeg-dir, + [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ + for i in $withval /usr/local /usr; do +- if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then ++ if test -f "$i/$with__lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$with__lib/libjpeg.a"; then + CPDF_JPEG_DIR=$i + break; + fi +@@ -13,11 +13,11 @@ + AC_MSG_ERROR([libjpeg.(a|so) not found.]) + fi + PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ +- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/$with__lib, CPDF_SHARED_LIBADD) + ] ,[ + AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) + ], [ +- -L$CPDF_JPEG_DIR/lib ++ -L$CPDF_JPEG_DIR/$with__lib + ]) + ],) + ]) +@@ -26,7 +26,7 @@ + AC_ARG_WITH(tiff-dir, + [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ + for i in $withval /usr/local /usr; do +- if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then ++ if test -f "$i/$with__lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/$with__lib/libtiff.a"; then + CPDF_TIFF_DIR=$i + break; + fi +@@ -35,11 +35,11 @@ + AC_MSG_ERROR([libtiff.(a|so) not found.]) + fi + PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ +- PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/$with__lib, CPDF_SHARED_LIBADD) + ] ,[ + AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) + ], [ +- -L$CPDF_TIFF_DIR/lib ++ -L$CPDF_TIFF_DIR/$with__lib + ]) + ],) + ]) +@@ -65,13 +65,13 @@ + ], [ + AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) + ], [ +- -L$i/lib $CPDF_SHARED_LIBADD ++ -L$i/$with__lib $CPDF_SHARED_LIBADD + ]) + ], [ +- -L$i/lib $CPDF_SHARED_LIBADD ++ -L$i/$with__lib $CPDF_SHARED_LIBADD + ]) + +- PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/$with__lib, CPDF_SHARED_LIBADD) + PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) + AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) + break +diff -ur php-4.4.1.orig/ext/crack/config.m4 php-4.4.1/ext/crack/config.m4 +--- php-4.4.1.orig/ext/crack/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/crack/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -7,7 +7,7 @@ + + if test "$PHP_CRACK" != "no"; then + +- for i in $PHP_CRACK/lib $PHP_CRACK/cracklib /usr/local/lib /usr/lib; do ++ for i in $PHP_CRACK/$with__lib $PHP_CRACK/cracklib /usr/local/$with__lib /usr/$with__lib; do + test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i && break + test -f $i/libcrack_krb5.$SHLIB_SUFFIX_NAME -o -f $i/libcrack_krb5.a && CRACK_LIBDIR=$i && break + done +diff -ur php-4.4.1.orig/ext/curl/config.m4 php-4.4.1/ext/curl/config.m4 +--- php-4.4.1.orig/ext/curl/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/curl/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -51,7 +51,7 @@ + + PHP_ADD_INCLUDE($CURL_DIR/include) + PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$with__lib, CURL_SHARED_LIBADD) + + PHP_CHECK_LIBRARY(curl,curl_easy_perform, + [ +@@ -59,14 +59,14 @@ + ],[ + AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) + ],[ +- $CURL_LIBS -L$CURL_DIR/lib ++ $CURL_LIBS -L$CURL_DIR/$with__lib + ]) + + PHP_CHECK_LIBRARY(curl,curl_version_info, + [ + AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ]) + ],[],[ +- $CURL_LIBS -L$CURL_DIR/lib ++ $CURL_LIBS -L$CURL_DIR/$with__lib + ]) + + dnl if test "$PHP_CURLWRAPPERS" != "no" ; then +diff -ur php-4.4.1.orig/ext/cyrus/config.m4 php-4.4.1/ext/cyrus/config.m4 +--- php-4.4.1.orig/ext/cyrus/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/cyrus/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -16,7 +16,7 @@ + for i in $PHP_CYRUS /usr/local /usr; do + if test -r $i/include/cyrus/imclient.h && test "$found_cyrus" = "no"; then + PHP_ADD_INCLUDE($i/include) +- PHP_ADD_LIBRARY_WITH_PATH(cyrus, $i/lib, CYRUS_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(cyrus, $i/$with__lib, CYRUS_SHARED_LIBADD) + found_cyrus=yes + CYRUS_INCPATH=$i/include + break 2 +@@ -50,10 +50,10 @@ + fi + + if test "$found_sasl" = "yes"; then +- if test -f $i/lib/libsasl2.a || test -f $i/lib/libsasl2.$SHLIB_SUFFIX_NAME; then +- PHP_ADD_LIBRARY_WITH_PATH(sasl2, $i/lib, CYRUS_SHARED_LIBADD) ++ if test -f $i/$with__lib/libsasl2.a || test -f $i/$with__lib/libsasl2.$SHLIB_SUFFIX_NAME; then ++ PHP_ADD_LIBRARY_WITH_PATH(sasl2, $i/$with__lib, CYRUS_SHARED_LIBADD) + else +- PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, CYRUS_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/$with__lib, CYRUS_SHARED_LIBADD) + fi + break 2 + fi +@@ -70,8 +70,8 @@ + if test "$PHP_OPENSSL" = "no"; then + for i in $PHP_CYRUS /usr/local /usr; do + if test -r $i/include/openssl/ssl.h; then +- PHP_ADD_LIBRARY_WITH_PATH(ssl, $i/lib, CYRUS_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(crypto, $i/lib, CYRUS_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ssl, $i/$with__lib, CYRUS_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(crypto, $i/$with__lib, CYRUS_SHARED_LIBADD) + break 2 + fi + done +diff -ur php-4.4.1.orig/ext/dba/config.m4 php-4.4.1/ext/dba/config.m4 +--- php-4.4.1.orig/ext/dba/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/dba/config.m4 2006-01-08 11:51:20.000000000 +0000 +@@ -21,7 +21,7 @@ + dnl Assign INCLUDE/LFLAGS from PREFIX + AC_DEFUN([PHP_DBA_STD_ASSIGN],[ + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then +- THIS_LFLAGS=$THIS_PREFIX/lib ++ THIS_LFLAGS=$THIS_PREFIX/$with__lib + fi + ]) + +@@ -85,7 +85,7 @@ + AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_GDBM, 1, [ ]) + THIS_LIBS=gdbm +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/$with__lib]) + fi + + PHP_DBA_STD_ASSIGN +@@ -117,7 +117,7 @@ + AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_NDBM, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/$with__lib]) + if test -n "$THIS_LIBS"; then + break + fi +@@ -135,8 +135,8 @@ + dnl parameters(version, library list, function) + AC_DEFUN([PHP_DBA_DB_CHECK],[ + for LIB in $2; do +- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then +- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ ++ if test -f $THIS_PREFIX/$with__lib/lib$LIB.a -o -f $THIS_PREFIX/$with__lib/lib$LIB.$SHLIB_SUFFIX_NAME; then ++ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$with__lib, -l$LIB,[ + AC_TRY_LINK([ + #include "$THIS_INCLUDE" + ],[ +@@ -328,7 +328,7 @@ + fi + AC_DEFINE(DBA_DBM, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/$with__lib]) + if test -n "$THIS_LIBS"; then + break + fi +@@ -370,7 +370,7 @@ + AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_CDB, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/$with__lib]) + if test -n "$THIS_LIBS"; then + break + fi +diff -ur php-4.4.1.orig/ext/domxml/config.m4 php-4.4.1/ext/domxml/config.m4 +--- php-4.4.1.orig/ext/domxml/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/domxml/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -50,7 +50,7 @@ + + PHP_DOM_CHECK_VERSION + +- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then ++ if test -f $DOMXML_DIR/$with__lib/libxml2.a -o -f $DOMXML_DIR/$with__lib/libxml2.$SHLIB_SUFFIX_NAME ; then + DOM_LIBNAME=xml2 + else + DOM_LIBNAME=xml +@@ -62,7 +62,7 @@ + DOM_LIBS=`$XML2_CONFIG --libs` + PHP_EVAL_LIBLINE($DOM_LIBS, DOMXML_SHARED_LIBADD) + else +- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/$with__lib, DOMXML_SHARED_LIBADD) + fi + + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) +@@ -70,7 +70,7 @@ + if test "$PHP_ZLIB_DIR" = "no"; then + AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>) + else +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$with__lib, DOMXML_SHARED_LIBADD) + fi + + AC_DEFINE(HAVE_DOMXML,1,[ ]) +@@ -137,7 +137,7 @@ + + PHP_DOM_XSLT_CHECK_VERSION + +- PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/$with__lib, DOMXML_SHARED_LIBADD) + + PHP_ADD_INCLUDE($DOMXSLT_DIR/include) + +@@ -145,17 +145,17 @@ + AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>) + fi + +- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then ++ if test -f $DOMXML_DIR/$with__lib/libxml2.a -o -f $DOMXML_DIR/$with__lib/libxml2.$SHLIB_SUFFIX_NAME ; then + DOM_LIBNAME=xml2 + else + DOM_LIBNAME=xml + fi + +- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/$with__lib, DOMXML_SHARED_LIBADD) + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) + +- if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then +- PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) ++ if test -f $DOMXML_DIR/$with__lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/$with__lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then ++ PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/$with__lib, DOMXML_SHARED_LIBADD) + fi + + AC_DEFINE(HAVE_DOMXSLT,1,[ ]) +@@ -187,7 +187,7 @@ + + PHP_DOM_EXSLT_CHECK_VERSION + +- PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/$with__lib, DOMXML_SHARED_LIBADD) + + PHP_ADD_INCLUDE($DOMEXSLT_DIR/include) + +diff -ur php-4.4.1.orig/ext/fbsql/config.m4 php-4.4.1/ext/fbsql/config.m4 +--- php-4.4.1.orig/ext/fbsql/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/fbsql/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -13,7 +13,7 @@ + FBSQL_INSTALLATION_DIR="" + if test "$PHP_FBSQL" = "yes"; then + +- for i in /Local/Library /usr/local /usr /opt /Library /usr/lib; do ++ for i in /Local/Library /usr/local /usr /opt /Library /usr/$with__lib; do + if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h; then + FBSQL_INSTALLATION_DIR=$i/FrontBase + break +@@ -33,11 +33,11 @@ + fi + fi + +- if test ! -r "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a"; then +- AC_MSG_ERROR(Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a) ++ if test ! -r "$FBSQL_INSTALLATION_DIR/$with__lib/libFBCAccess.a"; then ++ AC_MSG_ERROR(Could not find $FBSQL_INSTALLATION_DIR/$with__lib/libFBCAccess.a) + fi + +- PHP_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/lib, FBSQL_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/$with__lib, FBSQL_SHARED_LIBADD) + PHP_ADD_INCLUDE($FBSQL_INSTALLATION_DIR/include) + PHP_SUBST(FBSQL_SHARED_LIBADD) + fi +diff -ur php-4.4.1.orig/ext/fdf/config.m4 php-4.4.1/ext/fdf/config.m4 +--- php-4.4.1.orig/ext/fdf/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/fdf/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -49,7 +49,7 @@ + + FDFLIBRARY="" + for file in fdftk FdfTk; do +- for dir in $FDFTK_DIR/lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do ++ for dir in $FDFTK_DIR/$with__lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do + if test -r $dir/lib$file.so; then + PHP_CHECK_LIBRARY($file, FDFOpen, [FDFLIBRARY=$file], [], [-L$dir -lm]) + if test "$FDFLIBRARY"; then +diff -ur php-4.4.1.orig/ext/gd/config.m4 php-4.4.1/ext/gd/config.m4 +--- php-4.4.1.orig/ext/gd/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/gd/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -51,7 +51,7 @@ + if test "$PHP_JPEG_DIR" != "no"; then + + for i in $PHP_JPEG_DIR /usr/local /usr; do +- test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break ++ test -f $i/$with__lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$with__lib/libjpeg.a && GD_JPEG_DIR=$i && break + done + + if test -z "$GD_JPEG_DIR"; then +@@ -61,11 +61,11 @@ + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, + [ + PHP_ADD_INCLUDE($GD_JPEG_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/$with__lib, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_JPEG_DIR/lib ++ -L$GD_JPEG_DIR/$with__lib + ]) + else + AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>]) +@@ -76,7 +76,7 @@ + if test "$PHP_PNG_DIR" != "no"; then + + for i in $PHP_PNG_DIR /usr/local /usr; do +- test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break ++ test -f $i/$with__lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$with__lib/libpng.a && GD_PNG_DIR=$i && break + done + + if test -z "$GD_PNG_DIR"; then +@@ -94,12 +94,12 @@ + PHP_CHECK_LIBRARY(png,png_write_image, + [ + PHP_ADD_INCLUDE($GD_PNG_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$with__lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$with__lib, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) + ],[ +- -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib ++ -L$PHP_ZLIB_DIR/$with__lib -lz -L$GD_PNG_DIR/$with__lib + ]) + + else +@@ -111,7 +111,7 @@ + if test "$PHP_XPM_DIR" != "no"; then + + for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do +- test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break ++ test -f $i/$with__lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$with__lib/libXpm.a && GD_XPM_DIR=$i && break + done + + if test -z "$GD_XPM_DIR"; then +@@ -129,12 +129,12 @@ + PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, + [ + PHP_ADD_INCLUDE($GD_XPM_INC) +- PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/$with__lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/$with__lib, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_XPM_DIR/lib -lX11 ++ -L$GD_XPM_DIR/$with__lib -lX11 + ]) + else + AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>) +@@ -163,7 +163,7 @@ + fi + if test -n "$TTF_DIR" ; then + AC_DEFINE(HAVE_LIBTTF,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$with__lib, GD_SHARED_LIBADD) + fi + if test -z "$TTF_INC_DIR"; then + TTF_INC_DIR=$TTF_DIR/include +@@ -187,7 +187,7 @@ + done + + if test -n "$FREETYPE2_DIR" ; then +- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$with__lib, GD_SHARED_LIBADD) + PHP_ADD_INCLUDE($FREETYPE2_DIR/include) + PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) + AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) +@@ -215,11 +215,11 @@ + [ + AC_DEFINE(HAVE_LIBT1,1,[ ]) + PHP_ADD_INCLUDE($GD_T1_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/$with__lib, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_T1_DIR/lib ++ -L$GD_T1_DIR/$with__lib + ]) + fi + ]) +@@ -365,7 +365,7 @@ + done + + dnl Library path +- for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do ++ for i in $with__lib/gd1.3 $with__lib/gd $with__lib gd1.3 gd ""; do + test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" + done + +diff -ur php-4.4.1.orig/ext/gettext/config.m4 php-4.4.1/ext/gettext/config.m4 +--- php-4.4.1.orig/ext/gettext/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/gettext/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -14,7 +14,7 @@ + AC_MSG_ERROR(Cannot locate header file libintl.h) + fi + +- GETTEXT_LIBDIR=$GETTEXT_DIR/lib ++ GETTEXT_LIBDIR=$GETTEXT_DIR/$with__lib + GETTEXT_INCDIR=$GETTEXT_DIR/include + + O_LDFLAGS=$LDFLAGS +diff -ur php-4.4.1.orig/ext/gmp/config.m4 php-4.4.1/ext/gmp/config.m4 +--- php-4.4.1.orig/ext/gmp/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/gmp/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -21,13 +21,13 @@ + [],[ + AC_MSG_ERROR([GNU MP Library version 4.1.2 or greater required.]) + ],[ +- -L$GMP_DIR/lib ++ -L$GMP_DIR/$with__lib + ]) + ],[ +- -L$GMP_DIR/lib ++ -L$GMP_DIR/$with__lib + ]) + +- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/$with__lib, GMP_SHARED_LIBADD) + PHP_ADD_INCLUDE($GMP_DIR/include) + + PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared) +diff -ur php-4.4.1.orig/ext/hwapi/config.m4 php-4.4.1/ext/hwapi/config.m4 +--- php-4.4.1.orig/ext/hwapi/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/hwapi/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -23,7 +23,7 @@ + + PHP_ADD_INCLUDE($HWAPI_DIR/include/hwapi) + PHP_SUBST(HWAPI_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(hwapi, $HWAPI_DIR/lib, HWAPI_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(hwapi, $HWAPI_DIR/$with__lib, HWAPI_SHARED_LIBADD) + AC_DEFINE(HAVE_HWAPI,1,[ ]) + + PHP_REQUIRE_CXX +diff -ur php-4.4.1.orig/ext/iconv/config.m4 php-4.4.1/ext/iconv/config.m4 +--- php-4.4.1.orig/ext/iconv/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/iconv/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -24,7 +24,7 @@ + fi + + CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" +- LDFLAGS="-L$PHP_ICONV_PREFIX/lib $LDFLAGS" ++ LDFLAGS="-L$PHP_ICONV_PREFIX/$with__lib $LDFLAGS" + + if test -r $PHP_ICONV_PREFIX/include/giconv.h; then + PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" +diff -ur php-4.4.1.orig/ext/imap/config.m4 php-4.4.1/ext/imap/config.m4 +--- php-4.4.1.orig/ext/imap/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/imap/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -160,13 +160,13 @@ + + if test -r "$IMAP_DIR/c-client/c-client.a"; then + ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +- elif test -r "$IMAP_DIR/lib/c-client.a"; then +- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 ++ elif test -r "$IMAP_DIR/$with__lib/c-client.a"; then ++ ln -s "$IMAP_DIR/$with__lib/c-client.a" "$IMAP_DIR/$with__lib/libc-client.a" >/dev/null 2>&1 + fi + + for lib in c-client4 c-client imap; do + IMAP_LIB=$lib +- IMAP_LIB_CHK(lib) ++ IMAP_LIB_CHK($with__lib) + IMAP_LIB_CHK(c-client) + done + +diff -ur php-4.4.1.orig/ext/ingres_ii/config.m4 php-4.4.1/ext/ingres_ii/config.m4 +--- php-4.4.1.orig/ext/ingres_ii/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/ingres_ii/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -23,10 +23,10 @@ + AC_MSG_ERROR(Cannot find iiapi.h under $II_DIR/files) + fi + +- if test -r $II_DIR/lib/libiiapi.a; then +- II_LIB_DIR=$II_DIR/lib ++ if test -r $II_DIR/$with__lib/libiiapi.a; then ++ II_LIB_DIR=$II_DIR/$with__lib + else +- AC_MSG_ERROR(Cannot find libiiapi.a under $II_DIR/lib) ++ AC_MSG_ERROR(Cannot find libiiapi.a under $II_DIR/$with__lib) + fi + + PHP_ADD_LIBRARY_WITH_PATH(iiapi.1, $II_LIB_DIR, II_SHARED_LIBADD) +diff -ur php-4.4.1.orig/ext/interbase/config.m4 php-4.4.1/ext/interbase/config.m4 +--- php-4.4.1.orig/ext/interbase/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/interbase/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -9,10 +9,10 @@ + if test "$PHP_INTERBASE" != "no"; then + if test "$PHP_INTERBASE" = "yes"; then + IBASE_INCDIR=/usr/interbase/include +- IBASE_LIBDIR=/usr/interbase/lib ++ IBASE_LIBDIR=/usr/interbase/$with__lib + else + IBASE_INCDIR=$PHP_INTERBASE/include +- IBASE_LIBDIR=$PHP_INTERBASE/lib ++ IBASE_LIBDIR=$PHP_INTERBASE/$with__lib + fi + + PHP_CHECK_LIBRARY(gds, isc_detach_database, +diff -ur php-4.4.1.orig/ext/ircg/config.m4 php-4.4.1/ext/ircg/config.m4 +--- php-4.4.1.orig/ext/ircg/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/ircg/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -26,7 +26,7 @@ + + PHP_EVAL_LIBLINE(`$IRCG_CONFIG --ldflags`) + PHP_EVAL_INCLINE(`$IRCG_CONFIG --cppflags`) +- PHP_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/lib) ++ PHP_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/$with__lib) + PHP_ADD_INCLUDE($PHP_IRCG/include) + if test "$PHP_SAPI" = "thttpd"; then + AC_DEFINE(IRCG_WITH_THTTPD, 1, [Whether thttpd is available]) +diff -ur php-4.4.1.orig/ext/java/config.m4 php-4.4.1/ext/java/config.m4 +--- php-4.4.1.orig/ext/java/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/java/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -57,17 +57,17 @@ + + AC_DEFUN([JAVA_CHECK_LIB], [ + AC_MSG_CHECKING([Checking for libjava]) +- if test -d $PHP_JAVA/lib/kaffe; then +- PHP_ADD_LIBPATH($PHP_JAVA/lib) ++ if test -d $PHP_JAVA/$with__lib/kaffe; then ++ PHP_ADD_LIBPATH($PHP_JAVA/$with__lib) + JAVA_CFLAGS=-DKAFFE + JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe + JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar + JAVA_LIB=kaffevm +- JAVA_LIBPATH=$PHP_JAVA/lib/kaffe ++ JAVA_LIBPATH=$PHP_JAVA/$with__lib/kaffe + java_libext=kaffevm + +- test -f $PHP_JAVA/lib/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/lib +- test -f $PHP_JAVA/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/lib/kaffe ++ test -f $PHP_JAVA/$with__lib/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/$with__lib ++ test -f $PHP_JAVA/$with__lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/$with__lib/kaffe + + dnl + dnl accomodate old versions of kaffe which don't support jar +@@ -75,22 +75,22 @@ + if kaffe -version 2>&1 | grep 1.0b > /dev/null; then + JAVA_JAR='zip -q0' + fi +- elif test -f $PHP_JAVA/lib/$java_libext; then ++ elif test -f $PHP_JAVA/$with__lib/$java_libext; then + JAVA_LIB=java +- JAVA_LIBPATH=$PHP_JAVA/lib ++ JAVA_LIBPATH=$PHP_JAVA/$with__lib + JAVA_INCLUDE=-I$PHP_JAVA/include + +- test -f $PHP_JAVA/lib/classes.zip && JAVA_CFLAGS=-DJNI_11 +- test -f $PHP_JAVA/lib/jvm.jar && JAVA_CFLAGS=-DJNI_12 +- test -f $PHP_JAVA/lib/classes.zip && JAVA_CLASSPATH=$PHP_JAVA/lib/classes.zip +- test -f $PHP_JAVA/lib/jvm.jar && JAVA_CLASSPATH=$PHP_JAVA/lib/jvm.jar ++ test -f $PHP_JAVA/$with__lib/classes.zip && JAVA_CFLAGS=-DJNI_11 ++ test -f $PHP_JAVA/$with__lib/jvm.jar && JAVA_CFLAGS=-DJNI_12 ++ test -f $PHP_JAVA/$with__lib/classes.zip && JAVA_CLASSPATH=$PHP_JAVA/$with__lib/classes.zip ++ test -f $PHP_JAVA/$with__lib/jvm.jar && JAVA_CLASSPATH=$PHP_JAVA/$with__lib/jvm.jar + + for i in $PHP_JAVA/include/*; do + test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i" + done + dnl + dnl sample JDK v 1.4 path +- dnl /usr/java/j2sdk1.4.0_01/jre/lib/i386/libjava.so ++ dnl /usr/java/j2sdk1.4.0_01/jre/$with__lib/i386/libjava.so + dnl + else + dnl +diff -ur php-4.4.1.orig/ext/ldap/config.m4 php-4.4.1/ext/ldap/config.m4 +--- php-4.4.1.orig/ext/ldap/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/ldap/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -6,15 +6,15 @@ + if test -f $1/include/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/include +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/$with__lib + elif test -f $1/include/umich-ldap/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/include/umich-ldap +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/$with__lib + elif test -f $1/ldap/public/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/ldap/public +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/$with__lib + fi + ]) + +diff -ur php-4.4.1.orig/ext/mbstring/config.m4 php-4.4.1/ext/mbstring/config.m4 +--- php-4.4.1.orig/ext/mbstring/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mbstring/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -168,11 +168,11 @@ + fi + + PHP_CHECK_LIBRARY(mbfl, mbfl_buffer_converter_new, [ +- PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/lib, MBSTRING_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(mbfl, $PHP_LIBMBFL/$with__lib, MBSTRING_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.]) + ], [ +- -LPHP_LIBMBFL/lib ++ -LPHP_LIBMBFL/$with__lib + ]) + fi + ]) +diff -ur php-4.4.1.orig/ext/mcal/config.m4 php-4.4.1/ext/mcal/config.m4 +--- php-4.4.1.orig/ext/mcal/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mcal/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -19,7 +19,7 @@ + fi + done + +- for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do ++ for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/$with__lib $MCAL_DIR/$with__lib/mcal $MCAL_DIR/$with__lib; do + if test -r "$i/libmcal.a"; then + MCAL_LIBRARY=$i + fi +@@ -32,7 +32,7 @@ + done + + if test ! -f "$MCAL_LIBRARY/libmcal.a"; then +- AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) ++ AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the $with__lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) + fi + + PHP_ADD_INCLUDE($MCAL_INCLUDE) +diff -ur php-4.4.1.orig/ext/mcrypt/config.m4 php-4.4.1/ext/mcrypt/config.m4 +--- php-4.4.1.orig/ext/mcrypt/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mcrypt/config.m4 2006-01-08 12:05:35.000000000 +0000 +@@ -23,7 +23,7 @@ + [ + AC_DEFINE(HAVE_MCRYPT_GENERIC_DEINIT,1,[ ]) + ],[],[ +- -L$MCRYPT_DIR/lib -lltdl ++ -L$MCRYPT_DIR/$with__lib -lltdl + ]) + + ],[ +@@ -35,7 +35,7 @@ + [ + AC_DEFINE(HAVE_MCRYPT_GENERIC_DEINIT,1,[ ]) + ],[],[ +- -L$MCRYPT_DIR/lib ++ -L$MCRYPT_DIR/$with__lib + ]) + ],[ + PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, +@@ -44,16 +44,16 @@ + ],[ + AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.]) + ],[ +- -L$MCRYPT_DIR/lib ++ -L$MCRYPT_DIR/$with__lib + ]) + ],[ +- -L$MCRYPT_DIR/lib ++ -L$MCRYPT_DIR/$with__lib + ]) + ],[ + -L$MCRYPT_DIR/lib -lltdl + ]) + +- PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$with__lib, MCRYPT_SHARED_LIBADD) + PHP_ADD_INCLUDE($MCRYPT_DIR/include) + + PHP_NEW_EXTENSION(mcrypt, mcrypt.c, $ext_shared) +diff -ur php-4.4.1.orig/ext/mcve/config.m4 php-4.4.1/ext/mcve/config.m4 +--- php-4.4.1.orig/ext/mcve/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mcve/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -68,7 +68,7 @@ + CPPFLAGS=$saved_CPPFLAGS + + PHP_ADD_INCLUDE($MCVE_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(mcve, $MCVE_DIR/lib, MCVE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(mcve, $MCVE_DIR/$with__lib, MCVE_SHARED_LIBADD) + + dnl Build test. Check for libmcve or libmonetra + dnl libmonetra_compat.h handle's MCVE_ -> M_ conversion +diff -ur php-4.4.1.orig/ext/mhash/config.m4 php-4.4.1/ext/mhash/config.m4 +--- php-4.4.1.orig/ext/mhash/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mhash/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -15,7 +15,7 @@ + fi + + PHP_ADD_INCLUDE($MHASH_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/$with__lib, MHASH_SHARED_LIBADD) + + PHP_NEW_EXTENSION(mhash, mhash.c, $ext_shared) + PHP_SUBST(MHASH_SHARED_LIBADD) +diff -ur php-4.4.1.orig/ext/ming/config.m4 php-4.4.1/ext/ming/config.m4 +--- php-4.4.1.orig/ext/ming/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/ming/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -9,7 +9,7 @@ + AC_CHECK_LIB(m, sin) + + for i in $PHP_MING /usr/local /usr; do +- if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then ++ if test -f $i/$with__lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/$with__lib/libming.a; then + MING_DIR=$i + fi + done +@@ -33,11 +33,11 @@ + ],[ + AC_MSG_ERROR([Ming library 0.2a or greater required.]) + ],[ +- -L$MING_DIR/lib ++ -L$MING_DIR/$with__lib + ]) + + PHP_ADD_INCLUDE($MING_INC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$with__lib, MING_SHARED_LIBADD) + + AC_MSG_CHECKING([for destroySWFBlock]) + AC_TRY_RUN([ +diff -ur php-4.4.1.orig/ext/mnogosearch/config.m4 php-4.4.1/ext/mnogosearch/config.m4 +--- php-4.4.1.orig/ext/mnogosearch/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mnogosearch/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -13,11 +13,11 @@ + if test "$PHP_MNOGOSEARCH" = "yes"; then + MNOGOSEARCH_BINDIR=/usr/local/mnogosearch/bin + MNOGOSEARCH_INCDIR=/usr/local/mnogosearch/include +- MNOGOSEARCH_LIBDIR=/usr/local/mnogosearch/lib ++ MNOGOSEARCH_LIBDIR=/usr/local/mnogosearch/$with__lib + else + MNOGOSEARCH_BINDIR=$PHP_MNOGOSEARCH/bin + MNOGOSEARCH_INCDIR=$PHP_MNOGOSEARCH/include +- MNOGOSEARCH_LIBDIR=$PHP_MNOGOSEARCH/lib ++ MNOGOSEARCH_LIBDIR=$PHP_MNOGOSEARCH/$with__lib + fi + + AC_MSG_CHECKING(for mnoGoSearch version) +diff -ur php-4.4.1.orig/ext/msession/config.m4 php-4.4.1/ext/msession/config.m4 +--- php-4.4.1.orig/ext/msession/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/msession/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -6,12 +6,12 @@ + [ --with-msession[=DIR] Include msession support]) + + if test "$PHP_MSESSION" != "no"; then +- if test -r $PHP_MSESSION/lib/libphoenix.a; then ++ if test -r $PHP_MSESSION/$with__lib/libphoenix.a; then + PHOENIX_DIR=$PHP_MSESSION + else + AC_MSG_CHECKING(for msession in default path) + for i in /usr/local/phoenix /usr/local /usr; do +- if test -r $i/lib/libphoenix.a; then ++ if test -r $i/$with__lib/libphoenix.a; then + PHOENIX_DIR=$i + AC_MSG_RESULT(found in $i) + fi +@@ -25,7 +25,7 @@ + + + AC_DEFINE(HAVE_MSESSION, 1, [ ]) +- PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/lib", PHOENIX_LIB) ++ PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/$with__lib", PHOENIX_LIB) + PHOENIX_INCLUDE="-I$PHOENIX_DIR" + PHP_SUBST(PHOENIX_LIB) + +diff -ur php-4.4.1.orig/ext/msql/config.m4 php-4.4.1/ext/msql/config.m4 +--- php-4.4.1.orig/ext/msql/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/msql/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -28,10 +28,10 @@ + if test "$PHP_MSQL" != "no"; then + if test "$PHP_MSQL" = "yes"; then + MSQL_INCDIR=/usr/local/Hughes/include +- MSQL_LIBDIR=/usr/local/Hughes/lib ++ MSQL_LIBDIR=/usr/local/Hughes/$with__lib + else + MSQL_INCDIR=$PHP_MSQL/include +- MSQL_LIBDIR=$PHP_MSQL/lib ++ MSQL_LIBDIR=$PHP_MSQL/$with__lib + fi + PHP_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR, MSQL_SHARED_LIBADD) + PHP_ADD_INCLUDE($MSQL_INCDIR) +diff -ur php-4.4.1.orig/ext/mssql/config.m4 php-4.4.1/ext/mssql/config.m4 +--- php-4.4.1.orig/ext/mssql/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mssql/config.m4 2006-01-08 12:03:26.000000000 +0000 +@@ -32,12 +32,12 @@ + fi + fi + +- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then +- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so]) ++ if test ! -r "$FREETDS_INSTALLATION_DIR/$with__lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then ++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$with__lib/libtds.[a|so]) + fi + + MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include +- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib ++ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/$with__lib + + PHP_ADD_INCLUDE($MSSQL_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) +diff -ur php-4.4.1.orig/ext/mysql/config.m4 php-4.4.1/ext/mysql/config.m4 +--- php-4.4.1.orig/ext/mysql/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/mysql/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -22,7 +22,7 @@ + /var/run/mysqld/mysqld.sock \ + /var/tmp/mysql.sock \ + /var/run/mysql/mysql.sock \ +- /var/lib/mysql/mysql.sock \ ++ /var/$with__lib/mysql/mysql.sock \ + /var/mysql/mysql.sock \ + /usr/local/mysql/var/mysql.sock \ + /Private/tmp/mysql.sock \ +@@ -121,7 +121,7 @@ + ;; + esac + +- for i in lib lib/mysql; do ++ for i in $with__lib $with__lib/mysql; do + MYSQL_LIB_CHK($i) + done + +@@ -136,9 +136,9 @@ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ + AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) + ], [ +- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR ++ -L$PHP_ZLIB_DIR/$with__lib -L$MYSQL_LIB_DIR + ]) +- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" ++ MYSQL_LIBS="-L$PHP_ZLIB_DIR/$with__lib -lz" + else + PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ +diff -ur php-4.4.1.orig/ext/ncurses/config.m4 php-4.4.1/ext/ncurses/config.m4 +--- php-4.4.1.orig/ext/ncurses/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/ncurses/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -40,18 +40,18 @@ + + PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [ + AC_DEFINE(HAVE_NCURSESLIB,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/$with__lib, NCURSES_SHARED_LIBADD) + + PHP_CHECK_LIBRARY(panel, new_panel, [ + AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/$with__lib, NCURSES_SHARED_LIBADD) + ], [], [ +- -L$NCURSES_DIR/lib -l$LIBNAME -lm ++ -L$NCURSES_DIR/$with__lib -l$LIBNAME -lm + ]) + ], [ +- AC_MSG_ERROR(Wrong ncurses lib version or lib not found) ++ AC_MSG_ERROR(Wrong ncurses $with__lib version or $with__lib not found) + ], [ +- -L$NCURSES_DIR/lib -lm ++ -L$NCURSES_DIR/$with__lib -lm + ]) + + AC_CHECK_LIB($LIBNAME, color_set, [AC_DEFINE(HAVE_NCURSES_COLOR_SET, 1, [ ])]) +diff -ur php-4.4.1.orig/ext/oci8/config.m4 php-4.4.1/ext/oci8/config.m4 +--- php-4.4.1.orig/ext/oci8/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/oci8/config.m4 2006-01-08 12:00:13.000000000 +0000 +@@ -23,16 +23,16 @@ + if test -s "$OCI8_DIR/orainst/unix.rgs"; then + OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` + test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 +- elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then ++ elif test -f $OCI8_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then + OCI8_VERSION=10.1 +- elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then ++ elif test -f $OCI8_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then + OCI8_VERSION=9.0 +- elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then ++ elif test -f $OCI8_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then + OCI8_VERSION=8.1 +- elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then ++ elif test -f $OCI8_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then + OCI8_VERSION=8.0 +- elif test -f $OCI8_DIR/lib/libclntsh.a; then +- if test -f $OCI8_DIR/lib/libcore4.a; then ++ elif test -f $OCI8_DIR/$with__lib/libclntsh.a; then ++ if test -f $OCI8_DIR/$with__lib/libcore4.a; then + OCI8_VERSION=8.0 + else + OCI8_VERSION=8.1 +@@ -107,10 +107,10 @@ + OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public" + fi + +- if test -f "$OCI8_DIR/lib/sysliblist"; then +- PHP_EVAL_LIBLINE(`cat $OCI8_DIR/lib/sysliblist`, OCI8_SYSLIB) +- elif test -f "$OCI8_DIR/rdbms/lib/sysliblist"; then +- PHP_EVAL_LIBLINE(`cat $OCI8_DIR/rdbms/lib/sysliblist`, OCI8_SYSLIB) ++ if test -f "$OCI8_DIR/$with__lib/sysliblist"; then ++ PHP_EVAL_LIBLINE(`cat $OCI8_DIR/$with__lib/sysliblist`, OCI8_SYSLIB) ++ elif test -f "$OCI8_DIR/rdbms/$with__lib/sysliblist"; then ++ PHP_EVAL_LIBLINE(`cat $OCI8_DIR/rdbms/$with__lib/sysliblist`, OCI8_SYSLIB) + fi + + AC_OCI8_VERSION($OCI8_DIR) +@@ -119,12 +119,12 @@ + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core4, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(psa, "", OCI8_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/$with__lib, OCI8_SHARED_LIBADD) + ;; + + 8.1) + PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) +- PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($OCI8_DIR/$with__lib, OCI8_SHARED_LIBADD) + + dnl + dnl OCI_ATTR_STATEMENT is not available in all 8.1.x versions +@@ -134,7 +134,7 @@ + + 9.0) + PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) +- PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($OCI8_DIR/$with__lib, OCI8_SHARED_LIBADD) + AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) + + dnl These functions are only available in version >= 9.2 +@@ -145,16 +145,16 @@ + AC_DEFINE(HAVE_OCI_9_2,1,[ ]) + OCI8_VERSION=9.2 + ], [], [ +- -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD ++ -L$OCI8_DIR/$with__lib $OCI8_SHARED_LIBADD + ]) + ], [], [ +- -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD ++ -L$OCI8_DIR/$with__lib $OCI8_SHARED_LIBADD + ]) + ;; + + 10.1) + PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) +- PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($OCI8_DIR/$with__lib, OCI8_SHARED_LIBADD) + AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) + AC_DEFINE(HAVE_OCI_9_2,1,[ ]) + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) +@@ -178,10 +178,10 @@ + PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD) + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) + ], [], [ +- -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD ++ -L$OCI8_DIR/$with__lib $OCI8_SHARED_LIBADD + ]) + ], [ +- -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD ++ -L$OCI8_DIR/$with__lib $OCI8_SHARED_LIBADD + ]) + + dnl +diff -ur php-4.4.1.orig/ext/odbc/config.m4 php-4.4.1/ext/odbc/config.m4 +--- php-4.4.1.orig/ext/odbc/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/odbc/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -101,8 +101,8 @@ + fi + if test "$withval" != "no"; then + PHP_ADD_INCLUDE($withval/incl) +- PHP_ADD_LIBPATH($withval/lib) +- ODBC_OBJS="$withval/lib/odbclib.a" ++ PHP_ADD_LIBPATH($withval/$with__lib) ++ ODBC_OBJS="$withval/$with__lib/odbclib.a" + ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" + $srcdir/build/shtool mkdir -f -p ext/odbc + rm -f "$ODBC_LIB" +@@ -133,7 +133,7 @@ + fi + if test "$withval" != "no"; then + PHP_ADD_INCLUDE($withval/incl) +- PHP_ADD_LIBPATH($withval/lib) ++ PHP_ADD_LIBPATH($withval/$with__lib) + PHP_ADD_LIBRARY(sqlod) + ODBC_TYPE=sapdb + AC_DEFINE(HAVE_SAPDB,1,[ ]) +@@ -159,7 +159,7 @@ + fi + if test "$withval" != "no"; then + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_TYPE=solid + if test -f $ODBC_LIBDIR/soc*35.a; then +@@ -189,10 +189,10 @@ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + ODBC_INCDIR=/home/db2inst1/sqllib/include +- ODBC_LIBDIR=/home/db2inst1/sqllib/lib ++ ODBC_LIBDIR=/home/db2inst1/sqllib/$with__lib + else + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + fi + + if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then +@@ -277,9 +277,9 @@ + for I in $LIST + do + case $I in +- $EMPRESSPATH/odbccl/lib/* | \ +- $EMPRESSPATH/rdbms/lib/* | \ +- $EMPRESSPATH/common/lib/*) ++ $EMPRESSPATH/odbccl/$with__lib/* | \ ++ $EMPRESSPATH/rdbms/$with__lib/* | \ ++ $EMPRESSPATH/common/$with__lib/*) + NEWLIST="$NEWLIST $I" + ;; + esac +@@ -308,10 +308,10 @@ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + ODBC_INCDIR=/usr/local/birdstep/include +- ODBC_LIBDIR=/usr/local/birdstep/lib ++ ODBC_LIBDIR=/usr/local/birdstep/$with__lib + else + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + fi + + case $host_alias in +@@ -374,7 +374,7 @@ + fi + if test "$withval" != "no"; then + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + ODBC_LFLAGS=-L$ODBC_LIBDIR + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_LIBS=$CUSTOM_ODBC_LIBS +@@ -400,11 +400,11 @@ + withval=/usr/local + fi + if test "$withval" != "no"; then +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$with__lib) + PHP_ADD_INCLUDE($withval/include, 1) + ODBC_TYPE=iodbc + ODBC_INCLUDE=-I$withval/include +- ODBC_LFLAGS=-L$withval/lib ++ ODBC_LFLAGS=-L$withval/$with__lib + ODBC_LIBS=-liodbc + AC_DEFINE(HAVE_IODBC,1,[ ]) + AC_DEFINE(HAVE_ODBC2,1,[ ]) +@@ -430,7 +430,7 @@ + fi + if test "$withval" != "no"; then + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + ODBC_LFLAGS=-L$ODBC_LIBDIR + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_LIBS=-lesoobclient +@@ -457,7 +457,7 @@ + fi + if test "$withval" != "no"; then + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + ODBC_LFLAGS=-L$ODBC_LIBDIR + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_LIBS=-lodbc +@@ -506,7 +506,7 @@ + + if test "$withval" != "no"; then + ODBC_INCDIR=$withval/include +- ODBC_LIBDIR=$withval/lib ++ ODBC_LIBDIR=$withval/$with__lib + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_LFLAGS=-L$ODBC_LIBDIR + ODBC_INCLUDE=-I$ODBC_INCDIR +diff -ur php-4.4.1.orig/ext/oracle/config.m4 php-4.4.1/ext/oracle/config.m4 +--- php-4.4.1.orig/ext/oracle/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/oracle/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -7,14 +7,14 @@ + if test -s "$ORACLE_DIR/orainst/unix.rgs"; then + ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` + test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 +- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then ++ elif test -f $ORACLE_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then + ORACLE_VERSION=9.0 +- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then ++ elif test -f $ORACLE_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then + ORACLE_VERSION=8.1 +- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then ++ elif test -f $ORACLE_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then + ORACLE_VERSION=8.0 +- elif test -f $ORACLE_DIR/lib/libclntsh.a; then +- if test -f $ORACLE_DIR/lib/libcore4.a; then ++ elif test -f $ORACLE_DIR/$with__lib/libclntsh.a; then ++ if test -f $ORACLE_DIR/$with__lib/libcore4.a; then + ORACLE_VERSION=8.0 + else + ORACLE_VERSION=8.1 +@@ -50,87 +50,87 @@ + PHP_ADD_INCLUDE($ORACLE_DIR/plsql/public) + fi + +- if test -f "$ORACLE_DIR/lib/sysliblist"; then +- PHP_EVAL_LIBLINE(`cat $ORACLE_DIR/lib/sysliblist`, ORACLE_SHARED_LIBADD) +- elif test -f "$ORACLE_DIR/rdbms/lib/sysliblist"; then +- PHP_EVAL_LIBLINE(`cat $ORACLE_DIR/rdbms/lib/sysliblist`, ORACLE_SHARED_LIBADD) ++ if test -f "$ORACLE_DIR/$with__lib/sysliblist"; then ++ PHP_EVAL_LIBLINE(`cat $ORACLE_DIR/$with__lib/sysliblist`, ORACLE_SHARED_LIBADD) ++ elif test -f "$ORACLE_DIR/rdbms/$with__lib/sysliblist"; then ++ PHP_EVAL_LIBLINE(`cat $ORACLE_DIR/rdbms/$with__lib/sysliblist`, ORACLE_SHARED_LIBADD) + fi + + AC_ORACLE_VERSION($ORACLE_DIR) + case $ORACLE_VERSION in + 7.0|7.1) +- if test -f $ORACLE_DIR/lib/liboracle.$SHLIB_SUFFIX_NAME; then +- PHP_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ if test -f $ORACLE_DIR/$with__lib/liboracle.$SHLIB_SUFFIX_NAME; then ++ PHP_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + else +- PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(cv6, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(nlsrtl, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + if test "$ext_shared" = "yes"; then +- ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD"; ++ ORACLE_SHARED_LIBADD="$ORACLE_DIR/$with__lib/osntab.o $ORACLE_SHARED_LIBADD"; + else +- LIBS="$ORACLE_DIR/lib/osntab.o $LIBS"; ++ LIBS="$ORACLE_DIR/$with__lib/osntab.o $LIBS"; + fi +- PHP_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + if test "`uname -s 2>/dev/null`" = "AIX"; then + if test "$ext_shared" = "yes"; then +- ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/lib/mili.exp" ++ ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/$with__lib/mili.exp" + else +- LIBS="$LIBS -bI:$ORACLE_DIR/lib/mili.exp" ++ LIBS="$LIBS -bI:$ORACLE_DIR/$with__lib/mili.exp" + fi + fi + fi + ;; + + 7.2) +- if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then +- PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ if test -f $ORACLE_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME; then ++ PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + else +- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ora, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + if test "$ext_shared" = "yes"; then +- ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD"; ++ ORACLE_SHARED_LIBADD="$ORACLE_DIR/$with__lib/osntab.o $ORACLE_SHARED_LIBADD"; + else +- LIBS="$ORACLE_DIR/lib/osntab.o $LIBS"; ++ LIBS="$ORACLE_DIR/$with__lib/osntab.o $LIBS"; + fi +- PHP_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ocic, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + fi + ;; + + 7.3) +- if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then +- PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ if test -f $ORACLE_DIR/$with__lib/libclntsh.$SHLIB_SUFFIX_NAME; then ++ PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + else +- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + fi + ;; + +@@ -138,12 +138,12 @@ + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core4, "", ORACLE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(psa, "", ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + ;; + + 8.1|9.0) + PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD) +- PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($ORACLE_DIR/$with__lib, ORACLE_SHARED_LIBADD) + ;; + *) + AC_MSG_ERROR(Unsupported Oracle version!) +diff -ur php-4.4.1.orig/ext/ovrimos/config.m4 php-4.4.1/ext/ovrimos/config.m4 +--- php-4.4.1.orig/ext/ovrimos/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/ovrimos/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -16,9 +16,9 @@ + fi + + PHP_ADD_INCLUDE($OVRIMOS_DIR/include) +- LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib" ++ LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/$with__lib -L$OVRIMOS_DIR/$with__lib" + AC_CHECK_LIB(sqlcli, main) +- PHP_ADD_LIBRARY_WITH_PATH(sqlcli, $OVRIMOS_DIR/lib, OVRIMOS_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(sqlcli, $OVRIMOS_DIR/$with__lib, OVRIMOS_SHARED_LIBADD) + + PHP_NEW_EXTENSION(ovrimos, ovrimos.c, $ext_shared) + PHP_SUBST(OVRIMOS_SHARED_LIBADD) +diff -ur php-4.4.1.orig/ext/pcre/config0.m4 php-4.4.1/ext/pcre/config0.m4 +--- php-4.4.1.orig/ext/pcre/config0.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/pcre/config0.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -25,7 +25,7 @@ + AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) + fi + +- for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do ++ for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$with__lib; do + test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j + done + +diff -ur php-4.4.1.orig/ext/pdf/config.m4 php-4.4.1/ext/pdf/config.m4 +--- php-4.4.1.orig/ext/pdf/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/pdf/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -40,11 +40,11 @@ + if test "$PHP_JPEG_DIR" != "no"; then + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, + [ +- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/$with__lib, PDF_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libjpeg not found!]) + ],[ +- -L$PHP_JPEG_DIR/lib ++ -L$PHP_JPEG_DIR/$with__lib + ]) + else + AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>]) +@@ -54,11 +54,11 @@ + if test "$PHP_PNG_DIR" != "no"; then + PHP_CHECK_LIBRARY(png,png_create_info_struct, + [ +- PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/$with__lib, PDF_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libpng not found!]) + ],[ +- -L$PHP_PNG_DIR/lib ++ -L$PHP_PNG_DIR/$with__lib + ]) + else + AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>]) +@@ -68,11 +68,11 @@ + if test "$PHP_TIFF_DIR" != "no"; then + PHP_CHECK_LIBRARY(tiff,TIFFOpen, + [ +- PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/$with__lib, PDF_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libtiff not found!]) + ],[ +- -L$PHP_TIFF_DIR/lib ++ -L$PHP_TIFF_DIR/$with__lib + ]) + else + AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>]) +@@ -84,7 +84,7 @@ + AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>]) + else + AC_MSG_RESULT([$PHP_ZLIB_DIR]) +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$with__lib, PDF_SHARED_LIBADD) + fi + + dnl # +@@ -118,7 +118,7 @@ + PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, + [ + AC_DEFINE(HAVE_PDFLIB,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/$with__lib, PDF_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHP_PDFLIB/include) + ],[ + AC_MSG_ERROR([ +@@ -127,7 +127,7 @@ + See config.log for more information. + ]) + ],[ +- -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD ++ -L$PHP_PDFLIB/$with__lib $PDF_SHARED_LIBADD + ]) + else + AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=<PATH>. PATH should be the install prefix directory.]) +diff -ur php-4.4.1.orig/ext/pfpro/config.m4 php-4.4.1/ext/pfpro/config.m4 +--- php-4.4.1.orig/ext/pfpro/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/pfpro/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -14,16 +14,16 @@ + PFPRO_INC_DIR=$i + elif test -r $i/include/$PFPRO_HDR; then + PFPRO_INC_DIR=$i/include +- elif test -r $i/lib/$PFPRO_HDR; then +- PFPRO_INC_DIR=$i/lib ++ elif test -r $i/$with__lib/$PFPRO_HDR; then ++ PFPRO_INC_DIR=$i/$with__lib + elif test -r $i/bin/$PFPRO_HDR; then + PFPRO_INC_DIR=$i/bin + fi + + if test -r $i/$PFPRO_LIB; then + PFPRO_LIB_DIR=$i +- elif test -r $i/lib/$PFPRO_LIB; then +- PFPRO_LIB_DIR=$i/lib ++ elif test -r $i/$with__lib/$PFPRO_LIB; then ++ PFPRO_LIB_DIR=$i/$with__lib + fi + + test -n "$PFPRO_INC_DIR" && test -n "$PFPRO_LIB_DIR" && break +diff -ur php-4.4.1.orig/ext/pgsql/config.m4 php-4.4.1/ext/pgsql/config.m4 +--- php-4.4.1.orig/ext/pgsql/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/pgsql/config.m4 2006-01-08 12:04:10.000000000 +0000 +@@ -44,7 +44,7 @@ + fi + done + +- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do ++ for j in $with__lib $with__lib/pgsql $with__lib/postgres $with__lib/postgresql ""; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi +diff -ur php-4.4.1.orig/ext/pspell/config.m4 php-4.4.1/ext/pspell/config.m4 +--- php-4.4.1.orig/ext/pspell/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/pspell/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -27,7 +27,7 @@ + AC_MSG_ERROR(Cannot find pspell) + fi + +- PSPELL_LIBDIR=$PSPELL_DIR/lib ++ PSPELL_LIBDIR=$PSPELL_DIR/$with__lib + + PHP_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) + +diff -ur php-4.4.1.orig/ext/qtdom/config.m4 php-4.4.1/ext/qtdom/config.m4 +--- php-4.4.1.orig/ext/qtdom/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/qtdom/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -9,16 +9,16 @@ + case $PHP_QTDOM in + yes) + if test -f $QTDIR/include/qdom.h; then +- QTDOM_LIBDIR=$QTDIR/lib ++ QTDOM_LIBDIR=$QTDIR/$with__lib + QTDOM_INCDIR=$QTDIR/include +- elif test -f /usr/lib/qt2/include/qdom.h; then +- QTDOM_LIBDIR=/usr/lib +- QTDOM_INCDIR=/usr/lib/qt2/include ++ elif test -f /usr/$with__lib/qt2/include/qdom.h; then ++ QTDOM_LIBDIR=/usr/$with__lib ++ QTDOM_INCDIR=/usr/$with__lib/qt2/include + fi + ;; + *) + if test -f $PHP_QTDOM/include/qdom.h; then +- QTDOM_LIBDIR=$PHP_QTDOM/lib ++ QTDOM_LIBDIR=$PHP_QTDOM/$with__lib + QTDOM_INCDIR=$PHP_QTDOM/include + fi + ;; +diff -ur php-4.4.2.orig/ext/readline/config.m4 php-4.4.2/ext/readline/config.m4 +--- php-4.4.2.orig/ext/readline/config.m4 2005-11-18 13:10:33.000000000 -0200 ++++ php-4.4.2/ext/readline/config.m4 2006-06-15 22:06:55.000000000 -0300 +@@ -36,27 +36,27 @@ + + PHP_CHECK_LIBRARY(readline, readline, + [ +- PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$with__lib, READLINE_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(readline library not found) + ], [ +- -L$READLINE_DIR/lib $PHP_READLINE_LIBS ++ -L$READLINE_DIR/$with__lib $PHP_READLINE_LIBS + ]) + + PHP_CHECK_LIBRARY(readline, rl_callback_read_char, + [ + AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) + ],[],[ +- -L$READLINE_DIR/lib $PHP_READLINE_LIBS ++ -L$READLINE_DIR/$with__lib $PHP_READLINE_LIBS + ]) + + PHP_CHECK_LIBRARY(history, add_history, + [ +- PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$with__lib, READLINE_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(history library required by readline not found) + ], [ +- -L$READLINE_DIR/lib $PHP_READLINE_LIBS ++ -L$READLINE_DIR/$with__lib $PHP_READLINE_LIBS + ]) + + PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) +@@ -87,11 +87,11 @@ + + PHP_CHECK_LIBRARY(edit, readline, + [ +- PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$with__lib, READLINE_SHARED_LIBADD) + ], [ + AC_MSG_ERROR(edit library required by readline not found) + ], [ +- -L$READLINE_DIR/lib ++ -L$READLINE_DIR/$with__lib + ]) + + PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) +diff -ur php-4.4.1.orig/ext/recode/config.m4 php-4.4.1/ext/recode/config.m4 +--- php-4.4.1.orig/ext/recode/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/recode/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -12,17 +12,17 @@ + if test -f $i/include/recode.h; then + RECODE_DIR=$i + RECODE_INC=include +- RECODE_LIB=lib ++ RECODE_LIB=$with__lib + fi + if test -f $i/include/recode/recode.h; then + RECODE_DIR=$i + RECODE_INC=include/recode +- RECODE_LIB=lib/recode ++ RECODE_LIB=$with__lib/recode + fi + if test -f $i/recode/include/recode.h; then + RECODE_DIR=$i/recode + RECODE_INC=include +- RECODE_LIB=lib ++ RECODE_LIB=$with__lib + fi + test -n "$RECODE_DIR" && break + done +diff -ur php-4.4.1.orig/ext/session/config.m4 php-4.4.1/ext/session/config.m4 +--- php-4.4.1.orig/ext/session/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/session/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -25,7 +25,7 @@ + AC_MSG_ERROR(cannot find mm library) + fi + +- PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$with__lib, SESSION_SHARED_LIBADD) + PHP_ADD_INCLUDE($MM_DIR/include) + AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) + fi +diff -ur php-4.4.1.orig/ext/snmp/config.m4 php-4.4.1/ext/snmp/config.m4 +--- php-4.4.1.orig/ext/snmp/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/snmp/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -46,12 +46,12 @@ + test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp + done + for i in /usr /usr/snmp /usr/local /usr/local/snmp; do +- test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib ++ test -f $i/$with__lib/libsnmp.a -o -f $i/$with__lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/$with__lib + done + else + SNMP_INCDIR=$PHP_SNMP/include + test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp +- SNMP_LIBDIR=$PHP_SNMP/lib ++ SNMP_LIBDIR=$PHP_SNMP/$with__lib + fi + + if test -z "$SNMP_INCDIR"; then +diff -ur php-4.4.1.orig/ext/swf/config.m4 php-4.4.1/ext/swf/config.m4 +--- php-4.4.1.orig/ext/swf/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/swf/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -6,12 +6,12 @@ + [ --with-swf[=DIR] Include swf support]) + + if test "$PHP_SWF" != "no"; then +- if test -r $PHP_SWF/lib/libswf.a; then ++ if test -r $PHP_SWF/$with__lib/libswf.a; then + SWF_DIR=$PHP_SWF + else + AC_MSG_CHECKING(for libswf in default path) + for i in /usr/local /usr; do +- if test -r $i/lib/libswf.a; then ++ if test -r $i/$with__lib/libswf.a; then + SWF_DIR=$i + AC_MSG_RESULT(found in $i) + fi +@@ -22,13 +22,13 @@ + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please reinstall the libswf distribution - + swf.h should be <swf-dir>/include and +- libswf.a should be in <swf-dir>/lib) ++ libswf.a should be in <swf-dir>/$with__lib) + fi + + PHP_ADD_INCLUDE($SWF_DIR/include) + + PHP_SUBST(SWF_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR/lib, SWF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR/$with__lib, SWF_SHARED_LIBADD) + AC_DEFINE(HAVE_SWF,1,[ ]) + + PHP_NEW_EXTENSION(swf, swf.c, $ext_shared) +diff -ur php-4.4.1.orig/ext/sybase/config.m4 php-4.4.1/ext/sybase/config.m4 +--- php-4.4.1.orig/ext/sybase/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/sybase/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -10,10 +10,10 @@ + if test "$PHP_SYBASE" != "no"; then + if test "$PHP_SYBASE" = "yes"; then + SYBASE_INCDIR=/home/sybase/include +- SYBASE_LIBDIR=/home/sybase/lib ++ SYBASE_LIBDIR=/home/sybase/$with__lib + else + SYBASE_INCDIR=$PHP_SYBASE/include +- SYBASE_LIBDIR=$PHP_SYBASE/lib ++ SYBASE_LIBDIR=$PHP_SYBASE/$with__lib + fi + PHP_ADD_INCLUDE($SYBASE_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD) +diff -ur php-4.4.1.orig/ext/sybase_ct/config.m4 php-4.4.1/ext/sybase_ct/config.m4 +--- php-4.4.1.orig/ext/sybase_ct/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/sybase_ct/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -18,10 +18,10 @@ + + if test "$PHP_SYBASE_CT" = "yes"; then + SYBASE_CT_INCDIR=/home/sybase/include +- SYBASE_CT_LIBDIR=/home/sybase/lib ++ SYBASE_CT_LIBDIR=/home/sybase/$with__lib + else + SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include +- SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib ++ SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/$with__lib + fi + + if test -f $SYBASE_CT_INCDIR/ctpublic.h; then +diff -ur php-4.4.1.orig/ext/xml/config.m4 php-4.4.1/ext/xml/config.m4 +--- php-4.4.1.orig/ext/xml/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/xml/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -11,7 +11,7 @@ + fi + + PHP_ARG_ENABLE(xml,whether to enable XML support, +-[ --disable-xml Disable XML support using bundled expat lib], yes) ++[ --disable-xml Disable XML support using bundled expat $with__lib], yes) + + PHP_ARG_WITH(expat-dir, external libexpat install dir, + [ --with-expat-dir=<DIR> XML: external libexpat install dir], no, no) +@@ -31,7 +31,7 @@ + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + + for i in $PHP_XML $PHP_EXPAT_DIR; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then ++ if test -f $i/$with__lib/libexpat.a -o -f $i/$with__lib/libexpat.$SHLIB_SUFFIX_NAME ; then + EXPAT_DIR=$i + fi + done +@@ -41,7 +41,7 @@ + fi + + PHP_ADD_INCLUDE($EXPAT_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/$with__lib, XML_SHARED_LIBADD) + PHP_SUBST(XML_SHARED_LIBADD) + fi + fi +diff -ur php-4.4.1.orig/ext/xmlrpc/config.m4 php-4.4.1/ext/xmlrpc/config.m4 +--- php-4.4.1.orig/ext/xmlrpc/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/xmlrpc/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -23,9 +23,9 @@ + + testval=no + for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/$with__lib/libexpat.a -o -f $i/$with__lib/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$with__lib, XMLRPC_SHARED_LIBADD) + PHP_ADD_INCLUDE($i/include) + testval=yes + break +@@ -88,5 +88,5 @@ + fi + + PHP_ADD_INCLUDE($XMLRPC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/$with__lib, XMLRPC_SHARED_LIBADD) + fi +diff -ur php-4.4.1.orig/ext/xslt/config.m4 php-4.4.1/ext/xslt/config.m4 +--- php-4.4.1.orig/ext/xslt/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/xslt/config.m4 2006-01-08 12:01:12.000000000 +0000 +@@ -98,10 +98,10 @@ + + found_expat=no + for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/$with__lib/libexpat.a -o -f $i/$with__lib/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) + PHP_ADD_INCLUDE($i/include) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$with__lib, XSLT_SHARED_LIBADD) + found_expat=yes + break + fi +@@ -125,7 +125,7 @@ + + if test "$PHP_SABLOT_JS" != "no"; then + for i in $PHP_SABLOT_JS /usr/local /usr; do +- if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/$with__lib/libjs.a -o -f $i/$with__lib/libjs.$SHLIB_SUFFIX_NAME; then + PHP_SABLOT_JS_DIR=$i + break + fi +@@ -133,12 +133,12 @@ + + PHP_CHECK_LIBRARY(js, JS_GetRuntime, + [ +- PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD) +- PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib -ljs" ++ PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/$with__lib, XSLT_SHARED_LIBADD) ++ PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/$with__lib -ljs" + ], [ + AC_MSG_ERROR([libjs not found. Please check config.log for more information.]) + ], [ +- -L$PHP_SABLOT_JS_DIR/lib ++ -L$PHP_SABLOT_JS_DIR/$with__lib + ]) + fi + +@@ -146,7 +146,7 @@ + [ + AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]) + ], [], [ +- -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS ++ -L$XSLT_DIR/$with__lib $PHP_SABLOT_JS_LIBS + ]) + + dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31 +@@ -154,14 +154,14 @@ + [ + AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions]) + ], [], [ +- -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS ++ -L$XSLT_DIR/$with__lib $PHP_SABLOT_JS_LIBS + ]) + + AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ]) + fi + + PHP_ADD_INCLUDE($XSLT_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/$with__lib, XSLT_SHARED_LIBADD) + + AC_DEFINE(HAVE_XSLT, 1, [ ]) + fi +diff -ur php-4.4.1.orig/ext/zip/config.m4 php-4.4.1/ext/zip/config.m4 +--- php-4.4.1.orig/ext/zip/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/zip/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -24,7 +24,7 @@ + AC_DEFINE(HAVE_NEW_ZZIPLIB,1,[ ]) + fi + +- ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/lib ++ ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/$with__lib + + PHP_CHECK_LIBRARY(zzip, zzip_open, + [ +diff -ur php-4.4.1.orig/ext/zlib/config0.m4 php-4.4.1/ext/zlib/config0.m4 +--- php-4.4.1.orig/ext/zlib/config0.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/ext/zlib/config0.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -41,10 +41,10 @@ + ],[ + AC_MSG_ERROR(ZLIB extension requires zlib >= 1.0.9) + ],[ +- -L$ZLIB_DIR/lib ++ -L$ZLIB_DIR/$with__lib + ]) + +- PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($ZLIB_DIR/$with__lib, ZLIB_SHARED_LIBADD) + + PHP_ZLIB_DIR=$ZLIB_DIR + PHP_ADD_LIBRARY(z,, ZLIB_SHARED_LIBADD) +diff -ur php-4.4.1.orig/sapi/caudium/config.m4 php-4.4.1/sapi/caudium/config.m4 +--- php-4.4.1.orig/sapi/caudium/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/sapi/caudium/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -26,7 +26,7 @@ + fi + if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then + PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` +- PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' ` ++ PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,$with__lib/pike/modules,include/pike,' -e 's,$with__lib/modules,include/pike,' ` + if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then + AC_MSG_ERROR(Failed to figure out Pike module and include directories) + fi +@@ -83,7 +83,7 @@ + PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` + AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support]) + PHP_SELECT_SAPI(caudium, shared, caudium.c) +- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP4.so" ++ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/$with__lib/$PIKE_VERSION/PHP4.so" + RESULT=" *** Pike binary used: $PIKE + *** Pike include dir(s) used: $PIKE_INCLUDE_DIR + *** Pike version: $PIKE_VERSION" +diff -ur php-4.4.1.orig/sapi/embed/config.m4 php-4.4.1/sapi/embed/config.m4 +--- php-4.4.1.orig/sapi/embed/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/sapi/embed/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -11,11 +11,11 @@ + case $enableval in + yes|shared) + PHP_EMBED_TYPE=shared +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/$with__lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/$with__lib" + ;; + static) + PHP_EMBED_TYPE=static +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(prefix)/lib" ++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/$with__lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(prefix)/$with__lib" + ;; + *) + PHP_EMBED_TYPE=no +diff -ur php-4.4.1.orig/sapi/roxen/config.m4 php-4.4.1/sapi/roxen/config.m4 +--- php-4.4.1.orig/sapi/roxen/config.m4 2006-01-08 11:44:14.000000000 +0000 ++++ php-4.4.1/sapi/roxen/config.m4 2006-01-08 11:49:26.000000000 +0000 +@@ -20,7 +20,7 @@ + fi + if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then + PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` +- PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` ++ PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,$with__lib/pike/modules,include/pike,' -e 's,$with__lib/modules,include/pike,'` + if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then + AC_MSG_ERROR(Failed to figure out Pike module and include directories) + fi diff --git a/patches/php/doinst.sh.gz b/patches/php/doinst.sh.gz Binary files differnew file mode 100644 index 00000000..67263cac --- /dev/null +++ b/patches/php/doinst.sh.gz diff --git a/patches/php/mod_php.conf.example b/patches/php/mod_php.conf.example new file mode 100644 index 00000000..7adf6e0b --- /dev/null +++ b/patches/php/mod_php.conf.example @@ -0,0 +1,12 @@ +# +# mod_php - PHP Hypertext Preprocessor module +# + +# Load the PHP module: +LoadModule php4_module libexec/apache/libphp4.so + +# Tell Apache to feed all *.php files through the PHP module: +AddType application/x-httpd-php .php + +# This will display PHP files in colored syntax form. Use with caution. +#AddType application/x-httpd-php-source .phps diff --git a/patches/php/php-with-_lib-4.4.1.diff.gz b/patches/php/php-with-_lib-4.4.1.diff.gz Binary files differnew file mode 100644 index 00000000..e71bfb19 --- /dev/null +++ b/patches/php/php-with-_lib-4.4.1.diff.gz diff --git a/patches/php/php-with-_lib-4.4.2.diff.gz b/patches/php/php-with-_lib-4.4.2.diff.gz Binary files differnew file mode 100644 index 00000000..b4b68bb7 --- /dev/null +++ b/patches/php/php-with-_lib-4.4.2.diff.gz diff --git a/patches/php/php.SlackBuild b/patches/php/php.SlackBuild new file mode 100755 index 00000000..3628d7b9 --- /dev/null +++ b/patches/php/php.SlackBuild @@ -0,0 +1,310 @@ +#!/bin/bash +# +# Build and package mod_php on Slackware. +# by: David Cantrell <david@slackware.com> +# Modified for PHP 4+ by volkerdi@slackware.com +# +# Small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="php" +VERSION=${VERSION:=4.4.2} +PINE=${PINE:=4.64} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} + +TMP=${TMP:=/tmp} +PKG=$TMP/package-php +SRC_DIR=${SRC:=$CWD} + +RTOOL="wget" + +SRC="$PACKAGE-$VERSION.tar.bz2" +URL="http://mirror.pacific.net.au/linux/slackware/slackware-10.2/patches/source/php/$SRC" +#URL="http://br.php.net/get/$SRC/from/this/mirror" + +# pear modules +DB="DB-1.7.6.tgz" +HTTP="HTTP-1.4.0.tgz" +MAIL="Mail-1.1.9.tgz" +SMTP="Net_SMTP-1.2.8.tgz" +SOCKET="Net_Socket-1.0.6.tgz" +PARSER="XML_Parser-1.2.7.tgz" +RPC="XML_RPC-1.4.5.tgz" +TAR="Archive_Tar-1.3.1.tgz" +GETOPT="Console_Getopt-1.2.tgz" +TEMPLATE="HTML_Template_IT-1.1.3.tgz" + +PEAR="http://pear.php.net/get" + +if [ "$RTOOL" == "wget" ]; then + + if [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" + fi + + # rm -rf $SRC_DIR/pear* + mkdir -p $SRC_DIR/pear + + if [ $VERSION = 4.4.2 ]; then + pearlist="$DB $HTTP $MAIL $SMTP $SOCKET $PARSER $RPC" + mkdir -p $SRC_DIR/pear-4.4.2-bad-md5sums + for pear in $TAR $GETOPT $TEMPLATE; do + if [ ! -f "$SRC_DIR/pear-4.4.2-bad-md5sums/$pear" ]; then + wget "$PEAR/$pear" -O "$SRC_DIR/pear-4.4.2-bad-md5sums/$pear" + fi + done + else + pearlist="$DB $HTTP $MAIL $SMTP $SOCKET $PARSER $RPC $TAR $GETOPT $TEMPLATE" + fi + + for pear in $pearlist; do + if [ ! -f "$SRC_DIR/pear/$pear" ]; then + wget "$PEAR/$pear" -O "$SRC_DIR/pear/$pear" + fi + done + +fi + +if [ ! -d $TMP ]; then + mkdir -p $TMP +fi + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +fi + +# we need to compile Pine to get c-client.a for IMAP support: + +if [ "$ARCH" == "x86_64" ]; then + IMAPLIBDIR=/usr/local/lib64/c-client + LIBDIR="/usr/lib64" + LIB="lib64" +else + IMAPLIBDIR=/usr/local/lib/c-client + LIBDIR="/usr/lib" + LIB="lib" + ADD_FLAGS="--with-db3 --enable-yp" +fi + +if [ -r $IMAPLIBDIR/$LIB/c-client.a ]; then + echo "Using IMAP library:" + ls -l $IMAPLIBDIR/$LIB/c-client.a + sleep 5 +else + ( cd $CWD/../pine ; ./pine.SlackBuild ) + ( cd $TMP/pine${PINE}/imap/c-client + strip -g c-client.a + mkdir -p $IMAPLIBDIR/$LIB + cp c-client.a $IMAPLIBDIR/$LIB + mkdir -p $IMAPLIBDIR/include + cp *.h $IMAPLIBDIR/include + ) +fi + +php_configure() { +EXTENSION_DIR=/usr/$LIB/php/extensions \ +CFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr \ + $* \ + --with-_lib=$LIB \ + --libdir=$LIBDIR \ + --sysconfdir=/etc \ + --enable-discard-path \ + --with-config-file-path=/etc/apache \ + --enable-safe-mode \ + --with-openssl \ + --with-mhash \ + --enable-bcmath \ + --with-bz2 \ + --with-pic \ + --enable-calendar \ + --enable-ctype \ + --with-gdbm \ + --with-imap-ssl=$IMAPLIBDIR \ + --with-imap=$IMAPLIBDIR \ + --enable-dbase \ + --enable-ftp \ + --with-iconv \ + --with-dom \ + --with-exif \ + --enable-exif \ + --with-gd \ + --enable-gd-native-ttf \ + --with-jpeg-dir=/usr \ + --with-png \ + --with-gmp \ + --enable-mbstring \ + --with-curl=/usr \ + --with-pcre-regex=/usr \ + --with-mysql=shared,/usr \ + --with-gettext=shared,/usr \ + --with-expat-dir=/usr \ + --with-xml \ + --enable-wddx \ + --with-mm=/usr \ + --enable-trans-sid \ + --enable-shmop \ + --enable-sockets \ + --with-regex=php \ + --enable-sysvsem \ + --enable-sysvshm \ + --enable-memory-limit \ + --with-tsrm-pthreads \ + --enable-shared \ + --disable-debug \ + --with-zlib=/usr $ADD_FLAGS + # --with-mod_charset # only for Russian patched Apache + # --with-readline=/usr # this is only for the CGI version + # --with-ttf # this links with the shlib, need X for that + # --with-java # no thanks + + # strange bug, http://bugs.php.net/bug.php?id=31193 + sed -e 's/^EXTRA_LIBS\(.*\)/EXTRA_LIBS\1 -liconv/' Makefile > Makefile.new + mv Makefile.new Makefile + +} + +# compile php +rm -rf $PKG +mkdir -p $PKG/etc/apache +# A trick from DaMouse to enable building php into $PKG. +# We'll remove this later on. +cat /etc/apache/httpd.conf.default > $PKG/etc/apache/httpd.conf +cd $TMP +rm -rf php-$VERSION +tar xjvf $SRC_DIR/$SRC + +# Add missing(?) PEAR modules back: +( cd php-$VERSION/pear/packages + cp -a $SRC_DIR/pear/* . + bzip2 -d *.bz2 &> /dev/null + gunzip -d -f *.tgz &> /dev/null +) + +# Replace PEAR packages for which the 4.4.2 release contained incorrect md5sums: +if [ $VERSION = 4.4.2 ]; then + ( cd php-$VERSION/pear/packages + rm -f HTML_Template_IT-1.1.tar + cp -a $SRC_DIR/pear-4.4.2-bad-md5sums/* . + bzip2 -d --force *.bz2 &> /dev/null + gunzip -d -f *.tgz &> /dev/null + ) +fi + +cd php-$VERSION + +if [ "$ARCH" == "x86_64" ]; then + # Fix lib64 - thanks SuSE + echo patchin with $CWD/php-with-_lib-$VERSION.diff.gz... + zcat $CWD/php-with-_lib-$VERSION.diff.gz | patch -p1 --verbose + autoconf +fi + +# Fixup perms/owners: +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 666 -exec chmod 644 {} \; +find . -perm 664 -exec chmod 644 {} \; +find . -name "*.h" -exec chmod 644 {} \; +# Sometimes they ship a few of these: +find . -name "*.orig" -exec rm {} \; +# Patch ini files: + +if [ "$ARCH" == "x86_64" ]; then + zcat $CWD/php.ini-x86_64.diff.gz | patch -p1 --verbose --backup --suffix=.orig + # Fix an issue introduced in PHP 4.4.1 that breaks SquirrelMail and + # probably some other PHP applications: + #zcat $CWD/php.squirrel.diff.gz | patch -p1 --verbose || exit +else + zcat $CWD/php.ini.diff.gz | patch -p1 --verbose --backup --suffix=.orig +fi + +# Make the Apache module version of PHP: +echo "***START APACHE MODULE***" +php_configure --disable-static --with-apxs=/usr/sbin/apxs +make -j3 +make install INSTALL_ROOT=$PKG +make distclean +echo "***END APACHE MODULE***" + +# PHP likes to install Pear with some strange permissions. +chmod 755 $PKG/usr/bin/pear + +# Make the standalone interpreter: +php_configure --enable-force-cgi-redirect --enable-fastcgi --enable-pcntl --enable-sigchild +make -j3 +make install-cli INSTALL_ROOT=$PKG +chmod 755 $PKG/usr/bin/php +chown root.bin $PKG/usr/bin/php + +# PHP 4.4.2 seems to be throwing some junk in the root directory: +( cd $PKG + rm -rf .channels .depdb .depdblock .filemap .lock .registry +) + +if [ "$ARCH" == "x86_64" ]; then + # Fix $PKG/usr/lib64/php perms: + ( cd $PKG/usr/lib64/php + find . -perm 666 -exec chmod 644 {} \; + ) +else + # Fix $PKG/usr/lib/php perms: + ( cd $PKG/usr/lib/php + find . -perm 666 -exec chmod 644 {} \; + ) +fi + +mkdir -p $PKG/usr/doc/php-$VERSION +cp -a \ + CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* TODO* \ + sapi/cgi/README.FastCGI \ + $PKG/usr/doc/php-$VERSION +chown -R root.root $PKG/usr/doc/php-$VERSION + +mkdir -p $PKG/etc/apache +cp -a php.ini-dist php.ini-recommended $PKG/etc/apache +cp -a $CWD/mod_php.conf.example $PKG/etc/apache +chmod 644 $PKG/etc/apache/* +chown root.root $PKG/etc/apache/* + +rm -f $PKG/etc/apache/httpd* + +chown -R root:bin $PKG/usr/bin + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +gzip -9 $PKG/usr/man/man?/*.? + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +#if [ -d "$IMAPLIBDIR" ]; then +# ( cd $IMAPLIBDIR && rm -rf * ) +# rmdir $IMAPLIBDIR +#fi + +cd $PKG +makepkg -l y -c n $TMP/php-$VERSION-$ARCH-$BUILD.tgz + diff --git a/patches/php/php.ini-x86_64.diff.gz b/patches/php/php.ini-x86_64.diff.gz Binary files differnew file mode 100644 index 00000000..72de3f15 --- /dev/null +++ b/patches/php/php.ini-x86_64.diff.gz diff --git a/patches/php/php.ini.diff.gz b/patches/php/php.ini.diff.gz Binary files differnew file mode 100644 index 00000000..6b671576 --- /dev/null +++ b/patches/php/php.ini.diff.gz diff --git a/patches/php/php.squirrel.diff.gz b/patches/php/php.squirrel.diff.gz Binary files differnew file mode 100644 index 00000000..1b633ab3 --- /dev/null +++ b/patches/php/php.squirrel.diff.gz diff --git a/patches/php/php4-snapshot.SlackBuild b/patches/php/php4-snapshot.SlackBuild new file mode 100755 index 00000000..262110e3 --- /dev/null +++ b/patches/php/php4-snapshot.SlackBuild @@ -0,0 +1,311 @@ +#!/bin/bash +# +# Build and package mod_php on Slackware. +# by: David Cantrell <david@slackware.com> +# Modified for PHP 4+ by volkerdi@slackware.com +# +# Small changes by rhatto +# Use this script if you want a cvs snapshot. +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="php" +VERSION=${VERSION:=4.4.2} +SNAP_VERSION=${SNAP_VERSION:=200606181830} +PINE=${PINE:=4.64} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} + +TMP=${TMP:=/tmp} +PKG=$TMP/package-php +SRC_DIR=${SRC:=$CWD} + +RTOOL="wget" + +SRC="php4-STABLE-$SNAP_VERSION.tar.bz2" +URL="http://snaps.php.net/$SRC" + +# pear modules +DB="DB-1.7.6.tgz" +HTTP="HTTP-1.4.0.tgz" +MAIL="Mail-1.1.9.tgz" +SMTP="Net_SMTP-1.2.8.tgz" +SOCKET="Net_Socket-1.0.6.tgz" +PARSER="XML_Parser-1.2.7.tgz" +RPC="XML_RPC-1.4.5.tgz" +TAR="Archive_Tar-1.3.1.tgz" +GETOPT="Console_Getopt-1.2.tgz" +TEMPLATE="HTML_Template_IT-1.1.3.tgz" + +PEAR="http://pear.php.net/get" + +if [ "$RTOOL" == "wget" ]; then + + if [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" + fi + + # rm -rf $SRC_DIR/pear* + mkdir -p $SRC_DIR/pear + + if [ $VERSION = 4.4.2 ]; then + pearlist="$DB $HTTP $MAIL $SMTP $SOCKET $PARSER $RPC" + mkdir -p $SRC_DIR/pear-4.4.2-bad-md5sums + for pear in $TAR $GETOPT $TEMPLATE; do + if [ ! -f "$SRC_DIR/pear-4.4.2-bad-md5sums/$pear" ]; then + wget "$PEAR/$pear" -O "$SRC_DIR/pear-4.4.2-bad-md5sums/$pear" + fi + done + else + pearlist="$DB $HTTP $MAIL $SMTP $SOCKET $PARSER $RPC $TAR $GETOPT $TEMPLATE" + fi + + for pear in $pearlist; do + if [ ! -f "$SRC_DIR/pear/$pear" ]; then + wget "$PEAR/$pear" -O "$SRC_DIR/pear/$pear" + fi + done + +fi + +if [ ! -d $TMP ]; then + mkdir -p $TMP +fi + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +fi + +# we need to compile Pine to get c-client.a for IMAP support: + +if [ "$ARCH" == "x86_64" ]; then + IMAPLIBDIR=/usr/local/lib64/c-client + LIBDIR="/usr/lib64" + LIB="lib64" +else + IMAPLIBDIR=/usr/local/lib/c-client + LIBDIR="/usr/lib" + LIB="lib" + ADD_FLAGS="--with-db3 --enable-yp" +fi + +if [ -r $IMAPLIBDIR/$LIB/c-client.a ]; then + echo "Using IMAP library:" + ls -l $IMAPLIBDIR/$LIB/c-client.a + sleep 5 +else + ( cd $CWD/../pine ; ./pine.SlackBuild ) + ( cd $TMP/pine${PINE}/imap/c-client + strip -g c-client.a + mkdir -p $IMAPLIBDIR/$LIB + cp c-client.a $IMAPLIBDIR/$LIB + mkdir -p $IMAPLIBDIR/include + cp *.h $IMAPLIBDIR/include + ) +fi + +php_configure() { +EXTENSION_DIR=/usr/$LIB/php/extensions \ +CFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr \ + $* \ + --with-_lib=$LIB \ + --libdir=$LIBDIR \ + --sysconfdir=/etc \ + --enable-discard-path \ + --with-config-file-path=/etc/apache \ + --enable-safe-mode \ + --with-openssl \ + --with-mhash \ + --enable-bcmath \ + --with-bz2 \ + --with-pic \ + --enable-calendar \ + --enable-ctype \ + --with-gdbm \ + --with-imap-ssl=$IMAPLIBDIR \ + --with-imap=$IMAPLIBDIR \ + --enable-dbase \ + --enable-ftp \ + --with-iconv \ + --with-dom \ + --with-exif \ + --enable-exif \ + --with-gd \ + --enable-gd-native-ttf \ + --with-jpeg-dir=/usr \ + --with-png \ + --with-gmp \ + --enable-mbstring \ + --with-curl=/usr \ + --with-pcre-regex=/usr \ + --with-mysql=shared,/usr \ + --with-gettext=shared,/usr \ + --with-expat-dir=/usr \ + --with-xml \ + --enable-wddx \ + --with-mm=/usr \ + --enable-trans-sid \ + --enable-shmop \ + --enable-sockets \ + --with-regex=php \ + --enable-sysvsem \ + --enable-sysvshm \ + --enable-memory-limit \ + --with-tsrm-pthreads \ + --enable-shared \ + --disable-debug \ + --with-zlib=/usr $ADD_FLAGS + # --with-mod_charset # only for Russian patched Apache + # --with-readline=/usr # this is only for the CGI version + # --with-ttf # this links with the shlib, need X for that + # --with-java # no thanks + + # strange bug, http://bugs.php.net/bug.php?id=31193 + sed -e 's/^EXTRA_LIBS\(.*\)/EXTRA_LIBS\1 -liconv/' Makefile > Makefile.new + mv Makefile.new Makefile + +} + +# compile php +rm -rf $PKG +mkdir -p $PKG/etc/apache +# A trick from DaMouse to enable building php into $PKG. +# We'll remove this later on. +cat /etc/apache/httpd.conf.default > $PKG/etc/apache/httpd.conf +cd $TMP +rm -rf php-$SNAP_VERSION +tar xjvf $SRC_DIR/$SRC + +# Add missing(?) PEAR modules back: +( cd php4-STABLE-$SNAP_VERSION/pear/packages + cp -a $SRC_DIR/pear/* . + bzip2 -d *.bz2 &> /dev/null + gunzip -d -f *.tgz &> /dev/null +) + +# Replace PEAR packages for which the 4.4.2 release contained incorrect md5sums: +if [ $VERSION = 4.4.2 ]; then + ( cd php4-STABLE-$SNAP_VERSION/pear/packages + rm -f HTML_Template_IT-1.1.tar + cp -a $SRC_DIR/pear-4.4.2-bad-md5sums/* . + bzip2 -d --force *.bz2 &> /dev/null + gunzip -d -f *.tgz &> /dev/null + ) +fi + +cd php4-STABLE-$SNAP_VERSION + +if [ "$ARCH" == "x86_64" ]; then + # Fix lib64 - thanks SuSE + echo patchin with $CWD/php-with-_lib-$VERSION.diff.gz... + zcat $CWD/php-with-_lib-$VERSION.diff.gz | patch -p1 --verbose + autoconf +fi + +# Fixup perms/owners: +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 666 -exec chmod 644 {} \; +find . -perm 664 -exec chmod 644 {} \; +find . -name "*.h" -exec chmod 644 {} \; +# Sometimes they ship a few of these: +find . -name "*.orig" -exec rm {} \; +# Patch ini files: + +if [ "$ARCH" == "x86_64" ]; then + zcat $CWD/php.ini-x86_64.diff.gz | patch -p1 --verbose --backup --suffix=.orig + # Fix an issue introduced in PHP 4.4.1 that breaks SquirrelMail and + # probably some other PHP applications: + #zcat $CWD/php.squirrel.diff.gz | patch -p1 --verbose || exit +else + zcat $CWD/php.ini.diff.gz | patch -p1 --verbose --backup --suffix=.orig +fi + +# Make the Apache module version of PHP: +echo "***START APACHE MODULE***" +php_configure --disable-static --with-apxs=/usr/sbin/apxs +make -j3 +make install INSTALL_ROOT=$PKG +make distclean +echo "***END APACHE MODULE***" + +# PHP likes to install Pear with some strange permissions. +chmod 755 $PKG/usr/bin/pear + +# Make the standalone interpreter: +php_configure --enable-force-cgi-redirect --enable-fastcgi --enable-pcntl --enable-sigchild +make -j3 +make install-cli INSTALL_ROOT=$PKG +chmod 755 $PKG/usr/bin/php +chown root.bin $PKG/usr/bin/php + +# PHP 4.4.2 seems to be throwing some junk in the root directory: +( cd $PKG + rm -rf .channels .depdb .depdblock .filemap .lock .registry +) + +if [ "$ARCH" == "x86_64" ]; then + # Fix $PKG/usr/lib64/php perms: + ( cd $PKG/usr/lib64/php + find . -perm 666 -exec chmod 644 {} \; + ) +else + # Fix $PKG/usr/lib/php perms: + ( cd $PKG/usr/lib/php + find . -perm 666 -exec chmod 644 {} \; + ) +fi + +mkdir -p $PKG/usr/doc/php-$SNAP_VERSION +cp -a \ + CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* TODO* \ + sapi/cgi/README.FastCGI \ + $PKG/usr/doc/php-$SNAP_VERSION +chown -R root.root $PKG/usr/doc/php-$SNAP_VERSION + +mkdir -p $PKG/etc/apache +cp -a php.ini-dist php.ini-recommended $PKG/etc/apache +cp -a $CWD/mod_php.conf.example $PKG/etc/apache +chmod 644 $PKG/etc/apache/* +chown root.root $PKG/etc/apache/* + +rm -f $PKG/etc/apache/httpd* + +chown -R root:bin $PKG/usr/bin + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +gzip -9 $PKG/usr/man/man?/*.? + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +#if [ -d "$IMAPLIBDIR" ]; then +# ( cd $IMAPLIBDIR && rm -rf * ) +# rmdir $IMAPLIBDIR +#fi + +cd $PKG +makepkg -l y -c n $TMP/php-$SNAP_VERSION-$ARCH-$BUILD.tgz + diff --git a/patches/php/slack-desc b/patches/php/slack-desc new file mode 100644 index 00000000..fe14da6d --- /dev/null +++ b/patches/php/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +php: php (HTML-embedded scripting language) +php: +php: PHP is an HTML-embedded scripting language. It shares syntax +php: characteristics with C, Java, and Perl. The primary objective behind +php: this language is to make a fast and easy-to-use scripting language +php: for dynamic web sites. +php: +php: More information can be found online at http://www.php.net/ +php: +php: +php: diff --git a/patches/pine/_imapd.tar.gz b/patches/pine/_imapd.tar.gz Binary files differnew file mode 100644 index 00000000..a4c32c2f --- /dev/null +++ b/patches/pine/_imapd.tar.gz diff --git a/patches/pine/_pine.tar.gz b/patches/pine/_pine.tar.gz Binary files differnew file mode 100644 index 00000000..3f41c58e --- /dev/null +++ b/patches/pine/_pine.tar.gz diff --git a/patches/pine/fpic.diff.gz b/patches/pine/fpic.diff.gz Binary files differnew file mode 100644 index 00000000..ff74327b --- /dev/null +++ b/patches/pine/fpic.diff.gz diff --git a/patches/pine/pine-slackware.config.diff.gz b/patches/pine/pine-slackware.config.diff.gz Binary files differnew file mode 100644 index 00000000..09a589a9 --- /dev/null +++ b/patches/pine/pine-slackware.config.diff.gz diff --git a/patches/pine/pine.SlackBuild b/patches/pine/pine.SlackBuild new file mode 100755 index 00000000..ee292f99 --- /dev/null +++ b/patches/pine/pine.SlackBuild @@ -0,0 +1,147 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/pine/pine.SlackBuild +# small changes by rhatto +# + +# Set initial variables: + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +VERSION=${VERSION:=4.64} +PINEPGP=${PINEPGP:=0.18.0} +ARCH=${ARCH:=x86_64} +PINEBUILD=${BUILD:=1rha} +IMAPDBUILD=${BUILD:=1rha} + +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} + +PKG1=$TMP/package-pine +PKG2=$TMP/package-imapd + +RTOOL="wget" +SRC="pine$VERSION.tar.bz2" +URL="ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/pine/$SRC" +PGP="pinepgp-$PINEPGP.tar.gz" +PGP_URL="ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/pine/$PGP" + +if [ "$RTOOL" == "wget" ]; then + + if [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL" -O "$SRC_DIR/$SRC" + fi + + if [ ! -f "$SRC_DIR/$PGP" ]; then + wget "$PGP_URL" -O "$SRC_DIR/$PGP" + fi + +fi + +if [ ! -d $TMP ]; then + mkdir -p $TMP # location to build the source +fi +rm -rf $PKG1 $PKG2 +mkdir -p $PKG1 $PKG2 + +# Explode the package framework: +cd $PKG1 +explodepkg $CWD/_pine.tar.gz +cd $PKG2 +explodepkg $CWD/_imapd.tar.gz + +echo "+==========+" +echo "| pine$VERSION |" +echo "+==========+" +cd $TMP +rm -rf pine$VERSION +tar xjvf $SRC_DIR/$SRC +cd pine$VERSION + +if [ "$ARCH" == "x86_64" ]; then + ( cd imap/src/osdep/unix; zcat $CWD/fpic.diff.gz | patch -p0 --verbose -E || exit ) +fi + +zcat $CWD/pine-slackware.config.diff.gz | patch -p1 --backup --verbose -E || exit + +# Set default debug level to 0: +zcat $CWD/pine.debug.diff.gz | patch -p1 --backup --verbose -E || exit +echo "#define PASSFILE \".pine.pwd\"" >> pine/osdep/os-lnx.h +# Remove ~ files: +find . -name "*~" | xargs rm --verbose +mkdir $PKG1/usr/doc/pine$VERSION +cp -a README CPYRIGHT $PKG1/usr/doc/pine$VERSION +( cd doc ; cp -a * $PKG1/usr/doc/pine$VERSION ) +( cd $PKG1/usr/doc/pine$VERSION ; rm *.1 tech-notes.txt ) +( cd $PKG1/usr/doc/pine$VERSION ; chown -R root.root * ) +mkdir -p $PKG2/usr/doc/pine$VERSION +cp -a README CPYRIGHT $PKG2/usr/doc/pine$VERSION +chown root.root $PKG2/usr/doc/pine$VERSION/* + +if [ "$ARCH" == "x86_64" ]; then + ./build slx SSLLIB=/usr/lib SSLDIR=/etc/ssl SSLCERTS=/etc/ssl/certs SSLINCLUDE=/usr/include/openssl SSLTYPE=unix OPTIMIZE="-O2" DEBUG=-O2 CC="gcc -fPIC" +else + ./build slx SSLLIB=/usr/lib SSLDIR=/etc/ssl SSLCERTS=/etc/ssl/certs SSLINCLUDE=/usr/include/openssl SSLTYPE=unix OPTIMIZE=-O2 DEBUG=-O2 +fi + +#( cd imap ; make clean ) +#( cd imap ; make slx ) +for file in doc/pico.1 doc/pilot.1 doc/pine.1 ; do + cat $file | gzip -9c > $PKG1/usr/man/man1/`basename $file`.gz +done +for file in imap/src/imapd/imapd.8 imap/src/ipopd/ipopd.8 ; do + cat $file | gzip -9c > $PKG2/usr/man/man8/`basename $file`.gz +done +cd imap/imapd +strip imapd +cat imapd > $PKG2/usr/sbin/imapd +cd ../ipopd +strip ipop3d +cat ipop3d > $PKG2/usr/sbin/ipop3d +cd ../../bin +strip * +cat pico > $PKG1/usr/bin/pico +cat pilot > $PKG1/usr/bin/pilot +cat pine > $PKG1/usr/bin/pine +# Add a default system-wide config file: +$PKG1/usr/bin/pine -conf > $PKG1/etc/pine.conf + +# Add slack-desc files: +mkdir -p $PKG1/install +cat $CWD/slack-desc.pine > $PKG1/install/slack-desc +mkdir -p $PKG2/install +cat $CWD/slack-desc.imapd > $PKG2/install/slack-desc + +# Add pinepgp support: +cd $TMP +tar xzvf $SRC_DIR/pinepgp-$PINEPGP.tar.gz +cd pinepgp-$PINEPGP +chown -R root.root . +./configure --prefix=/usr +make +make install DESTDIR=$PKG1 +chown root.bin $PKG1/usr/bin/* +mkdir -p $PKG1/usr/doc/pinepgp-$PINEPGP +cp -a COPYING README $PKG1/usr/doc/pinepgp-$PINEPGP +chmod 644 $PKG1/usr/doc/pinepgp-$PINEPGP/* + +# Build the package: +cd $PKG1 +makepkg -l y -c n $TMP/pine-$VERSION-$ARCH-$PINEBUILD.tgz +cd $PKG2 +makepkg -l y -c n $TMP/imapd-$VERSION-$ARCH-$IMAPDBUILD.tgz + +# Clean up the extra stuff: +if [ "$1" = "--cleanup" ]; then + rm -rf $TMP/pine$VERSION + rm -rf $PKG1 + rm -rf $PKG2 +fi diff --git a/patches/pine/pine.debug.diff.gz b/patches/pine/pine.debug.diff.gz Binary files differnew file mode 100644 index 00000000..1d556182 --- /dev/null +++ b/patches/pine/pine.debug.diff.gz diff --git a/patches/pine/slack-desc.imapd b/patches/pine/slack-desc.imapd new file mode 100644 index 00000000..0388e9dd --- /dev/null +++ b/patches/pine/slack-desc.imapd @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +imapd: imapd (IMAP4rev1 from pine4.63) +imapd: +imapd: /usr/sbin/ipop3d and /usr/sbin/imapd are servers supporting the POP3 +imapd: and IMAP remote mail access protocols. They allow users to download +imapd: mail from your Linux system for remote viewing. +imapd: +imapd: +imapd: +imapd: +imapd: +imapd: diff --git a/patches/pine/slack-desc.pine b/patches/pine/slack-desc.pine new file mode 100644 index 00000000..3b966532 --- /dev/null +++ b/patches/pine/slack-desc.pine @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +pine: pine (a menu driven mail client) +pine: +pine: A menu driven user mail program. Originally based on Elm (Pine Is +pine: No-longer Elm), but with many additional features that make it +pine: easier to use. Also contains pilot (a simple file manager) and +pine: pico (an easy to use text editor). +pine: +pine: +pine: +pine: +pine: diff --git a/patches/sdl/libdir-fix.diff.gz b/patches/sdl/libdir-fix.diff.gz Binary files differnew file mode 100644 index 00000000..b34d6945 --- /dev/null +++ b/patches/sdl/libdir-fix.diff.gz diff --git a/patches/sdl/sdl.SlackBuild b/patches/sdl/sdl.SlackBuild new file mode 100755 index 00000000..ba3fb9c4 --- /dev/null +++ b/patches/sdl/sdl.SlackBuild @@ -0,0 +1,201 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/source/l/sdl/sdl.SlackBuild +# small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="sdl" +VERSION=${VERSION:=1.2.11} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} + +IMAGE=${IMAGE:=1.2.5} +MIXER=${MIXER:=1.2.7} +NET=${NET:=1.2.6} +TTF=${TTF:=2.0.8} + +RTOOL="wget" +PACKAGE_EXT="gz" +SRC="SDL-$VERSION.tar.$PACKAGE_EXT" +SRC_image="SDL_image-$IMAGE.tar.gz" +SRC_mixer="SDL_mixer-$MIXER.tar.gz" +SRC_net="SDL_net-$NET.tar.gz" +SRC_ttf="SDL_ttf-$TTF.tar.gz" +URL="http://www.libsdl.org/release/$SRC" +URL_LIB="http://www.libsdl.org/projects" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +SRC_DIR="$SRC_DIR/$PACKAGE" +TMP="$TMP/$PACKAGE" +mkdir -p $SRC_DIR $TMP + +if [ "$RTOOL" == "wget" ]; then + if [ ! -f "$SRC_DIR/$SRC" ]; then + wget "$URL/$SRC" -O "$SRC_DIR/$SRC" + fi + if [ ! -f "$SRC_DIR/$SRC_image" ]; then + wget "$URL_LIB/SDL_image/release/$SRC_image" -O "$SRC_DIR/$SRC_image" + fi + if [ ! -f "$SRC_DIR/$SRC_mixer" ]; then + wget "$URL_LIB/SDL_mixer/release/$SRC_mixer" -O "$SRC_DIR/$SRC_mixer" + fi + if [ ! -f "$SRC_DIR/SDL_net-$NET.tar.gz" ]; then + wget "$URL_LIB/SDL_net/release/$SRC_net" -O "$SRC_DIR/$SRC_net" + fi + if [ ! -f "$SRC_DIR/SDL_ttf-$TTF.tar.gz" ]; then + wget "$URL_LIB/SDL_ttf/release/$SRC_ttf" -O "$SRC_DIR/$SRC_ttf" + fi +fi + +PKG="$TMP/package-$PACKAGE" + +LIBDIR=/usr/lib +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIR=/usr/lib64 +fi +rm -rf $PKG +mkdir -p $PKG +cd $TMP +rm -rf sdl-$VERSION +tar xf$tarflag $SRC_DIR/$SRC +cd SDL-$VERSION +if [ "$ARCH" == "x86_64" ]; then + gzip -dc $CWD/libdir-fix.diff.gz | patch -p1 +fi +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 664 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --enable-shared=yes \ + --libdir=$LIBDIR \ + --enable-static=no +make -j3 +# Spam /, for mixer/image later on: +make install +# install to package: +make install DESTDIR=$PKG +mkdir -p $PKG/usr/doc/SDL-$VERSION/html +cp -a docs/index.html $PKG/usr/doc/SDL-$VERSION +cp -a docs/html/*.html $PKG/usr/doc/SDL-$VERSION/html +cp -a BUGS COPYING CREDITS INSTALL README* TODO WhatsNew $PKG/usr/doc/SDL-$VERSION +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Add SDL_image: +cd $TMP +rm -rf SDL_image-$IMAGE +tar xf$tarflag $SRC_DIR/$SRC_image +cd SDL_image-$IMAGE +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 664 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --enable-shared=yes \ + --libdir=$LIBDIR \ + --enable-static=no +make -j3 +make install DESTDIR=$PKG +mkdir -p $PKG/usr/doc/SDL_image-$IMAGE +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_image-$IMAGE + +# Add SDL_mixer: +cd $TMP +rm -rf SDL_mixer-$MIXER +tar xf$tarflag $SRC_DIR/$SRC_mixer +cd SDL_mixer-$MIXER +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 664 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --enable-shared=yes \ + --libdir=$LIBDIR \ + --enable-static=no +make -j3 +make install DESTDIR=$PKG +mkdir -p $PKG/usr/doc/SDL_mixer-$MIXER +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_mixer-$MIXER + +# Add SDL_net: +cd $TMP +rm -rf SDL_net-$NET +tar xf$tarflag $SRC_DIR/$SRC_net +cd SDL_net-$NET +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 664 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --enable-shared=yes \ + --libdir=$LIBDIR \ + --enable-static=no +make -j3 +make install DESTDIR=$PKG +mkdir -p $PKG/usr/doc/SDL_net-$NET +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_net-$NET + +# Add SDL_ttf: +cd $TMP +rm -rf SDL_ttf-$TTF +tar xf$tarflag $SRC_DIR/$SRC_ttf +cd SDL_ttf-$TTF +chown -R root.root . +find . -perm 777 -exec chmod 755 {} \; +find . -perm 664 -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --enable-shared=yes \ + --libdir=$LIBDIR \ + --enable-static=no +make -j3 +make install DESTDIR=$PKG +mkdir -p $PKG/usr/doc/SDL_ttf-$TTF +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_ttf-$TTF + +chown -R root.bin $PKG/usr/bin +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) +gzip -9 $PKG/usr/man/man?/*.? + +cd $PKG +makepkg -l y -c n ../sdl-$VERSION-$ARCH-$BUILD.tgz + diff --git a/patches/sdl/slack-desc b/patches/sdl/slack-desc new file mode 100644 index 00000000..1d5d5c01 --- /dev/null +++ b/patches/sdl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +sdl: sdl (Simple DirectMedia Layer library) +sdl: +sdl: This is the Simple DirectMedia Layer, a generic API that provides low +sdl: level access to audio, keyboard, mouse, joystick, 3D hardware via +sdl: OpenGL, and 2D framebuffer across multiple platforms. +sdl: +sdl: SDL links against alsa-lib, arts, audiofile, esound, and the X11 +sdl: libraries. Make sure all of these are installed if you're planning to +sdl: use SDL (a full installation will cover all of the prerequisites). +sdl: +sdl: diff --git a/patches/smartmontools/doinst.sh.gz b/patches/smartmontools/doinst.sh.gz Binary files differnew file mode 100644 index 00000000..7cf71d5a --- /dev/null +++ b/patches/smartmontools/doinst.sh.gz diff --git a/patches/smartmontools/slack-desc b/patches/smartmontools/slack-desc new file mode 100644 index 00000000..ce462947 --- /dev/null +++ b/patches/smartmontools/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +smartmontools: smartmontools (hard drive monitoring utilities) +smartmontools: +smartmontools: SMARTMONTOOLS contains utilities that control and monitor storage +smartmontools: devices using the Self-Monitoring, Analysis and Reporting Technology +smartmontools: (S.M.A.R.T.) system build into ATA and SCSI Hard Drives. This is used +smartmontools: to check the reliability of the hard drive and to predict drive +smartmontools: failures. SMARTMONTOOLS Version 5.x is designed to comply to the +smartmontools: ATA/ATAPI-5 specification (Revision 1). Future releases of +smartmontools: SMARTMONTOOLS (Versions 6.x and 7.x) will comply with the ATA/ATAPI-6 +smartmontools: and ATA/ATAPI-7 specifications. +smartmontools: diff --git a/patches/smartmontools/smartmontools.SlackBuild b/patches/smartmontools/smartmontools.SlackBuild new file mode 100755 index 00000000..5aaa5c5d --- /dev/null +++ b/patches/smartmontools/smartmontools.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/bash +# +# got it from ftp://ftp.slackware.com/pub/slackware/slackware-current/source/a/smartmontools/smartmontools.SlackBuild +# small changes by rhatto +# + +CWD="`pwd`" + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="smartmontools" +VERSION=${VERSION:=5.36} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +TMP=${TMP:=/tmp} +SRC_DIR=${SRC:=$CWD} + +if [ "$ARCH" == "x86_64" ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +RTOOL="wget" +PACKAGE_EXT="gz" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="http://easynews.dl.sourceforge.net/sourceforge/smartmontools/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +TMP="$TMP/$PACKAGE" +PKG=$TMP/package-$PACKAGE +SRC_DIR="$SRC_DIR/$PACKAGE" +mkdir -p $TMP $SRC_DIR + +# TODO: signature checking +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + rm -f $SRC_DIR/$SRC.asc + wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL.asc" -O "$SRC_DIR/$SRC.asc" +fi + + +if [ ! -d $TMP ]; then + mkdir -p $TMP # location to build the source +fi + +rm -rf $PKG +mkdir -p $PKG + +cd $TMP +rm -rf smartmontools-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd smartmontools-$VERSION +chown -R root:root . +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + $ARCH-slackware-linux +make +make install DESTDIR=$PKG +# Not used on Slackware: +rm -rf $PKG/etc/rc.d +mv $PKG/etc/smartd.conf $PKG/etc/smartd.conf.new +gzip -9 $PKG/usr/man/man?/*.? +mv $PKG/usr/share/doc $PKG/usr +rmdir $PKG/usr/share +rm -f $PKG/usr/doc/smartmontools-$VERSION/CHANGELOG \ + $PKG/usr/doc/smartmontools-$VERSION/smartd.conf +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/smartmontools-$VERSION-$ARCH-$BUILD.tgz + +# Clean up the extra stuff: +if [ "$1" = "--cleanup" ]; then + rm -rf $TMP/smartmontools-$VERSION + rm -rf $PKG +fi diff --git a/patches/sudo/doinst.sh.gz b/patches/sudo/doinst.sh.gz Binary files differnew file mode 100644 index 00000000..91d62013 --- /dev/null +++ b/patches/sudo/doinst.sh.gz diff --git a/patches/sudo/slack-desc b/patches/sudo/slack-desc new file mode 100644 index 00000000..66f1aa8c --- /dev/null +++ b/patches/sudo/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +sudo: sudo (give limited root privileges to certain users) +sudo: +sudo: 'sudo' is a command that allows users to execute some commands as +sudo: root. The /etc/sudoers file (edited with 'visudo') specifies which +sudo: users have access to sudo and which commands they can run. 'sudo' +sudo: logs all its activities to /var/log/ so the system administrator +sudo: can keep an eye on things. +sudo: +sudo: +sudo: +sudo: diff --git a/patches/sudo/sudo.SlackBuild b/patches/sudo/sudo.SlackBuild new file mode 100755 index 00000000..9aeb5144 --- /dev/null +++ b/patches/sudo/sudo.SlackBuild @@ -0,0 +1,125 @@ +#!/bin/bash +# +# Got it from http://slamd64.he.net/slamd64-10.2b/source/ap/sudo/sudo.SlackBuild +# Small changes by rhatto +# + +# Set initial variables: +CWD=`pwd` + +if [ -f "/etc/slackbuildrc" ]; then + source /etc/slackbuildrc +fi + +if [ -f "~/.slackbuildrc" ]; then + source ~/.slackbuildrc +fi + +PACKAGE="sudo" +VERSION=${VERSION:=1.6.8p12} +ARCH=${ARCH:=x86_64} +BUILD=${BUILD:=1rha} +SRC_DIR=${SRC:=$CWD} +TMP=${TMP:=/tmp} + +RTOOL="wget" +PACKAGE_EXT="gz" +SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" +URL="http://www.sudo.ws/sudo/dist/$SRC" + +if [ "$PACKAGE_EXT" == "bz2" ]; then + tarflag="j" +else + tarflag="z" +fi + +if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then + rm -f $SRC_DIR/$SRC.sig + wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" +fi + +gpg --import << EOGPG +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.7 (OpenBSD) + +mQGiBD2bdiURBACyoSsYq9t8jiLnhABRZcgDP2vaoJoGJD3eb9HNsv2+0IrcHaut +s1QR1AY88AGTMnQTFWjH1vIXz/YCKnvgqklfbVCMehvkOUKvGv2eP7IkmWvVPIQb +kayHCtChOKW86hqxZXyT8sbBJqHGHq7xBbg71uZ/CSaTY3ATencRX+UndwCg6ujz +FFQhKoVwnPdYPkYA10kp2UsD/2Act3O9UJabaln5MLqLQrxo1Cqa3+ht4liAAOr3 +psMPcieyIULQ4yE19Jvb90s2sao88BUPVeDxBHV/nhcNQxlH4Boc+kWtU36XSxU3 +yrUhZDQIvrM4o1yCSgNSwUM88+qYm6ETAT0sZAiFT9biMjsT4Bw13KihyYtE2L36 +LdXOA/9MEH8zWRqUjQMt4X1yKTjwmIotAd9xetVNj+4lfTgmsnlZoex7T94Id0+B +FDDSj4gpQ7GpFa0qOQgTyaUo5HgoPFw4F9TjebWiyey2SznIw4960KoAwfSTdSOG +GoD96xuBsmQGCfdIFW43SJngXKiOpF/3VHoUxGYhTefOSGHAvLQqVG9kZCBDLiBN +aWxsZXIgPFRvZGQuTWlsbGVyQGNvdXJ0ZXNhbi5jb20+iFkEExECABkFAj2bdiUE +CwcDAgMVAgMDFgIBAh4BAheAAAoJEFqJ36J+5HDEQigAoLdD+y5EQzvogb6oybhC +pBBmefqYAKDGlnXX7JNBJYBv/r5TBg4+zLOOL7kBDQQ9m3YnEAQAzhN0fOfOz3+z +m0rHJ+hCW06ME9W1UWTgPdkh6izMO29j5tsq7MDOEoiBA8fGNV9+1nqXS3PWsYpP +qnm+Yx/8zHPsepiOWe3UaJruBfFT8BlGSzN6p9aO1liQOnv57XouRab5tUFZPDM7 +ADHGAlruyvZjzywj/v6FWNoY6DLiqosAAwUEAKSap7csw/skFED0lF/lsllvmRa7 +4kd/lEYGPB62Cyau/4nucrnZrBNP7wSIdpCLzQxq6l/j/vP5aUV8qN2W6+DY1CZA +rodtZKPUNGHCdop9ZcskEx6eOG2ivYpgn0z6scoXUJ4g5kCSshzPedG4DOLHFMtE +hVDWxnHdtn0UFCntiEYEGBECAAYFAj2bdicACgkQWonfon7kcMTOeACgmCPD1Is5 +KhRmc+7kY4ILfdUX5OUAn2mdSBk/pObAfpdPzasJT7QxIQFL +=3GDW +-----END PGP PUBLIC KEY BLOCK----- +EOGPG + +gpg --verify $SRC.sig $SRC || echo WARNING: Could not check signature or WRONG signature found. + +PKG=$TMP/package-sudo + +if [ ! -d $TMP ]; then + mkdir -p $TMP # location to build the source +fi + +rm -rf $PKG +mkdir -p $PKG + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mcpu=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2" +fi + +cd $TMP +rm -rf sudo-$VERSION +tar xvf$tarflag $SRC_DIR/$SRC +cd sudo-$VERSION +chown -R root.root . +CFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr --sbindir=/usr/sbin --with-getpass --with-C2 +make +make install DESTDIR=$PKG +chown -R root:bin $PKG/usr/bin $PKG/usr/sbin +( cd $PKG/usr/bin + chmod 4711 sudo + ln -sf sudo sudoedit +) +chmod 755 $PKG/usr/sbin/visudo +rm -f $PKG/usr/man/man8/sudoedit.8 +gzip -9 $PKG/usr/man/man?/*.? +( cd $PKG/usr/man/man8 ; ln -sf sudo.8.gz sudoedit.8.gz ) +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) +mv $PKG/etc/sudoers $PKG/etc/sudoers.new +mkdir -p $PKG/usr/doc/sudo-$VERSION +cp -a \ + BUGS HISTORY INSTALL LICENSE PORTING README README.LDAP RUNSON TODO TROUBLESHOOTING UPGRADE \ + $PKG/usr/doc/sudo-$VERSION +chmod 644 $PKG/usr/doc/sudo-$VERSION/* +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/sudo-$VERSION-$ARCH-$BUILD.tgz + |