From 44395e5227c39f31ee6dcebc41fcb9afb70087e5 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 17 Aug 2005 14:45:03 +0000 Subject: [PATCH] CHANGELOG 2005-08-17 --- doc/CHANGELOG | 6 + misc/arch/ia32/linux.config | 5 +- packages/devel/scons/scons | 16 + packages/hackbard/apache/apache | 4 +- packages/hackbard/cups/cups | 4 +- packages/hackbard/cups/manpages.patch | 8 +- packages/hackbard/gpsd/gpsd | 10 +- packages/hackbard/gpsd/include_xm_h.patch | 10 + .../hackbard/gtk-gnutella/configure.patch | 33 +- packages/hackbard/gtk-gnutella/gtk-gnutella | 4 +- packages/hackbard/hostap/hostap | 5 +- packages/hackbard/isdn4k-utils/autoconf.patch | 135 -------- packages/hackbard/isdn4k-utils/isdn4k-utils | 12 +- .../hackbard/isdn4k-utils/no_make_dev.patch | 4 +- .../hackbard/isdn4k-utils/options_c.patch | 30 -- packages/hackbard/licq/licq | 4 +- packages/hackbard/licq/nptl.patch | 12 - packages/hackbard/lirc/lirc | 2 - packages/hackbard/lprng/lprng | 4 +- packages/hackbard/magicfilter/magicfilter | 4 +- packages/hackbard/raptor/raptor | 4 +- packages/hackbard/scummvm/scummvm | 12 +- packages/hackbard/slmodem/slmodem | 4 +- packages/hackbard/wine/wine | 4 +- .../hackbard/wvstreams/new_openssl_api.patch | 36 ++ packages/hackbard/wvstreams/wvstreams | 6 +- packages/hackbard/xdirectfb/startdfbx | 160 +++++++++ .../hackbard/xdirectfb/xdfbserverrc.example | 1 + packages/hackbard/xdirectfb/xdirectfb | 11 + packages/hackbard/xml-parser/xml-parser | 15 + .../hpc/openmosixuserland/openmosixuserland | 27 +- packages/multimedia/faad2/faad2 | 2 +- packages/multimedia/flite/flite | 2 +- packages/multimedia/libmad/libmad | 4 +- packages/multimedia/mplayer/kernel_2_6.patch | 12 - packages/multimedia/mplayer/mplayer | 21 +- packages/multimedia/transcode/transcode | 10 +- packages/multimedia/vlc/vlc | 7 +- packages/multimedia/xawtv/xawtv | 4 +- packages/net/ethereal/ethereal | 8 +- packages/net/ettercap/ettercap | 4 +- packages/net/ipsec-tools/ipsec-tools | 4 +- packages/net/nmap/nmap | 4 +- packages/net/samba/samba | 5 +- packages/optional/nut/nut | 25 +- packages/optional/nut/nut.setup | 12 + packages/optional/unrealircd/unrealircd | 4 +- packages/soundtools/alsa/alsa | 14 +- packages/soundtools/ardour/ardour | 8 +- packages/soundtools/jack/jack | 4 +- packages/soundtools/liblrdf/liblrdf | 4 +- packages/soundtools/libmustux/libmustux | 12 +- packages/soundtools/libmustux/qmakespec.patch | 15 + packages/soundtools/protux/protux | 11 +- packages/soundtools/protux/qmakespec.patch | 14 + packages/x11/cairo/cairo | 7 + packages/x11/cairo/fcfini.patch | 11 + packages/x11/firefox/firefox | 5 +- packages/x11/gimp-print/gimp-print | 2 +- packages/x11/gimp/gimp | 6 +- packages/x11/libpixman/libpixman | 7 + packages/x11/pango/pango | 3 + packages/x11/qiv/qiv | 2 +- packages/x11/qt/qt | 15 +- packages/x11/t1lib/t1lib | 6 +- packages/x11/thunderbird/thunderbird | 8 +- packages/x11/xmms/xmms | 2 +- packages/x11/xpdf/lfs.patch | 31 +- packages/x11/xpdf/pl1.patch | 315 ++++++++++++++++++ packages/x11/xpdf/pl2.patch | 54 +++ packages/x11/xpdf/pl3.patch | 14 + scripts/Build-Distro | 20 +- scripts/Helper | 2 +- scripts/subroutines | 7 + targets/all-dev/include | 2 + targets/all-stable/include | 28 ++ targets/desktop/include | 1 - targets/fai-server/include | 3 + targets/mobile/include | 5 +- targets/router/include | 30 +- 80 files changed, 998 insertions(+), 390 deletions(-) create mode 100644 packages/devel/scons/scons create mode 100644 packages/hackbard/gpsd/include_xm_h.patch delete mode 100644 packages/hackbard/isdn4k-utils/autoconf.patch delete mode 100644 packages/hackbard/isdn4k-utils/options_c.patch delete mode 100644 packages/hackbard/licq/nptl.patch create mode 100644 packages/hackbard/wvstreams/new_openssl_api.patch create mode 100755 packages/hackbard/xdirectfb/startdfbx create mode 100644 packages/hackbard/xdirectfb/xdfbserverrc.example create mode 100644 packages/hackbard/xml-parser/xml-parser delete mode 100644 packages/multimedia/mplayer/kernel_2_6.patch create mode 100644 packages/optional/nut/nut.setup create mode 100644 packages/soundtools/libmustux/qmakespec.patch create mode 100644 packages/soundtools/protux/qmakespec.patch create mode 100644 packages/x11/cairo/cairo create mode 100644 packages/x11/cairo/fcfini.patch create mode 100644 packages/x11/libpixman/libpixman create mode 100644 packages/x11/xpdf/pl1.patch create mode 100644 packages/x11/xpdf/pl2.patch create mode 100644 packages/x11/xpdf/pl3.patch create mode 100644 targets/all-stable/include diff --git a/doc/CHANGELOG b/doc/CHANGELOG index c8cd8c4..b379122 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,6 +1,12 @@ +*) 2005-08-17 + +- added cairo, libpixman package and all-stable target +- updates and fixes to many packages + *) 2005-08-15 - added gaim package +- removed nvidia package *) 2005-08-12 diff --git a/misc/arch/ia32/linux.config b/misc/arch/ia32/linux.config index 0dabcca..4dc49fd 100644 --- a/misc/arch/ia32/linux.config +++ b/misc/arch/ia32/linux.config @@ -157,11 +157,14 @@ CONFIG_ISA=y # # PCCARD (PCMCIA/CardBus) support # -# CONFIG_PCCARD is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +CONFIG_CARDBUS=y # # PC-card bridges # +CONFIG_YENTA=y CONFIG_PCMCIA_PROBE=y # diff --git a/packages/devel/scons/scons b/packages/devel/scons/scons new file mode 100644 index 0000000..cd229d3 --- /dev/null +++ b/packages/devel/scons/scons @@ -0,0 +1,16 @@ +# hdw - linux python package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 0.96.1 +# [S] 3-2 +# [D] scons-src-0.96.1.tar.gz http://mesh.dl.sourceforge.net/sourceforge/scons/ + +build_main() { + # build scons + export SCONS_LIB_DIR=`pwd`/src/engine + python src/script/scons.py build/scons + # install scons + cd build/scons + python setup.py install --prefix=$prefix + } diff --git a/packages/hackbard/apache/apache b/packages/hackbard/apache/apache index 94b7413..70926d5 100644 --- a/packages/hackbard/apache/apache +++ b/packages/hackbard/apache/apache @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.0.50 +# [V] 2.0.54 # [S] 3-9 -# [D] httpd-2.0.50.tar.gz http://www.apache.de/dist/httpd/ +# [D] httpd-2.0.54.tar.bz2 http://www.apache.de/dist/httpd/ srcdir="httpd-$ver" diff --git a/packages/hackbard/cups/cups b/packages/hackbard/cups/cups index fc0b7e1..f8bb7fe 100644 --- a/packages/hackbard/cups/cups +++ b/packages/hackbard/cups/cups @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.1.20 +# [V] 1.1.23 # [S] 3-8 -# [D] cups-1.1.20-source.tar.bz2 ftp://ftp2.easysw.com/pub/cups/1.1.20/ +# [D] cups-1.1.23-source.tar.bz2 ftp://ftp2.easysw.com/pub/cups/1.1.23/ confopt="$confopt --disable-ssl --with-logdir=$root/var/cups/log" confopt="$confopt --with-cups-user=daemon --with-cups-group=daemon" diff --git a/packages/hackbard/cups/manpages.patch b/packages/hackbard/cups/manpages.patch index da7d424..52dc9bf 100644 --- a/packages/hackbard/cups/manpages.patch +++ b/packages/hackbard/cups/manpages.patch @@ -1,11 +1,11 @@ ---- ./man/Makefile.orig 2003-10-30 13:36:13.000000000 +0100 -+++ ./man/Makefile 2003-10-30 13:36:26.000000000 +0100 +--- ./man/Makefile.orig 2005-08-15 05:12:57.000000000 +0200 ++++ ./man/Makefile 2005-08-15 05:13:35.000000000 +0200 @@ -30,7 +30,7 @@ # Other languages... # --LANGDIRS = fr -+#LANGDIRS = fr +-LANGDIRS = es fr ++#LANGDIRS = es fr # diff --git a/packages/hackbard/gpsd/gpsd b/packages/hackbard/gpsd/gpsd index c709d42..27cb62a 100644 --- a/packages/hackbard/gpsd/gpsd +++ b/packages/hackbard/gpsd/gpsd @@ -2,12 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.25 +# [V] 2.28 # [S] 3-9 -# [D] gpsd-2.25.tar.gz http://download.berlios.de/gpsd/ - -#build_main() { -# ./configure && make && -# cp -v gpsd $prefix/bin && # gps follows, needs motif -# mkdir -p $prefix/lib && cp -v libgpsd.a $prefix/lib -# } +# [D] gpsd-2.28.tar.gz http://download.berlios.de/gpsd/ diff --git a/packages/hackbard/gpsd/include_xm_h.patch b/packages/hackbard/gpsd/include_xm_h.patch new file mode 100644 index 0000000..f3273e4 --- /dev/null +++ b/packages/hackbard/gpsd/include_xm_h.patch @@ -0,0 +1,10 @@ +--- ./xgpsspeed.c.orig 2005-08-16 14:08:57.000000000 +0200 ++++ ./xgpsspeed.c 2005-08-16 14:13:43.000000000 +0200 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/packages/hackbard/gtk-gnutella/configure.patch b/packages/hackbard/gtk-gnutella/configure.patch index 646f75a..b57925b 100644 --- a/packages/hackbard/gtk-gnutella/configure.patch +++ b/packages/hackbard/gtk-gnutella/configure.patch @@ -1,18 +1,37 @@ ---- ./Configure.orig 2004-07-19 23:37:17.000000000 +0200 -+++ ./Configure 2004-07-19 23:38:04.000000000 +0200 -@@ -698,15 +698,6 @@ +--- ./Configure.orig 2005-08-15 05:53:24.000000000 +0200 ++++ ./Configure 2005-08-15 05:55:00.000000000 +0200 +@@ -859,20 +859,20 @@ esac : Sanity checks -case "$fastread$alldone" in -yescont|yesexit) ;; -*) -- if test ! -t 0; then -- echo "Say 'sh Configure', not 'sh &1 case "$silent" in diff --git a/packages/hackbard/gtk-gnutella/gtk-gnutella b/packages/hackbard/gtk-gnutella/gtk-gnutella index 16ad460..4dea641 100644 --- a/packages/hackbard/gtk-gnutella/gtk-gnutella +++ b/packages/hackbard/gtk-gnutella/gtk-gnutella @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.93.4 +# [V] 0.95.4 # [S] 3-8 -# [D] gtk-gnutella-0.93.4.tar.bz2 http://belnet.dl.sourceforge.net/sourceforge/gtk-gnutella/ +# [D] gtk-gnutella-0.95.4.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/gtk-gnutella/ confopt="-d -D prefix=/usr" install_conf="INSTALL_PREFIX=$root $install_conf" diff --git a/packages/hackbard/hostap/hostap b/packages/hackbard/hostap/hostap index 6c237e2..5b91e51 100644 --- a/packages/hackbard/hostap/hostap +++ b/packages/hackbard/hostap/hostap @@ -3,11 +3,14 @@ # author: hackbard@hackdaworld.dyndns.org # # [V] 0.4.1 -# [S] 3-8 +# [S] 3-9 # [D] hostap-driver-0.4.1.tar.gz http://hostap.epitest.fi/releases/ ## [D] hostap-utils-0.1.3.tar.gz http://hostap.epitest.fi/releases/ ## [D] hostapd-0.1.3.tar.gz http://hostap.epitest.fi/releases/ +make_conf="KERNEL_PATH=$prefix/src/linux $make_conf" +install_conf="KERNEL_PATH=$prefix/src/linux $install_conf" + post_install() { rm -rf $docdir ; mkdir -p $docdir cp README $docdir diff --git a/packages/hackbard/isdn4k-utils/autoconf.patch b/packages/hackbard/isdn4k-utils/autoconf.patch deleted file mode 100644 index 4b0da2b..0000000 --- a/packages/hackbard/isdn4k-utils/autoconf.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- ./capi20/Makefile.in.org Sat Jul 6 02:26:12 2002 -+++ ./capi20/Makefile.in Mon Jan 20 18:36:24 2003 -@@ -125,7 +125,7 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -a --foreign Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ ---- ./capiinfo/configure Fri Jul 19 23:19:41 2002 -+++ ./capiinfo/configure Mon Jan 20 18:55:57 2003 -@@ -1194,7 +1194,7 @@ - - - --am__api_version="1.6" -+am__api_version="1.8" - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then ---- ./capiinit/Makefile.in.org Mon Jan 20 19:01:19 2003 -+++ ./capiinit/Makefile.in Mon Jan 20 19:15:09 2003 -@@ -111,7 +111,7 @@ - .SUFFIXES: - .SUFFIXES: .S .c .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -i -a --foreign Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ ---- ./rcapid/configure.org Fri Jul 19 23:58:45 2002 -+++ ./rcapid/configure Mon Jan 20 20:36:59 2003 -@@ -1194,7 +1194,7 @@ - - - --am__api_version="1.6" -+am__api_version="1.8" - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then ---- ./capiinfo/Makefile.in.orig 2002-07-19 23:20:34.000000000 +0200 -+++ ./capiinfo/Makefile.in 2002-10-14 11:03:32.000000000 +0200 -@@ -121,7 +121,7 @@ - .SUFFIXES: - .SUFFIXES: .S .c .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -i --foreign Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ -@@ -318,7 +318,7 @@ - top_distdir=`cd $(distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ -- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir -i --foreign Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ ---- ./xmonisdn/Makefile.in.orig 2002-07-19 22:30:02.000000000 +0200 -+++ ./xmonisdn/Makefile.in 2002-10-14 11:03:32.000000000 +0200 -@@ -65,6 +65,8 @@ - config: - @cp Makefile.in GNUmakefile - @xmkmf -+ @echo "Hacking the Makefile .. (Clifford)" -+ @perl -pe 's,^(xmonisdn:.*),$$1\n\t\$$(MAKE) xmonisdn.man,' < Makefile > x && mv x Makefile - - clean: - $(MAKE) -f Makefile clean ---- ./capifax/Makefile.in.orig 2000-05-11 12:55:00.000000000 +0200 -+++ ./capifax/Makefile.in 2002-10-14 11:03:32.000000000 +0200 -@@ -124,7 +124,7 @@ - .SUFFIXES: - .SUFFIXES: .S .c .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -i --foreign Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ -@@ -286,7 +286,7 @@ - top_distdir=`cd $(distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ -- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir -i --foreign Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ ---- ./vbox/doc/Makefile.in.orig 2003-09-16 19:08:03.000000000 +0200 -+++ ./vbox/doc/Makefile.in 2003-09-16 19:13:57.000000000 +0200 -@@ -111,7 +111,7 @@ - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -i -a --foreign doc/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ ---- ./vbox/doc/de/Makefile.in.orig 2003-09-16 19:39:53.000000000 +0200 -+++ ./vbox/doc/de/Makefile.in 2003-09-16 19:40:15.000000000 +0200 -@@ -108,7 +108,7 @@ - - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -i -a --foreign doc/de/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ ---- ./rcapid/Makefile.in.orig 2003-09-16 20:15:46.000000000 +0200 -+++ ./rcapid/Makefile.in 2003-09-16 20:16:41.000000000 +0200 -@@ -111,13 +111,13 @@ - .SUFFIXES: - .SUFFIXES: .S .c .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) -i -a --foreign Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - --$(ACLOCAL_M4): configure.in acinclude.m4 -+$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) - - config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) diff --git a/packages/hackbard/isdn4k-utils/isdn4k-utils b/packages/hackbard/isdn4k-utils/isdn4k-utils index 616c24b..cfe43c4 100644 --- a/packages/hackbard/isdn4k-utils/isdn4k-utils +++ b/packages/hackbard/isdn4k-utils/isdn4k-utils @@ -2,17 +2,16 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] v3.2p1 +# [V] CVS-2005-08-08 # [S] 3-7 -# [D] isdn4k-utils.v3.2p1.tar.bz2 ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/ +# [D] isdn4k-utils-CVS-2005-08-08.tar.bz2 ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/ build_main() { [ -z "`echo $PATH | grep X11\/bin`" ] && \ export PATH="$PATH:$root/usr/X11/bin" - cd capi20 && - libtoolize -f -c && - cd .. - if [ ! -f $root/var/adm/flists/xfree86 ] ; then + if [ ! -f $root/var/adm/flists/xfree86-? \ + -a ! -f $root/var/adm/flists/xorg-? ] ; then + echo "no x11 detected => disabling xtools" make_conf="$make_conf CONFIG_XISDNLOAD=n CONFIG_XMONISDN=n" fi # prepare config @@ -20,4 +19,5 @@ build_main() { make $make_conf subconfig && make $make_conf && make $make_conf install + mkdir -p $docdir } diff --git a/packages/hackbard/isdn4k-utils/no_make_dev.patch b/packages/hackbard/isdn4k-utils/no_make_dev.patch index 8d16155..0c9d3b2 100644 --- a/packages/hackbard/isdn4k-utils/no_make_dev.patch +++ b/packages/hackbard/isdn4k-utils/no_make_dev.patch @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2003-09-14 21:41:59.000000000 +0200 -+++ ./Makefile 2003-09-14 21:43:35.000000000 +0200 +--- ./Makefile.orig 2005-08-14 13:50:53.000000000 +0200 ++++ ./Makefile 2005-08-14 13:51:50.000000000 +0200 @@ -135,8 +135,6 @@ @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ then \ diff --git a/packages/hackbard/isdn4k-utils/options_c.patch b/packages/hackbard/isdn4k-utils/options_c.patch deleted file mode 100644 index bcd6127..0000000 --- a/packages/hackbard/isdn4k-utils/options_c.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ./ipppd/options.c.orig 2003-10-28 18:49:00.000000000 +0100 -+++ ./ipppd/options.c 2003-10-28 18:52:15.000000000 +0100 -@@ -479,26 +479,7 @@ - #define IMPLEMENTATION "" - #endif - --static char *usage_string = "\ --ipppd version %s patch level %d%s\n\ --Usage: %s [ options ], where options are:\n\ --\t Communicate over the named device\n\ --#ifdef INCLUDE_OBSOLETE_FEATURES --\tcrtscts Use hardware RTS/CTS flow control\n\ --\t Set the baud rate to \n\ --\tmodem Use modem control lines\n\ --#endif --\t: Set the local and/or remote interface IP\n\ --\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\ --\tasyncmap Set the desired async map to hex \n\ --\tauth Require authentication from peer\n\ --\tconnect

Invoke shell command

to set up the serial line\n\ --\tdefaultroute Add default route through interface\n\ --\tfile Take options from file \n\ --\tmru Set MRU value to for negotiation\n\ --\tnetmask Set interface netmask to \n\ --See ipppd(8) for more options.\n\ --"; -+static char *usage_string = "\nipppd version %s patch level %d%s\n\nUsage: %s [ options ], where options are:\n\n\t Communicate over the named device\n\n\t: Set the local and/or remote interface IP\n\n\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\n\tasyncmap Set the desired async map to hex \n\n\tauth Require authentication from peer\n\n\tconnect

Invoke shell command

to set up the serial line\n\n\tdefaultroute Add default route through interface\n\n\tfile Take options from file \n\n\tmru Set MRU value to for negotiation\n\n\tnetmask Set interface netmask to \n\nSee ipppd(8) for more options.\n"; - - static char *current_option; /* the name of the option being parsed */ - diff --git a/packages/hackbard/licq/licq b/packages/hackbard/licq/licq index d0039fd..d16bca5 100644 --- a/packages/hackbard/licq/licq +++ b/packages/hackbard/licq/licq @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.2.7 +# [V] 1.3.0 # [S] 3-8 -# [D] licq-1.2.7.tar.bz2 http://belnet.dl.sourceforge.net/sourceforge/licq/ +# [D] licq-1.3.0.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/licq/ post_install() { cd plugins/qt-gui diff --git a/packages/hackbard/licq/nptl.patch b/packages/hackbard/licq/nptl.patch deleted file mode 100644 index 4142017..0000000 --- a/packages/hackbard/licq/nptl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/sighandler.c.orig 2004-07-20 13:21:45.000000000 +0200 -+++ ./src/sighandler.c 2004-07-20 13:22:42.000000000 +0200 -@@ -83,7 +83,8 @@ - fprintf(stderr, "%s\n", res[0]);*/ - } - fprintf(stderr, "Attempting to generate core file.\n"); -- pthread_kill_other_threads_np(); -+ /* nptl glibc */ -+ /* pthread_kill_other_threads_np(); */ - #endif - - abort(); diff --git a/packages/hackbard/lirc/lirc b/packages/hackbard/lirc/lirc index 1f362c3..c44839d 100644 --- a/packages/hackbard/lirc/lirc +++ b/packages/hackbard/lirc/lirc @@ -14,7 +14,5 @@ irq="4" confopt="$confopt --with-driver=$driver --with-port=$port --with-irq=$irq" pre_install() { - sed 's%which dialog%type -p dialog%' setup.sh > tmp~ - mv tmp~ setup.sh chmod 750 setup.sh } diff --git a/packages/hackbard/lprng/lprng b/packages/hackbard/lprng/lprng index 339536f..e73b571 100644 --- a/packages/hackbard/lprng/lprng +++ b/packages/hackbard/lprng/lprng @@ -3,9 +3,9 @@ # author: hackbard@hackdaworld.dyndns.org # # -# [V] 3.8.27 +# [V] 3.8.28 # [S] 3-9 -# [D] LPRng-3.8.27.tgz ftp://ftp.lprng.com/pub/LPRng/LPRng/ +# [D] LPRng-3.8.28.tgz ftp://ftp.lprng.com/pub/LPRng/LPRng/ srcdir="LPRng-$ver" diff --git a/packages/hackbard/magicfilter/magicfilter b/packages/hackbard/magicfilter/magicfilter index 9809103..486d141 100644 --- a/packages/hackbard/magicfilter/magicfilter +++ b/packages/hackbard/magicfilter/magicfilter @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.3.b +# [V] 2.3.d # [S] 3-9 -# [D] magicfilter-2.3.b.tar.gz http://www.pell.portland.or.us/~orc/Code/magicfilter/ +# [D] magicfilter-2.3.d.tar.gz http://www.pell.portland.or.us/~orc/Code/magicfilter/ confopt="--prefix=$prefix --confdir=$sysconfdir --with-lprng" confopt="$confopt --filterdir=$prefix/share/magicfilter/filters" diff --git a/packages/hackbard/raptor/raptor b/packages/hackbard/raptor/raptor index 1f038e6..84f83a8 100644 --- a/packages/hackbard/raptor/raptor +++ b/packages/hackbard/raptor/raptor @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.3.1 +# [V] 1.4.7 # [S] 3-10 -# [D] raptor-1.3.1.tar.gz http://www.redland.opensource.ac.uk/dist/source/ +# [D] raptor-1.4.7.tar.gz http://download.librdf.org/source/ diff --git a/packages/hackbard/scummvm/scummvm b/packages/hackbard/scummvm/scummvm index 36800fc..4e2be16 100644 --- a/packages/hackbard/scummvm/scummvm +++ b/packages/hackbard/scummvm/scummvm @@ -2,13 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.6.0 +# [V] 0.7.1 # [S] 3-9 -# [D] scummvm-0.6.0.tar.bz2 http://puzzle.dl.sourceforge.net/sourceforge/scummvm/ +# [D] scummvm-0.7.1.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/scummvm/ -build_main() { - ./configure - make && - mkdir -p $prefix/bin && - cp scummvm $prefix/bin - } +confopt="--prefix=$prefix --bindir=$prefix/bin --mandir=$prefix/man" +[ "$hdw_crossbuild" != "0" ] && confopt="$confopt --host=$hdw_arch_host" diff --git a/packages/hackbard/slmodem/slmodem b/packages/hackbard/slmodem/slmodem index 72061de..5d1507b 100644 --- a/packages/hackbard/slmodem/slmodem +++ b/packages/hackbard/slmodem/slmodem @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.9.9 +# [V] 2.9.9d # [S] 3-11 -# [D] slmodem-2.9.9.tar.gz http://linmodems.technion.ac.il/packages/smartlink/ +# [D] slmodem-2.9.9d.tar.gz http://linmodems.technion.ac.il/packages/smartlink/ pre_install() { rm -rf $docdir ; mkdir $docdir diff --git a/packages/hackbard/wine/wine b/packages/hackbard/wine/wine index 36e9461..a0733d0 100644 --- a/packages/hackbard/wine/wine +++ b/packages/hackbard/wine/wine @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 20040615 +# [V] 20050725 # [S] 3-9 -# [D] Wine-20040615.tar.gz http://belnet.dl.sourceforge.net/sourceforge/wine/ +# [D] Wine-20050725.tar.gz http://mesh.dl.sourceforge.net/sourceforge/wine/ make_conf="depend all" diff --git a/packages/hackbard/wvstreams/new_openssl_api.patch b/packages/hackbard/wvstreams/new_openssl_api.patch new file mode 100644 index 0000000..f93d264 --- /dev/null +++ b/packages/hackbard/wvstreams/new_openssl_api.patch @@ -0,0 +1,36 @@ +--- ./crypto/wvtripledes.cc.orig 2005-08-15 07:49:26.000000000 +0200 ++++ ./crypto/wvtripledes.cc 2005-08-15 07:50:18.000000000 +0200 +@@ -102,7 +102,8 @@ + // ECB works 64bits at a time + while (len >= 8) + { +-#if OPENSSL_VERSION_NUMBER >= 0x0090705FL ++#if OPENSSL_VERSION_NUMBER >= 0x0090705FL \ ++ && OPENSSL_VERSION_NUMBER < 0x0090800fL + DES_ecb3_encrypt(data, crypt, + &deskey1, &deskey2, &deskey3, + mode == ECBEncrypt ? DES_ENCRYPT : DES_DECRYPT); +--- ./crypto/wvx509.cc.orig 2005-08-15 07:50:40.000000000 +0200 ++++ ./crypto/wvx509.cc 2005-08-15 07:54:59.000000000 +0200 +@@ -1162,12 +1162,19 @@ + else + { + void *ext_data = NULL; ++#if OPENSSL_VERSION_NUMBER >= 0x0090800fL ++ const unsigned char **ext_value_data; ++ ext_value_data = (const_cast ++ (&ext->value->data)); ++#else ++ unsigned char **ext_value_data = &ext->value->data; ++#endif + if (method->it) +- ext_data = ASN1_item_d2i(NULL, &ext->value->data, ++ ext_data = ASN1_item_d2i(NULL, ext_value_data, + ext->value->length, + ASN1_ITEM_ptr(method->it)); + else +- ext_data = method->d2i(NULL, &ext->value->data, ++ ext_data = method->d2i(NULL, ext_value_data, + ext->value->length); + + if (method->i2s) diff --git a/packages/hackbard/wvstreams/wvstreams b/packages/hackbard/wvstreams/wvstreams index 44219cb..69a07f2 100644 --- a/packages/hackbard/wvstreams/wvstreams +++ b/packages/hackbard/wvstreams/wvstreams @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 4.0 +# [V] 4.0.2 # [S] 3-8 -# [D] wvstreams-4.0.tar.gz http://people.nit.ca/~sfllaw/ +# [D] wvstreams-4.0.2.tar.gz http://www.csclub.uwaterloo.ca/~ja2morri/ -confopt="$confopt --without-speex --with-fftw --with-bdb --with-ogg" +confopt="$confopt --with-speex --with-fftw --with-bdb --with-ogg" diff --git a/packages/hackbard/xdirectfb/startdfbx b/packages/hackbard/xdirectfb/startdfbx new file mode 100755 index 0000000..dfd58b9 --- /dev/null +++ b/packages/hackbard/xdirectfb/startdfbx @@ -0,0 +1,160 @@ +#!/bin/sh + +# $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ +# +# This is just a sample implementation of a slightly less primitive +# interface than xinit. It looks for user .xinitrc and .xserverrc +# files, then system xinitrc and xserverrc files, else lets xinit choose +# its default. The system xinitrc should probably do things like check +# for .Xresources files and merge them in, startup up a window manager, +# and pop a clock and serveral xterms. +# +# Site administrators are STRONGLY urged to write nicer versions. +# +# $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $ + + +userclientrc=$HOME/.xdfbinitrc +userserverrc=$HOME/.xdfbserverrc +sysclientrc=/opt/xdirectfb/lib/X11/xinit/xinitrc +sysserverrc=/opt/xdirectfb/lib/X11/xinit/xserverrc +defaultclient=/opt/xdirectfb/bin/xterm +defaultserver=/opt/xdirectfb/bin/X +defaultclientargs="" +defaultserverargs="" +clientargs="" +serverargs="" + + + + + + +if [ -f $userclientrc ]; then + defaultclientargs=$userclientrc +elif [ -f $sysclientrc ]; then + defaultclientargs=$sysclientrc +fi + + + + +if [ -f $userserverrc ]; then + defaultserverargs=$userserverrc +elif [ -f $sysserverrc ]; then + defaultserverargs=$sysserverrc +fi + +whoseargs="client" +while [ x"$1" != x ]; do + case "$1" in + # '' required to prevent cpp from treating "/*" as a C comment. + /''*|\./''*) + if [ "$whoseargs" = "client" ]; then + if [ x"$clientargs" = x ]; then + client="$1" + else + clientargs="$clientargs $1" + fi + else + if [ x"$serverargs" = x ]; then + server="$1" + else + serverargs="$serverargs $1" + fi + fi + ;; + --) + whoseargs="server" + ;; + *) + if [ "$whoseargs" = "client" ]; then + clientargs="$clientargs $1" + else + # display must be the FIRST server argument + if [ x"$serverargs" = x ] && \ + expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then + display="$1" + else + serverargs="$serverargs $1" + fi + fi + ;; + esac + shift +done + +# process client arguments +if [ x"$client" = x ]; then + # if no client arguments either, use rc file instead + if [ x"$clientargs" = x ]; then + client="$defaultclientargs" + else + client=$defaultclient + fi +fi + +# process server arguments +if [ x"$server" = x ]; then + # if no server arguments or display either, use rc file instead + if [ x"$serverargs" = x -a x"$display" = x ]; then + server="$defaultserverargs" + else + server=$defaultserver + fi +fi + +if [ x"$XAUTHORITY" = x ]; then + XAUTHORITY=$HOME/.Xauthority + export XAUTHORITY +fi + +removelist= + + +# set up default Xauth info for this machine +case `uname` in +Linux*) + if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then + hostname=`hostname -f` + else + hostname=`hostname` + fi + ;; +*) + hostname=`hostname` + ;; +esac + +authdisplay=${display:-:0} +mcookie=`mcookie` +for displayname in $authdisplay $hostname$authdisplay; do + if ! xauth list "$displayname" | grep "$displayname " >/dev/null 2>&1; then + xauth -q << EOF +add $displayname . $mcookie +EOF + removelist="$displayname $removelist" + fi +done + + +xinit $client $clientargs -- $server $display $serverargs + +if [ x"$removelist" != x ]; then + xauth remove $removelist +fi + + + + + +if command -v deallocvt > /dev/null 2>&1; then + deallocvt +fi + + + + + + + diff --git a/packages/hackbard/xdirectfb/xdfbserverrc.example b/packages/hackbard/xdirectfb/xdfbserverrc.example new file mode 100644 index 0000000..bab280d --- /dev/null +++ b/packages/hackbard/xdirectfb/xdfbserverrc.example @@ -0,0 +1 @@ +exec /opt/xdirectfb/bin/XDirectFB -defaultOpacity 230 -unfocusedOpacity 180 -enableUnfocused -enableRoot +kb -keyboardRules "xorg" -keyboardModel "pc102" -keyboardLayout "de" -a 1 -br diff --git a/packages/hackbard/xdirectfb/xdirectfb b/packages/hackbard/xdirectfb/xdirectfb index 50a6edd..c34104d 100644 --- a/packages/hackbard/xdirectfb/xdirectfb +++ b/packages/hackbard/xdirectfb/xdirectfb @@ -54,4 +54,15 @@ build_main() { echo "building rootless xserver now ..." make World && make && make install + + cd ../$srcdir + + } + +post_install() { + mkdir -p $docdir + cp -v README $docdir + cp -v $confdir/xdfbserverrc.example $docdir + cp -v $confdir/startdfbx $root/opt/xdirectfb/bin + chmod 755 $root/opt/xdirectfb/bin/startdfbx } diff --git a/packages/hackbard/xml-parser/xml-parser b/packages/hackbard/xml-parser/xml-parser new file mode 100644 index 0000000..074e2c0 --- /dev/null +++ b/packages/hackbard/xml-parser/xml-parser @@ -0,0 +1,15 @@ +# hdw - linux xml-parser package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 2.34 +# [S] 3-3 +# [D] XML-Parser-2.34.tar.gz http://www.cpan.org/authors/id/M/MS/MSERGEANT/ + +srcdir="XML-Parser-$ver" + +build_main() { + perl Makefile.PL + make $make_conf + make $install_conf install + } diff --git a/packages/hpc/openmosixuserland/openmosixuserland b/packages/hpc/openmosixuserland/openmosixuserland index c205cea..b849429 100644 --- a/packages/hpc/openmosixuserland/openmosixuserland +++ b/packages/hpc/openmosixuserland/openmosixuserland @@ -2,18 +2,25 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.2.4 -# [S] 4-3 -# [D] openMosixUserland-0.2.4.tgz http://belnet.dl.sourceforge.net/sourceforge/openmosix/ +# [V] cvs +# [S] 5-10 +# [D] userspace-tools.tar.bz2 cvs:anonymous:cvs.sourceforge.net:cvsroot/openmosix:userspace-tools +# [D] linux-openmosix-2_6.tar.bz2 cvs:anonymous:cvs.sourceforge.net:cvsroot/openmosix:linux-openmosix-2_6 + +srcdir="userspace-tools" +confopt="$confopt --with-kerneldir=/tmp/linux-openmosix-2_6/linux-openmosix-2_6" -srcdir="openMosixUserland-${ver}" pre_install() { - echo "patching configuration file ..." - sed 's%^OPENMOSIX.*%OPENMOSIX = /usr/src/linux%' configuration > \ - config.new && - mv config.new configuration + echo "extracting & configuring kernel tree ..." + tar --use-compress-program=$compress -xvf \ + $archdir/linux-openmosix-2_6.tar.bz2 -C /tmp + cd /tmp/linux-openmosix-2_6/linux-openmosix-2_6 + make oldconfig + cd - + # it's cvs + ./autogen.sh } -build_main() { - make +post_install() { + rm -rf /tmp/linux-openmosix-2_6 } diff --git a/packages/multimedia/faad2/faad2 b/packages/multimedia/faad2/faad2 index fe42c39..805280c 100644 --- a/packages/multimedia/faad2/faad2 +++ b/packages/multimedia/faad2/faad2 @@ -4,7 +4,7 @@ # # [V] 2.0 # [S] 3-8 -# [D] faad2-2.0.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/faac/ +# [D] faad2-2.0.tar.gz http://mesh.dl.sourceforge.net/sourceforge/faac/ pre_install() { autoreconf -vif diff --git a/packages/multimedia/flite/flite b/packages/multimedia/flite/flite index 5ef1560..70e1ce2 100644 --- a/packages/multimedia/flite/flite +++ b/packages/multimedia/flite/flite @@ -8,7 +8,7 @@ # [D] flite_lexfix.tar.gz http://fife.speech.cs.cmu.edu/flite/packed/flite-1.2/ # let package decide itself! -unset CFLAGS +#unset CFLAGS pre_install() { echo "applying lex fixes ..." diff --git a/packages/multimedia/libmad/libmad b/packages/multimedia/libmad/libmad index 8905719..2978b46 100644 --- a/packages/multimedia/libmad/libmad +++ b/packages/multimedia/libmad/libmad @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.15.0b +# [V] 0.15.1b # [S] 3-8 -# [D] libmad-0.15.0b.tar.gz http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/ +# [D] libmad-0.15.1b.tar.gz http://www.videolan.org/pub/videolan/vlc/0.8.2/contrib/ diff --git a/packages/multimedia/mplayer/kernel_2_6.patch b/packages/multimedia/mplayer/kernel_2_6.patch deleted file mode 100644 index 6249fcb..0000000 --- a/packages/multimedia/mplayer/kernel_2_6.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./osdep/kerneltwosix.h.orig 2004-07-20 16:37:03.000000000 +0200 -+++ ./osdep/kerneltwosix.h 2004-07-20 16:39:26.000000000 +0200 -@@ -1,9 +1 @@ - #include --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) --#define __KERNEL__ --#include --#include --#undef __KERNEL__ --#endif -- -- diff --git a/packages/multimedia/mplayer/mplayer b/packages/multimedia/mplayer/mplayer index e6e7a7d..a624906 100644 --- a/packages/multimedia/mplayer/mplayer +++ b/packages/multimedia/mplayer/mplayer @@ -6,12 +6,13 @@ # [S] 3-8 # [D] mplayer.tar.bz2 cvs:anonymous:mplayerhq.hu:cvsroot/mplayer:main # [D] ffmpeg.tar.bz2 cvs:anonymous:mplayerhq.hu:cvsroot/ffmpeg:ffmpeg -# [D] win32codecs-20040703.tar.bz2 ftp://mplayerhq.hu/MPlayer/releases/codecs/ -# [D] qt6dlls-20040626.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/codecs/ +# [D] all-20050412.tar.bz2 http://www2.mplayerhq.hu/MPlayer/releases/codecs/ +codecs_ver="20050412" srcdir="main" confopt="--prefix=$prefix --confdir=$sysconfdir --language=en" +confopt="$confopt --enable-gui --enable-tv-v4l2" confopt="$confopt --enable-linux-devfs --enable-fbdev" confopt="$confopt --enable-xinerama --enable-directfb" confopt="$confopt --with-win32libdir=$prefix/lib/win32codecs" @@ -23,8 +24,11 @@ pre_install() { # prepeare libavcodec tar --use-compress-program=bzip2 -xvf \ $hdw_home_dir/download/multimedia/mplayer/ffmpeg.tar.bz2 - mkdir -p libavcodec - cp -a ffmpeg/libavcodec/* libavcodec && rm -rf ffmpeg + mkdir -p libavcodec libavutil libavformat + cp -a ffmpeg/libavcodec/* libavcodec + cp -a ffmpeg/libavutil/* libavutil + cp -a ffmpeg/libavformat/* libavformat + rm -rf ffmpeg # copy codecs.conf cp ./etc/codecs.conf $root/etc/ @@ -33,12 +37,7 @@ pre_install() { rm -rf $prefix/lib/win32codecs mkdir -p $prefix/lib tar --use-compress-program=bzip2 -xvf \ - $archdir/win32codecs-20040703.tar.bz2 \ + $archdir/all-${codecs_ver}.tar.bz2 \ -C $prefix/lib - mv $prefix/lib/win32codecs-* $prefix/lib/win32codecs - tar --use-compress-program=bzip2 -xvf \ - $archdir/qt6dlls-20040626.tar.bz2 \ - -C $prefix/lib - mv $prefix/lib/qt6dlls-*/* $prefix/lib/win32codecs - rm -rf $prefix/lib/qt6dlls-* + mv $prefix/lib/all-${codecs_ver} $prefix/lib/win32codecs } diff --git a/packages/multimedia/transcode/transcode b/packages/multimedia/transcode/transcode index c09853d..acb441e 100644 --- a/packages/multimedia/transcode/transcode +++ b/packages/multimedia/transcode/transcode @@ -2,6 +2,12 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.6.12 +# [V] 1.0.0 # [S] 3-8 -# [D] transcode-0.6.12.tar.bz2 http://zebra.fh-weingarten.de/~transcode/pre/ +# [D] transcode-1.0.0.tar.gz http://www.jakemsr.com/transcode/ + +confopt="$confopt --enable-freetype2 --enable-oss --enable-imagemagick" +confopt="$confopt --enable-ogg --enable-vorbis" +confopt="$confopt --enable-a52 --enable-libmpeg3 --enable-avifile" +confopt="$confopt --enable-libxml2 --enable-sdl --enable-gtk" +confopt="$confopt --enable-netstream --enable-v4l" diff --git a/packages/multimedia/vlc/vlc b/packages/multimedia/vlc/vlc index 06482a4..7588e93 100644 --- a/packages/multimedia/vlc/vlc +++ b/packages/multimedia/vlc/vlc @@ -2,7 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.7.2 +# [V] 0.8.2 # [S] 3-8 -## [D] vlc.tar.bz2 cvs:anonymous:anoncvs.videolan.org:var/cvs/videolan:vlc -# [D] vlc-0.7.2.tar.gz http://download.videolan.org/pub/videolan/vlc/0.7.2/ +# [D] vlc-0.8.2.tar.gz http://download.videolan.org/pub/videolan/vlc/0.8.2/ + +confopt="$confopt --disable-wxwindows --disable-skins2" diff --git a/packages/multimedia/xawtv/xawtv b/packages/multimedia/xawtv/xawtv index 0508009..a4ad8ec 100644 --- a/packages/multimedia/xawtv/xawtv +++ b/packages/multimedia/xawtv/xawtv @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 3.93 +# [V] 3.94 # [S] 3-8 -# [D] xawtv-3.93.tar.gz http://dl.bytesex.org/releases/xawtv/ +# [D] xawtv-3.94.tar.gz http://dl.bytesex.org/releases/xawtv/ pre_install() { export PATH="$PATH:$root/usr/X11R6/bin" diff --git a/packages/net/ethereal/ethereal b/packages/net/ethereal/ethereal index 8b101e3..a5d8407 100644 --- a/packages/net/ethereal/ethereal +++ b/packages/net/ethereal/ethereal @@ -2,13 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] cvs +# [V] 0.10.12 # [S] 3-9 -# [D] ethereal.tar.bz2 cvs:anoncvs:cvs.ethereal.com:cvsroot:ethereal - -pre_install() { - ./autogen.sh - } +# [D] ethereal-0.10.12.tar.bz2 ftp://netmirror.org/ftp.ethereal.com/ post_install() { rm -rf $docdir ; mkdir -p $docdir diff --git a/packages/net/ettercap/ettercap b/packages/net/ettercap/ettercap index 3bcb460..73388c7 100644 --- a/packages/net/ettercap/ettercap +++ b/packages/net/ettercap/ettercap @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] NG-0.7.0 +# [V] NG-0.7.3 # [S] 3-8 -# [D] ettercap-NG-0.7.0.tar.gz http://belnet.dl.sourceforge.net/sourceforge/ettercap/ +# [D] ettercap-NG-0.7.3.tar.gz http://mesh.dl.sourceforge.net/sourceforge/ettercap/ diff --git a/packages/net/ipsec-tools/ipsec-tools b/packages/net/ipsec-tools/ipsec-tools index 4aec79a..7862649 100644 --- a/packages/net/ipsec-tools/ipsec-tools +++ b/packages/net/ipsec-tools/ipsec-tools @@ -3,8 +3,8 @@ # author: hackbard # [S] 3-2 -# [V] 0.6 -# [D] ipsec-tools-0.6.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/ipsec-tools/ +# [V] 0.6.1rc1 +# [D] ipsec-tools-0.6.1rc1.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/ipsec-tools/ confopt="$confopt --with-kernel-headers=$prefix/include" diff --git a/packages/net/nmap/nmap b/packages/net/nmap/nmap index f06af07..f178a80 100644 --- a/packages/net/nmap/nmap +++ b/packages/net/nmap/nmap @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 3.55 +# [V] 3.81 # [S] 3-9 -# [D] nmap-3.55.tar.bz2 http://download.insecure.org/nmap/dist/ +# [D] nmap-3.81.tar.bz2 http://download.insecure.org/nmap/dist/ diff --git a/packages/net/samba/samba b/packages/net/samba/samba index 25b3bfd..c9a00f7 100644 --- a/packages/net/samba/samba +++ b/packages/net/samba/samba @@ -2,10 +2,11 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 3.0.5 +# [V] 3.0.14a # [S] 4-10 -# [D] samba-3.0.5.tar.gz http://us3.samba.org/samba/ftp/ +# [D] samba-3.0.14a.tar.gz ftp://de.samba.org/samba.org/ # samba in opt makes me sleep() better ... + srcdir="samba-$ver/source" confopt="$confopt --with-smbmount" diff --git a/packages/optional/nut/nut b/packages/optional/nut/nut index 2f9302c..1a98e1b 100644 --- a/packages/optional/nut/nut +++ b/packages/optional/nut/nut @@ -2,29 +2,12 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.4.0 -# [S] 4-5 -# [D] nut-1.4.0.tar.gz http://penguin.harrison.k12.co.us/mirrors/nut/release/1.4/ +# [V] 2.0.2 +# [S] 4-10 +# [D] nut-2.0.2.tar.gz http://www.networkupstools.org/source/2.0/ confopt="$confopt --with-user=ups" -flist_pruned="${flist_pruned}|etc/shadow|etc/passwd|etc/group" - -pre_install() { - groupadd -g 1075 ups || true - useradd -c 'ups monitoring tools' -g ups -u 1075 ups \ - -d $root/var/state/ups -s /bin/false || true - mkdir -p $root/var/state/ups - chown ups.ups $root/var/state/ups - } post_install() { - mv $root/etc/upsd.conf.sample $root/etc/upsd.conf - mv $root/etc/upsd.users.sample $root/etc/upsd.users - mv $root/etc/upssched.conf.sample $root/etc/upssched.conf - mv $root/etc/ups.conf.sample $root/etc/ups.conf - mv $root/etc/upsmon.conf.sample $root/etc/upsmon.conf - chown ups.ups $root/etc/ups{,d,sched,mon}.conf - chown ups.ups $root/etc/upsd.users - chmod 0400 $root/etc/ups{,d,sched,mon}.conf - chmod 0400 $root/etc/upsd.users + make install-conf } diff --git a/packages/optional/nut/nut.setup b/packages/optional/nut/nut.setup new file mode 100644 index 0000000..708a5b6 --- /dev/null +++ b/packages/optional/nut/nut.setup @@ -0,0 +1,12 @@ +setup_block() { + groupadd -g 1075 ups || true + useradd -u 1075 -c 'ups monitoring tools' -g ups ups || true + mkdir -p /var/state/cups + chown ups.ups /var/state/cups + } + +uninstall_block() { + userdel ups || true + groupdel ups || true + rm -rf /var/state/cups + } diff --git a/packages/optional/unrealircd/unrealircd b/packages/optional/unrealircd/unrealircd index 105f766..1409491 100644 --- a/packages/optional/unrealircd/unrealircd +++ b/packages/optional/unrealircd/unrealircd @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 3.2.1 +# [V] 3.2.3 # [S] 3-11 -# [D] Unreal3.2.1.tar.gz http://codercrew.org/unrealircd/ +# [D] Unreal3.2.3.tar.gz http://unrealircd.fyrebird.net/ xver=`echo $ver | awk -F. '{ print $1 "." $2 }'` # we always install ircd to /opt ! diff --git a/packages/soundtools/alsa/alsa b/packages/soundtools/alsa/alsa index eb58edc..3e27119 100644 --- a/packages/soundtools/alsa/alsa +++ b/packages/soundtools/alsa/alsa @@ -2,13 +2,13 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.0.5 -# [S] 3-10 -## [D] alsa-driver-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/driver/ -# [D] alsa-lib-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/lib/ -# [D] alsa-oss-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/oss-lib/ -# [D] alsa-utils-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/utils/ -# [D] alsa-tools-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/tools/ +# [V] 1.0.9 +# [S] 3-7 +## [D] alsa-driver-1.0.9.tar.bz2 ftp://ftp.alsa-project.org/pub/driver/ +# [D] alsa-lib-1.0.9.tar.bz2 ftp://ftp.alsa-project.org/pub/lib/ +# [D] alsa-oss-1.0.9.tar.bz2 ftp://ftp.alsa-project.org/pub/oss-lib/ +# [D] alsa-utils-1.0.9.tar.bz2 ftp://ftp.alsa-project.org/pub/utils/ +# [D] alsa-tools-1.0.9.tar.bz2 ftp://ftp.alsa-project.org/pub/tools/ # popular drivers (i have those ;) card="emu10k1,intel8x0" diff --git a/packages/soundtools/ardour/ardour b/packages/soundtools/ardour/ardour index 80f4430..49321ef 100644 --- a/packages/soundtools/ardour/ardour +++ b/packages/soundtools/ardour/ardour @@ -2,6 +2,10 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.9beta18.3 +# [V] 0.9beta29 # [S] 3-12 -# [D] ardour-0.9beta22.tar.bz2 http://ardour.org/releases/ +# [D] ardour-0.9beta29.tar.bz2 http://ardour.org/releases/ + +build_main() { + scons PREFIX=$prefix + } diff --git a/packages/soundtools/jack/jack b/packages/soundtools/jack/jack index bd98a22..f8a7fbd 100644 --- a/packages/soundtools/jack/jack +++ b/packages/soundtools/jack/jack @@ -4,10 +4,8 @@ # # [V] cvs # [S] 3-10 -# [D] jack.tar.bz2 cvs:anonymous:cvs.jackit.sourceforge.net:cvsroot/jackit:jack +# [D] jack.tar.bz2 cvs:anonymous:cvs.sourceforge.net:cvsroot/jackit:jack pre_install() { - sed 's%which%type -p%g' autogen.sh > tmp~ - mv tmp~ autogen.sh ; chmod 750 autogen.sh ./autogen.sh } diff --git a/packages/soundtools/liblrdf/liblrdf b/packages/soundtools/liblrdf/liblrdf index ae54b20..c4de0d6 100644 --- a/packages/soundtools/liblrdf/liblrdf +++ b/packages/soundtools/liblrdf/liblrdf @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.3.7 +# [V] 0.4.0 # [S] 3-11 -# [D] liblrdf-0.3.7.tar.gz http://plugin.org.uk/lrdf/ +# [D] liblrdf-0.4.0.tar.gz http://mesh.dl.sourceforge.net/sourceforge/lrdf/ diff --git a/packages/soundtools/libmustux/libmustux b/packages/soundtools/libmustux/libmustux index 7aa271c..111e0ce 100644 --- a/packages/soundtools/libmustux/libmustux +++ b/packages/soundtools/libmustux/libmustux @@ -2,6 +2,14 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.20.2 +# [V] 20050202 # [S] 3-11 -# [D] libmustux-0.20.2.tar.gz http://vt.shuis.tudelft.nl/~remon/protux/stable/version-0.20.2/ +# [D] mustux-20050202.tar.gz http://vt.shuis.tudelft.nl/~remon/protux/CVS/ + +srcdir="mustux-$ver" + +pre_install() { + sed "s%/usr/local%$prefix%g" mustux.pro > tmp~ + mv tmp~ mustux.pro + ./compile + } diff --git a/packages/soundtools/libmustux/qmakespec.patch b/packages/soundtools/libmustux/qmakespec.patch new file mode 100644 index 0000000..e7b23dc --- /dev/null +++ b/packages/soundtools/libmustux/qmakespec.patch @@ -0,0 +1,15 @@ +--- ./compile.orig 2005-08-17 15:19:13.000000000 +0200 ++++ ./compile 2005-08-17 15:23:11.000000000 +0200 +@@ -2,11 +2,10 @@ + echo "Mustux compilation script" + echo "Cleaning old makefile ..." + rm -f Makefile +-export QMAKESPEC=linux-g++ ++export QMAKESPEC=/usr/share/qt/mkspecs/linux-g++ + echo "Generating new makefile ..." + qmake -unix -o Makefile mustux.pro + echo "Compiling ..." +-make + #make install + echo "Done. If you want to install the package, run: su -c \"make install\" " + diff --git a/packages/soundtools/protux/protux b/packages/soundtools/protux/protux index ea1a4f4..4303a0d 100644 --- a/packages/soundtools/protux/protux +++ b/packages/soundtools/protux/protux @@ -2,8 +2,15 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.20.2 +# [V] 20050202 # [S] 3-11 -# [D] protux-0.20.2.tar.gz http://vt.shuis.tudelft.nl/~remon/protux/stable/version-0.20.2/ +# [D] protux-20050202.tar.gz http://vt.shuis.tudelft.nl/~remon/protux/CVS/ confopt="$confopt --with-xinerama" + +pre_install() { + sed "s%/usr/local%$prefix%g" protux.pro > tmp~ + mv tmp~ protux.pro + ./compile + } + diff --git a/packages/soundtools/protux/qmakespec.patch b/packages/soundtools/protux/qmakespec.patch new file mode 100644 index 0000000..97447f5 --- /dev/null +++ b/packages/soundtools/protux/qmakespec.patch @@ -0,0 +1,14 @@ +--- ./compile.orig 2005-08-17 15:34:45.000000000 +0200 ++++ ./compile 2005-08-17 15:35:02.000000000 +0200 +@@ -2,10 +2,8 @@ + echo "Protux compilation script" + echo "Cleaning old makefile ..." + rm -f Makefile +-export QMAKESPEC=linux-g++ ++export QMAKESPEC=/usr/share/qt/mkspecs/linux-g++ + echo "Generating new makefile ..." + qmake -Wnone -unix -o Makefile protux.pro +-echo "Compiling ..." +-make + #make install + echo "Done. If you want to install the package, run: su -c \"make install\" " diff --git a/packages/x11/cairo/cairo b/packages/x11/cairo/cairo new file mode 100644 index 0000000..6da45d2 --- /dev/null +++ b/packages/x11/cairo/cairo @@ -0,0 +1,7 @@ +# hdw - linux cairo package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 0.9.2 +# [S] 3-6 +# [D] cairo-0.9.2.tar.gz http://cairographics.org/snapshots/ diff --git a/packages/x11/cairo/fcfini.patch b/packages/x11/cairo/fcfini.patch new file mode 100644 index 0000000..a55e4db --- /dev/null +++ b/packages/x11/cairo/fcfini.patch @@ -0,0 +1,11 @@ +--- ./test/cairo-test.c.orig 2005-08-14 16:58:34.000000000 +0200 ++++ ./test/cairo-test.c 2005-08-14 16:58:53.000000000 +0200 +@@ -572,7 +572,7 @@ + fclose (cairo_test_log_file); + + #if HAVE_FCFINI +- FcFini (); ++ // FcFini (); + #endif + + return ret; diff --git a/packages/x11/firefox/firefox b/packages/x11/firefox/firefox index 303b048..8967f08 100644 --- a/packages/x11/firefox/firefox +++ b/packages/x11/firefox/firefox @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.0.4 +# [V] 1.0.6 # [S] 3-8 -# [D] firefox-1.0.4-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.4/source/ +# [D] firefox-1.0.6-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.6/source/ # [D] install_flash_player_7_linux.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/ srcdir=mozilla @@ -32,6 +32,7 @@ confopt="$confopt --disable-mailnews --disable-ldap --disable-freetype2" confopt="$confopt --disable-tests --disable-debug --disable-composer" confopt="$confopt --disable-pedantic --disable-logging --disable-accessibility" confopt="$confopt --disable-installer --disable-dtd-debug" +confopt="$confopt --enable-reorder" post_install() { install -d $prefix/include/firefox-$ver/nss diff --git a/packages/x11/gimp-print/gimp-print b/packages/x11/gimp-print/gimp-print index c8be651..48d8195 100644 --- a/packages/x11/gimp-print/gimp-print +++ b/packages/x11/gimp-print/gimp-print @@ -4,6 +4,6 @@ # # [V] 4.2.7 # [S] 3-9 -# [D] gimp-print-4.2.7.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/gimp-print/ +# [D] gimp-print-4.2.7.tar.gz http://mesh.dl.sourceforge.net/sourceforge/gimp-print/ confopt="$confopt --with-cups --with-ghost" diff --git a/packages/x11/gimp/gimp b/packages/x11/gimp/gimp index d4a230e..4f0bbf3 100644 --- a/packages/x11/gimp/gimp +++ b/packages/x11/gimp/gimp @@ -2,8 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.1.1 +# [V] 2.2.8 # [S] 3-10 -# [D] gimp-2.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v2.1/ - -confopt="$confopt --disable-print" +# [D] gimp-2.2.8.tar.bz2 ftp://ftp.gimp.org/pub/gimp/v2.2/ diff --git a/packages/x11/libpixman/libpixman b/packages/x11/libpixman/libpixman new file mode 100644 index 0000000..f057ac6 --- /dev/null +++ b/packages/x11/libpixman/libpixman @@ -0,0 +1,7 @@ +# hdw - linux libpixman package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 0.1.6.orig +# [S] 3-5 +# [D] libpixman_0.1.6.orig.tar.gz http://ftp.debian.org/debian/pool/main/libp/libpixman/ diff --git a/packages/x11/pango/pango b/packages/x11/pango/pango index 4391574..80f89be 100644 --- a/packages/x11/pango/pango +++ b/packages/x11/pango/pango @@ -6,5 +6,8 @@ # [S] 3-6 # [D] pango-1.9.1.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/pango/1.9/ +export LDFLAGS="-lpixman" +export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig" + # optional # confopt="$confopt --disable-debug" diff --git a/packages/x11/qiv/qiv b/packages/x11/qiv/qiv index dbc0ad9..523b74f 100644 --- a/packages/x11/qiv/qiv +++ b/packages/x11/qiv/qiv @@ -4,7 +4,7 @@ # # [V] 2.0 # [S] 3-8 -# [D] qiv-2.0-src.tgz http://www.kdown1.de/files/ +# [D] qiv-2.0-src.tgz http://www.kdown2.de/files/ pre_install() { sed "s%PREFIX = /usr/local%PREFIX = $prefix%g" Makefile > tmp~ diff --git a/packages/x11/qt/qt b/packages/x11/qt/qt index 9cf6d77..9abe2d6 100644 --- a/packages/x11/qt/qt +++ b/packages/x11/qt/qt @@ -15,6 +15,10 @@ pre_install() { # modify configure, so it is none interactive sed 's/read acceptance/acceptance="yes"/' configure > configure_tmp mv -vf configure_tmp configure ; chmod 755 configure + + # adjust qmake.conf directories (use ' instead of " to not eval $QTDIR) + sed -i -e 's:$(QTDIR)/include:&/qt:' -e 's:$(QTDIR)/lib:&/qt:' \ + mkspecs/linux*/qmake.conf } confopt="-prefix $prefix -headerdir $prefix/include/qt -docdir $docdir" @@ -25,6 +29,13 @@ confopt="$confopt -thread -no-exceptions" confopt="$confopt -system-zlib -system-libpng -system-libjpeg -qt-gif" confopt="$confopt -plugin-imgfmt-mng -plugin-imgfmt-png" +build_main() { + ./configure $confopt + find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g" + make $make_conf + make $install_conf install + } + post_install() { # compatibility symlinks for i in $prefix/lib/libqt-mt.so*; do @@ -32,8 +43,8 @@ post_install() { done # documentation mkdir -p $docdir - cp -r doc/man $prefix/man - cp -r examples $docdir + cp -v -r doc/man $prefix/man + cp -v -r examples $docdir # profile cat > $root/etc/profile.d/qt <<-EOP QTDIR=$prefix diff --git a/packages/x11/t1lib/t1lib b/packages/x11/t1lib/t1lib index 1476ec4..299ffa9 100644 --- a/packages/x11/t1lib/t1lib +++ b/packages/x11/t1lib/t1lib @@ -2,8 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.3 +# [V] 5.1.0 # [S] 3-7 -# [D] t1lib-1.3.tar.gz ftp://ftp.foolabs.com/pub/xpdf/ - -srcdir="T1Lib-$ver" +# [D] t1lib-5.1.0.tar.gz http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/ diff --git a/packages/x11/thunderbird/thunderbird b/packages/x11/thunderbird/thunderbird index 082e484..13b3e0b 100644 --- a/packages/x11/thunderbird/thunderbird +++ b/packages/x11/thunderbird/thunderbird @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.0.2 +# [V] 1.0.6 # [S] 3-8 -# [D] thunderbird-1.0.2-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0.2/source/ +# [D] thunderbird-1.0.6-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0.6/source/ srcdir=mozilla optimize="`echo $hdw_cflags | awk '{ print $1 }'`" @@ -16,6 +16,10 @@ pre_install() { sed "s,0000000000,hdw-linux -- ${hdw_version}," \ xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in + # patching app Makefile (still needed?) + sed 's/$(destdir)$(bindir)/$(DESTDIR)$(mozappdir)/' \ + mail/app/Makefile.in > mail/app/Makefile.in.new + mv mail/app/Makefile.in.new mail/app/Makefile.in } confopt="$confopt --enable-default-toolkit=gtk2 --with-x --with-system-zlib" diff --git a/packages/x11/xmms/xmms b/packages/x11/xmms/xmms index e03f28d..1831b69 100644 --- a/packages/x11/xmms/xmms +++ b/packages/x11/xmms/xmms @@ -4,4 +4,4 @@ # # [V] 1.2.10 # [S] 3-8 -# [D] xmms-1.2.10.tar.bz2 http://www.xmms.org/files/1.2.x/ +# [D] xmms-1.2.10.tar.bz2 http://xmms.org/files/1.2.x/ diff --git a/packages/x11/xpdf/lfs.patch b/packages/x11/xpdf/lfs.patch index 6e4b5a2..8c9b1bc 100644 --- a/packages/x11/xpdf/lfs.patch +++ b/packages/x11/xpdf/lfs.patch @@ -1,21 +1,24 @@ -Submitted By: Tushar Teredesai -Date: 2004-03-20 -Initial Package Version: 3.00 -Origin: NA -Upstream Status: Major hack, will never be accepted upstream. -Description: Fixed compilation with freetype-2.1.7. -diff -ur xpdf-3.00.orig/configure xpdf-3.00/configure ---- xpdf-3.00.orig/configure 2004-01-21 19:26:44.000000000 -0600 -+++ xpdf-3.00/configure 2004-03-20 10:21:03.000000000 -0600 +--- xpdf-3.00-orig/configure 2004-01-22 01:26:44.000000000 +0000 ++++ xpdf-3.00/configure 2004-12-18 17:42:34.787719704 +0000 @@ -9007,6 +9007,9 @@ - - - + + + + cat >>confdefs.h <<_ACEOF +#include +_ACEOF - - + + + +@@ -9817,7 +9820,7 @@ + { (exit 1); exit 1; }; } + fi + else +- libpaper_CFLAGS= ++ libpaper_CFLAGS="-I/usr/include/freetype2" + fi + + smr_test_CPPFLAGS="${CPPFLAGS+set}" diff -ur xpdf-3.00.orig/splash/SplashFTFontEngine.h xpdf-3.00/splash/SplashFTFontEngine.h --- xpdf-3.00.orig/splash/SplashFTFontEngine.h 2004-01-21 19:26:44.000000000 -0600 diff --git a/packages/x11/xpdf/pl1.patch b/packages/x11/xpdf/pl1.patch new file mode 100644 index 0000000..b21015d --- /dev/null +++ b/packages/x11/xpdf/pl1.patch @@ -0,0 +1,315 @@ +*** ./xpdf/XRef.cc.orig Thu Jul 22 11:04:22 2004 +--- ./xpdf/XRef.cc Thu Jul 22 11:04:31 2004 +*************** +*** 96,102 **** + } + nObjects = obj1.getInt(); + obj1.free(); +! if (nObjects == 0) { + goto err1; + } + +--- 96,102 ---- + } + nObjects = obj1.getInt(); + obj1.free(); +! if (nObjects <= 0) { + goto err1; + } + +*************** +*** 106,111 **** +--- 106,114 ---- + } + first = obj1.getInt(); + obj1.free(); ++ if (first < 0) { ++ goto err1; ++ } + + objs = new Object[nObjects]; + objNums = (int *)gmalloc(nObjects * sizeof(int)); +*************** +*** 130,135 **** +--- 133,144 ---- + offsets[i] = obj2.getInt(); + obj1.free(); + obj2.free(); ++ if (objNums[i] < 0 || offsets[i] < 0 || ++ (i > 0 && offsets[i] < offsets[i-1])) { ++ delete parser; ++ gfree(offsets); ++ goto err1; ++ } + } + while (str->getChar() != EOF) ; + delete parser; +*************** +*** 369,378 **** + } + n = obj.getInt(); + obj.free(); + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize; + newSize <<= 1) ; + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +--- 378,393 ---- + } + n = obj.getInt(); + obj.free(); ++ if (first < 0 || n < 0 || first + n < 0) { ++ goto err1; ++ } + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize && newSize > 0; + newSize <<= 1) ; ++ if (newSize < 0) { ++ goto err1; ++ } + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +*************** +*** 443,449 **** + + // check for an 'XRefStm' key + if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { +! pos2 = obj2.getInt(); + readXRef(&pos2); + if (!ok) { + goto err1; +--- 458,464 ---- + + // check for an 'XRefStm' key + if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { +! pos2 = (Guint)obj2.getInt(); + readXRef(&pos2); + if (!ok) { + goto err1; +*************** +*** 474,479 **** +--- 489,497 ---- + } + newSize = obj.getInt(); + obj.free(); ++ if (newSize < 0) { ++ goto err1; ++ } + if (newSize > size) { + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { +*************** +*** 494,499 **** +--- 512,520 ---- + } + w[i] = obj2.getInt(); + obj2.free(); ++ if (w[i] < 0 || w[i] > 4) { ++ goto err1; ++ } + } + obj.free(); + +*************** +*** 513,525 **** + } + n = obj.getInt(); + obj.free(); +! if (!readXRefStreamSection(xrefStr, w, first, n)) { + idx.free(); + goto err0; + } + } + } else { +! if (!readXRefStreamSection(xrefStr, w, 0, size)) { + idx.free(); + goto err0; + } +--- 534,547 ---- + } + n = obj.getInt(); + obj.free(); +! if (first < 0 || n < 0 || +! !readXRefStreamSection(xrefStr, w, first, n)) { + idx.free(); + goto err0; + } + } + } else { +! if (!readXRefStreamSection(xrefStr, w, 0, newSize)) { + idx.free(); + goto err0; + } +*************** +*** 551,560 **** + Guint offset; + int type, gen, c, newSize, i, j; + + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize; + newSize <<= 1) ; + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +--- 573,588 ---- + Guint offset; + int type, gen, c, newSize, i, j; + ++ if (first + n < 0) { ++ return gFalse; ++ } + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize && newSize > 0; + newSize <<= 1) ; ++ if (newSize < 0) { ++ return gFalse; ++ } + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +*************** +*** 585,608 **** + } + gen = (gen << 8) + c; + } +! switch (type) { +! case 0: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryFree; +! break; +! case 1: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryUncompressed; +! break; +! case 2: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryCompressed; +! break; +! default: +! return gFalse; + } + } + +--- 613,638 ---- + } + gen = (gen << 8) + c; + } +! if (entries[i].offset == 0xffffffff) { +! switch (type) { +! case 0: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryFree; +! break; +! case 1: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryUncompressed; +! break; +! case 2: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryCompressed; +! break; +! default: +! return gFalse; +! } + } + } + +*************** +*** 664,701 **** + // look for object + } else if (isdigit(*p)) { + num = atoi(p); +! do { +! ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { + do { + ++p; +! } while (*p && isspace(*p)); +! if (isdigit(*p)) { +! gen = atoi(p); + do { + ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { + do { + ++p; +! } while (*p && isspace(*p)); +! if (!strncmp(p, "obj", 3)) { +! if (num >= size) { +! newSize = (num + 1 + 255) & ~255; +! entries = (XRefEntry *) +! grealloc(entries, newSize * sizeof(XRefEntry)); +! for (i = size; i < newSize; ++i) { +! entries[i].offset = 0xffffffff; +! entries[i].type = xrefEntryFree; + } +- size = newSize; +- } +- if (entries[num].type == xrefEntryFree || +- gen >= entries[num].gen) { +- entries[num].offset = pos - start; +- entries[num].gen = gen; +- entries[num].type = xrefEntryUncompressed; + } + } + } +--- 694,737 ---- + // look for object + } else if (isdigit(*p)) { + num = atoi(p); +! if (num > 0) { + do { + ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { + do { + ++p; +! } while (*p && isspace(*p)); +! if (isdigit(*p)) { +! gen = atoi(p); + do { + ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { +! do { +! ++p; +! } while (*p && isspace(*p)); +! if (!strncmp(p, "obj", 3)) { +! if (num >= size) { +! newSize = (num + 1 + 255) & ~255; +! if (newSize < 0) { +! error(-1, "Bad object number"); +! return gFalse; +! } +! entries = (XRefEntry *) +! grealloc(entries, newSize * sizeof(XRefEntry)); +! for (i = size; i < newSize; ++i) { +! entries[i].offset = 0xffffffff; +! entries[i].type = xrefEntryFree; +! } +! size = newSize; +! } +! if (entries[num].type == xrefEntryFree || +! gen >= entries[num].gen) { +! entries[num].offset = pos - start; +! entries[num].gen = gen; +! entries[num].type = xrefEntryUncompressed; + } + } + } + } + + diff --git a/packages/x11/xpdf/pl2.patch b/packages/x11/xpdf/pl2.patch new file mode 100644 index 0000000..a491dda --- /dev/null +++ b/packages/x11/xpdf/pl2.patch @@ -0,0 +1,54 @@ +*** ./xpdf/Gfx.cc.orig Sun Dec 12 16:04:43 2004 +--- ./xpdf/Gfx.cc Sun Dec 12 16:05:16 2004 +*************** +*** 2654,2660 **** + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; i < maskObj.arrayGetLength(); ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +--- 2654,2662 ---- + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; +! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; +! ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +*** ./xpdf/GfxState.cc.orig Sun Dec 12 16:04:48 2004 +--- ./xpdf/GfxState.cc Sun Dec 12 16:06:38 2004 +*************** +*** 708,713 **** +--- 708,718 ---- + } + nCompsA = obj2.getInt(); + obj2.free(); ++ if (nCompsA > gfxColorMaxComps) { ++ error(-1, "ICCBased color space with too many (%d > %d) components", ++ nCompsA, gfxColorMaxComps); ++ nCompsA = gfxColorMaxComps; ++ } + if (dict->lookup("Alternate", &obj2)->isNull() || + !(altA = GfxColorSpace::parse(&obj2))) { + switch (nCompsA) { +*************** +*** 1054,1060 **** + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { +! error(-1, "DeviceN color space with more than %d > %d components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } +--- 1059,1065 ---- + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { +! error(-1, "DeviceN color space with too many (%d > %d) components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } diff --git a/packages/x11/xpdf/pl3.patch b/packages/x11/xpdf/pl3.patch new file mode 100644 index 0000000..8e489e0 --- /dev/null +++ b/packages/x11/xpdf/pl3.patch @@ -0,0 +1,14 @@ +*** ./xpdf/XRef.cc.orig Wed Jan 12 17:10:53 2005 +--- ./xpdf/XRef.cc Wed Jan 12 17:11:22 2005 +*************** +*** 793,798 **** +--- 793,801 ---- + } else { + keyLength = 5; + } ++ if (keyLength > 16) { ++ keyLength = 16; ++ } + permFlags = permissions.getInt(); + if (encVersion >= 1 && encVersion <= 2 && + encRevision >= 2 && encRevision <= 3) { diff --git a/scripts/Build-Distro b/scripts/Build-Distro index 94b12eb..a5c3a9a 100755 --- a/scripts/Build-Distro +++ b/scripts/Build-Distro @@ -6,7 +6,7 @@ # # define max priority -max=20 +max=13 stages="0 1" no_src_del="" @@ -94,31 +94,31 @@ for stage in $stages; do cat ./build_order_stage${stage} | grep -v '^#' | \ while read x pr dir package; do # already build? - if [ ! -f $root/var/adm/logs/$stage-$pr-$package ]; then + if [ ! -f $root/var/adm/logs/$x-$pr-$package ]; then echo echo "building package `pkg_c $package`, stage $stage." - echo_w "log -> $root/var/adm/logs/$stage-$pr-$package" + echo_w "log -> $root/var/adm/logs/$x-$pr-$package" echo_y "started, `date | awk '{ print $4 }'`" b_append="" [ ! -z "$no_src_del" ] && b_append="-no_src_del" - ./scripts/Build -stage $stage -package $package \ + ./scripts/Build -stage $x -package $package \ -priority $pr -dir $dir $b_append > \ - $root/var/adm/logs/$stage-$pr-$package.out 2>&1 + $root/var/adm/logs/$x-$pr-$package.out 2>&1 if [ ! "$?" = "0" ]; then echo_r "failed to build package $package!" echo_r "aborted." [ "$hdw_abort" = "1" ] && exit 1 else - mv $root/var/adm/logs/$stage-$pr-$package.out \ - $root/var/adm/logs/$stage-$pr-$package + mv $root/var/adm/logs/$x-$pr-$package.out \ + $root/var/adm/logs/$x-$pr-$package echo_g "done, `date | awk '{ print $4 }'`" # make binary tar package if [ "$hdw_make_package" = "1" -a \ "$hdw_status" -ge "2" ] ; then echo -n "creating binary package ..." - if [ -d binaries/*/$package ] ; then + if [ -d binaries/{$hdw_arch}-${hdw_arch_opt}/$package ] ; then echo -n " (deleting old first)" - rm -rf binaries/*/$package + rm -rf binaries/{$hdw_arch}-${hdw_arch_opt}/$package fi ./scripts/Create-Binary \ -package $package-$pr \ @@ -130,7 +130,7 @@ for stage in $stages; do else echo echo_w "$package already build in stage $stage, skipped" - echo_w "remove $root/var/adm/logs/$stage-$pr-$package" + echo_w "remove $root/var/adm/logs/$x-$pr-$package" echo_w "if you want to rebuild it." fi done diff --git a/scripts/Helper b/scripts/Helper index 1d1b272..fb15677 100755 --- a/scripts/Helper +++ b/scripts/Helper @@ -80,7 +80,7 @@ if [ "$cdf" = "1" ] ; then echo -en "creating dist file ./distro/$hdw_target ..." . ./scripts/subroutines echo "00-dirtree" > ./distro/$hdw_target - create_buildorder '2 3 4' $max > ./distro/$hdw_target.~ + create_buildorder '2 3' $max > ./distro/$hdw_target.~ grep -v '^#' ./distro/$hdw_target.~ | awk '{ print $4 }' >> \ ./distro/$hdw_target rm ./distro/$hdw_target.~ diff --git a/scripts/subroutines b/scripts/subroutines index 7a85069..705af2f 100755 --- a/scripts/subroutines +++ b/scripts/subroutines @@ -201,6 +201,13 @@ output_if_valid() { echo -en "$stage \t $priority \t\t $dir " echo -e "`basename $package`" fi + # stage 4 packages (build at the same time) + if [ "$stage" = "3" ] ; then + if [ "4-$priority" = "$match" ] ; then + echo -en "4 \t $priority \t\t $dir " + echo -e "`basename $package`" + fi + fi done } diff --git a/targets/all-dev/include b/targets/all-dev/include index c4bfaef..208b1d2 100644 --- a/targets/all-dev/include +++ b/targets/all-dev/include @@ -15,6 +15,8 @@ # [C] x11 # replaced by xorg due to license stuff # [R] x11/xfree86 +# replaced by firefox & thunderbird +# [R] x11/mozilla # [C] science # [C] soundtools diff --git a/targets/all-stable/include b/targets/all-stable/include new file mode 100644 index 0000000..7d7c23f --- /dev/null +++ b/targets/all-stable/include @@ -0,0 +1,28 @@ +# hdw - linux all-stable target +# +# author: hackbard +# +# like all-dev, without broken packages +# + +# [C] toolchain +# [C] base +# [C] devel +# [C] hackbard +# [C] hpc +# [C] multimedia + +# [C] net +# [R] net/rarpd + +# [C] security + +# [C] x11 +# replaced by xorg due to license stuff +# [R] x11/xfree86 +# replaced by firefox & thunderbird +# [R] x11/mozilla + +# [C] science +# [C] soundtools +# [C] optional diff --git a/targets/desktop/include b/targets/desktop/include index d4aa943..722d5e3 100644 --- a/targets/desktop/include +++ b/targets/desktop/include @@ -29,6 +29,5 @@ # [R] hackbard/apache # [R] hackbard/pcmcia-cs # [R] hackbard/gpsd -# [R] hackbard/cvsd # [R] hackbard/minimalist # [R] hackbard/lprng diff --git a/targets/fai-server/include b/targets/fai-server/include index 5b3d6d7..32fedf9 100644 --- a/targets/fai-server/include +++ b/targets/fai-server/include @@ -6,5 +6,8 @@ # [C] toolchain # [C] base +# [P] net/portmap +# [P] net/nfsidmap # [P] net/nfs-utils # [P] net/tftp-hpa +# [P] net/dhcpd diff --git a/targets/mobile/include b/targets/mobile/include index a245608..b9eb4d4 100644 --- a/targets/mobile/include +++ b/targets/mobile/include @@ -20,14 +20,11 @@ # [R] net/netkit-tftp # [C] multimedia - -# [P] soundtools/alsa -# [P] soundtools/libsndfile +# [C] soundtools # [C] hackbard # [R] hackbard/minimalist # [R] hackbard/cvsd # [R] hackbard/lprng -# [R] hackbard/magicfilter # [C] devel diff --git a/targets/router/include b/targets/router/include index f930fd1..a48e2c0 100644 --- a/targets/router/include +++ b/targets/router/include @@ -18,26 +18,42 @@ # [P] hackbard/cron # [P] hackbard/curl # [P] hackbard/cvsd -# [P] hackbard/elftoaout -# [P] hackbard/fbset +# [P] hackbard/hdparm +# [P] hackbard/hostap # [P] hackbard/ipcheck # [P] hackbard/irssi +# [P] hackbard/isdn4k-utils +# [P] hackbard/libelf +# [P] hackbard/libieee1284 +# [P] hackbard/libunicode +# [P] hackbard/lirc +# [P] hackbard/lphdisk # [P] hackbard/ltrace +# [P] hackbard/lynx +# [P] hackbard/mhonarc # [P] hackbard/minicom # [P] hackbard/minimalist +# [P] hackbard/mppp +# [P] hackbard/mutt # [P] hackbard/openldap -# [P] hackbard/pcmcia-cs +# [P] hackbard/parted +# [P] hackbard/pciutils +# [P] hackbard/pcre # [P] hackbard/pine -# [P] hackbard/mutt +# [P] hackbard/procmail +# [P] hackbard/rcs # [P] hackbard/rsync +# [P] hackbard/screen # [P] hackbard/sendmail # [P] hackbard/sersniff +# [P] hackbard/setserial +# [P] hackbard/slmodem # [P] hackbard/strace # [P] hackbard/unzip +# [P] hackbard/which +# [P] hackbard/wvdial +# [P] hackbard/wvstreams # [P] hackbard/zip -# [P] hackbard/procmail -# [P] hackbard/isdn4k-utils -# [P] hackbard/rcs # [P] optional/unrealircd -- 2.39.2