From crazy at frugalware.org Sat Mar 1 00:48:42 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 00:48:44 2008 Subject: [Frugalware-git] frugalware-current: qt4-4.3.4-1-i686 Message-ID: <20080229234842.5A5C2119050E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5252f96dcd1f90b5259bad9a46d755fbbefc37f1 commit 5252f96dcd1f90b5259bad9a46d755fbbefc37f1 Author: crazy Date: Sat Mar 1 00:31:51 2008 +0100 qt4-4.3.4-1-i686 * Version bump diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 4401569..6df416a 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -3,8 +3,8 @@ pkgname=qt4 origname=qt -pkgver=4.3.3 -pkgrel=3 +pkgver=4.3.4 +pkgrel=1 pkgmore=x11-opensource-src ## Dummy package is empty .. pkgdesc="The QT4 GUI toolkit." @@ -31,7 +31,7 @@ source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \ frugalware.patch \ Trolltech.conf \ apply_patches) -sha1sums=('77d00e2438efa793f6c16c54b64c8ba440ee3228' \ +sha1sums=('639f6469d5aa07c51c2aa6795f8e3de3aab8cd25' \ 'a0fa3976fc9e28cd1b9debf913f4e1a3cf850df9' \ '70413a58f1d4b7260ab407482675b8028cea4e47' \ '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \ @@ -120,6 +120,7 @@ build() Fpatchall Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie + rm -rf $Fsrcdir/$origname-$pkgmore-$pkgver/patches/{0206*,0204*} || Fdie chmod +x apply_patches || Fdie ./apply_patches || Fdie ./configure \ @@ -155,7 +156,7 @@ build() -plugin-sql-odbc \ -qdbus -glib \ -no-separate-debug-info \ - -optimized-qmake \ + -no-optimized-qmake \ -fast \ -reduce-relocations || return 1 @@ -256,7 +257,7 @@ build() Fln linux-g++ /usr/share/$pkgname/mkspecs/default ## License etc - for l in *TXT changes-* *.GPL *.QPL README INSTALL + for l in *TXT changes-* GPL* *.GPL* *.QPL INSTALL README do Fdocrel $l done From crazy at frugalware.org Sat Mar 1 03:46:13 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 03:46:15 2008 Subject: [Frugalware-git] playground: qt4-4.4.0-0playround2-i686 Message-ID: <20080301024613.7647C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=4aebd2e5acc4f029b766848c7921a08f465e2738 commit 4aebd2e5acc4f029b766848c7921a08f465e2738 Author: crazy Date: Sat Mar 1 03:26:59 2008 +0100 qt4-4.4.0-0playround2-i686 * newer snapshot * updated trunk/qt-copy patches also diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index b93aff6..4466e1f 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt4 origname=qt pkgver=4.4.0 -pkgrel=0playround1 +pkgrel=0playround2 pkgmore=x11-opensource-src ## Dummy package is empty .. pkgdesc="The QT4 GUI toolkit." @@ -21,8 +21,8 @@ groups=('xlib-extra') archs=('i686' 'x86_64') options=('scriptlet' 'nodocs') up2date="lynx -dump ftp://ftp.trolltech.com/qt/source/|grep 'qt-x11-opensource-src'|grep -v rc[1-9]|grep -v beta|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" -source=(ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-4.4.0-snapshot-20080224.tar.bz2 \ - http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/patches-778836.tar.bz2 \ +source=(ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-4.4.0-snapshot-20080229.tar.bz2 \ + http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/patches-780789.tar.bz2 \ uitools-shared.patch \ assistant4.desktop \ assistant4-compat.desktop \ @@ -34,8 +34,8 @@ source=(ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-4.4.0-snapsho frugalware.patch \ Trolltech.conf \ apply_patches) -sha1sums=('ccd89b82822a6e8142a5fdf618d6b8610ee080cb' \ - 'ccd747c1bdc5e65278b46ceaab62756af005b08a' \ +sha1sums=('2b97189610cce693e3f59b5c5bd2d759b377c37c' \ + '68d80cf22283911ecf7c4536352a9364625b31a9' \ 'a65d9b29f2eb4c7323d33e04ccc24e7f8934aa17' \ '70413a58f1d4b7260ab407482675b8028cea4e47' \ 'ae0a66ad4fafbaa009635a9ae286949d895046e3' \ @@ -146,7 +146,7 @@ build() } cd $Fsrcdir || Fdie - mv $origname-$pkgmore-$pkgver-snapshot-20080224 $origname-$pkgmore-$pkgver || Fdie + mv $origname-$pkgmore-$pkgver-snapshot-20080229 $origname-$pkgmore-$pkgver || Fdie cd $origname-$pkgmore-$pkgver || Fdie Fpatchall Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf @@ -181,7 +181,7 @@ build() ## Here we go Fmessage "Running make.." - make || Fdie + make || Fdie ## -qtestlib do_split "src/testlib" libqttest From crazy at frugalware.org Sat Mar 1 05:12:19 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 05:12:22 2008 Subject: [Frugalware-git] playground: kdelibs-4.00.99-0playground4-i686 Message-ID: <20080301041219.DC8DE1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=37bffc80507e82a27ffa04aaa5cad7bde5618ec9 commit 37bffc80507e82a27ffa04aaa5cad7bde5618ec9 Author: crazy Date: Sat Mar 1 05:06:05 2008 +0100 kdelibs-4.00.99-0playground4-i686 * newer snapshot diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 53f341a..30f97b4 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: crazy pkgname=kdelibs -kdesvn=778813 +kdesvn=780793 pkgver=4.00.99 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="KDE4 Core Libraries." depends=('libkde' 'libqtnetwork>=4.4.0' 'qt4-qdbus' 'bzip2' 'libsm' 'libxfixes' 'gamin' 'xfsprogs-attr' 'fontconfig' 'libqtuitools>=4.4.0' \ 'pcre' 'libqttest>=4.4.0' 'libxslt' 'heimdal' 'libqtsql>=4.4.0' 'libqtdesigner>=4.4.0' 'openexr' 'jasper' 'shared-mime-info') @@ -19,7 +19,7 @@ options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2 fw-fonts.patch) _F_cd_path="$pkgname-${pkgver}_${kdesvn}" -sha1sums=('3241101b464167cb9966a76e7f0580b6b295e10e' \ +sha1sums=('7e936ee6c68c72c5e0123c2f4efd06150536be92' \ '7fde528360a1243e11edef700d0d8ead099e720a') ## TODO: groups!!! From crazy at frugalware.org Sat Mar 1 05:30:59 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 05:31:04 2008 Subject: [Frugalware-git] playground: kdepimlibs-4.00.99-0playground4-i686 Message-ID: <20080301043059.327D81190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=55701a81df96a3dc422dd91818ac9f2fe4c35c50 commit 55701a81df96a3dc422dd91818ac9f2fe4c35c50 Author: crazy Date: Sat Mar 1 05:28:56 2008 +0100 kdepimlibs-4.00.99-0playground4-i686 * newer snapshot diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild index ce2c31f..f8cbc53 100644 --- a/source/kde4/kdepimlibs/FrugalBuild +++ b/source/kde4/kdepimlibs/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: crazy pkgname=kdepimlibs -kdesvn=778820 +kdesvn=780662 pkgver=4.00.99 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="Personal Information Management (PIM) libraries for KDE4." depends=('libice' 'libxext' 'libqtgui>=4.4.0' 'libxfixes' 'libxrender' 'libkde>=4.00.99' \ 'gamin' 'xfsprogs-attr' 'libldap' 'libqtnetwork>=4.4.0' 'qt4-qdbus>=4.4.0' \ @@ -16,6 +16,6 @@ options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2) _F_cd_path="$pkgname-${pkgver}_${kdesvn}" -sha1sums=('2d7e8fc7dd5ea8745ea67a62b9dc81c89c04f52c') +sha1sums=('8f9d2c18713b06e1c75c10ad902f7c11f0e1b651') # optimization OK From crazy at frugalware.org Sat Mar 1 06:06:35 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 06:06:42 2008 Subject: [Frugalware-git] playground: kdebase-runtime-4.00.99-0playground4-i686 Message-ID: <20080301050635.CB30E1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=98b7bc7676f2057883b657a542108e6da58e3494 commit 98b7bc7676f2057883b657a542108e6da58e3494 Author: crazy Date: Sat Mar 1 05:47:53 2008 +0100 kdebase-runtime-4.00.99-0playground4-i686 * newer snapshot diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index ab712e7..7b1f856 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: crazy pkgname=kdebase-runtime -kdesvn=778516 +kdesvn=780770 pkgver=4.00.99 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="Programs needed at runtime by other KDE4 applications" depends=('libkde>=4.00.99' 'gamin' 'xfsprogs-attr' 'libxrender' 'libice' 'libxext' 'libxfixes' 'libqtnetwork>=4.4.0' \ 'bzip2' 'qt4-qdbus>=4.4.0' 'libqtgui>=4.4.0' 'pcre' 'libqtsql>=4.4.0' 'xine-lib' 'libsmbclient' 'openexr' 'clucene') @@ -15,7 +15,7 @@ options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2) _F_cd_path="$pkgname-${pkgver}_${kdesvn}" -sha1sums=('9f6e39a12e74af517e762746ccb9ab08fe7d2056') +sha1sums=('1cbef0a971a9f7e50edb32bf1a0386a6d5db6333') subpkgs=("kdebase-icons") From crazy at frugalware.org Sat Mar 1 06:36:46 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 06:36:48 2008 Subject: [Frugalware-git] playground: kdebase-workspace-4.00.99-0playground4-i686 Message-ID: <20080301053646.D80EC1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=d0c7ab02e5a2a3509311445a33b85aae6d20da41 commit d0c7ab02e5a2a3509311445a33b85aae6d20da41 Author: crazy Date: Sat Mar 1 06:31:09 2008 +0100 kdebase-workspace-4.00.99-0playground4-i686 * newer snapshot diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index c80ee1b..7325381 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -2,13 +2,14 @@ # Maintainer: crazy pkgname=kdebase-workspace -kdesvn=778873 +kdesvn=780798 pkgver=4.00.99 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="Programs specific for the KDE4 desktop." depends=('libkde>=4.00.99' 'libqt3support>=4.4.0' 'libqtsvg>=4.4.0' 'libsm' 'libxft' 'libxpm' 'libxcursor' 'strigi' 'xfsprogs-acl' \ 'libxtst' 'libpng' 'libxrandr' 'libxinerama' 'libqtuitools>=4.4.0' 'libxxf86vm' 'libdrm' 'libxres' 'lmsensors' 'libxklavier' \ - 'libxscrnsaver' 'qimageblitz' 'libstrigiqtdbusclient' 'libqtscript>=4.4.0' 'libcaptury' 'libusb' 'libxxf86misc' 'strigi-qt4-gui' 'pciutils') + 'libxscrnsaver' 'qimageblitz' 'libstrigiqtdbusclient' 'libqtscript>=4.4.0' 'libcaptury' 'libusb' 'libxxf86misc' 'strigi-qt4-gui' \ + 'pciutils' 'libxcomposite' 'bluez-libs' 'libxdamage' 'libxrender' 'libxfixes') makedepends=('xorg-server>=1.4.0.90-4' 'libqtsql>=4.4.0' 'libqtopengl>=4.4.0' 'qt4-designer') rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.4.0.90-4' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr>=1.2.2' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver") groups=('kde4' 'kde4-minimal') @@ -19,7 +20,7 @@ Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2 \ default-wallpaper.patch fw-fonts.patch) _F_cd_path="$pkgname-${pkgver}_${kdesvn}" -sha1sums=('cbc163f550fb8a0636f4ee6141870c9d3f5a571e' \ +sha1sums=('6afd24eb013744dd76233e305aede16df1c4bc51' \ '7a05287ff50b79918669e45ab056bfe4ebc711d5' \ '2585f5e90c18eb091f1ccf98604a5b4c1dce740f') From priyank at frugalware.org Sat Mar 1 07:47:24 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 07:47:26 2008 Subject: [Frugalware-git] frugalware-current: hal-0.5.10-4-i686 Message-ID: <20080301064724.D298F1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7bfd14ddfbeb6a5a3257053da655fc614fb3e3e commit c7bfd14ddfbeb6a5a3257053da655fc614fb3e3e Author: Priyank Date: Sat Mar 1 12:14:36 2008 +0530 hal-0.5.10-4-i686 * Added suspend_hibernate.patch so that hal can make use of the raw kernel interface for suspend and hibernation required for Gnome/Xfce to work. * ok with crazy ;D diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index 0a39d1d..8d4650b 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hal pkgver=0.5.10 -pkgrel=3 +pkgrel=4 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal" depends=('dbus-glib>=0.74' 'udev>=100' 'glib2' 'libcap' 'dbus>=1.1.2' \ @@ -23,6 +23,7 @@ source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ hal.conf.in.patch \ hal-device-manager.desktop \ ntfs-3g.patch \ + suspend_hibernate.patch \ hal-performance_pci.ids_v5.diff) sha1sums=('8d67499df61590c11fd3203004d69e8a45abb8fa' \ 'ab629a3ea7df51df48abad30731590b8e86e908f' \ @@ -30,6 +31,7 @@ sha1sums=('8d67499df61590c11fd3203004d69e8a45abb8fa' \ 'be12d1327ca93e1830c5784f395e904b107f1947' \ '0c4968cbb842bdae350901728d81eed9895445fa' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ + '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ '654235977c83f76433f9737f37b8a18f04136b35') diff --git a/source/apps/hal/suspend_hibernate.patch b/source/apps/hal/suspend_hibernate.patch new file mode 100644 index 0000000..272f93e --- /dev/null +++ b/source/apps/hal/suspend_hibernate.patch @@ -0,0 +1,28 @@ +diff -Naur hal-0.5.10/tools/linux/hal-system-power-hibernate-linux hal-0.5.10.new/tools/linux/hal-system-power-hibernate-linux +--- hal-0.5.10/tools/linux/hal-system-power-hibernate-linux 2007-07-26 23:30:28.000000000 +0530 ++++ hal-0.5.10.new/tools/linux/hal-system-power-hibernate-linux 2008-03-01 11:56:55.000000000 +0530 +@@ -26,6 +26,10 @@ + if [ -x /usr/sbin/pm-hibernate ] ; then + /usr/sbin/pm-hibernate $QUIRKS + RET=$? ++elif [ -w "/sys/power/state" ] ; then ++ # use the raw kernel interface ++ echo "disk" > /sys/power/state ++ RET=$? + else + unsupported + fi +diff -Naur hal-0.5.10/tools/linux/hal-system-power-suspend-linux hal-0.5.10.new/tools/linux/hal-system-power-suspend-linux +--- hal-0.5.10/tools/linux/hal-system-power-suspend-linux 2007-07-26 23:30:28.000000000 +0530 ++++ hal-0.5.10.new/tools/linux/hal-system-power-suspend-linux 2008-03-01 11:57:03.000000000 +0530 +@@ -39,6 +39,10 @@ + if [ -x "/usr/sbin/pm-suspend" ] ; then + /usr/sbin/pm-suspend $QUIRKS + RET=$? ++elif [ -w "/sys/power/state" ] ; then ++ # use the raw kernel interface ++ echo "mem" > /sys/power/state ++ RET=$? + else + # TODO: add support + unsupported From priyank at frugalware.org Sat Mar 1 07:47:24 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 07:47:27 2008 Subject: [Frugalware-git] frugalware-current: pm-utils-0.99.4-2-i686 Message-ID: <20080301064724.EDCA6119050F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4fc3ef4e1d0dfdd520d34973ce833f49344858df commit 4fc3ef4e1d0dfdd520d34973ce833f49344858df Author: Priyank Date: Sat Mar 1 12:16:33 2008 +0530 pm-utils-0.99.4-2-i686 * nobuild for now diff --git a/source/apps/pm-utils/FrugalBuild b/source/apps/pm-utils/FrugalBuild index eb362b1..016b2a8 100644 --- a/source/apps/pm-utils/FrugalBuild +++ b/source/apps/pm-utils/FrugalBuild @@ -9,6 +9,7 @@ url="http://pm-utils.freedesktop.org/wiki/" depends=('glibc') groups=('apps') archs=('i686' 'x86_64') +options=('nobuild') up2date="lynx -dump $url | grep tar.gz | Flasttar" source=(http://cvs.fedoraproject.org/repo/pkgs/$pkgname/$pkgname-$pkgver.tar.gz/a88503876f63c96b55784be91b6458d2/$pkgname-$pkgver.tar.gz \ $pkgname-0.99.3-cfg.patch) From priyank at frugalware.org Sat Mar 1 08:24:48 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 08:24:50 2008 Subject: [Frugalware-git] gfpm: gfpm-repomanager: added support for deleting repositories Message-ID: <20080301072448.BAD141190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=7a56406fac9fcd9bc88cb1191ed957b5f825f6be commit 7a56406fac9fcd9bc88cb1191ed957b5f825f6be Author: Priyank Date: Sat Mar 1 12:54:06 2008 +0530 gfpm-repomanager: added support for deleting repositories diff --git a/src/gfpm-repomanager.c b/src/gfpm-repomanager.c index f9af481..340c506 100644 --- a/src/gfpm-repomanager.c +++ b/src/gfpm-repomanager.c @@ -67,9 +67,14 @@ static void gfpm_servmgr_edit_server (gfpm_server_entry_t *s); static gfpm_repo_t * gfpm_repomgr_get_repo_input (void); static gfpm_server_entry_t * gfpm_servmgr_get_server_input (void); +/* some important functions */ +static void gfpm_repomgr_populate_repolist (void); +static void gfpm_repomgr_populate_repotvw (void); + /* signal callbacks */ static void cb_gfpm_repomgr_btnadd_clicked (GtkButton *button, gpointer data); static void cb_gfpm_repomgr_btnedit_clicked (GtkButton *button, gpointer data); +static void cb_gfpm_repomgr_btndel_clicked (GtkButton *button, gpointer data); static void cb_gfpm_servmgr_btndel_clicked (GtkButton *button, gpointer data); static void cb_gfpm_servmgr_btnedit_clicked (GtkButton *button, gpointer data); static void cb_gfpm_servmgr_btnadd_clicked (GtkButton *button, gpointer data); @@ -159,8 +164,9 @@ gfpm_repomanager_init (void) /* connect important signals */ /* repository manager signals */ - g_signal_connect (G_OBJECT(gfpm_repomgr_btnedit), "clicked", G_CALLBACK(cb_gfpm_repomgr_btnedit_clicked), NULL); g_signal_connect (G_OBJECT(gfpm_repomgr_btnadd), "clicked", G_CALLBACK(cb_gfpm_repomgr_btnadd_clicked), NULL); + g_signal_connect (G_OBJECT(gfpm_repomgr_btnedit), "clicked", G_CALLBACK(cb_gfpm_repomgr_btnedit_clicked), NULL); + g_signal_connect (G_OBJECT(gfpm_repomgr_btndel), "clicked", G_CALLBACK(cb_gfpm_repomgr_btndel_clicked), NULL); /* server manager signals */ g_signal_connect (G_OBJECT(gfpm_servmgr_btndel), "clicked", G_CALLBACK(cb_gfpm_servmgr_btndel_clicked), NULL); @@ -259,6 +265,7 @@ gfpm_write_config_file (void) GList *rlist = NULL; gfpm_repo_t *repo = NULL; GList *header = NULL; + GList *del_link = NULL; fp = fopen (CONF_FILE, "w"); if (fp == NULL) @@ -281,12 +288,26 @@ gfpm_write_config_file (void) GList *footer = NULL; repo = rlist->data; /* write the repository entry */ - if (repo->enabled) - fprintf (fp, "Include = %s/%s\n", REPO_PATH, repo->name); + if (repo->delete == FALSE) + { + if (repo->enabled) + fprintf (fp, "Include = %s/%s\n", REPO_PATH, repo->name); + else + fprintf (fp, "#Include = %s/%s\n", REPO_PATH, repo->name); + gfpm_write_servers_to_file (repo->name); + } else - fprintf (fp, "#Include = %s/%s\n", REPO_PATH, repo->name); + { + /* this repo has to be deleted. so, delete it's servers file too. */ + gchar *rpfile = NULL; + rpfile = g_strdup_printf ("%s/%s", REPO_PATH, repo->name); + /* remove only if it exists */ + if (g_file_test(rpfile, G_FILE_TEST_EXISTS)) + g_remove (rpfile); + g_free (rpfile); + del_link = repo; + } - gfpm_write_servers_to_file (repo->name); /* write the footer */ footer = repo->footer; if (footer == NULL) @@ -466,6 +487,29 @@ gfpm_repomgr_get_repo_input (void) return ret; } +static void +gfpm_repomgr_delete_repo (const char *repo) +{ + GList *rlist = NULL; + gfpm_repo_t *r = NULL; + + rlist = repolist->list; + while (rlist != NULL) + { + r = rlist->data; + if (!strcmp(r->name, repo)) + { + r->delete = TRUE; + break; + } + rlist = g_list_next (rlist); + } + gfpm_write_config_file (); + gfpm_repomgr_populate_repotvw (); + + return; +} + static GList * gfpm_repomgr_get_servers_from_repofile (const char *conf_file) { @@ -636,6 +680,7 @@ gfpm_repomgr_populate_repolist (void) repolist->list = g_list_append (repolist->list, (gpointer)repo_r); n++; } + repo_r->delete = FALSE; } repolist->n = n; @@ -1067,6 +1112,26 @@ cb_gfpm_repomgr_btnedit_clicked (GtkButton *button, gpointer data) } static void +cb_gfpm_repomgr_btndel_clicked (GtkButton *button, gpointer data) +{ + GtkTreeSelection *selection = NULL; + GtkTreeModel *model; + GtkTreeIter iter; + gchar *repo = NULL; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_repomgr_treeview)); + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 2, &repo, -1); + if (gfpm_question(_("Confirmation"), _("Are you sure you want to delete this repository ?")) == GTK_RESPONSE_YES) + gfpm_repomgr_delete_repo (repo); + g_free (repo); + } + + return; +} + +static void cb_gfpm_servmgr_btnadd_clicked (GtkButton *button, gpointer data) { gfpm_server_entry_t *s = NULL; diff --git a/src/gfpm-repomanager.h b/src/gfpm-repomanager.h index 3d97033..d33f284 100644 --- a/src/gfpm-repomanager.h +++ b/src/gfpm-repomanager.h @@ -15,6 +15,7 @@ typedef struct __gfpm_repo_t { gboolean enabled; + gboolean delete; GList *header; char name[REPONAME_MAX_SIZE+1]; GList *servers; From priyank at frugalware.org Sat Mar 1 08:28:56 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 08:28:58 2008 Subject: [Frugalware-git] gfpm: gfpm-db: gfpm_db_populate_repolist(): don't die with a gerror() here. let the caller handle it Message-ID: <20080301072856.A550A1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=52c722e8cb78a8d8a094fe3d14f0b2cadc73768b commit 52c722e8cb78a8d8a094fe3d14f0b2cadc73768b Author: Priyank Date: Sat Mar 1 12:58:27 2008 +0530 gfpm-db: gfpm_db_populate_repolist(): don't die with a gerror() here. let the caller handle it diff --git a/src/gfpm-db.c b/src/gfpm-db.c index ef5d052..cfa30ca 100644 --- a/src/gfpm-db.c +++ b/src/gfpm-db.c @@ -95,7 +95,6 @@ gfpm_db_populate_repolist (void) /* get the list of usable repositories */ if (pacman_parse_config (CFG_FILE, _db_callback, "") == -1) { - g_error ("error parsing config file"); return 1; } diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index e28c110..85faef3 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -274,6 +274,10 @@ gfpm_interface_init (void) gfpm_populate_repos_combobox (GTK_COMBO_BOX(gfpm_search_combo)); gtk_combo_box_set_active (GTK_COMBO_BOX(gfpm_search_combo), active); } + else + { + gfpm_error ("Error parsing repository information from configuration file."); + } /* search */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "search_entry1")), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL); From priyank at frugalware.org Sat Mar 1 08:58:11 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 08:58:13 2008 Subject: [Frugalware-git] gfpm: gfpm-db: gfpm_db_populate_repolist(): free the existing repolist if it's not NULL. Message-ID: <20080301075811.2227E1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=616b27d9dba33ca8ca52cda93460172131de8f55 commit 616b27d9dba33ca8ca52cda93460172131de8f55 Author: Priyank Date: Sat Mar 1 13:27:40 2008 +0530 gfpm-db: gfpm_db_populate_repolist(): free the existing repolist if it's not NULL. diff --git a/src/gfpm-db.c b/src/gfpm-db.c index cfa30ca..c7e580d 100644 --- a/src/gfpm-db.c +++ b/src/gfpm-db.c @@ -92,6 +92,12 @@ _db_callback (char *section, PM_DB *db) int gfpm_db_populate_repolist (void) { + if (dblist != NULL) + { + g_list_free (dblist); + dblist = NULL; + } + /* get the list of usable repositories */ if (pacman_parse_config (CFG_FILE, _db_callback, "") == -1) { From priyank at frugalware.org Sat Mar 1 08:59:53 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 08:59:55 2008 Subject: [Frugalware-git] gfpm: gfpm-interface: re-populate the repo combos when repos are enabled/disabled by the user through repo manager Message-ID: <20080301075953.E04B01190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=926e0cf8988466507c373904a07eb9720484293e commit 926e0cf8988466507c373904a07eb9720484293e Author: Priyank Date: Sat Mar 1 13:29:23 2008 +0530 gfpm-interface: re-populate the repo combos when repos are enabled/disabled by the user through repo manager diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 85faef3..a24f443 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -63,6 +63,10 @@ gchar *current_group = NULL; GtkWidget *gfpm_mw; GtkWidget *gfpm_pkgs_tvw = NULL; +/* init flag */ +/* indicates that the repos were initied atleast once */ +gboolean init = FALSE; + static GtkWidget *gfpm_statusbar = NULL; static GtkWidget *gfpm_groups_tvw = NULL; static GtkWidget *gfpm_info_tvw = NULL; @@ -79,6 +83,7 @@ static GtkWidget *gfpm_apply_inst_depcheck; static GtkWidget *gfpm_apply_inst_dwocheck; static GtkWidget *gfpm_apply_rem_depcheck; static GtkWidget *gfpm_search_combo; +static GtkWidget *gfpm_repos_combo; static guint gfpm_populate_repos_combobox (GtkComboBox *combo); static void cb_gfpm_repos_combo_changed (GtkComboBox *combo, gpointer data); @@ -110,12 +115,26 @@ gfpm_populate_repos_combobox (GtkComboBox *combo) gint c_index = 0; gboolean found = FALSE; - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store)); - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(combo), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL); + if (init == FALSE) + { + g_print ("im here\n"); + store = gtk_list_store_new (1, G_TYPE_STRING); + gtk_combo_box_set_model (GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store)); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(combo), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL); + g_print ("im here\n"); + } + else + { + store = GTK_LIST_STORE (gtk_combo_box_get_model(combo)); + if (store != NULL) + { + gtk_list_store_clear (store); + } + } + rlist = gfpm_db_get_repolist (); for (;rlist != NULL;rlist=rlist->next) { @@ -140,6 +159,26 @@ gfpm_populate_repos_combobox (GtkComboBox *combo) return c_index; } +void +gfpm_interface_setup_repo_combos (void) +{ + if (gfpm_db_populate_repolist() == 0) + { + guint active; + active = gfpm_populate_repos_combobox (GTK_COMBO_BOX(gfpm_repos_combo)); + g_signal_connect (G_OBJECT(gfpm_repos_combo), "changed", G_CALLBACK(cb_gfpm_repos_combo_changed), NULL); + gtk_combo_box_set_active (GTK_COMBO_BOX(gfpm_repos_combo), active); + gfpm_populate_repos_combobox (GTK_COMBO_BOX(gfpm_search_combo)); + gtk_combo_box_set_active (GTK_COMBO_BOX(gfpm_search_combo), active); + } + else + { + gfpm_error (_("Error"), _("Error parsing repository information from configuration file.")); + } + + return; +} + GtkWidget * gfpm_get_widget (const char *wname) { @@ -150,7 +189,6 @@ void gfpm_interface_init (void) { GtkWidget *gfpm_splash; - GtkWidget *widget; GtkListStore *store; GtkCellRenderer *renderer; GtkTreeSelection *selection; @@ -181,6 +219,7 @@ gfpm_interface_init (void) gfpm_apply_rem_depcheck = gfpm_get_widget ("applyremdepcheck"); gfpm_apply_inst_dwocheck = gfpm_get_widget ("applyinstdwcheck"); gfpm_search_combo = gfpm_get_widget ("search_repocombo"); + gfpm_repos_combo = gfpm_get_widget ("combobox_repos"); /* Setup groups treeview */ store = gtk_list_store_new (1, G_TYPE_STRING); @@ -264,20 +303,8 @@ gfpm_interface_init (void) g_object_set (gfpm_info_tvw, "hover-selection", TRUE, NULL); /* Setup repository combobox */ - widget = gfpm_get_widget ("combobox_repos"); - if (gfpm_db_populate_repolist() == 0) - { - guint active; - active = gfpm_populate_repos_combobox (GTK_COMBO_BOX(widget)); - g_signal_connect (G_OBJECT(widget), "changed", G_CALLBACK(cb_gfpm_repos_combo_changed), NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX(widget), active); - gfpm_populate_repos_combobox (GTK_COMBO_BOX(gfpm_search_combo)); - gtk_combo_box_set_active (GTK_COMBO_BOX(gfpm_search_combo), active); - } - else - { - gfpm_error ("Error parsing repository information from configuration file."); - } + gfpm_interface_setup_repo_combos (); + if (!init) init = TRUE; /* search */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "search_entry1")), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL); diff --git a/src/gfpm-interface.h b/src/gfpm-interface.h index e2adb2d..7f6e88f 100644 --- a/src/gfpm-interface.h +++ b/src/gfpm-interface.h @@ -18,6 +18,7 @@ void gfpm_load_info_tvw (const char *); void gfpm_load_files_txtvw (const char *, gboolean); void gfpm_load_changelog_txtvw (const char *, gboolean); void gfpm_interface_init (void); +void gfpm_interface_setup_repo_combos (void); void cb_gfpm_apply_btn_clicked (GtkButton *, gpointer); #endif diff --git a/src/gfpm-repomanager.c b/src/gfpm-repomanager.c index 340c506..9b21b9a 100644 --- a/src/gfpm-repomanager.c +++ b/src/gfpm-repomanager.c @@ -1063,6 +1063,9 @@ cb_gfpm_repo_enable_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpo /* write config file */ gfpm_write_config_file (); + + /* repopulate repository information and setup combos */ + gfpm_interface_setup_repo_combos (); g_free (sel); gtk_tree_path_free (path); From janny at frugalware.org Sat Mar 1 14:02:40 2008 From: janny at frugalware.org (janny) Date: Sat Mar 1 14:02:44 2008 Subject: [Frugalware-git] fwlive: kernel-fwlive-2.6.24-3-i686 Message-ID: <20080301130240.4D6291190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=5d0b1461fb2743485ee53b71e1769ecf0fffcece commit 5d0b1461fb2743485ee53b71e1769ecf0fffcece Author: janny Date: Sat Mar 1 13:48:36 2008 +0100 kernel-fwlive-2.6.24-3-i686 * release and version bump * actualize patch set * add was left out sqlzma2k-3.3.patch diff --git a/source/base-extra/kernel-fwlive/FrugalBuild b/source/base-extra/kernel-fwlive/FrugalBuild index d922009..5282a45 100644 --- a/source/base-extra/kernel-fwlive/FrugalBuild +++ b/source/base-extra/kernel-fwlive/FrugalBuild @@ -1,15 +1,16 @@ -# Compiling Time: 11.75 SBU +# Compiling Time: 18.95 SBU # Maintainer: Janny pkgver=2.6.24 -pkgrel=2 -_F_kernelver_stable=1 +pkgrel=3 +_F_kernel_stable=3 _F_kernel_name="-fwlive" _F_kernel_uname="-fw$pkgrel" -_F_kernel_patches=(CVE-2008-0600.patch \ +_F_kernel_patches=(revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch \ http://frugalware.org/~janny/patchs/kernel/${pkgver}/splice-2.6.23.patch \ http://frugalware.org/~janny/patchs/kernel/${pkgver}/sec_perm-2.6.24.patch \ - http://frugalware.org/~janny/patchs/kernel/${pkgver}/squashfs3.3-patch) + http://frugalware.org/~janny/patchs/kernel/${pkgver}/squashfs3.3-patch \ + http://frugalware.org/~janny/patchs/kernel/${pkgver}/sqlzma2k-3.3.patch) Finclude kernel groups=('base-extra') diff --git a/source/base-extra/kernel-fwlive/config.i686 b/source/base-extra/kernel-fwlive/config.i686 index 0f8033d..4552175 100644 --- a/source/base-extra/kernel-fwlive/config.i686 +++ b/source/base-extra/kernel-fwlive/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Mon Jan 21 15:11:36 2008 +# Sat Mar 1 09:37:23 2008 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -51,7 +51,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -61,24 +61,27 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_TASKSTATS is not set # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set CONFIG_FAIR_GROUP_SCHED=y CONFIG_FAIR_USER_SCHED=y # CONFIG_FAIR_CGROUP_SCHED is not set # CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set +CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -103,15 +106,15 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_BLK_DEV_IO_TRACE=y CONFIG_LSF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # # IO Schedulers @@ -125,13 +128,14 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y # # Processor type and features # -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y CONFIG_X86_PC=y @@ -147,11 +151,11 @@ CONFIG_X86_PC=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y # CONFIG_PARAVIRT_GUEST is not set # CONFIG_M386 is not set -CONFIG_M486=y +# CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set -# CONFIG_M686 is not set +CONFIG_M686=y # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set # CONFIG_MPENTIUMM is not set @@ -177,28 +181,29 @@ CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_X86_XADD=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y CONFIG_X86_MCE_NONFATAL=m -# CONFIG_X86_MCE_P4THERMAL is not set +CONFIG_X86_MCE_P4THERMAL=y CONFIG_VM86=y CONFIG_TOSHIBA=m CONFIG_I8K=m @@ -229,24 +234,24 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_NR_QUICK=1 CONFIG_VIRT_TO_BUS=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y # CONFIG_EFI is not set -CONFIG_IRQBALANCE=y +# CONFIG_IRQBALANCE is not set CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -# CONFIG_KEXEC is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_HOTPLUG_CPU=y -CONFIG_COMPAT_VDSO=y +# CONFIG_COMPAT_VDSO is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # @@ -268,16 +273,16 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_PROCFS_POWER=y CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=y -CONFIG_ACPI_DOCK=y -# CONFIG_ACPI_BAY is not set -CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 @@ -286,15 +291,15 @@ CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set -CONFIG_APM=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +CONFIG_APM=m # CONFIG_APM_IGNORE_USER_SUSPEND is not set # CONFIG_APM_DO_ENABLE is not set # CONFIG_APM_CPU_IDLE is not set # CONFIG_APM_DISPLAY_BLANK is not set # CONFIG_APM_ALLOW_INTS is not set -# CONFIG_APM_REAL_MODE_POWER_OFF is not set +CONFIG_APM_REAL_MODE_POWER_OFF=y # # CPU Frequency scaling @@ -303,7 +308,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set @@ -332,14 +337,14 @@ CONFIG_X86_P4_CLOCKMOD=m CONFIG_X86_CPUFREQ_NFORCE2=m CONFIG_X86_LONGRUN=m CONFIG_X86_LONGHAUL=m -# CONFIG_X86_E_POWERSAVER is not set +CONFIG_X86_E_POWERSAVER=m # # shared options # # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set CONFIG_X86_SPEEDSTEP_LIB=m -CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set # CONFIG_CPU_IDLE is not set # @@ -348,31 +353,35 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_PCI=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y +CONFIG_PCI_GODIRECT=y +# CONFIG_PCI_GOANY is not set CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y -# CONFIG_PCI_MSI is not set +CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set CONFIG_HT_IRQ=y CONFIG_ISA_DMA_API=y CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -CONFIG_SCx200=m -CONFIG_SCx200HR_TIMER=m +CONFIG_EISA=y +# CONFIG_EISA_VLB_PRIMING is not set +CONFIG_EISA_PCI_EISA=y +CONFIG_EISA_VIRTUAL_ROOT=y +CONFIG_EISA_NAMES=y +CONFIG_MCA=y +CONFIG_MCA_LEGACY=y +CONFIG_MCA_PROC_FS=y +# CONFIG_SCx200 is not set CONFIG_K8_NB=y -CONFIG_PCCARD=m +CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m +CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y +# CONFIG_PCMCIA_IOCTL is not set CONFIG_CARDBUS=y # @@ -392,9 +401,6 @@ CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=m CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -# CONFIG_HOTPLUG_PCI_IBM is not set CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set @@ -433,7 +439,10 @@ CONFIG_IP_FIB_HASH=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y @@ -451,50 +460,39 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IP_VS=m -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m +# CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set +CONFIG_IPV6_MIP6=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m @@ -503,9 +501,10 @@ CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -518,8 +517,9 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK_ENABLED=m CONFIG_NF_CONNTRACK=m -# CONFIG_NF_CT_ACCT is not set -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set # CONFIG_NF_CONNTRACK_EVENTS is not set CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -530,24 +530,25 @@ CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m -# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_TRACE=m -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m @@ -610,7 +611,7 @@ CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m -# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m @@ -629,7 +630,7 @@ CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_AH=m -# CONFIG_IP6_NF_MATCH_MH is not set +CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_LOG=m @@ -639,6 +640,11 @@ CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m # +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# # Bridge: Netfilter Configuration # CONFIG_BRIDGE_NF_EBTABLES=m @@ -660,7 +666,7 @@ CONFIG_BRIDGE_EBT_MARK_T=m CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set # CONFIG_IP_DCCP is not set CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set @@ -678,7 +684,8 @@ CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -# CONFIG_DECNET is not set +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y CONFIG_LLC2=m CONFIG_IPX=m @@ -692,9 +699,11 @@ CONFIG_COPS_TANGENT=y CONFIG_IPDDP=m CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y CONFIG_WAN_ROUTER=m CONFIG_NET_SCHED=y @@ -730,9 +739,15 @@ CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -# CONFIG_NET_EMATCH is not set +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m @@ -740,8 +755,8 @@ CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set +# CONFIG_NET_CLS_POLICE is not set +CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # @@ -754,7 +769,7 @@ CONFIG_HAMRADIO=y # Packet Radio protocols # CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set +CONFIG_AX25_DAMA_SLAVE=y CONFIG_NETROM=m CONFIG_ROSE=m @@ -880,6 +895,7 @@ CONFIG_WIRELESS_EXT=y CONFIG_MAC80211=m CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set @@ -906,9 +922,139 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set CONFIG_CONNECTOR=m -# CONFIG_MTD is not set +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PNC2000=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_OTP=y +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +CONFIG_MTD_ONENAND_SIM=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -926,7 +1072,8 @@ CONFIG_PNP=y # Protocols # CONFIG_ISAPNP=y -# CONFIG_PNPBIOS is not set +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=y @@ -967,10 +1114,10 @@ CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=y CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=y +CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 @@ -978,7 +1125,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_CDROM_PKTCDVD_WCACHE=y CONFIG_ATA_OVER_ETH=m CONFIG_MISC_DEVICES=y CONFIG_IBM_ASM=m @@ -987,10 +1134,11 @@ CONFIG_EEPROM_93CX6=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m -# CONFIG_ASUS_LAPTOP is not set +CONFIG_ASUS_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m CONFIG_MSI_LAPTOP=m -# CONFIG_SONY_LAPTOP is not set +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -1003,13 +1151,13 @@ CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_IDE_SATA is not set # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECS=m -# CONFIG_BLK_DEV_DELKIN is not set +CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEFLOPPY=y -CONFIG_BLK_DEV_IDESCSI=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_BLK_DEV_IDEACPI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_PROC_FS=y @@ -1017,10 +1165,11 @@ CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_PLATFORM=m -# CONFIG_BLK_DEV_CMD640 is not set -CONFIG_BLK_DEV_IDEPNP=y +CONFIG_IDE_GENERIC=m +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_CMD640=y +CONFIG_BLK_DEV_CMD640_ENHANCED=y +# CONFIG_BLK_DEV_IDEPNP is not set # # PCI IDE chipsets support @@ -1029,8 +1178,8 @@ CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_IDEPCI_PCIBUS_ORDER=y # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_GENERIC is not set +CONFIG_BLK_DEV_OPTI621=y CONFIG_BLK_DEV_RZ1000=y CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=y @@ -1043,16 +1192,16 @@ CONFIG_BLK_DEV_TRIFLEX=y CONFIG_BLK_DEV_CY82C693=y CONFIG_BLK_DEV_CS5520=y CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=y +CONFIG_BLK_DEV_CS5535=m CONFIG_BLK_DEV_HPT34X=y # CONFIG_HPT34X_AUTODMA is not set CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_JMICRON=y CONFIG_BLK_DEV_SC1200=y -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_PIIX is not set +CONFIG_BLK_DEV_IT8213=y CONFIG_BLK_DEV_IT821X=y -# CONFIG_BLK_DEV_NS87415 is not set +CONFIG_BLK_DEV_NS87415=m CONFIG_BLK_DEV_PDC202XX_OLD=y CONFIG_PDC202XX_BURST=y CONFIG_BLK_DEV_PDC202XX_NEW=y @@ -1060,9 +1209,9 @@ CONFIG_BLK_DEV_SVWKS=y CONFIG_BLK_DEV_SIIMAGE=y CONFIG_BLK_DEV_SIS5513=y CONFIG_BLK_DEV_SLC90E66=y -CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_TRM290=y CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_BLK_DEV_TC86C001 is not set +CONFIG_BLK_DEV_TC86C001=y # CONFIG_IDE_ARM is not set # @@ -1088,7 +1237,7 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=y +CONFIG_SCSI_TGT=m CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y @@ -1096,7 +1245,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y +CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y @@ -1106,34 +1255,35 @@ CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports # CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_FC_ATTRS=y +CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_FC_TGT_ATTRS=y -CONFIG_SCSI_ISCSI_ATTRS=y -CONFIG_SCSI_SAS_ATTRS=y -CONFIG_SCSI_SAS_LIBSAS=y -# CONFIG_SCSI_SAS_ATA is not set -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_LIBSAS_DEBUG=y CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=y -CONFIG_BLK_DEV_3W_XXXX_RAID=y -CONFIG_SCSI_3W_9XXX=y -CONFIG_SCSI_7000FASST=y -CONFIG_SCSI_ACARD=y -CONFIG_SCSI_AHA152X=y -CONFIG_SCSI_AHA1542=y -CONFIG_SCSI_AACRAID=y +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AHA1740=m +CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=y CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1141,75 +1291,85 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000 CONFIG_AIC7XXX_DEBUG_MASK=0 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set CONFIG_SCSI_AIC7XXX_OLD=m -CONFIG_SCSI_AIC79XX=y +CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=4 CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -CONFIG_SCSI_AIC94XX=y +CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_DPT_I2O=y +CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_IN2000=y +CONFIG_SCSI_IN2000=m CONFIG_SCSI_ARCMSR=m -# CONFIG_SCSI_ARCMSR_AER is not set +CONFIG_SCSI_ARCMSR_AER=y CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=y -CONFIG_MEGARAID_MAILBOX=y -CONFIG_MEGARAID_LEGACY=y -CONFIG_MEGARAID_SAS=y -CONFIG_SCSI_HPTIOP=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=y # CONFIG_SCSI_OMIT_FLASHPOINT is not set -CONFIG_SCSI_DMX3191D=y -CONFIG_SCSI_DTC3280=y -CONFIG_SCSI_EATA=y +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=y -CONFIG_SCSI_GDTH=y +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_FD_MCS=m +CONFIG_SCSI_GDTH=m CONFIG_SCSI_GENERIC_NCR5380=m -CONFIG_SCSI_GENERIC_NCR5380_MMIO=y +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IBMMCA=m +CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y +CONFIG_IBMMCA_SCSI_DEV_RESET=y CONFIG_SCSI_IPS=y -CONFIG_SCSI_INITIO=y -CONFIG_SCSI_INIA100=y +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_NCR53C406A=m -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=y +CONFIG_SCSI_NCR_D700=m +CONFIG_SCSI_STEX=y +CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=y +CONFIG_SCSI_IPR=m # CONFIG_SCSI_IPR_TRACE is not set # CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_NCR_Q720=m +CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 +CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 +CONFIG_SCSI_NCR53C8XX_SYNC=20 CONFIG_SCSI_PAS16=m -CONFIG_SCSI_PSI240I=y -CONFIG_SCSI_QLOGIC_FAS=y -CONFIG_SCSI_QLOGIC_1280=y -CONFIG_SCSI_QLA_FC=y -CONFIG_SCSI_QLA_ISCSI=y -CONFIG_SCSI_LPFC=y -CONFIG_SCSI_SEAGATE=y -CONFIG_SCSI_SYM53C416=y -CONFIG_SCSI_DC395x=y -CONFIG_SCSI_DC390T=y -CONFIG_SCSI_T128=y +CONFIG_SCSI_PSI240I=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_SEAGATE=m +CONFIG_SCSI_SIM710=m +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m CONFIG_SCSI_U14_34F=m # CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set # CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set CONFIG_SCSI_U14_34F_MAX_TAGS=8 CONFIG_SCSI_ULTRASTOR=m -CONFIG_SCSI_NSP32=y +CONFIG_SCSI_NSP32=m CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_SRP=y +CONFIG_SCSI_SRP=m CONFIG_SCSI_LOWLEVEL_PCMCIA=y CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m @@ -1220,12 +1380,12 @@ CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y CONFIG_SATA_AHCI=y -CONFIG_SATA_SVW=y +CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=y -CONFIG_SATA_MV=y +CONFIG_SATA_MV=m CONFIG_SATA_NV=y -CONFIG_PDC_ADMA=y -CONFIG_SATA_QSTOR=y +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m CONFIG_SATA_PROMISE=y CONFIG_SATA_SX4=y CONFIG_SATA_SIL=y @@ -1234,7 +1394,7 @@ CONFIG_SATA_SIS=y CONFIG_SATA_ULI=y CONFIG_SATA_VIA=y CONFIG_SATA_VITESSE=y -# CONFIG_SATA_INIC162X is not set +CONFIG_SATA_INIC162X=m CONFIG_PATA_ACPI=m CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m @@ -1256,8 +1416,8 @@ CONFIG_PATA_HPT3X3=m CONFIG_PATA_HPT3X3_DMA=y CONFIG_PATA_ISAPNP=m CONFIG_PATA_IT821X=m -# CONFIG_PATA_IT8213 is not set -CONFIG_PATA_JMICRON=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=y CONFIG_PATA_LEGACY=m CONFIG_PATA_TRIFLEX=m CONFIG_PATA_MARVELL=m @@ -1283,30 +1443,27 @@ CONFIG_PATA_WINBOND=m CONFIG_PATA_WINBOND_VLB=m CONFIG_MD=y CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y -CONFIG_MD_RAID10=y -CONFIG_MD_RAID456=y +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m CONFIG_MD_RAID5_RESHAPE=y -CONFIG_MD_MULTIPATH=y +CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=y -CONFIG_DM_SNAPSHOT=y -CONFIG_DM_MIRROR=y -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set CONFIG_FUSION=y -CONFIG_FUSION_SPI=y -CONFIG_FUSION_FC=y -CONFIG_FUSION_SAS=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m @@ -1328,31 +1485,31 @@ CONFIG_IEEE1394=y # # Controllers # -CONFIG_IEEE1394_PCILYNX=y -CONFIG_IEEE1394_OHCI1394=y +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m # # Protocols # CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=y +CONFIG_IEEE1394_SBP2=m # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m -CONFIG_I2O=y +CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_CONFIG=y -# CONFIG_I2O_CONFIG_OLD_IOCTL is not set -CONFIG_I2O_BUS=y -CONFIG_I2O_BLOCK=y -CONFIG_I2O_SCSI=y -CONFIG_I2O_PROC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y -# CONFIG_NETDEVICES_MULTIQUEUE is not set +CONFIG_NETDEVICES_MULTIQUEUE=y CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m @@ -1404,12 +1561,16 @@ CONFIG_ELPLUS=m CONFIG_EL16=m CONFIG_EL3=m CONFIG_3C515=m +CONFIG_ELMC=m +CONFIG_ELMC_II=m CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_LANCE=m CONFIG_NET_VENDOR_SMC=y CONFIG_WD80x3=m +CONFIG_ULTRAMCA=m CONFIG_ULTRA=m +CONFIG_ULTRA32=m CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m @@ -1435,18 +1596,20 @@ CONFIG_EEXPRESS=m CONFIG_EEXPRESS_PRO=m CONFIG_HPLAN_PLUS=m CONFIG_HPLAN=m -CONFIG_LP486E=m +# CONFIG_LP486E is not set CONFIG_ETH16I=m CONFIG_NE2000=m CONFIG_ZNET=m CONFIG_SEEQ8005=m +CONFIG_NE2_MCA=m +CONFIG_IBMLANA=m # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set # CONFIG_IBM_NEW_EMAC_EMAC4 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m -CONFIG_PCNET32_NAPI=y +# CONFIG_PCNET32_NAPI is not set CONFIG_AMD8111_ETH=m # CONFIG_AMD8111E_NAPI is not set CONFIG_ADAPTEC_STARFIRE=m @@ -1458,13 +1621,16 @@ CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y CONFIG_FORCEDETH=m -CONFIG_FORCEDETH_NAPI=y +# CONFIG_FORCEDETH_NAPI is not set CONFIG_CS89x0=m CONFIG_EEPRO100=m CONFIG_E100=m +CONFIG_LNE390=m CONFIG_FEALNX=m CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m +CONFIG_NE3210=m +CONFIG_ES3210=m CONFIG_8139CP=m CONFIG_8139TOO=m CONFIG_8139TOO_PIO=y @@ -1478,8 +1644,8 @@ CONFIG_SUNDANCE=m CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -CONFIG_VIA_RHINE_NAPI=y -# CONFIG_SC92031 is not set +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m @@ -1498,26 +1664,28 @@ CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m # CONFIG_R8169_NAPI is not set -CONFIG_R8169_VLAN=y +# CONFIG_R8169_VLAN is not set CONFIG_SIS190=m CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set CONFIG_SK98LIN=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m -# CONFIG_ATL1 is not set +CONFIG_ATL1=m CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m -# CONFIG_S2IO_NAPI is not set +CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m @@ -1534,12 +1702,18 @@ CONFIG_TMSPCI=m CONFIG_SKISA=m CONFIG_PROTEON=m CONFIG_ABYSS=m +CONFIG_MADGEMC=m CONFIG_SMCTR=m # # Wireless LAN # -# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_PRE80211=y +CONFIG_STRIP=m +CONFIG_ARLAN=m +CONFIG_WAVELAN=m +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_IPW2100=m @@ -1547,8 +1721,8 @@ CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y +# CONFIG_IPW2200_RADIOTAP is not set +# CONFIG_IPW2200_PROMISCUOUS is not set CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBERTAS=m @@ -1577,15 +1751,14 @@ CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m CONFIG_IWLWIFI=y -# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWLWIFI_SENSITIVITY=y CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y CONFIG_IWLWIFI_QOS=y CONFIG_IWL4965=m CONFIG_IWL3945=m CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE is not set CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m @@ -1611,7 +1784,7 @@ CONFIG_B43_DMA_AND_PIO_MODE=y CONFIG_B43LEGACY=m CONFIG_B43LEGACY_PCI_AUTOSELECT=y CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -1645,7 +1818,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -1657,7 +1830,7 @@ CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y # CONFIG_USB_EPSON2888 is not set -# CONFIG_USB_KC2190 is not set +CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m @@ -1681,14 +1854,11 @@ CONFIG_HDLC_RAW_ETH=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m CONFIG_HDLC_PPP=m - -# -# X.25/LAPB support is disabled -# +CONFIG_HDLC_X25=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_PC300=m -# CONFIG_PC300_MLPPP is not set +CONFIG_PC300_MLPPP=y # # Cyclades-PC300 MLPPP support is disabled. @@ -1697,7 +1867,7 @@ CONFIG_PC300=m # # Refer to the file README.mlppp, provided by PC300 package. # -# CONFIG_PC300TOO is not set +CONFIG_PC300TOO=m CONFIG_N2=m CONFIG_C101=m CONFIG_FARSYNC=m @@ -1710,10 +1880,12 @@ CONFIG_SDLA=m CONFIG_WAN_ROUTER_DRIVERS=m CONFIG_CYCLADES_SYNC=m CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m +# CONFIG_ATM_DUMMY is not set CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m @@ -1768,115 +1940,17 @@ CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set +CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_ISDN=m -CONFIG_ISDN_I4L=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -CONFIG_HISAX_NO_SENDCOMPLETE=y -CONFIG_HISAX_NO_LLC=y -CONFIG_HISAX_NO_KEYPAD=y -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_0=y -CONFIG_HISAX_16_3=y -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_AVM_A1=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_IX1MICROR2=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_ASUSCOM=y -CONFIG_HISAX_TELEINT=y -CONFIG_HISAX_HFCS=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_SPORTSTER=y -CONFIG_HISAX_MIC=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_ISURF=y -CONFIG_HISAX_HSTSAPHIR=y -CONFIG_HISAX_BKM_A4T=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_W6692=y -CONFIG_HISAX_HFC_SX=y -CONFIG_HISAX_ENTERNOW_PCI=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_TELES_CS=m - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_HISAX_HDLC=y - -# -# Active cards -# -CONFIG_ISDN_DRV_ICN=m -CONFIG_ISDN_DRV_PCBIT=m -CONFIG_ISDN_DRV_SC=m -CONFIG_ISDN_DRV_ACT2000=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -# CONFIG_GIGASET_M101 is not set -# CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set +# CONFIG_ISDN_I4L is not set CONFIG_ISDN_CAPI=m CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_CAPI_TRACE=y +# CONFIG_CAPI_TRACE is not set CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y CONFIG_ISDN_CAPI_CAPIFS=m -CONFIG_ISDN_CAPI_CAPIDRV=m # # CAPI hardware drivers @@ -1924,19 +1998,19 @@ CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_TOUCHKIT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_INPORT=m @@ -1968,7 +2042,7 @@ CONFIG_JOYSTICK_TWIDJOY=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_JOYDUMP=m +# CONFIG_JOYSTICK_JOYDUMP is not set CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y @@ -1979,6 +2053,7 @@ CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -2003,7 +2078,7 @@ CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_WISTRON_BTNS=m -# CONFIG_INPUT_ATLAS_BTNS is not set +CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m @@ -2021,7 +2096,7 @@ CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PCIPS2=m CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m +# CONFIG_SERIO_RAW is not set CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -2034,7 +2109,7 @@ CONFIG_GAMEPORT_FM801=m CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_SERIAL_NONSTANDARD=y CONFIG_COMPUTONE=m CONFIG_ROCKETPORT=m @@ -2051,7 +2126,7 @@ CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m CONFIG_SPECIALIX=m -# CONFIG_SPECIALIX_RTSCTS is not set +CONFIG_SPECIALIX_RTSCTS=y CONFIG_SX=m CONFIG_RIO=m # CONFIG_RIO_OLDPCI is not set @@ -2078,6 +2153,7 @@ CONFIG_SERIAL_8250_HUB6=m CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_MCA=m # # Non-8250 serial port support @@ -2103,7 +2179,9 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_NVRAM=m -CONFIG_RTC=y +CONFIG_RTC=m +CONFIG_GEN_RTC=y +CONFIG_GEN_RTC_X=y CONFIG_DTLK=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2116,28 +2194,29 @@ CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set -# CONFIG_HPET is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m -# CONFIG_TCG_TIS is not set -# CONFIG_TCG_NSC is not set +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m -# CONFIG_TCG_INFINEON is not set +CONFIG_TCG_INFINEON=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y -CONFIG_I2C=y +CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m # # I2C Algorithms # -CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m @@ -2160,15 +2239,12 @@ CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m CONFIG_I2C_SIMTEC=m -CONFIG_SCx200_I2C=m -CONFIG_SCx200_I2C_SCL=12 -CONFIG_SCx200_I2C_SDA=13 CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_STUB=m +# CONFIG_I2C_STUB is not set CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m @@ -2195,8 +2271,23 @@ CONFIG_SENSORS_TSL2550=m # # SPI support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m CONFIG_W1=m CONFIG_W1_CON=y @@ -2213,13 +2304,13 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m -CONFIG_W1_SLAVE_DS2433_CRC=y +# CONFIG_W1_SLAVE_DS2433_CRC is not set CONFIG_W1_SLAVE_DS2760=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set +CONFIG_PDA_POWER=m CONFIG_BATTERY_DS2760=m -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m @@ -2227,7 +2318,7 @@ CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m -# CONFIG_SENSORS_ADM1029 is not set +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_ADT7470=m @@ -2248,6 +2339,7 @@ CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m CONFIG_SENSORS_LM78=m @@ -2302,7 +2394,6 @@ CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_IT8712F_WDT=m CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m CONFIG_PC87413_WDT=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m @@ -2322,7 +2413,7 @@ CONFIG_SBC_EPX_C3_WATCHDOG=m CONFIG_PCWATCHDOG=m CONFIG_MIXCOMWD=m CONFIG_WDT=m -# CONFIG_WDT_501 is not set +CONFIG_WDT_501=y # # PCI-based Watchdog Cards @@ -2352,7 +2443,7 @@ CONFIG_SSB_DRIVER_PCICORE=y # # Multifunction device drivers # -# CONFIG_MFD_SM501 is not set +CONFIG_MFD_SM501=m # # Multimedia devices @@ -2363,15 +2454,7 @@ CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set - -# -# Encoders/decoders and other helper chips -# - -# -# Audio decoders -# +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TVAUDIO=m CONFIG_VIDEO_TDA7432=m CONFIG_VIDEO_TDA9840=m @@ -2380,49 +2463,25 @@ CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m - -# -# Video decoders -# CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_TCM825X=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA7111=m CONFIG_VIDEO_SAA7114=m CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m - -# -# Video improvement chips -# CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_VIVI=m @@ -2449,15 +2508,16 @@ CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m CONFIG_VIDEO_SAA7134=m -# CONFIG_VIDEO_SAA7134_ALSA is not set +CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m -# CONFIG_VIDEO_CX88_ALSA is not set +CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m @@ -2469,8 +2529,7 @@ CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_29XXX=y CONFIG_VIDEO_PVRUSB2_24XXX=y -CONFIG_VIDEO_PVRUSB2_SYSFS=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +# CONFIG_VIDEO_PVRUSB2_SYSFS is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_USBVIDEO=m @@ -2507,7 +2566,7 @@ CONFIG_RADIO_TYPHOON_PROC_FS=y CONFIG_RADIO_ZOLTRIX=m CONFIG_USB_DSBR=m CONFIG_DVB_CORE=m -# CONFIG_DVB_CORE_ATTACH is not set +CONFIG_DVB_CORE_ATTACH=y CONFIG_DVB_CAPTURE_DRIVERS=y # @@ -2517,7 +2576,7 @@ CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m -# CONFIG_DVB_BUDGET_AV is not set +CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_BUDGET_PATCH=m # @@ -2532,9 +2591,9 @@ CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_USB_DIB0700=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_CXUSB=m -# CONFIG_DVB_USB_M920X is not set -# CONFIG_DVB_USB_GL861 is not set -# CONFIG_DVB_USB_AU6610 is not set +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_VP7045=m CONFIG_DVB_USB_VP702X=m @@ -2548,11 +2607,7 @@ CONFIG_DVB_USB_AF9005_REMOTE=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_CINERGYT2=m -CONFIG_DVB_CINERGYT2_TUNING=y -CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 -CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 -CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 -# CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE is not set +# CONFIG_DVB_CINERGYT2_TUNING is not set # # Supported FlexCopII (B2C2) Adapters @@ -2579,7 +2634,7 @@ CONFIG_DVB_PLUTO2=m # # Customise DVB Frontends # -CONFIG_DVB_FE_CUSTOMISE=y +# CONFIG_DVB_FE_CUSTOMISE is not set # # DVB-S (satellite) frontends @@ -2691,8 +2746,8 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_VGASTATE=y +CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -2714,40 +2769,32 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -# CONFIG_FB_PM2_FIFO_DISCONNECT is not set -CONFIG_FB_CYBER2000=m -CONFIG_FB_ARC=m +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m +CONFIG_FB_VGA16=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y # CONFIG_FB_EFI is not set -CONFIG_FB_HECUBA=m -CONFIG_FB_HGA=m -# CONFIG_FB_HGA_ACCEL is not set -CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_HECUBA is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y +# CONFIG_FB_I810_I2C is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m CONFIG_FB_INTEL=m # CONFIG_FB_INTEL_DEBUG is not set CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m @@ -2759,39 +2806,32 @@ CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set CONFIG_FB_ATY_BACKLIGHT=y -# CONFIG_FB_S3 is not set -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_S3=m +# CONFIG_FB_SAVAGE is not set CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -# CONFIG_FB_3DFX_ACCEL is not set -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_CYBLA=m -CONFIG_FB_TRIDENT=m -# CONFIG_FB_TRIDENT_ACCEL is not set -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -CONFIG_FB_GEODE=y -CONFIG_FB_GEODE_LX=m -CONFIG_FB_GEODE_GX=m -# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set -CONFIG_FB_GEODE_GX1=m +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_CYBLA is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_GEODE is not set +CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CORGI=m -# CONFIG_BACKLIGHT_PROGEAR is not set +CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m # @@ -2814,7 +2854,7 @@ CONFIG_MDA_CONSOLE=m CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y @@ -2827,28 +2867,28 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_RTCTIMER=m @@ -2873,7 +2913,7 @@ CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m -# CONFIG_SND_PORTMAN2X4 is not set +CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AD1848_LIB=m CONFIG_SND_CS4231_LIB=m CONFIG_SND_SB_COMMON=m @@ -2912,11 +2952,11 @@ CONFIG_SND_SB8=m CONFIG_SND_SB16=m CONFIG_SND_SBAWE=m CONFIG_SND_SB16_CSP=y -CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL is not set CONFIG_SND_SGALAXY=m CONFIG_SND_SSCAPE=m CONFIG_SND_WAVEFRONT=m -CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL is not set # # PCI devices @@ -2980,9 +3020,9 @@ CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_KORG1212=m -CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MIXART=m CONFIG_SND_NM256=m CONFIG_SND_PCXHR=m @@ -2996,17 +3036,21 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 # +# SPI devices +# + +# # USB devices # CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set +CONFIG_SND_USB_CAIAQ_INPUT=y # # PCMCIA devices @@ -3031,18 +3075,18 @@ CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set -# CONFIG_HIDRAW is not set +CONFIG_HIDRAW=y # # USB Input Devices # CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT_POWERBOOK=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set CONFIG_HID_FF=y CONFIG_HID_PID=y CONFIG_LOGITECH_FF=y -# CONFIG_PANTHERLORD_FF is not set -CONFIG_THRUSTMASTER_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set CONFIG_ZEROPLUS_FF=y CONFIG_USB_HIDDEV=y CONFIG_USB_SUPPORT=y @@ -3056,27 +3100,28 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y # CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_ISP116X_HCD=y -CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y +CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=y +CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m @@ -3093,7 +3138,7 @@ CONFIG_USB_PRINTER=m # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y @@ -3112,7 +3157,7 @@ CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m -CONFIG_USB_MON=y +# CONFIG_USB_MON is not set # # USB port drivers @@ -3174,7 +3219,7 @@ CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_DEBUG=m +# CONFIG_USB_SERIAL_DEBUG is not set CONFIG_USB_EZUSB=y # @@ -3187,7 +3232,7 @@ CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m -# CONFIG_USB_BERRY_CHARGE is not set +CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m @@ -3199,10 +3244,10 @@ CONFIG_USB_IDMOUSE=m CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y +# CONFIG_USB_SISUSBVGA_CON is not set CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m -# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m # @@ -3217,7 +3262,33 @@ CONFIG_USB_XUSBATM=m # # USB Gadget Support # -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -3242,8 +3313,6 @@ CONFIG_LEDS_CLASS=m # # LED drivers # -CONFIG_LEDS_NET48XX=m -CONFIG_LEDS_WRAP=m # # LED Triggers @@ -3261,16 +3330,21 @@ CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_CM is not set +CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_ISER=m # CONFIG_EDAC is not set -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -3299,11 +3373,13 @@ CONFIG_RTC_DRV_M41T80_WDT=y # # SPI RTC drivers # +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m # # Platform RTC drivers # -# CONFIG_RTC_DRV_CMOS is not set +CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_DS1742=m @@ -3314,11 +3390,29 @@ CONFIG_RTC_DRV_V3020=m # # on-CPU RTC drivers # -# CONFIG_DMADEVICES is not set +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_DCA=m CONFIG_AUXDISPLAY=y -# CONFIG_KS0108 is not set +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 CONFIG_VIRTUALIZATION=y -# CONFIG_KVM is not set +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m # CONFIG_LGUEST is not set # @@ -3339,18 +3433,22 @@ CONFIG_DMIID=y # File systems # CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=y +CONFIG_EXT4DEV_FS=m CONFIG_EXT4DEV_FS_XATTR=y CONFIG_EXT4DEV_FS_POSIX_ACL=y CONFIG_EXT4DEV_FS_SECURITY=y CONFIG_JBD=y -CONFIG_JBD2=y +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +CONFIG_JBD2_DEBUG=y CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set @@ -3358,24 +3456,24 @@ CONFIG_REISERFS_FS=y CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=y +CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set +CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set -CONFIG_GFS2_FS=y +CONFIG_XFS_RT=y +CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m -CONFIG_OCFS2_FS=y +CONFIG_OCFS2_FS=m CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_MINIX_FS=y +# CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -3389,28 +3487,27 @@ CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m -CONFIG_GENERIC_ACL=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y +CONFIG_FAT_FS=m # CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=y +CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=y +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +CONFIG_NTFS_RW=y # # Pseudo filesystems @@ -3420,10 +3517,10 @@ CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=y +CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems @@ -3438,9 +3535,22 @@ CONFIG_BEFS_FS=m # CONFIG_BEFS_DEBUG is not set CONFIG_BFS_FS=m CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set CONFIG_CRAMFS=m -CONFIG_SQUASHFS=n -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 CONFIG_VXFS_FS=m CONFIG_HPFS_FS=m CONFIG_QNX4FS_FS=m @@ -3449,31 +3559,31 @@ CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_SPKM3=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set -CONFIG_CIFS_WEAK_PW_HASH=y +# CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set @@ -3490,7 +3600,7 @@ CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set -CONFIG_9P_FS=m +# CONFIG_9P_FS is not set # # Partition Types @@ -3506,16 +3616,17 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set # CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set -CONFIG_KARMA_PARTITION=y +# CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m @@ -3539,7 +3650,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -3552,13 +3663,10 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=y +CONFIG_NLS_UTF8=m CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set -CONFIG_INSTRUMENTATION=y -# CONFIG_PROFILING is not set -# CONFIG_KPROBES is not set -# CONFIG_MARKERS is not set +# CONFIG_INSTRUMENTATION is not set # # Kernel hacking @@ -3567,15 +3675,49 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_UNUSED_SYMBOLS=y -# CONFIG_DEBUG_FS is not set -CONFIG_HEADERS_CHECK=y -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y # CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_FRAME_POINTER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set + +# +# Page alloc debug is incompatible with Software Suspend on i386 +# +# CONFIG_DEBUG_RODATA is not set +# CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y CONFIG_DOUBLEFAULT=y @@ -3584,22 +3726,23 @@ CONFIG_DOUBLEFAULT=y # Security options # CONFIG_KEYS=y -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_FILE_CAPABILITIES=y +# CONFIG_SECURITY_FILE_CAPABILITIES is not set # CONFIG_SECURITY_ROOTPLUG is not set -CONFIG_XOR_BLOCKS=y -CONFIG_ASYNC_CORE=y -CONFIG_ASYNC_MEMCPY=y -CONFIG_ASYNC_XOR=y +# CONFIG_SECURITY_SELINUX is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y @@ -3614,7 +3757,7 @@ CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_XTS=m @@ -3637,7 +3780,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m @@ -3652,13 +3795,19 @@ CONFIG_CRYPTO_DEV_GEODE=m # CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m -CONFIG_CRC16=y +CONFIG_CRC16=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_CRC7=m -CONFIG_LIBCRC32C=y -CONFIG_ZLIB_INFLATE=y +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3668,3 +3817,5 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y + +CONFIG_SQUASHFS=n diff --git a/source/base-extra/kernel-fwlive/config.x86_64 b/source/base-extra/kernel-fwlive/config.x86_64 index 57c6af7..3880398 100644 --- a/source/base-extra/kernel-fwlive/config.x86_64 +++ b/source/base-extra/kernel-fwlive/config.x86_64 @@ -1,9 +1,8 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24 -# Mon Jan 21 15:11:36 2008 +# Linux kernel version: 2.6.24.3 +# Wed Feb 27 14:31:08 2008 # -# CONFIG_64BIT is not set CONFIG_64BIT=y # CONFIG_X86_32 is not set CONFIG_X86_64=y @@ -18,31 +17,27 @@ CONFIG_STACKTRACE_SUPPORT=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_MMU=y CONFIG_ZONE_DMA=y -CONFIG_QUICKLIST=y +# CONFIG_QUICKLIST is not set CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_DMI=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_ARCH_SUPPORTS_OPROFILE=y -# CONFIG_ZONE_DMA32 is not set +CONFIG_ZONE_DMA32=y CONFIG_ARCH_POPULATES_NODE_MAP=y -# CONFIG_AUDIT_ARCH is not set +CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_KTIME_SCALAR=y +# CONFIG_KTIME_SCALAR is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # @@ -52,7 +47,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -62,24 +57,27 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_TASKSTATS is not set # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set CONFIG_FAIR_GROUP_SCHED=y CONFIG_FAIR_USER_SCHED=y # CONFIG_FAIR_CGROUP_SCHED is not set # CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set +CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -104,15 +102,14 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y -CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_LSF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLOCK_COMPAT=y # # IO Schedulers @@ -126,13 +123,14 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y # # Processor type and features # -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y CONFIG_X86_PC=y @@ -145,10 +143,8 @@ CONFIG_X86_PC=y # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_ES7000 is not set # CONFIG_X86_VSMP is not set -CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -# CONFIG_PARAVIRT_GUEST is not set # CONFIG_M386 is not set -CONFIG_M486=y +# CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set @@ -159,7 +155,7 @@ CONFIG_M486=y # CONFIG_MPENTIUM4 is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set -# CONFIG_MK8 is not set +CONFIG_MK8=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set @@ -173,86 +169,71 @@ CONFIG_M486=y # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_GENERIC_CPU is not set -CONFIG_X86_GENERIC=y +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_X86_XADD=y -CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_NR_CPUS=32 +CONFIG_GART_IOMMU=y +# CONFIG_CALGARY_IOMMU is not set +CONFIG_SWIOTLB=y +CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y -CONFIG_X86_MCE_NONFATAL=m -# CONFIG_X86_MCE_P4THERMAL is not set -CONFIG_VM86=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y +# CONFIG_X86_MCE_INTEL is not set +CONFIG_X86_MCE_AMD=y CONFIG_MICROCODE=m CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y +# CONFIG_NUMA is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set +CONFIG_RESOURCES_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y -CONFIG_NR_QUICK=1 CONFIG_VIRT_TO_BUS=y -CONFIG_HIGHPTE=y -# CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y -# CONFIG_EFI is not set -CONFIG_IRQBALANCE=y CONFIG_SECCOMP=y +# CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -# CONFIG_KEXEC is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 +CONFIG_PHYSICAL_START=0x200000 # CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_PHYSICAL_ALIGN=0x200000 CONFIG_HOTPLUG_CPU=y -CONFIG_COMPAT_VDSO=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management options # +CONFIG_ARCH_HIBERNATION_HEADER=y CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set @@ -269,16 +250,16 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_PROCFS_POWER=y CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=y -CONFIG_ACPI_DOCK=y -# CONFIG_ACPI_BAY is not set -CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 @@ -287,15 +268,8 @@ CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set -CONFIG_APM=y -# CONFIG_APM_IGNORE_USER_SUSPEND is not set -# CONFIG_APM_DO_ENABLE is not set -# CONFIG_APM_CPU_IDLE is not set -# CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_ALLOW_INTS is not set -# CONFIG_APM_REAL_MODE_POWER_OFF is not set +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m # # CPU Frequency scaling @@ -304,7 +278,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set @@ -319,61 +293,41 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CPUFreq processor drivers # CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_POWERNOW_K6=m -CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y -CONFIG_X86_GX_SUSPMOD=m CONFIG_X86_SPEEDSTEP_CENTRINO=m -CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y -CONFIG_X86_SPEEDSTEP_ICH=m -CONFIG_X86_SPEEDSTEP_SMI=m CONFIG_X86_P4_CLOCKMOD=m -CONFIG_X86_CPUFREQ_NFORCE2=m -CONFIG_X86_LONGRUN=m -CONFIG_X86_LONGHAUL=m -# CONFIG_X86_E_POWERSAVER is not set # # shared options # # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set CONFIG_X86_SPEEDSTEP_LIB=m -CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y # CONFIG_CPU_IDLE is not set # # Bus options (PCI etc.) # CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y +# CONFIG_DMAR is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y -# CONFIG_PCI_MSI is not set +CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set CONFIG_HT_IRQ=y CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -CONFIG_SCx200=m -CONFIG_SCx200HR_TIMER=m CONFIG_K8_NB=y -CONFIG_PCCARD=m +CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m +CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y +# CONFIG_PCMCIA_IOCTL is not set CONFIG_CARDBUS=y # @@ -387,15 +341,9 @@ CONFIG_YENTA_ENE_TUNE=y CONFIG_YENTA_TOSHIBA=y CONFIG_PD6729=m CONFIG_I82092=m -CONFIG_I82365=m -CONFIG_TCIC=m -CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=m CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -# CONFIG_HOTPLUG_PCI_IBM is not set CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set @@ -405,8 +353,12 @@ CONFIG_HOTPLUG_PCI_SHPC=m # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=m +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y # # Networking @@ -434,7 +386,10 @@ CONFIG_IP_FIB_HASH=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y @@ -452,50 +407,39 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IP_VS=m -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m +# CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set +CONFIG_IPV6_MIP6=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m @@ -504,9 +448,10 @@ CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -519,8 +464,9 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK_ENABLED=m CONFIG_NF_CONNTRACK=m -# CONFIG_NF_CT_ACCT is not set -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set # CONFIG_NF_CONNTRACK_EVENTS is not set CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -531,24 +477,25 @@ CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m -# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_TRACE=m -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m @@ -611,7 +558,7 @@ CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m -# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m @@ -630,7 +577,7 @@ CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_AH=m -# CONFIG_IP6_NF_MATCH_MH is not set +CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_LOG=m @@ -640,6 +587,11 @@ CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m # +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# # Bridge: Netfilter Configuration # CONFIG_BRIDGE_NF_EBTABLES=m @@ -661,7 +613,7 @@ CONFIG_BRIDGE_EBT_MARK_T=m CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set # CONFIG_IP_DCCP is not set CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set @@ -679,23 +631,22 @@ CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -# CONFIG_DECNET is not set +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set CONFIG_LLC=y CONFIG_LLC2=m CONFIG_IPX=m # CONFIG_IPX_INTERN is not set CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m -CONFIG_LTPC=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y CONFIG_IPDDP=m CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y CONFIG_WAN_ROUTER=m CONFIG_NET_SCHED=y @@ -731,9 +682,15 @@ CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -# CONFIG_NET_EMATCH is not set +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m @@ -741,8 +698,8 @@ CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m # CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set +# CONFIG_NET_CLS_POLICE is not set +CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # @@ -755,7 +712,7 @@ CONFIG_HAMRADIO=y # Packet Radio protocols # CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set +CONFIG_AX25_DAMA_SLAVE=y CONFIG_NETROM=m CONFIG_ROSE=m @@ -765,13 +722,9 @@ CONFIG_ROSE=m CONFIG_MKISS=m CONFIG_6PACK=m CONFIG_BPQETHER=m -CONFIG_SCC=m -CONFIG_SCC_DELAY=y -CONFIG_SCC_TRXECHO=y CONFIG_BAYCOM_SER_FDX=m CONFIG_BAYCOM_SER_HDX=m CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m CONFIG_YAM=m CONFIG_IRDA=m @@ -832,7 +785,6 @@ CONFIG_USB_IRDA=m CONFIG_SIGMATEL_FIR=m CONFIG_NSC_FIR=m CONFIG_WINBOND_FIR=m -CONFIG_TOSHIBA_FIR=m CONFIG_SMC_IRCC_FIR=m CONFIG_ALI_FIR=m CONFIG_VLSI_FIR=m @@ -881,6 +833,7 @@ CONFIG_WIRELESS_EXT=y CONFIG_MAC80211=m CONFIG_MAC80211_RCSIMPLE=y CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set @@ -907,9 +860,138 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set CONFIG_CONNECTOR=m -# CONFIG_MTD is not set +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PNC2000=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_OTP=y +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +CONFIG_MTD_ONENAND_SIM=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -926,12 +1008,9 @@ CONFIG_PNP=y # # Protocols # -CONFIG_ISAPNP=y -# CONFIG_PNPBIOS is not set CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=y -CONFIG_BLK_DEV_XD=m CONFIG_PARIDE=m # @@ -948,7 +1027,6 @@ CONFIG_PARIDE_PG=m # CONFIG_PARIDE_ATEN=m CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m CONFIG_PARIDE_COMM=m CONFIG_PARIDE_DSTR=m CONFIG_PARIDE_FIT2=m @@ -968,10 +1046,10 @@ CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=y CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=y +CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 @@ -979,7 +1057,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_CDROM_PKTCDVD_WCACHE=y CONFIG_ATA_OVER_ETH=m CONFIG_MISC_DEVICES=y CONFIG_IBM_ASM=m @@ -988,10 +1066,11 @@ CONFIG_EEPROM_93CX6=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m -# CONFIG_ASUS_LAPTOP is not set +CONFIG_ASUS_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m CONFIG_MSI_LAPTOP=m -# CONFIG_SONY_LAPTOP is not set +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -1004,13 +1083,13 @@ CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_IDE_SATA is not set # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECS=m -# CONFIG_BLK_DEV_DELKIN is not set +CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEFLOPPY=y -CONFIG_BLK_DEV_IDESCSI=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_BLK_DEV_IDEACPI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_PROC_FS=y @@ -1018,10 +1097,11 @@ CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_PLATFORM=m -# CONFIG_BLK_DEV_CMD640 is not set -CONFIG_BLK_DEV_IDEPNP=y +CONFIG_IDE_GENERIC=m +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_CMD640=y +CONFIG_BLK_DEV_CMD640_ENHANCED=y +# CONFIG_BLK_DEV_IDEPNP is not set # # PCI IDE chipsets support @@ -1030,8 +1110,8 @@ CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_IDEPCI_PCIBUS_ORDER=y # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_GENERIC is not set +CONFIG_BLK_DEV_OPTI621=y CONFIG_BLK_DEV_RZ1000=y CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=y @@ -1044,16 +1124,15 @@ CONFIG_BLK_DEV_TRIFLEX=y CONFIG_BLK_DEV_CY82C693=y CONFIG_BLK_DEV_CS5520=y CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=y CONFIG_BLK_DEV_HPT34X=y # CONFIG_HPT34X_AUTODMA is not set CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_JMICRON=y CONFIG_BLK_DEV_SC1200=y -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_PIIX is not set +CONFIG_BLK_DEV_IT8213=y CONFIG_BLK_DEV_IT821X=y -# CONFIG_BLK_DEV_NS87415 is not set +CONFIG_BLK_DEV_NS87415=m CONFIG_BLK_DEV_PDC202XX_OLD=y CONFIG_PDC202XX_BURST=y CONFIG_BLK_DEV_PDC202XX_NEW=y @@ -1061,24 +1140,10 @@ CONFIG_BLK_DEV_SVWKS=y CONFIG_BLK_DEV_SIIMAGE=y CONFIG_BLK_DEV_SIS5513=y CONFIG_BLK_DEV_SLC90E66=y -CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_TRM290=y CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_BLK_DEV_TC86C001 is not set +CONFIG_BLK_DEV_TC86C001=y # CONFIG_IDE_ARM is not set - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -CONFIG_BLK_DEV_4DRIVES=y -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m CONFIG_BLK_DEV_IDEDMA=y CONFIG_IDE_ARCH_OBSOLETE_INIT=y # CONFIG_BLK_DEV_HD is not set @@ -1089,7 +1154,7 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=y +CONFIG_SCSI_TGT=m CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y @@ -1097,7 +1162,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y +CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y @@ -1107,34 +1172,31 @@ CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports # CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_FC_ATTRS=y +CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_FC_TGT_ATTRS=y -CONFIG_SCSI_ISCSI_ATTRS=y -CONFIG_SCSI_SAS_ATTRS=y -CONFIG_SCSI_SAS_LIBSAS=y -# CONFIG_SCSI_SAS_ATA is not set -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_LIBSAS_DEBUG=y CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=y -CONFIG_BLK_DEV_3W_XXXX_RAID=y -CONFIG_SCSI_3W_9XXX=y -CONFIG_SCSI_7000FASST=y -CONFIG_SCSI_ACARD=y -CONFIG_SCSI_AHA152X=y -CONFIG_SCSI_AHA1542=y -CONFIG_SCSI_AACRAID=y +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=y CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 @@ -1142,91 +1204,70 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000 CONFIG_AIC7XXX_DEBUG_MASK=0 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set CONFIG_SCSI_AIC7XXX_OLD=m -CONFIG_SCSI_AIC79XX=y +CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=4 CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -CONFIG_SCSI_AIC94XX=y +CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_DPT_I2O=y CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_IN2000=y CONFIG_SCSI_ARCMSR=m -# CONFIG_SCSI_ARCMSR_AER is not set +CONFIG_SCSI_ARCMSR_AER=y CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=y -CONFIG_MEGARAID_MAILBOX=y -CONFIG_MEGARAID_LEGACY=y -CONFIG_MEGARAID_SAS=y -CONFIG_SCSI_HPTIOP=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=y # CONFIG_SCSI_OMIT_FLASHPOINT is not set -CONFIG_SCSI_DMX3191D=y -CONFIG_SCSI_DTC3280=y -CONFIG_SCSI_EATA=y +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=y -CONFIG_SCSI_GDTH=y -CONFIG_SCSI_GENERIC_NCR5380=m -CONFIG_SCSI_GENERIC_NCR5380_MMIO=y -CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m CONFIG_SCSI_IPS=y -CONFIG_SCSI_INITIO=y -CONFIG_SCSI_INIA100=y +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_NCR53C406A=m -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=y +CONFIG_SCSI_STEX=y +CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=y +CONFIG_SCSI_IPR=m # CONFIG_SCSI_IPR_TRACE is not set # CONFIG_SCSI_IPR_DUMP is not set -CONFIG_SCSI_PAS16=m -CONFIG_SCSI_PSI240I=y -CONFIG_SCSI_QLOGIC_FAS=y -CONFIG_SCSI_QLOGIC_1280=y -CONFIG_SCSI_QLA_FC=y -CONFIG_SCSI_QLA_ISCSI=y -CONFIG_SCSI_LPFC=y -CONFIG_SCSI_SEAGATE=y -CONFIG_SCSI_SYM53C416=y -CONFIG_SCSI_DC395x=y -CONFIG_SCSI_DC390T=y -CONFIG_SCSI_T128=y -CONFIG_SCSI_U14_34F=m -# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set -# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set -CONFIG_SCSI_U14_34F_MAX_TAGS=8 -CONFIG_SCSI_ULTRASTOR=m -CONFIG_SCSI_NSP32=y +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_SRP=y +CONFIG_SCSI_SRP=m CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y CONFIG_SATA_AHCI=y -CONFIG_SATA_SVW=y +CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=y -CONFIG_SATA_MV=y +CONFIG_SATA_MV=m CONFIG_SATA_NV=y -CONFIG_PDC_ADMA=y -CONFIG_SATA_QSTOR=y +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m CONFIG_SATA_PROMISE=y CONFIG_SATA_SX4=y CONFIG_SATA_SIL=y @@ -1235,7 +1276,7 @@ CONFIG_SATA_SIS=y CONFIG_SATA_ULI=y CONFIG_SATA_VIA=y CONFIG_SATA_VITESSE=y -# CONFIG_SATA_INIC162X is not set +CONFIG_SATA_INIC162X=m CONFIG_PATA_ACPI=m CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m @@ -1245,8 +1286,6 @@ CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -CONFIG_PATA_CS5536=m CONFIG_PATA_CYPRESS=m CONFIG_PATA_EFAR=m CONFIG_ATA_GENERIC=m @@ -1255,11 +1294,9 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_HPT3X2N=m CONFIG_PATA_HPT3X3=m CONFIG_PATA_HPT3X3_DMA=y -CONFIG_PATA_ISAPNP=m CONFIG_PATA_IT821X=m -# CONFIG_PATA_IT8213 is not set -CONFIG_PATA_JMICRON=m -CONFIG_PATA_LEGACY=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=y CONFIG_PATA_TRIFLEX=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPIIX=m @@ -1271,7 +1308,6 @@ CONFIG_PATA_OPTI=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_PCMCIA=m CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_QDI=m CONFIG_PATA_RADISYS=m CONFIG_PATA_RZ1000=m CONFIG_PATA_SC1200=m @@ -1281,33 +1317,29 @@ CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=y CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m -CONFIG_PATA_WINBOND_VLB=m CONFIG_MD=y CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y -CONFIG_MD_RAID10=y -CONFIG_MD_RAID456=y +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m CONFIG_MD_RAID5_RESHAPE=y -CONFIG_MD_MULTIPATH=y +CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=y -CONFIG_DM_SNAPSHOT=y -CONFIG_DM_MIRROR=y -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set CONFIG_FUSION=y -CONFIG_FUSION_SPI=y -CONFIG_FUSION_FC=y -CONFIG_FUSION_SAS=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m @@ -1329,31 +1361,32 @@ CONFIG_IEEE1394=y # # Controllers # -CONFIG_IEEE1394_PCILYNX=y -CONFIG_IEEE1394_OHCI1394=y +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m # # Protocols # CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=y +CONFIG_IEEE1394_SBP2=m # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m -CONFIG_I2O=y +CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_CONFIG=y -# CONFIG_I2O_CONFIG_OLD_IOCTL is not set -CONFIG_I2O_BUS=y -CONFIG_I2O_BLOCK=y -CONFIG_I2O_SCSI=y -CONFIG_I2O_PROC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y -# CONFIG_NETDEVICES_MULTIQUEUE is not set +CONFIG_NETDEVICES_MULTIQUEUE=y CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m @@ -1371,7 +1404,6 @@ CONFIG_ARCNET_COM90xx=m CONFIG_ARCNET_COM90xxIO=m CONFIG_ARCNET_RIM_I=m CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_ISA=m CONFIG_ARCNET_COM20020_PCI=m CONFIG_PHYLIB=m @@ -1399,22 +1431,8 @@ CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m CONFIG_CASSINI=m CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m -CONFIG_EL2=m -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_EL3=m -CONFIG_3C515=m CONFIG_VORTEX=m CONFIG_TYPHOON=m -CONFIG_LANCE=m -CONFIG_NET_VENDOR_SMC=y -CONFIG_WD80x3=m -CONFIG_ULTRA=m -CONFIG_SMC9194=m -CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI52=m -CONFIG_NI65=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1426,41 +1444,24 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m -CONFIG_AT1700=m -CONFIG_DEPCA=m CONFIG_HP100=m -CONFIG_NET_ISA=y -CONFIG_E2100=m -CONFIG_EWRK3=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m -CONFIG_LP486E=m -CONFIG_ETH16I=m -CONFIG_NE2000=m -CONFIG_ZNET=m -CONFIG_SEEQ8005=m # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set # CONFIG_IBM_NEW_EMAC_EMAC4 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m -CONFIG_PCNET32_NAPI=y +# CONFIG_PCNET32_NAPI is not set CONFIG_AMD8111_ETH=m # CONFIG_AMD8111E_NAPI is not set CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y -CONFIG_AC3200=m -CONFIG_APRICOT=m CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y CONFIG_FORCEDETH=m -CONFIG_FORCEDETH_NAPI=y -CONFIG_CS89x0=m +# CONFIG_FORCEDETH_NAPI is not set CONFIG_EEPRO100=m CONFIG_E100=m CONFIG_FEALNX=m @@ -1476,11 +1477,10 @@ CONFIG_SIS900=m CONFIG_EPIC100=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -CONFIG_VIA_RHINE_NAPI=y -# CONFIG_SC92031 is not set +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m @@ -1499,26 +1499,28 @@ CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m # CONFIG_R8169_NAPI is not set -CONFIG_R8169_VLAN=y +# CONFIG_R8169_VLAN is not set CONFIG_SIS190=m CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set CONFIG_SK98LIN=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m -# CONFIG_ATL1 is not set +CONFIG_ATL1=m CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m -# CONFIG_S2IO_NAPI is not set +CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m @@ -1526,21 +1528,19 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_TEHUTI=m CONFIG_TR=y -CONFIG_IBMTR=m CONFIG_IBMOL=m -CONFIG_IBMLS=m CONFIG_3C359=m CONFIG_TMS380TR=m CONFIG_TMSPCI=m -CONFIG_SKISA=m -CONFIG_PROTEON=m CONFIG_ABYSS=m -CONFIG_SMCTR=m # # Wireless LAN # -# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_PRE80211=y +CONFIG_STRIP=m +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_IPW2100=m @@ -1548,8 +1548,8 @@ CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y +# CONFIG_IPW2200_RADIOTAP is not set +# CONFIG_IPW2200_PROMISCUOUS is not set CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBERTAS=m @@ -1578,15 +1578,14 @@ CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m CONFIG_IWLWIFI=y -# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWLWIFI_SENSITIVITY=y CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y CONFIG_IWLWIFI_QOS=y CONFIG_IWL4965=m CONFIG_IWL3945=m CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE is not set CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m @@ -1612,7 +1611,7 @@ CONFIG_B43_DMA_AND_PIO_MODE=y CONFIG_B43LEGACY=m CONFIG_B43LEGACY_PCI_AUTOSELECT=y CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -1646,7 +1645,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -1658,7 +1657,7 @@ CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y # CONFIG_USB_EPSON2888 is not set -# CONFIG_USB_KC2190 is not set +CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m @@ -1670,26 +1669,19 @@ CONFIG_PCMCIA_SMC91C92=m CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m CONFIG_ARCNET_COM20020_CS=m -CONFIG_PCMCIA_IBMTR=m CONFIG_WAN=y -CONFIG_HOSTESS_SV11=m -CONFIG_COSA=m CONFIG_LANMEDIA=m -CONFIG_SEALEVEL_4021=m CONFIG_HDLC=m CONFIG_HDLC_RAW=m CONFIG_HDLC_RAW_ETH=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m CONFIG_HDLC_PPP=m - -# -# X.25/LAPB support is disabled -# +CONFIG_HDLC_X25=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_PC300=m -# CONFIG_PC300_MLPPP is not set +CONFIG_PC300_MLPPP=y # # Cyclades-PC300 MLPPP support is disabled. @@ -1698,23 +1690,22 @@ CONFIG_PC300=m # # Refer to the file README.mlppp, provided by PC300 package. # -# CONFIG_PC300TOO is not set -CONFIG_N2=m -CONFIG_C101=m +CONFIG_PC300TOO=m CONFIG_FARSYNC=m CONFIG_DSCC4=m # CONFIG_DSCC4_PCISYNC is not set # CONFIG_DSCC4_PCI_RST is not set CONFIG_DLCI=m CONFIG_DLCI_MAX=8 -CONFIG_SDLA=m CONFIG_WAN_ROUTER_DRIVERS=m CONFIG_CYCLADES_SYNC=m CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m +# CONFIG_ATM_DUMMY is not set CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m @@ -1723,9 +1714,6 @@ CONFIG_ATM_ENI=m CONFIG_ATM_FIRESTREAM=m CONFIG_ATM_ZATM=m # CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set CONFIG_ATM_IDT77252=m # CONFIG_ATM_IDT77252_DEBUG is not set # CONFIG_ATM_IDT77252_RCV_ALL is not set @@ -1734,8 +1722,6 @@ CONFIG_ATM_AMBASSADOR=m # CONFIG_ATM_AMBASSADOR_DEBUG is not set CONFIG_ATM_HORIZON=m # CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set CONFIG_ATM_FORE200E_MAYBE=m # CONFIG_ATM_FORE200E_PCA is not set CONFIG_ATM_HE=m @@ -1769,124 +1755,24 @@ CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set +CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_ISDN=m -CONFIG_ISDN_I4L=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -CONFIG_HISAX_NO_SENDCOMPLETE=y -CONFIG_HISAX_NO_LLC=y -CONFIG_HISAX_NO_KEYPAD=y -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_0=y -CONFIG_HISAX_16_3=y -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_AVM_A1=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_IX1MICROR2=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_ASUSCOM=y -CONFIG_HISAX_TELEINT=y -CONFIG_HISAX_HFCS=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_SPORTSTER=y -CONFIG_HISAX_MIC=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_ISURF=y -CONFIG_HISAX_HSTSAPHIR=y -CONFIG_HISAX_BKM_A4T=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_W6692=y -CONFIG_HISAX_HFC_SX=y -CONFIG_HISAX_ENTERNOW_PCI=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_TELES_CS=m - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_HISAX_HDLC=y - -# -# Active cards -# -CONFIG_ISDN_DRV_ICN=m -CONFIG_ISDN_DRV_PCBIT=m -CONFIG_ISDN_DRV_SC=m -CONFIG_ISDN_DRV_ACT2000=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -# CONFIG_GIGASET_M101 is not set -# CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_UNDOCREQ is not set +# CONFIG_ISDN_I4L is not set CONFIG_ISDN_CAPI=m CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_CAPI_TRACE=y +# CONFIG_CAPI_TRACE is not set CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y CONFIG_ISDN_CAPI_CAPIFS=m -CONFIG_ISDN_CAPI_CAPIDRV=m # # CAPI hardware drivers # CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1ISA=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_T1ISA=m CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m CONFIG_ISDN_DRV_AVMB1_AVM_CS=m CONFIG_ISDN_DRV_AVMB1_T1PCI=m @@ -1925,25 +1811,21 @@ CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_TOUCHKIT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_INPORT=m -CONFIG_MOUSE_ATIXL=y -CONFIG_MOUSE_LOGIBM=m -CONFIG_MOUSE_PC110PAD=m CONFIG_MOUSE_VSXXXAA=m CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_ANALOG=m @@ -1969,7 +1851,7 @@ CONFIG_JOYSTICK_TWIDJOY=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_JOYDUMP=m +# CONFIG_JOYSTICK_JOYDUMP is not set CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y @@ -1980,6 +1862,7 @@ CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -2003,8 +1886,7 @@ CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_WISTRON_BTNS=m -# CONFIG_INPUT_ATLAS_BTNS is not set +CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m @@ -2022,7 +1904,7 @@ CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PCIPS2=m CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m +# CONFIG_SERIO_RAW is not set CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -2035,14 +1917,13 @@ CONFIG_GAMEPORT_FM801=m CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_SERIAL_NONSTANDARD=y CONFIG_COMPUTONE=m CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set CONFIG_DIGIEPCA=m -CONFIG_ESPSERIAL=m CONFIG_MOXA_INTELLIO=m CONFIG_MOXA_SMARTIO=m CONFIG_MOXA_SMARTIO_NEW=m @@ -2052,7 +1933,7 @@ CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m CONFIG_SPECIALIX=m -# CONFIG_SPECIALIX_RTSCTS is not set +CONFIG_SPECIALIX_RTSCTS=y CONFIG_SX=m CONFIG_RIO=m # CONFIG_RIO_OLDPCI is not set @@ -2071,11 +1952,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_FOURPORT=m -CONFIG_SERIAL_8250_ACCENT=m -CONFIG_SERIAL_8250_BOCA=m -CONFIG_SERIAL_8250_EXAR_ST16C554=m -CONFIG_SERIAL_8250_HUB6=m CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y @@ -2101,14 +1977,12 @@ CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_GEODE=m -CONFIG_HW_RANDOM_VIA=m CONFIG_NVRAM=m -CONFIG_RTC=y -CONFIG_DTLK=m +CONFIG_RTC=m +CONFIG_GEN_RTC=y +CONFIG_GEN_RTC_X=y CONFIG_R3964=m CONFIG_APPLICOM=m -CONFIG_SONYPI=m # # PCMCIA character devices @@ -2117,28 +1991,28 @@ CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set -# CONFIG_HPET is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m -# CONFIG_TCG_TIS is not set -# CONFIG_TCG_NSC is not set +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m -# CONFIG_TCG_INFINEON is not set +CONFIG_TCG_INFINEON=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y -CONFIG_I2C=y +CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m # # I2C Algorithms # -CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m @@ -2161,20 +2035,15 @@ CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m CONFIG_I2C_SIMTEC=m -CONFIG_SCx200_I2C=m -CONFIG_SCx200_I2C_SCL=12 -CONFIG_SCx200_I2C_SDA=13 -CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_STUB=m +# CONFIG_I2C_STUB is not set CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_VOODOO3=m -CONFIG_I2C_PCA_ISA=m # # Miscellaneous I2C Chip support @@ -2196,8 +2065,23 @@ CONFIG_SENSORS_TSL2550=m # # SPI support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m CONFIG_W1=m CONFIG_W1_CON=y @@ -2214,13 +2098,13 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m -CONFIG_W1_SLAVE_DS2433_CRC=y +# CONFIG_W1_SLAVE_DS2433_CRC is not set CONFIG_W1_SLAVE_DS2760=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set +CONFIG_PDA_POWER=m CONFIG_BATTERY_DS2760=m -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m @@ -2228,7 +2112,7 @@ CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m -# CONFIG_SENSORS_ADM1029 is not set +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_ADT7470=m @@ -2249,6 +2133,7 @@ CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m CONFIG_SENSORS_LM78=m @@ -2303,11 +2188,9 @@ CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_IT8712F_WDT=m CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m CONFIG_PC87413_WDT=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m -CONFIG_SBC7240_WDT=m CONFIG_CPU5_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_W83627HF_WDT=m @@ -2318,14 +2201,6 @@ CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m # -# ISA-based Watchdog Cards -# -CONFIG_PCWATCHDOG=m -CONFIG_MIXCOMWD=m -CONFIG_WDT=m -# CONFIG_WDT_501 is not set - -# # PCI-based Watchdog Cards # CONFIG_PCIPCWATCHDOG=m @@ -2353,7 +2228,7 @@ CONFIG_SSB_DRIVER_PCICORE=y # # Multifunction device drivers # -# CONFIG_MFD_SM501 is not set +CONFIG_MFD_SM501=m # # Multimedia devices @@ -2364,15 +2239,7 @@ CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set - -# -# Encoders/decoders and other helper chips -# - -# -# Audio decoders -# +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TVAUDIO=m CONFIG_VIDEO_TDA7432=m CONFIG_VIDEO_TDA9840=m @@ -2381,56 +2248,31 @@ CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m - -# -# Video decoders -# CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_TCM825X=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA7111=m CONFIG_VIDEO_SAA7114=m CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m - -# -# Video improvement chips -# CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_VIVI=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_PMS=m CONFIG_VIDEO_BWQCAM=m CONFIG_VIDEO_CQCAM=m CONFIG_VIDEO_W9966=m @@ -2450,15 +2292,16 @@ CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m CONFIG_VIDEO_SAA7134=m -# CONFIG_VIDEO_SAA7134_ALSA is not set +CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m -# CONFIG_VIDEO_CX88_ALSA is not set +CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m @@ -2470,8 +2313,7 @@ CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_29XXX=y CONFIG_VIDEO_PVRUSB2_24XXX=y -CONFIG_VIDEO_PVRUSB2_SYSFS=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +# CONFIG_VIDEO_PVRUSB2_SYSFS is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_USBVIDEO=m @@ -2491,24 +2333,12 @@ CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_ZR364XX=m CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_CADET=m -CONFIG_RADIO_RTRACK=m -CONFIG_RADIO_RTRACK2=m -CONFIG_RADIO_AZTECH=m -CONFIG_RADIO_GEMTEK=m CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m -CONFIG_RADIO_SF16FMI=m -CONFIG_RADIO_SF16FMR2=m -CONFIG_RADIO_TERRATEC=m -CONFIG_RADIO_TRUST=m -CONFIG_RADIO_TYPHOON=m -CONFIG_RADIO_TYPHOON_PROC_FS=y -CONFIG_RADIO_ZOLTRIX=m CONFIG_USB_DSBR=m CONFIG_DVB_CORE=m -# CONFIG_DVB_CORE_ATTACH is not set +CONFIG_DVB_CORE_ATTACH=y CONFIG_DVB_CAPTURE_DRIVERS=y # @@ -2518,7 +2348,7 @@ CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m -# CONFIG_DVB_BUDGET_AV is not set +CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_BUDGET_PATCH=m # @@ -2533,9 +2363,9 @@ CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_USB_DIB0700=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_CXUSB=m -# CONFIG_DVB_USB_M920X is not set -# CONFIG_DVB_USB_GL861 is not set -# CONFIG_DVB_USB_AU6610 is not set +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_VP7045=m CONFIG_DVB_USB_VP702X=m @@ -2549,11 +2379,7 @@ CONFIG_DVB_USB_AF9005_REMOTE=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_CINERGYT2=m -CONFIG_DVB_CINERGYT2_TUNING=y -CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 -CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 -CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 -# CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE is not set +# CONFIG_DVB_CINERGYT2_TUNING is not set # # Supported FlexCopII (B2C2) Adapters @@ -2580,7 +2406,7 @@ CONFIG_DVB_PLUTO2=m # # Customise DVB Frontends # -CONFIG_DVB_FE_CUSTOMISE=y +# CONFIG_DVB_FE_CUSTOMISE is not set # # DVB-S (satellite) frontends @@ -2670,17 +2496,11 @@ CONFIG_USB_DABUSB=m # # Graphics support # -CONFIG_AGP=m -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m +CONFIG_AGP=y +CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=m -CONFIG_AGP_NVIDIA=m CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m CONFIG_DRM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m @@ -2692,8 +2512,8 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_VGASTATE=y +CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -2715,40 +2535,29 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -# CONFIG_FB_PM2_FIFO_DISCONNECT is not set -CONFIG_FB_CYBER2000=m -CONFIG_FB_ARC=m +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m +CONFIG_FB_VGA16=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y # CONFIG_FB_EFI is not set -CONFIG_FB_HECUBA=m -CONFIG_FB_HGA=m -# CONFIG_FB_HGA_ACCEL is not set -CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y +# CONFIG_FB_HECUBA is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m CONFIG_FB_INTEL=m # CONFIG_FB_INTEL_DEBUG is not set CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m @@ -2760,39 +2569,31 @@ CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set CONFIG_FB_ATY_BACKLIGHT=y -# CONFIG_FB_S3 is not set -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_S3=m +# CONFIG_FB_SAVAGE is not set CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -# CONFIG_FB_3DFX_ACCEL is not set -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_CYBLA=m -CONFIG_FB_TRIDENT=m -# CONFIG_FB_TRIDENT_ACCEL is not set -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -CONFIG_FB_GEODE=y -CONFIG_FB_GEODE_LX=m -CONFIG_FB_GEODE_GX=m -# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set -CONFIG_FB_GEODE_GX1=m +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_GEODE is not set +CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CORGI=m -# CONFIG_BACKLIGHT_PROGEAR is not set +CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m # @@ -2811,11 +2612,10 @@ CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_VIDEO_SELECT=y -CONFIG_MDA_CONSOLE=m CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y @@ -2827,29 +2627,26 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_RTCTIMER=m @@ -2865,7 +2662,6 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL4_LIB=m CONFIG_SND_VX_LIB=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_DUMMY=m @@ -2874,52 +2670,11 @@ CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m -# CONFIG_SND_PORTMAN2X4 is not set -CONFIG_SND_AD1848_LIB=m -CONFIG_SND_CS4231_LIB=m +CONFIG_SND_PORTMAN2X4=m CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB8_DSP=m CONFIG_SND_SB16_DSP=m # -# ISA devices -# -CONFIG_SND_ADLIB=m -CONFIG_SND_AD1816A=m -CONFIG_SND_AD1848=m -CONFIG_SND_ALS100=m -CONFIG_SND_AZT2320=m -CONFIG_SND_CMI8330=m -CONFIG_SND_CS4231=m -CONFIG_SND_CS4232=m -CONFIG_SND_CS4236=m -CONFIG_SND_DT019X=m -CONFIG_SND_ES968=m -CONFIG_SND_ES1688=m -CONFIG_SND_ES18XX=m -CONFIG_SND_SC6000=m -CONFIG_SND_GUS_SYNTH=m -CONFIG_SND_GUSCLASSIC=m -CONFIG_SND_GUSEXTREME=m -CONFIG_SND_GUSMAX=m -CONFIG_SND_INTERWAVE=m -CONFIG_SND_INTERWAVE_STB=m -CONFIG_SND_OPL3SA2=m -CONFIG_SND_OPTI92X_AD1848=m -CONFIG_SND_OPTI92X_CS4231=m -CONFIG_SND_OPTI93X=m -CONFIG_SND_MIRO=m -CONFIG_SND_SB8=m -CONFIG_SND_SB16=m -CONFIG_SND_SBAWE=m -CONFIG_SND_SB16_CSP=y -CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL=y -CONFIG_SND_SGALAXY=m -CONFIG_SND_SSCAPE=m -CONFIG_SND_WAVEFRONT=m -CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y - -# # PCI devices # CONFIG_SND_AD1889=m @@ -2940,7 +2695,6 @@ CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2981,9 +2735,9 @@ CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_KORG1212=m -CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MIXART=m CONFIG_SND_NM256=m CONFIG_SND_PCXHR=m @@ -2997,17 +2751,21 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 # +# SPI devices +# + +# # USB devices # CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set +CONFIG_SND_USB_CAIAQ_INPUT=y # # PCMCIA devices @@ -3032,18 +2790,18 @@ CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set -# CONFIG_HIDRAW is not set +CONFIG_HIDRAW=y # # USB Input Devices # CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT_POWERBOOK=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set CONFIG_HID_FF=y CONFIG_HID_PID=y CONFIG_LOGITECH_FF=y -# CONFIG_PANTHERLORD_FF is not set -CONFIG_THRUSTMASTER_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set CONFIG_ZEROPLUS_FF=y CONFIG_USB_HIDDEV=y CONFIG_USB_SUPPORT=y @@ -3057,27 +2815,28 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y # CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_ISP116X_HCD=y -CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y +CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=y +CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m @@ -3094,7 +2853,7 @@ CONFIG_USB_PRINTER=m # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y @@ -3113,7 +2872,7 @@ CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m -CONFIG_USB_MON=y +# CONFIG_USB_MON is not set # # USB port drivers @@ -3175,7 +2934,7 @@ CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_DEBUG=m +# CONFIG_USB_SERIAL_DEBUG is not set CONFIG_USB_EZUSB=y # @@ -3188,7 +2947,7 @@ CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m -# CONFIG_USB_BERRY_CHARGE is not set +CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m @@ -3200,10 +2959,10 @@ CONFIG_USB_IDMOUSE=m CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y +# CONFIG_USB_SISUSBVGA_CON is not set CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m -# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m # @@ -3218,7 +2977,33 @@ CONFIG_USB_XUSBATM=m # # USB Gadget Support # -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -3237,14 +3022,13 @@ CONFIG_MMC_SDHCI=m CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SPI=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m # # LED drivers # -CONFIG_LEDS_NET48XX=m -CONFIG_LEDS_WRAP=m # # LED Triggers @@ -3260,18 +3044,24 @@ CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_CM is not set +CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_ISER=m # CONFIG_EDAC is not set -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -3300,11 +3090,13 @@ CONFIG_RTC_DRV_M41T80_WDT=y # # SPI RTC drivers # +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m # # Platform RTC drivers # -# CONFIG_RTC_DRV_CMOS is not set +CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_DS1742=m @@ -3315,12 +3107,29 @@ CONFIG_RTC_DRV_V3020=m # # on-CPU RTC drivers # -# CONFIG_DMADEVICES is not set +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_DCA=m CONFIG_AUXDISPLAY=y -# CONFIG_KS0108 is not set +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 CONFIG_VIRTUALIZATION=y -# CONFIG_KVM is not set -# CONFIG_LGUEST is not set +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m # # Userspace I/O @@ -3340,18 +3149,22 @@ CONFIG_DMIID=y # File systems # CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=y +CONFIG_EXT4DEV_FS=m CONFIG_EXT4DEV_FS_XATTR=y CONFIG_EXT4DEV_FS_POSIX_ACL=y CONFIG_EXT4DEV_FS_SECURITY=y CONFIG_JBD=y -CONFIG_JBD2=y +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +CONFIG_JBD2_DEBUG=y CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set @@ -3359,24 +3172,24 @@ CONFIG_REISERFS_FS=y CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=y +CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set +CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set -CONFIG_GFS2_FS=y +CONFIG_XFS_RT=y +CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m -CONFIG_OCFS2_FS=y +CONFIG_OCFS2_FS=m CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_MINIX_FS=y +# CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -3390,28 +3203,27 @@ CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m -CONFIG_GENERIC_ACL=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y +CONFIG_FAT_FS=m # CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=y +CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=y +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +CONFIG_NTFS_RW=y # # Pseudo filesystems @@ -3421,10 +3233,10 @@ CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=y +CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems @@ -3439,9 +3251,22 @@ CONFIG_BEFS_FS=m # CONFIG_BEFS_DEBUG is not set CONFIG_BFS_FS=m CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set CONFIG_CRAMFS=m -CONFIG_SQUASHFS=n -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 CONFIG_VXFS_FS=m CONFIG_HPFS_FS=m CONFIG_QNX4FS_FS=m @@ -3450,31 +3275,31 @@ CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_SPKM3=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set -CONFIG_CIFS_WEAK_PW_HASH=y +# CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set @@ -3491,7 +3316,7 @@ CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set -CONFIG_9P_FS=m +# CONFIG_9P_FS is not set # # Partition Types @@ -3507,16 +3332,17 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set # CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set -CONFIG_KARMA_PARTITION=y +# CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m @@ -3540,7 +3366,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -3553,13 +3379,10 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=y +CONFIG_NLS_UTF8=m CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set -CONFIG_INSTRUMENTATION=y -# CONFIG_PROFILING is not set -# CONFIG_KPROBES is not set -# CONFIG_MARKERS is not set +# CONFIG_INSTRUMENTATION is not set # # Kernel hacking @@ -3568,39 +3391,66 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set CONFIG_UNUSED_SYMBOLS=y -# CONFIG_DEBUG_FS is not set -CONFIG_HEADERS_CHECK=y -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y # CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_FRAME_POINTER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set CONFIG_EARLY_PRINTK=y -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y -CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_IOMMU_DEBUG is not set # # Security options # CONFIG_KEYS=y -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_CAPABILITIES=y -CONFIG_SECURITY_FILE_CAPABILITIES=y +# CONFIG_SECURITY_FILE_CAPABILITIES is not set # CONFIG_SECURITY_ROOTPLUG is not set -CONFIG_XOR_BLOCKS=y -CONFIG_ASYNC_CORE=y -CONFIG_ASYNC_MEMCPY=y -CONFIG_ASYNC_XOR=y +# CONFIG_SECURITY_SELINUX is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y @@ -3615,7 +3465,7 @@ CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_XTS=m @@ -3625,10 +3475,10 @@ CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_586=m +CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_TEA=m @@ -3638,28 +3488,29 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_GEODE=m # # Library routines # CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m -CONFIG_CRC16=y +CONFIG_CRC16=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_CRC7=m -CONFIG_LIBCRC32C=y -CONFIG_ZLIB_INFLATE=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3669,3 +3520,5 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y + +CONFIG_SQUASHFS=n From vmiklos at frugalware.org Sat Mar 1 14:43:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 14:43:54 2008 Subject: [Frugalware-git] homepage-ng: Newsletter issue 17 Message-ID: <20080301134351.B7C1A1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b93e6ebe018bf918941d80000ae020e84600ed74 commit b93e6ebe018bf918941d80000ae020e84600ed74 Author: Russell Dickenson Date: Sat Mar 1 22:34:46 2008 +1000 Newsletter issue 17 diff --git a/frugalware/weeklynews/issue17.html b/frugalware/weeklynews/issue17.html new file mode 100755 index 0000000..397add4 --- /dev/null +++ b/frugalware/weeklynews/issue17.html @@ -0,0 +1,144 @@ +

Table of Contents

+ + + +

Welcome

+

+ The newsletter's aim is to keep you up to date with what's happened recently in the world of the Linux distribution 'Frugalware'. +

+

+ Features of this issue include: +

    +
  • Kalgan is nearly here!
    • +
  • Memory donation - if I recall correctly :)
    • +
  • Frugalware's developers are people too!
    • +
  • Tip - Free some space on your hard drive
    • +
+

+ + +

Events

+

+ Here's a selection of events which have occurred since the previous newsletter: +

+
    +
  • +

    Kalgan is nearly here!

    +

    Frugalware 0.8 - code-named "Kalgan" - is scheduled to be released on 11 March 2008. If you're "geek" enough you'll set up a cron job to download the ISO(s) as soon they are sync-ed to your prefered mirror.

    +
    • +
  • +

    Memory donation - if I recall correctly :)

    +

    Sebastien Mazzucco ('pizux') recently donated two lots of 512 MB RAM which will be used in the build servers. Many thanks to Sebastien for his kind donation. One of the build servers may be renamed in his honour. :)

    +
    • +
  • +

    Kalgan's going to look great (we hope)

    +

    Masta64 began work some time ago on artwork to be released with Frugalware 0.8 ("Kalgan"). His artwork is nearly finished and work is being done to include it in Kalgan. This includes adapting it to themes for Splashy, KDM, GDM, XFCE. There have been some technical problems but it's expected that these will be be fixed in preparation for Kalgan's release.

    +
    • +
  • +

    Czech translation

    +

    Martin Burda has begun translating various parts of Frugalware into the Czech language. He has completed work on Setup, GFpm, Frugalware Control Center and frugalwareutils. In a recent email message to the developers mailing list, he declared himself to be the "Creative maintainer and chief of Czech section" :-)

    +
    • +
  • +

    It may not be news to you but it was to me...

    +

    I recently discovered that as well as being a Frugalware developer, Michel Hermier ('hermier') is the maintainer of Kopete's IRC plugin. Kopete is the KDE instant messenger client.

    +

    • +
+ + +

Frugalware's developers are people too!

+

This is a new feature of the newsletter in which various Frugalware developers reveal a little about themselves. The aim is to show that "Frugalware's developers are people too!" I thank the developers for taking the time to answer the questions. There will be one interview per newsletter (until we run out of developers).

+ +

voroskoi

+

This issue's interview is with voroskoi, whose roles in the Frugalware development team include: security advisories and maintenance of e17. Please stand and hum the Hungarian national anthem while you read his interview.

+ +
+
What's your name?
+
My name is András Vöröskői, that's Andrew Redstone in English.
+
What's your IRC nickname?
+
That's voroskoi. I used to play Counter Strike, then I've used The UnderTaker, itL and Csingacsguk too :)
+
In what country do you live?
+
Kesztölc, Hungary. http://www.kesztolc.hu/ This is a small village next to Esztergom.
+
In what country were you born?
+
Miskolc, Hungary. http://www.miskolc.hu/
+
What do you like the most about where you live?
+
Well, I don't know where I actually live. I live in Miskolc usually because of the university, but I was on passive term this autumn, so I am at home these days. The two places are totally different, but I love them both. I have a lot of friends here and there too. And the pubs are also good enough :)
+
What do you do for the Frugalware project?
+
Nowadays almost nothing. I should maintain the stable tree with security fixes, but my real life ate up all my spare time. And of course I have a few packages to maintain in the current tree.
+
What motivates you to work on Frugalware?
+
I tried this distribution because it was Hungarian. I was a beginner linux user. Really. I've learnt a lot from the guys on #frugalware and it was fun. I also had a lot of free time those days :)
+ Now creating a new package is not that entertaining, but the quality of our packages is much higher. Frugalware has really good tools to work with, but we lack the manpower. Well, it's a problem in almost every distribution I think. So I started it because I was interested in it and I met some good guys here. I like "working" with them. And satisfied users make me very happy.
+
What do you do when you're not working on Frugalware?
+
Nothing useful :) I watch movies, go to pubs or concerts. Something.
+ I have been working in Tesco for four months because of the passive term, but I'll go back to university in February. I study mechanical engineering there. I used to learn IT too, but that was boring.
+
What's the view from your front door?
+
There is a mountain, called Pilis and the limestone mine. Looks good, really.
+
+ + + +

Tips and tricks

+ Disclaimer - Be aware that the hints & tips provided here have NOT been tested and so come with no warranty. +
    +
  • +

    Free some space on your hard drive - by 'shrift' (edited by 'phayz')

    +

    To free some space, you can delete from your pacman cache those packages which have been replaced by a later version by typing this as root:

    + 
    pacman -Sc
    +

    To remove ALL packages from pacman's cache, type this as root:

    + 
    pacman -Scc
    +
    • +
+

This section relies on your contributions! If have some tips and tricks that you would like to be shown in the newsletter, please post them on the forums in the Tips and Tricks section!

+ + + +

Focus On Package(s)

+ +

HomeBank

+

First, let me tell you that the "HomeBank" package doesn't turn your home into a bank. :( It's a personal financial management application much like the proprietary Quicken and Microsoft's Money.

+

According to the web site - "HomeBank is free software. Use it to manage your personal accounts. It is designed to easy to use. Analyse your finances in detail using powerful filtering tools and graphs. ...If you are looking for an easy way manage your accounts then HomeBank should be the software of choice. Take some time to try it out, you won't regret it."

+

Try it out if you you find that you just don't know where all your money goes. Most of us find that we never seem to have quite enough money. Better management of the money you do have is likely to improve your future. If HomeBank doesn't meet your requirements, you might like to try some other open source personal financial management applications - e.g. GnuCash and KMymoney.

+ + + +

Bug fixes

+ +

+ A list of bugs closed since the previous newsletter is available here. +

+ + + +

Security announcements

+

+ Remember - According to the normal support arrangements for Frugalware, when Frugalware 0.8 ("Kalgan") is released, support for the previous release will end. This means that no further security or bug fixes will be released for Frugalware 0.7 ("Sayshell"). +

+ +

+ Here is a list of security issues which have been discovered and fixed in the 0.7 release since the previous newsletter. +

+ +
    +
  • FSA371 - openldap: A vulnerability has been reported in OpenLDAP, which can be exploited by malicious users to cause a DoS (Denial of Service). Please upgrade to openldap-2.3.39-1sayshell2.
    • +
  • FSA370 - mplayer: Some vulnerabilities have been reported in MPlayer, which can be exploited by malicious people to compromise a user's system. Please upgrade to mplayer-1.0rc1-9sayshell1.
    • +
+ + + +

About the newsletter

+

Author

+

The Frugalware newsletter is written by Russell Dickenson (AKA phayz). Credit for the Frugalware distribution goes to the development team.

+

Translations

+

The newsletter is currently translated into French and Danish. The French translation is provided by the French Frugalware community. The Danish translation is provided by the Danish Frugalware community. Thanks to all those involved in providing and hosting these translations.

+

Release

+

To allow time for review and corrections, each newsletter is written ahead of its release date. Therefore it may not mention events which occured in the few days before its release - e.g. security fixes. To be sure that you've got the very latest information on these topics, go to the appropriate page of the Frugalware web site.

+

Feedback

+

If you have feedback about the Frugalware newsletter - whether good or bad - please provide it via the forums. Your feedback is valuable because we want the newsletter to meet the needs of Frugalware's users.

From vmiklos at frugalware.org Sat Mar 1 14:43:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 14:43:55 2008 Subject: [Frugalware-git] homepage-ng: Newsletter issue 17 Message-ID: <20080301134351.CE8EB119050F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4352cdd57abd826b46fe73b77ce9fb645cd2a0d4 commit 4352cdd57abd826b46fe73b77ce9fb645cd2a0d4 Author: Russell Dickenson Date: Sat Mar 1 22:42:43 2008 +1000 Newsletter issue 17 diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 75d7282..110a391 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -17,6 +17,25 @@ + 90 + Frugalware Newsletter Issue 17 + Sat Mar 1 16:30:13 CET 2008 + phayz + 0 + + Features of this issue include: +
    +
  • Kalgan is nearly here!
    • +
  • Memory donation - if I recall correctly :)
    • +
  • Frugalware's developers are people too!
    • +
  • Tip - Free some space on your hard drive
    • +
+ You can read it here. We hope you like it! + ]]> + + + 89 Frugalware Newsletter Issue 16 Sun Feb 17 16:30:13 CET 2008 From vmiklos at frugalware.org Sat Mar 1 14:57:41 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 14:57:43 2008 Subject: [Frugalware-git] setup: hotplug: remove two gettext calls Message-ID: <20080301135741.C9EE61190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=b67983c06d263eb0c88ec3dfca97bbf3d8e10b04 commit b67983c06d263eb0c88ec3dfca97bbf3d8e10b04 Author: Miklos Vajna Date: Sat Mar 1 14:56:31 2008 +0100 hotplug: remove two gettext calls it's no good translating them as they are before the language selection diff --git a/src/plugins/hotplug.c b/src/plugins/hotplug.c index c4b23bb..f2cb601 100644 --- a/src/plugins/hotplug.c +++ b/src/plugins/hotplug.c @@ -53,10 +53,10 @@ char *desc() int run(GList **config) { - dialog_vars.backtitle=gen_backtitle(_("Detecting hardware")); + dialog_vars.backtitle=gen_backtitle("Detecting hardware"); dlg_put_backtitle(); dlg_clear(); - dialog_msgbox(_("Please wait"), _("Activating hardware detection..."), + dialog_msgbox("Please wait", "Activating hardware detection...", 0, 0, 0); // TODO: this is ugly fw_system("mount -t proc none /proc"); From crazy at frugalware.org Sat Mar 1 15:30:31 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 15:30:34 2008 Subject: [Frugalware-git] playground: kdebase-4.00.99-0playground4-i686 Message-ID: <20080301143031.E2FE71190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=e87c0038752c66110cdd3b787a251665e488a8b2 commit e87c0038752c66110cdd3b787a251665e488a8b2 Author: crazy Date: Sat Mar 1 15:26:46 2008 +0100 kdebase-4.00.99-0playground4-i686 * newer snapshot diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild index e44bf2a..dc4df9a 100644 --- a/source/kde4/kdebase/FrugalBuild +++ b/source/kde4/kdebase/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: crazy pkgname=kdebase -kdesvn=778423 +kdesvn=780739 pkgver=4.00.99 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="Basic programs for KDE4" depends=() makedepends=('libraw1394' 'libusb' 'pciutils' 'pcre' 'libqtnetwork>=4.4.0' 'bzip2' 'qt4-qdbus>=4.4.0' \ @@ -17,7 +17,7 @@ _F_kde4_subpkgs=('dolphin' 'kfind' 'konsole' 'kwrite' 'kappfinder' 'konqueror-ns Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2) _F_cd_path="$pkgname-${pkgver}_${kdesvn}" -sha1sums=('b2ac236fcbd7fc795d2f5228757918789f3ad0ad') +sha1sums=('649d449ea0219c13900ccb6c34f564783af1c8c6') # TODO: rename to kdebase-apps subpkgs=("${_F_kde4_subpkgs[@]}" 'libkonq') From crazy at frugalware.org Sat Mar 1 15:32:58 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 15:33:00 2008 Subject: [Frugalware-git] playground: kdebase-workspace-4.00.99-0playground4-i686 Message-ID: <20080301143258.9A5E11190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=8e77ca12176896296e0d15b3c92b7f40d7e1a341 commit 8e77ca12176896296e0d15b3c92b7f40d7e1a341 Author: crazy Date: Sat Mar 1 15:32:29 2008 +0100 kdebase-workspace-4.00.99-0playground4-i686 * depends++ diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 7325381..c61340a 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -9,8 +9,8 @@ pkgdesc="Programs specific for the KDE4 desktop." depends=('libkde>=4.00.99' 'libqt3support>=4.4.0' 'libqtsvg>=4.4.0' 'libsm' 'libxft' 'libxpm' 'libxcursor' 'strigi' 'xfsprogs-acl' \ 'libxtst' 'libpng' 'libxrandr' 'libxinerama' 'libqtuitools>=4.4.0' 'libxxf86vm' 'libdrm' 'libxres' 'lmsensors' 'libxklavier' \ 'libxscrnsaver' 'qimageblitz' 'libstrigiqtdbusclient' 'libqtscript>=4.4.0' 'libcaptury' 'libusb' 'libxxf86misc' 'strigi-qt4-gui' \ - 'pciutils' 'libxcomposite' 'bluez-libs' 'libxdamage' 'libxrender' 'libxfixes') -makedepends=('xorg-server>=1.4.0.90-4' 'libqtsql>=4.4.0' 'libqtopengl>=4.4.0' 'qt4-designer') + 'pciutils' 'libxcomposite' 'bluez-libs') +makedepends=('xorg-server>=1.4.0.90-4' 'libqtsql>=4.4.0' 'libqtopengl>=4.4.0' 'qt4-designer' 'libxdamage' 'libxrender' 'libxfixes') rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.4.0.90-4' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr>=1.2.2' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver") groups=('kde4' 'kde4-minimal') archs=('i686') From priyank at frugalware.org Sat Mar 1 15:36:30 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 15:36:31 2008 Subject: [Frugalware-git] frugalware-current: gdm-2.20.3-2-i686 Message-ID: <20080301143630.0B6031190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d0c7cf62517bbd776d2b4cb13a9aaba978620d0 commit 5d0c7cf62517bbd776d2b4cb13a9aaba978620d0 Author: Priyank Date: Sat Mar 1 20:01:51 2008 +0530 gdm-2.20.3-2-i686 * Removed gdm-gksu.patch (merged with gdm-gksu_categories.patch) * Added a patch to fix the Categories for gdmsetup.desktop so that it's displayed in the menu. * Closes #2704 * Added missing _F_gnome_{iconcache,scrollkeeper,desktop}="y" * Moved the gdmsetup.desktop to the right place diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 5c29d5f..9a77091 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.20.3 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf) @@ -13,16 +13,19 @@ rodepends=('xsm' 'sessreg' 'gksu' 'xmessage' 'gksu') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') -Finclude gnome +_F_gnome_desktop="y" +_F_gnome_iconcache="y" +_F_gnome_scrollkeeper="y" +Finclude gnome gnome-scriptlet options=(${options[@]} 'force') source=(${source[@]} $pkgname-2.20.1-gdmconf.patch \ - $pkgname-gksu.patch \ + $pkgname-gksu_categories.patch \ fix_reboot_path.patch \ gdm-fix-the-build.patch \ http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2) sha1sums=('de66323b890f2e65a33bb72c5937d1c95ee5bd89' \ 'bc0209e8700b01e2369a66e93b2c86766ff988fd' \ - '05f42c18c0ce9fedfeda7de980d230b34a574f2c' \ + '9665399f5ceaee25e5807f08c53456d5ac2a81fa' \ 'b602b6805d1d4787e4404827abf3d6f346843317' \ '7c00f8c4501d13368f4a25cf34422108356f8761' \ 'b13852bf7ce59df5d02f27b3603e274fba3e074d') @@ -50,6 +53,12 @@ build() { # Install our GDM theme. mv $Fsrcdir/Frugalware $Fdestdir/usr/share/gdm/themes/Frugalware || Fdie + + # Install the Login Window icon in the right place + Fmkdir /usr/share/applications + Fmv /usr/share/gdm/applications/gdmsetup.desktop /usr/share/applications/gdmsetup.desktop + + Fbuild_gnome_scriptlet } # optimization OK diff --git a/source/gnome/gdm/gdm-gksu.patch b/source/gnome/gdm/gdm-gksu.patch deleted file mode 100644 index 22e6b4f..0000000 --- a/source/gnome/gdm/gdm-gksu.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur gdm-2.20.3/gui/gdmsetup.desktop.in.in gdm-2.20.3-p/gui/gdmsetup.desktop.in.in ---- gdm-2.20.3/gui/gdmsetup.desktop.in.in 2008-01-07 20:39:05.000000000 +0100 -+++ gdm-2.20.3-p/gui/gdmsetup.desktop.in.in 2008-01-23 19:03:42.000000000 +0100 -@@ -2,8 +2,8 @@ - Encoding=UTF-8 - _Name=Login Window - _Comment=Configure GDM login window appearance and behavior --TryExec=@sbindir@/gdmsetup --Exec=@sbindir@/gdmsetup -+TryExec=gksu @sbindir@/gdmsetup -+Exec=gksu @sbindir@/gdmsetup - Icon=gdmsetup - StartupNotify=true - Terminal=false diff --git a/source/gnome/gdm/gdm-gksu_categories.patch b/source/gnome/gdm/gdm-gksu_categories.patch new file mode 100644 index 0000000..c0b2938 --- /dev/null +++ b/source/gnome/gdm/gdm-gksu_categories.patch @@ -0,0 +1,19 @@ +diff -Naur gdm-2.20.3/gui/gdmsetup.desktop.in.in gdm-2.20.3.new/gui/gdmsetup.desktop.in.in +--- gdm-2.20.3/gui/gdmsetup.desktop.in.in 2008-01-08 01:09:05.000000000 +0530 ++++ gdm-2.20.3.new/gui/gdmsetup.desktop.in.in 2008-03-01 19:32:38.000000000 +0530 +@@ -2,13 +2,12 @@ + Encoding=UTF-8 + _Name=Login Window + _Comment=Configure GDM login window appearance and behavior +-TryExec=@sbindir@/gdmsetup +-Exec=@sbindir@/gdmsetup ++Exec=gksu @sbindir@/gdmsetup + Icon=gdmsetup + StartupNotify=true + Terminal=false + Type=Application +-Categories=GNOME;GTK;Settings;System; ++Categories=Application;GTK;Settings;X-GNOME-SystemSettings; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gdm + X-GNOME-Bugzilla-Component=general From priyank at frugalware.org Sat Mar 1 15:50:32 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 15:50:35 2008 Subject: [Frugalware-git] gfpm: re-initialize libpacman before re-populating dblist Message-ID: <20080301145032.6F1FE1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=fd4957dc4fc7fd20c7a735649d191306e282a44f commit fd4957dc4fc7fd20c7a735649d191306e282a44f Author: Priyank Date: Sat Mar 1 20:19:53 2008 +0530 re-initialize libpacman before re-populating dblist diff --git a/src/gfpm-db.c b/src/gfpm-db.c index c7e580d..165d730 100644 --- a/src/gfpm-db.c +++ b/src/gfpm-db.c @@ -85,7 +85,6 @@ static void _db_callback (char *section, PM_DB *db) { dblist = g_list_append (dblist, db); - return; } @@ -94,10 +93,13 @@ gfpm_db_populate_repolist (void) { if (dblist != NULL) { - g_list_free (dblist); + /* if the dblist is already populated, the repos are already registered. + Hence, to repopulate the dblist, we need to release and re-initialize + libpacman or else it won't work */ + pacman_release (); + pacman_initialize ("/"); dblist = NULL; } - /* get the list of usable repositories */ if (pacman_parse_config (CFG_FILE, _db_callback, "") == -1) { diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index a24f443..125a40e 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -117,13 +117,11 @@ gfpm_populate_repos_combobox (GtkComboBox *combo) if (init == FALSE) { - g_print ("im here\n"); store = gtk_list_store_new (1, G_TYPE_STRING); gtk_combo_box_set_model (GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store)); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(combo), renderer, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL); - g_print ("im here\n"); } else { @@ -132,7 +130,6 @@ gfpm_populate_repos_combobox (GtkComboBox *combo) { gtk_list_store_clear (store); } - } rlist = gfpm_db_get_repolist (); diff --git a/src/gfpm-repomanager.c b/src/gfpm-repomanager.c index 9b21b9a..029c381 100644 --- a/src/gfpm-repomanager.c +++ b/src/gfpm-repomanager.c @@ -1127,7 +1127,9 @@ cb_gfpm_repomgr_btndel_clicked (GtkButton *button, gpointer data) { gtk_tree_model_get (model, &iter, 2, &repo, -1); if (gfpm_question(_("Confirmation"), _("Are you sure you want to delete this repository ?")) == GTK_RESPONSE_YES) + { gfpm_repomgr_delete_repo (repo); + } g_free (repo); } From priyank at frugalware.org Sat Mar 1 15:51:13 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 15:51:15 2008 Subject: [Frugalware-git] gfpm: Bump version to 1.1.0 (Callisto) Message-ID: <20080301145113.13B4D1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=882adc798f17809df781fb6e7e440d923ab96a0c commit 882adc798f17809df781fb6e7e440d923ab96a0c Author: Priyank Date: Sat Mar 1 20:20:35 2008 +0530 Bump version to 1.1.0 (Callisto) diff --git a/configure.ac b/configure.ac index ccd24ca..6225e54 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([Gfpm], 1.0.5.1, [priyankmg@gmail.com], gfpm) -AC_DEFINE_UNQUOTED([GFPM_RELEASE_NAME], ["Triton"], [Release codenames]) +AC_INIT([Gfpm], 1.1.0, [priyankmg@gmail.com], gfpm) +AC_DEFINE_UNQUOTED([GFPM_RELEASE_NAME], ["Callisto"], [Release codenames]) AC_CONFIG_SRCDIR([src/gfpm.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) From crazy at frugalware.org Sat Mar 1 15:54:03 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 15:54:04 2008 Subject: [Frugalware-git] playground: kdeadmin-4.00.99-0playground4-i686 Message-ID: <20080301145403.30AD61190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=c4b7643cbf71ead8f61721adb1b4f36060ac5f94 commit c4b7643cbf71ead8f61721adb1b4f36060ac5f94 Author: crazy Date: Sat Mar 1 15:51:05 2008 +0100 kdeadmin-4.00.99-0playground4-i686 * newer snapshot diff --git a/source/kde4/kdeadmin/FrugalBuild b/source/kde4/kdeadmin/FrugalBuild index d080e2f..95e7cec 100644 --- a/source/kde4/kdeadmin/FrugalBuild +++ b/source/kde4/kdeadmin/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: crazy pkgname=kdeadmin -kdesvn=778465 +kdesvn=780678 pkgver=4.00.99 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="KDE Administration Programs" depends=('libkde>=4.00.99' 'strigi' 'xfsprogs-acl' 'libqt3support>=4.4.0' 'libqtsvg>=4.4.0' 'libsm' 'libxft' 'libxpm' 'libxtst' \ 'libxcursor' 'libstdc++' 'libpng' 'libxi' 'libxrandr' 'libxinerama' 'cyrus-sasl' 'kdepimlibs>=4.00.99') @@ -16,7 +16,7 @@ _F_cmake_confopts="-DBUILD_kpackage:BOOL=OFF -DBUILD_knetworkconf:BOOL=OFF" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2) _F_cd_path="$pkgname-${pkgver}_${kdesvn}" -sha1sums=('57bbff4742b966954d854cccdc391aa34a053841') +sha1sums=('240147184c42cdea9b4375a8397d1b0694201c97') ## TODO: split build() From janny at frugalware.org Sat Mar 1 16:00:29 2008 From: janny at frugalware.org (janny) Date: Sat Mar 1 16:00:40 2008 Subject: [Frugalware-git] fwlive: squashfs-3.3-3-i686 Message-ID: <20080301150029.1E8001190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=666c1173cd5f197be35112beba85b077c3a809a4 commit 666c1173cd5f197be35112beba85b077c3a809a4 Author: janny Date: Sat Mar 1 15:59:37 2008 +0100 squashfs-3.3-3-i686 * release bump with new kernel diff --git a/source/apps-extra/squashfs/FrugalBuild b/source/apps-extra/squashfs/FrugalBuild index 7e82bd9..138b83d 100644 --- a/source/apps-extra/squashfs/FrugalBuild +++ b/source/apps-extra/squashfs/FrugalBuild @@ -2,52 +2,65 @@ # Maintainer: VMiklos pkgname=squashfs -pkgver=3.2_r2 -kver=2.6.22-1 -kdir=/lib/modules/${kver/-/-fw}/kernel/fs/squashfs -pkgrel=5 +pkgver=3.3 +lzmaver=457 +kver=2.6.24-3 +kdir=/lib/modules/${kver/-/-fw}/kernel/fs/${pkgname} +pkgrel=3 +url="http://www.squashfs-lzma.org" pkgdesc="A highly compressed read-only filesystem for Linux." depends=('zlib' "kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") groups=('apps-extra') archs=('i686' 'x86_64') -#_F_kernel_name="-fwlive" -Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=63835|grep squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'" -source=(${source/squashfs-/squashfs} \ - http://$_F_sourceforge_mirror.dl.sourceforge.net/sevenzip/lzma443.tar.bz2 \ - ftp://ftp.slax.org/source/slax/kernel/2.6.21.5/src-core/patches/squashfs/sqlzma.tar.bz2 \ - mksquashfs.quiet.patch) +source=(${url}/dl/lzma${lzmaver}.tar.bz2 \ + ${url}/dl/${pkgname}3.3.tar.gz \ + ${url}/dl/sqlzma3.3-${lzmaver}.tar.bz2 \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/${pkgname}-cvsfix.patch \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/sqlzma1-449.patch \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/sqlzma2u-3.3.patch \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/mksquashfs.quiet.patch ) options=('scriptlet') +sha1sums=('bd1b46ba42fe1ad7351a39c131e8b7657e909001' \ + 'e610ee21fb910606615cd158eda3c650af8a61cc' \ + 'adec846e3b3b57337ccddbc8aafab3da0b049753' \ + '17da1cd356cd50a1c1cefb86670437abcdb83986' \ + '4b89853ff744e02f970c667bc374ce4fa5400d08' \ + '5620c20b72a039eae12fcc1ad6f28bc1b381c8a9' \ + '11cbb2475fe34e94bc869ae33e52c343ee497977') build() { - rm -rf lzma443 - mkdir -p lzma443 || Fdie - tar -C lzma443 -xf lzma443.tar.bz2 || Fdie - rm sqlzma2k-3.2-r2.patch - patch -p0 Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=29c5eaffeeaa571d44ccc56cc76766bcb4e1f985 commit 29c5eaffeeaa571d44ccc56cc76766bcb4e1f985 Author: Priyank Date: Sat Mar 1 20:32:08 2008 +0530 updates for 1.1.0 diff --git a/NEWS b/NEWS index 33bc293..6c4f7c7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,19 @@ VERSION DESCRIPTION --------------------------------------------------------------------------------------------------------- +1.1.0 Callisto (2008-03-01) - Added a Repository Manager which allows users to configure their package repositories. + Added a Log Viewer which displays the pacman-g2 system log. + Added a new splash screen (Thanks to masta64 for the artwork) + New and Redesigned package search + BUGFIX (#2812): Fixed tooltip for "Install from File" toolbar button + BUGFIX (#2813): Don't try to remove a NULL package + BUGFIX: Fixed a bug at startup where the default repository was not set to frugalware-current + or frugalware + BUGFIX: Fixed a segfault in the Search function. This occured only when the repository being searched + was same as the current active repo) + Minor enhancements in "Install From File" Dialog + Many more minor fixes + Translation updates: hu_HU, es_ES, da_DK, fr_FR, sv_SE + New Translation: cs_CZ 1.0.5.1 - Fix a bug where gfpm failed to optimize the package database as the location of the pacman-g2 database changed to /var/lib/pacman-g2 1.0.5 - Gfpm should now parse /etc/pacman-g2.conf instead of /etc/pacman.conf From vmiklos at frugalware.org Sat Mar 1 16:07:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 16:07:15 2008 Subject: [Frugalware-git] frugalware-current: kernel-source.install: respect _F_kernel_uname Message-ID: <20080301150713.F084A1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dceae2e57b8834ffc85ef188d6866af82f880b3e commit dceae2e57b8834ffc85ef188d6866af82f880b3e Author: Miklos Vajna Date: Sat Mar 1 16:07:02 2008 +0100 kernel-source.install: respect _F_kernel_uname diff --git a/source/include/kernel-source.install b/source/include/kernel-source.install index 38f94f8..fba56c5 100644 --- a/source/include/kernel-source.install +++ b/source/include/kernel-source.install @@ -1,6 +1,7 @@ post_install() { ver=$_F_kernel_ver-$_F_kernel_rel + uname=$_F_kernel_uname if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then arch |grep -q 'i.86' && OLD_KARCH=i386 || OLD_KARCH=`arch` @@ -9,11 +10,11 @@ post_install() arch |grep -q 'i.86' && KARCH=i386 || KARCH=`arch` fi - if [ -e /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/.config ]; then - rm -f /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/config + if [ -e /usr/src/linux-$_F_kernel_uname/.config ]; then + rm -f /usr/src/linux-$_F_kernel_uname/config else - mv /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/config \ - /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/.config + mv /usr/src/linux-$_F_kernel_uname/config \ + /usr/src/linux-$_F_kernel_uname/.config fi # architecture specific tasks cd /usr/src/linux From hermier at frugalware.org Sat Mar 1 16:26:20 2008 From: hermier at frugalware.org (Michel Hermier) Date: Sat Mar 1 16:26:23 2008 Subject: [Frugalware-git] homepage-ng: news_fr.xml Message-ID: <20080301152620.7CDB11190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f354c206e42f260efe04bc6dc2220106484d174c commit f354c206e42f260efe04bc6dc2220106484d174c Author: Michel Hermier Date: Sat Mar 1 16:25:34 2008 +0100 news_fr.xml * Add newsletter 17 news. diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml index 61ab9cd..6886588 100644 --- a/frugalware/xml/news_fr.xml +++ b/frugalware/xml/news_fr.xml @@ -17,6 +17,25 @@ + 90 + Lettre d'information Frugalware numéro 17 + Sat Mar 1 16:30:13 CET 2008 + phayz + 0 + + Dans ce numéro: +
    +
  • Kalgan est presque là!
    • +
  • Don de mémoire - si je me rapelle bien :)
    • +
  • Les dévellopeurs de Frugalware sont des êtres humain aussi!
    • +
  • Astuce - Libérez un peut d'espace sur vos disques dur
    • +
+ Vous pouvez la lire ici (anglais). Nous espérons que vous l'apprécierez! + ]]> + + + 89 Lettre d'information Frugalware numéro 16 Sun Feb 17 16:30:13 CET 2008 From vmiklos at frugalware.org Sat Mar 1 16:26:27 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 16:26:29 2008 Subject: [Frugalware-git] homepage-ng: issue17: correct date Message-ID: <20080301152627.3A2E21190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=2d8298eebadbfc923c79fb6dd9a6e8e4360618af commit 2d8298eebadbfc923c79fb6dd9a6e8e4360618af Author: Miklos Vajna Date: Sat Mar 1 16:26:17 2008 +0100 issue17: correct date diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 110a391..3f7087c 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -19,7 +19,7 @@ 90 Frugalware Newsletter Issue 17 - Sat Mar 1 16:30:13 CET 2008 + Sat Mar 1 13:42:43 CET 2008 phayz 0 Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d5ec432e821247a6b405c736f5f9a2111fb1fcd commit 1d5ec432e821247a6b405c736f5f9a2111fb1fcd Author: crazy Date: Sat Mar 1 16:35:16 2008 +0100 aria2-0.12.1-1-i686 * Version bump to latest bug fix release * of the 0.12* series , current one is 0.13* that is * for 0.9 :) diff --git a/source/network-extra/aria2/FrugalBuild b/source/network-extra/aria2/FrugalBuild index 67fcece..e409299 100644 --- a/source/network-extra/aria2/FrugalBuild +++ b/source/network-extra/aria2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=aria2 -pkgver=0.12.0 +pkgver=0.12.1 pkgrel=1 pkgdesc="aria2 is an utility for downloading files." depends=('openssl' 'libstdc++' 'cppunit' 'c-ares>=1.5.1') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') _F_sourceforge_prefix="$pkgname-" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('138380000be0e5df2e3ee4cbb39c0f872cdb195b') +sha1sums=('882a22818db2bdb808c6336c20a48a32a8d89ecc') build() { From crazy at frugalware.org Sat Mar 1 16:45:30 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 16:45:36 2008 Subject: [Frugalware-git] frugalware-current: djvulibre-3.5.20_5-1-i686 Message-ID: <20080301154530.766A91190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d1596d1fb28985ca3885f33e040849fac3d40a0 commit 7d1596d1fb28985ca3885f33e040849fac3d40a0 Author: crazy Date: Sat Mar 1 16:44:17 2008 +0100 djvulibre-3.5.20_5-1-i686 * Version bump to patchlevel '5' diff --git a/source/xlib/djvulibre/FrugalBuild b/source/xlib/djvulibre/FrugalBuild index b4d0a73..6cec9a2 100644 --- a/source/xlib/djvulibre/FrugalBuild +++ b/source/xlib/djvulibre/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=djvulibre -pkgver=3.5.20_2 +pkgver=3.5.20_5 pkgrel=1 pkgdesc="DjVu is a web-centric format for distributing documents and images." depends=('libtiff' 'libjpeg') @@ -58,7 +58,7 @@ build() Fsplit djview usr/share/djvu/djview3 } -sha1sums=('0a726b7f1793262372b3e0fe30f398b0c7d48985' \ +sha1sums=('225ace94e37323d2e3a1c081b28a5b419a68c2c2' \ 'cc8bd12bc51a616a322819bb033c43dd489fff4e') # optimization OK From crazy at frugalware.org Sat Mar 1 16:50:02 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 16:50:04 2008 Subject: [Frugalware-git] frugalware-current: libxext-1.0.4-1-i686 Message-ID: <20080301155002.151291190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e17bb38daec01032eb1d791e3f79a16e994696e commit 2e17bb38daec01032eb1d791e3f79a16e994696e Author: crazy Date: Sat Mar 1 16:48:54 2008 +0100 libxext-1.0.4-1-i686 * Version bump * bugfix release , mostly Coverity fixes diff --git a/source/x11/libxext/FrugalBuild b/source/x11/libxext/FrugalBuild index 5ff22a5..c297c36 100644 --- a/source/x11/libxext/FrugalBuild +++ b/source/x11/libxext/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libxext _F_xorg_name=libXext -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="Misc X Extension Library" url="http://xorg.freedesktop.org" @@ -11,9 +11,8 @@ groups=('x11' 'xorg-core' 'xorg-libs') archs=('i686' 'x86_64') depends=('libx11>=1.1.3' 'xextproto') makedepends=('pkgconfig' 'xproto>=7.0.11' 'inputproto>=1.4.2.1') -_F_xorg_ind=1 Finclude xorg -sha1sums=('341796c502d0076912b090f0ac6a764501800684') +sha1sums=('dbadb6b71d303f75980ea66ef76096a9d17243c4') # optimization OK From crazy at frugalware.org Sat Mar 1 16:55:38 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 16:55:40 2008 Subject: [Frugalware-git] frugalware-current: xterm-233-1-i686 Message-ID: <20080301155538.B407C1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b99e4ba6f4eb72f42e4d8e51421661f7073d5f95 commit b99e4ba6f4eb72f42e4d8e51421661f7073d5f95 Author: crazy Date: Sat Mar 1 16:55:03 2008 +0100 xterm-233-1-i686 * Version bump diff --git a/source/x11/xterm/FrugalBuild b/source/x11/xterm/FrugalBuild index b12a62d..567cce2 100644 --- a/source/x11/xterm/FrugalBuild +++ b/source/x11/xterm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xterm -pkgver=232 +pkgver=233 pkgrel=1 pkgdesc="X terminal emulator" url="http://dickey.his.com/xterm/" @@ -42,5 +42,5 @@ build() { Fbuild_gnome_scriptlet } -sha1sums=('b3085cebc41399c8ce20fe0ba373d5ea4fdcb847') +sha1sums=('ca3f0ed80c4063920555e69e18c194a3da2f2119') # optimization OK From crazy at frugalware.org Sat Mar 1 16:58:43 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 16:58:45 2008 Subject: [Frugalware-git] frugalware-current: xf86-video-trident-1.2.4-1-i686 Message-ID: <20080301155843.C354B1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d0d89d7685ed8089515d766952780c137b02372f commit d0d89d7685ed8089515d766952780c137b02372f Author: crazy Date: Sat Mar 1 16:58:03 2008 +0100 xf86-video-trident-1.2.4-1-i686 * Version bump * finally fixed for newer xorg-server =) diff --git a/source/x11/xf86-video-trident/FrugalBuild b/source/x11/xf86-video-trident/FrugalBuild index e5f8151..50cd9ed 100644 --- a/source/x11/xf86-video-trident/FrugalBuild +++ b/source/x11/xf86-video-trident/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-trident -pkgver=1.2.3 -pkgrel=3 +pkgver=1.2.4 +pkgrel=1 pkgdesc="X.Org video driver for trident cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') @@ -12,5 +12,5 @@ depends=('xorg-server>=1.4.0.90') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('d75ca064bee6817209266fc85bbcfac671ed0642') +sha1sums=('ee37fdd260e0ad6701c72fb5db423238a19f9bae') # optimization OK From janny at frugalware.org Sat Mar 1 17:15:47 2008 From: janny at frugalware.org (janny) Date: Sat Mar 1 17:15:50 2008 Subject: [Frugalware-git] fwlive: aufs-20070228-1-i686 Message-ID: <20080301161547.362011190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=30c309375fbeea51bb881e30661706641a069abd commit 30c309375fbeea51bb881e30661706641a069abd Author: janny Date: Sat Mar 1 17:14:51 2008 +0100 aufs-20070228-1-i686 * version bump * new source diff --git a/source/apps-extra/aufs/FrugalBuild b/source/apps-extra/aufs/FrugalBuild index a20fb44..2d6e982 100644 --- a/source/apps-extra/aufs/FrugalBuild +++ b/source/apps-extra/aufs/FrugalBuild @@ -2,28 +2,32 @@ # Maintainer: Janny pkgname=aufs -pkgver=cvs20070715 -kver=2.6.22-1 +pkgver=20070228 +kver=2.6.24-3 pkgrel=1 pkgdesc="Aufs -- Another Unionfs" depends=('zlib' "kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") groups=('apps-extra') archs=('i686' 'x86_64') -#_F_kernel_name="-fwlive" Finclude sourceforge up2date=$pkgver -source=(http://ftp.frugalware.org/pub/other/sources/aufs/$pkgname-$pkgver.tar.bz2) +#source=(http://ftp.frugalware.org/pub/other/sources/aufs/$pkgname-$pkgver.tar.bz2) +source=(http://frugalware.org/~janny/source_pkgs/aufs.tar.gz) options=('force' 'scriptlet') -sha1sums=('ce84034584a3a966a0041bf4cc6add7d0aaeac55') +sha1sums=('8193a36eb28ab559ecda408456e585aad2a207ad') build() { - Fcd - cat local.mk | grep -v "^CONFIG_AUFS_DEBUG =" \ - | grep -v "^CONFIG_AUFS_COMPAT =" \ - | sed "s/#CONFIG_AUFS_KSIZE_PATCH/CONFIG_AUFS_KSIZE_PATCH/" \ - | sed "s/#CONFIG_AUFS_LHASH_PATCH/CONFIG_AUFS_LHASH_PATCH/" >Makefile + Fcd $pkgname + cat local.mk \ + | grep -v "^CONFIG_AUFS_DEBUG =" \ + | grep -v "^CONFIG_AUFS_BRANCH_MAX_127 =" \ + | sed -r "s/KDIR = .*/KDIR = \/usr\/src\/linux-${kver/-/-fw}\//" \ + | sed "s/CONFIG_AUFS_BRANCH_MAX_1023 =.*/CONFIG_AUFS_BRANCH_MAX_1023 = y/" \ + | sed "s/CONFIG_AUFS_SPLICE_PATCH =.*/CONFIG_AUFS_SPLICE_PATCH = y/" \ + | sed "s/CONFIG_AUFS_SEC_PERM_PATCH =.*/CONFIG_AUFS_SEC_PERM_PATCH = y/" \ + | sed "s/CONFIG_AUFS_WORKAROUND_FUSE =.*/CONFIG_AUFS_WORKAROUND_FUSE = y/" >Makefile make KDIR=/usr/src/linux Ffilerel /lib/modules/${kver/-/-fw}/kernel/fs/aufs/aufs.ko } From crazy at frugalware.org Sat Mar 1 17:30:13 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 17:30:14 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-kdepim-0.22-1-i686 Message-ID: <20080301163013.6F5F6119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95256af383e17182831c243cfeb796d940224239 commit 95256af383e17182831c243cfeb796d940224239 Author: crazy Date: Sat Mar 1 17:29:13 2008 +0100 libopensync-plugin-kdepim-0.22-1-i686 * New package * I forgot to push this one after kde3 updated =) * Ok @ vmiklos diff --git a/source/kde-extra/libopensync-plugin-kdepim/FrugalBuild b/source/kde-extra/libopensync-plugin-kdepim/FrugalBuild new file mode 100644 index 0000000..de0310e --- /dev/null +++ b/source/kde-extra/libopensync-plugin-kdepim/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-kdepim +pkgver=0.22 +pkgrel=1 +pkgdesc="file-sync plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'kdepim>=3.5.9') +groups=('kde-extra') +archs=('i686' 'x86_64') +options=('scriptlet') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-kdepim-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('591fa5ebdaa87bb75fe557156bb09d8bbffd2ebd') + +# optimization OK From priyank at frugalware.org Sat Mar 1 17:44:49 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 17:44:51 2008 Subject: [Frugalware-git] frugalware-current: hardinfo-0.4.2.3-1-i686 Message-ID: <20080301164449.A4656119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c66a570abdbd583167477631812e900d299ac682 commit c66a570abdbd583167477631812e900d299ac682 Author: Priyank Date: Sat Mar 1 22:11:29 2008 +0530 hardinfo-0.4.2.3-1-i686 * Version bump * Added a patch to fix broken CFLAGS * Added gnutls to depends * Closes #2826, #2441 * Added missing _F_gnome_desktop * build cleanup. New maintainer. diff --git a/source/gnome-extra/hardinfo/FrugalBuild b/source/gnome-extra/hardinfo/FrugalBuild index f8ff2b1..eb59112 100644 --- a/source/gnome-extra/hardinfo/FrugalBuild +++ b/source/gnome-extra/hardinfo/FrugalBuild @@ -1,32 +1,21 @@ -# Compiling Time: 0.26 SBU -# Maintainer: AlexExtreme +# Compiling Time: 0.02 SBU +# Maintainer: Priyank Gosalia # Contributor: Devil505 pkgname=hardinfo -pkgver=0.4.2.2 -pkgrel=2 +pkgver=0.4.2.3 +pkgrel=1 pkgdesc="A system information and benchmark tool." _F_berlios_ext=".tar.bz2" -Finclude berlios -source=($source frugalware.patch backport_fixes.patch) -options=('scriptlet') -depends=('gtk+2' 'libsoup' 'pciutils') +_F_gnome_desktop="y" +Finclude berlios gnome-scriptlet +source=($source frugalware.patch hardinfo-cflags.diff) +options=('genscriptlet') +depends=('gtk+2' 'libsoup' 'pciutils' 'gnutls') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('e3ec42cdb5ee03b002aa071d418f951579998408' \ +sha1sums=('b76e332dc4dd173a1afed3c3da292f85e9bbfe65' \ '18894bbc8fb42655660e700543adb04db5568308' \ - 'e5e6fcc602aede6f28fbdde0ea5456bc833601e6') + '383a03bdd663335f1f9639294c5f0e69a86511bc') -build() -{ - Fcd - Fpatchall - Fmake - Fmakeinstall - # 'workaround' bug #2441 for 0.7 - Fmv usr/bin/hardinfo usr/bin/hardinfo.bin - echo '#!/bin/sh' >$Fdestdir/usr/bin/hardinfo - echo 'G_SLICE=always-malloc /usr/bin/hardinfo.bin' \ - >$Fdestdir/usr/bin/hardinfo - chmod 0755 $Fdestdir/usr/bin/hardinfo || Fdie -} +# optimization OK diff --git a/source/gnome-extra/hardinfo/backport_fixes.patch b/source/gnome-extra/hardinfo/backport_fixes.patch deleted file mode 100644 index 0613b5e..0000000 --- a/source/gnome-extra/hardinfo/backport_fixes.patch +++ /dev/null @@ -1,369 +0,0 @@ -Index: hardinfo2/hardinfo.h -=================================================================== ---- hardinfo2/hardinfo.h (Revision 149) -+++ hardinfo2/hardinfo.h (Revision 160) -@@ -98,7 +98,9 @@ - - gchar *h_strdup_cprintf(const gchar *format, gchar *source, ...); - gchar *h_strconcat(gchar *string1, ...); -+void h_hash_table_remove_all (GHashTable *hash_table); - -+ - void module_entry_scan_all_except(ModuleEntry *entries, gint except_entry); - void module_entry_scan_all(ModuleEntry *entries); - void module_entry_reload(ShellModuleEntry *module_entry); -Index: hardinfo2/configure -=================================================================== ---- hardinfo2/configure (Revision 149) -+++ hardinfo2/configure (Revision 160) -@@ -167,7 +167,7 @@ - # -------------------------------------------------------------------------- - - if [ $SOUP -eq -1 ]; then -- echo "Disabling libsoup support. (Network Manager won't be available.)" -+ echo "Disabling libsoup support. (Network Updater won't be available.)" - fi - - # -------------------------------------------------------------------------- -Index: hardinfo2/computer.h -=================================================================== ---- hardinfo2/computer.h (Revision 149) -+++ hardinfo2/computer.h (Revision 160) -@@ -34,6 +34,7 @@ - { DB_PREFIX "SuSE-release", "suse" }, - { DB_PREFIX "sun-release", "sun" }, - { DB_PREFIX "zenwalk-version", "zen" }, -+ { DB_PREFIX "puppyversion", "ppy" }, - /* - * RedHat must be the *last* one to be checked, since - * some distros (like Mandrake) includes a redhat-relase -Index: hardinfo2/syncmanager.c -=================================================================== ---- hardinfo2/syncmanager.c (Revision 149) -+++ hardinfo2/syncmanager.c (Revision 160) -@@ -110,7 +110,7 @@ - { - #ifndef HAS_LIBSOUP - g_warning -- ("HardInfo was compiled without libsoup support. (Network Manager requires it.)"); -+ ("HardInfo was compiled without libsoup support. (Network Updater requires it.)"); - #else /* !HAS_LIBSOUP */ - SyncDialog *sd = sync_dialog_new(); - -Index: hardinfo2/util.c -=================================================================== ---- hardinfo2/util.c (Revision 149) -+++ hardinfo2/util.c (Revision 160) -@@ -1041,3 +1041,16 @@ - - return concat; - } -+ -+static gboolean h_hash_table_remove_all_true(gpointer key, gpointer data, gpointer user_data) -+{ -+ return TRUE; -+} -+ -+void -+h_hash_table_remove_all(GHashTable *hash_table) -+{ -+ g_hash_table_foreach_remove(hash_table, -+ h_hash_table_remove_all_true, -+ NULL); -+} -Index: hardinfo2/devices.c -=================================================================== ---- hardinfo2/devices.c (Revision 149) -+++ hardinfo2/devices.c (Revision 160) -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -346,8 +347,20 @@ - - void hi_module_init(void) - { -- moreinfo = -- g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); -+ if (!g_file_test("/usr/share/misc/pci.ids", G_FILE_TEST_EXISTS)) { -+ static SyncEntry se[] = { -+ { -+ .fancy_name = "Update PCI ID listing", -+ .name = "GetPCIIds", -+ .save_to = "pci.ids", -+ .get_data = NULL -+ } -+ }; -+ -+ sync_manager_add_entry(&se[0]); -+ } -+ -+ moreinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - __init_memory_labels(); - } - -Index: hardinfo2/arch/linux/common/sensors.h -=================================================================== ---- hardinfo2/arch/linux/common/sensors.h (Revision 149) -+++ hardinfo2/arch/linux/common/sensors.h (Revision 160) -@@ -254,7 +254,7 @@ - - if ((tz = g_dir_open(path_tz, 0, NULL))) { - const gchar *entry; -- gchar *temp = ""; -+ gchar *temp = g_strdup(""); - - - while ((entry = g_dir_read_name(tz))) { -Index: hardinfo2/arch/linux/common/storage.h -=================================================================== ---- hardinfo2/arch/linux/common/storage.h (Revision 149) -+++ hardinfo2/arch/linux/common/storage.h (Revision 160) -@@ -335,7 +335,7 @@ - g_hash_table_insert(moreinfo, devid, strhash); - - g_free(model); -- model = ""; -+ model = g_strdup(""); - } else - g_free(device); - -Index: hardinfo2/arch/linux/common/pci.h -=================================================================== ---- hardinfo2/arch/linux/common/pci.h (Revision 149) -+++ hardinfo2/arch/linux/common/pci.h (Revision 160) -@@ -21,16 +21,32 @@ - { - FILE *lspci; - gchar buffer[256], *buf, *strhash = NULL, *strdevice = NULL; -- gchar *category = NULL, *name = NULL; -- gint n = 0; -+ gchar *category = NULL, *name = NULL, *icon; -+ gint n = 0, x = 0; - -- if (!(lspci = popen(LSPCI, "r"))) { -- goto pci_error; -+ buf = g_build_filename(g_get_home_dir(), ".hardinfo", "pci.ids", NULL); -+ if (!g_file_test(buf, G_FILE_TEST_EXISTS)) { -+ DEBUG("using system-provided PCI IDs"); -+ g_free(buf); -+ if (!(lspci = popen(LSPCI, "r"))) { -+ goto pci_error; -+ } -+ } else { -+ gchar *tmp; -+ -+ tmp = g_strdup_printf("%s -i '%s'", LSPCI, buf); -+ g_free(buf); -+ buf = tmp; -+ -+ DEBUG("using updated PCI IDs (from %s)", buf); -+ if (!(lspci = popen(tmp, "r"))) { -+ g_free(buf); -+ goto pci_error; -+ } else { -+ g_free(buf); -+ } - } - -- gchar *icon; -- -- int x = 0; /* unique Memory, Capability and I/O port */ - while (fgets(buffer, 256, lspci)) { - buf = g_strstrip(buffer); - -Index: hardinfo2/arch/linux/common/alsa.h -=================================================================== ---- hardinfo2/arch/linux/common/alsa.h (Revision 149) -+++ hardinfo2/arch/linux/common/alsa.h (Revision 160) -@@ -20,16 +20,15 @@ - computer_get_alsacards(Computer * computer) - { - GSList *p; -- gchar *tmp = ""; -+ gchar *tmp = g_strdup(""); - gint n = 0; - - if (computer->alsa) { - for (p = computer->alsa->cards; p; p = p->next) { - AlsaCard *ac = (AlsaCard *) p->data; - -- tmp = -- g_strdup_printf("Audio Adapter#%d=%s\n%s", ++n, -- ac->friendly_name, tmp); -+ tmp = h_strdup_cprintf("Audio Adapter#%d=%s\n", -+ tmp, ++n, ac->friendly_name); - } - } - -Index: hardinfo2/arch/linux/common/os.h -=================================================================== ---- hardinfo2/arch/linux/common/os.h (Revision 149) -+++ hardinfo2/arch/linux/common/os.h (Revision 160) -@@ -185,6 +185,15 @@ - os->distro = g_strdup(buf); - } - } -+ -+ if (g_str_equal(distro_db[i].codename, "ppy")) { -+ gchar *tmp; -+ -+ tmp = g_strdup_printf("Puppy Linux %.2f", atof(os->distro) / 100.0); -+ g_free(os->distro); -+ os->distro = tmp; -+ } -+ - os->distrocode = g_strdup(distro_db[i].codename); - - break; -Index: hardinfo2/shell.c -=================================================================== ---- hardinfo2/shell.c (Revision 149) -+++ hardinfo2/shell.c (Revision 160) -@@ -544,6 +544,8 @@ - shell->info = info_tree_new(FALSE); - shell->moreinfo = info_tree_new(TRUE); - shell->loadgraph = load_graph_new(75); -+ update_tbl = g_hash_table_new_full(g_str_hash, g_str_equal, -+ g_free, g_free); - - gtk_paned_pack1(GTK_PANED(shell->hpaned), shell->tree->scroll, - SHELL_PACK_RESIZE, SHELL_PACK_SHRINK); -@@ -585,8 +587,14 @@ - - static gboolean update_field(gpointer data) - { -- ShellFieldUpdate *fu = (ShellFieldUpdate *) data; -- GtkTreeIter *iter = g_hash_table_lookup(update_tbl, fu->field_name); -+ ShellFieldUpdate *fu; -+ GtkTreeIter *iter; -+ -+ fu = (ShellFieldUpdate *) data; -+ g_return_val_if_fail(fu != NULL, FALSE); -+ -+ iter = g_hash_table_lookup(update_tbl, fu->field_name); -+ g_return_val_if_fail(iter != NULL, FALSE); - - /* if the entry is still selected, update it */ - if (iter && fu->entry->selected && fu->entry->fieldfunc) { -@@ -1002,9 +1010,8 @@ - module_selected_show_info(ShellModuleEntry * entry, gboolean reload) - { - GKeyFile *key_file = g_key_file_new(); -- gchar *key_data; -- gchar **groups; - GtkTreeStore *store; -+ gchar *key_data, **groups; - gint i; - gsize ngroups; - -@@ -1016,16 +1023,9 @@ - - /* recreate the iter hash table */ - if (!reload) { -- if (update_tbl) { -- g_hash_table_foreach_remove(update_tbl, (GHRFunc) gtk_true, -- NULL); -- } else { -- update_tbl = -- g_hash_table_new_full(g_str_hash, g_str_equal, g_free, -- g_free); -- } -+ h_hash_table_remove_all(update_tbl); - } -- -+ - if (update_sfusrc) { - GSList *sfusrc; - -@@ -1123,23 +1123,19 @@ - GtkTreeIter parent; - ShellModuleEntry *entry; - static ShellModuleEntry *current = NULL; -- static gboolean updating = FALSE; - -- if (updating) -- return; -- -- updating = TRUE; -- - /* Gets the currently selected item on the left-side TreeView; if there is no - selection, silently return */ - if (!gtk_tree_selection_get_selected -- (shelltree->selection, &model, &parent)) -+ (shelltree->selection, &model, &parent)) { - return; -+ } - - /* Mark the currently selected module as "unselected"; this is used to kill the - update timeout. */ -- if (current) -+ if (current) { - current->selected = FALSE; -+ } - - /* Get the current selection and shows its related info */ - gtk_tree_model_get(model, &parent, TREE_COL_DATA, &entry, -1); -@@ -1190,7 +1186,6 @@ - } - - current = entry; -- updating = FALSE; - } - - static void info_selected(GtkTreeSelection * ts, gpointer data) -Index: hardinfo2/report.c -=================================================================== ---- hardinfo2/report.c (Revision 149) -+++ hardinfo2/report.c (Revision 160) -@@ -366,7 +366,7 @@ - GTK_RESPONSE_ACCEPT, NULL); - - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), -- "hardinfo report"); -+ "hardinfo_report"); - - file_chooser_add_filters(dialog, file_types); - file_chooser_open_expander(dialog); -Index: hardinfo2/iconcache.c -=================================================================== ---- hardinfo2/iconcache.c (Revision 149) -+++ hardinfo2/iconcache.c (Revision 160) -@@ -48,7 +48,9 @@ - g_free(path); - } - -- g_object_ref(icon); -+ if (icon) { -+ g_object_ref(icon); -+ } - - return icon; - } -@@ -81,7 +83,9 @@ - g_free(path); - } - -- g_object_ref(icon); -+ if (icon) { -+ g_object_ref(icon); -+ } - - return icon; - } -Index: hardinfo2/vendor.c -=================================================================== ---- hardinfo2/vendor.c (Revision 149) -+++ hardinfo2/vendor.c (Revision 160) -@@ -57,6 +57,7 @@ - {"Logitech", "Logitech International SA", "www.logitech.com"}, - {"FUJITSU", "Fujitsu", "www.fujitsu.com"}, - {"CDU", "Sony", "www.sony.com"}, -+ {"SanDisk", "SanDisk", "www.sandisk.com"}, - {NULL, NULL, NULL}, - }; - diff --git a/source/gnome-extra/hardinfo/hardinfo-cflags.diff b/source/gnome-extra/hardinfo/hardinfo-cflags.diff new file mode 100644 index 0000000..d137525 --- /dev/null +++ b/source/gnome-extra/hardinfo/hardinfo-cflags.diff @@ -0,0 +1,24 @@ +diff -Naur hardinfo-0.4.2.3/configure hardinfo-0.4.2.3.new/configure +--- hardinfo-0.4.2.3/configure 2007-11-04 18:44:47.000000000 +0530 ++++ hardinfo-0.4.2.3.new/configure 2008-03-01 21:43:52.000000000 +0530 +@@ -215,7 +215,7 @@ + echo "SOUP_LIBS = ${SOUP_LIBS}" >> Makefile + echo "SOUP_CFLAGS = ${SOUP_FLAGS}" >> Makefile + echo "PACKAGE = `basename ${PWD}`" >> Makefile +-echo "ARCHOPTS = " >> Makefile ++echo "ARCHOPTS = -march=${PROC} -O2 -pipe " >> Makefile + echo "LIBDIR = $LIBDIR" >> Makefile + + cat Makefile.in >> Makefile +diff -Naur hardinfo-0.4.2.3/Makefile.in hardinfo-0.4.2.3.new/Makefile.in +--- hardinfo-0.4.2.3/Makefile.in 2007-11-04 18:44:47.000000000 +0530 ++++ hardinfo-0.4.2.3.new/Makefile.in 2008-03-01 21:43:38.000000000 +0530 +@@ -1,7 +1,7 @@ + + CC = gcc $(ARCHOPTS) -g + CCSLOW = gcc -O0 -g +-CFLAGS = -fPIC -pipe -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) $(SOUP_CFLAGS) -I. ++CFLAGS = -fPIC -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) $(SOUP_CFLAGS) -I. + + # ---------------------------------------------------------------------------- + From priyank at frugalware.org Sat Mar 1 18:18:09 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 18:18:12 2008 Subject: [Frugalware-git] frugalware-current: alacarte-0.11.4-1-i686 Message-ID: <20080301171809.BF437119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d03283cfbe314a551c6fbfc4c672dafb6fc67a4e commit d03283cfbe314a551c6fbfc4c672dafb6fc67a4e Author: Priyank Date: Sat Mar 1 22:46:40 2008 +0530 alacarte-0.11.4-1-i686 * Version bump diff --git a/source/gnome/alacarte/FrugalBuild b/source/gnome/alacarte/FrugalBuild index c2205da..59735d0 100644 --- a/source/gnome/alacarte/FrugalBuild +++ b/source/gnome/alacarte/FrugalBuild @@ -3,10 +3,10 @@ # Former Maintainer: AlexExtreme pkgname=alacarte -pkgver=0.11.3 -pkgrel=2 +pkgver=0.11.4 +pkgrel=1 pkgdesc="Menu editor for GNOME that lets you get things done, simply and quickly." -depends=('pygtk>=2.12.0' 'pyxdg' 'gnome-menus>=2.20.0' 'gnome-python-desktop>=2.20.0') +depends=('pygtk>=2.12.1' 'pyxdg' 'gnome-menus>=2.20.3' 'gnome-python-desktop>=2.20.0') makedepends=('intltool') groups=('gnome') archs=('i686' 'x86_64') @@ -14,4 +14,4 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet -sha1sums=('4e6e2e53dfe17f72b21bd65a3c2676452a151240') +sha1sums=('9aa2294dd7d2429e1cd3ac66608b11c102a6d7e3') From priyank at frugalware.org Sat Mar 1 18:25:23 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 18:25:26 2008 Subject: [Frugalware-git] frugalware-current: acidrip-0.14-5-i686 Message-ID: <20080301172523.C4F68119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f54add3959dc9af09aa0d5d10b9224cf0f7fe7e9 commit f54add3959dc9af09aa0d5d10b9224cf0f7fe7e9 Author: Priyank Date: Sat Mar 1 22:54:04 2008 +0530 acidrip-0.14-5-i686 * Added missing desktop icon entry. Closes #1974 * New maintainer diff --git a/source/xapps-extra/acidrip/FrugalBuild b/source/xapps-extra/acidrip/FrugalBuild index eeef209..b064963 100644 --- a/source/xapps-extra/acidrip/FrugalBuild +++ b/source/xapps-extra/acidrip/FrugalBuild @@ -1,15 +1,28 @@ # Compiling Time: 0.05 SBU -# Maintainer: BMH1980 +# Maintainer: Priyank Gosalia +# Contributor: BMH1980 pkgname=acidrip pkgver=0.14 -pkgrel=4 -pkgdesc="AcidRip is a Gtk2::Perl application for ripping and encoding DVD's." +pkgrel=5 +pkgdesc="AcidRip is a Gtk2::Perl application for ripping and encoding DVDs." license="GPL2" _F_sourceforge_broken_up2date=1 Finclude sourceforge +_F_desktop_name="AcidRip" +_F_desktop_icon="acidrip.png" +_F_desktop_categories="GTK;AudioVideo;" sha1sums=('5873c835c0d52edc2c1a799e9751980b6c7cc4f1') groups=('xapps-extra') archs=('i686' 'x86_64') depends=('perl-gtk2' 'lsdvd' 'mplayer') options=('scriptlet') + +build() +{ + Fbuild + Fmkdir /usr/share/pixmaps + Fcprrel AcidRip/logo.png /usr/share/pixmaps/acidrip.png + Fdesktop2 +} + From crazy at frugalware.org Sat Mar 1 18:29:51 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 1 18:29:54 2008 Subject: [Frugalware-git] frugalware-current: xorg-server-1.4.0.90-5-i686 Message-ID: <20080301172951.CA3D4119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f49af7c84ab61f3fa9763726072f7d1f3d72dda commit 1f49af7c84ab61f3fa9763726072f7d1f3d72dda Author: crazy Date: Sat Mar 1 18:16:30 2008 +0100 xorg-server-1.4.0.90-5-i686 * release bump * backported all fixes from 1.4 branch diff --git a/source/x11/xorg-server/Fix-context-sharing-between-direct-indirect-contexts.patch b/source/x11/xorg-server/Fix-context-sharing-between-direct-indirect-contexts.patch new file mode 100644 index 0000000..bd81c13 --- /dev/null +++ b/source/x11/xorg-server/Fix-context-sharing-between-direct-indirect-contexts.patch @@ -0,0 +1,38 @@ +From a65d4aed06acd839fb21153f74144498abda3e18 Mon Sep 17 00:00:00 2001 +From: Alan Hourihane +Date: Wed, 27 Feb 2008 16:49:34 +0000 +Subject: [PATCH] Fix context sharing between direct/indirect contexts + +--- + GL/glx/glxdri.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c +index 685683d..09abca3 100644 +--- a/GL/glx/glxdri.c ++++ b/GL/glx/glxdri.c +@@ -598,6 +598,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, + else + sharePrivate = NULL; + ++ if (baseShareContext && baseShareContext->isDirect) ++ return NULL; ++ + context = xalloc(sizeof *context); + if (context == NULL) + return NULL; +@@ -617,6 +620,11 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, + 0, /* render type */ + sharePrivate, + &context->driContext); ++ ++ if (!context->driContext.private) { ++ xfree(context); ++ return NULL; ++ } + + context->driContext.mode = modes; + +-- +1.5.4.3 + diff --git a/source/x11/xorg-server/Fix-rotation-for-multi-monitor-situation.patch b/source/x11/xorg-server/Fix-rotation-for-multi-monitor-situation.patch new file mode 100644 index 0000000..2cce9a2 --- /dev/null +++ b/source/x11/xorg-server/Fix-rotation-for-multi-monitor-situation.patch @@ -0,0 +1,31 @@ +From dc30ade6496c7cc24e38c419e229159525fe042f Mon Sep 17 00:00:00 2001 +From: Maarten Maathuis +Date: Sun, 17 Feb 2008 18:47:28 +0100 +Subject: [PATCH] Fix rotation for multi-monitor situation. + +- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find. +- Fix bug #13787. +(cherry picked from commit a48cc88ea2674c28b69b8d738b168cbafcf4001f) +--- + hw/xfree86/modes/xf86Rotate.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c +index 380478f..dd0e659 100644 +--- a/hw/xfree86/modes/xf86Rotate.c ++++ b/hw/xfree86/modes/xf86Rotate.c +@@ -579,9 +579,9 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation) + } + else + { +- PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y); ++ PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x), F(crtc->y)); + PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc); +- ++ + /* + * these are the size of the shadow pixmap, which + * matches the mode, not the pre-rotated copy in the +-- +1.5.4.3 + diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 4363c74..f1c961d 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xorg-server pkgver=1.4.0.90 -pkgrel=4 +pkgrel=5 mesaver=7.0.2 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') @@ -52,7 +52,14 @@ source=(${source[@]} \ 1.4-fix-dmx-build.patch \ 1.4-fix-dmx-link.patch \ 1.4-fix-kdrive-automake.patch \ - 1.4-fix-xephyr-link.patch) + 1.4-fix-xephyr-link.patch \ + dix-set-the-correct-number-of-valuators-in-valuator.patch \ + Fix-context-sharing-between-direct-indirect-contexts.patch \ + Fix-rotation-for-multi-monitor-situation.patch \ + Resize-composite-overlay-window-when-the-root-window.patch \ + security-Fix-for-Bug-14480-untrusted-access-broke.patch \ + xkb-don-t-update-LEDs-if-they-don-t-exist.patch) + sha1sums=('7c492ac32bd83b521f5c016e4728fccf9cba55db' \ 'd16eaeb1d9d95d11d3b6d289b1ba87108b88da90' \ 'af92fd389e72a3bb59d25dbf9cbb06e827b75d7d' \ @@ -80,7 +87,13 @@ sha1sums=('7c492ac32bd83b521f5c016e4728fccf9cba55db' \ '0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf' \ '41f686ef462e179f6c7e73a1babb7c0f2312d337' \ 'f21a54aed8eae1e718f2f0c262c37c36ccccd152' \ - '352c55be4b91b29c84b192d806a90834d887fc22') + '352c55be4b91b29c84b192d806a90834d887fc22' \ + '03056cde78a8a64b44c756014f31222cee5075e1' \ + 'eadf66c1603dcc5a46dc14407cea0f1bc36b9594' \ + '8d3e9e5daaf2eca41a1aba90509a1b27acb3533e' \ + 'fcde0358b5b3c5489bcfe939fa742a1b122c3e96' \ + 'e48a9793ca50616e4de3e8fd51443aa90abf6365' \ + '0e677503b0dd377530ec799f2139f25b5fcd2de9') subpkgs=('libglx' \ "$pkgname-dmx" "$pkgname-ati" "$pkgname-chips" "$pkgname-xephyr" \ @@ -175,6 +188,13 @@ build() { Fpatch OS-IO-Zero-out-client-buffers.patch Fpatch XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch Fpatch Xephyr-One-time-keyboard-leak-fix.patch + Fpatch dix-set-the-correct-number-of-valuators-in-valuator.patch + Fpatch Fix-context-sharing-between-direct-indirect-contexts.patch + Fpatch Fix-rotation-for-multi-monitor-situation.patch + Fpatch Resize-composite-overlay-window-when-the-root-window.patch + Fpatch security-Fix-for-Bug-14480-untrusted-access-broke.patch + Fpatch xkb-don-t-update-LEDs-if-they-don-t-exist.patch + ## GCC 4.2.0 bug do **NOT** remove this hack or it will kill your box!! ## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052 echo 'CFLAGS = @CFLAGS@ -O0' >> hw/xfree86/scanpci/Makefile.am diff --git a/source/x11/xorg-server/Resize-composite-overlay-window-when-the-root-window.patch b/source/x11/xorg-server/Resize-composite-overlay-window-when-the-root-window.patch new file mode 100644 index 0000000..22c8044 --- /dev/null +++ b/source/x11/xorg-server/Resize-composite-overlay-window-when-the-root-window.patch @@ -0,0 +1,62 @@ +From 3db5930c61aeb849de3b21e7ba0d86d3c0cf72bb Mon Sep 17 00:00:00 2001 +From: Maarten Maathuis +Date: Sun, 17 Feb 2008 11:21:01 +0100 +Subject: [PATCH] Resize composite overlay window when the root window changes. + +- This allows some compositing managers to work, even after randr12 has changed the root window size. +- Thanks to ajax for figuring out the best place to put this. +- Example: + - xf86RandR12SetMode() calls EnableDisableFBAccess(). + - That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize(). + - The final step is the call to PositionWindow(). +(cherry picked from commit 70c0592a97c7dc9db0576d32b3bdbe4766520509) +--- + composite/compwindow.c | 25 +++++++++++++++++++++++++ + 1 files changed, 25 insertions(+), 0 deletions(-) + +diff --git a/composite/compwindow.c b/composite/compwindow.c +index bfd2946..33192ad 100644 +--- a/composite/compwindow.c ++++ b/composite/compwindow.c +@@ -165,6 +165,29 @@ compCheckRedirect (WindowPtr pWin) + return TRUE; + } + ++static int ++updateOverlayWindow(ScreenPtr pScreen) ++{ ++ CompScreenPtr cs; ++ WindowPtr pWin; /* overlay window */ ++ XID vlist[2]; ++ ++ cs = GetCompScreen(pScreen); ++ if ((pWin = cs->pOverlayWin) != NULL) { ++ if ((pWin->drawable.width == pScreen->width) && ++ (pWin->drawable.height == pScreen->height)) ++ return Success; ++ ++ /* Let's resize the overlay window. */ ++ vlist[0] = pScreen->width; ++ vlist[1] = pScreen->height; ++ return ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin)); ++ } ++ ++ /* Let's be on the safe side and not assume an overlay window is always allocated. */ ++ return Success; ++} ++ + Bool + compPositionWindow (WindowPtr pWin, int x, int y) + { +@@ -203,6 +226,8 @@ compPositionWindow (WindowPtr pWin, int x, int y) + cs->PositionWindow = pScreen->PositionWindow; + pScreen->PositionWindow = compPositionWindow; + compCheckTree (pWin->drawable.pScreen); ++ if (updateOverlayWindow(pScreen) != Success) ++ ret = FALSE; + return ret; + } + +-- +1.5.4.3 + diff --git a/source/x11/xorg-server/dix-set-the-correct-number-of-valuators-in-valuator.patch b/source/x11/xorg-server/dix-set-the-correct-number-of-valuators-in-valuator.patch new file mode 100644 index 0000000..b2399cf --- /dev/null +++ b/source/x11/xorg-server/dix-set-the-correct-number-of-valuators-in-valuator.patch @@ -0,0 +1,29 @@ +From e98027c3ac7195fec665ef393d980b02870ca1b8 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 18 Dec 2007 13:57:07 +1030 +Subject: [PATCH] dix: set the correct number of valuators in valuator events. + +(first_valuator + num_valuators) must never be larger than the number of axes, +otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is +wrong too. +(cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e) +--- + dix/getevents.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 12d8189..b7ba69b 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -344,7 +344,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator, + for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) { + xv->type = DeviceValuator; + xv->first_valuator = i; +- xv->num_valuators = num_valuators; ++ xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i); + xv->deviceid = pDev->id; + switch (final_valuator - i) { + case 6: +-- +1.5.4.3 + diff --git a/source/x11/xorg-server/security-Fix-for-Bug-14480-untrusted-access-broke.patch b/source/x11/xorg-server/security-Fix-for-Bug-14480-untrusted-access-broke.patch new file mode 100644 index 0000000..a7cc2bb --- /dev/null +++ b/source/x11/xorg-server/security-Fix-for-Bug-14480-untrusted-access-broke.patch @@ -0,0 +1,25 @@ +From 74b40bba327a2e97780e8e3f995f784add2d6231 Mon Sep 17 00:00:00 2001 +From: Eamon Walsh +Date: Thu, 14 Feb 2008 19:47:44 -0500 +Subject: [PATCH] security: Fix for Bug #14480: untrusted access broken in 7.3. + +--- + Xext/security.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xext/security.c b/Xext/security.c +index e9d48c9..14ad354 100644 +--- a/Xext/security.c ++++ b/Xext/security.c +@@ -1014,7 +1014,7 @@ CALLBACK(SecurityCheckResourceIDAccess) + } + else /* server-owned resource - probably a default colormap or root window */ + { +- if (RT_WINDOW == rtype || RC_DRAWABLE == rtype) ++ if (RC_DRAWABLE & rtype) + { + switch (reqtype) + { /* the following operations are allowed on root windows */ +-- +1.5.4.3 + diff --git a/source/x11/xorg-server/xkb-don-t-update-LEDs-if-they-don-t-exist.patch b/source/x11/xorg-server/xkb-don-t-update-LEDs-if-they-don-t-exist.patch new file mode 100644 index 0000000..fd75f7e --- /dev/null +++ b/source/x11/xorg-server/xkb-don-t-update-LEDs-if-they-don-t-exist.patch @@ -0,0 +1,31 @@ +From bc72ef3a159efd67067322c043bba444869dc356 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 30 Jan 2008 10:39:54 +1030 +Subject: [PATCH] xkb: don't update LEDs if they don't exist. (Bug #13961) + +In some weird cases we call this function when there is no SrvLedInfo on the +device. And it turns out null-pointer dereferences are bad. + +X.Org Bug 13961 +(cherry picked from commit d954f9c80348de294602d931d387e5cd1ef4b9a5) +--- + xkb/xkbLEDs.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c +index d607d90..d28973c 100644 +--- a/xkb/xkbLEDs.c ++++ b/xkb/xkbLEDs.c +@@ -63,6 +63,9 @@ XkbSrvLedInfoPtr sli; + + sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0); + ++ if (!sli) ++ return update; ++ + if (state_changes&(XkbModifierStateMask|XkbGroupStateMask)) + update|= sli->usesEffective; + if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask)) +-- +1.5.4.3 + From priyank at frugalware.org Sat Mar 1 18:55:27 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 18:55:29 2008 Subject: [Frugalware-git] frugalware-current: hardinfo-0.4.2.3-2-i686 Message-ID: <20080301175527.E6CD81190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4cd0ef9af2e587acd14389240ebc3cc168dfa51 commit f4cd0ef9af2e587acd14389240ebc3cc168dfa51 Author: Priyank Date: Sat Mar 1 23:23:31 2008 +0530 hardinfo-0.4.2.3-2-i686 * Fixed CFLAGS for x86_64 diff --git a/source/gnome-extra/hardinfo/FrugalBuild b/source/gnome-extra/hardinfo/FrugalBuild index eb59112..f81d843 100644 --- a/source/gnome-extra/hardinfo/FrugalBuild +++ b/source/gnome-extra/hardinfo/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hardinfo pkgver=0.4.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A system information and benchmark tool." _F_berlios_ext=".tar.bz2" _F_gnome_desktop="y" @@ -16,6 +16,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') sha1sums=('b76e332dc4dd173a1afed3c3da292f85e9bbfe65' \ '18894bbc8fb42655660e700543adb04db5568308' \ - '383a03bdd663335f1f9639294c5f0e69a86511bc') + '43dca595f9548565c973608b05d3a186186fa9f0') # optimization OK diff --git a/source/gnome-extra/hardinfo/hardinfo-cflags.diff b/source/gnome-extra/hardinfo/hardinfo-cflags.diff index d137525..65418f7 100644 --- a/source/gnome-extra/hardinfo/hardinfo-cflags.diff +++ b/source/gnome-extra/hardinfo/hardinfo-cflags.diff @@ -1,7 +1,17 @@ diff -Naur hardinfo-0.4.2.3/configure hardinfo-0.4.2.3.new/configure --- hardinfo-0.4.2.3/configure 2007-11-04 18:44:47.000000000 +0530 -+++ hardinfo-0.4.2.3.new/configure 2008-03-01 21:43:52.000000000 +0530 -@@ -215,7 +215,7 @@ ++++ hardinfo-0.4.2.3.new/configure 2008-03-01 23:21:40.000000000 +0530 +@@ -56,7 +56,8 @@ + x86_64) + ln -sf linux/x86_64 arch/this + ARCH="ARCH_x86_64" +- LIBDIR="/usr/lib64" ;; ++ LIBDIR="/usr/lib64" ++ PROC="k8" ;; + mips*) + ln -sf linux/mips arch/this + ARCH="ARCH_MIPS" ;; +@@ -215,7 +216,7 @@ echo "SOUP_LIBS = ${SOUP_LIBS}" >> Makefile echo "SOUP_CFLAGS = ${SOUP_FLAGS}" >> Makefile echo "PACKAGE = `basename ${PWD}`" >> Makefile @@ -12,7 +22,7 @@ diff -Naur hardinfo-0.4.2.3/configure hardinfo-0.4.2.3.new/configure cat Makefile.in >> Makefile diff -Naur hardinfo-0.4.2.3/Makefile.in hardinfo-0.4.2.3.new/Makefile.in --- hardinfo-0.4.2.3/Makefile.in 2007-11-04 18:44:47.000000000 +0530 -+++ hardinfo-0.4.2.3.new/Makefile.in 2008-03-01 21:43:38.000000000 +0530 ++++ hardinfo-0.4.2.3.new/Makefile.in 2008-03-01 23:20:05.000000000 +0530 @@ -1,7 +1,7 @@ CC = gcc $(ARCHOPTS) -g From priyank at frugalware.org Sat Mar 1 19:20:33 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 19:20:36 2008 Subject: [Frugalware-git] frugalware-current: gdesklets-0.36-1-i686 Message-ID: <20080301182033.C20301190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=12376cb1f00983f20a41e65c301a686f280f8621 commit 12376cb1f00983f20a41e65c301a686f280f8621 Author: Priyank Date: Sat Mar 1 23:47:08 2008 +0530 gdesklets-0.36-1-i686 * Version bump * Fix up2date * Closes #2696 diff --git a/source/gnome-extra/gdesklets/FrugalBuild b/source/gnome-extra/gdesklets/FrugalBuild index 111ecc4..84f6cca 100644 --- a/source/gnome-extra/gdesklets/FrugalBuild +++ b/source/gnome-extra/gdesklets/FrugalBuild @@ -1,26 +1,25 @@ -# Compiling Time: 0.58 SBU +# Compiling Time: 0.11 SBU # Maintainer: Christian Hamar alias krix # Contributor: bigmatt pkgname=gdesklets -_F_archive_name=gDesklets -pkgver=0.35.4 -pkgrel=2 +pkgver=0.36 +pkgrel=1 pkgdesc="gdesklets provides an advanced architecture for your desktop applets" url="http://gdesklets.de/" depends=('python>=2.5' 'pygtk' 'libgtop' 'librsvg' 'gconf' 'gnome-python' 'libgnomeui') makedepends=('perl-xml-parser') rodepends=('shared-mime-info') groups=('gnome-extra') -up2date="lynx -dump http://www.gdesklets.de/ | Flasttar" -source=(http://gdesklets.de/files/`echo $pkgname | sed 's/d/D/'`-$pkgver.tar.bz2) +up2date="lynx -dump $url | grep -m1 tar.bz2 | sed 's/.*s-\(.*\).t.*/\1/'" +source=(http://gdesklets.de/files/$pkgname-$pkgver.tar.bz2) archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/gdesklets-display-thumbnail.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_mime="y" Finclude gnome-scriptlet -sha1sums=('f225dcc6503e8aaec732c52fc2ee47f70c1fd87c') +sha1sums=('debed7ae730796761ac829ba6cb7bafd566148d5') build() { From priyank at frugalware.org Sat Mar 1 20:10:34 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 1 20:10:36 2008 Subject: [Frugalware-git] frugalware-current: nautilus-sendto-0.13.2-1-i686 Message-ID: <20080301191034.EDE911190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3fb43306c6bb1991aabdac2f334cb50e9a9cc075 commit 3fb43306c6bb1991aabdac2f334cb50e9a9cc075 Author: Priyank Date: Sun Mar 2 00:38:12 2008 +0530 nautilus-sendto-0.13.2-1-i686 * Version bump (0.12 was really broken and didn't work for sending files over bluetooth) * Added missing _F_gnome_iconcache * Fixed package description diff --git a/source/gnome/nautilus-sendto/FrugalBuild b/source/gnome/nautilus-sendto/FrugalBuild index cc9896c..b42b4ed 100644 --- a/source/gnome/nautilus-sendto/FrugalBuild +++ b/source/gnome/nautilus-sendto/FrugalBuild @@ -2,17 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=nautilus-sendto -pkgver=0.12 +pkgver=0.13.2 pkgrel=1 -pkgdesc="Nautilus context menu componente 'Send To..'" +pkgdesc="A plugin to send files to other apps from Nautilus." url="http://www.gnome.org/" depends=('nautilus' 'evolution-data-server') makedepends=('intltool' 'perl-xml-parser' 'pidgin' 'claws-mail' 'gnome-bluetooth') groups=('gnome') archs=('i686' 'x86_64') +_F_gnome_devel="y" +_F_gnome_iconcache="y" _F_gnome_schemas=('/etc/gconf/schemas/nst.schemas') Finclude gnome gnome-scriptlet -source=(http://ftp.gnome.org/pub/gnome/sources/nautilus-sendto/$pkgver/$pkgname-$pkgver.tar.bz2) -sha1sums=('34b6241d6bcdc05507336f99d9c45d2f77f2d35b') +sha1sums=('46660e89352e3580245a4d6332637db4c399dfe8') # optimization OK From vmiklos at frugalware.org Sat Mar 1 20:32:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 20:32:07 2008 Subject: [Frugalware-git] setup: configsource/mirrorconf(): check if the mirror is empty before comparing it Message-ID: <20080301193205.5153B1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=71daf89cbd14c4598699e76371f873b9ea4acc78 commit 71daf89cbd14c4598699e76371f873b9ea4acc78 Author: Miklos Vajna Date: Sat Mar 1 20:30:55 2008 +0100 configsource/mirrorconf(): check if the mirror is empty before comparing it closes #2801 diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 5d05339..ecad0e2 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -152,7 +152,8 @@ GList *mirrorconf(void) // also removes the duplicate mirrors for (i=0; i Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=e76fee00e316eb69f72e2987c1a22143347938d1 commit e76fee00e316eb69f72e2987c1a22143347938d1 Author: Priyank Date: Sun Mar 2 01:22:31 2008 +0530 TAG 1.1.0 From vmiklos at frugalware.org Sat Mar 1 21:16:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 21:16:23 2008 Subject: [Frugalware-git] frugalware-current: docs: add a cronclean target to remove xml, fo and other interm files Message-ID: <20080301201619.DEE451190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34f6b555f33a9c001451d64aa5fd4dc555e21d84 commit 34f6b555f33a9c001451d64aa5fd4dc555e21d84 Author: Miklos Vajna Date: Sat Mar 1 21:12:17 2008 +0100 docs: add a cronclean target to remove xml, fo and other interm files diff --git a/docs/Makefile b/docs/Makefile index 88879b7..722b190 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -138,6 +138,11 @@ packages.txt: packages.txt.in clean: rm -rf *.html *.pdf *.text $(GENERATED_SOURCES) $(LANGS) +# deletes interim files like .xml or .fo but leaves the result (.pdf, +# etc) untouched +cronclean: + rm -rf {*/,}*.xml {*/,}*.fo po + # checks if all the txts are included in index.txt # -2 is for the two tags: index-user.txt and index-devel.txt check: clean From vmiklos at frugalware.org Sat Mar 1 21:16:20 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 1 21:16:25 2008 Subject: [Frugalware-git] frugalware-current: tools/genpkgdbs: call make cronclea for docs daily Message-ID: <20080301201620.006461190510@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ab7a41e191d53a1dad28348e27a66e9208f2bfa commit 1ab7a41e191d53a1dad28348e27a66e9208f2bfa Author: Miklos Vajna Date: Sat Mar 1 21:15:10 2008 +0100 tools/genpkgdbs: call make cronclea for docs daily diff --git a/tools/genpkgdbs b/tools/genpkgdbs index 7e8d6b0..5459f2e 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -52,6 +52,8 @@ cd ../docs make clean make all 2>&1 |tee build.log make -i all-i18n 2>&1 |tee build-i18n.log +# remove interim files +make cronclean # update pots From priyank at frugalware.org Sun Mar 2 06:57:34 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 06:57:36 2008 Subject: [Frugalware-git] fun: updates for 0.2.1 Message-ID: <20080302055734.94EC21190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=06d54ceb03e4626f013c30e0a1eef6f548e9427b commit 06d54ceb03e4626f013c30e0a1eef6f548e9427b Author: Priyank Date: Sun Mar 2 11:26:57 2008 +0530 updates for 0.2.1 diff --git a/NEWS b/NEWS index faf3b76..ff3f3b2 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ VERSION DESCRIPTION --------------------------------------------------------------------------------------------------------- +0.2.1 (2008-03-02) - Translation updates + - New translation: (Czech) cs_CZ 0.2.0 (2008-01-01) - Migrated to libnotify for displaying notification popups. - Got rid of EggTrayIcon. FUN client now uses GtkStatusIcon. - FUN client now performs a first-run update check everytime it's started. diff --git a/configure.ac b/configure.ac index c2b7d58..56da2e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([fun], 0.2.0, [frugalware-devel@frugalware.org], fun) +AC_INIT([fun], 0.2.1, [frugalware-devel@frugalware.org], fun) AC_CONFIG_SRCDIR([src/fun.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) From priyank at frugalware.org Sun Mar 2 06:58:22 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 06:58:25 2008 Subject: [Frugalware-git] fun: TAG 0.2.1 Message-ID: <20080302055823.046631190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=48ca2f5105e5003e30a239d3dd5122ff51226a3b commit 48ca2f5105e5003e30a239d3dd5122ff51226a3b Author: Priyank Date: Sun Mar 2 11:27:47 2008 +0530 TAG 0.2.1 From priyank at frugalware.org Sun Mar 2 07:10:43 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 07:10:46 2008 Subject: [Frugalware-git] frugalware-current: fun-0.2.1-1-i686 Message-ID: <20080302061043.79D631190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=640418192cd01fc729edcca707751f377af20f2b commit 640418192cd01fc729edcca707751f377af20f2b Author: Priyank Date: Sun Mar 2 11:38:44 2008 +0530 fun-0.2.1-1-i686 * Version bump diff --git a/source/xapps/fun/FrugalBuild b/source/xapps/fun/FrugalBuild index 06eb439..acfa485 100644 --- a/source/xapps/fun/FrugalBuild +++ b/source/xapps/fun/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=fun -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="Frugalware Update Notifier (FUN)" url="http://ftp.frugalware.org/pub/other/fun" -rodepends=('gfpm>=1.0.4') +rodepends=('gfpm>=1.0.5.1') depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2' 'frugalwareutils' 'dbus' \ 'dbus-glib' 'libnotify') makedepends=('pkgconfig' 'intltool') From priyank at frugalware.org Sun Mar 2 08:24:22 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 08:24:25 2008 Subject: [Frugalware-git] frugalware-current: gfpm-1.1.0-1-i686 Message-ID: <20080302072422.043C41190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=847157b98fb9ed7728bf9762eeb0d9ef2a3c4f32 commit 847157b98fb9ed7728bf9762eeb0d9ef2a3c4f32 Author: Priyank Date: Sun Mar 2 12:52:00 2008 +0530 gfpm-1.1.0-1-i686 * Version bump * Added frugalwareutils to depends() diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild index f3b21e8..e321a3a 100644 --- a/source/xapps/gfpm/FrugalBuild +++ b/source/xapps/gfpm/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=gfpm -pkgver=1.0.5.1 +pkgver=1.1.0 pkgrel=1 pkgdesc="Graphical Frugalware Package Manager" url="http://ftp.frugalware.org/pub/other/gfpm" -depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2>=3.6.7-2' 'inotify-tools') +depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2>=3.6.7-2' 'inotify-tools' 'frugalwareutils>=0.7.9') makedepends=('pkgconfig' 'intltool') groups=('xapps') replaces=('frugalpkg') From janny at frugalware.org Sun Mar 2 09:23:18 2008 From: janny at frugalware.org (Janny) Date: Sun Mar 2 09:23:22 2008 Subject: [Frugalware-git] fwlive: fwlive-LOCALE Message-ID: <20080302082318.D8F8A1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d917aff87b68f8d9532f860444ab8527ffb723e7 commit d917aff87b68f8d9532f860444ab8527ffb723e7 Author: Janny Date: Sun Mar 2 09:20:36 2008 +0100 fwlive-LOCALE * add LOCALE settings * actualize and correction in languages * add Cz language diff --git a/config b/config index 8c95182..3dc4e2e 100644 --- a/config +++ b/config @@ -23,7 +23,10 @@ FWLFONT = lat2-16.psfu.gz # * SERVER # * MIN - comfortable console workstation # * MUSTHAVE - minimalistic one, base of all profiles -APPSGROUP = FULL +APPSGROUP = MUSTHAVE + +# add supported locals +LOCALE = en,de,fr,da,hu,cz # grub title part 1 FWLSREL = FWLive-${APPSGROUP} @@ -34,7 +37,7 @@ FWVER = $(shell date +%Y%m%d) FWCODENAME = -current endif ifeq ($(findstring testing,$(TREE)),testing) -FWVER = 0.8rc2 +FWVER = 0.8 FWCODENAME = Kalgan endif FWVER ?= 0.7 @@ -86,14 +89,11 @@ INST_SERVER_APPS = ${INST_MIN_APPS} ncftp fuseftp postfix mysql libmysqlclient \ INST_X_APPS = xorg-server xorg-drivers xorg-fonts fvwm mplayer alsa-utils INST_EXTRA_APPS = gimp gwenview wireshark kaffeine kasablanca ktorrent INST_EXTRA_GTK_APPS = gimp wireshark gqview -INST_LOCALE_APPS = firefox-hu firefox-de firefox-fr \ - kde-i18n-hu kde-i18n-de kde-i18n-fr firefox-da kde-i18n-da openoffice.org-i18n-da \ - openoffice.org-dict-hu openoffice.org-dict-fr openoffice.org-dict-de \ - openoffice.org-i18n-hu openoffice.org-i18n-de openoffice.org-i18n-fr \ - bibletime-i18n k3b-i18n -INST_LOCALE_GTK_APPS = firefox-hu firefox-de firefox-fr firefox-da openoffice.org-i18n-da \ - openoffice.org-dict-hu openoffice.org-dict-fr openoffice.org-dict-de \ - openoffice.org-i18n-hu openoffice.org-i18n-de openoffice.org-i18n-fr +INST_LOCALE_APPS = firefox-{${LOCALE}} kde-i18n-{${LOCALE}} \ + openoffice.org-i18n-{${LOCALE}} bibletime-i18n k3b-i18n \ + openoffice.org-dict-de openoffice.org-dict-hu +INST_LOCALE_GTK_APPS = firefox-{${LOCALE}} openoffice.org-i18n-{${LOCALE}} \ + openoffice.org-dict-hu openoffice.org-dict-de INST_KDE_APPS = ${INST_MIN_APPS} ${INST_X_APPS} kdebase openoffice.org-kde firefox kmplayer \ flashplugin qtparted k3b INST_KDE4_APPS = ${INST_MIN_APPS} ${INST_X_APPS} kde4 From janny at frugalware.org Sun Mar 2 11:28:51 2008 From: janny at frugalware.org (janny) Date: Sun Mar 2 11:28:53 2008 Subject: [Frugalware-git] frugalware-current: gimp-2.4.5-1-i686 Message-ID: <20080302102851.23E8B1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88a336226d95ecb777ed6063445c9a7ec40327c9 commit 88a336226d95ecb777ed6063445c9a7ec40327c9 Author: janny Date: Sun Mar 2 11:21:59 2008 +0100 gimp-2.4.5-1-i686 * minor version bump * No new features are being added here, just bug-fixes. diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index ea79b3a..55b4ef6 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=gimp -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml-parser') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(ftp://ftp.gimp.org/pub/gimp/v2.4/$pkgname-$pkgver.tar.bz2) -sha1sums=('47c80470e15e3fa29e46652130e870e0c952789f') +sha1sums=('70cf6af5700cf6db73fca898510873394eb95581') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet From vmiklos at frugalware.org Sun Mar 2 13:34:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 2 13:34:16 2008 Subject: [Frugalware-git] frugalware-current: include/kernel-source.install: uname -r is $_F_kernel_ver$_F_kernel_uname Message-ID: <20080302123414.BC11F1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b67a4677444343b3dfb4f5525f2066ad95da117d commit b67a4677444343b3dfb4f5525f2066ad95da117d Author: Miklos Vajna Date: Sun Mar 2 13:33:41 2008 +0100 include/kernel-source.install: uname -r is $_F_kernel_ver$_F_kernel_uname and not $_F_kernel_uname, i was wrong in the previous commit diff --git a/source/include/kernel-source.install b/source/include/kernel-source.install index fba56c5..7af0232 100644 --- a/source/include/kernel-source.install +++ b/source/include/kernel-source.install @@ -1,8 +1,5 @@ post_install() { - ver=$_F_kernel_ver-$_F_kernel_rel - uname=$_F_kernel_uname - if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then arch |grep -q 'i.86' && OLD_KARCH=i386 || OLD_KARCH=`arch` KARCH=x86 @@ -10,11 +7,11 @@ post_install() arch |grep -q 'i.86' && KARCH=i386 || KARCH=`arch` fi - if [ -e /usr/src/linux-$_F_kernel_uname/.config ]; then - rm -f /usr/src/linux-$_F_kernel_uname/config + if [ -e /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/.config ]; then + rm -f /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/config else - mv /usr/src/linux-$_F_kernel_uname/config \ - /usr/src/linux-$_F_kernel_uname/.config + mv /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/config \ + /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/.config fi # architecture specific tasks cd /usr/src/linux From priyank at frugalware.org Sun Mar 2 14:50:22 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 14:50:24 2008 Subject: [Frugalware-git] frugalware-current: xchat-systray-integration-2.4.5-5-i686 Message-ID: <20080302135022.327681190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a30c78fd8619fddeeed93253bf86add9c15f080b commit a30c78fd8619fddeeed93253bf86add9c15f080b Author: Priyank Date: Sun Mar 2 19:16:54 2008 +0530 xchat-systray-integration-2.4.5-5-i686 * Added a patch to fix crashes while launching some applications from this plugin. * Closes #1679 diff --git a/source/xapps-extra/xchat-systray-integration/FrugalBuild b/source/xapps-extra/xchat-systray-integration/FrugalBuild index cb2bdf2..7767760 100644 --- a/source/xapps-extra/xchat-systray-integration/FrugalBuild +++ b/source/xapps-extra/xchat-systray-integration/FrugalBuild @@ -4,7 +4,7 @@ pkgname=xchat-systray-integration pkgver=2.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="Systray integration for xchat" _F_sourceforge_dirname="xchat2-plugins" _F_sourceforge_ext="-src.tar.gz" @@ -14,11 +14,14 @@ url="http://www.blight.tk/" depends=('xchat') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('d7bad0f60c1944ce385e5799eb08a45a081365ab') +source=(${source[@]} double_free_fix.diff) +sha1sums=('d7bad0f60c1944ce385e5799eb08a45a081365ab' \ + 'ff206f52880a12664cf9e307b667d9ef49ea7ee2') build() { Fcd + Fpatch double_free_fix.diff [ "$CARCH" == "x86_64" ] && CFLAGS="$CFLAGS -fPIC -DPIC" Fsed "CFLAGS = .*" "CFLAGS=${CFLAGS}" Makefile Fmake diff --git a/source/xapps-extra/xchat-systray-integration/double_free_fix.diff b/source/xapps-extra/xchat-systray-integration/double_free_fix.diff new file mode 100644 index 0000000..88cb25d --- /dev/null +++ b/source/xapps-extra/xchat-systray-integration/double_free_fix.diff @@ -0,0 +1,27 @@ +diff -Naur xchat-systray-integration-2.4.5/src/menu.c xchat-systray-integration-2.4.5.new/src/menu.c +--- xchat-systray-integration-2.4.5/src/menu.c 2004-04-30 18:08:10.000000000 +0530 ++++ xchat-systray-integration-2.4.5.new/src/menu.c 2008-03-02 19:12:25.000000000 +0530 +@@ -10,7 +10,6 @@ + char command[156]="exec "; + strcat(command, bpath); + xchat_command( ph, command ); +- g_free(command); + + } + +@@ -20,7 +19,6 @@ + char command[156]="exec "; + strcat(command, epath); + xchat_command( ph, command ); +- g_free(command); + + } + +@@ -30,7 +28,6 @@ + char command[156]="exec "; + strcat(command, ppath); + xchat_command( ph, command ); +- g_free(command); + + } + From vmiklos at frugalware.org Sun Mar 2 15:57:23 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 2 15:57:25 2008 Subject: [Frugalware-git] homepage-ng: donations: add distrowatch Message-ID: <20080302145723.B3FE81190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b8d39737f564375ac95f88cf22c4618dd1f3ce49 commit b8d39737f564375ac95f88cf22c4618dd1f3ce49 Author: Miklos Vajna Date: Sun Mar 2 15:57:18 2008 +0100 donations: add distrowatch diff --git a/frugalware/donations.php b/frugalware/donations.php index 5341df8..fe5f593 100644 --- a/frugalware/donations.php +++ b/frugalware/donations.php @@ -91,6 +91,7 @@ $cont4 = "
  • Balazs Dianiska
  • Francois Biot
  • Sebastien Mazzucco
    • +
  • Distrowath.com
"; fwmiddlebox("Monetary donations", $cont4); From vmiklos at frugalware.org Sun Mar 2 16:04:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 2 16:04:13 2008 Subject: [Frugalware-git] homepage-ng: donations: remove ancient 'wishes' section Message-ID: <20080302150412.E00B21190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=e58d7c06995f01608d28466f9643227f0b62f0fa commit e58d7c06995f01608d28466f9643227f0b62f0fa Author: Miklos Vajna Date: Sun Mar 2 16:04:00 2008 +0100 donations: remove ancient 'wishes' section we no longer need a hdd for yugo, etc. diff --git a/frugalware/donations.php b/frugalware/donations.php index fe5f593..e60c91d 100644 --- a/frugalware/donations.php +++ b/frugalware/donations.php @@ -49,12 +49,7 @@ if you wish to donate money."); fwmiddlebox(gettext("Donations"), $fwdonatewelcome); -$cont1 = "
Wishes:
    -
  • at least one 10-20GB IDE HDD for i686 buildserver's system and at least one bigger (80-100GB) for i686 buildserver's chroot environments
    • -
  • 10-20GB IDE HDD for testing Xen
    • -
  • 10GB IDE HDD for testing the setup
    • -
  • PegasosPPC or/and other PowerPC computer to use as buildserver
    • -
Received:
    +$cont1 = "
    Received:
    • Socket939 Motherboard + AMD Athlon64 3000+ CPU Socket939 version + 512MB DDR400 RAM (x86_64 buildserver)
    • Socket939 Motherboard + AMD Athlon64 3000+ CPU Socket939 version + 1GB DDR400 RAM (main server)
    • Codegen case for the new x86_64 buildserver (Krisztian VASAS)
      • From vmiklos at frugalware.org Sun Mar 2 16:07:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 2 16:07:44 2008 Subject: [Frugalware-git] homepage-ng: donations: typo fix Message-ID: <20080302150743.871401190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c634dff77979e5558e4f6d841e8e0a48a41306a1 commit c634dff77979e5558e4f6d841e8e0a48a41306a1 Author: Miklos Vajna Date: Sun Mar 2 16:07:30 2008 +0100 donations: typo fix thx devil505 for noticing it diff --git a/frugalware/donations.php b/frugalware/donations.php index e60c91d..0617660 100644 --- a/frugalware/donations.php +++ b/frugalware/donations.php @@ -86,7 +86,7 @@ $cont4 = "
      • Balazs Dianiska
      • Francois Biot
      • Sebastien Mazzucco
        • -
      • Distrowath.com
        • +
      • Distrowatch.com
      "; fwmiddlebox("Monetary donations", $cont4); From janny at frugalware.org Sun Mar 2 16:54:51 2008 From: janny at frugalware.org (janny) Date: Sun Mar 2 16:54:52 2008 Subject: [Frugalware-git] fwlive: kernel-fwlive-2.6.24-3-i686 Message-ID: <20080302155451.1EE3A1190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=a6373f25545699c9fa5f7f22348334de55a5acb7 commit a6373f25545699c9fa5f7f22348334de55a5acb7 Author: janny Date: Sun Mar 2 16:54:11 2008 +0100 kernel-fwlive-2.6.24-3-i686 * add missing patch diff --git a/source/base-extra/kernel-fwlive/revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch b/source/base-extra/kernel-fwlive/revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch new file mode 100644 index 0000000..dad14df --- /dev/null +++ b/source/base-extra/kernel-fwlive/revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch @@ -0,0 +1,11 @@ +diff -Naur linux-2.6.24/include/linux/Kbuild linux-2.6.24-revert/include/linux/Kbuild +--- linux-2.6.24/include/linux/Kbuild 2008-02-27 13:51:11.000000000 +0100 ++++ linux-2.6.24-revert/include/linux/Kbuild 2008-02-27 13:48:47.000000000 +0100 +@@ -217,7 +217,6 @@ + unifdef-y += icmp.h + unifdef-y += icmpv6.h + unifdef-y += if_addr.h +-unifdef-y += if_addrlabel.h + unifdef-y += if_arp.h + unifdef-y += if_bridge.h + unifdef-y += if_ec.h From priyank at frugalware.org Sun Mar 2 18:09:11 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 18:09:13 2008 Subject: [Frugalware-git] gfpm: added a README Message-ID: <20080302170911.7CC551190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=2cc0e9cb71b55b25ad0ce985c0dfc2f741686ba1 commit 2cc0e9cb71b55b25ad0ce985c0dfc2f741686ba1 Author: Priyank Date: Sun Mar 2 22:38:29 2008 +0530 added a README diff --git a/README b/README new file mode 100644 index 0000000..f1f5097 --- /dev/null +++ b/README @@ -0,0 +1,4 @@ +Gfpm 1.1.0 README +================== + + From priyank at frugalware.org Sun Mar 2 18:09:30 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 2 18:09:32 2008 Subject: [Frugalware-git] gfpm: indentation fixes Message-ID: <20080302170930.E78001190499@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=6930eb351be7c1b47067cee165839b94a2f3a4dc commit 6930eb351be7c1b47067cee165839b94a2f3a4dc Author: Priyank Date: Sun Mar 2 22:38:53 2008 +0530 indentation fixes diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index d79a4da..171f01f 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -33,7 +33,7 @@ extern GtkWidget *gfpm_mw; GtkProgressBar *progressbar = NULL; -GtkWidget *progresswindow = NULL; +GtkWidget *progresswindow = NULL; static GtkWidget *main_label = NULL; static GtkWidget *sub_label = NULL; static GtkWidget *rate_label = NULL; @@ -45,7 +45,7 @@ static GtkWidget *button_close = NULL; static GtkWidget *autoclose_checkbtn = NULL; GtkTextIter t_iter; -GtkTextBuffer *buffer = NULL; +GtkTextBuffer *buffer = NULL; float rate; int offset; @@ -97,7 +97,8 @@ gfpm_progress_init (void) static void cb_gfpm_close_button_clicked (GtkWidget *button, gpointer data) { - gfpm_progress_show (FALSE); + pacman_trans_release (); +// gfpm_progress_show (FALSE); return; } @@ -167,13 +168,13 @@ gfpm_progress_show (gboolean show) int gfpm_progress_update (netbuf *ctl, int xferred, void *arg) { - int size; - int per; - char text[6]; - char rate_text[10]; - struct timeval t1; - float tdiff; - gchar *rx_str = NULL; + int size; + int per; + char text[6]; + char rate_text[10]; + struct timeval t1; + float tdiff; + gchar *rx_str = NULL; while (gtk_events_pending()) gtk_main_iteration (); @@ -213,7 +214,6 @@ gfpm_progress_update (netbuf *ctl, int xferred, void *arg) while (gtk_events_pending()) gtk_main_iteration (); - return 1; } From janny at frugalware.org Sun Mar 2 21:38:11 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Mar 2 21:38:14 2008 Subject: [Frugalware-git] fwlive_pkgs: grub-theme-fwlive-0.2.8-1-i686 Message-ID: <20080302203812.00815119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=cb5b54b67f25fd87eb2c8226e5c9ebf3c98fba29 commit cb5b54b67f25fd87eb2c8226e5c9ebf3c98fba29 Author: Janos Kovacs Date: Sun Mar 2 21:33:08 2008 +0100 grub-theme-fwlive-0.2.8-1-i686 * version bump * add cs_CZ language diff --git a/source/base-extra/grub-theme-fwlive/FrugalBuild b/source/base-extra/grub-theme-fwlive/FrugalBuild index c10119d..2ec1366 100644 --- a/source/base-extra/grub-theme-fwlive/FrugalBuild +++ b/source/base-extra/grub-theme-fwlive/FrugalBuild @@ -3,10 +3,10 @@ pkgname=grub-theme-fwlive _F_archive_name=fwlive-grub-theme -pkgver=0.2.7 +pkgver=0.2.8 pkgrel=1 pkgdesc="FwLive theme for GRUB gfxboot." -url="http://frugalware.org/~janny/fwlive_themes" +url="http://frugalware.org/~janny/sources_pkgs" rodepends=('grub') makedepends=('gfxboot>=3.3.22' 'perl-html-parser' 'cpio') groups=('base-extra') @@ -14,11 +14,11 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=($url/$_F_archive_name-$pkgver.tar.bz2) options=('nodocs') -sha1sums=('a88bacff3199d9f5e85dce5e2f3fe4e6d6893f82') +sha1sums=('46d47e34bee9661f43ea024bda403798676d18f0') build() { - cd $Fsrcdir/themes/fwlive + cd $Fsrcdir/fwlive make BINDIR=/usr/sbin/ Ffilerel boot/message /boot/grub/message-fwlive } From vmiklos at frugalware.org Sun Mar 2 22:14:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 2 22:14:53 2008 Subject: [Frugalware-git] frugalware-current: hardinfo-0.4.2.3-3-x86_64 Message-ID: <20080302211452.82C41119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08e2512da45ada9646857556d1591d5bec686191 commit 08e2512da45ada9646857556d1591d5bec686191 Author: Miklos Vajna Date: Sun Mar 2 22:14:38 2008 +0100 hardinfo-0.4.2.3-3-x86_64 fix up hardinfo-cflags.diff for the 'lib64' test diff --git a/source/gnome-extra/hardinfo/FrugalBuild b/source/gnome-extra/hardinfo/FrugalBuild index f81d843..881c491 100644 --- a/source/gnome-extra/hardinfo/FrugalBuild +++ b/source/gnome-extra/hardinfo/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hardinfo pkgver=0.4.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A system information and benchmark tool." _F_berlios_ext=".tar.bz2" _F_gnome_desktop="y" @@ -16,6 +16,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') sha1sums=('b76e332dc4dd173a1afed3c3da292f85e9bbfe65' \ '18894bbc8fb42655660e700543adb04db5568308' \ - '43dca595f9548565c973608b05d3a186186fa9f0') + '28d0e569efc9c41d169e7b3c3f88888ab7a411f9') # optimization OK diff --git a/source/gnome-extra/hardinfo/hardinfo-cflags.diff b/source/gnome-extra/hardinfo/hardinfo-cflags.diff index 65418f7..ab5456b 100644 --- a/source/gnome-extra/hardinfo/hardinfo-cflags.diff +++ b/source/gnome-extra/hardinfo/hardinfo-cflags.diff @@ -6,7 +6,7 @@ diff -Naur hardinfo-0.4.2.3/configure hardinfo-0.4.2.3.new/configure ln -sf linux/x86_64 arch/this ARCH="ARCH_x86_64" - LIBDIR="/usr/lib64" ;; -+ LIBDIR="/usr/lib64" ++ LIBDIR="/usr/lib" + PROC="k8" ;; mips*) ln -sf linux/mips arch/this From vmiklos at frugalware.org Mon Mar 3 15:40:02 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 3 15:40:03 2008 Subject: [Frugalware-git] pacman-tools: syncpkgd: don't hardcode /home/syncpkgd Message-ID: <20080303144002.719BE119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=fab116c1de8696e241e6117678eedd1c10b56503 commit fab116c1de8696e241e6117678eedd1c10b56503 Author: Miklos Vajna Date: Mon Mar 3 15:39:58 2008 +0100 syncpkgd: don't hardcode /home/syncpkgd diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 365bb1a..4b12613 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -21,6 +21,7 @@ class Options: class Syncpkgcd: def __init__(self, options): self.options = options + self.home = pwd.getpwnam(options.uid).pw_dir def on_sigterm(num, frame): raise KeyboardInterrupt signal.signal(signal.SIGTERM, on_sigterm) @@ -95,7 +96,7 @@ class Syncpkgcd: pkgver = "-".join(pkgarr[-3:-1]) arch = pkgarr[-1] self.log(pkg, "starting build") - sock = os.popen("export HOME=/home/syncpkgd; . ~/.repoman.conf; echo $fst_root; echo $%s_servers" % tree) + sock = os.popen("export HOME=%s; . ~/.repoman.conf; echo $fst_root; echo $%s_servers" % (self.home, tree)) buf = sock.readlines() sock.close() fst_root = buf[0].strip() @@ -174,7 +175,7 @@ class Syncpkgcd: def system(self, cmd): logfile = "syncpkgcd-%s.log" % time.strftime("%Y%m%d", time.localtime()) - return os.system("export HOME=/home/syncpkgd; %s >> %s 2>&1" % (cmd, logfile)) + return os.system("export HOME=%s; %s >> %s 2>&1" % (self.home, cmd, logfile)) def go(self, pkgname): for root, dirs, files in os.walk("."): From vmiklos at frugalware.org Mon Mar 3 17:16:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 3 17:17:01 2008 Subject: [Frugalware-git] pacman-tools: update syncpkgcd documentation Message-ID: <20080303161659.B3445119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=f9aa42018d5cefcab93d3c2ead81120eef0b0925 commit f9aa42018d5cefcab93d3c2ead81120eef0b0925 Author: Miklos Vajna Date: Mon Mar 3 17:16:31 2008 +0100 update syncpkgcd documentation - remove references to darcs - add note about REMOTEHOME - other minor fixes diff --git a/syncpkgd/syncpkgcd.txt b/syncpkgd/syncpkgcd.txt index 2b384de..7a189e5 100644 --- a/syncpkgd/syncpkgcd.txt +++ b/syncpkgd/syncpkgcd.txt @@ -26,15 +26,19 @@ syncpkgcd [options] To set up syncpkgcd, you need the followings. -* First, check your firewall: outgoing connections to `genesis.frugalware.org` -should be allowed on ports 22 and 80. +* First, check your firewall: outgoing connections to `git.frugalware.org` +should be allowed on ports 22 and 80. (If you use the default Frugalware +firewall configuration then no changes are needed.) * Second, you need to edit the server_url, server_user and server_pass variables -in /etc/syncpkgcd/cconfig.py. +in /etc/syncpkgcd/cconfig.py. In most cases we (the Frugalware developers) +provide the syncpkgd server, so contact us to get an account. * Now switch to the syncpkgd user, using: ---- +# mkdir -p /home/syncpkgd +# chown syncpkgd.daemon /home/syncpkgd # su - syncpkgd ---- @@ -47,17 +51,18 @@ $ ssh-keygen -t dsa NOTE: The `\~/.ssh/id_dsa.pub` file should be appended to `\~/.ssh/authorized_keys` on the server with a `command="syncpkg-shell " ` prefix. -* Add the followings to your `\~/.repoman.conf`: +* Add the followings to your `\~/.repoman.conf` (still as `syncpkgd`): ---- repos=('stable' 'current') -stable_servers=("syncpkgd@darcs.frugalware.org:/home/ftp/pub/frugalware/frugalware-stable") +stable_servers=("syncpkgd@git.frugalware.org:/home/ftp/pub/frugalware/frugalware-stable") current_servers=("syncpkgd@git.frugalware.org:/home/ftp/pub/frugalware/frugalware-current") fst_root=~/repos +REMOTEHOME=/home/syncpkgd ---- -* Now login to darcs.frugalware.org and git.frugalware.org manually so that the -fingerprint of the servers will be added to the `\~/.ssh/known_hosts` file. +* Now login to git.frugalware.org manually so that the fingerprint of the + servers will be added to the `\~/.ssh/known_hosts` file. * You need to create the directory: @@ -65,7 +70,17 @@ fingerprint of the servers will be added to the `\~/.ssh/known_hosts` file. $ mkdir -p ~/repos ---- -* And now you can enable and start syncpkgcd: +* You are done with the user configuration, switch back to root and check if + the line + +---- +syncpkgd ALL=(ALL) NOPASSWD: /usr/bin/makepkg +---- + +is in `/etc/sudoers`. It should be, if you installed the `pacman-tools` package +and you haven't commented it out. + +* Finally you can enable and start syncpkgcd as root: ---- # service syncpkgcd add From vmiklos at frugalware.org Mon Mar 3 20:44:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 3 20:44:46 2008 Subject: [Frugalware-git] frugalware-current: tools/usb_install: get rid of the bc dependency Message-ID: <20080303194445.0CD5F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=760ecca8255529079181cbd4264a93f69449e3a8 commit 760ecca8255529079181cbd4264a93f69449e3a8 Author: Miklos Vajna Date: Mon Mar 3 20:44:13 2008 +0100 tools/usb_install: get rid of the bc dependency closes #2817 diff --git a/tools/usb_install.sh b/tools/usb_install.sh index f100eb8..131bb31 100644 --- a/tools/usb_install.sh +++ b/tools/usb_install.sh @@ -166,7 +166,7 @@ ver=`grep '' volumes.xml |sed 's/.*>\(.*\)<.*/\1/'` [ -z "$ver" ] && ver=`date +%Y%m%d` rel=`grep '' volumes.xml |sed 's/.*>\(.*\)<.*/\1/'` [ -z "$rel" ] && rel="-current" -size=`echo "$(gzip --list initrd-$(uname -m).img.gz|grep initrd-$(uname -m).img|sed 's/.*[0-9]\+ \+\([0-9]\+\) .*/\1/')/1024"|bc` +size=$(expr $(zcat initrd-$(uname -m).img.gz | wc --bytes) / 1024) echo "default=0 timeout=10 gfxmenu /boot/grub/message From vmiklos at frugalware.org Mon Mar 3 23:28:10 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 3 23:28:13 2008 Subject: [Frugalware-git] frugalware-current: perl-5.10.0-3-i686 Message-ID: <20080303222810.6E773119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69a6a65860416ed96c86b4da965be0a8e9d5c70d commit 69a6a65860416ed96c86b4da965be0a8e9d5c70d Author: Miklos Vajna Date: Mon Mar 3 23:27:48 2008 +0100 perl-5.10.0-3-i686 - fix symlink handling in install script - closes #2833 diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild index 07fa5a3..1649ea2 100644 --- a/source/base/perl/FrugalBuild +++ b/source/base/perl/FrugalBuild @@ -4,7 +4,7 @@ pkgname=perl pkgver=5.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Practical Extraction and Report Language." url="http://www.perl.org/" depends=('gdbm' 'db>=4.6.18') @@ -18,9 +18,8 @@ groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.perl.org/|grep -m1 'Current Release:'|sed 's/.*]\(.*\).*/\1/'" source=(http://www.cpan.org/src/5.0/$pkgname-$pkgver.tar.gz \ - $pkgname.install libnet.cfg perl-5.8.6-picdl.patch0) + libnet.cfg perl-5.8.6-picdl.patch0) sha1sums=('adf73606dd5248af7ccdd735bcaa0e628ea75b3c' \ - 'af913431187111c8051dcbde5081ee746ece8dd0' \ '92179e28215bf7b802ded72e0ca6e473a21f5003' \ '3000bd0130ed20e0ff5d9fb0147240e3909473a7') diff --git a/source/base/perl/perl.install b/source/base/perl/perl.install index 7517146..6a47265 100644 --- a/source/base/perl/perl.install +++ b/source/base/perl/perl.install @@ -1,7 +1,7 @@ post_install() { for ver in 5.8.{0,1,2,3,4,5,6,7,8} 5.10.0; do if [ -d usr/lib/perl5/$ver ] && \ - [ ! `test -h usr/lib/perl5/$ver; echo $?` ]; then + [ ! -h usr/lib/perl5/$ver ]; then echo -n "adapting old version: $ver... " cp --no-dereference -pr --reply=no usr/lib/perl5/$ver/* usr/lib/perl5/current/ >/dev/null 2>&1 cp --no-dereference -pr --reply=no usr/lib/perl5/site_perl/$ver/* usr/lib/perl5/site_perl/current/ >/dev/null 2>&1 From janny at frugalware.org Tue Mar 4 08:09:29 2008 From: janny at frugalware.org (Janos Kovacs) Date: Tue Mar 4 08:09:31 2008 Subject: [Frugalware-git] fwlive_pkgs: grub-theme-fwlive-0.2.8.1-1-i686 Message-ID: <20080304070929.51EBE1190216@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=4223a362ef1b64b87ba8188c4a187be019110caf commit 4223a362ef1b64b87ba8188c4a187be019110caf Author: Janos Kovacs Date: Tue Mar 4 08:07:17 2008 +0100 grub-theme-fwlive-0.2.8.1-1-i686 * version bump * add F1 (help) menu item (Big thx to IroNiQ) diff --git a/source/base-extra/grub-theme-fwlive/FrugalBuild b/source/base-extra/grub-theme-fwlive/FrugalBuild index 2ec1366..3252678 100644 --- a/source/base-extra/grub-theme-fwlive/FrugalBuild +++ b/source/base-extra/grub-theme-fwlive/FrugalBuild @@ -3,18 +3,18 @@ pkgname=grub-theme-fwlive _F_archive_name=fwlive-grub-theme -pkgver=0.2.8 +pkgver=0.2.8.1 pkgrel=1 pkgdesc="FwLive theme for GRUB gfxboot." -url="http://frugalware.org/~janny/sources_pkgs" +url="http://frugalware.org/~janny/source_pkgs" rodepends=('grub') makedepends=('gfxboot>=3.3.22' 'perl-html-parser' 'cpio') groups=('base-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" -source=($url/$_F_archive_name-$pkgver.tar.bz2) +source=($url/$_F_archive_name-$pkgver.tar.gz) options=('nodocs') -sha1sums=('46d47e34bee9661f43ea024bda403798676d18f0') +sha1sums=('4100ad807fe01b0abf010bafa28a333363ba5415') build() { From vmiklos at frugalware.org Tue Mar 4 10:28:56 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Mar 4 10:28:58 2008 Subject: [Frugalware-git] frugalware-0.7: kernel-2.6.22-7sayshell6-i686 Message-ID: <20080304092856.7E0F11190216@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=6c295cc15aea7dc2101d438ce5987d8a571ecc7d commit 6c295cc15aea7dc2101d438ce5987d8a571ecc7d Author: Miklos Vajna Date: Tue Mar 4 10:27:24 2008 +0100 kernel-2.6.22-7sayshell6-i686 - update to patchlevel '.19' - closes #2834 diff --git a/source/base/kernel/29eb51101c02df517ca64ec472d7501127ad1da8.patch b/source/base/kernel/29eb51101c02df517ca64ec472d7501127ad1da8.patch deleted file mode 100644 index f670643..0000000 --- a/source/base/kernel/29eb51101c02df517ca64ec472d7501127ad1da8.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Roland McGrath -Date: Mon, 16 Jul 2007 08:03:16 +0000 (-0700) -Subject: Handle bogus %cs selector in single-step instruction decoding -X-Git-Tag: v2.6.23-rc1~492 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=29eb51101c02df517ca64ec472d7501127ad1da8 - -Handle bogus %cs selector in single-step instruction decoding - -The code for LDT segment selectors was not robust in the face of a bogus -selector set in %cs via ptrace before the single-step was done. - -Signed-off-by: Roland McGrath -Signed-off-by: Linus Torvalds ---- - -diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c -index 1c075f5..0c8f00e 100644 ---- a/arch/i386/kernel/ptrace.c -+++ b/arch/i386/kernel/ptrace.c -@@ -164,14 +164,22 @@ static unsigned long convert_eip_to_linear(struct task_struct *child, struct pt_ - u32 *desc; - unsigned long base; - -- down(&child->mm->context.sem); -- desc = child->mm->context.ldt + (seg & ~7); -- base = (desc[0] >> 16) | ((desc[1] & 0xff) << 16) | (desc[1] & 0xff000000); -+ seg &= ~7UL; - -- /* 16-bit code segment? */ -- if (!((desc[1] >> 22) & 1)) -- addr &= 0xffff; -- addr += base; -+ down(&child->mm->context.sem); -+ if (unlikely((seg >> 3) >= child->mm->context.size)) -+ addr = -1L; /* bogus selector, access would fault */ -+ else { -+ desc = child->mm->context.ldt + seg; -+ base = ((desc[0] >> 16) | -+ ((desc[1] & 0xff) << 16) | -+ (desc[1] & 0xff000000)); -+ -+ /* 16-bit code segment? */ -+ if (!((desc[1] >> 22) & 1)) -+ addr &= 0xffff; -+ addr += base; -+ } - up(&child->mm->context.sem); - } - return addr; -diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c -index fa6775e..e83cc67 100644 ---- a/arch/x86_64/kernel/ptrace.c -+++ b/arch/x86_64/kernel/ptrace.c -@@ -102,16 +102,25 @@ unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *r - u32 *desc; - unsigned long base; - -- down(&child->mm->context.sem); -- desc = child->mm->context.ldt + (seg & ~7); -- base = (desc[0] >> 16) | ((desc[1] & 0xff) << 16) | (desc[1] & 0xff000000); -+ seg &= ~7UL; - -- /* 16-bit code segment? */ -- if (!((desc[1] >> 22) & 1)) -- addr &= 0xffff; -- addr += base; -+ down(&child->mm->context.sem); -+ if (unlikely((seg >> 3) >= child->mm->context.size)) -+ addr = -1L; /* bogus selector, access would fault */ -+ else { -+ desc = child->mm->context.ldt + seg; -+ base = ((desc[0] >> 16) | -+ ((desc[1] & 0xff) << 16) | -+ (desc[1] & 0xff000000)); -+ -+ /* 16-bit code segment? */ -+ if (!((desc[1] >> 22) & 1)) -+ addr &= 0xffff; -+ addr += base; -+ } - up(&child->mm->context.sem); - } -+ - return addr; - } - diff --git a/source/base/kernel/CVE-2007-6206.diff b/source/base/kernel/CVE-2007-6206.diff deleted file mode 100644 index cd6b4e5..0000000 --- a/source/base/kernel/CVE-2007-6206.diff +++ /dev/null @@ -1,37 +0,0 @@ -From: Ingo Molnar -Date: Wed, 28 Nov 2007 12:59:18 +0000 (+0100) -Subject: vfs: coredumping fix -X-Git-Tag: v2.6.24-rc4~82 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c46f739dd39db3b07ab5deb4e3ec81e1c04a91af - -vfs: coredumping fix - -fix: http://bugzilla.kernel.org/show_bug.cgi?id=3043 - -only allow coredumping to the same uid that the coredumping -task runs under. - -Signed-off-by: Ingo Molnar -Acked-by: Alan Cox -Acked-by: Christoph Hellwig -Acked-by: Al Viro -Signed-off-by: Linus Torvalds ---- - -diff --git a/fs/exec.c b/fs/exec.c -index 4ccaaa4..282240a 100644 ---- a/fs/exec.c -+++ b/fs/exec.c -@@ -1780,6 +1780,12 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs) - but keep the previous behaviour for now. */ - if (!ispipe && !S_ISREG(inode->i_mode)) - goto close_fail; -+ /* -+ * Dont allow local users get cute and trick others to coredump -+ * into their pre-created files: -+ */ -+ if (inode->i_uid != current->fsuid) -+ goto close_fail; - if (!file->f_op) - goto close_fail; - if (!file->f_op->write) diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 263e637..60b72bb 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -2,11 +2,8 @@ # Maintainer: VMiklos _F_kernel_patches=(aacraid.diff pxa27x.diff CVE-2007-3843.diff \ - 29eb51101c02df517ca64ec472d7501127ad1da8.patch \ - a10d9a71bafd3a283da240d2868e71346d2aef6f.patch \ - CVE-2007-6206.diff \ CVE-2008-0009-10.diff) Finclude kernel # you can safely bump this. on the first bump you MUST rebuild all the external # kernel modules so that they will have >=-styled deps instead of the = ones -pkgrel=7sayshell5 +pkgrel=7sayshell6 diff --git a/source/base/kernel/a10d9a71bafd3a283da240d2868e71346d2aef6f.patch b/source/base/kernel/a10d9a71bafd3a283da240d2868e71346d2aef6f.patch deleted file mode 100644 index b033800..0000000 --- a/source/base/kernel/a10d9a71bafd3a283da240d2868e71346d2aef6f.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: Peter Zijlstra -Date: Wed, 18 Jul 2007 18:59:22 +0000 (+0200) -Subject: i386: fixup TRACE_IRQ breakage -X-Git-Tag: v2.6.23-rc1~491 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a10d9a71bafd3a283da240d2868e71346d2aef6f - -i386: fixup TRACE_IRQ breakage - -The TRACE_IRQS_ON function in iret_exc: calls a C function without -ensuring that the segments are set properly. Move the trace function and -the enabling of interrupt into the C stub. - -Signed-off-by: Peter Zijlstra -Signed-off-by: Linus Torvalds ---- - -diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S -index 32980b8..a714d6b 100644 ---- a/arch/i386/kernel/entry.S -+++ b/arch/i386/kernel/entry.S -@@ -409,8 +409,6 @@ restore_nocheck_notrace: - 1: INTERRUPT_RETURN - .section .fixup,"ax" - iret_exc: -- TRACE_IRQS_ON -- ENABLE_INTERRUPTS(CLBR_NONE) - pushl $0 # no error code - pushl $do_iret_error - jmp error_code -diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c -index 18c1c28..d32fd4b 100644 ---- a/arch/i386/kernel/traps.c -+++ b/arch/i386/kernel/traps.c -@@ -518,10 +518,12 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \ - do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \ - } - --#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \ -+#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \ - fastcall void do_##name(struct pt_regs * regs, long error_code) \ - { \ - siginfo_t info; \ -+ if (irq) \ -+ local_irq_enable(); \ - info.si_signo = signr; \ - info.si_errno = 0; \ - info.si_code = sicode; \ -@@ -561,13 +563,13 @@ DO_VM86_ERROR( 3, SIGTRAP, "int3", int3) - #endif - DO_VM86_ERROR( 4, SIGSEGV, "overflow", overflow) - DO_VM86_ERROR( 5, SIGSEGV, "bounds", bounds) --DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->eip) -+DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->eip, 0) - DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) - DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) - DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) - DO_ERROR(12, SIGBUS, "stack segment", stack_segment) --DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) --DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0) -+DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) -+DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) - - fastcall void __kprobes do_general_protection(struct pt_regs * regs, - long error_code) diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 307b296..3d7ae20 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -18,4 +18,4 @@ # don't touch these! _F_kernelver_ver=2.6.22 _F_kernelver_rel=6 -_F_kernelver_stable=16 +_F_kernelver_stable=19 From janny at frugalware.org Tue Mar 4 14:43:49 2008 From: janny at frugalware.org (Janny) Date: Tue Mar 4 14:43:51 2008 Subject: [Frugalware-git] fwlive: fwlive-cmline Message-ID: <20080304134349.61A261190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=3417d228c26706848fc8e600df71cf411bdd90d3 commit 3417d228c26706848fc8e600df71cf411bdd90d3 Author: Janny Date: Tue Mar 4 14:42:25 2008 +0100 fwlive-cmline * add two options to cmdline parameters * autoexec and passwd diff --git a/parse_cmdline.in b/parse_cmdline.in index b0035e9..bbe4749 100644 --- a/parse_cmdline.in +++ b/parse_cmdline.in @@ -67,3 +67,33 @@ printf ' ================================================================ } gen_issue > /etc/issue + +. /usr/lib/liblinuxlive + +# change password +NEWROOTPASS="`cmdline_value passwd`" +if [ "$NEWROOTPASS" = "ask" ]; then + echo -ne "\nEnter new password for root: " + read -s NEWROOTPASS +fi + +if [ ! "$NEWROOTPASS" = "" ]; then + echo "root:$NEWROOTPASS" | /usr/sbin/chpasswd +fi + +# debug +#if grep debug /proc/cmdline 2>/dev/null >/dev/null; then +# show_debug_banner +# /mnt/live/bin/ash || /bin/bash || /bin/sh +#fi + +# if autoexec= boot parameter is present, automatically start the command given. +# If you need to execute several commands, separate them using ';' +# If you need to use spaces in your command, use ~ instead +# If you wish to reboot/poweroff after the command's execution is finished, +# simply use autoexec=yourCommand;poweroff for example. +AUTOCMD=$(cmdline_value "autoexec" | tr "~" " ") +if [ "$AUTOCMD" != "" ]; then + echo "starting autoexec command: su --login -c \"$AUTOCMD\"" + su --login -c "$AUTOCMD" +fi From priyank at frugalware.org Tue Mar 4 17:07:24 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 17:07:25 2008 Subject: [Frugalware-git] gfpm: changed the text of some buttons on the quick pane to make it more clear for the user Message-ID: <20080304160724.A4DC41190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=9abacb8bb86910ae6f0c015d086611deb263dbef commit 9abacb8bb86910ae6f0c015d086611deb263dbef Author: Priyank Date: Tue Mar 4 21:36:24 2008 +0530 changed the text of some buttons on the quick pane to make it more clear for the user * Closes #2814 diff --git a/data/gfpm.glade b/data/gfpm.glade index 24c09d1..65347ff 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -663,7 +663,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Install + Install this Package 1 @@ -700,7 +700,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove + Remove this Package 1 @@ -740,7 +740,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Upgrade + Upgrade this Package 1 From priyank at frugalware.org Tue Mar 4 17:08:55 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 17:08:56 2008 Subject: [Frugalware-git] gfpm: hide the help button for now (until the documentation for gfpm is ready) as it does nothing. Message-ID: <20080304160855.0484F1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=192464154ec91877ed0ed072202e14a0b8202bca commit 192464154ec91877ed0ed072202e14a0b8202bca Author: Priyank Date: Tue Mar 4 21:37:53 2008 +0530 hide the help button for now (until the documentation for gfpm is ready) as it does nothing. * Closes #2811 diff --git a/data/gfpm.glade b/data/gfpm.glade index 65347ff..f53f8be 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -201,7 +201,6 @@ - True Help True gtk-help From priyank at frugalware.org Tue Mar 4 17:18:30 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 17:18:32 2008 Subject: [Frugalware-git] frugalware-current: gfpm-1.1.0-2-i686 Message-ID: <20080304161830.500521190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=276dd4badf5b27128d7f571da76c93081ea8b363 commit 276dd4badf5b27128d7f571da76c93081ea8b363 Author: Priyank Date: Tue Mar 4 21:46:26 2008 +0530 gfpm-1.1.0-2-i686 * backported changes from gfpm-git * Closes #2811 diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild index e321a3a..87b6eb5 100644 --- a/source/xapps/gfpm/FrugalBuild +++ b/source/xapps/gfpm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gfpm pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical Frugalware Package Manager" url="http://ftp.frugalware.org/pub/other/gfpm" depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2>=3.6.7-2' 'inotify-tools' 'frugalwareutils>=0.7.9') @@ -14,8 +14,8 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="lynx -dump $url | Flasttar" -source=($url/$pkgname-$pkgver.tar.gz) -signatures=(${source[0]}.asc) +source=($url/$pkgname-$pkgver.tar.gz gfpm_hide_help_button.diff) +signatures=(${source[0]}.asc '') build() { diff --git a/source/xapps/gfpm/gfpm_hide_help_button.diff b/source/xapps/gfpm/gfpm_hide_help_button.diff new file mode 100644 index 0000000..a3f3588 --- /dev/null +++ b/source/xapps/gfpm/gfpm_hide_help_button.diff @@ -0,0 +1,11 @@ +diff -Naur gfpm-1.1.0/data/gfpm.glade gfpm-1.1.0.new/data/gfpm.glade +--- gfpm-1.1.0/data/gfpm.glade 2008-03-02 01:22:31.000000000 +0530 ++++ gfpm-1.1.0.new/data/gfpm.glade 2008-03-04 21:41:03.000000000 +0530 +@@ -201,7 +201,6 @@ + + + +- True + Help + True + gtk-help From vmiklos at frugalware.org Tue Mar 4 17:51:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Mar 4 17:51:33 2008 Subject: [Frugalware-git] homepage-ng: FSA372-kernel Message-ID: <20080304165131.CCA361190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=802b67e5253a76fa524baad0a66d719e475e86e0 commit 802b67e5253a76fa524baad0a66d719e475e86e0 Author: Miklos Vajna Date: Tue Mar 4 17:51:23 2008 +0100 FSA372-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index eec0d04..9ebf741 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,20 @@ + 372 + 2008-03-04 + vmiklos + kernel + 2.6.22-7sayshell5 + 2.6.22-7sayshell6 + http://bugs.frugalware.org/task/2834 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0007 + A vulnerability have been reported in the Linux Kernel, which can be exploited by malicious, local users to disclose potentially sensitive information or gain escalated privileges. + The vulnerability is caused due to certain drivers with registered page fault handlers not correctly preventing size expansions of mapped memory regions beyond the originally allocated size. This can be exploited to gain access to other memory areas via e.g. the "mremap()" system call. + Successful exploitation may allow local attackers to disclose and manipulate kernel memory, which potentially can be leveraged to gain escalated privileges. + + + 371 2008-02-26 vmiklos From priyank at frugalware.org Tue Mar 4 17:59:06 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 17:59:08 2008 Subject: [Frugalware-git] gfpm: don't initialize gfpm-repomanager if gfpm is not run as root (prevents a crash when run as non-root user) Message-ID: <20080304165906.8C9C31190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=4a6bb7ab051009fbb329326bc25c1c2a352294fa commit 4a6bb7ab051009fbb329326bc25c1c2a352294fa Author: Priyank Date: Tue Mar 4 22:28:20 2008 +0530 don't initialize gfpm-repomanager if gfpm is not run as root (prevents a crash when run as non-root user) diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 125a40e..516b4dd 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -338,6 +338,10 @@ gfpm_interface_init (void) gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_refresh1"), FALSE); gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_file1"), FALSE); } + else + { + gfpm_repomanager_init (); + } /* initialize modules */ if (gfpm_db_init ()) @@ -347,7 +351,6 @@ gfpm_interface_init (void) gfpm_optimize_db_dlg_init (); gfpm_quickpane_init (); gfpm_icmonitor_init (); - gfpm_repomanager_init (); gfpm_logviewer_init (); gtk_widget_hide (gfpm_splash); From priyank at frugalware.org Tue Mar 4 18:03:33 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 18:03:35 2008 Subject: [Frugalware-git] gfpm: disable the quick pane buttons Install, Remove, Upgrade if gfpm is not run as root. Message-ID: <20080304170333.286111190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=5d306235ece69b779d8da6047adae7cb288444fc commit 5d306235ece69b779d8da6047adae7cb288444fc Author: Priyank Date: Tue Mar 4 22:32:53 2008 +0530 disable the quick pane buttons Install,Remove,Upgrade if gfpm is not run as root. diff --git a/src/gfpm-quickpane.c b/src/gfpm-quickpane.c index 9b87294..7cdd2c3 100644 --- a/src/gfpm-quickpane.c +++ b/src/gfpm-quickpane.c @@ -73,6 +73,14 @@ gfpm_quickpane_init (void) "clicked", G_CALLBACK(cb_gfpm_quickpane_readme_clicked), NULL); + + /* Disable the Quick pane Install,Remove,Upgrade buttons if gfpm is not run as root */ + if (geteuid() != 0) + { + gtk_widget_set_sensitive ("quick_pane_install_btn", FALSE); + gtk_widget_set_sensitive ("quick_pane_remove_btn", FALSE); + gtk_widget_set_sensitive ("quick_pane_upgrade_btn", FALSE); + } return; } From priyank at frugalware.org Tue Mar 4 18:04:36 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 18:04:38 2008 Subject: [Frugalware-git] gfpm: bah widgets are not strings :( Message-ID: <20080304170436.18B561190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=8778a078acc2e3b22949a7dadebcae2a189fd7e0 commit 8778a078acc2e3b22949a7dadebcae2a189fd7e0 Author: Priyank Date: Tue Mar 4 22:33:55 2008 +0530 bah widgets are not strings :( diff --git a/src/gfpm-quickpane.c b/src/gfpm-quickpane.c index 7cdd2c3..fc1b5d5 100644 --- a/src/gfpm-quickpane.c +++ b/src/gfpm-quickpane.c @@ -77,9 +77,9 @@ gfpm_quickpane_init (void) /* Disable the Quick pane Install,Remove,Upgrade buttons if gfpm is not run as root */ if (geteuid() != 0) { - gtk_widget_set_sensitive ("quick_pane_install_btn", FALSE); - gtk_widget_set_sensitive ("quick_pane_remove_btn", FALSE); - gtk_widget_set_sensitive ("quick_pane_upgrade_btn", FALSE); + gtk_widget_set_sensitive (quick_pane_install_btn, FALSE); + gtk_widget_set_sensitive (quick_pane_remove_btn, FALSE); + gtk_widget_set_sensitive (quick_pane_upgrade_btn, FALSE); } return; From priyank at frugalware.org Tue Mar 4 18:09:24 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 18:09:27 2008 Subject: [Frugalware-git] gfpm: Don't allow the user to do things like databse optimization, manage repositories etc if gfpm is run as non-root user. Message-ID: <20080304170924.B67D71190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=f44c9d5b02c553fb0e0c36f40146efe6e48cc6e4 commit f44c9d5b02c553fb0e0c36f40146efe6e48cc6e4 Author: Priyank Date: Tue Mar 4 22:38:43 2008 +0530 Don't allow the user to do things like databse optimization, manage repositories etc if gfpm is run as non-root user. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 516b4dd..0290e1d 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -334,13 +334,19 @@ gfpm_interface_init (void) /* Disable Apply, Refresh and File buttons if user is not root */ if ( geteuid() != 0 ) { + /* disable some widgets */ gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_apply"), FALSE); gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_refresh1"), FALSE); gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_file1"), FALSE); + gtk_widget_set_sensitive (gfpm_get_widget("repos"), FALSE); + gtk_widget_set_sensitive (gfpm_get_widget("clr1"), FALSE); + gtk_widget_set_sensitive (gfpm_get_widget("opt1"), FALSE); } else { + /* init repomanager only if gfpm is run as root user */ gfpm_repomanager_init (); + } /* initialize modules */ From priyank at frugalware.org Tue Mar 4 18:15:25 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 18:15:26 2008 Subject: [Frugalware-git] gfpm: hide the right-click context menu for packages if gfpm is run as non-root user. Message-ID: <20080304171525.2045B1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=0a269dca0f61dad0c2ce5ac781533072f936016e commit 0a269dca0f61dad0c2ce5ac781533072f936016e Author: Priyank Date: Tue Mar 4 22:44:45 2008 +0530 hide the right-click context menu for packages if gfpm is run as non-root user. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 0290e1d..ed90c27 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -1446,6 +1446,9 @@ cb_gfpm_pkgs_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event) if (event->button != 3) return; + if (geteuid() != 0) + return; + model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_pkgs_tvw)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_pkgs_tvw)); if ( FALSE == gtk_tree_selection_get_selected (selection, &model, &iter) ) @@ -1496,7 +1499,7 @@ cb_gfpm_pkgs_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event) g_signal_connect (G_OBJECT(menu_item), "activate", G_CALLBACK(cb_gfpm_mark_for_reinstall), (gpointer)pkgname); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item); gtk_widget_show (menu_item); - + menu_item = gtk_image_menu_item_new_with_label (_("Mark for removal")); image = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item), image); From janny at frugalware.org Tue Mar 4 18:17:52 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 18:17:54 2008 Subject: [Frugalware-git] fwlive: redirfs-fwlive-0.2-3-i686 Message-ID: <20080304171752.ADDAC1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=c90153923fbdbd4fb5a69545caa7259996dcebf9 commit c90153923fbdbd4fb5a69545caa7259996dcebf9 Author: janny Date: Tue Mar 4 18:17:10 2008 +0100 redirfs-fwlive-0.2-3-i686 * add redifs to fwlive repo diff --git a/source/apps-extra/redirfs-fwlive/FrugalBuild b/source/apps-extra/redirfs-fwlive/FrugalBuild new file mode 100644 index 0000000..3f00a07 --- /dev/null +++ b/source/apps-extra/redirfs-fwlive/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.04 SBU +# Maintainer: VMiklos + +pkgname=redirfs-fwlive +_F_archive_name=redirfs +pkgver=0.2 +pkgrel=3 +pkgdesc="Redirecting FileSystem" +url="http://redirfs.org/" +_F_kernelmod_scriptlet=$_F_archive_name.install +Finclude kernel-module +kver=2.6.24-3 +depends=("kernel-fwlive=$kver") +makedepends=("kernel-fwlive-source=$kver") +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://redirfs.org/tiki-index.php?page=redirfs_download|grep -m1 gz$|Flasttar" +source=(http://www.redirfs.org/packages/redirfs-$pkgver.tar.gz) +sha1sums=('c736b6a9b9cb0540010eb865febfd4f3b1fe6d82') + +build() +{ + # no Fcheckkernel, crosscompilation verified + Fsed 'uname -r' "echo $_F_kernelmod_uname" Makefile + Fmake + Ffilerel /lib/modules/$_F_kernelmod_uname/extra/$_F_archive_name.ko + Fbuild_kernelmod_scriptlet +} diff --git a/source/apps-extra/redirfs-fwlive/redirfs.install b/source/apps-extra/redirfs-fwlive/redirfs.install new file mode 100644 index 0000000..8162fbb --- /dev/null +++ b/source/apps-extra/redirfs-fwlive/redirfs.install @@ -0,0 +1,38 @@ +post_install() +{ + if ! grep -q redirfs /etc/sysconfig/modules; then + echo -n "adding redirfs to /etc/sysconfig/modules..." + echo redirfs >> /etc/sysconfig/modules + echo " done." + fi + depmod -a $_F_kernelmod_uname + if lsmod|grep -q redirfs; then + rmmod redirfs + fi + echo -n "loading redirfs..." + modprobe redirfs + echo " done." +} + +post_upgrade() +{ + post_install +} + +pre_remove() +{ + if grep -q redirfs /etc/sysconfig/modules; then + echo -n "removing redirfs from /etc/sysconfig/modules..." + sed -i '/^redirfs/d' /etc/sysconfig/modules + echo " done." + fi + if lsmod|grep -q redirfs; then + echo -n "unloading redirfs..." + rmmod redirfs + echo " done." + fi +} + +op=$1 +shift +$op $* From vmiklos at frugalware.org Tue Mar 4 18:23:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Mar 4 18:23:48 2008 Subject: [Frugalware-git] frugalware-current: jed-0.99_18-4-i686 Message-ID: <20080304172345.7AB5B1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b936f5b415e16267b724c1ed6177c9ed69a6bf73 commit b936f5b415e16267b724c1ed6177c9ed69a6bf73 Author: Miklos Vajna Date: Tue Mar 4 18:20:43 2008 +0100 jed-0.99_18-4-i686 - move /usr/lib to /usr/share/jed/lib as --libdir=/usr/share/jed won't work - closes #1918 diff --git a/source/apps-extra/jed/FrugalBuild b/source/apps-extra/jed/FrugalBuild index 5054ade..faea2c5 100644 --- a/source/apps-extra/jed/FrugalBuild +++ b/source/apps-extra/jed/FrugalBuild @@ -4,7 +4,7 @@ pkgname=jed pkgver=0.99_18 -pkgrel=3 +pkgrel=4 pkgdesc="An extremely powerful but small emacs-like programmer's editor" url="http://www.jedsoft.org/jed/" depends=('slang>=2.0.7' 'gpm') @@ -16,22 +16,22 @@ source=(ftp://space.mit.edu/pub/davis/jed/v${pkgver%_*}/$pkgname-${pkgver/_/-}.t license="GPL2" sha1sums=('fa4b3313fdde0466546e36100b0de2d9cc75806d' \ 'eec8882c1a835e06bddee99026f264a03514f2d2') +Finclude texinfo build() { - export JED_ROOT=/usr + export JED_ROOT=/usr/share/jed Fcd $pkgname-${pkgver/_/-} Fpatchall Fmake make DESTDIR=$Fdestdir install # Fmakeinstall doesn't work with jed # move documentation to the right place - Fmkdir /usr/share/doc/$pkgname-$pkgver - for i in hlp manual txt README - do - Fmv /usr/doc/$i /usr/share/doc/$pkgname-$pkgver - done - # conflicts with texinfo - Frm /usr/info/info.info + Fmv usr/share/jed/info usr/share/info + Frm usr/share/info/{dir,info}* + Fmkdir usr/share/doc + Fmv usr/share/jed/doc usr/share/doc/$pkgname-$pkgver + # remove empty dir + Frm /usr/share/jed/bin } # optimization OK From janny at frugalware.org Tue Mar 4 18:29:59 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 18:30:03 2008 Subject: [Frugalware-git] fwlive: dazuko-fwlive-2.3.4-10-i686 Message-ID: <20080304172959.C3EDC1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=bbccf9c37408ddbaec780f75e1fb2e8e6cae6297 commit bbccf9c37408ddbaec780f75e1fb2e8e6cae6297 Author: janny Date: Tue Mar 4 18:27:32 2008 +0100 dazuko-fwlive-2.3.4-10-i686 * version bump in fwlive repo diff --git a/source/apps-extra/dazuko-fwlive/FrugalBuild b/source/apps-extra/dazuko-fwlive/FrugalBuild index aad33dc..aeb1171 100644 --- a/source/apps-extra/dazuko-fwlive/FrugalBuild +++ b/source/apps-extra/dazuko-fwlive/FrugalBuild @@ -2,23 +2,37 @@ # Maintainer: Janny pkgname=dazuko-fwlive -pkgver=2.3.3 -pkgrel=6 +_F_archive_name=dazuko +pkgver=2.3.4 +redirver=0.2 +pkgrel=10 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" -#Finclude kernel-module -kver=2.6.22-1 -depends=("kernel-fwlive=$kver") +_F_kernelmod_scriptlet=$_F_archive_name.install +Finclude kernel-module +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" "redirfs-fwlive=$redirver") makedepends=("kernel-fwlive-source=$kver") archs=('i686' 'x86_64') groups=('apps-extra') up2date="lynx -dump '$url/files/?M=O' | grep -v source |grep -v birthday|grep -v pre|Flasttar" -source=(http://www.dazuko.org/files/dazuko-$pkgver.tar.gz \ - README.Frugalware) +source=(http://www.dazuko.org/files/$_F_archive_name-$pkgver.tar.gz \ + http://www.redirfs.org/packages/redirfs-$redirver.tar.gz \ + README.Frugalware \ + 0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch \ + 0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch \ + 0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch) +sha1sums=('271d0a23d7aed2555f023141504386b6042a5efa' \ + 'c736b6a9b9cb0540010eb865febfd4f3b1fe6d82' \ + '8292447cba4bdab9dfbb8169c011e74559a00804' \ + 'eebf571563481dba5bce10900b02bff5d6e30b78' \ + '4f6b6b45a2be49a4e90fd7fb2ad4e40d9e50c436' \ + 'd45e7a44154f61d79f54c940ba6fa6085c88cbf6') build() { - Fcd dazuko-$pkgver/ + Fcd + ln -s redirfs-$redirver ../redirfs # Patch needed by some F-Secure softwares patch -p0 < patch_fsecure_init_event.diff || Fdie # no Fcheckkernel, crosscompilation verified @@ -26,12 +40,11 @@ build() { Fsed '`uname -r`' "$_F_kernelmod_uname" configure find . -type f -exec sed -i '/#include /d' {} \; ./configure --system=linux26 --disable-chroot-support \ - --without-dep --enable-event-init-module || Fdie + --without-dep --enable-event-init-module --enable-redirfs || Fdie make || Fdie - Ffilerel $_F_kernelmod_dir/extra/dazuko.ko + Ffilerel $_F_kernelmod_dir/extra/$_F_archive_name.ko make -C library || Fdie - Ffile dazuko-${pkgver//_/-}/library/libdazuko.a /usr/lib/libdazuko.a + Ffile $_F_archive_name-${pkgver//_/-}/library/libdazuko.a /usr/lib/libdazuko.a Fdoc README.Frugalware + Fbuild_kernelmod_scriptlet } -sha1sums=('a1772d42327a9c2cc5737993abd2a3bc392ae67c'\ - '8292447cba4bdab9dfbb8169c011e74559a00804') diff --git a/source/apps-extra/dazuko-fwlive/dazuko.html b/source/apps-extra/dazuko-fwlive/dazuko.html deleted file mode 100644 index a3f583e..0000000 --- a/source/apps-extra/dazuko-fwlive/dazuko.html +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - -Packages - - - -

      dazuko

      -
      -

      If you got errors saying:

      -

      dazuko: failed to register

      -

      then you need to do:

      -
      -
      -
      # rmmod capability
-# modprobe dazuko
-# modprobe capability
      -
      -

      It will work.

      -
      - - - diff --git a/source/apps-extra/dazuko-fwlive/dazuko.install b/source/apps-extra/dazuko-fwlive/dazuko.install index 2809fa6..6004b01 100644 --- a/source/apps-extra/dazuko-fwlive/dazuko.install +++ b/source/apps-extra/dazuko-fwlive/dazuko.install @@ -1,30 +1,17 @@ post_install() { - if test `grep dazuko < /etc/sysconfig/modules|wc -l` -gt 1; then - sed -i '/^dazuko/d' /etc/sysconfig/modules - fi - if test `grep commoncap < /etc/sysconfig/modules|wc -l` -gt 1; then - sed -i '/^commoncap/d' /etc/sysconfig/modules - fi if ! grep -q dazuko /etc/sysconfig/modules; then - echo "Adding dazuko to /etc/sysconfig/modules..." - sed -i 's/capability/dazuko\ncapability/' /etc/sysconfig/modules - fi - if ! grep -q commoncap /etc/sysconfig/modules; then - echo "Adding commoncap to /etc/sysconfig/modules..." - sed -i 's/dazuko/commoncap\ndazuko/' /etc/sysconfig/modules + echo -n "adding dazuko to /etc/sysconfig/modules..." + echo dazuko >> /etc/sysconfig/modules + echo " done." fi - depmod -a - rmmod capability 2>/dev/null - if test `lsmod|grep commoncap|wc -l` -lt 1; then - modprobe commoncap - fi - if test `lsmod|grep dazuko|wc -l` -ge 1; then - rmmod dazuko 2>/dev/null + depmod -a $_F_kernelmod_uname + if lsmod|grep -q dazuko; then + rmmod dazuko fi + echo -n "loading dazuko..." modprobe dazuko - modprobe capability - echo "Dazuko loaded..." + echo " done." } post_upgrade() @@ -34,8 +21,16 @@ post_upgrade() pre_remove() { - sed -i '/^dazuko/d' /etc/sysconfig/modules - sed -i '/^commoncap/d' /etc/sysconfig/modules + if grep -q dazuko /etc/sysconfig/modules; then + echo -n "removing dazuko from /etc/sysconfig/modules..." + sed -i '/^dazuko/d' /etc/sysconfig/modules + echo " done." + fi + if lsmod|grep -q dazuko; then + echo -n "unloading dazuko..." + rmmod dazuko + echo " done." + fi } op=$1 From janny at frugalware.org Tue Mar 4 18:30:00 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 18:30:05 2008 Subject: [Frugalware-git] fwlive: dazuko-fwlive-2.3.4-10-i686 Message-ID: <20080304173000.617461190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d707ff5e8c8046e4c6cf0f5ea11c7566a2bf27fd commit d707ff5e8c8046e4c6cf0f5ea11c7566a2bf27fd Author: janny Date: Tue Mar 4 18:29:04 2008 +0100 dazuko-fwlive-2.3.4-10-i686 * add missed patchs diff --git a/source/apps-extra/dazuko-fwlive/0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch b/source/apps-extra/dazuko-fwlive/0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch new file mode 100644 index 0000000..3408b10 --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch @@ -0,0 +1,196 @@ +From 8c31801270d4085bdf0704d572a0c3fbe8cf6a8f Mon Sep 17 00:00:00 2001 +From: ogman +Date: Wed, 12 Dec 2007 16:08:39 +0000 +Subject: [PATCH] add xp_set_path() function (necessary for RedirFS support) + +--- + dazuko_call.h | 14 ++++++++++++++ + dazuko_core.c | 10 ++++++++++ + dazuko_core.h | 3 +++ + dazuko_dummyos.c | 8 ++++++++ + dazuko_freebsd.c | 8 ++++++++ + dazuko_freebsd5.c | 8 ++++++++ + dazuko_linux.c | 8 ++++++++ + dazuko_linux26.c | 8 ++++++++ + dazuko_rsbac.c | 8 ++++++++ + 9 files changed, 75 insertions(+), 0 deletions(-) + +diff --git a/dazuko_call.h b/dazuko_call.h +index ad0e8e8..68bd929 100644 +--- a/dazuko_call.h ++++ b/dazuko_call.h +@@ -484,4 +484,18 @@ static int call_xp_init_cache(unsigned long ttl) + return xp_init_cache(ttl); + } + ++ ++/* include/exclude paths */ ++ ++static int call_xp_set_path(const char *path, int type) ++{ ++ if (path == NULL) ++ { ++ xp_print("dazuko: warning: call_xp_set_path(path=NULL)\n"); ++ return -1; ++ } ++ ++ return xp_set_path(path, type); ++} ++ + #endif +diff --git a/dazuko_core.c b/dazuko_core.c +index 7585166..fa8ca8f 100644 +--- a/dazuko_core.c ++++ b/dazuko_core.c +@@ -1607,10 +1607,20 @@ static int dazuko_set_option(struct daemon_id *did, int opt, void *param, int le + + case ADD_INCLUDE_PATH: + error = dazuko_insert_path_fs(&(sl->incl_paths), &(sl->lock_lists), (char *)param, len); ++ if (!error) ++ { ++ if (call_xp_set_path((char *)param, ADD_INCLUDE_PATH) != 0) ++ error = XP_ERROR_INVALID; ++ } + break; + + case ADD_EXCLUDE_PATH: + error = dazuko_insert_path_fs(&(sl->excl_paths), &(sl->lock_lists), (char *)param, len); ++ if (!error) ++ { ++ if (call_xp_set_path((char *)param, ADD_EXCLUDE_PATH) != 0) ++ error = XP_ERROR_INVALID; ++ } + break; + + case REMOVE_ALL_PATHS: +diff --git a/dazuko_core.h b/dazuko_core.h +index 935ca63..e64bf3e 100644 +--- a/dazuko_core.h ++++ b/dazuko_core.h +@@ -178,6 +178,9 @@ int xp_set_event_properties(struct event_properties *event_p, struct xp_daemon_i + /* cache settings */ + int xp_init_cache(unsigned long ttl); + ++/* include/exclude paths */ ++int xp_set_path(const char *path, int type); ++ + /* output */ + int xp_print(const char *fmt, ...); + +diff --git a/dazuko_dummyos.c b/dazuko_dummyos.c +index d092581..6bdcf70 100644 +--- a/dazuko_dummyos.c ++++ b/dazuko_dummyos.c +@@ -350,6 +350,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + static void dummy_dazuko_setid(const char *id) +diff --git a/dazuko_freebsd.c b/dazuko_freebsd.c +index f4cb535..c16412c 100644 +--- a/dazuko_freebsd.c ++++ b/dazuko_freebsd.c +@@ -825,6 +825,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + static inline int check_fd(struct proc *p, int fd) +diff --git a/dazuko_freebsd5.c b/dazuko_freebsd5.c +index ff0994f..d26f030 100644 +--- a/dazuko_freebsd5.c ++++ b/dazuko_freebsd5.c +@@ -877,6 +877,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + static inline int check_fd(struct proc *p, int fd) +diff --git a/dazuko_linux.c b/dazuko_linux.c +index f8bd860..d83bded 100644 +--- a/dazuko_linux.c ++++ b/dazuko_linux.c +@@ -1429,6 +1429,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + #if defined(ON_OPEN_SUPPORT) +diff --git a/dazuko_linux26.c b/dazuko_linux26.c +index cdf0d43..a1676be 100644 +--- a/dazuko_linux26.c ++++ b/dazuko_linux26.c +@@ -579,6 +579,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system hooks */ + + #ifndef DAZUKO_FIST +diff --git a/dazuko_rsbac.c b/dazuko_rsbac.c +index 9fa701b..6023bae 100644 +--- a/dazuko_rsbac.c ++++ b/dazuko_rsbac.c +@@ -518,6 +518,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system hook */ + + inline int xp_sys_hook() +-- +1.5.4.rc4.25.g81cc-dirty + diff --git a/source/apps-extra/dazuko-fwlive/0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch b/source/apps-extra/dazuko-fwlive/0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch new file mode 100644 index 0000000..742965d --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch @@ -0,0 +1,1008 @@ +From 26176cf910f1c66979c74a5ca24e95efebc05310 Mon Sep 17 00:00:00 2001 +From: ogman +Date: Wed, 12 Dec 2007 16:14:20 +0000 +Subject: [PATCH] source code to compile Dazuko as an RedirFS filter + +--- + dazuko_redirfs.c | 989 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 989 insertions(+), 0 deletions(-) + create mode 100644 dazuko_redirfs.c + +diff --git a/dazuko_redirfs.c b/dazuko_redirfs.c +new file mode 100644 +index 0000000..885242a +--- /dev/null ++++ b/dazuko_redirfs.c +@@ -0,0 +1,989 @@ ++/* Dazuko RedirFS. Allow Linux 2.6 file access control for 3rd-party applications. ++ Written by John Ogness ++ ++ Copyright (c) 2007 Avira GmbH ++ All rights reserved. ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License ++ as published by the Free Software Foundation; either version 2 ++ of the License, or (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++*/ ++ ++#include "dazuko_linux26.h" ++#include "dazuko_core.h" ++#include "dazuko_linux26_device_def.h" ++ ++#ifdef USE_CONFIG_H ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../redirfs/redirfs.h" ++#ifdef DEVFS_SUPPORT ++#include ++#endif ++#include ++#if !defined(USE_TRYTOFREEZEVOID) ++#include ++#endif ++#ifdef LINUX_USE_FREEZER_H ++#include ++#endif ++#include ++ ++ ++#ifndef DAZUKO_DM ++#define DAZUKO_DM 0 ++#endif ++ ++ ++ssize_t linux_dazuko_device_read(struct file *, char __user *, size_t, loff_t *); ++ssize_t linux_dazuko_device_write(struct file *, const char __user *, size_t, loff_t *); ++int linux_dazuko_device_open(struct inode *, struct file *); ++int linux_dazuko_device_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long param); ++int linux_dazuko_device_release(struct inode *, struct file *); ++ ++#ifndef WITHOUT_UDEV ++#ifdef USE_CLASS ++static struct class *dazuko_class = NULL; ++#else ++static struct class_simple *dazuko_class = NULL; ++#endif ++#endif ++ ++static int dev_major = -1; ++ ++int dazukoflt_ctl(struct rfs_ctl *ctl); ++enum rfs_retv dazukoflt_permission(rfs_context context, struct rfs_args *args); ++static rfs_filter dazukoflt; ++static struct rfs_filter_info flt_info = {"dazukoflt", 1000, 1, dazukoflt_ctl}; ++static struct rfs_op_info op_info[] = { ++ { RFS_REG_IOP_PERMISSION, dazukoflt_permission, NULL }, ++ { RFS_OP_END, NULL, NULL } ++}; ++ ++static struct file_operations fops = { ++ .owner = THIS_MODULE, ++ .read = linux_dazuko_device_read, ++ .write = linux_dazuko_device_write, ++ .ioctl = linux_dazuko_device_ioctl, ++ .open = linux_dazuko_device_open, ++ .release = linux_dazuko_device_release, ++ }; ++ ++ ++/* mutex */ ++ ++inline void xp_init_mutex(struct xp_mutex *mutex) ++{ ++ init_MUTEX(&(mutex->mutex)); ++} ++ ++inline void xp_down(struct xp_mutex *mutex) ++{ ++ down(&(mutex->mutex)); ++} ++ ++inline void xp_up(struct xp_mutex *mutex) ++{ ++ up(&(mutex->mutex)); ++} ++ ++inline void xp_destroy_mutex(struct xp_mutex *mutex) ++{ ++} ++ ++ ++/* read-write lock */ ++ ++inline void xp_init_rwlock(struct xp_rwlock *rwlock) ++{ ++ rwlock_init(&(rwlock->rwlock)); ++} ++ ++inline void xp_write_lock(struct xp_rwlock *rwlock) ++{ ++ write_lock(&(rwlock->rwlock)); ++} ++ ++inline void xp_write_unlock(struct xp_rwlock *rwlock) ++{ ++ write_unlock(&(rwlock->rwlock)); ++} ++ ++inline void xp_read_lock(struct xp_rwlock *rlock) ++{ ++ read_lock(&(rlock->rwlock)); ++} ++ ++inline void xp_read_unlock(struct xp_rwlock *rlock) ++{ ++ read_unlock(&(rlock->rwlock)); ++} ++ ++inline void xp_destroy_rwlock(struct xp_rwlock *rwlock) ++{ ++} ++ ++ ++/* wait-notify queue */ ++ ++inline int xp_init_queue(struct xp_queue *queue) ++{ ++ init_waitqueue_head(&(queue->queue)); ++ return 0; ++} ++ ++inline int xp_wait_until_condition(struct xp_queue *queue, int (*cfunction)(void *), void *cparam, int allow_interrupt) ++{ ++ /* wait until cfunction(cparam) != 0 (condition is true) */ ++ int ret = 0; ++ ++ if (allow_interrupt) ++ { ++ while (1) ++ { ++ ret = wait_event_interruptible(queue->queue, cfunction(cparam) != 0); ++ ++#if defined (USE_TRYTOFREEZEVOID) ++ if (try_to_freeze() == 0) ++ break; ++#else ++ if (current->flags & PF_FREEZE) ++ { ++ refrigerator(PF_FREEZE); ++ } ++ else ++ { ++ break; ++ } ++#endif ++ } ++ } ++ else ++ { ++ wait_event(queue->queue, cfunction(cparam) != 0); ++ } ++ ++ return ret; ++} ++ ++inline int xp_notify(struct xp_queue *queue) ++{ ++ wake_up(&(queue->queue)); ++ return 0; ++} ++ ++inline int xp_destroy_queue(struct xp_queue *queue) ++{ ++ return 0; ++} ++ ++ ++/* memory */ ++ ++inline void* xp_malloc(size_t size) ++{ ++ return kmalloc(size, GFP_ATOMIC); ++} ++ ++inline int xp_free(void *ptr) ++{ ++ kfree(ptr); ++ return 0; ++} ++ ++inline int xp_copyin(const void *user_src, void *kernel_dest, size_t size) ++{ ++ return copy_from_user(kernel_dest, user_src, size); ++} ++ ++inline int xp_copyout(const void *kernel_src, void *user_dest, size_t size) ++{ ++ return copy_to_user(user_dest, kernel_src, size); ++} ++ ++inline int xp_verify_user_writable(const void *user_ptr, size_t size) ++{ ++ return 0; ++} ++ ++inline int xp_verify_user_readable(const void *user_ptr, size_t size) ++{ ++ return 0; ++} ++ ++ ++/* path attribute */ ++ ++inline int xp_is_absolute_path(const char *path) ++{ ++ if (path[0] == '/') ++ return 1; ++ ++ return 0; ++} ++ ++ ++/* atomic */ ++ ++inline int xp_atomic_set(struct xp_atomic *atomic, int value) ++{ ++ atomic_set(&(atomic->atomic), value); ++ return 0; ++} ++ ++inline int xp_atomic_inc(struct xp_atomic *atomic) ++{ ++ atomic_inc(&(atomic->atomic)); ++ return 0; ++} ++ ++inline int xp_atomic_dec(struct xp_atomic *atomic) ++{ ++ atomic_dec(&(atomic->atomic)); ++ return 0; ++} ++ ++inline int xp_atomic_read(struct xp_atomic *atomic) ++{ ++ return atomic_read(&(atomic->atomic)); ++} ++ ++ ++/* file structure */ ++ ++static int dazuko_get_full_filename(struct xp_file_struct *xfs) ++{ ++ char *temp; ++ ++ if (xfs == NULL) ++ return 0; ++ ++ if (xfs->inode == NULL) ++ return 0; ++ ++ if (S_ISDIR(xfs->inode->i_mode)) ++ return 0; ++ ++ if (xfs->nd == NULL || xfs->free_full_filename) ++ return 0; ++ ++ if (xfs->nd->mnt == NULL || xfs->nd->dentry == NULL) ++ return 0; ++ ++ /* check if we need to allocate a buffer */ ++ if (!xfs->free_page_buffer) ++ { ++ /* get pre-requisites for d_path function */ ++ xfs->buffer = (char *)__get_free_page(GFP_USER); ++ ++ /* make sure we got a page */ ++ if (xfs->buffer == NULL) ++ return 0; ++ ++ /* the buffer will need to be freed */ ++ xfs->free_page_buffer = 1; ++ } ++ ++ /* make sure we don't already have a vfsmount */ ++ if (!xfs->mntput_vfsmount) ++ { ++ xfs->vfsmount = mntget(xfs->nd->mnt); ++ ++ /* the vfsmount will need to be put back */ ++ xfs->mntput_vfsmount = 1; ++ } ++ ++ /* make sure we don't already have a dentry */ ++ if (!xfs->dput_dentry) ++ { ++ xfs->dentry = dget(xfs->nd->dentry); ++ ++ /* the dentry will need to be put back */ ++ xfs->dput_dentry = 1; ++ } ++ ++ temp = d_path(xfs->dentry, xfs->vfsmount, xfs->buffer, PAGE_SIZE); ++ ++ /* make sure we really got a new filename */ ++ if (temp == NULL) ++ return 0; ++ ++ xfs->full_filename_length = dazuko_strlen(temp); ++ ++ xfs->full_filename = (char *)xp_malloc(xfs->full_filename_length + 1); ++ if (xfs->full_filename == NULL) ++ return 0; ++ ++ /* the char array will need to be freed */ ++ xfs->free_full_filename = 1; ++ ++ memcpy(xfs->full_filename, temp, xfs->full_filename_length + 1); ++ ++ /* we have a filename with the full path */ ++ ++ return 1; ++} ++ ++static int dazuko_fill_file_struct_cleanup(struct dazuko_file_struct *dfs) ++{ ++ if (dfs == NULL) ++ return 0; ++ ++ if (dfs->extra_data == NULL) ++ return 0; ++ ++ if (dfs->extra_data->free_page_buffer) ++ { ++ free_page((unsigned long)dfs->extra_data->buffer); ++ dfs->extra_data->free_page_buffer = 0; ++ } ++ ++ if (dfs->extra_data->dput_dentry) ++ { ++ dput(dfs->extra_data->dentry); ++ dfs->extra_data->dput_dentry = 0; ++ } ++ ++ if (dfs->extra_data->mntput_vfsmount) ++ { ++ mntput(dfs->extra_data->vfsmount); ++ dfs->extra_data->mntput_vfsmount = 0; ++ } ++ ++ return 0; ++} ++ ++int xp_fill_file_struct(struct dazuko_file_struct *dfs) ++{ ++ int error = -1; ++ ++ if (dfs == NULL) ++ return error; ++ ++ /* check if filename has already been filled in */ ++ if (dfs->filename != NULL) ++ return 0; ++ ++ /* make sure we can get the full path */ ++ if (dazuko_get_full_filename(dfs->extra_data)) ++ { ++ /* reference copy of full path */ ++ dfs->filename = dfs->extra_data->full_filename; ++ ++ dfs->filename_length = dfs->extra_data->full_filename_length; ++ ++ dfs->file_p.size = dfs->extra_data->inode->i_size; ++ dfs->file_p.set_size = 1; ++ dfs->file_p.uid = dfs->extra_data->inode->i_uid; ++ dfs->file_p.set_uid = 1; ++ dfs->file_p.gid = dfs->extra_data->inode->i_gid; ++ dfs->file_p.set_gid = 1; ++ dfs->file_p.mode = dfs->extra_data->inode->i_mode; ++ dfs->file_p.set_mode = 1; ++ dfs->file_p.device_type = dfs->extra_data->inode->i_rdev; ++ dfs->file_p.set_device_type = 1; ++ ++ error = 0; ++ } ++ ++ dazuko_fill_file_struct_cleanup(dfs); ++ ++ return error; ++} ++ ++static int dazuko_file_struct_cleanup(struct dazuko_file_struct **dfs) ++{ ++ if (dfs == NULL) ++ return 0; ++ ++ if (*dfs == NULL) ++ return 0; ++ ++ if ((*dfs)->extra_data) ++ { ++ if ((*dfs)->extra_data->free_full_filename) ++ xp_free((*dfs)->extra_data->full_filename); ++ ++ xp_free((*dfs)->extra_data); ++ } ++ ++ xp_free(*dfs); ++ ++ *dfs = NULL; ++ ++ return 0; ++} ++ ++ ++/* daemon id */ ++ ++static inline int check_parent(struct task_struct *parent, struct task_struct *child) ++{ ++ struct task_struct *ts = child; ++ ++ if (parent == NULL || child == NULL) ++ return -1; ++ ++ while (1) ++ { ++ if (ts == parent) ++ return 0; ++ ++ if (ts->parent == NULL) ++ break; ++ ++ if (ts == ts->parent) ++ break; ++ ++ ts = ts->parent; ++ } ++ ++ return -1; ++} ++ ++inline int xp_id_compare(struct xp_daemon_id *id1, struct xp_daemon_id *id2, int check_related) ++{ ++ if (id1 == NULL || id2 == NULL) ++ return DAZUKO_DIFFERENT; ++ ++ /* If file's are available we do a special ++ * check ("file"'s are only used by daemons). ++ * Here we allow threads to look like one ++ * instance, if they pass around the handle. ++ * Note: this is a Linux-only "hack" */ ++ if (id1->file != NULL && id2->file != NULL) ++ { ++ if (id1->tgid == id2->tgid && id1->files == id2->files && id1->file == id2->file) ++ return DAZUKO_SAME; ++ } ++ ++ if (id1->pid == id2->pid && id1->current_p == id2->current_p && id1->files == id2->files) ++ return DAZUKO_SAME; ++ ++ if (check_related) ++ { ++ /* Same thread id and same file descriptors, ++ * looks like they could be the same process... ++ * We will treat two threads of the same process ++ * as the same (for relation checks). This is ++ * useful for the Trusted Application Framework, ++ * if we trust one thread, we can trust them all.*/ ++ if (id1->tgid == id2->tgid && id1->files == id2->files) ++ { ++ /* Two different threads of the same process will have different current pointers, ++ * but if process ids match, current pointers must too. */ ++ ++ if (id1->pid == id2->pid && id1->current_p == id2->current_p) ++ return DAZUKO_SAME; ++ ++ if (id1->pid != id2->pid && id1->current_p != id2->current_p) ++ return DAZUKO_SAME; ++ } ++ ++ if (check_parent(id1->current_p, id2->current_p) == 0) ++ { ++ return DAZUKO_CHILD; ++ } ++ else if (id1->pid == id2->pid || id1->current_p == id2->current_p || id1->files == id2->files) ++ { ++ return DAZUKO_SUSPICIOUS; ++ } ++ else if (id1->tgid == id2->tgid) ++ { ++ return DAZUKO_SUSPICIOUS; ++ } ++ } ++ ++ return DAZUKO_DIFFERENT; ++} ++ ++inline int xp_id_free(struct xp_daemon_id *id) ++{ ++ xp_free(id); ++ ++ return 0; ++} ++ ++inline struct xp_daemon_id* xp_id_copy(struct xp_daemon_id *id) ++{ ++ struct xp_daemon_id *ptr; ++ ++ if (id == NULL) ++ return NULL; ++ ++ ptr = (struct xp_daemon_id *)xp_malloc(sizeof(struct xp_daemon_id)); ++ ++ if (ptr != NULL) ++ { ++ ptr->pid = id->pid; ++ ptr->tgid = id->tgid; ++ ptr->file = id->file; ++ ptr->current_p = id->current_p; ++ ptr->files = id->files; ++ } ++ ++ return ptr; ++} ++ ++ ++/* event */ ++ ++int xp_set_event_properties(struct event_properties *event_p, struct xp_daemon_id *xp_id) ++{ ++ event_p->pid = xp_id->pid; ++ event_p->set_pid = 1; ++ ++ return 0; ++} ++ ++ ++/* cache settings */ ++ ++int xp_init_cache(unsigned long ttl) ++{ ++ return -1; ++} ++ ++ ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ int err; ++ struct rfs_path_info path_info; ++ ++ switch (type) ++ { ++ case ADD_INCLUDE_PATH: ++ path_info.flags = RFS_PATH_INCLUDE | RFS_PATH_SUBTREE; ++ break; ++ ++ case ADD_EXCLUDE_PATH: ++ path_info.flags = RFS_PATH_EXCLUDE | RFS_PATH_SUBTREE; ++ break; ++ ++ default: ++ return -1; ++ } ++ ++ path_info.path = dazuko_strdup(path, NULL); ++ err = rfs_set_path(dazukoflt, &path_info); ++ if (err) ++ { ++ xp_print("dazuko: failed to set RedirFS path, err=%d\n", err); ++ rfs_unregister_filter(dazukoflt); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++/* system hooks */ ++ ++int dazuko_sys_generic(struct inode *inode, int mask, struct nameidata *nd) ++{ ++ struct dazuko_file_struct *dfs = NULL; ++ int error = 0; ++ int check_error = 0; ++ struct event_properties event_p; ++ struct xp_daemon_id xp_id; ++ struct slot_list *sl = NULL; ++ int event = DAZUKO_ON_OPEN; ++ int daemon_is_allowed = 1; ++ ++ if (nd == NULL || inode == NULL) ++ return 0; ++ ++ dazuko_bzero(&event_p, sizeof(event_p)); ++ ++ if ((mask & MAY_EXEC) != 0) ++ { ++ event = DAZUKO_ON_EXEC; ++ daemon_is_allowed = 0; ++ } ++ else ++ { ++ /* mask == 0 is passed in when a file is created */ ++ if (mask == 0 || (mask & (MAY_WRITE|MAY_APPEND)) != 0) ++ { ++ if ((mask & MAY_READ) != 0) ++ { ++ event_p.flags = O_RDWR; ++ } ++ else ++ { ++ event_p.flags = O_WRONLY; ++ } ++ ++ event_p.set_flags = 1; ++ } ++ else if ((mask & MAY_READ) != 0) ++ { ++ event_p.flags = O_RDONLY; ++ event_p.set_flags = 1; ++ } ++ } ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = NULL; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ check_error = dazuko_check_access(event, daemon_is_allowed, &xp_id, &sl); ++ ++ if (!check_error) ++ { ++ event_p.mode = inode->i_mode; ++ event_p.set_mode = 1; ++ event_p.pid = current->pid; ++ event_p.set_pid = 1; ++ event_p.uid = current->uid; ++ event_p.set_uid = 1; ++ ++ dfs = (struct dazuko_file_struct *)xp_malloc(sizeof(struct dazuko_file_struct)); ++ if (dfs != NULL) ++ { ++ dazuko_bzero(dfs, sizeof(struct dazuko_file_struct)); ++ ++ dfs->extra_data = (struct xp_file_struct *)xp_malloc(sizeof(struct xp_file_struct)); ++ if (dfs->extra_data != NULL) ++ { ++ dazuko_bzero(dfs->extra_data, sizeof(struct xp_file_struct)); ++ ++ dfs->extra_data->nd = nd; ++ dfs->extra_data->inode = inode; ++ ++ error = dazuko_process_access(event, dfs, &event_p, sl); ++ } ++ else ++ { ++ xp_free(dfs); ++ dfs = NULL; ++ } ++ ++ dazuko_file_struct_cleanup(&dfs); ++ } ++ } ++ ++ if (error) ++ return XP_ERROR_PERMISSION; ++ ++ return 0; ++} ++ ++int dazukoflt_ctl(struct rfs_ctl *ctl) ++{ ++ return 0; ++} ++ ++enum rfs_retv dazukoflt_permission(rfs_context context, struct rfs_args *args) ++{ ++ if (!args->args.i_permission.inode) ++ return RFS_CONTINUE; ++ ++ if (!args->args.i_permission.mask) ++ return RFS_CONTINUE; ++ ++ if (!args->args.i_permission.nd) ++ return RFS_CONTINUE; ++ ++ if (dazuko_sys_generic(args->args.i_permission.inode, args->args.i_permission.mask, args->args.i_permission.nd) != 0) ++ { ++ args->retv.rv_int = -EACCES; ++ return RFS_STOP; ++ } ++ ++ return RFS_CONTINUE; ++} ++ ++inline int xp_sys_hook() ++{ ++ /* Make sure we have a valid task_struct. */ ++ ++ if (current == NULL) ++ { ++ xp_print("dazuko: panic (current == NULL)\n"); ++ return -1; ++ } ++ if (current->fs == NULL) ++ { ++ xp_print("dazuko: panic (current->fs == NULL)\n"); ++ return -1; ++ } ++ ++ { ++ int err; ++ ++ err = rfs_register_filter(&dazukoflt, &flt_info); ++ if (err) ++ { ++ xp_print("dazuko: unable to register with RedirFS, err=%d\n", err); ++ return -1; ++ } ++ ++ err = rfs_set_operations(dazukoflt, op_info); ++ if (err) ++ { ++ xp_print("dazuko: unable to set RedirFS options, err=%d\n", err); ++ rfs_unregister_filter(dazukoflt); ++ return -1; ++ } ++ } ++ ++ dev_major = register_chrdev(DAZUKO_DM, DEVICE_NAME, &fops); ++ if (dev_major < 0) ++ { ++ xp_print("dazuko: unable to register device, err=%d\n", dev_major); ++ return dev_major; ++ } ++ ++#ifdef DEVFS_SUPPORT ++ devfs_mk_cdev(MKDEV(dev_major, 0), S_IFCHR | S_IRUSR | S_IWUSR, DEVICE_NAME); ++#endif ++ ++#ifndef WITHOUT_UDEV ++#ifdef USE_CLASS ++ dazuko_class = class_create(THIS_MODULE, "dazuko"); ++#ifdef CLASS_class_device_create_2_6_15 ++ class_device_create(dazuko_class, NULL, MKDEV(dev_major, 0), NULL, "dazuko"); ++#else ++ class_device_create(dazuko_class, MKDEV(dev_major, 0), NULL, "dazuko"); ++#endif ++#else ++ dazuko_class = class_simple_create(THIS_MODULE, "dazuko"); ++ class_simple_device_add(dazuko_class, MKDEV(dev_major, 0), NULL, "dazuko"); ++#endif ++#endif ++ ++ return 0; ++} ++ ++inline int xp_sys_unhook() ++{ ++ unregister_chrdev(dev_major, DEVICE_NAME); ++ ++#ifdef DEVFS_SUPPORT ++ devfs_remove(DEVICE_NAME); ++#endif ++ ++#ifndef WITHOUT_UDEV ++#ifdef USE_CLASS ++ class_device_destroy(dazuko_class, MKDEV(dev_major, 0)); ++ class_destroy(dazuko_class); ++#else ++ class_simple_device_remove(MKDEV(dev_major, 0)); ++ class_simple_destroy(dazuko_class); ++#endif ++#endif ++ ++ { ++ int err; ++ ++ err = rfs_unregister_filter(dazukoflt); ++ if (err) ++ { ++ xp_print("dazuko: failed to unregister from RedirFS, err=%d\n", err); ++ } ++ } ++ ++ return 0; ++} ++ ++ ++/* output */ ++ ++int xp_print(const char *fmt, ...) ++{ ++ va_list args; ++ char *p; ++ size_t size = 1024; ++ int length; ++ ++ p = (char *)xp_malloc(size); ++ if (p == NULL) ++ return -1; ++ ++ length = dazuko_strlen(KERN_INFO); ++ ++ memcpy(p, KERN_INFO, length); ++ ++ va_start(args, fmt); ++ vsnprintf(p + length, size - length, fmt, args); ++ va_end(args); ++ ++ p[size-1] = 0; ++ ++ printk(p); ++ ++ xp_free(p); ++ ++ return 0; ++} ++ ++ ++/* ioctl's */ ++ ++int linux_dazuko_device_open(struct inode *inode, struct file *file) ++{ ++ DPRINT(("dazuko: linux_dazuko_device_open() [%d]\n", current->pid)); ++ ++ return 0; ++} ++ ++ssize_t linux_dazuko_device_read(struct file *file, char *buffer, size_t length, loff_t *pos) ++{ ++ /* Reading from the dazuko device simply ++ * returns the device number. This is to ++ * help out the daemon. */ ++ ++ char tmp[20]; ++ size_t dev_major_len; ++ ++ DPRINT(("dazuko: linux_dazuko_device_read() [%d]\n", current->pid)); ++ ++ if (*pos != 0) ++ return 0; ++ ++ if (dev_major < 0) ++ return XP_ERROR_NODEVICE; ++ ++ /* print dev_major to a string ++ * and get length (with terminator) */ ++ dazuko_bzero(tmp, sizeof(tmp)); ++ ++ dev_major_len = dazuko_snprintf(tmp, sizeof(tmp), "%d", dev_major) + 1; ++ ++ if (tmp[sizeof(tmp)-1] != 0) ++ { ++ xp_print("dazuko: failing device_read, device number overflow for dameon %d (dev_major=%d)\n", current->pid, dev_major); ++ return XP_ERROR_FAULT; ++ } ++ ++ if (length < dev_major_len) ++ return XP_ERROR_INVALID; ++ ++ /* copy dev_major string to userspace */ ++ if (xp_copyout(tmp, buffer, dev_major_len) != 0) ++ return XP_ERROR_FAULT; ++ ++ *pos += dev_major_len; ++ ++ return dev_major_len; ++} ++ ++ssize_t linux_dazuko_device_write(struct file *file, const char *buffer, size_t length, loff_t *pos) ++{ ++ struct xp_daemon_id xp_id; ++ char tmpbuffer[32]; ++ int size; ++ ++ size = length; ++ if (length >= sizeof(tmpbuffer)) ++ size = sizeof(tmpbuffer) -1; ++ ++ /* copy request pointer string to kernelspace */ ++ if (xp_copyin(buffer, tmpbuffer, size) != 0) ++ return XP_ERROR_FAULT; ++ ++ tmpbuffer[size] = 0; ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = file; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ if (dazuko_handle_user_request(tmpbuffer, &xp_id) == 0) ++ return size; ++ ++ return XP_ERROR_INTERRUPT; ++} ++ ++int linux_dazuko_device_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long param) ++{ ++ /* A daemon uses this function to interact with ++ * the kernel. A daemon can set scanning parameters, ++ * give scanning response, and get filenames to scan. */ ++ ++ struct xp_daemon_id xp_id; ++ int error = 0; ++ ++ if (param == 0) ++ { ++ xp_print("dazuko: error: linux_dazuko_device_ioctl(..., 0)\n"); ++ return XP_ERROR_INVALID; ++ } ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = file; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ error = dazuko_handle_user_request_compat1((void *)param, _IOC_NR(cmd), &xp_id); ++ ++ if (error != 0) ++ { ++ /* general error occurred */ ++ ++ return XP_ERROR_PERMISSION; ++ } ++ ++ return error; ++} ++ ++int linux_dazuko_device_release(struct inode *inode, struct file *file) ++{ ++ struct xp_daemon_id xp_id; ++ ++ DPRINT(("dazuko: dazuko_device_release() [%d]\n", current->pid)); ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = file; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ return dazuko_unregister_daemon(&xp_id); ++} ++ ++ ++/* init/exit */ ++ ++static int __init linux_dazuko_init(void) ++{ ++ return dazuko_init(); ++} ++ ++static void __exit linux_dazuko_exit(void) ++{ ++ dazuko_exit(); ++} ++ ++ ++MODULE_AUTHOR("Avira GmbH "); ++MODULE_DESCRIPTION("allow 3rd-party file access control"); ++MODULE_LICENSE("GPL"); ++MODULE_INFO(vermagic, VERMAGIC_STRING); ++ ++module_init(linux_dazuko_init); ++module_exit(linux_dazuko_exit); +-- +1.5.4.rc4.25.g81cc-dirty + diff --git a/source/apps-extra/dazuko-fwlive/0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch b/source/apps-extra/dazuko-fwlive/0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch new file mode 100644 index 0000000..a2448e3 --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch @@ -0,0 +1,127 @@ +From b39f2f1f24f1a508c30356b0ee64aaa68f54e8a1 Mon Sep 17 00:00:00 2001 +From: ogman +Date: Wed, 12 Dec 2007 17:07:11 +0000 +Subject: [PATCH] - add "--enable-redirfs" to build Dazuko as a RedirFS filter + - change "--without-dep" to be the default + +--- + configure | 41 +++++++++++++++++++++++++++++++++-------- + 1 files changed, 33 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 17168f1..d300fce 100755 +--- a/configure ++++ b/configure +@@ -74,6 +74,7 @@ print_help() + echo " --disable-compat1 disable 1.x compatibility (IO/Linux only)" + echo " --enable-debug print extra debug information" + echo " --enable-syscalls hook syscalls, not LSM (Linux 2.6 only)" ++ echo " --enable-redirfs use RedirFS (Linux 2.6 only)" + echo "" + echo "optional packages" + echo " --with-PACKAGE use PACKAGE" +@@ -81,7 +82,7 @@ print_help() + echo " --without-module do not build kernel module" + echo " --without-library do not build library" + echo " --without-example-c do not build C example" +- echo " --without-dep do not build dependencies (Linux only)" ++ echo " --with-dep build dependencies (Linux only)" + echo " --with-example-java build Java example" + echo " --with-example-perl build Perl example" + echo " --with-example-python build Python example" +@@ -407,7 +408,18 @@ check_use_parent() + + do_linux26() + { +- if [ $LINUX26_USE_SYSCALLS -eq 0 ] ++ if [ $LINUX26_USE_SYSCALLS -eq 0 -a $LINUX26_USE_REDIRFS -eq 1 ] ++ then ++ echo -n "checking for RedirFS source code... " ++ if [ ! -f "../redirfs/redirfs.h" ] ++ then ++ echo "not found" ++ echo "error: please make sure the RedirFS code is available as ../redirfs/" ++ exit 1 ++ fi ++ echo "found (../redirfs)" ++ ++ elif [ $LINUX26_USE_SYSCALLS -eq 0 -a $LINUX26_USE_REDIRFS -eq 0 ] + then + echo -n "checking if security module support is enabled... " + if [ $CONFIG_SECURITY -eq 0 ] +@@ -690,25 +702,25 @@ do_linux26() + + if [ $ON_CLOSE -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_CLOSE events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_CLOSE events (not available for Linux 2.6 LSM/RedirFS)" + ON_CLOSE=0 + fi + + if [ ${ON_UNLINK} -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_UNLINK events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_UNLINK events (not available for Linux 2.6 LSM/RedirFS)" + ON_UNLINK=0 + fi + + if [ ${ON_RMDIR} -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_RMDIR events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_RMDIR events (not available for Linux 2.6 LSM/RedirFS)" + ON_RMDIR=0 + fi + + if [ ${ON_CLOSE_MODIFIED} -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_CLOSE_MODIFIED events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_CLOSE_MODIFIED events (not available for Linux 2.6 LSM/RedirFS)" + ON_CLOSE_MODIFIED=0 + fi + +@@ -716,7 +728,12 @@ do_linux26() + + if [ ${LINUX26_USE_SYSCALLS} -eq 0 ] + then +- LINUX26_OBJS="dazuko_linux26.o" ++ if [ ${LINUX26_USE_REDIRFS} -eq 0 ] ++ then ++ LINUX26_OBJS="dazuko_linux26.o" ++ else ++ LINUX26_OBJS="dazuko_redirfs.o" ++ fi + echo "EXTRA_CFLAGS += -Wall -DLINUX26_SUPPORT" > Makefile + else + LINUX26_OBJS="dazuko_linux.o" +@@ -1460,12 +1477,13 @@ LINUX26_USE_SYSCALLS=0 + PERFORM_SCT_CHECK=1 + LINUX26_SYSCALLTABLE_READONLY=0 + LINUX26_SYSCALL_CFLAGS="" +-WITH_LINUX_DEP=1 ++WITH_LINUX_DEP=0 + NO_CAPABILITIES=0 + SMP=0 + HIDDEN_SCT=0 + DUMMYOS=0 + LSM_STACKING=1 ++LINUX26_USE_REDIRFS=0 + LOCAL_DPATH=2 + LINUX_SRC="" + LINUX_OBJ="" +@@ -1549,6 +1567,13 @@ do + --disable-syscalls) + LINUX26_USE_SYSCALLS=0 + ;; ++ --enable-redirfs) ++ LINUX26_USE_REDIRFS=1 ++ LSM_STACKING=0 ++ ;; ++ --disable-redirfs) ++ LINUX26_USE_REDIRFS=0 ++ ;; + --sct-nocheck) + PERFORM_SCT_CHECK=0 + ;; +-- +1.5.4.rc4.25.g81cc-dirty + From priyank at frugalware.org Tue Mar 4 18:31:18 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 4 18:31:20 2008 Subject: [Frugalware-git] frugalware-current: gfpm-1.1.0-3-i686 Message-ID: <20080304173118.5135D1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3937a2a1b634ca61204edbb472c67eb90ef938c0 commit 3937a2a1b634ca61204edbb472c67eb90ef938c0 Author: Priyank Date: Tue Mar 4 22:59:58 2008 +0530 gfpm-1.1.0-3-i686 * Backported more fixes from gfpm git diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild index 87b6eb5..537894b 100644 --- a/source/xapps/gfpm/FrugalBuild +++ b/source/xapps/gfpm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gfpm pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Graphical Frugalware Package Manager" url="http://ftp.frugalware.org/pub/other/gfpm" depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2>=3.6.7-2' 'inotify-tools' 'frugalwareutils>=0.7.9') @@ -14,8 +14,8 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="lynx -dump $url | Flasttar" -source=($url/$pkgname-$pkgver.tar.gz gfpm_hide_help_button.diff) -signatures=(${source[0]}.asc '') +source=($url/$pkgname-$pkgver.tar.gz gfpm_hide_help_button.diff gfpm_post110fixes.diff) +signatures=(${source[0]}.asc '' '') build() { diff --git a/source/xapps/gfpm/gfpm_post110fixes.diff b/source/xapps/gfpm/gfpm_post110fixes.diff new file mode 100644 index 0000000..c507301 --- /dev/null +++ b/source/xapps/gfpm/gfpm_post110fixes.diff @@ -0,0 +1,128 @@ +diff -Naur gfpm-1.1.0/src/gfpm-interface.c gfpm-1.1.0.new/src/gfpm-interface.c +--- gfpm-1.1.0/src/gfpm-interface.c 2008-03-02 01:22:31.000000000 +0530 ++++ gfpm-1.1.0.new/src/gfpm-interface.c 2008-03-04 22:47:09.000000000 +0530 +@@ -334,9 +334,19 @@ + /* Disable Apply, Refresh and File buttons if user is not root */ + if ( geteuid() != 0 ) + { ++ /* disable some widgets */ + gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_apply"), FALSE); + gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_refresh1"), FALSE); + gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_file1"), FALSE); ++ gtk_widget_set_sensitive (gfpm_get_widget("repos"), FALSE); ++ gtk_widget_set_sensitive (gfpm_get_widget("clr1"), FALSE); ++ gtk_widget_set_sensitive (gfpm_get_widget("opt1"), FALSE); ++ } ++ else ++ { ++ /* init repomanager only if gfpm is run as root user */ ++ gfpm_repomanager_init (); ++ + } + + /* initialize modules */ +@@ -347,7 +357,6 @@ + gfpm_optimize_db_dlg_init (); + gfpm_quickpane_init (); + gfpm_icmonitor_init (); +- gfpm_repomanager_init (); + gfpm_logviewer_init (); + + gtk_widget_hide (gfpm_splash); +@@ -1437,6 +1446,9 @@ + if (event->button != 3) + return; + ++ if (geteuid() != 0) ++ return; ++ + model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_pkgs_tvw)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_pkgs_tvw)); + if ( FALSE == gtk_tree_selection_get_selected (selection, &model, &iter) ) +@@ -1487,7 +1499,7 @@ + g_signal_connect (G_OBJECT(menu_item), "activate", G_CALLBACK(cb_gfpm_mark_for_reinstall), (gpointer)pkgname); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item); + gtk_widget_show (menu_item); +- ++ + menu_item = gtk_image_menu_item_new_with_label (_("Mark for removal")); + image = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item), image); +diff -Naur gfpm-1.1.0/src/gfpm-progress.c gfpm-1.1.0.new/src/gfpm-progress.c +--- gfpm-1.1.0/src/gfpm-progress.c 2008-03-02 01:22:31.000000000 +0530 ++++ gfpm-1.1.0.new/src/gfpm-progress.c 2008-03-04 22:47:11.000000000 +0530 +@@ -33,7 +33,7 @@ + extern GtkWidget *gfpm_mw; + + GtkProgressBar *progressbar = NULL; +-GtkWidget *progresswindow = NULL; ++GtkWidget *progresswindow = NULL; + static GtkWidget *main_label = NULL; + static GtkWidget *sub_label = NULL; + static GtkWidget *rate_label = NULL; +@@ -45,7 +45,7 @@ + static GtkWidget *autoclose_checkbtn = NULL; + + GtkTextIter t_iter; +-GtkTextBuffer *buffer = NULL; ++GtkTextBuffer *buffer = NULL; + + float rate; + int offset; +@@ -97,7 +97,8 @@ + static void + cb_gfpm_close_button_clicked (GtkWidget *button, gpointer data) + { +- gfpm_progress_show (FALSE); ++ pacman_trans_release (); ++// gfpm_progress_show (FALSE); + + return; + } +@@ -167,13 +168,13 @@ + int + gfpm_progress_update (netbuf *ctl, int xferred, void *arg) + { +- int size; +- int per; +- char text[6]; +- char rate_text[10]; +- struct timeval t1; +- float tdiff; +- gchar *rx_str = NULL; ++ int size; ++ int per; ++ char text[6]; ++ char rate_text[10]; ++ struct timeval t1; ++ float tdiff; ++ gchar *rx_str = NULL; + + while (gtk_events_pending()) + gtk_main_iteration (); +@@ -213,7 +214,6 @@ + while (gtk_events_pending()) + gtk_main_iteration (); + +- + return 1; + } + +diff -Naur gfpm-1.1.0/src/gfpm-quickpane.c gfpm-1.1.0.new/src/gfpm-quickpane.c +--- gfpm-1.1.0/src/gfpm-quickpane.c 2008-03-02 01:22:31.000000000 +0530 ++++ gfpm-1.1.0.new/src/gfpm-quickpane.c 2008-03-04 22:47:11.000000000 +0530 +@@ -73,6 +73,14 @@ + "clicked", + G_CALLBACK(cb_gfpm_quickpane_readme_clicked), + NULL); ++ ++ /* Disable the Quick pane Install,Remove,Upgrade buttons if gfpm is not run as root */ ++ if (geteuid() != 0) ++ { ++ gtk_widget_set_sensitive (quick_pane_install_btn, FALSE); ++ gtk_widget_set_sensitive (quick_pane_remove_btn, FALSE); ++ gtk_widget_set_sensitive (quick_pane_upgrade_btn, FALSE); ++ } + + return; + } From crazy at frugalware.org Tue Mar 4 19:02:11 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 4 19:02:11 2008 Subject: [Frugalware-git] frugalware-current: zziplib-0.13.49-2-i686 Message-ID: <20080304180211.0184E1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6dbb1f484c43cf59d0629d5c4cf21a474cd4657e commit 6dbb1f484c43cf59d0629d5c4cf21a474cd4657e Author: crazy Date: Tue Mar 4 19:00:51 2008 +0100 zziplib-0.13.49-2-i686 * relbump * fixed all pc files diff --git a/source/lib-extra/zziplib/FrugalBuild b/source/lib-extra/zziplib/FrugalBuild index 15141c5..c3db255 100644 --- a/source/lib-extra/zziplib/FrugalBuild +++ b/source/lib-extra/zziplib/FrugalBuild @@ -3,7 +3,7 @@ pkgname=zziplib pkgver=0.13.49 -pkgrel=1 +pkgrel=2 pkgdesc="easily extract data from files archived in a single zip file" url="http://zziplib.sourceforge.net/" depends=('zlib') @@ -15,11 +15,16 @@ up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=6389& build() { Fcd + ## we need autoreconf first + Fautoreconf Fconf - Fsed 'tail -1' 'tail -n 1' Makefile make || return 1 make test || return 1 Fmakeinstall + ## datadir is broken in all pc files and while + ## that there is no way for other package need zziplib + ## to use it from pkg-config :| + Fsed 'datadir=.*' 'datadir=${prefix}/share' $Fdestdir//usr/lib/pkgconfig/*.pc } # optimization OK From boobaa at frugalware.org Tue Mar 4 19:03:43 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Mar 4 19:03:46 2008 Subject: [Frugalware-git] frugalware-current: phpmyadmin-2.11.5-1-i686 Message-ID: <20080304180343.843641190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9047f837fc6141498c5281428384cb223c12a0c commit b9047f837fc6141498c5281428384cb223c12a0c Author: CSCSY Lszl Date: Tue Mar 4 19:03:35 2008 +0100 phpmyadmin-2.11.5-1-i686 version bump closes #2835 in -current diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index 2ac11e6..020ba39 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSCSY Lszl pkgname=phpmyadmin -pkgver=2.11.4 +pkgver=2.11.5 pkgrel=1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -30,4 +30,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('d43e4e2b33efbd02c164e1d55aa38e9bebff4e57') +sha1sums=('922a5ce40a0139aa3013e95eb6ee9176a7aa2785') From crazy at frugalware.org Tue Mar 4 19:24:01 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 4 19:24:03 2008 Subject: [Frugalware-git] frugalware-current: mediawiki-1.11.2-1-i686 Message-ID: <20080304182401.C88321190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=612ad1988771bf1e7bdeb013f491b9511df33980 commit 612ad1988771bf1e7bdeb013f491b9511df33980 Author: crazy Date: Tue Mar 4 19:21:42 2008 +0100 mediawiki-1.11.2-1-i686 * Version bump * closes FS#2836 in -current diff --git a/source/network-extra/mediawiki/FrugalBuild b/source/network-extra/mediawiki/FrugalBuild index 3f92305..fe0b747 100644 --- a/source/network-extra/mediawiki/FrugalBuild +++ b/source/network-extra/mediawiki/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=mediawiki -pkgver=1.11.0 +pkgver=1.11.2 pkgrel=1 pkgdesc="The collaborative editing software that runs Wikipedia" _F_sourceforge_dirname="wikipedia" @@ -25,6 +25,6 @@ build() Fexe /usr/bin/mediawikisetup } # php code, no need of optimalization -sha1sums=('754ddbbff80b1f76ca5022a0e70253cc1c45a2b1' \ +sha1sums=('c5d5e99d73e646cff421b3bb92dd638fb93cd575' \ '2c70930c46b8a5d87e830f64dc2761c5506ce967' \ 'b9810ea6531b4f61e41778b76f7601f2c4f9b0e2') From janny at frugalware.org Tue Mar 4 19:33:48 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 19:33:48 2008 Subject: [Frugalware-git] fwlive: lirc-fwlive-0.8.2-18-i686 Message-ID: <20080304183348.34EB81190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=1fd4a5f61f56a7791c98da52a4e76c42b0695b18 commit 1fd4a5f61f56a7791c98da52a4e76c42b0695b18 Author: janny Date: Tue Mar 4 19:32:58 2008 +0100 lirc-fwlive-0.8.2-18-i686 * version bump in fwlive repo diff --git a/source/apps-extra/lirc-fwlive/FrugalBuild b/source/apps-extra/lirc-fwlive/FrugalBuild index 06032ac..45525c9 100644 --- a/source/apps-extra/lirc-fwlive/FrugalBuild +++ b/source/apps-extra/lirc-fwlive/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: voroskoi pkgname=lirc-fwlive +_F_archive_name=lirc pkgver=0.8.2 -pkgrel=3 +pkgrel=18 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" -#Finclude kernel-module sourceforge _F_sourceforge_name="lirc" _F_rcd_name="lirc" -Finclude sourceforge -kver=2.6.22-1 +Finclude kernel-module sourceforge +kver=2.6.24-3 makedepends=("kernel-fwlive-source=$kver") subpkgs=('lirc_modules-fwlive') @@ -25,17 +25,20 @@ rodepends=("lirc_modules-fwlive=$pkgver") groups=('apps-extra') archs=('i686' 'x86_64') backup=(etc/lirc{d,md}.conf etc/sysconfig/lirc) -source=(${source[@]} rc.lirc lirc.logrotate lirc.sysconfig README.Frugalware) +source=(${source[@]} rc.lirc lirc.logrotate lirc.sysconfig README.Frugalware \ + kernel-2.6.{23,24}.patch) unset install build() { - Fcd lirc-$pkgver Fpatchall Fconf --enable-sandboxed --with-driver=all \ - --with-moduledir=/lib/modules/`echo $kver|sed 's/-/-fw/'`/misc + --with-moduledir=$_F_kernelmod_dir/misc # does not compile with SMP kernel sed -i -e 's/lirc_parallel//' -e 's/lirc_bt829//' \ Makefile drivers/Makefile drivers/*/Makefile tools/Makefile || Fdie + # disable lirc_gpio due to brokeness of kernel 2.6.23 + Fsed "lirc_gpio" "" \ + Makefile drivers/Makefile drivers/*/Makefile tools/Makefile || Fdie make || Fdie make install DESTDIR=$Fdestdir || Fdie @@ -47,14 +50,16 @@ build() { Fmkdir /etc/{logrotate.d,sysconfig} Ffile lirc.logrotate /etc/logrotate.d/ Ffile lirc.sysconfig /etc/sysconfig/lirc - Frcd2 lirc - Fsplit lirc_modules-fwlive lib/modules - Frm lib + Frcd2 $_F_archive_name + Fsplit lirc_modules lib/modules + Fbuild_kernelmod_scriptlet } -sha1sums=('3443b24c54e8679483efbb6fb446b41116bc654c'\ - '30a7d32e512af135840e657edfa0736ad9d53281'\ - '4342b004eb53d51fcbb9af2cf136bb4990874608'\ - '504e0cd04780e75b6a8ab6836815c1ed9058db78'\ - '0b80c73e902920c028dca98a9006aaa313c6e120') +sha1sums=('3443b24c54e8679483efbb6fb446b41116bc654c' \ + '30a7d32e512af135840e657edfa0736ad9d53281' \ + '4342b004eb53d51fcbb9af2cf136bb4990874608' \ + '504e0cd04780e75b6a8ab6836815c1ed9058db78' \ + '0b80c73e902920c028dca98a9006aaa313c6e120' \ + 'cd65d7ce6a33a8e8965dc0d529b72a785c4437f7' \ + '83bb445945e6331d17c2bb5200811c107bdc609f') # optimization OK From janny at frugalware.org Tue Mar 4 21:28:35 2008 From: janny at frugalware.org (Janny) Date: Tue Mar 4 21:28:38 2008 Subject: [Frugalware-git] fwlive: fwlive-config Message-ID: <20080304202835.F03671190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=2592b897f91c97c4ab87aa7c380be32e4665d811 commit 2592b897f91c97c4ab87aa7c380be32e4665d811 Author: Janny Date: Tue Mar 4 21:27:24 2008 +0100 fwlive-config * remove truecrypt-fwlive pkg from DRIVERS diff --git a/config b/config index 3dc4e2e..6eb87c1 100644 --- a/config +++ b/config @@ -69,9 +69,9 @@ SAVEDIRS = etc home lib root usr var CONFIG_SETUP = y # additional packages to be installed by the profiles -# no builded pkgs: rt2500-fwlive rt2400-fwlive acx100-fwlive lirc-fwlive +# no builded pkgs: rt2500-fwlive rt2400-fwlive acx100-fwlive lirc-fwlive truecrypt-fwlive DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \ - qc-usb-fwlive truecrypt-fwlive dazuko-fwlive \ + qc-usb-fwlive dazuko-fwlive \ busybox-fwlive acerhk-fwlive madwifi-fwlive \ wlan-ng-fwlive adm8211-fwlive ipw3945-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ From janny at frugalware.org Tue Mar 4 21:42:21 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 21:42:23 2008 Subject: [Frugalware-git] fwlive: gspcav1-fwlive-1.00.20-6-i686 Message-ID: <20080304204221.B5BE11190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=147d9a77776354cec8e3cac5684cfb46bc85bb9b commit 147d9a77776354cec8e3cac5684cfb46bc85bb9b Author: janny Date: Tue Mar 4 21:40:47 2008 +0100 gspcav1-fwlive-1.00.20-6-i686 * version bump in fwlive repo diff --git a/source/multimedia-extra/gspcav1-fwlive/FrugalBuild b/source/multimedia-extra/gspcav1-fwlive/FrugalBuild index b5a02a4..9d363e9 100644 --- a/source/multimedia-extra/gspcav1-fwlive/FrugalBuild +++ b/source/multimedia-extra/gspcav1-fwlive/FrugalBuild @@ -2,27 +2,27 @@ # Maintainer: Janny pkgname=gspcav1-fwlive -pkgver=1.00.18 -pkgrel=5 -pkgdate=20070508 +_F_archive_name=gspcav1 +pkgver=1.00.20 +pkgrel=6 +pkgdate=20071224 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" license="GPL" -#Finclude kernel-module -kver=2.6.22-1 +Finclude kernel-module +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` archs=('i686' 'x86_64') groups=('multimedia-extra') replaces=('spca5xx') up2date="lynx -dump $url/download.html|grep -m1 'gspcav1'|sed 's/.*version \(.*\) da.*/\1/'" -source=(http://mxhaard.free.fr/spca50x/Download/gspcav1-$pkgdate.tar.gz) -sha1sums=('c7c63c9ee3be36dfe0d69b814239d398ced5f91a') +source=(http://mxhaard.free.fr/spca50x/Download/$_F_archive_name-$pkgdate.tar.gz) +sha1sums=('e34e91f4bccc69830f1b5f09fe0ecb4eccfe854d') build() { # no Fcheckkernel, crosscompilation verified - Fcd gspcav1-$pkgdate + Fcd $_F_archive_name-$pkgdate Fsed '`uname -r`' "$_F_kernelmod_uname" Makefile Fmake sed -i s\%MODULE_INSTALLDIR\ =\ /lib%MODULE_INSTALLDIR\ =\ $Fdestdir/lib% Makefile || Fdie @@ -31,5 +31,6 @@ build() { sed -i s\%@/sbin/depmod%% Makefile || Fdie sed -i s\%su\ -c\ \"make\ install-root\"%make\ install-root% Makefile || Fdie make DESTDIR=$Fdestdir install || Fdie - Ffileschmod ../src/gspcav1-$pkgdate 644 + Ffileschmod ../src/$_F_archive_name-$pkgdate 644 + Fbuild_kernelmod_scriptlet } From janny at frugalware.org Tue Mar 4 23:09:28 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 23:09:29 2008 Subject: [Frugalware-git] fwlive: qc-usb-fwlive-0.6.6-31-i686 Message-ID: <20080304220928.3FEA11190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=1d4f74f26fcb05c0ecdad7caf55fb76226e0d3f5 commit 1d4f74f26fcb05c0ecdad7caf55fb76226e0d3f5 Author: janny Date: Tue Mar 4 23:06:58 2008 +0100 qc-usb-fwlive-0.6.6-31-i686 * version bump in fwlive repo diff --git a/source/multimedia-extra/qc-usb-fwlive/FrugalBuild b/source/multimedia-extra/qc-usb-fwlive/FrugalBuild index 9fd5e4d..64f30c2 100644 --- a/source/multimedia-extra/qc-usb-fwlive/FrugalBuild +++ b/source/multimedia-extra/qc-usb-fwlive/FrugalBuild @@ -3,27 +3,30 @@ pkgname=qc-usb-fwlive pkgver=0.6.6 -pkgrel=17 +pkgrel=31 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="qce-ga" _F_sourceforge_name="qc-usb" -Finclude sourceforge -#kernel-module -kver=2.6.22-1 +Finclude kernel-module sourceforge +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" url="http://qce-ga.sourceforge.net/" +source=($source kernel-2.6.24.patch) up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=12924|grep qc-usb |sed 's/[^]]*][^]]*]\([^ ]*\) .*/\1/;q'" -sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43') +sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \ + 'e0362a80fc4d08d7cfa10899ded63b6eaf854ee7') build() { Fcd qc-usb-$pkgver + Fpatchall # no Fcheckkernel, crosscompilation verified make LINUX_DIR=$_F_kernelmod_dir/build all || return 1 Ffilerel $_F_kernelmod_dir/kernel/drivers/usb/misc/quickcam.ko + Fbuild_kernelmod_scriptlet } From janny at frugalware.org Tue Mar 4 23:11:03 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 23:11:04 2008 Subject: [Frugalware-git] fwlive: qc-usb-fwlive-0.6.6-31-i686 Message-ID: <20080304221103.79A4E1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=bd48cab73ad7b91da9417eb7aed1ef62a85e3651 commit bd48cab73ad7b91da9417eb7aed1ef62a85e3651 Author: janny Date: Tue Mar 4 23:10:26 2008 +0100 qc-usb-fwlive-0.6.6-31-i686 * add missing patch diff --git a/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch b/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch new file mode 100644 index 0000000..2f7b0e0 --- /dev/null +++ b/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch @@ -0,0 +1,39 @@ +by Stefan Lippers-Hollmann +fixes kernel 2.6.24 compatibility. + +diff -urNad qc-usb-0.6.6~/qc-driver.c qc-usb-0.6.6/qc-driver.c +--- qc-usb-0.6.6~/qc-driver.c 2006-10-24 04:06:19.000000000 +0200 ++++ qc-usb-0.6.6/qc-driver.c 2007-12-09 17:20:30.000000000 +0100 +@@ -821,7 +821,9 @@ + if (!cr) goto fail2; + urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */ + if (!urb->transfer_buffer) goto fail3; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + spin_lock_init(&urb->lock); ++#endif + urb->complete = qc_i2c_handler; + urb->context = qc; + #if (LINUX_VERSION_CODE= KERNEL_VERSION(2,6,0) + release: qc_v4l_release, +diff -urNad qc-usb-0.6.6~/quickcam.h qc-usb-0.6.6/quickcam.h +--- qc-usb-0.6.6~/quickcam.h 2006-11-04 14:38:27.000000000 +0100 ++++ qc-usb-0.6.6/quickcam.h 2007-12-09 17:17:01.000000000 +0100 +@@ -126,7 +126,9 @@ + #define FALSE 0 + #define TRUE (!FALSE) + typedef unsigned char Bool; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + #define BIT(x) (1<<(x)) ++#endif + #define SIZE(a) (sizeof(a)/sizeof((a)[0])) + #define MAX(a,b) ((a)>(b)?(a):(b)) + #define MIN(a,b) ((a)<(b)?(a):(b)) From janny at frugalware.org Tue Mar 4 23:49:09 2008 From: janny at frugalware.org (janny) Date: Tue Mar 4 23:49:11 2008 Subject: [Frugalware-git] fwlive: madwifi-fwlive-0.9.4-2-i686 Message-ID: <20080304224909.EEFBB1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=5c9e60444857897ddbe23135deacda6b70c3e3be commit 5c9e60444857897ddbe23135deacda6b70c3e3be Author: janny Date: Tue Mar 4 23:48:39 2008 +0100 madwifi-fwlive-0.9.4-2-i686 * version bump in fwlive repo diff --git a/source/network/madwifi-fwlive/FrugalBuild b/source/network/madwifi-fwlive/FrugalBuild index 802c2c4..87846f9 100644 --- a/source/network/madwifi-fwlive/FrugalBuild +++ b/source/network/madwifi-fwlive/FrugalBuild @@ -2,40 +2,35 @@ # Maintainer: VMiklos pkgname=madwifi-fwlive -pkgver=0.9.3.1 -pkgrel=4 +_F_archive_name=madwifi +_F_sourceforge_name=madwifi +pkgver=0.9.4 +pkgrel=2 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" -#Finclude kernel-module -#depends=(${depends[@]} 'wireless_tools') -replaces=('madwifi-ng') -#makedepends=(${makedepends[@]} 'sharutils') -kver=2.6.22-1 +Finclude kernel-module sourceforge +kver=2.6.24-3 depends=("kernel-fwlive=$kver" 'wireless_tools') +replaces=('madwifi-ng') makedepends=("kernel-fwlive-source=$kver" 'sharutils') -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" groups=('network') archs=('i686' 'x86_64') -_F_sourceforge_name="madwifi" -_F_rcd_name="madwifi" -Finclude sourceforge -source=($source madwifi-0.9.3-cflags.diff madwifi-0.9.3.1-kernel2622.diff) -sha1sums=('690543c825b8b49186e4613a286b39114fff3c11' \ - '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \ - 'b61d7e0bc2da632e399abbe6b6bef92f6a73d7cc') +source=($source madwifi-0.9.3-cflags.diff) +sha1sums=('6f289cb2e99d27b23570d15b69bf0f4240e34d1e' \ + '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35') # If the package needs testing, feel free to poke Benjamin Woods build() { + Fcd $_F_archive_name-$pkgver # no Fcheckkernel, crosscompilation verified - Fcd madwifi-$pkgver Fpatchall KERNELPATH=/usr/src/linux Fmake Fmakeinstall KERNELPATH=/usr/src/linux \ MODULEPATH=$_F_kernelmod_dir/kernel/drivers/net/wireless \ BINDIR=/usr/bin MANDIR=/usr/man + Fbuild_kernelmod_scriptlet } # optimization OK diff --git a/source/network/madwifi-fwlive/madwifi-0.9.3.1-kernel2622.diff b/source/network/madwifi-fwlive/madwifi-0.9.3.1-kernel2622.diff deleted file mode 100644 index eea54e8..0000000 --- a/source/network/madwifi-fwlive/madwifi-0.9.3.1-kernel2622.diff +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naur madwifi-0.9.3.1.orig/Makefile.inc madwifi-0.9.3.1/Makefile.inc ---- madwifi-0.9.3.1.orig/Makefile.inc 2007-01-18 09:26:23.000000000 +0100 -+++ madwifi-0.9.3.1/Makefile.inc 2007-07-10 14:45:07.000000000 +0200 -@@ -146,7 +146,7 @@ - # - TOOLS= $(TOP)/tools - --COPTS+= -Werror -+#COPTS+= -Werror - INCS= -include $(TOP)/include/compat.h -I$(TOP)/include - - # TARGET defines the target platform architecture. It must match one of -diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c madwifi-0.9.3.1/net80211/ieee80211_input.c ---- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c 2007-05-23 10:43:05.000000000 +0200 -+++ madwifi-0.9.3.1/net80211/ieee80211_input.c 2007-07-10 14:45:21.000000000 +0200 -@@ -1048,11 +1048,12 @@ - * incoming fragments - * XXX 4-address/QoS frames? - */ -- else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + -- hdrlen) { -+ else if (skb_end_pointer(skb) - skb->head < -+ ni->ni_vap->iv_dev->mtu + hdrlen) { - ni->ni_rxfrag = skb_copy_expand(skb, 0, - (ni->ni_vap->iv_dev->mtu + hdrlen) - -- (skb->end - skb->head), GFP_ATOMIC); -+ (skb_end_pointer(skb) - skb->head), -+ GFP_ATOMIC); - dev_kfree_skb(skb); - } - } -@@ -1136,8 +1137,8 @@ - } - if (skb1 != NULL) { - skb1->dev = dev; -- skb1->mac.raw = skb1->data; -- skb1->nh.raw = skb1->data + sizeof(struct ether_header); -+ skb_reset_mac_header(skb1); -+ skb1->network_header = skb1->data + sizeof(struct ether_header); - skb1->protocol = __constant_htons(ETH_P_802_2); - /* XXX insert vlan tag before queue it? */ - dev_queue_xmit(skb1); -@@ -2259,7 +2260,7 @@ - if (skb1 == NULL) - return; - skb1->dev = dev; -- skb1->mac.raw = skb1->data; -+ skb_reset_mac_header(skb1); - skb1->ip_summed = CHECKSUM_NONE; - skb1->pkt_type = PACKET_OTHERHOST; - skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ -@@ -2534,7 +2535,7 @@ - - skb->dev = dev; - skb->protocol = eth_type_trans(skb, dev); -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - ieee80211_deliver_data(ni, skb); - return; - } -@@ -3712,15 +3713,15 @@ - ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) - { - struct ethhdr *eth; -- -- skb->mac.raw=skb->data; -+ -+ skb_reset_mac_header(skb); - skb_pull(skb, ETH_HLEN); - /* - * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but - * since that's an inline and not a define there's - * no easy way to do this cleanly. - */ -- eth = (struct ethhdr *)skb->mac.raw; -+ eth = eth_hdr(skb); - - if (*eth->h_dest & 1) - if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) -diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c madwifi-0.9.3.1/net80211/ieee80211_monitor.c ---- madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c 2007-02-15 00:45:48.000000000 +0100 -+++ madwifi-0.9.3.1/net80211/ieee80211_monitor.c 2007-07-10 14:45:14.000000000 +0200 -@@ -373,7 +373,7 @@ - if (vap->iv_monitor_txf_len && tx) { - /* truncate transmit feedback packets */ - skb_trim(skb1, vap->iv_monitor_txf_len); -- skb1->nh.raw = skb1->data; -+ skb1->network_header = skb1->data; - } - switch (vap->iv_dev->type) { - case ARPHRD_IEEE80211: -@@ -555,7 +555,7 @@ - skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN); - } - skb1->dev = dev; /* NB: deliver to wlanX */ -- skb1->mac.raw = skb1->data; -+ skb_reset_mac_header(skb1); - skb1->ip_summed = CHECKSUM_NONE; - skb1->pkt_type = pkttype; - skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ From crazy at frugalware.org Wed Mar 5 01:00:23 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 5 01:00:25 2008 Subject: [Frugalware-git] frugalware-current: miro-1.1.1-2-i686 Message-ID: <20080305000023.B310E1190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bbf503b211b0bb14c6cea87f1f96a27fd45e7ca commit 3bbf503b211b0bb14c6cea87f1f96a27fd45e7ca Author: crazy Date: Wed Mar 5 00:57:22 2008 +0100 miro-1.1.1-2-i686 * relbump * added missing pysqlite2 depend * closes FS#2839 diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild index 293ff39..1fd65f6 100644 --- a/source/gnome-extra/miro/FrugalBuild +++ b/source/gnome-extra/miro/FrugalBuild @@ -4,11 +4,11 @@ pkgname=miro _F_archive_name=Miro pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform." url="http://www.getmiro.com/" depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'libboost>=1.34.1' 'libboost-mt>=1.34.1' 'xine-lib' 'db>=4.6.19' - 'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed') + 'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed' 'pysqlite2') makedepends=('boost>=1.34.1') groups=('gnome-extra') replaces=('democracy') From janny at frugalware.org Wed Mar 5 09:30:33 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 09:30:35 2008 Subject: [Frugalware-git] fwlive: acx100-fwlive-20071003-9-i686 Message-ID: <20080305083033.855011190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=14646a9879856c75cd3f449dc5b6dfe77b2a4ae1 commit 14646a9879856c75cd3f449dc5b6dfe77b2a4ae1 Author: janny Date: Wed Mar 5 09:29:25 2008 +0100 acx100-fwlive-20071003-9-i686 * version bump in fwlive repo diff --git a/source/network-extra/acx100-fwlive/FrugalBuild b/source/network-extra/acx100-fwlive/FrugalBuild index f29b50a..2b1a542 100644 --- a/source/network-extra/acx100-fwlive/FrugalBuild +++ b/source/network-extra/acx100-fwlive/FrugalBuild @@ -1,36 +1,35 @@ -# Compiling Time: ~0.04 SBU +# Compiling Time: 0.03 SBU # Maintainer: voroskoi pkgname=acx100-fwlive -pkgver=0.3.36 -pkgdate=20070101 -pkgrel=11 +aname=acx100 +origname=acx-mac80211 +pkgver=20071003 +pkgrel=9 pkgdesc="The ACX100/ACX111 wireless network driver." -url="http://www.cmartin.tk/acx" -#Finclude kernel-module -#depends=(${depends[@]} 'wireless_tools') -kver=2.6.22-1 +_F_archive_name=${origname} +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname=$aname +_F_sourceforge_name=${origname} +Finclude kernel-module sourceforge +kver=2.6.24-3 depends=("kernel-fwlive=$kver" 'wireless_tools') makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" +depends=(${depends[@]} 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep acx-2 |Flasttarbz2 |sed s/$pkgdate/$pkgver/" -source=($url/acx-$pkgdate.tar.bz2 \ - http://195.66.192.167/linux/acx_patches/fw.tar.bz2 \ - http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin \ - acx100-0.3.36-kernel2622.diff) -sha1sums=('5c7259c09bc754529910aceead6087876177a143' \ - '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ - '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \ - '2a385b78e656d6430bb730594cbb7724901e5d58') +up2date="lynx -dump http://acx100.sourceforge.net/wiki/Main_Page |Flasttarbz2" +source=(${source[@]} \ + http://ftp.frugalware.org/pub/other/sources/$aname/{fw.tar.bz2,ACX100_USB.bin,svn-20071112.patch} \ + kernel-2.6.24.patch) build() { # no Fcheckkernel, crosscompilation verified - Fcd acx-$pkgdate + Fcd ${origname}-${pkgver} Fpatchall - make -C $_F_kernelmod_dir/build M=`pwd` || Fdie + make -C $_F_kernelmod_dir/build M=`pwd` CONFIG_ACX_MAC80211=m CONFIG_ACX_MAC80211_PCI=y CONFIG_ACX_MAC80211_USB=y || Fdie Fmkdir $_F_kernelmod_dir/net Ffilerel $_F_kernelmod_dir/net/acx.ko Ffile /lib/firmware/ACX100_USB.bin @@ -41,6 +40,13 @@ build() { Ffile fw/acx111_2.4.0.70-USB/tiacx111usbc1B /lib/firmware Fln tiacx100usbc0D /lib/firmware/tiacx100usb Fln tiacx111usbc1B /lib/firmware/tiacx111usb + Fbuild_kernelmod_scriptlet } # optimalization OK - uses the kernel's option + +sha1sums=('5e62f70cd84c6c0ecb78358585e7e44901d2ce30' \ + '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ + '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \ + 'eb3a1ceb2e204a7dc80eb4802a2f1628c212d61f' \ + 'e3e96ee12a564ba033f4def6760b2a975b273765') diff --git a/source/network-extra/acx100-fwlive/acx100-0.3.36-kernel2622.diff b/source/network-extra/acx100-fwlive/acx100-0.3.36-kernel2622.diff deleted file mode 100644 index 535bc89..0000000 --- a/source/network-extra/acx100-fwlive/acx100-0.3.36-kernel2622.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common.c -+++ b/common.c -@@ -2760,7 +2760,7 @@ acx_l_rxmonitor(acx_device_t *adev, cons - skb->dev = adev->ndev; - skb->dev->last_rx = jiffies; - -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - skb->ip_summed = CHECKSUM_NONE; - skb->pkt_type = PACKET_OTHERHOST; - skb->protocol = htons(ETH_P_80211_RAW); From janny at frugalware.org Wed Mar 5 09:30:33 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 09:30:35 2008 Subject: [Frugalware-git] fwlive: acx100-fwlive-20071003-9-i686 Message-ID: <20080305083033.9BBEB1190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=91e318f2deb8695e4a7c60b80ad4052808f55e73 commit 91e318f2deb8695e4a7c60b80ad4052808f55e73 Author: janny Date: Wed Mar 5 09:30:01 2008 +0100 acx100-fwlive-20071003-9-i686 * add missing patch diff --git a/source/network-extra/acx100-fwlive/kernel-2.6.24.patch b/source/network-extra/acx100-fwlive/kernel-2.6.24.patch new file mode 100644 index 0000000..4e70628 --- /dev/null +++ b/source/network-extra/acx100-fwlive/kernel-2.6.24.patch @@ -0,0 +1,21 @@ +--- pci.c ++++ pci.c 2007/11/11 23:41:12 +@@ -2116,7 +2116,7 @@ + /* TODO: pci_set_power_state(pdev, PCI_D0); ? */ + + /* request shared IRQ handler */ +- if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) { ++ if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) { + printk("%s: request_irq FAILED\n", ndev->name); + result = -EAGAIN; + goto done; +--- usb.c ++++ usb.c 2007/11/11 23:48:50 +@@ -859,7 +859,6 @@ + ndev->watchdog_timeo = 4 * HZ; + #endif + ndev->change_mtu = &acx_e_change_mtu; +- SET_MODULE_OWNER(ndev); + + /* Setup private driver context */ + From janny at frugalware.org Wed Mar 5 09:34:29 2008 From: janny at frugalware.org (Janny) Date: Wed Mar 5 09:34:31 2008 Subject: [Frugalware-git] fwlive: fwlive-config Message-ID: <20080305083429.D21001190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=e1f0b963b2dbb3548ff438d247552ae904edb736 commit e1f0b963b2dbb3548ff438d247552ae904edb736 Author: Janny Date: Wed Mar 5 09:33:15 2008 +0100 fwlive-config * remove disused adm8211-fwlive pkg diff --git a/config b/config index 6eb87c1..7b1c595 100644 --- a/config +++ b/config @@ -73,7 +73,7 @@ CONFIG_SETUP = y DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \ qc-usb-fwlive dazuko-fwlive \ busybox-fwlive acerhk-fwlive madwifi-fwlive \ - wlan-ng-fwlive adm8211-fwlive ipw3945-fwlive kqemu-fwlive + wlan-ng-fwlive ipw3945-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) From janny at frugalware.org Wed Mar 5 09:37:39 2008 From: janny at frugalware.org (Janny) Date: Wed Mar 5 09:37:40 2008 Subject: [Frugalware-git] fwlive: fwlive-config Message-ID: <20080305083739.675F81190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=49ff4815a12505617d99be88f9d11f5561596e1e commit 49ff4815a12505617d99be88f9d11f5561596e1e Author: Janny Date: Wed Mar 5 09:36:37 2008 +0100 fwlive-config * remove ipw3945 replaced with iwl3945 diff --git a/config b/config index 7b1c595..12b7cf2 100644 --- a/config +++ b/config @@ -73,7 +73,7 @@ CONFIG_SETUP = y DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \ qc-usb-fwlive dazuko-fwlive \ busybox-fwlive acerhk-fwlive madwifi-fwlive \ - wlan-ng-fwlive ipw3945-fwlive kqemu-fwlive + wlan-ng-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) From janny at frugalware.org Wed Mar 5 09:56:50 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 09:56:53 2008 Subject: [Frugalware-git] fwlive: ndiswrapper-fwlive-1.51-6-i686 Message-ID: <20080305085650.E76181190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=b7652a708ab536f99b3b230ab6b5cb9ac0f905e3 commit b7652a708ab536f99b3b230ab6b5cb9ac0f905e3 Author: janny Date: Wed Mar 5 09:56:02 2008 +0100 ndiswrapper-fwlive-1.51-6-i686 * version bump in fwlive repo diff --git a/source/network-extra/ndiswrapper-fwlive/FrugalBuild b/source/network-extra/ndiswrapper-fwlive/FrugalBuild index a5fb12d..68b13c7 100644 --- a/source/network-extra/ndiswrapper-fwlive/FrugalBuild +++ b/source/network-extra/ndiswrapper-fwlive/FrugalBuild @@ -3,13 +3,12 @@ # Maintainer: voroskoi pkgname=ndiswrapper-fwlive -pkgver=1.47 -pkgrel=3 +pkgver=1.51 +pkgrel=6 pkgdesc="Wrapper for using Windows drivers for some wireless cards" -#Finclude kernel-module sourceforge _F_sourceforge_name="ndiswrapper" -Finclude sourceforge -kver=2.6.22-1 +Finclude kernel-module sourceforge +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") unset install @@ -17,9 +16,9 @@ depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') source=(${source[@]} README.Frugalware no-depmod-thx.patch) -sha1sums=('2431c8f74cab37d3f4c39c6d1b625e0b8312282e'\ - 'c3f24143cb9814326a2c0c3cbc8d58d953bac268'\ - '1274975ac5c636c0fc26c312010eadd056fec010') +sha1sums=('e264d9bc080759ee86be18614b0dcb061dd5c772' \ + 'c3f24143cb9814326a2c0c3cbc8d58d953bac268' \ + '1274975ac5c636c0fc26c312010eadd056fec010') [ "$CARCH" == "x86_64" ] && \ source=(${source[@]} ndiswrapper-amd64-detect-fix.patch) && \ sha1sums=(${sha1sums[@]} '7e46cc4bb72520d911f256748e8c3936498f001b') @@ -33,5 +32,5 @@ build() Fmake Fmakeinstall Fdoc README.Frugalware - Fsed '$_F_kernelmod_uname' "`echo $kver|sed 's/-/-fw/'`" $startdir/ndiswrapper.install + Fbuild_kernelmod_scriptlet } From janny at frugalware.org Wed Mar 5 10:18:39 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 10:18:41 2008 Subject: [Frugalware-git] fwlive: wlan-ng-fwlive-0.2.8-18-i686 Message-ID: <20080305091839.64AA11190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=32a54d8be2e9c9c227b42da974a123d5ac414e1e commit 32a54d8be2e9c9c227b42da974a123d5ac414e1e Author: janny Date: Wed Mar 5 10:17:55 2008 +0100 wlan-ng-fwlive-0.2.8-18-i686 * version bump in fwlive repo diff --git a/source/network-extra/wlan-ng-fwlive/FrugalBuild b/source/network-extra/wlan-ng-fwlive/FrugalBuild index 8b97e31..9fbd7c7 100644 --- a/source/network-extra/wlan-ng-fwlive/FrugalBuild +++ b/source/network-extra/wlan-ng-fwlive/FrugalBuild @@ -3,30 +3,30 @@ pkgname=wlan-ng-fwlive pkgver=0.2.8 -pkgrel=4 +pkgrel=18 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" -#Finclude kernel-module -kver=2.6.22-1 -depends=("kernel-fwlive=$kver") +_F_archive_name=wlan-ng +Finclude kernel-module +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" 'wireless_tools') makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" depends=(${depends[@]} 'bash') groups=('network-extra') archs=('i686' 'x86_64') backup=(etc/wlan/wlan.conf) up2date="lynx -dump ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/|grep tar.bz2$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-//;$ p'" -source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-$pkgver.tar.bz2 \ - rc.wlan wlan-ng-0.2.8-kernel2622.diff) +source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-$_F_archive_name-$pkgver.tar.bz2 \ + rc.wlan wlan-ng-0.2.8-kernel26{23,24}.diff) sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de' \ - '3c50d5e942999a968437093a17e3864a4733e11e' \ - '0f44af63867c2d8494aefb9d0cf61742ba322222') + 'b5b76089293cf11ab5c5f634f1c3b8dd7f4c34a7' \ + 'dd46ef1066debf1596902c9d8bb7c3988e98e184' \ + '1987d4137a82cfbb4a390228e5d33155f52e1fbc') build() { # no Fcheckkernel, crosscompilation verified - Fcd linux-wlan-ng-$pkgver + Fcd linux-$_F_archive_name-$pkgver Fsed '`uname -r`' "$_F_kernelmod_uname" Configure find . -type f -exec sed -i '/#include /d' {} \; Fsed "TARGET_ROOT_ON_HOST=" "TARGET_ROOT_ON_HOST=$Fdestdir" config.in @@ -41,6 +41,7 @@ build() Fmv /usr/local/man /usr/man Frm /init.d Frcd wlan + Fbuild_kernelmod_scriptlet } # optimization OK diff --git a/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2622.diff b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2622.diff deleted file mode 100644 index a0ce4d9..0000000 --- a/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2622.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur linux-wlan-ng-0.2.8.orig/src/p80211/p80211conv.c linux-wlan-ng-0.2.8/src/p80211/p80211conv.c ---- linux-wlan-ng-0.2.8.orig/src/p80211/p80211conv.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-07-10 14:53:04.000000000 +0200 -@@ -498,7 +498,7 @@ - } - - skb->protocol = eth_type_trans(skb, netdev); -- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ -+ skb->mac_header = (unsigned char *) e_hdr; /* new MAC header */ - - /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ - /* jkriegl: only process signal/noise if requested by iwspy */ -diff -Naur linux-wlan-ng-0.2.8.orig/src/p80211/p80211netdev.c linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c ---- linux-wlan-ng-0.2.8.orig/src/p80211/p80211netdev.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-07-10 14:53:04.000000000 +0200 -@@ -389,7 +389,7 @@ - - /* set up various data fields */ - skb->dev = dev; -- skb->mac.raw = skb->data ; -+ skb_reset_mac_header(skb); - skb->ip_summed = CHECKSUM_NONE; - skb->pkt_type = PACKET_OTHERHOST; - skb->protocol = htons(ETH_P_80211_RAW); -diff -Naur linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c ---- linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-07-10 14:53:04.000000000 +0200 -@@ -3645,7 +3645,7 @@ - /* the prism2 cards don't return the FCS */ - datap = skb_put(skb, WLAN_CRC_LEN); - memset (datap, 0xff, WLAN_CRC_LEN); -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - - /* Attach the rxmeta, set some stuff */ - p80211skb_rxmeta_attach(wlandev, skb); -diff -Naur linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c ---- linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x_usb.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-07-10 14:53:04.000000000 +0200 -@@ -4255,7 +4255,7 @@ - /* The prism2 series does not return the CRC */ - memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); - -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - - /* Attach the rxmeta, set some stuff */ - p80211skb_rxmeta_attach(wlandev, skb); diff --git a/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2623.diff b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2623.diff new file mode 100644 index 0000000..5e7d9a7 --- /dev/null +++ b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2623.diff @@ -0,0 +1,193 @@ +diff -Naur linux-wlan-ng-0.2.8/CHANGES linux-wlan-ng-export/CHANGES +--- linux-wlan-ng-0.2.8/CHANGES 2007-05-04 14:29:27.000000000 +0200 ++++ linux-wlan-ng-export/CHANGES 2007-10-16 16:07:27.000000000 +0200 +@@ -41,6 +41,11 @@ + * Intersil Corporation as part of PRISM(R) chipset product development. + * + * -------------------------------------------------------------------- ++ - Support 2.6.23 kernels. (With apologies to Martin Dauskardt for a ++ misapplied patch) ++ - Support "Intersil Americas USB 802.11b WLAN DEVICE" (Peter Levart) ++ - Tweaks to support Fedora 7 (Dan Williams) ++ - Support 2.6.22 kernels + 0.2.8 + - Fix up a pile of sparse warnings (Pavel Roskin) + - Support 2.6.20 kernels (Pavel Roskin) +diff -Naur linux-wlan-ng-0.2.8/Configure linux-wlan-ng-export/Configure +--- linux-wlan-ng-0.2.8/Configure 2007-05-08 00:00:22.000000000 +0200 ++++ linux-wlan-ng-export/Configure 2007-10-16 16:43:56.000000000 +0200 +@@ -277,9 +277,9 @@ + fi + write_bool KERN_2_6_17 + +-if [ $VERSION_CODE -gt `version 2 6 21` ] ; then ++if [ $VERSION_CODE -gt `version 2 6 22` ] ; then + $ECHO "******* WARNING WARNING WARNING *******" +- $ECHO "Kernels newer than 2.6.21.x are not supported." ++ $ECHO "Kernels newer than 2.6.23.x are not supported." + $ECHO "******* WARNING WARNING WARNING *******" + fi + +diff -Naur linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules linux-wlan-ng-export/etc/udev/rules.d/40-prism2.rules +--- linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules 2006-06-26 17:03:27.000000000 +0200 ++++ linux-wlan-ng-export/etc/udev/rules.d/40-prism2.rules 2007-06-20 16:53:45.000000000 +0200 +@@ -1 +1,2 @@ +-ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k" ++#ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k" ++KERNEL="wlan*",ACTION=="add",DRIVERS=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k" +diff -Naur linux-wlan-ng-0.2.8/Makefile linux-wlan-ng-export/Makefile +--- linux-wlan-ng-0.2.8/Makefile 2005-02-24 18:59:10.000000000 +0100 ++++ linux-wlan-ng-export/Makefile 2007-10-16 16:43:56.000000000 +0200 +@@ -76,6 +76,8 @@ + all: config.mk + set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done + ++distclean: mrproper ++ + mrproper: clean + rm -f config.out + rm -f tags.linux tags TAGS +diff -Naur linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h linux-wlan-ng-export/src/include/wlan/wlan_compat.h +--- linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h 2007-02-28 16:44:02.000000000 +0100 ++++ linux-wlan-ng-export/src/include/wlan/wlan_compat.h 2007-09-18 18:51:48.000000000 +0200 +@@ -479,6 +479,18 @@ + #endif + #endif /* _LINUX_PROC_FS_H */ + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) ++#define skb_reset_mac_header(__a) (__a)->mac.raw = (__a)->data ++#define SKB_MAC_HEADER(__a) (__a)->mac.raw ++#else ++#define SKB_MAC_HEADER(__a) (__a)->mac_header ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) ++#define IRQF_DISABLED SA_INTERRUPT ++#define IRQF_SHARED SA_SHIRQ ++#endif ++ + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) + #ifndef INIT_TQUEUE + #define PREPARE_TQUEUE(_tq, _routine, _data) \ +diff -Naur linux-wlan-ng-0.2.8/src/p80211/p80211conv.c linux-wlan-ng-export/src/p80211/p80211conv.c +--- linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/p80211/p80211conv.c 2007-10-16 16:44:37.000000000 +0200 +@@ -497,8 +497,16 @@ + + } + ++ /* ++ * Note that eth_type_trans() expects an skb w/ skb->data pointing ++ * at the MAC header, it then sets the following skb members: ++ * skb->mac_header, ++ * skb->data, and ++ * skb->pkt_type. ++ * It then _returns_ the value that _we're_ supposed to stuff in ++ * skb->protocol. This is nuts. ++ */ + skb->protocol = eth_type_trans(skb, netdev); +- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ + + /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ + /* jkriegl: only process signal/noise if requested by iwspy */ +diff -Naur linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c linux-wlan-ng-export/src/p80211/p80211netdev.c +--- linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/p80211/p80211netdev.c 2007-09-18 18:39:19.000000000 +0200 +@@ -389,7 +389,8 @@ + + /* set up various data fields */ + skb->dev = dev; +- skb->mac.raw = skb->data ; ++ skb_reset_mac_header(skb); ++ + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); +@@ -929,8 +930,8 @@ + dev->open = p80211knetdev_open; + dev->stop = p80211knetdev_stop; + +-#ifdef CONFIG_NET_WIRELESS +-#if ((WIRELESS_EXT < 17) && (WIRELESS_EXT < 21)) ++#if defined(CONFIG_NET_WIRELESS) || defined(WIRELESS_EXT) ++#if (WIRELESS_EXT < 17) + dev->get_wireless_stats = p80211wext_get_wireless_stats; + #endif + #if WIRELESS_EXT > 12 +diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c linux-wlan-ng-export/src/prism2/driver/hfa384x.c +--- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/prism2/driver/hfa384x.c 2007-06-20 16:45:49.000000000 +0200 +@@ -3645,7 +3645,7 @@ + /* the prism2 cards don't return the FCS */ + datap = skb_put(skb, WLAN_CRC_LEN); + memset (datap, 0xff, WLAN_CRC_LEN); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); +diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-export/src/prism2/driver/hfa384x_usb.c +--- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/prism2/driver/hfa384x_usb.c 2007-06-20 16:45:49.000000000 +0200 +@@ -4255,7 +4255,7 @@ + /* The prism2 series does not return the CRC */ + memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); + +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); +diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c linux-wlan-ng-export/src/prism2/driver/prism2_pci.c +--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/prism2/driver/prism2_pci.c 2007-10-16 16:07:27.000000000 +0200 +@@ -163,7 +163,7 @@ + * _know_ things are alright. A test routine would help. + */ + request_irq(wlandev->netdev->irq, hfa384x_interrupt, +- SA_SHIRQ, wlandev->name, wlandev); ++ IRQF_SHARED, wlandev->name, wlandev); + + wlandev->msdstate = WLAN_MSD_HWPRESENT; + +@@ -275,7 +275,7 @@ + static int __init prism2pci_init(void) + { + WLAN_LOG_NOTICE("%s Loaded\n", version); +- return pci_module_init(&prism2_pci_drv_id); ++ return pci_register_driver(&prism2_pci_drv_id); + }; + + static void __exit prism2pci_cleanup(void) +diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c linux-wlan-ng-export/src/prism2/driver/prism2_plx.c +--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/prism2/driver/prism2_plx.c 2007-10-16 16:07:27.000000000 +0200 +@@ -272,7 +272,7 @@ + * _know_ things are alright. A test routine would help. + */ + request_irq(wlandev->netdev->irq, hfa384x_interrupt, +- SA_SHIRQ, wlandev->name, wlandev); ++ IRQF_SHARED, wlandev->name, wlandev); + + wlandev->msdstate = WLAN_MSD_HWPRESENT; + +@@ -420,7 +420,7 @@ + static int __init prism2plx_init(void) + { + WLAN_LOG_NOTICE("%s Loaded\n", version); +- return pci_module_init(&prism2_plx_drv_id); ++ return pci_register_driver(&prism2_plx_drv_id); + }; + + static void __exit prism2plx_cleanup(void) +diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/prism2_usb.c linux-wlan-ng-export/src/prism2/driver/prism2_usb.c +--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_usb.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-export/src/prism2/driver/prism2_usb.c 2007-09-18 18:35:12.000000000 +0200 +@@ -13,6 +13,7 @@ + .driver_info = (unsigned long) name + + static struct usb_device_id usb_prism_tbl[] = { ++ {PRISM_USB_DEVICE(0x0707, 0xee04, "Intersil Americas USB 802.11b WLAN DEVICE")}, + {PRISM_USB_DEVICE(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS")}, + {PRISM_USB_DEVICE(0x07aa, 0x0012, "Corega Wireless LAN USB Stick-11")}, + {PRISM_USB_DEVICE(0x09aa, 0x3642, "Prism2.x 11Mbps WLAN USB Adapter")}, diff --git a/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2624.diff b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2624.diff new file mode 100644 index 0000000..6144045 --- /dev/null +++ b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2624.diff @@ -0,0 +1,82 @@ +--- src/p80211/p80211netdev.c ++++ src/p80211/p80211netdev.c +@@ -82,6 +82,8 @@ + #if WIRELESS_EXT > 12 + #include + #endif ++#include ++ + + /*================================================================*/ + /* Project Includes */ +@@ -167,11 +169,11 @@ + DBFENTER; + + #ifdef CONFIG_PROC_FS +- if (proc_net != NULL) { ++ if (init_net.proc_net != NULL) { + proc_p80211 = create_proc_entry( + "p80211", + (S_IFDIR|S_IRUGO|S_IXUGO), +- proc_net); ++ init_net.proc_net); + } + #endif + DBFEXIT; +@@ -196,7 +198,7 @@ + DBFENTER; + #ifdef CONFIG_PROC_FS + if (proc_p80211 != NULL) { +- remove_proc_entry("p80211", proc_net); ++ remove_proc_entry("p80211", init_net.proc_net); + } + #endif + DBFEXIT; +--- src/prism2/driver/prism2_cs.c ++++ src/prism2/driver/prism2_cs.c +@@ -517,7 +517,6 @@ + #endif + + /* Register the network device and get assigned a name */ +- SET_MODULE_OWNER(wlandev->netdev); + SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(pdev)); + if (register_wlandev(wlandev) != 0) { + WLAN_LOG_NOTICE("prism2sta_cs: register_wlandev() failed.\n"); +@@ -1080,7 +1079,6 @@ + link->dev = &hw->node; + + /* Register the network device and get assigned a name */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) ) + SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(link->handle)); + #endif +--- src/prism2/driver/prism2_pci.c ++++ src/prism2/driver/prism2_pci.c +@@ -119,7 +119,6 @@ + /* Register the wlandev, this gets us a name and registers the + * linux netdevice. + */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev)); + #endif +--- src/prism2/driver/prism2_plx.c ++++ src/prism2/driver/prism2_plx.c +@@ -228,7 +228,6 @@ + /* Register the wlandev, this gets us a name and registers the + * linux netdevice. + */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev)); + #endif +--- src/prism2/driver/prism2_usb.c ++++ src/prism2/driver/prism2_usb.c +@@ -131,7 +131,6 @@ + /* Register the wlandev, this gets us a name and registers the + * linux netdevice. + */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + SET_NETDEV_DEV(wlandev->netdev, &(interface->dev)); + #endif From janny at frugalware.org Wed Mar 5 10:49:47 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 10:49:49 2008 Subject: [Frugalware-git] fwlive: fglrx-fwlive-8.42.3-10-i686 Message-ID: <20080305094947.46F991190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=57262433b84505ab3fe7e2b5800ba7df82996f0c commit 57262433b84505ab3fe7e2b5800ba7df82996f0c Author: janny Date: Wed Mar 5 10:45:26 2008 +0100 fglrx-fwlive-8.42.3-10-i686 * version bump in fwlive repo diff --git a/source/x11-extra/fglrx-fwlive/2.6.22.patch b/source/x11-extra/fglrx-fwlive/2.6.22.patch deleted file mode 100644 index 850607e..0000000 --- a/source/x11-extra/fglrx-fwlive/2.6.22.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- firegl_public.c-orig 2007-05-16 14:52:12.000000000 -0500 -+++ firegl_public.c 2007-05-16 14:52:48.000000000 -0500 -@@ -144,12 +144,14 @@ - #define EXPORT_NO_SYMBOLS - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - #ifdef __x86_64__ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - #include "linux/ioctl32.h" - #else - #include "asm/ioctl32.h" - #endif -+#endif - - #ifdef __x86_64__ - #include "asm/compat.h" diff --git a/source/x11-extra/fglrx-fwlive/FrugalBuild b/source/x11-extra/fglrx-fwlive/FrugalBuild index acdad31..1d55609 100644 --- a/source/x11-extra/fglrx-fwlive/FrugalBuild +++ b/source/x11-extra/fglrx-fwlive/FrugalBuild @@ -3,13 +3,15 @@ # Maintainer: voroskoi pkgname=fglrx-fwlive -pkgver=8.38.6 -pkgrel=2 +_F_archive_name=fglrx +pkgver=8.42.3 +pkgrel=10 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it -#Finclude kernel-module -kver=2.6.22-1 +_F_kernelmod_scriptlet=fglrx_module.install +Finclude kernel-module +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` @@ -20,7 +22,7 @@ subdescs=('fglrx kernel module') subdepends=($depends) subgroups=('x11-extra') subarchs=('i686 x86_64') -subinstall=fglrx_module-fwlive.install +subinstall=fglrx_module.install depends=() rodepends=('fglrx_module-fwlive' 'xorg-server' 'libstdc++5') @@ -28,15 +30,16 @@ conflicts=('libgl') provides=('libgl') groups=('x11-extra') archs=('i686' 'x86_64') -install=$pkgname.install +install=$_F_archive_name.install up2date=$pkgver source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run \ - README.Frugalware libGL.la 2.6.22.patch) + README.Frugalware libGL.la \ + fglrx-firegl_public.c-2.6.24.patch) options=(${options[@]} 'nodocs') -sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67' \ +sha1sums=('b8e878e846e0971d49339ee5957acc6482329510' \ 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ - 'e862660a7af445f3d0ac07c360bd786b909f426e') + '5c88075b135bbc6700301d29736a74177b6df860') Xversion=x710 @@ -54,10 +57,7 @@ build() { cp -r $Fsrcdir/ATi/common/* $Fsrcdir/ || Fdie - if [ "$CARCH" == "x86_64" ]; then - Fcd /lib/modules/fglrx/build_mod - patch -p0 < $Fsrcdir/2.6.22.patch || Fdie - fi + patch -p0 < $Fsrcdir/fglrx-firegl_public.c-2.6.24.patch || Fdie # building kernel module Fcd /lib/modules/fglrx/build_mod @@ -66,7 +66,7 @@ build() { Ffile lib/modules/fglrx/build_mod/fglrx.ko $_F_kernelmod_dir/video/fglrx.ko # moving the intresting part to the package - mv $Fsrcdir/usr $Fdestdir || Fdie + mv $Fsrcdir/{usr,etc} $Fdestdir || Fdie # Install into correct paths for Xorg7 Fmkdir /usr/{include,lib/xorg,bin} @@ -80,9 +80,6 @@ build() { mv $Fdestdir/usr/X11R6/lib64/* $Fdestdir/usr/lib || Fdie fi mv $Fdestdir/usr/X11R6/bin/* $Fdestdir/usr/bin || Fdie - # FIXME - [ "$CARCH" == "i686" ] && Fexe ATi/x690/usr/X11R6/bin/fireglcontrolpanel /usr/bin/fireglcontrolpanel - [ "$CARCH" == "x86_64" ] && Fexe ATi/x690_64a/usr/X11R6/bin/fireglcontrolpanel /usr/bin/fireglcontrolpanel Frm /usr/X11R6 # No hardware support without it @@ -95,6 +92,8 @@ build() { Fln ../../dri /usr/lib/xorg/modules/dri # closes #2112 Fln /usr/lib/dri /usr/X11R6/lib/modules/dri + # closes #2498 + Fln lib /usr/X11R6/lib64 # Links Fln libfglrx_pp.so.1.0 /usr/lib/libfglrx_pp.1 @@ -104,9 +103,12 @@ build() { Fln libGL.so.1.2 /usr/lib/libGL.so.1 cp -ar $Fsrcdir/libGL.la $Fdestdir/usr/lib || Fdie - find $Fdestdir -type d |xargs chmod 755 + (find $Fdestdir -type d |xargs chmod 755) || Fdie + # closes #2498 + (find $Fdestdir -perm 744 |xargs chmod 755) || Fdie Fdoc README.Frugalware - Fsplit fglrx_module-fwlive /lib + Fsplit fglrx_module /lib + Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch new file mode 100644 index 0000000..740eb1f --- /dev/null +++ b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch @@ -0,0 +1,104 @@ +--- lib/modules/fglrx/build_mod/firegl_public.c.orig 2007-08-10 23:59:21.000000000 +0200 ++++ lib/modules/fglrx/build_mod/firegl_public.c 2007-08-13 20:00:26.000000000 +0200 +@@ -214,6 +214,56 @@ + #define preempt_enable() + #endif + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22) ++#if defined(__i386__) ++#define ptep_test_and_clear_dirty(vma, addr, ptep) ({ \ ++ int __ret = 0; \ ++ if (pte_dirty(*(ptep))) \ ++ __ret = test_and_clear_bit(_PAGE_BIT_DIRTY, \ ++ &(ptep)->pte_low); \ ++ if (__ret) \ ++ pte_update((vma)->vm_mm, addr, ptep); \ ++ __ret; \ ++}) ++ ++static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_USER; } ++static inline int pte_user(pte_t pte) { return (pte).pte_low & _PAGE_USER; } ++#ifdef CONFIG_X86_PAE ++/* ++ * Is the pte executable? ++ */ ++static inline int pte_x(pte_t pte) ++{ ++ return !(pte_val(pte) & _PAGE_NX); ++} ++ ++/* ++ * All present user-pages with !NX bit are user-executable: ++ */ ++static inline int pte_exec(pte_t pte) ++{ ++ return pte_user(pte) && pte_x(pte); ++} ++#else ++static inline int pte_exec(pte_t pte) ++{ ++ return pte_user(pte); ++} ++#endif /* PAE */ ++ ++#elif defined(__x86_64__) ++static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, ++ unsigned long addr, pte_t *ptep) ++{ ++ if (!pte_dirty(*ptep)) ++ return 0; ++ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte); ++} ++static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; } ++static inline int pte_exec(pte_t pte) { return !(pte_val(pte) & _PAGE_NX); } ++#endif ++#endif ++ + // ============================================================ + /* globals */ + +@@ -2356,7 +2406,7 @@ void ATI_API_CALL __ke_put_vm_page_table + #ifndef ptep_clear_flush_dirty + #define ptep_clear_flush_dirty(__vma, __address, __ptep) \ + ({ \ +- int __dirty = ptep_test_and_clear_dirty(__ptep); \ ++ int __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); \ + if (__dirty) \ + flush_tlb_page(__vma, __address); \ + __dirty; \ +@@ -2986,7 +2986,7 @@ + { + return request_irq(irq, + (void(*)(int, void *, struct pt_regs *))handler, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -3009,7 +3009,7 @@ + irq_handler_func = handler; + return request_irq(irq, + ke_irq_handler_wrap, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -5303,7 +5353,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_R + /** \brief Type definition of the structure describing Slab Cache object */ + typedef struct tag_kasSlabCache_t + { +- kmem_cache_t* cache; /* OS slab cache object */ ++ struct kmem_cache *cache; /* OS slab cache object */ + spinlock_t lock; /* OS spinlock object protecting the cache */ + unsigned int routine_type; /* Type of routine the cache might be accessed from */ + char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ +@@ -5349,7 +5399,7 @@ unsigned int ATI_API_CALL KAS_SlabCache_ + DBG_TRACE("creating slab object '%s'", slabcache_obj->name); + + if ((slabcache_obj->cache = +- kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL))) ++ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL))) + { + ret = 1; + } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install b/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install deleted file mode 100644 index 7c80936..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() -{ - echo 'You have successfully installed the ATi proprietary driver!' - echo 'To configure your xserver please run aticonfig!' - echo 'Before using X please restart your computer!' -} - -post_upgrade() -{ - post_install $1 -} - -op=$1 -shift -$op $* - -# vim: ft=sh diff --git a/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install b/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install deleted file mode 100644 index 47e9670..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install +++ /dev/null @@ -1,23 +0,0 @@ -post_install() -{ - [ `grep fglrx < /etc/sysconfig/modules|wc -l` == 0 ] && \ - echo 'fglrx' >> /etc/sysconfig/modules - depmod -a -} - -post_upgrade() -{ - post_install $1 -} - -pre_remove() -{ - [ ! `/sbin/lsmod|grep fglrx|wc -l` == 0 ] && /sbin/rmmod fglrx - sed -i 's|fglrx||g' /etc/sysconfig/modules -} - -op=$1 -shift -$op $* - -# vim: ft=sh From vmiklos at frugalware.org Wed Mar 5 12:26:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 12:26:15 2008 Subject: [Frugalware-git] frugalware-current: cyrus-sasl-2.1.22-12-i686 Message-ID: <20080305112613.10AC71190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=22f280a0869cb297c1e70eff09022fe38a12dc30 commit 22f280a0869cb297c1e70eff09022fe38a12dc30 Author: Miklos Vajna Date: Wed Mar 5 12:25:41 2008 +0100 cyrus-sasl-2.1.22-12-i686 add missing backup() diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 4b637a4..2f12947 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -3,10 +3,11 @@ pkgname=cyrus-sasl pkgver=2.1.22 -pkgrel=11 +pkgrel=12 pkgdesc="SASL Authentication mechanism" url="http://ftp.andrew.cmu.edu/pub/cyrus-mail/" depends=('openssl' 'gdbm') +backup=(etc/sysconfig/saslauthd) makedepends=('mysql' 'postgresql>=8.2' 'heimdal>=1.0' 'db>=4.6.18') groups=('network') archs=('i686' 'x86_64') From janny at frugalware.org Wed Mar 5 15:27:30 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 15:27:32 2008 Subject: [Frugalware-git] fwlive: nvidia-96xx-fwlive-96.43.05-4-i686 Message-ID: <20080305142730.AAAC71190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=9521ff358b8b999ec43cb8cdec8b2b13a8842eb6 commit 9521ff358b8b999ec43cb8cdec8b2b13a8842eb6 Author: janny Date: Wed Mar 5 15:25:37 2008 +0100 nvidia-96xx-fwlive-96.43.05-4-i686 * version bump in fwlive repo diff --git a/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild b/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild index 5d5e6ac..06e8bd4 100644 --- a/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: AlexExtreme pkgname=nvidia-96xx-fwlive -pkgver=1.0_9639 -nvver=`echo $pkgver|sed 's/_/-/'` -pkgrel=3 +_F_archive_name=nvidia-96xx +pkgver=96.43.05 +pkgrel=4 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') @@ -16,28 +16,28 @@ removes=(usr/bin/nvidia-{bug-report.sh,settings,xconfig} groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.nvidia.com/object/unix.html | grep -m1 'Latest Legacy.*1.0-96xx series'|sed 's/.*]//;s/-/_/'" -if [ "$CARCH" == "x86_64" ]; then - jarch=x86_64 && sha1=4e5fb164881cf4d13b12a811bc03a367e6860a7b - pkgnum=2 +if [ "$CARCH" == "i686" ]; then + _arch=x86 + pkgnum=1 + sha1sums=('ee4b15c1e550607bcf0768490c8127c3ae0e565d') else - jarch=x86 && sha1=ed7748c8f107cb4f5ec940915c2336c611049e5b - pkgnum=1 + _arch=x86_64 + pkgnum=2 + sha1sums=('9f20838b33c54c3d54e7fdbe87a3b47d542d21f1') fi -source=(http://us.download.nvidia.com/XFree86/Linux-$jarch/$nvver/NVIDIA-Linux-$jarch-$nvver-pkg$pkgnum.run) -sha1sums=($sha1) +source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip') -#Finclude kernel-module -kver=2.6.22-1 +Finclude kernel-module +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" depends=(${depends[@]} 'xorg-server>=1.1.0' 'pciutils') ## TMP for gf4 -unset install -install=$pkgname.install +install=$_F_archive_name.install build() { - nvdir=NVIDIA-Linux-$jarch-$nvver-pkg$pkgnum + nvdir=NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum linkver=`echo $pkgver|sed 's/_/\./'` cd $Fsrcdir sh $nvdir.run --extract-only @@ -81,4 +81,5 @@ build() { Fdoc $nvdir/LICENSE Fcpr $nvdir/usr/share/doc/* /usr/share/doc/$pkgname-$pkgver/ Fln "$pkgname-$pkgver" "/usr/share/doc/nvidia" + Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx-fwlive.install b/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx-fwlive.install deleted file mode 100644 index 491156d..0000000 --- a/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx-fwlive.install +++ /dev/null @@ -1,60 +0,0 @@ -post_install() { - echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." - echo "*** If you don't accept it, please remove the package!" - ## well here a 'WARNING' only on install | update because I don't know this - ## metamodes option will work for all - devnr=`lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` - - if [ "$devnr" ]; then - if [ "$devnr" -eq 0179 ]; then - echo "" - echo "*** WARNING: Nvidia - GeForce4 440/420 Go 32/64M - with PCI ID: - 0x$devnr - detected." - echo "*** WARNING: If you get an black screen try add this line to your xorg.conf in the DefaultDepth Section:" - echo "Option "\"metamodes\" "\"DFP: nvidia-auto-select +0+0; DFP: 800x600 +0+0; DFP: 640x480 +0+0\"" - echo "" - fi - fi - - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 0 ]; then - echo nvidia >> /etc/sysconfig/modules - fi - /sbin/depmod -a - /sbin/modprobe nvidia -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia - fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 1 ]; then - grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp - mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules - fi - if [ -e /usr/lib/xorg/temp/libglx.so ]; then - mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ - fi -} - -post_remove() { - depmod -a - echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" - echo "*** pacman-g2 -S libgl libglx ****" -} - -op=$1 -shift -$op $* diff --git a/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx.install b/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx.install new file mode 100644 index 0000000..d346d07 --- /dev/null +++ b/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx.install @@ -0,0 +1,84 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE." + echo "*** If you don't accept it, please remove the package!" + ## well here a 'WARNING' only on install | update because I don't know this + ## metamodes option will work for all + devnr=`/usr/sbin/lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` + + if [ "$devnr" ]; then + if [ "$devnr" -eq 0179 ]; then + echo "" + echo "*** WARNING: Nvidia - GeForce4 440/420 Go 32/64M - with PCI ID: - 0x$devnr - detected." + echo "*** WARNING: If you get an black screen try add this line to your xorg.conf in the DefaultDepth Section:" + echo "Option "\"metamodes\" "\"DFP: nvidia-auto-select +0+0; DFP: 800x600 +0+0; DFP: 640x480 +0+0\"" + echo "" + fi + fi + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + else + echo "WARNING: /etc/X11/xorg.conf does not exist!" + fi + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -ea $_F_kernelmod_uname + ## if nvidia dependent kernel is the current kernel + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## Try to load it + /sbin/modprobe nvidia + fi +} + +post_upgrade() { + echo -n "Runing depmod for nvidia kernel module for kernel $_F_kernelmod_uname ..." + /sbin/depmod -ea $_F_kernelmod_uname + echo " done." + ## if that exisit we bumped / upgraded the package only no new kernel + ## on a new kernel we do nothing because one has to reboot anyway + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## see if is loaded , if yes kill it and modprobe again if not do nothing + if grep -q nvidia /proc/modules; then + echo -n "Reloading nvidia kernel module.." + modprobe --remove nvidia + sleep 1 + modprobe nvidia + echo " done." + fi + fi +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + /sbin/modprobe --remove nvidia + fi + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + fi + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + /sbin/depmod -a $_F_kernelmod_uname + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* From janny at frugalware.org Wed Mar 5 21:20:09 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 21:20:12 2008 Subject: [Frugalware-git] fwlive: nvidia-fwlive-169.12-2-i686 Message-ID: <20080305202009.A89341190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=5cadb2cd1487767a0b69c5adbc42206033be85db commit 5cadb2cd1487767a0b69c5adbc42206033be85db Author: janny Date: Wed Mar 5 21:18:11 2008 +0100 nvidia-fwlive-169.12-2-i686 * version bump in fwlive repo diff --git a/source/x11-extra/nvidia-fwlive/FrugalBuild b/source/x11-extra/nvidia-fwlive/FrugalBuild index a64c48e..9981781 100644 --- a/source/x11-extra/nvidia-fwlive/FrugalBuild +++ b/source/x11-extra/nvidia-fwlive/FrugalBuild @@ -2,8 +2,9 @@ # Maintainer: AlexExtreme pkgname=nvidia-fwlive -pkgver=100.14.11 -pkgrel=1 +_F_archive_name=nvidia +pkgver=169.12 +pkgrel=2 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') @@ -11,23 +12,27 @@ provides=('libgl' 'libglx') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" -[ "$CARCH" == "x86_64" ] && jarch=x86_64 && sha1=d542b702fdf7835f5dc7ec767789b2c1ada60908 && pkgnum=2 -echo "$CARCH" | grep -q 'i.86' && jarch=x86 && sha1=1427c18afd1cae198bee5d321f0a023994619926 && pkgnum=1 -source=(http://us.download.nvidia.com/XFree86/Linux-$jarch/$pkgver/NVIDIA-Linux-$jarch-$pkgver-pkg$pkgnum.run) -sha1sums=($sha1) +if echo "$CARCH" | grep -q 'i.86'; then + _arch=x86 + sha1sums=('6ce789da785bf109fcb213db755eaf6975de2e46') + pkgnum=1 +elif [ "$CARCH" == "x86_64" ]; then + _arch=x86_64 + sha1sums=('62f9e1055ce6cd4d7806757ece0a144695ef12ff') + pkgnum=2 +fi +source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip' 'force') -#Finclude kernel-module -kver=2.6.22-1 -depends=("kernel-fwlive=$kver") +_F_kernelmod_scriptlet=$_F_archive_name.install +Finclude kernel-module +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" 'xorg-server>=1.1.0') makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" -depends=(${depends[@]} 'xorg-server>=1.1.0') -unset install -install=$pkgname.install +#_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` +#_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" build() { - nvdir=NVIDIA-Linux-$jarch-$pkgver-pkg$pkgnum + nvdir=NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum cd $Fsrcdir sh $nvdir.run --extract-only Fcd $nvdir/ @@ -83,6 +88,7 @@ build() { Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko Fdoc $nvdir/LICENSE - Fcpr $nvdir/usr/share/doc/* /usr/share/doc/$pkgname-$pkgver/ + Fcpr $nvdir/usr/share/doc/* usr/share/doc/$pkgname-$pkgver/ Fln "$pkgname-$pkgver" "/usr/share/doc/$pkgname" + Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install b/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install deleted file mode 100644 index cae4fc4..0000000 --- a/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." - echo "*** If you don't accept it, please remove the package!" - - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 0 ]; then - echo nvidia >> /etc/sysconfig/modules - fi - /sbin/depmod -a - /sbin/modprobe nvidia -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia - fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 1 ]; then - grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp - mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules - fi - if [ -e /usr/lib/xorg/temp/libglx.so ]; then - mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ - fi -} - -post_remove() { - depmod -a - echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" - echo "*** pacman-g2 -S libgl libglx ****" -} - -op=$1 -shift -$op $* diff --git a/source/x11-extra/nvidia-fwlive/nvidia.install b/source/x11-extra/nvidia-fwlive/nvidia.install new file mode 100644 index 0000000..cae4fc4 --- /dev/null +++ b/source/x11-extra/nvidia-fwlive/nvidia.install @@ -0,0 +1,47 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia/LICENSE." + echo "*** If you don't accept it, please remove the package!" + + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -a + /sbin/modprobe nvidia +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + rmmod nvidia + fi + + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + depmod -a + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* From janny at frugalware.org Wed Mar 5 21:50:25 2008 From: janny at frugalware.org (janny) Date: Wed Mar 5 21:51:12 2008 Subject: [Frugalware-git] fwlive: kqemu-fwlive-1.3.0pre11-24-i686 Message-ID: <20080305205025.A6DDB1190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=550c907375adeb16021400810d5875786066f5bf commit 550c907375adeb16021400810d5875786066f5bf Author: janny Date: Wed Mar 5 21:49:26 2008 +0100 kqemu-fwlive-1.3.0pre11-24-i686 * version bump in fwlive repo diff --git a/source/xapps-extra/kqemu-fwlive/FrugalBuild b/source/xapps-extra/kqemu-fwlive/FrugalBuild index 04bf9cd..3a11c83 100644 --- a/source/xapps-extra/kqemu-fwlive/FrugalBuild +++ b/source/xapps-extra/kqemu-fwlive/FrugalBuild @@ -3,12 +3,13 @@ pkgname=kqemu-fwlive pkgver=1.3.0pre11 -pkgrel=10 +pkgrel=24 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') -#Finclude kernel-module -kver=2.6.22-1 +_F_kernelmod_scriptlet=kqemu.install +Finclude kernel-module +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` @@ -16,8 +17,9 @@ _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep kqemu.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=($url/kqemu-$pkgver.tar.gz) -sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71') +source=($url/kqemu-$pkgver.tar.gz README.Frugalware) +sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71' \ + 'e1eb29a8e4c453480a18857c4416d1cc979a28f4') build() { @@ -28,4 +30,6 @@ build() Fmkdir /etc/udev/rules.d/ echo 'KERNEL=="kqemu*", NAME="%k", GROUP="users", MODE="0660"' \ > $Fdestdir/etc/udev/rules.d/48-qemu.rules + Fdoc README.Frugalware + Fbuild_kernelmod_scriptlet } diff --git a/source/xapps-extra/kqemu-fwlive/kqemu-fwlive.install b/source/xapps-extra/kqemu-fwlive/kqemu-fwlive.install deleted file mode 100644 index 7bc3b9a..0000000 --- a/source/xapps-extra/kqemu-fwlive/kqemu-fwlive.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() -{ - /sbin/depmod -a - /sbin/modprobe kqemu major=0 - if ! grep -q kqemu /etc/sysconfig/modules; then - echo 'kqemu "major=0"' >>/etc/sysconfig/modules - fi -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - /sbin/depmod -a - sed '/^kqemu/d' -i /etc/sysconfig/modules -} - -op=$1 -shift - -$op $* diff --git a/source/xapps-extra/kqemu-fwlive/kqemu.install b/source/xapps-extra/kqemu-fwlive/kqemu.install new file mode 100644 index 0000000..c054c92 --- /dev/null +++ b/source/xapps-extra/kqemu-fwlive/kqemu.install @@ -0,0 +1,24 @@ +post_install() +{ + /sbin/depmod -a $_F_kernelmod_uname + /sbin/modprobe kqemu major=0 + if ! grep -q kqemu /etc/sysconfig/modules; then + echo 'kqemu "major=0"' >>/etc/sysconfig/modules + fi +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + /sbin/depmod -a $_F_kernelmod_uname + sed '/^kqemu/d' -i /etc/sysconfig/modules +} + +op=$1 +shift + +$op $* From vmiklos at frugalware.org Wed Mar 5 22:15:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 22:15:52 2008 Subject: [Frugalware-git] frugalware-current: xaw3d-1.5-6-x86_64 Message-ID: <20080305211549.340741190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f77456dcd0fca508285daaa03abb2e8e9b86853 commit 7f77456dcd0fca508285daaa03abb2e8e9b86853 Author: Miklos Vajna Date: Wed Mar 5 21:44:00 2008 +0100 xaw3d-1.5-6-x86_64 - fix up smp build diff --git a/source/xlib/xaw3d/FrugalBuild b/source/xlib/xaw3d/FrugalBuild index 8f83f8f..c549445 100644 --- a/source/xlib/xaw3d/FrugalBuild +++ b/source/xlib/xaw3d/FrugalBuild @@ -17,7 +17,7 @@ source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-$pkgver$pkgextraver.tar.gz \ $pkgname-$pkgver-xfree86.diff) sha1sums=('efc5b923feda52866c859c59a5b553cb675a69d1' \ 'b45d4ea2104bbb6a0e756f2356acc1ac44b54df2') - +unset MAKEFLAGS build() { Fcd xc/lib/Xaw3d From vmiklos at frugalware.org Wed Mar 5 22:15:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 22:15:52 2008 Subject: [Frugalware-git] frugalware-current: yudit-2.9.0-1-x86_64 Message-ID: <20080305211549.177831190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=72953aa30505c30ecaad6277bff067f238484c76 commit 72953aa30505c30ecaad6277bff067f238484c76 Author: Miklos Vajna Date: Wed Mar 5 21:39:56 2008 +0100 yudit-2.9.0-1-x86_64 - fix up smp build diff --git a/source/xapps-extra/yudit/FrugalBuild b/source/xapps-extra/yudit/FrugalBuild index 3ea583e..d03b703 100644 --- a/source/xapps-extra/yudit/FrugalBuild +++ b/source/xapps-extra/yudit/FrugalBuild @@ -12,5 +12,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://yudit.org/download.html | grep -m1 tar.bz2$ | sed 's/.*-\(.*\).t.*/\1/'" source=(http://yudit.org/download/yudit-$pkgver.tar.bz2) sha1sums=('d958c88f93707036e031c6d6ac12e2d20d68d0fd') - +unset MAKEFLAGS # optimization OK From vmiklos at frugalware.org Wed Mar 5 22:15:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 22:15:52 2008 Subject: [Frugalware-git] frugalware-current: tuxpaint-0.9.18-2-x86_64 Message-ID: <20080305211549.40C3E1190A18@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f74e54fd2a1aa663717d3b0fbc83f3389227a663 commit f74e54fd2a1aa663717d3b0fbc83f3389227a663 Author: Miklos Vajna Date: Wed Mar 5 22:11:56 2008 +0100 tuxpaint-0.9.18-2-x86_64 - fix up x86_64 build diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild index 01bdde1..95ba779 100644 --- a/source/games-extra/tuxpaint/FrugalBuild +++ b/source/games-extra/tuxpaint/FrugalBuild @@ -23,6 +23,9 @@ build() { Fcd Fpatchall + if [ "$CARCH" == "x86_64" ]; then + Fsed '-g' '-fPIC' magic/Makefile + fi make ENABLE_GETTEXT=1 || Fdie make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install || Fdie Fbuild_gnome_scriptlet From vmiklos at frugalware.org Wed Mar 5 22:15:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 22:15:53 2008 Subject: [Frugalware-git] frugalware-current: sword-packard-1.2-1-x86_64 Message-ID: <20080305211549.49826176C055@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f08aebd721a6ba26b942caa4a01550323700c3d commit 3f08aebd721a6ba26b942caa4a01550323700c3d Author: Miklos Vajna Date: Wed Mar 5 22:15:42 2008 +0100 sword-packard-1.2-1-x86_64 - sha1sums() fix diff --git a/source/locale-extra/sword-packard/FrugalBuild b/source/locale-extra/sword-packard/FrugalBuild index be10ea9..e53f1c5 100644 --- a/source/locale-extra/sword-packard/FrugalBuild +++ b/source/locale-extra/sword-packard/FrugalBuild @@ -12,7 +12,7 @@ groups=('locale-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.crosswire.org/sword/modules/ModInfo.jsp?modName=Packard | grep 'Module Version' | sed 's/.*Module Version \(.*\).*/\1/'" source=(http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/Packard.zip) -sha1sums=('39a1a79a3b0518ec2cde4d0a725f874bdf7308cd') +sha1sums=('0d31be8e157970743efa3f2b3b455598fae046c2') build() { From vmiklos at frugalware.org Wed Mar 5 22:32:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 22:32:50 2008 Subject: [Frugalware-git] frugalware-current: mutt-ng-1.5.17-2-x86_64 Message-ID: <20080305213249.71CD41190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=275b74dc41a52a3c0e5d5bca2a580efdd15c5cb7 commit 275b74dc41a52a3c0e5d5bca2a580efdd15c5cb7 Author: Miklos Vajna Date: Wed Mar 5 22:32:45 2008 +0100 mutt-ng-1.5.17-2-x86_64 - fix up smp build diff --git a/source/network-extra/mutt-ng/FrugalBuild b/source/network-extra/mutt-ng/FrugalBuild index 385cfb3..8fb8ce2 100644 --- a/source/network-extra/mutt-ng/FrugalBuild +++ b/source/network-extra/mutt-ng/FrugalBuild @@ -17,7 +17,7 @@ up2date="lynx -dump $url/download.html |grep tar |sed -ne 's/.*-\(.*\).t.*/\1/;2 source=(ftp://ftp.mutt.org/mutt/devel/mutt-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/mutt-ng/mutt-${pkgver}-patches2.tar.gz) signatures=($source.asc '') - +unset MAKEFLAGS build() { Fcd mutt-$pkgver From vmiklos at frugalware.org Wed Mar 5 23:10:56 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 5 23:10:57 2008 Subject: [Frugalware-git] frugalware-current: kde-theme-qtcurve-0.55.3-1-x86_64 Message-ID: <20080305221056.4AD321190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08c3987f3f284fdcb5811ffff64539b6bc129048 commit 08c3987f3f284fdcb5811ffff64539b6bc129048 Author: Miklos Vajna Date: Wed Mar 5 23:10:48 2008 +0100 kde-theme-qtcurve-0.55.3-1-x86_64 - fix up x86_64 build diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index f5861ef..a3252ea 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -60,10 +60,6 @@ build() || Fdie make || Fdie make DESTDIR=$Fdestdir install || Fdie - if [ "$CARCH" == "x86_64" ]; then - Fmv usr/lib64/kde3/* /usr/lib/kde3 - Frm /usr/lib64 - fi } # optimization OK From vmiklos at frugalware.org Thu Mar 6 00:48:38 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 6 00:48:41 2008 Subject: [Frugalware-git] frugalware-current: gpac-0.4.4-3-x86_64 Message-ID: <20080305234838.681581190A16@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dbc4dd32a796839ca373fd30c7a480b14b58b6a0 commit dbc4dd32a796839ca373fd30c7a480b14b58b6a0 Author: Miklos Vajna Date: Thu Mar 6 00:25:55 2008 +0100 gpac-0.4.4-3-x86_64 - fix up x86_64 build diff --git a/source/xmultimedia-extra/gpac/FrugalBuild b/source/xmultimedia-extra/gpac/FrugalBuild index 3bd1840..162665f 100644 --- a/source/xmultimedia-extra/gpac/FrugalBuild +++ b/source/xmultimedia-extra/gpac/FrugalBuild @@ -11,16 +11,24 @@ archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=84101 |grep tar.gz |sed -ne 's/.*c-\(.*\).tar.*/\1/;s/-/_/;1p'" +sha1sums=('99b185966632376295f4406821223f5d60d1a32c') +if [ "$CARCH" == "x86_64" ]; then + source=(${source[@]} soname.patch pic.patch) + sha1sums=($sha1sums '16141d981c72a65b48565019052de604226e6b84' \ + '03df9bb4796c0342a70c9e5793739ee0bc6a3177') +fi build(){ unset MAKEFLAGS Fcd $pkgname + Fpatchall chmod +x configure || Fdie Fsed "-O3" "$CFLAGS" configure + Fsed 'osmozilla' '' applications/Makefile Fsed '$(prefix)/bin' '$(DESTDIR)$(prefix)/bin' applications/osmo4_wx/Makefile - Fbuild + Fmake --enable-pic + Fmakeinstall make DESTDIR=$Fdestdir install-lib || Fdie } -sha1sums=('99b185966632376295f4406821223f5d60d1a32c') # optimization OK diff --git a/source/xmultimedia-extra/gpac/pic.patch b/source/xmultimedia-extra/gpac/pic.patch new file mode 100644 index 0000000..9bb2a67 --- /dev/null +++ b/source/xmultimedia-extra/gpac/pic.patch @@ -0,0 +1,760 @@ +Index: gpac-0.4.4/configure +=================================================================== +--- gpac-0.4.4.orig/configure ++++ gpac-0.4.4/configure +@@ -69,6 +69,8 @@ has_ipv6="no" + has_dvb4linux="no" + has_openjpeg="no" + gprof_build="no" ++PIC_CFLAGS="" ++want_pic="no" + + win32="no" + mingw32="no" +@@ -121,6 +123,7 @@ echo " --mozdir=MOZ_PATH specify + echo "" + echo " --enable-debug produce debug version" + echo " --enable-gprof enable profiling" ++echo " --enable-pic enable Position Independant Code for shared objects" + echo " --track-memory enables tracking of all memory allocated by gpac" + echo " --disable-fragments disable movie fragments in ISO media support" + echo " --disable-opt disable GCC optimizations" +@@ -195,7 +198,8 @@ case "$cpu" in + if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then + cpu="x86_64" + #that's a bit crude... +- CFLAGS="$CFLAGS -fPIC -DPIC" ++ PIC_CFLAGS="-fPIC -DPIC" ++ want_pic="yes" + fi + fi + ;; +@@ -826,6 +830,8 @@ for opt do + ;; + --enable-gprof) gprof_build="yes"; + ;; ++ --enable-pic) PIC_CFLAGS="-fPIC -DPIC"; want_pic="yes"; ++ ;; + --disable-opt) no_gcc_opt="yes" + ;; + --disable-ipv6) has_ipv6="no" +@@ -1209,6 +1215,8 @@ echo "RANLIB=$ranlib" >> config.mak + echo "STRIP=$strip" >> config.mak + echo "OPTFLAGS=$CFLAGS" >> config.mak + echo "CPPFLAGS=$CPPFLAGS" >> config.mak ++echo "PIC_CFLAGS=$PIC_CFLAGS" >> config.mak ++echo "WANT_PIC=$want_pic" >> config.mak + echo "LDFLAGS=$LDFLAGS" >> config.mak + echo "SHFLAGS=$SHFLAGS" >> config.mak + +@@ -1422,4 +1430,7 @@ if [ ! -d "./bin/gcc/temp" ]; then + mkdir ./bin/gcc/temp + fi + ++echo '%.opic : %.c' >> config.mak ++echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak ++ + echo "Done - type 'make help' for make info, 'make' to build" +Index: gpac-0.4.4/src/Makefile +=================================================================== +--- gpac-0.4.4.orig/src/Makefile ++++ gpac-0.4.4/src/Makefile +@@ -157,6 +157,12 @@ endif + EXTRALIBS+=$(GPAC_SH_FLAGS) + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + SRCS := $(OBJS:.o=.c) + + all: lib +@@ -204,10 +210,10 @@ else + $(CC) $(CFLAGS) -c -o $@ $< + endif + +-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) isomedia scenegraph mcrypt mediatools sceneman term render ++$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(OBJSPIC) isomedia scenegraph mcrypt mediatools sceneman term render + ar cr ../bin/gcc/libgpac_static.a $(OBJS) + ranlib ../bin/gcc/libgpac_static.a +- $(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS) ++ $(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) + + dep: depend + +Index: gpac-0.4.4/modules/aac_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/aac_in/Makefile ++++ gpac-0.4.4/modules/aac_in/Makefile +@@ -37,11 +37,18 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols aac_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/alsa/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/alsa/Makefile ++++ gpac-0.4.4/modules/alsa/Makefile +@@ -22,10 +22,16 @@ SRCS := $(OBJS:.o=.c) + + LIB=gm_alsa.$(DYN_LIB_SUFFIX) + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound + + + %.o: %.c +Index: gpac-0.4.4/modules/bifs_dec/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/bifs_dec/Makefile ++++ gpac-0.4.4/modules/bifs_dec/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols bifs_dec.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/ctx_load/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/ctx_load/Makefile ++++ gpac-0.4.4/modules/ctx_load/Makefile +@@ -24,11 +24,18 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols ctx_load.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/dummy_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/dummy_in/Makefile ++++ gpac-0.4.4/modules/dummy_in/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols dummy_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/ffmpeg_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/ffmpeg_in/Makefile ++++ gpac-0.4.4/modules/ffmpeg_in/Makefile +@@ -38,11 +38,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols ffmpeg_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/ft_font/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/ft_font/Makefile ++++ gpac-0.4.4/modules/ft_font/Makefile +@@ -28,11 +28,17 @@ endif + LINKVAR=-L../../bin/gcc -lgpac $(FT_LIBS) + + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKVAR) $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKVAR) $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/img_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/img_in/Makefile ++++ gpac-0.4.4/modules/img_in/Makefile +@@ -87,11 +87,17 @@ LINKLIBS+=-lwinmm + LDFLAGS+=-export-symbols img_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/ismacryp/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/ismacryp/Makefile ++++ gpac-0.4.4/modules/ismacryp/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols ismacryp.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/isom_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/isom_in/Makefile ++++ gpac-0.4.4/modules/isom_in/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols isom_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/laser_dec/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/laser_dec/Makefile ++++ gpac-0.4.4/modules/laser_dec/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols laser_dec.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/mp3_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/mp3_in/Makefile ++++ gpac-0.4.4/modules/mp3_in/Makefile +@@ -39,11 +39,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols mp3_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/mpegts_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/mpegts_in/Makefile ++++ gpac-0.4.4/modules/mpegts_in/Makefile +@@ -29,11 +29,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols mpegts_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/odf_dec/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/odf_dec/Makefile ++++ gpac-0.4.4/modules/odf_dec/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols odf_dec.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/ogg/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/ogg/Makefile ++++ gpac-0.4.4/modules/ogg/Makefile +@@ -62,11 +62,17 @@ LDFLAGS+=-export-symbols ogg.def + endif + + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/oss_audio/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/oss_audio/Makefile ++++ gpac-0.4.4/modules/oss_audio/Makefile +@@ -31,10 +31,16 @@ SRCS := $(OBJS:.o=.c) + + LIB=gm_oss_audio.$(DYN_LIB_SUFFIX) + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS) + + + %.o: %.c +Index: gpac-0.4.4/modules/raw_out/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/raw_out/Makefile ++++ gpac-0.4.4/modules/raw_out/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols raw_out.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/render2d/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/render2d/Makefile ++++ gpac-0.4.4/modules/render2d/Makefile +@@ -38,11 +38,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols render2d.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKFLAGS) $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/render3d/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/render3d/Makefile ++++ gpac-0.4.4/modules/render3d/Makefile +@@ -44,11 +44,17 @@ LDFLAGS+=-export-symbols render3d.def + else + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(EXTRALIBS) $(OGL_LIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKFLAGS) $(EXTRALIBS) $(OGL_LIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/rtp_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/rtp_in/Makefile ++++ gpac-0.4.4/modules/rtp_in/Makefile +@@ -25,11 +25,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols rtp_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) + + + %.o: %.c +Index: gpac-0.4.4/modules/saf_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/saf_in/Makefile ++++ gpac-0.4.4/modules/saf_in/Makefile +@@ -25,11 +25,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols saf_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/sdl_out/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/sdl_out/Makefile ++++ gpac-0.4.4/modules/sdl_out/Makefile +@@ -31,11 +31,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols sdl_out.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(SDL_LIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(SDL_LIBS) -L../../bin/gcc -lgpac + + %.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< +Index: gpac-0.4.4/modules/soft_raster/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/soft_raster/Makefile ++++ gpac-0.4.4/modules/soft_raster/Makefile +@@ -30,11 +30,18 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols rast_soft.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/svg_in/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/svg_in/Makefile ++++ gpac-0.4.4/modules/svg_in/Makefile +@@ -29,11 +29,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols svg_in.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lz ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lz + + + %.o: %.c +Index: gpac-0.4.4/modules/timedtext/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/timedtext/Makefile ++++ gpac-0.4.4/modules/timedtext/Makefile +@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols timedtext.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c +Index: gpac-0.4.4/modules/x11_out/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/x11_out/Makefile ++++ gpac-0.4.4/modules/x11_out/Makefile +@@ -47,11 +47,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -lX11 -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -lX11 -L../../bin/gcc -lgpac + + %.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< +Index: gpac-0.4.4/modules/xvid_dec/Makefile +=================================================================== +--- gpac-0.4.4.orig/modules/xvid_dec/Makefile ++++ gpac-0.4.4/modules/xvid_dec/Makefile +@@ -31,11 +31,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols xvid_dec.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) + + + %.o: %.c +Index: gpac/modules/amr_float_dec/Makefile +=================================================================== +--- gpac.orig/modules/amr_float_dec/Makefile ++++ gpac/modules/amr_float_dec/Makefile +@@ -41,11 +41,17 @@ ifeq ($(CONFIG_WIN32),yes) + LDFLAGS+=-export-symbols amr_float_dec.def + endif + ++ifeq ($(WANT_PIC),yes) ++OBJSPIC=$(OBJS:.o=.opic) ++else ++OBJSPIC=$(OBJS) ++endif ++ + all: $(LIB) + + +-$(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++$(LIB): $(OBJSPIC) ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + + + %.o: %.c diff --git a/source/xmultimedia-extra/gpac/soname.patch b/source/xmultimedia-extra/gpac/soname.patch new file mode 100644 index 0000000..e5951b3 --- /dev/null +++ b/source/xmultimedia-extra/gpac/soname.patch @@ -0,0 +1,11 @@ +--- gpac.orig/src/Makefile 2006-07-11 11:53:44.000000000 -0400 ++++ gpac/src/Makefile 2006-08-01 12:58:38.000000000 -0400 +@@ -197,7 +197,7 @@ + $(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) isomedia scenegraph mcrypt mediatools sceneman term render + ar cr ../bin/gcc/libgpac_static.a $(OBJS) + ranlib ../bin/gcc/libgpac_static.a +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS) ++ $(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS) + + dep: depend + From priyank at frugalware.org Thu Mar 6 07:41:39 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 07:41:40 2008 Subject: [Frugalware-git] gfpm: gfpm-repomgr: gfpm_repomgr_populate_repolist(): skip bad repos and prevent a segfault Message-ID: <20080306064139.44708119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=0c0eb4395c05da7e6f9b47b37e1cb3923d37268f commit 0c0eb4395c05da7e6f9b47b37e1cb3923d37268f Author: Priyank Date: Thu Mar 6 12:10:42 2008 +0530 gfpm-repomgr: gfpm_repomgr_populate_repolist(): skip bad repos and prevent a segfault diff --git a/src/gfpm-repomanager.c b/src/gfpm-repomanager.c index 029c381..6eede20 100644 --- a/src/gfpm-repomanager.c +++ b/src/gfpm-repomanager.c @@ -568,7 +568,7 @@ gfpm_repomgr_populate_repo_info (const char *path, gfpm_repo_t *repo_r) if ((tmp = fopen (path, "r")) == NULL) { - gchar *errorstr = g_strdup_printf ("%s for %s %s", _("Error opening repository servers file"), path, _("repository")); + gchar *errorstr = g_strdup_printf ("%s : %s.\n%s", _("Error opening"), path, _("This repository will be disabled")); gfpm_error (_("Error opening repository file"), errorstr); g_free (errorstr); return; @@ -663,7 +663,13 @@ gfpm_repomgr_populate_repolist (void) repo_r = (gfpm_repo_t*)malloc(sizeof(gfpm_repo_t)); memset (repo_r, 0, sizeof(gfpm_repo_t)); gfpm_repomgr_populate_repo_info (str, repo_r); + if (!strlen(repo_r->name)) + { + g_free (repo_r); + continue; + } repo_r->enabled = TRUE; + repo_r->delete = FALSE; // and then append it to our repo list repolist->list = g_list_append (repolist->list, (gpointer)repo_r); n++; @@ -675,12 +681,17 @@ gfpm_repomgr_populate_repolist (void) repo_r = (gfpm_repo_t*)malloc(sizeof(gfpm_repo_t)); memset (repo_r, 0, sizeof(gfpm_repo_t)); gfpm_repomgr_populate_repo_info (str, repo_r); + if (!strlen(repo_r->name)) + { + g_free (repo_r); + continue; + } repo_r->enabled = FALSE; + repo_r->delete = FALSE; // and then append it to our repo list repolist->list = g_list_append (repolist->list, (gpointer)repo_r); n++; } - repo_r->delete = FALSE; } repolist->n = n; From priyank at frugalware.org Thu Mar 6 08:01:32 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 08:01:34 2008 Subject: [Frugalware-git] gfpm: gfpm-repomgr: Fixed a major bug where gfpm didn't save some parts of the config file resulting in an inconsistent configuration. Message-ID: <20080306070132.35BDD119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=c2f5c3757de6fc5af638d7faa4656f0c9083e64c commit c2f5c3757de6fc5af638d7faa4656f0c9083e64c Author: Priyank Date: Thu Mar 6 12:30:43 2008 +0530 gfpm-repomgr: Fixed a major bug where gfpm didn't save some parts of the config file resulting in an inconsistent configuration. diff --git a/src/gfpm-repomanager.c b/src/gfpm-repomanager.c index 6eede20..c97e482 100644 --- a/src/gfpm-repomanager.c +++ b/src/gfpm-repomanager.c @@ -644,20 +644,9 @@ gfpm_repomgr_populate_repolist (void) fwutil_trim (line); if (!strlen(line)) continue; - else if (line[0] == '#' && line[1] != 'I') - { - if (flag == FALSE) - { - repolist->header = g_list_append (repolist->header, (gpointer) g_strdup(line)); - } - else - { - repo_r->footer = g_list_append (repo_r->footer, (gpointer) g_strdup(line)); - } - continue; - } - else if (sscanf(line, "Include = %s", str)) + else if (line[0] == 'I' && line[1] == 'n') { + sscanf (line, "Include = %s", str); if (flag == FALSE) flag = TRUE; repo_r = (gfpm_repo_t*)malloc(sizeof(gfpm_repo_t)); @@ -674,8 +663,9 @@ gfpm_repomgr_populate_repolist (void) repolist->list = g_list_append (repolist->list, (gpointer)repo_r); n++; } - else if (sscanf(line, "#Include = %s", str)) + else if (line[0] == '#' && line[1] == 'I') { + sscanf (line, "#Include = %s", str); if (flag == FALSE) flag = TRUE; repo_r = (gfpm_repo_t*)malloc(sizeof(gfpm_repo_t)); @@ -692,6 +682,18 @@ gfpm_repomgr_populate_repolist (void) repolist->list = g_list_append (repolist->list, (gpointer)repo_r); n++; } + else + { + if (flag == FALSE) + { + repolist->header = g_list_append (repolist->header, (gpointer) g_strdup(line)); + } + else + { + repo_r->footer = g_list_append (repo_r->footer, (gpointer) g_strdup(line)); + } + continue; + } } repolist->n = n; From janny at frugalware.org Thu Mar 6 13:14:24 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 13:14:26 2008 Subject: [Frugalware-git] fwlive: fwlive-build Message-ID: <20080306121424.A7B711190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=b0a6d638dbbc7dbd944a9af0da0ef4a445da5613 commit b0a6d638dbbc7dbd944a9af0da0ef4a445da5613 Author: Janny Date: Thu Mar 6 13:12:50 2008 +0100 fwlive-build * add "Deleting unused languages" to build diff --git a/live-base/build b/live-base/build index 2aa0954..a470fd2 100644 --- a/live-base/build +++ b/live-base/build @@ -50,6 +50,13 @@ cd .. cp initrd/initrd.gz $CDDATA/boot/initrd.gz rm initrd/initrd.gz +echo "Deleting unused languages..." + +for i in $(echo $LOCALE | sed -r "s/\,/ /g"); do + lo="! -name \"$i*\" "$lo +done +find /usr/share/locale -maxdepth 1 -type d $lo -ecec rm -fr {} \; + echo "Creating compressed images..." for dir in $MKMOD; do From janny at frugalware.org Thu Mar 6 13:14:24 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 13:14:26 2008 Subject: [Frugalware-git] fwlive: fwlive-Makefile Message-ID: <20080306121424.8DAC1119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=59d629e0fb63b8b29a1e9e7a6889ba46eb262c63 commit 59d629e0fb63b8b29a1e9e7a6889ba46eb262c63 Author: Janny Date: Thu Mar 6 13:06:47 2008 +0100 fwlive-Makefile * add in MAKEFILE insert LOCALE line to live-base config diff --git a/Makefile b/Makefile index 647820a..2980323 100644 --- a/Makefile +++ b/Makefile @@ -275,6 +275,7 @@ endif sed -i "s|linuxcd|${FWLHOST}|" ${CHROOTDIR}/${TREE}/tmp/live-base/.config sed -i "s|Live|$(shell ${FWLREL}) (${FWLCODENAME})|" ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/linux/make_iso.sh sed -i "s|KERNEL=.*|KERNEL=\"$(shell ${KERNVER})\"|" ${CHROOTDIR}/${TREE}/tmp/live-base/.config + echo "LOCALE=${LOCALE}" >> ${CHROOTDIR}/${TREE}/tmp/live-base/.config hacking-kdmrc: checkroot if [ ${APPSGROUP} == "KDE" ] || [ ${APPSGROUP} == "FULL" ] ; then \ From janny at frugalware.org Thu Mar 6 13:32:16 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 13:32:18 2008 Subject: [Frugalware-git] fwlive: fwlive-build Message-ID: <20080306123216.65917119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=83fc6b50235a47bf76b690d7f30f07269195f1cf commit 83fc6b50235a47bf76b690d7f30f07269195f1cf Author: Janny Date: Thu Mar 6 13:31:46 2008 +0100 fwlive-build * add real path and typo fix diff --git a/live-base/build b/live-base/build index a470fd2..031dd2e 100644 --- a/live-base/build +++ b/live-base/build @@ -55,7 +55,7 @@ echo "Deleting unused languages..." for i in $(echo $LOCALE | sed -r "s/\,/ /g"); do lo="! -name \"$i*\" "$lo done -find /usr/share/locale -maxdepth 1 -type d $lo -ecec rm -fr {} \; +find $ROOT/usr/share/locale -maxdepth 1 -type d $lo -exec rm -fr {} \; echo "Creating compressed images..." From vmiklos at frugalware.org Thu Mar 6 13:34:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 6 13:34:23 2008 Subject: [Frugalware-git] frugalware-current: binutils-emul-2.18.50.0.3_1-1-x86_64 Message-ID: <20080306123421.09F6F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52c7583a1c07707ea89cbf895e6316b7dac12814 commit 52c7583a1c07707ea89cbf895e6316b7dac12814 Author: Miklos Vajna Date: Thu Mar 6 13:34:10 2008 +0100 binutils-emul-2.18.50.0.3_1-1-x86_64 - fix up pkgver and sha1sums() diff --git a/source/emul-extra/binutils-emul/FrugalBuild b/source/emul-extra/binutils-emul/FrugalBuild index 5e6f571..3f1b667 100644 --- a/source/emul-extra/binutils-emul/FrugalBuild +++ b/source/emul-extra/binutils-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=binutils-emul -pkgver=2.18.50.0.3_ +pkgver=2.18.50.0.3_1 pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files for emulation of i686 on x86_64" url="http://sources.redhat.com/binutils" @@ -10,4 +10,4 @@ depends=('bash-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('6c579b8c1a14c51361f9231c388fafb1503e592a') +sha1sums=('75f8595d2f592df44114db08c5ac004d19539117') From priyank at frugalware.org Thu Mar 6 13:58:12 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 13:58:13 2008 Subject: [Frugalware-git] gfpm: Bump version to 1.1.1 Message-ID: <20080306125812.876B61190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=70032bffe9c4610414c073698a9f8e30301cd1d7 commit 70032bffe9c4610414c073698a9f8e30301cd1d7 Author: Priyank Date: Thu Mar 6 18:27:15 2008 +0530 Bump version to 1.1.1 diff --git a/README b/README index f1f5097..6c7a41a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Gfpm 1.1.0 README +Gfpm 1.1.1 README ================== diff --git a/configure.ac b/configure.ac index 6225e54..9059bad 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([Gfpm], 1.1.0, [priyankmg@gmail.com], gfpm) +AC_INIT([Gfpm], 1.1.1, [priyankmg@gmail.com], gfpm) AC_DEFINE_UNQUOTED([GFPM_RELEASE_NAME], ["Callisto"], [Release codenames]) AC_CONFIG_SRCDIR([src/gfpm.c]) AC_LANG(C) From priyank at frugalware.org Thu Mar 6 13:58:12 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 13:58:14 2008 Subject: [Frugalware-git] gfpm: updates for 1.1.1 Message-ID: <20080306125812.67D76119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=c2eee63ebcae4e4ac76533db8037387b28051f69 commit c2eee63ebcae4e4ac76533db8037387b28051f69 Author: Priyank Date: Thu Mar 6 18:23:26 2008 +0530 updates for 1.1.1 diff --git a/NEWS b/NEWS index 6c4f7c7..0fc62fe 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,14 @@ VERSION DESCRIPTION --------------------------------------------------------------------------------------------------------- +1.1.1 - BUGFIX: Fixed a major bug where Gfpm repository manager failed to save [options] part + of the configuration file resulting in an inconsistent configuration + BUGFIX: In repository manager, while parsing the repositories from the conf file, skip + bad repos. This prevents a segfault. + BUGFIX (#2811): Hide the HELP button until the documentation for Gfpm is ready + BUGFIX (#2814): Changed text of some buttons on the quick pane to make it more clear for the user + Don't allow non-root users to perform certain operations like installing/removing a package, + optimize the database etc. + Fix a segfault when gfpm is run by a non-root user. 1.1.0 Callisto (2008-03-01) - Added a Repository Manager which allows users to configure their package repositories. Added a Log Viewer which displays the pacman-g2 system log. Added a new splash screen (Thanks to masta64 for the artwork) From vmiklos at frugalware.org Thu Mar 6 14:11:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 6 14:12:00 2008 Subject: [Frugalware-git] frugalware-current: cyrus-sasl-2.1.22-12-x86_64 Message-ID: <20080306131157.EA764119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2465d66d15a15cfdb3a2fde6629c8c33c9bde5b commit e2465d66d15a15cfdb3a2fde6629c8c33c9bde5b Author: Miklos Vajna Date: Thu Mar 6 14:11:54 2008 +0100 cyrus-sasl-2.1.22-12-x86_64 - fix up smp build diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 2f12947..6112f08 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -29,10 +29,9 @@ subdepends=("$pkgname=$pkgver libmysqlclient libpq>=8.2" "$pkgname=$pkgver db>=4 "$pkgname=$pkgver $pkgname-gssapiv2") subgroups=('network' 'network' 'network') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') - build() { - + unset MAKEFLAGS Fbuild --enable-login \ --enable-sql \ --enable-plain \ From priyank at frugalware.org Thu Mar 6 14:17:42 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 14:17:43 2008 Subject: [Frugalware-git] frugalware-current: gfpm-1.1.1-1-i686 Message-ID: <20080306131742.1F54D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7cd241143f5703e9e5c34f6ed4090d160826ae7c commit 7cd241143f5703e9e5c34f6ed4090d160826ae7c Author: Priyank Date: Thu Mar 6 18:44:34 2008 +0530 gfpm-1.1.1-1-i686 * Version bump [ok with vmiklos] diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild index 537894b..bf7b481 100644 --- a/source/xapps/gfpm/FrugalBuild +++ b/source/xapps/gfpm/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=gfpm -pkgver=1.1.0 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Graphical Frugalware Package Manager" url="http://ftp.frugalware.org/pub/other/gfpm" depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2>=3.6.7-2' 'inotify-tools' 'frugalwareutils>=0.7.9') @@ -14,8 +14,8 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="lynx -dump $url | Flasttar" -source=($url/$pkgname-$pkgver.tar.gz gfpm_hide_help_button.diff gfpm_post110fixes.diff) -signatures=(${source[0]}.asc '' '') +source=($url/$pkgname-$pkgver.tar.gz) +signatures=(${source[0]}.asc) build() { diff --git a/source/xapps/gfpm/gfpm_hide_help_button.diff b/source/xapps/gfpm/gfpm_hide_help_button.diff deleted file mode 100644 index a3f3588..0000000 --- a/source/xapps/gfpm/gfpm_hide_help_button.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur gfpm-1.1.0/data/gfpm.glade gfpm-1.1.0.new/data/gfpm.glade ---- gfpm-1.1.0/data/gfpm.glade 2008-03-02 01:22:31.000000000 +0530 -+++ gfpm-1.1.0.new/data/gfpm.glade 2008-03-04 21:41:03.000000000 +0530 -@@ -201,7 +201,6 @@ -       - - -- True - Help - True - gtk-help diff --git a/source/xapps/gfpm/gfpm_post110fixes.diff b/source/xapps/gfpm/gfpm_post110fixes.diff deleted file mode 100644 index c507301..0000000 --- a/source/xapps/gfpm/gfpm_post110fixes.diff +++ /dev/null @@ -1,128 +0,0 @@ -diff -Naur gfpm-1.1.0/src/gfpm-interface.c gfpm-1.1.0.new/src/gfpm-interface.c ---- gfpm-1.1.0/src/gfpm-interface.c 2008-03-02 01:22:31.000000000 +0530 -+++ gfpm-1.1.0.new/src/gfpm-interface.c 2008-03-04 22:47:09.000000000 +0530 -@@ -334,9 +334,19 @@ - /* Disable Apply, Refresh and File buttons if user is not root */ - if ( geteuid() != 0 ) - { -+ /* disable some widgets */ - gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_apply"), FALSE); - gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_refresh1"), FALSE); - gtk_widget_set_sensitive (glade_xml_get_widget(xml, "button_file1"), FALSE); -+ gtk_widget_set_sensitive (gfpm_get_widget("repos"), FALSE); -+ gtk_widget_set_sensitive (gfpm_get_widget("clr1"), FALSE); -+ gtk_widget_set_sensitive (gfpm_get_widget("opt1"), FALSE); -+ } -+ else -+ { -+ /* init repomanager only if gfpm is run as root user */ -+ gfpm_repomanager_init (); -+ - } - - /* initialize modules */ -@@ -347,7 +357,6 @@ - gfpm_optimize_db_dlg_init (); - gfpm_quickpane_init (); - gfpm_icmonitor_init (); -- gfpm_repomanager_init (); - gfpm_logviewer_init (); - - gtk_widget_hide (gfpm_splash); -@@ -1437,6 +1446,9 @@ - if (event->button != 3) - return; - -+ if (geteuid() != 0) -+ return; -+ - model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_pkgs_tvw)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_pkgs_tvw)); - if ( FALSE == gtk_tree_selection_get_selected (selection, &model, &iter) ) -@@ -1487,7 +1499,7 @@ - g_signal_connect (G_OBJECT(menu_item), "activate", G_CALLBACK(cb_gfpm_mark_for_reinstall), (gpointer)pkgname); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item); - gtk_widget_show (menu_item); -- -+ - menu_item = gtk_image_menu_item_new_with_label (_("Mark for removal")); - image = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item), image); -diff -Naur gfpm-1.1.0/src/gfpm-progress.c gfpm-1.1.0.new/src/gfpm-progress.c ---- gfpm-1.1.0/src/gfpm-progress.c 2008-03-02 01:22:31.000000000 +0530 -+++ gfpm-1.1.0.new/src/gfpm-progress.c 2008-03-04 22:47:11.000000000 +0530 -@@ -33,7 +33,7 @@ - extern GtkWidget *gfpm_mw; - - GtkProgressBar *progressbar = NULL; --GtkWidget *progresswindow = NULL; -+GtkWidget *progresswindow = NULL; - static GtkWidget *main_label = NULL; - static GtkWidget *sub_label = NULL; - static GtkWidget *rate_label = NULL; -@@ -45,7 +45,7 @@ - static GtkWidget *autoclose_checkbtn = NULL; - - GtkTextIter t_iter; --GtkTextBuffer *buffer = NULL; -+GtkTextBuffer *buffer = NULL; - - float rate; - int offset; -@@ -97,7 +97,8 @@ - static void - cb_gfpm_close_button_clicked (GtkWidget *button, gpointer data) - { -- gfpm_progress_show (FALSE); -+ pacman_trans_release (); -+// gfpm_progress_show (FALSE); - - return; - } -@@ -167,13 +168,13 @@ - int - gfpm_progress_update (netbuf *ctl, int xferred, void *arg) - { -- int size; -- int per; -- char text[6]; -- char rate_text[10]; -- struct timeval t1; -- float tdiff; -- gchar *rx_str = NULL; -+ int size; -+ int per; -+ char text[6]; -+ char rate_text[10]; -+ struct timeval t1; -+ float tdiff; -+ gchar *rx_str = NULL; - - while (gtk_events_pending()) - gtk_main_iteration (); -@@ -213,7 +214,6 @@ - while (gtk_events_pending()) - gtk_main_iteration (); - -- - return 1; - } - -diff -Naur gfpm-1.1.0/src/gfpm-quickpane.c gfpm-1.1.0.new/src/gfpm-quickpane.c ---- gfpm-1.1.0/src/gfpm-quickpane.c 2008-03-02 01:22:31.000000000 +0530 -+++ gfpm-1.1.0.new/src/gfpm-quickpane.c 2008-03-04 22:47:11.000000000 +0530 -@@ -73,6 +73,14 @@ - "clicked", - G_CALLBACK(cb_gfpm_quickpane_readme_clicked), - NULL); -+ -+ /* Disable the Quick pane Install,Remove,Upgrade buttons if gfpm is not run as root */ -+ if (geteuid() != 0) -+ { -+ gtk_widget_set_sensitive (quick_pane_install_btn, FALSE); -+ gtk_widget_set_sensitive (quick_pane_remove_btn, FALSE); -+ gtk_widget_set_sensitive (quick_pane_upgrade_btn, FALSE); -+ } - - return; - } From priyank at frugalware.org Thu Mar 6 14:21:39 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 14:21:41 2008 Subject: [Frugalware-git] frugalware-current: TAG 1.1.1 Message-ID: <20080306132139.6BCC9119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85b14c00db91516ff7463bc44d55d85b5803b72c commit 85b14c00db91516ff7463bc44d55d85b5803b72c Author: Priyank Date: Thu Mar 6 18:50:53 2008 +0530 TAG 1.1.1 From priyank at frugalware.org Thu Mar 6 14:23:28 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 6 14:23:29 2008 Subject: [Frugalware-git] gfpm: TAG 1.1.1 Message-ID: <20080306132328.6C051119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=7d5b8f96d90c29164518b07a6983297702849f80 commit 7d5b8f96d90c29164518b07a6983297702849f80 Author: Priyank Date: Thu Mar 6 18:52:41 2008 +0530 TAG 1.1.1 From vmiklos at frugalware.org Thu Mar 6 14:35:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 6 14:35:27 2008 Subject: [Frugalware-git] frugalware-current: junit-3.8.2-1-x86_64 Message-ID: <20080306133526.4A3B2119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=339643bee824fe16cce1138fcf03e5ace607bbd2 commit 339643bee824fe16cce1138fcf03e5ace607bbd2 Author: Miklos Vajna Date: Thu Mar 6 14:35:14 2008 +0100 junit-3.8.2-1-x86_64 - added x86_64 to archs() - needed by apache-ant-1.7.0-1-x86_64 diff --git a/source/devel-extra/junit/FrugalBuild b/source/devel-extra/junit/FrugalBuild index 3bc7d16..119ee0d 100644 --- a/source/devel-extra/junit/FrugalBuild +++ b/source/devel-extra/junit/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_ext=".zip" Finclude java sourceforge url="http://www.junit.org/" groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') source=(${source/-} build.xml) sha1sums=('701578302e244e5173dca3040cce0774a5c39645' \ 'b0c2fc9cec04aa535afe35e818c3ab6eed15330b') From janny at frugalware.org Thu Mar 6 19:14:42 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:14:45 2008 Subject: [Frugalware-git] fwlive_pkgs: kernel-fwlive-2.6.24-3-i686 Message-ID: <20080306181442.14F27119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=b8da31668ab9a6b6ea79773598d06efc6ee24d6b commit b8da31668ab9a6b6ea79773598d06efc6ee24d6b Author: Janos Kovacs Date: Thu Mar 6 19:04:30 2008 +0100 kernel-fwlive-2.6.24-3-i686 * version bump diff --git a/source/base-extra/kernel-fwlive/CVE-2007-6206.diff b/source/base-extra/kernel-fwlive/CVE-2007-6206.diff deleted file mode 100644 index cd6b4e5..0000000 --- a/source/base-extra/kernel-fwlive/CVE-2007-6206.diff +++ /dev/null @@ -1,37 +0,0 @@ -From: Ingo Molnar -Date: Wed, 28 Nov 2007 12:59:18 +0000 (+0100) -Subject: vfs: coredumping fix -X-Git-Tag: v2.6.24-rc4~82 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c46f739dd39db3b07ab5deb4e3ec81e1c04a91af - -vfs: coredumping fix - -fix: http://bugzilla.kernel.org/show_bug.cgi?id=3043 - -only allow coredumping to the same uid that the coredumping -task runs under. - -Signed-off-by: Ingo Molnar -Acked-by: Alan Cox -Acked-by: Christoph Hellwig -Acked-by: Al Viro -Signed-off-by: Linus Torvalds ---- - -diff --git a/fs/exec.c b/fs/exec.c -index 4ccaaa4..282240a 100644 ---- a/fs/exec.c -+++ b/fs/exec.c -@@ -1780,6 +1780,12 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs) - but keep the previous behaviour for now. */ - if (!ispipe && !S_ISREG(inode->i_mode)) - goto close_fail; -+ /* -+ * Dont allow local users get cute and trick others to coredump -+ * into their pre-created files: -+ */ -+ if (inode->i_uid != current->fsuid) -+ goto close_fail; - if (!file->f_op) - goto close_fail; - if (!file->f_op->write) diff --git a/source/base-extra/kernel-fwlive/CVE-2007-6434.diff b/source/base-extra/kernel-fwlive/CVE-2007-6434.diff deleted file mode 100644 index f5b8313..0000000 --- a/source/base-extra/kernel-fwlive/CVE-2007-6434.diff +++ /dev/null @@ -1,36 +0,0 @@ -From: Eric Paris -Date: Wed, 5 Dec 2007 07:45:31 +0000 (-0800) -Subject: VM/Security: add security hook to do_brk -X-Git-Tag: v2.6.24-rc5~71 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ecaf18c15aac8bb9bed7b7aa0e382fe252e275d5 - -VM/Security: add security hook to do_brk - -Given a specifically crafted binary do_brk() can be used to get low pages -available in userspace virtual memory and can thus be used to circumvent -the mmap_min_addr low memory protection. Add security checks in do_brk(). - -Signed-off-by: Eric Paris -Acked-by: Alan Cox -Cc: Stephen Smalley -Cc: James Morris -Cc: Chris Wright -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - -diff --git a/mm/mmap.c b/mm/mmap.c -index facc1a7..acfc13f 100644 ---- a/mm/mmap.c -+++ b/mm/mmap.c -@@ -1934,6 +1934,10 @@ unsigned long do_brk(unsigned long addr, unsigned long len) - if (is_hugepage_only_range(mm, addr, len)) - return -EINVAL; - -+ error = security_file_mmap(0, 0, 0, 0, addr, 1); -+ if (error) -+ return error; -+ - flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; - - error = arch_mmap_check(addr, len, flags); diff --git a/source/base-extra/kernel-fwlive/FrugalBuild b/source/base-extra/kernel-fwlive/FrugalBuild index 3b3710c..5282a45 100644 --- a/source/base-extra/kernel-fwlive/FrugalBuild +++ b/source/base-extra/kernel-fwlive/FrugalBuild @@ -1,16 +1,17 @@ -# Compiling Time: 11.75 SBU +# Compiling Time: 18.95 SBU # Maintainer: Janny -pkgver=2.6.23 -pkgrel=6 -_F_kernelver_stable=14 +pkgver=2.6.24 +pkgrel=3 +_F_kernel_stable=3 _F_kernel_name="-fwlive" _F_kernel_uname="-fw$pkgrel" -_F_kernel_patches=('aic7xxx-suspend.patch' 'CVE-2007-6434.diff' 'CVE-2007-6206.diff' \ - 'squashfs3.3-patch' 'sqlzma2k-3.3.patch') +_F_kernel_patches=(revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch \ + http://frugalware.org/~janny/patchs/kernel/${pkgver}/splice-2.6.23.patch \ + http://frugalware.org/~janny/patchs/kernel/${pkgver}/sec_perm-2.6.24.patch \ + http://frugalware.org/~janny/patchs/kernel/${pkgver}/squashfs3.3-patch \ + http://frugalware.org/~janny/patchs/kernel/${pkgver}/sqlzma2k-3.3.patch) Finclude kernel -source=(config ${source[@]}) -signatures=('' "${signatures[@]}") groups=('base-extra') # NOTE: if you bump this package, you need to bump the squashfs one, too! diff --git a/source/base-extra/kernel-fwlive/aic7xxx-suspend.patch b/source/base-extra/kernel-fwlive/aic7xxx-suspend.patch deleted file mode 100644 index 0ba3571..0000000 --- a/source/base-extra/kernel-fwlive/aic7xxx-suspend.patch +++ /dev/null @@ -1,691 +0,0 @@ -From 2dc1cdee053846fafc98a819bdad1533ac7c2f04 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke -Date: Fri, 19 Oct 2007 09:13:17 +0200 -Subject: [PATCH 1/4] aic7xxx: Add suspend/resume support - -The aic7xxx driver already contains fragments for suspend/resume -support. So we only need to update them to the current interface -and have full PCI suspend/resume. - -Signed-off-by: Hannes Reinecke -Tested-by: Jens Axboe ---- - drivers/scsi/aic7xxx/aic7770.c | 16 ----- - drivers/scsi/aic7xxx/aic79xx.h | 9 +++ - drivers/scsi/aic7xxx/aic79xx_core.c | 33 +--------- - drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 112 ++++++++++++++++++++++++++------ - drivers/scsi/aic7xxx/aic79xx_pci.c | 24 ------- - drivers/scsi/aic7xxx/aic79xx_pci.h | 25 +++++++ - drivers/scsi/aic7xxx/aic7xxx.h | 18 +---- - drivers/scsi/aic7xxx/aic7xxx_core.c | 41 +----------- - drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 91 +++++++++++++++++++++----- - drivers/scsi/aic7xxx/aic7xxx_pci.c | 16 +---- - 10 files changed, 208 insertions(+), 177 deletions(-) - -diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c -index c4d1723..6d86a9b 100644 ---- a/drivers/scsi/aic7xxx/aic7770.c -+++ b/drivers/scsi/aic7xxx/aic7770.c -@@ -60,8 +60,6 @@ - #define ID_OLV_274xD 0x04907783 /* Olivetti OEM (Differential) */ - - static int aic7770_chip_init(struct ahc_softc *ahc); --static int aic7770_suspend(struct ahc_softc *ahc); --static int aic7770_resume(struct ahc_softc *ahc); - static int aha2840_load_seeprom(struct ahc_softc *ahc); - static ahc_device_setup_t ahc_aic7770_VL_setup; - static ahc_device_setup_t ahc_aic7770_EISA_setup; -@@ -155,8 +153,6 @@ aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io) - return (error); - - ahc->bus_chip_init = aic7770_chip_init; -- ahc->bus_suspend = aic7770_suspend; -- ahc->bus_resume = aic7770_resume; - - error = ahc_reset(ahc, /*reinit*/FALSE); - if (error != 0) -@@ -272,18 +268,6 @@ aic7770_chip_init(struct ahc_softc *ahc) - return (ahc_chip_init(ahc)); - } - --static int --aic7770_suspend(struct ahc_softc *ahc) --{ -- return (ahc_suspend(ahc)); --} -- --static int --aic7770_resume(struct ahc_softc *ahc) --{ -- return (ahc_resume(ahc)); --} -- - /* - * Read the 284x SEEPROM. - */ -diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h -index 27adbb2..a96a2ff 100644 ---- a/drivers/scsi/aic7xxx/aic79xx.h -+++ b/drivers/scsi/aic7xxx/aic79xx.h -@@ -1003,8 +1003,15 @@ struct ahd_suspend_channel_state { - uint8_t seqctl; - }; - -+struct ahd_suspend_pci_state { -+ uint32_t devconfig; -+ uint8_t command; -+ uint8_t csize_lattime; -+}; -+ - struct ahd_suspend_state { - struct ahd_suspend_channel_state channel[2]; -+ struct ahd_suspend_pci_state pci_state; - uint8_t optionmode; - uint8_t dscommand0; - uint8_t dspcistatus; -@@ -1343,6 +1350,8 @@ struct ahd_softc *ahd_alloc(void *platform_arg, char *name); - int ahd_softc_init(struct ahd_softc *); - void ahd_controller_info(struct ahd_softc *ahd, char *buf); - int ahd_init(struct ahd_softc *ahd); -+void ahd_shutdown(void *arg); -+void ahd_restart(struct ahd_softc *ahd); - int ahd_default_config(struct ahd_softc *ahd); - int ahd_parse_vpddata(struct ahd_softc *ahd, - struct vpd_config *vpd); -diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c -index 05f692b..91f6f4f 100644 ---- a/drivers/scsi/aic7xxx/aic79xx_core.c -+++ b/drivers/scsi/aic7xxx/aic79xx_core.c -@@ -255,7 +255,6 @@ static void ahd_freeze_devq(struct ahd_softc *ahd, - static void ahd_handle_scb_status(struct ahd_softc *ahd, - struct scb *scb); - static struct ahd_phase_table_entry* ahd_lookup_phase_entry(int phase); --static void ahd_shutdown(void *arg); - static void ahd_update_coalescing_values(struct ahd_softc *ahd, - u_int timer, - u_int maxcmds, -@@ -357,7 +356,7 @@ ahd_complete_scb(struct ahd_softc *ahd, struct scb *scb) - /* - * Restart the sequencer program from address zero - */ --static void -+void - ahd_restart(struct ahd_softc *ahd) - { - -@@ -5456,7 +5455,7 @@ ahd_free(struct ahd_softc *ahd) - return; - } - --static void -+void - ahd_shutdown(void *arg) - { - struct ahd_softc *ahd; -@@ -7175,34 +7174,6 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd) - ahd->flags &= ~AHD_ALL_INTERRUPTS; - } - --#if 0 --int --ahd_suspend(struct ahd_softc *ahd) --{ -- -- ahd_pause_and_flushwork(ahd); -- -- if (LIST_FIRST(&ahd->pending_scbs) != NULL) { -- ahd_unpause(ahd); -- return (EBUSY); -- } -- ahd_shutdown(ahd); -- return (0); --} --#endif /* 0 */ -- --#if 0 --int --ahd_resume(struct ahd_softc *ahd) --{ -- -- ahd_reset(ahd, /*reinit*/TRUE); -- ahd_intr_enable(ahd, TRUE); -- ahd_restart(ahd); -- return (0); --} --#endif /* 0 */ -- - /************************** Busy Target Table *********************************/ - /* - * Set SCBPTR to the SCB that contains the busy -diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c -index c62ce41..8aa6302 100644 ---- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c -+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c -@@ -43,15 +43,6 @@ - #include "aic79xx_inline.h" - #include "aic79xx_pci.h" - --static int ahd_linux_pci_dev_probe(struct pci_dev *pdev, -- const struct pci_device_id *ent); --static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, -- u_long *base, u_long *base2); --static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, -- u_long *bus_addr, -- uint8_t __iomem **maddr); --static void ahd_linux_pci_dev_remove(struct pci_dev *pdev); -- - /* Define the macro locally since it's different for different class of chips. - */ - #define ID(x) \ -@@ -83,12 +74,82 @@ static struct pci_device_id ahd_linux_pci_id_table[] = { - - MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table); - --static struct pci_driver aic79xx_pci_driver = { -- .name = "aic79xx", -- .probe = ahd_linux_pci_dev_probe, -- .remove = ahd_linux_pci_dev_remove, -- .id_table = ahd_linux_pci_id_table --}; -+#ifdef CONFIG_PM -+int -+ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) -+{ -+ struct ahd_softc *ahd = pci_get_drvdata(pdev); -+ -+ /* -+ * Shutdown the HBA -+ */ -+ ahd_pause_and_flushwork(ahd); -+ -+ if (LIST_FIRST(&ahd->pending_scbs) != NULL) { -+ ahd_unpause(ahd); -+ return -EBUSY; -+ } -+ -+ ahd_shutdown(ahd); -+ -+ /* -+ * Save chip register configuration data for chip resets -+ * that occur during runtime and resume events. -+ */ -+ pci_read_config_dword(ahd->dev_softc, DEVCONFIG, -+ &ahd->suspend_state.pci_state.devconfig); -+ pci_read_config_byte(ahd->dev_softc, PCIR_COMMAND, -+ &ahd->suspend_state.pci_state.command); -+ pci_read_config_byte(ahd->dev_softc, CSIZE_LATTIME, -+ &ahd->suspend_state.pci_state.csize_lattime); -+ -+ pci_save_state(pdev); -+ pci_disable_device(pdev); -+ -+ if (mesg.event == PM_EVENT_SUSPEND) -+ pci_set_power_state(pdev, PCI_D3hot); -+ -+ return 0; -+} -+ -+int -+ahd_linux_pci_dev_resume(struct pci_dev *pdev) -+{ -+ struct ahd_softc *ahd = pci_get_drvdata(pdev); -+ int rc; -+ -+ pci_set_power_state(pdev, PCI_D0); -+ pci_restore_state(pdev); -+ -+ rc = pci_enable_device(pdev); -+ if (rc) { -+ dev_printk(KERN_ERR, &pdev->dev, -+ "failed to enable device after resume (%d)\n", rc); -+ return rc; -+ } -+ -+ pci_set_master(pdev); -+ -+ /* -+ * Restore additional PCI registers -+ */ -+ pci_write_config_dword(ahd->dev_softc, DEVCONFIG, -+ ahd->suspend_state.pci_state.devconfig); -+ pci_write_config_byte(ahd->dev_softc, PCIR_COMMAND, -+ ahd->suspend_state.pci_state.command); -+ pci_write_config_byte(ahd->dev_softc, CSIZE_LATTIME, -+ ahd->suspend_state.pci_state.csize_lattime); -+ -+ /* -+ * Restart the HBA -+ */ -+ ahd_reset(ahd, /*reinit*/TRUE); -+ ahd_intr_enable(ahd, TRUE); -+ ahd_restart(ahd); -+ -+ return 0; -+} -+#endif /* CONFIG_PM */ - - static void - ahd_linux_pci_dev_remove(struct pci_dev *pdev) -@@ -97,7 +158,7 @@ ahd_linux_pci_dev_remove(struct pci_dev *pdev) - u_long s; - - if (ahd->platform_data && ahd->platform_data->host) -- scsi_remove_host(ahd->platform_data->host); -+ scsi_remove_host(ahd->platform_data->host); - - ahd_lock(ahd, &s); - ahd_intr_enable(ahd, FALSE); -@@ -195,6 +256,17 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) - return (0); - } - -+static struct pci_driver aic79xx_pci_driver = { -+ .name = "aic79xx", -+ .probe = ahd_linux_pci_dev_probe, -+#ifdef CONFIG_PM -+ .suspend = ahd_linux_pci_dev_suspend, -+ .resume = ahd_linux_pci_dev_resume, -+#endif -+ .remove = ahd_linux_pci_dev_remove, -+ .id_table = ahd_linux_pci_id_table -+}; -+ - int - ahd_linux_pci_init(void) - { -@@ -276,7 +348,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd) - /* - * If its allowed, we prefer memory mapped access. - */ -- command = ahd_pci_read_config(ahd->dev_softc, PCIR_COMMAND, 4); -+ pci_read_config_dword(ahd->dev_softc, PCIR_COMMAND, &command); - command &= ~(PCIM_CMD_PORTEN|PCIM_CMD_MEMEN); - base = 0; - maddr = NULL; -@@ -287,8 +359,8 @@ ahd_pci_map_registers(struct ahd_softc *ahd) - ahd->bshs[0].maddr = maddr; - ahd->tags[1] = BUS_SPACE_MEMIO; - ahd->bshs[1].maddr = maddr + 0x100; -- ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, -- command | PCIM_CMD_MEMEN, 4); -+ pci_write_config_dword(ahd->dev_softc, PCIR_COMMAND, -+ command | PCIM_CMD_MEMEN); - - if (ahd_pci_test_register_access(ahd) != 0) { - -@@ -332,7 +404,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd) - base, base2); - } - } -- ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, 4); -+ pci_write_config_dword(ahd->dev_softc, PCIR_COMMAND, command); - return (error); - } - -diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c -index 0bada00..c8617e0 100644 ---- a/drivers/scsi/aic7xxx/aic79xx_pci.c -+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c -@@ -209,12 +209,6 @@ static struct ahd_pci_identity ahd_pci_ident_table [] = - - static const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table); - --#define DEVCONFIG 0x40 --#define PCIXINITPAT 0x0000E000ul --#define PCIXINIT_PCI33_66 0x0000E000ul --#define PCIXINIT_PCIX50_66 0x0000C000ul --#define PCIXINIT_PCIX66_100 0x0000A000ul --#define PCIXINIT_PCIX100_133 0x00008000ul - #define PCI_BUS_MODES_INDEX(devconfig) \ - (((devconfig) & PCIXINITPAT) >> 13) - static const char *pci_bus_modes[] = -@@ -229,24 +223,6 @@ static const char *pci_bus_modes[] = - "PCI 33 or 66Mhz" - }; - --#define TESTMODE 0x00000800ul --#define IRDY_RST 0x00000200ul --#define FRAME_RST 0x00000100ul --#define PCI64BIT 0x00000080ul --#define MRDCEN 0x00000040ul --#define ENDIANSEL 0x00000020ul --#define MIXQWENDIANEN 0x00000008ul --#define DACEN 0x00000004ul --#define STPWLEVEL 0x00000002ul --#define QWENDIANSEL 0x00000001ul -- --#define DEVCONFIG1 0x44 --#define PREQDIS 0x01 -- --#define CSIZE_LATTIME 0x0c --#define CACHESIZE 0x000000fful --#define LATTIME 0x0000ff00ul -- - static int ahd_check_extport(struct ahd_softc *ahd); - static void ahd_configure_termination(struct ahd_softc *ahd, - u_int adapter_control); -diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.h b/drivers/scsi/aic7xxx/aic79xx_pci.h -index 16b7c70..67ea5ae 100644 ---- a/drivers/scsi/aic7xxx/aic79xx_pci.h -+++ b/drivers/scsi/aic7xxx/aic79xx_pci.h -@@ -69,4 +69,29 @@ - #define ID_AHA_39320D_HP 0x8011900500AC0E11ull - #define ID_AHA_39320D_B_HP 0x801C900500AC0E11ull - -+#define DEVCONFIG 0x40 -+#define PCIXINITPAT 0x0000E000ul -+#define PCIXINIT_PCI33_66 0x0000E000ul -+#define PCIXINIT_PCIX50_66 0x0000C000ul -+#define PCIXINIT_PCIX66_100 0x0000A000ul -+#define PCIXINIT_PCIX100_133 0x00008000ul -+ -+#define TESTMODE 0x00000800ul -+#define IRDY_RST 0x00000200ul -+#define FRAME_RST 0x00000100ul -+#define PCI64BIT 0x00000080ul -+#define MRDCEN 0x00000040ul -+#define ENDIANSEL 0x00000020ul -+#define MIXQWENDIANEN 0x00000008ul -+#define DACEN 0x00000004ul -+#define STPWLEVEL 0x00000002ul -+#define QWENDIANSEL 0x00000001ul -+ -+#define DEVCONFIG1 0x44 -+#define PREQDIS 0x01 -+ -+#define CSIZE_LATTIME 0x0c -+#define CACHESIZE 0x000000fful -+#define LATTIME 0x0000ff00ul -+ - #endif /* _AIC79XX_PCI_H_ */ -diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h -index e1bd57b..80ceeaf 100644 ---- a/drivers/scsi/aic7xxx/aic7xxx.h -+++ b/drivers/scsi/aic7xxx/aic7xxx.h -@@ -899,8 +899,6 @@ union ahc_bus_softc { - - typedef void (*ahc_bus_intr_t)(struct ahc_softc *); - typedef int (*ahc_bus_chip_init_t)(struct ahc_softc *); --typedef int (*ahc_bus_suspend_t)(struct ahc_softc *); --typedef int (*ahc_bus_resume_t)(struct ahc_softc *); - typedef void ahc_callback_t (void *); - - struct ahc_softc { -@@ -962,16 +960,6 @@ struct ahc_softc { - ahc_bus_chip_init_t bus_chip_init; - - /* -- * Bus specific suspend routine. -- */ -- ahc_bus_suspend_t bus_suspend; -- -- /* -- * Bus specific resume routine. -- */ -- ahc_bus_resume_t bus_resume; -- -- /* - * Target mode related state kept on a per enabled lun basis. - * Targets that are not enabled will have null entries. - * As an initiator, we keep one target entry for our initiator -@@ -1153,6 +1141,7 @@ struct ahc_pci_identity *ahc_find_pci_device(ahc_dev_softc_t); - int ahc_pci_config(struct ahc_softc *, - struct ahc_pci_identity *); - int ahc_pci_test_register_access(struct ahc_softc *); -+void ahc_pci_resume(struct ahc_softc *ahc); - - /*************************** EISA/VL Front End ********************************/ - struct aic7770_identity *aic7770_find_device(uint32_t); -@@ -1179,14 +1168,13 @@ int ahc_chip_init(struct ahc_softc *ahc); - int ahc_init(struct ahc_softc *ahc); - void ahc_intr_enable(struct ahc_softc *ahc, int enable); - void ahc_pause_and_flushwork(struct ahc_softc *ahc); --int ahc_suspend(struct ahc_softc *ahc); --int ahc_resume(struct ahc_softc *ahc); - void ahc_set_unit(struct ahc_softc *, int); - void ahc_set_name(struct ahc_softc *, char *); - void ahc_alloc_scbs(struct ahc_softc *ahc); - void ahc_free(struct ahc_softc *ahc); - int ahc_reset(struct ahc_softc *ahc, int reinit); --void ahc_shutdown(void *arg); -+void ahc_restart(struct ahc_softc *ahc); -+void ahc_shutdown(struct ahc_softc *ahc); - - /*************************** Interrupt Services *******************************/ - void ahc_clear_intstat(struct ahc_softc *ahc); -diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c -index f350b5e..40f7072 100644 ---- a/drivers/scsi/aic7xxx/aic7xxx_core.c -+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c -@@ -3984,13 +3984,10 @@ ahc_free(struct ahc_softc *ahc) - } - - void --ahc_shutdown(void *arg) -+ahc_shutdown(struct ahc_softc *ahc) - { -- struct ahc_softc *ahc; - int i; - -- ahc = (struct ahc_softc *)arg; -- - /* This will reset most registers to 0, but not all */ - ahc_reset(ahc, /*reinit*/FALSE); - ahc_outb(ahc, SCSISEQ, 0); -@@ -5078,42 +5075,6 @@ ahc_pause_and_flushwork(struct ahc_softc *ahc) - ahc->flags &= ~AHC_ALL_INTERRUPTS; - } - --int --ahc_suspend(struct ahc_softc *ahc) --{ -- -- ahc_pause_and_flushwork(ahc); -- -- if (LIST_FIRST(&ahc->pending_scbs) != NULL) { -- ahc_unpause(ahc); -- return (EBUSY); -- } -- --#ifdef AHC_TARGET_MODE -- /* -- * XXX What about ATIOs that have not yet been serviced? -- * Perhaps we should just refuse to be suspended if we -- * are acting in a target role. -- */ -- if (ahc->pending_device != NULL) { -- ahc_unpause(ahc); -- return (EBUSY); -- } --#endif -- ahc_shutdown(ahc); -- return (0); --} -- --int --ahc_resume(struct ahc_softc *ahc) --{ -- -- ahc_reset(ahc, /*reinit*/TRUE); -- ahc_intr_enable(ahc, TRUE); -- ahc_restart(ahc); -- return (0); --} -- - /************************** Busy Target Table *********************************/ - /* - * Return the untagged transaction id for a given target/channel lun. -diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c -index ea5687d..847485f 100644 ---- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c -+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c -@@ -41,15 +41,7 @@ - - #include "aic7xxx_osm.h" - #include "aic7xxx_pci.h" -- --static int ahc_linux_pci_dev_probe(struct pci_dev *pdev, -- const struct pci_device_id *ent); --static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, -- u_long *base); --static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc, -- u_long *bus_addr, -- uint8_t __iomem **maddr); --static void ahc_linux_pci_dev_remove(struct pci_dev *pdev); -+#include "aic7xxx_inline.h" - - /* Define the macro locally since it's different for different class of chips. - */ -@@ -130,12 +122,68 @@ static struct pci_device_id ahc_linux_pci_id_table[] = { - - MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table); - --static struct pci_driver aic7xxx_pci_driver = { -- .name = "aic7xxx", -- .probe = ahc_linux_pci_dev_probe, -- .remove = ahc_linux_pci_dev_remove, -- .id_table = ahc_linux_pci_id_table --}; -+#ifdef CONFIG_PM -+static int -+ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) -+{ -+ struct ahc_softc *ahc = pci_get_drvdata(pdev); -+ -+ ahc_pause_and_flushwork(ahc); -+ -+ if (LIST_FIRST(&ahc->pending_scbs) != NULL) { -+ ahc_unpause(ahc); -+ return -EBUSY; -+ } -+ -+#ifdef AHC_TARGET_MODE -+ /* -+ * XXX What about ATIOs that have not yet been serviced? -+ * Perhaps we should just refuse to be suspended if we -+ * are acting in a target role. -+ */ -+ if (ahc->pending_device != NULL) { -+ ahc_unpause(ahc); -+ return -EBUSY; -+ } -+#endif -+ ahc_shutdown(ahc); -+ -+ pci_save_state(pdev); -+ pci_disable_device(pdev); -+ -+ if (mesg.event == PM_EVENT_SUSPEND) -+ pci_set_power_state(pdev, PCI_D3hot); -+ -+ return 0; -+} -+ -+static int -+ahc_linux_pci_dev_resume(struct pci_dev *pdev) -+{ -+ struct ahc_softc *ahc = pci_get_drvdata(pdev); -+ int rc; -+ -+ pci_set_power_state(pdev, PCI_D0); -+ pci_restore_state(pdev); -+ -+ rc = pci_enable_device(pdev); -+ if (rc) { -+ dev_printk(KERN_ERR, &pdev->dev, -+ "failed to enable device after resume (%d)\n", rc); -+ return rc; -+ } -+ -+ pci_set_master(pdev); -+ -+ ahc_pci_resume(ahc); -+ -+ ahc_reset(ahc, /*reinit*/TRUE); -+ ahc_intr_enable(ahc, TRUE); -+ ahc_restart(ahc); -+ -+ return rc; -+} -+#endif /* CONFIG_PM */ - - static void - ahc_linux_pci_dev_remove(struct pci_dev *pdev) -@@ -144,7 +192,7 @@ ahc_linux_pci_dev_remove(struct pci_dev *pdev) - u_long s; - - if (ahc->platform_data && ahc->platform_data->host) -- scsi_remove_host(ahc->platform_data->host); -+ scsi_remove_host(ahc->platform_data->host); - - ahc_lock(ahc, &s); - ahc_intr_enable(ahc, FALSE); -@@ -243,6 +291,17 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) - return (0); - } - -+static struct pci_driver aic7xxx_pci_driver = { -+ .name = "aic7xxx", -+ .probe = ahc_linux_pci_dev_probe, -+#ifdef CONFIG_PM -+ .suspend = ahc_linux_pci_dev_suspend, -+ .resume = ahc_linux_pci_dev_resume, -+#endif -+ .remove = ahc_linux_pci_dev_remove, -+ .id_table = ahc_linux_pci_id_table -+}; -+ - int - ahc_linux_pci_init(void) - { -diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c -index 09c8172..ae35937 100644 ---- a/drivers/scsi/aic7xxx/aic7xxx_pci.c -+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c -@@ -633,8 +633,6 @@ static void write_brdctl(struct ahc_softc *ahc, uint8_t value); - static uint8_t read_brdctl(struct ahc_softc *ahc); - static void ahc_pci_intr(struct ahc_softc *ahc); - static int ahc_pci_chip_init(struct ahc_softc *ahc); --static int ahc_pci_suspend(struct ahc_softc *ahc); --static int ahc_pci_resume(struct ahc_softc *ahc); - - static int - ahc_9005_subdevinfo_valid(uint16_t device, uint16_t vendor, -@@ -791,8 +789,6 @@ ahc_pci_config(struct ahc_softc *ahc, struct ahc_pci_identity *entry) - - ahc->bus_intr = ahc_pci_intr; - ahc->bus_chip_init = ahc_pci_chip_init; -- ahc->bus_suspend = ahc_pci_suspend; -- ahc->bus_resume = ahc_pci_resume; - - /* Remeber how the card was setup in case there is no SEEPROM */ - if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) { -@@ -2024,18 +2020,9 @@ ahc_pci_chip_init(struct ahc_softc *ahc) - return (ahc_chip_init(ahc)); - } - --static int --ahc_pci_suspend(struct ahc_softc *ahc) --{ -- return (ahc_suspend(ahc)); --} -- --static int -+void - ahc_pci_resume(struct ahc_softc *ahc) - { -- -- pci_set_power_state(ahc->dev_softc, AHC_POWER_STATE_D0); -- - /* - * We assume that the OS has restored our register - * mappings, etc. Just update the config space registers -@@ -2063,7 +2050,6 @@ ahc_pci_resume(struct ahc_softc *ahc) - &sxfrctl1); - ahc_release_seeprom(&sd); - } -- return (ahc_resume(ahc)); - } - - static int - diff --git a/source/base-extra/kernel-fwlive/revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch b/source/base-extra/kernel-fwlive/revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch new file mode 100644 index 0000000..dad14df --- /dev/null +++ b/source/base-extra/kernel-fwlive/revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch @@ -0,0 +1,11 @@ +diff -Naur linux-2.6.24/include/linux/Kbuild linux-2.6.24-revert/include/linux/Kbuild +--- linux-2.6.24/include/linux/Kbuild 2008-02-27 13:51:11.000000000 +0100 ++++ linux-2.6.24-revert/include/linux/Kbuild 2008-02-27 13:48:47.000000000 +0100 +@@ -217,7 +217,6 @@ + unifdef-y += icmp.h + unifdef-y += icmpv6.h + unifdef-y += if_addr.h +-unifdef-y += if_addrlabel.h + unifdef-y += if_arp.h + unifdef-y += if_bridge.h + unifdef-y += if_ec.h diff --git a/source/base-extra/kernel-fwlive/sqlzma2k-3.3.patch b/source/base-extra/kernel-fwlive/sqlzma2k-3.3.patch deleted file mode 100644 index 596589e..0000000 --- a/source/base-extra/kernel-fwlive/sqlzma2k-3.3.patch +++ /dev/null @@ -1,739 +0,0 @@ -Index: linux-2.6.23/fs/squashfs/Makefile -=================================================================== -RCS file: linux-2.6.23/fs/squashfs/Makefile,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.23/fs/squashfs/Makefile 4 Nov 2007 13:21:40 -0000 1.1 -+++ linux-2.6.23/fs/squashfs/Makefile 5 Nov 2007 05:43:36 -0000 1.2 -@@ -2,6 +2,8 @@ - # Makefile for the linux squashfs routines. - # - -+-include /tmp/sqvars.mk -+ - obj-$(CONFIG_SQUASHFS) += squashfs.o - squashfs-y += inode.o - squashfs-y += squashfs2_0.o -Index: linux-2.6.23/fs/squashfs/inode.c -=================================================================== -RCS file: linux-2.6.23/fs/squashfs/inode.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.23/fs/squashfs/inode.c 4 Nov 2007 13:21:40 -0000 1.1 -+++ linux-2.6.23/fs/squashfs/inode.c 5 Nov 2007 05:43:36 -0000 1.2 -@@ -34,8 +34,30 @@ - #include - - #include "squashfs.h" -+#include "sqlzma.h" -+#include "sqmagic.h" - --int squashfs_cached_blks; -+#undef KeepPreemptive -+#if defined(CONFIG_PREEMPT) && !defined(UnsquashNoPreempt) -+#define KeepPreemptive -+#endif -+ -+struct sqlzma { -+#ifdef KeepPreemptive -+ struct mutex mtx; -+#endif -+ unsigned char read_data[SQUASHFS_FILE_MAX_SIZE]; -+ struct sqlzma_un un; -+}; -+static DEFINE_PER_CPU(struct sqlzma *, sqlzma); -+ -+#define dpri(fmt, args...) /* printk("%s:%d: " fmt, __func__, __LINE__, ##args) */ -+#define dpri_un(un) dpri("un{%d, {%d %p}, {%d %p}, {%d %p}}\n", \ -+ (un)->un_lzma, (un)->un_a[0].sz, (un)->un_a[0].buf, \ -+ (un)->un_a[1].sz, (un)->un_a[1].buf, \ -+ (un)->un_a[2].sz, (un)->un_a[2].buf) -+ -+static int squashfs_cached_blks; - - static void vfs_read_inode(struct inode *i); - static struct dentry *squashfs_get_parent(struct dentry *child); -@@ -219,7 +241,8 @@ SQSH_EXTERN unsigned int squashfs_read_d - if (index < 0 || (index + 2) > sblk->bytes_used) - goto read_failure; - -- bh[0] = get_block_length(s, &cur_index, &offset, &c_byte); -+ bh[0] = get_block_length(s, (int *)&cur_index, (int *)&offset, -+ (int *)&c_byte); - if (bh[0] == NULL) - goto read_failure; - -@@ -243,66 +266,75 @@ SQSH_EXTERN unsigned int squashfs_read_d - } - - if (compressed) { -- int zlib_err = 0; -+ int zlib_err = Z_STREAM_END; -+ int rest, start; -+ enum {Src, Dst}; -+ struct sized_buf sbuf[2]; -+ struct sqlzma *percpu; - - /* - * uncompress block - */ - -- mutex_lock(&msblk->read_data_mutex); -- -- msblk->stream.next_out = buffer; -- msblk->stream.avail_out = srclength; -- -- for (bytes = 0; k < b; k++) { -- avail_bytes = min(c_byte - bytes, msblk->devblksize - offset); -- -+ for (k = 0; k < b; k++) { - wait_on_buffer(bh[k]); - if (!buffer_uptodate(bh[k])) -- goto release_mutex; -- -- msblk->stream.next_in = bh[k]->b_data + offset; -- msblk->stream.avail_in = avail_bytes; -- -- if (k == 0) { -- zlib_err = zlib_inflateInit(&msblk->stream); -- if (zlib_err != Z_OK) { -- ERROR("zlib_inflateInit returned unexpected result 0x%x," -- " srclength %d\n", zlib_err, srclength); -- goto release_mutex; -- } -- -- if (avail_bytes == 0) { -- offset = 0; -- brelse(bh[k]); -- continue; -- } -- } -- -- zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH); -- if (zlib_err != Z_OK && zlib_err != Z_STREAM_END) { -- ERROR("zlib_inflate returned unexpected result 0x%x," -- " srclength %d, avail_in %d, avail_out %d\n", zlib_err, -- srclength, msblk->stream.avail_in, msblk->stream.avail_out); -- goto release_mutex; -- } -+ goto block_release; -+ } - -- bytes += avail_bytes; -+ avail_bytes = 0; -+ for (k = 0; !avail_bytes && k < b; k++) { -+ avail_bytes = msblk->devblksize - offset; -+ if (c_byte < avail_bytes) -+ avail_bytes = c_byte; -+ if (avail_bytes) -+ break; - offset = 0; - brelse(bh[k]); - } -+ bytes = 0; -+ if (!avail_bytes) -+ goto block_release; // nothing to be process - -- if (zlib_err != Z_STREAM_END) -- goto release_mutex; -- -- zlib_err = zlib_inflateEnd(&msblk->stream); -- if (zlib_err != Z_OK) { -- ERROR("zlib_inflateEnd returned unexpected result 0x%x," -- " srclength %d\n", zlib_err, srclength); -+ start = k; -+ /* it disables preemption */ -+ percpu = get_cpu_var(sqlzma); -+#ifdef KeepPreemptive -+ put_cpu_var(sqlzma); -+ mutex_lock(&percpu->mtx); -+#endif -+ -+ for (; k < b; k++) { -+ memcpy(percpu->read_data + bytes, bh[k]->b_data + offset, -+ avail_bytes); -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ avail_bytes = msblk->devblksize - offset; -+ rest = c_byte - bytes; -+ if (rest < avail_bytes) -+ avail_bytes = rest; -+ } -+ -+ sbuf[Src].buf = percpu->read_data; -+ sbuf[Src].sz = bytes; -+ sbuf[Dst].buf = buffer; -+ sbuf[Dst].sz = srclength; -+ dpri_un(&percpu->un); -+ dpri("src %d %p, dst %d %p\n", sbuf[Src].sz, sbuf[Src].buf, -+ sbuf[Dst].sz, sbuf[Dst].buf); -+ zlib_err = sqlzma_un(&percpu->un, sbuf + Src, sbuf + Dst); -+ bytes = percpu->un.un_reslen; -+ -+#ifdef KeepPreemptive -+ mutex_unlock(&percpu->mtx); -+#else -+ put_cpu_var(sqlzma); -+#endif -+ if (unlikely(zlib_err)) { -+ dpri("zlib_err %d\n", zlib_err); - goto release_mutex; - } -- bytes = msblk->stream.total_out; -- mutex_unlock(&msblk->read_data_mutex); - } else { - int i; - -@@ -330,7 +362,7 @@ SQSH_EXTERN unsigned int squashfs_read_d - return bytes; - - release_mutex: -- mutex_unlock(&msblk->read_data_mutex); -+ //mutex_unlock(&msblk->read_data_mutex); - - block_release: - for (; k < b; k++) -@@ -471,12 +503,14 @@ static int get_fragment_location(struct - struct squashfs_fragment_entry sfragment_entry; - - if (!squashfs_get_cached_block(s, &sfragment_entry, start_block, offset, -- sizeof(sfragment_entry), &start_block, &offset)) -+ sizeof(sfragment_entry), &start_block, -+ (unsigned int *)&offset)) - goto out; - SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry); - } else - if (!squashfs_get_cached_block(s, &fragment_entry, start_block, offset, -- sizeof(fragment_entry), &start_block, &offset)) -+ sizeof(fragment_entry), &start_block, -+ (unsigned int *)&offset)) - goto out; - - *fragment_start_block = fragment_entry.start_block; -@@ -616,11 +650,11 @@ static squashfs_inode_t squashfs_inode_l - squashfs_inode_t sinode; - - if (!squashfs_get_cached_block(s, &sinode, start, offset, -- sizeof(sinode), &start, &offset)) -+ sizeof(sinode), &start, (unsigned int *)&offset)) - goto out; - SQUASHFS_SWAP_INODE_T((&inode), &sinode); - } else if (!squashfs_get_cached_block(s, &inode, start, offset, -- sizeof(inode), &start, &offset)) -+ sizeof(inode), &start, (unsigned int *)&offset)) - goto out; - - TRACE("squashfs_inode_lookup, inode = 0x%llx\n", inode); -@@ -1089,12 +1123,13 @@ static int squashfs_fill_super(struct su - { - struct squashfs_sb_info *msblk; - struct squashfs_super_block *sblk; -- int i; -+ int i, err; - char b[BDEVNAME_SIZE]; - struct inode *root; - - TRACE("Entered squashfs_fill_superblock\n"); - -+ err = -ENOMEM; - s->s_fs_info = kzalloc(sizeof(struct squashfs_sb_info), GFP_KERNEL); - if (s->s_fs_info == NULL) { - ERROR("Failed to allocate superblock\n"); -@@ -1102,17 +1137,12 @@ static int squashfs_fill_super(struct su - } - msblk = s->s_fs_info; - -- msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize()); -- if (msblk->stream.workspace == NULL) { -- ERROR("Failed to allocate zlib workspace\n"); -- goto failure; -- } - sblk = &msblk->sblk; - - msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE); - msblk->devblksize_log2 = ffz(~msblk->devblksize); - -- mutex_init(&msblk->read_data_mutex); -+ //mutex_init(&msblk->read_data_mutex); - mutex_init(&msblk->read_page_mutex); - mutex_init(&msblk->block_cache_mutex); - mutex_init(&msblk->fragment_mutex); -@@ -1124,6 +1154,7 @@ static int squashfs_fill_super(struct su - /* sblk->bytes_used is checked in squashfs_read_data to ensure reads are not - * beyond filesystem end. As we're using squashfs_read_data to read sblk here, - * first set sblk->bytes_used to a useful value */ -+ err = -EINVAL; - sblk->bytes_used = sizeof(struct squashfs_super_block); - if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START, - sizeof(struct squashfs_super_block) | -@@ -1133,21 +1164,35 @@ static int squashfs_fill_super(struct su - } - - /* Check it is a SQUASHFS superblock */ -- if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) { -- if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) { -- struct squashfs_super_block ssblk; -- -- WARNING("Mounting a different endian SQUASHFS filesystem on %s\n", -- bdevname(s->s_bdev, b)); -- -- SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -- memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -- msblk->swap = 1; -- } else { -- SERROR("Can't find a SQUASHFS superblock on %s\n", -- bdevname(s->s_bdev, b)); -- goto failed_mount; -- } -+ s->s_magic = sblk->s_magic; -+ msblk->swap = 0; -+ dpri("magic 0x%x\n", sblk->s_magic); -+ switch (sblk->s_magic) { -+ struct squashfs_super_block ssblk; -+ -+ case SQUASHFS_MAGIC_SWAP: -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC_LZMA_SWAP: -+ WARNING("Mounting a different endian SQUASHFS " -+ "filesystem on %s\n", bdevname(s->s_bdev, b)); -+ -+ SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -+ memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -+ msblk->swap = 1; -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC: -+ case SQUASHFS_MAGIC_LZMA: -+ break; -+ default: -+ SERROR("Can't find a SQUASHFS superblock on %s\n", -+ bdevname(s->s_bdev, b)); -+ goto failed_mount; -+ } -+ -+ { -+ struct sqlzma *p; -+ dpri("block_size %d\n", sblk->block_size); -+ BUG_ON(sblk->block_size > sizeof(p->read_data)); - } - - /* Check the MAJOR & MINOR versions */ -@@ -1191,6 +1236,7 @@ static int squashfs_fill_super(struct su - goto failed_mount; - - /* Allocate read_page block */ -+ err = -ENOMEM; - msblk->read_page = vmalloc(sblk->block_size); - if (msblk->read_page == NULL) { - ERROR("Failed to allocate read_page block\n"); -@@ -1206,19 +1252,30 @@ static int squashfs_fill_super(struct su - } - msblk->guid = msblk->uid + sblk->no_uids; - -+ dpri("swap %d\n", msblk->swap); -+ err = -EINVAL; - if (msblk->swap) { -- unsigned int suid[sblk->no_uids + sblk->no_guids]; -+ unsigned int *suid; -+ -+ err = -ENOMEM; -+ suid = kmalloc(sizeof(*suid) * (sblk->no_uids + sblk->no_guids), -+ GFP_KERNEL); -+ if (unlikely(!suid)) -+ goto failed_mount; - -- if (!squashfs_read_data(s, (char *) &suid, sblk->uid_start, -+ err = -EINVAL; -+ if (!squashfs_read_data(s, (char *)suid, sblk->uid_start, - ((sblk->no_uids + sblk->no_guids) * - sizeof(unsigned int)) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { - ERROR("unable to read uid/gid table\n"); -+ kfree(suid); - goto failed_mount; - } - - SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids + - sblk->no_guids), (sizeof(unsigned int) * 8)); -+ kfree(suid); - } else - if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start, - ((sblk->no_uids + sblk->no_guids) * -@@ -1232,6 +1289,7 @@ static int squashfs_fill_super(struct su - if (sblk->s_major == 1 && squashfs_1_0_supported(msblk)) - goto allocate_root; - -+ err = -ENOMEM; - msblk->fragment = kzalloc(sizeof(struct squashfs_fragment_cache) * - SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL); - if (msblk->fragment == NULL) { -@@ -1261,9 +1319,12 @@ static int squashfs_fill_super(struct su - s->s_export_op = &squashfs_export_ops; - - allocate_root: -+ dpri("alloate_root\n"); - root = new_inode(s); -- if ((msblk->read_inode)(root, sblk->root_inode) == 0) -+ if ((msblk->read_inode)(root, sblk->root_inode) == 0) { -+ iput(root); - goto failed_mount; -+ } - insert_inode_hash(root); - - s->s_root = d_alloc_root(root); -@@ -1284,13 +1345,10 @@ failed_mount: - vfree(msblk->read_page); - kfree(msblk->block_cache); - kfree(msblk->fragment_index_2); -- vfree(msblk->stream.workspace); - kfree(s->s_fs_info); - s->s_fs_info = NULL; -- return -EINVAL; -- --failure: -- return -ENOMEM; -+ failure: -+ return err; - } - - -@@ -1301,7 +1359,7 @@ static int squashfs_statfs(struct dentry - - TRACE("Entered squashfs_statfs\n"); - -- buf->f_type = SQUASHFS_MAGIC; -+ buf->f_type = sblk->s_magic; - buf->f_bsize = sblk->block_size; - buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1; - buf->f_bfree = buf->f_bavail = 0; -@@ -1328,7 +1386,8 @@ static int squashfs_symlink_readpage(str - - for (length = 0; length < index; length += bytes) { - bytes = squashfs_get_cached_block(inode->i_sb, NULL, block, -- offset, PAGE_CACHE_SIZE, &block, &offset); -+ offset, PAGE_CACHE_SIZE, &block, -+ (unsigned int *)&offset); - if (bytes == 0) { - ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset); - goto skip_read; -@@ -1344,7 +1403,7 @@ static int squashfs_symlink_readpage(str - avail_bytes = min_t(int, i_size_read(inode) - length, PAGE_CACHE_SIZE); - - bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block, offset, -- avail_bytes, &block, &offset); -+ avail_bytes, &block, (unsigned int *)&offset); - if (bytes == 0) - ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset); - -@@ -1359,7 +1418,7 @@ skip_read: - } - - --struct meta_index *locate_meta_index(struct inode *inode, int index, int offset) -+static struct meta_index *locate_meta_index(struct inode *inode, int index, int offset) - { - struct meta_index *meta = NULL; - struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -@@ -1394,7 +1453,7 @@ not_allocated: - } - - --struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip) -+static struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip) - { - struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; - struct meta_index *meta = NULL; -@@ -1448,7 +1507,7 @@ failed: - } - - --void release_meta_index(struct inode *inode, struct meta_index *meta) -+static void release_meta_index(struct inode *inode, struct meta_index *meta) - { - meta->locked = 0; - smp_mb(); -@@ -1463,18 +1522,24 @@ static int read_block_index(struct super - int block = 0; - - if (msblk->swap) { -- char sblock_list[blocks << 2]; -+ char *sblock_list; -+ -+ sblock_list = kmalloc(blocks << 2, GFP_KERNEL); -+ if (unlikely(!sblock_list)) -+ goto failure; - - if (!squashfs_get_cached_block(s, sblock_list, *start_block, -- *offset, blocks << 2, start_block, offset)) { -+ *offset, blocks << 2, start_block, (unsigned int *)offset)) { - ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset); -+ kfree(sblock_list); - goto failure; - } - SQUASHFS_SWAP_INTS(((unsigned int *)block_list), - ((unsigned int *)sblock_list), blocks); -+ kfree(sblock_list); - } else { - if (!squashfs_get_cached_block(s, block_list, *start_block, -- *offset, blocks << 2, start_block, offset)) { -+ *offset, blocks << 2, start_block, (unsigned int *)offset)) { - ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset); - goto failure; - } -@@ -1890,7 +1955,8 @@ static int squashfs_readdir(struct file - file->f_pos += size; - } - -- length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset, -+ length = get_dir_index_using_offset(i->i_sb, &next_block, -+ (unsigned int *)&next_offset, - SQUASHFS_I(i)->u.s2.directory_index_start, - SQUASHFS_I(i)->u.s2.directory_index_offset, - SQUASHFS_I(i)->u.s2.directory_index_count, file->f_pos); -@@ -1901,14 +1967,16 @@ static int squashfs_readdir(struct file - struct squashfs_dir_header sdirh; - - if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block, -- next_offset, sizeof(sdirh), &next_block, &next_offset)) -+ next_offset, sizeof(sdirh), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(sdirh); - SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); - } else { - if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block, -- next_offset, sizeof(dirh), &next_block, &next_offset)) -+ next_offset, sizeof(dirh), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(dirh); -@@ -1919,21 +1987,24 @@ static int squashfs_readdir(struct file - if (msblk->swap) { - struct squashfs_dir_entry sdire; - if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block, -- next_offset, sizeof(sdire), &next_block, &next_offset)) -+ next_offset, sizeof(sdire), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(sdire); - SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); - } else { - if (!squashfs_get_cached_block(i->i_sb, dire, next_block, -- next_offset, sizeof(*dire), &next_block, &next_offset)) -+ next_offset, sizeof(*dire), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(*dire); - } - - if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block, -- next_offset, dire->size + 1, &next_block, &next_offset)) -+ next_offset, dire->size + 1, &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += dire->size + 1; -@@ -1997,7 +2068,7 @@ static struct dentry *squashfs_lookup(st - if (len > SQUASHFS_NAME_LEN) - goto exit_lookup; - -- length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset, -+ length = get_dir_index_using_name(i->i_sb, &next_block, (unsigned int *)&next_offset, - SQUASHFS_I(i)->u.s2.directory_index_start, - SQUASHFS_I(i)->u.s2.directory_index_offset, - SQUASHFS_I(i)->u.s2.directory_index_count, name, len); -@@ -2007,14 +2078,16 @@ static struct dentry *squashfs_lookup(st - if (msblk->swap) { - struct squashfs_dir_header sdirh; - if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block, -- next_offset, sizeof(sdirh), &next_block, &next_offset)) -+ next_offset, sizeof(sdirh), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(sdirh); - SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); - } else { - if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block, -- next_offset, sizeof(dirh), &next_block, &next_offset)) -+ next_offset, sizeof(dirh), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(dirh); -@@ -2025,21 +2098,24 @@ static struct dentry *squashfs_lookup(st - if (msblk->swap) { - struct squashfs_dir_entry sdire; - if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block, -- next_offset, sizeof(sdire), &next_block, &next_offset)) -+ next_offset, sizeof(sdire), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(sdire); - SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); - } else { - if (!squashfs_get_cached_block(i->i_sb, dire, next_block, -- next_offset, sizeof(*dire), &next_block, &next_offset)) -+ next_offset, sizeof(*dire), &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += sizeof(*dire); - } - - if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block, -- next_offset, dire->size + 1, &next_block, &next_offset)) -+ next_offset, dire->size + 1, &next_block, -+ (unsigned int *)&next_offset)) - goto failed_read; - - length += dire->size + 1; -@@ -2103,7 +2179,6 @@ static void squashfs_put_super(struct su - kfree(sbi->fragment_index); - kfree(sbi->fragment_index_2); - kfree(sbi->meta_index); -- vfree(sbi->stream.workspace); - kfree(s->s_fs_info); - s->s_fs_info = NULL; - } -@@ -2117,19 +2192,63 @@ static int squashfs_get_sb(struct file_s - mnt); - } - -+static void free_sqlzma(void) -+{ -+ int cpu; -+ struct sqlzma *p; -+ -+ for_each_online_cpu(cpu) { -+ p = per_cpu(sqlzma, cpu); -+ if (p) { -+#ifdef KeepPreemptive -+ mutex_destroy(&p->mtx); -+#endif -+ sqlzma_fin(&p->un); -+ kfree(p); -+ } -+ } -+} - - static int __init init_squashfs_fs(void) - { -+ struct sqlzma *p; -+ int cpu; - int err = init_inodecache(); - if (err) - goto out; - -+ for_each_online_cpu(cpu) { -+ dpri("%d: %p\n", cpu, per_cpu(sqlzma, cpu)); -+ err = -ENOMEM; -+ p = kmalloc(sizeof(struct sqlzma), GFP_KERNEL); -+ if (p) { -+#ifdef KeepPreemptive -+ mutex_init(&p->mtx); -+#endif -+ err = sqlzma_init(&p->un, 1, 0); -+ if (unlikely(err)) { -+ ERROR("Failed to intialize uncompress workspace\n"); -+ break; -+ } -+ per_cpu(sqlzma, cpu) = p; -+ err = 0; -+ } else -+ break; -+ } -+ if (unlikely(err)) { -+ free_sqlzma(); -+ goto out; -+ } -+ - printk(KERN_INFO "squashfs: version 3.3 (2007/10/31) " -- "Phillip Lougher\n"); -+ "Phillip Lougher\n" -+ "squashfs: LZMA suppport for slax.org by jro\n"); - - err = register_filesystem(&squashfs_fs_type); -- if (err) -+ if (err) { -+ free_sqlzma(); - destroy_inodecache(); -+ } - - out: - return err; -@@ -2139,6 +2258,7 @@ out: - static void __exit exit_squashfs_fs(void) - { - unregister_filesystem(&squashfs_fs_type); -+ free_sqlzma(); - destroy_inodecache(); - } - -@@ -2187,6 +2307,6 @@ static void destroy_inodecache(void) - - module_init(init_squashfs_fs); - module_exit(exit_squashfs_fs); --MODULE_DESCRIPTION("squashfs 3.2-r2-CVS, a compressed read-only filesystem"); --MODULE_AUTHOR("Phillip Lougher "); -+MODULE_DESCRIPTION("squashfs 3.2-r2-CVS, a compressed read-only filesystem, and LZMA suppport for slax.org"); -+MODULE_AUTHOR("Phillip Lougher , and LZMA suppport for slax.org by jro"); - MODULE_LICENSE("GPL"); -Index: linux-2.6.23/include/linux/squashfs_fs.h -=================================================================== -RCS file: linux-2.6.23/include/linux/squashfs_fs.h,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.23/include/linux/squashfs_fs.h 4 Nov 2007 13:21:40 -0000 1.1 -+++ linux-2.6.23/include/linux/squashfs_fs.h 5 Nov 2007 05:43:36 -0000 1.2 -@@ -341,7 +341,7 @@ struct squashfs_dir_entry { - unsigned int offset:13; - unsigned int type:3; - unsigned int size:8; -- int inode_number:16; -+ unsigned int inode_number:16; - char name[0]; - } __attribute__ ((packed)); - -Index: linux-2.6.23/include/linux/squashfs_fs_sb.h -=================================================================== -RCS file: linux-2.6.23/include/linux/squashfs_fs_sb.h,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.23/include/linux/squashfs_fs_sb.h 4 Nov 2007 13:21:40 -0000 1.1 -+++ linux-2.6.23/include/linux/squashfs_fs_sb.h 5 Nov 2007 05:43:36 -0000 1.2 -@@ -24,6 +24,7 @@ - */ - - #include -+#include "sqlzma.h" - - struct squashfs_cache { - long long block; -@@ -54,7 +55,7 @@ struct squashfs_sb_info { - long long *fragment_index; - unsigned int *fragment_index_2; - char *read_page; -- struct mutex read_data_mutex; -+ //struct mutex read_data_mutex; - struct mutex read_page_mutex; - struct mutex block_cache_mutex; - struct mutex fragment_mutex; -@@ -62,7 +63,7 @@ struct squashfs_sb_info { - wait_queue_head_t waitq; - wait_queue_head_t fragment_wait_queue; - struct meta_index *meta_index; -- z_stream stream; -+ //z_stream stream; - long long *inode_lookup_table; - int unused_cache_blks; - int unused_frag_blks; diff --git a/source/base-extra/kernel-fwlive/squashfs3.3-patch b/source/base-extra/kernel-fwlive/squashfs3.3-patch deleted file mode 100644 index 536f319..0000000 --- a/source/base-extra/kernel-fwlive/squashfs3.3-patch +++ /dev/null @@ -1,4234 +0,0 @@ -diff -x .gitignore -Nurp linux-2.6.23/fs/Kconfig linux-2.6.23-squashfs3.3/fs/Kconfig ---- linux-2.6.23/fs/Kconfig 2007-10-09 21:31:38.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/fs/Kconfig 2007-11-01 05:06:25.000000000 +0000 -@@ -1364,6 +1364,56 @@ config CRAMFS - - If unsure, say N. - -+config SQUASHFS -+ tristate "SquashFS 3.3 - Squashed file system support" -+ select ZLIB_INFLATE -+ help -+ Saying Y here includes support for SquashFS 3.3 (a Compressed -+ Read-Only File System). Squashfs is a highly compressed read-only -+ filesystem for Linux. It uses zlib compression to compress both -+ files, inodes and directories. Inodes in the system are very small -+ and all blocks are packed to minimise data overhead. Block sizes -+ greater than 4K are supported up to a maximum of 1 Mbytes (default -+ block size 128K). SquashFS 3.3 supports 64 bit filesystems and files -+ (larger than 4GB), full uid/gid information, hard links and timestamps. -+ -+ Squashfs is intended for general read-only filesystem use, for -+ archival use (i.e. in cases where a .tar.gz file may be used), and in -+ embedded systems where low overhead is needed. Further information -+ and filesystem tools are available from http://squashfs.sourceforge.net. -+ -+ If you want to compile this as a module ( = code which can be -+ inserted in and removed from the running kernel whenever you want), -+ say M here and read . The module -+ will be called squashfs. Note that the root file system (the one -+ containing the directory /) cannot be compiled as a module. -+ -+ If unsure, say N. -+ -+config SQUASHFS_EMBEDDED -+ -+ bool "Additional option for memory-constrained systems" -+ depends on SQUASHFS -+ default n -+ help -+ Saying Y here allows you to specify cache size. -+ -+ If unsure, say N. -+ -+config SQUASHFS_FRAGMENT_CACHE_SIZE -+ int "Number of fragments cached" if SQUASHFS_EMBEDDED -+ depends on SQUASHFS -+ default "3" -+ help -+ By default SquashFS caches the last 3 fragments read from -+ the filesystem. Increasing this amount may mean SquashFS -+ has to re-read fragments less often from disk, at the expense -+ of extra system memory. Decreasing this amount will mean -+ SquashFS uses less memory at the expense of extra reads from disk. -+ -+ Note there must be at least one cached fragment. Anything -+ much more than three will probably not make much difference. -+ - config VXFS_FS - tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" - depends on BLOCK -diff -x .gitignore -Nurp linux-2.6.23/fs/Makefile linux-2.6.23-squashfs3.3/fs/Makefile ---- linux-2.6.23/fs/Makefile 2007-10-09 21:31:38.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/fs/Makefile 2007-11-01 05:06:25.000000000 +0000 -@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/ - obj-$(CONFIG_JBD2) += jbd2/ - obj-$(CONFIG_EXT2_FS) += ext2/ - obj-$(CONFIG_CRAMFS) += cramfs/ -+obj-$(CONFIG_SQUASHFS) += squashfs/ - obj-$(CONFIG_RAMFS) += ramfs/ - obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ - obj-$(CONFIG_CODA_FS) += coda/ -diff -x .gitignore -Nurp linux-2.6.23/fs/squashfs/inode.c linux-2.6.23-squashfs3.3/fs/squashfs/inode.c ---- linux-2.6.23/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/fs/squashfs/inode.c 2007-11-01 03:09:05.000000000 +0000 -@@ -0,0 +1,2192 @@ -+/* -+ * Squashfs - a compressed read only filesystem for Linux -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * inode.c -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "squashfs.h" -+ -+int squashfs_cached_blks; -+ -+static void vfs_read_inode(struct inode *i); -+static struct dentry *squashfs_get_parent(struct dentry *child); -+static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode); -+static int squashfs_statfs(struct dentry *, struct kstatfs *); -+static int squashfs_symlink_readpage(struct file *file, struct page *page); -+static long long read_blocklist(struct inode *inode, int index, -+ int readahead_blks, char *block_list, -+ unsigned short **block_p, unsigned int *bsize); -+static int squashfs_readpage(struct file *file, struct page *page); -+static int squashfs_readdir(struct file *, void *, filldir_t); -+static struct dentry *squashfs_lookup(struct inode *, struct dentry *, -+ struct nameidata *); -+static int squashfs_remount(struct super_block *s, int *flags, char *data); -+static void squashfs_put_super(struct super_block *); -+static int squashfs_get_sb(struct file_system_type *,int, const char *, void *, -+ struct vfsmount *); -+static struct inode *squashfs_alloc_inode(struct super_block *sb); -+static void squashfs_destroy_inode(struct inode *inode); -+static int init_inodecache(void); -+static void destroy_inodecache(void); -+ -+static struct file_system_type squashfs_fs_type = { -+ .owner = THIS_MODULE, -+ .name = "squashfs", -+ .get_sb = squashfs_get_sb, -+ .kill_sb = kill_block_super, -+ .fs_flags = FS_REQUIRES_DEV -+}; -+ -+static const unsigned char squashfs_filetype_table[] = { -+ DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK -+}; -+ -+static struct super_operations squashfs_super_ops = { -+ .alloc_inode = squashfs_alloc_inode, -+ .destroy_inode = squashfs_destroy_inode, -+ .statfs = squashfs_statfs, -+ .put_super = squashfs_put_super, -+ .remount_fs = squashfs_remount -+}; -+ -+static struct super_operations squashfs_export_super_ops = { -+ .alloc_inode = squashfs_alloc_inode, -+ .destroy_inode = squashfs_destroy_inode, -+ .statfs = squashfs_statfs, -+ .put_super = squashfs_put_super, -+ .read_inode = vfs_read_inode -+}; -+ -+static struct export_operations squashfs_export_ops = { -+ .get_parent = squashfs_get_parent -+}; -+ -+SQSH_EXTERN const struct address_space_operations squashfs_symlink_aops = { -+ .readpage = squashfs_symlink_readpage -+}; -+ -+SQSH_EXTERN const struct address_space_operations squashfs_aops = { -+ .readpage = squashfs_readpage -+}; -+ -+static const struct file_operations squashfs_dir_ops = { -+ .read = generic_read_dir, -+ .readdir = squashfs_readdir -+}; -+ -+SQSH_EXTERN struct inode_operations squashfs_dir_inode_ops = { -+ .lookup = squashfs_lookup -+}; -+ -+ -+static struct buffer_head *get_block_length(struct super_block *s, -+ int *cur_index, int *offset, int *c_byte) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ unsigned short temp; -+ struct buffer_head *bh; -+ -+ if (!(bh = sb_bread(s, *cur_index))) -+ goto out; -+ -+ if (msblk->devblksize - *offset == 1) { -+ if (msblk->swap) -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ else -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ brelse(bh); -+ if (!(bh = sb_bread(s, ++(*cur_index)))) -+ goto out; -+ if (msblk->swap) -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ bh->b_data); -+ else -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ bh->b_data); -+ *c_byte = temp; -+ *offset = 1; -+ } else { -+ if (msblk->swap) { -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ (bh->b_data + *offset + 1)); -+ } else { -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ (bh->b_data + *offset + 1)); -+ } -+ *c_byte = temp; -+ *offset += 2; -+ } -+ -+ if (SQUASHFS_CHECK_DATA(msblk->sblk.flags)) { -+ if (*offset == msblk->devblksize) { -+ brelse(bh); -+ if (!(bh = sb_bread(s, ++(*cur_index)))) -+ goto out; -+ *offset = 0; -+ } -+ if (*((unsigned char *) (bh->b_data + *offset)) != -+ SQUASHFS_MARKER_BYTE) { -+ ERROR("Metadata block marker corrupt @ %x\n", -+ *cur_index); -+ brelse(bh); -+ goto out; -+ } -+ (*offset)++; -+ } -+ return bh; -+ -+out: -+ return NULL; -+} -+ -+ -+SQSH_EXTERN unsigned int squashfs_read_data(struct super_block *s, char *buffer, -+ long long index, unsigned int length, -+ long long *next_index, int srclength) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ struct buffer_head **bh; -+ unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1); -+ unsigned int cur_index = index >> msblk->devblksize_log2; -+ int bytes, avail_bytes, b = 0, k = 0; -+ unsigned int compressed; -+ unsigned int c_byte = length; -+ -+ bh = kmalloc(((sblk->block_size >> msblk->devblksize_log2) + 1) * -+ sizeof(struct buffer_head *), GFP_KERNEL); -+ if (bh == NULL) -+ goto read_failure; -+ -+ if (c_byte) { -+ bytes = msblk->devblksize - offset; -+ compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte); -+ c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); -+ -+ TRACE("Block @ 0x%llx, %scompressed size %d, src size %d\n", index, -+ compressed ? "" : "un", (unsigned int) c_byte, srclength); -+ -+ if (c_byte > srclength || index < 0 || (index + c_byte) > sblk->bytes_used) -+ goto read_failure; -+ -+ bh[0] = sb_getblk(s, cur_index); -+ if (bh[0] == NULL) -+ goto block_release; -+ -+ for (b = 1; bytes < c_byte; b++) { -+ bh[b] = sb_getblk(s, ++cur_index); -+ if (bh[b] == NULL) -+ goto block_release; -+ bytes += msblk->devblksize; -+ } -+ ll_rw_block(READ, b, bh); -+ } else { -+ if (index < 0 || (index + 2) > sblk->bytes_used) -+ goto read_failure; -+ -+ bh[0] = get_block_length(s, &cur_index, &offset, &c_byte); -+ if (bh[0] == NULL) -+ goto read_failure; -+ -+ bytes = msblk->devblksize - offset; -+ compressed = SQUASHFS_COMPRESSED(c_byte); -+ c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte); -+ -+ TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed -+ ? "" : "un", (unsigned int) c_byte); -+ -+ if (c_byte > srclength || (index + c_byte) > sblk->bytes_used) -+ goto read_failure; -+ -+ for (b = 1; bytes < c_byte; b++) { -+ bh[b] = sb_getblk(s, ++cur_index); -+ if (bh[b] == NULL) -+ goto block_release; -+ bytes += msblk->devblksize; -+ } -+ ll_rw_block(READ, b - 1, bh + 1); -+ } -+ -+ if (compressed) { -+ int zlib_err = 0; -+ -+ /* -+ * uncompress block -+ */ -+ -+ mutex_lock(&msblk->read_data_mutex); -+ -+ msblk->stream.next_out = buffer; -+ msblk->stream.avail_out = srclength; -+ -+ for (bytes = 0; k < b; k++) { -+ avail_bytes = min(c_byte - bytes, msblk->devblksize - offset); -+ -+ wait_on_buffer(bh[k]); -+ if (!buffer_uptodate(bh[k])) -+ goto release_mutex; -+ -+ msblk->stream.next_in = bh[k]->b_data + offset; -+ msblk->stream.avail_in = avail_bytes; -+ -+ if (k == 0) { -+ zlib_err = zlib_inflateInit(&msblk->stream); -+ if (zlib_err != Z_OK) { -+ ERROR("zlib_inflateInit returned unexpected result 0x%x," -+ " srclength %d\n", zlib_err, srclength); -+ goto release_mutex; -+ } -+ -+ if (avail_bytes == 0) { -+ offset = 0; -+ brelse(bh[k]); -+ continue; -+ } -+ } -+ -+ zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH); -+ if (zlib_err != Z_OK && zlib_err != Z_STREAM_END) { -+ ERROR("zlib_inflate returned unexpected result 0x%x," -+ " srclength %d, avail_in %d, avail_out %d\n", zlib_err, -+ srclength, msblk->stream.avail_in, msblk->stream.avail_out); -+ goto release_mutex; -+ } -+ -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ } -+ -+ if (zlib_err != Z_STREAM_END) -+ goto release_mutex; -+ -+ zlib_err = zlib_inflateEnd(&msblk->stream); -+ if (zlib_err != Z_OK) { -+ ERROR("zlib_inflateEnd returned unexpected result 0x%x," -+ " srclength %d\n", zlib_err, srclength); -+ goto release_mutex; -+ } -+ bytes = msblk->stream.total_out; -+ mutex_unlock(&msblk->read_data_mutex); -+ } else { -+ int i; -+ -+ for(i = 0; i < b; i++) { -+ wait_on_buffer(bh[i]); -+ if (!buffer_uptodate(bh[i])) -+ goto block_release; -+ } -+ -+ for (bytes = 0; k < b; k++) { -+ avail_bytes = min(c_byte - bytes, msblk->devblksize - offset); -+ -+ memcpy(buffer + bytes, bh[k]->b_data + offset, avail_bytes); -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ } -+ } -+ -+ if (next_index) -+ *next_index = index + c_byte + (length ? 0 : -+ (SQUASHFS_CHECK_DATA(msblk->sblk.flags) ? 3 : 2)); -+ -+ kfree(bh); -+ return bytes; -+ -+release_mutex: -+ mutex_unlock(&msblk->read_data_mutex); -+ -+block_release: -+ for (; k < b; k++) -+ brelse(bh[k]); -+ -+read_failure: -+ ERROR("sb_bread failed reading block 0x%x\n", cur_index); -+ kfree(bh); -+ return 0; -+} -+ -+ -+SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, void *buffer, -+ long long block, unsigned int offset, -+ int length, long long *next_block, -+ unsigned int *next_offset) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ int n, i, bytes, return_length = length; -+ long long next_index; -+ -+ TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset); -+ -+ while (1) { -+ for (i = 0; i < squashfs_cached_blks; i++) -+ if (msblk->block_cache[i].block == block) -+ break; -+ -+ mutex_lock(&msblk->block_cache_mutex); -+ -+ if (i == squashfs_cached_blks) { -+ /* read inode header block */ -+ if (msblk->unused_cache_blks == 0) { -+ mutex_unlock(&msblk->block_cache_mutex); -+ wait_event(msblk->waitq, msblk->unused_cache_blks); -+ continue; -+ } -+ -+ i = msblk->next_cache; -+ for (n = 0; n < squashfs_cached_blks; n++) { -+ if (msblk->block_cache[i].block != SQUASHFS_USED_BLK) -+ break; -+ i = (i + 1) % squashfs_cached_blks; -+ } -+ -+ msblk->next_cache = (i + 1) % squashfs_cached_blks; -+ -+ if (msblk->block_cache[i].block == SQUASHFS_INVALID_BLK) { -+ msblk->block_cache[i].data = vmalloc(SQUASHFS_METADATA_SIZE); -+ if (msblk->block_cache[i].data == NULL) { -+ ERROR("Failed to allocate cache block\n"); -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto out; -+ } -+ } -+ -+ msblk->block_cache[i].block = SQUASHFS_USED_BLK; -+ msblk->unused_cache_blks --; -+ mutex_unlock(&msblk->block_cache_mutex); -+ -+ msblk->block_cache[i].length = squashfs_read_data(s, -+ msblk->block_cache[i].data, block, 0, &next_index, -+ SQUASHFS_METADATA_SIZE); -+ -+ if (msblk->block_cache[i].length == 0) { -+ ERROR("Unable to read cache block [%llx:%x]\n", block, offset); -+ mutex_lock(&msblk->block_cache_mutex); -+ msblk->block_cache[i].block = SQUASHFS_INVALID_BLK; -+ msblk->unused_cache_blks ++; -+ smp_mb(); -+ vfree(msblk->block_cache[i].data); -+ wake_up(&msblk->waitq); -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto out; -+ } -+ -+ mutex_lock(&msblk->block_cache_mutex); -+ msblk->block_cache[i].block = block; -+ msblk->block_cache[i].next_index = next_index; -+ msblk->unused_cache_blks ++; -+ smp_mb(); -+ wake_up(&msblk->waitq); -+ TRACE("Read cache block [%llx:%x]\n", block, offset); -+ } -+ -+ if (msblk->block_cache[i].block != block) { -+ mutex_unlock(&msblk->block_cache_mutex); -+ continue; -+ } -+ -+ bytes = msblk->block_cache[i].length - offset; -+ -+ if (bytes < 1) { -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto out; -+ } else if (bytes >= length) { -+ if (buffer) -+ memcpy(buffer, msblk->block_cache[i].data + offset, length); -+ if (msblk->block_cache[i].length - offset == length) { -+ *next_block = msblk->block_cache[i].next_index; -+ *next_offset = 0; -+ } else { -+ *next_block = block; -+ *next_offset = offset + length; -+ } -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto finish; -+ } else { -+ if (buffer) { -+ memcpy(buffer, msblk->block_cache[i].data + offset, bytes); -+ buffer = (char *) buffer + bytes; -+ } -+ block = msblk->block_cache[i].next_index; -+ mutex_unlock(&msblk->block_cache_mutex); -+ length -= bytes; -+ offset = 0; -+ } -+ } -+ -+finish: -+ return return_length; -+out: -+ return 0; -+} -+ -+ -+static int get_fragment_location(struct super_block *s, unsigned int fragment, -+ long long *fragment_start_block, -+ unsigned int *fragment_size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ long long start_block = -+ msblk->fragment_index[SQUASHFS_FRAGMENT_INDEX(fragment)]; -+ int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET(fragment); -+ struct squashfs_fragment_entry fragment_entry; -+ -+ if (msblk->swap) { -+ struct squashfs_fragment_entry sfragment_entry; -+ -+ if (!squashfs_get_cached_block(s, &sfragment_entry, start_block, offset, -+ sizeof(sfragment_entry), &start_block, &offset)) -+ goto out; -+ SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry); -+ } else -+ if (!squashfs_get_cached_block(s, &fragment_entry, start_block, offset, -+ sizeof(fragment_entry), &start_block, &offset)) -+ goto out; -+ -+ *fragment_start_block = fragment_entry.start_block; -+ *fragment_size = fragment_entry.size; -+ -+ return 1; -+ -+out: -+ return 0; -+} -+ -+ -+SQSH_EXTERN void release_cached_fragment(struct squashfs_sb_info *msblk, -+ struct squashfs_fragment_cache *fragment) -+{ -+ mutex_lock(&msblk->fragment_mutex); -+ fragment->locked --; -+ if (fragment->locked == 0) { -+ msblk->unused_frag_blks ++; -+ smp_mb(); -+ wake_up(&msblk->fragment_wait_queue); -+ } -+ mutex_unlock(&msblk->fragment_mutex); -+} -+ -+ -+SQSH_EXTERN -+struct squashfs_fragment_cache *get_cached_fragment(struct super_block *s, -+ long long start_block, int length) -+{ -+ int i, n; -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ while (1) { -+ mutex_lock(&msblk->fragment_mutex); -+ -+ for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS && -+ msblk->fragment[i].block != start_block; i++); -+ -+ if (i == SQUASHFS_CACHED_FRAGMENTS) { -+ if (msblk->unused_frag_blks == 0) { -+ mutex_unlock(&msblk->fragment_mutex); -+ wait_event(msblk->fragment_wait_queue, msblk->unused_frag_blks); -+ continue; -+ } -+ -+ i = msblk->next_fragment; -+ for (n = 0; n < SQUASHFS_CACHED_FRAGMENTS; n++) { -+ if (msblk->fragment[i].locked == 0) -+ break; -+ i = (i + 1) % SQUASHFS_CACHED_FRAGMENTS; -+ } -+ -+ msblk->next_fragment = (msblk->next_fragment + 1) % -+ SQUASHFS_CACHED_FRAGMENTS; -+ -+ if (msblk->fragment[i].data == NULL) { -+ msblk->fragment[i].data = vmalloc(sblk->block_size); -+ if (msblk->fragment[i].data == NULL) { -+ ERROR("Failed to allocate fragment cache block\n"); -+ mutex_unlock(&msblk->fragment_mutex); -+ goto out; -+ } -+ } -+ -+ msblk->unused_frag_blks --; -+ msblk->fragment[i].block = SQUASHFS_INVALID_BLK; -+ msblk->fragment[i].locked = 1; -+ mutex_unlock(&msblk->fragment_mutex); -+ -+ msblk->fragment[i].length = squashfs_read_data(s, -+ msblk->fragment[i].data, start_block, length, NULL, -+ sblk->block_size); -+ -+ if (msblk->fragment[i].length == 0) { -+ ERROR("Unable to read fragment cache block [%llx]\n", start_block); -+ msblk->fragment[i].locked = 0; -+ msblk->unused_frag_blks ++; -+ smp_mb(); -+ wake_up(&msblk->fragment_wait_queue); -+ goto out; -+ } -+ -+ mutex_lock(&msblk->fragment_mutex); -+ msblk->fragment[i].block = start_block; -+ TRACE("New fragment %d, start block %lld, locked %d\n", -+ i, msblk->fragment[i].block, msblk->fragment[i].locked); -+ mutex_unlock(&msblk->fragment_mutex); -+ break; -+ } -+ -+ if (msblk->fragment[i].locked == 0) -+ msblk->unused_frag_blks --; -+ msblk->fragment[i].locked++; -+ mutex_unlock(&msblk->fragment_mutex); -+ TRACE("Got fragment %d, start block %lld, locked %d\n", i, -+ msblk->fragment[i].block, msblk->fragment[i].locked); -+ break; -+ } -+ -+ return &msblk->fragment[i]; -+ -+out: -+ return NULL; -+} -+ -+ -+static void squashfs_new_inode(struct squashfs_sb_info *msblk, struct inode *i, -+ struct squashfs_base_inode_header *inodeb) -+{ -+ i->i_ino = inodeb->inode_number; -+ i->i_mtime.tv_sec = inodeb->mtime; -+ i->i_atime.tv_sec = inodeb->mtime; -+ i->i_ctime.tv_sec = inodeb->mtime; -+ i->i_uid = msblk->uid[inodeb->uid]; -+ i->i_mode = inodeb->mode; -+ i->i_size = 0; -+ -+ if (inodeb->guid == SQUASHFS_GUIDS) -+ i->i_gid = i->i_uid; -+ else -+ i->i_gid = msblk->guid[inodeb->guid]; -+} -+ -+ -+static squashfs_inode_t squashfs_inode_lookup(struct super_block *s, int ino) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ long long start = msblk->inode_lookup_table[SQUASHFS_LOOKUP_BLOCK(ino - 1)]; -+ int offset = SQUASHFS_LOOKUP_BLOCK_OFFSET(ino - 1); -+ squashfs_inode_t inode; -+ -+ TRACE("Entered squashfs_inode_lookup, inode_number = %d\n", ino); -+ -+ if (msblk->swap) { -+ squashfs_inode_t sinode; -+ -+ if (!squashfs_get_cached_block(s, &sinode, start, offset, -+ sizeof(sinode), &start, &offset)) -+ goto out; -+ SQUASHFS_SWAP_INODE_T((&inode), &sinode); -+ } else if (!squashfs_get_cached_block(s, &inode, start, offset, -+ sizeof(inode), &start, &offset)) -+ goto out; -+ -+ TRACE("squashfs_inode_lookup, inode = 0x%llx\n", inode); -+ -+ return inode; -+ -+out: -+ return SQUASHFS_INVALID_BLK; -+} -+ -+ -+static void vfs_read_inode(struct inode *i) -+{ -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ squashfs_inode_t inode = squashfs_inode_lookup(i->i_sb, i->i_ino); -+ -+ TRACE("Entered vfs_read_inode\n"); -+ -+ if(inode != SQUASHFS_INVALID_BLK) -+ (msblk->read_inode)(i, inode); -+} -+ -+ -+static struct dentry *squashfs_get_parent(struct dentry *child) -+{ -+ struct inode *i = child->d_inode; -+ struct inode *parent = iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode); -+ struct dentry *rv; -+ -+ TRACE("Entered squashfs_get_parent\n"); -+ -+ if(parent == NULL) { -+ rv = ERR_PTR(-EACCES); -+ goto out; -+ } -+ -+ rv = d_alloc_anon(parent); -+ if(rv == NULL) -+ rv = ERR_PTR(-ENOMEM); -+ -+out: -+ return rv; -+} -+ -+ -+SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s, -+ squashfs_inode_t inode, unsigned int inode_number) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct inode *i = iget_locked(s, inode_number); -+ -+ TRACE("Entered squashfs_iget\n"); -+ -+ if(i && (i->i_state & I_NEW)) { -+ (msblk->read_inode)(i, inode); -+ unlock_new_inode(i); -+ } -+ -+ return i; -+} -+ -+ -+static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode) -+{ -+ struct super_block *s = i->i_sb; -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long block = SQUASHFS_INODE_BLK(inode) + sblk->inode_table_start; -+ unsigned int offset = SQUASHFS_INODE_OFFSET(inode); -+ long long next_block; -+ unsigned int next_offset; -+ union squashfs_inode_header id, sid; -+ struct squashfs_base_inode_header *inodeb = &id.base, *sinodeb = &sid.base; -+ -+ TRACE("Entered squashfs_read_inode\n"); -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodeb, block, offset, -+ sizeof(*sinodeb), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_BASE_INODE_HEADER(inodeb, sinodeb, sizeof(*sinodeb)); -+ } else -+ if (!squashfs_get_cached_block(s, inodeb, block, offset, -+ sizeof(*inodeb), &next_block, &next_offset)) -+ goto failed_read; -+ -+ squashfs_new_inode(msblk, i, inodeb); -+ -+ switch(inodeb->inode_type) { -+ case SQUASHFS_FILE_TYPE: { -+ unsigned int frag_size; -+ long long frag_blk; -+ struct squashfs_reg_inode_header *inodep = &id.reg; -+ struct squashfs_reg_inode_header *sinodep = &sid.reg; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_REG_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ frag_blk = SQUASHFS_INVALID_BLK; -+ -+ if (inodep->fragment != SQUASHFS_INVALID_FRAG) -+ if(!get_fragment_location(s, inodep->fragment, &frag_blk, -+ &frag_size)) -+ goto failed_read; -+ -+ i->i_nlink = 1; -+ i->i_size = inodep->file_size; -+ i->i_fop = &generic_ro_fops; -+ i->i_mode |= S_IFREG; -+ i->i_blocks = ((i->i_size - 1) >> 9) + 1; -+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk; -+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size; -+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->u.s1.block_list_start = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ i->i_data.a_ops = &squashfs_aops; -+ -+ TRACE("File inode %x:%x, start_block %llx, " -+ "block_list_start %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, next_block, -+ next_offset); -+ break; -+ } -+ case SQUASHFS_LREG_TYPE: { -+ unsigned int frag_size; -+ long long frag_blk; -+ struct squashfs_lreg_inode_header *inodep = &id.lreg; -+ struct squashfs_lreg_inode_header *sinodep = &sid.lreg; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_LREG_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ frag_blk = SQUASHFS_INVALID_BLK; -+ -+ if (inodep->fragment != SQUASHFS_INVALID_FRAG) -+ if (!get_fragment_location(s, inodep->fragment, &frag_blk, -+ &frag_size)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->file_size; -+ i->i_fop = &generic_ro_fops; -+ i->i_mode |= S_IFREG; -+ i->i_blocks = ((i->i_size - 1) >> 9) + 1; -+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk; -+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size; -+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->u.s1.block_list_start = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ i->i_data.a_ops = &squashfs_aops; -+ -+ TRACE("File inode %x:%x, start_block %llx, " -+ "block_list_start %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, next_block, -+ next_offset); -+ break; -+ } -+ case SQUASHFS_DIR_TYPE: { -+ struct squashfs_dir_inode_header *inodep = &id.dir; -+ struct squashfs_dir_inode_header *sinodep = &sid.dir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DIR_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops; -+ i->i_fop = &squashfs_dir_ops; -+ i->i_mode |= S_IFDIR; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = 0; -+ SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode; -+ -+ TRACE("Directory inode %x:%x, start_block %x, offset " -+ "%x\n", SQUASHFS_INODE_BLK(inode), -+ offset, inodep->start_block, -+ inodep->offset); -+ break; -+ } -+ case SQUASHFS_LDIR_TYPE: { -+ struct squashfs_ldir_inode_header *inodep = &id.ldir; -+ struct squashfs_ldir_inode_header *sinodep = &sid.ldir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_LDIR_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops; -+ i->i_fop = &squashfs_dir_ops; -+ i->i_mode |= S_IFDIR; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_start = next_block; -+ SQUASHFS_I(i)->u.s2.directory_index_offset = next_offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = inodep->i_count; -+ SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode; -+ -+ TRACE("Long directory inode %x:%x, start_block %x, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, inodep->offset); -+ break; -+ } -+ case SQUASHFS_SYMLINK_TYPE: { -+ struct squashfs_symlink_inode_header *inodep = &id.symlink; -+ struct squashfs_symlink_inode_header *sinodep = &sid.symlink; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_SYMLINK_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->symlink_size; -+ i->i_op = &page_symlink_inode_operations; -+ i->i_data.a_ops = &squashfs_symlink_aops; -+ i->i_mode |= S_IFLNK; -+ SQUASHFS_I(i)->start_block = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ -+ TRACE("Symbolic link inode %x:%x, start_block %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ next_block, next_offset); -+ break; -+ } -+ case SQUASHFS_BLKDEV_TYPE: -+ case SQUASHFS_CHRDEV_TYPE: { -+ struct squashfs_dev_inode_header *inodep = &id.dev; -+ struct squashfs_dev_inode_header *sinodep = &sid.dev; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DEV_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_mode |= (inodeb->inode_type == SQUASHFS_CHRDEV_TYPE) ? -+ S_IFCHR : S_IFBLK; -+ init_special_inode(i, i->i_mode, old_decode_dev(inodep->rdev)); -+ -+ TRACE("Device inode %x:%x, rdev %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, inodep->rdev); -+ break; -+ } -+ case SQUASHFS_FIFO_TYPE: -+ case SQUASHFS_SOCKET_TYPE: { -+ struct squashfs_ipc_inode_header *inodep = &id.ipc; -+ struct squashfs_ipc_inode_header *sinodep = &sid.ipc; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, sinodep, block, offset, -+ sizeof(*sinodep), &next_block, &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_IPC_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, inodep, block, offset, -+ sizeof(*inodep), &next_block, &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE) -+ ? S_IFIFO : S_IFSOCK; -+ init_special_inode(i, i->i_mode, 0); -+ break; -+ } -+ default: -+ ERROR("Unknown inode type %d in squashfs_iget!\n", -+ inodeb->inode_type); -+ goto failed_read1; -+ } -+ -+ return 1; -+ -+failed_read: -+ ERROR("Unable to read inode [%llx:%x]\n", block, offset); -+ -+failed_read1: -+ make_bad_inode(i); -+ return 0; -+} -+ -+ -+static int read_inode_lookup_table(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned int length = SQUASHFS_LOOKUP_BLOCK_BYTES(sblk->inodes); -+ -+ TRACE("In read_inode_lookup_table, length %d\n", length); -+ -+ /* Allocate inode lookup table */ -+ msblk->inode_lookup_table = kmalloc(length, GFP_KERNEL); -+ if (msblk->inode_lookup_table == NULL) { -+ ERROR("Failed to allocate inode lookup table\n"); -+ return 0; -+ } -+ -+ if (!squashfs_read_data(s, (char *) msblk->inode_lookup_table, -+ sblk->lookup_table_start, length | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length)) { -+ ERROR("unable to read inode lookup table\n"); -+ return 0; -+ } -+ -+ if (msblk->swap) { -+ int i; -+ long long block; -+ -+ for (i = 0; i < SQUASHFS_LOOKUP_BLOCKS(sblk->inodes); i++) { -+ /* XXX */ -+ SQUASHFS_SWAP_LOOKUP_BLOCKS((&block), -+ &msblk->inode_lookup_table[i], 1); -+ msblk->inode_lookup_table[i] = block; -+ } -+ } -+ -+ return 1; -+} -+ -+ -+static int read_fragment_index_table(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned int length = SQUASHFS_FRAGMENT_INDEX_BYTES(sblk->fragments); -+ -+ if(length == 0) -+ return 1; -+ -+ /* Allocate fragment index table */ -+ msblk->fragment_index = kmalloc(length, GFP_KERNEL); -+ if (msblk->fragment_index == NULL) { -+ ERROR("Failed to allocate fragment index table\n"); -+ return 0; -+ } -+ -+ if (!squashfs_read_data(s, (char *) msblk->fragment_index, -+ sblk->fragment_table_start, length | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length)) { -+ ERROR("unable to read fragment index table\n"); -+ return 0; -+ } -+ -+ if (msblk->swap) { -+ int i; -+ long long fragment; -+ -+ for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES(sblk->fragments); i++) { -+ /* XXX */ -+ SQUASHFS_SWAP_FRAGMENT_INDEXES((&fragment), -+ &msblk->fragment_index[i], 1); -+ msblk->fragment_index[i] = fragment; -+ } -+ } -+ -+ return 1; -+} -+ -+ -+static int readahead_metadata(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ int i; -+ -+ squashfs_cached_blks = SQUASHFS_CACHED_BLKS; -+ -+ /* Init inode_table block pointer array */ -+ msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) * -+ squashfs_cached_blks, GFP_KERNEL); -+ if (msblk->block_cache == NULL) { -+ ERROR("Failed to allocate block cache\n"); -+ goto failed; -+ } -+ -+ for (i = 0; i < squashfs_cached_blks; i++) -+ msblk->block_cache[i].block = SQUASHFS_INVALID_BLK; -+ -+ msblk->next_cache = 0; -+ msblk->unused_cache_blks = squashfs_cached_blks; -+ -+ return 1; -+ -+failed: -+ return 0; -+} -+ -+ -+static int supported_squashfs_filesystem(struct squashfs_sb_info *msblk, int silent) -+{ -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ msblk->read_inode = squashfs_read_inode; -+ msblk->read_blocklist = read_blocklist; -+ msblk->read_fragment_index_table = read_fragment_index_table; -+ -+ if (sblk->s_major == 1) { -+ if (!squashfs_1_0_supported(msblk)) { -+ SERROR("Major/Minor mismatch, Squashfs 1.0 filesystems " -+ "are unsupported\n"); -+ SERROR("Please recompile with Squashfs 1.0 support enabled\n"); -+ return 0; -+ } -+ } else if (sblk->s_major == 2) { -+ if (!squashfs_2_0_supported(msblk)) { -+ SERROR("Major/Minor mismatch, Squashfs 2.0 filesystems " -+ "are unsupported\n"); -+ SERROR("Please recompile with Squashfs 2.0 support enabled\n"); -+ return 0; -+ } -+ } else if(sblk->s_major != SQUASHFS_MAJOR || sblk->s_minor > -+ SQUASHFS_MINOR) { -+ SERROR("Major/Minor mismatch, trying to mount newer %d.%d " -+ "filesystem\n", sblk->s_major, sblk->s_minor); -+ SERROR("Please update your kernel\n"); -+ return 0; -+ } -+ -+ return 1; -+} -+ -+ -+static int squashfs_fill_super(struct super_block *s, void *data, int silent) -+{ -+ struct squashfs_sb_info *msblk; -+ struct squashfs_super_block *sblk; -+ int i; -+ char b[BDEVNAME_SIZE]; -+ struct inode *root; -+ -+ TRACE("Entered squashfs_fill_superblock\n"); -+ -+ s->s_fs_info = kzalloc(sizeof(struct squashfs_sb_info), GFP_KERNEL); -+ if (s->s_fs_info == NULL) { -+ ERROR("Failed to allocate superblock\n"); -+ goto failure; -+ } -+ msblk = s->s_fs_info; -+ -+ msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize()); -+ if (msblk->stream.workspace == NULL) { -+ ERROR("Failed to allocate zlib workspace\n"); -+ goto failure; -+ } -+ sblk = &msblk->sblk; -+ -+ msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE); -+ msblk->devblksize_log2 = ffz(~msblk->devblksize); -+ -+ mutex_init(&msblk->read_data_mutex); -+ mutex_init(&msblk->read_page_mutex); -+ mutex_init(&msblk->block_cache_mutex); -+ mutex_init(&msblk->fragment_mutex); -+ mutex_init(&msblk->meta_index_mutex); -+ -+ init_waitqueue_head(&msblk->waitq); -+ init_waitqueue_head(&msblk->fragment_wait_queue); -+ -+ /* sblk->bytes_used is checked in squashfs_read_data to ensure reads are not -+ * beyond filesystem end. As we're using squashfs_read_data to read sblk here, -+ * first set sblk->bytes_used to a useful value */ -+ sblk->bytes_used = sizeof(struct squashfs_super_block); -+ if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START, -+ sizeof(struct squashfs_super_block) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, sizeof(struct squashfs_super_block))) { -+ SERROR("unable to read superblock\n"); -+ goto failed_mount; -+ } -+ -+ /* Check it is a SQUASHFS superblock */ -+ if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) { -+ if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) { -+ struct squashfs_super_block ssblk; -+ -+ WARNING("Mounting a different endian SQUASHFS filesystem on %s\n", -+ bdevname(s->s_bdev, b)); -+ -+ SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -+ memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -+ msblk->swap = 1; -+ } else { -+ SERROR("Can't find a SQUASHFS superblock on %s\n", -+ bdevname(s->s_bdev, b)); -+ goto failed_mount; -+ } -+ } -+ -+ /* Check the MAJOR & MINOR versions */ -+ if(!supported_squashfs_filesystem(msblk, silent)) -+ goto failed_mount; -+ -+ /* Check the filesystem does not extend beyond the end of the -+ block device */ -+ if(sblk->bytes_used < 0 || sblk->bytes_used > i_size_read(s->s_bdev->bd_inode)) -+ goto failed_mount; -+ -+ /* Check the root inode for sanity */ -+ if (SQUASHFS_INODE_OFFSET(sblk->root_inode) > SQUASHFS_METADATA_SIZE) -+ goto failed_mount; -+ -+ TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b)); -+ TRACE("Inodes are %scompressed\n", SQUASHFS_UNCOMPRESSED_INODES(sblk->flags) -+ ? "un" : ""); -+ TRACE("Data is %scompressed\n", SQUASHFS_UNCOMPRESSED_DATA(sblk->flags) -+ ? "un" : ""); -+ TRACE("Check data is %spresent in the filesystem\n", -+ SQUASHFS_CHECK_DATA(sblk->flags) ? "" : "not "); -+ TRACE("Filesystem size %lld bytes\n", sblk->bytes_used); -+ TRACE("Block size %d\n", sblk->block_size); -+ TRACE("Number of inodes %d\n", sblk->inodes); -+ if (sblk->s_major > 1) -+ TRACE("Number of fragments %d\n", sblk->fragments); -+ TRACE("Number of uids %d\n", sblk->no_uids); -+ TRACE("Number of gids %d\n", sblk->no_guids); -+ TRACE("sblk->inode_table_start %llx\n", sblk->inode_table_start); -+ TRACE("sblk->directory_table_start %llx\n", sblk->directory_table_start); -+ if (sblk->s_major > 1) -+ TRACE("sblk->fragment_table_start %llx\n", sblk->fragment_table_start); -+ TRACE("sblk->uid_start %llx\n", sblk->uid_start); -+ -+ s->s_maxbytes = MAX_LFS_FILESIZE; -+ s->s_flags |= MS_RDONLY; -+ s->s_op = &squashfs_super_ops; -+ -+ if (readahead_metadata(s) == 0) -+ goto failed_mount; -+ -+ /* Allocate read_page block */ -+ msblk->read_page = vmalloc(sblk->block_size); -+ if (msblk->read_page == NULL) { -+ ERROR("Failed to allocate read_page block\n"); -+ goto failed_mount; -+ } -+ -+ /* Allocate uid and gid tables */ -+ msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) * -+ sizeof(unsigned int), GFP_KERNEL); -+ if (msblk->uid == NULL) { -+ ERROR("Failed to allocate uid/gid table\n"); -+ goto failed_mount; -+ } -+ msblk->guid = msblk->uid + sblk->no_uids; -+ -+ if (msblk->swap) { -+ unsigned int suid[sblk->no_uids + sblk->no_guids]; -+ -+ if (!squashfs_read_data(s, (char *) &suid, sblk->uid_start, -+ ((sblk->no_uids + sblk->no_guids) * -+ sizeof(unsigned int)) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { -+ ERROR("unable to read uid/gid table\n"); -+ goto failed_mount; -+ } -+ -+ SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids + -+ sblk->no_guids), (sizeof(unsigned int) * 8)); -+ } else -+ if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start, -+ ((sblk->no_uids + sblk->no_guids) * -+ sizeof(unsigned int)) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { -+ ERROR("unable to read uid/gid table\n"); -+ goto failed_mount; -+ } -+ -+ -+ if (sblk->s_major == 1 && squashfs_1_0_supported(msblk)) -+ goto allocate_root; -+ -+ msblk->fragment = kzalloc(sizeof(struct squashfs_fragment_cache) * -+ SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL); -+ if (msblk->fragment == NULL) { -+ ERROR("Failed to allocate fragment block cache\n"); -+ goto failed_mount; -+ } -+ -+ for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) { -+ msblk->fragment[i].block = SQUASHFS_INVALID_BLK; -+ } -+ -+ msblk->next_fragment = 0; -+ msblk->unused_frag_blks = SQUASHFS_CACHED_FRAGMENTS; -+ -+ /* Allocate and read fragment index table */ -+ if (msblk->read_fragment_index_table(s) == 0) -+ goto failed_mount; -+ -+ if(sblk->s_major < 3 || sblk->lookup_table_start == SQUASHFS_INVALID_BLK) -+ goto allocate_root; -+ -+ /* Allocate and read inode lookup table */ -+ if (read_inode_lookup_table(s) == 0) -+ goto failed_mount; -+ -+ s->s_op = &squashfs_export_super_ops; -+ s->s_export_op = &squashfs_export_ops; -+ -+allocate_root: -+ root = new_inode(s); -+ if ((msblk->read_inode)(root, sblk->root_inode) == 0) -+ goto failed_mount; -+ insert_inode_hash(root); -+ -+ s->s_root = d_alloc_root(root); -+ if (s->s_root == NULL) { -+ ERROR("Root inode create failed\n"); -+ iput(root); -+ goto failed_mount; -+ } -+ -+ TRACE("Leaving squashfs_fill_super\n"); -+ return 0; -+ -+failed_mount: -+ kfree(msblk->inode_lookup_table); -+ kfree(msblk->fragment_index); -+ kfree(msblk->fragment); -+ kfree(msblk->uid); -+ vfree(msblk->read_page); -+ kfree(msblk->block_cache); -+ kfree(msblk->fragment_index_2); -+ vfree(msblk->stream.workspace); -+ kfree(s->s_fs_info); -+ s->s_fs_info = NULL; -+ return -EINVAL; -+ -+failure: -+ return -ENOMEM; -+} -+ -+ -+static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf) -+{ -+ struct squashfs_sb_info *msblk = dentry->d_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ TRACE("Entered squashfs_statfs\n"); -+ -+ buf->f_type = SQUASHFS_MAGIC; -+ buf->f_bsize = sblk->block_size; -+ buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1; -+ buf->f_bfree = buf->f_bavail = 0; -+ buf->f_files = sblk->inodes; -+ buf->f_ffree = 0; -+ buf->f_namelen = SQUASHFS_NAME_LEN; -+ -+ return 0; -+} -+ -+ -+static int squashfs_symlink_readpage(struct file *file, struct page *page) -+{ -+ struct inode *inode = page->mapping->host; -+ int index = page->index << PAGE_CACHE_SHIFT, length, bytes, avail_bytes; -+ long long block = SQUASHFS_I(inode)->start_block; -+ int offset = SQUASHFS_I(inode)->offset; -+ void *pageaddr = kmap(page); -+ -+ TRACE("Entered squashfs_symlink_readpage, page index %ld, start block " -+ "%llx, offset %x\n", page->index, -+ SQUASHFS_I(inode)->start_block, -+ SQUASHFS_I(inode)->offset); -+ -+ for (length = 0; length < index; length += bytes) { -+ bytes = squashfs_get_cached_block(inode->i_sb, NULL, block, -+ offset, PAGE_CACHE_SIZE, &block, &offset); -+ if (bytes == 0) { -+ ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset); -+ goto skip_read; -+ } -+ } -+ -+ if (length != index) { -+ ERROR("(squashfs_symlink_readpage) length != index\n"); -+ bytes = 0; -+ goto skip_read; -+ } -+ -+ avail_bytes = min_t(int, i_size_read(inode) - length, PAGE_CACHE_SIZE); -+ -+ bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block, offset, -+ avail_bytes, &block, &offset); -+ if (bytes == 0) -+ ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset); -+ -+skip_read: -+ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); -+ kunmap(page); -+ flush_dcache_page(page); -+ SetPageUptodate(page); -+ unlock_page(page); -+ -+ return 0; -+} -+ -+ -+struct meta_index *locate_meta_index(struct inode *inode, int index, int offset) -+{ -+ struct meta_index *meta = NULL; -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ int i; -+ -+ mutex_lock(&msblk->meta_index_mutex); -+ -+ TRACE("locate_meta_index: index %d, offset %d\n", index, offset); -+ -+ if (msblk->meta_index == NULL) -+ goto not_allocated; -+ -+ for (i = 0; i < SQUASHFS_META_NUMBER; i ++) { -+ if (msblk->meta_index[i].inode_number == inode->i_ino && -+ msblk->meta_index[i].offset >= offset && -+ msblk->meta_index[i].offset <= index && -+ msblk->meta_index[i].locked == 0) { -+ TRACE("locate_meta_index: entry %d, offset %d\n", i, -+ msblk->meta_index[i].offset); -+ meta = &msblk->meta_index[i]; -+ offset = meta->offset; -+ } -+ } -+ -+ if (meta) -+ meta->locked = 1; -+ -+not_allocated: -+ mutex_unlock(&msblk->meta_index_mutex); -+ -+ return meta; -+} -+ -+ -+struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip) -+{ -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct meta_index *meta = NULL; -+ int i; -+ -+ mutex_lock(&msblk->meta_index_mutex); -+ -+ TRACE("empty_meta_index: offset %d, skip %d\n", offset, skip); -+ -+ if (msblk->meta_index == NULL) { -+ msblk->meta_index = kmalloc(sizeof(struct meta_index) * -+ SQUASHFS_META_NUMBER, GFP_KERNEL); -+ if (msblk->meta_index == NULL) { -+ ERROR("Failed to allocate meta_index\n"); -+ goto failed; -+ } -+ for (i = 0; i < SQUASHFS_META_NUMBER; i++) { -+ msblk->meta_index[i].inode_number = 0; -+ msblk->meta_index[i].locked = 0; -+ } -+ msblk->next_meta_index = 0; -+ } -+ -+ for (i = SQUASHFS_META_NUMBER; i && -+ msblk->meta_index[msblk->next_meta_index].locked; i --) -+ msblk->next_meta_index = (msblk->next_meta_index + 1) % -+ SQUASHFS_META_NUMBER; -+ -+ if (i == 0) { -+ TRACE("empty_meta_index: failed!\n"); -+ goto failed; -+ } -+ -+ TRACE("empty_meta_index: returned meta entry %d, %p\n", -+ msblk->next_meta_index, -+ &msblk->meta_index[msblk->next_meta_index]); -+ -+ meta = &msblk->meta_index[msblk->next_meta_index]; -+ msblk->next_meta_index = (msblk->next_meta_index + 1) % -+ SQUASHFS_META_NUMBER; -+ -+ meta->inode_number = inode->i_ino; -+ meta->offset = offset; -+ meta->skip = skip; -+ meta->entries = 0; -+ meta->locked = 1; -+ -+failed: -+ mutex_unlock(&msblk->meta_index_mutex); -+ return meta; -+} -+ -+ -+void release_meta_index(struct inode *inode, struct meta_index *meta) -+{ -+ meta->locked = 0; -+ smp_mb(); -+} -+ -+ -+static int read_block_index(struct super_block *s, int blocks, char *block_list, -+ long long *start_block, int *offset) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ unsigned int *block_listp; -+ int block = 0; -+ -+ if (msblk->swap) { -+ char sblock_list[blocks << 2]; -+ -+ if (!squashfs_get_cached_block(s, sblock_list, *start_block, -+ *offset, blocks << 2, start_block, offset)) { -+ ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset); -+ goto failure; -+ } -+ SQUASHFS_SWAP_INTS(((unsigned int *)block_list), -+ ((unsigned int *)sblock_list), blocks); -+ } else { -+ if (!squashfs_get_cached_block(s, block_list, *start_block, -+ *offset, blocks << 2, start_block, offset)) { -+ ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset); -+ goto failure; -+ } -+ } -+ -+ for (block_listp = (unsigned int *) block_list; blocks; -+ block_listp++, blocks --) -+ block += SQUASHFS_COMPRESSED_SIZE_BLOCK(*block_listp); -+ -+ return block; -+ -+failure: -+ return -1; -+} -+ -+ -+#define SIZE 256 -+ -+static inline int calculate_skip(int blocks) { -+ int skip = (blocks - 1) / ((SQUASHFS_SLOTS * SQUASHFS_META_ENTRIES + 1) * SQUASHFS_META_INDEXES); -+ return skip >= 7 ? 7 : skip + 1; -+} -+ -+ -+static int get_meta_index(struct inode *inode, int index, -+ long long *index_block, int *index_offset, -+ long long *data_block, char *block_list) -+{ -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int skip = calculate_skip(i_size_read(inode) >> sblk->block_log); -+ int offset = 0; -+ struct meta_index *meta; -+ struct meta_entry *meta_entry; -+ long long cur_index_block = SQUASHFS_I(inode)->u.s1.block_list_start; -+ int cur_offset = SQUASHFS_I(inode)->offset; -+ long long cur_data_block = SQUASHFS_I(inode)->start_block; -+ int i; -+ -+ index /= SQUASHFS_META_INDEXES * skip; -+ -+ while (offset < index) { -+ meta = locate_meta_index(inode, index, offset + 1); -+ -+ if (meta == NULL) { -+ meta = empty_meta_index(inode, offset + 1, skip); -+ if (meta == NULL) -+ goto all_done; -+ } else { -+ if(meta->entries == 0) -+ goto failed; -+ /* XXX */ -+ offset = index < meta->offset + meta->entries ? index : -+ meta->offset + meta->entries - 1; -+ /* XXX */ -+ meta_entry = &meta->meta_entry[offset - meta->offset]; -+ cur_index_block = meta_entry->index_block + sblk->inode_table_start; -+ cur_offset = meta_entry->offset; -+ cur_data_block = meta_entry->data_block; -+ TRACE("get_meta_index: offset %d, meta->offset %d, " -+ "meta->entries %d\n", offset, meta->offset, meta->entries); -+ TRACE("get_meta_index: index_block 0x%llx, offset 0x%x" -+ " data_block 0x%llx\n", cur_index_block, -+ cur_offset, cur_data_block); -+ } -+ -+ for (i = meta->offset + meta->entries; i <= index && -+ i < meta->offset + SQUASHFS_META_ENTRIES; i++) { -+ int blocks = skip * SQUASHFS_META_INDEXES; -+ -+ while (blocks) { -+ int block = blocks > (SIZE >> 2) ? (SIZE >> 2) : blocks; -+ int res = read_block_index(inode->i_sb, block, block_list, -+ &cur_index_block, &cur_offset); -+ -+ if (res == -1) -+ goto failed; -+ -+ cur_data_block += res; -+ blocks -= block; -+ } -+ -+ meta_entry = &meta->meta_entry[i - meta->offset]; -+ meta_entry->index_block = cur_index_block - sblk->inode_table_start; -+ meta_entry->offset = cur_offset; -+ meta_entry->data_block = cur_data_block; -+ meta->entries ++; -+ offset ++; -+ } -+ -+ TRACE("get_meta_index: meta->offset %d, meta->entries %d\n", -+ meta->offset, meta->entries); -+ -+ release_meta_index(inode, meta); -+ } -+ -+all_done: -+ *index_block = cur_index_block; -+ *index_offset = cur_offset; -+ *data_block = cur_data_block; -+ -+ return offset * SQUASHFS_META_INDEXES * skip; -+ -+failed: -+ release_meta_index(inode, meta); -+ return -1; -+} -+ -+ -+static long long read_blocklist(struct inode *inode, int index, -+ int readahead_blks, char *block_list, -+ unsigned short **block_p, unsigned int *bsize) -+{ -+ long long block_ptr; -+ int offset; -+ long long block; -+ int res = get_meta_index(inode, index, &block_ptr, &offset, &block, -+ block_list); -+ -+ TRACE("read_blocklist: res %d, index %d, block_ptr 0x%llx, offset" -+ " 0x%x, block 0x%llx\n", res, index, block_ptr, offset, block); -+ -+ if(res == -1) -+ goto failure; -+ -+ index -= res; -+ -+ while (index) { -+ int blocks = index > (SIZE >> 2) ? (SIZE >> 2) : index; -+ int res = read_block_index(inode->i_sb, blocks, block_list, -+ &block_ptr, &offset); -+ if (res == -1) -+ goto failure; -+ block += res; -+ index -= blocks; -+ } -+ -+ if (read_block_index(inode->i_sb, 1, block_list, &block_ptr, &offset) == -1) -+ goto failure; -+ *bsize = *((unsigned int *) block_list); -+ -+ return block; -+ -+failure: -+ return 0; -+} -+ -+ -+static int squashfs_readpage(struct file *file, struct page *page) -+{ -+ struct inode *inode = page->mapping->host; -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned char *block_list = NULL; -+ long long block; -+ unsigned int bsize, i; -+ int bytes; -+ int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT); -+ void *pageaddr; -+ struct squashfs_fragment_cache *fragment = NULL; -+ char *data_ptr = msblk->read_page; -+ -+ int mask = (1 << (sblk->block_log - PAGE_CACHE_SHIFT)) - 1; -+ int start_index = page->index & ~mask; -+ int end_index = start_index | mask; -+ int file_end = i_size_read(inode) >> sblk->block_log; -+ int sparse = 0; -+ -+ TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n", -+ page->index, SQUASHFS_I(inode)->start_block); -+ -+ if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> -+ PAGE_CACHE_SHIFT)) -+ goto out; -+ -+ if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK -+ || index < file_end) { -+ block_list = kmalloc(SIZE, GFP_KERNEL); -+ if (block_list == NULL) { -+ ERROR("Failed to allocate block_list\n"); -+ goto error_out; -+ } -+ -+ block = (msblk->read_blocklist)(inode, index, 1, block_list, NULL, &bsize); -+ if (block == 0) -+ goto error_out; -+ -+ if (bsize == 0) { /* hole */ -+ bytes = index == file_end ? -+ (i_size_read(inode) & (sblk->block_size - 1)) : sblk->block_size; -+ sparse = 1; -+ } else { -+ mutex_lock(&msblk->read_page_mutex); -+ -+ bytes = squashfs_read_data(inode->i_sb, msblk->read_page, block, -+ bsize, NULL, sblk->block_size); -+ -+ if (bytes == 0) { -+ ERROR("Unable to read page, block %llx, size %x\n", block, bsize); -+ mutex_unlock(&msblk->read_page_mutex); -+ goto error_out; -+ } -+ } -+ } else { -+ fragment = get_cached_fragment(inode->i_sb, -+ SQUASHFS_I(inode)-> u.s1.fragment_start_block, -+ SQUASHFS_I(inode)->u.s1.fragment_size); -+ -+ if (fragment == NULL) { -+ ERROR("Unable to read page, block %llx, size %x\n", -+ SQUASHFS_I(inode)->u.s1.fragment_start_block, -+ (int) SQUASHFS_I(inode)->u.s1.fragment_size); -+ goto error_out; -+ } -+ bytes = i_size_read(inode) & (sblk->block_size - 1); -+ data_ptr = fragment->data + SQUASHFS_I(inode)->u.s1.fragment_offset; -+ } -+ -+ for (i = start_index; i <= end_index && bytes > 0; i++, -+ bytes -= PAGE_CACHE_SIZE, data_ptr += PAGE_CACHE_SIZE) { -+ struct page *push_page; -+ int avail = sparse ? 0 : min_t(unsigned int, bytes, PAGE_CACHE_SIZE); -+ -+ TRACE("bytes %d, i %d, available_bytes %d\n", bytes, i, avail); -+ -+ push_page = (i == page->index) ? page : -+ grab_cache_page_nowait(page->mapping, i); -+ -+ if (!push_page) -+ continue; -+ -+ if (PageUptodate(push_page)) -+ goto skip_page; -+ -+ pageaddr = kmap_atomic(push_page, KM_USER0); -+ memcpy(pageaddr, data_ptr, avail); -+ memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); -+ kunmap_atomic(pageaddr, KM_USER0); -+ flush_dcache_page(push_page); -+ SetPageUptodate(push_page); -+skip_page: -+ unlock_page(push_page); -+ if(i != page->index) -+ page_cache_release(push_page); -+ } -+ -+ if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK -+ || index < file_end) { -+ if (!sparse) -+ mutex_unlock(&msblk->read_page_mutex); -+ kfree(block_list); -+ } else -+ release_cached_fragment(msblk, fragment); -+ -+ return 0; -+ -+error_out: -+ SetPageError(page); -+out: -+ pageaddr = kmap_atomic(page, KM_USER0); -+ memset(pageaddr, 0, PAGE_CACHE_SIZE); -+ kunmap_atomic(pageaddr, KM_USER0); -+ flush_dcache_page(page); -+ if (!PageError(page)) -+ SetPageUptodate(page); -+ unlock_page(page); -+ -+ kfree(block_list); -+ return 0; -+} -+ -+ -+static int get_dir_index_using_offset(struct super_block *s, -+ long long *next_block, unsigned int *next_offset, -+ long long index_start, unsigned int index_offset, int i_count, -+ long long f_pos) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index index; -+ -+ TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n", -+ i_count, (unsigned int) f_pos); -+ -+ f_pos =- 3; -+ if (f_pos == 0) -+ goto finish; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index sindex; -+ squashfs_get_cached_block(s, &sindex, index_start, index_offset, -+ sizeof(sindex), &index_start, &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX(&index, &sindex); -+ } else -+ squashfs_get_cached_block(s, &index, index_start, index_offset, -+ sizeof(index), &index_start, &index_offset); -+ -+ if (index.index > f_pos) -+ break; -+ -+ squashfs_get_cached_block(s, NULL, index_start, index_offset, -+ index.size + 1, &index_start, &index_offset); -+ -+ length = index.index; -+ *next_block = index.start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ -+finish: -+ return length + 3; -+} -+ -+ -+static int get_dir_index_using_name(struct super_block *s, -+ long long *next_block, unsigned int *next_offset, -+ long long index_start, unsigned int index_offset, int i_count, -+ const char *name, int size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index *index; -+ char *str; -+ -+ TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count); -+ -+ str = kmalloc(sizeof(struct squashfs_dir_index) + -+ (SQUASHFS_NAME_LEN + 1) * 2, GFP_KERNEL); -+ if (str == NULL) { -+ ERROR("Failed to allocate squashfs_dir_index\n"); -+ goto failure; -+ } -+ -+ index = (struct squashfs_dir_index *) (str + SQUASHFS_NAME_LEN + 1); -+ strncpy(str, name, size); -+ str[size] = '\0'; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index sindex; -+ squashfs_get_cached_block(s, &sindex, index_start, index_offset, -+ sizeof(sindex), &index_start, &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX(index, &sindex); -+ } else -+ squashfs_get_cached_block(s, index, index_start, index_offset, -+ sizeof(struct squashfs_dir_index), &index_start, &index_offset); -+ -+ squashfs_get_cached_block(s, index->name, index_start, index_offset, -+ index->size + 1, &index_start, &index_offset); -+ -+ index->name[index->size + 1] = '\0'; -+ -+ if (strcmp(index->name, str) > 0) -+ break; -+ -+ length = index->index; -+ *next_block = index->start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ kfree(str); -+ -+failure: -+ return length + 3; -+} -+ -+ -+static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir) -+{ -+ struct inode *i = file->f_dentry->d_inode; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, dir_count; -+ struct squashfs_dir_header dirh; -+ struct squashfs_dir_entry *dire; -+ -+ TRACE("Entered squashfs_readdir [%llx:%x]\n", next_block, next_offset); -+ -+ dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL); -+ if (dire == NULL) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto finish; -+ } -+ -+ while(file->f_pos < 3) { -+ char *name; -+ int size, i_ino; -+ -+ if(file->f_pos == 0) { -+ name = "."; -+ size = 1; -+ i_ino = i->i_ino; -+ } else { -+ name = ".."; -+ size = 2; -+ i_ino = SQUASHFS_I(i)->u.s2.parent_inode; -+ } -+ TRACE("Calling filldir(%x, %s, %d, %d, %d, %d)\n", -+ (unsigned int) dirent, name, size, (int) -+ file->f_pos, i_ino, squashfs_filetype_table[1]); -+ -+ if (filldir(dirent, name, size, file->f_pos, i_ino, -+ squashfs_filetype_table[1]) < 0) { -+ TRACE("Filldir returned less than 0\n"); -+ goto finish; -+ } -+ file->f_pos += size; -+ } -+ -+ length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, file->f_pos); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header sdirh; -+ -+ if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block, -+ next_offset, sizeof(sdirh), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block, -+ next_offset, sizeof(dirh), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry sdire; -+ if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block, -+ next_offset, sizeof(sdire), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, dire, next_block, -+ next_offset, sizeof(*dire), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block, -+ next_offset, dire->size + 1, &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (file->f_pos >= length) -+ continue; -+ -+ dire->name[dire->size + 1] = '\0'; -+ -+ TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d, %d)\n", -+ (unsigned int) dirent, dire->name, dire->size + 1, -+ (int) file->f_pos, dirh.start_block, dire->offset, -+ dirh.inode_number + dire->inode_number, -+ squashfs_filetype_table[dire->type]); -+ -+ if (filldir(dirent, dire->name, dire->size + 1, file->f_pos, -+ dirh.inode_number + dire->inode_number, -+ squashfs_filetype_table[dire->type]) < 0) { -+ TRACE("Filldir returned less than 0\n"); -+ goto finish; -+ } -+ file->f_pos = length; -+ } -+ } -+ -+finish: -+ kfree(dire); -+ return 0; -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ kfree(dire); -+ return 0; -+} -+ -+ -+static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry, -+ struct nameidata *nd) -+{ -+ const unsigned char *name = dentry->d_name.name; -+ int len = dentry->d_name.len; -+ struct inode *inode = NULL; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, dir_count; -+ struct squashfs_dir_header dirh; -+ struct squashfs_dir_entry *dire; -+ -+ TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset); -+ -+ dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL); -+ if (dire == NULL) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto exit_lookup; -+ } -+ -+ if (len > SQUASHFS_NAME_LEN) -+ goto exit_lookup; -+ -+ length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, name, len); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header sdirh; -+ if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block, -+ next_offset, sizeof(sdirh), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block, -+ next_offset, sizeof(dirh), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry sdire; -+ if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block, -+ next_offset, sizeof(sdire), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, dire, next_block, -+ next_offset, sizeof(*dire), &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block, -+ next_offset, dire->size + 1, &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (name[0] < dire->name[0]) -+ goto exit_lookup; -+ -+ if ((len == dire->size + 1) && !strncmp(name, dire->name, len)) { -+ squashfs_inode_t ino = SQUASHFS_MKINODE(dirh.start_block, -+ dire->offset); -+ -+ TRACE("calling squashfs_iget for directory entry %s, inode" -+ " %x:%x, %d\n", name, dirh.start_block, dire->offset, -+ dirh.inode_number + dire->inode_number); -+ -+ inode = squashfs_iget(i->i_sb, ino, dirh.inode_number + dire->inode_number); -+ -+ goto exit_lookup; -+ } -+ } -+ } -+ -+exit_lookup: -+ kfree(dire); -+ if (inode) -+ return d_splice_alias(inode, dentry); -+ d_add(dentry, inode); -+ return ERR_PTR(0); -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ goto exit_lookup; -+} -+ -+ -+static int squashfs_remount(struct super_block *s, int *flags, char *data) -+{ -+ *flags |= MS_RDONLY; -+ return 0; -+} -+ -+ -+static void squashfs_put_super(struct super_block *s) -+{ -+ int i; -+ -+ if (s->s_fs_info) { -+ struct squashfs_sb_info *sbi = s->s_fs_info; -+ if (sbi->block_cache) -+ for (i = 0; i < squashfs_cached_blks; i++) -+ if (sbi->block_cache[i].block != SQUASHFS_INVALID_BLK) -+ vfree(sbi->block_cache[i].data); -+ if (sbi->fragment) -+ for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) -+ vfree(sbi->fragment[i].data); -+ kfree(sbi->fragment); -+ kfree(sbi->block_cache); -+ vfree(sbi->read_page); -+ kfree(sbi->uid); -+ kfree(sbi->fragment_index); -+ kfree(sbi->fragment_index_2); -+ kfree(sbi->meta_index); -+ vfree(sbi->stream.workspace); -+ kfree(s->s_fs_info); -+ s->s_fs_info = NULL; -+ } -+} -+ -+ -+static int squashfs_get_sb(struct file_system_type *fs_type, int flags, -+ const char *dev_name, void *data, struct vfsmount *mnt) -+{ -+ return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, -+ mnt); -+} -+ -+ -+static int __init init_squashfs_fs(void) -+{ -+ int err = init_inodecache(); -+ if (err) -+ goto out; -+ -+ printk(KERN_INFO "squashfs: version 3.3 (2007/10/31) " -+ "Phillip Lougher\n"); -+ -+ err = register_filesystem(&squashfs_fs_type); -+ if (err) -+ destroy_inodecache(); -+ -+out: -+ return err; -+} -+ -+ -+static void __exit exit_squashfs_fs(void) -+{ -+ unregister_filesystem(&squashfs_fs_type); -+ destroy_inodecache(); -+} -+ -+ -+static struct kmem_cache * squashfs_inode_cachep; -+ -+ -+static struct inode *squashfs_alloc_inode(struct super_block *sb) -+{ -+ struct squashfs_inode_info *ei; -+ ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL); -+ return ei ? &ei->vfs_inode : NULL; -+} -+ -+ -+static void squashfs_destroy_inode(struct inode *inode) -+{ -+ kmem_cache_free(squashfs_inode_cachep, SQUASHFS_I(inode)); -+} -+ -+ -+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) -+{ -+ struct squashfs_inode_info *ei = foo; -+ -+ inode_init_once(&ei->vfs_inode); -+} -+ -+ -+static int __init init_inodecache(void) -+{ -+ squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache", -+ sizeof(struct squashfs_inode_info), 0, -+ SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, init_once); -+ if (squashfs_inode_cachep == NULL) -+ return -ENOMEM; -+ return 0; -+} -+ -+ -+static void destroy_inodecache(void) -+{ -+ kmem_cache_destroy(squashfs_inode_cachep); -+} -+ -+ -+module_init(init_squashfs_fs); -+module_exit(exit_squashfs_fs); -+MODULE_DESCRIPTION("squashfs 3.2-r2-CVS, a compressed read-only filesystem"); -+MODULE_AUTHOR("Phillip Lougher "); -+MODULE_LICENSE("GPL"); -diff -x .gitignore -Nurp linux-2.6.23/fs/squashfs/Makefile linux-2.6.23-squashfs3.3/fs/squashfs/Makefile ---- linux-2.6.23/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/fs/squashfs/Makefile 2005-11-20 14:31:00.000000000 +0000 -@@ -0,0 +1,7 @@ -+# -+# Makefile for the linux squashfs routines. -+# -+ -+obj-$(CONFIG_SQUASHFS) += squashfs.o -+squashfs-y += inode.o -+squashfs-y += squashfs2_0.o -diff -x .gitignore -Nurp linux-2.6.23/fs/squashfs/squashfs2_0.c linux-2.6.23-squashfs3.3/fs/squashfs/squashfs2_0.c ---- linux-2.6.23/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/fs/squashfs/squashfs2_0.c 2007-10-25 00:43:59.000000000 +0100 -@@ -0,0 +1,740 @@ -+/* -+ * Squashfs - a compressed read only filesystem for Linux -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs2_0.c -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "squashfs.h" -+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir); -+static struct dentry *squashfs_lookup_2(struct inode *, struct dentry *, -+ struct nameidata *); -+ -+static struct file_operations squashfs_dir_ops_2 = { -+ .read = generic_read_dir, -+ .readdir = squashfs_readdir_2 -+}; -+ -+static struct inode_operations squashfs_dir_inode_ops_2 = { -+ .lookup = squashfs_lookup_2 -+}; -+ -+static unsigned char squashfs_filetype_table[] = { -+ DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK -+}; -+ -+static int read_fragment_index_table_2(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ if (!(msblk->fragment_index_2 = kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES_2 -+ (sblk->fragments), GFP_KERNEL))) { -+ ERROR("Failed to allocate uid/gid table\n"); -+ return 0; -+ } -+ -+ if (SQUASHFS_FRAGMENT_INDEX_BYTES_2(sblk->fragments) && -+ !squashfs_read_data(s, (char *) -+ msblk->fragment_index_2, -+ sblk->fragment_table_start, -+ SQUASHFS_FRAGMENT_INDEX_BYTES_2 -+ (sblk->fragments) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, SQUASHFS_FRAGMENT_INDEX_BYTES_2(sblk->fragments))) { -+ ERROR("unable to read fragment index table\n"); -+ return 0; -+ } -+ -+ if (msblk->swap) { -+ int i; -+ unsigned int fragment; -+ -+ for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES_2(sblk->fragments); -+ i++) { -+ SQUASHFS_SWAP_FRAGMENT_INDEXES_2((&fragment), -+ &msblk->fragment_index_2[i], 1); -+ msblk->fragment_index_2[i] = fragment; -+ } -+ } -+ -+ return 1; -+} -+ -+ -+static int get_fragment_location_2(struct super_block *s, unsigned int fragment, -+ long long *fragment_start_block, -+ unsigned int *fragment_size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ long long start_block = -+ msblk->fragment_index_2[SQUASHFS_FRAGMENT_INDEX_2(fragment)]; -+ int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET_2(fragment); -+ struct squashfs_fragment_entry_2 fragment_entry; -+ -+ if (msblk->swap) { -+ struct squashfs_fragment_entry_2 sfragment_entry; -+ -+ if (!squashfs_get_cached_block(s, (char *) &sfragment_entry, -+ start_block, offset, -+ sizeof(sfragment_entry), &start_block, -+ &offset)) -+ goto out; -+ SQUASHFS_SWAP_FRAGMENT_ENTRY_2(&fragment_entry, &sfragment_entry); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) &fragment_entry, -+ start_block, offset, -+ sizeof(fragment_entry), &start_block, -+ &offset)) -+ goto out; -+ -+ *fragment_start_block = fragment_entry.start_block; -+ *fragment_size = fragment_entry.size; -+ -+ return 1; -+ -+out: -+ return 0; -+} -+ -+ -+static void squashfs_new_inode(struct squashfs_sb_info *msblk, struct inode *i, -+ struct squashfs_base_inode_header_2 *inodeb, unsigned int ino) -+{ -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ i->i_ino = ino; -+ i->i_mtime.tv_sec = sblk->mkfs_time; -+ i->i_atime.tv_sec = sblk->mkfs_time; -+ i->i_ctime.tv_sec = sblk->mkfs_time; -+ i->i_uid = msblk->uid[inodeb->uid]; -+ i->i_mode = inodeb->mode; -+ i->i_nlink = 1; -+ i->i_size = 0; -+ if (inodeb->guid == SQUASHFS_GUIDS) -+ i->i_gid = i->i_uid; -+ else -+ i->i_gid = msblk->guid[inodeb->guid]; -+} -+ -+ -+static int squashfs_read_inode_2(struct inode *i, squashfs_inode_t inode) -+{ -+ struct super_block *s = i->i_sb; -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned int block = SQUASHFS_INODE_BLK(inode) + -+ sblk->inode_table_start; -+ unsigned int offset = SQUASHFS_INODE_OFFSET(inode); -+ unsigned int ino = SQUASHFS_MK_VFS_INODE(block - -+ sblk->inode_table_start, offset); -+ long long next_block; -+ unsigned int next_offset; -+ union squashfs_inode_header_2 id, sid; -+ struct squashfs_base_inode_header_2 *inodeb = &id.base, -+ *sinodeb = &sid.base; -+ -+ TRACE("Entered squashfs_read_inode_2\n"); -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) sinodeb, block, -+ offset, sizeof(*sinodeb), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_BASE_INODE_HEADER_2(inodeb, sinodeb, -+ sizeof(*sinodeb)); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) inodeb, block, -+ offset, sizeof(*inodeb), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ squashfs_new_inode(msblk, i, inodeb, ino); -+ -+ switch(inodeb->inode_type) { -+ case SQUASHFS_FILE_TYPE: { -+ struct squashfs_reg_inode_header_2 *inodep = &id.reg; -+ struct squashfs_reg_inode_header_2 *sinodep = &sid.reg; -+ long long frag_blk; -+ unsigned int frag_size = 0; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_REG_INODE_HEADER_2(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ frag_blk = SQUASHFS_INVALID_BLK; -+ if (inodep->fragment != SQUASHFS_INVALID_FRAG && -+ !get_fragment_location_2(s, -+ inodep->fragment, &frag_blk, &frag_size)) -+ goto failed_read; -+ -+ i->i_size = inodep->file_size; -+ i->i_fop = &generic_ro_fops; -+ i->i_mode |= S_IFREG; -+ i->i_mtime.tv_sec = inodep->mtime; -+ i->i_atime.tv_sec = inodep->mtime; -+ i->i_ctime.tv_sec = inodep->mtime; -+ i->i_blocks = ((i->i_size - 1) >> 9) + 1; -+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk; -+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size; -+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->u.s1.block_list_start = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ i->i_data.a_ops = &squashfs_aops; -+ -+ TRACE("File inode %x:%x, start_block %x, " -+ "block_list_start %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, next_block, -+ next_offset); -+ break; -+ } -+ case SQUASHFS_DIR_TYPE: { -+ struct squashfs_dir_inode_header_2 *inodep = &id.dir; -+ struct squashfs_dir_inode_header_2 *sinodep = &sid.dir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DIR_INODE_HEADER_2(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops_2; -+ i->i_fop = &squashfs_dir_ops_2; -+ i->i_mode |= S_IFDIR; -+ i->i_mtime.tv_sec = inodep->mtime; -+ i->i_atime.tv_sec = inodep->mtime; -+ i->i_ctime.tv_sec = inodep->mtime; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = 0; -+ SQUASHFS_I(i)->u.s2.parent_inode = 0; -+ -+ TRACE("Directory inode %x:%x, start_block %x, offset " -+ "%x\n", SQUASHFS_INODE_BLK(inode), -+ offset, inodep->start_block, -+ inodep->offset); -+ break; -+ } -+ case SQUASHFS_LDIR_TYPE: { -+ struct squashfs_ldir_inode_header_2 *inodep = &id.ldir; -+ struct squashfs_ldir_inode_header_2 *sinodep = &sid.ldir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_LDIR_INODE_HEADER_2(inodep, -+ sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops_2; -+ i->i_fop = &squashfs_dir_ops_2; -+ i->i_mode |= S_IFDIR; -+ i->i_mtime.tv_sec = inodep->mtime; -+ i->i_atime.tv_sec = inodep->mtime; -+ i->i_ctime.tv_sec = inodep->mtime; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_start = next_block; -+ SQUASHFS_I(i)->u.s2.directory_index_offset = -+ next_offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = -+ inodep->i_count; -+ SQUASHFS_I(i)->u.s2.parent_inode = 0; -+ -+ TRACE("Long directory inode %x:%x, start_block %x, " -+ "offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, inodep->offset); -+ break; -+ } -+ case SQUASHFS_SYMLINK_TYPE: { -+ struct squashfs_symlink_inode_header_2 *inodep = -+ &id.symlink; -+ struct squashfs_symlink_inode_header_2 *sinodep = -+ &sid.symlink; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(inodep, -+ sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_size = inodep->symlink_size; -+ i->i_op = &page_symlink_inode_operations; -+ i->i_data.a_ops = &squashfs_symlink_aops; -+ i->i_mode |= S_IFLNK; -+ SQUASHFS_I(i)->start_block = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ -+ TRACE("Symbolic link inode %x:%x, start_block %llx, " -+ "offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ next_block, next_offset); -+ break; -+ } -+ case SQUASHFS_BLKDEV_TYPE: -+ case SQUASHFS_CHRDEV_TYPE: { -+ struct squashfs_dev_inode_header_2 *inodep = &id.dev; -+ struct squashfs_dev_inode_header_2 *sinodep = &sid.dev; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DEV_INODE_HEADER_2(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_mode |= (inodeb->inode_type == -+ SQUASHFS_CHRDEV_TYPE) ? S_IFCHR : -+ S_IFBLK; -+ init_special_inode(i, i->i_mode, -+ old_decode_dev(inodep->rdev)); -+ -+ TRACE("Device inode %x:%x, rdev %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->rdev); -+ break; -+ } -+ case SQUASHFS_FIFO_TYPE: -+ case SQUASHFS_SOCKET_TYPE: { -+ -+ i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE) -+ ? S_IFIFO : S_IFSOCK; -+ init_special_inode(i, i->i_mode, 0); -+ break; -+ } -+ default: -+ ERROR("Unknown inode type %d in squashfs_iget!\n", -+ inodeb->inode_type); -+ goto failed_read1; -+ } -+ -+ return 1; -+ -+failed_read: -+ ERROR("Unable to read inode [%x:%x]\n", block, offset); -+ -+failed_read1: -+ return 0; -+} -+ -+ -+static int get_dir_index_using_offset(struct super_block *s, long long -+ *next_block, unsigned int *next_offset, -+ long long index_start, -+ unsigned int index_offset, int i_count, -+ long long f_pos) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index_2 index; -+ -+ TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n", -+ i_count, (unsigned int) f_pos); -+ -+ if (f_pos == 0) -+ goto finish; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index_2 sindex; -+ squashfs_get_cached_block(s, (char *) &sindex, -+ index_start, index_offset, -+ sizeof(sindex), &index_start, -+ &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX_2(&index, &sindex); -+ } else -+ squashfs_get_cached_block(s, (char *) &index, -+ index_start, index_offset, -+ sizeof(index), &index_start, -+ &index_offset); -+ -+ if (index.index > f_pos) -+ break; -+ -+ squashfs_get_cached_block(s, NULL, index_start, index_offset, -+ index.size + 1, &index_start, -+ &index_offset); -+ -+ length = index.index; -+ *next_block = index.start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ -+finish: -+ return length; -+} -+ -+ -+static int get_dir_index_using_name(struct super_block *s, long long -+ *next_block, unsigned int *next_offset, -+ long long index_start, -+ unsigned int index_offset, int i_count, -+ const char *name, int size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index_2 *index; -+ char *str; -+ -+ TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count); -+ -+ if (!(str = kmalloc(sizeof(struct squashfs_dir_index) + -+ (SQUASHFS_NAME_LEN + 1) * 2, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_index\n"); -+ goto failure; -+ } -+ -+ index = (struct squashfs_dir_index_2 *) (str + SQUASHFS_NAME_LEN + 1); -+ strncpy(str, name, size); -+ str[size] = '\0'; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index_2 sindex; -+ squashfs_get_cached_block(s, (char *) &sindex, -+ index_start, index_offset, -+ sizeof(sindex), &index_start, -+ &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX_2(index, &sindex); -+ } else -+ squashfs_get_cached_block(s, (char *) index, -+ index_start, index_offset, -+ sizeof(struct squashfs_dir_index_2), -+ &index_start, &index_offset); -+ -+ squashfs_get_cached_block(s, index->name, index_start, -+ index_offset, index->size + 1, -+ &index_start, &index_offset); -+ -+ index->name[index->size + 1] = '\0'; -+ -+ if (strcmp(index->name, str) > 0) -+ break; -+ -+ length = index->index; -+ *next_block = index->start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ kfree(str); -+failure: -+ return length; -+} -+ -+ -+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir) -+{ -+ struct inode *i = file->f_dentry->d_inode; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, -+ dir_count; -+ struct squashfs_dir_header_2 dirh; -+ struct squashfs_dir_entry_2 *dire; -+ -+ TRACE("Entered squashfs_readdir_2 [%llx:%x]\n", next_block, next_offset); -+ -+ if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto finish; -+ } -+ -+ length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, -+ file->f_pos); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header_2 sdirh; -+ -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, -+ next_block, next_offset, sizeof(sdirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh, -+ next_block, next_offset, sizeof(dirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry_2 sdire; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ &sdire, next_block, next_offset, -+ sizeof(sdire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ dire, next_block, next_offset, -+ sizeof(*dire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, -+ next_block, next_offset, -+ dire->size + 1, &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (file->f_pos >= length) -+ continue; -+ -+ dire->name[dire->size + 1] = '\0'; -+ -+ TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d)\n", -+ (unsigned int) dirent, dire->name, -+ dire->size + 1, (int) file->f_pos, -+ dirh.start_block, dire->offset, -+ squashfs_filetype_table[dire->type]); -+ -+ if (filldir(dirent, dire->name, dire->size + 1, -+ file->f_pos, SQUASHFS_MK_VFS_INODE( -+ dirh.start_block, dire->offset), -+ squashfs_filetype_table[dire->type]) -+ < 0) { -+ TRACE("Filldir returned less than 0\n"); -+ goto finish; -+ } -+ file->f_pos = length; -+ } -+ } -+ -+finish: -+ kfree(dire); -+ return 0; -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ kfree(dire); -+ return 0; -+} -+ -+ -+static struct dentry *squashfs_lookup_2(struct inode *i, struct dentry *dentry, -+ struct nameidata *nd) -+{ -+ const unsigned char *name = dentry->d_name.name; -+ int len = dentry->d_name.len; -+ struct inode *inode = NULL; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, -+ dir_count; -+ struct squashfs_dir_header_2 dirh; -+ struct squashfs_dir_entry_2 *dire; -+ int sorted = sblk->s_major == 2 && sblk->s_minor >= 1; -+ -+ TRACE("Entered squashfs_lookup_2 [%llx:%x]\n", next_block, next_offset); -+ -+ if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto exit_loop; -+ } -+ -+ if (len > SQUASHFS_NAME_LEN) -+ goto exit_loop; -+ -+ length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, name, -+ len); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header_2 sdirh; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, -+ next_block, next_offset, sizeof(sdirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh, -+ next_block, next_offset, sizeof(dirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry_2 sdire; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ &sdire, next_block,next_offset, -+ sizeof(sdire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ dire, next_block,next_offset, -+ sizeof(*dire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, -+ next_block, next_offset, dire->size + 1, -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (sorted && name[0] < dire->name[0]) -+ goto exit_loop; -+ -+ if ((len == dire->size + 1) && !strncmp(name, -+ dire->name, len)) { -+ squashfs_inode_t ino = -+ SQUASHFS_MKINODE(dirh.start_block, -+ dire->offset); -+ unsigned int inode_number = SQUASHFS_MK_VFS_INODE(dirh.start_block, -+ dire->offset); -+ -+ TRACE("calling squashfs_iget for directory " -+ "entry %s, inode %x:%x, %lld\n", name, -+ dirh.start_block, dire->offset, ino); -+ -+ inode = squashfs_iget(i->i_sb, ino, inode_number); -+ -+ goto exit_loop; -+ } -+ } -+ } -+ -+exit_loop: -+ kfree(dire); -+ d_add(dentry, inode); -+ return ERR_PTR(0); -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ goto exit_loop; -+} -+ -+ -+int squashfs_2_0_supported(struct squashfs_sb_info *msblk) -+{ -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ msblk->read_inode = squashfs_read_inode_2; -+ msblk->read_fragment_index_table = read_fragment_index_table_2; -+ -+ sblk->bytes_used = sblk->bytes_used_2; -+ sblk->uid_start = sblk->uid_start_2; -+ sblk->guid_start = sblk->guid_start_2; -+ sblk->inode_table_start = sblk->inode_table_start_2; -+ sblk->directory_table_start = sblk->directory_table_start_2; -+ sblk->fragment_table_start = sblk->fragment_table_start_2; -+ -+ return 1; -+} -diff -x .gitignore -Nurp linux-2.6.23/fs/squashfs/squashfs.h linux-2.6.23-squashfs3.3/fs/squashfs/squashfs.h ---- linux-2.6.23/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/fs/squashfs/squashfs.h 2007-08-19 04:23:16.000000000 +0100 -@@ -0,0 +1,86 @@ -+/* -+ * Squashfs - a compressed read only filesystem for Linux -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs.h -+ */ -+ -+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+#endif -+ -+#ifdef SQUASHFS_TRACE -+#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args) -+#else -+#define TRACE(s, args...) {} -+#endif -+ -+#define ERROR(s, args...) printk(KERN_ERR "SQUASHFS error: "s, ## args) -+ -+#define SERROR(s, args...) do { \ -+ if (!silent) \ -+ printk(KERN_ERR "SQUASHFS error: "s, ## args);\ -+ } while(0) -+ -+#define WARNING(s, args...) printk(KERN_WARNING "SQUASHFS: "s, ## args) -+ -+static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode) -+{ -+ return list_entry(inode, struct squashfs_inode_info, vfs_inode); -+} -+ -+#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY) -+#define SQSH_EXTERN -+extern unsigned int squashfs_read_data(struct super_block *s, char *buffer, -+ long long index, unsigned int length, -+ long long *next_index, int srclength); -+extern int squashfs_get_cached_block(struct super_block *s, void *buffer, -+ long long block, unsigned int offset, -+ int length, long long *next_block, -+ unsigned int *next_offset); -+extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct -+ squashfs_fragment_cache *fragment); -+extern struct squashfs_fragment_cache *get_cached_fragment(struct super_block -+ *s, long long start_block, -+ int length); -+extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number); -+extern const struct address_space_operations squashfs_symlink_aops; -+extern const struct address_space_operations squashfs_aops; -+extern struct inode_operations squashfs_dir_inode_ops; -+#else -+#define SQSH_EXTERN static -+#endif -+ -+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk); -+#else -+static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk) -+{ -+ return 0; -+} -+#endif -+ -+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk); -+#else -+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk) -+{ -+ return 0; -+} -+#endif -diff -x .gitignore -Nurp linux-2.6.23/include/linux/squashfs_fs.h linux-2.6.23-squashfs3.3/include/linux/squashfs_fs.h ---- linux-2.6.23/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/include/linux/squashfs_fs.h 2007-11-01 03:50:57.000000000 +0000 -@@ -0,0 +1,935 @@ -+#ifndef SQUASHFS_FS -+#define SQUASHFS_FS -+ -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs_fs.h -+ */ -+ -+#ifndef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+#define CONFIG_SQUASHFS_2_0_COMPATIBILITY -+#endif -+ -+#define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE -+#define SQUASHFS_MAJOR 3 -+#define SQUASHFS_MINOR 1 -+#define SQUASHFS_MAGIC 0x73717368 -+#define SQUASHFS_MAGIC_SWAP 0x68737173 -+#define SQUASHFS_START 0 -+ -+/* size of metadata (inode and directory) blocks */ -+#define SQUASHFS_METADATA_SIZE 8192 -+#define SQUASHFS_METADATA_LOG 13 -+ -+/* default size of data blocks */ -+#define SQUASHFS_FILE_SIZE 131072 -+#define SQUASHFS_FILE_LOG 17 -+ -+#define SQUASHFS_FILE_MAX_SIZE 1048576 -+ -+/* Max number of uids and gids */ -+#define SQUASHFS_UIDS 256 -+#define SQUASHFS_GUIDS 255 -+ -+/* Max length of filename (not 255) */ -+#define SQUASHFS_NAME_LEN 256 -+ -+#define SQUASHFS_INVALID ((long long) 0xffffffffffff) -+#define SQUASHFS_INVALID_FRAG ((unsigned int) 0xffffffff) -+#define SQUASHFS_INVALID_BLK ((long long) -1) -+#define SQUASHFS_USED_BLK ((long long) -2) -+ -+/* Filesystem flags */ -+#define SQUASHFS_NOI 0 -+#define SQUASHFS_NOD 1 -+#define SQUASHFS_CHECK 2 -+#define SQUASHFS_NOF 3 -+#define SQUASHFS_NO_FRAG 4 -+#define SQUASHFS_ALWAYS_FRAG 5 -+#define SQUASHFS_DUPLICATE 6 -+#define SQUASHFS_EXPORT 7 -+ -+#define SQUASHFS_BIT(flag, bit) ((flag >> bit) & 1) -+ -+#define SQUASHFS_UNCOMPRESSED_INODES(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NOI) -+ -+#define SQUASHFS_UNCOMPRESSED_DATA(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NOD) -+ -+#define SQUASHFS_UNCOMPRESSED_FRAGMENTS(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NOF) -+ -+#define SQUASHFS_NO_FRAGMENTS(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NO_FRAG) -+ -+#define SQUASHFS_ALWAYS_FRAGMENTS(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_ALWAYS_FRAG) -+ -+#define SQUASHFS_DUPLICATES(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_DUPLICATE) -+ -+#define SQUASHFS_EXPORTABLE(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_EXPORT) -+ -+#define SQUASHFS_CHECK_DATA(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_CHECK) -+ -+#define SQUASHFS_MKFLAGS(noi, nod, check_data, nof, no_frag, always_frag, \ -+ duplicate_checking, exortable) (noi | (nod << 1) | (check_data << 2) \ -+ | (nof << 3) | (no_frag << 4) | (always_frag << 5) | \ -+ (duplicate_checking << 6) | (exportable << 7)) -+ -+/* Max number of types and file types */ -+#define SQUASHFS_DIR_TYPE 1 -+#define SQUASHFS_FILE_TYPE 2 -+#define SQUASHFS_SYMLINK_TYPE 3 -+#define SQUASHFS_BLKDEV_TYPE 4 -+#define SQUASHFS_CHRDEV_TYPE 5 -+#define SQUASHFS_FIFO_TYPE 6 -+#define SQUASHFS_SOCKET_TYPE 7 -+#define SQUASHFS_LDIR_TYPE 8 -+#define SQUASHFS_LREG_TYPE 9 -+ -+/* 1.0 filesystem type definitions */ -+#define SQUASHFS_TYPES 5 -+#define SQUASHFS_IPC_TYPE 0 -+ -+/* Flag whether block is compressed or uncompressed, bit is set if block is -+ * uncompressed */ -+#define SQUASHFS_COMPRESSED_BIT (1 << 15) -+ -+#define SQUASHFS_COMPRESSED_SIZE(B) (((B) & ~SQUASHFS_COMPRESSED_BIT) ? \ -+ (B) & ~SQUASHFS_COMPRESSED_BIT : SQUASHFS_COMPRESSED_BIT) -+ -+#define SQUASHFS_COMPRESSED(B) (!((B) & SQUASHFS_COMPRESSED_BIT)) -+ -+#define SQUASHFS_COMPRESSED_BIT_BLOCK (1 << 24) -+ -+#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B) ((B) & \ -+ ~SQUASHFS_COMPRESSED_BIT_BLOCK) -+ -+#define SQUASHFS_COMPRESSED_BLOCK(B) (!((B) & SQUASHFS_COMPRESSED_BIT_BLOCK)) -+ -+/* -+ * Inode number ops. Inodes consist of a compressed block number, and an -+ * uncompressed offset within that block -+ */ -+#define SQUASHFS_INODE_BLK(a) ((unsigned int) ((a) >> 16)) -+ -+#define SQUASHFS_INODE_OFFSET(a) ((unsigned int) ((a) & 0xffff)) -+ -+#define SQUASHFS_MKINODE(A, B) ((squashfs_inode_t)(((squashfs_inode_t) (A)\ -+ << 16) + (B))) -+ -+/* Compute 32 bit VFS inode number from squashfs inode number */ -+#define SQUASHFS_MK_VFS_INODE(a, b) ((unsigned int) (((a) << 8) + \ -+ ((b) >> 2) + 1)) -+/* XXX */ -+ -+/* Translate between VFS mode and squashfs mode */ -+#define SQUASHFS_MODE(a) ((a) & 0xfff) -+ -+/* fragment and fragment table defines */ -+#define SQUASHFS_FRAGMENT_BYTES(A) ((A) * sizeof(struct squashfs_fragment_entry)) -+ -+#define SQUASHFS_FRAGMENT_INDEX(A) (SQUASHFS_FRAGMENT_BYTES(A) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_OFFSET(A) (SQUASHFS_FRAGMENT_BYTES(A) % \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEXES(A) ((SQUASHFS_FRAGMENT_BYTES(A) + \ -+ SQUASHFS_METADATA_SIZE - 1) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_BYTES(A) (SQUASHFS_FRAGMENT_INDEXES(A) *\ -+ sizeof(long long)) -+ -+/* inode lookup table defines */ -+#define SQUASHFS_LOOKUP_BYTES(A) ((A) * sizeof(squashfs_inode_t)) -+ -+#define SQUASHFS_LOOKUP_BLOCK(A) (SQUASHFS_LOOKUP_BYTES(A) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_LOOKUP_BLOCK_OFFSET(A) (SQUASHFS_LOOKUP_BYTES(A) % \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_LOOKUP_BLOCKS(A) ((SQUASHFS_LOOKUP_BYTES(A) + \ -+ SQUASHFS_METADATA_SIZE - 1) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_LOOKUP_BLOCK_BYTES(A) (SQUASHFS_LOOKUP_BLOCKS(A) *\ -+ sizeof(long long)) -+ -+/* cached data constants for filesystem */ -+#define SQUASHFS_CACHED_BLKS 8 -+ -+#define SQUASHFS_MAX_FILE_SIZE_LOG 64 -+ -+#define SQUASHFS_MAX_FILE_SIZE ((long long) 1 << \ -+ (SQUASHFS_MAX_FILE_SIZE_LOG - 2)) -+ -+#define SQUASHFS_MARKER_BYTE 0xff -+ -+/* meta index cache */ -+#define SQUASHFS_META_INDEXES (SQUASHFS_METADATA_SIZE / sizeof(unsigned int)) -+#define SQUASHFS_META_ENTRIES 31 -+#define SQUASHFS_META_NUMBER 8 -+#define SQUASHFS_SLOTS 4 -+ -+struct meta_entry { -+ long long data_block; -+ unsigned int index_block; -+ unsigned short offset; -+ unsigned short pad; -+}; -+ -+struct meta_index { -+ unsigned int inode_number; -+ unsigned int offset; -+ unsigned short entries; -+ unsigned short skip; -+ unsigned short locked; -+ unsigned short pad; -+ struct meta_entry meta_entry[SQUASHFS_META_ENTRIES]; -+}; -+ -+ -+/* -+ * definitions for structures on disk -+ */ -+ -+typedef long long squashfs_block_t; -+typedef long long squashfs_inode_t; -+ -+struct squashfs_super_block { -+ unsigned int s_magic; -+ unsigned int inodes; -+ unsigned int bytes_used_2; -+ unsigned int uid_start_2; -+ unsigned int guid_start_2; -+ unsigned int inode_table_start_2; -+ unsigned int directory_table_start_2; -+ unsigned int s_major:16; -+ unsigned int s_minor:16; -+ unsigned int block_size_1:16; -+ unsigned int block_log:16; -+ unsigned int flags:8; -+ unsigned int no_uids:8; -+ unsigned int no_guids:8; -+ unsigned int mkfs_time /* time of filesystem creation */; -+ squashfs_inode_t root_inode; -+ unsigned int block_size; -+ unsigned int fragments; -+ unsigned int fragment_table_start_2; -+ long long bytes_used; -+ long long uid_start; -+ long long guid_start; -+ long long inode_table_start; -+ long long directory_table_start; -+ long long fragment_table_start; -+ long long lookup_table_start; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_index { -+ unsigned int index; -+ unsigned int start_block; -+ unsigned char size; -+ unsigned char name[0]; -+} __attribute__ ((packed)); -+ -+#define SQUASHFS_BASE_INODE_HEADER \ -+ unsigned int inode_type:4; \ -+ unsigned int mode:12; \ -+ unsigned int uid:8; \ -+ unsigned int guid:8; \ -+ unsigned int mtime; \ -+ unsigned int inode_number; -+ -+struct squashfs_base_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+} __attribute__ ((packed)); -+ -+struct squashfs_ipc_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+} __attribute__ ((packed)); -+ -+struct squashfs_dev_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned short rdev; -+} __attribute__ ((packed)); -+ -+struct squashfs_symlink_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned short symlink_size; -+ char symlink[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_reg_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ squashfs_block_t start_block; -+ unsigned int fragment; -+ unsigned int offset; -+ unsigned int file_size; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_lreg_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ squashfs_block_t start_block; -+ unsigned int fragment; -+ unsigned int offset; -+ long long file_size; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned int file_size:19; -+ unsigned int offset:13; -+ unsigned int start_block; -+ unsigned int parent_inode; -+} __attribute__ ((packed)); -+ -+struct squashfs_ldir_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned int file_size:27; -+ unsigned int offset:13; -+ unsigned int start_block; -+ unsigned int i_count:16; -+ unsigned int parent_inode; -+ struct squashfs_dir_index index[0]; -+} __attribute__ ((packed)); -+ -+union squashfs_inode_header { -+ struct squashfs_base_inode_header base; -+ struct squashfs_dev_inode_header dev; -+ struct squashfs_symlink_inode_header symlink; -+ struct squashfs_reg_inode_header reg; -+ struct squashfs_lreg_inode_header lreg; -+ struct squashfs_dir_inode_header dir; -+ struct squashfs_ldir_inode_header ldir; -+ struct squashfs_ipc_inode_header ipc; -+}; -+ -+struct squashfs_dir_entry { -+ unsigned int offset:13; -+ unsigned int type:3; -+ unsigned int size:8; -+ int inode_number:16; -+ char name[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_header { -+ unsigned int count:8; -+ unsigned int start_block; -+ unsigned int inode_number; -+} __attribute__ ((packed)); -+ -+struct squashfs_fragment_entry { -+ long long start_block; -+ unsigned int size; -+ unsigned int pending; -+} __attribute__ ((packed)); -+ -+extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen); -+extern int squashfs_uncompress_init(void); -+extern int squashfs_uncompress_exit(void); -+ -+/* -+ * macros to convert each packed bitfield structure from little endian to big -+ * endian and vice versa. These are needed when creating or using a filesystem -+ * on a machine with different byte ordering to the target architecture. -+ * -+ */ -+ -+#define SQUASHFS_SWAP_START \ -+ int bits;\ -+ int b_pos;\ -+ unsigned long long val;\ -+ unsigned char *s;\ -+ unsigned char *d; -+ -+#define SQUASHFS_SWAP_SUPER_BLOCK(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_super_block));\ -+ SQUASHFS_SWAP((s)->s_magic, d, 0, 32);\ -+ SQUASHFS_SWAP((s)->inodes, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->bytes_used_2, d, 64, 32);\ -+ SQUASHFS_SWAP((s)->uid_start_2, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->guid_start_2, d, 128, 32);\ -+ SQUASHFS_SWAP((s)->inode_table_start_2, d, 160, 32);\ -+ SQUASHFS_SWAP((s)->directory_table_start_2, d, 192, 32);\ -+ SQUASHFS_SWAP((s)->s_major, d, 224, 16);\ -+ SQUASHFS_SWAP((s)->s_minor, d, 240, 16);\ -+ SQUASHFS_SWAP((s)->block_size_1, d, 256, 16);\ -+ SQUASHFS_SWAP((s)->block_log, d, 272, 16);\ -+ SQUASHFS_SWAP((s)->flags, d, 288, 8);\ -+ SQUASHFS_SWAP((s)->no_uids, d, 296, 8);\ -+ SQUASHFS_SWAP((s)->no_guids, d, 304, 8);\ -+ SQUASHFS_SWAP((s)->mkfs_time, d, 312, 32);\ -+ SQUASHFS_SWAP((s)->root_inode, d, 344, 64);\ -+ SQUASHFS_SWAP((s)->block_size, d, 408, 32);\ -+ SQUASHFS_SWAP((s)->fragments, d, 440, 32);\ -+ SQUASHFS_SWAP((s)->fragment_table_start_2, d, 472, 32);\ -+ SQUASHFS_SWAP((s)->bytes_used, d, 504, 64);\ -+ SQUASHFS_SWAP((s)->uid_start, d, 568, 64);\ -+ SQUASHFS_SWAP((s)->guid_start, d, 632, 64);\ -+ SQUASHFS_SWAP((s)->inode_table_start, d, 696, 64);\ -+ SQUASHFS_SWAP((s)->directory_table_start, d, 760, 64);\ -+ SQUASHFS_SWAP((s)->fragment_table_start, d, 824, 64);\ -+ SQUASHFS_SWAP((s)->lookup_table_start, d, 888, 64);\ -+} -+ -+#define SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\ -+ SQUASHFS_MEMSET(s, d, n);\ -+ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ -+ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ -+ SQUASHFS_SWAP((s)->uid, d, 16, 8);\ -+ SQUASHFS_SWAP((s)->guid, d, 24, 8);\ -+ SQUASHFS_SWAP((s)->mtime, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->inode_number, d, 64, 32); -+ -+#define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, n) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\ -+} -+ -+#define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_ipc_inode_header))\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_dev_inode_header)); \ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->rdev, d, 128, 16);\ -+} -+ -+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_symlink_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->symlink_size, d, 128, 16);\ -+} -+ -+#define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_reg_inode_header));\ -+ SQUASHFS_SWAP((s)->start_block, d, 96, 64);\ -+ SQUASHFS_SWAP((s)->fragment, d, 160, 32);\ -+ SQUASHFS_SWAP((s)->offset, d, 192, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 224, 32);\ -+} -+ -+#define SQUASHFS_SWAP_LREG_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_lreg_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 128, 64);\ -+ SQUASHFS_SWAP((s)->fragment, d, 192, 32);\ -+ SQUASHFS_SWAP((s)->offset, d, 224, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 256, 64);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_dir_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 128, 19);\ -+ SQUASHFS_SWAP((s)->offset, d, 147, 13);\ -+ SQUASHFS_SWAP((s)->start_block, d, 160, 32);\ -+ SQUASHFS_SWAP((s)->parent_inode, d, 192, 32);\ -+} -+ -+#define SQUASHFS_SWAP_LDIR_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_ldir_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 128, 27);\ -+ SQUASHFS_SWAP((s)->offset, d, 155, 13);\ -+ SQUASHFS_SWAP((s)->start_block, d, 168, 32);\ -+ SQUASHFS_SWAP((s)->i_count, d, 200, 16);\ -+ SQUASHFS_SWAP((s)->parent_inode, d, 216, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INDEX(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index));\ -+ SQUASHFS_SWAP((s)->index, d, 0, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->size, d, 64, 8);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header));\ -+ SQUASHFS_SWAP((s)->count, d, 0, 8);\ -+ SQUASHFS_SWAP((s)->start_block, d, 8, 32);\ -+ SQUASHFS_SWAP((s)->inode_number, d, 40, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_ENTRY(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry));\ -+ SQUASHFS_SWAP((s)->offset, d, 0, 13);\ -+ SQUASHFS_SWAP((s)->type, d, 13, 3);\ -+ SQUASHFS_SWAP((s)->size, d, 16, 8);\ -+ SQUASHFS_SWAP((s)->inode_number, d, 24, 16);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_ENTRY(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry));\ -+ SQUASHFS_SWAP((s)->start_block, d, 0, 64);\ -+ SQUASHFS_SWAP((s)->size, d, 64, 32);\ -+} -+ -+#define SQUASHFS_SWAP_INODE_T(s, d) SQUASHFS_SWAP_LONG_LONGS(s, d, 1) -+ -+#define SQUASHFS_SWAP_SHORTS(s, d, n) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * 2);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ 16)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, 16);\ -+} -+ -+#define SQUASHFS_SWAP_INTS(s, d, n) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * 4);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ 32)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, 32);\ -+} -+ -+#define SQUASHFS_SWAP_LONG_LONGS(s, d, n) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * 8);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ 64)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, 64);\ -+} -+ -+#define SQUASHFS_SWAP_DATA(s, d, n, bits) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * bits / 8);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ bits)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, bits);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_INDEXES(s, d, n) SQUASHFS_SWAP_LONG_LONGS(s, d, n) -+#define SQUASHFS_SWAP_LOOKUP_BLOCKS(s, d, n) SQUASHFS_SWAP_LONG_LONGS(s, d, n) -+ -+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+ -+struct squashfs_base_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+} __attribute__ ((packed)); -+ -+struct squashfs_ipc_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned int type:4; -+ unsigned int offset:4; -+} __attribute__ ((packed)); -+ -+struct squashfs_dev_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned short rdev; -+} __attribute__ ((packed)); -+ -+struct squashfs_symlink_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned short symlink_size; -+ char symlink[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_reg_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned int mtime; -+ unsigned int start_block; -+ unsigned int file_size:32; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned int file_size:19; -+ unsigned int offset:13; -+ unsigned int mtime; -+ unsigned int start_block:24; -+} __attribute__ ((packed)); -+ -+union squashfs_inode_header_1 { -+ struct squashfs_base_inode_header_1 base; -+ struct squashfs_dev_inode_header_1 dev; -+ struct squashfs_symlink_inode_header_1 symlink; -+ struct squashfs_reg_inode_header_1 reg; -+ struct squashfs_dir_inode_header_1 dir; -+ struct squashfs_ipc_inode_header_1 ipc; -+}; -+ -+#define SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n) \ -+ SQUASHFS_MEMSET(s, d, n);\ -+ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ -+ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ -+ SQUASHFS_SWAP((s)->uid, d, 16, 4);\ -+ SQUASHFS_SWAP((s)->guid, d, 20, 4); -+ -+#define SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, n) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n)\ -+} -+ -+#define SQUASHFS_SWAP_IPC_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_ipc_inode_header_1));\ -+ SQUASHFS_SWAP((s)->type, d, 24, 4);\ -+ SQUASHFS_SWAP((s)->offset, d, 28, 4);\ -+} -+ -+#define SQUASHFS_SWAP_DEV_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_dev_inode_header_1));\ -+ SQUASHFS_SWAP((s)->rdev, d, 24, 16);\ -+} -+ -+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_symlink_inode_header_1));\ -+ SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\ -+} -+ -+#define SQUASHFS_SWAP_REG_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_reg_inode_header_1));\ -+ SQUASHFS_SWAP((s)->mtime, d, 24, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 56, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 88, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_dir_inode_header_1));\ -+ SQUASHFS_SWAP((s)->file_size, d, 24, 19);\ -+ SQUASHFS_SWAP((s)->offset, d, 43, 13);\ -+ SQUASHFS_SWAP((s)->mtime, d, 56, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 88, 24);\ -+} -+ -+#endif -+ -+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+ -+struct squashfs_dir_index_2 { -+ unsigned int index:27; -+ unsigned int start_block:29; -+ unsigned char size; -+ unsigned char name[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_base_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+} __attribute__ ((packed)); -+ -+struct squashfs_ipc_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+} __attribute__ ((packed)); -+ -+struct squashfs_dev_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned short rdev; -+} __attribute__ ((packed)); -+ -+struct squashfs_symlink_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned short symlink_size; -+ char symlink[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_reg_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned int mtime; -+ unsigned int start_block; -+ unsigned int fragment; -+ unsigned int offset; -+ unsigned int file_size:32; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned int file_size:19; -+ unsigned int offset:13; -+ unsigned int mtime; -+ unsigned int start_block:24; -+} __attribute__ ((packed)); -+ -+struct squashfs_ldir_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned int file_size:27; -+ unsigned int offset:13; -+ unsigned int mtime; -+ unsigned int start_block:24; -+ unsigned int i_count:16; -+ struct squashfs_dir_index_2 index[0]; -+} __attribute__ ((packed)); -+ -+union squashfs_inode_header_2 { -+ struct squashfs_base_inode_header_2 base; -+ struct squashfs_dev_inode_header_2 dev; -+ struct squashfs_symlink_inode_header_2 symlink; -+ struct squashfs_reg_inode_header_2 reg; -+ struct squashfs_dir_inode_header_2 dir; -+ struct squashfs_ldir_inode_header_2 ldir; -+ struct squashfs_ipc_inode_header_2 ipc; -+}; -+ -+struct squashfs_dir_header_2 { -+ unsigned int count:8; -+ unsigned int start_block:24; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_entry_2 { -+ unsigned int offset:13; -+ unsigned int type:3; -+ unsigned int size:8; -+ char name[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_fragment_entry_2 { -+ unsigned int start_block; -+ unsigned int size; -+} __attribute__ ((packed)); -+ -+#define SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\ -+ SQUASHFS_MEMSET(s, d, n);\ -+ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ -+ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ -+ SQUASHFS_SWAP((s)->uid, d, 16, 8);\ -+ SQUASHFS_SWAP((s)->guid, d, 24, 8);\ -+ -+#define SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, n) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\ -+} -+ -+#define SQUASHFS_SWAP_IPC_INODE_HEADER_2(s, d) \ -+ SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, sizeof(struct squashfs_ipc_inode_header_2)) -+ -+#define SQUASHFS_SWAP_DEV_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_dev_inode_header_2)); \ -+ SQUASHFS_SWAP((s)->rdev, d, 32, 16);\ -+} -+ -+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_symlink_inode_header_2));\ -+ SQUASHFS_SWAP((s)->symlink_size, d, 32, 16);\ -+} -+ -+#define SQUASHFS_SWAP_REG_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_reg_inode_header_2));\ -+ SQUASHFS_SWAP((s)->mtime, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 64, 32);\ -+ SQUASHFS_SWAP((s)->fragment, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->offset, d, 128, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 160, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_dir_inode_header_2));\ -+ SQUASHFS_SWAP((s)->file_size, d, 32, 19);\ -+ SQUASHFS_SWAP((s)->offset, d, 51, 13);\ -+ SQUASHFS_SWAP((s)->mtime, d, 64, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 96, 24);\ -+} -+ -+#define SQUASHFS_SWAP_LDIR_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_ldir_inode_header_2));\ -+ SQUASHFS_SWAP((s)->file_size, d, 32, 27);\ -+ SQUASHFS_SWAP((s)->offset, d, 59, 13);\ -+ SQUASHFS_SWAP((s)->mtime, d, 72, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 104, 24);\ -+ SQUASHFS_SWAP((s)->i_count, d, 128, 16);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INDEX_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index_2));\ -+ SQUASHFS_SWAP((s)->index, d, 0, 27);\ -+ SQUASHFS_SWAP((s)->start_block, d, 27, 29);\ -+ SQUASHFS_SWAP((s)->size, d, 56, 8);\ -+} -+#define SQUASHFS_SWAP_DIR_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header_2));\ -+ SQUASHFS_SWAP((s)->count, d, 0, 8);\ -+ SQUASHFS_SWAP((s)->start_block, d, 8, 24);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_ENTRY_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry_2));\ -+ SQUASHFS_SWAP((s)->offset, d, 0, 13);\ -+ SQUASHFS_SWAP((s)->type, d, 13, 3);\ -+ SQUASHFS_SWAP((s)->size, d, 16, 8);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_ENTRY_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry_2));\ -+ SQUASHFS_SWAP((s)->start_block, d, 0, 32);\ -+ SQUASHFS_SWAP((s)->size, d, 32, 32);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_INDEXES_2(s, d, n) SQUASHFS_SWAP_INTS(s, d, n) -+ -+/* fragment and fragment table defines */ -+#define SQUASHFS_FRAGMENT_BYTES_2(A) (A * sizeof(struct squashfs_fragment_entry_2)) -+ -+#define SQUASHFS_FRAGMENT_INDEX_2(A) (SQUASHFS_FRAGMENT_BYTES_2(A) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_OFFSET_2(A) (SQUASHFS_FRAGMENT_BYTES_2(A) % \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEXES_2(A) ((SQUASHFS_FRAGMENT_BYTES_2(A) + \ -+ SQUASHFS_METADATA_SIZE - 1) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_BYTES_2(A) (SQUASHFS_FRAGMENT_INDEXES_2(A) *\ -+ sizeof(int)) -+ -+#endif -+ -+#ifdef __KERNEL__ -+ -+/* -+ * macros used to swap each structure entry, taking into account -+ * bitfields and different bitfield placing conventions on differing -+ * architectures -+ */ -+ -+#include -+ -+#ifdef __BIG_ENDIAN -+ /* convert from little endian to big endian */ -+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \ -+ tbits, b_pos) -+#else -+ /* convert from big endian to little endian */ -+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \ -+ tbits, 64 - tbits - b_pos) -+#endif -+ -+#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\ -+ b_pos = pos % 8;\ -+ val = 0;\ -+ s = (unsigned char *)p + (pos / 8);\ -+ d = ((unsigned char *) &val) + 7;\ -+ for(bits = 0; bits < (tbits + b_pos); bits += 8) \ -+ *d-- = *s++;\ -+ value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\ -+} -+ -+#define SQUASHFS_MEMSET(s, d, n) memset(s, 0, n); -+ -+#endif -+#endif -diff -x .gitignore -Nurp linux-2.6.23/include/linux/squashfs_fs_i.h linux-2.6.23-squashfs3.3/include/linux/squashfs_fs_i.h ---- linux-2.6.23/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/include/linux/squashfs_fs_i.h 2007-08-19 04:24:08.000000000 +0100 -@@ -0,0 +1,45 @@ -+#ifndef SQUASHFS_FS_I -+#define SQUASHFS_FS_I -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs_fs_i.h -+ */ -+ -+struct squashfs_inode_info { -+ long long start_block; -+ unsigned int offset; -+ union { -+ struct { -+ long long fragment_start_block; -+ unsigned int fragment_size; -+ unsigned int fragment_offset; -+ long long block_list_start; -+ } s1; -+ struct { -+ long long directory_index_start; -+ unsigned int directory_index_offset; -+ unsigned int directory_index_count; -+ unsigned int parent_inode; -+ } s2; -+ } u; -+ struct inode vfs_inode; -+}; -+#endif -diff -x .gitignore -Nurp linux-2.6.23/include/linux/squashfs_fs_sb.h linux-2.6.23-squashfs3.3/include/linux/squashfs_fs_sb.h ---- linux-2.6.23/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/include/linux/squashfs_fs_sb.h 2007-08-19 04:24:26.000000000 +0100 -@@ -0,0 +1,76 @@ -+#ifndef SQUASHFS_FS_SB -+#define SQUASHFS_FS_SB -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs_fs_sb.h -+ */ -+ -+#include -+ -+struct squashfs_cache { -+ long long block; -+ int length; -+ long long next_index; -+ char *data; -+}; -+ -+struct squashfs_fragment_cache { -+ long long block; -+ int length; -+ unsigned int locked; -+ char *data; -+}; -+ -+struct squashfs_sb_info { -+ struct squashfs_super_block sblk; -+ int devblksize; -+ int devblksize_log2; -+ int swap; -+ struct squashfs_cache *block_cache; -+ struct squashfs_fragment_cache *fragment; -+ int next_cache; -+ int next_fragment; -+ int next_meta_index; -+ unsigned int *uid; -+ unsigned int *guid; -+ long long *fragment_index; -+ unsigned int *fragment_index_2; -+ char *read_page; -+ struct mutex read_data_mutex; -+ struct mutex read_page_mutex; -+ struct mutex block_cache_mutex; -+ struct mutex fragment_mutex; -+ struct mutex meta_index_mutex; -+ wait_queue_head_t waitq; -+ wait_queue_head_t fragment_wait_queue; -+ struct meta_index *meta_index; -+ z_stream stream; -+ long long *inode_lookup_table; -+ int unused_cache_blks; -+ int unused_frag_blks; -+ int (*read_inode)(struct inode *i, squashfs_inode_t \ -+ inode); -+ long long (*read_blocklist)(struct inode *inode, int \ -+ index, int readahead_blks, char *block_list, \ -+ unsigned short **block_p, unsigned int *bsize); -+ int (*read_fragment_index_table)(struct super_block *s); -+}; -+#endif -diff -x .gitignore -Nurp linux-2.6.23/init/do_mounts_rd.c linux-2.6.23-squashfs3.3/init/do_mounts_rd.c ---- linux-2.6.23/init/do_mounts_rd.c 2007-10-09 21:31:38.000000000 +0100 -+++ linux-2.6.23-squashfs3.3/init/do_mounts_rd.c 2007-11-01 05:06:25.000000000 +0000 -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in - * numbers could not be found. - * - * We currently check for the following magic numbers: -+ * squashfs - * minix - * ext2 - * romfs -@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start - struct ext2_super_block *ext2sb; - struct romfs_super_block *romfsb; - struct cramfs_super *cramfsb; -+ struct squashfs_super_block *squashfsb; - int nblocks = -1; - unsigned char *buf; - -@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start - ext2sb = (struct ext2_super_block *) buf; - romfsb = (struct romfs_super_block *) buf; - cramfsb = (struct cramfs_super *) buf; -+ squashfsb = (struct squashfs_super_block *) buf; - memset(buf, 0xe5, size); - - /* -@@ -101,6 +105,18 @@ identify_ramdisk_image(int fd, int start - goto done; - } - -+ /* squashfs is at block zero too */ -+ if (squashfsb->s_magic == SQUASHFS_MAGIC) { -+ printk(KERN_NOTICE -+ "RAMDISK: squashfs filesystem found at block %d\n", -+ start_block); -+ if (squashfsb->s_major < 3) -+ nblocks = (squashfsb->bytes_used_2+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+ else -+ nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+ goto done; -+ } -+ - /* - * Read block 1 to test for minix and ext2 superblock - */ From janny at frugalware.org Thu Mar 6 19:19:49 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:19:50 2008 Subject: [Frugalware-git] fwlive_pkgs: grub-theme-fwlive-0.2.9-1-i686 Message-ID: <20080306181949.564E6119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=0777e551510d58c2a195a3dcc7d7435d77414de6 commit 0777e551510d58c2a195a3dcc7d7435d77414de6 Author: Janos Kovacs Date: Thu Mar 6 19:19:20 2008 +0100 grub-theme-fwlive-0.2.9-1-i686 * version bump diff --git a/source/base-extra/grub-theme-fwlive/FrugalBuild b/source/base-extra/grub-theme-fwlive/FrugalBuild index 3252678..6ed644e 100644 --- a/source/base-extra/grub-theme-fwlive/FrugalBuild +++ b/source/base-extra/grub-theme-fwlive/FrugalBuild @@ -3,7 +3,7 @@ pkgname=grub-theme-fwlive _F_archive_name=fwlive-grub-theme -pkgver=0.2.8.1 +pkgver=0.2.9 pkgrel=1 pkgdesc="FwLive theme for GRUB gfxboot." url="http://frugalware.org/~janny/source_pkgs" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=($url/$_F_archive_name-$pkgver.tar.gz) options=('nodocs') -sha1sums=('4100ad807fe01b0abf010bafa28a333363ba5415') +sha1sums=('6a83211ca8fdf30e7b0224c8b3cf2f173959ca0f') build() { From janny at frugalware.org Thu Mar 6 19:26:20 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:26:21 2008 Subject: [Frugalware-git] fwlive_pkgs: acerhk-fwlive-0.5.35-9-i686 Message-ID: <20080306182620.5A98A119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=98f4fafac411e01bfebb1156f0fa8d28029e10db commit 98f4fafac411e01bfebb1156f0fa8d28029e10db Author: Janos Kovacs Date: Thu Mar 6 19:26:00 2008 +0100 acerhk-fwlive-0.5.35-9-i686 * version bump diff --git a/source/apps-extra/acerhk-fwlive/FrugalBuild b/source/apps-extra/acerhk-fwlive/FrugalBuild index 8c44dee..3a495d9 100644 --- a/source/apps-extra/acerhk-fwlive/FrugalBuild +++ b/source/apps-extra/acerhk-fwlive/FrugalBuild @@ -3,12 +3,12 @@ # Maintainer: VMiklos pkgname=acerhk-fwlive +_F_archive_name=acerhk pkgver=0.5.35 -pkgrel=6 +pkgrel=9 pkgdesc="Acer Hotkey driver for Linux" -url="http://www.cakey.de/acerhk" -Finclude kernel-module -kver=2.6.23-6 +url="http://www.cakey.de/acerhk/" +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") groups=('apps-extra') @@ -16,13 +16,12 @@ archs=('i686' '!x86_64') up2date="lynx -dump $url |grep tgz$|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/archives/acerhk-$pkgver.tgz) sha1sums=('cf977b2bee3487a401b9c92f04fe8b2ac77f2db2') +Finclude kernel-module -build() -{ - Fcd acerhk-$pkgver/ +build() { Fpatchall # no Fcheckkernel, crosscompilation verified - Fcd + Fsed 'CFLAGS' 'EXTRA_CFLAGS' Makefile sed -i '/config.h/d' acerhk.c KERNELSRC=/usr/src/linux Fmake Ffilerel $_F_kernelmod_dir/kernel/drivers/char/acerhk.ko From janny at frugalware.org Thu Mar 6 19:27:22 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:27:23 2008 Subject: [Frugalware-git] fwlive_pkgs: aufs-20070228-1-i686 Message-ID: <20080306182722.6D9EC119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=9cafb807b5c68d9b4f212cff7fdb1d4ef3194274 commit 9cafb807b5c68d9b4f212cff7fdb1d4ef3194274 Author: Janos Kovacs Date: Thu Mar 6 19:27:00 2008 +0100 aufs-20070228-1-i686 * version bump diff --git a/source/apps-extra/aufs/FrugalBuild b/source/apps-extra/aufs/FrugalBuild index 4030148..2d6e982 100644 --- a/source/apps-extra/aufs/FrugalBuild +++ b/source/apps-extra/aufs/FrugalBuild @@ -2,28 +2,32 @@ # Maintainer: Janny pkgname=aufs -pkgver=cvs20080119 -kver=2.6.23-6 -pkgrel=2 +pkgver=20070228 +kver=2.6.24-3 +pkgrel=1 pkgdesc="Aufs -- Another Unionfs" depends=('zlib' "kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") groups=('apps-extra') archs=('i686' 'x86_64') -#_F_kernel_name="-fwlive" Finclude sourceforge up2date=$pkgver -source=(http://ftp.frugalware.org/pub/other/sources/aufs/$pkgname-$pkgver.tar.bz2) +#source=(http://ftp.frugalware.org/pub/other/sources/aufs/$pkgname-$pkgver.tar.bz2) +source=(http://frugalware.org/~janny/source_pkgs/aufs.tar.gz) options=('force' 'scriptlet') -sha1sums=('4837b23b350ae5a9e7573824e1fb5bbd46d9892a') +sha1sums=('8193a36eb28ab559ecda408456e585aad2a207ad') build() { - Fcd - cat local.mk | grep -v "^CONFIG_AUFS_DEBUG =" \ - | grep -v "^CONFIG_AUFS_COMPAT =" \ - | sed "s/#CONFIG_AUFS_KSIZE_PATCH/CONFIG_AUFS_KSIZE_PATCH/" \ - | sed "s/#CONFIG_AUFS_LHASH_PATCH/CONFIG_AUFS_LHASH_PATCH/" >Makefile + Fcd $pkgname + cat local.mk \ + | grep -v "^CONFIG_AUFS_DEBUG =" \ + | grep -v "^CONFIG_AUFS_BRANCH_MAX_127 =" \ + | sed -r "s/KDIR = .*/KDIR = \/usr\/src\/linux-${kver/-/-fw}\//" \ + | sed "s/CONFIG_AUFS_BRANCH_MAX_1023 =.*/CONFIG_AUFS_BRANCH_MAX_1023 = y/" \ + | sed "s/CONFIG_AUFS_SPLICE_PATCH =.*/CONFIG_AUFS_SPLICE_PATCH = y/" \ + | sed "s/CONFIG_AUFS_SEC_PERM_PATCH =.*/CONFIG_AUFS_SEC_PERM_PATCH = y/" \ + | sed "s/CONFIG_AUFS_WORKAROUND_FUSE =.*/CONFIG_AUFS_WORKAROUND_FUSE = y/" >Makefile make KDIR=/usr/src/linux Ffilerel /lib/modules/${kver/-/-fw}/kernel/fs/aufs/aufs.ko } From janny at frugalware.org Thu Mar 6 19:30:00 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:30:02 2008 Subject: [Frugalware-git] fwlive_pkgs: dazuko-fwlive-2.3.4-10-i686 Message-ID: <20080306183000.B8467119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=b5517f98e034ed093599912e74b266bbe1e2af5b commit b5517f98e034ed093599912e74b266bbe1e2af5b Author: Janos Kovacs Date: Thu Mar 6 19:29:39 2008 +0100 dazuko-fwlive-2.3.4-10-i686 * version bump diff --git a/source/apps-extra/dazuko-fwlive/0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch b/source/apps-extra/dazuko-fwlive/0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch new file mode 100644 index 0000000..3408b10 --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch @@ -0,0 +1,196 @@ +From 8c31801270d4085bdf0704d572a0c3fbe8cf6a8f Mon Sep 17 00:00:00 2001 +From: ogman +Date: Wed, 12 Dec 2007 16:08:39 +0000 +Subject: [PATCH] add xp_set_path() function (necessary for RedirFS support) + +--- + dazuko_call.h | 14 ++++++++++++++ + dazuko_core.c | 10 ++++++++++ + dazuko_core.h | 3 +++ + dazuko_dummyos.c | 8 ++++++++ + dazuko_freebsd.c | 8 ++++++++ + dazuko_freebsd5.c | 8 ++++++++ + dazuko_linux.c | 8 ++++++++ + dazuko_linux26.c | 8 ++++++++ + dazuko_rsbac.c | 8 ++++++++ + 9 files changed, 75 insertions(+), 0 deletions(-) + +diff --git a/dazuko_call.h b/dazuko_call.h +index ad0e8e8..68bd929 100644 +--- a/dazuko_call.h ++++ b/dazuko_call.h +@@ -484,4 +484,18 @@ static int call_xp_init_cache(unsigned long ttl) + return xp_init_cache(ttl); + } + ++ ++/* include/exclude paths */ ++ ++static int call_xp_set_path(const char *path, int type) ++{ ++ if (path == NULL) ++ { ++ xp_print("dazuko: warning: call_xp_set_path(path=NULL)\n"); ++ return -1; ++ } ++ ++ return xp_set_path(path, type); ++} ++ + #endif +diff --git a/dazuko_core.c b/dazuko_core.c +index 7585166..fa8ca8f 100644 +--- a/dazuko_core.c ++++ b/dazuko_core.c +@@ -1607,10 +1607,20 @@ static int dazuko_set_option(struct daemon_id *did, int opt, void *param, int le + + case ADD_INCLUDE_PATH: + error = dazuko_insert_path_fs(&(sl->incl_paths), &(sl->lock_lists), (char *)param, len); ++ if (!error) ++ { ++ if (call_xp_set_path((char *)param, ADD_INCLUDE_PATH) != 0) ++ error = XP_ERROR_INVALID; ++ } + break; + + case ADD_EXCLUDE_PATH: + error = dazuko_insert_path_fs(&(sl->excl_paths), &(sl->lock_lists), (char *)param, len); ++ if (!error) ++ { ++ if (call_xp_set_path((char *)param, ADD_EXCLUDE_PATH) != 0) ++ error = XP_ERROR_INVALID; ++ } + break; + + case REMOVE_ALL_PATHS: +diff --git a/dazuko_core.h b/dazuko_core.h +index 935ca63..e64bf3e 100644 +--- a/dazuko_core.h ++++ b/dazuko_core.h +@@ -178,6 +178,9 @@ int xp_set_event_properties(struct event_properties *event_p, struct xp_daemon_i + /* cache settings */ + int xp_init_cache(unsigned long ttl); + ++/* include/exclude paths */ ++int xp_set_path(const char *path, int type); ++ + /* output */ + int xp_print(const char *fmt, ...); + +diff --git a/dazuko_dummyos.c b/dazuko_dummyos.c +index d092581..6bdcf70 100644 +--- a/dazuko_dummyos.c ++++ b/dazuko_dummyos.c +@@ -350,6 +350,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + static void dummy_dazuko_setid(const char *id) +diff --git a/dazuko_freebsd.c b/dazuko_freebsd.c +index f4cb535..c16412c 100644 +--- a/dazuko_freebsd.c ++++ b/dazuko_freebsd.c +@@ -825,6 +825,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + static inline int check_fd(struct proc *p, int fd) +diff --git a/dazuko_freebsd5.c b/dazuko_freebsd5.c +index ff0994f..d26f030 100644 +--- a/dazuko_freebsd5.c ++++ b/dazuko_freebsd5.c +@@ -877,6 +877,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + static inline int check_fd(struct proc *p, int fd) +diff --git a/dazuko_linux.c b/dazuko_linux.c +index f8bd860..d83bded 100644 +--- a/dazuko_linux.c ++++ b/dazuko_linux.c +@@ -1429,6 +1429,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system calls */ + + #if defined(ON_OPEN_SUPPORT) +diff --git a/dazuko_linux26.c b/dazuko_linux26.c +index cdf0d43..a1676be 100644 +--- a/dazuko_linux26.c ++++ b/dazuko_linux26.c +@@ -579,6 +579,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system hooks */ + + #ifndef DAZUKO_FIST +diff --git a/dazuko_rsbac.c b/dazuko_rsbac.c +index 9fa701b..6023bae 100644 +--- a/dazuko_rsbac.c ++++ b/dazuko_rsbac.c +@@ -518,6 +518,14 @@ int xp_init_cache(unsigned long ttl) + } + + ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ return 0; ++} ++ ++ + /* system hook */ + + inline int xp_sys_hook() +-- +1.5.4.rc4.25.g81cc-dirty + diff --git a/source/apps-extra/dazuko-fwlive/0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch b/source/apps-extra/dazuko-fwlive/0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch new file mode 100644 index 0000000..742965d --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch @@ -0,0 +1,1008 @@ +From 26176cf910f1c66979c74a5ca24e95efebc05310 Mon Sep 17 00:00:00 2001 +From: ogman +Date: Wed, 12 Dec 2007 16:14:20 +0000 +Subject: [PATCH] source code to compile Dazuko as an RedirFS filter + +--- + dazuko_redirfs.c | 989 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 989 insertions(+), 0 deletions(-) + create mode 100644 dazuko_redirfs.c + +diff --git a/dazuko_redirfs.c b/dazuko_redirfs.c +new file mode 100644 +index 0000000..885242a +--- /dev/null ++++ b/dazuko_redirfs.c +@@ -0,0 +1,989 @@ ++/* Dazuko RedirFS. Allow Linux 2.6 file access control for 3rd-party applications. ++ Written by John Ogness ++ ++ Copyright (c) 2007 Avira GmbH ++ All rights reserved. ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License ++ as published by the Free Software Foundation; either version 2 ++ of the License, or (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++*/ ++ ++#include "dazuko_linux26.h" ++#include "dazuko_core.h" ++#include "dazuko_linux26_device_def.h" ++ ++#ifdef USE_CONFIG_H ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../redirfs/redirfs.h" ++#ifdef DEVFS_SUPPORT ++#include ++#endif ++#include ++#if !defined(USE_TRYTOFREEZEVOID) ++#include ++#endif ++#ifdef LINUX_USE_FREEZER_H ++#include ++#endif ++#include ++ ++ ++#ifndef DAZUKO_DM ++#define DAZUKO_DM 0 ++#endif ++ ++ ++ssize_t linux_dazuko_device_read(struct file *, char __user *, size_t, loff_t *); ++ssize_t linux_dazuko_device_write(struct file *, const char __user *, size_t, loff_t *); ++int linux_dazuko_device_open(struct inode *, struct file *); ++int linux_dazuko_device_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long param); ++int linux_dazuko_device_release(struct inode *, struct file *); ++ ++#ifndef WITHOUT_UDEV ++#ifdef USE_CLASS ++static struct class *dazuko_class = NULL; ++#else ++static struct class_simple *dazuko_class = NULL; ++#endif ++#endif ++ ++static int dev_major = -1; ++ ++int dazukoflt_ctl(struct rfs_ctl *ctl); ++enum rfs_retv dazukoflt_permission(rfs_context context, struct rfs_args *args); ++static rfs_filter dazukoflt; ++static struct rfs_filter_info flt_info = {"dazukoflt", 1000, 1, dazukoflt_ctl}; ++static struct rfs_op_info op_info[] = { ++ { RFS_REG_IOP_PERMISSION, dazukoflt_permission, NULL }, ++ { RFS_OP_END, NULL, NULL } ++}; ++ ++static struct file_operations fops = { ++ .owner = THIS_MODULE, ++ .read = linux_dazuko_device_read, ++ .write = linux_dazuko_device_write, ++ .ioctl = linux_dazuko_device_ioctl, ++ .open = linux_dazuko_device_open, ++ .release = linux_dazuko_device_release, ++ }; ++ ++ ++/* mutex */ ++ ++inline void xp_init_mutex(struct xp_mutex *mutex) ++{ ++ init_MUTEX(&(mutex->mutex)); ++} ++ ++inline void xp_down(struct xp_mutex *mutex) ++{ ++ down(&(mutex->mutex)); ++} ++ ++inline void xp_up(struct xp_mutex *mutex) ++{ ++ up(&(mutex->mutex)); ++} ++ ++inline void xp_destroy_mutex(struct xp_mutex *mutex) ++{ ++} ++ ++ ++/* read-write lock */ ++ ++inline void xp_init_rwlock(struct xp_rwlock *rwlock) ++{ ++ rwlock_init(&(rwlock->rwlock)); ++} ++ ++inline void xp_write_lock(struct xp_rwlock *rwlock) ++{ ++ write_lock(&(rwlock->rwlock)); ++} ++ ++inline void xp_write_unlock(struct xp_rwlock *rwlock) ++{ ++ write_unlock(&(rwlock->rwlock)); ++} ++ ++inline void xp_read_lock(struct xp_rwlock *rlock) ++{ ++ read_lock(&(rlock->rwlock)); ++} ++ ++inline void xp_read_unlock(struct xp_rwlock *rlock) ++{ ++ read_unlock(&(rlock->rwlock)); ++} ++ ++inline void xp_destroy_rwlock(struct xp_rwlock *rwlock) ++{ ++} ++ ++ ++/* wait-notify queue */ ++ ++inline int xp_init_queue(struct xp_queue *queue) ++{ ++ init_waitqueue_head(&(queue->queue)); ++ return 0; ++} ++ ++inline int xp_wait_until_condition(struct xp_queue *queue, int (*cfunction)(void *), void *cparam, int allow_interrupt) ++{ ++ /* wait until cfunction(cparam) != 0 (condition is true) */ ++ int ret = 0; ++ ++ if (allow_interrupt) ++ { ++ while (1) ++ { ++ ret = wait_event_interruptible(queue->queue, cfunction(cparam) != 0); ++ ++#if defined (USE_TRYTOFREEZEVOID) ++ if (try_to_freeze() == 0) ++ break; ++#else ++ if (current->flags & PF_FREEZE) ++ { ++ refrigerator(PF_FREEZE); ++ } ++ else ++ { ++ break; ++ } ++#endif ++ } ++ } ++ else ++ { ++ wait_event(queue->queue, cfunction(cparam) != 0); ++ } ++ ++ return ret; ++} ++ ++inline int xp_notify(struct xp_queue *queue) ++{ ++ wake_up(&(queue->queue)); ++ return 0; ++} ++ ++inline int xp_destroy_queue(struct xp_queue *queue) ++{ ++ return 0; ++} ++ ++ ++/* memory */ ++ ++inline void* xp_malloc(size_t size) ++{ ++ return kmalloc(size, GFP_ATOMIC); ++} ++ ++inline int xp_free(void *ptr) ++{ ++ kfree(ptr); ++ return 0; ++} ++ ++inline int xp_copyin(const void *user_src, void *kernel_dest, size_t size) ++{ ++ return copy_from_user(kernel_dest, user_src, size); ++} ++ ++inline int xp_copyout(const void *kernel_src, void *user_dest, size_t size) ++{ ++ return copy_to_user(user_dest, kernel_src, size); ++} ++ ++inline int xp_verify_user_writable(const void *user_ptr, size_t size) ++{ ++ return 0; ++} ++ ++inline int xp_verify_user_readable(const void *user_ptr, size_t size) ++{ ++ return 0; ++} ++ ++ ++/* path attribute */ ++ ++inline int xp_is_absolute_path(const char *path) ++{ ++ if (path[0] == '/') ++ return 1; ++ ++ return 0; ++} ++ ++ ++/* atomic */ ++ ++inline int xp_atomic_set(struct xp_atomic *atomic, int value) ++{ ++ atomic_set(&(atomic->atomic), value); ++ return 0; ++} ++ ++inline int xp_atomic_inc(struct xp_atomic *atomic) ++{ ++ atomic_inc(&(atomic->atomic)); ++ return 0; ++} ++ ++inline int xp_atomic_dec(struct xp_atomic *atomic) ++{ ++ atomic_dec(&(atomic->atomic)); ++ return 0; ++} ++ ++inline int xp_atomic_read(struct xp_atomic *atomic) ++{ ++ return atomic_read(&(atomic->atomic)); ++} ++ ++ ++/* file structure */ ++ ++static int dazuko_get_full_filename(struct xp_file_struct *xfs) ++{ ++ char *temp; ++ ++ if (xfs == NULL) ++ return 0; ++ ++ if (xfs->inode == NULL) ++ return 0; ++ ++ if (S_ISDIR(xfs->inode->i_mode)) ++ return 0; ++ ++ if (xfs->nd == NULL || xfs->free_full_filename) ++ return 0; ++ ++ if (xfs->nd->mnt == NULL || xfs->nd->dentry == NULL) ++ return 0; ++ ++ /* check if we need to allocate a buffer */ ++ if (!xfs->free_page_buffer) ++ { ++ /* get pre-requisites for d_path function */ ++ xfs->buffer = (char *)__get_free_page(GFP_USER); ++ ++ /* make sure we got a page */ ++ if (xfs->buffer == NULL) ++ return 0; ++ ++ /* the buffer will need to be freed */ ++ xfs->free_page_buffer = 1; ++ } ++ ++ /* make sure we don't already have a vfsmount */ ++ if (!xfs->mntput_vfsmount) ++ { ++ xfs->vfsmount = mntget(xfs->nd->mnt); ++ ++ /* the vfsmount will need to be put back */ ++ xfs->mntput_vfsmount = 1; ++ } ++ ++ /* make sure we don't already have a dentry */ ++ if (!xfs->dput_dentry) ++ { ++ xfs->dentry = dget(xfs->nd->dentry); ++ ++ /* the dentry will need to be put back */ ++ xfs->dput_dentry = 1; ++ } ++ ++ temp = d_path(xfs->dentry, xfs->vfsmount, xfs->buffer, PAGE_SIZE); ++ ++ /* make sure we really got a new filename */ ++ if (temp == NULL) ++ return 0; ++ ++ xfs->full_filename_length = dazuko_strlen(temp); ++ ++ xfs->full_filename = (char *)xp_malloc(xfs->full_filename_length + 1); ++ if (xfs->full_filename == NULL) ++ return 0; ++ ++ /* the char array will need to be freed */ ++ xfs->free_full_filename = 1; ++ ++ memcpy(xfs->full_filename, temp, xfs->full_filename_length + 1); ++ ++ /* we have a filename with the full path */ ++ ++ return 1; ++} ++ ++static int dazuko_fill_file_struct_cleanup(struct dazuko_file_struct *dfs) ++{ ++ if (dfs == NULL) ++ return 0; ++ ++ if (dfs->extra_data == NULL) ++ return 0; ++ ++ if (dfs->extra_data->free_page_buffer) ++ { ++ free_page((unsigned long)dfs->extra_data->buffer); ++ dfs->extra_data->free_page_buffer = 0; ++ } ++ ++ if (dfs->extra_data->dput_dentry) ++ { ++ dput(dfs->extra_data->dentry); ++ dfs->extra_data->dput_dentry = 0; ++ } ++ ++ if (dfs->extra_data->mntput_vfsmount) ++ { ++ mntput(dfs->extra_data->vfsmount); ++ dfs->extra_data->mntput_vfsmount = 0; ++ } ++ ++ return 0; ++} ++ ++int xp_fill_file_struct(struct dazuko_file_struct *dfs) ++{ ++ int error = -1; ++ ++ if (dfs == NULL) ++ return error; ++ ++ /* check if filename has already been filled in */ ++ if (dfs->filename != NULL) ++ return 0; ++ ++ /* make sure we can get the full path */ ++ if (dazuko_get_full_filename(dfs->extra_data)) ++ { ++ /* reference copy of full path */ ++ dfs->filename = dfs->extra_data->full_filename; ++ ++ dfs->filename_length = dfs->extra_data->full_filename_length; ++ ++ dfs->file_p.size = dfs->extra_data->inode->i_size; ++ dfs->file_p.set_size = 1; ++ dfs->file_p.uid = dfs->extra_data->inode->i_uid; ++ dfs->file_p.set_uid = 1; ++ dfs->file_p.gid = dfs->extra_data->inode->i_gid; ++ dfs->file_p.set_gid = 1; ++ dfs->file_p.mode = dfs->extra_data->inode->i_mode; ++ dfs->file_p.set_mode = 1; ++ dfs->file_p.device_type = dfs->extra_data->inode->i_rdev; ++ dfs->file_p.set_device_type = 1; ++ ++ error = 0; ++ } ++ ++ dazuko_fill_file_struct_cleanup(dfs); ++ ++ return error; ++} ++ ++static int dazuko_file_struct_cleanup(struct dazuko_file_struct **dfs) ++{ ++ if (dfs == NULL) ++ return 0; ++ ++ if (*dfs == NULL) ++ return 0; ++ ++ if ((*dfs)->extra_data) ++ { ++ if ((*dfs)->extra_data->free_full_filename) ++ xp_free((*dfs)->extra_data->full_filename); ++ ++ xp_free((*dfs)->extra_data); ++ } ++ ++ xp_free(*dfs); ++ ++ *dfs = NULL; ++ ++ return 0; ++} ++ ++ ++/* daemon id */ ++ ++static inline int check_parent(struct task_struct *parent, struct task_struct *child) ++{ ++ struct task_struct *ts = child; ++ ++ if (parent == NULL || child == NULL) ++ return -1; ++ ++ while (1) ++ { ++ if (ts == parent) ++ return 0; ++ ++ if (ts->parent == NULL) ++ break; ++ ++ if (ts == ts->parent) ++ break; ++ ++ ts = ts->parent; ++ } ++ ++ return -1; ++} ++ ++inline int xp_id_compare(struct xp_daemon_id *id1, struct xp_daemon_id *id2, int check_related) ++{ ++ if (id1 == NULL || id2 == NULL) ++ return DAZUKO_DIFFERENT; ++ ++ /* If file's are available we do a special ++ * check ("file"'s are only used by daemons). ++ * Here we allow threads to look like one ++ * instance, if they pass around the handle. ++ * Note: this is a Linux-only "hack" */ ++ if (id1->file != NULL && id2->file != NULL) ++ { ++ if (id1->tgid == id2->tgid && id1->files == id2->files && id1->file == id2->file) ++ return DAZUKO_SAME; ++ } ++ ++ if (id1->pid == id2->pid && id1->current_p == id2->current_p && id1->files == id2->files) ++ return DAZUKO_SAME; ++ ++ if (check_related) ++ { ++ /* Same thread id and same file descriptors, ++ * looks like they could be the same process... ++ * We will treat two threads of the same process ++ * as the same (for relation checks). This is ++ * useful for the Trusted Application Framework, ++ * if we trust one thread, we can trust them all.*/ ++ if (id1->tgid == id2->tgid && id1->files == id2->files) ++ { ++ /* Two different threads of the same process will have different current pointers, ++ * but if process ids match, current pointers must too. */ ++ ++ if (id1->pid == id2->pid && id1->current_p == id2->current_p) ++ return DAZUKO_SAME; ++ ++ if (id1->pid != id2->pid && id1->current_p != id2->current_p) ++ return DAZUKO_SAME; ++ } ++ ++ if (check_parent(id1->current_p, id2->current_p) == 0) ++ { ++ return DAZUKO_CHILD; ++ } ++ else if (id1->pid == id2->pid || id1->current_p == id2->current_p || id1->files == id2->files) ++ { ++ return DAZUKO_SUSPICIOUS; ++ } ++ else if (id1->tgid == id2->tgid) ++ { ++ return DAZUKO_SUSPICIOUS; ++ } ++ } ++ ++ return DAZUKO_DIFFERENT; ++} ++ ++inline int xp_id_free(struct xp_daemon_id *id) ++{ ++ xp_free(id); ++ ++ return 0; ++} ++ ++inline struct xp_daemon_id* xp_id_copy(struct xp_daemon_id *id) ++{ ++ struct xp_daemon_id *ptr; ++ ++ if (id == NULL) ++ return NULL; ++ ++ ptr = (struct xp_daemon_id *)xp_malloc(sizeof(struct xp_daemon_id)); ++ ++ if (ptr != NULL) ++ { ++ ptr->pid = id->pid; ++ ptr->tgid = id->tgid; ++ ptr->file = id->file; ++ ptr->current_p = id->current_p; ++ ptr->files = id->files; ++ } ++ ++ return ptr; ++} ++ ++ ++/* event */ ++ ++int xp_set_event_properties(struct event_properties *event_p, struct xp_daemon_id *xp_id) ++{ ++ event_p->pid = xp_id->pid; ++ event_p->set_pid = 1; ++ ++ return 0; ++} ++ ++ ++/* cache settings */ ++ ++int xp_init_cache(unsigned long ttl) ++{ ++ return -1; ++} ++ ++ ++/* include/exclude paths */ ++ ++int xp_set_path(const char *path, int type) ++{ ++ int err; ++ struct rfs_path_info path_info; ++ ++ switch (type) ++ { ++ case ADD_INCLUDE_PATH: ++ path_info.flags = RFS_PATH_INCLUDE | RFS_PATH_SUBTREE; ++ break; ++ ++ case ADD_EXCLUDE_PATH: ++ path_info.flags = RFS_PATH_EXCLUDE | RFS_PATH_SUBTREE; ++ break; ++ ++ default: ++ return -1; ++ } ++ ++ path_info.path = dazuko_strdup(path, NULL); ++ err = rfs_set_path(dazukoflt, &path_info); ++ if (err) ++ { ++ xp_print("dazuko: failed to set RedirFS path, err=%d\n", err); ++ rfs_unregister_filter(dazukoflt); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++/* system hooks */ ++ ++int dazuko_sys_generic(struct inode *inode, int mask, struct nameidata *nd) ++{ ++ struct dazuko_file_struct *dfs = NULL; ++ int error = 0; ++ int check_error = 0; ++ struct event_properties event_p; ++ struct xp_daemon_id xp_id; ++ struct slot_list *sl = NULL; ++ int event = DAZUKO_ON_OPEN; ++ int daemon_is_allowed = 1; ++ ++ if (nd == NULL || inode == NULL) ++ return 0; ++ ++ dazuko_bzero(&event_p, sizeof(event_p)); ++ ++ if ((mask & MAY_EXEC) != 0) ++ { ++ event = DAZUKO_ON_EXEC; ++ daemon_is_allowed = 0; ++ } ++ else ++ { ++ /* mask == 0 is passed in when a file is created */ ++ if (mask == 0 || (mask & (MAY_WRITE|MAY_APPEND)) != 0) ++ { ++ if ((mask & MAY_READ) != 0) ++ { ++ event_p.flags = O_RDWR; ++ } ++ else ++ { ++ event_p.flags = O_WRONLY; ++ } ++ ++ event_p.set_flags = 1; ++ } ++ else if ((mask & MAY_READ) != 0) ++ { ++ event_p.flags = O_RDONLY; ++ event_p.set_flags = 1; ++ } ++ } ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = NULL; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ check_error = dazuko_check_access(event, daemon_is_allowed, &xp_id, &sl); ++ ++ if (!check_error) ++ { ++ event_p.mode = inode->i_mode; ++ event_p.set_mode = 1; ++ event_p.pid = current->pid; ++ event_p.set_pid = 1; ++ event_p.uid = current->uid; ++ event_p.set_uid = 1; ++ ++ dfs = (struct dazuko_file_struct *)xp_malloc(sizeof(struct dazuko_file_struct)); ++ if (dfs != NULL) ++ { ++ dazuko_bzero(dfs, sizeof(struct dazuko_file_struct)); ++ ++ dfs->extra_data = (struct xp_file_struct *)xp_malloc(sizeof(struct xp_file_struct)); ++ if (dfs->extra_data != NULL) ++ { ++ dazuko_bzero(dfs->extra_data, sizeof(struct xp_file_struct)); ++ ++ dfs->extra_data->nd = nd; ++ dfs->extra_data->inode = inode; ++ ++ error = dazuko_process_access(event, dfs, &event_p, sl); ++ } ++ else ++ { ++ xp_free(dfs); ++ dfs = NULL; ++ } ++ ++ dazuko_file_struct_cleanup(&dfs); ++ } ++ } ++ ++ if (error) ++ return XP_ERROR_PERMISSION; ++ ++ return 0; ++} ++ ++int dazukoflt_ctl(struct rfs_ctl *ctl) ++{ ++ return 0; ++} ++ ++enum rfs_retv dazukoflt_permission(rfs_context context, struct rfs_args *args) ++{ ++ if (!args->args.i_permission.inode) ++ return RFS_CONTINUE; ++ ++ if (!args->args.i_permission.mask) ++ return RFS_CONTINUE; ++ ++ if (!args->args.i_permission.nd) ++ return RFS_CONTINUE; ++ ++ if (dazuko_sys_generic(args->args.i_permission.inode, args->args.i_permission.mask, args->args.i_permission.nd) != 0) ++ { ++ args->retv.rv_int = -EACCES; ++ return RFS_STOP; ++ } ++ ++ return RFS_CONTINUE; ++} ++ ++inline int xp_sys_hook() ++{ ++ /* Make sure we have a valid task_struct. */ ++ ++ if (current == NULL) ++ { ++ xp_print("dazuko: panic (current == NULL)\n"); ++ return -1; ++ } ++ if (current->fs == NULL) ++ { ++ xp_print("dazuko: panic (current->fs == NULL)\n"); ++ return -1; ++ } ++ ++ { ++ int err; ++ ++ err = rfs_register_filter(&dazukoflt, &flt_info); ++ if (err) ++ { ++ xp_print("dazuko: unable to register with RedirFS, err=%d\n", err); ++ return -1; ++ } ++ ++ err = rfs_set_operations(dazukoflt, op_info); ++ if (err) ++ { ++ xp_print("dazuko: unable to set RedirFS options, err=%d\n", err); ++ rfs_unregister_filter(dazukoflt); ++ return -1; ++ } ++ } ++ ++ dev_major = register_chrdev(DAZUKO_DM, DEVICE_NAME, &fops); ++ if (dev_major < 0) ++ { ++ xp_print("dazuko: unable to register device, err=%d\n", dev_major); ++ return dev_major; ++ } ++ ++#ifdef DEVFS_SUPPORT ++ devfs_mk_cdev(MKDEV(dev_major, 0), S_IFCHR | S_IRUSR | S_IWUSR, DEVICE_NAME); ++#endif ++ ++#ifndef WITHOUT_UDEV ++#ifdef USE_CLASS ++ dazuko_class = class_create(THIS_MODULE, "dazuko"); ++#ifdef CLASS_class_device_create_2_6_15 ++ class_device_create(dazuko_class, NULL, MKDEV(dev_major, 0), NULL, "dazuko"); ++#else ++ class_device_create(dazuko_class, MKDEV(dev_major, 0), NULL, "dazuko"); ++#endif ++#else ++ dazuko_class = class_simple_create(THIS_MODULE, "dazuko"); ++ class_simple_device_add(dazuko_class, MKDEV(dev_major, 0), NULL, "dazuko"); ++#endif ++#endif ++ ++ return 0; ++} ++ ++inline int xp_sys_unhook() ++{ ++ unregister_chrdev(dev_major, DEVICE_NAME); ++ ++#ifdef DEVFS_SUPPORT ++ devfs_remove(DEVICE_NAME); ++#endif ++ ++#ifndef WITHOUT_UDEV ++#ifdef USE_CLASS ++ class_device_destroy(dazuko_class, MKDEV(dev_major, 0)); ++ class_destroy(dazuko_class); ++#else ++ class_simple_device_remove(MKDEV(dev_major, 0)); ++ class_simple_destroy(dazuko_class); ++#endif ++#endif ++ ++ { ++ int err; ++ ++ err = rfs_unregister_filter(dazukoflt); ++ if (err) ++ { ++ xp_print("dazuko: failed to unregister from RedirFS, err=%d\n", err); ++ } ++ } ++ ++ return 0; ++} ++ ++ ++/* output */ ++ ++int xp_print(const char *fmt, ...) ++{ ++ va_list args; ++ char *p; ++ size_t size = 1024; ++ int length; ++ ++ p = (char *)xp_malloc(size); ++ if (p == NULL) ++ return -1; ++ ++ length = dazuko_strlen(KERN_INFO); ++ ++ memcpy(p, KERN_INFO, length); ++ ++ va_start(args, fmt); ++ vsnprintf(p + length, size - length, fmt, args); ++ va_end(args); ++ ++ p[size-1] = 0; ++ ++ printk(p); ++ ++ xp_free(p); ++ ++ return 0; ++} ++ ++ ++/* ioctl's */ ++ ++int linux_dazuko_device_open(struct inode *inode, struct file *file) ++{ ++ DPRINT(("dazuko: linux_dazuko_device_open() [%d]\n", current->pid)); ++ ++ return 0; ++} ++ ++ssize_t linux_dazuko_device_read(struct file *file, char *buffer, size_t length, loff_t *pos) ++{ ++ /* Reading from the dazuko device simply ++ * returns the device number. This is to ++ * help out the daemon. */ ++ ++ char tmp[20]; ++ size_t dev_major_len; ++ ++ DPRINT(("dazuko: linux_dazuko_device_read() [%d]\n", current->pid)); ++ ++ if (*pos != 0) ++ return 0; ++ ++ if (dev_major < 0) ++ return XP_ERROR_NODEVICE; ++ ++ /* print dev_major to a string ++ * and get length (with terminator) */ ++ dazuko_bzero(tmp, sizeof(tmp)); ++ ++ dev_major_len = dazuko_snprintf(tmp, sizeof(tmp), "%d", dev_major) + 1; ++ ++ if (tmp[sizeof(tmp)-1] != 0) ++ { ++ xp_print("dazuko: failing device_read, device number overflow for dameon %d (dev_major=%d)\n", current->pid, dev_major); ++ return XP_ERROR_FAULT; ++ } ++ ++ if (length < dev_major_len) ++ return XP_ERROR_INVALID; ++ ++ /* copy dev_major string to userspace */ ++ if (xp_copyout(tmp, buffer, dev_major_len) != 0) ++ return XP_ERROR_FAULT; ++ ++ *pos += dev_major_len; ++ ++ return dev_major_len; ++} ++ ++ssize_t linux_dazuko_device_write(struct file *file, const char *buffer, size_t length, loff_t *pos) ++{ ++ struct xp_daemon_id xp_id; ++ char tmpbuffer[32]; ++ int size; ++ ++ size = length; ++ if (length >= sizeof(tmpbuffer)) ++ size = sizeof(tmpbuffer) -1; ++ ++ /* copy request pointer string to kernelspace */ ++ if (xp_copyin(buffer, tmpbuffer, size) != 0) ++ return XP_ERROR_FAULT; ++ ++ tmpbuffer[size] = 0; ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = file; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ if (dazuko_handle_user_request(tmpbuffer, &xp_id) == 0) ++ return size; ++ ++ return XP_ERROR_INTERRUPT; ++} ++ ++int linux_dazuko_device_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long param) ++{ ++ /* A daemon uses this function to interact with ++ * the kernel. A daemon can set scanning parameters, ++ * give scanning response, and get filenames to scan. */ ++ ++ struct xp_daemon_id xp_id; ++ int error = 0; ++ ++ if (param == 0) ++ { ++ xp_print("dazuko: error: linux_dazuko_device_ioctl(..., 0)\n"); ++ return XP_ERROR_INVALID; ++ } ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = file; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ error = dazuko_handle_user_request_compat1((void *)param, _IOC_NR(cmd), &xp_id); ++ ++ if (error != 0) ++ { ++ /* general error occurred */ ++ ++ return XP_ERROR_PERMISSION; ++ } ++ ++ return error; ++} ++ ++int linux_dazuko_device_release(struct inode *inode, struct file *file) ++{ ++ struct xp_daemon_id xp_id; ++ ++ DPRINT(("dazuko: dazuko_device_release() [%d]\n", current->pid)); ++ ++ xp_id.pid = current->pid; ++ xp_id.tgid = current->tgid; ++ xp_id.file = file; ++ xp_id.current_p = current; ++ xp_id.files = current->files; ++ ++ return dazuko_unregister_daemon(&xp_id); ++} ++ ++ ++/* init/exit */ ++ ++static int __init linux_dazuko_init(void) ++{ ++ return dazuko_init(); ++} ++ ++static void __exit linux_dazuko_exit(void) ++{ ++ dazuko_exit(); ++} ++ ++ ++MODULE_AUTHOR("Avira GmbH "); ++MODULE_DESCRIPTION("allow 3rd-party file access control"); ++MODULE_LICENSE("GPL"); ++MODULE_INFO(vermagic, VERMAGIC_STRING); ++ ++module_init(linux_dazuko_init); ++module_exit(linux_dazuko_exit); +-- +1.5.4.rc4.25.g81cc-dirty + diff --git a/source/apps-extra/dazuko-fwlive/0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch b/source/apps-extra/dazuko-fwlive/0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch new file mode 100644 index 0000000..a2448e3 --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch @@ -0,0 +1,127 @@ +From b39f2f1f24f1a508c30356b0ee64aaa68f54e8a1 Mon Sep 17 00:00:00 2001 +From: ogman +Date: Wed, 12 Dec 2007 17:07:11 +0000 +Subject: [PATCH] - add "--enable-redirfs" to build Dazuko as a RedirFS filter + - change "--without-dep" to be the default + +--- + configure | 41 +++++++++++++++++++++++++++++++++-------- + 1 files changed, 33 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 17168f1..d300fce 100755 +--- a/configure ++++ b/configure +@@ -74,6 +74,7 @@ print_help() + echo " --disable-compat1 disable 1.x compatibility (IO/Linux only)" + echo " --enable-debug print extra debug information" + echo " --enable-syscalls hook syscalls, not LSM (Linux 2.6 only)" ++ echo " --enable-redirfs use RedirFS (Linux 2.6 only)" + echo "" + echo "optional packages" + echo " --with-PACKAGE use PACKAGE" +@@ -81,7 +82,7 @@ print_help() + echo " --without-module do not build kernel module" + echo " --without-library do not build library" + echo " --without-example-c do not build C example" +- echo " --without-dep do not build dependencies (Linux only)" ++ echo " --with-dep build dependencies (Linux only)" + echo " --with-example-java build Java example" + echo " --with-example-perl build Perl example" + echo " --with-example-python build Python example" +@@ -407,7 +408,18 @@ check_use_parent() + + do_linux26() + { +- if [ $LINUX26_USE_SYSCALLS -eq 0 ] ++ if [ $LINUX26_USE_SYSCALLS -eq 0 -a $LINUX26_USE_REDIRFS -eq 1 ] ++ then ++ echo -n "checking for RedirFS source code... " ++ if [ ! -f "../redirfs/redirfs.h" ] ++ then ++ echo "not found" ++ echo "error: please make sure the RedirFS code is available as ../redirfs/" ++ exit 1 ++ fi ++ echo "found (../redirfs)" ++ ++ elif [ $LINUX26_USE_SYSCALLS -eq 0 -a $LINUX26_USE_REDIRFS -eq 0 ] + then + echo -n "checking if security module support is enabled... " + if [ $CONFIG_SECURITY -eq 0 ] +@@ -690,25 +702,25 @@ do_linux26() + + if [ $ON_CLOSE -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_CLOSE events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_CLOSE events (not available for Linux 2.6 LSM/RedirFS)" + ON_CLOSE=0 + fi + + if [ ${ON_UNLINK} -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_UNLINK events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_UNLINK events (not available for Linux 2.6 LSM/RedirFS)" + ON_UNLINK=0 + fi + + if [ ${ON_RMDIR} -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_RMDIR events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_RMDIR events (not available for Linux 2.6 LSM/RedirFS)" + ON_RMDIR=0 + fi + + if [ ${ON_CLOSE_MODIFIED} -ne 0 -a $LINUX26_USE_SYSCALLS -eq 0 ] + then +- echo "disabling ON_CLOSE_MODIFIED events (not available for Linux 2.6 LSM)" ++ echo "disabling ON_CLOSE_MODIFIED events (not available for Linux 2.6 LSM/RedirFS)" + ON_CLOSE_MODIFIED=0 + fi + +@@ -716,7 +728,12 @@ do_linux26() + + if [ ${LINUX26_USE_SYSCALLS} -eq 0 ] + then +- LINUX26_OBJS="dazuko_linux26.o" ++ if [ ${LINUX26_USE_REDIRFS} -eq 0 ] ++ then ++ LINUX26_OBJS="dazuko_linux26.o" ++ else ++ LINUX26_OBJS="dazuko_redirfs.o" ++ fi + echo "EXTRA_CFLAGS += -Wall -DLINUX26_SUPPORT" > Makefile + else + LINUX26_OBJS="dazuko_linux.o" +@@ -1460,12 +1477,13 @@ LINUX26_USE_SYSCALLS=0 + PERFORM_SCT_CHECK=1 + LINUX26_SYSCALLTABLE_READONLY=0 + LINUX26_SYSCALL_CFLAGS="" +-WITH_LINUX_DEP=1 ++WITH_LINUX_DEP=0 + NO_CAPABILITIES=0 + SMP=0 + HIDDEN_SCT=0 + DUMMYOS=0 + LSM_STACKING=1 ++LINUX26_USE_REDIRFS=0 + LOCAL_DPATH=2 + LINUX_SRC="" + LINUX_OBJ="" +@@ -1549,6 +1567,13 @@ do + --disable-syscalls) + LINUX26_USE_SYSCALLS=0 + ;; ++ --enable-redirfs) ++ LINUX26_USE_REDIRFS=1 ++ LSM_STACKING=0 ++ ;; ++ --disable-redirfs) ++ LINUX26_USE_REDIRFS=0 ++ ;; + --sct-nocheck) + PERFORM_SCT_CHECK=0 + ;; +-- +1.5.4.rc4.25.g81cc-dirty + diff --git a/source/apps-extra/dazuko-fwlive/FrugalBuild b/source/apps-extra/dazuko-fwlive/FrugalBuild index 020252a..aeb1171 100644 --- a/source/apps-extra/dazuko-fwlive/FrugalBuild +++ b/source/apps-extra/dazuko-fwlive/FrugalBuild @@ -2,25 +2,37 @@ # Maintainer: Janny pkgname=dazuko-fwlive +_F_archive_name=dazuko pkgver=2.3.4 -pkgrel=7 +redirver=0.2 +pkgrel=10 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" -_F_kernelmod_scriptlet=$pkgname.install +_F_kernelmod_scriptlet=$_F_archive_name.install Finclude kernel-module -kver=2.6.23-6 -depends=("kernel-fwlive=$kver") +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" "redirfs-fwlive=$redirver") makedepends=("kernel-fwlive-source=$kver") archs=('i686' 'x86_64') groups=('apps-extra') up2date="lynx -dump '$url/files/?M=O' | grep -v source |grep -v birthday|grep -v pre|Flasttar" -source=(http://www.dazuko.org/files/dazuko-$pkgver.tar.gz README.Frugalware) +source=(http://www.dazuko.org/files/$_F_archive_name-$pkgver.tar.gz \ + http://www.redirfs.org/packages/redirfs-$redirver.tar.gz \ + README.Frugalware \ + 0001-add-xp_set_path-function-necessary-for-RedirFS-su.patch \ + 0002-source-code-to-compile-Dazuko-as-an-RedirFS-filter.patch \ + 0003-add-enable-redirfs-to-build-Dazuko-as-a-RedirF.patch) sha1sums=('271d0a23d7aed2555f023141504386b6042a5efa' \ - '8292447cba4bdab9dfbb8169c011e74559a00804') + 'c736b6a9b9cb0540010eb865febfd4f3b1fe6d82' \ + '8292447cba4bdab9dfbb8169c011e74559a00804' \ + 'eebf571563481dba5bce10900b02bff5d6e30b78' \ + '4f6b6b45a2be49a4e90fd7fb2ad4e40d9e50c436' \ + 'd45e7a44154f61d79f54c940ba6fa6085c88cbf6') build() { - Fcd dazuko-$pkgver/ + Fcd + ln -s redirfs-$redirver ../redirfs # Patch needed by some F-Secure softwares patch -p0 < patch_fsecure_init_event.diff || Fdie # no Fcheckkernel, crosscompilation verified @@ -28,10 +40,11 @@ build() { Fsed '`uname -r`' "$_F_kernelmod_uname" configure find . -type f -exec sed -i '/#include /d' {} \; ./configure --system=linux26 --disable-chroot-support \ - --without-dep --enable-event-init-module || Fdie + --without-dep --enable-event-init-module --enable-redirfs || Fdie make || Fdie - Ffilerel $_F_kernelmod_dir/extra/dazuko.ko + Ffilerel $_F_kernelmod_dir/extra/$_F_archive_name.ko make -C library || Fdie - Ffile dazuko-${pkgver//_/-}/library/libdazuko.a /usr/lib/libdazuko.a + Ffile $_F_archive_name-${pkgver//_/-}/library/libdazuko.a /usr/lib/libdazuko.a Fdoc README.Frugalware + Fbuild_kernelmod_scriptlet } diff --git a/source/apps-extra/dazuko-fwlive/README.Frugalware b/source/apps-extra/dazuko-fwlive/README.Frugalware new file mode 100644 index 0000000..cd09da1 --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/README.Frugalware @@ -0,0 +1,13 @@ +If you got errors saying: + +'dazuko: failed to register' + +then you need to do: + +------------------- +# rmmod capability +# modprobe dazuko +# modprobe capability +------------------- + +It will work. diff --git a/source/apps-extra/dazuko-fwlive/dazuko-fwlive.install b/source/apps-extra/dazuko-fwlive/dazuko-fwlive.install deleted file mode 100644 index 6726b94..0000000 --- a/source/apps-extra/dazuko-fwlive/dazuko-fwlive.install +++ /dev/null @@ -1,43 +0,0 @@ -post_install() -{ - if test `grep dazuko < /etc/sysconfig/modules|wc -l` -gt 1; then - sed -i '/^dazuko/d' /etc/sysconfig/modules - fi - if test `grep commoncap < /etc/sysconfig/modules|wc -l` -gt 1; then - sed -i '/^commoncap/d' /etc/sysconfig/modules - fi - if ! grep -q dazuko /etc/sysconfig/modules; then - echo "Adding dazuko to /etc/sysconfig/modules..." - sed -i 's/capability/dazuko\ncapability/' /etc/sysconfig/modules - fi - if ! grep -q commoncap /etc/sysconfig/modules; then - echo "Adding commoncap to /etc/sysconfig/modules..." - sed -i 's/dazuko/commoncap\ndazuko/' /etc/sysconfig/modules - fi - depmod -a $_F_kernelmod_uname - rmmod capability 2>/dev/null - if test `lsmod|grep commoncap|wc -l` -lt 1; then - modprobe commoncap - fi - if test `lsmod|grep dazuko|wc -l` -ge 1; then - rmmod dazuko 2>/dev/null - fi - modprobe dazuko - modprobe capability - echo "Dazuko loaded..." -} - -post_upgrade() -{ - post_install -} - -pre_remove() -{ - sed -i '/^dazuko/d' /etc/sysconfig/modules - sed -i '/^commoncap/d' /etc/sysconfig/modules -} - -op=$1 -shift -$op $* diff --git a/source/apps-extra/dazuko-fwlive/dazuko.install b/source/apps-extra/dazuko-fwlive/dazuko.install new file mode 100644 index 0000000..6004b01 --- /dev/null +++ b/source/apps-extra/dazuko-fwlive/dazuko.install @@ -0,0 +1,38 @@ +post_install() +{ + if ! grep -q dazuko /etc/sysconfig/modules; then + echo -n "adding dazuko to /etc/sysconfig/modules..." + echo dazuko >> /etc/sysconfig/modules + echo " done." + fi + depmod -a $_F_kernelmod_uname + if lsmod|grep -q dazuko; then + rmmod dazuko + fi + echo -n "loading dazuko..." + modprobe dazuko + echo " done." +} + +post_upgrade() +{ + post_install +} + +pre_remove() +{ + if grep -q dazuko /etc/sysconfig/modules; then + echo -n "removing dazuko from /etc/sysconfig/modules..." + sed -i '/^dazuko/d' /etc/sysconfig/modules + echo " done." + fi + if lsmod|grep -q dazuko; then + echo -n "unloading dazuko..." + rmmod dazuko + echo " done." + fi +} + +op=$1 +shift +$op $* From janny at frugalware.org Thu Mar 6 19:32:24 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:32:26 2008 Subject: [Frugalware-git] fwlive_pkgs: lirc-fwlive-0.8.2-18-i686 Message-ID: <20080306183224.B5002119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=7987d8518c26de09d6fde4a340e7db091a4a56a1 commit 7987d8518c26de09d6fde4a340e7db091a4a56a1 Author: Janos Kovacs Date: Thu Mar 6 19:31:53 2008 +0100 lirc-fwlive-0.8.2-18-i686 * version bump diff --git a/source/apps-extra/lirc-fwlive/FrugalBuild b/source/apps-extra/lirc-fwlive/FrugalBuild index d80b0d6..45525c9 100644 --- a/source/apps-extra/lirc-fwlive/FrugalBuild +++ b/source/apps-extra/lirc-fwlive/FrugalBuild @@ -2,14 +2,15 @@ # Maintainer: voroskoi pkgname=lirc-fwlive +_F_archive_name=lirc pkgver=0.8.2 -pkgrel=15 +pkgrel=18 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" _F_sourceforge_name="lirc" _F_rcd_name="lirc" Finclude kernel-module sourceforge -kver=2.6.23-6 +kver=2.6.24-3 makedepends=("kernel-fwlive-source=$kver") subpkgs=('lirc_modules-fwlive') @@ -25,11 +26,10 @@ groups=('apps-extra') archs=('i686' 'x86_64') backup=(etc/lirc{d,md}.conf etc/sysconfig/lirc) source=(${source[@]} rc.lirc lirc.logrotate lirc.sysconfig README.Frugalware \ - kernel-2.6.23.patch) + kernel-2.6.{23,24}.patch) unset install build() { - Fcd lirc-$pkgver Fpatchall Fconf --enable-sandboxed --with-driver=all \ --with-moduledir=$_F_kernelmod_dir/misc @@ -50,8 +50,8 @@ build() { Fmkdir /etc/{logrotate.d,sysconfig} Ffile lirc.logrotate /etc/logrotate.d/ Ffile lirc.sysconfig /etc/sysconfig/lirc - Frcd2 lirc - Fsplit lirc_modules-fwlive lib/modules + Frcd2 $_F_archive_name + Fsplit lirc_modules lib/modules Fbuild_kernelmod_scriptlet } sha1sums=('3443b24c54e8679483efbb6fb446b41116bc654c' \ @@ -59,6 +59,7 @@ sha1sums=('3443b24c54e8679483efbb6fb446b41116bc654c' \ '4342b004eb53d51fcbb9af2cf136bb4990874608' \ '504e0cd04780e75b6a8ab6836815c1ed9058db78' \ '0b80c73e902920c028dca98a9006aaa313c6e120' \ - 'cd65d7ce6a33a8e8965dc0d529b72a785c4437f7') + 'cd65d7ce6a33a8e8965dc0d529b72a785c4437f7' \ + '83bb445945e6331d17c2bb5200811c107bdc609f') # optimization OK diff --git a/source/apps-extra/lirc-fwlive/kernel-2.6.24.patch b/source/apps-extra/lirc-fwlive/kernel-2.6.24.patch new file mode 100644 index 0000000..6bf4ef1 --- /dev/null +++ b/source/apps-extra/lirc-fwlive/kernel-2.6.24.patch @@ -0,0 +1,1143 @@ +--- lirc-0.8.2/drivers/lirc_dev/lirc_dev.c 2007/11/08 21:27:29 1.53 ++++ lirc-0.8.2/drivers/lirc_dev/lirc_dev.c 2008/01/13 10:45:02 1.56 +@@ -41,14 +41,23 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) + #include +-#include + #include +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++#else ++#include ++#include ++#endif ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + #include + #endif + #define __KERNEL_SYSCALLS__ + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) ++#include ++#endif + + #include "drivers/kcompat.h" + +@@ -60,19 +69,19 @@ + #include "drivers/lirc.h" + #include "lirc_dev.h" + +-static int debug = 0; +-#define dprintk(fmt, args...) \ +- do{ \ +- if(debug) printk(KERN_DEBUG fmt, ## args); \ +- }while(0) ++static int debug; ++#define dprintk(fmt, args...) \ ++ do { \ ++ if (debug) \ ++ printk(KERN_DEBUG fmt, ## args); \ ++ } while (0) + + #define IRCTL_DEV_NAME "BaseRemoteCtl" + #define SUCCESS 0 + #define NOPLUG -1 + #define LOGHEAD "lirc_dev (%s[%d]): " + +-struct irctl +-{ ++struct irctl { + struct lirc_plugin p; + int attached; + int open; +@@ -80,10 +89,14 @@ + struct semaphore buffer_sem; + struct lirc_buffer *buf; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + int tpid; +- struct semaphore *t_notify; +- struct semaphore *t_notify2; ++ struct completion *t_notify; ++ struct completion *t_notify2; + int shutdown; ++#else ++ struct task_struct *task; ++#endif + long jiffies_to_wait; + + #ifdef LIRC_HAVE_DEVFS_24 +@@ -108,10 +121,14 @@ + sema_init(&ir->buffer_sem, 1); + ir->p.minor = NOPLUG; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + ir->tpid = -1; + ir->t_notify = NULL; + ir->t_notify2 = NULL; + ir->shutdown = 0; ++#else ++ ir->task = NULL; ++#endif + ir->jiffies_to_wait = 0; + + ir->open = 0; +@@ -128,14 +145,14 @@ + #ifdef LIRC_HAVE_DEVFS_26 + devfs_remove(DEV_LIRC "/%u", ir->p.minor); + #endif +- class_device_destroy(lirc_class,MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); ++ class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); + +- if (ir->buf != ir->p.rbuf){ ++ if (ir->buf != ir->p.rbuf) { + lirc_buffer_free(ir->buf); + kfree(ir->buf); + } + ir->buf = NULL; +- ++ + init_irctl(ir); + } + +@@ -152,29 +169,31 @@ + return -EOVERFLOW; + } + +- if(ir->p.add_to_buf) { ++ if (ir->p.add_to_buf) { + int res = -ENODATA; + int got_data = 0; +- ++ + /* service the device as long as it is returning + * data and we have space + */ +- while( !lirc_buffer_full(ir->buf) ) +- { +- res = ir->p.add_to_buf( ir->p.data, ir->buf ); +- if( res == SUCCESS ) ++ while (!lirc_buffer_full(ir->buf)) { ++ res = ir->p.add_to_buf(ir->p.data, ir->buf); ++ if (res == SUCCESS) + got_data++; + else + break; + } +- +- if( res == -ENODEV ) +- { ++ ++ if (res == -ENODEV) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + ir->shutdown = 1; +- } ++#else ++ kthread_stop(ir->task); ++#endif ++ + return (got_data ? SUCCESS : res); + } +- ++ + return SUCCESS; + } + +@@ -183,56 +202,59 @@ + static int lirc_thread(void *irctl) + { + struct irctl *ir = irctl; +- ++ + /* This thread doesn't need any user-level access, + * so get rid of all our resources + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + daemonize("lirc_dev"); +- +- if (ir->t_notify != NULL) { +- up(ir->t_notify); +- } +- ++ ++ if (ir->t_notify != NULL) ++ complete(ir->t_notify); ++#endif ++ + dprintk(LOGHEAD "poll thread started\n", ir->p.name, ir->p.minor); +- ++ + do { + if (ir->open) { + if (ir->jiffies_to_wait) { + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout(ir->jiffies_to_wait); + } else { +- interruptible_sleep_on(ir->p.get_queue(ir->p.data)); ++ interruptible_sleep_on( ++ ir->p.get_queue(ir->p.data)); + } +- if (ir->shutdown) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) ++ if (ir->shutdown) ++#else ++ if (kthread_should_stop()) ++#endif + break; +- } +- if (!add_to_buf(ir)) { ++ if (!add_to_buf(ir)) + wake_up_interruptible(&ir->buf->wait_poll); +- } + } else { + /* if device not opened so we can sleep half a second */ + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout(HZ/2); + } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + } while (!ir->shutdown); +- +- if (ir->t_notify2 != NULL) { +- down(ir->t_notify2); +- } ++ ++ if (ir->t_notify2 != NULL) ++ wait_for_completion(ir->t_notify2); + + ir->tpid = -1; +- if (ir->t_notify != NULL) { +- up(ir->t_notify); +- } +- ++ if (ir->t_notify != NULL) ++ complete(ir->t_notify); ++#else ++ } while (!kthread_should_stop()); ++#endif ++ + dprintk(LOGHEAD "poll thread ended\n", ir->p.name, ir->p.minor); +- ++ + return 0; + } + +-/* +- * +- */ + int lirc_register_plugin(struct lirc_plugin *p) + { + struct irctl *ir; +@@ -242,43 +264,43 @@ + #ifdef LIRC_HAVE_DEVFS_24 + char name[16]; + #endif +- DECLARE_MUTEX_LOCKED(tn); ++ DECLARE_COMPLETION(tn); + + if (!p) { +- printk("lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "plugin pointer must be not NULL!\n"); + err = -EBADRQC; + goto out; + } + + if (MAX_IRCTL_DEVICES <= p->minor) { +- printk("lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "\"minor\" must be between 0 and %d (%d)!\n", + MAX_IRCTL_DEVICES-1, p->minor); + err = -EBADRQC; + goto out; + } + +- if (1 > p->code_length || (BUFLEN*8) < p->code_length) { +- printk("lirc_dev: lirc_register_plugin: " ++ if (1 > p->code_length || (BUFLEN * 8) < p->code_length) { ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "code length in bits for minor (%d) " + "must be less than %d!\n", +- p->minor, BUFLEN*8); ++ p->minor, BUFLEN * 8); + err = -EBADRQC; + goto out; + } + +- printk("lirc_dev: lirc_register_plugin: " +- "sample_rate: %d\n",p->sample_rate); ++ printk(KERN_INFO "lirc_dev: lirc_register_plugin: sample_rate: %d\n", ++ p->sample_rate); + if (p->sample_rate) { + if (2 > p->sample_rate || HZ < p->sample_rate) { +- printk("lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "sample_rate must be between 2 and %d!\n", HZ); + err = -EBADRQC; + goto out; + } + if (!p->add_to_buf) { +- printk("lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "add_to_buf cannot be NULL when " + "sample_rate is set\n"); + err = -EBADRQC; +@@ -286,15 +308,15 @@ + } + } else if (!(p->fops && p->fops->read) + && !p->get_queue && !p->rbuf) { +- printk("lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "fops->read, get_queue and rbuf " + "cannot all be NULL!\n"); + err = -EBADRQC; + goto out; + } else if (!p->get_queue && !p->rbuf) { +- if (!(p->fops && p->fops->read && p->fops->poll) ++ if (!(p->fops && p->fops->read && p->fops->poll) + || (!p->fops->ioctl && !p->ioctl)) { +- printk("lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "neither read, poll nor ioctl can be NULL!\n"); + err = -EBADRQC; + goto out; +@@ -302,7 +324,7 @@ + } + + if (p->owner == NULL) { +- printk(KERN_WARNING "lirc_dev: lirc_register_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "no module owner registered\n"); + err = -EBADRQC; + goto out; +@@ -314,17 +336,17 @@ + + if (0 > minor) { + /* find first free slot for plugin */ +- for (minor=0; minorsample_rate) { + ir->jiffies_to_wait = HZ / p->sample_rate; + } else { +- /* it means - wait for externeal event in task queue */ ++ /* it means - wait for external event in task queue */ + ir->jiffies_to_wait = 0; +- } ++ } + + /* some safety check 8-) */ + p->name[sizeof(p->name)-1] = '\0'; + + bytes_in_key = p->code_length/8 + (p->code_length%8 ? 1 : 0); +- ++ + if (p->rbuf) { + ir->buf = p->rbuf; + } else { + ir->buf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL); +- if(!ir->buf) { ++ if (!ir->buf) { + err = -ENOMEM; + goto out_lock; + } +- if(lirc_buffer_init +- (ir->buf, bytes_in_key, BUFLEN/bytes_in_key) != 0) { ++ if (lirc_buffer_init(ir->buf, bytes_in_key, ++ BUFLEN/bytes_in_key) != 0) { + kfree(ir->buf); + err = -ENOMEM; + goto out_lock; + } + } + +- if (p->features==0) ++ if (p->features == 0) + p->features = (p->code_length > 8) ? + LIRC_CAN_REC_LIRCCODE : LIRC_CAN_REC_CODE; + +@@ -368,7 +390,7 @@ + ir->p.minor = minor; + + #if defined(LIRC_HAVE_DEVFS_24) +- sprintf (name, DEV_LIRC "/%d", ir->p.minor); ++ sprintf(name, DEV_LIRC "/%d", ir->p.minor); + ir->devfs_handle = devfs_register(NULL, name, DEVFS_FL_DEFAULT, + IRCTL_DEV_MAJOR, ir->p.minor, + S_IFCHR | S_IRUSR | S_IWUSR, +@@ -378,23 +400,30 @@ + S_IFCHR|S_IRUSR|S_IWUSR, + DEV_LIRC "/%u", ir->p.minor); + #endif +- (void) lirc_class_device_create(lirc_class, NULL, ++ (void) lirc_class_device_create(lirc_class, NULL, + MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), + ir->p.dev, "lirc%u", ir->p.minor); + +- if(p->sample_rate || p->get_queue) { ++ if (p->sample_rate || p->get_queue) { + /* try to fire up polling thread */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + ir->t_notify = &tn; +- ir->tpid = kernel_thread(lirc_thread, (void*)ir, 0); ++ ir->tpid = kernel_thread(lirc_thread, (void *)ir, 0); + if (ir->tpid < 0) { +- printk("lirc_dev: lirc_register_plugin: " ++#else ++ ir->task = kthread_run(lirc_thread, (void *)ir, "lirc_dev"); ++ if (IS_ERR(ir->task)) { ++#endif ++ printk(KERN_ERR "lirc_dev: lirc_register_plugin: " + "cannot run poll thread for minor = %d\n", + p->minor); + err = -ECHILD; + goto out_sysfs; + } +- down(&tn); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) ++ wait_for_completion(&tn); + ir->t_notify = NULL; ++#endif + } + ir->attached = 1; + up(&plugin_lock); +@@ -410,9 +439,9 @@ + ir->p.name, ir->p.minor); + p->minor = minor; + return minor; +- ++ + out_sysfs: +- class_device_destroy(lirc_class,MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); ++ class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); + #ifdef LIRC_HAVE_DEVFS_24 + devfs_unregister(ir->devfs_handle); + #endif +@@ -424,18 +453,16 @@ + out: + return err; + } ++EXPORT_SYMBOL(lirc_register_plugin); + +-/* +- * +- */ + int lirc_unregister_plugin(int minor) + { + struct irctl *ir; +- DECLARE_MUTEX_LOCKED(tn); +- DECLARE_MUTEX_LOCKED(tn2); ++ DECLARE_COMPLETION(tn); ++ DECLARE_COMPLETION(tn2); + + if (minor < 0 || minor >= MAX_IRCTL_DEVICES) { +- printk("lirc_dev: lirc_unregister_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_unregister_plugin: " + "\"minor\" must be between 0 and %d!\n", + MAX_IRCTL_DEVICES-1); + return -EBADRQC; +@@ -446,21 +473,22 @@ + down(&plugin_lock); + + if (ir->p.minor != minor) { +- printk("lirc_dev: lirc_unregister_plugin: " ++ printk(KERN_ERR "lirc_dev: lirc_unregister_plugin: " + "minor (%d) device not registered!", minor); + up(&plugin_lock); + return -ENOENT; + } + + /* end up polling thread */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + if (ir->tpid >= 0) { + ir->t_notify = &tn; + ir->t_notify2 = &tn2; + ir->shutdown = 1; +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) + { + struct task_struct *p; +- ++ + p = find_task_by_pid(ir->tpid); + wake_up_process(p); + } +@@ -468,11 +496,17 @@ + /* 2.2.x does not export wake_up_process() */ + wake_up_interruptible(ir->p.get_queue(ir->p.data)); + #endif +- up(&tn2); +- down(&tn); ++ complete(&tn2); ++ wait_for_completion(&tn); + ir->t_notify = NULL; + ir->t_notify2 = NULL; + } ++#else /* kernel >= 2.6.23 */ ++ if (ir->task) { ++ wake_up_process(ir->task); ++ kthread_stop(ir->task); ++ } ++#endif + + dprintk("lirc_dev: plugin %s unregistered from minor number = %d\n", + ir->p.name, ir->p.minor); +@@ -486,11 +520,8 @@ + ir->p.set_use_dec(ir->p.data); + module_put(ir->p.owner); + up(&ir->buffer_sem); +- } +- else +- { ++ } else + cleanup(ir); +- } + up(&plugin_lock); + + /* +@@ -503,6 +534,7 @@ + + return SUCCESS; + } ++EXPORT_SYMBOL(lirc_unregister_plugin); + + /* + * +@@ -511,7 +543,7 @@ + { + struct irctl *ir; + int retval; +- ++ + if (MINOR(inode->i_rdev) >= MAX_IRCTL_DEVICES) { + dprintk("lirc_dev [%d]: open result = -ENODEV\n", + MINOR(inode->i_rdev)); +@@ -523,13 +555,11 @@ + dprintk(LOGHEAD "open called\n", ir->p.name, ir->p.minor); + + /* if the plugin has an open function use it instead */ +- if(ir->p.fops && ir->p.fops->open) ++ if (ir->p.fops && ir->p.fops->open) + return ir->p.fops->open(inode, file); + + if (down_interruptible(&plugin_lock)) +- { + return -ERESTARTSYS; +- } + + if (ir->p.minor == NOPLUG) { + up(&plugin_lock); +@@ -545,30 +575,27 @@ + return -EBUSY; + } + +- /* there is no need for locking here because ir->open is 0 +- * and lirc_thread isn't using buffer ++ /* there is no need for locking here because ir->open is 0 ++ * and lirc_thread isn't using buffer + * plugins which use irq's should allocate them on set_use_inc, + * so there should be no problem with those either. +- */ ++ */ + ir->buf->head = ir->buf->tail; + ir->buf->fill = 0; + +- if(ir->p.owner!=NULL && try_module_get(ir->p.owner)) +- { ++ if (ir->p.owner != NULL && try_module_get(ir->p.owner)) { + ++ir->open; + retval = ir->p.set_use_inc(ir->p.data); +- ++ + if (retval != SUCCESS) { + module_put(ir->p.owner); + --ir->open; + } +- } +- else +- { +- if(ir->p.owner==NULL) +- { +- dprintk(LOGHEAD "no module owner!!!\n", ir->p.name, ir->p.minor); +- } ++ } else { ++ if (ir->p.owner == NULL) ++ dprintk(LOGHEAD "no module owner!!!\n", ++ ir->p.name, ir->p.minor); ++ + retval = -ENODEV; + } + +@@ -586,24 +613,19 @@ + struct irctl *ir = &irctls[MINOR(inode->i_rdev)]; + + dprintk(LOGHEAD "close called\n", ir->p.name, ir->p.minor); +- ++ + /* if the plugin has a close function use it instead */ +- if(ir->p.fops && ir->p.fops->release) ++ if (ir->p.fops && ir->p.fops->release) + return ir->p.fops->release(inode, file); + + if (down_interruptible(&plugin_lock)) +- { + return -ERESTARTSYS; +- } + + --ir->open; +- if(ir->attached) +- { ++ if (ir->attached) { + ir->p.set_use_dec(ir->p.data); + module_put(ir->p.owner); +- } +- else +- { ++ } else { + cleanup(ir); + } + +@@ -623,12 +645,11 @@ + dprintk(LOGHEAD "poll called\n", ir->p.name, ir->p.minor); + + /* if the plugin has a poll function use it instead */ +- if(ir->p.fops && ir->p.fops->poll) ++ if (ir->p.fops && ir->p.fops->poll) + return ir->p.fops->poll(file, wait); + + down(&ir->buffer_sem); +- if(!ir->attached) +- { ++ if (!ir->attached) { + up(&ir->buffer_sem); + return POLLERR; + } +@@ -636,11 +657,11 @@ + poll_wait(file, &ir->buf->wait_poll, wait); + + dprintk(LOGHEAD "poll result = %s\n", +- ir->p.name, ir->p.minor, ++ ir->p.name, ir->p.minor, + lirc_buffer_empty(ir->buf) ? "0" : "POLLIN|POLLRDNORM"); + + ret = lirc_buffer_empty(ir->buf) ? 0 : (POLLIN|POLLRDNORM); +- ++ + up(&ir->buffer_sem); + return ret; + } +@@ -649,7 +670,7 @@ + * + */ + static int irctl_ioctl(struct inode *inode, struct file *file, +- unsigned int cmd, unsigned long arg) ++ unsigned int cmd, unsigned long arg) + { + unsigned long mode; + int result; +@@ -659,7 +680,7 @@ + ir->p.name, ir->p.minor, cmd); + + /* if the plugin has a ioctl function use it instead */ +- if(ir->p.fops && ir->p.fops->ioctl) ++ if (ir->p.fops && ir->p.fops->ioctl) + return ir->p.fops->ioctl(inode, file, cmd, arg); + + if (ir->p.minor == NOPLUG || !ir->attached) { +@@ -669,7 +690,7 @@ + } + + /* Give the plugin a chance to handle the ioctl */ +- if(ir->p.ioctl){ ++ if (ir->p.ioctl) { + result = ir->p.ioctl(inode, file, cmd, arg); + if (result != -ENOIOCTLCMD) + return result; +@@ -677,33 +698,32 @@ + /* The plugin can't handle cmd */ + result = SUCCESS; + +- switch(cmd) +- { ++ switch (cmd) { + case LIRC_GET_FEATURES: +- result = put_user(ir->p.features, (unsigned long*)arg); ++ result = put_user(ir->p.features, (unsigned long *)arg); + break; + case LIRC_GET_REC_MODE: +- if(!(ir->p.features&LIRC_CAN_REC_MASK)) +- return(-ENOSYS); +- ++ if (!(ir->p.features&LIRC_CAN_REC_MASK)) ++ return -ENOSYS; ++ + result = put_user(LIRC_REC2MODE + (ir->p.features&LIRC_CAN_REC_MASK), +- (unsigned long*)arg); ++ (unsigned long *)arg); + break; + case LIRC_SET_REC_MODE: +- if(!(ir->p.features&LIRC_CAN_REC_MASK)) +- return(-ENOSYS); ++ if (!(ir->p.features&LIRC_CAN_REC_MASK)) ++ return -ENOSYS; + +- result = get_user(mode, (unsigned long*)arg); +- if(!result && !(LIRC_MODE2REC(mode) & ir->p.features)) { ++ result = get_user(mode, (unsigned long *)arg); ++ if (!result && !(LIRC_MODE2REC(mode) & ir->p.features)) + result = -EINVAL; +- } +- /* FIXME: We should actually set the mode somehow +- * but for now, lirc_serial doesn't support mode changin +- * eighter */ ++ /* ++ * FIXME: We should actually set the mode somehow but ++ * for now, lirc_serial doesn't support mode changing either ++ */ + break; + case LIRC_GET_LENGTH: +- result = put_user((unsigned long)ir->p.code_length, ++ result = put_user((unsigned long)ir->p.code_length, + (unsigned long *)arg); + break; + default: +@@ -720,27 +740,24 @@ + * + */ + static ssize_t irctl_read(struct file *file, +- char *buffer, +- size_t length, +- loff_t *ppos) ++ char *buffer, ++ size_t length, ++ loff_t *ppos) + { + struct irctl *ir = &irctls[MINOR(file->f_dentry->d_inode->i_rdev)]; + unsigned char buf[ir->buf->chunk_size]; +- int ret=0, written=0; ++ int ret = 0, written = 0; + DECLARE_WAITQUEUE(wait, current); + + dprintk(LOGHEAD "read called\n", ir->p.name, ir->p.minor); + + /* if the plugin has a specific read function use it instead */ +- if(ir->p.fops && ir->p.fops->read) ++ if (ir->p.fops && ir->p.fops->read) + return ir->p.fops->read(file, buffer, length, ppos); + +- if(down_interruptible(&ir->buffer_sem)) +- { ++ if (down_interruptible(&ir->buffer_sem)) + return -ERESTARTSYS; +- } +- if(!ir->attached) +- { ++ if (!ir->attached) { + up(&ir->buffer_sem); + return -ENODEV; + } +@@ -752,23 +769,26 @@ + return -EINVAL; + } + +- /* we add ourselves to the task queue before buffer check +- * to avoid losing scan code (in case when queue is awaken somewhere ++ /* ++ * we add ourselves to the task queue before buffer check ++ * to avoid losing scan code (in case when queue is awaken somewhere + * beetwen while condition checking and scheduling) + */ + add_wait_queue(&ir->buf->wait_poll, &wait); + set_current_state(TASK_INTERRUPTIBLE); + +- /* while we did't provide 'length' bytes, device is opened in blocking ++ /* ++ * while we did't provide 'length' bytes, device is opened in blocking + * mode and 'copy_to_user' is happy, wait for data. + */ +- while (written < length && ret == 0) { ++ while (written < length && ret == 0) { + if (lirc_buffer_empty(ir->buf)) { + /* According to the read(2) man page, 'written' can be + * returned as less than 'length', instead of blocking + * again, returning -EWOULDBLOCK, or returning + * -ERESTARTSYS */ +- if (written) break; ++ if (written) ++ break; + if (file->f_flags & O_NONBLOCK) { + ret = -EWOULDBLOCK; + break; +@@ -779,8 +799,7 @@ + } + schedule(); + set_current_state(TASK_INTERRUPTIBLE); +- if(!ir->attached) +- { ++ if (!ir->attached) { + ret = -ENODEV; + break; + } +@@ -795,7 +814,7 @@ + remove_wait_queue(&ir->buf->wait_poll, &wait); + set_current_state(TASK_RUNNING); + up(&ir->buffer_sem); +- ++ + dprintk(LOGHEAD "read result = %s (%d)\n", + ir->p.name, ir->p.minor, ret ? "-EFAULT" : "OK", ret); + +@@ -805,87 +824,78 @@ + + void *lirc_get_pdata(struct file *file) + { +- void *data=NULL; ++ void *data = NULL; + + if (file && file->f_dentry && file->f_dentry->d_inode && +- file->f_dentry->d_inode->i_rdev ) +- { +- struct irctl *ir = &irctls[MINOR(file->f_dentry->d_inode->i_rdev)]; +- data=ir->p.data; ++ file->f_dentry->d_inode->i_rdev) { ++ struct irctl *ir; ++ ir = &irctls[MINOR(file->f_dentry->d_inode->i_rdev)]; ++ data = ir->p.data; + } + + return data; + } ++EXPORT_SYMBOL(lirc_get_pdata); + + + static ssize_t irctl_write(struct file *file, const char *buffer, +- size_t length, loff_t * ppos) ++ size_t length, loff_t *ppos) + { + struct irctl *ir = &irctls[MINOR(file->f_dentry->d_inode->i_rdev)]; + + dprintk(LOGHEAD "write called\n", ir->p.name, ir->p.minor); + + /* if the plugin has a specific read function use it instead */ +- if(ir->p.fops && ir->p.fops->write) ++ if (ir->p.fops && ir->p.fops->write) + return ir->p.fops->write(file, buffer, length, ppos); + +- if(!ir->attached) +- { ++ if (!ir->attached) + return -ENODEV; +- } + + return -EINVAL; + } + + + static struct file_operations fops = { +- read: irctl_read, +- write: irctl_write, +- poll: irctl_poll, +- ioctl: irctl_ioctl, +- open: irctl_open, +- release: irctl_close ++ .read = irctl_read, ++ .write = irctl_write, ++ .poll = irctl_poll, ++ .ioctl = irctl_ioctl, ++ .open = irctl_open, ++ .release = irctl_close + }; + + +-EXPORT_SYMBOL(lirc_get_pdata); +-EXPORT_SYMBOL(lirc_register_plugin); +-EXPORT_SYMBOL(lirc_unregister_plugin); +- +-/* +- * +- */ + static int lirc_dev_init(void) +-{ ++{ + int i; + +- for (i=0; i < MAX_IRCTL_DEVICES; ++i) { +- init_irctl(&irctls[i]); +- } ++ for (i = 0; i < MAX_IRCTL_DEVICES; ++i) ++ init_irctl(&irctls[i]); + +- if(register_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME, &fops)) { ++ if (register_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME, &fops)) { + printk(KERN_ERR "lirc_dev: register_chrdev failed\n"); + goto out; + } + + lirc_class = class_create(THIS_MODULE, "lirc"); +- if(IS_ERR(lirc_class)) { ++ if (IS_ERR(lirc_class)) { + printk(KERN_ERR "lirc_dev: class_create failed\n"); + goto out_unregister; + } + +- printk("lirc_dev: IR Remote Control driver registered, at major %d \n", +- IRCTL_DEV_MAJOR); ++ printk(KERN_INFO "lirc_dev: IR Remote Control driver registered, " ++ "major %d \n", IRCTL_DEV_MAJOR); + + return SUCCESS; + + out_unregister: +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) ++ if (unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME)) ++ printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n"); ++#else + /* unregister_chrdev returns void now */ + unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME); +-#else +- if(unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME)) +- printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n"); + #endif + out: + return -1; +@@ -910,20 +920,22 @@ + */ + void cleanup_module(void) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) +- /* unregister_chrdev returns void now */ +- unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME); +- class_destroy(lirc_class); +-#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) + int ret; + + ret = unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME); + class_destroy(lirc_class); + +- if(ret) +- printk("lirc_dev: error in module_unregister_chrdev: %d\n", ret); ++ if (ret) ++ printk(KERN_ERR "lirc_dev: error in " ++ "module_unregister_chrdev: %d\n", ret); + else + dprintk("lirc_dev: module successfully unloaded\n"); ++#else ++ /* unregister_chrdev returns void now */ ++ unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME); ++ class_destroy(lirc_class); ++ dprintk("lirc_dev: module unloaded\n"); + #endif + } + + +--- lirc-0.8.2/drivers/lirc_dev/lirc_dev.h 2007/09/27 19:47:20 1.20 ++++ lirc-0.8.2/drivers/lirc_dev/lirc_dev.h 2008/01/13 10:45:02 1.22 +@@ -14,18 +14,17 @@ + #define MAX_IRCTL_DEVICES 4 + #define BUFLEN 16 + +-//#define LIRC_BUFF_POWER_OF_2 ++/* #define LIRC_BUFF_POWER_OF_2 */ + #ifdef LIRC_BUFF_POWER_OF_2 +-#define mod(n, div) ((n) & ((div) -1)) ++#define mod(n, div) ((n) & ((div) - 1)) + #else + #define mod(n, div) ((n) % (div)) + #endif + #include + #include + +-struct lirc_buffer +-{ +- wait_queue_head_t wait_poll; ++struct lirc_buffer { ++ wait_queue_head_t wait_poll; + spinlock_t lock; + + unsigned char *data; +@@ -33,12 +32,14 @@ + unsigned int size; /* in chunks */ + unsigned int fill; /* in chunks */ + int head, tail; /* in chunks */ +- /* Using chunks instead of bytes pretends to simplify boundary checking ++ /* Using chunks instead of bytes pretends to simplify boundary checking + * And should allow for some performance fine tunning later */ + }; + static inline void _lirc_buffer_clear(struct lirc_buffer *buf) + { +- buf->head = buf->tail = buf->fill = 0; ++ buf->head = 0; ++ buf->tail = 0; ++ buf->fill = 0; + } + static inline int lirc_buffer_init(struct lirc_buffer *buf, + unsigned int chunk_size, +@@ -61,7 +62,9 @@ + { + kfree(buf->data); + buf->data = NULL; +- buf->head = buf->tail = buf->fill = 0; ++ buf->head = 0; ++ buf->tail = 0; ++ buf->fill = 0; + buf->chunk_size = 0; + buf->size = 0; + } +@@ -77,11 +80,13 @@ + { + return (buf->size - buf->fill); + } +-static inline void lirc_buffer_lock(struct lirc_buffer *buf, unsigned long *flags) ++static inline void lirc_buffer_lock(struct lirc_buffer *buf, ++ unsigned long *flags) + { + spin_lock_irqsave(&buf->lock, *flags); + } +-static inline void lirc_buffer_unlock(struct lirc_buffer *buf, unsigned long *flags) ++static inline void lirc_buffer_unlock(struct lirc_buffer *buf, ++ unsigned long *flags) + { + spin_unlock_irqrestore(&buf->lock, *flags); + } +@@ -135,49 +140,48 @@ + lirc_buffer_unlock(buf, &flags); + } + static inline void _lirc_buffer_write_n(struct lirc_buffer *buf, +- unsigned char* orig, int count) ++ unsigned char *orig, int count) + { +- memcpy(&buf->data[buf->tail*buf->chunk_size], orig, +- count*buf->chunk_size); +- buf->tail = mod(buf->tail+count, buf->size); ++ memcpy(&buf->data[buf->tail * buf->chunk_size], orig, ++ count * buf->chunk_size); ++ buf->tail = mod(buf->tail + count, buf->size); + buf->fill += count; + } + static inline void lirc_buffer_write_n(struct lirc_buffer *buf, +- unsigned char* orig, int count) ++ unsigned char *orig, int count) + { + unsigned long flags; + int space1; +- lirc_buffer_lock(buf,&flags); +- if( buf->head > buf->tail ) space1 = buf->head - buf->tail; +- else space1 = buf->size - buf->tail; +- +- if( count > space1 ) +- { ++ ++ lirc_buffer_lock(buf, &flags); ++ if (buf->head > buf->tail) ++ space1 = buf->head - buf->tail; ++ else ++ space1 = buf->size - buf->tail; ++ ++ if (count > space1) { + _lirc_buffer_write_n(buf, orig, space1); + _lirc_buffer_write_n(buf, orig+(space1*buf->chunk_size), + count-space1); +- } +- else +- { ++ } else { + _lirc_buffer_write_n(buf, orig, count); + } + lirc_buffer_unlock(buf, &flags); + } + +-struct lirc_plugin +-{ ++struct lirc_plugin { + char name[40]; + int minor; + int code_length; + int sample_rate; + unsigned long features; +- void* data; +- int (*add_to_buf) (void* data, struct lirc_buffer* buf); +- wait_queue_head_t* (*get_queue) (void* data); ++ void *data; ++ int (*add_to_buf) (void *data, struct lirc_buffer *buf); ++ wait_queue_head_t* (*get_queue) (void *data); + struct lirc_buffer *rbuf; +- int (*set_use_inc) (void* data); +- void (*set_use_dec) (void* data); +- int (*ioctl) (struct inode *,struct file *,unsigned int, ++ int (*set_use_inc) (void *data); ++ void (*set_use_dec) (void *data); ++ int (*ioctl) (struct inode *, struct file *, unsigned int, + unsigned long); + struct file_operations *fops; + struct device *dev; +@@ -188,7 +192,7 @@ + * + * minor: + * indicates minor device (/dev/lirc) number for registered plugin +- * if caller fills it with negative value, then the first free minor ++ * if caller fills it with negative value, then the first free minor + * number will be used (if available) + * + * code_length: +@@ -233,7 +237,7 @@ + * + * fops: + * file_operations for drivers which don't fit the current plugin model. +- * ++ * + * owner: + * the module owning this struct + * +@@ -242,7 +246,7 @@ + + /* following functions can be called ONLY from user context + * +- * returns negative value on error or minor number ++ * returns negative value on error or minor number + * of the registered device if success + * contens of the structure pointed by p is copied + */ + +--- lirc-0.8.2/drivers/lirc_serial/lirc_serial.c 2007/11/08 21:27:30 5.86 ++++ lirc-0.8.2/drivers/lirc_serial/lirc_serial.c 2007/12/15 17:28:01 5.87 +@@ -965,7 +965,7 @@ + do_gettimeofday(&lasttv); + + result=request_irq(irq,irq_handler, +- SA_INTERRUPT | (share_irq ? SA_SHIRQ:0), ++ IRQF_DISABLED | (share_irq ? IRQF_SHARED:0), + LIRC_DRIVER_NAME,(void *)&hardware); + + switch(result) +--- lirc-0.8.2/drivers/lirc_sir/lirc_sir.c 2007/09/27 19:47:23 1.47 ++++ lirc-0.8.2/drivers/lirc_sir/lirc_sir.c 2007/12/15 17:28:01 1.48 +@@ -1025,7 +1025,7 @@ + return -EBUSY; + } + #endif +- retval = request_irq(irq, sir_interrupt, SA_INTERRUPT, ++ retval = request_irq(irq, sir_interrupt, IRQF_DISABLED, + LIRC_DRIVER_NAME, NULL); + if (retval < 0) { + # + ifndef LIRC_ON_SA1100 \ No newline at end of file From janny at frugalware.org Thu Mar 6 19:33:46 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:33:46 2008 Subject: [Frugalware-git] fwlive_pkgs: redirfs-fwlive-0.2-3-i686 Message-ID: <20080306183346.38509119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=004ec76d3ee1b3c2a172ac3be891bef7e4e38f85 commit 004ec76d3ee1b3c2a172ac3be891bef7e4e38f85 Author: Janos Kovacs Date: Thu Mar 6 19:33:08 2008 +0100 redirfs-fwlive-0.2-3-i686 * add new pkg to fwlive_pkgs repo diff --git a/source/apps-extra/redirfs-fwlive/FrugalBuild b/source/apps-extra/redirfs-fwlive/FrugalBuild new file mode 100644 index 0000000..3f00a07 --- /dev/null +++ b/source/apps-extra/redirfs-fwlive/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.04 SBU +# Maintainer: VMiklos + +pkgname=redirfs-fwlive +_F_archive_name=redirfs +pkgver=0.2 +pkgrel=3 +pkgdesc="Redirecting FileSystem" +url="http://redirfs.org/" +_F_kernelmod_scriptlet=$_F_archive_name.install +Finclude kernel-module +kver=2.6.24-3 +depends=("kernel-fwlive=$kver") +makedepends=("kernel-fwlive-source=$kver") +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://redirfs.org/tiki-index.php?page=redirfs_download|grep -m1 gz$|Flasttar" +source=(http://www.redirfs.org/packages/redirfs-$pkgver.tar.gz) +sha1sums=('c736b6a9b9cb0540010eb865febfd4f3b1fe6d82') + +build() +{ + # no Fcheckkernel, crosscompilation verified + Fsed 'uname -r' "echo $_F_kernelmod_uname" Makefile + Fmake + Ffilerel /lib/modules/$_F_kernelmod_uname/extra/$_F_archive_name.ko + Fbuild_kernelmod_scriptlet +} diff --git a/source/apps-extra/redirfs-fwlive/redirfs.install b/source/apps-extra/redirfs-fwlive/redirfs.install new file mode 100644 index 0000000..8162fbb --- /dev/null +++ b/source/apps-extra/redirfs-fwlive/redirfs.install @@ -0,0 +1,38 @@ +post_install() +{ + if ! grep -q redirfs /etc/sysconfig/modules; then + echo -n "adding redirfs to /etc/sysconfig/modules..." + echo redirfs >> /etc/sysconfig/modules + echo " done." + fi + depmod -a $_F_kernelmod_uname + if lsmod|grep -q redirfs; then + rmmod redirfs + fi + echo -n "loading redirfs..." + modprobe redirfs + echo " done." +} + +post_upgrade() +{ + post_install +} + +pre_remove() +{ + if grep -q redirfs /etc/sysconfig/modules; then + echo -n "removing redirfs from /etc/sysconfig/modules..." + sed -i '/^redirfs/d' /etc/sysconfig/modules + echo " done." + fi + if lsmod|grep -q redirfs; then + echo -n "unloading redirfs..." + rmmod redirfs + echo " done." + fi +} + +op=$1 +shift +$op $* From janny at frugalware.org Thu Mar 6 19:34:49 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:34:51 2008 Subject: [Frugalware-git] fwlive_pkgs: squashfs-3.3-3-i686 Message-ID: <20080306183449.B6142119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=d1cb8964f04043b3fdd3a3de4d898541b6d8650b commit d1cb8964f04043b3fdd3a3de4d898541b6d8650b Author: Janos Kovacs Date: Thu Mar 6 19:34:28 2008 +0100 squashfs-3.3-3-i686 * version bump diff --git a/source/apps-extra/squashfs/FrugalBuild b/source/apps-extra/squashfs/FrugalBuild index 367f3d0..138b83d 100644 --- a/source/apps-extra/squashfs/FrugalBuild +++ b/source/apps-extra/squashfs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=squashfs pkgver=3.3 lzmaver=457 -kver=2.6.23-6 +kver=2.6.24-3 kdir=/lib/modules/${kver/-/-fw}/kernel/fs/${pkgname} pkgrel=3 url="http://www.squashfs-lzma.org" @@ -14,13 +14,20 @@ makedepends=("kernel-fwlive-source=$kver") groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=63835|grep squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'" -source=(${url}/dl/lzma${lzmaver}.tar.bz2 ${url}/dl/${pkgname}-cvsfix.patch \ - ${url}/dl/${pkgname}3.3.tar.gz ${url}/dl/sqlzma3.3-${lzmaver}.tar.bz2 mksquashfs.quiet.patch) +source=(${url}/dl/lzma${lzmaver}.tar.bz2 \ + ${url}/dl/${pkgname}3.3.tar.gz \ + ${url}/dl/sqlzma3.3-${lzmaver}.tar.bz2 \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/${pkgname}-cvsfix.patch \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/sqlzma1-449.patch \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/sqlzma2u-3.3.patch \ + http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/mksquashfs.quiet.patch ) options=('scriptlet') sha1sums=('bd1b46ba42fe1ad7351a39c131e8b7657e909001' \ - '17da1cd356cd50a1c1cefb86670437abcdb83986' \ 'e610ee21fb910606615cd158eda3c650af8a61cc' \ 'adec846e3b3b57337ccddbc8aafab3da0b049753' \ + '17da1cd356cd50a1c1cefb86670437abcdb83986' \ + '4b89853ff744e02f970c667bc374ce4fa5400d08' \ + '5620c20b72a039eae12fcc1ad6f28bc1b381c8a9' \ '11cbb2475fe34e94bc869ae33e52c343ee497977') build() @@ -30,6 +37,7 @@ build() tar -C lzma${lzmaver} -xf lzma${lzmaver}.tar.bz2 || Fdie Fmessage "copy /usr/src/linux/ ./" cp -a /usr/src/linux/ ./ || Fdie + Fmessage "patching" patch -p0 Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=adf7cc8e6ccf22ec1e930625cd67318ff59061ac commit adf7cc8e6ccf22ec1e930625cd67318ff59061ac Author: Janos Kovacs Date: Thu Mar 6 19:35:51 2008 +0100 gspcav1-fwlive-1.00.20-6-i686 * version bump diff --git a/source/multimedia-extra/gspcav1-fwlive/FrugalBuild b/source/multimedia-extra/gspcav1-fwlive/FrugalBuild index 2218e3a..9d363e9 100644 --- a/source/multimedia-extra/gspcav1-fwlive/FrugalBuild +++ b/source/multimedia-extra/gspcav1-fwlive/FrugalBuild @@ -2,27 +2,27 @@ # Maintainer: Janny pkgname=gspcav1-fwlive +_F_archive_name=gspcav1 pkgver=1.00.20 -pkgrel=3 +pkgrel=6 pkgdate=20071224 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" license="GPL" Finclude kernel-module -kver=2.6.23-6 +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` archs=('i686' 'x86_64') groups=('multimedia-extra') replaces=('spca5xx') up2date="lynx -dump $url/download.html|grep -m1 'gspcav1'|sed 's/.*version \(.*\) da.*/\1/'" -source=(http://mxhaard.free.fr/spca50x/Download/gspcav1-$pkgdate.tar.gz) +source=(http://mxhaard.free.fr/spca50x/Download/$_F_archive_name-$pkgdate.tar.gz) sha1sums=('e34e91f4bccc69830f1b5f09fe0ecb4eccfe854d') build() { # no Fcheckkernel, crosscompilation verified - Fcd gspcav1-$pkgdate + Fcd $_F_archive_name-$pkgdate Fsed '`uname -r`' "$_F_kernelmod_uname" Makefile Fmake sed -i s\%MODULE_INSTALLDIR\ =\ /lib%MODULE_INSTALLDIR\ =\ $Fdestdir/lib% Makefile || Fdie @@ -31,6 +31,6 @@ build() { sed -i s\%@/sbin/depmod%% Makefile || Fdie sed -i s\%su\ -c\ \"make\ install-root\"%make\ install-root% Makefile || Fdie make DESTDIR=$Fdestdir install || Fdie - Ffileschmod ../src/gspcav1-$pkgdate 644 + Ffileschmod ../src/$_F_archive_name-$pkgdate 644 Fbuild_kernelmod_scriptlet } From janny at frugalware.org Thu Mar 6 19:38:17 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:38:18 2008 Subject: [Frugalware-git] fwlive_pkgs: qc-usb-fwlive-0.6.6-31-i686 Message-ID: <20080306183817.1BCBA119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=2604ec4b7f4f19700265a4bf739ac60544025e90 commit 2604ec4b7f4f19700265a4bf739ac60544025e90 Author: Janos Kovacs Date: Thu Mar 6 19:37:54 2008 +0100 qc-usb-fwlive-0.6.6-31-i686 * version bump diff --git a/source/multimedia-extra/qc-usb-fwlive/FrugalBuild b/source/multimedia-extra/qc-usb-fwlive/FrugalBuild index a501808..64f30c2 100644 --- a/source/multimedia-extra/qc-usb-fwlive/FrugalBuild +++ b/source/multimedia-extra/qc-usb-fwlive/FrugalBuild @@ -3,24 +3,27 @@ pkgname=qc-usb-fwlive pkgver=0.6.6 -pkgrel=28 +pkgrel=31 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="qce-ga" _F_sourceforge_name="qc-usb" Finclude kernel-module sourceforge -kver=2.6.23-6 +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" url="http://qce-ga.sourceforge.net/" +source=($source kernel-2.6.24.patch) up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=12924|grep qc-usb |sed 's/[^]]*][^]]*]\([^ ]*\) .*/\1/;q'" -sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43') +sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \ + 'e0362a80fc4d08d7cfa10899ded63b6eaf854ee7') build() { Fcd qc-usb-$pkgver + Fpatchall # no Fcheckkernel, crosscompilation verified make LINUX_DIR=$_F_kernelmod_dir/build all || return 1 Ffilerel $_F_kernelmod_dir/kernel/drivers/usb/misc/quickcam.ko diff --git a/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch b/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch new file mode 100644 index 0000000..2f7b0e0 --- /dev/null +++ b/source/multimedia-extra/qc-usb-fwlive/kernel-2.6.24.patch @@ -0,0 +1,39 @@ +by Stefan Lippers-Hollmann +fixes kernel 2.6.24 compatibility. + +diff -urNad qc-usb-0.6.6~/qc-driver.c qc-usb-0.6.6/qc-driver.c +--- qc-usb-0.6.6~/qc-driver.c 2006-10-24 04:06:19.000000000 +0200 ++++ qc-usb-0.6.6/qc-driver.c 2007-12-09 17:20:30.000000000 +0100 +@@ -821,7 +821,9 @@ + if (!cr) goto fail2; + urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */ + if (!urb->transfer_buffer) goto fail3; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + spin_lock_init(&urb->lock); ++#endif + urb->complete = qc_i2c_handler; + urb->context = qc; + #if (LINUX_VERSION_CODE= KERNEL_VERSION(2,6,0) + release: qc_v4l_release, +diff -urNad qc-usb-0.6.6~/quickcam.h qc-usb-0.6.6/quickcam.h +--- qc-usb-0.6.6~/quickcam.h 2006-11-04 14:38:27.000000000 +0100 ++++ qc-usb-0.6.6/quickcam.h 2007-12-09 17:17:01.000000000 +0100 +@@ -126,7 +126,9 @@ + #define FALSE 0 + #define TRUE (!FALSE) + typedef unsigned char Bool; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + #define BIT(x) (1<<(x)) ++#endif + #define SIZE(a) (sizeof(a)/sizeof((a)[0])) + #define MAX(a,b) ((a)>(b)?(a):(b)) + #define MIN(a,b) ((a)<(b)?(a):(b)) From janny at frugalware.org Thu Mar 6 19:39:34 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:39:36 2008 Subject: [Frugalware-git] fwlive_pkgs: madwifi-fwlive-0.9.4-2-i686 Message-ID: <20080306183934.88925119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=2da892c3aa077018e57c87264da3199b8a3835d2 commit 2da892c3aa077018e57c87264da3199b8a3835d2 Author: Janos Kovacs Date: Thu Mar 6 19:39:10 2008 +0100 madwifi-fwlive-0.9.4-2-i686 * version bump diff --git a/source/network/madwifi-fwlive/FrugalBuild b/source/network/madwifi-fwlive/FrugalBuild index 8d33586..87846f9 100644 --- a/source/network/madwifi-fwlive/FrugalBuild +++ b/source/network/madwifi-fwlive/FrugalBuild @@ -2,34 +2,29 @@ # Maintainer: VMiklos pkgname=madwifi-fwlive -pkgver=0.9.3.3 -pkgrel=7 +_F_archive_name=madwifi +_F_sourceforge_name=madwifi +pkgver=0.9.4 +pkgrel=2 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" -Finclude kernel-module -#depends=(${depends[@]} 'wireless_tools') -replaces=('madwifi-ng') -#makedepends=(${makedepends[@]} 'sharutils') -kver=2.6.23-6 +Finclude kernel-module sourceforge +kver=2.6.24-3 depends=("kernel-fwlive=$kver" 'wireless_tools') +replaces=('madwifi-ng') makedepends=("kernel-fwlive-source=$kver" 'sharutils') -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" groups=('network') archs=('i686' 'x86_64') -_F_sourceforge_name="madwifi" -_F_rcd_name="madwifi" -Finclude sourceforge source=($source madwifi-0.9.3-cflags.diff) -sha1sums=('acdd6f06b484202225fd3f888564e18e0f064af1' \ +sha1sums=('6f289cb2e99d27b23570d15b69bf0f4240e34d1e' \ '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35') # If the package needs testing, feel free to poke Benjamin Woods build() { + Fcd $_F_archive_name-$pkgver # no Fcheckkernel, crosscompilation verified - Fcd madwifi-$pkgver Fpatchall KERNELPATH=/usr/src/linux Fmake Fmakeinstall KERNELPATH=/usr/src/linux \ From janny at frugalware.org Thu Mar 6 19:42:43 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:42:44 2008 Subject: [Frugalware-git] fwlive_pkgs: acx100-fwlive-20071003-9-i686 Message-ID: <20080306184243.07931119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=fd3aa35c2012254978e689d5fb0dedb26b33f39f commit fd3aa35c2012254978e689d5fb0dedb26b33f39f Author: Janos Kovacs Date: Thu Mar 6 19:41:16 2008 +0100 acx100-fwlive-20071003-9-i686 * version bump diff --git a/source/network-extra/acx100-fwlive/kernel-2.6.24.patch b/source/network-extra/acx100-fwlive/kernel-2.6.24.patch new file mode 100644 index 0000000..4e70628 --- /dev/null +++ b/source/network-extra/acx100-fwlive/kernel-2.6.24.patch @@ -0,0 +1,21 @@ +--- pci.c ++++ pci.c 2007/11/11 23:41:12 +@@ -2116,7 +2116,7 @@ + /* TODO: pci_set_power_state(pdev, PCI_D0); ? */ + + /* request shared IRQ handler */ +- if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) { ++ if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) { + printk("%s: request_irq FAILED\n", ndev->name); + result = -EAGAIN; + goto done; +--- usb.c ++++ usb.c 2007/11/11 23:48:50 +@@ -859,7 +859,6 @@ + ndev->watchdog_timeo = 4 * HZ; + #endif + ndev->change_mtu = &acx_e_change_mtu; +- SET_MODULE_OWNER(ndev); + + /* Setup private driver context */ + From janny at frugalware.org Thu Mar 6 19:44:43 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:44:44 2008 Subject: [Frugalware-git] fwlive_pkgs: ndiswrapper-fwlive-1.51-6-i686 Message-ID: <20080306184443.D79E1119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=184298c620344dadea93a26c7fa4a5d24f64037c commit 184298c620344dadea93a26c7fa4a5d24f64037c Author: Janos Kovacs Date: Thu Mar 6 19:44:00 2008 +0100 ndiswrapper-fwlive-1.51-6-i686 * version bump diff --git a/source/network-extra/ndiswrapper-fwlive/FrugalBuild b/source/network-extra/ndiswrapper-fwlive/FrugalBuild index 3e98f03..68b13c7 100644 --- a/source/network-extra/ndiswrapper-fwlive/FrugalBuild +++ b/source/network-extra/ndiswrapper-fwlive/FrugalBuild @@ -4,14 +4,14 @@ pkgname=ndiswrapper-fwlive pkgver=1.51 -pkgrel=3 +pkgrel=6 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_sourceforge_name="ndiswrapper" -_F_kernelmod_scriptlet=ndiswrapper.install Finclude kernel-module sourceforge -kver=2.6.23-6 +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") +unset install depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') @@ -32,6 +32,5 @@ build() Fmake Fmakeinstall Fdoc README.Frugalware - Fsed '$_F_kernelmod_uname' "`echo $kver|sed 's/-/-fw/'`" $startdir/ndiswrapper.install Fbuild_kernelmod_scriptlet } From janny at frugalware.org Thu Mar 6 19:46:40 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:46:41 2008 Subject: [Frugalware-git] fwlive_pkgs: wlan-ng-fwlive-0.2.8-18-i686 Message-ID: <20080306184640.1367D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=a3279bc7c4fa0306c636571a8bd0964e91574909 commit a3279bc7c4fa0306c636571a8bd0964e91574909 Author: Janos Kovacs Date: Thu Mar 6 19:46:14 2008 +0100 wlan-ng-fwlive-0.2.8-18-i686 * version bump diff --git a/source/network-extra/wlan-ng-fwlive/FrugalBuild b/source/network-extra/wlan-ng-fwlive/FrugalBuild index d7f07ce..9fbd7c7 100644 --- a/source/network-extra/wlan-ng-fwlive/FrugalBuild +++ b/source/network-extra/wlan-ng-fwlive/FrugalBuild @@ -3,30 +3,30 @@ pkgname=wlan-ng-fwlive pkgver=0.2.8 -pkgrel=15 +pkgrel=18 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" +_F_archive_name=wlan-ng Finclude kernel-module -kver=2.6.23-6 -depends=("kernel-fwlive=$kver") +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" 'wireless_tools') makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" depends=(${depends[@]} 'bash') groups=('network-extra') archs=('i686' 'x86_64') backup=(etc/wlan/wlan.conf) up2date="lynx -dump ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/|grep tar.bz2$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-//;$ p'" -source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-$pkgver.tar.bz2 \ - rc.wlan wlan-ng-0.2.8-kernel2623.diff) +source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-$_F_archive_name-$pkgver.tar.bz2 \ + rc.wlan wlan-ng-0.2.8-kernel26{23,24}.diff) sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de' \ 'b5b76089293cf11ab5c5f634f1c3b8dd7f4c34a7' \ - 'dd46ef1066debf1596902c9d8bb7c3988e98e184') + 'dd46ef1066debf1596902c9d8bb7c3988e98e184' \ + '1987d4137a82cfbb4a390228e5d33155f52e1fbc') build() { # no Fcheckkernel, crosscompilation verified - Fcd linux-wlan-ng-$pkgver + Fcd linux-$_F_archive_name-$pkgver Fsed '`uname -r`' "$_F_kernelmod_uname" Configure find . -type f -exec sed -i '/#include /d' {} \; Fsed "TARGET_ROOT_ON_HOST=" "TARGET_ROOT_ON_HOST=$Fdestdir" config.in diff --git a/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2624.diff b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2624.diff new file mode 100644 index 0000000..6144045 --- /dev/null +++ b/source/network-extra/wlan-ng-fwlive/wlan-ng-0.2.8-kernel2624.diff @@ -0,0 +1,82 @@ +--- src/p80211/p80211netdev.c ++++ src/p80211/p80211netdev.c +@@ -82,6 +82,8 @@ + #if WIRELESS_EXT > 12 + #include + #endif ++#include ++ + + /*================================================================*/ + /* Project Includes */ +@@ -167,11 +169,11 @@ + DBFENTER; + + #ifdef CONFIG_PROC_FS +- if (proc_net != NULL) { ++ if (init_net.proc_net != NULL) { + proc_p80211 = create_proc_entry( + "p80211", + (S_IFDIR|S_IRUGO|S_IXUGO), +- proc_net); ++ init_net.proc_net); + } + #endif + DBFEXIT; +@@ -196,7 +198,7 @@ + DBFENTER; + #ifdef CONFIG_PROC_FS + if (proc_p80211 != NULL) { +- remove_proc_entry("p80211", proc_net); ++ remove_proc_entry("p80211", init_net.proc_net); + } + #endif + DBFEXIT; +--- src/prism2/driver/prism2_cs.c ++++ src/prism2/driver/prism2_cs.c +@@ -517,7 +517,6 @@ + #endif + + /* Register the network device and get assigned a name */ +- SET_MODULE_OWNER(wlandev->netdev); + SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(pdev)); + if (register_wlandev(wlandev) != 0) { + WLAN_LOG_NOTICE("prism2sta_cs: register_wlandev() failed.\n"); +@@ -1080,7 +1079,6 @@ + link->dev = &hw->node; + + /* Register the network device and get assigned a name */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) ) + SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(link->handle)); + #endif +--- src/prism2/driver/prism2_pci.c ++++ src/prism2/driver/prism2_pci.c +@@ -119,7 +119,6 @@ + /* Register the wlandev, this gets us a name and registers the + * linux netdevice. + */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev)); + #endif +--- src/prism2/driver/prism2_plx.c ++++ src/prism2/driver/prism2_plx.c +@@ -228,7 +228,6 @@ + /* Register the wlandev, this gets us a name and registers the + * linux netdevice. + */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev)); + #endif +--- src/prism2/driver/prism2_usb.c ++++ src/prism2/driver/prism2_usb.c +@@ -131,7 +131,6 @@ + /* Register the wlandev, this gets us a name and registers the + * linux netdevice. + */ +- SET_MODULE_OWNER(wlandev->netdev); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + SET_NETDEV_DEV(wlandev->netdev, &(interface->dev)); + #endif From janny at frugalware.org Thu Mar 6 19:52:46 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:52:48 2008 Subject: [Frugalware-git] fwlive_pkgs: fglrx-fwlive-8.42.3-10-i686 Message-ID: <20080306185246.22D8A119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=21600bf965dc0f83ed8a56450faf9fbebbe04f2d commit 21600bf965dc0f83ed8a56450faf9fbebbe04f2d Author: Janos Kovacs Date: Thu Mar 6 19:48:29 2008 +0100 fglrx-fwlive-8.42.3-10-i686 * version bump diff --git a/source/x11-extra/fglrx-fwlive/FrugalBuild b/source/x11-extra/fglrx-fwlive/FrugalBuild index 829aea0..1d55609 100644 --- a/source/x11-extra/fglrx-fwlive/FrugalBuild +++ b/source/x11-extra/fglrx-fwlive/FrugalBuild @@ -3,13 +3,15 @@ # Maintainer: voroskoi pkgname=fglrx-fwlive +_F_archive_name=fglrx pkgver=8.42.3 -pkgrel=7 +pkgrel=10 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it +_F_kernelmod_scriptlet=fglrx_module.install Finclude kernel-module -kver=2.6.23-6 +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` @@ -20,7 +22,7 @@ subdescs=('fglrx kernel module') subdepends=($depends) subgroups=('x11-extra') subarchs=('i686 x86_64') -subinstall=fglrx_module-fwlive.install +subinstall=fglrx_module.install depends=() rodepends=('fglrx_module-fwlive' 'xorg-server' 'libstdc++5') @@ -28,15 +30,16 @@ conflicts=('libgl') provides=('libgl') groups=('x11-extra') archs=('i686' 'x86_64') -install=$pkgname.install +install=$_F_archive_name.install up2date=$pkgver source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run \ - README.Frugalware libGL.la fglrx-firegl_public.c-2.6.23.patch) + README.Frugalware libGL.la \ + fglrx-firegl_public.c-2.6.24.patch) options=(${options[@]} 'nodocs') sha1sums=('b8e878e846e0971d49339ee5957acc6482329510' \ 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ - '57eab429062d6cf64b19e67f2097ef2ce525edeb') + '5c88075b135bbc6700301d29736a74177b6df860') Xversion=x710 @@ -53,7 +56,8 @@ build() { fi cp -r $Fsrcdir/ATi/common/* $Fsrcdir/ || Fdie - patch -p0 < $Fsrcdir/fglrx-firegl_public.c-2.6.23.patch || Fdie + + patch -p0 < $Fsrcdir/fglrx-firegl_public.c-2.6.24.patch || Fdie # building kernel module Fcd /lib/modules/fglrx/build_mod @@ -62,7 +66,7 @@ build() { Ffile lib/modules/fglrx/build_mod/fglrx.ko $_F_kernelmod_dir/video/fglrx.ko # moving the intresting part to the package - mv $Fsrcdir/usr $Fdestdir || Fdie + mv $Fsrcdir/{usr,etc} $Fdestdir || Fdie # Install into correct paths for Xorg7 Fmkdir /usr/{include,lib/xorg,bin} @@ -99,13 +103,12 @@ build() { Fln libGL.so.1.2 /usr/lib/libGL.so.1 cp -ar $Fsrcdir/libGL.la $Fdestdir/usr/lib || Fdie - (find $Fdestdir -type d |xargs chmod 755) || Fdie # closes #2498 (find $Fdestdir -perm 744 |xargs chmod 755) || Fdie Fdoc README.Frugalware - Fsplit fglrx_module-fwlive /lib + Fsplit fglrx_module /lib Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.23.patch b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.23.patch deleted file mode 100644 index 468f9c9..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.23.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- lib/modules/fglrx/build_mod/firegl_public.c.orig 2007-08-10 23:59:21.000000000 +0200 -+++ lib/modules/fglrx/build_mod/firegl_public.c 2007-08-13 20:00:26.000000000 +0200 -@@ -214,6 +214,56 @@ - #define preempt_enable() - #endif - -+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22) -+#if defined(__i386__) -+#define ptep_test_and_clear_dirty(vma, addr, ptep) ({ \ -+ int __ret = 0; \ -+ if (pte_dirty(*(ptep))) \ -+ __ret = test_and_clear_bit(_PAGE_BIT_DIRTY, \ -+ &(ptep)->pte_low); \ -+ if (__ret) \ -+ pte_update((vma)->vm_mm, addr, ptep); \ -+ __ret; \ -+}) -+ -+static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_USER; } -+static inline int pte_user(pte_t pte) { return (pte).pte_low & _PAGE_USER; } -+#ifdef CONFIG_X86_PAE -+/* -+ * Is the pte executable? -+ */ -+static inline int pte_x(pte_t pte) -+{ -+ return !(pte_val(pte) & _PAGE_NX); -+} -+ -+/* -+ * All present user-pages with !NX bit are user-executable: -+ */ -+static inline int pte_exec(pte_t pte) -+{ -+ return pte_user(pte) && pte_x(pte); -+} -+#else -+static inline int pte_exec(pte_t pte) -+{ -+ return pte_user(pte); -+} -+#endif /* PAE */ -+ -+#elif defined(__x86_64__) -+static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, -+ unsigned long addr, pte_t *ptep) -+{ -+ if (!pte_dirty(*ptep)) -+ return 0; -+ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte); -+} -+static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; } -+static inline int pte_exec(pte_t pte) { return !(pte_val(pte) & _PAGE_NX); } -+#endif -+#endif -+ - // ============================================================ - /* globals */ - -@@ -2356,7 +2406,7 @@ void ATI_API_CALL __ke_put_vm_page_table - #ifndef ptep_clear_flush_dirty - #define ptep_clear_flush_dirty(__vma, __address, __ptep) \ - ({ \ -- int __dirty = ptep_test_and_clear_dirty(__ptep); \ -+ int __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); \ - if (__dirty) \ - flush_tlb_page(__vma, __address); \ - __dirty; \ -@@ -5303,7 +5353,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_R - /** \brief Type definition of the structure describing Slab Cache object */ - typedef struct tag_kasSlabCache_t - { -- kmem_cache_t* cache; /* OS slab cache object */ -+ struct kmem_cache *cache; /* OS slab cache object */ - spinlock_t lock; /* OS spinlock object protecting the cache */ - unsigned int routine_type; /* Type of routine the cache might be accessed from */ - char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ -@@ -5349,7 +5399,7 @@ unsigned int ATI_API_CALL KAS_SlabCache_ - DBG_TRACE("creating slab object '%s'", slabcache_obj->name); - - if ((slabcache_obj->cache = -- kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL))) -+ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL))) - { - ret = 1; - } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch new file mode 100644 index 0000000..740eb1f --- /dev/null +++ b/source/x11-extra/fglrx-fwlive/fglrx-firegl_public.c-2.6.24.patch @@ -0,0 +1,104 @@ +--- lib/modules/fglrx/build_mod/firegl_public.c.orig 2007-08-10 23:59:21.000000000 +0200 ++++ lib/modules/fglrx/build_mod/firegl_public.c 2007-08-13 20:00:26.000000000 +0200 +@@ -214,6 +214,56 @@ + #define preempt_enable() + #endif + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22) ++#if defined(__i386__) ++#define ptep_test_and_clear_dirty(vma, addr, ptep) ({ \ ++ int __ret = 0; \ ++ if (pte_dirty(*(ptep))) \ ++ __ret = test_and_clear_bit(_PAGE_BIT_DIRTY, \ ++ &(ptep)->pte_low); \ ++ if (__ret) \ ++ pte_update((vma)->vm_mm, addr, ptep); \ ++ __ret; \ ++}) ++ ++static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_USER; } ++static inline int pte_user(pte_t pte) { return (pte).pte_low & _PAGE_USER; } ++#ifdef CONFIG_X86_PAE ++/* ++ * Is the pte executable? ++ */ ++static inline int pte_x(pte_t pte) ++{ ++ return !(pte_val(pte) & _PAGE_NX); ++} ++ ++/* ++ * All present user-pages with !NX bit are user-executable: ++ */ ++static inline int pte_exec(pte_t pte) ++{ ++ return pte_user(pte) && pte_x(pte); ++} ++#else ++static inline int pte_exec(pte_t pte) ++{ ++ return pte_user(pte); ++} ++#endif /* PAE */ ++ ++#elif defined(__x86_64__) ++static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, ++ unsigned long addr, pte_t *ptep) ++{ ++ if (!pte_dirty(*ptep)) ++ return 0; ++ return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte); ++} ++static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; } ++static inline int pte_exec(pte_t pte) { return !(pte_val(pte) & _PAGE_NX); } ++#endif ++#endif ++ + // ============================================================ + /* globals */ + +@@ -2356,7 +2406,7 @@ void ATI_API_CALL __ke_put_vm_page_table + #ifndef ptep_clear_flush_dirty + #define ptep_clear_flush_dirty(__vma, __address, __ptep) \ + ({ \ +- int __dirty = ptep_test_and_clear_dirty(__ptep); \ ++ int __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); \ + if (__dirty) \ + flush_tlb_page(__vma, __address); \ + __dirty; \ +@@ -2986,7 +2986,7 @@ + { + return request_irq(irq, + (void(*)(int, void *, struct pt_regs *))handler, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -3009,7 +3009,7 @@ + irq_handler_func = handler; + return request_irq(irq, + ke_irq_handler_wrap, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -5303,7 +5353,7 @@ unsigned int ATI_API_CALL KAS_Spinlock_R + /** \brief Type definition of the structure describing Slab Cache object */ + typedef struct tag_kasSlabCache_t + { +- kmem_cache_t* cache; /* OS slab cache object */ ++ struct kmem_cache *cache; /* OS slab cache object */ + spinlock_t lock; /* OS spinlock object protecting the cache */ + unsigned int routine_type; /* Type of routine the cache might be accessed from */ + char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ +@@ -5349,7 +5399,7 @@ unsigned int ATI_API_CALL KAS_SlabCache_ + DBG_TRACE("creating slab object '%s'", slabcache_obj->name); + + if ((slabcache_obj->cache = +- kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL))) ++ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL))) + { + ret = 1; + } diff --git a/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install b/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install deleted file mode 100644 index 7c80936..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx-fwlive.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() -{ - echo 'You have successfully installed the ATi proprietary driver!' - echo 'To configure your xserver please run aticonfig!' - echo 'Before using X please restart your computer!' -} - -post_upgrade() -{ - post_install $1 -} - -op=$1 -shift -$op $* - -# vim: ft=sh diff --git a/source/x11-extra/fglrx-fwlive/fglrx.install b/source/x11-extra/fglrx-fwlive/fglrx.install new file mode 100644 index 0000000..7c80936 --- /dev/null +++ b/source/x11-extra/fglrx-fwlive/fglrx.install @@ -0,0 +1,17 @@ +post_install() +{ + echo 'You have successfully installed the ATi proprietary driver!' + echo 'To configure your xserver please run aticonfig!' + echo 'Before using X please restart your computer!' +} + +post_upgrade() +{ + post_install $1 +} + +op=$1 +shift +$op $* + +# vim: ft=sh diff --git a/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install b/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install deleted file mode 100644 index 92f6293..0000000 --- a/source/x11-extra/fglrx-fwlive/fglrx_module-fwlive.install +++ /dev/null @@ -1,23 +0,0 @@ -post_install() -{ - [ `grep fglrx < /etc/sysconfig/modules|wc -l` == 0 ] && \ - echo 'fglrx' >> /etc/sysconfig/modules - /sbin/depmod -a $_F_kernelmod_uname -} - -post_upgrade() -{ - post_install $1 -} - -pre_remove() -{ - [ ! `/sbin/lsmod|grep fglrx|wc -l` == 0 ] && /sbin/rmmod fglrx - sed -i 's|fglrx||g' /etc/sysconfig/modules -} - -op=$1 -shift -$op $* - -# vim: ft=sh diff --git a/source/x11-extra/fglrx-fwlive/fglrx_module.install b/source/x11-extra/fglrx-fwlive/fglrx_module.install new file mode 100644 index 0000000..92f6293 --- /dev/null +++ b/source/x11-extra/fglrx-fwlive/fglrx_module.install @@ -0,0 +1,23 @@ +post_install() +{ + [ `grep fglrx < /etc/sysconfig/modules|wc -l` == 0 ] && \ + echo 'fglrx' >> /etc/sysconfig/modules + /sbin/depmod -a $_F_kernelmod_uname +} + +post_upgrade() +{ + post_install $1 +} + +pre_remove() +{ + [ ! `/sbin/lsmod|grep fglrx|wc -l` == 0 ] && /sbin/rmmod fglrx + sed -i 's|fglrx||g' /etc/sysconfig/modules +} + +op=$1 +shift +$op $* + +# vim: ft=sh diff --git a/source/x11-extra/fglrx-fwlive/libGL.la b/source/x11-extra/fglrx-fwlive/libGL.la new file mode 100644 index 0000000..5739533 --- /dev/null +++ b/source/x11-extra/fglrx-fwlive/libGL.la @@ -0,0 +1,32 @@ +# libGL.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGL.so.1' + +# Names of this library. +library_names='libGL.so.1.2 libGL.so.1 libGL.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs=' -L/usr/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' + +# Version information for libGL. +current=3 +age=2 +revision=0 + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/lib' From janny at frugalware.org Thu Mar 6 19:55:00 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:55:01 2008 Subject: [Frugalware-git] fwlive_pkgs: nvidia-96xx-fwlive-96.43.05-4-i686 Message-ID: <20080306185500.AA89A119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=5fd1d42df37559d71245cf8e36acfa9f659258c3 commit 5fd1d42df37559d71245cf8e36acfa9f659258c3 Author: Janos Kovacs Date: Thu Mar 6 19:53:47 2008 +0100 nvidia-96xx-fwlive-96.43.05-4-i686 * version bump diff --git a/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild b/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild index 660518d..06e8bd4 100644 --- a/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-fwlive/FrugalBuild @@ -2,8 +2,9 @@ # Maintainer: AlexExtreme pkgname=nvidia-96xx-fwlive -pkgver=96.43.01 -pkgrel=6 +_F_archive_name=nvidia-96xx +pkgver=96.43.05 +pkgrel=4 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') @@ -18,22 +19,22 @@ up2date="lynx -dump http://www.nvidia.com/object/unix.html | grep -m1 'Latest Le if [ "$CARCH" == "i686" ]; then _arch=x86 pkgnum=1 - sha1sums=('b92e46eb09514a15023e60dadda616b8811ce28b') + sha1sums=('ee4b15c1e550607bcf0768490c8127c3ae0e565d') else _arch=x86_64 pkgnum=2 - sha1sums=('d0dc8d61c32631eb397a8348630eadbae2744e96') + sha1sums=('9f20838b33c54c3d54e7fdbe87a3b47d542d21f1') fi source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip') Finclude kernel-module -kver=2.6.23-6 +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" depends=(${depends[@]} 'xorg-server>=1.1.0' 'pciutils') ## TMP for gf4 -install=$pkgname.install +install=$_F_archive_name.install build() { nvdir=NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum diff --git a/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx-fwlive.install b/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx-fwlive.install deleted file mode 100644 index 491156d..0000000 --- a/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx-fwlive.install +++ /dev/null @@ -1,60 +0,0 @@ -post_install() { - echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." - echo "*** If you don't accept it, please remove the package!" - ## well here a 'WARNING' only on install | update because I don't know this - ## metamodes option will work for all - devnr=`lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` - - if [ "$devnr" ]; then - if [ "$devnr" -eq 0179 ]; then - echo "" - echo "*** WARNING: Nvidia - GeForce4 440/420 Go 32/64M - with PCI ID: - 0x$devnr - detected." - echo "*** WARNING: If you get an black screen try add this line to your xorg.conf in the DefaultDepth Section:" - echo "Option "\"metamodes\" "\"DFP: nvidia-auto-select +0+0; DFP: 800x600 +0+0; DFP: 640x480 +0+0\"" - echo "" - fi - fi - - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 0 ]; then - echo nvidia >> /etc/sysconfig/modules - fi - /sbin/depmod -a - /sbin/modprobe nvidia -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia - fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 1 ]; then - grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp - mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules - fi - if [ -e /usr/lib/xorg/temp/libglx.so ]; then - mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ - fi -} - -post_remove() { - depmod -a - echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" - echo "*** pacman-g2 -S libgl libglx ****" -} - -op=$1 -shift -$op $* diff --git a/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx.install b/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx.install new file mode 100644 index 0000000..d346d07 --- /dev/null +++ b/source/x11-extra/nvidia-96xx-fwlive/nvidia-96xx.install @@ -0,0 +1,84 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE." + echo "*** If you don't accept it, please remove the package!" + ## well here a 'WARNING' only on install | update because I don't know this + ## metamodes option will work for all + devnr=`/usr/sbin/lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` + + if [ "$devnr" ]; then + if [ "$devnr" -eq 0179 ]; then + echo "" + echo "*** WARNING: Nvidia - GeForce4 440/420 Go 32/64M - with PCI ID: - 0x$devnr - detected." + echo "*** WARNING: If you get an black screen try add this line to your xorg.conf in the DefaultDepth Section:" + echo "Option "\"metamodes\" "\"DFP: nvidia-auto-select +0+0; DFP: 800x600 +0+0; DFP: 640x480 +0+0\"" + echo "" + fi + fi + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + else + echo "WARNING: /etc/X11/xorg.conf does not exist!" + fi + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -ea $_F_kernelmod_uname + ## if nvidia dependent kernel is the current kernel + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## Try to load it + /sbin/modprobe nvidia + fi +} + +post_upgrade() { + echo -n "Runing depmod for nvidia kernel module for kernel $_F_kernelmod_uname ..." + /sbin/depmod -ea $_F_kernelmod_uname + echo " done." + ## if that exisit we bumped / upgraded the package only no new kernel + ## on a new kernel we do nothing because one has to reboot anyway + if [ -e /lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko ]; then + ## see if is loaded , if yes kill it and modprobe again if not do nothing + if grep -q nvidia /proc/modules; then + echo -n "Reloading nvidia kernel module.." + modprobe --remove nvidia + sleep 1 + modprobe nvidia + echo " done." + fi + fi +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + /sbin/modprobe --remove nvidia + fi + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + fi + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + /sbin/depmod -a $_F_kernelmod_uname + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* From janny at frugalware.org Thu Mar 6 19:57:28 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 19:57:29 2008 Subject: [Frugalware-git] fwlive_pkgs: nvidia-fwlive-169.12-2-i686 Message-ID: <20080306185728.1EDDA119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=2cbfdd3922ffd950b14720a4afcab97647125774 commit 2cbfdd3922ffd950b14720a4afcab97647125774 Author: Janos Kovacs Date: Thu Mar 6 19:55:49 2008 +0100 nvidia-fwlive-169.12-2-i686 * version bump diff --git a/source/x11-extra/nvidia-fwlive/FrugalBuild b/source/x11-extra/nvidia-fwlive/FrugalBuild index 5a2459f..9981781 100644 --- a/source/x11-extra/nvidia-fwlive/FrugalBuild +++ b/source/x11-extra/nvidia-fwlive/FrugalBuild @@ -2,8 +2,9 @@ # Maintainer: AlexExtreme pkgname=nvidia-fwlive -pkgver=169.09 -pkgrel=1 +_F_archive_name=nvidia +pkgver=169.12 +pkgrel=2 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') @@ -13,23 +14,22 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" if echo "$CARCH" | grep -q 'i.86'; then _arch=x86 - sha1sums=('c001e13a2f38ea73b0a1610c585e0ebaebeac6f8') + sha1sums=('6ce789da785bf109fcb213db755eaf6975de2e46') pkgnum=1 elif [ "$CARCH" == "x86_64" ]; then _arch=x86_64 - sha1sums=('18ff8301461bd496e7305052aea5f7f652b15e76') + sha1sums=('62f9e1055ce6cd4d7806757ece0a144695ef12ff') pkgnum=2 fi source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip' 'force') -_F_kernelmod_scriptlet=$pkgname.install +_F_kernelmod_scriptlet=$_F_archive_name.install Finclude kernel-module -kver=2.6.23-6 -depends=("kernel-fwlive=$kver") +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" 'xorg-server>=1.1.0') makedepends=("kernel-fwlive-source=$kver") -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" -depends=(${depends[@]} 'xorg-server>=1.1.0') +#_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` +#_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" build() { nvdir=NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum @@ -88,7 +88,7 @@ build() { Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko Fdoc $nvdir/LICENSE - Fcpr $nvdir/usr/share/doc/* /usr/share/doc/$pkgname-$pkgver/ + Fcpr $nvdir/usr/share/doc/* usr/share/doc/$pkgname-$pkgver/ Fln "$pkgname-$pkgver" "/usr/share/doc/$pkgname" Fbuild_kernelmod_scriptlet } diff --git a/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install b/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install deleted file mode 100644 index cae4fc4..0000000 --- a/source/x11-extra/nvidia-fwlive/nvidia-fwlive.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." - echo "*** If you don't accept it, please remove the package!" - - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 0 ]; then - echo nvidia >> /etc/sysconfig/modules - fi - /sbin/depmod -a - /sbin/modprobe nvidia -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia - fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 1 ]; then - grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp - mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules - fi - if [ -e /usr/lib/xorg/temp/libglx.so ]; then - mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ - fi -} - -post_remove() { - depmod -a - echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" - echo "*** pacman-g2 -S libgl libglx ****" -} - -op=$1 -shift -$op $* diff --git a/source/x11-extra/nvidia-fwlive/nvidia.install b/source/x11-extra/nvidia-fwlive/nvidia.install new file mode 100644 index 0000000..cae4fc4 --- /dev/null +++ b/source/x11-extra/nvidia-fwlive/nvidia.install @@ -0,0 +1,47 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia/LICENSE." + echo "*** If you don't accept it, please remove the package!" + + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -a + /sbin/modprobe nvidia +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + rmmod nvidia + fi + + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + depmod -a + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* From janny at frugalware.org Thu Mar 6 20:00:38 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 20:00:39 2008 Subject: [Frugalware-git] fwlive_pkgs: kqemu-fwlive-1.3.0pre11-24-i686 Message-ID: <20080306190038.81F1E119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=5e06cd2a3ed081cb64098edd551c9a106f643ac1 commit 5e06cd2a3ed081cb64098edd551c9a106f643ac1 Author: Janos Kovacs Date: Thu Mar 6 19:59:57 2008 +0100 kqemu-fwlive-1.3.0pre11-24-i686 * version bump diff --git a/source/xapps-extra/kqemu-fwlive/FrugalBuild b/source/xapps-extra/kqemu-fwlive/FrugalBuild index 117e457..3a11c83 100644 --- a/source/xapps-extra/kqemu-fwlive/FrugalBuild +++ b/source/xapps-extra/kqemu-fwlive/FrugalBuild @@ -3,13 +3,13 @@ pkgname=kqemu-fwlive pkgver=1.3.0pre11 -pkgrel=21 +pkgrel=24 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') _F_kernelmod_scriptlet=kqemu.install Finclude kernel-module -kver=2.6.23-6 +kver=2.6.24-3 depends=("kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") _F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` @@ -17,8 +17,9 @@ _F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep kqemu.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=($url/kqemu-$pkgver.tar.gz) -sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71') +source=($url/kqemu-$pkgver.tar.gz README.Frugalware) +sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71' \ + 'e1eb29a8e4c453480a18857c4416d1cc979a28f4') build() { @@ -29,5 +30,6 @@ build() Fmkdir /etc/udev/rules.d/ echo 'KERNEL=="kqemu*", NAME="%k", GROUP="users", MODE="0660"' \ > $Fdestdir/etc/udev/rules.d/48-qemu.rules + Fdoc README.Frugalware Fbuild_kernelmod_scriptlet } From janny at frugalware.org Thu Mar 6 20:02:08 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 20:02:13 2008 Subject: [Frugalware-git] fwlive_pkgs: lirc-fwlive-0.8.2-18-i686 Message-ID: <20080306190208.8BE0C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=c1fe21968f44e678f9dcaf4959c89487ccf4d237 commit c1fe21968f44e678f9dcaf4959c89487ccf4d237 Author: Janos Kovacs Date: Thu Mar 6 20:01:16 2008 +0100 lirc-fwlive-0.8.2-18-i686 * add missing files diff --git a/source/apps-extra/lirc-fwlive/lirc.logrotate b/source/apps-extra/lirc-fwlive/lirc.logrotate new file mode 100644 index 0000000..623c4f3 --- /dev/null +++ b/source/apps-extra/lirc-fwlive/lirc.logrotate @@ -0,0 +1,5 @@ +/var/log/lircd { + missingok + notifempty + delaycompress +} From janny at frugalware.org Thu Mar 6 20:03:01 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 20:03:04 2008 Subject: [Frugalware-git] fwlive_pkgs: kernel-fwlive-2.6.24-3-i686 Message-ID: <20080306190301.6CBE2119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=3384a358ec969d7499d68cc9f0fc46a3a6c8fd9c commit 3384a358ec969d7499d68cc9f0fc46a3a6c8fd9c Author: Janos Kovacs Date: Thu Mar 6 20:02:43 2008 +0100 kernel-fwlive-2.6.24-3-i686 * add missing files diff --git a/source/base-extra/kernel-fwlive/config.i686 b/source/base-extra/kernel-fwlive/config.i686 new file mode 100644 index 0000000..4552175 --- /dev/null +++ b/source/base-extra/kernel-fwlive/config.i686 @@ -0,0 +1,3821 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.24 +# Sat Mar 1 09:37:23 2008 +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_QUICKLIST=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_X86_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y +CONFIG_KTIME_SCALAR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_FAIR_USER_SCHED=y +# CONFIG_FAIR_CGROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBD=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_LSF=y +CONFIG_BLK_DEV_BSG=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_X86_VSMP is not set +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +# CONFIG_PARAVIRT_GUEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_GENERIC_CPU is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_XADD=y +CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_GOOD_APIC=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_HPET_TIMER=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_NONFATAL=m +CONFIG_X86_MCE_P4THERMAL=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_NR_QUICK=1 +CONFIG_VIRT_TO_BUS=y +# CONFIG_HIGHPTE is not set +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +# CONFIG_IRQBALANCE is not set +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_SMP_POSSIBLE=y +CONFIG_SUSPEND=y +CONFIG_HIBERNATION_SMP_POSSIBLE=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +CONFIG_APM=m +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +# CONFIG_APM_DO_ENABLE is not set +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_ALLOW_INTS is not set +CONFIG_APM_REAL_MODE_POWER_OFF=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_POWERNOW_K8_ACPI=y +CONFIG_X86_GX_SUSPMOD=m +CONFIG_X86_SPEEDSTEP_CENTRINO=m +CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +CONFIG_X86_SPEEDSTEP_LIB=m +# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +# CONFIG_CPU_IDLE is not set + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +CONFIG_PCI_GODIRECT=y +# CONFIG_PCI_GOANY is not set +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set +CONFIG_HT_IRQ=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +CONFIG_EISA=y +# CONFIG_EISA_VLB_PRIMING is not set +CONFIG_EISA_PCI_EISA=y +CONFIG_EISA_VIRTUAL_ROOT=y +CONFIG_EISA_NAMES=y +CONFIG_MCA=y +CONFIG_MCA_LEGACY=y +CONFIG_MCA_PROC_FS=y +# CONFIG_SCx200 is not set +CONFIG_K8_NB=y +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA_IOCTL is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK_ENABLED=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y +CONFIG_WAN_ROUTER=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RR=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +# CONFIG_NET_ACT_SIMP is not set +# CONFIG_NET_CLS_POLICE is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +CONFIG_SCC_DELAY=y +CONFIG_SCC_TRXECHO=y +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# Old SIR device drivers +# + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +CONFIG_MAC80211_RCSIMPLE=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_RFKILL_LEDS=y +CONFIG_NET_9P=m +CONFIG_NET_9P_FD=m +# CONFIG_NET_9P_DEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PNC2000=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_OTP=y +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +CONFIG_MTD_ONENAND_SIM=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=y +CONFIG_BLK_DEV_XD=m +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_BPCK6=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=y +CONFIG_BLK_CPQ_CISS_DA=y +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=y +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +CONFIG_MISC_DEVICES=y +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +CONFIG_EEPROM_93CX6=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ASUS_LAPTOP=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_MSI_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_BLK_DEV_IDEACPI is not set +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_CMD640=y +CONFIG_BLK_DEV_CMD640_ENHANCED=y +# CONFIG_BLK_DEV_IDEPNP is not set + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_IDEPCI_PCIBUS_ORDER=y +# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_BLK_DEV_GENERIC is not set +CONFIG_BLK_DEV_OPTI621=y +CONFIG_BLK_DEV_RZ1000=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=y +CONFIG_BLK_DEV_ATIIXP=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_CS5535=m +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +CONFIG_BLK_DEV_JMICRON=y +CONFIG_BLK_DEV_SC1200=y +# CONFIG_BLK_DEV_PIIX is not set +CONFIG_BLK_DEV_IT8213=y +CONFIG_BLK_DEV_IT821X=y +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=y +CONFIG_PDC202XX_BURST=y +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SIS5513=y +CONFIG_BLK_DEV_SLC90E66=y +CONFIG_BLK_DEV_TRM290=y +CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_TC86C001=y +# CONFIG_IDE_ARM is not set + +# +# Other IDE chipsets support +# + +# +# Note: most of these also require special kernel boot parameters +# +CONFIG_BLK_DEV_4DRIVES=y +CONFIG_BLK_DEV_ALI14XX=m +CONFIG_BLK_DEV_DTC2278=m +CONFIG_BLK_DEV_HT6560B=m +CONFIG_BLK_DEV_QD65XX=m +CONFIG_BLK_DEV_UMC8672=m +CONFIG_BLK_DEV_IDEDMA=y +CONFIG_IDE_ARCH_OBSOLETE_INIT=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_FC_TGT_ATTRS=y +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_LIBSAS_DEBUG=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AHA1740=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=y +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ARCMSR_AER=y +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=y +# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_FD_MCS=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IBMMCA=m +CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y +CONFIG_IBMMCA_SCSI_DEV_RESET=y +CONFIG_SCSI_IPS=y +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_NCR_D700=m +CONFIG_SCSI_STEX=y +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_NCR_Q720=m +CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 +CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 +CONFIG_SCSI_NCR53C8XX_SYNC=20 +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_PSI240I=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_SEAGATE=m +CONFIG_SCSI_SIM710=m +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=y +CONFIG_SATA_MV=m +CONFIG_SATA_NV=y +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=y +CONFIG_SATA_SX4=y +CONFIG_SATA_SIL=y +CONFIG_SATA_SIL24=y +CONFIG_SATA_SIS=y +CONFIG_SATA_ULI=y +CONFIG_SATA_VIA=y +CONFIG_SATA_VITESSE=y +CONFIG_SATA_INIC162X=m +CONFIG_PATA_ACPI=m +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_HPT3X3_DMA=y +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=y +CONFIG_PATA_LEGACY=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=y +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m +CONFIG_PATA_WINBOND_VLB=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_IEEE1394=y + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set + +# +# Controllers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocols +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_NETDEVICES_MULTIQUEUE=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_ISA=m +CONFIG_ARCNET_COM20020_PCI=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_FIXED_PHY=m +CONFIG_FIXED_MII_10_FDX=y +CONFIG_FIXED_MII_100_FDX=y +CONFIG_FIXED_MII_1000_FDX=y +CONFIG_FIXED_MII_AMNT=1 +CONFIG_MDIO_BITBANG=m +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_ELMC=m +CONFIG_ELMC_II=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRAMCA=m +CONFIG_ULTRA=m +CONFIG_ULTRA32=m +CONFIG_SMC9194=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI52=m +CONFIG_NI65=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +# CONFIG_LP486E is not set +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +CONFIG_NE2_MCA=m +CONFIG_IBMLANA=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_ADAPTEC_STARFIRE_NAPI=y +CONFIG_AC3200=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_CS89x0=m +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_LNE390=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_NE3210=m +CONFIG_ES3210=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +CONFIG_IXGB_NAPI=y +CONFIG_S2IO=m +CONFIG_S2IO_NAPI=y +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_TR=y +CONFIG_IBMTR=m +CONFIG_IBMOL=m +CONFIG_IBMLS=m +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_SKISA=m +CONFIG_PROTEON=m +CONFIG_ABYSS=m +CONFIG_MADGEMC=m +CONFIG_SMCTR=m + +# +# Wireless LAN +# +CONFIG_WLAN_PRE80211=y +CONFIG_STRIP=m +CONFIG_ARLAN=m +CONFIG_WAVELAN=m +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +# CONFIG_IPW2200_RADIOTAP is not set +# CONFIG_IPW2200_PROMISCUOUS is not set +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_RTL8187=m +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y +CONFIG_IWLWIFI_SENSITIVITY=y +CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y +CONFIG_IWLWIFI_QOS=y +CONFIG_IWL4965=m +CONFIG_IWL3945=m +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_LEDS=y +CONFIG_B43_RFKILL=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43_DMA=y +CONFIG_B43_PIO=y +CONFIG_B43_DMA_AND_PIO_MODE=y +# CONFIG_B43_DMA_MODE is not set +# CONFIG_B43_PIO_MODE is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2400PCI=m +CONFIG_RT2400PCI_RFKILL=y +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_RFKILL=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2X00_DEBUG is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_ARCNET_COM20020_CS=m +CONFIG_PCMCIA_IBMTR=m +CONFIG_WAN=y +CONFIG_HOSTESS_SV11=m +CONFIG_COSA=m +CONFIG_LANMEDIA=m +CONFIG_SEALEVEL_4021=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m +CONFIG_PC300_MLPPP=y + +# +# Cyclades-PC300 MLPPP support is disabled. +# + +# +# Refer to the file README.mlppp, provided by PC300 package. +# +CONFIG_PC300TOO=m +CONFIG_N2=m +CONFIG_C101=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +# CONFIG_DSCC4_PCISYNC is not set +# CONFIG_DSCC4_PCI_RST is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_SDLA=m +CONFIG_WAN_ROUTER_DRIVERS=m +CONFIG_CYCLADES_SYNC=m +CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +# CONFIG_SBNI_MULTILINE is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E_MAYBE=m +# CONFIG_ATM_FORE200E_PCA is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER_LARGE_RINGS is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_NET_FC=y +CONFIG_SHAPER=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_ISDN=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_PHONE=m +CONFIG_PHONE_IXJ=m +CONFIG_PHONE_IXJ_PCMCIA=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_INPORT=m +CONFIG_MOUSE_ATIXL=y +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_COMPUTONE=m +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +CONFIG_ESPSERIAL=m +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_MOXA_SMARTIO_NEW=m +CONFIG_ISI=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_SPECIALIX=m +CONFIG_SPECIALIX_RTSCTS=y +CONFIG_SX=m +CONFIG_RIO=m +# CONFIG_RIO_OLDPCI is not set +CONFIG_STALDRV=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_FOURPORT=m +CONFIG_SERIAL_8250_ACCENT=m +CONFIG_SERIAL_8250_BOCA=m +CONFIG_SERIAL_8250_EXAR_ST16C554=m +CONFIG_SERIAL_8250_HUB6=m +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_MCA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_NVRAM=m +CONFIG_RTC=m +CONFIG_GEN_RTC=y +CONFIG_GEN_RTC_X=y +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_I810=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_PROSAVAGE=m +CONFIG_I2C_SAVAGE4=m +CONFIG_I2C_SIMTEC=m +CONFIG_SCx200_ACB=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_TAOS_EVM=m +# CONFIG_I2C_STUB is not set +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m +CONFIG_I2C_VOODOO3=m +CONFIG_I2C_PCA_ISA=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_DS1682=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m +# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m +CONFIG_WDT_501=y + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +CONFIG_MFD_SM501=m + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y +# CONFIG_VIDEO_PVRUSB2_SYSFS is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_TYPHOON_PROC_FS=y +CONFIG_RADIO_ZOLTRIX=m +CONFIG_USB_DSBR=m +CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_S5H1409=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m +CONFIG_DVB_TUNER_QT1010=m +CONFIG_DVB_TUNER_MT2060=m +CONFIG_DVB_TUNER_MT2266=m +CONFIG_DVB_TUNER_MT2131=m +CONFIG_DVB_TUNER_DIB0070=m + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_TUA6100=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_TUNER=m +# CONFIG_VIDEO_TUNER_CUSTOMIZE is not set +CONFIG_TUNER_MT20XX=m +CONFIG_TUNER_TDA8290=m +CONFIG_TUNER_TEA5761=m +CONFIG_TUNER_TEA5767=m +CONFIG_TUNER_SIMPLE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DAB=y +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_VGASTATE=y +CONFIG_VIDEO_OUTPUT_CONTROL=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_SVGALIB=m +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=y +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +# CONFIG_FB_EFI is not set +# CONFIG_FB_HECUBA is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +# CONFIG_FB_I810_I2C is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_MATROX_MULTIHEAD=y +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +# CONFIG_FB_SAVAGE is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_CYBLA is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_GEODE is not set +CONFIG_FB_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_VIDEO_SELECT=y +CONFIG_MDA_CONSOLE=m +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AD1848_LIB=m +CONFIG_SND_CS4231_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m + +# +# ISA devices +# +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4232=m +CONFIG_SND_CS4236=m +CONFIG_SND_DT019X=m +CONFIG_SND_ES968=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUS_SYNTH=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +# CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_SGALAXY=m +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +# CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL is not set + +# +# PCI devices +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_MAESTRO3=m +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 + +# +# SPI devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y + +# +# PCMCIA devices +# +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# SoC Audio support for SuperH +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_PERSIST is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_SPLIT_ISO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_KARMA=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +# CONFIG_USB_MON is not set + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m + +# +# MMC/SD Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_RICOH_MMC=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_ISER=m +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_V3020=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +# CONFIG_LGUEST is not set + +# +# Userspace I/O +# +CONFIG_UIO=m +CONFIG_UIO_CIF=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4DEV_FS=m +CONFIG_EXT4DEV_FS_XATTR=y +CONFIG_EXT4DEV_FS_POSIX_ACL=y +CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_JBD=y +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +CONFIG_JBD2_DEBUG=y +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_NOLOCK=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +# CONFIG_PRINT_QUOTA_WARNING is not set +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_CRAMFS=m +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_XPRT_RDMA=m +# CONFIG_SUNRPC_BIND34 is not set +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set +# CONFIG_INSTRUMENTATION is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_FRAME_POINTER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SAMPLES is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set + +# +# Page alloc debug is incompatible with Software Suspend on i386 +# +# CONFIG_DEBUG_RODATA is not set +# CONFIG_4KSTACKS is not set +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_CAPABILITIES=y +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_SECURITY_ROOTPLUG is not set +# CONFIG_SECURITY_SELINUX is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=m +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y + +CONFIG_SQUASHFS=n diff --git a/source/base-extra/kernel-fwlive/config.x86_64 b/source/base-extra/kernel-fwlive/config.x86_64 new file mode 100644 index 0000000..3880398 --- /dev/null +++ b/source/base-extra/kernel-fwlive/config.x86_64 @@ -0,0 +1,3524 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.24.3 +# Wed Feb 27 14:31:08 2008 +# +CONFIG_64BIT=y +# CONFIG_X86_32 is not set +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +# CONFIG_QUICKLIST is not set +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_ARCH_SUPPORTS_OPROFILE=y +CONFIG_ZONE_DMA32=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +# CONFIG_KTIME_SCALAR is not set +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_FAIR_USER_SCHED=y +# CONFIG_FAIR_CGROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_X86_VSMP is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +CONFIG_MK8=y +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_GENERIC_CPU is not set +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_GOOD_APIC=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_HPET_TIMER=y +CONFIG_GART_IOMMU=y +# CONFIG_CALGARY_IOMMU is not set +CONFIG_SWIOTLB=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_MCE=y +# CONFIG_X86_MCE_INTEL is not set +CONFIG_X86_MCE_AMD=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NUMA is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MTRR=y +CONFIG_SECCOMP=y +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x200000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x200000 +CONFIG_HOTPLUG_CPU=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_SMP_POSSIBLE=y +CONFIG_SUSPEND=y +CONFIG_HIBERNATION_SMP_POSSIBLE=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_POWERNOW_K8_ACPI=y +CONFIG_X86_SPEEDSTEP_CENTRINO=m +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +CONFIG_X86_SPEEDSTEP_LIB=m +# CONFIG_CPU_IDLE is not set + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_DOMAINS=y +# CONFIG_DMAR is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set +CONFIG_HT_IRQ=y +CONFIG_ISA_DMA_API=y +CONFIG_K8_NB=y +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA_IOCTL is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=m +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK_ENABLED=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y +CONFIG_WAN_ROUTER=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RR=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +# CONFIG_NET_ACT_SIMP is not set +# CONFIG_NET_CLS_POLICE is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# Old SIR device drivers +# + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +CONFIG_MAC80211_RCSIMPLE=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_RFKILL_LEDS=y +CONFIG_NET_9P=m +CONFIG_NET_9P_FD=m +# CONFIG_NET_9P_DEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PNC2000=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_OTP=y +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +CONFIG_MTD_ONENAND_SIM=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=y +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=y +CONFIG_BLK_CPQ_CISS_DA=y +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=y +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +CONFIG_MISC_DEVICES=y +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +CONFIG_EEPROM_93CX6=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ASUS_LAPTOP=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_MSI_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_BLK_DEV_IDEACPI is not set +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_CMD640=y +CONFIG_BLK_DEV_CMD640_ENHANCED=y +# CONFIG_BLK_DEV_IDEPNP is not set + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_IDEPCI_PCIBUS_ORDER=y +# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_BLK_DEV_GENERIC is not set +CONFIG_BLK_DEV_OPTI621=y +CONFIG_BLK_DEV_RZ1000=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=y +CONFIG_BLK_DEV_ATIIXP=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +CONFIG_BLK_DEV_JMICRON=y +CONFIG_BLK_DEV_SC1200=y +# CONFIG_BLK_DEV_PIIX is not set +CONFIG_BLK_DEV_IT8213=y +CONFIG_BLK_DEV_IT821X=y +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=y +CONFIG_PDC202XX_BURST=y +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SIS5513=y +CONFIG_BLK_DEV_SLC90E66=y +CONFIG_BLK_DEV_TRM290=y +CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_TC86C001=y +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +CONFIG_IDE_ARCH_OBSOLETE_INIT=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_FC_TGT_ATTRS=y +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_LIBSAS_DEBUG=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=y +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ARCMSR_AER=y +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=y +# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_IPS=y +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=y +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=y +CONFIG_SATA_MV=m +CONFIG_SATA_NV=y +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=y +CONFIG_SATA_SX4=y +CONFIG_SATA_SIL=y +CONFIG_SATA_SIL24=y +CONFIG_SATA_SIS=y +CONFIG_SATA_ULI=y +CONFIG_SATA_VIA=y +CONFIG_SATA_VITESSE=y +CONFIG_SATA_INIC162X=m +CONFIG_PATA_ACPI=m +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_HPT3X3_DMA=y +CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=y +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=y +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_IEEE1394=y + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set + +# +# Controllers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocols +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_NETDEVICES_MULTIQUEUE=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_PCI=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_FIXED_PHY=m +CONFIG_FIXED_MII_10_FDX=y +CONFIG_FIXED_MII_100_FDX=y +CONFIG_FIXED_MII_1000_FDX=y +CONFIG_FIXED_MII_AMNT=1 +CONFIG_MDIO_BITBANG=m +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_HP100=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_ADAPTEC_STARFIRE_NAPI=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +CONFIG_IXGB_NAPI=y +CONFIG_S2IO=m +CONFIG_S2IO_NAPI=y +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_TR=y +CONFIG_IBMOL=m +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_ABYSS=m + +# +# Wireless LAN +# +CONFIG_WLAN_PRE80211=y +CONFIG_STRIP=m +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +# CONFIG_IPW2200_RADIOTAP is not set +# CONFIG_IPW2200_PROMISCUOUS is not set +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_RTL8187=m +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_IWLWIFI=y +CONFIG_IWLWIFI_DEBUG=y +CONFIG_IWLWIFI_SENSITIVITY=y +CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y +CONFIG_IWLWIFI_QOS=y +CONFIG_IWL4965=m +CONFIG_IWL3945=m +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_LEDS=y +CONFIG_B43_RFKILL=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43_DMA=y +CONFIG_B43_PIO=y +CONFIG_B43_DMA_AND_PIO_MODE=y +# CONFIG_B43_DMA_MODE is not set +# CONFIG_B43_PIO_MODE is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2400PCI=m +CONFIG_RT2400PCI_RFKILL=y +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_RFKILL=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2X00_DEBUG is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_ARCNET_COM20020_CS=m +CONFIG_WAN=y +CONFIG_LANMEDIA=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m +CONFIG_PC300_MLPPP=y + +# +# Cyclades-PC300 MLPPP support is disabled. +# + +# +# Refer to the file README.mlppp, provided by PC300 package. +# +CONFIG_PC300TOO=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +# CONFIG_DSCC4_PCISYNC is not set +# CONFIG_DSCC4_PCI_RST is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_WAN_ROUTER_DRIVERS=m +CONFIG_CYCLADES_SYNC=m +CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +# CONFIG_SBNI_MULTILINE is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_FORE200E_MAYBE=m +# CONFIG_ATM_FORE200E_PCA is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER_LARGE_RINGS is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_NET_FC=y +CONFIG_SHAPER=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_ISDN=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_PHONE=m +CONFIG_PHONE_IXJ=m +CONFIG_PHONE_IXJ_PCMCIA=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_COMPUTONE=m +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_MOXA_SMARTIO_NEW=m +CONFIG_ISI=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_SPECIALIX=m +CONFIG_SPECIALIX_RTSCTS=y +CONFIG_SX=m +CONFIG_RIO=m +# CONFIG_RIO_OLDPCI is not set +CONFIG_STALDRV=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_NVRAM=m +CONFIG_RTC=m +CONFIG_GEN_RTC=y +CONFIG_GEN_RTC_X=y +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_I810=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_PROSAVAGE=m +CONFIG_I2C_SAVAGE4=m +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_TAOS_EVM=m +# CONFIG_I2C_STUB is not set +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m +CONFIG_I2C_VOODOO3=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_DS1682=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m +# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +CONFIG_MFD_SM501=m + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y +# CONFIG_VIDEO_PVRUSB2_SYSFS is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_USB_DSBR=m +CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_S5H1409=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m +CONFIG_DVB_TUNER_QT1010=m +CONFIG_DVB_TUNER_MT2060=m +CONFIG_DVB_TUNER_MT2266=m +CONFIG_DVB_TUNER_MT2131=m +CONFIG_DVB_TUNER_DIB0070=m + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_TUA6100=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_TUNER=m +# CONFIG_VIDEO_TUNER_CUSTOMIZE is not set +CONFIG_TUNER_MT20XX=m +CONFIG_TUNER_TDA8290=m +CONFIG_TUNER_TEA5761=m +CONFIG_TUNER_TEA5767=m +CONFIG_TUNER_SIMPLE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DAB=y +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_VGASTATE=y +CONFIG_VIDEO_OUTPUT_CONTROL=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_SVGALIB=m +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=y +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +# CONFIG_FB_EFI is not set +# CONFIG_FB_HECUBA is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_MATROX_MULTIHEAD=y +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +# CONFIG_FB_SAVAGE is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_GEODE is not set +CONFIG_FB_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_VIDEO_SELECT=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m + +# +# PCI devices +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_MAESTRO3=m +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 + +# +# SPI devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y + +# +# PCMCIA devices +# +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# SoC Audio support for SuperH +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_PERSIST is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_SPLIT_ISO=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_KARMA=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +# CONFIG_USB_MON is not set + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m + +# +# MMC/SD Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_RICOH_MMC=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SPI=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_ISER=m +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_V3020=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m + +# +# Userspace I/O +# +CONFIG_UIO=m +CONFIG_UIO_CIF=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4DEV_FS=m +CONFIG_EXT4DEV_FS_XATTR=y +CONFIG_EXT4DEV_FS_POSIX_ACL=y +CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_JBD=y +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +CONFIG_JBD2_DEBUG=y +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_NOLOCK=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +# CONFIG_PRINT_QUOTA_WARNING is not set +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_CRAMFS=m +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_XPRT_RDMA=m +# CONFIG_SUNRPC_BIND34 is not set +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set +# CONFIG_INSTRUMENTATION is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_FRAME_POINTER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SAMPLES is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_IOMMU_DEBUG is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_CAPABILITIES=y +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_SECURITY_ROOTPLUG is not set +# CONFIG_SECURITY_SELINUX is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=m +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_HW=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y + +CONFIG_SQUASHFS=n From janny at frugalware.org Thu Mar 6 20:03:49 2008 From: janny at frugalware.org (Janos Kovacs) Date: Thu Mar 6 20:03:51 2008 Subject: [Frugalware-git] fwlive_pkgs: acx100-fwlive-20071003-9-i686 Message-ID: <20080306190349.C17E9119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=ab9f0b3bce8ecc12dbf3ebfe9ac72f35699bc1ac commit ab9f0b3bce8ecc12dbf3ebfe9ac72f35699bc1ac Author: Janos Kovacs Date: Thu Mar 6 20:03:32 2008 +0100 acx100-fwlive-20071003-9-i686 * add missing files diff --git a/source/network-extra/acx100-fwlive/FrugalBuild b/source/network-extra/acx100-fwlive/FrugalBuild new file mode 100644 index 0000000..2b1a542 --- /dev/null +++ b/source/network-extra/acx100-fwlive/FrugalBuild @@ -0,0 +1,52 @@ +# Compiling Time: 0.03 SBU +# Maintainer: voroskoi + +pkgname=acx100-fwlive +aname=acx100 +origname=acx-mac80211 +pkgver=20071003 +pkgrel=9 +pkgdesc="The ACX100/ACX111 wireless network driver." +_F_archive_name=${origname} +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname=$aname +_F_sourceforge_name=${origname} +Finclude kernel-module sourceforge +kver=2.6.24-3 +depends=("kernel-fwlive=$kver" 'wireless_tools') +makedepends=("kernel-fwlive-source=$kver") +_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` +_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" +depends=(${depends[@]} 'wireless_tools') +groups=('network-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://acx100.sourceforge.net/wiki/Main_Page |Flasttarbz2" +source=(${source[@]} \ + http://ftp.frugalware.org/pub/other/sources/$aname/{fw.tar.bz2,ACX100_USB.bin,svn-20071112.patch} \ + kernel-2.6.24.patch) + +build() { + # no Fcheckkernel, crosscompilation verified + Fcd ${origname}-${pkgver} + Fpatchall + make -C $_F_kernelmod_dir/build M=`pwd` CONFIG_ACX_MAC80211=m CONFIG_ACX_MAC80211_PCI=y CONFIG_ACX_MAC80211_USB=y || Fdie + Fmkdir $_F_kernelmod_dir/net + Ffilerel $_F_kernelmod_dir/net/acx.ko + Ffile /lib/firmware/ACX100_USB.bin + Ffile fw/acx111_1.2.1.34/tiacx111 /lib/firmware + Ffile fw/acx111_2.3.1.31/* /lib/firmware + Ffile fw/acx100_1.9.8.b/* /lib/firmware + Ffile fw/acx100_1.0.9-USB/tiacx100usbc0D /lib/firmware + Ffile fw/acx111_2.4.0.70-USB/tiacx111usbc1B /lib/firmware + Fln tiacx100usbc0D /lib/firmware/tiacx100usb + Fln tiacx111usbc1B /lib/firmware/tiacx111usb + Fbuild_kernelmod_scriptlet +} + +# optimalization OK - uses the kernel's option + +sha1sums=('5e62f70cd84c6c0ecb78358585e7e44901d2ce30' \ + '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ + '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \ + 'eb3a1ceb2e204a7dc80eb4802a2f1628c212d61f' \ + 'e3e96ee12a564ba033f4def6760b2a975b273765') From janny at frugalware.org Thu Mar 6 20:18:12 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 20:18:14 2008 Subject: [Frugalware-git] fwlive: fwlive-Makefile_build Message-ID: <20080306191812.E08ED119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=a0895bbd497065abf19cc99b8c69191e3dd52fa9 commit a0895bbd497065abf19cc99b8c69191e3dd52fa9 Author: Janny Date: Thu Mar 6 20:14:40 2008 +0100 fwlive-Makefile_build * add to config FULL * add remove other language files to build diff --git a/config b/config index 12b7cf2..7d1c304 100644 --- a/config +++ b/config @@ -23,7 +23,7 @@ FWLFONT = lat2-16.psfu.gz # * SERVER # * MIN - comfortable console workstation # * MUSTHAVE - minimalistic one, base of all profiles -APPSGROUP = MUSTHAVE +APPSGROUP = FULL # add supported locals LOCALE = en,de,fr,da,hu,cz diff --git a/live-base/build b/live-base/build index 031dd2e..ab7e5f6 100644 --- a/live-base/build +++ b/live-base/build @@ -55,6 +55,7 @@ echo "Deleting unused languages..." for i in $(echo $LOCALE | sed -r "s/\,/ /g"); do lo="! -name \"$i*\" "$lo done +find $ROOT/usr/share/i18n/locales -maxdepth 1 -type f $lo -exec rm -fr {} \; find $ROOT/usr/share/locale -maxdepth 1 -type d $lo -exec rm -fr {} \; echo "Creating compressed images..." From janny at frugalware.org Thu Mar 6 20:33:30 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 20:33:31 2008 Subject: [Frugalware-git] fwlive: the direction of packages Message-ID: <20080306193330.2E27F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d1a4f65d96636bdf9c2ed80203b2240a17c2546f commit d1a4f65d96636bdf9c2ed80203b2240a17c2546f Author: Janny Date: Thu Mar 6 20:33:20 2008 +0100 the direction of packages diff --git a/config b/config index 7d1c304..d911e47 100644 --- a/config +++ b/config @@ -69,11 +69,11 @@ SAVEDIRS = etc home lib root usr var CONFIG_SETUP = y # additional packages to be installed by the profiles -# no builded pkgs: rt2500-fwlive rt2400-fwlive acx100-fwlive lirc-fwlive truecrypt-fwlive -DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \ - qc-usb-fwlive dazuko-fwlive \ - busybox-fwlive acerhk-fwlive madwifi-fwlive \ - wlan-ng-fwlive kqemu-fwlive +# no builded pkgs: truecrypt-fwlive +DRIVERS = gspcav1-fwlive qc-usb-fwlive dazuko-fwlive busybox-fwlive lirc-fwlive \ + acerhk-fwlive redirfs-fwlive fglrx-fwlive nvidia-96xx-fwlive \ + nvidia-fwlive madwifi-fwlive wlan-ng-fwlive \ + acx100-fwlive ndiswrapper-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) From janny at frugalware.org Thu Mar 6 20:40:54 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 20:40:55 2008 Subject: [Frugalware-git] fwlive: add missed pkgs Message-ID: <20080306194054.5871A119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=677d5bd9b2b000b343a1d895438108149452fba2 commit 677d5bd9b2b000b343a1d895438108149452fba2 Author: Janny Date: Thu Mar 6 20:40:37 2008 +0100 add missed pkgs diff --git a/config b/config index d911e47..2133466 100644 --- a/config +++ b/config @@ -72,7 +72,7 @@ CONFIG_SETUP = y # no builded pkgs: truecrypt-fwlive DRIVERS = gspcav1-fwlive qc-usb-fwlive dazuko-fwlive busybox-fwlive lirc-fwlive \ acerhk-fwlive redirfs-fwlive fglrx-fwlive nvidia-96xx-fwlive \ - nvidia-fwlive madwifi-fwlive wlan-ng-fwlive \ + nvidia-fwlive madwifi-fwlive wlan-ng-fwlive busybox-fwlive \ acx100-fwlive ndiswrapper-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g From janny at frugalware.org Thu Mar 6 21:55:34 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 21:55:36 2008 Subject: [Frugalware-git] fwlive: fwlive-strip Message-ID: <20080306205534.244DA119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=699a8f3a0d9485259118e99b902f8492cbfcfc72 commit 699a8f3a0d9485259118e99b902f8492cbfcfc72 Author: Janny Date: Thu Mar 6 21:54:11 2008 +0100 fwlive-strip * add strip all files to build * add remove all README, COPYING, AUTHORS files diff --git a/live-base/build b/live-base/build index ab7e5f6..75ce8c9 100644 --- a/live-base/build +++ b/live-base/build @@ -58,6 +58,19 @@ done find $ROOT/usr/share/i18n/locales -maxdepth 1 -type f $lo -exec rm -fr {} \; find $ROOT/usr/share/locale -maxdepth 1 -type d $lo -exec rm -fr {} \; +echo "Deleting docs files which are not needed in Live mode.." + +find $ROOT/usr/share/doc ! -name "README*" ! -name "COPYING*" ! -name "AUTHORS*" -exec rm -rf {} \; + +# strip usr/{bin,sbin} bin and sbin + +echo "Stripping all files in /usr/{bin,sbin} /bin , /sbin .." + +strip $ROOT/usr/bin/* -s 2>/dev/null +strip $ROOT/usr/sbin/* -s 2>/dev/null +strip $ROOT/bin/* -s 2>/dev/null +strip $ROOT/sbin/* -s 2>/dev/null + echo "Creating compressed images..." for dir in $MKMOD; do From janny at frugalware.org Thu Mar 6 22:10:41 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 22:10:43 2008 Subject: [Frugalware-git] fwlive: very typo fix ^M :S Message-ID: <20080306211041.BEF72119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=60548f644f6ea62d1c09016bf1de591070a27d2b commit 60548f644f6ea62d1c09016bf1de591070a27d2b Author: Janny Date: Thu Mar 6 22:10:30 2008 +0100 very typo fix ^M :S diff --git a/config b/config index 2133466..51169ec 100644 --- a/config +++ b/config @@ -23,7 +23,7 @@ FWLFONT = lat2-16.psfu.gz # * SERVER # * MIN - comfortable console workstation # * MUSTHAVE - minimalistic one, base of all profiles -APPSGROUP = FULL +APPSGROUP = FULL # add supported locals LOCALE = en,de,fr,da,hu,cz From janny at frugalware.org Thu Mar 6 22:22:39 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 22:22:40 2008 Subject: [Frugalware-git] fwlive: fwlive-locale typo fix ()thx crazy) Message-ID: <20080306212239.6C4ED119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=49fdc4ea5eca70138a10b2d9283d95fc6336db76 commit 49fdc4ea5eca70138a10b2d9283d95fc6336db76 Author: Janny Date: Thu Mar 6 22:22:32 2008 +0100 fwlive-locale typo fix ()thx crazy) diff --git a/config b/config index 51169ec..d909bfe 100644 --- a/config +++ b/config @@ -26,7 +26,7 @@ FWLFONT = lat2-16.psfu.gz APPSGROUP = FULL # add supported locals -LOCALE = en,de,fr,da,hu,cz +LOCALE = en,de,fr,da,hu,cs # grub title part 1 FWLSREL = FWLive-${APPSGROUP} From janny at frugalware.org Thu Mar 6 22:42:57 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 22:42:58 2008 Subject: [Frugalware-git] fwlive: fwlive Message-ID: <20080306214257.E81F1119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d762bb4d34d2c68a3159bffd9d12a92706c6ee66 commit d762bb4d34d2c68a3159bffd9d12a92706c6ee66 Author: Janny Date: Thu Mar 6 22:41:14 2008 +0100 fwlive * from config remove en variable * add en variable to LOCALE in Makefile diff --git a/Makefile b/Makefile index 2980323..caf3469 100644 --- a/Makefile +++ b/Makefile @@ -275,7 +275,7 @@ endif sed -i "s|linuxcd|${FWLHOST}|" ${CHROOTDIR}/${TREE}/tmp/live-base/.config sed -i "s|Live|$(shell ${FWLREL}) (${FWLCODENAME})|" ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/linux/make_iso.sh sed -i "s|KERNEL=.*|KERNEL=\"$(shell ${KERNVER})\"|" ${CHROOTDIR}/${TREE}/tmp/live-base/.config - echo "LOCALE=${LOCALE}" >> ${CHROOTDIR}/${TREE}/tmp/live-base/.config + echo "LOCALE=${LOCALE},en" >> ${CHROOTDIR}/${TREE}/tmp/live-base/.config hacking-kdmrc: checkroot if [ ${APPSGROUP} == "KDE" ] || [ ${APPSGROUP} == "FULL" ] ; then \ diff --git a/config b/config index d909bfe..ce0bbb0 100644 --- a/config +++ b/config @@ -26,7 +26,7 @@ FWLFONT = lat2-16.psfu.gz APPSGROUP = FULL # add supported locals -LOCALE = en,de,fr,da,hu,cs +LOCALE = de,fr,da,hu,cs # grub title part 1 FWLSREL = FWLive-${APPSGROUP} @@ -69,11 +69,11 @@ SAVEDIRS = etc home lib root usr var CONFIG_SETUP = y # additional packages to be installed by the profiles -# no builded pkgs: truecrypt-fwlive +# no builded pkgs: truecrypt-fwlive acx100-fwlive DRIVERS = gspcav1-fwlive qc-usb-fwlive dazuko-fwlive busybox-fwlive lirc-fwlive \ acerhk-fwlive redirfs-fwlive fglrx-fwlive nvidia-96xx-fwlive \ nvidia-fwlive madwifi-fwlive wlan-ng-fwlive busybox-fwlive \ - acx100-fwlive ndiswrapper-fwlive kqemu-fwlive + ndiswrapper-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) From janny at frugalware.org Thu Mar 6 22:51:29 2008 From: janny at frugalware.org (Janny) Date: Thu Mar 6 22:51:31 2008 Subject: [Frugalware-git] fwlive: remove nvidia and fglrx pkgs Message-ID: <20080306215129.46192119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=6159c4459a4b5a13b642a17bfa4692a7af44a3ee commit 6159c4459a4b5a13b642a17bfa4692a7af44a3ee Author: Janny Date: Thu Mar 6 22:51:21 2008 +0100 remove nvidia and fglrx pkgs diff --git a/config b/config index ce0bbb0..d3a210d 100644 --- a/config +++ b/config @@ -71,8 +71,7 @@ CONFIG_SETUP = y # additional packages to be installed by the profiles # no builded pkgs: truecrypt-fwlive acx100-fwlive DRIVERS = gspcav1-fwlive qc-usb-fwlive dazuko-fwlive busybox-fwlive lirc-fwlive \ - acerhk-fwlive redirfs-fwlive fglrx-fwlive nvidia-96xx-fwlive \ - nvidia-fwlive madwifi-fwlive wlan-ng-fwlive busybox-fwlive \ + acerhk-fwlive redirfs-fwlive madwifi-fwlive wlan-ng-fwlive busybox-fwlive \ ndiswrapper-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g From vmiklos at frugalware.org Fri Mar 7 00:20:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 00:20:02 2008 Subject: [Frugalware-git] frugalware-current: pacman-tools-1.0.6-2-x86_64 Message-ID: <20080306232000.DABDD119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1049c37b0d2b0083cb43661711d862c60700f84 commit a1049c37b0d2b0083cb43661711d862c60700f84 Author: Miklos Vajna Date: Fri Mar 7 00:19:56 2008 +0100 pacman-tools-1.0.6-2-x86_64 - add patch from git to fix syncd's home detection diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index d8e468e..43b63a2 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pacman-tools pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for developers for managing packages" url="http://ftp.frugalware.org/pub/other/pacman-tools" depends=('bash' 'perl' 'pacman-g2>=3.5.1' 'wget' 'python' 'libxml2' 'glib2') @@ -13,7 +13,8 @@ archs=('i686' 'x86_64' 'ppc') backup=(etc/{genchangelog,repoman}.conf etc/syncpkg{cd/c,d/d,d/ctl}config.py) _F_archive_nosort=y up2date="lynx -dump $url|Flasttar" -source=($url/$pkgname-$pkgver.tar.gz) +source=($url/$pkgname-$pkgver.tar.gz \ + http://git.frugalware.org/patches/pacman-tools/fab116c1de8696e241e6117678eedd1c10b56503.patch) options=('scriptlet') -signatures=(${source[0]}.asc) +signatures=(${source[0]}.asc '') # optimization OK From vmiklos at frugalware.org Fri Mar 7 00:28:06 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 00:28:07 2008 Subject: [Frugalware-git] frugalware: TAG 0.8 Message-ID: <20080306232806.858401190A17@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=1db13bf6cc581143f76ab1b7d7f6159455d510f2 commit 1db13bf6cc581143f76ab1b7d7f6159455d510f2 Author: Miklos Vajna Date: Fri Mar 7 00:27:10 2008 +0100 TAG 0.8 From vmiklos at frugalware.org Fri Mar 7 00:28:06 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 00:28:07 2008 Subject: [Frugalware-git] frugalware: update for 0.8 Message-ID: <20080306232806.678FA119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=81462f923e7357b0cda6d33f974c3305f2d30e83 commit 81462f923e7357b0cda6d33f974c3305f2d30e83 Author: Miklos Vajna Date: Fri Mar 7 00:27:08 2008 +0100 update for 0.8 diff --git a/Makefile b/Makefile index b691d06..106c160 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.8rc2 +VERSION = 0.8 CODENAME = Kalgan FRUGALWARE_LANGS = de hu it From vmiklos at frugalware.org Fri Mar 7 00:39:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 00:39:47 2008 Subject: [Frugalware-git] frugalware-current: frugalware-0.8-1-i686 Message-ID: <20080306233945.A22E3119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43a28fe3c6d5d248ebab9188e7ecbe97d0e1b718 commit 43a28fe3c6d5d248ebab9188e7ecbe97d0e1b718 Author: Miklos Vajna Date: Fri Mar 7 00:39:31 2008 +0100 frugalware-0.8-1-i686 version bump diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 5246823..a083068 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=frugalware -pkgver=0.8rc2 +pkgver=0.8 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" @@ -12,7 +12,6 @@ makedepends=('help2man') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,termcap}) -_F_archive_nosort=y up2date="lynx -dump $url |Flasttar" source=($url/$pkgname-$pkgver.tar.gz) signatures=("$source.asc") From vmiklos at frugalware.org Fri Mar 7 00:50:46 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 00:50:48 2008 Subject: [Frugalware-git] setup: updates for 0.8.8 Message-ID: <20080306235046.B11D8119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=9fbe7986d4ee0b2eb1b48e21e30d954a00ca48e7 commit 9fbe7986d4ee0b2eb1b48e21e30d954a00ca48e7 Author: Miklos Vajna Date: Fri Mar 7 00:49:48 2008 +0100 updates for 0.8.8 diff --git a/NEWS b/NEWS index 65fe40a..da94513 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.8.8 - check for volume name to determine if a disc is a Frugalware install + one + - new translation: cs_CZ + - added a splash for the hardware detection + - fixed a bug in mirror selection 0.8.7 - fixed a case when xconfig hanged - fixed issues introduced by kernel-2.6.24 0.8.6 - fix selecting individual packages in expert mode diff --git a/configure b/configure index 6d6c8ca..a8bf9c5 100755 --- a/configure +++ b/configure @@ -16,8 +16,8 @@ packages = ['bash', 'kernel', 'busybox', 'dhcpcd', 'dialog', 'e2fsprogs', 'readline', 'acx100', 'shadow', 'madwifi', 'rt2500', 'device-mapper', 'lvm2', 'wpa_supplicant', 'openssl'] -# when releasing a new setup, please update this :) -version = "0.8.7" +# when releasing a new setup, please update this. +version = "0.8.8" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From vmiklos at frugalware.org Fri Mar 7 00:57:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 00:57:50 2008 Subject: [Frugalware-git] frugalware-current: fwsetup-0.8.8-1-i686 Message-ID: <20080306235749.4C113119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2860b5e8fb9c91ef8c1ea6f7879a9e15fc8f168 commit e2860b5e8fb9c91ef8c1ea6f7879a9e15fc8f168 Author: Miklos Vajna Date: Fri Mar 7 00:57:41 2008 +0100 fwsetup-0.8.8-1-i686 version bump diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index ec61eab..1dbf142 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: VMiklos pkgname=fwsetup -pkgver=0.8.7 +pkgver=0.8.8 pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() -makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.8rc2') +makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.8') groups=('devel-extra') archs=('i686' 'x86_64') _F_archive_nosort=y @@ -16,5 +16,5 @@ source=($url/releases/$pkgname-$pkgver.tar.gz) signatures=("$source.asc") options=('nofakeroot') unset MAKEFLAGS -Fconfopts="$Fconfopts --repo=testing" +Fconfopts="$Fconfopts --repo=stable" # optimization OK From vmiklos at frugalware.org Fri Mar 7 12:39:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 12:39:54 2008 Subject: [Frugalware-git] frugalware-current: kde-theme-qtcurve-0.55.3-2-x86_64 Message-ID: <20080307113952.55288119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=caeeaca3d96358147927de542e38e2c9e27b9d41 commit caeeaca3d96358147927de542e38e2c9e27b9d41 Author: Miklos Vajna Date: Fri Mar 7 12:39:38 2008 +0100 kde-theme-qtcurve-0.55.3-2-x86_64 - fix for the lib64 test - this fix broke the build in newer versions so i removed it but the testsuite pointed out that the fix is still necessary. so here is an updated version. diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index a3252ea..b9b70ed 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kde-theme-qtcurve pkgver=0.55.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE QtCurve Theme" depends=('kdelibs>=3.5.8') makedepends=('gtk+2>=2.12.1' 'freetype2' 'cmake') @@ -60,6 +60,9 @@ build() || Fdie make || Fdie make DESTDIR=$Fdestdir install || Fdie + if [ "$CARCH" == "x86_64" ]; then + Fmv usr/lib64 usr/lib + fi } # optimization OK From vmiklos at frugalware.org Fri Mar 7 13:08:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 13:08:03 2008 Subject: [Frugalware-git] frugalware-current: gnome-pilot-2.0.15-3-x86_64 Message-ID: <20080307120800.E099D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b69ef89829d339220f7eb5efa17e04e92f252aac commit b69ef89829d339220f7eb5efa17e04e92f252aac Author: Miklos Vajna Date: Fri Mar 7 13:07:56 2008 +0100 gnome-pilot-2.0.15-3-x86_64 - rebuilt with pilot-link-0.12.3 diff --git a/source/gnome/gnome-pilot/FrugalBuild b/source/gnome/gnome-pilot/FrugalBuild index 98486f9..b39c02f 100644 --- a/source/gnome/gnome-pilot/FrugalBuild +++ b/source/gnome/gnome-pilot/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gnome-pilot pkgver=2.0.15 -pkgrel=2 +pkgrel=3 pkgdesc="Pilot support for GNOME" url="http://www.gnome.org/" -depends=('pilot-link>=0.12.2' 'gnome-panel>=2.18.0' 'scrollkeeper' 'dbus-glib>=0.73') +depends=('pilot-link>=0.12.3' 'gnome-panel>=2.18.0' 'scrollkeeper' 'dbus-glib>=0.73') makedepends=('intltool') groups=('gnome') archs=('i686' 'x86_64') From vmiklos at frugalware.org Fri Mar 7 14:43:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 14:43:34 2008 Subject: [Frugalware-git] homepage-ng: FSA373-firefox Message-ID: <20080307134332.DD6A8119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=6d3ab302dff1a57cc94db8d11a51115420eb009e commit 6d3ab302dff1a57cc94db8d11a51115420eb009e Author: Miklos Vajna Date: Fri Mar 7 14:43:27 2008 +0100 FSA373-firefox diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 9ebf741..3aba6f4 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,35 @@ + 373 + 2008-03-07 + vmiklos + firefox + 2.0.0.11-1sayshell1 + 2.0.0.12-1sayshell1 + http://bugs.frugalware.org/task/2776 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0412 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0413 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0414 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0415 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0419 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0420 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0591 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0593 + Some vulnerabilities and weaknesses have been reported Mozilla Firefox, which can be exploited by malicious people to disclose sensitive information, bypass certain security restrictions, conduct spoofing attacks, or to compromise a user's system. + 1) Various errors in the browser engine can be exploited to cause a memory corruption. + 2) Various errors in the Javascript engine can be exploited to cause a memory corruption. + Successful exploitation of these vulnerabilities may allow execution of arbitrary code. + 3) A security issue is caused due to a design error within the focus handling and can potentially be exploited to trick a user into uploading arbitrary files. + 4) An error in the Javascript engine can be exploited to run Javascript code with "chrome" privileges. + 5) An error in the Javascript engine can be exploited to bypass the same-origin policy via the "XMLDocument.load()" function. + 6) An error exists in the handling of images when a user leaves a page, which uses "designMode" frames. This can be exploited to disclose the user's navigation history, forward navigation information, and to cause a memory corruption. + Successful exploitation of this vulnerability may allow execution of arbitrary code. + 7) A design error related to timer-enabled dialogs can be exploited to trick a user into unintentionally confirming a security dialog. + 8) The problem is that Firefox follows "302" redirects for stylesheets and allows reading the target URL via "element.sheet.href". This can potentially be exploited to disclose sensitive URL parameters. + 9) An error within the processing of color palettes within bitmaps can be exploited to disclose the contents of memory areas. + + 372 2008-03-04 vmiklos From vmiklos at frugalware.org Fri Mar 7 14:50:30 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 14:50:36 2008 Subject: [Frugalware-git] homepage-ng: FSA374-seamonkey Message-ID: <20080307135030.88282119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=ecfcec3910bb816ca2922cb9997bdd4ba5202dc6 commit ecfcec3910bb816ca2922cb9997bdd4ba5202dc6 Author: Miklos Vajna Date: Fri Mar 7 14:50:26 2008 +0100 FSA374-seamonkey diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 3aba6f4..85cc8a3 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,24 @@ + 374 + 2008-03-07 + vmiklos + seamonkey + 1.1.7-1sayshell1 + 1.1.8-1sayshell1 + http://bugs.frugalware.org/task/2777 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0412 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0413 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0414 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0415 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0418 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0419 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0593 + Some vulnerabilities have been reported in Mozilla SeaMonkey, which can be exploited by malicious people to disclose sensitive information, bypass certain security restrictions, conduct spoofing attacks, or potentially to compromise a vulnerable system. + For more information, see FSA373. + + 373 2008-03-07 vmiklos From vmiklos at frugalware.org Fri Mar 7 21:14:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 7 21:14:27 2008 Subject: [Frugalware-git] frugalware-current: TAG 0.8 Message-ID: <20080307201426.2A323119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94688ebffe18a2e1e2efd06fff591b73211e122c commit 94688ebffe18a2e1e2efd06fff591b73211e122c Author: Miklos Vajna Date: Fri Mar 7 21:14:22 2008 +0100 TAG 0.8 From vmiklos at frugalware.org Sat Mar 8 00:33:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 00:33:24 2008 Subject: [Frugalware-git] frugalware-0.7: vlc-0.8.6-8sayshell2-i686 Message-ID: <20080307233322.300CF1190A3B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=d29752025aa86a700683efdc62366e99ec8cfda6 commit d29752025aa86a700683efdc62366e99ec8cfda6 Author: Miklos Vajna Date: Sat Mar 8 00:33:00 2008 +0100 vlc-0.8.6-8sayshell2-i686 - added vlc-0.8.6-CORE-2008-0130.patch - closes #2819 diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index 7cb76ec..4c57d3b 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -4,7 +4,7 @@ pkgname=vlc pkgver=0.8.6 pkgextraver=c -pkgrel=8sayshell1 +pkgrel=8sayshell2 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/" depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ @@ -18,13 +18,15 @@ groups=('xmultimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ - $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch SA28233.patch) + $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch SA28233.patch \ + http://www.videolan.org/patches/vlc-0.8.6-CORE-2008-0130.patch) sha1sums=('aefaf7a039874930b3e7caf139d2ed5b5bbd0a56' \ '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \ '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \ 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ - '86ece3df5bf479c2c74f4a24ac3746b1bd7ef49d') + '86ece3df5bf479c2c74f4a24ac3746b1bd7ef49d' \ + 'c5c9a2e30be6ffeb85eefaefc6cb2988d1005823') build() { From vmiklos at frugalware.org Sat Mar 8 00:55:11 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 00:55:14 2008 Subject: [Frugalware-git] frugalware-0.7: clamav-0.92.1-1sayshell1-i686 Message-ID: <20080307235511.F26B91190A3B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=594ec3291d79c57d6c12ea206a4e6164840dd8c2 commit 594ec3291d79c57d6c12ea206a4e6164840dd8c2 Author: Miklos Vajna Date: Sat Mar 8 00:54:40 2008 +0100 clamav-0.92.1-1sayshell1-i686 - secfix bump - closes #2771 diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index d87e1c6..7b36fff 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Janny pkgname=clamav -pkgver=0.91.2 -pkgrel=2sayshell1 +pkgver=0.92.1 +pkgrel=1sayshell1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp' 'bzip2' 'curl>=7.16.0') rodepends=('shadow') @@ -11,16 +11,10 @@ backup=(etc/{freshclam,clamd}.conf) groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge -source=($source rc.clamav rc.clamav-hu.po \ - clamav-0.91.2-CVE-2007-6335.patch \ - clamav-0.91.2-CVE-2007-6336.patch \ - clamav-0.91.2-CVE-2007-6337.patch) -sha1sums=('f18007c3045a1d78967adad805c6934d46ca6419' \ +source=($source rc.clamav rc.clamav-hu.po) +sha1sums=('6ee4fa5a1c5f71eecc99beb17bc5f3c5a3b580ec' \ '90b22c99927b56992ac05042029d2702db79a8b0' \ - '57d36966c45adfd6b3ebd10b91874194924ab2c3' \ - '48707d513348dd87ff74beaff7370a91a097acec' \ - '482fa318c9d1172c1a2b3a652936e8a417e11817' \ - 'e02199c35043a1811a077e7fb6a7044dd820d12b') + '57d36966c45adfd6b3ebd10b91874194924ab2c3') build() { diff --git a/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6335.patch b/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6335.patch deleted file mode 100644 index d879eb7..0000000 --- a/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6335.patch +++ /dev/null @@ -1,52 +0,0 @@ -Thu Dec 6 15:22:27 CET 2007 (tk) ---------------------------------- - * libclamav/pe.c: fix possible integer overflow in MEW related code - Reported by iDefense [IDEF2842] - - Backported by - - SVN r3376 - -Index: clamav-0.91.2/libclamav/pe.c -=================================================================== ---- clamav-0.91.2.orig/libclamav/pe.c -+++ clamav-0.91.2/libclamav/pe.c -@@ -80,6 +80,18 @@ - #define PEALIGN(o,a) (((a))?(((o)/(a))*(a)):(o)) - #define PESALIGN(o,a) (((a))?(((o)/(a)+((o)%(a)!=0))*(a)):(o)) - -+#define CLI_UNPSIZELIMITS(NAME,CHK) \ -+if(ctx->limits && ctx->limits->maxfilesize && (CHK) > ctx->limits->maxfilesize) { \ -+ cli_dbgmsg(NAME": Sizes exceeded (%lu > %lu)\n", (CHK), ctx->limits->maxfilesize); \ -+ free(exe_sections); \ -+ if(BLOCKMAX) { \ -+ *ctx->virname = "PE."NAME".ExceededFileSize"; \ -+ return CL_VIRUS; \ -+ } else { \ -+ return CL_CLEAN; \ -+ } \ -+} -+ - extern short cli_leavetemps_flag; - - struct offset_list { -@@ -1153,16 +1165,9 @@ int cli_scanpe(int desc, cli_ctx *ctx) - dsize = exe_sections[i].vsz; - - cli_dbgmsg("MEW: ssize %08x dsize %08x offdiff: %08x\n", ssize, dsize, offdiff); -- if(ctx->limits && ctx->limits->maxfilesize && (ssize + dsize > ctx->limits->maxfilesize || exe_sections[i + 1].rsz > ctx->limits->maxfilesize)) { -- cli_dbgmsg("MEW: Sizes exceeded (ssize: %u, dsize: %u, max: %lu)\n", ssize, dsize , ctx->limits->maxfilesize); -- free(exe_sections); -- if(BLOCKMAX) { -- *ctx->virname = "PE.MEW.ExceededFileSize"; -- return CL_VIRUS; -- } else { -- return CL_CLEAN; -- } -- } -+ -+ CLI_UNPSIZELIMITS("MEW", MAX(ssize, dsize)); -+ CLI_UNPSIZELIMITS("MEW", MAX(ssize + dsize, exe_sections[i + 1].rsz)); - - /* allocate needed buffer */ - if (!(src = cli_calloc (ssize + dsize, sizeof(char)))) { diff --git a/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6336.patch b/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6336.patch deleted file mode 100644 index 41cc474..0000000 --- a/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6336.patch +++ /dev/null @@ -1,21 +0,0 @@ -Thu Dec 6 15:15:45 CET 2007 (tk) ---------------------------------- - * libclamav/mspack.c: fix off-by-one error in LZX_READ_HUFFSYM() (bb#663) - - https://wwws.clamav.net/bugzilla/show_bug.cgi?id=663 - - SVN r3374 - -Index: clamav-0.91.2/libclamav/mspack.c -=================================================================== ---- clamav-0.91.2.orig/libclamav/mspack.c -+++ clamav-0.91.2/libclamav/mspack.c -@@ -734,7 +734,7 @@ void mszip_free(struct mszip_stream *zip - - #define LZX_ENSURE_BITS(nbits) \ - while (bits_left < (nbits)) { \ -- if (i_ptr >= i_end) { \ -+ if (i_ptr + 1 >= i_end) { \ - if (lzx_read_input(lzx)) return lzx->error; \ - i_ptr = lzx->i_ptr; \ - i_end = lzx->i_end; \ diff --git a/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6337.patch b/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6337.patch deleted file mode 100644 index 71edc47..0000000 --- a/source/apps-extra/clamav/clamav-0.91.2-CVE-2007-6337.patch +++ /dev/null @@ -1,24 +0,0 @@ -Mon Dec 10 15:54:20 CET 2007 (tk) ---------------------------------- - * libclamav/nsis/bzlib_private.h: fix bzlib bug (aCaB) - - SVN r3387 - -Index: clamav-0.91.2/libclamav/nsis/bzlib_private.h -=================================================================== ---- clamav-0.91.2.orig/libclamav/nsis/bzlib_private.h -+++ clamav-0.91.2/libclamav/nsis/bzlib_private.h -@@ -422,11 +422,13 @@ typedef - /*-- Macros for decompression. --*/ - - #define BZ_GET_FAST(cccc) \ -+ if (s->tPos >= s->blockSize100k * 100000) return True; \ - s->tPos = s->tt[s->tPos]; \ - cccc = (UChar)(s->tPos & 0xff); \ - s->tPos >>= 8; - - #define BZ_GET_FAST_C(cccc) \ -+ if (c_tPos >= s->blockSize100k * 100000) return True; \ - c_tPos = c_tt[c_tPos]; \ - cccc = (UChar)(c_tPos & 0xff); \ - c_tPos >>= 8; From vmiklos at frugalware.org Sat Mar 8 01:14:02 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 01:14:04 2008 Subject: [Frugalware-git] frugalware-0.7: dbus-1.0.3-1sayshell1-i686 Message-ID: <20080308001402.A8AE61190A3B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=27812e764a2b49d84f43d1597efd90383a4233dc commit 27812e764a2b49d84f43d1597efd90383a4233dc Author: Miklos Vajna Date: Sat Mar 8 01:13:42 2008 +0100 dbus-1.0.3-1sayshell1-i686 - secfix bump - closes #2822 diff --git a/source/apps/dbus/FrugalBuild b/source/apps/dbus/FrugalBuild index a37cc4c..5a06236 100644 --- a/source/apps/dbus/FrugalBuild +++ b/source/apps/dbus/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=dbus -pkgver=1.0.2 -pkgrel=3sayshell1 +pkgver=1.0.3 +pkgrel=1sayshell1 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus" depends=('libxml2' 'expat') @@ -15,7 +15,7 @@ up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar" source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ rc.$pkgname dbus-0.95-dont-crash.patch \ dbus-1-launch dbus-1-launch.desktop) -sha1sums=('2870efd6ea0b5b0d14e52195f560238a74bb1e0e' \ +sha1sums=('85fbc3069b14e1cd8391bdba364655adeef67e12' \ 'b5b036bbdd1a3fbe97218ae57bdd565f85160cd9' \ '7c35583080fdf47bab1888cbcad75870bace315c' \ '740af74eb43cadf1277346029577aadd3d10f2b5' \ From crazy at frugalware.org Sat Mar 8 13:19:35 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 13:19:36 2008 Subject: [Frugalware-git] gcc43: util.sh Message-ID: <20080308121935.4DFD311904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=7211673f2e915c06ae513e1e7575611e18fd9bda commit 7211673f2e915c06ae513e1e7575611e18fd9bda Author: crazy Date: Sat Mar 8 13:17:37 2008 +0100 util.sh * remove gcc hack from here , never worked * will be moved to makepkg for now and for Kalgan+1 to makepkg.conf * added comment for LDFLAGS these have to be moved to makepkg.conf also diff --git a/source/include/util.sh b/source/include/util.sh index 49ed8d7..ef8d898 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -83,11 +83,7 @@ Flocalstatedir="/var" Fmenudir="/usr/share/applications" Farchs=('i686' 'x86_64' 'ppc') Fconfopts="--prefix=$Fprefix" -_gccver=`type -p gcc >/dev/null && gcc -dumpversion` -if [ "${_gccver%%.?}" == "4.2" ]; then - export CFLAGS="$CFLAGS -fno-strict-aliasing" - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" -fi +## Move to makepkg.conf for Kalgan+1 export LDFLAGS="-Wl,--hash-style=both" ### From vmiklos at frugalware.org Sat Mar 8 13:30:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 13:30:46 2008 Subject: [Frugalware-git] frugalware-0.7: thunderbird-2.0.0.12-1sayshell1-i686 Message-ID: <20080308123044.0C24E11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=655ec8d6f3fc447622904db9f07e82c0d0d7b2fa commit 655ec8d6f3fc447622904db9f07e82c0d0d7b2fa Author: Miklos Vajna Date: Sat Mar 8 13:30:08 2008 +0100 thunderbird-2.0.0.12-1sayshell1-i686 - secfix bump - closes #2775 diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index fe690dc..3f192ad 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Krisztian VASAS pkgname=thunderbird -pkgver=2.0.0.9 -pkgrel=1terminus1 +pkgver=2.0.0.12 +pkgrel=1sayshell1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" depends=('gtk+2>=2.10.11' 'nss>=3.11.5' 'pango>=1.16.2' 'cairo>=1.4.4' 'libstdc++' 'libxt' 'libidl' 'libxcb') From vmiklos at frugalware.org Sat Mar 8 13:33:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 13:33:36 2008 Subject: [Frugalware-git] frugalware-0.7: joomla-1.0.15-1sayshell1-i686 Message-ID: <20080308123335.1A3D611904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=5e798b3adb3c0b95c899d13bf05b582121caf452 commit 5e798b3adb3c0b95c899d13bf05b582121caf452 Author: Miklos Vajna Date: Sat Mar 8 13:33:16 2008 +0100 joomla-1.0.15-1sayshell1-i686 - secfix bump - closes #2808 diff --git a/source/network-extra/joomla/CVE-2007-5427.diff b/source/network-extra/joomla/CVE-2007-5427.diff deleted file mode 100644 index f012105..0000000 --- a/source/network-extra/joomla/CVE-2007-5427.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- components/com_search/search.html.php 2008/01/04 04:49:28 9849 -+++ components/com_search/search.html.php 2008/01/04 05:56:34 9850 -@@ -127,8 +127,9 @@ - $searchphrase = strtolower( strval( mosGetParam( $_REQUEST, 'searchphrase', 'any' ) ) ); - - $searchphrase = htmlspecialchars($searchphrase); -+ $cleanWord = htmlspecialchars($searchword); - -- $link = $mosConfig_live_site ."/index.php?option=$option&Itemid=$Itemid&searchword=$searchword&searchphrase=$searchphrase&ordering=$ordering"; -+ $link = $mosConfig_live_site ."/index.php?option=$option&Itemid=$Itemid&searchword=$cleanWord&searchphrase=$searchphrase&ordering=$ordering"; - echo $pageNav->getLimitBox( $link ); - ?> -
    diff --git a/source/network-extra/joomla/FrugalBuild b/source/network-extra/joomla/FrugalBuild index 8292e2f..4adcb00 100644 --- a/source/network-extra/joomla/FrugalBuild +++ b/source/network-extra/joomla/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Bence Nagy pkgname=joomla -pkgver=1.0.13 -pkgrel=2sayshell1 +pkgver=1.0.15 +pkgrel=1sayshell1 pkgdesc="One of the most powerful Open Source Content Management Systems on the planet" url="http://www.joomla.org/" rodepends=('apache' 'php' 'mysql' 'webappconfig') @@ -11,12 +11,11 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.joomla.org/content/blogcategory/32/66/|grep 'Stable version is'|sed 's/.*\[ *\([0-9.]\+\) *\]/\1/'" backup=(var/www/joomla/configuration.php) -source=(http://joomlacode.org/gf/download/frsrelease/4508/13216/Joomla_$pkgver-Stable-Full_Package.tar.gz \ - joomlasetup README.Frugalware CVE-2007-5427.diff) -sha1sums=('91934fe13e65ccb679ba50db1962449c306211df' \ +source=(http://joomlacode.org/gf/download/frsrelease/6828/22537/Joomla_$pkgver-Stable-Full_Package.tar.gz \ + joomlasetup README.Frugalware) +sha1sums=('c1cebbf891127d77672c29880c4d2d5ba6ac5c2b' \ '436fa260a2750e2394eb23f1504757bdb8045af1' \ - 'c079d041113ca5302340955027a5e313bee47f4a' \ - '044d0443f13a71893bb1626a690386a7c39514df') + 'c079d041113ca5302340955027a5e313bee47f4a') build() { _F_cd_path="." From crazy at frugalware.org Sat Mar 8 13:49:01 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 13:49:03 2008 Subject: [Frugalware-git] gcc43: pacman-g2-3.6.8-3-i686 Message-ID: <20080308124901.5FFA611904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ff593166a0ed7d7add97041ea266a3c6c8891521 commit ff593166a0ed7d7add97041ea266a3c6c8891521 Author: crazy Date: Sat Mar 8 13:44:40 2008 +0100 pacman-g2-3.6.8-3-i686 * prepare for rebuild / bump party ;) * added 2 patches to update CHOST, * first one updates configure.ac second patch is * adding an workaround for peoples are running stable * but uses current chroot ( eg: build servers mostly ) * moved the gcc hack from utils.sh to makepkg diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 63dbea0..4dec62a 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -6,11 +6,11 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 pkgver=3.6.8 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=2 +pkgrel=3 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) -depends=('libarchive>=2.0.27' 'glibc>=2.7') +depends=('libarchive>=2.0.27' 'glibc>=2.7' 'grep' 'util-linux-ng') makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \ 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') @@ -21,8 +21,11 @@ _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then source=($url/releases/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch) - signatures=("$source.asc" '') + http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch \ + makepkg-move-strict-aliasing-hack-here.patch \ + pacman-g2-CHOST-1.patch \ + pacman-g2-CHOST-2.patch) + signatures=("$source.asc" '' '' '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" diff --git a/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch b/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch new file mode 100644 index 0000000..02bbeaa --- /dev/null +++ b/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch @@ -0,0 +1,35 @@ +From b109f0c78f46a2d54af529ceb71c69a1476b24ec Mon Sep 17 00:00:00 2001 +From: crazy +Date: Fri, 7 Mar 2008 22:54:32 +0100 +Subject: [PATCH] makepkg: move strict-aliasing hack here + * while we still need -fno-strict-aliasing + * moved the hack from util.sh ( where it never worked ) + * to here. We can't do that from util.sh because + * makepkg.conf is sourced after util.sh so the *FLAGS are lost + +--- + scripts/makepkg | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index 5333002..a84c3ab 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -114,6 +114,14 @@ Fextract() { + # makepkg configuration + [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf + ++# we need -fno-strict-aliasing for gcc 4.2*++ ++_gccver=`type -p gcc >/dev/null && gcc -dumpversion` ++if [ "${_gccver%%.?}" == "4.3" ]; then ++ export CFLAGS="$CFLAGS -fno-strict-aliasing" ++ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" ++fi ++ ++ + INFAKEROOT= + if [ "$1" = "-F" ]; then + INFAKEROOT=1 +-- +1.5.4.3 + diff --git a/source/base/pacman-g2/pacman-g2-CHOST-1.patch b/source/base/pacman-g2/pacman-g2-CHOST-1.patch new file mode 100644 index 0000000..4435268 --- /dev/null +++ b/source/base/pacman-g2/pacman-g2-CHOST-1.patch @@ -0,0 +1,72 @@ +From d60831f10df7969ca4bc5d3aade7be99a9caa949 Mon Sep 17 00:00:00 2001 +From: crazy +Date: Fri, 7 Mar 2008 23:03:57 +0100 +Subject: [PATCH] configure.ac + * prepare for bump party ;) + * changed CHOST to ${CARCH}-frugalware-linux + +--- + configure.ac | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ac2d49b..936dde1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,7 @@ case "$host" in + CARCH="i686" + CARCHFLAGS="i686" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture]) +@@ -104,7 +104,7 @@ case "$host" in + CARCH="x86_64" + CARCHFLAGS="k8" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture]) +@@ -112,7 +112,7 @@ case "$host" in + CARCH="ia64" + CARCHFLAGS="ia64" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture]) +@@ -120,7 +120,7 @@ case "$host" in + CARCH="sparc" + CARCHFLAGS="v9" + MARCHFLAG="mcpu" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + ppc-* | powerpc-*) + AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture]) +@@ -129,7 +129,7 @@ case "$host" in + CARCH="ppc" + CARCHFLAGS="750" + MARCHFLAG="mcpu" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture]) +@@ -137,7 +137,7 @@ case "$host" in + CARCH="i386" + CARCHFLAGS="i386" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + *) + AC_MSG_ERROR([Your architecture is not supported]) +-- +1.5.4.3 + diff --git a/source/base/pacman-g2/pacman-g2-CHOST-2.patch b/source/base/pacman-g2/pacman-g2-CHOST-2.patch new file mode 100644 index 0000000..e98968b --- /dev/null +++ b/source/base/pacman-g2/pacman-g2-CHOST-2.patch @@ -0,0 +1,18 @@ +diff --git a/scripts/makepkg b/scripts/makepkg +index a84c3ab..23d4924 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -114,6 +114,13 @@ Fextract() { + # makepkg configuration + [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf + ++## both are hacks , remove after 0.9 and move to makepkg.conf ++ ++if `$ECHO $CHOST|grep -q linux-gnu`; then ++ unset CHOST ++ export CHOST="`arch`-frugalware-linux" ++fi ++ + # we need -fno-strict-aliasing for gcc 4.2*++ + _gccver=`type -p gcc >/dev/null && gcc -dumpversion` + if [ "${_gccver%%.?}" == "4.3" ]; then diff --git a/source/base/pacman-g2/pacman-g2.install b/source/base/pacman-g2/pacman-g2.install index 6d2a8df..ee32082 100644 --- a/source/base/pacman-g2/pacman-g2.install +++ b/source/base/pacman-g2/pacman-g2.install @@ -28,6 +28,17 @@ post_upgrade() mv /var/lib/pacman{,-g2} ln -s pacman-g2 /var/lib/pacman fi + + ## sed in makepkg.* to cover conf.xxx files + PARCH=`arch` + if grep -q linux-gnu /etc/makepkg.conf*; then + if [ "$PARCH" = "i686" ]; then + sed -i -e 's/i686-pc-linux-gnu/i686-frugalware-linux/g' /etc/makepkg.conf* + else + sed -i -e 's/x86_64-unknown-linux-gnu/x86_64-frugalware-linux/g' /etc/makepkg.conf* + fi + ## yeah I know ppc but .. + fi } op=$1 From vmiklos at frugalware.org Sat Mar 8 13:55:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 13:55:53 2008 Subject: [Frugalware-git] frugalware-0.7: graphicsmagick-1.1.11-1sayshell1-i686 Message-ID: <20080308125551.74C4A11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=1ff3e3e05175774da65c25c264dd04f4fa5cb1b2 commit 1ff3e3e05175774da65c25c264dd04f4fa5cb1b2 Author: Miklos Vajna Date: Sat Mar 8 13:55:31 2008 +0100 graphicsmagick-1.1.11-1sayshell1-i686 - secfix bump - closes #2807 diff --git a/source/xapps-extra/graphicsmagick/FrugalBuild b/source/xapps-extra/graphicsmagick/FrugalBuild index 5205d83..301521f 100644 --- a/source/xapps-extra/graphicsmagick/FrugalBuild +++ b/source/xapps-extra/graphicsmagick/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=graphicsmagick -pkgver=1.1.8 -pkgrel=1 +pkgver=1.1.11 +pkgrel=1sayshell1 pkgdesc="A collection of tools and libraries for many image formats" depends=('libxext' 'libsm' 'lcms' 'freetype2' 'libxml2' 'bzip2' 'jasper>=1.900.0' 'libpng' 'perl' 'urw-fonts' 'xespgs') groups=('xapps-extra') @@ -14,7 +14,7 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.graphicsmagick.org/" _F_cd_path="GraphicsMagick-$pkgver" -sha1sums=('fdd10d47f208d278f66b9f0ff69f814c67fbeab3') +sha1sums=('05f295b08ac07182b38a0284acfc023b0d84d091') subpkgs=("$pkgname-docs") subdescs=('GraphicsMagick Documentation') From vmiklos at frugalware.org Sat Mar 8 14:00:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 14:00:32 2008 Subject: [Frugalware-git] frugalware-0.7: pcre-7.6-1sayshell1-i686 Message-ID: <20080308130031.07B7B11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=59299d099628a5141ae20fa050b045affa07d19d commit 59299d099628a5141ae20fa050b045affa07d19d Author: Miklos Vajna Date: Sat Mar 8 14:00:10 2008 +0100 pcre-7.6-1sayshell1-i686 - secfix bump - closes #2785 diff --git a/source/base/pcre/FrugalBuild b/source/base/pcre/FrugalBuild index 5b68302..8d5b747 100644 --- a/source/base/pcre/FrugalBuild +++ b/source/base/pcre/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=pcre -pkgver=7.4 -pkgrel=1 +pkgver=7.6 +pkgrel=1sayshell1 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" groups=('base' 'chroot-core') From crazy at frugalware.org Sat Mar 8 14:26:46 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 14:26:48 2008 Subject: [Frugalware-git] gcc43: binutils-2.18.50.0.4-1-i686 Message-ID: <20080308132646.5CFDC11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b7635c802ce09e8c76c6428a5f1bb5b53924d72a commit b7635c802ce09e8c76c6428a5f1bb5b53924d72a Author: crazy Date: Sat Mar 8 14:24:29 2008 +0100 binutils-2.18.50.0.4-1-i686 * Version bump * added "pacman-g2>=3.6.8-3" to depends * build with --build=$CARCH-frugalware-linux diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild index e0f2064..4655017 100644 --- a/source/devel/binutils/FrugalBuild +++ b/source/devel/binutils/FrugalBuild @@ -2,27 +2,30 @@ # Maintainer: VMiklos pkgname=binutils -pkgver=2.18.50.0.3 +pkgver=2.18.50.0.4 pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files" url="http://www.gnu.org/software/binutils/" -depends=('bash' 'glibc>=2.6-2') +depends=('bash' 'glibc>=2.6-2' 'pacman-g2>=3.6.8-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') # for now, we need a devel version to utilize glibc-2.7 -up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.3/'" +up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.4/'" #Fup2gnubz2 source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2) #source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2) #signatures=($source.sig) -sha1sums=('7c89bd6cf6eaa13a374e22cf4ba8a598aa251825') +sha1sums=('26167b7de585ccef184b045b232606cf89894d86') build() { Fcd Fpatchall autoconf || Fdie - Fmake --enable-shared --disable-werror + Fmake \ + --enable-shared \ + --disable-werror \ + --build=$CARCH-frugalware-linux Fmakeinstall if [ "$CARCH" == "x86_64" ]; then cd libiberty || Fdie From vmiklos at frugalware.org Sat Mar 8 14:38:58 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 14:38:59 2008 Subject: [Frugalware-git] pacman-g2: makepkg: move strict-aliasing hack Message-ID: <20080308133858.7597911904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d6ab67d4fcc785a7b2ce7a0c36f959f5a27197a5 commit d6ab67d4fcc785a7b2ce7a0c36f959f5a27197a5 Author: crazy Date: Fri Mar 7 22:54:32 2008 +0100 makepkg: move strict-aliasing hack while we still need -fno-strict-aliasing moved the hack from util.sh ( where it never worked ) to here. We can't do that from util.sh because makepkg.conf is sourced after util.sh so the *FLAGS are lost diff --git a/scripts/makepkg b/scripts/makepkg index 5333002..a84c3ab 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -114,6 +114,14 @@ Fextract() { # makepkg configuration [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf +# we need -fno-strict-aliasing for gcc 4.2*++ +_gccver=`type -p gcc >/dev/null && gcc -dumpversion` +if [ "${_gccver%%.?}" == "4.3" ]; then + export CFLAGS="$CFLAGS -fno-strict-aliasing" + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" +fi + + INFAKEROOT= if [ "$1" = "-F" ]; then INFAKEROOT=1 From vmiklos at frugalware.org Sat Mar 8 14:40:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 14:40:09 2008 Subject: [Frugalware-git] frugalware-0.7: xine-lib-1.1.10.1-1sayshell1-i686 Message-ID: <20080308134005.3595511904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=0a0895a5f7d7b5f81637ce6047bb1a7490179394 commit 0a0895a5f7d7b5f81637ce6047bb1a7490179394 Author: Miklos Vajna Date: Sat Mar 8 14:39:44 2008 +0100 xine-lib-1.1.10.1-1sayshell1-i686 - secfix bump - closes #2773 diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild index c567b79..f8f3e23 100644 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=xine-lib -pkgver=1.1.8 -pkgrel=1 +pkgver=1.1.10.1 +pkgrel=1sayshell1 pkgdesc="Xine multimedia playback engine libraries" _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" @@ -19,7 +19,7 @@ options=('scriptlet') makedepends=('arts' 'esd' 'sdl') groups=('xlib') archs=('i686' 'x86_64') -sha1sums=('48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf') +sha1sums=('d77747206d19b48fd11a1dc36f3ac5ad3526c415') build() { export CFLAGS="$CFLAGS -UHAVE_MMX" From priyank at frugalware.org Sat Mar 8 14:41:47 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 8 14:41:49 2008 Subject: [Frugalware-git] gfpm: don't just release the transaction, hide the progress bar too. Message-ID: <20080308134147.87CCC11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=619ff240e05386690061bdac3ca18f36c2b5da41 commit 619ff240e05386690061bdac3ca18f36c2b5da41 Author: Priyank Date: Sat Mar 8 11:36:33 2008 +0530 don't just release the transaction, hide the progress bar too. * I wonder how this one got messed up diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 171f01f..d912b2b 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -98,7 +98,7 @@ static void cb_gfpm_close_button_clicked (GtkWidget *button, gpointer data) { pacman_trans_release (); -// gfpm_progress_show (FALSE); + gfpm_progress_show (FALSE); return; } From priyank at frugalware.org Sat Mar 8 15:48:33 2008 From: priyank at frugalware.org (Priyank) Date: Sat Mar 8 15:48:37 2008 Subject: [Frugalware-git] gfpm: new preferences dialog Message-ID: <20080308144833.3663611904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=71f904316f5fe6b54b6010b44c2805983b630144 commit 71f904316f5fe6b54b6010b44c2805983b630144 Author: Priyank Date: Sat Mar 8 20:17:40 2008 +0530 new preferences dialog diff --git a/data/gfpm.glade b/data/gfpm.glade index f53f8be..cf97fe7 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -43,13 +43,29 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Packages + _Options True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Preferences + True + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-preferences + + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2628,4 +2644,128 @@ + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 8 + Preferences + True + mainwindow + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + gtk-preferences + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 5 + <span size="larger"><b>Preferences</b></span> + True + + + False + 1 + + + + + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + General + + + tab + False + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Packages + + + tab + 1 + False + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Something + + + tab + 2 + False + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + + False + 2 + + + + + From crazy at frugalware.org Sat Mar 8 16:24:50 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 16:24:53 2008 Subject: [Frugalware-git] gcc43: gcc-4.3.0-1-i686 Message-ID: <20080308152450.8FF5211904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e06e3651206bc30396b50edb7730523679befd02 commit e06e3651206bc30396b50edb7730523679befd02 Author: crazy Date: Sat Mar 8 16:21:09 2008 +0100 gcc-4.3.0-1-i686 * Version bump * a lot java changes * depends / makedepends fixes * build with --build=$CARCH-frugalware-linux , --with-bugurl * and --with-pkgversion diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 8a2932e..0826e95 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -2,21 +2,27 @@ # Maintainer: VMiklos pkgname=gcc -pkgver=4.2.3 +pkgver=4.3.0 pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" -depends=('binutils>=2.18.50.0.3' 'libstdc++') -makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' 'glibc>=2.6.1-2') +depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc' 'mpfr') +makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ + 'glibc>=2.6.1-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ + 'libxdamage' 'alsa-lib' 'pacman-g2>=3.6.8-3') provides=('c-compiler') groups=('devel' 'devel-core') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" -source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ +#source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ +source=(ftp://ftp.gwdg.de/pub/misc/gcc/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 \ ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2 \ README.Frugalware) -signatures=("$source.sig" '' '') +#signatures=("$source.sig" '' '') +sha1sums=('d6ae7f024b99ba9b85f253fdeb00a9a1d6f1fc8d' \ + 'd3c9af69bb788334a67039bbe056606e8590a8a7' \ + '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ @@ -32,12 +38,22 @@ subdescs=('GCC shared support library' 'GNU Standard C++ Library' \ 'Treelang support for GCC' \ 'FFI libraries from GCC' 'SSP libraries from GCC' \ 'GNU OpenMP runtime library') -subdepends=('glibc' 'libgcc' \ - 'libgcc' "gcc=$pkgver libgnat" \ - 'glibc' "gcc=$pkgver mpfr libgfortran" \ - 'libgcc zip' 'libgcj gtk+2 libart_lgpl libxtst' "gcc=$pkgver libgcj" \ - 'libgcc' "gcc=$pkgver libobjc" "gcc=$pkgver libobjc" \ - "gcc=$pkgver" "glibc" "glibc" "glibc") +subdepends=('glibc' \ + 'libgcc' \ + 'libgcc' \ + "glibc mpfr" \ + 'glibc' \ + "glibc mpfr" \ + 'libgcc zlib alsa-lib' \ + 'libgcj libart_lgpl gtk+2 libxml2 freetype2 libice libxtst libxau libxdmcp libxdamage libstdc++' \ + "libgcj zlib libgcj mpfr" \ + 'libgcc' \ + "glibc mpfr" \ + "glibc mpfr" \ + "glibc mpfr" \ + "glibc" \ + "glibc" \ + "glibc") subbackup=('' '' '' '' '' '' "usr/lib/gcj-$pkgver/classmap.db" '' '' '' '' '' '' '' '' '') subgroups=('base chroot-core' 'base chroot-core' \ 'lib-extra' 'devel-extra' \ @@ -72,6 +88,8 @@ build() --enable-threads=posix \ --enable-__cxa_atexit \ --enable-java-awt=gtk \ + --with-ecj \ + --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \ --enable-gtk-cairo \ --enable-plugin \ --with-system-zlib \ @@ -79,10 +97,20 @@ build() --disable-multilib \ --disable-libjava-multilib \ --enable-target-optspace \ - --enable-bootstrap + --enable-bootstrap \ + --with-bugurl="http://bugs.frugalware.org/" \ + --with-pkgversion="Frugalware Linux" \ + --enable-linux-futex \ + --disable-dependency-tracking \ + --enable-libstdcxx-allocator=new \ + --enable-hash-synchronization \ + --disable-libstdcxx-pch \ + --build=$CARCH-frugalware-linux + + ## libstdcxx-pch is really a waste of space , nothing need nor uses that make STAGE_CC_WRAPPER="$FCC" BOOT_CFLAGS="$CFLAGS" GCJFLAGS="$CFLAGS" bootstrap || return 1 - + unset MAKEFLAGS #this is needed by libffi Fmakeinstall @@ -140,12 +168,42 @@ build() # libstdc++ Fsplit libstdc++ usr/lib/libstdc++.* Fsplit libstdc++ usr/man/man3/ + ## always do this java stuff before gnat because gnat splits with gnat* + ## and we got now 'gnat'ive2ascii which is java stuff ;) + ## NOTE: old gcj-${pkgver} is now gcj-${pkgver}-xx + gcjpkgver=$(basename $Fdestdir/usr/lib/gcj-${pkgver}*) + # libgcj-awt + Fsplit libgcj-awt usr/lib/gcc/$CHOST/$pkgver/include/jawt*.h + Fsplit libgcj-awt usr/lib/${gcjpkgver}/lib{jawt,gcjwebplugin,gtkpeer}.* + Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/awt + Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/java/awt + Fsplit libgcj-awt usr/include/c++/$pkgver/java/awt + Fsplit libgcj-awt usr/include/c++/$pkgver/sun/awt + # libgcj + ## org , sun are libgcj incldes also + Fsplit libgcj usr/include/c++/$pkgver/[gjos]* + Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc + ## maybe we should add some libgcj-tools or libgcj-utils package ? - crazy - + Fsplit libgcj usr/bin/{jv-convert,gij,gjar,grmi*,gcj-dbtool,gorbd,gappletviewer,gjarsigner,gkeytool,addr2name.awk} + Fsplit libgcj usr/bin/{gtnameserv,gnative2ascii,gserialver,gc-analyze} + Fsplit libgcj usr/man/man1/{gjarsigner,gkeytool,gjar,jv-convert,gij,grmi*,gorbd,gcj-dbtool,gtnameserv}.1* + Fsplit libgcj usr/man/man1/{gnative2ascii,gserialver,gappletviewer,gc-analyze}.1* + Fsplit libgcj usr/lib/libgcj* + Fsplit libgcj usr/lib/libgij* + Fsplit libgcj usr/share/java + Fsplit libgcj usr/lib/security + Fsplit libgcj usr/lib/logging.properties + Fsplit libgcj usr/lib/${gcjpkgver} + # gcc-gcj + Fsplit gcc-gcj usr/bin/{gcj,$CHOST-gcj,gcjh,gjavah,jcf-dump} + Fsplit gcc-gcj usr/man/man1/{gcj,gcjh,gjavah,jcf-dump}.1* + Fsplit gcc-gcj usr/info/gcj* + Fsplit gcc-gcj usr/libexec/gcc/$CHOST/$pkgver/{jc1,jvgenmain,ecj1} # libgnat Fsplit libgnat usr/lib/libgnat*.so Fsplit libgnat usr/lib/libgnarl*.so # gcc-gnat Fsplit gcc-gnat usr/bin/gnat* - Fsplit gcc-gnat usr/bin/gpr* Fsplit gcc-gnat usr/info/gnat* Fsplit gcc-gnat usr/lib/gcc/$CHOST/$pkgver/adainclude Fsplit gcc-gnat usr/lib/gcc/$CHOST/$pkgver/adalib @@ -157,28 +215,6 @@ build() Fsplit gcc-gfortran usr/man/man1/gfortran.1* Fsplit gcc-gfortran usr/info/gfortran* Fsplit gcc-gfortran usr/libexec/gcc/$CHOST/$pkgver/f951 - # libgcj-awt - Fsplit libgcj-awt usr/lib/gcc/$CHOST/$pkgver/include/jawt*.h - Fsplit libgcj-awt usr/lib/gcj-$pkgver/lib{jawt,gcjwebplugin,gtkpeer}.* - Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/awt - Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/java/awt - Fsplit libgcj-awt usr/include/c++/$pkgver/java/awt - # libgcj - Fsplit libgcj usr/include/c++/$pkgver/[gj]* - Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc - Fsplit libgcj usr/bin/{jv-convert,gij,jar,grmic,grmiregistry,gcj-dbtool,gappletviewer,gjarsigner,gkeytool} - Fsplit libgcj usr/man/man1/{jv-convert,gij,grmic,grmiregistry,gcj-dbtool}.1* - Fsplit libgcj usr/lib/libgcj* - Fsplit libgcj usr/lib/libgij* - Fsplit libgcj usr/share/java - Fsplit libgcj usr/lib/security - Fsplit libgcj usr/lib/logging.properties - Fsplit libgcj usr/lib/gcj-$pkgver - # gcc-gcj - Fsplit gcc-gcj usr/bin/{gcj,$CHOST-gcj,gcjh,$CHOST-gcjh,gjnih,jcf-dump,jv-scan} - Fsplit gcc-gcj usr/man/man1/{gcj,gcjh,gjnih,jcf-dump,jv-scan}.1* - Fsplit gcc-gcj usr/info/gcj* - Fsplit gcc-gcj usr/libexec/gcc/$CHOST/$pkgver/{jc1,jvgenmain} # libobjc Fsplit libobjc usr/lib/libobjc* # gcc-objc From vmiklos at frugalware.org Sat Mar 8 16:47:37 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 16:47:44 2008 Subject: [Frugalware-git] frugalware-0.7: cups-1.3.6-1sayshell1-i686 Message-ID: <20080308154737.C8B8E11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=9add9c2a02a39bd38bfd42af3bc868a06004c968 commit 9add9c2a02a39bd38bfd42af3bc868a06004c968 Author: Miklos Vajna Date: Sat Mar 8 16:46:45 2008 +0100 cups-1.3.6-1sayshell1-i686 - secfix bump - closes #2806 diff --git a/source/apps/cups/CVE-2007-4351.diff b/source/apps/cups/CVE-2007-4351.diff deleted file mode 100644 index da0d07a..0000000 --- a/source/apps/cups/CVE-2007-4351.diff +++ /dev/null @@ -1,153 +0,0 @@ -Index: ipp.c -=================================================================== ---- cups/ipp.c (revision 7023) -+++ cups/ipp.c (working copy) -@@ -1306,6 +1306,12 @@ - { - case IPP_TAG_INTEGER : - case IPP_TAG_ENUM : -+ if (n != 4) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 4) < 4) - { - DEBUG_puts("ippReadIO: Unable to read integer value!"); -@@ -1318,6 +1324,12 @@ - value->integer = n; - break; - case IPP_TAG_BOOLEAN : -+ if (n != 1) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 1) < 1) - { - DEBUG_puts("ippReadIO: Unable to read boolean value!"); -@@ -1335,6 +1347,12 @@ - case IPP_TAG_CHARSET : - case IPP_TAG_LANGUAGE : - case IPP_TAG_MIMETYPE : -+ if (n >= sizeof(buffer)) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, n) < n) - { - DEBUG_puts("ippReadIO: unable to read name!"); -@@ -1347,6 +1365,12 @@ - value->string.text)); - break; - case IPP_TAG_DATE : -+ if (n != 11) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, value->date, 11) < 11) - { - DEBUG_puts("ippReadIO: Unable to date integer value!"); -@@ -1354,6 +1378,12 @@ - } - break; - case IPP_TAG_RESOLUTION : -+ if (n != 9) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 9) < 9) - { - DEBUG_puts("ippReadIO: Unable to read resolution value!"); -@@ -1370,6 +1400,12 @@ - (ipp_res_t)buffer[8]; - break; - case IPP_TAG_RANGE : -+ if (n != 8) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 8) < 8) - { - DEBUG_puts("ippReadIO: Unable to read range value!"); -@@ -1385,7 +1421,7 @@ - break; - case IPP_TAG_TEXTLANG : - case IPP_TAG_NAMELANG : -- if (n > sizeof(buffer) || n < 4) -+ if (n >= sizeof(buffer) || n < 4) - { - DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); - return (IPP_ERROR); -@@ -1411,22 +1447,27 @@ - - n = (bufptr[0] << 8) | bufptr[1]; - -- if (n >= sizeof(string)) -+ if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)) || -+ n >= sizeof(string)) - { -- memcpy(string, bufptr + 2, sizeof(string) - 1); -- string[sizeof(string) - 1] = '\0'; -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); - } -- else -- { -- memcpy(string, bufptr + 2, n); -- string[n] = '\0'; -- } - -+ memcpy(string, bufptr + 2, n); -+ string[n] = '\0'; -+ - value->string.charset = _cupsStrAlloc((char *)string); - - bufptr += 2 + n; - n = (bufptr[0] << 8) | bufptr[1]; - -+ if ((bufptr + 2 + n) >= (buffer + sizeof(buffer))) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - bufptr[2 + n] = '\0'; - value->string.text = _cupsStrAlloc((char *)bufptr + 2); - break; -@@ -1468,6 +1509,12 @@ - * we need to carry over... - */ - -+ if (n >= sizeof(buffer)) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, n) < n) - { - DEBUG_puts("ippReadIO: Unable to read member name value!"); -@@ -1489,6 +1536,12 @@ - break; - - default : /* Other unsupported values */ -+ if (n > sizeof(buffer)) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - value->unknown.length = n; - if (n > 0) - { diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index eed23e5..2ee6f5f 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=cups -pkgver=1.3.2 -pkgrel=2sayshell3 +pkgver=1.3.6 +pkgrel=1sayshell1 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" depends=('libtiff' 'libpng' 'libjpeg') @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs}) up2date="lynx -dump $url |grep Stable |sed -e 's/.*v\(.*\)/\1/'" source=(ftp://ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \ - rc.cups rc.cups-{hu,de}.po CVE-2007-4351.diff cups-xpdf.diff str2589.patch) + rc.cups rc.cups-{hu,de}.po) subpkgs=('libcups') subdescs=('Main library of the CUPS printing system.') @@ -49,12 +49,9 @@ build() { Fsplit libcups usr/lib/libcups.so* } -sha1sums=('6915f4499ac258a59afc5b3541b17f56b3bfb66f' \ +sha1sums=('4f7ed1c2b16db46f945ab113beab8aeaecbca0b9' \ 'ad90c43de181d362f6c507f366904472d01ae585' \ 'f19bb889e3535e1284d0b93606da48aa61089c8a' \ - '03197abb98eff18d3ede3000a61c7783b8c1ad92' \ - '79b9bc071bb4ab0ccf032a51f815adf96264dd52' \ - 'c081ba7af9d0f3028c1c5a9b63cb15cdc5527c29' \ - 'd9c61f7e88da276134f730aba6b68b5cae87538d') + '03197abb98eff18d3ede3000a61c7783b8c1ad92') # optimization OK diff --git a/source/apps/cups/cups-xpdf.diff b/source/apps/cups/cups-xpdf.diff deleted file mode 100644 index 813f626..0000000 --- a/source/apps/cups/cups-xpdf.diff +++ /dev/null @@ -1,798 +0,0 @@ -diff -aur cups-1.3.4/pdftops/Stream.cxx fw_cups-1.3.4/pdftops/Stream.cxx ---- cups-1.3.4/pdftops/Stream.cxx 2007-07-30 21:53:15.000000000 +0200 -+++ fw_cups-1.3.4/pdftops/Stream.cxx 2007-11-23 09:59:16.000000000 +0100 -@@ -1274,23 +1274,26 @@ - columns = columnsA; - if (columns < 1) { - columns = 1; -- } -- if (columns + 4 <= 0) { -- columns = INT_MAX - 4; -+ } else if (columns > INT_MAX - 2) { -+ columns = INT_MAX - 2; - } - rows = rowsA; - endOfBlock = endOfBlockA; - black = blackA; -- refLine = (short *)gmallocn(columns + 4, sizeof(short)); -- codingLine = (short *)gmallocn(columns + 3, sizeof(short)); -+ // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns -+ // ---> max codingLine size = columns + 1 -+ // refLine has one extra guard entry at the end -+ // ---> max refLine size = columns + 2 -+ codingLine = (int *)gmallocn(columns + 1, sizeof(int)); -+ refLine = (int *)gmallocn(columns + 2, sizeof(int)); - - eof = gFalse; - row = 0; - nextLine2D = encoding < 0; - inputBits = 0; -- codingLine[0] = 0; -- codingLine[1] = refLine[2] = columns; -- a0 = 1; -+ codingLine[0] = columns; -+ a0i = 0; -+ outputBits = 0; - - buf = EOF; - } -@@ -1309,9 +1312,9 @@ - row = 0; - nextLine2D = encoding < 0; - inputBits = 0; -- codingLine[0] = 0; -- codingLine[1] = refLine[2] = columns; -- a0 = 1; -+ codingLine[0] = columns; -+ a0i = 0; -+ outputBits = 0; - buf = EOF; - - // skip any initial zero bits and end-of-line marker, and get the 2D -@@ -1328,284 +1331,357 @@ - } - } - --int CCITTFaxStream::lookChar() { -- short code1, code2, code3; -- int a0New; -- GBool err, gotEOL; -- int ret; -- int bits, i; -- -- // if at eof just return EOF -- if (eof && codingLine[a0] >= columns) { -- return EOF; -- } -- -- // read the next row -- err = gFalse; -- if (codingLine[a0] >= columns) { -- -- // 2-D encoding -- if (nextLine2D) { -- for (i = 0; codingLine[i] < columns; ++i) -- refLine[i] = codingLine[i]; -- refLine[i] = refLine[i + 1] = columns; -- b1 = 1; -- a0New = codingLine[a0 = 0] = 0; -- do { -- code1 = getTwoDimCode(); -- switch (code1) { -- case twoDimPass: -- if (refLine[b1] < columns) { -- a0New = refLine[b1 + 1]; -- b1 += 2; -- } -- break; -- case twoDimHoriz: -- if ((a0 & 1) == 0) { -- code1 = code2 = 0; -- do { -- code1 += code3 = getWhiteCode(); -- } while (code3 >= 64); -- do { -- code2 += code3 = getBlackCode(); -- } while (code3 >= 64); -- } else { -- code1 = code2 = 0; -- do { -- code1 += code3 = getBlackCode(); -- } while (code3 >= 64); -- do { -- code2 += code3 = getWhiteCode(); -- } while (code3 >= 64); -- } -- if (code1 > 0 || code2 > 0) { -- codingLine[a0 + 1] = a0New + code1; -- ++a0; -- a0New = codingLine[a0 + 1] = codingLine[a0] + code2; -- ++a0; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVert0: -- a0New = codingLine[++a0] = refLine[b1]; -- if (refLine[b1] < columns) { -- ++b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVertR1: -- a0New = codingLine[++a0] = refLine[b1] + 1; -- if (refLine[b1] < columns) { -- ++b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVertL1: -- if (a0 == 0 || refLine[b1] - 1 > a0New) { -- a0New = codingLine[++a0] = refLine[b1] - 1; -- --b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVertR2: -- a0New = codingLine[++a0] = refLine[b1] + 2; -- if (refLine[b1] < columns) { -- ++b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVertL2: -- if (a0 == 0 || refLine[b1] - 2 > a0New) { -- a0New = codingLine[++a0] = refLine[b1] - 2; -- --b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVertR3: -- a0New = codingLine[++a0] = refLine[b1] + 3; -- if (refLine[b1] < columns) { -- ++b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case twoDimVertL3: -- if (a0 == 0 || refLine[b1] - 3 > a0New) { -- a0New = codingLine[++a0] = refLine[b1] - 3; -- --b1; -- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) -- b1 += 2; -- } -- break; -- case EOF: -- eof = gTrue; -- codingLine[a0 = 0] = columns; -- return EOF; -- default: -- error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); -- err = gTrue; -- break; -- } -- } while (codingLine[a0] < columns); -- -- // 1-D encoding -- } else { -- codingLine[a0 = 0] = 0; -- while (1) { -- code1 = 0; -- do { -- code1 += code3 = getWhiteCode(); -- } while (code3 >= 64); -- codingLine[a0+1] = codingLine[a0] + code1; -- ++a0; -- if (codingLine[a0] >= columns) -- break; -- code2 = 0; -- do { -- code2 += code3 = getBlackCode(); -- } while (code3 >= 64); -- codingLine[a0+1] = codingLine[a0] + code2; -- ++a0; -- if (codingLine[a0] >= columns) -- break; -- } -+inline void CCITTFaxStream::addPixels(int a1, int blackPixels) { -+ if (a1 > codingLine[a0i]) { -+ if (a1 > columns) { -+ error(getPos(), "CCITTFax row is wrong length (%d)", a1); -+ err = gTrue; -+ a1 = columns; - } -+ if ((a0i & 1) ^ blackPixels) { -+ ++a0i; -+ } -+ codingLine[a0i] = a1; -+ } -+} - -- if (codingLine[a0] != columns) { -- error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]); -- // force the row to be the correct length -- while (codingLine[a0] > columns) { -- --a0; -- } -- codingLine[++a0] = columns; -+inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) { -+ if (a1 > codingLine[a0i]) { -+ if (a1 > columns) { -+ error(getPos(), "CCITTFax row is wrong length (%d)", a1); - err = gTrue; -+ a1 = columns; - } -- -- // byte-align the row -- if (byteAlign) { -- inputBits &= ~7; -+ if ((a0i & 1) ^ blackPixels) { -+ ++a0i; - } -- -- // check for end-of-line marker, skipping over any extra zero bits -- gotEOL = gFalse; -- if (!endOfBlock && row == rows - 1) { -- eof = gTrue; -- } else { -- code1 = lookBits(12); -- while (code1 == 0) { -- eatBits(1); -- code1 = lookBits(12); -- } -- if (code1 == 0x001) { -- eatBits(12); -- gotEOL = gTrue; -- } else if (code1 == EOF) { -- eof = gTrue; -- } -+ codingLine[a0i] = a1; -+ } else if (a1 < codingLine[a0i]) { -+ if (a1 < 0) { -+ error(getPos(), "Invalid CCITTFax code"); -+ err = gTrue; -+ a1 = 0; - } -- -- // get 2D encoding tag -- if (!eof && encoding > 0) { -- nextLine2D = !lookBits(1); -- eatBits(1); -- } -- -- // check for end-of-block marker -- if (endOfBlock && gotEOL) { -- code1 = lookBits(12); -- if (code1 == 0x001) { -- eatBits(12); -- if (encoding > 0) { -- lookBits(1); -- eatBits(1); -- } -- if (encoding >= 0) { -- for (i = 0; i < 4; ++i) { -- code1 = lookBits(12); -- if (code1 != 0x001) { -- error(getPos(), "Bad RTC code in CCITTFax stream"); -- } -- eatBits(12); -- if (encoding > 0) { -- lookBits(1); -- eatBits(1); -- } -- } -- } -- eof = gTrue; -- } -- -- // look for an end-of-line marker after an error -- we only do -- // this if we know the stream contains end-of-line markers because -- // the "just plow on" technique tends to work better otherwise -- } else if (err && endOfLine) { -- do { -- if (code1 == EOF) { -- eof = gTrue; -- return EOF; -- } -- eatBits(1); -- code1 = lookBits(13); -- } while ((code1 >> 1) != 0x001); -- eatBits(12); -- if (encoding > 0) { -- eatBits(1); -- nextLine2D = !(code1 & 1); -- } -+ while (a0i > 0 && a1 <= codingLine[a0i - 1]) { -+ --a0i; - } -+ codingLine[a0i] = a1; -+ } -+} - -- a0 = 0; -- outputBits = codingLine[1] - codingLine[0]; -- if (outputBits == 0) { -- a0 = 1; -- outputBits = codingLine[2] - codingLine[1]; -- } -+int CCITTFaxStream::lookChar() { -+ short code1, code2, code3; -+ int b1i, blackPixels, i, bits; -+ GBool gotEOL; -+ -+ if (buf != EOF) { -+ return buf; -+ -+ // read the next row -+ if (outputBits == 0) { -+ -+ // if at eof just return EOF -+ if (eof) { -+ return EOF; -+ } -+ -+ err = gFalse; -+ -+ // 2-D encoding -+ if (nextLine2D) { -+ for (i = 0; codingLine[i] < columns; ++i) { -+ refLine[i] = codingLine[i]; -+ } -+ refLine[i++] = columns; -+ refLine[i] = columns; -+ codingLine[0] = 0; -+ a0i = 0; -+ b1i = 0; -+ blackPixels = 0; -+ // invariant: -+ // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] -+ // <= columns -+ // exception at left edge: -+ // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible -+ // exception at right edge: -+ // refLine[b1i] = refLine[b1i+1] = columns is possible -+ while (codingLine[a0i] < columns) { -+ code1 = getTwoDimCode(); -+ switch (code1) { -+ case twoDimPass: -+ addPixels(refLine[b1i + 1], blackPixels); -+ if (refLine[b1i + 1] < columns) { -+ b1i += 2; -+ } -+ break; -+ case twoDimHoriz: -+ code1 = code2 = 0; -+ if (blackPixels) { -+ do { -+ code1 += code3 = getBlackCode(); -+ } while (code3 >= 64); -+ do { -+ code2 += code3 = getWhiteCode(); -+ } while (code3 >= 64); -+ } else { -+ do { -+ code1 += code3 = getWhiteCode(); -+ } while (code3 >= 64); -+ do { -+ code2 += code3 = getBlackCode(); -+ } while (code3 >= 64); -+ } -+ addPixels(codingLine[a0i] + code1, blackPixels); -+ if (codingLine[a0i] < columns) { -+ addPixels(codingLine[a0i] + code2, blackPixels ^ 1); -+ } -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ break; -+ case twoDimVertR3: -+ addPixels(refLine[b1i] + 3, blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ ++b1i; -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case twoDimVertR2: -+ addPixels(refLine[b1i] + 2, blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ ++b1i; -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case twoDimVertR1: -+ addPixels(refLine[b1i] + 1, blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ ++b1i; -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case twoDimVert0: -+ addPixels(refLine[b1i], blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ ++b1i; -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case twoDimVertL3: -+ addPixelsNeg(refLine[b1i] - 3, blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ if (b1i > 0) { -+ --b1i; -+ } else { -+ ++b1i; -+ } -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case twoDimVertL2: -+ addPixelsNeg(refLine[b1i] - 2, blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ if (b1i > 0) { -+ --b1i; -+ } else { -+ ++b1i; -+ } -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case twoDimVertL1: -+ addPixelsNeg(refLine[b1i] - 1, blackPixels); -+ blackPixels ^= 1; -+ if (codingLine[a0i] < columns) { -+ if (b1i > 0) { -+ --b1i; -+ } else { -+ ++b1i; -+ } -+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { -+ b1i += 2; -+ } -+ } -+ break; -+ case EOF: -+ addPixels(columns, 0); -+ eof = gTrue; -+ break; -+ default: -+ error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); -+ addPixels(columns, 0); -+ err = gTrue; -+ break; -+ } -+ } -+ -+ // 1-D encoding -+ } else { -+ codingLine[0] = 0; -+ a0i = 0; -+ blackPixels = 0; -+ while (codingLine[a0i] < columns) { -+ code1 = 0; -+ if (blackPixels) { -+ do { -+ code1 += code3 = getBlackCode(); -+ } while (code3 >= 64); -+ } else { -+ do { -+ code1 += code3 = getWhiteCode(); -+ } while (code3 >= 64); -+ } -+ -+ addPixels(codingLine[a0i] + code1, blackPixels); -+ blackPixels ^= 1; -+ } -+ } -+ -+ // byte-align the row -+ if (byteAlign) { -+ inputBits &= ~7; -+ } -+ -+ // check for end-of-line marker, skipping over any extra zero bits -+ gotEOL = gFalse; -+ if (!endOfBlock && row == rows - 1) { -+ eof = gTrue; -+ } else { -+ code1 = lookBits(12); -+ while (code1 == 0) { -+ eatBits(1); -+ code1 = lookBits(12); -+ } -+ if (code1 == 0x001) { -+ eatBits(12); -+ gotEOL = gTrue; -+ } else if (code1 == EOF) { -+ eof = gTrue; -+ } -+ } -+ -+ // get 2D encoding tag -+ if (!eof && encoding > 0) { -+ nextLine2D = !lookBits(1); -+ eatBits(1); -+ } -+ -+ // check for end-of-block marker -+ if (endOfBlock && gotEOL) { -+ code1 = lookBits(12); -+ if (code1 == 0x001) { -+ eatBits(12); -+ if (encoding > 0) { -+ lookBits(1); -+ eatBits(1); -+ } -+ if (encoding >= 0) { -+ for (i = 0; i < 4; ++i) { -+ code1 = lookBits(12); -+ if (code1 != 0x001) { -+ error(getPos(), "Bad RTC code in CCITTFax stream"); -+ } -+ eatBits(12); -+ if (encoding > 0) { -+ lookBits(1); -+ eatBits(1); -+ } -+ } -+ } -+ eof = gTrue; -+ } -+ -+ // look for an end-of-line marker after an error -- we only do -+ // this if we know the stream contains end-of-line markers because -+ // the "just plow on" technique tends to work better otherwise -+ } else if (err && endOfLine) { -+ while (1) { -+ code1 = lookBits(13); -+ if (code1 == EOF) { -+ eof = gTrue; -+ return EOF; -+ } -+ if ((code1 >> 1) == 0x001) { -+ break; -+ } -+ eatBits(1); -+ } -+ eatBits(12); -+ if (encoding > 0) { -+ eatBits(1); -+ nextLine2D = !(code1 & 1); -+ } -+ } -+ -+ // set up for output -+ if (codingLine[0] > 0) { -+ outputBits = codingLine[a0i = 0]; -+ } else { -+ outputBits = codingLine[a0i = 1]; -+ } - -- ++row; -- } -+ ++row; -+ } - -- // get a byte -- if (outputBits >= 8) { -- ret = ((a0 & 1) == 0) ? 0xff : 0x00; -- if ((outputBits -= 8) == 0) { -- ++a0; -- if (codingLine[a0] < columns) { -- outputBits = codingLine[a0 + 1] - codingLine[a0]; -- } -- } -- } else { -- bits = 8; -- ret = 0; -- do { -- if (outputBits > bits) { -- i = bits; -- bits = 0; -- if ((a0 & 1) == 0) { -- ret |= 0xff >> (8 - i); -- } -- outputBits -= i; -- } else { -- i = outputBits; -- bits -= outputBits; -- if ((a0 & 1) == 0) { -- ret |= (0xff >> (8 - i)) << bits; -- } -- outputBits = 0; -- ++a0; -- if (codingLine[a0] < columns) { -- outputBits = codingLine[a0 + 1] - codingLine[a0]; -+ // get a byte -+ if (outputBits >= 8) { -+ buf = (a0i & 1) ? 0x00 : 0xff; -+ outputBits -= 8; -+ if (outputBits == 0 && codingLine[a0i] < columns) { -+ ++a0i; -+ outputBits = codingLine[a0i] - codingLine[a0i - 1]; -+ } -+ } else { -+ bits = 8; -+ buf = 0; -+ do { -+ if (outputBits > bits) { -+ buf <<= bits; -+ if (!(a0i & 1)) { -+ buf |= 0xff >> (8 - bits); -+ } -+ outputBits -= bits; -+ bits = 0; -+ } else { -+ buf <<= outputBits; -+ if (!(a0i & 1)) { -+ buf |= 0xff >> (8 - outputBits); -+ } -+ bits -= outputBits; -+ outputBits = 0; -+ if (codingLine[a0i] < columns) { -+ ++a0i; -+ outputBits = codingLine[a0i] - codingLine[a0i - 1]; -+ } else if (bits > 0) { -+ buf <<= bits; -+ bits = 0; -+ } -+ } -+ } while (bits); -+ } -+ if (black) { -+ buf ^= 0xff; -+ } -+ return buf; - } -- } -- } while (bits > 0 && codingLine[a0] < columns); -- } -- buf = black ? (ret ^ 0xff) : ret; -- return buf; - } - - short CCITTFaxStream::getTwoDimCode() { -@@ -1646,6 +1722,9 @@ - code = 0; // make gcc happy - if (endOfBlock) { - code = lookBits(12); -+ if (code == EOF) { -+ return 1; -+ } - if ((code >> 5) == 0) { - p = &whiteTab1[code]; - } else { -@@ -1658,6 +1737,9 @@ - } else { - for (n = 1; n <= 9; ++n) { - code = lookBits(n); -+ if (code == EOF) { -+ return 1; -+ } - if (n < 9) { - code <<= 9 - n; - } -@@ -1669,6 +1751,9 @@ - } - for (n = 11; n <= 12; ++n) { - code = lookBits(n); -+ if (code == EOF) { -+ return 1; -+ } - if (n < 12) { - code <<= 12 - n; - } -@@ -1694,9 +1779,12 @@ - code = 0; // make gcc happy - if (endOfBlock) { - code = lookBits(13); -+ if (code == EOF) { -+ return 1; -+ } - if ((code >> 7) == 0) { - p = &blackTab1[code]; -- } else if ((code >> 9) == 0) { -+ } else if ((code >> 9) == 0 && (code >> 7) != 0) { - p = &blackTab2[(code >> 1) - 64]; - } else { - p = &blackTab3[code >> 7]; -@@ -1708,6 +1796,9 @@ - } else { - for (n = 2; n <= 6; ++n) { - code = lookBits(n); -+ if (code == EOF) { -+ return 1; -+ } - if (n < 6) { - code <<= 6 - n; - } -@@ -1719,6 +1810,9 @@ - } - for (n = 7; n <= 12; ++n) { - code = lookBits(n); -+ if (code == EOF) { -+ return 1; -+ } - if (n < 12) { - code <<= 12 - n; - } -@@ -1732,6 +1826,9 @@ - } - for (n = 10; n <= 13; ++n) { - code = lookBits(n); -+ if (code == EOF) { -+ return 1; -+ } - if (n < 13) { - code <<= 13 - n; - } -@@ -1954,6 +2051,12 @@ - // allocate a buffer for the whole image - bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth; - bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight; -+ if (bufWidth <= 0 || bufHeight <= 0 || -+ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) { -+ error(getPos(), "Invalid image size in DCT stream"); -+ y = height; -+ return; -+ } - for (i = 0; i < numComps; ++i) { - frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int)); - memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int)); -@@ -3015,6 +3118,11 @@ - } - scanInfo.firstCoeff = str->getChar(); - scanInfo.lastCoeff = str->getChar(); -+ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 || -+ scanInfo.firstCoeff > scanInfo.lastCoeff) { -+ error(getPos(), "Bad DCT coefficient numbers in scan info block"); -+ return gFalse; -+ } - c = str->getChar(); - scanInfo.ah = (c >> 4) & 0x0f; - scanInfo.al = c & 0x0f; -diff -aur cups-1.3.4/pdftops/Stream.h fw_cups-1.3.4/pdftops/Stream.h ---- cups-1.3.4/pdftops/Stream.h 2006-02-13 04:08:11.000000000 +0100 -+++ fw_cups-1.3.4/pdftops/Stream.h 2007-11-23 08:50:16.000000000 +0100 -@@ -519,13 +519,15 @@ - int row; // current row - int inputBuf; // input buffer - int inputBits; // number of bits in input buffer -- short *refLine; // reference line changing elements -- int b1; // index into refLine -- short *codingLine; // coding line changing elements -- int a0; // index into codingLine -+ int *codingLine; // coding line changing elements -+ int *refLine; // reference line changing elements -+ int a0i; // index into codingLine -+ GBool err; // error on current line - int outputBits; // remaining ouput bits - int buf; // character buffer - -+ void addPixels(int a1, int black); -+ void addPixelsNeg(int a1, int black); - short getTwoDimCode(); - short getWhiteCode(); - short getBlackCode(); diff --git a/source/apps/cups/str2589.patch b/source/apps/cups/str2589.patch deleted file mode 100644 index a957ca6..0000000 --- a/source/apps/cups/str2589.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: backend/snmp.c -=================================================================== ---- backend/snmp.c (revision 530) -+++ backend/snmp.c (working copy) -@@ -1064,18 +1064,38 @@ - char *string, /* I - String buffer */ - int strsize) /* I - String buffer size */ - { -- if (length < strsize) -+ if (length < 0) - { -- memcpy(string, *buffer, length); -+ /* -+ * Disallow negative lengths! -+ */ -+ -+ fprintf(stderr, "ERROR: Bad ASN1 string length %d!\n", length); -+ *string = '\0'; -+ } -+ else if (length < strsize) -+ { -+ /* -+ * String is smaller than the buffer... -+ */ -+ -+ if (length > 0) -+ memcpy(string, *buffer, length); -+ - string[length] = '\0'; - } - else - { -+ /* -+ * String is larger than the buffer... -+ */ -+ - memcpy(string, buffer, strsize - 1); - string[strsize - 1] = '\0'; - } - -- (*buffer) += length; -+ if (length > 0) -+ (*buffer) += length; - - return (string); - } From vmiklos at frugalware.org Sat Mar 8 17:18:47 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 17:18:49 2008 Subject: [Frugalware-git] frugalware-0.7: lighttpd-1.4.18-2sayshell1-i686 Message-ID: <20080308161847.13BB311904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=d94abb89979b63ca4930bb61227564708bda5c3a commit d94abb89979b63ca4930bb61227564708bda5c3a Author: Miklos Vajna Date: Sat Mar 8 17:18:24 2008 +0100 lighttpd-1.4.18-2sayshell1-i686 - added Fix-372-and-1562.patch - closes #2804 diff --git a/source/network-extra/lighttpd/Fix-372-and-1562.patch b/source/network-extra/lighttpd/Fix-372-and-1562.patch new file mode 100644 index 0000000..0571046 --- /dev/null +++ b/source/network-extra/lighttpd/Fix-372-and-1562.patch @@ -0,0 +1,40 @@ +From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Stefan=20B=C3=BChler?= +Date: Wed, 13 Feb 2008 00:07:22 +0100 +Subject: [PATCH] Fix #372 + #1562 + +--- + src/fdevent_solaris_devpoll.c | 2 +- + src/server.c | 3 --- + 2 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c +index f77daef..76414a4 100644 +--- a/src/fdevent_solaris_devpoll.c ++++ b/src/fdevent_solaris_devpoll.c +@@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { + int ret; + + dopoll.dp_timeout = timeout_ms; +- dopoll.dp_nfds = ev->maxfds; ++ dopoll.dp_nfds = ev->maxfds - 1; + dopoll.dp_fds = ev->devpollfds; + + ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); +diff --git a/src/server.c b/src/server.c +index 052130a..585a973 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -697,9 +697,6 @@ int main (int argc, char **argv) { + } + } + +- /* #372: solaris need some fds extra for devpoll */ +- if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; +- + if (srv->event_handler == FDEVENT_HANDLER_SELECT) { + srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; + } else { +-- +1.5.3.8 + diff --git a/source/network-extra/lighttpd/FrugalBuild b/source/network-extra/lighttpd/FrugalBuild index 89f4352..af827d8 100644 --- a/source/network-extra/lighttpd/FrugalBuild +++ b/source/network-extra/lighttpd/FrugalBuild @@ -4,14 +4,15 @@ pkgname=lighttpd pkgver=1.4.18 -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="A webserver designed and optimized for high performance environments." url="http://www.lighttpd.net/" license="BSD" up2date="lynx -dump http://www.lighttpd.net/download|grep -om1 'lighttpd-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" source=($url/download/$pkgname-$pkgver.tar.bz2 \ $pkgname.conf rc.$pkgname index.html \ - http://frugalware.org/images/frugalware.png) + http://frugalware.org/images/frugalware.png \ + Fix-372-and-1562.patch) groups=('network-extra') archs=('i686' 'x86_64') depends=('libmysqlclient' 'bzip2' 'lua' 'pcre' 'xfsprogs-attr' 'libldap' 'openssl') @@ -21,7 +22,8 @@ sha1sums=('a53a8f8ae8d42d036f0b5129764b822e943cc778' \ '1a1d742bba61f24b42a4aea99623ceabbd345d3e' \ 'f30cb68ad73467a43317afabe0f4a90472df222e' \ 'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \ - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \ + 'd93a7f8e53c4f47308bd5938ec391a7992bdc42d') build() { From vmiklos at frugalware.org Sat Mar 8 18:03:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 18:03:35 2008 Subject: [Frugalware-git] frugalware-0.7: cacti-0.8.6j-4sayshell1-i686 Message-ID: <20080308170332.0EB3011904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=874bc96760b6fa66422cdac1cd7fabaca161a41a commit 874bc96760b6fa66422cdac1cd7fabaca161a41a Author: Miklos Vajna Date: Sat Mar 8 18:02:41 2008 +0100 cacti-0.8.6j-4sayshell1-i686 - added sec patches ping_php_version4_snmpgetnext.patch, tree_console_missing_hosts.patch, thumbnail_graphs_not_working.patch, graph_debug_lockup_fix.patch, snmpwalk_fix.patch, multiple_vulnerabilities-0.8.6j.patch - closes #2772 diff --git a/source/network-extra/cacti/FrugalBuild b/source/network-extra/cacti/FrugalBuild index c1f3257..7c1b1d5 100644 --- a/source/network-extra/cacti/FrugalBuild +++ b/source/network-extra/cacti/FrugalBuild @@ -4,7 +4,7 @@ pkgname=cacti pkgver=0.8.6j -pkgrel=3terminus1 +pkgrel=4sayshell1 pkgdesc="Cacti is a complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality." url="http://cacti.net/" depends=('rrdtool' 'apache' 'mysql' 'php' 'net-snmp') @@ -12,10 +12,22 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://cacti.net/download_cacti.php | grep 'latest version' | sed 's/.*:....//'" source=(http://www.cacti.net/downloads/$pkgname-$pkgver.tar.gz SA25557.diff \ - http://www.cacti.net/downloads/patches/0.8.6j/sec_sql_injection-0.8.6j.patch) + http://www.cacti.net/downloads/patches/0.8.6j/sec_sql_injection-0.8.6j.patch \ + http://www.cacti.net/downloads/patches/0.8.6j/ping_php_version4_snmpgetnext.patch \ + http://www.cacti.net/downloads/patches/0.8.6j/tree_console_missing_hosts.patch \ + http://www.cacti.net/downloads/patches/0.8.6j/thumbnail_graphs_not_working.patch \ + http://www.cacti.net/downloads/patches/0.8.6j/graph_debug_lockup_fix.patch \ + http://www.cacti.net/downloads/patches/0.8.6j/snmpwalk_fix.patch \ + http://www.cacti.net/downloads/patches/0.8.6j/multiple_vulnerabilities-0.8.6j.patch) sha1sums=('4ed5b7ada8710c5474e7fc4aad4ad9339caf0188' \ 'eff9db43c57c8bdf4836647ab4e1792c28f8e650' \ - '3c44758623435c4311777e3a080d846dbe475736') + '3c44758623435c4311777e3a080d846dbe475736' \ + '41be27e18e136d79c5e3b2f99438a192fffdc383' \ + 'bccc1293567c9160971537a3cbbf69ab0ca9cf81' \ + '3684fe33e37105c719c59bd3ba7e1aaf2795c9a8' \ + 'be180e9def1f51678ed9424950dd5d5c8d3bc578' \ + 'e5cb384b87224e26e31063d13bb15e0bea12383c' \ + '7d00e4d42866967136f639c7600d06ef23fe223d') build() { From crazy at frugalware.org Sat Mar 8 18:52:22 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 18:52:24 2008 Subject: [Frugalware-git] gcc43: glibc-2.7-2-i686 Message-ID: <20080308175222.2891011904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9f4dc5828dd34e992041d926deaec230e3fc51d3 commit 9f4dc5828dd34e992041d926deaec230e3fc51d3 Author: crazy Date: Sat Mar 8 18:41:37 2008 +0100 glibc-2.7-2-i686 * rebuild * added an small patch to fix the build with new gcc and binutils * added binutils and gcc to depends for this relbump diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index e49b118..7ae5d06 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -3,17 +3,18 @@ pkgname=glibc pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" -depends=() +depends=('binutils>=2.18.50.0.4' 'gcc>=4.3.0') rodepends=('tzdata') makedepends=('grep>=2.5.3-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz -source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2) -signatures=("$source.sig") +source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 \ + glibc-2.7-fnstsw.diff) +signatures=("$source.sig" '') ## XEN disabled for 0.7 #if [ "$CARCH" == "i686" ]; then @@ -34,10 +35,20 @@ _build() rm -rf ../glibc-build || Fdie mkdir ../glibc-build || Fdie cd ../glibc-build || Fdie - ../glibc-$pkgver/configure --prefix=/usr --with-tls --with-__thread \ - --enable-add-ons=nptl --enable-kernel=2.6.0 --without-cvs \ - --without-selinux --enable-shared --enable-bind-now \ - --enable-static --enable-all-warnings || Fdie + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CXX="g++" CC="gcc" \ + ../glibc-$pkgver/configure \ + --prefix=/usr \ + --with-tls \ + --with-__thread \ + --enable-add-ons=nptl \ + --enable-kernel=2.6.0 \ + --without-cvs \ + --without-selinux \ + --enable-shared \ + --enable-bind-now \ + --enable-static \ + --enable-all-warnings \ + --build=$CARCH-frugalware-linux || Fdie make || Fdie diff --git a/source/base/glibc/glibc-2.7-fnstsw.diff b/source/base/glibc/glibc-2.7-fnstsw.diff new file mode 100644 index 0000000..93b706b --- /dev/null +++ b/source/base/glibc/glibc-2.7-fnstsw.diff @@ -0,0 +1,17 @@ +--- + sysdeps/i386/fpu/ftestexcept.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: glibc-2.7/sysdeps/i386/fpu/ftestexcept.c +=================================================================== +--- glibc-2.7.orig/sysdeps/i386/fpu/ftestexcept.c 2004-03-05 11:14:48.000000000 +0100 ++++ glibc-2.7/sysdeps/i386/fpu/ftestexcept.c 2008-01-18 14:02:19.000000000 +0100 +@@ -26,7 +26,7 @@ + int + fetestexcept (int excepts) + { +- int temp; ++ unsigned short temp; + int xtemp = 0; + + /* Get current exceptions. */ From vmiklos at frugalware.org Sat Mar 8 19:05:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 19:05:01 2008 Subject: [Frugalware-git] frugalware-0.7: rblibtorrent-0.12-6sayshell1-i686 Message-ID: <20080308180500.4189911904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=aedbf8bbad87217ed01accd5e88587a9fc1225e2 commit aedbf8bbad87217ed01accd5e88587a9fc1225e2 Author: Miklos Vajna Date: Sat Mar 8 19:04:33 2008 +0100 rblibtorrent-0.12-6sayshell1-i686 - added CVE-2008-0646.patch - closes #2770 diff --git a/source/lib-extra/rblibtorrent/CVE-2008-0646.patch b/source/lib-extra/rblibtorrent/CVE-2008-0646.patch new file mode 100644 index 0000000..b0c7922 --- /dev/null +++ b/source/lib-extra/rblibtorrent/CVE-2008-0646.patch @@ -0,0 +1,43 @@ +--- include/libtorrent/bencode.hpp 2007/03/10 20:38:59 956 ++++ include/libtorrent/bencode.hpp 2008/01/28 02:58:17 1968 +@@ -200,8 +200,9 @@ + } + + template +- void bdecode_recursive(InIt& in, InIt end, entry& ret) ++ void bdecode_recursive(InIt& in, InIt end, entry& ret, int depth) + { ++ if (depth >= 100) throw invalid_encoding(); + if (in == end) throw invalid_encoding(); + switch (*in) + { +@@ -228,7 +229,7 @@ + { + ret.list().push_back(entry()); + entry& e = ret.list().back(); +- bdecode_recursive(in, end, e); ++ bdecode_recursive(in, end, e, depth + 1); + if (in == end) throw invalid_encoding(); + } + assert(*in == 'e'); +@@ -244,9 +245,9 @@ + while (*in != 'e') + { + entry key; +- bdecode_recursive(in, end, key); ++ bdecode_recursive(in, end, key, depth + 1); + entry& e = ret[key.string()]; +- bdecode_recursive(in, end, e); ++ bdecode_recursive(in, end, e, depth + 1); + if (in == end) throw invalid_encoding(); + } + assert(*in == 'e'); +@@ -285,7 +286,7 @@ + try + { + entry e; +- detail::bdecode_recursive(start, end, e); ++ detail::bdecode_recursive(start, end, e, 0); + return e; + } + catch(type_error&) diff --git a/source/lib-extra/rblibtorrent/FrugalBuild b/source/lib-extra/rblibtorrent/FrugalBuild index 3ed2d58..27b9128 100644 --- a/source/lib-extra/rblibtorrent/FrugalBuild +++ b/source/lib-extra/rblibtorrent/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rblibtorrent pkgver=0.12 -pkgrel=5 +pkgrel=6sayshell1 pkgdesc="LibTorrent is a BitTorrent library written in C++" _F_sourceforge_name="libtorrent" Finclude sourceforge @@ -13,7 +13,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') #source=(http://www.libtorrent.org/libtorrent-${pkgver}rc3.tar.gz) up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=79942|grep -m1 '.tar.gz'|sed 's/.*rent-\(.*\).tar.gz.*/\1/'" -source=($source not-for-upstream.patch) +source=($source not-for-upstream.patch CVE-2008-0646.patch) _F_cd_path="libtorrent-$pkgver" build() @@ -36,6 +36,7 @@ build() Fln /usr/lib/libtorrent/libtorrent.so.0.1.0 /usr/lib/libtorrent.so.0 } -sha1sums=('c0b0535100d53452719cdfbcdf8e66c1217bc29e'\ - '729610c06b87fd4772ae0c428ad0abc5dbfeff3f') +sha1sums=('c0b0535100d53452719cdfbcdf8e66c1217bc29e' \ + '729610c06b87fd4772ae0c428ad0abc5dbfeff3f' \ + 'edd8e02811f7636c6a5d1ee8f1353889d89b5f0b') # optimization OK From crazy at frugalware.org Sat Mar 8 20:24:02 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 20:24:05 2008 Subject: [Frugalware-git] gcc43: gcc-4.3.0-1-x86_64 Message-ID: <20080308192402.DDE7311904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a7ea86af3815895ccc073d9cc071766e95605bd6 commit a7ea86af3815895ccc073d9cc071766e95605bd6 Author: crazy Date: Sat Mar 8 20:23:29 2008 +0100 gcc-4.3.0-1-x86_64 * multilib crap is broken again * lets see if that helps to fix it diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 0826e95..cf86fd4 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -95,7 +95,9 @@ build() --with-system-zlib \ --libdir=/usr/lib \ --disable-multilib \ + --enable-multilib=no \ --disable-libjava-multilib \ + --enable-libjava-multilib=no \ --enable-target-optspace \ --enable-bootstrap \ --with-bugurl="http://bugs.frugalware.org/" \ From vmiklos at frugalware.org Sat Mar 8 20:48:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 20:48:06 2008 Subject: [Frugalware-git] frugalware-0.7: phpmyadmin-2.11.5-1sayshell1-i686 Message-ID: <20080308194804.AE66911904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=3c6f3b84e022392708c30d5dbb54d15862cbe293 commit 3c6f3b84e022392708c30d5dbb54d15862cbe293 Author: Miklos Vajna Date: Sat Mar 8 20:47:44 2008 +0100 phpmyadmin-2.11.5-1sayshell1-i686 - secfix bump - closes #2835 diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index 9404b80..2f47cc5 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSCSY Lszl pkgname=phpmyadmin -pkgver=2.11.2.2 +pkgver=2.11.5 pkgrel=1sayshell1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -29,4 +29,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('0839e9f79c86b257b95dba24a96838a0171fce88') +sha1sums=('922a5ce40a0139aa3013e95eb6ee9176a7aa2785') From crazy at frugalware.org Sat Mar 8 21:40:07 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 21:40:10 2008 Subject: [Frugalware-git] gcc43: gcc-4.3.0-2-i686 Message-ID: <20080308204008.05BAE11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9ca07e811835d1760dc6464ffa1deed7e195bcd4 commit 9ca07e811835d1760dc6464ffa1deed7e195bcd4 Author: crazy Date: Sat Mar 8 21:14:42 2008 +0100 gcc-4.3.0-2-i686 * rebuild with glibc diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index cf86fd4..0068ddc 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gcc pkgver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" -depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc' 'mpfr') +depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc>=2.7-2' 'mpfr') makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ - 'glibc>=2.6.1-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ + 'glibc>=2.7-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ 'libxdamage' 'alsa-lib' 'pacman-g2>=3.6.8-3') provides=('c-compiler') groups=('devel' 'devel-core') From vmiklos at frugalware.org Sat Mar 8 21:48:39 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 21:48:42 2008 Subject: [Frugalware-git] frugalware-0.7: wireshark-0.99.8-1sayshell1-i686 Message-ID: <20080308204839.B6C9011904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=2a335f00b3e75480a9bd118f0125132ea3df7d7b commit 2a335f00b3e75480a9bd118f0125132ea3df7d7b Author: Miklos Vajna Date: Sat Mar 8 21:48:18 2008 +0100 wireshark-0.99.8-1sayshell1-i686 - secfix bump - closes #2821 diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 81f2782..3759f42 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl pkgname=wireshark -pkgver=0.99.7 -pkgrel=1terminus1 +pkgver=0.99.8 +pkgrel=1sayshell1 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" depends=('heimdal>=1.0' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=2.0.0') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump 'http://www.wireshark.org/download/src/?C=M;O=D' | grep -m1 tar.gz | sed 's/.*wireshark-\(.*\)\.tar\.gz.*/\1/'" source=(http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2) -sha1sums=('3cb6e11410d5151734db19d4fc03b42ecb226277') +sha1sums=('a33c7fd8d73bcbf843d3e3a96fd44489212c51e5') build() { From crazy at frugalware.org Sat Mar 8 21:57:50 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 21:57:51 2008 Subject: [Frugalware-git] gcc43: binutils-2.18.50.0.4-2-i686 Message-ID: <20080308205750.1094C11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e766b64094ee25d99ee0ea08194a9687c18e9e5d commit e766b64094ee25d99ee0ea08194a9687c18e9e5d Author: crazy Date: Sat Mar 8 21:56:09 2008 +0100 binutils-2.18.50.0.4-2-i686 * rebuild with gcc and glibc diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild index 4655017..05a090e 100644 --- a/source/devel/binutils/FrugalBuild +++ b/source/devel/binutils/FrugalBuild @@ -3,10 +3,11 @@ pkgname=binutils pkgver=2.18.50.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files" url="http://www.gnu.org/software/binutils/" -depends=('bash' 'glibc>=2.6-2' 'pacman-g2>=3.6.8-3') +depends=('bash' 'glibc>=2.7-2') +makedepends=('gcc>=4.3.0-2' 'pacman-g2>=3.6.8-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') # for now, we need a devel version to utilize glibc-2.7 From crazy at frugalware.org Sat Mar 8 22:45:19 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 8 22:45:22 2008 Subject: [Frugalware-git] gcc43: glibc-2.7-3-i686 Message-ID: <20080308214519.CDC0011904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4495af73c1d1f433f2f36f60916997fdad5de8bb commit 4495af73c1d1f433f2f36f60916997fdad5de8bb Author: crazy Date: Sat Mar 8 22:35:24 2008 +0100 glibc-2.7-3-i686 * rebuild with gcc , binutils * moved things back to makedepends diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 7ae5d06..4f49f94 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=glibc pkgver=2.7 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" -depends=('binutils>=2.18.50.0.4' 'gcc>=4.3.0') +depends=() +makedepends=('binutils>=2.18.50.0.4-2' 'gcc>=4.3.0-2' 'grep>=2.5.3-2') rodepends=('tzdata') -makedepends=('grep>=2.5.3-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From janny at frugalware.org Sat Mar 8 23:07:24 2008 From: janny at frugalware.org (Janny) Date: Sat Mar 8 23:07:26 2008 Subject: [Frugalware-git] fwlive: fwlive-build Message-ID: <20080308220724.7D92411904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=dfd5f38550c5501f418e4a0a000bf1d968a0be10 commit dfd5f38550c5501f418e4a0a000bf1d968a0be10 Author: Janny Date: Sat Mar 8 23:04:31 2008 +0100 fwlive-build * fixed "Deleting unused languages" section (thx vmiklos) * fixed remove empty dirs in doc/ dir diff --git a/live-base/build b/live-base/build index 75ce8c9..e1b8b77 100644 --- a/live-base/build +++ b/live-base/build @@ -53,23 +53,16 @@ rm initrd/initrd.gz echo "Deleting unused languages..." for i in $(echo $LOCALE | sed -r "s/\,/ /g"); do - lo="! -name \"$i*\" "$lo + lo="-a ! -name \"$i*\" "$lo done -find $ROOT/usr/share/i18n/locales -maxdepth 1 -type f $lo -exec rm -fr {} \; -find $ROOT/usr/share/locale -maxdepth 1 -type d $lo -exec rm -fr {} \; +eval "find $ROOT/usr/share/i18n/locales/* -maxdepth 0 -type f ! -name \"C\" $lo -exec rm -f {} \;" +eval "find $ROOT/usr/share/locale/* -maxdepth 0 -type d ! -name \"l10n*\" -a ! -name \"C\" $lo -exec rm -fr {} \;" +eval "find $ROOT/usr/share/locale/l10n/* -maxdepth 0 -type d ! -name \"C\" $lo -exec rm -fr {} \;" -echo "Deleting docs files which are not needed in Live mode.." +echo "Deleting docs files which are not needed in Live mode..." -find $ROOT/usr/share/doc ! -name "README*" ! -name "COPYING*" ! -name "AUTHORS*" -exec rm -rf {} \; - -# strip usr/{bin,sbin} bin and sbin - -echo "Stripping all files in /usr/{bin,sbin} /bin , /sbin .." - -strip $ROOT/usr/bin/* -s 2>/dev/null -strip $ROOT/usr/sbin/* -s 2>/dev/null -strip $ROOT/bin/* -s 2>/dev/null -strip $ROOT/sbin/* -s 2>/dev/null +find $ROOT/usr/share/doc/ -type f ! -name "README*" -a ! -name "COPYING*" -a ! -name "AUTHORS*" -exec rm -f {} \; +find $ROOT/usr/share/doc/ -type d -empty -exec rmdir -p --ignore-fail-on-non-empty {} \; 2>/dev/null echo "Creating compressed images..." From vmiklos at frugalware.org Sat Mar 8 23:34:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 23:34:41 2008 Subject: [Frugalware-git] frugalware-0.8: pacman-g2-3.6.8-3kalgan1-i686 Message-ID: <20080308223440.9CA0811904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=584fb2fe59048f00443a364dd612dd0218c89ba0 commit 584fb2fe59048f00443a364dd612dd0218c89ba0 Author: Miklos Vajna Date: Sat Mar 8 23:33:53 2008 +0100 pacman-g2-3.6.8-3kalgan1-i686 - default to -stable diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 63dbea0..39dfc5e 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 pkgver=3.6.8 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=2 +pkgrel=3kalgan1 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -21,8 +21,9 @@ _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then source=($url/releases/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch) - signatures=("$source.asc" '') + http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch \ + stable.diff) + signatures=("$source.asc" '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" diff --git a/source/base/pacman-g2/stable.diff b/source/base/pacman-g2/stable.diff new file mode 100644 index 0000000..de62edb --- /dev/null +++ b/source/base/pacman-g2/stable.diff @@ -0,0 +1,17 @@ +diff --git a/etc/pacman-g2.conf.in b/etc/pacman-g2.conf.in +index 23c24b3..d581d05 100644 +--- a/etc/pacman-g2.conf.in ++++ b/etc/pacman-g2.conf.in +@@ -19,10 +19,10 @@ OldDelay = 3 + # tree to avoid conflicts + + # -current +-Include = /etc/pacman-g2/repos/frugalware-current ++#Include = /etc/pacman-g2/repos/frugalware-current + + # -stable +-#Include = /etc/pacman-g2/repos/frugalware ++Include = /etc/pacman-g2/repos/frugalware + + # An example of a custom package repository. See the pacman-g2 manpage for + # tips on creating your own repositories. From vmiklos at frugalware.org Sat Mar 8 23:38:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 23:38:42 2008 Subject: [Frugalware-git] frugalware-0.7: opera-9.26-1sayshell1-i686 Message-ID: <20080308223840.762D611904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=6c8ff92c0044b1496d3ec0ed7749404c207e4863 commit 6c8ff92c0044b1496d3ec0ed7749404c207e4863 Author: Miklos Vajna Date: Sat Mar 8 23:38:19 2008 +0100 opera-9.26-1sayshell1-i686 - secfix bump - closes #2805 diff --git a/source/xapps-extra/opera/FrugalBuild b/source/xapps-extra/opera/FrugalBuild index 6b57335..cc0b6a1 100644 --- a/source/xapps-extra/opera/FrugalBuild +++ b/source/xapps-extra/opera/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=opera -pkgver=9.25 -pkgextraver=20071214.1-static-qt.i386-en +pkgver=9.26 +pkgextraver=20080215.1-static-qt.i386-en pkgrel=1sayshell1 pkgdesc="Opera web browser." url="http://www.opera.com/linux/" @@ -20,10 +20,10 @@ _F_desktop_icon=/usr/share/opera/images/opera_48x48.png build() { - Fcd $pkgname-$pkgver-$pkgextraver-687 + Fcd $pkgname-$pkgver-$pkgextraver-698 ./install.sh --prefix=/usr --DESTDIR=$Fdestdir || Fdie _F_desktop_categories="Network;" Fdesktop2 echo "StartUpNotify=false" >> $Fdestdir$Fmenudir/$pkgname.desktop || Fdie } -sha1sums=('2783ba59e98bf0d61491264fd43b11b89f0bfec2') +sha1sums=('fbdb4e15ea8ad2eecf25b83e4a313968e8b0e10b') From vmiklos at frugalware.org Sat Mar 8 23:55:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 8 23:55:14 2008 Subject: [Frugalware-git] frugalware-0.8: pacman-tools-1.0.6-3kalgan1-i686 Message-ID: <20080308225512.6009211904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=e90dedef5ed66ab574aac2ee9d30773f1e26e0b5 commit e90dedef5ed66ab574aac2ee9d30773f1e26e0b5 Author: Miklos Vajna Date: Sat Mar 8 23:54:51 2008 +0100 pacman-tools-1.0.6-3kalgan1-i686 - default to -stable diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index 43b63a2..0a3e05a 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pacman-tools pkgver=1.0.6 -pkgrel=2 +pkgrel=3kalgan1 pkgdesc="Tools for developers for managing packages" url="http://ftp.frugalware.org/pub/other/pacman-tools" depends=('bash' 'perl' 'pacman-g2>=3.5.1' 'wget' 'python' 'libxml2' 'glib2') @@ -14,7 +14,8 @@ backup=(etc/{genchangelog,repoman}.conf etc/syncpkg{cd/c,d/d,d/ctl}config.py) _F_archive_nosort=y up2date="lynx -dump $url|Flasttar" source=($url/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/pacman-tools/fab116c1de8696e241e6117678eedd1c10b56503.patch) + http://git.frugalware.org/patches/pacman-tools/fab116c1de8696e241e6117678eedd1c10b56503.patch \ + stable.diff) options=('scriptlet') -signatures=(${source[0]}.asc '') +signatures=(${source[0]}.asc '' '') # optimization OK diff --git a/source/devel/pacman-tools/stable.diff b/source/devel/pacman-tools/stable.diff new file mode 100644 index 0000000..b9523d9 --- /dev/null +++ b/source/devel/pacman-tools/stable.diff @@ -0,0 +1,15 @@ +diff --git a/repoman.conf b/repoman.conf +index 35d41f6..37ca7b2 100644 +--- a/repoman.conf ++++ b/repoman.conf +@@ -7,8 +7,8 @@ + + # the order is important, the first repo will be used as a default for + # developer actions (like up, del and so on) +-source /etc/repoman.d/current +-#source /etc/repoman.d/stable ++#source /etc/repoman.d/current ++source /etc/repoman.d/stable + + # default repo to search the include dir in + fst_root=/var/fst/ From vmiklos at frugalware.org Sun Mar 9 00:11:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:11:38 2008 Subject: [Frugalware-git] homepage-ng: FSA375-vlc Message-ID: <20080308231135.ED55611904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=46614e7b0c23f3d72789d050ccad75649ddba828 commit 46614e7b0c23f3d72789d050ccad75649ddba828 Author: Miklos Vajna Date: Sun Mar 9 00:11:30 2008 +0100 FSA375-vlc diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 85cc8a3..2d1ec98 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 375 + 2008-03-09 + vmiklos + vlc + 0.8.6-8sayshell1 + 0.8.6-8sayshell2 + http://bugs.frugalware.org/task/2819 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0984 + A vulnerability has been reported in VLC Media Player, which can potentially be exploited by malicious people to compromise a user's system. + The vulnerability is caused due to a boundary error within the MP4 demuxer (modules/demux/mp4/mp4.c). This can be exploited to overwrite an almost arbitrary memory address via a specially crafted MPEG-4 file. + Successful exploitation may allow execution of arbitrary code. + + 374 2008-03-07 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:14:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:14:17 2008 Subject: [Frugalware-git] homepage-ng: FSA376-clamav Message-ID: <20080308231416.5737211904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=76cefd285f6453a487846717f1af61e1112fe488 commit 76cefd285f6453a487846717f1af61e1112fe488 Author: Miklos Vajna Date: Sun Mar 9 00:14:12 2008 +0100 FSA376-clamav diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 2d1ec98..f39895b 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,21 @@ + 376 + 2008-03-09 + vmiklos + clamav + 0.91.2-2sayshell1 + 0.92.1-1sayshell1 + http://bugs.frugalware.org/task/2771 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0318 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0728 + Some vulnerabilities have been reported in ClamAV, which can be exploited by malicious people to cause a DoS (Denial of Service) or to potentially compromise a vulnerable system. + 1) An integer overflow error within the "cli_scanpe()" function in libclamav/pe.c can be exploited to cause a heap-based buffer overflow via a specially crafted PE file. + 2) An error within the "unmew11()" function in libclamav/mew.c can be exploited to corrupt heap memory. + Successful exploitation may allow execution of arbitrary code. + + 375 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:17:50 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:17:54 2008 Subject: [Frugalware-git] homepage-ng: FSA377-dbus Message-ID: <20080308231750.2D97011904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=7b6fada0f7714a4f7a03d603c890d89a5265a7c0 commit 7b6fada0f7714a4f7a03d603c890d89a5265a7c0 Author: Miklos Vajna Date: Sun Mar 9 00:17:45 2008 +0100 FSA377-dbus diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index f39895b..bb4a979 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 377 + 2008-03-09 + vmiklos + dbus + 1.0.2-3sayshell1 + 1.0.3-1sayshell1 + http://bugs.frugalware.org/task/2822 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0595 + A security issue has been reported in D-Bus, which can be exploited by malicious, local users to bypass certain security restrictions. + The security issue is caused due to an error in the processing of messages with a NULL interface, which can be exploited to bypass security policy directives of the form "allow send_interface= [interface]". + + 376 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:22:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:22:10 2008 Subject: [Frugalware-git] homepage-ng: FSA378-joomla Message-ID: <20080308232205.759DF11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=bc9b273d1616166e17ffe50cea8e31b8aa7c35d5 commit bc9b273d1616166e17ffe50cea8e31b8aa7c35d5 Author: Miklos Vajna Date: Sun Mar 9 00:22:00 2008 +0100 FSA378-joomla diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index bb4a979..d54837b 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,20 @@ + 378 + 2008-03-09 + vmiklos + joomla + 1.0.13-2sayshell1 + 1.0.15-1sayshell1 + http://bugs.frugalware.org/task/2808 + There is no CVE entry for this issue. + Hendrik-Jan Verheij has discovered a vulnerability in Joomla!, which can be exploited by malicious people to compromise a vulnerable system. + Input passed to the "mosConfig_absolute_path" parameter in index.php is not properly verified before being used to include files. This can be exploited to include arbitrary files from external resources. + Successful exploitation requires that RG_EMULATION is either switched on or undefined. + NOTE: Both situations cause security warnings to be displayed in Joomla!'s administration section. + + 377 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:25:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:25:14 2008 Subject: [Frugalware-git] homepage-ng: FSA379-graphicsmagick Message-ID: <20080308232512.C4DA711904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=78a0de92babdde69d3236fd9d51bf81022c8d224 commit 78a0de92babdde69d3236fd9d51bf81022c8d224 Author: Miklos Vajna Date: Sun Mar 9 00:25:09 2008 +0100 FSA379-graphicsmagick diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index d54837b..bd37e2a 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,21 @@ + 379 + 2008-03-09 + vmiklos + graphicsmagick + 1.1.8-1 + 1.1.11-1sayshell1 + http://bugs.frugalware.org/task/2807 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4985 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4986 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4987 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4988 + Some vulnerabilities have been reported in GraphicsMagick, which can be exploited by malicious people to conduct DoS (Denial of Service) attacks or compromise a user's system. + The vulnerabilities are caused due to the use of vulnerable ImageMagick code. + + 378 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:28:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:28:49 2008 Subject: [Frugalware-git] homepage-ng: FSA380-cups Message-ID: <20080308232848.51C4C11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b04c5b64abba213bd594ebd958e6d3db65ada4cd commit b04c5b64abba213bd594ebd958e6d3db65ada4cd Author: Miklos Vajna Date: Sun Mar 9 00:28:44 2008 +0100 FSA380-cups diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index bd37e2a..5b60650 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 380 + 2008-03-09 + vmiklos + cups + 1.3.2-2sayshell3 + 1.3.6-1sayshell1 + http://bugs.frugalware.org/task/2806 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0882 + A vulnerability has been discovered in CUPS, which can be exploited by malicious people to cause a DoS (Denial of Service) or to potentially compromise a vulnerable system. + The vulnerability is caused due to an error within the "process_browse_data()" function when adding printers and classes. This can be exploited to free the same buffer twice by sending specially crafted browser packets to the UDP port on which cupsd is listening (by default port 631/UDP). + Successful exploitation may allow execution of arbitrary code. + + 379 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:31:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:31:51 2008 Subject: [Frugalware-git] homepage-ng: FSA381-lighttpd Message-ID: <20080308233149.DEC8F11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=11490afa3fa3d9afab4b11d489939bf5f83faf52 commit 11490afa3fa3d9afab4b11d489939bf5f83faf52 Author: Miklos Vajna Date: Sun Mar 9 00:31:46 2008 +0100 FSA381-lighttpd diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 5b60650..f5a4503 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 381 + 2008-03-09 + vmiklos + lighttpd + 1.4.18-1 + 1.4.18-2sayshell1 + http://bugs.frugalware.org/task/2804 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0983 + A vulnerability has been reported in lighttpd, which can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerability is caused due to a calculation error when allocating the global file descriptor array and can be exploited to crash an affected server. + + 380 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:33:50 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:33:52 2008 Subject: [Frugalware-git] homepage-ng: FSA382-pcre Message-ID: <20080308233350.ED7D911904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4b19f3c96a23a0dc66f99bacd9ec1f518830a414 commit 4b19f3c96a23a0dc66f99bacd9ec1f518830a414 Author: Miklos Vajna Date: Sun Mar 9 00:33:47 2008 +0100 FSA382-pcre diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index f5a4503..92f15f0 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 382 + 2008-03-09 + vmiklos + pcre + 7.4-1 + 7.6-1sayshell1 + http://bugs.frugalware.org/task/2785 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0674 + A vulnerability has been reported in PCRE, which potentially can be exploited by malicious people to cause a DoS (Denial of Service) or compromise an application using the library. + The vulnerability is caused due to a boundary error when processing character classes and can be exploited to cause a buffer overflow via an overly long character class with codepoints greater than 255. + + 381 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:39:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:39:43 2008 Subject: [Frugalware-git] homepage-ng: FSA383-thunderbird Message-ID: <20080308233935.6BBAD11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=25de10a0161b6d10e7adbaf3b8014f39a2366709 commit 25de10a0161b6d10e7adbaf3b8014f39a2366709 Author: Miklos Vajna Date: Sun Mar 9 00:39:31 2008 +0100 FSA383-thunderbird diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 92f15f0..f3644e7 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,22 @@ + 383 + 2008-03-09 + vmiklos + thunderbird + 2.0.0.9-1terminus1 + 2.0.0.12-1sayshell1 + http://bugs.frugalware.org/task/2775 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0304 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0412 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0413 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0415 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0418 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0419 + Some vulnerabilities have been reported in Mozilla Thunderbird, which can be exploited by malicious people to disclose sensitive information, bypass certain security restrictions, or potentially to compromise a user's system. For more information, see FSA374. + + 382 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:44:03 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:44:05 2008 Subject: [Frugalware-git] homepage-ng: FSA384-xine-lib Message-ID: <20080308234403.7410B11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=bca44aac106448ef099fa19ea492e879a10357ba commit bca44aac106448ef099fa19ea492e879a10357ba Author: Miklos Vajna Date: Sun Mar 9 00:44:00 2008 +0100 FSA384-xine-lib diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index f3644e7..94fe94f 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 384 + 2008-03-09 + vmiklos + xine-lib + 1.1.8-1 + 1.1.10.1-1sayshell1 + http://bugs.frugalware.org/task/2773 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0486 + A vulnerability has been discovered in xine-lib, which can potentially be exploited by malicious people to compromise a user's system. + The vulnerability is caused due to a boundary error within the "open_flac_file()" function in src/demuxers/demux_flac.c. This can be exploited to corrupt memory via a specially crafted FLAC file. + + 383 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:48:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:48:30 2008 Subject: [Frugalware-git] homepage-ng: FSA385-cacti Message-ID: <20080308234828.28B4C11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=cded294c7f9f4fafe14244b1ebc79fafd02e1773 commit cded294c7f9f4fafe14244b1ebc79fafd02e1773 Author: Miklos Vajna Date: Sun Mar 9 00:48:24 2008 +0100 FSA385-cacti diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 94fe94f..d650713 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,23 @@ + 385 + 2008-03-09 + vmiklos + cacti + 0.8.6j-3terminus1 + 0.8.6j-4sayshell1 + http://bugs.frugalware.org/task/2772 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0783 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0784 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0785 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0786 + Some vulnerabilities have been reported in Cacti, which can be exploited by malicious people to conduct HTTP response splitting, cross-site scripting, and SQL injection attacks. + 1) Input passed to unspecified parameters is not properly sanitised before being used in SQL queries. This can be exploited to manipulate SQL queries by injecting arbitrary SQL code. + 2) Input passed to unspecified parameters is not properly sanitised before being returned to the user. This can be exploited to execute arbitrary HTML and script code in a user's browser session in context of an affected site. + 3) Input passed to unspecified parameters is not properly sanitised before being returned to the user. This can be exploited to insert arbitrary HTTP headers, which will be included in a response sent to the user, allowing for execution of arbitrary HTML and script code in a user's browser session in context of an affected site. + + 384 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:52:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:52:07 2008 Subject: [Frugalware-git] homepage-ng: FSA386-rblibtorrent Message-ID: <20080308235205.56FF311904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4a730e216804406079b8303e7d2b71e57905ef55 commit 4a730e216804406079b8303e7d2b71e57905ef55 Author: Miklos Vajna Date: Sun Mar 9 00:52:01 2008 +0100 FSA386-rblibtorrent diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index d650713..97304d4 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 386 + 2008-03-09 + vmiklos + rblibtorrent + 0.12-5 + 0.12-6sayshell1 + http://bugs.frugalware.org/task/2770 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0646 + A vulnerability has been reported in Rasterbar Software libtorrent, which can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerability is caused due to an error within the "bdecode_recursive()" function in include/libtorrent/bencode.hpp when processing certain bencoded data. This can be exploited to cause a stack overflow and crash an application using the library by sending specially crafted bencoded messages. + + 385 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 00:55:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:55:20 2008 Subject: [Frugalware-git] homepage-ng: FSA387-phpmyadmin Message-ID: <20080308235519.367D411904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=5721f8e0625fc70e594b93a3caff0e85515f33fa commit 5721f8e0625fc70e594b93a3caff0e85515f33fa Author: Miklos Vajna Date: Sun Mar 9 00:55:15 2008 +0100 FSA387-phpmyadmin diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 97304d4..a6a49ff 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 387 + 2008-03-09 + vmiklos + phpmyadmin + 2.11.2.2-1sayshell1 + 2.11.5-1sayshell1 + http://bugs.frugalware.org/task/2835 + There is no CVE entry for this issue. + A vulnerability has been reported in phpMyAdmin, which can be exploited by malicious people to conduct SQL injection attacks. + The vulnerability is caused due to the application obtaining parameters via the "$_REQUEST" variable, and using them without proper sanitation in SQL queries. This can be exploited to manipulate SQL queries by injecting arbitrary SQL code via a malicious cookie. + Successful exploitation requires that a phpMyAdmin user is tricked into visiting a malicious website. + + 386 2008-03-09 vmiklos From crazy at frugalware.org Sun Mar 9 00:58:31 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 00:58:32 2008 Subject: [Frugalware-git] gcc43: java-gcj-compat-1.0.77-1-i686 Message-ID: <20080308235831.12E7E11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3d5984119655ec6ac77b070af59f08f4ebfd1cfd commit 3d5984119655ec6ac77b070af59f08f4ebfd1cfd Author: crazy Date: Sun Mar 9 00:55:49 2008 +0100 java-gcj-compat-1.0.77-1-i686 * Version bump * build for gcj 4.3.0 * I ( yes me 'when-I-see-java-I-usually-run-away-crazy ;) ) * hope I didn't broke anything =) diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index bdade82..fcc5be6 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -2,38 +2,30 @@ # Maintainer: VMiklos pkgname=java-gcj-compat -pkgver=1.0.72 -pkgrel=8 -gccver=4.2.3 +pkgver=1.0.77 +pkgrel=1 +gccver=4.3.0 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" depends=("libgcj=$gccver" 'gjdoc') -makedepends=('gcc-gcj' 'ecj') +makedepends=('gcc-gcj=$gccver' 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://sources.redhat.com/pub/rhug/java-gcj-compat-$pkgver.tar.gz \ - java-gcj.sh) -sha1sums=('4f5267544927e1826facbd988ecb4992dde43f76'\ - '73c1f3cc2db4f63cb051e65f0c664358289e9f13') - -# yes, there is a newer version. to bump it, we have to patch gcc: -# http://gcc.gnu.org/ml/java-patches/2007-q1/msg00656.html -# and here are some infos about what new options gcc will need: -# http://gcc.gnu.org/ml/java-patches/2007-q1/msg00658.html -# a simple check is to -# ls libjava/classpath/tools/classes/com/sun/javadoc/SourcePosition.class -# if that file exists, then we can bump this pkg + java-gcj.sh symlink-gjar-fastjar-is-gone-since-gcc4.2.patch) +sha1sums=('07b4058ed0a254462d5196fee91e660d434f84ec' \ + '73c1f3cc2db4f63cb051e65f0c664358289e9f13' \ + 'f3cd78dde7169bfe841943ae508f5a073e2fc4e7') build() { - Fsed 'libgcj-tools' 'libgcj' Makefile.am - Fsed '4.1.2' $gccver Makefile.am - Fsed 'fastjar' 'jar' configure.ac Makefile.am + Fcd + Fpatchall Fautoreconf - Fbuild - Fln jvm/java-$javaver/lib/tools.jar /usr/lib/ + Fconf + Fmakeinstall Fexe /etc/profile.d/java-gcj.sh echo 'if [ -z "$CLASSPATH" ]; then' >>$Fdestdir/etc/profile.d/java-gcj.sh echo " export CLASSPATH=/usr/share/java/libgcj-$gccver.jar" >>$Fdestdir/etc/profile.d/java-gcj.sh @@ -42,10 +34,9 @@ build() >>$Fdestdir/etc/profile.d/java-gcj.sh echo "fi" >>$Fdestdir/etc/profile.d/java-gcj.sh Fln /usr/bin/gjdoc /usr/lib/jvm/java-$javaver/bin/javadoc - # gcc-4.2.0, no more fastjar - Frm /usr/bin/jar # openoffice.org wants this - Fln gcj-$gccver/libjawt.so /usr/lib + gcjver=$(basename /usr/lib/gcj-${gccver}*) + Fln gcj-$gcjver/libjawt.so /usr/lib } # optimization OK diff --git a/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch b/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch new file mode 100644 index 0000000..7f18ebf --- /dev/null +++ b/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch @@ -0,0 +1,12 @@ +diff -Naur java-gcj-compat-1.0.77/Makefile.am java-gcj-compat-1.0.77-p/Makefile.am +--- java-gcj-compat-1.0.77/Makefile.am 2007-06-26 21:51:19.000000000 +0200 ++++ java-gcj-compat-1.0.77-p/Makefile.am 2008-03-08 20:43:21.000000000 +0100 +@@ -17,7 +17,7 @@ + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS) + ln -sf ../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/java + ln -sf ../../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(JRE_BIN_DIR)/java +- ln -sf ../../../../bin/fastjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar ++ ln -sf ../../../../bin/gjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar + ln -sf ../../../../bin/sinjdoc $(DESTDIR)$(SDK_BIN_DIR)/javadoc + ln -sf ../../../../bin/grmic$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/rmic + ln -sf ../../../../bin/gjavah$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/javah From vmiklos at frugalware.org Sun Mar 9 00:59:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 00:59:44 2008 Subject: [Frugalware-git] homepage-ng: FSA388-wireshark Message-ID: <20080308235943.3469F11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=5a213fc3b25ceee7ca509b73d86a45e32748509c commit 5a213fc3b25ceee7ca509b73d86a45e32748509c Author: Miklos Vajna Date: Sun Mar 9 00:59:36 2008 +0100 FSA388-wireshark diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index a6a49ff..0d4aa4a 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,20 @@ + 388 + 2008-03-09 + vmiklos + wireshark + 0.99.7-1terminus1 + 0.99.8-1sayshell1 + http://bugs.frugalware.org/task/2821 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1070 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1071 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1072 + Some vulnerabilities have been reported in Wireshark, which can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerabilities are caused due to errors in the SCTP, SNMP, and TFTP dissectors. These can be exploited to cause the application to crash or consume large amounts of memory when processing specially crafted packets that are either captured off the wire or loaded via a capture file. + + 387 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 01:10:17 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 01:10:19 2008 Subject: [Frugalware-git] homepage-ng: FSA389-kdebase Message-ID: <20080309001017.3CE2A11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=9403c0c704622cd91ccf087b8105173227bea824 commit 9403c0c704622cd91ccf087b8105173227bea824 Author: Miklos Vajna Date: Sun Mar 9 01:10:10 2008 +0100 FSA389-kdebase diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 0d4aa4a..429ffa9 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 389 + 2008-03-09 + vmiklos + kdebase + 3.5.7-3 + 3.5.7-4sayshell1 + http://bugs.frugalware.org/task/2681 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5963 + A weakness has been reported in KDE, which can be exploited by malicious, local users to cause a DoS (Denial of Service). + The weakness is caused due to an error in KDM when processing certain files, which can be exploited to cause KDM to e.g. consume large amounts of memory or prevent users from logging in. + + 388 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 01:20:10 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 01:20:13 2008 Subject: [Frugalware-git] frugalware-0.7: wordpress-2.3.3-1sayshell1-i686 Message-ID: <20080309002010.638BC11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=ecdff355229353c0b5824522e2b8ac69fea58ede commit ecdff355229353c0b5824522e2b8ac69fea58ede Author: Miklos Vajna Date: Sun Mar 9 01:19:46 2008 +0100 wordpress-2.3.3-1sayshell1-i686 - secfix bump - closes #2739 diff --git a/source/network-extra/wordpress/FrugalBuild b/source/network-extra/wordpress/FrugalBuild index e7e6f82..54aa63f 100644 --- a/source/network-extra/wordpress/FrugalBuild +++ b/source/network-extra/wordpress/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl pkgname=wordpress -pkgver=2.3.2 -pkgrel=1terminus1 +pkgver=2.3.3 +pkgrel=1sayshell1 pkgdesc="a state-of-the-art semantic personal publishing platform" url="http://wordpress.org/" depends=() @@ -22,4 +22,4 @@ build() Fmv ../src/$pkgname /var/www/$pkgname } # optimization OK - noarch -sha1sums=('35583cdfcc4f046e734848b659cd2b6589d13450') +sha1sums=('767747b9fb44714dd71122f5a58dba4c662b3155') From crazy at frugalware.org Sun Mar 9 01:31:22 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 01:31:28 2008 Subject: [Frugalware-git] gcc43: ccache-2.4-7-i686 Message-ID: <20080309003122.60E9A11904C9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=d7fda03b115367bbd31bd0b04fc3f48ead427d2d commit d7fda03b115367bbd31bd0b04fc3f48ead427d2d Author: crazy Date: Sun Mar 9 01:29:26 2008 +0100 ccache-2.4-7-i686 * rebuild * fixed symlink bug * added missing Fdie diff --git a/source/devel/ccache/FrugalBuild b/source/devel/ccache/FrugalBuild index 2a97dc3..5dccf93 100644 --- a/source/devel/ccache/FrugalBuild +++ b/source/devel/ccache/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ccache pkgver=2.4 -pkgrel=6 +pkgrel=7 pkgdesc="A fast compiler cache" url="http://ccache.samba.org" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep 'The latest release' | sed -e 's/.*ccache \(.*\)\..*/\1/'" @@ -18,11 +18,11 @@ sha1sums=('9833ec13de9b90d5409e60d679ac681115ef465e' \ build() { Fbuild Fmkdir /usr/lib/ccache/bin - for i in {$CARCH-pc-linux-gnu-,}{cc,c++,gcc,g++} + for i in {$CHOST-,}{cc,c++,gcc,g++} do Fln /usr/bin/ccache /usr/lib/ccache/bin/$i done - install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ + install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ || Fdie Fdoc README.Frugalware } From vmiklos at frugalware.org Sun Mar 9 01:57:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 01:57:14 2008 Subject: [Frugalware-git] frugalware-0.7: bind-9.4.1-3sayshell1-i686 Message-ID: <20080309005709.C316A11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=be84b3a7d1d3319050dee125dd2be25722ea83f8 commit be84b3a7d1d3319050dee125dd2be25722ea83f8 Author: Miklos Vajna Date: Sun Mar 9 01:56:44 2008 +0100 bind-9.4.1-3sayshell1-i686 - added CVE-2008-0122.patch - closes #2721 diff --git a/source/network/bind/CVE-2008-0122.patch b/source/network/bind/CVE-2008-0122.patch new file mode 100644 index 0000000..184f146 --- /dev/null +++ b/source/network/bind/CVE-2008-0122.patch @@ -0,0 +1,19 @@ +--- lib/bind/inet/inet_network.c Wed Apr 27 04:56:21 2005 ++++ lib/bind/inet/inet_network.c Tue Jan 15 04:02:01 2008 +@@ -84,9 +84,9 @@ + } + if (!digit) + return (INADDR_NONE); ++ if (pp >= parts + 4 || val > 0xffU) ++ return (INADDR_NONE); + if (*cp == '.') { +- if (pp >= parts + 4 || val > 0xffU) +- return (INADDR_NONE); + *pp++ = val, cp++; + goto again; + } + + + + + diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild index 0e86f1e..ed8e17b 100644 --- a/source/network/bind/FrugalBuild +++ b/source/network/bind/FrugalBuild @@ -4,7 +4,7 @@ pkgname=bind pkgver=9.4.1 pkgextraver=-P1 -pkgrel=2 +pkgrel=3sayshell1 pkgdesc="DNS server and utilities" url="http://www.isc.org/index.pl?/sw/bind/" backup=(etc/named.conf etc/logrotate.d/named) @@ -12,8 +12,9 @@ depends=('openssl') groups=('network') archs=('i686' 'x86_64') up2date="lynx -dump ftp://ftp.isc.org/isc/bind9/|grep '/9.*[^abc][0-9]$'|sed -n 's|.*/||;s/$pkgextraver//;$ p'" -source=(ftp://ftp.isc.org/isc/bind9/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.gz rc.bind bind) -signatures=($source.asc '' '') +source=(ftp://ftp.isc.org/isc/bind9/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.gz rc.bind bind \ + CVE-2008-0122.patch) +signatures=($source.asc '' '' '') build() { From crazy at frugalware.org Sun Mar 9 02:57:42 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 02:57:44 2008 Subject: [Frugalware-git] gcc43: gmp-4.2.2-2-i686 Message-ID: <20080309015742.E351E11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=18a59da4c3126a8c166287febd5ee5c309070335 commit 18a59da4c3126a8c166287febd5ee5c309070335 Author: crazy Date: Sun Mar 9 02:54:15 2008 +0100 gmp-4.2.2-2-i686 * release bump * added devel-core to groups * ( groups was twice in FB so one gone ) * added an patch to fix the build with gcc43 ( it needs cstdio ) * we need force the CHOST for this package * we also need to autoreconf , auto* is broken diff --git a/source/lib/gmp/FrugalBuild b/source/lib/gmp/FrugalBuild index 61081ba..a35f61c 100644 --- a/source/lib/gmp/FrugalBuild +++ b/source/lib/gmp/FrugalBuild @@ -4,26 +4,31 @@ pkgname=gmp pkgver=4.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNU multiple precision arithmetic library" url="http://swox.com/gmp/" -groups=('lib') archs=('i686' 'x86_64') -depends=('libstdc++') +depends=('libstdc++>=4.3.0-2') +makedepends=('libgcj') Fup2gnubz2 -groups=('lib') -source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2) +groups=('lib' 'devel-core') +source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 gcc43.patch) Finclude texinfo -signatures=($source.sig) +signatures=($source.sig '') build() { [ "$CARCH" == "i686" ] && export MPN_PATH="x86 generic" [ "$CARCH" == "x86_64" ] && export MPN_PATH="x86_64 generic" - Fbuild --enable-cxx \ + Fcd + Fpatchall + Fautoreconf + Fconf --enable-cxx \ --disable-static \ - --with-gnu-ld + --build=$CHOST Fmessage "Running make check" + make || Fdie + Fmakeinstall make check || Fdie } diff --git a/source/lib/gmp/gcc43.patch b/source/lib/gmp/gcc43.patch new file mode 100644 index 0000000..6f94c0d --- /dev/null +++ b/source/lib/gmp/gcc43.patch @@ -0,0 +1,9 @@ +diff -up gmp-4.2.2/gmp-h.in.pom gmp-4.2.2/gmp-h.in +--- gmp-4.2.2/gmp-h.in.pom 2007-09-03 18:05:40.000000000 +0200 ++++ gmp-4.2.2/gmp-h.in 2008-02-13 09:53:48.000000000 +0100 +@@ -22,6 +22,7 @@ along with the GNU MP Library. If not, + + #if defined (__cplusplus) + #include /* for std::istream, std::ostream, std::string */ ++#include + #endif From crazy at frugalware.org Sun Mar 9 03:04:02 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 03:04:03 2008 Subject: [Frugalware-git] gcc43: mpfr-2.3.1-2-i686 Message-ID: <20080309020402.F0DE511904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ac9759025dfcafa35f33857c66016ab9fdf64b16 commit ac9759025dfcafa35f33857c66016ab9fdf64b16 Author: crazy Date: Sun Mar 9 03:03:12 2008 +0100 mpfr-2.3.1-2-i686 * rebuild * added devel-core to groups diff --git a/source/lib/mpfr/FrugalBuild b/source/lib/mpfr/FrugalBuild index 5aa36b6..9dede71 100644 --- a/source/lib/mpfr/FrugalBuild +++ b/source/lib/mpfr/FrugalBuild @@ -9,11 +9,11 @@ if [ -n "$patchver" ]; then else pkgver=${basever} fi -pkgrel=1 +pkgrel=2 pkgdesc="Library for multiple-precision floating-point computations." url="http://www.mpfr.org/mpfr-current/" -depends=('gmp') -groups=('lib') +depends=('gmp>=4.2.2-2') +groups=('lib' 'devel-core') archs=('i686' 'x86_64') up2date="echo \$(lynx -dump $url |grep version|sed 's/.*n \(.*\) (.*/\1/;q')_\$(lynx -source -dump $url |grep 'patch[0-9]\{2\}'|sed -n 's/.*patch\([0-9]\{2\}\).*/\1/;$ p')|sed 's/_$//'" source=(http://www.mpfr.org/mpfr-current/mpfr-$basever.tar.bz2) From crazy at frugalware.org Sun Mar 9 03:09:14 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 03:09:15 2008 Subject: [Frugalware-git] gcc43: gcc-4.3.0-2-i686 Message-ID: <20080309020914.1DCCF11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=6088e3e6dfdc25e148875932f7bf44cb1fda8f07 commit 6088e3e6dfdc25e148875932f7bf44cb1fda8f07 Author: crazy Date: Sun Mar 9 03:06:47 2008 +0100 gcc-4.3.0-2-i686 * fixed splitting bug * not yet rebuild diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 0068ddc..e341e8c 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -183,7 +183,8 @@ build() Fsplit libgcj-awt usr/include/c++/$pkgver/sun/awt # libgcj ## org , sun are libgcj incldes also - Fsplit libgcj usr/include/c++/$pkgver/[gjos]* + Fsplit libgcj usr/include/c++/$pkgver/[gj]* + Fsplit libgcj usr/include/c++/$pkgver/{sun,org} Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc ## maybe we should add some libgcj-tools or libgcj-utils package ? - crazy - Fsplit libgcj usr/bin/{jv-convert,gij,gjar,grmi*,gcj-dbtool,gorbd,gappletviewer,gjarsigner,gkeytool,addr2name.awk} From priyank at frugalware.org Sun Mar 9 07:31:39 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 9 07:31:42 2008 Subject: [Frugalware-git] gfpm: added some options to the preferences dialog Message-ID: <20080309063139.4BCAF11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=7fab583bfcdff8372c41c524dfb1c23737dbd9b3 commit 7fab583bfcdff8372c41c524dfb1c23737dbd9b3 Author: Priyank Date: Sun Mar 9 12:00:27 2008 +0530 added some options to the preferences dialog diff --git a/data/gfpm.glade b/data/gfpm.glade index cf97fe7..a36171a 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -2645,10 +2645,14 @@ + 500 + 400 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 8 Preferences True + 500 + 400 mainwindow @@ -2695,7 +2699,103 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_OUT + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + True + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + Log File Path + + + 1 + 2 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable Logging + + + GTK_FILL + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Logging</b> + True + + + label_item + + + + + + + + @@ -2709,7 +2809,199 @@ - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + 4 + <b>Hold Packages</b> + True + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + Description of Hold Packages + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_OUT + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_BUTTONBOX_START + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-add + True + 0 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-remove + True + 0 + + + 1 + + + + + False + 1 + + + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + 5 + <b>Ignore Packages</b> + True + + + False + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + Description of Ignore Packages + + + False + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_OUT + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_BUTTONBOX_START + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-add + True + 0 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-remove + True + 0 + + + 1 + + + + + False + 1 + + + + + 5 + + + + + 1 + From janny at frugalware.org Sun Mar 9 10:34:23 2008 From: janny at frugalware.org (Janny) Date: Sun Mar 9 10:34:27 2008 Subject: [Frugalware-git] fwlive: fwlive-stable: Message-ID: <20080309093423.AC35411904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=c5ee051efc7e74c4353bbb5b07ad56f753e54873 commit c5ee051efc7e74c4353bbb5b07ad56f753e54873 Author: Janny Date: Sun Mar 9 10:34:09 2008 +0100 fwlive-stable: diff --git a/config b/config index d3a210d..479c2d5 100644 --- a/config +++ b/config @@ -6,7 +6,7 @@ # repos to be included in the chroot. probably you want "current" or "stable". # use a come-separated list if you want to list multiple repos. the first one # takes precedence -TREE = testing +TREE = stable # default language, in an xx_YY form FWLLLANG = en_US From janny at frugalware.org Sun Mar 9 10:34:23 2008 From: janny at frugalware.org (Janny) Date: Sun Mar 9 10:34:28 2008 Subject: [Frugalware-git] fwlive: fwlive-fwliverc Message-ID: <20080309093423.9537D11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=9ebda4cba3893fc69fcd18276ef1c0e5876d9814 commit 9ebda4cba3893fc69fcd18276ef1c0e5876d9814 Author: Janny Date: Sun Mar 9 10:31:14 2008 +0100 fwlive-fwliverc * add fwliverc file diff --git a/Makefile b/Makefile index caf3469..aa74c9b 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,9 @@ endif # needed files (files that we can't live without) NEED_FILES = fstab-update parse_cmdline.in xorg.conf.in rc.fsupd \ crypt.c rc.fwlive rc.config configsave fileswap reboot.diff services.diff rc.S.diff \ - rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst + rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst fwliverc INST_FILES_755 = /etc/rc.d/rc.fwlive /etc/rc.d/rc.config /etc/rc.d/rc.fsupd /usr/local/bin/configsave \ - /usr/local/bin/fileswap /usr/local/bin/fstab-update /usr/local/bin/xstart \ + /usr/local/bin/fileswap /usr/local/bin/fstab-update /usr/local/bin/xstart /usr/local/bin/fwliverc \ /usr/local/bin/parse_cmdline /etc/rc.d/rc.parse_cmdline /tmp/live-base/tools/fpm2lzm INST_FILES_644 = /etc/X11/xorg.conf /boot/grub/menu.lst PWD = $(shell pwd) @@ -276,6 +276,7 @@ endif sed -i "s|Live|$(shell ${FWLREL}) (${FWLCODENAME})|" ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/linux/make_iso.sh sed -i "s|KERNEL=.*|KERNEL=\"$(shell ${KERNVER})\"|" ${CHROOTDIR}/${TREE}/tmp/live-base/.config echo "LOCALE=${LOCALE},en" >> ${CHROOTDIR}/${TREE}/tmp/live-base/.config + echo "/usr/local/bin/fwliverc" >> ${CHROOTDIR}/${TREE}/etc/rc.d/rc.local hacking-kdmrc: checkroot if [ ${APPSGROUP} == "KDE" ] || [ ${APPSGROUP} == "FULL" ] ; then \ diff --git a/fwliverc b/fwliverc new file mode 100644 index 0000000..60bb163 --- /dev/null +++ b/fwliverc @@ -0,0 +1,36 @@ +#!/bin/sh + +# (c) 2007 Miklos Vajna +# (c) 2008 Janos Kovacs +# parse_cmdline for Frugalware +# distributed under GPL License + +. /usr/local/bin/liblinuxlive + +# change password +NEWROOTPASS="`cmdline_value passwd`" +if [ "$NEWROOTPASS" = "ask" ]; then + echo -ne "\nEnter new password for root: " + read -s NEWROOTPASS +fi + +if [ ! "$NEWROOTPASS" = "" ]; then + echo "root:$NEWROOTPASS" | /usr/sbin/chpasswd +fi + +# debug +#if grep debug /proc/cmdline 2>/dev/null >/dev/null; then +# show_debug_banner +# /mnt/live/bin/ash || /bin/bash || /bin/sh +#fi + +# if autoexec= boot parameter is present, automatically start the command given. +# If you need to execute several commands, separate them using ';' +# If you need to use spaces in your command, use ~ instead +# If you wish to reboot/poweroff after the command's execution is finished, +# simply use autoexec=yourCommand;poweroff for example. +AUTOCMD=$(cmdline_value "autoexec" | tr "~" " ") +if [ "$AUTOCMD" != "" ]; then + echo "starting autoexec command: su --login -c \"$AUTOCMD\"" + su --login -c "$AUTOCMD" +fi diff --git a/parse_cmdline.in b/parse_cmdline.in index bbe4749..b0035e9 100644 --- a/parse_cmdline.in +++ b/parse_cmdline.in @@ -67,33 +67,3 @@ printf ' ================================================================ } gen_issue > /etc/issue - -. /usr/lib/liblinuxlive - -# change password -NEWROOTPASS="`cmdline_value passwd`" -if [ "$NEWROOTPASS" = "ask" ]; then - echo -ne "\nEnter new password for root: " - read -s NEWROOTPASS -fi - -if [ ! "$NEWROOTPASS" = "" ]; then - echo "root:$NEWROOTPASS" | /usr/sbin/chpasswd -fi - -# debug -#if grep debug /proc/cmdline 2>/dev/null >/dev/null; then -# show_debug_banner -# /mnt/live/bin/ash || /bin/bash || /bin/sh -#fi - -# if autoexec= boot parameter is present, automatically start the command given. -# If you need to execute several commands, separate them using ';' -# If you need to use spaces in your command, use ~ instead -# If you wish to reboot/poweroff after the command's execution is finished, -# simply use autoexec=yourCommand;poweroff for example. -AUTOCMD=$(cmdline_value "autoexec" | tr "~" " ") -if [ "$AUTOCMD" != "" ]; then - echo "starting autoexec command: su --login -c \"$AUTOCMD\"" - su --login -c "$AUTOCMD" -fi From vmiklos at frugalware.org Sun Mar 9 12:56:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 12:56:42 2008 Subject: [Frugalware-git] frugalware-0.7: boost-1.34.0-6sayshell1-i686 Message-ID: <20080309115640.2CCE311904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=02cc47a0b5dd70d77e90c143d0b05fa46654994c commit 02cc47a0b5dd70d77e90c143d0b05fa46654994c Author: Miklos Vajna Date: Sun Mar 9 12:56:07 2008 +0100 boost-1.34.0-6sayshell1-i686 - added CVE-2008-0171.patch and CVE-2008-0172.patch - closes #2720 diff --git a/source/devel-extra/boost/CVE-2008-0171.patch b/source/devel-extra/boost/CVE-2008-0171.patch new file mode 100644 index 0000000..3226b2e --- /dev/null +++ b/source/devel-extra/boost/CVE-2008-0171.patch @@ -0,0 +1,19 @@ +Index: /libs/regex/test/regress/test_perl_ex.cpp +=================================================================== +--- /libs/regex/test/regress/test_perl_ex.cpp (revision 30980) ++++ /libs/regex/test/regress/test_perl_ex.cpp (revision 42674) +@@ -122,4 +122,15 @@ + TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl); + TEST_INVALID_REGEX("(?:(a)|b)(?(?getaddress(expected_alt_point); ++ // Make sure we have exactly one alternative following this state: + if(b->type != syntax_element_alt) + { +@@ -1878,4 +1880,13 @@ + { + fail(regex_constants::error_bad_pattern, m_position - m_base); ++ return false; ++ } ++ // check for invalid repetition of next state: ++ b = this->getaddress(expected_alt_point); ++ b = this->getaddress(static_cast(b)->next.i, b); ++ if((b->type != syntax_element_assert_backref) ++ && (b->type != syntax_element_startmark)) ++ { ++ fail(regex_constants::error_badrepeat, m_position - m_base); + return false; + } diff --git a/source/devel-extra/boost/FrugalBuild b/source/devel-extra/boost/FrugalBuild index 12feb26..933d589 100644 --- a/source/devel-extra/boost/FrugalBuild +++ b/source/devel-extra/boost/FrugalBuild @@ -3,7 +3,7 @@ pkgname=boost pkgver=1.34.0 -pkgrel=5 +pkgrel=6sayshell1 pkgdesc="Boost Libraries for C++" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge python @@ -14,12 +14,14 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7586 | grep 'Latest.*Notes' | sed -n 's/.*\]\([0-9\.]\+\) \[.*/\1/;1 p'" source=(${source/-$pkgver/_${pkgver//./_}} no_version_for_include_kthx.patch \ - boostjam_x86_64.patch gcc42_atomicity_h.patch) + boostjam_x86_64.patch gcc42_atomicity_h.patch CVE-2008-0171.patch CVE-2008-0172.patch) _F_cd_path="${pkgname}_`echo $pkgver|tr . _`" -sha1sums=('d2fdb4535a13566917fe3d8377b017f094933641'\ - 'ed54f5fe28c801e240fa87f3641de1b1184dfe20'\ - 'f183bdd5970e67ac2d9062ec1834eb22233ede03'\ - '4885396af53aa6a959cd6adb92d826acfa204d5a') +sha1sums=('d2fdb4535a13566917fe3d8377b017f094933641' \ + 'ed54f5fe28c801e240fa87f3641de1b1184dfe20' \ + 'f183bdd5970e67ac2d9062ec1834eb22233ede03' \ + '4885396af53aa6a959cd6adb92d826acfa204d5a' \ + 'd793699347692e5f56eb9d09343ed8bb1c9bd7ce' \ + 'dded66ac4a086653a51fc66e07ff038b52ee5d2c') build() { From vmiklos at frugalware.org Sun Mar 9 13:09:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 13:09:52 2008 Subject: [Frugalware-git] pacman-g2: pacman_db_update() call _pacman_db_setlastupdate() after _pacman_db_install() Message-ID: <20080309120951.B1C1A11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ee2e7518bf58e0dfedafeba0cac73b0e6f4b8c7e commit ee2e7518bf58e0dfedafeba0cac73b0e6f4b8c7e Author: Miklos Vajna Date: Sun Mar 9 13:08:06 2008 +0100 pacman_db_update() call _pacman_db_setlastupdate() after _pacman_db_install() so that in case the user hits ^C while unpacking the db, no -Syy will be necessary just a -Sy diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index de5a038..402edf9 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -314,7 +314,7 @@ int pacman_db_update(int force, PM_DB *db) pmlist_t *files = NULL; char newmtime[16] = ""; char lastupdate[16] = ""; - int ret; + int ret, updated=0; /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -351,7 +351,7 @@ int pacman_db_update(int force, PM_DB *db) } else { if(strlen(newmtime)) { _pacman_log(PM_LOG_DEBUG, _("sync: new mtime for %s: %s\n"), db->treename, newmtime); - _pacman_db_setlastupdate(db, newmtime); + updated = 1; } snprintf(path, PATH_MAX, "%s%s/%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); @@ -374,6 +374,9 @@ int pacman_db_update(int force, PM_DB *db) if(_pacman_db_install(db, path) == -1) { return -1; } + if(updated) { + _pacman_db_setlastupdate(db, newmtime); + } } return(0); From crazy at frugalware.org Sun Mar 9 15:37:26 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 15:37:29 2008 Subject: [Frugalware-git] gcc43: gcc-4.3.0-2-i686 Message-ID: <20080309143726.A4B9311904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b45c79d79d0a0cfde370a7354a2f75b10f9b2c95 commit b45c79d79d0a0cfde370a7354a2f75b10f9b2c95 Author: crazy Date: Sun Mar 9 15:36:14 2008 +0100 gcc-4.3.0-2-i686 * fix 64bit multilib crap * added an extra check to move the libs if * they still install in lib64 for some reason diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index e341e8c..df8419a 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -68,7 +68,7 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' build() { - Fsed '../lib64 ../lib' '. ../lib' gcc/config/i386/t-linux64 + Fsed 'lib64' 'lib' gcc/config/i386/t-linux64 # no fixincludes, thanks Fsed '\./fixinc\.sh' '-c true' gcc/Makefile.in # fix for newer xulrunner @@ -115,6 +115,12 @@ build() unset MAKEFLAGS #this is needed by libffi Fmakeinstall + + if [ -d $Fdestdir/usr/lib64 ]; then + Fmessage "Killing multilib CRAP!" + mv -f $Fdestdir/usr/lib64/* $Fdestdir/usr/lib/ || Fdie + rm -rf $Fdestdir/usr/lib64 || Fdie + fi # fix some junk in la files for lafile in `find $Fdestdir -name "*.la"` From vmiklos at frugalware.org Sun Mar 9 18:37:47 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 18:37:49 2008 Subject: [Frugalware-git] homepage-ng: FSA390-opera Message-ID: <20080309173747.CE15B11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c4efffe0b463fb8515f559e7f86d67fa51cf2a11 commit c4efffe0b463fb8515f559e7f86d67fa51cf2a11 Author: Miklos Vajna Date: Sun Mar 9 18:37:40 2008 +0100 FSA390-opera diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 429ffa9..3121fa6 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,22 @@ + 390 + 2008-03-09 + vmiklos + opera + 9.25-1sayshell1 + 9.26-1sayshell1 + http://bugs.frugalware.org/task/2805 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1080 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1081 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1082 + Some vulnerabilities have been reported in Opera, which can be exploited by malicious people to conduct cross-site scripting attacks, disclose sensitive information, or to bypass certain security restrictions. + 1) A security issue is caused due to a design error when handling input to file form fields, which can potentially be exploited to trick a user into uploading arbitrary files. + 2) An error within the handling of custom comments in image properties can be exploited to execute arbitrary script code in the wrong security context when comments of a malicious image are displayed. + 3) An error in the handling of attribute values when importing XML into a document can be exploited to bypass filters and conduct cross-site scripting attacks if these values are used as document content. + + 389 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 18:39:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 18:39:50 2008 Subject: [Frugalware-git] homepage-ng: FSA391-wordpress Message-ID: <20080309173949.E5E1C11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c788c086f7447e688d4c647c6298938169c08a18 commit c788c086f7447e688d4c647c6298938169c08a18 Author: Miklos Vajna Date: Sun Mar 9 18:39:47 2008 +0100 FSA391-wordpress diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 3121fa6..70a5747 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 391 + 2008-03-09 + vmiklos + wordpress + 2.3.2-1terminus1 + 2.3.3-1sayshell1 + http://bugs.frugalware.org/task/2739 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0664 + A vulnerability has been reported in WordPress, which can be exploited by malicious users to bypass certain security restrictions and to manipulate data. + The xmlrpc.php script does not properly restrict access to the edit functionality. This can be exploited to edit other users' posts. + Successful exploitation requires valid user credentials. + + 390 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 18:42:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 18:42:59 2008 Subject: [Frugalware-git] homepage-ng: FSA392-bind Message-ID: <20080309174257.644D711901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f9d39ba65a0b6009a50f328016bd9c0c25f0ed80 commit f9d39ba65a0b6009a50f328016bd9c0c25f0ed80 Author: Miklos Vajna Date: Sun Mar 9 18:42:54 2008 +0100 FSA392-bind diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 70a5747..b7238c0 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,17 @@ + 392 + 2008-03-09 + vmiklos + bind + 9.4.1-2 + 9.4.1-3sayshell1 + http://bugs.frugalware.org/task/2721 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0122 + A vulnerability has been reported in ISC BIND, which can be exploited by malicious people to cause a DoS (Denial of Service) or to potentially compromise a vulnerable system. + + 391 2008-03-09 vmiklos From vmiklos at frugalware.org Sun Mar 9 18:45:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Mar 9 18:45:05 2008 Subject: [Frugalware-git] homepage-ng: FSA393-boost Message-ID: <20080309174505.5447411901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=41a687de20ef269f65cc55413a30d93a6e1981c9 commit 41a687de20ef269f65cc55413a30d93a6e1981c9 Author: Miklos Vajna Date: Sun Mar 9 18:45:02 2008 +0100 FSA393-boost diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index b7238c0..ea035a3 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 393 + 2008-03-09 + vmiklos + boost + 1.34.0-5 + 1.34.0-6sayshell1 + http://bugs.frugalware.org/task/2720 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0171 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0172 + Some vulnerabilities have been reported in Boost, which can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerabilities are caused due to errors within the parsing of regular expressions in boost/regex/v4/basic_regex_parser.hpp. These can be exploited to crash an application linked against the Boost library via specially crafted regular expressions. + + 392 2008-03-09 vmiklos From priyank at frugalware.org Sun Mar 9 20:17:34 2008 From: priyank at frugalware.org (Priyank) Date: Sun Mar 9 20:17:36 2008 Subject: [Frugalware-git] gfpm: gfpm.glade: minor fixes in prefs dialog Message-ID: <20080309191734.DCCB111904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=0531ca257c260005baee06e1f9bb7c6f76b3c446 commit 0531ca257c260005baee06e1f9bb7c6f76b3c446 Author: Priyank Date: Mon Mar 10 00:46:40 2008 +0530 gfpm.glade: minor fixes in prefs dialog diff --git a/data/gfpm.glade b/data/gfpm.glade index a36171a..474b9c1 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -2721,17 +2721,29 @@ 2 2 - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enable Logging + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + Log File Path - 1 - 2 1 2 - GTK_FILL + GTK_FILL + @@ -2750,29 +2762,17 @@ - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - Log File Path + 1 + 2 1 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable Logging - - - GTK_FILL - + GTK_FILL @@ -3015,21 +3015,6 @@ False - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Something - - - tab - 2 - False - - 1 From crazy at frugalware.org Sun Mar 9 20:44:34 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 20:44:37 2008 Subject: [Frugalware-git] gcc43: java-gcj-compat-1.0.77-1-x86_64 Message-ID: <20080309194434.B04CE11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1005cf76569d679d2212d2cd554ad09ec82017a1 commit 1005cf76569d679d2212d2cd554ad09ec82017a1 Author: crazy Date: Sun Mar 9 20:44:24 2008 +0100 java-gcj-compat-1.0.77-1-x86_64 * fix typo in makedepends diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index fcc5be6..6f0e913 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -9,7 +9,7 @@ javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" depends=("libgcj=$gccver" 'gjdoc') -makedepends=('gcc-gcj=$gccver' 'ecj') +makedepends=("gcc-gcj=$gccver" 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" From janny at frugalware.org Sun Mar 9 21:04:46 2008 From: janny at frugalware.org (Janny) Date: Sun Mar 9 21:04:48 2008 Subject: [Frugalware-git] fwlive: fwlive Message-ID: <20080309200446.E888611904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=6bd2dfa44e4444b629eff1107adcd2a8c66cf86b commit 6bd2dfa44e4444b629eff1107adcd2a8c66cf86b Author: Janny Date: Sun Mar 9 21:03:53 2008 +0100 fwlive * fixed current & stable repo typo diff --git a/Makefile b/Makefile index aa74c9b..a6e5189 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,8 @@ check-tree: repo=$$(eval "echo \$${$${i}_fdb/.fdb}"); \ [ -z "$$repo" ] && repo="$$i"; \ [ ${TREE} == testing ] && echo "[frugalware-current]" >> ${PACCONF}; \ - [ ${TREE} == current ] || [ ${TREE} == stable ] && echo "[frugalware-$$repo]" >> ${PACCONF}; \ + [ ${TREE} == current ] && echo "[frugalware-current]" >> ${PACCONF}; \ + [ ${TREE} == stable ] && echo "[frugalware]" >> ${PACCONF}; \ echo "Server = http://ftp.frugalware.org/pub/frugalware/frugalware-$$repo/frugalware-i686" >> ${PACCONF}; \ done From crazy at frugalware.org Sun Mar 9 21:13:14 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 21:13:17 2008 Subject: [Frugalware-git] gcc43: gcc-4.3.0-3-i686 Message-ID: <20080309201314.D21B611904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=db8217585f7b9c9469e0016defa4d615ddc5444f commit db8217585f7b9c9469e0016defa4d615ddc5444f Author: crazy Date: Sun Mar 9 20:46:26 2008 +0100 gcc-4.3.0-3-i686 * release bump to fix the splitting bug * ( last one for today really :D ) diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index df8419a..4296981 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gcc pkgver=4.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" -depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc>=2.7-2' 'mpfr') +depends=('binutils>=2.18.50.0.4-2' 'libstdc++' 'glibc>=2.7-3' 'mpfr>=2.3.1-2') makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ - 'glibc>=2.7-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ + 'ecj' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ 'libxdamage' 'alsa-lib' 'pacman-g2>=3.6.8-3') provides=('c-compiler') groups=('devel' 'devel-core') From crazy at frugalware.org Sun Mar 9 21:40:14 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 21:40:16 2008 Subject: [Frugalware-git] gcc43: db-4.6.21-2-i686 Message-ID: <20080309204014.1B9D311904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=971d69970177ca94aef77b29da3b387d788fb551 commit 971d69970177ca94aef77b29da3b387d788fb551 Author: crazy Date: Sun Mar 9 21:34:17 2008 +0100 db-4.6.21-2-i686 * rebuild * removed the java part from FrugalBuild * added missing Fdie's diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild index 4a7c34e..577b7c7 100644 --- a/source/base/db/FrugalBuild +++ b/source/base/db/FrugalBuild @@ -3,25 +3,16 @@ pkgname=db pkgver=4.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="The Berkeley DB embedded database system" url="http://www.sleepycat.com" -# maybe later we can enable java for i686 & x86_64 -ENABLE_JAVA=${ENABLE_JAVA:-0} -if [ "$ENABLE_JAVA" = "1" ]; then - Finclude java - makedepends=(${makedepends[@]} 'java-gcj-compat') -fi -depends=('libstdc++') +depends=('libstdc++>=4.3.0-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.oracle.com/technology/software/products/berkeley-db/index.html|grep '\]Berkeley DB'|sed 's/.*DB \([^ ]*\) .*/\1/;q'" -source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz \ - db-4.5.20-java-gcj.patch) -sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \ - 'c8063bb1e85f0a8d4ed420d43f2e165e6ba625fe') +source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz) +sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119') [ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --with-mutex=x86/gcc-assembly" -[ "$ENABLE_JAVA" = "1" ] && Fconfopts="$Fconfopts --enable-java" ### # NOTE! Every time you bump this package, perl-berkeleydb needs bumping, too! @@ -29,31 +20,20 @@ sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \ build() { - Fpatchall - cd build_unix + + Fcd + cd build_unix || Fdie ../dist/configure $Fconfopts --enable-compat185 \ - --enable-shared --enable-static --enable-cxx + --enable-shared --enable-static --enable-cxx || Fdie make LIBSO_LIBS=-lpthread || return 1 Fmakeinstall - Fmkdir /usr/share/java - if [ "$ENABLE_JAVA" = "1" ]; then - Fmv /usr/lib/db.jar /usr/share/java/ - # FIXME: Fjar's -Wl,-Bsymbolic causes DatabaseConfig.DEFAULT to return null. - # Doing just the same thing without -Wl,-Bsymbolic works. - cmd="gcj $CFLAGS -fPIC -fjni -findirect-dispatch \ - -fno-strict-aliasing -shared -o $Fdestdir/usr/lib/libdb.jar.so \ - $Fdestdir/usr/share/java/db.jar -L$Fdestdir/usr/lib -ldb \ - -ldb_java" - echo $cmd - $cmd || return 1 - fi Fmkdir /usr/share/doc/$pkgname-$pkgver Fmv /usr/docs/* /usr/share/doc/$pkgname-$pkgver/ Frm /usr/docs/ - cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ + cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie } # optimization ok From crazy at frugalware.org Sun Mar 9 21:58:00 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 21:58:01 2008 Subject: [Frugalware-git] gcc43: sed-4.1.5-2-i686 Message-ID: <20080309205800.3DD3411904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=5f95fb1cc5892d8cc4b8d8fc66a8a45b672a23fa commit 5f95fb1cc5892d8cc4b8d8fc66a8a45b672a23fa Author: crazy Date: Sun Mar 9 21:57:38 2008 +0100 sed-4.1.5-2-i686 * rebuild diff --git a/source/base/sed/FrugalBuild b/source/base/sed/FrugalBuild index db1ab8d..959be2f 100644 --- a/source/base/sed/FrugalBuild +++ b/source/base/sed/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sed pkgver=4.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="GNU version of sed, a stream editor" url="http://www.gnu.org/software/sed" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Sun Mar 9 22:07:34 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 22:07:36 2008 Subject: [Frugalware-git] gcc43: ncurses-5.6-3-i686 Message-ID: <20080309210734.ECECF11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0a0248ac319df3b61e13a6ed5938c441b0b24be7 commit 0a0248ac319df3b61e13a6ed5938c441b0b24be7 Author: crazy Date: Sun Mar 9 22:06:39 2008 +0100 ncurses-5.6-3-i686 * rebuild diff --git a/source/base/ncurses/FrugalBuild b/source/base/ncurses/FrugalBuild index 744a999..1355975 100644 --- a/source/base/ncurses/FrugalBuild +++ b/source/base/ncurses/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ncurses pkgver=5.6 -pkgrel=2 +pkgrel=3 pkgdesc="A System V Release 4.0 curses emulation library" url="http://www.gnu.org/software/ncurses/ncurses.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Sun Mar 9 22:12:34 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 22:12:36 2008 Subject: [Frugalware-git] gcc43: readline-5.2-2-i686 Message-ID: <20080309211234.BEEAE11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=20f7834d58e03d1cf9b834ef15968cb934d322d3 commit 20f7834d58e03d1cf9b834ef15968cb934d322d3 Author: crazy Date: Sun Mar 9 22:11:38 2008 +0100 readline-5.2-2-i686 * rebuild * added --build= to Fconf * unset MAKEFLAGS before Fmakeinstall diff --git a/source/base/readline/FrugalBuild b/source/base/readline/FrugalBuild index 2f346ab..e2ec549 100644 --- a/source/base/readline/FrugalBuild +++ b/source/base/readline/FrugalBuild @@ -3,10 +3,10 @@ pkgname=readline pkgver=5.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" url="http://www.gnu.org/" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') backup=("etc/inputrc") @@ -16,10 +16,13 @@ source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz \ build() { - Fconf + + Fconf \ + --build=$CHOST make SHLIB_LIBS=-lncurses || return 1 + unset MAKEFLAGS Fmakeinstall Ffile /etc/inputrc chmod 755 $Fdestdir/usr/lib/libreadline.so.$pkgver \ From crazy at frugalware.org Sun Mar 9 22:53:49 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 22:53:51 2008 Subject: [Frugalware-git] gcc43: util.sh Message-ID: <20080309215349.8397811904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=026c4c82ff6aa52d9d9cada8cf047701d39e08d1 commit 026c4c82ff6aa52d9d9cada8cf047701d39e08d1 Author: crazy Date: Sun Mar 9 22:51:43 2008 +0100 util.sh * added Fbuildchost , which is set to `arch`-frugalware-linux * and if we find --build= in configure we use it automatically * in $Fconfopts diff --git a/source/include/util.sh b/source/include/util.sh index ef8d898..9f59ba5 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -82,6 +82,7 @@ Fsysconfdir="/etc" Flocalstatedir="/var" Fmenudir="/usr/share/applications" Farchs=('i686' 'x86_64' 'ppc') +Fbuildchost="`arch`-frugalware-linux" Fconfopts="--prefix=$Fprefix" ## Move to makepkg.conf for Kalgan+1 export LDFLAGS="-Wl,--hash-style=both" @@ -501,6 +502,8 @@ Fconf() { Fconfopts="$Fconfopts --sysconfdir=$Fsysconfdir" grep -q localstatedir $_F_conf_configure && \ Fconfopts="$Fconfopts --localstatedir=$Flocalstatedir" + grep -q 'build=' $_F_conf_configure && \ + Fconfopts="$Fconfopts --build=$Fbuildchost" $_F_conf_configure $Fconfopts "$@" || Fdie elif [ -f Makefile.PL ]; then if [ -z "$_F_conf_perl_pipefrom" ]; then From crazy at frugalware.org Sun Mar 9 23:02:02 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:02:03 2008 Subject: [Frugalware-git] gcc43: bash-3.2_033-2-i686 Message-ID: <20080309220202.61B7A11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4ca9f28626a89195cb4ed4790cf3aa8f23e3a513 commit 4ca9f28626a89195cb4ed4790cf3aa8f23e3a513 Author: crazy Date: Sun Mar 9 23:01:27 2008 +0100 bash-3.2_033-2-i686 * rebuild diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild index 21e5a8c..37103e6 100644 --- a/source/base/bash/FrugalBuild +++ b/source/base/bash/FrugalBuild @@ -9,11 +9,11 @@ if [ -z "$patchver" ]; then else pkgver=${basever}_$patchver fi -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" url="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" backup=(etc/{profile,shells,skel/.bashrc}) -depends=('glibc' 'readline') +depends=('glibc>=2.7-3' 'readline>=5.2-2') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') up2date="echo \$(lynx -dump $url|grep current|sed -n -e 's/.*bash-\(.*\)\. .*$/\1/' -e '1 p')\$(lynx -dump ftp://ftp.cwru.edu/pub/bash/bash-$basever-patches|grep 'bash${basever//.}-[0-9]\{3\}'|sed -n 's/.*bash${basever//.}-\([0-9]\{3\}\).*/_\1/;$ p')" From crazy at frugalware.org Sun Mar 9 23:13:47 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:13:50 2008 Subject: [Frugalware-git] gcc43: coreutils-6.10-3-i686 Message-ID: <20080309221347.9BB5A11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=68a1e7d25b35f836668ea5620fca9bea1b82859d commit 68a1e7d25b35f836668ea5620fca9bea1b82859d Author: crazy Date: Sun Mar 9 23:12:31 2008 +0100 coreutils-6.10-3-i686 * rebuild diff --git a/source/base/coreutils/FrugalBuild b/source/base/coreutils/FrugalBuild index 45c6399..baf12e5 100644 --- a/source/base/coreutils/FrugalBuild +++ b/source/base/coreutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=coreutils pkgver=6.10 -pkgrel=2 +pkgrel=3 pkgdesc="These are the GNU core utilities, the basic command line programs" url="http://www.gnu.org/software/coreutils" -depends=('bash' 'glibc') +depends=('bash' 'glibc>=2.7-3') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Sun Mar 9 23:14:34 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:14:36 2008 Subject: [Frugalware-git] gcc43: bzip2-1.0.4-2-i686 Message-ID: <20080309221434.DF0D111904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=bedc6043c7fd3465a8bf9c85dda43a95447e2690 commit bedc6043c7fd3465a8bf9c85dda43a95447e2690 Author: crazy Date: Sun Mar 9 23:14:15 2008 +0100 bzip2-1.0.4-2-i686 * rebuild diff --git a/source/base/bzip2/FrugalBuild b/source/base/bzip2/FrugalBuild index 31bb14c..df4af3c 100644 --- a/source/base/bzip2/FrugalBuild +++ b/source/base/bzip2/FrugalBuild @@ -3,10 +3,10 @@ pkgname=bzip2 pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A block-sorting file compressor" url="http://www.bzip.org/" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'chroot-core') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep current|sed 's/.*s \(.*\), .*/\1/'" From crazy at frugalware.org Sun Mar 9 23:17:51 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:17:51 2008 Subject: [Frugalware-git] gcc43: diffutils-2.8.1-3-i686 Message-ID: <20080309221751.124A911904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=bf9cc5906b244a3e36372274be684a95ef67265f commit bf9cc5906b244a3e36372274be684a95ef67265f Author: crazy Date: Sun Mar 9 23:17:28 2008 +0100 diffutils-2.8.1-3-i686 * rebuild diff --git a/source/base/diffutils/FrugalBuild b/source/base/diffutils/FrugalBuild index 3233713..b98bdab 100644 --- a/source/base/diffutils/FrugalBuild +++ b/source/base/diffutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=diffutils pkgver=2.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Utility programs used for creating patch files" url="http://www.gnu.org/software/diffutils" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Sun Mar 9 23:19:55 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:19:57 2008 Subject: [Frugalware-git] gcc43: findutils-4.3.9-2-i686 Message-ID: <20080309221955.DE8ED11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=670ae8d37bf463b460d78476f068c7e06e7f820a commit 670ae8d37bf463b460d78476f068c7e06e7f820a Author: crazy Date: Sun Mar 9 23:19:28 2008 +0100 findutils-4.3.9-2-i686 * rebuild diff --git a/source/base/findutils/FrugalBuild b/source/base/findutils/FrugalBuild index 159ed12..fe7ffdc 100644 --- a/source/base/findutils/FrugalBuild +++ b/source/base/findutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=findutils pkgver=4.3.9 -pkgrel=1 +pkgrel=2 pkgdesc="Basic directory searching utilities" url="http://www.gnu.org/software/findutils" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="wget --passive-ftp -O - -q ftp://alpha.gnu.org/pub/gnu/findutils/|grep 'findutils.*.tar.gz<'|tail -n 1|sed 's/.*s-\(.*\)\.t.*/\1/'" From crazy at frugalware.org Sun Mar 9 23:23:39 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:23:41 2008 Subject: [Frugalware-git] gcc43: gawk-3.1.6-2-i686 Message-ID: <20080309222339.0BE4311904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a18c54b85cf680811d0411548709aae7f2d50f41 commit a18c54b85cf680811d0411548709aae7f2d50f41 Author: crazy Date: Sun Mar 9 23:23:00 2008 +0100 gawk-3.1.6-2-i686 * rebuild diff --git a/source/base/gawk/FrugalBuild b/source/base/gawk/FrugalBuild index 24da2c7..3b2898b 100644 --- a/source/base/gawk/FrugalBuild +++ b/source/base/gawk/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gawk pkgver=3.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Gnu version of awk" url="http://www.gnu.org/software/gawk/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.gnu.org/gnu/gawk/|grep -- 'gawk-[0-9.]\+'|Flasttar" From crazy at frugalware.org Sun Mar 9 23:33:05 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:33:07 2008 Subject: [Frugalware-git] gcc43: gettext-0.17-2-i686 Message-ID: <20080309223305.2368811904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ddbcc8adf128675a5be1afabaf3bf439897d4291 commit ddbcc8adf128675a5be1afabaf3bf439897d4291 Author: crazy Date: Sun Mar 9 23:31:28 2008 +0100 gettext-0.17-2-i686 * rebuild diff --git a/source/base/gettext/FrugalBuild b/source/base/gettext/FrugalBuild index 0265660..d0749aa 100644 --- a/source/base/gettext/FrugalBuild +++ b/source/base/gettext/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gettext pkgver=0.17 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" url="http://www.gnu.org/software/gettext" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Sun Mar 9 23:37:53 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:37:57 2008 Subject: [Frugalware-git] gcc43: expat-2.0.1-2-i686 Message-ID: <20080309223753.910F611904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=498e5d727a48a59f9e30da3ae97533d9dd1eb78f commit 498e5d727a48a59f9e30da3ae97533d9dd1eb78f Author: crazy Date: Sun Mar 9 23:36:06 2008 +0100 expat-2.0.1-2-i686 * rebuild diff --git a/source/lib/expat/FrugalBuild b/source/lib/expat/FrugalBuild index 7aaf544..a67bbcd 100644 --- a/source/lib/expat/FrugalBuild +++ b/source/lib/expat/FrugalBuild @@ -4,15 +4,14 @@ pkgname=expat pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An XML Parser library written in C" url="http://expat.sf.net" -depends=('glibc') -rodepends=('coreutils') +depends=('glibc>=2.7-3') +rodepends=('coreutils>=6.10-3') groups=('lib' 'chroot-core') archs=('i686' 'x86_64') -_F_cd_path="$pkgname-2007-06-05" # is stable just wrong packaged :P Finclude sourceforge -sha1sums=('24515689805c63b0bcbed104841f7233c6e6a288') +sha1sums=('663548c37b996082db1f2f2c32af060d7aa15c2d') # optimization OK From crazy at frugalware.org Sun Mar 9 23:41:40 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:41:42 2008 Subject: [Frugalware-git] gcc43: pcre-7.6-2-i686 Message-ID: <20080309224140.C55FE11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=d57736583741a2f610f2ccf5213343ba4cf32cdd commit d57736583741a2f610f2ccf5213343ba4cf32cdd Author: crazy Date: Sun Mar 9 23:41:13 2008 +0100 pcre-7.6-2-i686 * rebuild diff --git a/source/base/pcre/FrugalBuild b/source/base/pcre/FrugalBuild index d9240fb..f1471c7 100644 --- a/source/base/pcre/FrugalBuild +++ b/source/base/pcre/FrugalBuild @@ -4,12 +4,12 @@ pkgname=pcre pkgver=7.6 -pkgrel=1 +pkgrel=2 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('libstdc++') +depends=('libstdc++>=4.3.0-3') up2date="lynx -dump ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/|grep '.tar.gz$'|sort -n -r|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --disable-static --enable-utf8" From crazy at frugalware.org Sun Mar 9 23:43:35 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:43:37 2008 Subject: [Frugalware-git] gcc43: grep-2.5.3-3-i686 Message-ID: <20080309224335.B4BDD11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=50ecb04460b04990b1b743325e7fd978fa95a3bc commit 50ecb04460b04990b1b743325e7fd978fa95a3bc Author: crazy Date: Sun Mar 9 23:43:13 2008 +0100 grep-2.5.3-3-i686 * rebuild diff --git a/source/base/grep/FrugalBuild b/source/base/grep/FrugalBuild index a078468..1c14fb7 100644 --- a/source/base/grep/FrugalBuild +++ b/source/base/grep/FrugalBuild @@ -4,10 +4,10 @@ pkgname=grep pkgver=2.5.3 extrapkgver= -pkgrel=2 +pkgrel=3 pkgdesc="Print lines matching a pattern" url="http://www.gnu.org/software/grep/grep.html" -depends=('pcre') +depends=('pcre>=7.6-2') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Sun Mar 9 23:45:35 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:45:41 2008 Subject: [Frugalware-git] gcc43: gzip-1.3.12-3-i686 Message-ID: <20080309224535.6629A11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=5505dad51431609fada25b5d00c9fcfd9da87d80 commit 5505dad51431609fada25b5d00c9fcfd9da87d80 Author: crazy Date: Sun Mar 9 23:45:16 2008 +0100 gzip-1.3.12-3-i686 * rebuild diff --git a/source/base/gzip/FrugalBuild b/source/base/gzip/FrugalBuild index 2fbc305..7efae43 100644 --- a/source/base/gzip/FrugalBuild +++ b/source/base/gzip/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gzip pkgver=1.3.12 -pkgrel=2 +pkgrel=3 pkgdesc="A file compression utility" url="http://www.gzip.org" depends=('bash') From crazy at frugalware.org Sun Mar 9 23:48:08 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:48:09 2008 Subject: [Frugalware-git] gcc43: make-3.81-3-i686 Message-ID: <20080309224808.5C9D511904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=2339cdd0194deafffcf200e57d014dc19942f421 commit 2339cdd0194deafffcf200e57d014dc19942f421 Author: crazy Date: Sun Mar 9 23:47:40 2008 +0100 make-3.81-3-i686 * rebuild diff --git a/source/devel/make/FrugalBuild b/source/devel/make/FrugalBuild index c1c3e9c..d6db112 100644 --- a/source/devel/make/FrugalBuild +++ b/source/devel/make/FrugalBuild @@ -3,10 +3,10 @@ pkgname=make pkgver=3.81 -pkgrel=1 +pkgrel=3 pkgdesc="GNU make utility to maintain groups of programs" url="http://www.gnu.org/software/make" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('devel' 'devel-core') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Sun Mar 9 23:49:44 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:49:46 2008 Subject: [Frugalware-git] gcc43: ed-0.8-2-i686 Message-ID: <20080309224944.A85A211904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=2171da22c3d1f874454ee635ec12d7ab2d12cef6 commit 2171da22c3d1f874454ee635ec12d7ab2d12cef6 Author: crazy Date: Sun Mar 9 23:49:23 2008 +0100 ed-0.8-2-i686 * rebuild diff --git a/source/base/ed/FrugalBuild b/source/base/ed/FrugalBuild index 7f6dab9..c6a2608 100644 --- a/source/base/ed/FrugalBuild +++ b/source/base/ed/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ed pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A POSIX-compliant line editor" url="http://www.gnu.org/software/ed/ed.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnubz2 From crazy at frugalware.org Sun Mar 9 23:56:31 2008 From: crazy at frugalware.org (crazy) Date: Sun Mar 9 23:56:33 2008 Subject: [Frugalware-git] gcc43: patch-2.5.9-2-i686 Message-ID: <20080309225631.777C211904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a2f2c6ca89b97dce06ca23dbf5bc28b8a2c00baa commit a2f2c6ca89b97dce06ca23dbf5bc28b8a2c00baa Author: crazy Date: Sun Mar 9 23:56:12 2008 +0100 patch-2.5.9-2-i686 * rebuild diff --git a/source/base/patch/FrugalBuild b/source/base/patch/FrugalBuild index c753805..1cbcca1 100644 --- a/source/base/patch/FrugalBuild +++ b/source/base/patch/FrugalBuild @@ -3,10 +3,10 @@ pkgname=patch pkgver=2.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to apply patch files to original sources" url="http://www.gnu.org/software/patch/patch.html" -depends=('ed') +depends=('ed>=0.8-2') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://bent.latency.net/bent/darcs/patch-2.5.9/src/ |Flasttar" From crazy at frugalware.org Mon Mar 10 00:00:24 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 00:00:26 2008 Subject: [Frugalware-git] gcc43: gdbm-1.8.3-4-i686 Message-ID: <20080309230024.D0C8D11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a049aed8169cd0cc0e744cdd36f6a24f0922fe73 commit a049aed8169cd0cc0e744cdd36f6a24f0922fe73 Author: crazy Date: Sun Mar 9 23:59:47 2008 +0100 gdbm-1.8.3-4-i686 * rebuild * unset MAKEFLAGS before Fmakeinstall diff --git a/source/base/gdbm/FrugalBuild b/source/base/gdbm/FrugalBuild index 360ef88..0982aea 100644 --- a/source/base/gdbm/FrugalBuild +++ b/source/base/gdbm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gdbm pkgver=1.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz @@ -16,6 +16,7 @@ sha1sums=('a0296b1986a99cb9ec0dc3b17ea99aec76e9b760') build() { Fmake || return 1 + unset MAKEFLAGS Fmakeinstall install-compat } From crazy at frugalware.org Mon Mar 10 00:12:03 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 00:12:05 2008 Subject: [Frugalware-git] gcc43: popt-1.13-1-i686 Message-ID: <20080309231203.5F63E11904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=f97828acf0508acb01f5ece84adbb76c86bbb9df commit f97828acf0508acb01f5ece84adbb76c86bbb9df Author: crazy Date: Mon Mar 10 00:10:55 2008 +0100 popt-1.13-1-i686 * Version bump * fixed broken , url , source and up2date * we need autoreconf when we use Fsed o Makefile.am's , heh diff --git a/source/base/popt/FrugalBuild b/source/base/popt/FrugalBuild index 7d8d5fc..e8158aa 100644 --- a/source/base/popt/FrugalBuild +++ b/source/base/popt/FrugalBuild @@ -3,20 +3,21 @@ # Maintainer: voroskoi pkgname=popt -pkgver=1.10.7 -pkgrel=2 +pkgver=1.13 +pkgrel=1 pkgdesc="A commandline option parser" -url="http://freshmeat.net/projects/popt/" -depends=('glibc' 'gettext') +url="http://rpm5.org" +depends=('glibc>=2.7-3' 'gettext>=0.17-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump ftp://jbj.org/pub/rpm-4.4.x|grep 'tar.gz'|grep 'popt-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" -source=(ftp://jbj.org/pub/rpm-4.4.x/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump http://rpm5.org/files/popt|Flasttar" +source=(http://rpm5.org/files/popt/$pkgname-$pkgver.tar.gz) build() { Fsed "@MARK64@" "" Makefile.am + Fautoreconf Fbuild } -sha1sums=('c1a22bd3b50b24f64654c69a6f91142ca54ca853') +sha1sums=('658bf2d2ec25e97816f5920bb24048cf252d053a') # optimization OK From crazy at frugalware.org Mon Mar 10 01:29:42 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 01:29:44 2008 Subject: [Frugalware-git] gcc43: db-4.6.21-3-i686 Message-ID: <20080310002942.B2FB211904CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0fe2b980fd908233e6286abcc1ff397f66bd4b20 commit 0fe2b980fd908233e6286abcc1ff397f66bd4b20 Author: crazy Date: Mon Mar 10 01:25:28 2008 +0100 db-4.6.21-3-i686 * release bump * fix docs bug being installed twice * deleted all java docs we don't have java support for db yet diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild index 577b7c7..9e2e2a2 100644 --- a/source/base/db/FrugalBuild +++ b/source/base/db/FrugalBuild @@ -3,7 +3,7 @@ pkgname=db pkgver=4.6.21 -pkgrel=2 +pkgrel=3 pkgdesc="The Berkeley DB embedded database system" url="http://www.sleepycat.com" depends=('libstdc++>=4.3.0-3') @@ -31,9 +31,9 @@ build() Fmakeinstall Fmkdir /usr/share/doc/$pkgname-$pkgver + Frm /usr/docs/{java,gsg_txn/JAVA,gsg/JAVA,gsg_db_rep/JAVA} Fmv /usr/docs/* /usr/share/doc/$pkgname-$pkgver/ Frm /usr/docs/ - cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie } # optimization ok From crazy at frugalware.org Mon Mar 10 15:24:13 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 15:24:16 2008 Subject: [Frugalware-git] gcc43: chkconfig-1.3.30c-1-i686 Message-ID: <20080310142413.AD80911901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3e527cb67d14d5a804935841ba470f3489750146 commit 3e527cb67d14d5a804935841ba470f3489750146 Author: crazy Date: Mon Mar 10 15:21:17 2008 +0100 chkconfig-1.3.30c-1-i686 * Version bump * fixed url , source * added up2date again and removed that comment * which is not true anymore * added an frugalware patch to make it ignore * .pacxxx backup files and removed verbose ( debug ?! ) * output on --add diff --git a/source/base/chkconfig/FrugalBuild b/source/base/chkconfig/FrugalBuild index 9a25a77..c4b8d9d 100644 --- a/source/base/chkconfig/FrugalBuild +++ b/source/base/chkconfig/FrugalBuild @@ -2,22 +2,23 @@ # Maintainer: VMiklos pkgname=chkconfig -pkgver=1.2.24h -pkgrel=6 +pkgver=1.3.30c +pkgrel=1 pkgdesc="Updates and queries runlevel information for system services" -url="http://www.fastcoder.net/~thumper/software/sysadmin/chkconfig/" -depends=('glibc' 'popt') +url="http://www.fastcoder.net/software/chkconfig/" +depends=('glibc>=2.7-3' 'popt>=1.13') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') -# silence up2date, newer versions may be problematic and we'll switch to -# upstart soon -up2date="$pkgver" -source=(http://www.fastcoder.net/~thumper/downloads/chkconfig/$pkgname-$pkgver.tar.gz) -sha1sums=('c22cab9f75e7acdc50f9a2061e224705c43437db') +up2date="lynx -dump http://www.fastcoder.net/downloads/|Flasttar" +source=( http://www.fastcoder.net/downloads/$pkgname-$pkgver.tar.gz frugalware.patch) +sha1sums=('5041858adc384863c66e4a4110c951c19e4a690c' \ + '218905354a6828c8d0e3a439be02d21fbb190552') build() { - Fbuild --with-init-dir=/etc/rc.d + Fbuild \ + --with-init-dir=/etc/rc.d + --enable-threads=posix Fmkdir /etc/rc.d/rc{S,0,1,2,3,4,5,6}.d } diff --git a/source/base/chkconfig/frugalware.patch b/source/base/chkconfig/frugalware.patch new file mode 100644 index 0000000..9dac5ee --- /dev/null +++ b/source/base/chkconfig/frugalware.patch @@ -0,0 +1,82 @@ +diff -Naur chkconfig-1.3.30c/chkconfig.c chkconfig-1.3.30c-p/chkconfig.c +--- chkconfig-1.3.30c/chkconfig.c 2007-04-01 23:36:25.000000000 +0200 ++++ chkconfig-1.3.30c-p/chkconfig.c 2008-03-10 15:14:15.000000000 +0100 +@@ -202,13 +202,14 @@ + + /* Skip files with known bad extensions */ + if ((dn = strrchr(ent->d_name, '.')) != NULL && +- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) ++ (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") ++ || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacsave") || !strcmp(dn, ".pacorig"))) + continue; +- ++ + dn = ent->d_name + strlen(ent->d_name) - 1; + if (*dn == '~' || *dn == ',') + continue; +- ++ + sprintf(fn, "%s/%s", conf.initdir, ent->d_name); + if (stat(fn, &sb)) { + continue; +@@ -224,7 +225,6 @@ + do { + nResolved = 0; + int i; +- + for (i = 0; i < numservs ; i++) { + if ((servs+i)->isLSB) + nResolved += frobOneDependencies(servs+i, servs, numservs, 0); +@@ -244,9 +244,13 @@ + return 1; + } + +- printf("start = %d\n", s.sPriority); +- printf("end = %d\n", s.kPriority); +- ++ #if 0 ++ ++ printf("start = %d\n", s.sPriority); ++ printf("end = %d\n", s.kPriority); ++ ++ #endif ++ + if (s.type == TYPE_XINETD) return 0; + if (s.isLSB) + frobDependencies(&s); +@@ -343,7 +347,7 @@ + + numServicesAlloced = 10; + services = malloc(sizeof(*services) * numServicesAlloced); +- ++ + if (!(dir = opendir(conf.initdir))) { + fprintf(stderr, _("failed to open %s: %s\n"), conf.initdir, + strerror(errno)); +@@ -361,13 +365,14 @@ + (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") + || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") + || !strcmp(dn, ".dpkg-dist") || !strcmp(dn, ".dpkg-old") +- || !strcmp(dn, ".dpkg-new"))) ++ || !strcmp(dn, ".dpkg-new") || !strcmp(dn, ".pacsave") ++ || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacorig"))) + continue; + + dn = ent->d_name + strlen(ent->d_name) - 1; + if (*dn == '~' || *dn == ',') + continue; +- ++ + sprintf(fn, "%s/%s", conf.initdir, ent->d_name); + if (stat(fn, &sb)) { + fprintf(stderr, _("error reading info for service %s: %s\n"), +@@ -421,7 +426,8 @@ + + /* Skip files with known bad extensions */ + if ((dn = strrchr(ent->d_name, '.')) != NULL && +- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) ++ (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") ++ ||!strcmp(dn, ".pacsave") || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacorig"))) + continue; + + dn = ent->d_name + strlen(ent->d_name) - 1; From crazy at frugalware.org Mon Mar 10 15:30:02 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 15:30:03 2008 Subject: [Frugalware-git] gcc43: frugalware-0.8-2-i686 Message-ID: <20080310143002.1976911901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0b0724896d70420a93b4a82e49571c2235e138b8 commit 0b0724896d70420a93b4a82e49571c2235e138b8 Author: crazy Date: Mon Mar 10 15:28:39 2008 +0100 frugalware-0.8-2-i686 * release bump * added serice diff for new chkconfig * and fixed other minor issues in service * Ok @ vmiklos diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index a083068..751f570 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -3,15 +3,15 @@ pkgname=frugalware pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" depends=() -rodepends=('coreutils' 'chkconfig') +rodepends=('coreutils>=6.10-3' 'chkconfig>=1.3.30c') makedepends=('help2man') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,termcap}) up2date="lynx -dump $url |Flasttar" -source=($url/$pkgname-$pkgver.tar.gz) -signatures=("$source.asc") +source=($url/$pkgname-$pkgver.tar.gz service.diff) +signatures=("$source.asc" '') diff --git a/source/base/frugalware/service.diff b/source/base/frugalware/service.diff new file mode 100644 index 0000000..0743b94 --- /dev/null +++ b/source/base/frugalware/service.diff @@ -0,0 +1,121 @@ +diff -Naur frugalware-0.8/var/service frugalware-0.8-p/var/service +--- frugalware-0.8/var/service 2008-03-07 00:27:10.000000000 +0100 ++++ frugalware-0.8-p/var/service 2008-03-10 14:44:27.000000000 +0100 +@@ -1,3 +1,4 @@ ++ + #!/bin/sh + + # (c) 2003, 2004, 2008 Miklos Vajna +@@ -7,46 +8,65 @@ + TEXTDOMAIN=service + TEXTDOMAINDIR=/var/lib/frugalware/messages + ++ ++usage() ++{ ++ echo $"Usage: $0 service action" ++ echo ++ echo $"Actions:" ++ echo ++ echo $"start Start the service." ++ echo ++ echo $"stop Stop the service." ++ echo ++ echo $"status Status of the service (if it supports querying so)." ++ echo ++ echo $"restart Stop and start again the service." ++ echo ++ echo $"add Adds a new service for management by chkconfig." ++ echo ++ echo $"del Removes a service from chkconfig management." ++ echo ++ echo $"list List whether the service is stopped or started in each runlevel." ++ exit 0 ++} ++ ++if [ "$1" = "" ]; then ++ usage ++fi ++ + if [ "$1" = "--version" ]; then +- echo "service (pacman-tools) 0.2" ++ echo "service (pacman-tools) 0.2.1" + echo +- echo "Copyright (c) 2003-2007 by Miklos Vajna " ++ echo "Copyright (c) 2003-2008 by Miklos Vajna " + echo "This is free software; see the source for copying conditions. There is NO" + echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit 0 + elif [ "$1" = "--help" ]; then +- echo $"Usage: $0 service action" +- echo +- echo $"Actions:" +- echo +- echo $"start Start the service." +- echo +- echo $"stop Stop the service." +- echo +- echo $"status Status of the service (if it supports querying so)." +- echo +- echo $"restart Stop and start again the service." +- echo +- echo $"add Adds a new service for management by chkconfig." +- echo +- echo $"del Removes a service from chkconfig management." +- echo +- echo $"list List whether the service is stopped or started in each runlevel." +- exit 0 ++ usage + fi +-if [ "$1" = "list" ]; then +- chkconfig --list --level $2 | grep $2:$3 ++ ++if [ "$1" = "level" ]; then ++ if [ "$2" != "" ]; then ++ if [ "$3" != "" ]; then ++ ## well just support english for now 'on' is not ++ ## the same as Ein etc ++ LC_ALL=C; chkconfig --list --level $2 | grep $2:$3 ++ else ++ echo $"Usage: $0 level " ++ exit 1 ++ fi ++ else ++ echo $"Usage: $0 level " ++ exit 1 ++ fi + else + service=rc.$1 + name=/etc/rc.d/$service + if ! [ -z "$1" ]; then + if ! [ -e $name ]; then +- # this will print a nice error message +- chkconfig --list $service +- exit 1 +- fi +- if ! chkconfig --list $service >/dev/null 2>&1; then +- chkconfig --list $service ++ ## maybe typo ? ++ usage + exit 1 + fi + fi +@@ -55,7 +75,17 @@ + elif [ "$2" = "del" ]; then + chkconfig --del $service + elif [ "$2" = "list" ]; then +- chkconfig --list $service ++ chkconfig --list $service >/dev/null 2>&1 ++ RET=$? ++ if [ "$RET" = "0" ]; then ++ ## we are fine , the file $name ++ ## exists and is added list it ++ chkconfig --list $service ++ else ++ ## error , files exists but isn't added ++ echo $"Use $0 $1 add first." ++ exit 1 ++ fi + else + $name $2 + fi From crazy at frugalware.org Mon Mar 10 15:33:59 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 15:34:01 2008 Subject: [Frugalware-git] gcc43: udev-118-7-i686 Message-ID: <20080310143359.D546E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e6742df08d1c492222d1eac0d489bace87d17878 commit e6742df08d1c492222d1eac0d489bace87d17878 Author: crazy Date: Mon Mar 10 15:33:39 2008 +0100 udev-118-7-i686 * rebuild diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index e8817d0..9755b5d 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,13 +3,13 @@ pkgname=udev pkgver=118 -pkgrel=6 +pkgrel=7 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules} \ etc/sysconfig/blacklist) -depends=('glibc') -rodepends=('chkconfig' 'coreutils' 'grep') +depends=('glibc>=2.7-3') +rodepends=('chkconfig>=1.3.30c' 'coreutils>=6.10-3' 'grep>=2.5.3-3') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') conflicts=('devfsd' 'pcmcia-cs' 'hotplug') From crazy at frugalware.org Mon Mar 10 15:36:52 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 15:36:54 2008 Subject: [Frugalware-git] gcc43: libtool-1.5.26-2-i686 Message-ID: <20080310143652.664E911901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e48b92adc0d180dbc2a8207afd9ebaaa6ccdc1e5 commit e48b92adc0d180dbc2a8207afd9ebaaa6ccdc1e5 Author: crazy Date: Mon Mar 10 15:36:23 2008 +0100 libtool-1.5.26-2-i686 * rebuild diff --git a/source/devel/libtool/FrugalBuild b/source/devel/libtool/FrugalBuild index 443c3d0..dd19621 100644 --- a/source/devel/libtool/FrugalBuild +++ b/source/devel/libtool/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libtool pkgver=1.5.26 -pkgrel=1 +pkgrel=2 pkgdesc="A generic library support script" url="http://www.gnu.org/software/libtool" depends=('bash') From vmiklos at frugalware.org Mon Mar 10 15:42:06 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 10 15:42:06 2008 Subject: [Frugalware-git] homepage-ng: 0.8 announce draft Message-ID: <20080310144206.8351E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=7e86442bb9e5a404c662aa52c5f761472e2ddc4e commit 7e86442bb9e5a404c662aa52c5f761472e2ddc4e Author: Miklos Vajna Date: Mon Mar 10 15:41:35 2008 +0100 0.8 announce draft diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 3f7087c..72f4cc5 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -17,6 +17,112 @@ + 91 + Frugalware 0.8 (Kalgan) for i686 and x86_64 released + Mon Mar 11 07:16:05 CET 2008 + VMiklos + 1 + announce the immediate availability of Frugalware 0.8, our eighth stable release.
    + No new features have been added since 0.8rc2, but more than 300 changes have been made to fix minor bugs. + If you didn't follow the changes during the pre/rc releases, here are the most important changes since 0.7:
    +
      +
    • Up to date base system: Linux kernel 2.6.24.3, Glibc 2.7 and GCC 4.2.3
      • +
    • Up to date desktop packages: KDE 3.5.9, GNOME 2.20, XFCE 4.4.2, OpenOffice.org 2.4rc2 (ooo-build 2.4.0) and Firefox 2.0.0.12
      • +
    • Setup: WPA support, new supported language: Czech.
      • +
    • New graphical tool: FUN (update notifier).
      • +
    • 4068 changes, including 251 new packages, 1729 updated packages and 416 closed tasks.
      • +
    + Please refer to the Frugalware Sayshell ChangeLog for more information.
    + Download for i686:
    + livecd, + netinstall, + cd1, + cd2, + cd3, + cd4, + cd5, + cd6, + cd7, + cd8, + cd9, + cd10, + cd11, + cd12, + cd13, + cd14, + dvd1, + dvd2, + tftp, + usb, + chroot tarball +
    + Download for x86_64:
    + netinstall, + cd1, + cd2, + cd3, + cd4, + cd5, + cd6, + cd7, + cd8, + cd9, + cd10, + cd11, + cd12, + dvd1, + dvd2, + tftp, + usb, + chroot tarball +
    + NOTE: Click here to read more about what media you need for the installation.
    + SHA1SUMs: + 
    +716af41f46cc0d4ffc05c00e206a265438bddab3  frugalware-0.8-i686-cd10.iso
+dc9721be7a6dcca936d65c2bda749684fd6d3d4b  frugalware-0.8-i686-cd11.iso
+d7ef389858311e4cbb5db07236e4663f4e77bf07  frugalware-0.8-i686-cd12.iso
+da90575c20185d608ab051e6c6b9fb583f8ff303  frugalware-0.8-i686-cd13.iso
+a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
+86a7629a794fbb799b412f1da6f43b119c79138a  frugalware-0.8-i686-cd1.iso
+5de9f070fd8e940853e58063112bb9576322a3e2  frugalware-0.8-i686-cd2.iso
+1409dcf8f7e81664f4a3a84d607898c06bcbfb1c  frugalware-0.8-i686-cd3.iso
+a705f4662f3d7931e47dcb88f8af6574fa39ae3e  frugalware-0.8-i686-cd4.iso
+d612aa3851b5c4f382e0a0dfb5cbbc0d27230ce3  frugalware-0.8-i686-cd5.iso
+a473a3338220d22d65249c391ba30161d4e2c50a  frugalware-0.8-i686-cd6.iso
+588349db788e39541c663d5332626118fd3232ea  frugalware-0.8-i686-cd7.iso
+84a6526bebb5de2729897fcc2823386ca6f3673e  frugalware-0.8-i686-cd8.iso
+c7d66707fcbef326193a6e427862961b3bb8ec56  frugalware-0.8-i686-cd9.iso
+2925f86d9c1c6e6e63e6533f0673de4fea09d437  frugalware-0.8-i686-dvd1.iso
+9e09729d9a4c93c09cece38e2679163c11c57a45  frugalware-0.8-i686-dvd2.iso
+b1c645170fdbf6e57b746f4b6185687a84784a0f  frugalware-0.8-i686-net.iso
+987f5281eca7c1b2418a300378506b364e986b3f  frugalware-0.8-x86_64-cd10.iso
+ca99396c8a720f9537c55169716382a38a39d4ef  frugalware-0.8-x86_64-cd11.iso
+63033736c6886eff1240fe5efc5813a133133c6c  frugalware-0.8-x86_64-cd12.iso
+c08a269260babaf993bb2e3a5c06f3bd6de6ed5a  frugalware-0.8-x86_64-cd1.iso
+9a24c1e82782cd8e7190d86faba78bf9a0c2ad07  frugalware-0.8-x86_64-cd2.iso
+5fe53403702bb672898bb495629751d7d9714301  frugalware-0.8-x86_64-cd3.iso
+bda7d57f4d2bef9601a4705ec2cc55f0101d451b  frugalware-0.8-x86_64-cd4.iso
+de1e545c56a7982827a950d8a14a9825467cf4ea  frugalware-0.8-x86_64-cd5.iso
+bf075fe9c826062091190e6e98cc1be531906db3  frugalware-0.8-x86_64-cd6.iso
+b1e36d88804acb7a0f8b76f8f2d040bf7b950eaf  frugalware-0.8-x86_64-cd7.iso
+c9de8aec4bc1e266ebdc9d12cc4c7c943ee3c754  frugalware-0.8-x86_64-cd8.iso
+d9977d7358ec0f9a3021541453d0afaa16b031e2  frugalware-0.8-x86_64-cd9.iso
+f9be2f77dbaeb1edf28cb4f951b5a2306b5a9e9f  frugalware-0.8-x86_64-dvd1.iso
+c5d4c23bc4c5ececa2157e41a855abd375819bdf  frugalware-0.8-x86_64-dvd2.iso
+6c2aee54190fea645dde4f2be1e0d04dc81aff74  frugalware-0.8-x86_64-net.iso
+ef68c4d3353ff104ad59725743e9f11b63703323  fwlive-0.8-i686-full.iso
+34dd50fc34315d73f7289ab887b23328d5950f04  frugalware-0.8-i686-tftp.img.gz
+fb2079de1627ca0e65a323005e0644b88fed6d03  frugalware-0.8-i686-usb.tar.gz
+8d82cdc2f15bf3f6c6c7b3bb89b5ca284754bee6  frugalware-0.8-x86_64-tftp.img.gz
+299d3473073399c3237ab87cad0ef1fa433e4717  frugalware-0.8-x86_64-usb.tar.gz
+
    + If you are upgrading to Kalgan from our previous stable release (Sayshell), please read the upgrade part of our documentation.
    + ]]> +     +     + 90 Frugalware Newsletter Issue 17 Sat Mar 1 13:42:43 CET 2008 From crazy at frugalware.org Mon Mar 10 15:57:12 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 15:57:14 2008 Subject: [Frugalware-git] gcc43: perl-5.10.0-4-i686 Message-ID: <20080310145712.AB5F811904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=00a146f0a603be0f2b21d819a419f35ece619813 commit 00a146f0a603be0f2b21d819a419f35ece619813 Author: crazy Date: Mon Mar 10 15:51:43 2008 +0100 perl-5.10.0-4-i686 * rebuild diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild index 1649ea2..3fa85a0 100644 --- a/source/base/perl/FrugalBuild +++ b/source/base/perl/FrugalBuild @@ -4,16 +4,16 @@ pkgname=perl pkgver=5.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Practical Extraction and Report Language." url="http://www.perl.org/" -depends=('gdbm' 'db>=4.6.18') +depends=('gdbm>=1.8.3-4' 'db>=4.6.21-3') provides=('perl-version' 'perl-module-build' 'perl-io-zlib' \ 'perl-io-compress-zlib' 'perl-io-compress-base' 'perl-extutils-cbuilder' \ 'perl-compress-zlib' 'perl-compress-raw-zlib' 'perl-archive-tar' \ 'perl-digest-sha' 'perl-pod-simple' 'perl-pod-escapes') conflicts=(${provides[@]}) -rodepends=('udev') +rodepends=('udev>=118-7') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.perl.org/|grep -m1 'Current Release:'|sed 's/.*]\(.*\).*/\1/'" From crazy at frugalware.org Mon Mar 10 16:06:21 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:06:22 2008 Subject: [Frugalware-git] gcc43: tar-1.19-3-i686 Message-ID: <20080310150621.10E4A11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=f8ac87a4c683fe4362a1351481671ea913c3b1ad commit f8ac87a4c683fe4362a1351481671ea913c3b1ad Author: crazy Date: Mon Mar 10 16:05:29 2008 +0100 tar-1.19-3-i686 * rebuild * added an patch to fix the build with gcc43 diff --git a/source/base/tar/FrugalBuild b/source/base/tar/FrugalBuild index bf99d4c..931b297 100644 --- a/source/base/tar/FrugalBuild +++ b/source/base/tar/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tar pkgver=1.19 -pkgrel=2 +pkgrel=3 pkgdesc="Utility used to store, backup, and transport files" url="http://www.gnu.org/software/tar/tar.html" depends=('bash') @@ -11,8 +11,8 @@ groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz tar.1 \ - $pkgname-1.18-lzma.patch) -signatures=($source.sig '' '') + $pkgname-1.18-lzma.patch gcc43.patch) +signatures=($source.sig '' '' '') build() { diff --git a/source/base/tar/gcc43.patch b/source/base/tar/gcc43.patch new file mode 100644 index 0000000..abe626e --- /dev/null +++ b/source/base/tar/gcc43.patch @@ -0,0 +1,33 @@ +diff -up tar-1.19/lib/argp-fmtstream.h.gcc43 tar-1.19/lib/argp-fmtstream.h +--- tar-1.19/lib/argp-fmtstream.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp-fmtstream.h 2008-02-13 16:56:58.000000000 +0100 +@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI +-#define ARGP_FS_EI extern inline ++# ifdef __GNUC_STDC_INLINE__ ++# define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) ++# else ++# define ARGP_FS_EI extern inline ++# endif + #endif + + ARGP_FS_EI size_t +diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h +--- tar-1.19/lib/argp.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp.h 2008-02-13 16:55:36.000000000 +0100 +@@ -580,7 +580,11 @@ extern void *__argp_input (const struct + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# if defined __GNUC_STDC_INLINE__ ++# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) ++# else ++# define ARGP_EI extern __inline__ ++# endif + # endif + + ARGP_EI void + From crazy at frugalware.org Mon Mar 10 16:10:54 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:10:55 2008 Subject: [Frugalware-git] gcc43: mktemp-1.5-2-i686 Message-ID: <20080310151054.17DBE11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=c288587d8e22dfbd5b5ff24b398711d5b699b536 commit c288587d8e22dfbd5b5ff24b398711d5b699b536 Author: crazy Date: Mon Mar 10 16:10:13 2008 +0100 mktemp-1.5-2-i686 * rebuild * unset MAKEFLAGS , it does not like SMP diff --git a/source/base/mktemp/FrugalBuild b/source/base/mktemp/FrugalBuild index 535a24b..53aa5e5 100644 --- a/source/base/mktemp/FrugalBuild +++ b/source/base/mktemp/FrugalBuild @@ -3,10 +3,10 @@ pkgname=mktemp pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A small program to allow safe temporary file creation from shell scripts." url="http://www.mktemp.org/" -depends=('glibc') +depends=('glibc>=2.7-3') replaces=('debianutils') groups=('base' 'chroot-core') archs=('i686' 'x86_64') @@ -14,4 +14,5 @@ up2date="lynx -dump $url |grep current|sed 's/.*]\([^,]*\),.*/\1/'" source=(ftp://ftp.mktemp.org/pub/mktemp/mktemp-$pkgver.tar.gz) signatures=(ftp://ftp.mktemp.org/pub/mktemp/mktemp-$pkgver.tar.gz.sig) +unset MAKEFLAGS # optimization OK From iron at frugalware.org Mon Mar 10 16:26:27 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Mar 10 16:26:29 2008 Subject: [Frugalware-git] homepage-ng: 0.8 Hungarian announcement draft Message-ID: <20080310152627.4544E11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=41930dbea016894ecf142b4ac52d54233054cbce commit 41930dbea016894ecf142b4ac52d54233054cbce Author: Krisztian VASAS Date: Mon Mar 10 16:26:22 2008 +0100 0.8 Hungarian announcement draft diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml index 55804b4..8abdb3b 100644 --- a/frugalware/xml/news_hu.xml +++ b/frugalware/xml/news_hu.xml @@ -17,6 +17,112 @@ + 91 + Megjelent a Frugalware 0.8 (Kalgan) i686-ra s x86_64-re + Mon Mar 11 07:26:44 CET 2008 + IroNiQ + 1 + jelenti be a Frugalware 0.8 azonnali elérhetőségét, mint nyolcadik stabil kiadásunkat.
    + Igaz, hogy újdonság nem került bele 0.8rc2 óta, de több, mint 300 apróbb hibajavítás történt. + Ha nem követte folyamatosan a változásokat, íme a legfontosabbak 0.7 óta:
    +
      +
    • Naprakész alaprendszer: Linux kernel 2.6.24.3, Glibc 2.7 és GCC 4.2.3
      • +
    • Naprakész grafikus csomagok: KDE 3.5.9, GNOME 2.20, XFCE 4.4.2, OpenOffice.org 2.4rc2 (ooo-build 2.4.0) és Firefox 2.0.0.12
      • +
    • Telepítő: WPA támogatás, cseh nyelvű telepítő.
      • +
    • Új grafikus eszköz: FUN (update notifier - frissítés jelző).
      • +
    • 4068 változtatás, többek között 251 új és 1729 frissített csomag, 416 lezárt hibajegy.
      • +
    + Bővebb információért tekintse meg a Frugalware 0.8 (Kalgan) Változások Listáját.
    + Letöltés i686-ra:
    + livecd, + netinstall, + cd1, + cd2, + cd3, + cd4, + cd5, + cd6, + cd7, + cd8, + cd9, + cd10, + cd11, + cd12, + cd13, + cd14, + dvd1, + dvd2, + tftp, + usb, + chroot tarball +
    + Letöltés x86_64-re:
    + netinstall, + cd1, + cd2, + cd3, + cd4, + cd5, + cd6, + cd7, + cd8, + cd9, + cd10, + cd11, + cd12, + dvd1, + dvd2, + tftp, + usb, + chroot tarball +
    + Megjegyzés: Kattintson ide, hogy eldönthesse, melyik telepítő médiára van szüksége.
    + SHA1SUMok: + 
    +86a7629a794fbb799b412f1da6f43b119c79138a  frugalware-0.8-i686-cd1.iso
+5de9f070fd8e940853e58063112bb9576322a3e2  frugalware-0.8-i686-cd2.iso
+1409dcf8f7e81664f4a3a84d607898c06bcbfb1c  frugalware-0.8-i686-cd3.iso
+a705f4662f3d7931e47dcb88f8af6574fa39ae3e  frugalware-0.8-i686-cd4.iso
+d612aa3851b5c4f382e0a0dfb5cbbc0d27230ce3  frugalware-0.8-i686-cd5.iso
+a473a3338220d22d65249c391ba30161d4e2c50a  frugalware-0.8-i686-cd6.iso
+588349db788e39541c663d5332626118fd3232ea  frugalware-0.8-i686-cd7.iso
+84a6526bebb5de2729897fcc2823386ca6f3673e  frugalware-0.8-i686-cd8.iso
+c7d66707fcbef326193a6e427862961b3bb8ec56  frugalware-0.8-i686-cd9.iso
+716af41f46cc0d4ffc05c00e206a265438bddab3  frugalware-0.8-i686-cd10.iso
+dc9721be7a6dcca936d65c2bda749684fd6d3d4b  frugalware-0.8-i686-cd11.iso
+d7ef389858311e4cbb5db07236e4663f4e77bf07  frugalware-0.8-i686-cd12.iso
+da90575c20185d608ab051e6c6b9fb583f8ff303  frugalware-0.8-i686-cd13.iso
+a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
+2925f86d9c1c6e6e63e6533f0673de4fea09d437  frugalware-0.8-i686-dvd1.iso
+9e09729d9a4c93c09cece38e2679163c11c57a45  frugalware-0.8-i686-dvd2.iso
+b1c645170fdbf6e57b746f4b6185687a84784a0f  frugalware-0.8-i686-net.iso
+c08a269260babaf993bb2e3a5c06f3bd6de6ed5a  frugalware-0.8-x86_64-cd1.iso
+9a24c1e82782cd8e7190d86faba78bf9a0c2ad07  frugalware-0.8-x86_64-cd2.iso
+5fe53403702bb672898bb495629751d7d9714301  frugalware-0.8-x86_64-cd3.iso
+bda7d57f4d2bef9601a4705ec2cc55f0101d451b  frugalware-0.8-x86_64-cd4.iso
+de1e545c56a7982827a950d8a14a9825467cf4ea  frugalware-0.8-x86_64-cd5.iso
+bf075fe9c826062091190e6e98cc1be531906db3  frugalware-0.8-x86_64-cd6.iso
+b1e36d88804acb7a0f8b76f8f2d040bf7b950eaf  frugalware-0.8-x86_64-cd7.iso
+c9de8aec4bc1e266ebdc9d12cc4c7c943ee3c754  frugalware-0.8-x86_64-cd8.iso
+d9977d7358ec0f9a3021541453d0afaa16b031e2  frugalware-0.8-x86_64-cd9.iso
+987f5281eca7c1b2418a300378506b364e986b3f  frugalware-0.8-x86_64-cd10.iso
+ca99396c8a720f9537c55169716382a38a39d4ef  frugalware-0.8-x86_64-cd11.iso
+63033736c6886eff1240fe5efc5813a133133c6c  frugalware-0.8-x86_64-cd12.iso
+f9be2f77dbaeb1edf28cb4f951b5a2306b5a9e9f  frugalware-0.8-x86_64-dvd1.iso
+c5d4c23bc4c5ececa2157e41a855abd375819bdf  frugalware-0.8-x86_64-dvd2.iso
+6c2aee54190fea645dde4f2be1e0d04dc81aff74  frugalware-0.8-x86_64-net.iso
+ef68c4d3353ff104ad59725743e9f11b63703323  fwlive-0.8-i686-full.iso
+34dd50fc34315d73f7289ab887b23328d5950f04  frugalware-0.8-i686-tftp.img.gz
+fb2079de1627ca0e65a323005e0644b88fed6d03  frugalware-0.8-i686-usb.tar.gz
+8d82cdc2f15bf3f6c6c7b3bb89b5ca284754bee6  frugalware-0.8-x86_64-tftp.img.gz
+299d3473073399c3237ab87cad0ef1fa433e4717  frugalware-0.8-x86_64-usb.tar.gz
+
    + Ha a korábbi stabil kiadásunkról (Sayshell) frissít, kérjük olvassa el a dokumentáció frissítésről szóló részét.
    + ]]> +     +     + 88 Megjelent a Frugalware 0.8rc2 (Kalgan) Sun Feb 17 12:04:23 CET 2008 From iron at frugalware.org Mon Mar 10 16:33:51 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Mar 10 16:33:52 2008 Subject: [Frugalware-git] homepage-ng: 0.8 .hu ann draft fix #1 Message-ID: <20080310153351.40EC711904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=72059cbd5476d472e18b12072e1f363bf1212ff7 commit 72059cbd5476d472e18b12072e1f363bf1212ff7 Author: Krisztian VASAS Date: Mon Mar 10 16:33:47 2008 +0100 0.8 .hu ann draft fix #1 diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml index 8abdb3b..4711d2e 100644 --- a/frugalware/xml/news_hu.xml +++ b/frugalware/xml/news_hu.xml @@ -18,7 +18,7 @@ 91 - Megjelent a Frugalware 0.8 (Kalgan) i686-ra s x86_64-re + Megjelent a Frugalware 0.8 (Kalgan) i686-ra és x86_64-re Mon Mar 11 07:26:44 CET 2008 IroNiQ 1 From iron at frugalware.org Mon Mar 10 16:34:36 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Mar 10 16:34:38 2008 Subject: [Frugalware-git] homepage-ng: 0.8 .hu ann draft fix #2 Message-ID: <20080310153436.C639311904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=408e2c460d3cad851431323a58e45836bec807f9 commit 408e2c460d3cad851431323a58e45836bec807f9 Author: Krisztian VASAS Date: Mon Mar 10 16:34:32 2008 +0100 0.8 .hu ann draft fix #2 diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml index 4711d2e..03dfff0 100644 --- a/frugalware/xml/news_hu.xml +++ b/frugalware/xml/news_hu.xml @@ -18,7 +18,7 @@ 91 - Megjelent a Frugalware 0.8 (Kalgan) i686-ra és x86_64-re + Megjelent a Frugalware 0.8 (Kalgan) i686-ra, valamint x86_64-re Mon Mar 11 07:26:44 CET 2008 IroNiQ 1 From crazy at frugalware.org Mon Mar 10 16:38:18 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:38:20 2008 Subject: [Frugalware-git] gcc43: net-tools-1.60-25-i686 Message-ID: <20080310153818.542A911904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=dc03b143848e282a69d3a8fd8ba9592d3f109c37 commit dc03b143848e282a69d3a8fd8ba9592d3f109c37 Author: crazy Date: Mon Mar 10 16:37:04 2008 +0100 net-tools-1.60-25-i686 * rebuild * we need to touch both config.* files * after patching , if not it will live ask you about options * during building and this is not what we want diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index af44ed5..53fa256 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,10 +3,10 @@ pkgname=net-tools pkgver=1.60 -pkgrel=24 +pkgrel=25 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/" -depends=('mktemp' 'chkconfig') +depends=('mktemp>=1.5-2' 'chkconfig>=1.3.30c') groups=('base' 'chroot-core') conflicts=('hotplug') archs=('i686' 'x86_64' 'ppc') @@ -32,6 +32,7 @@ build() { unset MAKEFLAGS Fpatchall + touch config.* || Fdie Fsed '^\(COPTS = .*\) -O2 \(.*\)' "\1 $CFLAGS \2" Makefile Fmake make BASEDIR=$Fdestdir update From iron at frugalware.org Mon Mar 10 16:41:55 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Mar 10 16:41:57 2008 Subject: [Frugalware-git] homepage-ng: fwng: added czech flag Message-ID: <20080310154155.E3AE911904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a725ae46a5fb6c72a569ee85f6540bd9c482af3e commit a725ae46a5fb6c72a569ee85f6540bd9c482af3e Author: Krisztian VASAS Date: Mon Mar 10 16:41:51 2008 +0100 fwng: added czech flag diff --git a/frugalware/config.inc.php b/frugalware/config.inc.php index dabbe1a..2559076 100644 --- a/frugalware/config.inc.php +++ b/frugalware/config.inc.php @@ -100,6 +100,8 @@ $langcontent = '
    ' . gettext( 'Change language' ) . ' | ' . gettext( 'Change language' ) . ' + | + ' . gettext( 'Change language' ) . '
    '; /* | ' . gettext('Change language') . ' | ' . gettext('Change language') . ''; diff --git a/frugalware/images/czech.gif b/frugalware/images/czech.gif new file mode 100644 index 0000000..95f7380 Binary files /dev/null and b/frugalware/images/czech.gif differ From crazy at frugalware.org Mon Mar 10 16:42:29 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:42:30 2008 Subject: [Frugalware-git] gcc43: bison-2.3-2-i686 Message-ID: <20080310154229.4327511904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3d6c44fda980f29ec1e644749c04843240de3dbc commit 3d6c44fda980f29ec1e644749c04843240de3dbc Author: crazy Date: Mon Mar 10 16:42:01 2008 +0100 bison-2.3-2-i686 * rebuild diff --git a/source/devel/bison/FrugalBuild b/source/devel/bison/FrugalBuild index a0aca6d..aa9495d 100644 --- a/source/devel/bison/FrugalBuild +++ b/source/devel/bison/FrugalBuild @@ -3,10 +3,10 @@ pkgname=bison pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A general-purpose parser generator." url="http://www.gnu.org/software/bison/bison.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Mon Mar 10 16:46:57 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:46:59 2008 Subject: [Frugalware-git] gcc43: shadow-4.1.0-4-i686 Message-ID: <20080310154657.E594911904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1f942d173efb08042b6f928dcef74bd1f65a051a commit 1f942d173efb08042b6f928dcef74bd1f65a051a Author: crazy Date: Mon Mar 10 16:46:12 2008 +0100 shadow-4.1.0-4-i686 * rebuild diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index 76c2321..503e9fc 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -3,13 +3,13 @@ pkgname=shadow pkgver=4.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Shadow password file utilities" url="http://pkg-shadow.alioth.debian.org/" pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow" backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits) -depends=('glibc') -rodepends=('frugalware') # for /etc/issue +depends=('glibc>=2.7-3') +rodepends=('frugalware>=0.8-2') # for /etc/issue groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $pkgurl |Flasttar" From crazy at frugalware.org Mon Mar 10 16:52:33 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:52:34 2008 Subject: [Frugalware-git] gcc43: texinfo-4.11-2-i686 Message-ID: <20080310155233.6114211904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e609d27daccb3158596d98b8a81cfc8fd3f91333 commit e609d27daccb3158596d98b8a81cfc8fd3f91333 Author: crazy Date: Mon Mar 10 16:51:57 2008 +0100 texinfo-4.11-2-i686 * rebuild diff --git a/source/base/texinfo/FrugalBuild b/source/base/texinfo/FrugalBuild index 1c9c6b0..386dd1a 100644 --- a/source/base/texinfo/FrugalBuild +++ b/source/base/texinfo/FrugalBuild @@ -4,12 +4,12 @@ pkgname=texinfo pkgver=4.11 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU info program and utilities" url="http://www.gnu.org/software/texinfo/" -depends=('ncurses' 'net-tools' 'grep' 'sed' 'udev' 'gawk') -rodepends=('shadow') -makedepends=('bison') +depends=('ncurses>=5.6-3' 'net-tools>=1.60-25' 'grep>=2.5.3-3' 'sed>=4.1.5-2' 'udev>=118-7' 'gawk>=3.1.6-2') +rodepends=('shadow>=4.1.0-4') +makedepends=('bison>=2.3-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64') options=('force') From crazy at frugalware.org Mon Mar 10 16:56:56 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:56:57 2008 Subject: [Frugalware-git] gcc43: e2fsprogs-1.40.6-2-i686 Message-ID: <20080310155656.24EB111904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=f62686e2483c1df95b18599307d7343d8970aabb commit f62686e2483c1df95b18599307d7343d8970aabb Author: crazy Date: Mon Mar 10 16:56:23 2008 +0100 e2fsprogs-1.40.6-2-i686 * rebuild diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 2803b37..cd3701e 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -3,10 +3,10 @@ pkgname=e2fsprogs pkgver=1.40.6 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" url="http://e2fsprogs.sourceforge.net/" -depends=('glibc') +depends=('glibc>=2.7-3') rodepends=('coreutils') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') From crazy at frugalware.org Mon Mar 10 16:59:30 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 16:59:31 2008 Subject: [Frugalware-git] gcc43: zlib-1.2.3-5-i686 Message-ID: <20080310155930.B872211904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=67df475f394251fd1bb1b365a051404e183050a3 commit 67df475f394251fd1bb1b365a051404e183050a3 Author: crazy Date: Mon Mar 10 16:59:09 2008 +0100 zlib-1.2.3-5-i686 * rebuild diff --git a/source/base/zlib/FrugalBuild b/source/base/zlib/FrugalBuild index 8d8014e..28d98b5 100644 --- a/source/base/zlib/FrugalBuild +++ b/source/base/zlib/FrugalBuild @@ -4,10 +4,10 @@ pkgname=zlib pkgver=1.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="A compression/decompression library" url="http://www.zlib.net/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.zlib.net/ | grep -m 1 'zlib source code' | cut -d ' ' -f 16 | tr -d ," From crazy at frugalware.org Mon Mar 10 17:07:42 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:07:45 2008 Subject: [Frugalware-git] gcc43: util-linux-ng-2.13.1-2-i686 Message-ID: <20080310160742.CBD2811904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=97c062352cb6700959e53d817c8cfea1b18313b0 commit 97c062352cb6700959e53d817c8cfea1b18313b0 Author: crazy Date: Mon Mar 10 17:06:54 2008 +0100 util-linux-ng-2.13.1-2-i686 * rebuild diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index 6fa003f..5c66e78 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -3,11 +3,11 @@ pkgname=util-linux-ng pkgver=2.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') -depends=('bash' 'ncurses' 'zlib' 'e2fsprogs' 'texinfo') +depends=('bash' 'ncurses>=5.6-3' 'zlib>=1.2.3-5' 'e2fsprogs>=1.40.6-2' 'texinfo>=4.11-2') replaces=('util-linux' 'linux32') conflicts=('util-linux' 'linux32') provides=('util-linux' 'linux32') From crazy at frugalware.org Mon Mar 10 17:11:35 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:11:37 2008 Subject: [Frugalware-git] gcc43: tzdata-2008a-1-i686 Message-ID: <20080310161135.2D04011904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b19243aa2918f5c0aee7aa91233e8c44fe757315 commit b19243aa2918f5c0aee7aa91233e8c44fe757315 Author: crazy Date: Mon Mar 10 17:11:09 2008 +0100 tzdata-2008a-1-i686 * Version bump diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild index 3d4c4a4..999c621 100644 --- a/source/base/tzdata/FrugalBuild +++ b/source/base/tzdata/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: crazy pkgname=tzdata -pkgver=2007k +pkgver=2008a pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" url="http://www.twinsun.com/tz/tz-link.htm" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64') up2date="lynx -dump -nolist ftp://elsie.nci.nih.gov/pub/|grep tzdata|sed 's/.*ta\(.*\).t.*/\1/'" source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${pkgver}.tar.gz \ Makefile.patch) -sha1sums=('2ff7cf783186677689633a794481da2019b65507' \ - 'd64928c84555a67be2eace926c066911b35b0d39' \ +sha1sums=('aa68bc0bc1aba465692c8acefcf86641f240a802' \ + '0a43a9b96b48421657f0e09534a23b664fc58d18' \ 'e8890681333949977ccff0b7a429ad25ed78dbcf') build() From crazy at frugalware.org Mon Mar 10 17:15:36 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:15:38 2008 Subject: [Frugalware-git] gcc43: lha-1.14i_ac20050924p1-2-i686 Message-ID: <20080310161536.E262711904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=03e6a7d9bf788cc03bab04935f4ce9a6783ff8ae commit 03e6a7d9bf788cc03bab04935f4ce9a6783ff8ae Author: crazy Date: Mon Mar 10 17:15:18 2008 +0100 lha-1.14i_ac20050924p1-2-i686 * rebuild diff --git a/source/base/lha/FrugalBuild b/source/base/lha/FrugalBuild index 2164f26..2a21481 100644 --- a/source/base/lha/FrugalBuild +++ b/source/base/lha/FrugalBuild @@ -4,16 +4,14 @@ pkgname=lha pkgver=1.14i_ac20050924p1 rel_id=22231 -pkgrel=1 +pkgrel=2 pkgdesc="An archiving and compression utility for LHarc format archives." url="http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="elinks -dump http://sourceforge.jp/projects/lha/files/|grep tar.gz$|sed 's/.*lha-\(.*\)\.t.*/\1/;s/-/_/;q'" source=(http://osdn.dl.sourceforge.jp/$pkgname/$rel_id/$pkgname-${pkgver/_/-}.tar.gz) -# this can be removed after Frugalware 0.6 -options=('force') _F_cd_path="$pkgname-${pkgver/_/-}" # optimization OK sha1sums=('2491c8b584c21759f1d3819f57fa0e1cbc235092') From crazy at frugalware.org Mon Mar 10 17:17:43 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:17:44 2008 Subject: [Frugalware-git] gcc43: isapnptools-1.27-2-i686 Message-ID: <20080310161743.11E5A11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b63fac4e3fdbc1c860605a5f2badc8359f4f5fea commit b63fac4e3fdbc1c860605a5f2badc8359f4f5fea Author: crazy Date: Mon Mar 10 17:17:24 2008 +0100 isapnptools-1.27-2-i686 * rebuild diff --git a/source/base/isapnptools/FrugalBuild b/source/base/isapnptools/FrugalBuild index 80b4df5..3b03a85 100644 --- a/source/base/isapnptools/FrugalBuild +++ b/source/base/isapnptools/FrugalBuild @@ -3,10 +3,10 @@ pkgname=isapnptools pkgver=1.27 -pkgrel=1 +pkgrel=2 pkgdesc="allow ISA Plug-And-Play devices to be configured on a Linux machine" url="http://www.roestock.demon.co.uk/isapnptools/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep 'latest released'|sed 's/.*s \(.*\), .*/\1/'" From crazy at frugalware.org Mon Mar 10 17:20:08 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:20:10 2008 Subject: [Frugalware-git] gcc43: module-init-tools-3.4-6-i686 Message-ID: <20080310162008.DABF411904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=da7a0273f60c30d6df5846008755c239d1de7560 commit da7a0273f60c30d6df5846008755c239d1de7560 Author: crazy Date: Mon Mar 10 17:19:43 2008 +0100 module-init-tools-3.4-6-i686 * rebuild diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 647e9e9..a2d4b53 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,11 +3,11 @@ pkgname=module-init-tools pkgver=3.4 -pkgrel=5 +pkgrel=6 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" -depends=('glibc') -makedepends=('zlib' 'docbook-utils' 'docbook-sgml-dtd-4.1' 'perl-sgmlspm') +depends=('glibc>=2.7-3') +makedepends=('zlib>=1.2.3-5' 'docbook-utils' 'docbook-sgml-dtd-4.1' 'perl-sgmlspm') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') From crazy at frugalware.org Mon Mar 10 17:30:02 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:30:06 2008 Subject: [Frugalware-git] gcc43: libgpg-error-1.6-2-i686 Message-ID: <20080310163002.7236B11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1b0e7cca1529d09be48f78e0afcc2ed18351d89a commit 1b0e7cca1529d09be48f78e0afcc2ed18351d89a Author: crazy Date: Mon Mar 10 17:29:42 2008 +0100 libgpg-error-1.6-2-i686 * rebuild diff --git a/source/lib/libgpg-error/FrugalBuild b/source/lib/libgpg-error/FrugalBuild index 3e6c4dd..82601c4 100644 --- a/source/lib/libgpg-error/FrugalBuild +++ b/source/lib/libgpg-error/FrugalBuild @@ -4,12 +4,12 @@ pkgname=libgpg-error pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" groups=('lib') archs=('i686' 'x86_64') -depends=('glibc') +depends=('glibc>=2.7-3') up2date="lynx -dump http://www.gnupg.org/\(en\)/download/index.html |grep libgpg-error.*tar |sed -n -e 's/.*r-\(.*\)\.t.*/\1/;s/-/_/;1 p'" source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$pkgver.tar.bz2) sha1sums=('2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3') From crazy at frugalware.org Mon Mar 10 17:34:58 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:34:59 2008 Subject: [Frugalware-git] gcc43: libgcrypt-1.4.0-2-i686 Message-ID: <20080310163458.ED3D811904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e6a4d9fd073de4041e6af5fb8245cc00ed855139 commit e6a4d9fd073de4041e6af5fb8245cc00ed855139 Author: crazy Date: Mon Mar 10 17:34:28 2008 +0100 libgcrypt-1.4.0-2-i686 * rebuild diff --git a/source/lib/libgcrypt/FrugalBuild b/source/lib/libgcrypt/FrugalBuild index a69cf16..aa6e547 100644 --- a/source/lib/libgcrypt/FrugalBuild +++ b/source/lib/libgcrypt/FrugalBuild @@ -4,12 +4,12 @@ pkgname=libgcrypt pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Libgcrypt is a general purpose cryptographic library based on the code from GnuPG." url="http://www.gnu.org/directory/security/libgcrypt.html" groups=('lib') archs=('i686' 'x86_64') -depends=('libgpg-error' 'texinfo') +depends=('libgpg-error>=1.6-2' 'texinfo>=4.11-2') Finclude texinfo up2date="lynx -dump ftp://ftp.gnupg.org/gcrypt/$pkgname |Flasttar" source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) From crazy at frugalware.org Mon Mar 10 17:50:17 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:50:19 2008 Subject: [Frugalware-git] gcc43: glib2-2.14.6-2-i686 Message-ID: <20080310165017.A0F7A11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=cbdb3cc4695260ee280a5c6609068e6657b8d902 commit cbdb3cc4695260ee280a5c6609068e6657b8d902 Author: crazy Date: Mon Mar 10 17:48:47 2008 +0100 glib2-2.14.6-2-i686 * rebuild * removed CFLAGS hack we do so by default now diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index d1f18b3..e48e893 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -3,11 +3,11 @@ pkgname=glib2 pkgver=2.14.6 -pkgrel=1 +pkgrel=2 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" -depends=('glibc') -makedepends=('gtk-doc>=1.8-2') +depends=('glibc>=2.7-3') +makedepends=('gtk-doc>=1.8-2' 'libgcrypt>=1.4.0-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64') options=('scriptlet') @@ -22,8 +22,6 @@ _F_cd_path="glib-$pkgver" sha1sums=('f2e2a5323357516ccb813d9e7f3921ef1e490079' \ '8aa98ec8c7a8aad90d27e6c81a7fee1c686914fe' \ 'a78a870e933a317148e11bffdf5d19c8fe4ac2bd') -# Don't touch that -export CFLAGS="$CFLAGS -fno-strict-aliasing" subpkgs=("$pkgname-docs") subdescs=("Glib2 Documentation") From crazy at frugalware.org Mon Mar 10 17:57:42 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 17:57:44 2008 Subject: [Frugalware-git] gcc43: parted-1.8.8-2-i686 Message-ID: <20080310165742.B397B11904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e926da3211b0181a73b8a7b2debda77a102cc2db commit e926da3211b0181a73b8a7b2debda77a102cc2db Author: crazy Date: Mon Mar 10 17:57:09 2008 +0100 parted-1.8.8-2-i686 * rebuild diff --git a/source/base/parted/FrugalBuild b/source/base/parted/FrugalBuild index 0fea558..631a161 100644 --- a/source/base/parted/FrugalBuild +++ b/source/base/parted/FrugalBuild @@ -3,11 +3,11 @@ pkgname=parted pkgver=1.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" url="http://www.gnu.org/software/parted/parted.html" -depends=('e2fsprogs' 'readline') -rodepends=('gawk' 'gzip' 'shadow' 'texinfo') +depends=('e2fsprogs>=1.40.6-2' 'readline>=5.2-2') +rodepends=('gawk>=3.1.6-2' 'gzip>=1.3.12-3' 'shadow>=4.1.0-4' 'texinfo>=4.11-2') groups=('base') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Mon Mar 10 18:01:29 2008 From: crazy at frugalware.org (crazy) Date: Mon Mar 10 18:01:30 2008 Subject: [Frugalware-git] gcc43: libarchive-2.4.8-2-i686 Message-ID: <20080310170129.3CC2911904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3ab206d238466611e0b762a77763849c3302713e commit 3ab206d238466611e0b762a77763849c3302713e Author: crazy Date: Mon Mar 10 18:01:07 2008 +0100 libarchive-2.4.8-2-i686 * rebuild diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild index 155cc5a..ca156b7 100644 --- a/source/base/libarchive/FrugalBuild +++ b/source/base/libarchive/FrugalBuild @@ -3,12 +3,12 @@ pkgname=libarchive pkgver=2.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="Library to create and read several different archive formats" groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') url="http://people.freebsd.org/~kientzle/libarchive/" -depends=('bzip2' 'zlib') +depends=('bzip2>=1.0.4-2' 'zlib>=1.2.3-5') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) sha1sums=('129b07ee35e3eede8581904272efe6950a99eaaa') From vmiklos at frugalware.org Mon Mar 10 18:48:36 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 10 18:48:38 2008 Subject: [Frugalware-git] homepage-ng: typo: sayshell -> kalgan Message-ID: <20080310174836.E4E3A1190502@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=865978403553627a6f0357feb4fa3d7e1936a43c commit 865978403553627a6f0357feb4fa3d7e1936a43c Author: Miklos Vajna Date: Mon Mar 10 18:48:27 2008 +0100 typo: sayshell -> kalgan diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 8978224..fec162e 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -33,7 +33,7 @@
  • New graphical tool: FUN (update notifier).
  • 4068 changes, including 251 new packages, 1729 updated packages and 416 closed tasks.
- Please refer to the Frugalware Sayshell ChangeLog for more information.
+ Please refer to the Frugalware Kalgan ChangeLog for more information.
Download for i686:
livecd, netinstall, From vmiklos at frugalware.org Mon Mar 10 18:48:36 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Mar 10 18:48:40 2008 Subject: [Frugalware-git] homepage-ng: cosmetics: reorder sha1sums Message-ID: <20080310174836.C481311904CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=127e973ebd23c6bbf79dbada931e7b8b31b8b9dd commit 127e973ebd23c6bbf79dbada931e7b8b31b8b9dd Author: Miklos Vajna Date: Mon Mar 10 18:47:50 2008 +0100 cosmetics: reorder sha1sums diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 72f4cc5..8978224 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -80,11 +80,6 @@ NOTE: Click here to read more about what media you need for the installation.
SHA1SUMs: 
-716af41f46cc0d4ffc05c00e206a265438bddab3  frugalware-0.8-i686-cd10.iso
-dc9721be7a6dcca936d65c2bda749684fd6d3d4b  frugalware-0.8-i686-cd11.iso
-d7ef389858311e4cbb5db07236e4663f4e77bf07  frugalware-0.8-i686-cd12.iso
-da90575c20185d608ab051e6c6b9fb583f8ff303  frugalware-0.8-i686-cd13.iso
-a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
86a7629a794fbb799b412f1da6f43b119c79138a  frugalware-0.8-i686-cd1.iso
5de9f070fd8e940853e58063112bb9576322a3e2  frugalware-0.8-i686-cd2.iso
1409dcf8f7e81664f4a3a84d607898c06bcbfb1c  frugalware-0.8-i686-cd3.iso
@@ -94,12 +89,14 @@ a473a3338220d22d65249c391ba30161d4e2c50a  frugalware-0.8-i686-cd6.iso
588349db788e39541c663d5332626118fd3232ea  frugalware-0.8-i686-cd7.iso
84a6526bebb5de2729897fcc2823386ca6f3673e  frugalware-0.8-i686-cd8.iso
c7d66707fcbef326193a6e427862961b3bb8ec56  frugalware-0.8-i686-cd9.iso
+716af41f46cc0d4ffc05c00e206a265438bddab3  frugalware-0.8-i686-cd10.iso
+dc9721be7a6dcca936d65c2bda749684fd6d3d4b  frugalware-0.8-i686-cd11.iso
+d7ef389858311e4cbb5db07236e4663f4e77bf07  frugalware-0.8-i686-cd12.iso
+da90575c20185d608ab051e6c6b9fb583f8ff303  frugalware-0.8-i686-cd13.iso
+a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
2925f86d9c1c6e6e63e6533f0673de4fea09d437  frugalware-0.8-i686-dvd1.iso
9e09729d9a4c93c09cece38e2679163c11c57a45  frugalware-0.8-i686-dvd2.iso
b1c645170fdbf6e57b746f4b6185687a84784a0f  frugalware-0.8-i686-net.iso
-987f5281eca7c1b2418a300378506b364e986b3f  frugalware-0.8-x86_64-cd10.iso
-ca99396c8a720f9537c55169716382a38a39d4ef  frugalware-0.8-x86_64-cd11.iso
-63033736c6886eff1240fe5efc5813a133133c6c  frugalware-0.8-x86_64-cd12.iso
c08a269260babaf993bb2e3a5c06f3bd6de6ed5a  frugalware-0.8-x86_64-cd1.iso
9a24c1e82782cd8e7190d86faba78bf9a0c2ad07  frugalware-0.8-x86_64-cd2.iso
5fe53403702bb672898bb495629751d7d9714301  frugalware-0.8-x86_64-cd3.iso
@@ -109,6 +106,9 @@ bf075fe9c826062091190e6e98cc1be531906db3  frugalware-0.8-x86_64-cd6.iso
b1e36d88804acb7a0f8b76f8f2d040bf7b950eaf  frugalware-0.8-x86_64-cd7.iso
c9de8aec4bc1e266ebdc9d12cc4c7c943ee3c754  frugalware-0.8-x86_64-cd8.iso
d9977d7358ec0f9a3021541453d0afaa16b031e2  frugalware-0.8-x86_64-cd9.iso
+987f5281eca7c1b2418a300378506b364e986b3f  frugalware-0.8-x86_64-cd10.iso
+ca99396c8a720f9537c55169716382a38a39d4ef  frugalware-0.8-x86_64-cd11.iso
+63033736c6886eff1240fe5efc5813a133133c6c  frugalware-0.8-x86_64-cd12.iso
f9be2f77dbaeb1edf28cb4f951b5a2306b5a9e9f  frugalware-0.8-x86_64-dvd1.iso
c5d4c23bc4c5ececa2157e41a855abd375819bdf  frugalware-0.8-x86_64-dvd2.iso
6c2aee54190fea645dde4f2be1e0d04dc81aff74  frugalware-0.8-x86_64-net.iso
From crazy at frugalware.org  Mon Mar 10 19:38:18 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 19:38:20 2008
Subject: [Frugalware-git] gcc43: ecj-3.3.2-1-i686
Message-ID: <20080310183818.3234411904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a1769d3ba855083b8dd5bd569f382697d48a018b

commit a1769d3ba855083b8dd5bd569f382697d48a018b
Author: crazy 
Date:   Mon Mar 10 19:35:52 2008 +0100

ecj-3.3.2-1-i686
* Version bump ( round 1 )
* added an patch from fedora to fix problems with gcj4.3

diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild
index 7fb97c0..d90fbbb 100644
--- a/source/devel-extra/ecj/FrugalBuild
+++ b/source/devel-extra/ecj/FrugalBuild
@@ -2,22 +2,25 @@
# Maintainer: VMiklos 

pkgname=ecj
-pkgver=3.3.1.1
-date=200710231652
+pkgver=3.3.2
+date=200802211800
+gccver=4.3.0
pkgrel=1
pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project."
url="http://www.eclipse.org/"
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'"
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip)
-sha1sums=('d29e04bca326e3c6551604de17a492239160d1cc')
+source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip ecj-gcj.patch)
+sha1sums=('c9229f01f991777829279d9907069e81857516ca' \
+          '51bfaa1069ae5d0a81dee641fd8cfa093365d451')
Finclude java
-makedepends=('gcc-gcj')
+makedepends=("gcc-gcj")

build()
{
# this will be a separete package since these must be compiled with ecj
+	patch -p1  1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
++		this.options.put(
++				CompilerOptions.OPTION_LineNumberAttribute,
++				level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
++		this.options.put(
++				CompilerOptions.OPTION_SourceFileAttribute,
++				CompilerOptions.GENERATE);
++	}
++
++	private void readFileList(String file, ArrayList result) {
++		try {
++			BufferedReader b = new BufferedReader(new FileReader(file));
++			String line;
++			while ((line = b.readLine()) != null) {
++				if (line.endsWith(SUFFIX_STRING_java))
++					result.add(line);
++			}
++			b.close();
++		} catch (IOException err) {
++			fail(err);
++		}
++	}
++
++	private void readAllFileListFiles(ArrayList fileList, ArrayList result) {
++		Iterator it = fileList.iterator();
++		while (it.hasNext()) {
++			readFileList((String) it.next(), result);
++		}
++	}
++
++	private void handleWall(boolean enable) throws InvalidInputException {
++		// A somewhat arbitrary list.  We use the GCC names
++		// here, and the local handleWarningToken translates
++		// for us.
++		handleWarningToken("constructor-name", enable, false);
++		handleWarningToken("pkg-default-method", enable, false);
++		handleWarningToken("masked-catch-block", enable, false);
++		handleWarningToken("all-deprecation", enable, false);
++		handleWarningToken("unused-local", enable, false);
++		handleWarningToken("unused-label", enable, false);
++		handleWarningToken("static-receiver", enable, false);
++		handleWarningToken("indirect-static", enable, false);
++		handleWarningToken("no-effect-assign", enable, false);
++		handleWarningToken("char-concat", enable, false);
++		handleWarningToken("useless-type-check", enable, false);
++		handleWarningToken("final-bound", enable, false);
++		handleWarningToken("assert-identifier", enable, false);
++		handleWarningToken("enum-identifier", enable, false);
++		handleWarningToken("finally", enable, false);
++		handleWarningToken("varargs-cast", enable, false);
++		handleWarningToken("unused", enable, false);
++		handleWarningToken("forbidden", enable, false);
++	}
++
++	public void configure(String[] argv) throws InvalidInputException {
++		if ((argv == null) || (argv.length == 0)) {
++			// This is a "can't happen".
++			System.exit(1);
++		}
++
++		ArrayList files = new ArrayList();
++		ArrayList otherFiles = new ArrayList();
++		String classpath = null;
++		boolean haveFileList = false;
++		boolean inhibitAllWarnings = false;
++		boolean treatWarningsAsErrors = false;
++
++		for (int i = 0; i < argv.length; ++i) {
++			String currentArg = argv[i];
++
++			if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$
++				// Simply accept the last one.
++				String encoding = getArgument(currentArg);
++				try { // ensure encoding is supported
++					new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
++				} catch (UnsupportedEncodingException e) {
++					throw new InvalidInputException(
++						this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
++				}
++				this.options.put(CompilerOptions.OPTION_Encoding, encoding);
++			} else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
++				String arg = getArgument(currentArg);
++				if (this.destinationPath != null) {
++					StringBuffer errorMessage = new StringBuffer();
++					errorMessage.append("-d"); //$NON-NLS-1$
++					errorMessage.append(' ');
++					errorMessage.append(arg);
++					throw new InvalidInputException(
++						this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
++				}
++				this.destinationPath = arg;
++				// this.generatePackagesStructure = true;
++			} else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
++				classpath = getArgument(currentArg);
++			} else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
++				++i;
++				if (i >= argv.length)
++					throw new InvalidInputException(this.bind("gcc.zipArg")); //$NON-NLS-1$
++				this.zipDestination = argv[i];
++			} else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
++				++i;
++				if (i >= argv.length)
++					throw new InvalidInputException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$
++				this.zipDependencyDestination = argv[i];
++			} else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
++				if (currentArg.equals("-g0")) { //$NON-NLS-1$
++					setDebugLevel(0);
++				} else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
++						|| currentArg.equals("-g")) { //$NON-NLS-1$
++					setDebugLevel(2);
++				} else {
++					// Handle -g1 but also things like -gstabs.
++					setDebugLevel(1);
++				}
++			} else if (currentArg.equals("-Werror")) { //$NON-NLS-1$
++				treatWarningsAsErrors = true;
++			} else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$
++				treatWarningsAsErrors = false;
++			} else if (currentArg.equals("-Wall")) { //$NON-NLS-1$
++				handleWall(true);
++			} else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$
++				handleWall(false);
++			} else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
++				handleWarningToken(currentArg.substring(5), false, false);
++			} else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
++				handleWarningToken(currentArg.substring(2), true, false);
++			} else if (currentArg.equals("-w")) { //$NON-NLS-1$
++				inhibitAllWarnings = true;
++			} else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
++				// Ignore.
++			} else if (currentArg.equals("-v")) { //$NON-NLS-1$
++				this.verbose = true;
++			} else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$
++				this.syntaxOnly = true;
++			} else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$
++				currentArg = getArgument(currentArg);
++				if (currentArg.equals("1.3")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
++				} else if (currentArg.equals("1.4")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
++				} else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
++				} else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
++				} else {
++					throw new InvalidInputException(this.bind("configure.source", currentArg)); //$NON-NLS-1$
++				}
++			} else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
++				currentArg = getArgument(currentArg);
++				if (currentArg.equals("1.1")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1);
++				} else if (currentArg.equals("1.2")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2);
++				} else if (currentArg.equals("1.3")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
++				} else if (currentArg.equals("1.4")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
++				} else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
++				} else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
++				} else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
++					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
++				} else {
++					throw new InvalidInputException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
++				}
++			} else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
++				haveFileList = true;
++			} else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
++				files.add(currentArg);
++			} else if (currentArg.charAt(0) == '-'){
++				// FIXME: error if not a file?
++			} else {
++				otherFiles.add(currentArg);
++			}
++		}
++
++		// Read the file list file.  We read them all, but really there
++		// will only be one.
++		if (haveFileList)
++			readAllFileListFiles(otherFiles, files);
++
++		this.filenames = (String[]) files.toArray(new String[0]);
++		this.encodings = new String[this.filenames.length];
++		this.destinationPaths = new String[this.filenames.length];
++		for (int i = 0; i < this.filenames.length; ++i)
++			this.destinationPaths[i] = this.destinationPath;
++
++		// Classpath processing.
++		ArrayList result = new ArrayList();
++		if (classpath == null)
++			throw new InvalidInputException(this.bind("gcc.noClasspath")); //$NON-NLS-1$
++		parsePath(result, classpath);
++
++		// We must always create both output files, even if one is not used.
++		// That way we will always pass valid zip file on to jc1.
++		try {
++			getZipOutput();
++			getDependencyOutput();
++		} catch (IOException err) {
++			fail(err);
++		}
++
++		if (inhibitAllWarnings)
++			disableWarnings();
++		if (treatWarningsAsErrors)
++			turnWarningsToErrors();
++
++		this.checkedClasspaths = new FileSystem.Classpath[result.size()];
++		result.toArray(this.checkedClasspaths);
++
++		this.logger.logCommandLineArguments(argv);
++		this.logger.logOptions(this.options);
++		this.logger.logClasspath(this.checkedClasspaths);
++
++		this.repetitions = 1;
++	}
++
++	public boolean compile(String[] argv) {
++		boolean result = super.compile(argv);
++		try {
++			if (zipStream != null) {
++				zipStream.finish();
++				zipStream.close();
++			}
++			if (zipDependencyStream != null) {
++				zipDependencyStream.finish();
++				zipDependencyStream.close();
++			}
++		} catch (IOException err) {
++			fail(err);
++		}
++		return result;
++	}
++
++	public static void main(String[] argv) {
++		boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv);
++		System.exit(result ? 0 : 1);
++	}
++}
+
From vmiklos at frugalware.org  Mon Mar 10 19:50:29 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Mar 10 19:50:31 2008
Subject: [Frugalware-git] frugalware: service: rework for newer chkconfig
Message-ID: <20080310185029.0E72F11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=80c46069c1465994bd7b1b12913297a37b1dc323

commit 80c46069c1465994bd7b1b12913297a37b1dc323
Author: Miklos Vajna 
Date:   Mon Mar 10 19:49:11 2008 +0100

service: rework for newer chkconfig
- from crazy

diff --git a/var/service b/var/service
index 77db200..c15a213 100644
--- a/var/service
+++ b/var/service
@@ -7,46 +7,65 @@
TEXTDOMAIN=service
TEXTDOMAINDIR=/var/lib/frugalware/messages

+
+usage()
+{
+	echo $"Usage: $0 service action"
+        echo
+        echo $"Actions:"
+        echo
+        echo $"start        Start the service."
+        echo
+        echo $"stop         Stop the service."
+        echo
+        echo $"status       Status of the service (if it supports querying so)."
+        echo
+        echo $"restart      Stop and start again the service."
+        echo
+        echo $"add          Adds a new service for management by chkconfig."
+        echo
+        echo $"del          Removes a service from chkconfig management."
+        echo
+        echo $"list         List whether the service is stopped or started in each runlevel."
+        exit 0
+}
+
+if [ "$1" = "" ]; then
+	usage
+fi
+
if [ "$1" = "--version" ]; then
-	echo "service (pacman-tools) 0.2"
+	echo "service (pacman-tools) 0.2.1"
echo
-	echo "Copyright (c) 2003-2007 by Miklos Vajna "
+	echo "Copyright (c) 2003-2008 by Miklos Vajna "
echo "This is free software; see the source for copying conditions.  There is NO"
echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit 0
elif [ "$1" = "--help" ]; then
-	echo $"Usage: $0 service action"
-	echo
-	echo $"Actions:"
-	echo
-	echo $"start        Start the service."
-	echo
-	echo $"stop         Stop the service."
-	echo
-	echo $"status       Status of the service (if it supports querying so)."
-	echo
-	echo $"restart      Stop and start again the service."
-	echo
-	echo $"add          Adds a new service for management by chkconfig."
-	echo
-	echo $"del          Removes a service from chkconfig management."
-	echo
-	echo $"list         List whether the service is stopped or started in each runlevel."
-	exit 0
+	usage
fi
-if [ "$1" = "list" ]; then
-	chkconfig --list --level $2 | grep $2:$3
+
+if [ "$1" = "level" ]; then
+	if [ "$2" != "" ]; then
+		if [ "$3" != "" ]; then
+			## well just support english for now 'on' is not
+			## the same as Ein etc
+			LC_ALL=C; chkconfig --list --level $2 | grep $2:$3
+		else
+			echo $"Usage: $0 level  "
+			exit 1
+		fi
+	else
+		echo $"Usage: $0 level  "
+		exit 1
+	fi
else
service=rc.$1
name=/etc/rc.d/$service
if ! [ -z "$1" ]; then
if ! [ -e $name ]; then
-			# this will print a nice error message
-			chkconfig --list $service
-			exit 1
-		fi
-		if ! chkconfig --list $service >/dev/null 2>&1; then
-			chkconfig --list $service
+			## maybe typo ?
+			usage
exit 1
fi
fi
@@ -55,7 +74,17 @@ else
elif [ "$2" = "del" ]; then
chkconfig --del $service
elif [ "$2" = "list" ]; then
-		chkconfig --list $service
+		chkconfig --list $service >/dev/null 2>&1
+		RET=$?
+		if [ "$RET" = "0" ]; then
+			## we are fine , the file $name
+			## exists and is added  list it
+			chkconfig --list $service
+		else
+			## error , files exists but isn't added
+			echo $"Use $0 $1 add first."
+			exit 1
+		fi
else
$name $2
fi
From crazy at frugalware.org  Mon Mar 10 19:55:51 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 19:55:52 2008
Subject: [Frugalware-git] gcc43: ecj-3.3.2-2-i686
Message-ID: <20080310185551.53C8611904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=6f3921fd692f801e8d931d292a6b18ea26bd340f

commit 6f3921fd692f801e8d931d292a6b18ea26bd340f
Author: crazy 
Date:   Mon Mar 10 19:52:48 2008 +0100

ecj-3.3.2-2-i686
* release bump
* added depends =$gccver on gcj
* added ecj itself as makedepend for this release
* jar -> gjar

diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild
index d90fbbb..bdf475d 100644
--- a/source/devel-extra/ecj/FrugalBuild
+++ b/source/devel-extra/ecj/FrugalBuild
@@ -5,7 +5,7 @@ pkgname=ecj
pkgver=3.3.2
date=200802211800
gccver=4.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project."
url="http://www.eclipse.org/"
groups=('devel-extra')
@@ -15,7 +15,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjs
sha1sums=('c9229f01f991777829279d9907069e81857516ca' \
'51bfaa1069ae5d0a81dee641fd8cfa093365d451')
Finclude java
-makedepends=("gcc-gcj")
+makedepends=("gcc-gcj=$gccver" "$pkgname>=3.3.2")

build()
{
@@ -31,7 +31,7 @@ build()
gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1

find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
-		xargs jar cf eclipse-ecj.jar
+		xargs gjar cf eclipse-ecj.jar
Ffilerel /usr/share/java/eclipse-ecj.jar
Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \
$Fdestdir/usr/share/java/eclipse-ecj.jar
From crazy at frugalware.org  Mon Mar 10 20:04:15 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 20:04:16 2008
Subject: [Frugalware-git] gcc43: ecj-3.3.2-2-i686
Message-ID: <20080310190415.CAC9411904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9186691f08f74ba3313e9913faa5efb77ed1f828

commit 9186691f08f74ba3313e9913faa5efb77ed1f828
Author: crazy 
Date:   Mon Mar 10 20:03:48 2008 +0100

ecj-3.3.2-2-i686
* change the depends on gcj to >=

diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild
index bdf475d..a5561a5 100644
--- a/source/devel-extra/ecj/FrugalBuild
+++ b/source/devel-extra/ecj/FrugalBuild
@@ -15,7 +15,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjs
sha1sums=('c9229f01f991777829279d9907069e81857516ca' \
'51bfaa1069ae5d0a81dee641fd8cfa093365d451')
Finclude java
-makedepends=("gcc-gcj=$gccver" "$pkgname>=3.3.2")
+makedepends=("gcc-gcj>=$gccver" "$pkgname>=3.3.2")

build()
{
From vmiklos at frugalware.org  Mon Mar 10 20:34:13 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Mar 10 20:34:14 2008
Subject: [Frugalware-git] pacman-g2: chost: default to
	${CARCH}-frugalware-linux
Message-ID: <20080310193413.3837D11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4ce05a1dd8f34aaf297743f0627bec6813b961dc

commit 4ce05a1dd8f34aaf297743f0627bec6813b961dc
Author: Miklos Vajna 
Date:   Mon Mar 10 20:32:21 2008 +0100

chost: default to ${CARCH}-frugalware-linux
- also add a --with-chost argument to configure so that others can use an
other host as well (i686-pc-linux-gnu or whatever they want)

diff --git a/configure.ac b/configure.ac
index ac2d49b..5bbb3ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,9 @@ AC_ARG_ENABLE(csharp,
AC_HELP_STRING([  --disable-csharp], [Do not build csharp bindings]),
[wantcsharp=$enableval], [wantcsharp=yes])

+dnl Help line for chost
+AC_ARG_WITH(chost, AC_HELP_STRING([--with-chost], [Build with a specific CHOST (default: CARCH-frugalware-linux)]))
+
dnl Check for architecture
case "$host" in
i686-*) AC_DEFINE_UNQUOTED([CARCH], ["i686"], [Architecture])
@@ -96,7 +99,6 @@ case "$host" in
CARCH="i686"
CARCHFLAGS="i686"
MARCHFLAG="march"
-		CHOST="${host}"
;;
x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture])
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture])
@@ -104,7 +106,6 @@ case "$host" in
CARCH="x86_64"
CARCHFLAGS="k8"
MARCHFLAG="march"
-		CHOST="${host}"
;;
ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture])
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture])
@@ -112,7 +113,6 @@ case "$host" in
CARCH="ia64"
CARCHFLAGS="ia64"
MARCHFLAG="march"
-		CHOST="${host}"
;;
sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture])
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture])
@@ -120,7 +120,6 @@ case "$host" in
CARCH="sparc"
CARCHFLAGS="v9"
MARCHFLAG="mcpu"
-		CHOST="${host}"
;;
ppc-* | powerpc-*)
AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture])
@@ -129,7 +128,6 @@ case "$host" in
CARCH="ppc"
CARCHFLAGS="750"
MARCHFLAG="mcpu"
-		CHOST="${host}"
;;
i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture])
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture])
@@ -137,13 +135,19 @@ case "$host" in
CARCH="i386"
CARCHFLAGS="i386"
MARCHFLAG="march"
-		CHOST="${host}"
;;
*)
AC_MSG_ERROR([Your architecture is not supported])
;;
esac

+dnl Check for chost
+if test "z$with_chost" != "z"; then
+	CHOST="$with_chost"
+else
+	CHOST="${CARCH}-frugalware-linux"
+fi
+
AC_SUBST(CARCH)
AC_SUBST(CARCHFLAGS)
AC_SUBST(MARCHFLAG)
From vmiklos at frugalware.org  Mon Mar 10 20:39:33 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Mar 10 20:39:33 2008
Subject: [Frugalware-git] pacman-g2: makepkg: added a hack for outdated
	makepkg.confs
Message-ID: <20080310193933.0B49A11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=90a399845df954daacb1b9817f525c4208da2700

commit 90a399845df954daacb1b9817f525c4208da2700
Author: Miklos Vajna 
Date:   Mon Mar 10 20:38:14 2008 +0100

makepkg: added a hack for outdated makepkg.confs
- from crazy

diff --git a/scripts/makepkg b/scripts/makepkg
index a84c3ab..d4f005c 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -114,6 +114,13 @@ Fextract() {
# makepkg configuration
[ -f /etc/makepkg.conf ] && source /etc/makepkg.conf

+## both are hacks , remove after 0.9 and move to makepkg.conf
+
+if [ -e /etc/frugalware-release ] && $ECHO $CHOST|grep -q linux-gnu; then
+        unset CHOST
+        export CHOST="`arch`-frugalware-linux"
+fi
+
# we need -fno-strict-aliasing for gcc 4.2*++
_gccver=`type -p gcc >/dev/null && gcc -dumpversion`
if [ "${_gccver%%.?}" == "4.3" ]; then
From crazy at frugalware.org  Mon Mar 10 20:40:19 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 20:40:21 2008
Subject: [Frugalware-git] gcc43: fbset-2.1-3-i686
Message-ID: <20080310194019.B893711904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=11f281ff853cae776e9a895d72e3d8f5511e82c1

commit 11f281ff853cae776e9a895d72e3d8f5511e82c1
Author: crazy 
Date:   Mon Mar 10 20:39:49 2008 +0100

fbset-2.1-3-i686
* rebuild

diff --git a/source/base/fbset/FrugalBuild b/source/base/fbset/FrugalBuild
index 48b3df6..aa59423 100644
--- a/source/base/fbset/FrugalBuild
+++ b/source/base/fbset/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=fbset
pkgver=2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Show and modify frame buffer device settings"
url="http://home.tvd.be/cr26864/Linux/fbdev/"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fbset/|sed 's/_/-/;s/\.orig//'|Flasttar"
From crazy at frugalware.org  Mon Mar 10 20:44:36 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 20:44:39 2008
Subject: [Frugalware-git] gcc43: which-2.19-2-i686
Message-ID: <20080310194436.B944D11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=dee572dbbae29141f8ab14ce1f472852763087bb

commit dee572dbbae29141f8ab14ce1f472852763087bb
Author: crazy 
Date:   Mon Mar 10 20:44:19 2008 +0100

which-2.19-2-i686
* rebuild

diff --git a/source/base/which/FrugalBuild b/source/base/which/FrugalBuild
index 9870ee2..07393e1 100644
--- a/source/base/which/FrugalBuild
+++ b/source/base/which/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=which
pkgver=2.19
-pkgrel=1
+pkgrel=2
pkgdesc="A utility to show the full path of commands"
url="http://www.xs4all.nl/~carlo17/which"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.xs4all.nl/~carlo17/which/NEWS|sed -n '1 p'|cut -d  '>' -f 2|tr -d ' '"
From crazy at frugalware.org  Mon Mar 10 20:57:50 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 20:57:52 2008
Subject: [Frugalware-git] gcc43: fdutils-5.5-4-i686
Message-ID: <20080310195750.D637A11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=aa54e8e0619423dd9041e7ee2a7edd3eac2aed95

commit aa54e8e0619423dd9041e7ee2a7edd3eac2aed95
Author: crazy 
Date:   Mon Mar 10 20:56:45 2008 +0100

fdutils-5.5-4-i686
* rebuild
* unset MAKEFLAGS
* added scriptlet option
* ( I don't think this ever got build in a chroot :s )

diff --git a/source/base/fdutils/FrugalBuild b/source/base/fdutils/FrugalBuild
index d4f8209..db1ac49 100644
--- a/source/base/fdutils/FrugalBuild
+++ b/source/base/fdutils/FrugalBuild
@@ -3,13 +3,14 @@

pkgname=fdutils
pkgver=5.5
-pkgrel=3
+pkgrel=4
pkgdesc="Utilities for formatting floppies and configuring the floppy drive."
url="http://fdutils.linux.lu/"
-depends=('bash' 'glibc')
+depends=('bash' 'glibc>=2.7-3')
makedepends=('tetex')
groups=('base')
archs=('i686' 'x86_64')
+options=('scriptlet')
up2date="lynx -dump \"$url/download.html?no-to-this-CONstitution\"|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
source=($url/$pkgname-$pkgver.tar.gz)
sha1sums=('3e7478d321ff2f9bc1f53ed09f9585e6e8ca813f')
@@ -20,6 +21,7 @@ build()
Fconf
# fix broken Makefile
Fsed 'sysconfdir  = /\(.*\)$' 'sysconfdir  = ${prefix}/\1' src/Makefile
+	unset MAKEFLAGS
make || return 1
Fmkdir /usr/{bin,etc,man/man1,man/man4,info}
Fmakeinstall
From crazy at frugalware.org  Mon Mar 10 21:02:22 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:02:23 2008
Subject: [Frugalware-git] gcc43: flex-2.5.33-3-i686
Message-ID: <20080310200222.A25BD11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e76bddd44888b7afdb291c1c0e9cf5f397da29d4

commit e76bddd44888b7afdb291c1c0e9cf5f397da29d4
Author: crazy 
Date:   Mon Mar 10 21:01:59 2008 +0100

flex-2.5.33-3-i686
* rebuild

diff --git a/source/base/flex/FrugalBuild b/source/base/flex/FrugalBuild
index c52ce45..71bf467 100644
--- a/source/base/flex/FrugalBuild
+++ b/source/base/flex/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=flex
pkgver=2.5.33
-pkgrel=2
+pkgrel=3
pkgdesc="A tool for generating text-scanning programs"
url="http://flex.sourceforge.net"
-depends=('glibc' 'bash')
+depends=('glibc>=2.7-3' 'bash')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
Finclude sourceforge
From crazy at frugalware.org  Mon Mar 10 21:04:09 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:04:10 2008
Subject: [Frugalware-git] gcc43: updated-2.11-3-i686
Message-ID: <20080310200409.B85C811904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a7d7f558bd8cd6d8d8fb2bf71441f36fde5bc862

commit a7d7f558bd8cd6d8d8fb2bf71441f36fde5bc862
Author: crazy 
Date:   Mon Mar 10 21:03:53 2008 +0100

updated-2.11-3-i686
* rebuild

diff --git a/source/base/updated/FrugalBuild b/source/base/updated/FrugalBuild
index fdd6e9a..6722c69 100644
--- a/source/base/updated/FrugalBuild
+++ b/source/base/updated/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=updated
pkgver=2.11
-pkgrel=2
+pkgrel=3
pkgdesc="an update daemon for Linux 2.0 or newer"
url="http://www.ibiblio.org/pub/Linux/system/daemons/"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/system/daemons/?M=D'|grep updated.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
From crazy at frugalware.org  Mon Mar 10 21:09:56 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:09:57 2008
Subject: [Frugalware-git] gcc43: tree-1.5.1-2-i686
Message-ID: <20080310200956.3A31C119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=875f3d8451a25b0c402e2a88c4ef63366ca8b7d8

commit 875f3d8451a25b0c402e2a88c4ef63366ca8b7d8
Author: crazy 
Date:   Mon Mar 10 21:09:03 2008 +0100

tree-1.5.1-2-i686
* kind version bump
* tarball is tree-1.5.1 but packaged is tree-1.5.1.1

diff --git a/source/base/tree/FrugalBuild b/source/base/tree/FrugalBuild
index 4d34d0b..b09c781 100644
--- a/source/base/tree/FrugalBuild
+++ b/source/base/tree/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=tree
pkgver=1.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="List contents of directories in a tree-like format"
url="ftp://mama.indstate.edu/linux/tree/"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="wget --passive-ftp -O - -q $url |grep tree |grep tgz|tail -n 1|cut -d '>' -f 2|cut -d '<' -f 1|sed 's/.tgz//'|cut -d - -f 2"
@@ -14,9 +14,10 @@ source=($url/$pkgname-$pkgver.tgz)

build()
{
+	Fcd $pkgname-${pkgver}.1 ## lol someone replaced the tarball
Fsed '^\(CFLAGS=\)-O2' "\1$CFLAGS" Makefile
Fbuild
}

# optimization ok
-sha1sums=('f63dd27860c34c27fbaacc361b44f27607d2b100')
+sha1sums=('ca4145bf1d2957ff3f4e6af0f64ce92d102fd356')
From crazy at frugalware.org  Mon Mar 10 21:14:21 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:14:22 2008
Subject: [Frugalware-git] gcc43: ppp-2.4.4-3-i686
Message-ID: <20080310201421.6EE26119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=5cb438e9b3119498899ddfb6bbe9b341e8455dcf

commit 5cb438e9b3119498899ddfb6bbe9b341e8455dcf
Author: crazy 
Date:   Mon Mar 10 21:13:54 2008 +0100

ppp-2.4.4-3-i686
* rebuild

diff --git a/source/base/ppp/FrugalBuild b/source/base/ppp/FrugalBuild
index 9c221cf..af47f02 100644
--- a/source/base/ppp/FrugalBuild
+++ b/source/base/ppp/FrugalBuild
@@ -3,18 +3,18 @@

pkgname=ppp
pkgver=2.4.4
-pkgrel=2
+pkgrel=3
pkgdesc="The PPP (Point-to-Point Protocol) daemon"
url="http://www.samba.org/ppp/"
groups=('base')
archs=('i686' 'x86_64')
-depends=('glibc')
+depends=('glibc>=2.7-3')
backup=('etc/ppp/chap-secrets' 'etc/ppp/pap-secrets' 'etc/ppp/options')
up2date="wget --passive-ftp -O - -q ftp://ftp.samba.org/pub/ppp/|grep ppp-.[0-9\.]*\.tar\.gz|tail -n 1|sed 's/.*ppp-\([0-9\.]*\)\.tar\.gz<.*/\1/'"
source=(ftp://ftp.samba.org/pub/ppp/ppp-$pkgver.tar.gz ip-up ip-down)
sha1sums=('9b91b0117e0a8bfaf8c4e894af79e0960dd36259' \
-	  '52b2e62a47050498846aa769495628da2a00fb31' \
-	  '09472529dfcf1f47d7e7f65067291f651c7ac476')
+          '52b2e62a47050498846aa769495628da2a00fb31' \
+          '09472529dfcf1f47d7e7f65067291f651c7ac476')

build()
{
From crazy at frugalware.org  Mon Mar 10 21:20:26 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:20:28 2008
Subject: [Frugalware-git] gcc43: unzip-5.52-5-i686
Message-ID: <20080310202026.AFAE5119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0d3bd6b315f8d2cbb74cb1109fa1cbd970a31a6a

commit 0d3bd6b315f8d2cbb74cb1109fa1cbd970a31a6a
Author: crazy 
Date:   Mon Mar 10 21:20:06 2008 +0100

unzip-5.52-5-i686
* rebuild

diff --git a/source/base/unzip/FrugalBuild b/source/base/unzip/FrugalBuild
index 88f1d3c..adfd7e7 100644
--- a/source/base/unzip/FrugalBuild
+++ b/source/base/unzip/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=unzip
pkgver=5.52
-pkgrel=4
+pkgrel=5
pkgdesc="Info-ZIP's unzip utility"
url="http://www.info-zip.org/UnZip.html"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.info-zip.org/UnZip.html|grep UnZip|sed -n 's/.*p \(.*\) \[.*/\1/;1 p'"
From crazy at frugalware.org  Mon Mar 10 21:22:01 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:22:02 2008
Subject: [Frugalware-git] gcc43: genpower-1.0.2-7-i686
Message-ID: <20080310202201.6321A119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=fd85a750dc43db90783799138a92ba27674c2afc

commit fd85a750dc43db90783799138a92ba27674c2afc
Author: crazy 
Date:   Mon Mar 10 21:21:44 2008 +0100

genpower-1.0.2-7-i686
* rebuild

diff --git a/source/base/genpower/FrugalBuild b/source/base/genpower/FrugalBuild
index 56e9985..a240f4b 100644
--- a/source/base/genpower/FrugalBuild
+++ b/source/base/genpower/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=genpower
pkgver=1.0.2
-pkgrel=6
+pkgrel=7
pkgdesc="UPS monitoring daemon"
url="http://www.ibiblio.org/pub/linux/system/ups/!INDEX.html"
-depends=('glibc' 'bash')
+depends=('glibc>=2.7-3' 'bash')
backup=(etc/sysconfig/ups)
groups=('base')
archs=('i686' 'x86_64' 'ppc')
From crazy at frugalware.org  Mon Mar 10 21:26:58 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:26:59 2008
Subject: [Frugalware-git] gcc43: file-4.23-2-i686
Message-ID: <20080310202658.98D8D119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1f1c9154639e7a33072d892a8ba1bb6bbc76f33d

commit 1f1c9154639e7a33072d892a8ba1bb6bbc76f33d
Author: crazy 
Date:   Mon Mar 10 21:26:29 2008 +0100

file-4.23-2-i686
* rebuild

diff --git a/source/base/file/FrugalBuild b/source/base/file/FrugalBuild
index 2054422..c207d00 100644
--- a/source/base/file/FrugalBuild
+++ b/source/base/file/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=file
pkgver=4.23
-pkgrel=1
+pkgrel=2
pkgdesc="File type identification utility"
url="ftp://ftp.astron.com/pub/file"
-depends=('glibc' 'zlib')
+depends=('glibc>=2.7-3' 'zlib>=1.2.3-5')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
up2date="wget --passive-ftp -O - -q ftp://ftp.astron.com/pub/file/ |grep file |grep tar.gz|tail -n 1|cut -d '>' -f 2|cut -d '<' -f 1|sed 's/.tar.gz//'|cut -d - -f 2"
From crazy at frugalware.org  Mon Mar 10 21:29:35 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:29:36 2008
Subject: [Frugalware-git] gcc43: eject-2.1.5-2-i686
Message-ID: <20080310202935.4291F119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=139d479a28cac9551a23cc4aa11dbefacf60d11a

commit 139d479a28cac9551a23cc4aa11dbefacf60d11a
Author: crazy 
Date:   Mon Mar 10 21:29:17 2008 +0100

eject-2.1.5-2-i686
* rebuild

diff --git a/source/base/eject/FrugalBuild b/source/base/eject/FrugalBuild
index f601816..6de29f3 100644
--- a/source/base/eject/FrugalBuild
+++ b/source/base/eject/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=eject
pkgver=2.1.5
-pkgrel=1
+pkgrel=2
pkgdesc="Allows removable media to be ejected under software control."
url="http://members.rogers.com/jefftranter/eject.html"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump 'http://ca.geocities.com/jefftranter@rogers.com/eject.html' | Flasttar"
From crazy at frugalware.org  Mon Mar 10 21:35:04 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:35:06 2008
Subject: [Frugalware-git] gcc43: groff-1.19.2-3-i686
Message-ID: <20080310203504.6A5DA119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a8e8b05395a0ca35ffbb404c5a50478cb9e7f2bf

commit a8e8b05395a0ca35ffbb404c5a50478cb9e7f2bf
Author: crazy 
Date:   Mon Mar 10 21:33:49 2008 +0100

groff-1.19.2-3-i686
* rebuild

diff --git a/source/base/groff/FrugalBuild b/source/base/groff/FrugalBuild
index debe9b0..d13a03b 100644
--- a/source/base/groff/FrugalBuild
+++ b/source/base/groff/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=groff
pkgver=1.19.2
-pkgrel=2
+pkgrel=3
pkgdesc="GNU troff text-formatting system"
url="http://www.gnu.org/software/groff/groff.html"
-depends=('perl' 'libstdc++')
+depends=('perl>=5.10.0-4' 'libstdc++>=4.3.0-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://ftp.gnu.org/gnu/groff/|grep tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'|Fsort|sed -n '$ p'"
From crazy at frugalware.org  Mon Mar 10 21:37:30 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:37:31 2008
Subject: [Frugalware-git] gcc43: mdadm-2.6.4-2-i686
Message-ID: <20080310203730.66E7B11904CB@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=05ee93bdede8fcf525f08d71324cc796e4f0ac64

commit 05ee93bdede8fcf525f08d71324cc796e4f0ac64
Author: crazy 
Date:   Mon Mar 10 21:37:10 2008 +0100

mdadm-2.6.4-2-i686
* rebuild

diff --git a/source/base/mdadm/FrugalBuild b/source/base/mdadm/FrugalBuild
index 1e98f9e..3770fbb 100644
--- a/source/base/mdadm/FrugalBuild
+++ b/source/base/mdadm/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=mdadm
pkgver=2.6.4
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for managing software RAID under Linux"
url="http://www.kernel.org/pub/linux/utils/raid/mdadm/"
-depends=('glibc')
-makedepends=('groff')
+depends=('glibc>=2.7-3')
+makedepends=('groff>=1.19.2-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
backup=(etc/{mdadm.conf,sysconfig/mdadm})
From crazy at frugalware.org  Mon Mar 10 21:39:15 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:39:16 2008
Subject: [Frugalware-git] gcc43: time-1.7-4-i686
Message-ID: <20080310203915.A63FA119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0dba843e12cea4f938bdff692c2462065752f60b

commit 0dba843e12cea4f938bdff692c2462065752f60b
Author: crazy 
Date:   Mon Mar 10 21:38:57 2008 +0100

time-1.7-4-i686
* rebuild

diff --git a/source/base/time/FrugalBuild b/source/base/time/FrugalBuild
index 32a39ad..603f00c 100644
--- a/source/base/time/FrugalBuild
+++ b/source/base/time/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=time
pkgver=1.7
-pkgrel=3
+pkgrel=4
pkgdesc="Time a simple command or give resource usage"
url="http://www.gnu.org/software/time/"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
Fup2gnugz
From crazy at frugalware.org  Mon Mar 10 21:43:10 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:43:12 2008
Subject: [Frugalware-git] gcc43: setserial-2.17-4-i686
Message-ID: <20080310204310.C2132119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9c896b9415be5e63d8bfde8baf41cb7b07d84973

commit 9c896b9415be5e63d8bfde8baf41cb7b07d84973
Author: crazy 
Date:   Mon Mar 10 21:42:52 2008 +0100

setserial-2.17-4-i686
* rebuild

diff --git a/source/base/setserial/FrugalBuild b/source/base/setserial/FrugalBuild
index 0f61d30..56fece8 100644
--- a/source/base/setserial/FrugalBuild
+++ b/source/base/setserial/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=setserial
pkgver=2.17
-pkgrel=3
+pkgrel=4
pkgdesc="allows you to look at and change various attributes of a serial device"
-depends=('glibc')
-makedepends=('groff')
+depends=('glibc>=2.7-3')
+makedepends=('groff>=1.19.2-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
Finclude sourceforge
From crazy at frugalware.org  Mon Mar 10 21:44:59 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:45:01 2008
Subject: [Frugalware-git] gcc43: adjtimex-1.21-2-i686
Message-ID: <20080310204459.F2653119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ef3301dff78a5af9b3a3efcf7ccca9287368c1bb

commit ef3301dff78a5af9b3a3efcf7ccca9287368c1bb
Author: crazy 
Date:   Mon Mar 10 21:44:42 2008 +0100

adjtimex-1.21-2-i686
* rebuild

diff --git a/source/base/adjtimex/FrugalBuild b/source/base/adjtimex/FrugalBuild
index 3f317db..05e7615 100644
--- a/source/base/adjtimex/FrugalBuild
+++ b/source/base/adjtimex/FrugalBuild
@@ -3,17 +3,17 @@

pkgname=adjtimex
pkgver=1.21
-pkgrel=1
+pkgrel=2
pkgdesc="display or set the kernel time variables"
url="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.ibiblio.org/pub/Linux/system/admin/time/ | grep $pkgname | Flasttar"
source=(http://www.ibiblio.org/pub/Linux/system/admin/time/$pkgname-$pkgver.tar.gz \
adjtimex-1.13-glibc.patch)
sha1sums=('0a18b481005ca8d56bba3f56693a79e305bb6738' \
-	  '5c5e26a052c39da0c05610bd36e4a22a82a4f166')
+          '5c5e26a052c39da0c05610bd36e4a22a82a4f166')

build() {
Fcd
From crazy at frugalware.org  Mon Mar 10 21:48:41 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 21:48:42 2008
Subject: [Frugalware-git] gcc43: sysfsutils-2.1.0-2-i686
Message-ID: <20080310204841.07194119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a2ef6a7a612f27089148176c6295ae3e725af516

commit a2ef6a7a612f27089148176c6295ae3e725af516
Author: crazy 
Date:   Mon Mar 10 21:48:22 2008 +0100

sysfsutils-2.1.0-2-i686
* rebuild

diff --git a/source/base/sysfsutils/FrugalBuild b/source/base/sysfsutils/FrugalBuild
index 53e790d..cec8d0a 100644
--- a/source/base/sysfsutils/FrugalBuild
+++ b/source/base/sysfsutils/FrugalBuild
@@ -3,12 +3,12 @@

pkgname=sysfsutils
pkgver=2.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="System utilities based on sysfs"
_F_sourceforge_dirname="linux-diag"
Finclude sourceforge
url="http://linux-diag.sourceforge.net/Sysfsutils.html"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64')
up2date="lynx -dump $url|grep '* v\. [0-9\._]* '|sed -n -e 's/.*v\. \([0-9\.]*\) .*/\1/' -e '1 p'"
From crazy at frugalware.org  Mon Mar 10 22:01:36 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:01:37 2008
Subject: [Frugalware-git] gcc43: flex-2.5.35-1-x86_64
Message-ID: <20080310210136.14E46119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=deb3d3b954c27195ce245dc570e7f1b1df56ab7d

commit deb3d3b954c27195ce245dc570e7f1b1df56ab7d
Author: crazy 
Date:   Mon Mar 10 22:01:25 2008 +0100

flex-2.5.35-1-x86_64
* Version bump
* .33 does not pass the test on 64bit
* .34 was broken , .35 passes all 46 tests

diff --git a/source/base/flex/FrugalBuild b/source/base/flex/FrugalBuild
index 71bf467..9bc2bf7 100644
--- a/source/base/flex/FrugalBuild
+++ b/source/base/flex/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: VMiklos 

pkgname=flex
-pkgver=2.5.33
-pkgrel=3
+pkgver=2.5.35
+pkgrel=1
pkgdesc="A tool for generating text-scanning programs"
url="http://flex.sourceforge.net"
depends=('glibc>=2.7-3' 'bash')
@@ -14,9 +14,9 @@ Finclude sourceforge
# http://sourceforge.net/tracker/index.php?func=detail&aid=1849812&group_id=97492&atid=618177
# http://sourceforge.net/tracker/index.php?func=detail&aid=1849809&group_id=97492&atid=618177
# http://sourceforge.net/tracker/index.php?func=detail&aid=1849805&group_id=97492&atid=618177
-up2date="$up2date |sed 's/2.5.34/2.5.33/'"
+#up2date="$up2date |sed 's/2.5.34/2.5.33/'"
source=(${source[@]} lex)
-sha1sums=('9bf2d66bb2e15c26c466eb88218cca6ad9476805' \
+sha1sums=('333c876a8e24ae5a17d9573459fc501b7721930b' \
'76701388d28fe8b1fb269c79c11a1316a02b4e46')
options=('force')
From crazy at frugalware.org  Mon Mar 10 22:03:06 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:03:08 2008
Subject: [Frugalware-git] gcc43: zip-2.32-2-i686
Message-ID: <20080310210306.72E79119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9d3ac344dfe20337d000bf68d164ec5f1008b0f1

commit 9d3ac344dfe20337d000bf68d164ec5f1008b0f1
Author: crazy 
Date:   Mon Mar 10 22:02:27 2008 +0100

zip-2.32-2-i686
* rebuild
* changed the mirror , original source location is broken

diff --git a/source/base/zip/FrugalBuild b/source/base/zip/FrugalBuild
index 79203ac..7efecf1 100644
--- a/source/base/zip/FrugalBuild
+++ b/source/base/zip/FrugalBuild
@@ -3,14 +3,15 @@

pkgname=zip
pkgver=2.32
-pkgrel=1
+pkgrel=2
pkgdesc="Info-ZIP's zip utility"
url="http://www.info-zip.org/Zip.html"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.info-zip.org/Zip.html|grep Zip|sed -n 's/.*p \(.*\) \[.*/\1/;1 p'"
-source=(http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz)
+#source=(http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz)
+source=(ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/src/zip232.tar.gz)
sha1sums=('5bc562bf95d9aee0cb6625e6038898e1f191a4aa')

build()
From iron at frugalware.org  Mon Mar 10 22:06:54 2008
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Mar 10 22:06:56 2008
Subject: [Frugalware-git] homepage-ng: 0.8 announcement: removed x86_64 due
	it's not ready for release
Message-ID: <20080310210654.59ABB119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=0b08e15c137f29ec64fdd47f8794a59edf2baaf3

commit 0b08e15c137f29ec64fdd47f8794a59edf2baaf3
Author: Krisztian VASAS 
Date:   Mon Mar 10 22:04:51 2008 +0100

0.8 announcement: removed x86_64 due it's not ready for release

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index fec162e..0819b7a 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -18,7 +18,7 @@


91
-        Frugalware 0.8 (Kalgan) for i686 and x86_64 released
+        Frugalware 0.8 (Kalgan) for i686 released
Mon Mar 11 07:16:05 CET 2008
VMiklos
1
@@ -57,26 +57,6 @@
usb,
chroot tarball


-            Download for x86_64:

-                netinstall,
-                cd1,
-                cd2,
-                cd3,
-                cd4,
-                cd5,
-                cd6,
-                cd7,
-                cd8,
-                cd9,
-                cd10,
-                cd11,
-                cd12,
-                dvd1,
-                dvd2,
-                tftp,
-                usb,
-                chroot tarball
-								

NOTE: Click here to read more about what media you need for the installation.

SHA1SUMs:

@@ -97,26 +77,9 @@ a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
2925f86d9c1c6e6e63e6533f0673de4fea09d437  frugalware-0.8-i686-dvd1.iso
9e09729d9a4c93c09cece38e2679163c11c57a45  frugalware-0.8-i686-dvd2.iso
b1c645170fdbf6e57b746f4b6185687a84784a0f  frugalware-0.8-i686-net.iso
-c08a269260babaf993bb2e3a5c06f3bd6de6ed5a  frugalware-0.8-x86_64-cd1.iso
-9a24c1e82782cd8e7190d86faba78bf9a0c2ad07  frugalware-0.8-x86_64-cd2.iso
-5fe53403702bb672898bb495629751d7d9714301  frugalware-0.8-x86_64-cd3.iso
-bda7d57f4d2bef9601a4705ec2cc55f0101d451b  frugalware-0.8-x86_64-cd4.iso
-de1e545c56a7982827a950d8a14a9825467cf4ea  frugalware-0.8-x86_64-cd5.iso
-bf075fe9c826062091190e6e98cc1be531906db3  frugalware-0.8-x86_64-cd6.iso
-b1e36d88804acb7a0f8b76f8f2d040bf7b950eaf  frugalware-0.8-x86_64-cd7.iso
-c9de8aec4bc1e266ebdc9d12cc4c7c943ee3c754  frugalware-0.8-x86_64-cd8.iso
-d9977d7358ec0f9a3021541453d0afaa16b031e2  frugalware-0.8-x86_64-cd9.iso
-987f5281eca7c1b2418a300378506b364e986b3f  frugalware-0.8-x86_64-cd10.iso
-ca99396c8a720f9537c55169716382a38a39d4ef  frugalware-0.8-x86_64-cd11.iso
-63033736c6886eff1240fe5efc5813a133133c6c  frugalware-0.8-x86_64-cd12.iso
-f9be2f77dbaeb1edf28cb4f951b5a2306b5a9e9f  frugalware-0.8-x86_64-dvd1.iso
-c5d4c23bc4c5ececa2157e41a855abd375819bdf  frugalware-0.8-x86_64-dvd2.iso
-6c2aee54190fea645dde4f2be1e0d04dc81aff74  frugalware-0.8-x86_64-net.iso
ef68c4d3353ff104ad59725743e9f11b63703323  fwlive-0.8-i686-full.iso
34dd50fc34315d73f7289ab887b23328d5950f04  frugalware-0.8-i686-tftp.img.gz
fb2079de1627ca0e65a323005e0644b88fed6d03  frugalware-0.8-i686-usb.tar.gz
-8d82cdc2f15bf3f6c6c7b3bb89b5ca284754bee6  frugalware-0.8-x86_64-tftp.img.gz
-299d3473073399c3237ab87cad0ef1fa433e4717  frugalware-0.8-x86_64-usb.tar.gz


If you are upgrading to Kalgan from our previous stable release (Sayshell), please read the upgrade part of our documentation.

]]>
diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index 03dfff0..b848180 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -18,7 +18,7 @@


91
-		Megjelent a Frugalware 0.8 (Kalgan) i686-ra, valamint x86_64-re
+		Megjelent a Frugalware 0.8 (Kalgan) i686-ra
Mon Mar 11 07:26:44 CET 2008
IroNiQ
1
@@ -57,26 +57,6 @@
usb,
chroot tarball


-			Letöltés x86_64-re:

-				netinstall,
-				cd1,
-				cd2,
-				cd3,
-				cd4,
-				cd5,
-				cd6,
-				cd7,
-				cd8,
-				cd9,
-				cd10,
-				cd11,
-				cd12,
-				dvd1,
-				dvd2,
-				tftp,
-				usb,
-				chroot tarball
-			

Megjegyzés: Kattintson ide, hogy eldönthesse, melyik telepítő médiára van szüksége.

SHA1SUMok:

@@ -97,26 +77,9 @@ a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
2925f86d9c1c6e6e63e6533f0673de4fea09d437  frugalware-0.8-i686-dvd1.iso
9e09729d9a4c93c09cece38e2679163c11c57a45  frugalware-0.8-i686-dvd2.iso
b1c645170fdbf6e57b746f4b6185687a84784a0f  frugalware-0.8-i686-net.iso
-c08a269260babaf993bb2e3a5c06f3bd6de6ed5a  frugalware-0.8-x86_64-cd1.iso
-9a24c1e82782cd8e7190d86faba78bf9a0c2ad07  frugalware-0.8-x86_64-cd2.iso
-5fe53403702bb672898bb495629751d7d9714301  frugalware-0.8-x86_64-cd3.iso
-bda7d57f4d2bef9601a4705ec2cc55f0101d451b  frugalware-0.8-x86_64-cd4.iso
-de1e545c56a7982827a950d8a14a9825467cf4ea  frugalware-0.8-x86_64-cd5.iso
-bf075fe9c826062091190e6e98cc1be531906db3  frugalware-0.8-x86_64-cd6.iso
-b1e36d88804acb7a0f8b76f8f2d040bf7b950eaf  frugalware-0.8-x86_64-cd7.iso
-c9de8aec4bc1e266ebdc9d12cc4c7c943ee3c754  frugalware-0.8-x86_64-cd8.iso
-d9977d7358ec0f9a3021541453d0afaa16b031e2  frugalware-0.8-x86_64-cd9.iso
-987f5281eca7c1b2418a300378506b364e986b3f  frugalware-0.8-x86_64-cd10.iso
-ca99396c8a720f9537c55169716382a38a39d4ef  frugalware-0.8-x86_64-cd11.iso
-63033736c6886eff1240fe5efc5813a133133c6c  frugalware-0.8-x86_64-cd12.iso
-f9be2f77dbaeb1edf28cb4f951b5a2306b5a9e9f  frugalware-0.8-x86_64-dvd1.iso
-c5d4c23bc4c5ececa2157e41a855abd375819bdf  frugalware-0.8-x86_64-dvd2.iso
-6c2aee54190fea645dde4f2be1e0d04dc81aff74  frugalware-0.8-x86_64-net.iso
ef68c4d3353ff104ad59725743e9f11b63703323  fwlive-0.8-i686-full.iso
34dd50fc34315d73f7289ab887b23328d5950f04  frugalware-0.8-i686-tftp.img.gz
fb2079de1627ca0e65a323005e0644b88fed6d03  frugalware-0.8-i686-usb.tar.gz
-8d82cdc2f15bf3f6c6c7b3bb89b5ca284754bee6  frugalware-0.8-x86_64-tftp.img.gz
-299d3473073399c3237ab87cad0ef1fa433e4717  frugalware-0.8-x86_64-usb.tar.gz


Ha a korábbi stabil kiadásunkról (Sayshell) frissít, kérjük olvassa el a dokumentáció frissítésről szóló részét.

]]>
From crazy at frugalware.org  Mon Mar 10 22:22:19 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:22:21 2008
Subject: [Frugalware-git] gcc43: hfsutils-3.2.6-2-i686
Message-ID: <20080310212219.6F9D9119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b4691decbeae11fffaa5c60f7486b62a1ddf549c

commit b4691decbeae11fffaa5c60f7486b62a1ddf549c
Author: crazy 
Date:   Mon Mar 10 22:21:55 2008 +0100

hfsutils-3.2.6-2-i686
* rebuild

diff --git a/source/base/hfsutils/FrugalBuild b/source/base/hfsutils/FrugalBuild
index 80c5d59..51cbc68 100644
--- a/source/base/hfsutils/FrugalBuild
+++ b/source/base/hfsutils/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=hfsutils
pkgver=3.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="HFS FS Acess utils"
url="http://www.mars.org/home/rob/proj/hfs/"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'ppc' 'x86_64')
up2date="lynx -dump ftp://ftp.mars.org/pub/hfs/ | grep -m1 'tar.gz'|sed 's/.*ils-//g'|sed 's/.tar.*//g'"
From crazy at frugalware.org  Mon Mar 10 22:24:41 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:24:43 2008
Subject: [Frugalware-git] gcc43: unarj-2.63a-3-i686
Message-ID: <20080310212441.393FE119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=5edd464c995d4c5d87cf91a9e9767718bc7ba3f2

commit 5edd464c995d4c5d87cf91a9e9767718bc7ba3f2
Author: crazy 
Date:   Mon Mar 10 22:24:23 2008 +0100

unarj-2.63a-3-i686
* rebuild

diff --git a/source/base/unarj/FrugalBuild b/source/base/unarj/FrugalBuild
index 0664f92..4fef0be 100644
--- a/source/base/unarj/FrugalBuild
+++ b/source/base/unarj/FrugalBuild
@@ -3,12 +3,12 @@

pkgname=unarj
pkgver=2.63a
-pkgrel=2
+pkgrel=3
pkgdesc="extract, test and view ARJ archives"
url="http://www.ibiblio.org/pub/Linux/utils/compress/"
up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/utils/compress/?M=D' |grep unarj.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
source=(http://www.ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz)
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
sha1sums=('abd35d894444fea1a0bdc7472ed2346f0f8c6ba4')
From crazy at frugalware.org  Mon Mar 10 22:26:03 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:26:04 2008
Subject: [Frugalware-git] gcc43: dosfstools-2.11-3-i686
Message-ID: <20080310212603.8E969119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=57322c1363b13a479b1544ea8ae43de56d246c30

commit 57322c1363b13a479b1544ea8ae43de56d246c30
Author: crazy 
Date:   Mon Mar 10 22:25:46 2008 +0100

dosfstools-2.11-3-i686
* rebuild

diff --git a/source/base/dosfstools/FrugalBuild b/source/base/dosfstools/FrugalBuild
index 41e2dcf..f9526f5 100644
--- a/source/base/dosfstools/FrugalBuild
+++ b/source/base/dosfstools/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=dosfstools
pkgver=2.11
-pkgrel=2
+pkgrel=3
pkgdesc="FAT/FAT32/VFAT filesystem checker"
url="http://sparemint.atariforge.net/sparemint/html/packages/dosfstools.html"
-depends=('glibc' 'bash')
+depends=('glibc>=2.7-3' 'bash')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools|grep src.tar.gz$|sed 's/.*-\(.*\)\.src.*/\1/'|Fsort|tail -n 1"
From crazy at frugalware.org  Mon Mar 10 22:30:55 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:30:57 2008
Subject: [Frugalware-git] gcc43: xfsprogs-attr-2.4.41_1-1-i686
Message-ID: <20080310213055.9B96F119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=76332bc58414d5ee333a9332f752613026fcce6b

commit 76332bc58414d5ee333a9332f752613026fcce6b
Author: crazy 
Date:   Mon Mar 10 22:30:17 2008 +0100

xfsprogs-attr-2.4.41_1-1-i686
* Version bump
* old source does not exists anymore I have to bump it

diff --git a/source/base/xfsprogs-attr/FrugalBuild b/source/base/xfsprogs-attr/FrugalBuild
index 315454a..2411bfe 100644
--- a/source/base/xfsprogs-attr/FrugalBuild
+++ b/source/base/xfsprogs-attr/FrugalBuild
@@ -3,19 +3,19 @@
# Contributor: VMiklos 

pkgname=xfsprogs-attr
-pkgver=2.4.39_1
+pkgver=2.4.41_1
pkgrel=1
pkgdesc="Dynamic library for extended attribute support."
url="http://oss.sgi.com/projects/xfs/"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'attr_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'"
source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_`echo ${pkgver} | sed -e 's/_/-/'`.tar.gz)
-sha1sums=('d7b04e7a9b280862c2897432091b2da2efe8fa7a')
+sha1sums=('868d1629ebe034c381ca221cdb5f45f71b1bf392')

build() {
-	Fcd attr-2.4.39
+	Fcd attr-2.4.41
Fmake --libdir=/lib --libexecdir=/usr/lib
make DIST_ROOT=$Fdestdir install-dev install-lib install || Fdie
}
From crazy at frugalware.org  Mon Mar 10 22:36:41 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 22:36:43 2008
Subject: [Frugalware-git] gcc43: xfsprogs-acl-2.2.47_1-1-i686
Message-ID: <20080310213641.D7014119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=947cf0bb37204bb5c85423d2db9543e3fda3b04f

commit 947cf0bb37204bb5c85423d2db9543e3fda3b04f
Author: crazy 
Date:   Mon Mar 10 22:36:10 2008 +0100

xfsprogs-acl-2.2.47_1-1-i686
* Version bump
* same story =) source gone

diff --git a/source/base/xfsprogs-acl/FrugalBuild b/source/base/xfsprogs-acl/FrugalBuild
index 7438b7e..e1f7e80 100644
--- a/source/base/xfsprogs-acl/FrugalBuild
+++ b/source/base/xfsprogs-acl/FrugalBuild
@@ -3,17 +3,17 @@
# Contributor: VMiklos 

pkgname=xfsprogs-acl
-pkgver=2.2.45_1
+pkgver=2.2.47_1
pkgrel=1
pkgdesc="Dynamic library for access control list support."
url="http://oss.sgi.com/projects/xfs/"
-depends=('xfsprogs-attr>=2.4.39_1')
+depends=('xfsprogs-attr>=2.4.41_1')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'acl_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'"
source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz \
acl-2.2.32-only-symlink-when-needed.patch0)
-sha1sums=('264fae8dce2d19a11d50df9d1adbae301a442f1c' \
+sha1sums=('989a54cc2c600182cac9efafeaa73a4623852d1d' \
'79fefd16a84e51797165fc8438382382156a149b')

build()
@@ -21,7 +21,7 @@ build()
## see doc/INSTALL
export OPTIMIZER="$CFLAGS"
export DEBUG="-DNDEBUG"
-	Fcd acl-2.2.45
+	Fcd acl-2.2.47
Fpatchall
autoconf || return 1
Fconf --enable-lib64=no --libexecdir=/usr/libexec --bindir=/bin || return 1
From crazy at frugalware.org  Mon Mar 10 23:04:46 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 23:04:48 2008
Subject: [Frugalware-git] gcc43: xfsprogs-2.9.7_1-1-i686
Message-ID: <20080310220446.863E6119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=eaabeb591aa39a5e06b6134c3c6498b3318899d4

commit eaabeb591aa39a5e06b6134c3c6498b3318899d4
Author: crazy 
Date:   Mon Mar 10 23:03:38 2008 +0100

xfsprogs-2.9.7_1-1-i686
* Version bump
* some cleanup ( for the rest I have to poke krix )

diff --git a/source/base/xfsprogs/FrugalBuild b/source/base/xfsprogs/FrugalBuild
index 59cb3c1..100ea3d 100644
--- a/source/base/xfsprogs/FrugalBuild
+++ b/source/base/xfsprogs/FrugalBuild
@@ -3,27 +3,27 @@
# Contributor: VMiklos 

pkgname=xfsprogs
-pkgver=2.9.4_1
+pkgver=2.9.7_1
pkgrel=1
pkgdesc="XFS filesystem-specific static libraries and headers."
url="http://oss.sgi.com/projects/xfs/"
-depends=('e2fsprogs')
-makedepends=('xfsprogs-attr>=2.4.39_1')
+depends=('e2fsprogs>=1.40.6-2')
+makedepends=('xfsprogs-attr>=2.4.41_1')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
replaces=('xfsprogs-base')
up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'xfsprogs_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'"
source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz \
xfsprogs-sharedlibs.patch.gz)
-sha1sums=('ee97510e8167edf1e5212da34028c77d911a7695' \
+sha1sums=('7cc9d12681597344978705e2c4a5bc54599e400a' \
'd0db69f8de7a769272ae6584b5438a323628ab67')

build() {
unset MAKEFLAGS
-	Fcd $pkgname-2.9.4
+	Fcd $pkgname-2.9.7
Fpatchall
-	DEBUG="-DNDEBUG"
-	OPTIMIZER="${CFLAGS}"
+	export DEBUG="-DNDEBUG"
+	export OPTIMIZER=""
sed -i \
-e '/^GCFLAGS/s:-O1::' \
-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${pkgname}-${pkgver}:" \
@@ -32,7 +32,6 @@ build() {
autoconf || Fdie
sed -i -e '/PLATFORM/d' configure || Fdie "sed PLATFORM"
sed -i -e '/INSTALL.* -S .*LIBNAME/d' include/buildmacros || Fdie "sed symlinks"
-	unset CFLAGS
Fmake --bindir=/bin \
--sbindir=/sbin \
--libexecdir=/usr/lib --enable-lib64=no \
From crazy at frugalware.org  Mon Mar 10 23:10:01 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 23:10:02 2008
Subject: [Frugalware-git] gcc43: xfsprogs-dmapi-2.2.8_1-3-i686
Message-ID: <20080310221001.CB1A3119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=f2166518af84cab0938605452aa6e082cea94d68

commit f2166518af84cab0938605452aa6e082cea94d68
Author: crazy 
Date:   Mon Mar 10 23:09:41 2008 +0100

xfsprogs-dmapi-2.2.8_1-3-i686
* rebuild

diff --git a/source/base/xfsprogs-dmapi/FrugalBuild b/source/base/xfsprogs-dmapi/FrugalBuild
index e84752f..e8c8fcc 100644
--- a/source/base/xfsprogs-dmapi/FrugalBuild
+++ b/source/base/xfsprogs-dmapi/FrugalBuild
@@ -4,10 +4,10 @@

pkgname=xfsprogs-dmapi
pkgver=2.2.8_1
-pkgrel=2
+pkgrel=3
pkgdesc="Data Management API static libraries and headers."
url="http://oss.sgi.com/projects/xfs/"
-depends=('xfsprogs>=2.8.16_1')
+depends=('xfsprogs>=2.9.7_1')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'dmapi_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'"
From crazy at frugalware.org  Mon Mar 10 23:17:48 2008
From: crazy at frugalware.org (crazy)
Date: Mon Mar 10 23:17:50 2008
Subject: [Frugalware-git] gcc43: xfsprogs-xfsdump-2.2.48_1-1-i686
Message-ID: <20080310221748.7F0D0119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=dd3ef4d89d481b140a12955a70a19dff75b3d979

commit dd3ef4d89d481b140a12955a70a19dff75b3d979
Author: crazy 
Date:   Mon Mar 10 23:17:24 2008 +0100

xfsprogs-xfsdump-2.2.48_1-1-i686
* Version bump

diff --git a/source/base/xfsprogs-xfsdump/FrugalBuild b/source/base/xfsprogs-xfsdump/FrugalBuild
index 6fcebf3..68de13e 100644
--- a/source/base/xfsprogs-xfsdump/FrugalBuild
+++ b/source/base/xfsprogs-xfsdump/FrugalBuild
@@ -3,23 +3,23 @@
# Contributor: VMiklos 

pkgname=xfsprogs-xfsdump
-pkgver=2.2.46_1
+pkgver=2.2.48_1
pkgrel=1
pkgdesc="Administrative utilities for the XFS filesystem."
url="http://oss.sgi.com/projects/xfs/"
-depends=('xfsprogs-dmapi>=2.2.8_1-2' 'xfsprogs-attr>=2.4.39_1' 'ncurses')
+depends=('xfsprogs-dmapi>=2.2.8_1-3' 'xfsprogs-attr>=2.4.41_1' 'ncurses>=5.6-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'xfsdump_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'"
source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz)
-sha1sums=('98feca5b681a66db5dbd561b0eddefd269b70a35')
+sha1sums=('bdfffa637efa23329899fd38d6b77119d51ea039')

build()
{
## see doc/INSTALL
export OPTIMIZER="$CFLAGS"
export DEBUG="-DNDEBUG"
-	Fcd xfsdump-2.2.46
+	Fcd xfsdump-2.2.48
autoconf || return 1
Fconf --enable-lib64=no  --libexecdir=/usr/libexec
Fmake
From crazy at frugalware.org  Tue Mar 11 02:01:21 2008
From: crazy at frugalware.org (crazy)
Date: Tue Mar 11 02:01:23 2008
Subject: [Frugalware-git] gcc43: portmap-5beta-6-x86_64
Message-ID: <20080311010121.37D94119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=7770352b7cb712916e7f6bcddff6a5d565e0f38a

commit 7770352b7cb712916e7f6bcddff6a5d565e0f38a
Author: crazy 
Date:   Tue Mar 11 02:01:15 2008 +0100

portmap-5beta-6-x86_64
* rebuild
* fixed makedepends
* fixed CFLAGS
* converted FB to F* commands

diff --git a/source/base/portmap/FrugalBuild b/source/base/portmap/FrugalBuild
index baa203a..f89950a 100644
--- a/source/base/portmap/FrugalBuild
+++ b/source/base/portmap/FrugalBuild
@@ -4,10 +4,11 @@

pkgname=portmap
pkgver=5beta
-pkgrel=5
+pkgrel=6
pkgdesc="RPC connection manager"
url="ftp://ftp.porcupine.org/pub/security"
-depends=('glibc')
+depends=('glibc>=2.7-3')
+makedepends=('tcp_wrappers')
groups=('base')
archs=('i686' 'x86_64')
up2date="wget --passive-ftp -O - -q ftp://ftp.porcupine.org/pub/security/|grep 'portmap[[:print:]]*tar.gz<'|tail -n 1|cut -d _ -f 2|cut -d . -f 1"
@@ -16,14 +17,15 @@ sha1sums=('783a322ca9220e4830664f94195ff923ce8a09d6' \
'63901011ef1eb163ad2bd8dd2a7e9af242f31482' \
'bdd14477543527bd1aded1d750ebee86ff7bf74d')

-build() {
-  cd $startdir/src/${pkgname}_${pkgver}
-  patch -p1 < $startdir/src/$pkgname-$pkgver.diff
-
-  make || return 1
-
-  make DESTDIR=$startdir/pkg install
-  mkdir -p $startdir/pkg/etc/rc.d/rc.messages
-  install -m755 $startdir/src/rc.portmap $startdir/pkg/etc/rc.d/
-  cp -a $startdir/messages/* $startdir/pkg/etc/rc.d/rc.messages/
+build()
+{
+	Fcd ${pkgname}_${pkgver}
+	Fpatchall
+	Fsed '-O2' "$CFLAGS" Makefile
+	Fmake
+	Fmakeinstall
+	Frcd
+
}
+
+# optimization OK
From crazy at frugalware.org  Tue Mar 11 02:03:48 2008
From: crazy at frugalware.org (crazy)
Date: Tue Mar 11 02:03:51 2008
Subject: [Frugalware-git] gcc43: acpid-1.0.6-2-x86_64
Message-ID: <20080311010348.8FB2E119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=d7191193ddf3a8533860263eec55025abe84c7a0

commit d7191193ddf3a8533860263eec55025abe84c7a0
Author: crazy 
Date:   Tue Mar 11 02:03:43 2008 +0100

acpid-1.0.6-2-x86_64
* rebuild

diff --git a/source/base/acpid/FrugalBuild b/source/base/acpid/FrugalBuild
index f57c115..61a2e9f 100644
--- a/source/base/acpid/FrugalBuild
+++ b/source/base/acpid/FrugalBuild
@@ -3,9 +3,9 @@

pkgname=acpid
pkgver=1.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="Utilities for using ACPI power management"
-depends=('glibc')
+depends=('glibc>=2.7-3')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
Finclude sourceforge
From vmiklos at frugalware.org  Tue Mar 11 07:48:27 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Mar 11 07:48:28 2008
Subject: [Frugalware-git] homepage-ng: 0.8 final is out :)
Message-ID: <20080311064827.DFAFC119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d5c3cef526e729a1ebdc4f60b5e42dc4655d9457

commit d5c3cef526e729a1ebdc4f60b5e42dc4655d9457
Author: Miklos Vajna 
Date:   Tue Mar 11 01:13:15 2008 +0100

0.8 final is out :)

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 0819b7a..7564db8 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -21,7 +21,7 @@
Frugalware 0.8 (Kalgan) for i686 released
Mon Mar 11 07:16:05 CET 2008
VMiklos
-        1
+        0
announce the immediate availability of Frugalware 0.8, our eighth stable release.

No new features have been added since 0.8rc2, but more than 300 changes have been made to fix minor bugs.
diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml
index 9306f0e..2d8ff05 100644
--- a/frugalware/xml/roadmap.xml
+++ b/frugalware/xml/roadmap.xml
@@ -26,7 +26,7 @@
Kalgan is a fictional planet in Isaac Asimov's Foundation series.
0.8
Mar 11, 2008
-		0
+		1


rc2
From vmiklos at frugalware.org  Tue Mar 11 11:08:50 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Mar 11 11:08:52 2008
Subject: [Frugalware-git] frugalware-current: php-pecl-xdebug-2.0.2-1-i686
Message-ID: <20080311100850.C7E1B119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f60ef585680e5dfc8f3b79fab06aee48a961fb75

commit f60ef585680e5dfc8f3b79fab06aee48a961fb75
Author: Miklos Vajna 
Date:   Tue Mar 11 11:08:25 2008 +0100

php-pecl-xdebug-2.0.2-1-i686
- new package
- requested by pim on IRC

diff --git a/source/devel-extra/php-pecl-xdebug/FrugalBuild b/source/devel-extra/php-pecl-xdebug/FrugalBuild
new file mode 100644
index 0000000..24f7d2f
--- /dev/null
+++ b/source/devel-extra/php-pecl-xdebug/FrugalBuild
@@ -0,0 +1,9 @@
+# Compiling Time: 0.05 SBU
+# Maintainer: VMiklos 
+
+_F_pecl_name="xdebug"
+pkgver=2.0.2
+pkgdesc="Provides functions for function traces and profiling"
+depends=('php>=4.3.0')
+Finclude pecl
+sha1sums=('f417b4f3916fa67a867de1ba60f82038987bcf97')
From vmiklos at frugalware.org  Tue Mar 11 11:32:40 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Mar 11 11:32:43 2008
Subject: [Frugalware-git] frugalware-current: python-dateutil-1.4-1-i686
Message-ID: <20080311103240.78A58119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e48b18f8c9d0b2f71b2b6aa87ce0e84980291f08

commit e48b18f8c9d0b2f71b2b6aa87ce0e84980291f08
Author: Miklos Vajna 
Date:   Tue Mar 11 11:32:32 2008 +0100

python-dateutil-1.4-1-i686
- new package

diff --git a/source/devel-extra/python-dateutil/FrugalBuild b/source/devel-extra/python-dateutil/FrugalBuild
new file mode 100644
index 0000000..a6abfbc
--- /dev/null
+++ b/source/devel-extra/python-dateutil/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0 SBU
+# Maintainer: VMiklos 
+
+pkgname=python-dateutil
+pkgver=1.4
+pkgrel=1
+pkgdesc="Provides powerful extensions to the standard datetime module."
+url="http://labix.org/python-dateutil"
+depends=('python')
+makedepends=('setuptools')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+up2date="lynx -dump $url|grep -m1 /python-dateutil-.*bz2|Flasttar"
+source=(http://labix.org/download/python-dateutil/python-dateutil-$pkgver.tar.bz2)
+sha1sums=('bf388800de42cfe932d22f5359b7b8b9150c8f23')
From vmiklos at frugalware.org  Tue Mar 11 12:48:56 2008
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Mar 11 12:48:58 2008
Subject: [Frugalware-git] frugalware-current: vobject-0.6.0-1-i686
Message-ID: <20080311114856.1A11B1190935@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=624c3d33b0b5d89804e2c054a96765b275e469be

commit 624c3d33b0b5d89804e2c054a96765b275e469be
Author: Miklos Vajna 
Date:   Tue Mar 11 12:48:45 2008 +0100

vobject-0.6.0-1-i686
- version bump
- depends() fix

diff --git a/source/devel-extra/vobject/FrugalBuild b/source/devel-extra/vobject/FrugalBuild
index 4ee426e..390f7ca 100644
--- a/source/devel-extra/vobject/FrugalBuild
+++ b/source/devel-extra/vobject/FrugalBuild
@@ -2,14 +2,14 @@
# Maintainer: AlexExtreme 

pkgname=vobject
-pkgver=0.5.0
+pkgver=0.6.0
pkgrel=1
pkgdesc="vobject is intended to be a full featured Python package for parsing and generating vCard and vCalendar files"
url="http://vobject.skyhouseconsulting.com/"
-depends=('python>=2.5')
+depends=('python-dateutil')
makedepends=('setuptools')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://vobject.skyhouseconsulting.com/history.html | grep -m1 'vobject.*released' | sed 's/.*vobject //' | sed 's/ released.*//'"
source=(http://vobject.skyhouseconsulting.com/$pkgname-$pkgver.tar.gz)
-sha1sums=('525b28ebafd4adf81c353993df5272b14b1c7c8b')
+sha1sums=('2f5f601ef0491940b225cce89e3fd482c4b04e01')
From crazy at frugalware.org  Tue Mar 11 13:02:44 2008
From: crazy at frugalware.org (crazy)
Date: Tue Mar 11 13:02:47 2008
Subject: [Frugalware-git] gcc43: ecj-3.2.2-1-i686
Message-ID: <20080311120244.20071119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9bf4a6956eaf4e11046caaa587a4799ab4d784b1

commit 9bf4a6956eaf4e11046caaa587a4799ab4d784b1
Author: crazy 
Date:   Tue Mar 11 12:58:06 2008 +0100

ecj-3.2.2-1-i686
* downgrade ( round 1 )
* ( but only from version , 3.3.1 package used 3.2.2 source heh )
* added comments on how to get the source and where to put it
* also added comments about the 3.3* series
* added fixup patches from vmiklos
* added force to the package

diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild
index a5561a5..48c51f5 100644
--- a/source/devel-extra/ecj/FrugalBuild
+++ b/source/devel-extra/ecj/FrugalBuild
@@ -2,25 +2,38 @@
# Maintainer: VMiklos 

pkgname=ecj
-pkgver=3.3.2
+pkgver=3.2.2
date=200802211800
-gccver=4.3.0
-pkgrel=2
+pkgrel=1
pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project."
url="http://www.eclipse.org/"
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'"
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip ecj-gcj.patch)
-sha1sums=('c9229f01f991777829279d9907069e81857516ca' \
-          '51bfaa1069ae5d0a81dee641fd8cfa093365d451')
+## NOTE: when you bump that package you should _NOT_ use the source as is from ecplipe because
+## it does not have any version and we end up to package it wrong.
+## Also when you bump this package create a new dir in sources/ecj on our ftp ( eg: 3.3.1 )
+## get the ecjsrc.zip from eclipse and 'be sure is the version you want to bump to' and move it
+## to be ecjsrc-$the_version.zip ( eg: ecjsrc-3.3.1.zip ) in that folder.
+## NOTE2: 3.3* series have some problems with gcj 4.3* , until we figure why do not bump
+## this package to any 3.3* series
+## If someone wonders why we drop back to 3.2.2 that is simply because we used 3.2.2 and not 3.3.1.1 =)
+## and this version does work.
+#source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip \
+source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgver/ecjsrc-$pkgver.zip \
+	ecj-gcj.patch ecj-square-bracket-classpath.diff)
+sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \
+          'e79f7ca323e4e5dac8b15f498626413ffb7977cb' \
+          '9824cc2be79d66e03705d89b3445400d097d52a6')
Finclude java
-makedepends=("gcc-gcj>=$gccver" "$pkgname>=3.3.2")
+options=('force')
+makedepends=("gcc-gcj")
+_F_cd_path="."

build()
{
+	Fpatchall
# this will be a separete package since these must be compiled with ecj
-	patch -p1 

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b572e25669d18d64428720ede2b1f2ee01ec7dfa

commit b572e25669d18d64428720ede2b1f2ee01ec7dfa
Author: crazy 
Date:   Tue Mar 11 13:03:41 2008 +0100

ecj-3.2.2-1-i686
* well it helps when you dg add the patch first ;)

diff --git a/source/devel-extra/ecj/ecj-square-bracket-classpath.diff b/source/devel-extra/ecj/ecj-square-bracket-classpath.diff
new file mode 100644
index 0000000..689b625
--- /dev/null
+++ b/source/devel-extra/ecj/ecj-square-bracket-classpath.diff
@@ -0,0 +1,103 @@
+diff -urN org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java
+--- org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java	2007-02-12 19:46:45.000000000 +0100
++++ org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java	2007-03-03 19:56:45.000000000 +0100
+@@ -2723,6 +2723,10 @@
+ 	ArrayList currentRuleSpecs = new ArrayList(defaultSize);
+ 	StringTokenizer tokenizer = new StringTokenizer(currentPath,
+ 			File.pathSeparator + "[]", true); //$NON-NLS-1$
++	ArrayList tokens = new ArrayList();
++	while (tokenizer.hasMoreTokens()) {
++		tokens.add(tokenizer.nextToken());
++	}
+ 	// state machine
+ 	final int start = 0;
+ 	final int readyToClose = 1;
+@@ -2737,14 +2741,20 @@
+ 	// 'path[' 'path1;path2['
+ 	final int rulesReadyToClose = 6;
+ 	// 'path[rule' 'path[rule1;rule2'
++	final int bracketOpened = 7;
++	// '.*[.*'
++	final int bracketClosed = 8;
++	// '.*([.*])+'
+ 	final int error = 99;
+ 	int state = start;
+ 	String token = null;
+-	while (tokenizer.hasMoreTokens() && state != error) {
+-		token = tokenizer.nextToken();
++    int cursor = 0, tokensNb = tokens.size(), bracket = -1;
++    while (cursor < tokensNb && state != error) {
++        token = (String) tokens.get(cursor++);
+ 		if (token.equals(File.pathSeparator)) {
+ 			switch (state) {
+ 			case start:
++	        case bracketOpened:
+ 				break;
+ 			case readyToClose:
+ 			case readyToCloseEndingWithRules:
+@@ -2757,14 +2767,21 @@
+ 			case rulesReadyToClose:
+ 				state = rulesNeedAnotherRule;
+ 				break;
++			case bracketClosed:
++				cursor = bracket + 1;
++				state = rulesStart;
++				break;
+ 			default:
+ 				state = error;
+ 			}
+ 		} else if (token.equals("[")) { //$NON-NLS-1$
+ 			switch (state) {
+ 			case readyToClose:
+-				state = rulesStart;
++				bracket = cursor - 1;
++			case bracketClosed:
++				state = bracketOpened;
+ 				break;
++			case bracketOpened:
+ 			default:
+ 				state = error;
+ 			}
+@@ -2773,6 +2790,10 @@
+ 			case rulesReadyToClose:
+ 				state = readyToCloseEndingWithRules;
+ 				break;
++			case bracketOpened:
++				state = bracketClosed;
++				break;
++			case bracketClosed:
+ 			default:
+ 				state = error;
+ 			}
+@@ -2789,10 +2810,22 @@
+ 				state = rulesReadyToClose;
+ 				currentRuleSpecs.add(token);
+ 				break;
++            case bracketClosed:
++                for (int i = bracket; i < cursor ; i++) {
++                	currentClasspathName += (String) tokens.get(i);
++                }
++			    state = readyToClose;
++			    break;
++			case bracketOpened:
++			    break;
+ 			default:
+ 				state = error;
+ 			}
+ 		}
++		if (state == bracketClosed && cursor == tokensNb) {
++			cursor = bracket + 1;
++			state = rulesStart;
++		}
+ 	}
+ 	switch(state) {
+ 		case readyToClose:
+@@ -2801,6 +2834,8 @@
+ 			addNewEntry(paths, currentClasspathName, currentRuleSpecs,
+ 				customEncoding, isSourceOnly);
+ 			break;
++        case bracketOpened:
++        case bracketClosed:
+ 		default :
+ 			// we go on anyway
+ 			this.logger.logIncorrectClasspath(currentPath);
From crazy at frugalware.org  Tue Mar 11 13:40:19 2008
From: crazy at frugalware.org (crazy)
Date: Tue Mar 11 13:40:23 2008
Subject: [Frugalware-git] gcc43: ecj-3.2.2-2-i686
Message-ID: <20080311124019.2F0C9119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ea4bccd34325398ed34a812215d78d01e9b2b3c9

commit ea4bccd34325398ed34a812215d78d01e9b2b3c9
Author: crazy 
Date:   Tue Mar 11 13:36:03 2008 +0100

ecj-3.2.2-2-i686
* release bump
* build against gcj43 ( jaja hack hack :p)
* added gccver
* changed gcj makedepends to  'gcc-gcj>=$gccver'
* added 'ecj=3.2.2' to makedepends ( do not change that for now )
* jar -> gjar

diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild
index 48c51f5..1073241 100644
--- a/source/devel-extra/ecj/FrugalBuild
+++ b/source/devel-extra/ecj/FrugalBuild
@@ -4,7 +4,8 @@
pkgname=ecj
pkgver=3.2.2
date=200802211800
-pkgrel=1
+gccver=4.3.0
+pkgrel=2
pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project."
url="http://www.eclipse.org/"
groups=('devel-extra')
@@ -27,7 +28,7 @@ sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \
'9824cc2be79d66e03705d89b3445400d097d52a6')
Finclude java
options=('force')
-makedepends=("gcc-gcj")
+makedepends=("gcc-gcj>=$gccver" "$pkgname=3.2.2")
_F_cd_path="."

build()
@@ -44,7 +45,7 @@ build()
gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1

find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
-		xargs jar cf eclipse-ecj.jar
+		xargs gjar cf eclipse-ecj.jar
Ffilerel /usr/share/java/eclipse-ecj.jar
Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \
$Fdestdir/usr/share/java/eclipse-ecj.jar
From crazy at frugalware.org  Tue Mar 11 19:16:54 2008
From: crazy at frugalware.org (crazy)
Date: Tue Mar 11 19:16:57 2008
Subject: [Frugalware-git] gcc43: gcc-4.3.0-4-i686
Message-ID: <20080311181654.95D87119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e2ee0afcc945470f7c5e6174176932a95866beec

commit e2ee0afcc945470f7c5e6174176932a95866beec
Author: crazy 
Date:   Tue Mar 11 18:46:07 2008 +0100

gcc-4.3.0-4-i686
* release bump
* added an patch to fix gjar problems with
* './' prefixes not being stripped at all.

diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index 4296981..b301b9c 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gcc
pkgver=4.3.0
-pkgrel=3
+pkgrel=4
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
depends=('binutils>=2.18.50.0.4-2' 'libstdc++' 'glibc>=2.7-3' 'mpfr>=2.3.1-2')
@@ -18,11 +18,12 @@ up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'"
#source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \
source=(ftp://ftp.gwdg.de/pub/misc/gcc/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 \
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2 \
-	README.Frugalware)
+	README.Frugalware gjar-prefix.patch)
#signatures=("$source.sig" '' '')
sha1sums=('d6ae7f024b99ba9b85f253fdeb00a9a1d6f1fc8d' \
'd3c9af69bb788334a67039bbe056606e8590a8a7' \
-          '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca')
+          '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca' \
+          '0a9fa719eac4fef5e0fe29014421110635c50dcd')

subpkgs=('libgcc' 'libstdc++' \
'libgnat' 'gcc-gnat' \
diff --git a/source/devel/gcc/gjar-prefix.patch b/source/devel/gcc/gjar-prefix.patch
new file mode 100644
index 0000000..20363af
--- /dev/null
+++ b/source/devel/gcc/gjar-prefix.patch
@@ -0,0 +1,36 @@
+diff -Naur gcc-4.3.0/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java gcc-4.3.0-p/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java
+--- gcc-4.3.0/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java	2006-06-09 18:07:07.000000000 +0200
++++ gcc-4.3.0-p/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java	2008-03-11 15:59:07.000000000 +0100
+@@ -1,5 +1,5 @@
+ /* Entry.java - represent a single file to write to a jar
+- Copyright (C) 2006 Free Software Foundation, Inc.
++ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+  This file is part of GNU Classpath.
+
+@@ -49,12 +49,22 @@
+   public Entry(File file, String name)
+   {
+     this.file = file;
+-    this.name = name;
++
++    /* Removes any './' prefixes automatically. Those caused trouble
++     * in (boot) classpath use-cases. See #32516.
++     */
++    int start = 0;
++    while (name.length() > start + 2
++           && name.codePointAt(start) == '.'
++           && name.codePointAt(start + 1) == File.separatorChar)
++      start += 2;
++
++    this.name = name.substring(start);
+   }
+
+   public Entry(File file)
+   {
+-    this.file = file;
+-    this.name = file.toString();
++    this(file, file.toString());
+   }
++
+ }
From hermier at frugalware.org  Tue Mar 11 19:17:03 2008
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Mar 11 19:17:04 2008
Subject: [Frugalware-git] homepage-ng: news_fr.xml
Message-ID: <20080311181703.378C0119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=7c01fb86a5176698496950c20b36c6031af625fa

commit 7c01fb86a5176698496950c20b36c6031af625fa
Author: Michel Hermier 
Date:   Tue Mar 11 19:15:25 2008 +0100

news_fr.xml
* Added news for the 0.8 release.

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index 6886588..072245b 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -17,6 +17,76 @@



+		91
+		Frugalware 0.8rc2 (Kalgan) pour i686 est disponible
+		Mon Mar 11 07:16:05 CET 2008
+		VMiklos
+		0
+		announcer la sortie de Frugalware 0.8, notre huitième version stable.

+			Aucune nouveauté n'a été ajoutée depuis 0.8rc2, mais plus de 300 changements ont étés éffectués pour corriger des problèmes mineurs.
+			Si vous n'avez pas suivis les changement pendant les versions pre/rc, voici les changements les plus important depuis la version 0.7:

+			
    
+				
  • Mise à jour de la base du système: Linux kernel 2.6.24.3, Glibc 2.7 et GCC 4.2.3
    • 
+				
  • Mise à jour des paquets de bureaux: KDE 3.5.9, GNOME 2.20, XFCE 4.4.2, OpenOffice.org 2.4rc2 (ooo-build 2.4.0) et Firefox 2.0.0.12
    • 
+				
  • Configuration: Support de WPA, support de neouvelles langues: Tchèque.
    • 
+				
  • Nouvel outil graphique: FUN (notificateur de mise à jour).
    • 
+				
  • 4068 changements, incluant 251 nouveaux paquets, 1729 paquets mis à jour et 416 tâches fermées.
    • 
+			

+			Veuillez vous référer à la Frugalware Kalgan ChangeLog pour plus d'information.

+			Téléchargements pour i686:

+				livecd,
+				netinstall,
+				cd1,
+				cd2,
+				cd3,
+				cd4,
+				cd5,
+				cd6,
+				cd7,
+				cd8,
+				cd9,
+				cd10,
+				cd11,
+				cd12,
+				cd13,
+				cd14,
+				dvd1,
+				dvd2,
+				tftp,
+				usb,
+				chroot tarball
+			

+			NOTE: Cliquez ici pour avoir plus d'information pour choisir le media dont vous avez besoin pour l'installation.

+			SHA1SUMs:
+			
+86a7629a794fbb799b412f1da6f43b119c79138a  frugalware-0.8-i686-cd1.iso
+5de9f070fd8e940853e58063112bb9576322a3e2  frugalware-0.8-i686-cd2.iso
+1409dcf8f7e81664f4a3a84d607898c06bcbfb1c  frugalware-0.8-i686-cd3.iso
+a705f4662f3d7931e47dcb88f8af6574fa39ae3e  frugalware-0.8-i686-cd4.iso
+d612aa3851b5c4f382e0a0dfb5cbbc0d27230ce3  frugalware-0.8-i686-cd5.iso
+a473a3338220d22d65249c391ba30161d4e2c50a  frugalware-0.8-i686-cd6.iso
+588349db788e39541c663d5332626118fd3232ea  frugalware-0.8-i686-cd7.iso
+84a6526bebb5de2729897fcc2823386ca6f3673e  frugalware-0.8-i686-cd8.iso
+c7d66707fcbef326193a6e427862961b3bb8ec56  frugalware-0.8-i686-cd9.iso
+716af41f46cc0d4ffc05c00e206a265438bddab3  frugalware-0.8-i686-cd10.iso
+dc9721be7a6dcca936d65c2bda749684fd6d3d4b  frugalware-0.8-i686-cd11.iso
+d7ef389858311e4cbb5db07236e4663f4e77bf07  frugalware-0.8-i686-cd12.iso
+da90575c20185d608ab051e6c6b9fb583f8ff303  frugalware-0.8-i686-cd13.iso
+a8dec5db845ddeb195009d5b64c24dcfe42497b2  frugalware-0.8-i686-cd14.iso
+2925f86d9c1c6e6e63e6533f0673de4fea09d437  frugalware-0.8-i686-dvd1.iso
+9e09729d9a4c93c09cece38e2679163c11c57a45  frugalware-0.8-i686-dvd2.iso
+b1c645170fdbf6e57b746f4b6185687a84784a0f  frugalware-0.8-i686-net.iso
+ef68c4d3353ff104ad59725743e9f11b63703323  fwlive-0.8-i686-full.iso
+34dd50fc34315d73f7289ab887b23328d5950f04  frugalware-0.8-i686-tftp.img.gz
+fb2079de1627ca0e65a323005e0644b88fed6d03  frugalware-0.8-i686-usb.tar.gz
+			

+			Si vous mettez vers Kalgan depuis notre version stable précédente (Sayshell), veuillez lire la partie mise à jour de notre documentation.

+			En cadeau spécial pour cette version, vous pouvez essayer Kalgan dans qemu ou virtualbox sans l'installer!

+			]]>
+		
+	
+	
90
Lettre d'information Frugalware numéro 17
Sat Mar 1 16:30:13 CET 2008
@@ -110,7 +180,7 @@
cd14,
dvd1 et
dvd2
-				

+			

SHA1SUMS:

c6a7ad4f5afc586c76f2c65219daf618d2d3813f  frugalware-0.8rc2-i686-cd1.iso
From hermier at frugalware.org  Tue Mar 11 19:44:17 2008
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Mar 11 19:44:19 2008
Subject: [Frugalware-git] frugalware-current: azureus-3.0.5.0-1-i686
Message-ID: <20080311184417.02E9F119053C@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0b992c5b72bdaeba13f5525a2192b03f9364179

commit b0b992c5b72bdaeba13f5525a2192b03f9364179
Author: Michel Hermier 
Date:   Tue Mar 11 19:42:15 2008 +0100

azureus-3.0.5.0-1-i686
* Bump to last version.

diff --git a/source/xapps-extra/azureus/FrugalBuild b/source/xapps-extra/azureus/FrugalBuild
index b7ae359..d07f607 100644
--- a/source/xapps-extra/azureus/FrugalBuild
+++ b/source/xapps-extra/azureus/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Shrift 

pkgname=azureus
-pkgver=3.0.4.2
+pkgver=3.0.5.0
pkgrel=1
pkgdesc="A Java BitTorrent Client"
depends=()
@@ -13,9 +13,9 @@ archs=('i686' 'x86_64')
_F_sourceforge_prefix=azureus-
Finclude sourceforge
[ "$CARCH" == "i686" ] && _arch="" && \
-	sha1sums=('e65afb621e80342271a94e15fe0d5a71148a5af3')
+	sha1sums=('2704fa345d48f85565fb33904b9156a64453ce45')
[ "$CARCH" == "x86_64" ] && _arch=-x86_64 && \
-	sha1sums=('4cc8afa28dccca976ccc779bea9f29dbb4f5b1f8')
+	sha1sums=('bbf2d305d53ea9c4a28470bc4836d3a3aac7525a')
source=(${source%az*}/Azureus_$pkgver'_'linux$_arch.tar.bz2 $pkgname.desktop)
sha1sums=(${sha1sums[@]} '7fbddde5f38583716cd3868a91064fcb6d1d56c8')
From hermier at frugalware.org  Tue Mar 11 19:44:16 2008
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Mar 11 19:44:21 2008
Subject: [Frugalware-git] frugalware-current: linuxwacom-0.7.9_8-1-i686
Message-ID: <20080311184416.EE105119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f18e487aaf6d97a1495d240fec27869b95d0f786

commit f18e487aaf6d97a1495d240fec27869b95d0f786
Author: Michel Hermier 
Date:   Tue Mar 11 19:41:10 2008 +0100

linuxwacom-0.7.9_8-1-i686
* Bump to last devel release.

diff --git a/source/x11-extra/linuxwacom/FrugalBuild b/source/x11-extra/linuxwacom/FrugalBuild
index fdc9f6d..7ddcd4f 100644
--- a/source/x11-extra/linuxwacom/FrugalBuild
+++ b/source/x11-extra/linuxwacom/FrugalBuild
@@ -2,20 +2,20 @@
# Maintainer: VMiklos 

pkgname=linuxwacom
-pkgver=0.7.9_7
+pkgver=0.7.9_8
pkgrel=1
pkgdesc="Drivers, libraries, and doc for configuring and running Wacom tablets."
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
# ugly. the original up2date is correct but atm we need the devel version
-up2date="$up2date |sed 's/0.7.8_3/0.7.9_7/'"
+up2date="$up2date |sed 's/0.7.8_3/0.7.9_8/'"
depends=('xorg-server>=1.4.0.90' 'ncurses' 'libxi>=1.1.3')
makedepends=('tk' 'inputproto' 'randrproto')
rodepends=('udev')
groups=('x11-extra')
archs=('i686')
source=($source check_driver{,.1} 60-wacom.rules)
-sha1sums=('a5f7f15e721e9fc327737bcd24b84e3883a9146f' \
+sha1sums=('dd27757ee9b434c593cf98a677cf000df8faafa3' \
'12ae37807a03f36be2c5cc47e444475677b41693' \
'7adf948f2d6f29635e80f4cc336799b7962d2a9a' \
'075411d58a7915c194bd25a866babbed1d0a1127')
From priyank at frugalware.org  Tue Mar 11 20:17:25 2008
From: priyank at frugalware.org (Priyank)
Date: Tue Mar 11 20:17:27 2008
Subject: [Frugalware-git] homepage-ng: added new screenshots for 0.8
Message-ID: <20080311191725.12883119053B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=1836a81ce06621940865ed7351c6f60f50c69024

commit 1836a81ce06621940865ed7351c6f60f50c69024
Author: Priyank 
Date:   Wed Mar 12 00:45:15 2008 +0530

added new screenshots for 0.8

diff --git a/frugalware/screenshots.php b/frugalware/screenshots.php
index f6be1bb..7bfb890 100644
--- a/frugalware/screenshots.php
+++ b/frugalware/screenshots.php
@@ -98,38 +98,64 @@ $shots[inst][33][name]="34_mouse.png";
$shots[inst][33][title]=gettext("34_mouse.png");
$shots[inst][34][name]="35_success.png";
$shots[inst][34][title]=gettext("35_success.png");
-$shots[defdesk][0][name]="01_grub.png";
-$shots[defdesk][0][title]=gettext("01_grub.png");
-$shots[defdesk][1][name]="02_boot.png";
-$shots[defdesk][1][title]=gettext("02_boot.png");
-$shots[defdesk][2][name]="03_boot.png";
-$shots[defdesk][2][title]=gettext("03_boot.png");
-$shots[defdesk][3][name]="04_boot.png";
-$shots[defdesk][3][title]=gettext("04_boot.png");
-$shots[defdesk][4][name]="05_console.png";
-$shots[defdesk][4][title]=gettext("05_console.png");
-$shots[defdesk][5][name]="06_console.png";
-$shots[defdesk][5][title]=gettext("06_console.png");
-$shots[defdesk][6][name]="08_kde_login.png";
-$shots[defdesk][6][title]=gettext("08_kde_login.png");
-$shots[defdesk][7][name]="09_kde.png";
-$shots[defdesk][7][title]=gettext("09_kde.png");
-$shots[defdesk][8][name]="10_kde_menu.png";
-$shots[defdesk][8][title]=gettext("10_kde_menu.png");
-$shots[defdesk][9][name]="11_gdm.png";
-$shots[defdesk][9][title]=gettext("11_gdm.png");
-$shots[defdesk][10][name]="13_gnome.png";
-$shots[defdesk][10][title]=gettext("13_gnome.png");
-$shots[defdesk][11][name]="14_gnome_menu.png";
-$shots[defdesk][11][title]=gettext("14_gnome_menu.png");
-$shots[defdesk][12][name]="15_gnome_menu.png";
-$shots[defdesk][12][title]=gettext("15_gnome_menu.png");
-$shots[defdesk][13][name]="16_gnome_menu.png";
-$shots[defdesk][13][title]=gettext("16_gnome_menu.png");
-$shots[defdesk][14][name]="17_package_manager.png";
-$shots[defdesk][14][title]=gettext("17_package_manager.png");
-$shots[defdesk][15][name]="18_runlevel_editor.png";
-$shots[defdesk][15][title]=gettext("18_runlevel_editor.png");
+
+$shots[startup][0][name]="01_grub.png";
+$shots[startup][0][title]=gettext("01_grub.png");
+$shots[startup][1][name]="02_boot.png";
+$shots[startup][1][title]=gettext("02_boot.png");
+$shots[startup][2][name]="03_boot.png";
+$shots[startup][2][title]=gettext("03_boot.png");
+$shots[startup][3][name]="04_boot.png";
+$shots[startup][3][title]=gettext("04_boot.png");
+$shots[startup][4][name]="05_console.png";
+$shots[startup][4][title]=gettext("05_console.png");
+$shots[startup][5][name]="06_console.png";
+$shots[startup][5][title]=gettext("06_console.png");
+
+$shots[kde][0][name]="08_kde_login.png";
+$shots[kde][0][title]=gettext("08_kde_login.png");
+$shots[kde][1][name]="09_kde.png";
+$shots[kde][1][title]=gettext("09_kde.png");
+$shots[kde][2][name]="10_kde_menu.png";
+$shots[kde][2][title]=gettext("10_kde_menu.png");
+
+$shots[gnome][0][name]="01_gnome_gdm.png";
+$shots[gnome][0][title]=gettext("GDM Login Screen");
+$shots[gnome][1][name]="02_gnome_desktop.png";
+$shots[gnome][1][title]=gettext("Gnome Desktop 1");
+$shots[gnome][2][name]="03_gnome_desktop.png";
+$shots[gnome][2][title]=gettext("Gnome Desktop 2");
+$shots[gnome][3][name]="04_gnome_desktop.png";
+$shots[gnome][3][title]=gettext("Gnome Desktop 3");
+$shots[gnome][4][name]="05_gnome_desktop.png";
+$shots[gnome][4][title]=gettext("Gnome Desktop 4");
+
+$shots[xfce][0][name]="01_xfce_desktop.png";
+$shots[xfce][0][title]=gettext("XFCE Desktop 1");
+$shots[xfce][1][name]="02_xfce_desktop.png";
+$shots[xfce][1][title]=gettext("XFCE Desktop 2");
+$shots[xfce][2][name]="03_xfce_desktop.png";
+$shots[xfce][2][title]=gettext("XFCE Desktop 3");
+$shots[xfce][3][name]="04_xfce_desktop.png";
+$shots[xfce][3][title]=gettext("XFCE Desktop 4");
+$shots[xfce][4][name]="05_xfce_desktop.png";
+$shots[xfce][4][title]=gettext("XFCE Desktop 5");
+
+$shots[gfpm][0][name]="01_gfpm.png";
+$shots[gfpm][0][title]=gettext("01_gfpm.png");
+$shots[gfpm][1][name]="02_gfpm.png";
+$shots[gfpm][1][title]=gettext("02_gfpm.png");
+$shots[gfpm][2][name]="03_gfpm.png";
+$shots[gfpm][2][title]=gettext("03_gfpm.png");
+$shots[gfpm][3][name]="04_gfpm.png";
+$shots[gfpm][3][title]=gettext("04_gfpm.png");
+$shots[gfpm][4][name]="05_gfpm.png";
+$shots[gfpm][4][title]=gettext("05_gfpm.png");
+$shots[gfpm][5][name]="06_gfpm.png";
+$shots[gfpm][5][title]=gettext("06_gfpm.png");
+
+$shots[runleveled][15][name]="18_runlevel_editor.png";
+$shots[runleveled][15][title]=gettext("18_runlevel_editor.png");

// include the config and let's start page
include("config.inc.php");
@@ -144,12 +170,52 @@ for ($i=0; $i".$shots[inst][$i][title]."
\n"; } $maincont .= "\n
\n"; -$maincont .= "".gettext("Default Desktop")."\n"; -for ($i=0; $i\n"; +for ($i=0; $i". + "\"screenshot\"". + "
".$shots[startup][$i][title]."\n"; +} +$maincont .= "
\n
\n"; +$maincont .= "".gettext("KDE Desktop")."\n"; +for ($i=0; $i". + "\"screenshot\"". + "
".$shots[kde][$i][title]."\n"; +} +$maincont .= "
\n
\n"; +$maincont .= "".gettext("GNOME Desktop")."\n"; +for ($i=0; $i". + "\"screenshot\"". + "
".$shots[gnome][$i][title]."\n"; +} +$maincont .= "
\n
\n"; +$maincont .= "".gettext("XFCE Desktop")."\n"; +for ($i=0; $i". + "\"screenshot\"". + "
".$shots[xfce][$i][title]."\n"; +} +$maincont .= "
\n
\n"; +$maincont .= "".gettext("GFpm (Package Manager)")."\n"; +for ($i=0; $i". + "\"screenshot\"". + "
".$shots[gfpm][$i][title]."\n"; +} +$maincont .= "
\n
\n"; +$maincont .= "".gettext("FUN (Update Notifier)")."\n"; +for ($i=0; $i". - "\"screenshot\"". - "
".$shots[defdesk][$i][title]."\n"; + $maincont .= "
". + "\"screenshot\"". + "
".$shots[fun][$i][title]."
\n"; } $maincont .= "
\n\n"; From priyank at frugalware.org Tue Mar 11 20:22:43 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 11 20:22:45 2008 Subject: [Frugalware-git] homepage-ng: fixed paths for the new screenshots and some old ones Message-ID: <20080311192243.E0A92119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=8456033aa17776547b975c52e8ff971b63588942 commit 8456033aa17776547b975c52e8ff971b63588942 Author: Priyank Date: Wed Mar 12 00:51:20 2008 +0530 fixed paths for the new screenshots and some old ones diff --git a/frugalware/screenshots.php b/frugalware/screenshots.php index 7bfb890..102a5cb 100644 --- a/frugalware/screenshots.php +++ b/frugalware/screenshots.php @@ -173,48 +173,48 @@ $maincont .= "\n
\n"; $maincont .= "".gettext("Startup")."\n"; for ($i=0; $i". - "\"screenshot\"". + $maincont .= "
". + "\"screenshot\"". "
".$shots[startup][$i][title]."
\n"; } $maincont .= "
\n
\n"; $maincont .= "".gettext("KDE Desktop")."\n"; for ($i=0; $i". - "\"screenshot\"". + $maincont .= "
". + "\"screenshot\"". "
".$shots[kde][$i][title]."
\n"; } $maincont .= "
\n
\n"; $maincont .= "".gettext("GNOME Desktop")."\n"; for ($i=0; $i". - "\"screenshot\"". + $maincont .= "
". + "\"screenshot\"". "
".$shots[gnome][$i][title]."
\n"; } $maincont .= "
\n
\n"; $maincont .= "".gettext("XFCE Desktop")."\n"; for ($i=0; $i". - "\"screenshot\"". + $maincont .= "
". + "\"screenshot\"". "
".$shots[xfce][$i][title]."
\n"; } $maincont .= "
\n
\n"; $maincont .= "".gettext("GFpm (Package Manager)")."\n"; for ($i=0; $i". - "\"screenshot\"". + $maincont .= "
". + "\"screenshot\"". "
".$shots[gfpm][$i][title]."
\n"; } $maincont .= "
\n
\n"; $maincont .= "".gettext("FUN (Update Notifier)")."\n"; for ($i=0; $i". - "\"screenshot\"". + $maincont .= "
". + "\"screenshot\"". "
".$shots[fun][$i][title]."
\n"; } $maincont .= "
\n\n"; From priyank at frugalware.org Tue Mar 11 20:34:53 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 11 20:34:55 2008 Subject: [Frugalware-git] homepage-ng: added screenshots for FUN and modified the description of some screenshots Message-ID: <20080311193453.E6EC0119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=ad1b9d0f4932388bf02d1cff37641cfaaa8969ed commit ad1b9d0f4932388bf02d1cff37641cfaaa8969ed Author: Priyank Date: Wed Mar 12 01:03:49 2008 +0530 added screenshots for FUN and modified the description of some screenshots diff --git a/frugalware/screenshots.php b/frugalware/screenshots.php index 102a5cb..c2afb17 100644 --- a/frugalware/screenshots.php +++ b/frugalware/screenshots.php @@ -122,37 +122,44 @@ $shots[kde][2][title]=gettext("10_kde_menu.png"); $shots[gnome][0][name]="01_gnome_gdm.png"; $shots[gnome][0][title]=gettext("GDM Login Screen"); $shots[gnome][1][name]="02_gnome_desktop.png"; -$shots[gnome][1][title]=gettext("Gnome Desktop 1"); +$shots[gnome][1][title]=gettext("Default Gnome Desktop"); $shots[gnome][2][name]="03_gnome_desktop.png"; -$shots[gnome][2][title]=gettext("Gnome Desktop 2"); +$shots[gnome][2][title]=gettext("Gnome Menu"); $shots[gnome][3][name]="04_gnome_desktop.png"; -$shots[gnome][3][title]=gettext("Gnome Desktop 3"); +$shots[gnome][3][title]=gettext("Web Browser"); $shots[gnome][4][name]="05_gnome_desktop.png"; -$shots[gnome][4][title]=gettext("Gnome Desktop 4"); +$shots[gnome][4][title]=gettext("File Manager"); $shots[xfce][0][name]="01_xfce_desktop.png"; -$shots[xfce][0][title]=gettext("XFCE Desktop 1"); +$shots[xfce][0][title]=gettext("Default XFCE Desktop"); $shots[xfce][1][name]="02_xfce_desktop.png"; -$shots[xfce][1][title]=gettext("XFCE Desktop 2"); +$shots[xfce][1][title]=gettext("XFCE in Action"); $shots[xfce][2][name]="03_xfce_desktop.png"; -$shots[xfce][2][title]=gettext("XFCE Desktop 3"); +$shots[xfce][2][title]=gettext("XFCE Menu"); $shots[xfce][3][name]="04_xfce_desktop.png"; -$shots[xfce][3][title]=gettext("XFCE Desktop 4"); +$shots[xfce][3][title]=gettext("XFCE Settings Manager"); $shots[xfce][4][name]="05_xfce_desktop.png"; -$shots[xfce][4][title]=gettext("XFCE Desktop 5"); +$shots[xfce][4][title]=gettext("XFCE Terminal"); $shots[gfpm][0][name]="01_gfpm.png"; -$shots[gfpm][0][title]=gettext("01_gfpm.png"); +$shots[gfpm][0][title]=gettext("Gfpm"); $shots[gfpm][1][name]="02_gfpm.png"; -$shots[gfpm][1][title]=gettext("02_gfpm.png"); +$shots[gfpm][1][title]=gettext("Gfpm Synchronizing"); $shots[gfpm][2][name]="03_gfpm.png"; -$shots[gfpm][2][title]=gettext("03_gfpm.png"); +$shots[gfpm][2][title]=gettext("Repository Manager"); $shots[gfpm][3][name]="04_gfpm.png"; -$shots[gfpm][3][title]=gettext("04_gfpm.png"); +$shots[gfpm][3][title]=gettext("Servers Manager"); $shots[gfpm][4][name]="05_gfpm.png"; -$shots[gfpm][4][title]=gettext("05_gfpm.png"); +$shots[gfpm][4][title]=gettext("Optimizing Package Database"); $shots[gfpm][5][name]="06_gfpm.png"; -$shots[gfpm][5][title]=gettext("06_gfpm.png"); +$shots[gfpm][5][title]=gettext("Log Viewer"); + +$shots[fun][0][name]="01_fun.png"; +$shots[fun][0][title]=gettext("Update Notification"); +$shots[fun][1][name]="02_fun.png"; +$shots[fun][1][title]=gettext("FUN Main Window"); +$shots[fun][2][name]="03_fun.png"; +$shots[fun][2][title]=gettext("Preferences Window"); $shots[runleveled][15][name]="18_runlevel_editor.png"; $shots[runleveled][15][title]=gettext("18_runlevel_editor.png"); From crazy at frugalware.org Tue Mar 11 20:46:40 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 20:46:41 2008 Subject: [Frugalware-git] gcc43: fastjar-0.94-1-i686 Message-ID: <20080311194640.260F3119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=8ef04e61bb70a831029d6130a00c6f9d8378d926 commit 8ef04e61bb70a831029d6130a00c6f9d8378d926 Author: crazy Date: Tue Mar 11 20:45:53 2008 +0100 fastjar-0.94-1-i686 * New package diff --git a/source/devel-extra/fastjar/FrugalBuild b/source/devel-extra/fastjar/FrugalBuild new file mode 100644 index 0000000..8703f58 --- /dev/null +++ b/source/devel-extra/fastjar/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 2.55 SBU +# Maintainer: crazy + +pkgname=fastjar +pkgver=0.94 +pkgrel=1 +pkgdesc="Fastjar is an implementation of Sun's jar utility" +depends=('zlib>=1.2.3-5') +groups=('devel-extra') +archs=('i686' 'x86_64') +Finclude sourceforge +sha1sums=('2b54b558bed1acef63455b27827b69e83c823f8d') + +# optimization OK + From priyank at frugalware.org Tue Mar 11 20:48:24 2008 From: priyank at frugalware.org (Priyank) Date: Tue Mar 11 20:48:26 2008 Subject: [Frugalware-git] homepage-ng: fixed name for gdm screenshot Message-ID: <20080311194824.8F8DE119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d0c1f46dea20dc675701769f28b2548c03d7da05 commit d0c1f46dea20dc675701769f28b2548c03d7da05 Author: Priyank Date: Wed Mar 12 01:17:29 2008 +0530 fixed name for gdm screenshot diff --git a/frugalware/screenshots.php b/frugalware/screenshots.php index c2afb17..5736f3c 100644 --- a/frugalware/screenshots.php +++ b/frugalware/screenshots.php @@ -119,7 +119,7 @@ $shots[kde][1][title]=gettext("09_kde.png"); $shots[kde][2][name]="10_kde_menu.png"; $shots[kde][2][title]=gettext("10_kde_menu.png"); -$shots[gnome][0][name]="01_gnome_gdm.png"; +$shots[gnome][0][name]="01_gdm.png"; $shots[gnome][0][title]=gettext("GDM Login Screen"); $shots[gnome][1][name]="02_gnome_desktop.png"; $shots[gnome][1][title]=gettext("Default Gnome Desktop"); From crazy at frugalware.org Tue Mar 11 20:51:23 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 20:51:23 2008 Subject: [Frugalware-git] gcc43: java-gcj-compat-1.0.77-2-i686 Message-ID: <20080311195123.0139A119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e338d02c1aa397d9e8b07cf1f2287b9e7d2d92e3 commit e338d02c1aa397d9e8b07cf1f2287b9e7d2d92e3 Author: crazy Date: Tue Mar 11 20:50:30 2008 +0100 java-gcj-compat-1.0.77-2-i686 * relbump * droped the patch for now from source ( not yet removed ) * added fastjar to depends diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index 6f0e913..2606278 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -3,21 +3,20 @@ pkgname=java-gcj-compat pkgver=1.0.77 -pkgrel=1 +pkgrel=2 gccver=4.3.0 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" -depends=("libgcj=$gccver" 'gjdoc') +depends=("libgcj=$gccver" 'gjdoc' 'fastjar') makedepends=("gcc-gcj=$gccver" 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://sources.redhat.com/pub/rhug/java-gcj-compat-$pkgver.tar.gz \ - java-gcj.sh symlink-gjar-fastjar-is-gone-since-gcc4.2.patch) + java-gcj.sh) sha1sums=('07b4058ed0a254462d5196fee91e660d434f84ec' \ - '73c1f3cc2db4f63cb051e65f0c664358289e9f13' \ - 'f3cd78dde7169bfe841943ae508f5a073e2fc4e7') + '73c1f3cc2db4f63cb051e65f0c664358289e9f13') build() { From crazy at frugalware.org Tue Mar 11 21:04:44 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 21:04:45 2008 Subject: [Frugalware-git] gcc43: ecj-3.2.2-3-i686 Message-ID: <20080311200444.036E8119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=53e476d7d5c383c171cffbaf04460bab147edee5 commit 53e476d7d5c383c171cffbaf04460bab147edee5 Author: crazy Date: Tue Mar 11 21:03:20 2008 +0100 ecj-3.2.2-3-i686 * hack bump again diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index 1073241..b62d16f 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -5,7 +5,7 @@ pkgname=ecj pkgver=3.2.2 date=200802211800 gccver=4.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') @@ -20,6 +20,8 @@ up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release| ## this package to any 3.3* series ## If someone wonders why we drop back to 3.2.2 that is simply because we used 3.2.2 and not 3.3.1.1 =) ## and this version does work. +## NOTE3: Before you push an new update please _check_ if is working , to make a broken version +## compile again is a lot work #source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip \ source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgver/ecjsrc-$pkgver.zip \ ecj-gcj.patch ecj-square-bracket-classpath.diff) @@ -28,7 +30,7 @@ sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java options=('force') -makedepends=("gcc-gcj>=$gccver" "$pkgname=3.2.2") +makedepends=("gcc-gcj") _F_cd_path="." build() @@ -45,7 +47,7 @@ build() gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1 find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \ - xargs gjar cf eclipse-ecj.jar + xargs jar cf eclipse-ecj.jar Ffilerel /usr/share/java/eclipse-ecj.jar Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar From crazy at frugalware.org Tue Mar 11 21:26:13 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 21:26:15 2008 Subject: [Frugalware-git] gcc43: ecj-3.2.2-4-i686 Message-ID: <20080311202613.AE8B5119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=853e51f086317b1bbd0494cd6ff9e148daf0e437 commit 853e51f086317b1bbd0494cd6ff9e148daf0e437 Author: crazy Date: Tue Mar 11 21:24:22 2008 +0100 ecj-3.2.2-4-i686 * build against right tree * added java-gcj-compat>=1.0.77-2 to makedepends diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index b62d16f..56cccef 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -5,7 +5,7 @@ pkgname=ecj pkgver=3.2.2 date=200802211800 gccver=4.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') @@ -30,7 +30,7 @@ sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java options=('force') -makedepends=("gcc-gcj") +makedepends=("gcc-gcj>=$gccver" "ecj>=3.2.2-3" "java-gcj-compat>=1.0.77-2") _F_cd_path="." build() From crazy at frugalware.org Tue Mar 11 21:36:11 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 21:36:21 2008 Subject: [Frugalware-git] gcc43: pacman-g2-3.6.8-4-i686 Message-ID: <20080311203612.1593F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a3a61a628fd35ccfb91db15068f993046f5a39eb commit a3a61a628fd35ccfb91db15068f993046f5a39eb Author: crazy Date: Tue Mar 11 21:35:22 2008 +0100 pacman-g2-3.6.8-4-i686 * rebuild diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 4dec62a..8498c6c 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -6,12 +6,12 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 pkgver=3.6.8 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=3 +pkgrel=4 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) -depends=('libarchive>=2.0.27' 'glibc>=2.7' 'grep' 'util-linux-ng') -makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \ +depends=('libarchive>=2.4.8-2' 'glibc>=2.7-3' 'grep>=2.5.3-3' 'util-linux-ng>=2.13.1-2') +makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat>=1.0.77-2' 'ecj>=3.2.2-4' 'mono' \ 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') Finclude mono From crazy at frugalware.org Tue Mar 11 21:43:36 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 21:43:46 2008 Subject: [Frugalware-git] gcc43: dialog-1.1_20071028-2-i686 Message-ID: <20080311204336.8530F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=2a87fdf3583bace6347676cda11e49e3796e4c9d commit 2a87fdf3583bace6347676cda11e49e3796e4c9d Author: crazy Date: Tue Mar 11 21:43:04 2008 +0100 dialog-1.1_20071028-2-i686 * rebuild diff --git a/source/base/dialog/FrugalBuild b/source/base/dialog/FrugalBuild index 5e820e1..f8aed73 100644 --- a/source/base/dialog/FrugalBuild +++ b/source/base/dialog/FrugalBuild @@ -3,10 +3,10 @@ pkgname=dialog pkgver=1.1_20071028 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to display dialog boxes from shell scripts" url="http://invisible-island.net/dialog/dialog.html" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump ftp://invisible-island.net/dialog/|grep tgz$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;$ p'" From vmiklos at frugalware.org Tue Mar 11 21:47:17 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Mar 11 21:47:22 2008 Subject: [Frugalware-git] frugalware-current: git-1.5.4.4-1-i686 Message-ID: <20080311204717.88185119053A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28bfefffe9bfab9e543fe4a3279b7c56f60d30d2 commit 28bfefffe9bfab9e543fe4a3279b7c56f60d30d2 Author: Miklos Vajna Date: Tue Mar 11 21:46:46 2008 +0100 git-1.5.4.4-1-i686 - version bump - some cleanup diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index f2e24a3..7d24353 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -8,7 +8,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=1.5.4.3 +pkgver=1.5.4.4 Fuse $USE_DEVEL && pkgver=1.5.4.rc5 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." @@ -55,19 +55,15 @@ build() # don't install the source of the manpages Fsed '\t\*.txt ' '\t' Documentation/install-webdoc.sh - # fix the path of html manpages - Fsed 'htmldir=$(sharedir)/doc/git-doc' "htmldir=\$(sharedir)/doc/git-$pkgver" Makefile - if ! Fuse $USE_HTMLMAN; then # we don't need the html version of manpages Fsed '^DOC_HTML=.*' 'DOC_HTML=' Documentation/Makefile fi Fconf - make V=1 CLFAGS="$CFLAGS" ASCIIDOC8=YesPlease \ - ETC_GITCONFIG=/etc/gitconfig DOCBOOK2X_TEXI=docbook2texi \ - all doc info test || return 1 - Fmakeinstall install-doc install-info ETC_GITCONFIG=/etc/gitconfig mandir=/usr/share/man + build_settings="V=1 ETC_GITCONFIG=/etc/gitconfig htmldir=/usr/share/doc/$pkgname-$pkgver mandir=/usr/share/man" + make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc info test || return 1 + Fmakeinstall $build_settings install-doc install-info Ffilerel perl/private-Error.pm /usr/lib/perl5/site_perl/current/Error.pm make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver install-webdoc || return 1 # broken symlink From crazy at frugalware.org Tue Mar 11 21:48:34 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 21:48:36 2008 Subject: [Frugalware-git] gcc43: frugalwareutils-0.7.9-2-i686 Message-ID: <20080311204834.2BBEE1190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=d34c9b71617c14162cd92fd8131444ea10243227 commit d34c9b71617c14162cd92fd8131444ea10243227 Author: crazy Date: Tue Mar 11 21:48:06 2008 +0100 frugalwareutils-0.7.9-2-i686 * rebuild diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 7c4b3e7..248e969 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -3,11 +3,11 @@ pkgname=frugalwareutils pkgver=0.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" -depends=('glib2' 'ncurses' 'parted>=1.8.8' 'pacman-g2>=3.5.1') -makedepends=('dialog>=1.0_20051030-3' 'doxygen' 'asciidoc' 'docbook-xsl' \ +depends=('glib2>=2.14.6-2' 'ncurses>=5.6-3' 'parted>=1.8.8-2' 'pacman-g2>=3.6.8-4') +makedepends=('dialog>=1.1_20071028-2' 'doxygen' 'asciidoc' 'docbook-xsl' \ 'docbook-xml' 'sgml-common' 'po4a') groups=('base') archs=('i686' 'x86_64') From crazy at frugalware.org Tue Mar 11 21:58:08 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 21:58:17 2008 Subject: [Frugalware-git] gcc43: cpio-2.9-3-i686 Message-ID: <20080311205808.491141190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b8848677afe44c2b4c4c5d4521146be44e9a3610 commit b8848677afe44c2b4c4c5d4521146be44e9a3610 Author: crazy Date: Tue Mar 11 21:57:30 2008 +0100 cpio-2.9-3-i686 * rebuild * added gcc43 patch * depends fix diff --git a/source/base/cpio/FrugalBuild b/source/base/cpio/FrugalBuild index c39faeb..af7fcc2 100644 --- a/source/base/cpio/FrugalBuild +++ b/source/base/cpio/FrugalBuild @@ -3,17 +3,18 @@ pkgname=cpio pkgver=2.9 -pkgrel=2 +pkgrel=3 pkgdesc="A program to manage archives of files" url="http://www.gnu.org/software/cpio" -depends=('bash') +depends=('bash' 'glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnubz2 source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 \ - cpio-2.9-safer_name_suffix.patch) + cpio-2.9-safer_name_suffix.patch gcc43.patch) sha1sums=('ef381d0f33f1ea74475b6d813c42a74327762c4a' \ - '0c052bd7900bc8a39b74f36feab2d2358297f87b') + '0c052bd7900bc8a39b74f36feab2d2358297f87b' \ + '3533e0a6efc06a12e656ab6648f3100d12e105c0') build() { diff --git a/source/base/cpio/gcc43.patch b/source/base/cpio/gcc43.patch new file mode 100644 index 0000000..abe626e --- /dev/null +++ b/source/base/cpio/gcc43.patch @@ -0,0 +1,33 @@ +diff -up tar-1.19/lib/argp-fmtstream.h.gcc43 tar-1.19/lib/argp-fmtstream.h +--- tar-1.19/lib/argp-fmtstream.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp-fmtstream.h 2008-02-13 16:56:58.000000000 +0100 +@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI +-#define ARGP_FS_EI extern inline ++# ifdef __GNUC_STDC_INLINE__ ++# define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) ++# else ++# define ARGP_FS_EI extern inline ++# endif + #endif + + ARGP_FS_EI size_t +diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h +--- tar-1.19/lib/argp.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp.h 2008-02-13 16:55:36.000000000 +0100 +@@ -580,7 +580,11 @@ extern void *__argp_input (const struct + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# if defined __GNUC_STDC_INLINE__ ++# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) ++# else ++# define ARGP_EI extern __inline__ ++# endif + # endif + + ARGP_EI void + From crazy at frugalware.org Tue Mar 11 22:00:49 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 22:00:55 2008 Subject: [Frugalware-git] gcc43: psmisc-22.6-2-i686 Message-ID: <20080311210049.662F71190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=13376340a63986a607701cbacb17791acc7cb818 commit 13376340a63986a607701cbacb17791acc7cb818 Author: crazy Date: Tue Mar 11 22:00:28 2008 +0100 psmisc-22.6-2-i686 * rebuild diff --git a/source/base/psmisc/FrugalBuild b/source/base/psmisc/FrugalBuild index e799bae..eb7a6f2 100644 --- a/source/base/psmisc/FrugalBuild +++ b/source/base/psmisc/FrugalBuild @@ -3,9 +3,9 @@ pkgname=psmisc pkgver=22.6 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous procfs tools" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge From vmiklos at frugalware.org Tue Mar 11 23:46:25 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Mar 11 23:46:29 2008 Subject: [Frugalware-git] frugalware-current: docs: pacman.conf -> pacman-g2.conf Message-ID: <20080311224625.447A7119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e712999b735581600d246e7705c6265af9544bc commit 5e712999b735581600d246e7705c6265af9544bc Author: Miklos Vajna Date: Tue Mar 11 23:46:19 2008 +0100 docs: pacman.conf -> pacman-g2.conf diff --git a/docs/install.txt b/docs/install.txt index 2713a70..e2ff7ed 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -136,7 +136,7 @@ the .fpm's found in frugalware-i686 (or frugalware-x86_64) dir to '/var/cache/pacman/pkg'. Second is a bit more challenging, but more usable. Add a new line -to '/etc/pacman.conf' before the other Include lines: +to '/etc/pacman-g2.conf' before the other Include lines: `Include = /etc/pacman.d/cd` diff --git a/docs/makepkg.txt b/docs/makepkg.txt index 5076d07..98e2584 100644 --- a/docs/makepkg.txt +++ b/docs/makepkg.txt @@ -400,7 +400,7 @@ in the previous section. The backup array is used to make some files in the package as config files. If possible, we don't modify config files during an upgrade. Example: -`backup=(\'etc/pacman.conf\')` +`backup=(\'etc/pacman-g2.conf\')` Note that the leading slash is missing! From crazy at frugalware.org Tue Mar 11 23:51:19 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 23:51:20 2008 Subject: [Frugalware-git] gcc43: netkit-base-0.17-5-i686 Message-ID: <20080311225119.30599119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=308dc71a0c65f6a5429607f7f0cde505af4e8f7b commit 308dc71a0c65f6a5429607f7f0cde505af4e8f7b Author: crazy Date: Tue Mar 11 23:50:43 2008 +0100 netkit-base-0.17-5-i686 * rebuild * converted FB to use F* commands diff --git a/source/base/netkit-base/FrugalBuild b/source/base/netkit-base/FrugalBuild index dcef5ea..5a16da5 100644 --- a/source/base/netkit-base/FrugalBuild +++ b/source/base/netkit-base/FrugalBuild @@ -4,12 +4,12 @@ pkgname=netkit-base pkgver=0.17 -pkgrel=4 +pkgrel=5 pkgdesc="This is netkit-base for Linux" url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" groups=('base') archs=('i686' 'x86_64') -depends=('glibc' 'portmap') +depends=('glibc>=2.7-3' 'portmap>=5beta-6') backup=(etc/{HOSTNAME,hosts,networks,nntpserver,protocols,resolv.conf,services} etc/hosts.{conf,allow,deny,equiv}) up2date="wget --passive-ftp -O - -q ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/|grep netkit-base.*tar.gz|sed -n -e 's/.*>netkit-base-\(.*\)\.tar\.gz.*/\1/' -e '1 p'" source=(ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-$pkgver.tar.gz \ @@ -20,22 +20,20 @@ sha1sums=('d1f610efa3320ecac75c2f13df8a45c84fc7d448' \ '08cabf0acb67286536478a0f43c3072d6133c513' \ 'f63ad8c3815d7ada3bd9deb0097038622e94f9f6') -build() { - cd $startdir/src/netkit-base-$pkgver - sed -i 's/localhost/localhost frugalware.local frugalware/' \ - etc.sample/hosts +build() + { + Fcd netkit-base-$pkgver + Fsed "localhost" "localhost frugalware.local frugalware" etc.sample/hosts - mkdir -p $startdir/pkg/{bin,etc} $startdir/pkg/usr/{sbin,man/man8} + Fmkdir {bin,etc} usr/{sbin,man/man8} install -m644 etc.sample/{host.conf,hosts,hosts.allow,hosts.deny,hosts.equiv,networks,nntpserver} \ - $startdir/pkg/etc/ - install -m644 $startdir/src/{protocols,services} $startdir/pkg/etc/ - grep -v domain etc.sample/resolv.conf > $startdir/pkg/etc/resolv.conf - echo "frugalware.local" > $startdir/pkg/etc/HOSTNAME + $Fdestdir/etc || Fdie + install -m644 $Fsrcdir/{protocols,services} $Fdestdir/etc || Fdie + grep -v domain etc.sample/resolv.conf > $startdir/pkg/etc/resolv.conf || Fdie + echo "frugalware.local" > $startdir/pkg/etc/HOSTNAME || Fdie - cd ../netdate - patch -p1 < $startdir/src/netdate.diff - make - make DESTDIR=$startdir/pkg install + cd ../netdate || Fdie + Fbuild } # optimization OK From crazy at frugalware.org Tue Mar 11 23:57:06 2008 From: crazy at frugalware.org (crazy) Date: Tue Mar 11 23:57:08 2008 Subject: [Frugalware-git] gcc43: sysklogd-1.5-2-i686 Message-ID: <20080311225706.BB634119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=d5acdcf198a0186299f0580afe1675c64dde1262 commit d5acdcf198a0186299f0580afe1675c64dde1262 Author: crazy Date: Tue Mar 11 23:56:25 2008 +0100 sysklogd-1.5-2-i686 * rebuild * added missing depends=() diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index e32a474..b965397 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,11 +4,12 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Linux system logging utilities" url="http://www.ibiblio.org/pub/Linux/system/daemons/!INDEX" backup=(etc/syslog.conf etc/logrotate.d/syslog) -rodepends=('netkit-base') +depends=('glibc>=2.7-3') +rodepends=('netkit-base>=0.17-5') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://ftp.ibiblio.org/pub/Linux/system/daemons/?M=D'|grep sysklogd.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" From crazy at frugalware.org Wed Mar 12 00:03:10 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 00:03:12 2008 Subject: [Frugalware-git] gcc43: dcron-3.2-5-i686 Message-ID: <20080311230310.5D3EE119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=64ee9fed67cf6f714d37a1cec5940796c3b268b1 commit 64ee9fed67cf6f714d37a1cec5940796c3b268b1 Author: crazy Date: Wed Mar 12 00:02:17 2008 +0100 dcron-3.2-5-i686 * rebuild * added missing depends=() diff --git a/source/base/dcron/FrugalBuild b/source/base/dcron/FrugalBuild index 268148d..fb5e75b 100644 --- a/source/base/dcron/FrugalBuild +++ b/source/base/dcron/FrugalBuild @@ -3,10 +3,11 @@ pkgname=dcron pkgver=3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Dillon's Cron daemon" url="http://apollo.backplane.com/FreeSrc/" -rodepends=('sysklogd' 'psmisc') +depends=('glibc>=2.7-3') +rodepends=('sysklogd>=1.5-2' 'psmisc>=22.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(var/spool/cron/crontabs/root) From crazy at frugalware.org Wed Mar 12 00:07:07 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 00:07:10 2008 Subject: [Frugalware-git] gcc43: dhcpcd-3.1.8-2-i686 Message-ID: <20080311230707.D489E119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1b545eecbf5d51811028bd9793f81a3b0b80c5c3 commit 1b545eecbf5d51811028bd9793f81a3b0b80c5c3 Author: crazy Date: Wed Mar 12 00:06:08 2008 +0100 dhcpcd-3.1.8-2-i686 * rebuild diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index 34cc740..f4087e5 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -3,13 +3,13 @@ pkgname=dhcpcd pkgver=3.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A DHCP client daemon" url="http://dhcpcd.berlios.de" groups=('base') archs=('i686' 'x86_64') -depends=('glibc') -rodepends=('frugalwareutils>=0.7.2') +depends=('glibc>=2.7-3') +rodepends=('frugalwareutils>=0.7.9-2') _F_berlios_ext=".tar.bz2" Finclude berlios source=(${source[@]} dhcpcd-3.0.17-service-paths.patch \ From vmiklos at frugalware.org Wed Mar 12 00:13:50 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 00:13:59 2008 Subject: [Frugalware-git] frugalware-current: docs: clean up 'Using packages from CD/DVD' section Message-ID: <20080311231350.AFBEC119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f9d9ca8e518a38dfe2feb7dbe6cb3abf46969002 commit f9d9ca8e518a38dfe2feb7dbe6cb3abf46969002 Author: Miklos Vajna Date: Wed Mar 12 00:13:42 2008 +0100 docs: clean up 'Using packages from CD/DVD' section diff --git a/docs/install.txt b/docs/install.txt index e2ff7ed..382f80d 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -136,11 +136,7 @@ the .fpm's found in frugalware-i686 (or frugalware-x86_64) dir to '/var/cache/pacman/pkg'. Second is a bit more challenging, but more usable. Add a new line -to '/etc/pacman-g2.conf' before the other Include lines: - -`Include = /etc/pacman.d/cd` - -Create a new file /etc/pacman.d/cd file with the following contents: +to '/etc/pacman-g2/repos/frugalware' before the other Server lines: `Server = file:///media/dvd/frugalware-i686` @@ -149,7 +145,7 @@ On x86_64, use this one: `Server = file:///media/dvd/frugalware-x86_64` The media should be mounted on /media/dvd, or change the Server lines -appropriately. The section and the filename must be the same. +appropriately. Also you can only install packages then from the given media, so you have to insert the first CD if you install a package from the first CD and so on. This From crazy at frugalware.org Wed Mar 12 00:18:08 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 00:18:17 2008 Subject: [Frugalware-git] gcc43: gpm-1.20.1-14-i686 Message-ID: <20080311231808.756B2119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=5570cb48e222c82e8f13f5cf855bb36d3c57899c commit 5570cb48e222c82e8f13f5cf855bb36d3c57899c Author: crazy Date: Wed Mar 12 00:17:05 2008 +0100 gpm-1.20.1-14-i686 * rebuild * added an patch to fix the build * OPEN_MAX gone in 2.6.23 diff --git a/source/base/gpm/FrugalBuild b/source/base/gpm/FrugalBuild index 76ad986..e959d40 100644 --- a/source/base/gpm/FrugalBuild +++ b/source/base/gpm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gpm pkgver=1.20.1 -pkgrel=13 +pkgrel=14 pkgdesc="General purpose mouse server" url="http://arcana.linux.it" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/gpm) @@ -15,10 +15,12 @@ source=(http://arcana.linux.it/pub/$pkgname/$pkgname-$pkgver.tar.gz rc.gpm \ rc.gpm-de.po gpm \ 01-mc-segfaults.patch \ gpm-1.20.1-ceilf-gcc4.patch \ - $pkgname-$pkgver-nodebug.patch) + $pkgname-$pkgver-nodebug.patch \ + openmax.patch) build() { + unset MAKEFLAGS Fbuild Frcd2 Ffile /etc/sysconfig/gpm @@ -27,9 +29,10 @@ build() # optimization OK sha1sums=('7a664bc1af6b39c41b1eeab96a48d46f423783b3' \ - '4d799baf9e0b5e5dbe3e34afcd847788c73bb8ed' \ - '2f7c697b367ac05c61ec9f09649407be55daee91' \ - '2a81304fa5332ee8d9051905c5adcac12b8f68be' \ - 'b0f48220a6d82df68e8812f477b06537acb52597' \ - '44cea22c374ff8690a09a7422749fc9a64f40468' \ - 'b2eb219209778f420e9453b579eb692ffd3c1f05') + '4d799baf9e0b5e5dbe3e34afcd847788c73bb8ed' \ + '2f7c697b367ac05c61ec9f09649407be55daee91' \ + '2a81304fa5332ee8d9051905c5adcac12b8f68be' \ + 'b0f48220a6d82df68e8812f477b06537acb52597' \ + '44cea22c374ff8690a09a7422749fc9a64f40468' \ + 'b2eb219209778f420e9453b579eb692ffd3c1f05' \ + '3a2f888b6639a940f1ab90eddc839d650bbbdbbb') diff --git a/source/base/gpm/openmax.patch b/source/base/gpm/openmax.patch new file mode 100644 index 0000000..0a968f9 --- /dev/null +++ b/source/base/gpm/openmax.patch @@ -0,0 +1,25 @@ +--- gpm-1.20.1/src/prog/gpm-root.y.openmax 2002-12-24 23:57:16.000000000 +0100 ++++ gpm-1.20.1/src/prog/gpm-root.y 2007-07-24 20:45:46.000000000 +0200 +@@ -525,7 +525,9 @@ + open("/dev/null",O_RDONLY); /* stdin */ + open(consolename,O_WRONLY); /* stdout */ + dup(1); /* stderr */ +- for (i=3;iarg,(char *)NULL); + exit(1); /* shouldn't happen */ + default: return 0; +--- gpm-1.20.1/src/special.c.openmax 2007-07-24 20:45:46.000000000 +0200 ++++ gpm-1.20.1/src/special.c 2007-07-24 20:45:46.000000000 +0200 +@@ -156,7 +156,9 @@ + open(GPM_NULL_DEV,O_RDONLY); /* stdin */ + open(console.device, O_WRONLY); /* stdout */ + dup(1); /* stderr */ +- for (i=3;i Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e5307695ecf433a785b6879a887212ee214a2959 commit e5307695ecf433a785b6879a887212ee214a2959 Author: crazy Date: Wed Mar 12 00:34:24 2008 +0100 irqbalance-0.55-2-i686 * rebuild diff --git a/source/base/irqbalance/FrugalBuild b/source/base/irqbalance/FrugalBuild index 64b3778..5d31f2b 100644 --- a/source/base/irqbalance/FrugalBuild +++ b/source/base/irqbalance/FrugalBuild @@ -3,10 +3,10 @@ pkgname=irqbalance pkgver=0.55 -pkgrel=1 +pkgrel=2 pkgdesc="Distributes interrupts over the processors and cores you have." url="http://irqbalance.org/" -depends=('glib2') +depends=('glib2>=2.14.6-2') backup=(etc/sysconfig/$pkgname) groups=('base') archs=('i686' 'x86_64') From vmiklos at frugalware.org Wed Mar 12 00:51:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 00:51:42 2008 Subject: [Frugalware-git] bmf: grub2-1.96-1-i686 Message-ID: <20080311235140.81F97119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=d8ae922a756b59d2fa8edfbc744781fa16be0bde commit d8ae922a756b59d2fa8edfbc744781fa16be0bde Author: Miklos Vajna Date: Wed Mar 12 00:50:04 2008 +0100 grub2-1.96-1-i686 - new package - not yet stable, so not in current - works for me :) (vanilla grub1 does not) - it can be installed paralellry with grub1 - added some fw-specific doc diff --git a/source/base-extra/grub2/FrugalBuild b/source/base-extra/grub2/FrugalBuild new file mode 100644 index 0000000..ae43550 --- /dev/null +++ b/source/base-extra/grub2/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.20 SBU +# Maintainer: VMiklos + +pkgname=grub2 +pkgver=1.96 +pkgrel=1 +pkgdesc="GRUB 2, the second version of the GRand Unified Bootloader." +url="http://www.gnu.org/software/grub/grub.html" +depends=('lzo') +groups=('apps-extra') +archs=('i686') +_F_archive_name="grub" +up2date="lynx -dump http://alpha.gnu.org/gnu/grub/|Flasttar" +source=(http://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz) +signatures=($source.sig) + +# optimization OK diff --git a/source/base-extra/grub2/README.Frugalware b/source/base-extra/grub2/README.Frugalware new file mode 100644 index 0000000..d456aba --- /dev/null +++ b/source/base-extra/grub2/README.Frugalware @@ -0,0 +1,6 @@ +See http://grub.enbug.org/grub.cfg[this page] for a sample grub.cfg. You +have to convert your menu.lst manually, but for a typical Linux +configuration it's pretty trivial. + +One trick you should know is that for example sda1 used to be (hd0,0) +but now it's (hd0,1), so starting from one and not zero. From crazy at frugalware.org Wed Mar 12 00:52:00 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 00:52:03 2008 Subject: [Frugalware-git] gcc43: jfsutils-1.1.12-2-i686 Message-ID: <20080311235200.82C99119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e34a7b140191d313b45051b648865d7a4117ed4c commit e34a7b140191d313b45051b648865d7a4117ed4c Author: crazy Date: Wed Mar 12 00:50:33 2008 +0100 jfsutils-1.1.12-2-i686 * rebuild diff --git a/source/base/jfsutils/FrugalBuild b/source/base/jfsutils/FrugalBuild index 270784d..dcc2b24 100644 --- a/source/base/jfsutils/FrugalBuild +++ b/source/base/jfsutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=jfsutils pkgver=1.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="JFS filesystem utilities" url="http://www-124.ibm.com/developerworks/oss/jfs/" -depends=('e2fsprogs') +depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://jfs.sourceforge.net/source.html |grep jfsutils |sed 's/.*utils-\(.*\)\.t.*/\1/;q'" From vmiklos at frugalware.org Wed Mar 12 01:00:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 01:00:35 2008 Subject: [Frugalware-git] bmf: grub2-1.96-1-i686 Message-ID: <20080312000031.339A2119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=015c2ccce9d32b4f20400e43ddb469e42bd11d54 commit 015c2ccce9d32b4f20400e43ddb469e42bd11d54 Author: Miklos Vajna Date: Wed Mar 12 01:00:06 2008 +0100 grub2-1.96-1-i686 - move to the right dir diff --git a/source/apps-extra/grub2/FrugalBuild b/source/apps-extra/grub2/FrugalBuild new file mode 100644 index 0000000..ae43550 --- /dev/null +++ b/source/apps-extra/grub2/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.20 SBU +# Maintainer: VMiklos + +pkgname=grub2 +pkgver=1.96 +pkgrel=1 +pkgdesc="GRUB 2, the second version of the GRand Unified Bootloader." +url="http://www.gnu.org/software/grub/grub.html" +depends=('lzo') +groups=('apps-extra') +archs=('i686') +_F_archive_name="grub" +up2date="lynx -dump http://alpha.gnu.org/gnu/grub/|Flasttar" +source=(http://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz) +signatures=($source.sig) + +# optimization OK diff --git a/source/apps-extra/grub2/README.Frugalware b/source/apps-extra/grub2/README.Frugalware new file mode 100644 index 0000000..d456aba --- /dev/null +++ b/source/apps-extra/grub2/README.Frugalware @@ -0,0 +1,6 @@ +See http://grub.enbug.org/grub.cfg[this page] for a sample grub.cfg. You +have to convert your menu.lst manually, but for a typical Linux +configuration it's pretty trivial. + +One trick you should know is that for example sda1 used to be (hd0,0) +but now it's (hd0,1), so starting from one and not zero. diff --git a/source/base-extra/grub2/FrugalBuild b/source/base-extra/grub2/FrugalBuild deleted file mode 100644 index ae43550..0000000 --- a/source/base-extra/grub2/FrugalBuild +++ /dev/null @@ -1,17 +0,0 @@ -# Compiling Time: 0.20 SBU -# Maintainer: VMiklos - -pkgname=grub2 -pkgver=1.96 -pkgrel=1 -pkgdesc="GRUB 2, the second version of the GRand Unified Bootloader." -url="http://www.gnu.org/software/grub/grub.html" -depends=('lzo') -groups=('apps-extra') -archs=('i686') -_F_archive_name="grub" -up2date="lynx -dump http://alpha.gnu.org/gnu/grub/|Flasttar" -source=(http://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz) -signatures=($source.sig) - -# optimization OK diff --git a/source/base-extra/grub2/README.Frugalware b/source/base-extra/grub2/README.Frugalware deleted file mode 100644 index d456aba..0000000 --- a/source/base-extra/grub2/README.Frugalware +++ /dev/null @@ -1,6 +0,0 @@ -See http://grub.enbug.org/grub.cfg[this page] for a sample grub.cfg. You -have to convert your menu.lst manually, but for a typical Linux -configuration it's pretty trivial. - -One trick you should know is that for example sda1 used to be (hd0,0) -but now it's (hd0,1), so starting from one and not zero. From crazy at frugalware.org Wed Mar 12 01:13:53 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 01:13:56 2008 Subject: [Frugalware-git] gcc43: kbd-1.12-26-i686 Message-ID: <20080312001353.59756119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=81a497cd438b55ec7c6c1b72063487b311462f92 commit 81a497cd438b55ec7c6c1b72063487b311462f92 Author: crazy Date: Wed Mar 12 01:08:47 2008 +0100 kbd-1.12-26-i686 * rebuild diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index a751d17..5df822f 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,11 +3,11 @@ pkgname=kbd pkgver=1.12 -pkgrel=25 +pkgrel=26 pkgdesc="Keyboard maps and console fonts" url="http://www.ibiblio.org/pub/Linux/system/keyboards/" up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/system/keyboards/?C=M;O=D'|grep kbd.*tar.gz$ | grep -v 'GR' |sed -n 's/.*d-\(.*\)\.t.*/\1/;1 p'" -depends=('sed' 'bash') +depends=('sed>=4.1.5-2' 'bash') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/font) From crazy at frugalware.org Wed Mar 12 01:20:25 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 01:20:28 2008 Subject: [Frugalware-git] gcc43: less-418-2-i686 Message-ID: <20080312002025.9DD27119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e12f51d1b2eaafb251d7d177060ede4547411c5f commit e12f51d1b2eaafb251d7d177060ede4547411c5f Author: crazy Date: Wed Mar 12 01:18:36 2008 +0100 less-418-2-i686 * rebuild diff --git a/source/base/less/FrugalBuild b/source/base/less/FrugalBuild index 539eb52..64119d8 100644 --- a/source/base/less/FrugalBuild +++ b/source/base/less/FrugalBuild @@ -3,10 +3,10 @@ pkgname=less pkgver=418 -pkgrel=1 +pkgrel=2 pkgdesc="A paginator similar to more" url="http://www.greenwoodsoftware.com/less" -depends=('ncurses' 'bash' 'file') +depends=('ncurses>=5.6-3' 'bash' 'file>=4.23-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.greenwoodsoftware.com/less/download.html |grep -m 1 .tar.gz | Flasttar" From crazy at frugalware.org Wed Mar 12 01:34:05 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 01:34:10 2008 Subject: [Frugalware-git] gcc43: pciutils-2.2.10-2-i686 Message-ID: <20080312003405.5A67E119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0ae6ac117d1007fcbd2e08114d906d1c78790961 commit 0ae6ac117d1007fcbd2e08114d906d1c78790961 Author: crazy Date: Wed Mar 12 01:33:40 2008 +0100 pciutils-2.2.10-2-i686 * rebuild diff --git a/source/base/pciutils/FrugalBuild b/source/base/pciutils/FrugalBuild index f29846d..9cc4fb8 100644 --- a/source/base/pciutils/FrugalBuild +++ b/source/base/pciutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=pciutils pkgver=2.2.10 -pkgrel=1 +pkgrel=2 pkgdesc="PCI utilities" url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" -depends=('zlib') +depends=('zlib>=1.2.3-5') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.kernel.org/pub/software/utils/pciutils/|Flasttar" From crazy at frugalware.org Wed Mar 12 01:59:59 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:00:01 2008 Subject: [Frugalware-git] gcc43: pcmciautils-014-3-i686 Message-ID: <20080312005959.D003F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=61a65c57008268c593649da99c89ee58fc0f642f commit 61a65c57008268c593649da99c89ee58fc0f642f Author: crazy Date: Wed Mar 12 01:58:20 2008 +0100 pcmciautils-014-3-i686 * rebuild * fix for CFLAGS * also while our cis tarball gone for some reason * I've put slack's one on our ftp now diff --git a/source/base/pcmciautils/FrugalBuild b/source/base/pcmciautils/FrugalBuild index 3b4b02b..1136fe1 100644 --- a/source/base/pcmciautils/FrugalBuild +++ b/source/base/pcmciautils/FrugalBuild @@ -3,23 +3,25 @@ pkgname=pcmciautils pkgver=014 -pkgrel=2 +pkgrel=3 pkgdesc="Contains the initialization tools necessary to allow the PCMCIA subsystem to behave as every other hotpluggable bus system." url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -depends=('sysfsutils>=1.3.0' 'module-init-tools>=3.2' 'udev') +depends=('sysfsutils>=2.1.0-2' 'module-init-tools>=3.4-6' 'udev>=118-7') groups=('base') backup=('etc/pcmcia/config.opts' 'etc/udev/rules.d/60-pcmcia.rules') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep '\.tar.bz2$'|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-$pkgver.tar.bz2 \ - http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/base/pcmciautils/cis-3.2.8.tar.gz \ + http://ftp.frugalware.org/pub/other/sources/$pkgname/cis-cs-3.2.8.tar.gz \ pcmciautils-014-udev094.diff) signatures=("${source[0]}.sign" '' '') build() { unset MAKEFLAGS + Fcd + Fsed 'CFLAGS := -pipe' "CFLAGS := $CFLAGS" Makefile Fbuild Fmkdir /lib/firmware - Ffilerel $Fsrcdir/*.cis /lib/firmware + Ffilerel $Fsrcdir/lib/firmware/*.cis /lib/firmware Fln pccardctl /sbin/lspcmcia } From vmiklos at frugalware.org Wed Mar 12 02:06:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 02:06:52 2008 Subject: [Frugalware-git] frugalware-current: nvi-1.81.6-1-i686 Message-ID: <20080312010649.A31D6119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a6130440a70226110aa346e26d3971d352164f2 commit 3a6130440a70226110aa346e26d3971d352164f2 Author: Miklos Vajna Date: Wed Mar 12 02:06:21 2008 +0100 nvi-1.81.6-1-i686 - version bump - removed patches (2 is unnecessary, one is in upstream) diff --git a/source/base/nvi/FrugalBuild b/source/base/nvi/FrugalBuild index f81275a..33e5501 100644 --- a/source/base/nvi/FrugalBuild +++ b/source/base/nvi/FrugalBuild @@ -1,21 +1,29 @@ -# Compiling Time: 0.15 SBU +# Compiling Time: 0.34 SBU # Maintainer: VMiklos pkgname=nvi -pkgver=1.79 +pkgver=1.81.6 pkgrel=1 pkgdesc="The Berkeley Vi Editor" url="http://www.bostic.com/vi/" depends=('ncurses') groups=('base') archs=('i686' 'x86_64') -up2date="lynx -dump ftp://ftp.sleepycat.com/pub/|grep nvi- |Flasttar" -source=(ftp://ftp.sleepycat.com/pub/nvi-$pkgver.tar.gz \ - nvi-1.79-{nocache,syntax,symlink}.diff) -_F_cd_path="$pkgname-$pkgver/build" -Fconfopts="$Fconfopts --program-prefix=n --disable-curses" +up2date="lynx -dump http://www.kotnet.org/~skimo/nvi/devel/ |Flasttar" +source=(http://www.kotnet.org/~skimo/nvi/devel/nvi-$pkgver.tar.gz) +sha1sums=('ce3e0d7d476fb3bdcce9d547e170152290db0347') + +build() +{ + Fcd + mkdir build + cd build + ../dist/configure $Fconfopts --program-prefix=n --disable-curses || return 1 + make || return 1 + Fmakeinstall + Frm /usr/share/man/cat1 + Fmkdir /bin + Fln /usr/bin/nvi /bin/vi +} + # optimization OK -sha1sums=('65b49768783372609278ecedd63caa8c1547aa2a'\ - '6494c606c0f6c2f490cd052ae5dd7faf47d82cd2'\ - 'c5d83a174efc7ac057c187db0ce626c982afc875'\ - 'add8517e0f35920fa628147f9f54bd347e4743da') diff --git a/source/base/nvi/nvi-1.79-nocache.diff b/source/base/nvi/nvi-1.79-nocache.diff deleted file mode 100644 index 83d5e29..0000000 --- a/source/base/nvi/nvi-1.79-nocache.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur build.orig/Makefile.in build/Makefile.in ---- build.orig/Makefile.in 1996-10-23 15:43:38.000000000 +0200 -+++ build/Makefile.in 2007-01-25 23:44:23.000000000 +0100 -@@ -91,19 +91,7 @@ - `echo vi | sed '$(transform)'` `echo view | sed '$(transform)'` - [ -d $(mandir) ] || \ - ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir)) -- [ -d $(mandir)/cat1 ] || \ -- ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1) - @echo "Installing man pages: $(mandir) ..." -- cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'` -- $(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \ -- $(mandir)/cat1/`echo vi.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(ln) \ -- `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(ln) \ -- `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'` - [ -d $(mandir)/man1 ] || \ - ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1) - cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'` -@@ -156,9 +144,6 @@ - cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'` - cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'` - cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'` -- cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'` -- cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'` - cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'` - cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'` - cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'` diff --git a/source/base/nvi/nvi-1.79-symlink.diff b/source/base/nvi/nvi-1.79-symlink.diff deleted file mode 100644 index 3c4fb27..0000000 --- a/source/base/nvi/nvi-1.79-symlink.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur build.orig/Makefile.in build/Makefile.in ---- build.orig/Makefile.in 1996-10-23 15:43:38.000000000 +0200 -+++ build/Makefile.in 2007-01-26 20:31:23.000000000 +0100 -@@ -78,8 +78,11 @@ - @echo "Installing vi, ex, view: $(bindir) ..." - [ -d $(bindir) ] || \ - ($(mkdir) $(bindir) && $(chmod) $(dmode) $(bindir)) -+ [ -d $(bindir)/../../bin ] || \ -+ ($(mkdir) $(bindir)/../../bin && $(chmod) $(dmode) $(bindir)/../../bin) - cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'` - $(cp) nvi $(bindir)/`echo vi | sed '$(transform)'` -+ ln -s ../usr/bin/nvi $(bindir)/../../bin/vi - cd $(bindir) && [ -f $(strip) ] && \ - $(strip) `echo vi | sed '$(transform)'` - cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'` diff --git a/source/base/nvi/nvi-1.79-syntax.diff b/source/base/nvi/nvi-1.79-syntax.diff deleted file mode 100644 index 9fd2840..0000000 --- a/source/base/nvi/nvi-1.79-syntax.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur build.orig/Makefile.in build/Makefile.in ---- build.orig/Makefile.in 1996-10-23 15:43:38.000000000 +0200 -+++ build/Makefile.in 2007-01-25 23:26:12.000000000 +0100 -@@ -139,8 +139,8 @@ - cd $(datadir)/vi/catalog && $(chmod) $(fmode) *) - @echo "Installing Perl scripts: $(datadir)/vi/perl ..." - $(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl -- [ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \ -- cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm) -+ if [ -f VI.pm ]; then $(cp) VI.pm $(datadir)/vi/perl && \ -+ cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm; fi - (cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \ - cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl) - @echo "Installing Tcl scripts: $(datadir)/vi/tcl ..." From crazy at frugalware.org Wed Mar 12 02:12:25 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:12:27 2008 Subject: [Frugalware-git] gcc43: procps-3.2.7-5-i686 Message-ID: <20080312011225.35CD6119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=14e511a5ee676f5d050d01f32b8a6ce5c8a6c6bc commit 14e511a5ee676f5d050d01f32b8a6ce5c8a6c6bc Author: crazy Date: Wed Mar 12 02:11:51 2008 +0100 procps-3.2.7-5-i686 * rebuild diff --git a/source/base/procps/FrugalBuild b/source/base/procps/FrugalBuild index 13f1c22..0e6b997 100644 --- a/source/base/procps/FrugalBuild +++ b/source/base/procps/FrugalBuild @@ -3,10 +3,10 @@ pkgname=procps pkgver=3.2.7 -pkgrel=4 +pkgrel=5 pkgdesc="utilities for displaying process information" url="http://procps.sf.net" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=('etc/sysctl.conf') From crazy at frugalware.org Wed Mar 12 02:34:03 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:34:05 2008 Subject: [Frugalware-git] gcc43: rp-pppoe-3.8-3-i686 Message-ID: <20080312013403.049B6119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=8ac4444f9f977eb2f12984a3f9ab3db673a4ae40 commit 8ac4444f9f977eb2f12984a3f9ab3db673a4ae40 Author: crazy Date: Wed Mar 12 02:33:23 2008 +0100 rp-pppoe-3.8-3-i686 * rebuild * added missing Fdie's * source and url fix diff --git a/source/base/rp-pppoe/FrugalBuild b/source/base/rp-pppoe/FrugalBuild index 35085fb..d0cc088 100644 --- a/source/base/rp-pppoe/FrugalBuild +++ b/source/base/rp-pppoe/FrugalBuild @@ -3,15 +3,15 @@ pkgname=rp-pppoe pkgver=3.8 -pkgrel=2 +pkgrel=3 pkgdesc="Roaring Penguin PPPoE client" -url="http://www.roaringpenguin.com/pppoe/" +url="http://www.roaringpenguin.com/products/pppoe" groups=('base') archs=('i686' 'x86_64') -depends=('ppp') +depends=('ppp>=2.4.4-3') backup=(etc/ppp/{pppoe.conf,firewall-standalone,firewall-masq,pppoe-server-options}) up2date="lynx -dump $url |grep tar.gz|sed -n -e 's/.*rp-pppoe-\(.*\)\.tar\.gz .*/\1/' -e '1 p'" -source=(http://www.roaringpenguin.com/penguin/pppoe/$pkgname-$pkgver.tar.gz \ +source=(http://www.roaringpenguin.com/files/download/$pkgname-$pkgver.tar.gz \ rc.adsl) sha1sums=('d9a4346701e580b4a6049a940557b38533f9e8f7' \ 'f79284e0beab4d3362c468faead10a43dd71607e') @@ -19,10 +19,10 @@ sha1sums=('d9a4346701e580b4a6049a940557b38533f9e8f7' \ build() { Fcd - cd src + cd src || Fdie Fmake make RPM_INSTALL_ROOT=$Fdestdir install - cd ../gui + cd ../gui || Fdie Fmake make RPM_INSTALL_ROOT=$Fdestdir install Frcd adsl From crazy at frugalware.org Wed Mar 12 02:38:47 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:38:47 2008 Subject: [Frugalware-git] gcc43: sharutils-4.2.1-3-i686 Message-ID: <20080312013847.102F7119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=415334cf2cfbcf194b8ffdfb684ad8559a08ea2e commit 415334cf2cfbcf194b8ffdfb684ad8559a08ea2e Author: crazy Date: Wed Mar 12 02:38:26 2008 +0100 sharutils-4.2.1-3-i686 * rebuild diff --git a/source/base/sharutils/FrugalBuild b/source/base/sharutils/FrugalBuild index af11911..9c22dcc 100644 --- a/source/base/sharutils/FrugalBuild +++ b/source/base/sharutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sharutils pkgver=4.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="GNU shar makes so-called shell archives out of many files" url="http://www.gnu.org/software/sharutils/" -depends=('gettext') +depends=('gettext>=0.17-2') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Wed Mar 12 02:43:50 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:43:52 2008 Subject: [Frugalware-git] gcc43: slocate-3.1-4-i686 Message-ID: <20080312014350.1D87C119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=a46b746f5f9814b129b15894b318963174f24be5 commit a46b746f5f9814b129b15894b318963174f24be5 Author: crazy Date: Wed Mar 12 02:43:15 2008 +0100 slocate-3.1-4-i686 * rebuild diff --git a/source/base/slocate/FrugalBuild b/source/base/slocate/FrugalBuild index ff72f5b..f4b49e8 100644 --- a/source/base/slocate/FrugalBuild +++ b/source/base/slocate/FrugalBuild @@ -3,10 +3,10 @@ pkgname=slocate pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Security Enhanced version of the GNU Locate" url="http://www.geekreview.org/slocate" -depends=('util-linux' 'frugalware') +depends=('util-linux-ng>=2.13.1-2' 'frugalware>=0.8-2') groups=('base') archs=('i686' 'x86_64') backup=('etc/updatedb.conf') From crazy at frugalware.org Wed Mar 12 02:49:32 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:49:34 2008 Subject: [Frugalware-git] gcc43: sysvinit-2.86-28-i686 Message-ID: <20080312014932.6FA10119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=6f80e244301dc4eaa2a3cfcaed2843a33019e959 commit 6f80e244301dc4eaa2a3cfcaed2843a33019e959 Author: crazy Date: Wed Mar 12 02:49:13 2008 +0100 sysvinit-2.86-28-i686 * rebuild diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index 3bd731b..1c7cde1 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sysvinit pkgver=2.86 -pkgrel=27 +pkgrel=28 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" -depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'gawk') +depends=('shadow>=4.1.0-4' 'util-linux-ng>=2.13.1-2' 'coreutils>=6.10-3' 'glibc>=2.7-3' 'gawk>=3.1.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/{inittab,rc.d/rc.local}) From crazy at frugalware.org Wed Mar 12 02:53:50 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 02:53:51 2008 Subject: [Frugalware-git] gcc43: tcsh-6.15.00-2-i686 Message-ID: <20080312015350.3660F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=eb09113cebe99d2f23e3958b00314d9462e7e2b3 commit eb09113cebe99d2f23e3958b00314d9462e7e2b3 Author: crazy Date: Wed Mar 12 02:53:27 2008 +0100 tcsh-6.15.00-2-i686 * rebuild diff --git a/source/base/tcsh/FrugalBuild b/source/base/tcsh/FrugalBuild index e0f3bf5..c0b9c43 100644 --- a/source/base/tcsh/FrugalBuild +++ b/source/base/tcsh/FrugalBuild @@ -3,10 +3,10 @@ pkgname=tcsh pkgver=6.15.00 -pkgrel=1 +pkgrel=2 pkgdesc="Enhanced version of the Berkeley C shell" url="http://www.tcsh.org/Welcome" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/csh.login) From crazy at frugalware.org Wed Mar 12 03:13:12 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 03:13:15 2008 Subject: [Frugalware-git] gcc43: reiserfsprogs-3.6.19-3-i686 Message-ID: <20080312021312.27A8B119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=c7648da274b3adefcbcd7227d3bc7c93b51c867d commit c7648da274b3adefcbcd7227d3bc7c93b51c867d Author: crazy Date: Wed Mar 12 03:12:32 2008 +0100 reiserfsprogs-3.6.19-3-i686 * rebuild * added 2 patches to fix the build diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index 7c73f3a..e1fffcc 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -3,18 +3,23 @@ pkgname=reiserfsprogs pkgver=3.6.19 -pkgrel=2 +pkgrel=3 pkgdesc="Reiserfs utilities" url="http://www.namesys.com" -depends=('e2fsprogs') +depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" -source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188') +#source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://www.sfr-fresh.com/linux/misc/$pkgname-$pkgver.tar.gz \ + reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) +sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ + 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ + 'fd97c2e9c9a8dc2064e74e41e7f6b4d8e3b61a09') build() { + unset MAKEFLAGS Fbuild || return 1 Fmv /usr/sbin / Fln reiserfsck /sbin/fsck.reiserfs diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch new file mode 100644 index 0000000..2146c94 --- /dev/null +++ b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch @@ -0,0 +1,12 @@ +diff -ur reiserfsprogs-3.6.19.orig/fsck/main.c reiserfsprogs-3.6.19/fsck/main.c +--- reiserfsprogs-3.6.19.orig/fsck/main.c 2004-10-07 15:04:08.000000000 +0100 ++++ reiserfsprogs-3.6.19/fsck/main.c 2007-05-02 16:05:08.000000000 +0100 +@@ -416,7 +416,7 @@ + (data->log == stdout) ? "stdout" : + (data->log_file_name ? data->log_file_name : "fsck.run")); + +- if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you want to " ++ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) && !user_confirmed (warn_to, "\nDo you want to " + "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n")) + exit (EXIT_USER); + } diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch new file mode 100644 index 0000000..5883ce8 --- /dev/null +++ b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch @@ -0,0 +1,35 @@ +backported from 3.6.20 + +http://bugs.gentoo.org/153494 + +--- include/reiserfs_fs.h ++++ include/reiserfs_fs.h +@@ -38,14 +38,22 @@ + # define extern_inline + #endif + +-#include +- + #ifndef get_unaligned +-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ +- defined(__PPC) || defined(powerpc) || defined(__powerpc__) +-# define get_unaligned(ptr) (*(ptr)) +-# define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) ++#define get_unaligned(ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp; \ ++ memcpy(&__tmp, (ptr), sizeof(*(ptr))); \ ++ __tmp; \ ++}) + #endif ++ ++#ifndef put_unaligned ++#define put_unaligned(val, ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp = (val); \ ++ memcpy((ptr), &__tmp, sizeof(*(ptr))); \ ++ (void)0; \ ++}) + #endif + + #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) From crazy at frugalware.org Wed Mar 12 03:17:22 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 03:17:23 2008 Subject: [Frugalware-git] gcc43: reiserfsprogs-3.6.19-3-i686 Message-ID: <20080312021722.A5BCB119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=786c227a8fe06677e4018a697b7c31409b0153a0 commit 786c227a8fe06677e4018a697b7c31409b0153a0 Author: crazy Date: Wed Mar 12 03:16:42 2008 +0100 reiserfsprogs-3.6.19-3-i686 * better source url * re added up2date diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index e1fffcc..f04c7b2 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -9,9 +9,10 @@ url="http://www.namesys.com" depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" +#up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" #source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -source=(http://www.sfr-fresh.com/linux/misc/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump http://mirror.trouble-free.net/sources/|Flasttar" +source=(http://mirror.trouble-free.net/sources//$pkgname-$pkgver.tar.gz \ reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ From crazy at frugalware.org Wed Mar 12 03:49:04 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 03:49:07 2008 Subject: [Frugalware-git] gcc43: apmd-3.0.2-7-i686 Message-ID: <20080312024904.ED152119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=73c798898705eb30628129237eb14bbccf45bbf5 commit 73c798898705eb30628129237eb14bbccf45bbf5 Author: crazy Date: Wed Mar 12 03:48:22 2008 +0100 apmd-3.0.2-7-i686 * rebuild * added some Fsed's to fix the build * and some other issues diff --git a/source/base/apmd/FrugalBuild b/source/base/apmd/FrugalBuild index 722a042..569b774 100644 --- a/source/base/apmd/FrugalBuild +++ b/source/base/apmd/FrugalBuild @@ -3,10 +3,10 @@ pkgname=apmd pkgver=3.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="Set of tools for managing notebook power consumption" url="http://alumnit.ca/~apenwarr/apmd/" -depends=('glibc') +depends=('glibc>=2.7-3') makedepends=('libx11' 'libxaw') groups=('base') archs=('i686' 'x86_64') @@ -26,6 +26,9 @@ build() Fcd $pkgname Fpatchall || return 1 Fsed '-I/usr/src/linux/include' '-I/usr/include' Makefile + Fsed '-Vt' '' Makefile + Fsed '/X11R6' '' Makefile + Fsed '-O' "$CFLAGS" Makefile Fmake || return 1 Fmkdir /etc /usr Fmakeinstall PREFIX=$Fdestdir/usr APMD_PROXY_DIR=$Fdestdir/etc @@ -33,3 +36,5 @@ build() } # vim: ft=sh + +# optimization OK From crazy at frugalware.org Wed Mar 12 03:59:10 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 03:59:12 2008 Subject: [Frugalware-git] gcc43: man-1.6f-2-i686 Message-ID: <20080312025910.CC049119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=2535843a2ca654dec4e997b7751261ee0cbf9c72 commit 2535843a2ca654dec4e997b7751261ee0cbf9c72 Author: crazy Date: Wed Mar 12 03:58:38 2008 +0100 man-1.6f-2-i686 * rebuild * workaround SMP build diff --git a/source/base/man/FrugalBuild b/source/base/man/FrugalBuild index f06049c..8d47925 100644 --- a/source/base/man/FrugalBuild +++ b/source/base/man/FrugalBuild @@ -3,10 +3,10 @@ pkgname=man pkgver=1.6f -pkgrel=1 +pkgrel=2 pkgdesc="A utility for reading man pages" url="http://primates.ximian.com/~flucifredi/man/" -depends=('groff' 'less' 'gzip' 'gawk' 'coreutils' 'bash') +depends=('groff>=1.19.2-3' 'less>=418-2' 'gzip>=1.3.12-3' 'gawk>=3.1.6-2' 'coreutils>=6.10-3' 'bash') backup=(etc/profile.d/man-colors.sh) groups=('base') archs=('i686' 'x86_64' 'ppc') @@ -25,6 +25,7 @@ sha1sums=('c97012607ed9d75a6eee7e66d257a99a8ed86918' \ build() { + unset MAKEFLAGS Fpatchall ./configure -confdir=/etc +lang all +fhs || Fdie From crazy at frugalware.org Wed Mar 12 04:04:19 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:04:22 2008 Subject: [Frugalware-git] gcc43: lua-5.1.2-2-i686 Message-ID: <20080312030419.C2006119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ef2675ad31ae3f245e53258ad3668e4fe1307ed4 commit ef2675ad31ae3f245e53258ad3668e4fe1307ed4 Author: crazy Date: Wed Mar 12 04:03:57 2008 +0100 lua-5.1.2-2-i686 * rebuild diff --git a/source/apps/lua/FrugalBuild b/source/apps/lua/FrugalBuild index b85f80a..3396d3c 100644 --- a/source/apps/lua/FrugalBuild +++ b/source/apps/lua/FrugalBuild @@ -4,10 +4,10 @@ pkgname=lua pkgver=5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/" -depends=('readline') +depends=('readline>=5.2-2') groups=('apps' 'devel-core') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.lua.org/ftp/'|Flasttar" From crazy at frugalware.org Wed Mar 12 04:06:33 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:06:33 2008 Subject: [Frugalware-git] gcc43: fakeroot-1.9.3-2-i686 Message-ID: <20080312030633.47647119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3a1a03ff3a40aade8c032e6164169ea51c561d2f commit 3a1a03ff3a40aade8c032e6164169ea51c561d2f Author: crazy Date: Wed Mar 12 04:06:14 2008 +0100 fakeroot-1.9.3-2-i686 * rebuild diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index ec028b4..a4bd84d 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -4,10 +4,10 @@ pkgname=fakeroot pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" -depends=('glibc') +depends=('glibc>=2.7-3') makedepends=('po4a') groups=('devel' 'devel-core') archs=('i686' 'x86_64') From crazy at frugalware.org Wed Mar 12 04:17:28 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:17:30 2008 Subject: [Frugalware-git] gcc43: rsync-2.6.9-4-i686 Message-ID: <20080312031728.2914C119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=521c6d80da238fbdd1a92771bbab72c300138d17 commit 521c6d80da238fbdd1a92771bbab72c300138d17 Author: crazy Date: Wed Mar 12 04:16:28 2008 +0100 rsync-2.6.9-4-i686 * rebuild * fixed source location * fixed broken up2date ( a newer version is out ) diff --git a/source/network/rsync/FrugalBuild b/source/network/rsync/FrugalBuild index 8e74a64..dea34d6 100644 --- a/source/network/rsync/FrugalBuild +++ b/source/network/rsync/FrugalBuild @@ -4,16 +4,16 @@ pkgname=rsync pkgver=2.6.9 -pkgrel=3 +pkgrel=4 pkgdesc="An open source utility that provides fast incremental file transfer." url="http://samba.anu.edu.au/rsync/" groups=('network' 'devel-core') archs=('i686' 'x86_64') backup=(etc/rsyncd.conf) -depends=('popt') +depends=('popt>=1.13') install=$pkgname.install -up2date="lynx -dump $url|grep 'released\.' |grep -v pre|sed -ne 's/.*n \(.*\) h.*/\1/' -e '1 p'" -source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump http://samba.anu.edu.au/rsync/|grep -m1 'Rsync version \(.*\) released'|sed 's/.*on \(.*\) re.*/\1/'" +source=(http://samba.org/ftp/rsync/src/$pkgname-$pkgver.tar.gz \ http://www.suse.de/~krahmer/rsync-2.6.9-fname-obo.diff \ http://rsync.samba.org/ftp/rsync/munge-symlinks-2.6.9.diff \ rsyncd.conf rc.rsyncd) From crazy at frugalware.org Wed Mar 12 04:19:59 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:20:01 2008 Subject: [Frugalware-git] gcc43: pkgconfig-0.23-2-i686 Message-ID: <20080312031959.7D8EF119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=cf578bba1cf9dbeed6d89cfa423ca6245bc1a87b commit cf578bba1cf9dbeed6d89cfa423ca6245bc1a87b Author: crazy Date: Wed Mar 12 04:19:41 2008 +0100 pkgconfig-0.23-2-i686 * rebuild diff --git a/source/lib/pkgconfig/FrugalBuild b/source/lib/pkgconfig/FrugalBuild index b773a68..868b259 100644 --- a/source/lib/pkgconfig/FrugalBuild +++ b/source/lib/pkgconfig/FrugalBuild @@ -3,11 +3,11 @@ pkgname=pkgconfig pkgver=0.23 -pkgrel=1 +pkgrel=2 pkgdesc="A system for managing library compile/link flags" url="http://freedesktop.org/wiki/Software_2fpkgconfig" groups=('lib' 'devel-core') -depends=('glibc' 'glib2') +depends=('glibc>=2.7-3' 'glib2>=2.14.6-2') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://www.freedesktop.org/software/pkgconfig/releases/?C=M;O=D' | grep tar\.gz | sed -n 's/.*-\([0-9\.]\+\)\.tar.*/\1/;1 p'" source=(http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-$pkgver.tar.gz $pkgname.sh) From crazy at frugalware.org Wed Mar 12 04:34:27 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:34:29 2008 Subject: [Frugalware-git] gcc43: openssl-0.9.8-12-i686 Message-ID: <20080312033427.0FCC9119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=aadcd24656ce6d790a493d9be3413404d553c7ff commit aadcd24656ce6d790a493d9be3413404d553c7ff Author: crazy Date: Wed Mar 12 04:33:02 2008 +0100 openssl-0.9.8-12-i686 * rebuild diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild index 93bfc61..1f7cc70 100644 --- a/source/lib/openssl/FrugalBuild +++ b/source/lib/openssl/FrugalBuild @@ -5,13 +5,13 @@ pkgname=openssl pkgver=0.9.8 pkgextraver=g -pkgrel=11 +pkgrel=12 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" url="http://www.openssl.org/source/" groups=('lib' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('glibc') -makedepends=('util-linux') +depends=('glibc>=2.7-3') +makedepends=('util-linux-ng>=2.13.1-2') up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'" source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff) signatures=("$source.asc" '') From crazy at frugalware.org Wed Mar 12 04:50:41 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:51:34 2008 Subject: [Frugalware-git] gcc43: python-2.5.2-2-i686 Message-ID: <20080312035041.1DDFC119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=cd6538a4ae30b50fe7d27a7ce357ae76ca247c93 commit cd6538a4ae30b50fe7d27a7ce357ae76ca247c93 Author: crazy Date: Wed Mar 12 04:46:05 2008 +0100 python-2.5.2-2-i686 * rebuild diff --git a/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild index 9a9b589..f0adfb1 100644 --- a/source/devel/python/FrugalBuild +++ b/source/devel/python/FrugalBuild @@ -4,10 +4,10 @@ pkgname=python pkgver=2.5.2 shortpkgver=2.5 # 2.3 if $pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level scripting language" url="http://www.python.org" -depends=('glibc' 'db>=4.6.18' 'bzip2' 'gdbm' 'openssl' 'glib2') +depends=('glibc>=2.7-3' 'db>=4.6.21-3' 'bzip2>=1.0.4-2' 'gdbm>=1.8.3-4' 'openssl>=0.9.8-12' 'glib2>=2.14.6-2') makedepends=('tk>=8.5' 'gtk+2') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') From crazy at frugalware.org Wed Mar 12 04:55:57 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 04:56:00 2008 Subject: [Frugalware-git] gcc43: bc-1.06-5-i686 Message-ID: <20080312035557.EC5CF119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9b5508f51628e732ad10fee47d5d138adad427e2 commit 9b5508f51628e732ad10fee47d5d138adad427e2 Author: crazy Date: Wed Mar 12 04:55:38 2008 +0100 bc-1.06-5-i686 * rebuild diff --git a/source/apps/bc/FrugalBuild b/source/apps/bc/FrugalBuild index 2688151..7526c28 100644 --- a/source/apps/bc/FrugalBuild +++ b/source/apps/bc/FrugalBuild @@ -3,10 +3,10 @@ pkgname=bc pkgver=1.06 -pkgrel=4 +pkgrel=5 pkgdesc="An arbitrary precision calculator language" url="http://www.gnu.org/software/bc/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('apps' 'chroot-core') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Wed Mar 12 05:03:04 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:03:07 2008 Subject: [Frugalware-git] gcc43: distcc-2.18.3-4-i686 Message-ID: <20080312040304.37F27119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=06c8022d4929f521c3c5c63a14917164770b27d2 commit 06c8022d4929f521c3c5c63a14917164770b27d2 Author: crazy Date: Wed Mar 12 05:02:31 2008 +0100 distcc-2.18.3-4-i686 * rebuild * fixed symlink bug diff --git a/source/devel-extra/distcc/FrugalBuild b/source/devel-extra/distcc/FrugalBuild index e108de7..296c651 100644 --- a/source/devel-extra/distcc/FrugalBuild +++ b/source/devel-extra/distcc/FrugalBuild @@ -4,11 +4,11 @@ pkgname=distcc pkgver=2.18.3 -pkgrel=3 +pkgrel=4 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.samba.org" -depends=('popt' 'gcc') -rodepends=('shadow') +depends=('popt>=1.13' 'gcc>=4.3.0-4') +rodepends=('shadow>=4.1.0-4') groups=('devel-extra' 'chroot-core') archs=('i686' 'x86_64') up2date="lynx -dump http://distcc.samba.org/download.html | grep tar.bz2 | sed -ne 's/.*-\(.*\)\.t.*/\1/;s/systray-plugin-//;1 p'" @@ -26,12 +26,10 @@ build() Frcd distccd Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver Fmkdir /usr/lib/$pkgname/bin - for i in {$CARCH-pc-linux-gnu-,}{cc,c++,gcc,g++} + for i in {$CHOST-,}{cc,c++,gcc,g++} do Fln /usr/bin/$pkgname /usr/lib/$pkgname/bin/$i done } -# optimalization OK - # optimization OK From crazy at frugalware.org Wed Mar 12 05:10:03 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:10:05 2008 Subject: [Frugalware-git] gcc43: libidn-0.5.20-3-i686 Message-ID: <20080312041003.98D5F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=2e4affbbdb8ac2a9b883b867799fdd24f5e45073 commit 2e4affbbdb8ac2a9b883b867799fdd24f5e45073 Author: crazy Date: Wed Mar 12 05:09:35 2008 +0100 libidn-0.5.20-3-i686 * rebuild diff --git a/source/lib/libidn/FrugalBuild b/source/lib/libidn/FrugalBuild index 30151dd..fb5f86b 100644 --- a/source/lib/libidn/FrugalBuild +++ b/source/lib/libidn/FrugalBuild @@ -3,11 +3,11 @@ pkgname=libidn pkgver=0.5.20 -pkgrel=2 +pkgrel=3 pkgdesc="GNU Libidn is an implementation of the Stringprep,Punycode and IDNA specification." url="http://www.gnu.org/software/libidn/" -depends=('glibc') -makedepends=('java-gcj-compat' 'ecj' 'gcc-gcj' 'libtool') +depends=('glibc>=2.7-3') +makedepends=('java-gcj-compat>=1.0.77-2' 'ecj>=3.2.2-4' 'gcc-gcj>=4.3.0-4' 'libtool>=1.5.26-2') archs=('i686' 'x86_64') groups=('lib' 'chroot-core') up2date=$pkgver From crazy at frugalware.org Wed Mar 12 05:18:22 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:18:24 2008 Subject: [Frugalware-git] gcc43: libxml2-2.6.31-2-i686 Message-ID: <20080312041822.A12A4119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=20cdbae1353f7527f00843d52ff32494ed294a46 commit 20cdbae1353f7527f00843d52ff32494ed294a46 Author: crazy Date: Wed Mar 12 05:17:09 2008 +0100 libxml2-2.6.31-2-i686 * rebuild diff --git a/source/lib/libxml2/FrugalBuild b/source/lib/libxml2/FrugalBuild index ec853c6..7cabdc4 100644 --- a/source/lib/libxml2/FrugalBuild +++ b/source/lib/libxml2/FrugalBuild @@ -4,13 +4,13 @@ pkgname=libxml2 pkgver=2.6.31 -pkgrel=1 +pkgrel=2 pkgdesc="XML parsing library" url="http://www.xmlsoft.org/" groups=('lib' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('zlib') -makedepends=('python>=2.5' 'readline') +depends=('zlib>=1.2.3-5') +makedepends=('python>=2.5.2-2' 'readline>=5.2-2') #up2date="lynx -dump 'ftp://xmlsoft.org/libxml2/'|grep -m1 'LATEST_LIBXML2_IS_'|sed 's/.*xml2-\(.*\).t.*/\1/'" up2date="lynx -dump 'ftp://xmlsoft.org/libxml2/'|grep 'libxml2-\(.*\).tar.gz'|Flasttar" source=(ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz) From crazy at frugalware.org Wed Mar 12 05:25:30 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:25:32 2008 Subject: [Frugalware-git] gcc43: sudo-1.6.9p14-1-i686 Message-ID: <20080312042530.CE88D119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1daa073a0aee5b128355511e3acaf36ea60f7841 commit 1daa073a0aee5b128355511e3acaf36ea60f7841 Author: crazy Date: Wed Mar 12 05:24:50 2008 +0100 sudo-1.6.9p14-1-i686 * Version bump * old source gone diff --git a/source/apps/sudo/FrugalBuild b/source/apps/sudo/FrugalBuild index c9c670b..cecbed1 100644 --- a/source/apps/sudo/FrugalBuild +++ b/source/apps/sudo/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: VMiklos pkgname=sudo -pkgver=1.6.9p12 +pkgver=1.6.9p14 pkgrel=1 pkgdesc="Give limited root privileges to certain users" url="http://www.sudo.ws/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('apps' 'chroot-core') archs=('i686' 'x86_64') backup=('etc/sudoers') up2date="lynx -dump http://www.sudo.ws/|grep 'stable version is'|sed 's/.*sudo \(.*\), .*/\1/'" source=(http://www.sudo.ws/$pkgname/dist/$pkgname-$pkgver.tar.gz sudo.sh) -sha1sums=('c2b07c68d2026fb3e7786b2c9a8fb0c519a830f8' \ +sha1sums=('71ac10f51c1b3d6338ac936fe39be3009ea4dbb4' \ 'ff0745f1d95c614f55e8fd1f85abee2486cf24ba') build() From crazy at frugalware.org Wed Mar 12 05:33:24 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:33:26 2008 Subject: [Frugalware-git] gcc43: distcc-2.18.3-5-i686 Message-ID: <20080312043324.1AF2D119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=536cae0be986d4914d8cc88bd000a1c079f4c0ef commit 536cae0be986d4914d8cc88bd000a1c079f4c0ef Author: crazy Date: Wed Mar 12 05:32:25 2008 +0100 distcc-2.18.3-5-i686 * fix another bug * sysconfig/distccd need be in backup() diff --git a/source/devel-extra/distcc/FrugalBuild b/source/devel-extra/distcc/FrugalBuild index 296c651..c8dd77a 100644 --- a/source/devel-extra/distcc/FrugalBuild +++ b/source/devel-extra/distcc/FrugalBuild @@ -4,12 +4,13 @@ pkgname=distcc pkgver=2.18.3 -pkgrel=4 +pkgrel=5 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.samba.org" depends=('popt>=1.13' 'gcc>=4.3.0-4') rodepends=('shadow>=4.1.0-4') groups=('devel-extra' 'chroot-core') +backup=('etc/sysconfig/distccd') archs=('i686' 'x86_64') up2date="lynx -dump http://distcc.samba.org/download.html | grep tar.bz2 | sed -ne 's/.*-\(.*\)\.t.*/\1/;s/systray-plugin-//;1 p'" source=(http://distcc.samba.org/ftp/distcc/$pkgname-$pkgver.tar.bz2 \ From crazy at frugalware.org Wed Mar 12 05:39:23 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:39:36 2008 Subject: [Frugalware-git] gcc43: wget-1.11-2-i686 Message-ID: <20080312043923.8BBC2119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=5ca7c48966a39b6cfac05e8661c77a550a59a9e9 commit 5ca7c48966a39b6cfac05e8661c77a550a59a9e9 Author: crazy Date: Wed Mar 12 05:38:49 2008 +0100 wget-1.11-2-i686 * rebuild diff --git a/source/network/wget/FrugalBuild b/source/network/wget/FrugalBuild index e3c870a..6ac45d2 100644 --- a/source/network/wget/FrugalBuild +++ b/source/network/wget/FrugalBuild @@ -4,7 +4,7 @@ pkgname=wget pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="A network utility to retrieve files from the Web" url="http://www.gnu.org/software/wget/wget.html" depends=('openssl=0.9.8') From crazy at frugalware.org Wed Mar 12 05:50:27 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 05:58:55 2008 Subject: [Frugalware-git] gcc43: lynx-2.8.6-2-i686 Message-ID: <20080312045027.518251964036@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1767446b982c663f0eda89bf491aa77dfc83426a commit 1767446b982c663f0eda89bf491aa77dfc83426a Author: crazy Date: Wed Mar 12 05:49:02 2008 +0100 lynx-2.8.6-2-i686 * rebuild * sha1sums fix diff --git a/source/network/lynx/FrugalBuild b/source/network/lynx/FrugalBuild index ee44730..5fe218c 100644 --- a/source/network/lynx/FrugalBuild +++ b/source/network/lynx/FrugalBuild @@ -4,12 +4,12 @@ pkgname=lynx pkgver=2.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="A fully-featured text mode World Wide Web (WWW) client." url="http://lynx.isc.org/" groups=('network' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('ncurses' 'openssl' 'zlib') +depends=('ncurses>=5.6-3' 'openssl>=0.9.8-12' 'zlib>=1.2.3-5') up2date="lynx -dump $url|grep stable|sed -e 's/.*lynx\(.*\)\. .*/\1/' -e 's/-/./g'" source=(http://lynx.isc.org/release/$pkgname$pkgver.tar.gz) @@ -22,6 +22,6 @@ build() { --enable-libjs --libdir=/etc/lynx Fmakeinstall } -sha1sums=('b3bddc2a7abdf1993ce54e9ee2f635f30d7950c3') +sha1sums=('621d03b2f94abfe152f52a6a25864f04256ea139') # optimization OK From crazy at frugalware.org Wed Mar 12 05:56:17 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 06:05:31 2008 Subject: [Frugalware-git] gcc43: gnupg-1.4.8-2-i686 Message-ID: <20080312045617.418851964036@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=18832d830ee3db86ee22a8b0c5df3c926f11610a commit 18832d830ee3db86ee22a8b0c5df3c926f11610a Author: crazy Date: Wed Mar 12 05:53:58 2008 +0100 gnupg-1.4.8-2-i686 * rebuild diff --git a/source/apps/gnupg/FrugalBuild b/source/apps/gnupg/FrugalBuild index 7390c3a..b6543f8 100644 --- a/source/apps/gnupg/FrugalBuild +++ b/source/apps/gnupg/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gnupg pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="GnuPG is a complete and free replacement for PGP" url="http://www.gnupg.org/" -depends=('zlib' 'bzip2' 'readline') +depends=('zlib>=1.2.3-5' 'bzip2>=1.0.4-2' 'readline>=5.2-2') groups=('apps' 'chroot-core') archs=('i686' 'x86_64') # yes, this is intentional, voroskoi will bump this pkg to 2.x when he says 2.x From crazy at frugalware.org Wed Mar 12 06:12:49 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 06:23:21 2008 Subject: [Frugalware-git] gcc43: lynx-2.8.6-2-x86_64 Message-ID: <20080312051249.B5ED31B640CA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4a537f6f36b42bd0eb1ce39c68ecc254cbed16a8 commit 4a537f6f36b42bd0eb1ce39c68ecc254cbed16a8 Author: crazy Date: Wed Mar 12 06:10:56 2008 +0100 lynx-2.8.6-2-x86_64 * workaround SMP build diff --git a/source/network/lynx/FrugalBuild b/source/network/lynx/FrugalBuild index 5fe218c..4e7130a 100644 --- a/source/network/lynx/FrugalBuild +++ b/source/network/lynx/FrugalBuild @@ -14,6 +14,7 @@ up2date="lynx -dump $url|grep stable|sed -e 's/.*lynx\(.*\)\. .*/\1/' -e 's/-/./ source=(http://lynx.isc.org/release/$pkgname$pkgver.tar.gz) build() { + unset MAKEFLAGS Fcd $pkgname`echo $pkgver|sed 's/\./-/g'` Fpatchall # --libdir is needed for config files, not real libraries. So put it those to /etc/lynx From crazy at frugalware.org Wed Mar 12 06:20:28 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 06:28:36 2008 Subject: [Frugalware-git] gcc43: elinks-0.11.3-5-i686 Message-ID: <20080312052028.32B71119053D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4d1248886089a67106c9e4d92daaee2a6089e785 commit 4d1248886089a67106c9e4d92daaee2a6089e785 Author: crazy Date: Wed Mar 12 06:19:01 2008 +0100 elinks-0.11.3-5-i686 * rebuild diff --git a/source/network/elinks/FrugalBuild b/source/network/elinks/FrugalBuild index 5e16a32..dad02df 100644 --- a/source/network/elinks/FrugalBuild +++ b/source/network/elinks/FrugalBuild @@ -4,10 +4,11 @@ pkgname=elinks pkgver=0.11.3 -pkgrel=4 +pkgrel=5 pkgdesc="An advanced and well-established feature-rich text mode web browser" url="http://elinks.or.cz/" -depends=('openssl' 'glibc' 'gpm' 'zlib' 'bzip2' 'libidn' 'expat' 'ncurses' 'perl>=5.10.0') +depends=('openssl>=0.9.8-12' 'glibc>=2.7-3' 'gpm>=1.20.1-14' 'zlib>=1.2.3-5' \ + 'bzip2>=1.0.4-2' 'libidn>=0.5.20-3' 'expat>=2.0.1-2' 'ncurses>=5.6-3' 'perl>=5.10.0-4') #makedepends=('samba') # smb support is disabled by upstream (security reasons) groups=('network' 'chroot-core') archs=('i686' 'x86_64') From vmiklos at frugalware.org Wed Mar 12 09:35:27 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 09:35:29 2008 Subject: [Frugalware-git] frugalware-current: nvi-1.81.6-1-i686 Message-ID: <20080312083527.6EAB1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6e9053614a93f8a66614e03beddaced213814a9 commit d6e9053614a93f8a66614e03beddaced213814a9 Author: Miklos Vajna Date: Wed Mar 12 09:32:50 2008 +0100 nvi-1.81.6-1-i686 - attemp to fix up smp build diff --git a/source/base/nvi/FrugalBuild b/source/base/nvi/FrugalBuild index 33e5501..f51247a 100644 --- a/source/base/nvi/FrugalBuild +++ b/source/base/nvi/FrugalBuild @@ -20,6 +20,7 @@ build() cd build ../dist/configure $Fconfopts --program-prefix=n --disable-curses || return 1 make || return 1 + unset MAKEFLAGS Fmakeinstall Frm /usr/share/man/cat1 Fmkdir /bin From vmiklos at frugalware.org Wed Mar 12 10:14:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 10:14:07 2008 Subject: [Frugalware-git] frugalware-current: po4a-0.33-1-i686 Message-ID: <20080312091405.B234B119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f265b0bc9ca65317ecb1baa07d330b498b3184a0 commit f265b0bc9ca65317ecb1baa07d330b498b3184a0 Author: Miklos Vajna Date: Wed Mar 12 10:13:19 2008 +0100 po4a-0.33-1-i686 - version bump - removed patches, they are in upstream now diff --git a/source/devel-extra/po4a/FrugalBuild b/source/devel-extra/po4a/FrugalBuild index 7ac4638..e1b0800 100644 --- a/source/devel-extra/po4a/FrugalBuild +++ b/source/devel-extra/po4a/FrugalBuild @@ -2,9 +2,10 @@ # Maintainer: VMiklos pkgname=po4a -pkgver=0.32 -rel_id=2108 -pkgrel=2 +pkgver=0.33 +# check http://alioth.debian.org/frs/?group_id=30267 +rel_id=2351 +pkgrel=1 pkgdesc="Eases translation work, and in particular the maintenance of translations." url="http://po4a.alioth.debian.org/" depends=('perl-gettext' 'perl-text-wrapi18n') @@ -12,8 +13,5 @@ makedepends=('perl-module-build') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://alioth.debian.org/projects/po4a/|grep ' po4a'|sed 's/.*po4a \([^ ]*\) .*/\1/'" -source=(http://alioth.debian.org/download.php/$rel_id/$pkgname-$pkgver.tar.gz \ - po4a-1.patch po4a-2.patch) -sha1sums=('890ccfd513530f5cfda3efd5d33aab9874f7104a' \ - 'a697b7c77edc980dbb903a83c28be6469dbf2096' \ - '0dffc7b1065dd5bb4008ba23826e6a02d9442ea2') +source=(http://alioth.debian.org/download.php/$rel_id/$pkgname-$pkgver.tar.gz) +sha1sums=('894c47f9f3d1edf2a10033960fec19def7e560d5') diff --git a/source/devel-extra/po4a/po4a-1.patch b/source/devel-extra/po4a/po4a-1.patch deleted file mode 100644 index 6451b78..0000000 --- a/source/devel-extra/po4a/po4a-1.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- po4a-0.32-ORIG/po4a 2008-01-06 16:00:14.000000000 +0100 -+++ po4a-0.32/po4a 2008-01-06 16:08:19.000000000 +0100 -@@ -440,10 +440,10 @@ - $opts{"msgmerge-opt"} .= " --previous" if $previous; - - # options to transmit to the modules -- %{$opts{"options"}} = ( -+ $opts{"options"} = { - "verbose" => $opts{"verbose"}, - "debug" => $opts{"debug"} -- ); -+ }; - foreach (@options) { - if (m/^([^=]*)=(.*)$/) { - $opts{"options"}{$1}="$2"; -@@ -498,10 +498,10 @@ - if (! defined $lang) { - $lang = "global"; - } -- if (! defined ${%$options}{$lang}) { -- ${%$options}{$lang} = $opt; -+ if (! defined $options->{$lang}) { -+ $options->{$lang} = $opt; - } else { -- ${%$options}{$lang} .= " $opt"; -+ $options->{$lang} .= " $opt"; - } - } else { - last; -@@ -638,20 +638,20 @@ - my %options; - # 1. Use the global options ([opt] ...) - %options = %{$document{''}{'options'}} -- if defined %{$document{''}{'options'}}; -+ if defined $document{''}{'options'}; - - # 2. Merge the alias options - if (defined $aliases{$1}) { - $document{$main}{'format'} = $aliases{$1}{"module"}; -- if (defined %{$aliases{$1}{"options"}}) { -- %options = %{$aliases{$1}{"options"}}; -+ if (defined $aliases{$1}{"options"}) { -+ %options = %{$aliases{$1}{"options"}}; # XXX not a merge, but overwrite - } - } - - # 3. If this file was already specified, reuse the previous - # options (no merge) - %options = %{$document{$main}{'options'}} -- if defined %{$document{$main}{'options'}}; -+ if defined $document{$main}{'options'}; - - # 4. Merge the document specific options - # separate the end of the line, which contains options. -@@ -697,7 +697,7 @@ - $o =~ s/.*?\[options\] +//; - parse_config_options("$config_file:$nb", - $o, -- \%{$document{''}{"options"}}); -+ $document{''}{"options"}); - } else { - die wrap_ref_mod("$config_file:$nb", "", - gettext("Unparsable command '%s'."), $cmd); - diff --git a/source/devel-extra/po4a/po4a-2.patch b/source/devel-extra/po4a/po4a-2.patch deleted file mode 100644 index f4e5b38..0000000 --- a/source/devel-extra/po4a/po4a-2.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- po4a-0.32-ORIG/lib/Locale/Po4a/Common.pm 2008-01-06 16:00:14.000000000 +0100 -+++ po4a-0.32/lib/Locale/Po4a/Common.pm 2008-01-06 16:09:59.000000000 +0100 -@@ -192,8 +192,8 @@ - BEGIN { - if (eval { require Locale::gettext }) { - import Locale::gettext; -- use POSIX; -- setlocale(LC_MESSAGES, ''); -+ require POSIX; -+ POSIX::setlocale(&POSIX::LC_MESSAGES, ''); - } else { - eval ' - sub bindtextdomain($$) { } - From vmiklos at frugalware.org Wed Mar 12 10:16:41 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 10:16:42 2008 Subject: [Frugalware-git] frugalware-current: bzr-1.2-1-i686 Message-ID: <20080312091641.25619119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95b223fce3f878c04401fe0f1fe3ca0be2bf60cd commit 95b223fce3f878c04401fe0f1fe3ca0be2bf60cd Author: Miklos Vajna Date: Wed Mar 12 10:16:33 2008 +0100 bzr-1.2-1-i686 - version bump diff --git a/source/devel-extra/bzr/FrugalBuild b/source/devel-extra/bzr/FrugalBuild index 8506124..73920b4 100644 --- a/source/devel-extra/bzr/FrugalBuild +++ b/source/devel-extra/bzr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bzr -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="Next generation distributed version control" url="http://bazaar-vcs.org" From vmiklos at frugalware.org Wed Mar 12 10:19:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 10:19:42 2008 Subject: [Frugalware-git] frugalware-current: autoconf-archive-2008_02_21-1-i686 Message-ID: <20080312091940.77A2E119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8825e24d9e3ccbf25a29f55e83ded535d4fc956 commit b8825e24d9e3ccbf25a29f55e83ded535d4fc956 Author: Miklos Vajna Date: Wed Mar 12 10:19:13 2008 +0100 autoconf-archive-2008_02_21-1-i686 - version bump diff --git a/source/devel-extra/autoconf-archive/FrugalBuild b/source/devel-extra/autoconf-archive/FrugalBuild index e228135..5a6b6b9 100644 --- a/source/devel-extra/autoconf-archive/FrugalBuild +++ b/source/devel-extra/autoconf-archive/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=autoconf-archive -pkgver=2008_01_16 +pkgver=2008_02_21 pkgrel=1 pkgdesc="Aims to provide a collection of reusable Autoconf macros." url="http://autoconf-archive.cryp.to/" @@ -11,5 +11,5 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar.bz2$|sed 's/.*archive-\(.*\).t.*/\1/;s/-/_/g;q'" source=(http://autoconf-archive.cryp.to/autoconf-archive-${pkgver//_/-}.tar.bz2) -sha1sums=('52f09e2095c69d65e60da5ebfc22520c7e544839') +sha1sums=('bc1e0ef8c64a77294cee29f83a4836474d5f74d7') _F_cd_path="autoconf-archive-${pkgver//_/-}" From vmiklos at frugalware.org Wed Mar 12 10:22:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 10:22:29 2008 Subject: [Frugalware-git] frugalware-current: etckeeper-0.12-1-i686 Message-ID: <20080312092228.48CC1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f248d8e601c535b57ccb3291faa845ed9b0173d commit 9f248d8e601c535b57ccb3291faa845ed9b0173d Author: Miklos Vajna Date: Wed Mar 12 10:22:19 2008 +0100 etckeeper-0.12-1-i686 - version bump diff --git a/source/apps-extra/etckeeper/FrugalBuild b/source/apps-extra/etckeeper/FrugalBuild index 813cb44..898bd2a 100644 --- a/source/apps-extra/etckeeper/FrugalBuild +++ b/source/apps-extra/etckeeper/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=etckeeper -pkgver=0.11 +pkgver=0.12 pkgrel=1 pkgdesc="Stores the /etc directory in a git repo." url="http://kitenet.net/~joey/code/etckeeper/" @@ -13,7 +13,7 @@ archs=('i686') Fpkgversep="_" up2date="lynx -dump http://ftp.debian.org/debian/pool/main/e/etckeeper|Flasttar" source=(http://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_$pkgver.tar.gz) -sha1sums=('82c37599af7f2681d892fde95b7db7825d42820f') +sha1sums=('5b0f471743eba1c8ef43fe9bd9913d6a7a2e5df2') build() { From vmiklos at frugalware.org Wed Mar 12 10:29:30 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 10:29:32 2008 Subject: [Frugalware-git] frugalware-current: star-1.5a88-1-i686 Message-ID: <20080312092930.382FB119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=493119a146e2d94594bc362c9b00d2bf172a6638 commit 493119a146e2d94594bc362c9b00d2bf172a6638 Author: Miklos Vajna Date: Wed Mar 12 10:29:22 2008 +0100 star-1.5a88-1-i686 - version bump diff --git a/source/apps-extra/star/FrugalBuild b/source/apps-extra/star/FrugalBuild index f4121ad..a636846 100644 --- a/source/apps-extra/star/FrugalBuild +++ b/source/apps-extra/star/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Michael Surette pkgname=star -pkgver=1.5a87 +pkgver=1.5a88 pkgrel=1 pkgdesc="very fast and Posix 1003.1 compliant tar" url="http://cdrecord.berlios.de/old/private/star.html" @@ -13,7 +13,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="elinks -dump ftp://ftp.berlios.de/pub/star/alpha |grep [0-9].tar.bz2|tail -n1|sed -e 's/.*star-//' -e 's/.tar.bz2//'" source=("ftp://ftp.berlios.de/pub/$pkgname/alpha/$pkgname-$pkgver.tar.bz2") -sha1sums=('5f6cb97f075f7b44cdd8dd8b86ca1f5b1940c2ff') +sha1sums=('835a97232f476a7ee487ae7095ce0358959baab3') build() { From janny at frugalware.org Wed Mar 12 11:02:16 2008 From: janny at frugalware.org (Janny) Date: Wed Mar 12 11:02:19 2008 Subject: [Frugalware-git] fwlive: fwlive-stable Message-ID: <20080312100216.4FC2A119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=76684e126b5cce28fb832e18466ab1e0dec369c7 commit 76684e126b5cce28fb832e18466ab1e0dec369c7 Author: Janny Date: Wed Mar 12 11:02:03 2008 +0100 fwlive-stable diff --git a/config b/config index 479c2d5..a026f1e 100644 --- a/config +++ b/config @@ -40,8 +40,8 @@ ifeq ($(findstring testing,$(TREE)),testing) FWVER = 0.8 FWCODENAME = Kalgan endif -FWVER ?= 0.7 -FWCODENAME ?= Sayshell +FWVER ?= 0.8 +FWCODENAME ?= Kalgan FWREL = ${FWVER} (${FWCODENAME}) # filename of the is @@ -69,10 +69,10 @@ SAVEDIRS = etc home lib root usr var CONFIG_SETUP = y # additional packages to be installed by the profiles -# no builded pkgs: truecrypt-fwlive acx100-fwlive +# no builded pkgs: truecrypt-fwlive DRIVERS = gspcav1-fwlive qc-usb-fwlive dazuko-fwlive busybox-fwlive lirc-fwlive \ acerhk-fwlive redirfs-fwlive madwifi-fwlive wlan-ng-fwlive busybox-fwlive \ - ndiswrapper-fwlive kqemu-fwlive + ndiswrapper-fwlive kqemu-fwlive acx100-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) From janny at frugalware.org Wed Mar 12 11:03:26 2008 From: janny at frugalware.org (Janny) Date: Wed Mar 12 11:03:27 2008 Subject: [Frugalware-git] fwlive: TAG 0.8 Message-ID: <20080312100326.268A5119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=458ddecd83f3d75a86e4551f9d4c1ea5e25c1567 commit 458ddecd83f3d75a86e4551f9d4c1ea5e25c1567 Author: Janny Date: Wed Mar 12 11:03:19 2008 +0100 TAG 0.8 From vmiklos at frugalware.org Wed Mar 12 11:35:58 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 11:36:00 2008 Subject: [Frugalware-git] frugalware-current: truecrypt-5.1-1-i686 Message-ID: <20080312103558.2ACAA119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7798384be097f922fceb916bb040ed6f96c73040 commit 7798384be097f922fceb916bb040ed6f96c73040 Author: Miklos Vajna Date: Wed Mar 12 11:35:30 2008 +0100 truecrypt-5.1-1-i686 - version bump - removed -64bit.patch (no longer applies) diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild index c2b2399..0b03177 100644 --- a/source/apps-extra/truecrypt/FrugalBuild +++ b/source/apps-extra/truecrypt/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=truecrypt -pkgver=5.0 +pkgver=5.1 pkgextraver= pkgrel=1 pkgdesc="A free open-source disk encryption software" @@ -11,21 +11,22 @@ depends=('fuse' 'wxgtk-u8') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.truecrypt.org/downloads.php|grep Stable|sed 's/.* - //;s/$pkgextraver//'" -source=("http://www.truecrypt.org/downloads/transient/987a415c42/TrueCrypt $pkgver$pkgextraver Source.tar.gz" \ - truecrypt-5.0-64bit.patch) -sha1sums=('f6e71f757425cedc76f023a91b78a073e279cdac' \ - '9dc34ff69dad98c8b84c5f8a99a232bfc6b01d06') +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/TrueCrypt-$pkgver$pkgextraver-Source.tar.gz) +signatures=($source.sig) build() { - tar xf "TrueCrypt $pkgver$pkgextraver Source.tar.gz" Fcd truecrypt-$pkgver$pkgextraver-source Fpatchall Fsed '--static' '' Main/Main.make rm -rf wxrelease mkdir wxrelease ln -s /usr/bin/wx-config wxrelease/ - Fmake + extra="" + [ "$CARCH" == "x86_64" ] && extra="USE64BIT=1" + make $extra VERBOSE=1 EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || return 1 Fexerel Main/truecrypt /usr/bin/truecrypt Fdocrel Readme.txt Release } + +# optimization OK diff --git a/source/apps-extra/truecrypt/truecrypt-5.0-64bit.patch b/source/apps-extra/truecrypt/truecrypt-5.0-64bit.patch deleted file mode 100644 index 69d1383..0000000 --- a/source/apps-extra/truecrypt/truecrypt-5.0-64bit.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -urNP truecrypt-5.0-source.org/Platform/StringConverter.cpp truecrypt-5.0-source/Platform/StringConverter.cpp ---- truecrypt-5.0-source.org/Platform/StringConverter.cpp 2008-02-04 13:14:18.000000000 +0200 -+++ truecrypt-5.0-source/Platform/StringConverter.cpp 2008-02-09 21:38:23.000000000 +0200 -@@ -32,12 +32,14 @@ - return s.str(); - } - -+#if __WORDSIZE == 32 - wstring StringConverter::FromNumber (int64 number) - { - wstringstream s; - s << number; - return s.str(); - } -+#endif - - wstring StringConverter::FromNumber (int number) - { -@@ -60,12 +62,14 @@ - return s.str(); - } - -+#if __WORDSIZE == 32 - wstring StringConverter::FromNumber (uint64 number) - { - wstringstream s; - s << number; - return s.str(); - } -+#endif - - string StringConverter::GetTrailingNumber (const string &str) - { -diff -urNP truecrypt-5.0-source.org/Platform/StringConverter.h truecrypt-5.0-source/Platform/StringConverter.h ---- truecrypt-5.0-source.org/Platform/StringConverter.h 2008-02-04 13:14:16.000000000 +0200 -+++ truecrypt-5.0-source/Platform/StringConverter.h 2008-02-09 21:38:03.000000000 +0200 -@@ -19,11 +19,15 @@ - public: - static wstring FromNumber (double number); - static wstring FromNumber (int number); -+#if __WORDSIZE == 32 - static wstring FromNumber (int64 number); -+#endif - static wstring FromNumber (long number); - static wstring FromNumber (unsigned int number); - static wstring FromNumber (unsigned long number); -+#if __WORDSIZE == 32 - static wstring FromNumber (uint64 number); -+#endif - static string GetTrailingNumber (const string &str); - static string GetTypeName (const type_info &typeInfo); - static wstring QuoteSpaces (const wstring &str); ---- truecrypt-5.0-source.org/Platform/PlatformTest.cpp 2008-02-04 13:14:16.000000000 +0200 -+++ truecrypt-5.0-source/Platform/PlatformTest.cpp 2008-02-09 21:49:15.000000000 +0200 -@@ -270,7 +270,11 @@ namespace TrueCrypt - // shared_ptr, make_shared, StringConverter, foreach - list > numList; - -+#if __WORDSIZE == 32 - numList.push_front (make_shared (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeULL)))); -+#else -+ numList.push_front (make_shared (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeUL)))); -+#endif - numList.push_front (make_shared (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2")))); - numList.push_front (make_shared (3)); - ---- truecrypt-5.0-source.org/Main/StringFormatter.h 2008-02-04 13:14:14.000000000 +0200 -+++ truecrypt-5.0-source/Main/StringFormatter.h 2008-02-09 22:15:04.000000000 +0200 -@@ -27,11 +27,15 @@ namespace TrueCrypt - StringFormatterArg (const wstring &str) : Empty (false), Referenced (false), StringArg (str) { } - StringFormatterArg (const wxString &str) : Empty (false), Referenced (false), StringArg (str) { } - StringFormatterArg (int number) : Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { } -+#if __WORDSIZE == 32 - StringFormatterArg (int64 number) : Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { } -+#endif - StringFormatterArg (long number) : Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { } - StringFormatterArg (unsigned int number) : Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { } - StringFormatterArg (unsigned long number) : Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { } -+#if __WORDSIZE == 32 - StringFormatterArg (uint64 number) : Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { } -+#endif - - operator wxString () { Referenced = true; return StringArg; } - ---- truecrypt-5.0-source.org/Main/Forms/VolumeSizeWizardPage.cpp 2008-02-04 13:14:46.000000000 +0200 -+++ truecrypt-5.0-source/Main/Forms/VolumeSizeWizardPage.cpp 2008-02-09 22:27:35.000000000 +0200 -@@ -55,7 +55,7 @@ namespace TrueCrypt - { - uint64 prefixMult = 1; - if (VolumeSizePrefixChoice->GetSelection() != wxNOT_FOUND) -- prefixMult = reinterpret_cast (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection())); -+ prefixMult = reinterpret_cast (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection())); - - uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue())); - if (val <= 0x7fffFFFFffffFFFFull / prefixMult) From janny at frugalware.org Wed Mar 12 11:48:21 2008 From: janny at frugalware.org (janny) Date: Wed Mar 12 11:48:23 2008 Subject: [Frugalware-git] frugalware-current: perl-carp-clan-6.00-1-i686 Message-ID: <20080312104821.CAC32119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d74533eb012d8885a71b0e08d89257f5c799d9d1 commit d74533eb012d8885a71b0e08d89257f5c799d9d1 Author: janny Date: Wed Mar 12 11:47:32 2008 +0100 perl-carp-clan-6.00-1-i686 * version bump diff --git a/source/devel-extra/perl-carp-clan/FrugalBuild b/source/devel-extra/perl-carp-clan/FrugalBuild index 013f8e4..fbadab9 100644 --- a/source/devel-extra/perl-carp-clan/FrugalBuild +++ b/source/devel-extra/perl-carp-clan/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Carp-Clan _F_perl_author=J/JJ/JJORE -pkgver=5.10 +pkgver=6.00 pkgdesc="Report errors from perspective of caller of a 'clan' of modules" # don't install additional modules just for the testsuite _F_conf_perl_pipefrom="echo no" Finclude perl -sha1sums=('81eefc71a1329b06173c450d8efe13cec18ae690') +sha1sums=('031be112a57393ac87db24239933c408d2f1f6c6') archs=(${archs[@]} 'x86_64') From krics at linuxforum.hu Wed Mar 12 14:20:16 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Mar 12 14:20:19 2008 Subject: [Frugalware-git] frugalware-current: ntfs-3g-1.2310-1-x86_64 Message-ID: <20080312132016.C5BC2119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6b4cb454995c257db8f893660a9d99743422c4c commit d6b4cb454995c257db8f893660a9d99743422c4c Author: Christian Hamar alias krix Date: Wed Mar 12 14:20:02 2008 +0100 ntfs-3g-1.2310-1-x86_64 * Version bump diff --git a/source/apps-extra/ntfs-3g/FrugalBuild b/source/apps-extra/ntfs-3g/FrugalBuild index 6873552..1f4471d 100644 --- a/source/apps-extra/ntfs-3g/FrugalBuild +++ b/source/apps-extra/ntfs-3g/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=ntfs-3g -pkgver=1.2216 +pkgver=1.2310 pkgrel=1 pkgdesc="Third generation Linux NTFS driver with full read-write access." url="http://www.ntfs-3g.org/" @@ -13,5 +13,5 @@ up2date="lynx -dump $url| grep -m 1 'ntfs-3g-[[:digit:]]\+\.[[:digit:]]\+\.tgz' source=($url/$pkgname-$pkgver.tgz) Fconfopts="$Fconfopts --disable-ldconfig" -sha1sums=('e0a09cb9ee241e6f3a671f22e3cd8866c731bc6f') +sha1sums=('d8fd4827be5f4a80ae4e1684f107a5fdb296bcbc') # optimization OK From devil505linux at gmail.com Wed Mar 12 18:25:05 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 18:25:07 2008 Subject: [Frugalware-git] frugalware-current: guake-0.1-5-i686 Message-ID: <20080312172505.2F3F3119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5f934d54c992d581e3c5b91cb2460e76025a97e commit d5f934d54c992d581e3c5b91cb2460e76025a97e Author: Devil505 Date: Wed Mar 12 17:22:38 2008 +0000 guake-0.1-5-i686 *added x86_64 to archs() *added gnome-python to depends() *Closed FS#2847 diff --git a/source/gnome-extra/guake/FrugalBuild b/source/gnome-extra/guake/FrugalBuild index 0d31cac..837d25a 100644 --- a/source/gnome-extra/guake/FrugalBuild +++ b/source/gnome-extra/guake/FrugalBuild @@ -3,10 +3,10 @@ pkgname=guake pkgver=0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Guake is a drop-down terminal for Gnome Desktop Environment" url='http://guake-terminal.org' -depends=('python' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' 'notify-python') +depends=('python' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' 'notify-python' 'gnome-python') rodepends=('vte-python' 'notification-daemon') makedepends=('perl-xml-parser' 'gconf') _F_gnome_desktop="y" @@ -14,7 +14,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/guake.schemas') Finclude gnome-scriptlet options=('genscriptlet') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/download | Flasttar" source=($url/releases/0.1-alpha/$pkgname-$pkgver.tar.gz) sha1sums=('0e76695fe4c6f3da77e49a730e72b21979235540') From devil505linux at gmail.com Wed Mar 12 18:30:33 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 18:30:34 2008 Subject: [Frugalware-git] frugalware-current: *added x86_64 to archs() Message-ID: <20080312173033.17460119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=429c5ab6becd5049d76c0cf4a48cefb7423868d5 commit 429c5ab6becd5049d76c0cf4a48cefb7423868d5 Author: Devil505 Date: Wed Mar 12 17:29:13 2008 +0000 *added x86_64 to archs() diff --git a/source/xapps-extra/homebank/FrugalBuild b/source/xapps-extra/homebank/FrugalBuild index a22463d..439db68 100644 --- a/source/xapps-extra/homebank/FrugalBuild +++ b/source/xapps-extra/homebank/FrugalBuild @@ -10,7 +10,7 @@ depends=('gtk+2' 'libxdamage' 'libofx>=0.9.0') makedepends=('perl-xml-parser') options=('scriptlet') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump '$url/public/?M=A' | Flasttar" source=($url/public/$pkgname-$pkgver.tar.gz) sha1sums=('020b6fdc4eaf766d7861717390bdca1c5f8ec73f') From devil505linux at gmail.com Wed Mar 12 18:32:18 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 18:32:20 2008 Subject: [Frugalware-git] frugalware-current: *added x86_64 to archs() Message-ID: <20080312173218.97E60119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cac69c6fb63fee9cef981c67e8fea6aca7398a80 commit cac69c6fb63fee9cef981c67e8fea6aca7398a80 Author: Devil505 Date: Wed Mar 12 17:31:26 2008 +0000 *added x86_64 to archs() diff --git a/source/xapps-extra/coverfinder/FrugalBuild b/source/xapps-extra/coverfinder/FrugalBuild index eb88483..3ec7b6c 100644 --- a/source/xapps-extra/coverfinder/FrugalBuild +++ b/source/xapps-extra/coverfinder/FrugalBuild @@ -9,7 +9,7 @@ url="http://mookooh.org/coverfinder/" depends=('gtk+2' 'curl' 'libxdamage') options=('scriptlet') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url | grep tar.gz | Flasttar" source=($url/releases/$pkgname-$pkgver.tar.gz) sha1sums=('727ea6b8a9576098111e63c07514369ed03bf349') From devil505linux at gmail.com Wed Mar 12 18:36:31 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 18:36:32 2008 Subject: [Frugalware-git] frugalware-current: added x86_64 to archs() Message-ID: <20080312173631.99C74119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0824bf8fb7644a57684b8dc218263b90ff841ac0 commit 0824bf8fb7644a57684b8dc218263b90ff841ac0 Author: Devil505 Date: Wed Mar 12 17:36:04 2008 +0000 added x86_64 to archs() diff --git a/source/xapps-extra/jargoninformatique/FrugalBuild b/source/xapps-extra/jargoninformatique/FrugalBuild old mode 100755 new mode 100644 index 4879f65..306f232 --- a/source/xapps-extra/jargoninformatique/FrugalBuild +++ b/source/xapps-extra/jargoninformatique/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="French computering dictionary." url="http://jargon.tuxfamily.org" depends=('fltk' 'libxpm' 'libstdc++') -archs=('i686') +archs=('i686' 'x86_64') groups=('xapps-extra') up2date="lynx -dump $url/download.php | grep -m3 tar.gz | Flasttar" source="http://jargon.tuxfamily.org/$pkgname-$pkgver.tar.gz" From devil505linux at gmail.com Wed Mar 12 18:45:08 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 18:45:22 2008 Subject: [Frugalware-git] frugalware-current: amsn-plugin-bigsmileys-20060226-1-i686 Message-ID: <20080312174508.C62E7119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5388760e4a82893877ad2d953b42ef6d9c4ca067 commit 5388760e4a82893877ad2d953b42ef6d9c4ca067 Author: Devil505 Date: Wed Mar 12 17:44:10 2008 +0000 amsn-plugin-bigsmileys-20060226-1-i686 *Version bump diff --git a/source/xapps-extra/amsn-plugin-bigsmileys/FrugalBuild b/source/xapps-extra/amsn-plugin-bigsmileys/FrugalBuild index b2a43d5..f78f5be 100644 --- a/source/xapps-extra/amsn-plugin-bigsmileys/FrugalBuild +++ b/source/xapps-extra/amsn-plugin-bigsmileys/FrugalBuild @@ -3,7 +3,7 @@ pkgname=amsn-plugin-bigsmileys _F_amsn_name="bigsmileys" -pkgver=20060116 +pkgver=20060226 pkgrel=1 pkgdesc="amsn plugin that shows an extra smileys button for selecting from customs smileys with a bigger preview." _F_sourceforge_ext=".zip" @@ -12,6 +12,6 @@ _F_sourceforge_name="bigsmileys" _F_sourceforge_broken_up2date=1 Finclude sourceforge amsn archs=('i686') -sha1sums=('ea9aa9d3620ba6d03a7d454045c962008434c605') +sha1sums=('1bb7be606f1eeefa0895ebe4332fb94002de9a1b') From devil505linux at gmail.com Wed Mar 12 19:13:41 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 19:13:44 2008 Subject: [Frugalware-git] frugalware-current: cwallpaper-0.3.2-1-i686 Message-ID: <20080312181341.E0CEB119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fbb0844bc313467ec6d9565c3b5f402931e78aa commit 5fbb0844bc313467ec6d9565c3b5f402931e78aa Author: Devil505 Date: Wed Mar 12 18:12:25 2008 +0000 cwallpaper-0.3.2-1-i686 *version bump *new depends diff --git a/source/xapps-extra/cwallpaper/FrugalBuild b/source/xapps-extra/cwallpaper/FrugalBuild index 93cab15..3855f1a 100644 --- a/source/xapps-extra/cwallpaper/FrugalBuild +++ b/source/xapps-extra/cwallpaper/FrugalBuild @@ -1,16 +1,16 @@ -# Compiling Time: 0.03 SBU +# Compiling Time: 0.01 SBU # Maintainer: Devil505 pkgname=cwallpaper -pkgver=0.3.1 +pkgver=0.3.2 pkgrel="1" pkgdesc="CWallpaper is a front end for fbsetbg, Esetroot, feh, and other wallpaper changers." -depends=('gtk+2' 'libxdamage') +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2') _F_sourceforge_broken_up2date=1 Finclude sourceforge options=('scriptlet') groups=('xapps-extra') archs=('i686') -sha1sums=('395d6cf35bf35ae38a5aa271a1be88ca46011cbf') +sha1sums=('fa5e518967a98ac7a040199da5bc86e69611857f') # optimization OK \ No newline at end of file From devil505linux at gmail.com Wed Mar 12 19:21:50 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 19:21:53 2008 Subject: [Frugalware-git] frugalware-current: *Fixed sha1sum Message-ID: <20080312182150.12F29119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54af469aa8b32ecd6930e7781e0e309f71ebdbae commit 54af469aa8b32ecd6930e7781e0e309f71ebdbae Author: Devil505 Date: Wed Mar 12 18:21:29 2008 +0000 *Fixed sha1sum diff --git a/source/xapps-extra/homebank/FrugalBuild b/source/xapps-extra/homebank/FrugalBuild index 439db68..c795c6a 100644 --- a/source/xapps-extra/homebank/FrugalBuild +++ b/source/xapps-extra/homebank/FrugalBuild @@ -13,6 +13,6 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$url/public/?M=A' | Flasttar" source=($url/public/$pkgname-$pkgver.tar.gz) -sha1sums=('020b6fdc4eaf766d7861717390bdca1c5f8ec73f') +sha1sums=('a4f65b9867e0131173003378308a7a2ffef83e49'') # optimization OK From devil505linux at gmail.com Wed Mar 12 19:22:51 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 19:22:52 2008 Subject: [Frugalware-git] frugalware-current: *Fixed typo Message-ID: <20080312182251.20FC1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46276ec6e27e4f8eccf62a24d77de392ad5078e3 commit 46276ec6e27e4f8eccf62a24d77de392ad5078e3 Author: Devil505 Date: Wed Mar 12 18:22:33 2008 +0000 *Fixed typo diff --git a/source/xapps-extra/homebank/FrugalBuild b/source/xapps-extra/homebank/FrugalBuild index c795c6a..8fcce09 100644 --- a/source/xapps-extra/homebank/FrugalBuild +++ b/source/xapps-extra/homebank/FrugalBuild @@ -13,6 +13,6 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$url/public/?M=A' | Flasttar" source=($url/public/$pkgname-$pkgver.tar.gz) -sha1sums=('a4f65b9867e0131173003378308a7a2ffef83e49'') +sha1sums=('a4f65b9867e0131173003378308a7a2ffef83e49') # optimization OK From devil505linux at gmail.com Wed Mar 12 19:28:43 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 19:28:45 2008 Subject: [Frugalware-git] frugalware-current: coverfinder-0.1.1-2-i686 Message-ID: <20080312182843.BBDD1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6a4b84d94a19003f38d94cf0b2d38fe55db8927 commit a6a4b84d94a19003f38d94cf0b2d38fe55db8927 Author: Devil505 Date: Wed Mar 12 18:28:22 2008 +0000 coverfinder-0.1.1-2-i686 *Fixed depends diff --git a/source/xapps-extra/coverfinder/FrugalBuild b/source/xapps-extra/coverfinder/FrugalBuild index 3ec7b6c..ece8fb6 100644 --- a/source/xapps-extra/coverfinder/FrugalBuild +++ b/source/xapps-extra/coverfinder/FrugalBuild @@ -3,10 +3,10 @@ pkgname=coverfinder pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="This is a tool to find cover images via the Amazon Web Services API and to save them locally" url="http://mookooh.org/coverfinder/" -depends=('gtk+2' 'curl' 'libxdamage') +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'curl' 'libxml2' 'libxdamage' 'libxext') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From devil505linux at gmail.com Wed Mar 12 19:37:15 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 19:37:17 2008 Subject: [Frugalware-git] frugalware-current: bygfoot-2.2.1-1-i686 Message-ID: <20080312183715.F0B1E119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ec962238af58dc0c6008cedcf7133d9943a9277 commit 3ec962238af58dc0c6008cedcf7133d9943a9277 Author: Devil505 Date: Wed Mar 12 18:36:01 2008 +0000 bygfoot-2.2.1-1-i686 *version bump *new depends diff --git a/source/games-extra/bygfoot/FrugalBuild b/source/games-extra/bygfoot/FrugalBuild index d045f87..629ac2a 100644 --- a/source/games-extra/bygfoot/FrugalBuild +++ b/source/games-extra/bygfoot/FrugalBuild @@ -1,19 +1,19 @@ -# Compiling Time: 0.36 SBU +# Compiling Time: 0.29 SBU # Maintainer: Devil505 pkgname=bygfoot -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Football (a.k.a. soccer) management game" _F_sourceforge_ext="-source.tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.bygfoot.com/" -depends=('gtk+2' 'libxdamage') +depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2') groups=('games-extra') archs=('i686' 'x86_64') _F_cd_path="$pkgname-$pkgver-source" -sha1sums=('4ed7aad57c5f675b3cb72c42b329178536201d8b') +sha1sums=('a125ed203de0d8c89a9c16cb796c56b0df6209c5') _F_desktop_name="Bygfoot" _F_desktop_icon="/usr/share/bygfoot/support_files/pixmaps/bygfoot_icon.png" @@ -23,5 +23,6 @@ build() { Fbuild Fdesktop2 -} +} + # optimization OK From devil505linux at gmail.com Wed Mar 12 19:50:16 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 19:50:22 2008 Subject: [Frugalware-git] frugalware-current: gnome-video-arcade-0.5.6-1-i686 Message-ID: <20080312185016.8B5C5119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=26b39f00f45423228c0763b9d0483721e0395a7c commit 26b39f00f45423228c0763b9d0483721e0395a7c Author: Devil505 Date: Wed Mar 12 18:49:04 2008 +0000 gnome-video-arcade-0.5.6-1-i686 *version bump *new depends diff --git a/source/gnome-extra/gnome-video-arcade/FrugalBuild b/source/gnome-extra/gnome-video-arcade/FrugalBuild index 00f9fdc..66040ef 100644 --- a/source/gnome-extra/gnome-video-arcade/FrugalBuild +++ b/source/gnome-extra/gnome-video-arcade/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Devil505 pkgname=gnome-video-arcade -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=1 pkgdesc="GNOME Video Arcade is a simple xmame front-end for the GNOME Desktop Environment" _F_sourceforge_dirname="gva" _F_sourceforge_broken_up2date=1 Finclude sourceforge -depends=('libgnomeui' 'sqlite3' 'libxdamage' 'xmame') +depends=('libglade' 'libgnomeui' 'libsm' 'popt' 'gnome-vfs' 'esd' 'pango' 'gail' 'libart_lgpl' 'atk' 'freetype2' 'libxau' 'libxdmcp' 'sqlite3' 'libjpeg' 'openssl' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'xmame') makedepends=('perl-xml-parser' 'gnome-doc-utils') _F_gnome_schemas=('/etc/gconf/schemas/gnome-video-arcade.schemas') _F_gnome_desktop="y" @@ -17,6 +17,6 @@ Finclude gnome-scriptlet options=('genscriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('652127ae0fd9703943e51fba63170344404accc9') +sha1sums=('b53ec7bf2142ebfbee7f97510c1235aaa7276a49') # optimization OK From crazy at frugalware.org Wed Mar 12 21:19:56 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 21:19:59 2008 Subject: [Frugalware-git] gcc43: kernel-2.6.24-4-i686 Message-ID: <20080312201956.AE427119053C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3e3b2d572d2ae8a36ccabdcd2c74503ca5d1def6 commit 3e3b2d572d2ae8a36ccabdcd2c74503ca5d1def6 Author: crazy Date: Wed Mar 12 20:55:02 2008 +0100 kernel-2.6.24-4-i686 * release bump * added backport patch from 2.6.25-rc5 to fix gcc43 issue diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 9f2e16b..fc534d2 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 14.33 SBU # Maintainer: VMiklos -_F_kernel_patches=(revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch) +_F_kernel_patches=(revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch gcc43.patch) Finclude kernel diff --git a/source/base/kernel/gcc43.patch b/source/base/kernel/gcc43.patch new file mode 100644 index 0000000..58cbe7b --- /dev/null +++ b/source/base/kernel/gcc43.patch @@ -0,0 +1,29 @@ +commit 38332cb98772f5ea757e6486bed7ed0381cb5f98 +Author: Segher Boessenkool +Date: Tue Mar 4 14:59:54 2008 -0800 + + time: prevent the loop in timespec_add_ns() from being optimised away + + Since some architectures don't support __udivdi3(). + + Signed-off-by: Segher Boessenkool + Cc: john stultz + Cc: Ingo Molnar + Signed-off-by: Andrew Morton + Signed-off-by: Thomas Gleixner + +diff --git a/include/linux/time.h b/include/linux/time.h +index 2091a19..d32ef0a 100644 +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } From crazy at frugalware.org Wed Mar 12 21:19:56 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 21:20:02 2008 Subject: [Frugalware-git] gcc43: kernel-version.sh Message-ID: <20080312201956.96B1F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0cdeff4c43a0892e7903f8f51344e4741ba40917 commit 0cdeff4c43a0892e7903f8f51344e4741ba40917 Author: crazy Date: Wed Mar 12 07:00:30 2008 +0100 kernel-version.sh * release bump diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 6d0bc1c..f5f4ab6 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,5 +16,5 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.24 -_F_kernelver_rel=3 +_F_kernelver_rel=4 _F_kernelver_stable=3 From crazy at frugalware.org Wed Mar 12 21:59:12 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 21:59:15 2008 Subject: [Frugalware-git] gcc43: acerhk-0.5.35-10-i686 Message-ID: <20080312205912.55F2E119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=523e29f3d3ea8dea4a2d6645f82b364b0bc6d1c1 commit 523e29f3d3ea8dea4a2d6645f82b364b0bc6d1c1 Author: crazy Date: Wed Mar 12 21:58:54 2008 +0100 acerhk-0.5.35-10-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 44c349f..ce64176 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=9 +pkgrel=10 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From crazy at frugalware.org Wed Mar 12 22:02:16 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:02:18 2008 Subject: [Frugalware-git] gcc43: acx100-20071003-10-i686 Message-ID: <20080312210216.0D887119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ab31238f3f33b89375c416c49b80abde21ed9d04 commit ab31238f3f33b89375c416c49b80abde21ed9d04 Author: crazy Date: Wed Mar 12 22:01:57 2008 +0100 acx100-20071003-10-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index dad78bc..6fb7e9d 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20071003 -pkgrel=9 +pkgrel=10 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From crazy at frugalware.org Wed Mar 12 22:06:49 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:06:50 2008 Subject: [Frugalware-git] gcc43: gspcav1-1.00.20-7-i686 Message-ID: <20080312210649.050C1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9bdb1d6e435a00cad6ea40f63fcfcd98dd64e3d4 commit 9bdb1d6e435a00cad6ea40f63fcfcd98dd64e3d4 Author: crazy Date: Wed Mar 12 22:06:35 2008 +0100 gspcav1-1.00.20-7-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index dac3636..7b1b80e 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.20 -pkgrel=6 +pkgrel=7 pkgdate=20071224 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From crazy at frugalware.org Wed Mar 12 22:15:06 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:15:07 2008 Subject: [Frugalware-git] gcc43: nvidia-169.12-3-i686 Message-ID: <20080312211506.A960F119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=d5c31e8bb9a79886ce331797db2aac30d5fad557 commit d5c31e8bb9a79886ce331797db2aac30d5fad557 Author: crazy Date: Wed Mar 12 22:11:29 2008 +0100 nvidia-169.12-3-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 8db6a2f..35538e9 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=169.12 -pkgrel=2 +pkgrel=3 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From crazy at frugalware.org Wed Mar 12 22:17:52 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:17:53 2008 Subject: [Frugalware-git] gcc43: kqemu-1.3.0pre11-25-i686 Message-ID: <20080312211752.1A777119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1d1feb247b402f7e947285c0860e3ca5bdd1b7a0 commit 1d1feb247b402f7e947285c0860e3ca5bdd1b7a0 Author: crazy Date: Wed Mar 12 22:17:39 2008 +0100 kqemu-1.3.0pre11-25-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index b01ab77..91e7138 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=24 +pkgrel=25 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') From crazy at frugalware.org Wed Mar 12 22:20:53 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:20:54 2008 Subject: [Frugalware-git] gcc43: wlan-ng-0.2.8-19-i686 Message-ID: <20080312212053.6B6B1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9fef780aab57a56970fd509c255eb9138095f393 commit 9fef780aab57a56970fd509c255eb9138095f393 Author: crazy Date: Wed Mar 12 22:20:32 2008 +0100 wlan-ng-0.2.8-19-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index c803b55..0c4f1c5 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.8 -pkgrel=18 +pkgrel=19 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From crazy at frugalware.org Wed Mar 12 22:24:42 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:24:45 2008 Subject: [Frugalware-git] gcc43: lirc-0.8.2-19-i686 Message-ID: <20080312212442.D2959119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=667a942105697619a7580a11c774abdd2c04d458 commit 667a942105697619a7580a11c774abdd2c04d458 Author: crazy Date: Wed Mar 12 22:24:20 2008 +0100 lirc-0.8.2-19-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index c3663b9..bf121d7 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.2 -pkgrel=18 +pkgrel=19 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From crazy at frugalware.org Wed Mar 12 22:27:51 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:27:53 2008 Subject: [Frugalware-git] gcc43: ipw3945-1.2.2-14-i686 Message-ID: <20080312212751.C59C2119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e0c05bbecf73129c752bade148d8d3fdd9aeb9e9 commit e0c05bbecf73129c752bade148d8d3fdd9aeb9e9 Author: crazy Date: Wed Mar 12 22:27:37 2008 +0100 ipw3945-1.2.2-14-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild index 8eed76a..85eeb6f 100644 --- a/source/network-extra/ipw3945/FrugalBuild +++ b/source/network-extra/ipw3945/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ipw3945 pkgver=1.2.2 -pkgrel=13 +pkgrel=14 pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux" _F_sourceforge_ext=".tgz" Finclude sourceforge kernel-module From crazy at frugalware.org Wed Mar 12 22:30:51 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:30:53 2008 Subject: [Frugalware-git] gcc43: ndiswrapper-1.51-7-i686 Message-ID: <20080312213051.77F75119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4af795910fe5787b5f339735d044d5c0a87a0beb commit 4af795910fe5787b5f339735d044d5c0a87a0beb Author: crazy Date: Wed Mar 12 22:30:37 2008 +0100 ndiswrapper-1.51-7-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 8fe67ba..53e87a4 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.51 -pkgrel=6 +pkgrel=7 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From crazy at frugalware.org Wed Mar 12 22:33:26 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:33:28 2008 Subject: [Frugalware-git] gcc43: r8169-6.004.00-9-i686 Message-ID: <20080312213326.86F3D119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=c528f16f50d962cc5bcb334abc99114f3d6f0aab commit c528f16f50d962cc5bcb334abc99114f3d6f0aab Author: crazy Date: Wed Mar 12 22:33:15 2008 +0100 r8169-6.004.00-9-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 7701204..75fa1c2 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.004.00 -pkgrel=8 +pkgrel=9 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Wed Mar 12 22:35:41 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 22:35:43 2008 Subject: [Frugalware-git] frugalware-current: cvs2svn-2.1.0-1-i686 Message-ID: <20080312213541.97378119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e176db5fe1c0fee797f84ba4b626f48b9a4d46cc commit e176db5fe1c0fee797f84ba4b626f48b9a4d46cc Author: Miklos Vajna Date: Wed Mar 12 22:35:19 2008 +0100 cvs2svn-2.1.0-1-i686 - new package (cvs to svn/git converter) diff --git a/source/devel-extra/cvs2svn/FrugalBuild b/source/devel-extra/cvs2svn/FrugalBuild new file mode 100644 index 0000000..92985c3 --- /dev/null +++ b/source/devel-extra/cvs2svn/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0 SBU +# Maintainer: VMiklos + +pkgname=cvs2svn +pkgver=2.1.0 +pkg_id=41596 +pkgrel=1 +pkgdesc="A tool for migrating a CVS repository to Subversion or git." +url="http://cvs2svn.tigris.org/" +depends=('python' 'cvs' 'subversion') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump 'http://cvs2svn.tigris.org/servlets/ProjectDocumentList?folderID=2976&expandFolder=2976&folderID=0' |Flasttar" +source=(http://cvs2svn.tigris.org/files/documents/1462/$pkg_id/cvs2svn-$pkgver.tar.gz) +signatures=(http://cvs2svn.tigris.org/files/documents/1462/$(($pkg_id+1))/cvs2svn-$pkgver.tar.gz.asc) From crazy at frugalware.org Wed Mar 12 22:45:37 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:45:38 2008 Subject: [Frugalware-git] gcc43: madwifi-0.9.4-3-i686 Message-ID: <20080312214537.720EA119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=88d388945a23d6372795d712d99f70482856ffbf commit 88d388945a23d6372795d712d99f70482856ffbf Author: crazy Date: Wed Mar 12 22:45:19 2008 +0100 madwifi-0.9.4-3-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 53b65bd..b127865 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" Finclude kernel-module From crazy at frugalware.org Wed Mar 12 22:48:01 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:48:02 2008 Subject: [Frugalware-git] gcc43: redirfs-0.2-4-i686 Message-ID: <20080312214801.C3861119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=27d63a7c9704182bece588f5c66e1a86b7477b5a commit 27d63a7c9704182bece588f5c66e1a86b7477b5a Author: crazy Date: Wed Mar 12 22:47:49 2008 +0100 redirfs-0.2-4-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 33e565d..920b1b7 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=redirfs pkgver=0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Redirecting FileSystem" url="http://redirfs.org/" _F_kernelmod_scriptlet=$pkgname.install From crazy at frugalware.org Wed Mar 12 22:54:51 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 22:54:53 2008 Subject: [Frugalware-git] gcc43: nvidia-96xx-96.43.05-5-i686 Message-ID: <20080312215451.09504119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3066242b07a834beacadf7a9cbb7bd093a5681ab commit 3066242b07a834beacadf7a9cbb7bd093a5681ab Author: crazy Date: Wed Mar 12 22:52:27 2008 +0100 nvidia-96xx-96.43.05-5-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index f797b76..6233199 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx pkgver=96.43.05 -pkgrel=4 +pkgrel=5 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From crazy at frugalware.org Wed Mar 12 23:06:17 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 23:06:19 2008 Subject: [Frugalware-git] gcc43: fglrx-8.42.3-11-i686 Message-ID: <20080312220617.37712119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=10928eac59bc46fabb311abae290db63e29fc378 commit 10928eac59bc46fabb311abae290db63e29fc378 Author: crazy Date: Wed Mar 12 23:00:55 2008 +0100 fglrx-8.42.3-11-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 9944d89..d8199c0 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=fglrx pkgver=8.42.3 -pkgrel=10 +pkgrel=11 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From crazy at frugalware.org Wed Mar 12 23:08:58 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 23:09:00 2008 Subject: [Frugalware-git] gcc43: qc-usb-0.6.6-32-i686 Message-ID: <20080312220858.182B1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4a73e85b6c83108be211662a2a909bc60b3bac30 commit 4a73e85b6c83108be211662a2a909bc60b3bac30 Author: crazy Date: Wed Mar 12 23:08:46 2008 +0100 qc-usb-0.6.6-32-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 1aa4229..0b52d74 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=31 +pkgrel=32 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Wed Mar 12 23:11:25 2008 From: crazy at frugalware.org (crazy) Date: Wed Mar 12 23:11:28 2008 Subject: [Frugalware-git] gcc43: dazuko-2.3.4-11-i686 Message-ID: <20080312221125.E0AA8119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=4554685d16cfb71ed378e980c2d0d61ed0e50ff8 commit 4554685d16cfb71ed378e980c2d0d61ed0e50ff8 Author: crazy Date: Wed Mar 12 23:11:14 2008 +0100 dazuko-2.3.4-11-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 0e40c13..0e7f955 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -4,7 +4,7 @@ pkgname=dazuko pkgver=2.3.4 redirver=0.2 -pkgrel=10 +pkgrel=11 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From devil505linux at gmail.com Wed Mar 12 23:29:29 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Mar 12 23:29:30 2008 Subject: [Frugalware-git] frugalware-current: xcfa-3.2.57-1-i686 Message-ID: <20080312222929.49587119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e2cd065c1d2faa15da85c6396fb92409d74140e commit 2e2cd065c1d2faa15da85c6396fb92409d74140e Author: Devil505 Date: Wed Mar 12 22:27:47 2008 +0000 xcfa-3.2.57-1-i686 *initial import *new package from jedifox diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild new file mode 100644 index 0000000..3ca71a9 --- /dev/null +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.20 SBU +# Maintainer: Devil505 +# Contributor: jedifox + +pkgname=xcfa +pkgver=3.2.57 +pkgrel=1 +pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" +url="http://www.xcfa.tuxfamily.org/" +rodepends=('dvd+rw-tools') +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'taglib' 'curl' 'libxdamage' 'libxext' 'libxml2') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/download/Etch/Src/ | Flasttar" +Fconfopts="${Fconfopts[@]} --disable-ansi" +source=(http://download.tuxfamily.org/xcfaudio/download/Etch/Src/$pkgname-$pkgver.tar.gz) +sha1sums=('807351f88f2bd243d64cf2efe22d8ecde59ddbf5') From vmiklos at frugalware.org Wed Mar 12 23:33:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 23:33:28 2008 Subject: [Frugalware-git] frugalware-current: t/xorg: constype is solaris-only Message-ID: <20080312223326.1B098119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b08a158ef53225f57a99860f717704071b38b021 commit b08a158ef53225f57a99860f717704071b38b021 Author: Miklos Vajna Date: Wed Mar 12 23:33:19 2008 +0100 t/xorg: constype is solaris-only diff --git a/t/xorg b/t/xorg index cd8e8cc..9a2e369 100755 --- a/t/xorg +++ b/t/xorg @@ -26,6 +26,7 @@ ls source/x11|sed 's|/$||' >$fw # mkcfm is removed by priyank # xkbdata deprecated | not maintained anymore. xkeyboard-config replaced it. # xf86-video-glide: makedepends on xfree86.. +# constype is solaris-only diff -u $upstream $fw|grep ^-[^-] |grep -v \ -'\(xf86-video-impact\|xf86-video-wsfb\|xf86-video-i810\|compiz\|mkcfm\|xkbdata\|xf86-video-glide\)'|sed 's/^-//' +'\(xf86-video-impact\|xf86-video-wsfb\|xf86-video-i810\|compiz\|mkcfm\|xkbdata\|xf86-video-glide\|constype\)'|sed 's/^-//' rm -f $upstream $fw From vmiklos at frugalware.org Wed Mar 12 23:53:34 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 23:53:36 2008 Subject: [Frugalware-git] frugalware-current: t/xorg: grandr is in gnome-extra Message-ID: <20080312225334.C2D46119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a8b5943648603254981b43e99f213bd414f1f83 commit 9a8b5943648603254981b43e99f213bd414f1f83 Author: Miklos Vajna Date: Wed Mar 12 23:38:33 2008 +0100 t/xorg: grandr is in gnome-extra diff --git a/t/xorg b/t/xorg index 9a2e369..b204136 100755 --- a/t/xorg +++ b/t/xorg @@ -27,6 +27,7 @@ ls source/x11|sed 's|/$||' >$fw # xkbdata deprecated | not maintained anymore. xkeyboard-config replaced it. # xf86-video-glide: makedepends on xfree86.. # constype is solaris-only +# grandr is in gnome-extra diff -u $upstream $fw|grep ^-[^-] |grep -v \ -'\(xf86-video-impact\|xf86-video-wsfb\|xf86-video-i810\|compiz\|mkcfm\|xkbdata\|xf86-video-glide\|constype\)'|sed 's/^-//' +'\(xf86-video-impact\|xf86-video-wsfb\|xf86-video-i810\|compiz\|mkcfm\|xkbdata\|xf86-video-glide\|constype\|grandr\)'|sed 's/^-//' rm -f $upstream $fw From vmiklos at frugalware.org Wed Mar 12 23:53:34 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 23:53:37 2008 Subject: [Frugalware-git] frugalware-current: t/xorg: reworked test Message-ID: <20080312225334.DE834119053C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4008e68f5319b3af932d51fbfeae307ff82e0bc commit e4008e68f5319b3af932d51fbfeae307ff82e0bc Author: Miklos Vajna Date: Wed Mar 12 23:52:58 2008 +0100 t/xorg: reworked test - avoid an ugly and long regex - detect packaged xorg modules which are outside x11 diff --git a/t/xorg b/t/xorg index b204136..2060416 100755 --- a/t/xorg +++ b/t/xorg @@ -1,5 +1,19 @@ #!/bin/sh +in_array() +{ + local i needle + needle=$1 + shift 1 + # array() undefined + [ -z "$1" ] && return 1 + for i in $* + do + echo $i |grep -q "^$needle" && return 0 + done + return 1 +} + if [ "$1" == "--help" ]; then echo "missing xorg packages" exit 1 @@ -11,23 +25,22 @@ fi cd .. -upstream=`mktemp` -fw=`mktemp` +skip=('xf86-video-impact is mips-only' +'xf86-video-wsfb is for *bsd' +'xf86-video-i810 is replaced by xf86-video-intel' +'mkcfm is removed by priyank' +'xkbdata is replaced by xkeyboard-config' +'xf86-video-glide makedepends on xfree86' +'constype is solaris-only') -for i in app data doc driver font lib proto testdir util xserver +upstream=$(for i in app data doc driver font lib proto testdir util xserver do lynx -dump http://xorg.freedesktop.org/releases/individual/$i/|grep bz2$|sed 's|.*/\(.*\)-.*|\1|' -done |sort -u |tr '[A-Z]' '[a-z]'>$upstream -ls source/x11|sed 's|/$||' >$fw -# xf86-video-impact is mips-only :) -# xf86-video-wsfb is for *bsd -# xf86-video-i810: replaced by xf86-video-intel -# compiz is in x11-extra -# mkcfm is removed by priyank -# xkbdata deprecated | not maintained anymore. xkeyboard-config replaced it. -# xf86-video-glide: makedepends on xfree86.. -# constype is solaris-only -# grandr is in gnome-extra -diff -u $upstream $fw|grep ^-[^-] |grep -v \ -'\(xf86-video-impact\|xf86-video-wsfb\|xf86-video-i810\|compiz\|mkcfm\|xkbdata\|xf86-video-glide\|constype\|grandr\)'|sed 's/^-//' -rm -f $upstream $fw +done |sort -u |tr '[A-Z]' '[a-z]') + +for i in $upstream +do + if ! stat source/*/$i &>/dev/null && ! in_array $i ${skip[@]}; then + echo $i + fi +done From vmiklos at frugalware.org Wed Mar 12 23:58:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Mar 12 23:58:59 2008 Subject: [Frugalware-git] frugalware-current: xinput-1.3.0-1-i686 Message-ID: <20080312225857.BF8C4119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7879e89b7ed5ed697e29cd215b9f50fb4a9b685 commit e7879e89b7ed5ed697e29cd215b9f50fb4a9b685 Author: Miklos Vajna Date: Wed Mar 12 23:58:37 2008 +0100 xinput-1.3.0-1-i686 - new package - now all xorg modules are packaged again :) diff --git a/source/x11/xinput/FrugalBuild b/source/x11/xinput/FrugalBuild new file mode 100644 index 0000000..47ab6eb --- /dev/null +++ b/source/x11/xinput/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xinput +pkgver=1.3.0 +pkgrel=1 +pkgdesc="Utility to set XInput device parameters" +groups=('x11' 'xorg-core' 'xorg-apps') +archs=('i686' 'x86_64') +depends=('libxi') +makedepends=('inputproto>=1.4') +Finclude xorg +sha1sums=('84c8316950ebae8f28794759202391303148fd02') + +# optimization OK From devil505linux at gmail.com Thu Mar 13 00:02:28 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Mar 13 00:02:29 2008 Subject: [Frugalware-git] frugalware-current: filezilla-3.0.7.1-1-i686 Message-ID: <20080312230228.61FBC119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8073c4ddf8e8690cfcfc30bd446daedace16e2c0 commit 8073c4ddf8e8690cfcfc30bd446daedace16e2c0 Author: Devil505 Date: Wed Mar 12 23:00:04 2008 +0000 filezilla-3.0.7.1-1-i686 *initial import *new package *closed feature request FS#2769 diff --git a/source/xapps-extra/filezilla/FrugalBuild b/source/xapps-extra/filezilla/FrugalBuild new file mode 100644 index 0000000..5181ef0 --- /dev/null +++ b/source/xapps-extra/filezilla/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 2.16 SBU +# Maintainer: Devil505 + +pkgname=filezilla +pkgver=3.0.7.1 +pkgrel=1 +pkgdesc="a fast and reliable cross-platform FTP, FTPS and SFTP client" +depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.0.4' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice') +makedepends=('gettext') +_F_sourceforge_ext="_src.tar.bz2" +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="FileZilla" +_F_sourceforge_sep="_" +_F_sourceforge_broken_up2date="1" +Finclude sourceforge +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +sha1sums=('b6f84d7fef3213e0cdb6ef9c70972291ddeb0da6') + +# optimization OK From crazy at frugalware.org Thu Mar 13 00:10:55 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 00:10:57 2008 Subject: [Frugalware-git] gcc43: virtualbox-1.5.6_1-3-i686 Message-ID: <20080312231055.994B6119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=0007fc676ba96dbce383d5a82ea46bf02f1a44ea commit 0007fc676ba96dbce383d5a82ea46bf02f1a44ea Author: crazy Date: Thu Mar 13 00:07:54 2008 +0100 virtualbox-1.5.6_1-3-i686 * rebuilt with kernel-2.6.24-4 * added patches for gcc43 to fix the build diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 9d0e590..8ccc680 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -5,7 +5,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.5.6_1 -pkgrel=2 +pkgrel=3 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" _F_kernelmod_scriptlet=$pkgname.install @@ -18,13 +18,17 @@ groups=('xapps-extra') archs=('i686' '!x86_64') up2date="lynx -dump http://www.virtualbox.org/wiki/Downloads | grep 'OSE tarball' | sed 's/.*VirtualBox //' | sed 's/ OSE.*//'" source=(http://www.virtualbox.org/download/$(echo $pkgver|sed 's/_.*//')/${realname}-${pkgver/_/-}_OSE.tar.bz2 \ - vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules) + vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules \ + use-o3-to-workaround-gcc-ice.diff virtualbox-gcc43-fixes.diff virtualbox-validate-op-gcc43.diff) sha1sums=('1cb11c012b9143e14f2eada645757cae8886d0d1' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ '07f49d0c5fac8311ec87d1a38a981de9ba3a4e07' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c' \ - '4fccf6d7030af764dfb7eb54763fb2abe544af6f') + '4fccf6d7030af764dfb7eb54763fb2abe544af6f' \ + 'f8875f474975d33ef2c8707bde4710c7c72f9727' \ + '17f6f99a344ac9a088fef826249a38e6cce2c11d' \ + 'c2d014abf3801f0a87142fc3a6d08a782cd5ef9c') _F_cd_path="${realname}-$(echo $pkgver|sed 's/_.*//')_OSE" vboxrealpkgver="$(echo $pkgver|sed 's/_.*//')" options=('scriptlet') diff --git a/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff b/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff new file mode 100644 index 0000000..f3346be --- /dev/null +++ b/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff @@ -0,0 +1,14 @@ +--- src/recompiler/Makefile.kmk ++++ src/recompiler/Makefile.kmk +@@ -231,9 +231,9 @@ + + # Extra flags for these source modules. + target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls +-target-i386/op.c_CFLAGS.x86 = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 ++target-i386/op.c_CFLAGS.x86 = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 + target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4 +-target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse ++target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse + cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse + + diff --git a/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff b/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff new file mode 100644 index 0000000..a508fb2 --- /dev/null +++ b/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff @@ -0,0 +1,21 @@ +--- src/VBox/Main/VMMDevInterface.cpp.old 2008-01-27 16:50:02.000000000 +0100 ++++ src/VBox/Main/VMMDevInterface.cpp 2008-01-27 16:50:28.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef VBOX_HGCM + #include "hgcm/HGCM.h" +--- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.old 2008-01-27 16:49:32.000000000 +0100 ++++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-01-27 16:49:48.000000000 +0100 +@@ -28,6 +28,8 @@ + #include "VBoxRegistrationDlg.h" + #endif + ++#include ++ + #include + #include + #include diff --git a/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff b/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff new file mode 100644 index 0000000..34ac3ba --- /dev/null +++ b/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff @@ -0,0 +1,13 @@ +Index: src/recompiler/InnoTek/op-validate.sed +=================================================================== +--- src/recompiler/InnoTek/op-validate.sed.orig ++++ src/recompiler/InnoTek/op-validate.sed +@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan + /\.Lfe[0-9][0-9]*:/d + /\.LFE[0-9][0-9]*:/d + /size[[:space:]]/d ++/p2align[[:space:]]/d ++/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d + /^[/#]NO_APP[[:space:]]*$/d + /^$/!b bad + b end From crazy at frugalware.org Thu Mar 13 00:33:56 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 00:33:58 2008 Subject: [Frugalware-git] gcc43: antlr-2.7.7-2-x86_64 Message-ID: <20080312233356.CF8F1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=7e76bc9cafc3647ef2b3f4f7be1c676a7bd87a03 commit 7e76bc9cafc3647ef2b3f4f7be1c676a7bd87a03 Author: crazy Date: Thu Mar 13 00:33:42 2008 +0100 antlr-2.7.7-2-x86_64 * relbump * recompiled with libgcj * added an patch to fix the build * source fix diff --git a/source/devel-extra/antlr/FrugalBuild b/source/devel-extra/antlr/FrugalBuild index 1d3edcd..ae78c8e 100644 --- a/source/devel-extra/antlr/FrugalBuild +++ b/source/devel-extra/antlr/FrugalBuild @@ -3,23 +3,23 @@ pkgname=antlr pkgver=2.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="ANother Tool for Language Recognition" url="http://www.antlr.org/" Finclude java -makedepends=('ecj' 'java-gcj-compat' 'gcc-gcj') +makedepends=('ecj>=3.2.2-4' 'java-gcj-compat>=1.0.77-2' 'gcc-gcj>=4.3.0-4') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.antlr.org/download.html|grep -m1 'antlr-\(.*\).tar.gz'|Flasttar" -source=(http://www.antlr.org/download/antlr-$pkgver.tar.gz) +source=(http://www.antlr2.org/download/antlr-$pkgver.tar.gz gcc43.patch) build() { JAVAC=ecj Fbuild # install the proper java/python bindings Fjar antlr/antlr.jar - cd lib/python - rm Makefile* + cd lib/python || Fdie + rm Makefile* || Fdie Fmakeinstall # then clean up the junk Frm /usr/lib/antlr.{jar,py} /usr/{sbin,bin/antlr} @@ -28,4 +28,5 @@ build() # optimization OK -sha1sums=('802655c343cc7806aaf1ec2177a0e663ff209de1') +sha1sums=('802655c343cc7806aaf1ec2177a0e663ff209de1' \ + 'fd0bbcab73d75ab2e0487e5eed4260120c3b66fa') diff --git a/source/devel-extra/antlr/gcc43.patch b/source/devel-extra/antlr/gcc43.patch new file mode 100644 index 0000000..5ce5d8c --- /dev/null +++ b/source/devel-extra/antlr/gcc43.patch @@ -0,0 +1,11 @@ +diff -Naur antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7-p/lib/cpp/antlr/CharScanner.hpp +--- antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100 ++++ antlr-2.7.7-p/lib/cpp/antlr/CharScanner.hpp 2008-03-13 00:22:30.000000000 +0100 +@@ -24,6 +24,7 @@ + # include + #endif + ++#include + #include + #include + #include From vmiklos at frugalware.org Thu Mar 13 01:00:11 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 13 01:00:13 2008 Subject: [Frugalware-git] frugalware-current: netbeans-6.0.1-1-i686 Message-ID: <20080313000011.41FEF11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cce712720a112f54fd0f3d3040574272fd41ee1c commit cce712720a112f54fd0f3d3040574272fd41ee1c Author: Miklos Vajna Date: Thu Mar 13 00:59:09 2008 +0100 netbeans-6.0.1-1-i686 - version bump - from gaetan - removed no longer necessary wrapper/patch diff --git a/source/devel-extra/netbeans/FrugalBuild b/source/devel-extra/netbeans/FrugalBuild index e6634ba..e6b3a92 100644 --- a/source/devel-extra/netbeans/FrugalBuild +++ b/source/devel-extra/netbeans/FrugalBuild @@ -2,40 +2,51 @@ # Maintainer: VMiklos pkgname=netbeans -pkgver=5.5.1 -pkgdate=200704122300 -pkgrel=2 +pkgver=6.0.1 +pkgrel=1 +pkgdate=200801291616 pkgdesc="The original free Java IDE, and so much more." url="http://www.netbeans.info/" -depends=('j2sdk') +depends=('j2sdk' 'ruby') makedepends=('apache-ant') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url/downloads/index.php|grep IDE|sed 's/.*IDE \(.*\) Download.*/\1/;q'" -source=(http://us2-mirror.netbeans.info/download/${pkgver//./_}/fcs/$pkgdate/netbeans-${pkgver//./_}-ide_sources.tar.bz2 \ - netbeans-5.0-classpath.diff \ - netbeans) -sha1sums=('b4235a16b0edb8048bfd4173803d65712c618ac9' \ - 'd8c652541c8b91c3dcb27f507ac75311bf37b965' \ - '572bf826930f9f7ebac988895cc7d0465f4ebfd8') +pkgurl="http://download.netbeans.org/$pkgname/${pkgver%.?}/final/zip/" +up2date="lynx -dump $pkgurl | grep $pkgurl$pkgname- | tail -1 | cut -d- -f2" +source=(http://download.netbeans.org/$pkgname/${pkgver%.?}/final/zip/$pkgname-$pkgver-$pkgdate-src.zip) +sha1sums=('f9b28b303bf83c51cb1415312d7a654b2421fad4') + +_F_desktop_name="$pkgname" +_F_desktop_icon="/usr/lib/netbeans/nb6.0/netbeans.png" +_F_desktop_categories="KDE;GNOME;Development;IDE;" build() { - Fcd netbeans-src - Fpatchall - cd nbbuild - + echo "nb.clusters.list=nb.cluster.nb,nb.cluster.platform,nb.cluster.ide,nb.cluster.ruby,nb.cluster.java,nb.cluster.apisupport,nb.cluster.harness" >> nbbuild/user.build.properties # for now build using Sun's javac export JAVA_HOME=/usr/lib/java - ant -D{ant.jar,antsrc.cp}=/usr/share/java/ant.jar build-nozip || return 1 + #if you want latest source + #ant -f build.xml checkout || return 1 + + # -Dpermit.jdk6.builds=true to force jdk6 and not 5 + ANT_OPTS="-Xmx512M" ant -f nbbuild/build.xml \ + -Dstop.when.broken.modules=true -Dbuild.compiler.deprecation=true \ + -Dpermit.jdk6.builds=true || return 1 + # bin non-Linux binaries - find netbeans -type f -name "*.exe" -o -name "*.cmd" -o -name "*.bat" -o -name "*.dll" -exec rm -f {} \; - cd netbeans - Fmkdir /usr/lib/netbeans/ + find nbbuild -type f -name "*.exe" -o \ + -name "*.cmd" -o \ + -name "*.bat" -o \ + -name "*.dll" \ + -exec rm -f {} \; + # the real installation + cd nbbuild/netbeans + Fmkdir /usr/lib/netbeans cp -a * $Fdestdir/usr/lib/netbeans || return 1 - # our wrapper - Fexe /usr/bin/netbeans - Fdesktop "/usr/bin/$pkgname" "/usr/lib/netbeans/nb5.0/netbeans.png" "KDE;GNOME;Development;IDE;" + + # for launch + Fwrapper '/usr/lib/netbeans/bin/netbeans $@' netbeans + Fdesktop2 } diff --git a/source/devel-extra/netbeans/netbeans b/source/devel-extra/netbeans/netbeans deleted file mode 100644 index 7445e84..0000000 --- a/source/devel-extra/netbeans/netbeans +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# hack! - -export LIBXCB_ALLOW_SLOPPY_LOCK=1 - -/usr/lib/netbeans/bin/netbeans $@ diff --git a/source/devel-extra/netbeans/netbeans-5.0-classpath.diff b/source/devel-extra/netbeans/netbeans-5.0-classpath.diff deleted file mode 100644 index 72543f8..0000000 --- a/source/devel-extra/netbeans/netbeans-5.0-classpath.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- netbeans-src/ant/browsetask/build.xml.orig 2006-10-07 21:56:28.000000000 +0200 -+++ netbeans-src/ant/browsetask/build.xml 2006-10-07 21:57:50.000000000 +0200 -@@ -19,7 +19,7 @@ - - - -- -+ - - - ---- netbeans-src/apisupport/ant/build.xml.orig 2006-10-07 22:12:48.000000000 +0200 -+++ netbeans-src/apisupport/ant/build.xml 2006-10-07 22:43:54.000000000 +0200 -@@ -19,7 +19,7 @@ - - - -- -+ - - - ---- netbeans-src/java/j2seproject/copylibstask/nbproject/build-impl.xml.orig 2006-10-07 23:43:24.000000000 +0200 -+++ netbeans-src/java/j2seproject/copylibstask/nbproject/build-impl.xml 2006-10-07 23:43:46.000000000 +0200 -@@ -118,6 +118,7 @@ - - - -+ - - - ---- netbeans-src/nbbuild/build.xml.orig 2006-10-07 20:38:12.000000000 +0200 -+++ netbeans-src/nbbuild/build.xml 2006-10-07 20:58:27.000000000 +0200 -@@ -84,7 +84,8 @@ - - - -- -+ - - - From vmiklos at frugalware.org Thu Mar 13 01:17:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 13 01:18:01 2008 Subject: [Frugalware-git] homepage-ng: roadmap: add Solaria Message-ID: <20080313001759.26781119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c10b0176d0a025d5d04fd32f82a694a1f2e595ef commit c10b0176d0a025d5d04fd32f82a694a1f2e595ef Author: Miklos Vajna Date: Thu Mar 13 01:17:55 2008 +0100 roadmap: add Solaria diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml index 2d8ff05..fef40d9 100644 --- a/frugalware/xml/roadmap.xml +++ b/frugalware/xml/roadmap.xml @@ -22,6 +22,34 @@ + Solaria + A fictional human-inhabited planet in Isaac Asimov's Foundation and Robot series. + 0.9 + Sep 9, 2008 + 0 + + + rc2 + Aug 19, 2008 + 0 + + + rc1 + Aug 5, 2008 + 0 + + + pre2 + July 8, 2008 + 0 + + + pre1 + May 13, 2007 + 0 + + + Kalgan Kalgan is a fictional planet in Isaac Asimov's Foundation series. 0.8 From crazy at frugalware.org Thu Mar 13 02:36:23 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 02:36:26 2008 Subject: [Frugalware-git] gcc43: octave-3.0.0-2-i686 Message-ID: <20080313013623.CC391119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1e8e30d1f9a9e8bae4a86b1aa5b24a85dfcfd8ab commit 1e8e30d1f9a9e8bae4a86b1aa5b24a85dfcfd8ab Author: crazy Date: Thu Mar 13 02:32:40 2008 +0100 octave-3.0.0-2-i686 * recompiled with libgfortran * added an patch to fix the build diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild index 3f0064c..540a18f 100644 --- a/source/apps-extra/octave/FrugalBuild +++ b/source/apps-extra/octave/FrugalBuild @@ -3,14 +3,15 @@ pkgname=octave pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Octave is a high-level language, primarily intended for numerical computations." url="http://www.octave.org/" -depends=('libstdc++' 'fftw' 'libgfortran' 'readline') +depends=('libstdc++>=4.3.0-4' 'fftw' 'libgfortran>=4.3.0-4' 'readline>=5.2-2') makedepends=('gcc-gfortran') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Stable|sed 's/.* \([0-9.]\+\) (.*/\1/'" -source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('874b3d40db5d882e37614ffa6cdb9fdd71e173f8') +source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 gcc43.patch) +sha1sums=('874b3d40db5d882e37614ffa6cdb9fdd71e173f8' \ + 'f04865197157ace7891e68044ac7ad49ddb699cd') # optimization OK diff --git a/source/apps-extra/octave/gcc43.patch b/source/apps-extra/octave/gcc43.patch new file mode 100644 index 0000000..74790f6 --- /dev/null +++ b/source/apps-extra/octave/gcc43.patch @@ -0,0 +1,11 @@ +diff -Naur octave-3.0.0/src/mxarray.h.in octave-3.0.0-p/src/mxarray.h +--- octave-3.0.0/src/mxarray.h.in 2007-12-21 21:15:10.000000000 +0100 ++++ octave-3.0.0-p/src/mxarray.h.in 2008-03-13 01:08:37.000000000 +0100 +@@ -45,6 +45,7 @@ + + #if ! defined (MXARRAY_H) + #define MXARRAY_H ++#include + + typedef enum + { From crazy at frugalware.org Thu Mar 13 03:16:45 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 03:16:46 2008 Subject: [Frugalware-git] gcc43: amule-2.1.3-13-x86_64 Message-ID: <20080313021645.7971E119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=574de967220659db981358c387adbda0d062532c commit 574de967220659db981358c387adbda0d062532c Author: crazy Date: Thu Mar 13 03:16:34 2008 +0100 amule-2.1.3-13-x86_64 * recompiled * added an patch to fix the build * amulecmd and webserver option are disabled for this release * will fix soon diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild index 218ace0..921ba6e 100644 --- a/source/xapps-extra/amule/FrugalBuild +++ b/source/xapps-extra/amule/FrugalBuild @@ -3,7 +3,7 @@ pkgname=amule pkgver=2.1.3 -pkgrel=12 +pkgrel=13 pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="aMule" @@ -11,23 +11,27 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.amule.org/" replaces=('xmule') -source=($source aMule-wx.patch fix-broken-server.met-link.patch) -depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.3' 'gd' 'curl') +source=($source aMule-wx.patch fix-broken-server.met-link.patch gcc43.patch) +depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.4' 'gd' 'curl') up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10" license="GPL2" groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') Fconfopts="$Fconfopts --enable-cas --enable-wxcas \ - --enable-amulecmd --enable-amulecmdgui \ - --enable-webserver --enable-webservergui \ + --disable-amulecmd --disable-amulecmdgui \ + --disable-webserver --disable-webservergui \ --enable-kad-compile --enable-amule-daemon \ --enable-alc --enable-alcc \ --enable-ccache --disable-debug" +# br0ken gcc43 - will fix soon -- crazy -- +# --enable-webserver --enable-webservergui +# --enable-amulecmd --enable-amulecmdgui _F_cd_path="aMule-$pkgver" sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \ 'bd048f7b88ff4c19841f606d03c5a9750e6e6945' \ - '5c74fe3e13cad5d40def64e873f3fe6114ecb91a') + '5c74fe3e13cad5d40def64e873f3fe6114ecb91a' \ + 'ce6e079ad3422e76d12152d59e992488956f327c') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated" # optimization OK diff --git a/source/xapps-extra/amule/gcc43.patch b/source/xapps-extra/amule/gcc43.patch new file mode 100644 index 0000000..aea9e00 --- /dev/null +++ b/source/xapps-extra/amule/gcc43.patch @@ -0,0 +1,11 @@ +diff -Naur aMule-2.1.3/src/ED2KLinkParser.cpp aMule-2.1.3-p/src/ED2KLinkParser.cpp +--- aMule-2.1.3/src/ED2KLinkParser.cpp 2006-01-30 19:53:03.000000000 +0100 ++++ aMule-2.1.3-p/src/ED2KLinkParser.cpp 2008-03-13 02:53:08.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #ifdef __APPLE__ + #include From devil505linux at gmail.com Thu Mar 13 07:37:02 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Mar 13 07:37:03 2008 Subject: [Frugalware-git] frugalware-current: pyspacewar-0.9.3-1-i686 Message-ID: <20080313063702.634D4119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6a5debef1a4469b2389f7c5dd2a241be2b95cab commit d6a5debef1a4469b2389f7c5dd2a241be2b95cab Author: Devil505 Date: Thu Mar 13 07:36:07 2008 +0100 pyspacewar-0.9.3-1-i686 *initial import *new package diff --git a/source/games-extra/pyspacewar/FrugalBuild b/source/games-extra/pyspacewar/FrugalBuild new file mode 100644 index 0000000..6767dda --- /dev/null +++ b/source/games-extra/pyspacewar/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=pyspacewar +pkgver=0.9.3 +pkgrel=1 +pkgdesc="Open-source game, loosely inspired by Spacewar, Gravity Wars, and a bit by Star Control (I and II)." +url="http://mg.pov.lt/pyspacewar" +depends=("pygame" "psyco") +groups=('games-extra') +archs=('i686') +up2date="lynx -dump $url | Flasttar" +source=("$url/$pkgname-$pkgver.tar.gz") +sha1sums=('df2e97cdcae329a49d70c6d601d81560aad8b061') + +_F_desktop_categories="Game;ArcadeGame;" + +build() +{ + Fbuild + Fdesktop2 +} \ No newline at end of file From devil505linux at gmail.com Thu Mar 13 11:14:32 2008 From: devil505linux at gmail.com (Devil505) Date: Thu Mar 13 11:14:34 2008 Subject: [Frugalware-git] frugalware-current: fortunes-fr-0.02-1-i686 Message-ID: <20080313101432.44FD9119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59c71aa59bbb97a473d5a763ec55ef8ddae4179b commit 59c71aa59bbb97a473d5a763ec55ef8ddae4179b Author: Devil505 Date: Thu Mar 13 11:13:38 2008 +0100 fortunes-fr-0.02-1-i686 *initial import *new package diff --git a/source/games-extra/fortunes-fr/FrugalBuild b/source/games-extra/fortunes-fr/FrugalBuild new file mode 100644 index 0000000..bee80d6 --- /dev/null +++ b/source/games-extra/fortunes-fr/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.02 SBU +# Maintainer: Devil505 + +pkgname=fortunes-fr +pkgver=0.02 +pkgrel=1 +pkgdesc="Collection of French fortune cookie files" +url="http://www.fortunes-fr.org" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686') +up2date="lynx -dump $url | Flasttar" +source=(http://www.fortunes-fr.org/$pkgname/$pkgname-$pkgver.tar.gz) +Fconfopts="${Fconfopts[@]} --with-fortunesdir=/usr/share/fortune/fr" +sha1sums=('5816867a4200053a6a3dafe9b76d444fae74c6eb') \ No newline at end of file From crazy at frugalware.org Thu Mar 13 14:33:55 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 14:33:57 2008 Subject: [Frugalware-git] gcc43: gdb-6.7.1-3-i686 Message-ID: <20080313133355.4AAE1119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=1f60342ce675c8b418fa40361aa15916ac2aa229 commit 1f60342ce675c8b418fa40361aa15916ac2aa229 Author: crazy Date: Thu Mar 13 14:31:35 2008 +0100 gdb-6.7.1-3-i686 * rebuilt diff --git a/source/devel/gdb/FrugalBuild b/source/devel/gdb/FrugalBuild index 5194444..cc25570 100644 --- a/source/devel/gdb/FrugalBuild +++ b/source/devel/gdb/FrugalBuild @@ -4,13 +4,13 @@ pkgname=gdb pkgver=6.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Gnu Project Debugger" url="http://www.gnu.org/software/gdb/download/" -depends=('readline' 'mpfr' 'expat') +depends=('readline>=5.2-2' 'mpfr>=2.3.1-2' 'expat>=2.0.1-2') groups=('devel') archs=('i686' 'x86_64') -makedepends=('gmp') +makedepends=('gmp>=4.2.2-2') Fup2gnubz2 source=(http://ftp.gnu.org/gnu/gdb/$pkgname-$pkgver.tar.bz2) sha1sums=('4ecfb5896d511111d9a5d91e937501caa9d33ced') @@ -23,7 +23,7 @@ build() { # Fpatch 02-gdb-6.3-readline_docs.patch # Fixes CVE-2006-4146 SEC bug # Fpatch gdb-cve-2006-4146-sec.patch - Fmake --with-gmp=/usr --with-mpfr=/usr + Fmake --with-gmp=/usr --with-mpfr=/usr --disable-werror Fmakeinstall Frm /usr/include/{bfd.h,symcat.h,ansidecl.h,bfdlink.h} Frm /usr/lib/{libopcodes.a,libopcodes.la} From voroskoi at frugalware.org Thu Mar 13 14:50:59 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Mar 13 14:51:01 2008 Subject: [Frugalware-git] frugalware-current: libpng-1.2.25-1-i686 Message-ID: <20080313135059.C08F6119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=83600129bb8eea6899524ed49e158229a3a514f4 commit 83600129bb8eea6899524ed49e158229a3a514f4 Author: voroskoi Date: Thu Mar 13 14:50:23 2008 +0100 libpng-1.2.25-1-i686 version bump diff --git a/source/lib/libpng/FrugalBuild b/source/lib/libpng/FrugalBuild index 5a78f3f..6647ba5 100644 --- a/source/lib/libpng/FrugalBuild +++ b/source/lib/libpng/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=libpng -pkgver=1.2.24 +pkgver=1.2.25 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" url="http://www.libpng.org/" @@ -12,7 +12,7 @@ groups=('lib') archs=('i686' 'x86_64' 'ppc') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('67ea40f216348cc1d9952e972899cd17d175ec6f') +sha1sums=('0afb5738eab00f721e3fbeb9ed76dbdb2b53204f') build() { Fcd From vmiklos at frugalware.org Thu Mar 13 14:54:56 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 13 14:54:56 2008 Subject: [Frugalware-git] frugalware-current: libytnef-1.5-1-i686 Message-ID: <20080313135456.1C7D6119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=12a2ed9638d874d3860f0a2b2368dc27ed21f308 commit 12a2ed9638d874d3860f0a2b2368dc27ed21f308 Author: Miklos Vajna Date: Thu Mar 13 14:50:35 2008 +0100 libytnef-1.5-1-i686 - new package - from bouleetbil diff --git a/source/lib-extra/libytnef/FrugalBuild b/source/lib-extra/libytnef/FrugalBuild new file mode 100644 index 0000000..c65436c --- /dev/null +++ b/source/lib-extra/libytnef/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.15 SBU +# Maintainer: VMiklos +# Contributor: bouleetbil@frogdev.info + +pkgname=libytnef +pkgver=1.5 +pkgrel=1 +pkgdesc="Yerase's TNEF Stream Reader" +_F_sourceforge_dirname="ytnef" +_F_sourceforge_broken_up2date="1" +Finclude sourceforge +depends=('glibc') +groups=('lib-extra') +archs=('i686') +sha1sums=('f04075187accaa82346ed873af8c61755de781cc') + +# optimization OK From voroskoi at frugalware.org Thu Mar 13 15:16:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Mar 13 15:16:45 2008 Subject: [Frugalware-git] frugalware-current: gnutls-2.2.2-1-i686 Message-ID: <20080313141643.92AA3119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2194a51c6dfd603a724d3ec43a4c7fb9b083048e commit 2194a51c6dfd603a724d3ec43a4c7fb9b083048e Author: voroskoi Date: Thu Mar 13 15:16:08 2008 +0100 gnutls-2.2.2-1-i686 version bump diff --git a/source/lib/gnutls/FrugalBuild b/source/lib/gnutls/FrugalBuild index 5819fab..400b8fb 100644 --- a/source/lib/gnutls/FrugalBuild +++ b/source/lib/gnutls/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=gnutls -pkgver=2.2.0 +pkgver=2.2.2 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" url="http://www.gnu.org/software/gnutls/" From voroskoi at frugalware.org Thu Mar 13 15:39:45 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Mar 13 15:39:46 2008 Subject: [Frugalware-git] frugalware-current: icu-3.8.1-1-x86_64 Message-ID: <20080313143945.815E311901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3f05ac8b334b5d16e3bb49e63ba6ecbafee9f7f commit d3f05ac8b334b5d16e3bb49e63ba6ecbafee9f7f Author: voroskoi Date: Thu Mar 13 15:35:22 2008 +0100 icu-3.8.1-1-x86_64 version bump updated source() diff --git a/source/lib/icu/FrugalBuild b/source/lib/icu/FrugalBuild index 5f4c8f0..6a7924c 100644 --- a/source/lib/icu/FrugalBuild +++ b/source/lib/icu/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=icu -pkgver=3.8 +pkgver=3.8.1 pkgrel=1 pkgdesc="International Components for Unicode library" groups=('lib') @@ -11,8 +11,13 @@ archs=('i686' 'x86_64') license="ICU License" depends=('libstdc++' 'bash') Finclude sourceforge -source=(http://dl.sourceforge.net/sourceforge/icu/icu4c-`echo $pkgver|sed 's/\./_/'`-src.tgz) -sha1sums=('4370becc68eab7a01292db62e1649239b1732a5b') +source=(http://download.icu-project.org/files/icu4c/$pkgver/icu4c-`echo $pkgver|sed 's/\./_/g'`-src.tgz) +sha1sums=('c2b933aee6741c28956f1b87dc514dee49b949aa') _F_cd_path=$pkgname/source +build() { + Fbuild + chmod +x $Fdestdir/usr/lib/*.so || Fdie +} + # optimization OK From vmiklos at frugalware.org Thu Mar 13 15:40:15 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 13 15:40:16 2008 Subject: [Frugalware-git] frugalware-current: ltp-20080229-1-i686 Message-ID: <20080313144015.2390211901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0e7bb7ef0bafcd4b57470b284d904be27098c93 commit a0e7bb7ef0bafcd4b57470b284d904be27098c93 Author: Miklos Vajna Date: Thu Mar 13 15:40:02 2008 +0100 ltp-20080229-1-i686 - version bump diff --git a/source/apps-extra/ltp/FrugalBuild b/source/apps-extra/ltp/FrugalBuild index 912ec33..5556160 100644 --- a/source/apps-extra/ltp/FrugalBuild +++ b/source/apps-extra/ltp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=ltp -pkgver=20080131 +pkgver=20080229 # sometimes != $pkgver realver=$pkgver pkgrel=1 @@ -16,7 +16,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') source=(${source/ltp-/ltp-full-} $pkgname-{IDcheck_noninteractive,runltp_path}.diff \ ltp-20061222-linux2619.diff) -sha1sums=('168657e7edbe595f3ecdb39cacea87e7f2114a68' \ +sha1sums=('2c1adb2cfbe3438179b7c39ba2a23867a5236193' \ 'c7a2132257cf1c430a9692009952084746722c40' \ 'e9ff5dbafdd07ebe796b2f064066d7dbb7c7b6c5' \ '0a6f6665340d6745904936484c42e6e874a0fc2d') From voroskoi at frugalware.org Thu Mar 13 15:42:59 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Mar 13 15:43:00 2008 Subject: [Frugalware-git] frugalware-current: libksba-1.0.3-1-i686 Message-ID: <20080313144259.C604511901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=634c5f14e1d4ac02780221384b69cf96b4328ee2 commit 634c5f14e1d4ac02780221384b69cf96b4328ee2 Author: voroskoi Date: Thu Mar 13 15:41:55 2008 +0100 libksba-1.0.3-1-i686 version bump diff --git a/source/lib/libksba/FrugalBuild b/source/lib/libksba/FrugalBuild index 6a4c77f..1c4109c 100644 --- a/source/lib/libksba/FrugalBuild +++ b/source/lib/libksba/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libksba -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="Libksba is a CMS and X.509 access library." url="http://www.gnupg.org/related_software/libksba/index.html.en" From vmiklos at frugalware.org Thu Mar 13 15:49:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 13 15:49:44 2008 Subject: [Frugalware-git] frugalware-current: kvm-63-1-i686 Message-ID: <20080313144943.1224211901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb21fd8f16f791f7fa211176afbd939166826d74 commit cb21fd8f16f791f7fa211176afbd939166826d74 Author: Miklos Vajna Date: Thu Mar 13 15:49:28 2008 +0100 kvm-63-1-i686 - version bump diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild index 4cf1355..8081abe 100644 --- a/source/xapps-extra/kvm/FrugalBuild +++ b/source/xapps-extra/kvm/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: AlexExtreme pkgname=kvm -pkgver=61 -pkgrel=2 +pkgver=63 +pkgrel=1 pkgdesc="KVM is a kernel based virtual machine" url="http://kvm.sourceforge.net" groups=('xapps-extra') @@ -12,7 +12,7 @@ archs=('i686') Finclude sourceforge depends=('sdl' 'zlib') makedepends=('gcc-3.3') -sha1sums=('a68cf8ffc2898bfe95ddfccb3d76caec4a91cb1d') +sha1sums=('c4fc3e7984f6cc2abe2503fab8d8092d2181329c') Fconfopts="--prefix=$Fprefix" # no changelog in the tarball, you can reach it here: From vmiklos at frugalware.org Thu Mar 13 15:55:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Mar 13 15:55:35 2008 Subject: [Frugalware-git] frugalware-current: nss_ldap-260-1-i686 Message-ID: <20080313145533.B36AF11901BA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5c961b13dacbe635d66dc38cea7f663df251ba3 commit f5c961b13dacbe635d66dc38cea7f663df251ba3 Author: Miklos Vajna Date: Thu Mar 13 15:55:20 2008 +0100 nss_ldap-260-1-i686 - version bump diff --git a/source/network-extra/nss_ldap/FrugalBuild b/source/network-extra/nss_ldap/FrugalBuild index fd3a5f6..5783b77 100644 --- a/source/network-extra/nss_ldap/FrugalBuild +++ b/source/network-extra/nss_ldap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=nss_ldap -pkgver=259 +pkgver=260 pkgrel=1 pkgdesc="Resolve the entities defined in RFC 2307 from LDAP directories." url="http://www.padl.com/OSS/nss_ldap.html" @@ -13,5 +13,5 @@ up2date="lynx -dump http://www.padl.com/download/ |grep nss_ldap- |Flasttar" source=(http://www.padl.com/download/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --with-ldap=openldap --libdir=/lib --enable-schema-mapping \ --enable-rfc2307bis" -sha1sums=('0644d06be11b01e45d7a2a153e247b1203704d25') +sha1sums=('ad3f5215d66e1dc6c0ef04da83548ed2bc0dcd95') # optimization OK From crazy at frugalware.org Thu Mar 13 16:32:01 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 16:32:02 2008 Subject: [Frugalware-git] frugalware-current: qscintilla2-qt3-1.73_2.1-4-i686 Message-ID: <20080313153201.49A761190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=600dfad456ce57b91378f8052a67b49bbf8b70f6 commit 600dfad456ce57b91378f8052a67b49bbf8b70f6 Author: crazy Date: Thu Mar 13 16:31:30 2008 +0100 qscintilla2-qt3-1.73_2.1-4-i686 * up2date fix diff --git a/source/xlib/qscintilla2-qt3/FrugalBuild b/source/xlib/qscintilla2-qt3/FrugalBuild index a99590b..4e15bdf 100644 --- a/source/xlib/qscintilla2-qt3/FrugalBuild +++ b/source/xlib/qscintilla2-qt3/FrugalBuild @@ -10,7 +10,7 @@ pkgrel=4 pkgdesc="QScintilla2 is a port to Qt of Neil Hodgson's Scintilla C++ editor class. (Qt3)" url="http://www.riverbankcomputing.co.uk/qscintilla" license="GPL 2" -up2date="lynx -dump $url/download.php|grep -v "gpl-1.7"|grep -m1 'gpl-\(.*\).tar.gz'|sed 's/.*la-//;s/-gpl\(.*\).t.*/\1/;s/-/_/'" +up2date="lynx -dump $url/download.php|grep -v "gpl-1.7"|grep -m1 'gpl-\(.*\).tar.gz'|sed 's/.*-gpl-\(.*\).t.*/\1/'" source=(http://www.riverbankcomputing.com/Downloads/${origname}2/$origname-$ver1-gpl-$ver2.tar.gz \ broken-destdir.patch) groups=('xlib') From crazy at frugalware.org Thu Mar 13 17:11:18 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 17:11:20 2008 Subject: [Frugalware-git] frugalware-current: lighttpd-1.4.19-1-i686 Message-ID: <20080313161118.C9C2E1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4dde91a65a6f0d69dd382d7275e445d1ce7d4afa commit 4dde91a65a6f0d69dd382d7275e445d1ce7d4afa Author: crazy Date: Thu Mar 13 17:10:39 2008 +0100 lighttpd-1.4.19-1-i686 * Version bump * closes FS#2844 in current diff --git a/source/network-extra/lighttpd/Fix-372-and-1562.patch b/source/network-extra/lighttpd/Fix-372-and-1562.patch deleted file mode 100644 index 0571046..0000000 --- a/source/network-extra/lighttpd/Fix-372-and-1562.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Stefan=20B=C3=BChler?= -Date: Wed, 13 Feb 2008 00:07:22 +0100 -Subject: [PATCH] Fix #372 + #1562 - ---- - src/fdevent_solaris_devpoll.c | 2 +- - src/server.c | 3 --- - 2 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c -index f77daef..76414a4 100644 ---- a/src/fdevent_solaris_devpoll.c -+++ b/src/fdevent_solaris_devpoll.c -@@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { - int ret; - - dopoll.dp_timeout = timeout_ms; -- dopoll.dp_nfds = ev->maxfds; -+ dopoll.dp_nfds = ev->maxfds - 1; - dopoll.dp_fds = ev->devpollfds; - - ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); -diff --git a/src/server.c b/src/server.c -index 052130a..585a973 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -697,9 +697,6 @@ int main (int argc, char **argv) { - } - } - -- /* #372: solaris need some fds extra for devpoll */ -- if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; -- - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { - srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; - } else { --- -1.5.3.8 - diff --git a/source/network-extra/lighttpd/FrugalBuild b/source/network-extra/lighttpd/FrugalBuild index 6502604..aa778a8 100644 --- a/source/network-extra/lighttpd/FrugalBuild +++ b/source/network-extra/lighttpd/FrugalBuild @@ -3,27 +3,25 @@ # Contributor: BMH1980 pkgname=lighttpd -pkgver=1.4.18 -pkgrel=2 +pkgver=1.4.19 +pkgrel=1 pkgdesc="A webserver designed and optimized for high performance environments." url="http://www.lighttpd.net/" license="BSD" up2date="lynx -dump http://www.lighttpd.net/download|grep -om1 'lighttpd-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" source=($url/download/$pkgname-$pkgver.tar.bz2 \ $pkgname.conf rc.$pkgname index.html \ - http://frugalware.org/images/frugalware.png \ - Fix-372-and-1562.patch) + http://frugalware.org/images/frugalware.png) groups=('network-extra') archs=('i686' 'x86_64') depends=('libmysqlclient' 'bzip2' 'lua' 'pcre' 'xfsprogs-attr' 'libldap' 'openssl') makedepends=('mysql') backup=(etc/$pkgname/$pkgname.conf) -sha1sums=('a53a8f8ae8d42d036f0b5129764b822e943cc778' \ +sha1sums=('fd4450e7faae55ebe0905114722995b0c57397cc' \ '1a1d742bba61f24b42a4aea99623ceabbd345d3e' \ 'f30cb68ad73467a43317afabe0f4a90472df222e' \ 'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \ - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \ - 'd93a7f8e53c4f47308bd5938ec391a7992bdc42d') + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') build() { From crazy at frugalware.org Thu Mar 13 17:20:45 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 17:20:47 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-python-0.22-1-i686 Message-ID: <20080313162045.D58BC11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6d8ee042a93550e6cd0d9b9dcd087d1aedaf207 commit f6d8ee042a93550e6cd0d9b9dcd087d1aedaf207 Author: crazy Date: Thu Mar 13 17:20:07 2008 +0100 libopensync-plugin-python-0.22-1-i686 * New package for FS#2850 diff --git a/source/lib-extra/libopensync-plugin-python/FrugalBuild b/source/lib-extra/libopensync-plugin-python/FrugalBuild new file mode 100644 index 0000000..5d4b737 --- /dev/null +++ b/source/lib-extra/libopensync-plugin-python/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-python +pkgver=0.22 +pkgrel=1 +pkgdesc="python plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'zlib') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-python-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('655793fdb23aedee6c6a02c49bfb8a11c1c4cf42') + +# optimization OK From crazy at frugalware.org Thu Mar 13 17:42:02 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 17:42:03 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-gnokii-0.22-1-i686 Message-ID: <20080313164202.4BFE51190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=723808feec78c97e417b8820533c547640309b0b commit 723808feec78c97e417b8820533c547640309b0b Author: crazy Date: Thu Mar 13 17:41:37 2008 +0100 libopensync-plugin-gnokii-0.22-1-i686 * New package for FS#2850 diff --git a/source/xlib-extra/libopensync-plugin-gnokii/FrugalBuild b/source/xlib-extra/libopensync-plugin-gnokii/FrugalBuild new file mode 100644 index 0000000..fc881a2 --- /dev/null +++ b/source/xlib-extra/libopensync-plugin-gnokii/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-gnokii +pkgver=0.22 +pkgrel=1 +pkgdesc="gnokii plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'zlib' 'gnokii' 'libusb' 'libxpm') +groups=('xlib-extra') +archs=('i686' 'x86_64') +options=('scriptlet') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-gnokii-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('7030ec7370ea1fa3548c86a7b0840630a0a7b2b4') + +build() +{ + Fcd + Fsed '-Werror' '' src/Makefile.am + Fautoreconf + Fbuild +} + +# optimization OK From crazy at frugalware.org Thu Mar 13 17:48:34 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 17:48:35 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-ldap-0.22-1-i686 Message-ID: <20080313164834.6638A1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5fee34b33322c78fdf4a7fe1c63a521e90d895a commit d5fee34b33322c78fdf4a7fe1c63a521e90d895a Author: crazy Date: Thu Mar 13 17:47:51 2008 +0100 libopensync-plugin-ldap-0.22-1-i686 * New package for FS#2850 diff --git a/source/lib-extra/libopensync-plugin-ldap/FrugalBuild b/source/lib-extra/libopensync-plugin-ldap/FrugalBuild new file mode 100644 index 0000000..8245a93 --- /dev/null +++ b/source/lib-extra/libopensync-plugin-ldap/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-ldap +pkgver=0.22 +pkgrel=1 +pkgdesc="ldap plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'zlib' 'libgcrypt' 'libldap') +makedepends=('openldap') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-ldap-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('2066938445baff3320dde9c0441b123d0b329a38') + + +# optimization OK diff --git a/source/xapps-extra/jargoninformatique/FrugalBuild b/source/xapps-extra/jargoninformatique/FrugalBuild old mode 100644 new mode 100755 From crazy at frugalware.org Thu Mar 13 17:55:11 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 17:55:12 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-gpe-0.22-1-i686 Message-ID: <20080313165511.358701190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b46ff9d028239dced41be082446a6c4e417a5273 commit b46ff9d028239dced41be082446a6c4e417a5273 Author: crazy Date: Thu Mar 13 17:54:45 2008 +0100 libopensync-plugin-gpe-0.22-1-i686 * New package for FS#2850 diff --git a/source/lib-extra/libopensync-plugin-gpe/FrugalBuild b/source/lib-extra/libopensync-plugin-gpe/FrugalBuild new file mode 100644 index 0000000..8f36d91 --- /dev/null +++ b/source/lib-extra/libopensync-plugin-gpe/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-gpe +pkgver=0.22 +pkgrel=1 +pkgdesc="gpe plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'zlib') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-gpe-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('f2520fe8d55307dc6744a203104399b0c9a27906') + + +# optimization OK From crazy at frugalware.org Thu Mar 13 18:01:36 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 18:01:37 2008 Subject: [Frugalware-git] frugalware-current: msynctool-0.22-1-i686 Message-ID: <20080313170136.046FB1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0000bf280d0fede0cd5de382d19f5c43921f10b commit b0000bf280d0fede0cd5de382d19f5c43921f10b Author: crazy Date: Thu Mar 13 18:01:13 2008 +0100 msynctool-0.22-1-i686 * New package for FS#2850 diff --git a/source/apps-extra/msynctool/FrugalBuild b/source/apps-extra/msynctool/FrugalBuild new file mode 100644 index 0000000..f9c8398 --- /dev/null +++ b/source/apps-extra/msynctool/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=msynctool +pkgver=0.22 +pkgrel=1 +pkgdesc="Command line interface for OpenSync" +url="http://www.opensync.org" +depends=('libopensync' 'zlib') +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'msynctool-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('2eab3c847dba4a457d06061efcf662237da2c8e4') + + +# optimization OK From voroskoi at frugalware.org Thu Mar 13 18:01:56 2008 From: voroskoi at frugalware.org (voroskoi) Date: Thu Mar 13 18:02:00 2008 Subject: [Frugalware-git] frugalware-current: libtrash-3.2-1-i686 Message-ID: <20080313170156.B40261190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=71296d4e9d5db95cbbc8a2a88d8cd5219fe0d28f commit 71296d4e9d5db95cbbc8a2a88d8cd5219fe0d28f Author: voroskoi Date: Thu Mar 13 18:01:32 2008 +0100 libtrash-3.2-1-i686 version bump diff --git a/source/lib-extra/libtrash/FrugalBuild b/source/lib-extra/libtrash/FrugalBuild index bbe09ec..9d71bc0 100644 --- a/source/lib-extra/libtrash/FrugalBuild +++ b/source/lib-extra/libtrash/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libtrash -pkgver=3.0 +pkgver=3.2 pkgrel=1 pkgdesc="The shared library which, when preloaded, implements a trash can under GNU/Linux." url="http://pages.stern.nyu.edu/~marriaga/software/libtrash/" @@ -12,7 +12,7 @@ up2date="lynx -dump $url |grep -m 1 Version|sed 's/.*n \(.*\) can.*/\1/'" source=($url/$pkgname-latest.tgz) groups=('lib-extra') archs=('i686' 'x86_64') -sha1sums=('0cd25c2dbd041b6f3f1e706b31e1b535b723a588') +sha1sums=('79c94ff1eefea4749bb912c8d104d12aa30c8f5e') build() { From crazy at frugalware.org Thu Mar 13 19:07:08 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 19:07:10 2008 Subject: [Frugalware-git] frugalware-current: wbxml2-0.9.2-1-i686 Message-ID: <20080313180708.8F1541190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee9b38c1a7c51357980e5e8b040da152cb9b89c1 commit ee9b38c1a7c51357980e5e8b040da152cb9b89c1 Author: crazy Date: Thu Mar 13 19:06:25 2008 +0100 wbxml2-0.9.2-1-i686 * New package for FS#2850 diff --git a/source/lib-extra/wbxml2/FrugalBuild b/source/lib-extra/wbxml2/FrugalBuild new file mode 100644 index 0000000..d3aceec --- /dev/null +++ b/source/lib-extra/wbxml2/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=wbxml2 +pkgver=0.9.2 +pkgrel=1 +pkgdesc="A C library for handling WBXML (Wireless Binary XML) documents." +depends=('expat' 'zlib' 'popt') +groups=('lib-extra') +archs=('i686' 'x86_64') +_F_sourceforge_dirname="wbxmllib" +Finclude sourceforge +source=($source doc-does-not-exist.patch) +sha1sums=('ee02ec4a1e6cd0312d0b2a02c85c603e4c98ba14' \ + 'c4308e823b04500d84dba3585b974b9cc6dbd68e') + +build() +{ + Fcd + Fpatchall + Fsed '-O3' "$CFLAGS" src/Makefile.am + Fsed '-O3' "$CFLAGS" tools/Makefile.am + Fautoreconf + Fmake + Fmakeinstall +} + +# optimization OK diff --git a/source/lib-extra/wbxml2/doc-does-not-exist.patch b/source/lib-extra/wbxml2/doc-does-not-exist.patch new file mode 100644 index 0000000..0540a7a --- /dev/null +++ b/source/lib-extra/wbxml2/doc-does-not-exist.patch @@ -0,0 +1,14 @@ +diff -Naur wbxml2-0.9.2/Makefile.am wbxml2-0.9.2-p/Makefile.am +--- wbxml2-0.9.2/Makefile.am 2006-07-11 13:47:43.000000000 +0200 ++++ wbxml2-0.9.2-p/Makefile.am 2008-03-13 18:30:38.000000000 +0100 +@@ -24,10 +24,6 @@ + TODO\ + doxygen.h + +-install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual +- cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual +- + dist-bz2: distdir + sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux + mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec From priyank at frugalware.org Thu Mar 13 19:17:39 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 19:17:40 2008 Subject: [Frugalware-git] frugalware-current: compiz.sh: updated compizver to 0.7.2 Message-ID: <20080313181739.60C291190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b74d90efdb8bb7ea2b12d1ffa0b7b8a53857fb23 commit b74d90efdb8bb7ea2b12d1ffa0b7b8a53857fb23 Author: Priyank Date: Thu Mar 13 23:47:21 2008 +0530 compiz.sh: updated compizver to 0.7.2 * fixed source() for some packages diff --git a/source/include/compiz.sh b/source/include/compiz.sh index 4b87e5c..f166b16 100644 --- a/source/include/compiz.sh +++ b/source/include/compiz.sh @@ -32,7 +32,7 @@ # to declare the real version ### -compizver=0.6.0 +compizver=0.7.2 if [ -z "$_F_compiz_name" ]; then _F_compiz_name=$pkgname @@ -57,7 +57,11 @@ pkgver=$_F_compiz_version pkgdesc="Compiz is a compositing window manager using GLX_EXT_texture_from_pixmap" url="http://www.compiz-fusion.org/" up2date="lynx -dump http://releases.compiz-fusion.org/$_F_compiz_version/ | grep $_F_compiz_name | Flasttarbz2" -source=(http://releases.compiz-fusion.org/$_F_compiz_version/$_F_compiz_name-$pkgver.tar.bz2) +if [ $_F_compiz_name == "compiz" ]; then + source=(http://releases.compiz-fusion.org/$_F_compiz_version/compiz/$_F_compiz_name-$pkgver.tar.bz2) +else + source=(http://releases.compiz-fusion.org/$_F_compiz_version/$_F_compiz_name-$pkgver.tar.bz2) +fi _F_cd_path="$_F_compiz_name-$_F_compiz_version" ### From priyank at frugalware.org Thu Mar 13 19:42:40 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 19:42:41 2008 Subject: [Frugalware-git] frugalware-current: compiz-0.7.2-1-i686 Message-ID: <20080313184240.5D1331190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b5e4aee41e0e67d69c257f256c2e55bd3bfd0d0 commit 5b5e4aee41e0e67d69c257f256c2e55bd3bfd0d0 Author: Priyank Date: Fri Mar 14 00:10:43 2008 +0530 compiz-0.7.2-1-i686 * Version bump diff --git a/source/x11-extra/compiz/FrugalBuild b/source/x11-extra/compiz/FrugalBuild index e7fa097..3e57cb2 100644 --- a/source/x11-extra/compiz/FrugalBuild +++ b/source/x11-extra/compiz/FrugalBuild @@ -1,8 +1,7 @@ -# Compiling Time: 0.30 SBU +# Compiling Time: 0.37 SBU # Maintainer: Priyank Gosalia pkgname=compiz -_F_compiz_version=0.6.2 Finclude compiz pkgrel=1 depends=('libgl' 'libglx' 'libpng' 'libxcomposite' 'libxfixes' 'libxdamage' \ @@ -13,8 +12,7 @@ replaces=('beryl' 'beryl-manager' 'beryl-settings' 'beryl-settings-bindings' 'be groups=('x11-extra') archs=('i686' 'x86_64') up2date=$pkgver -source=(http://releases.compiz-fusion.org/compiz/$pkgver/$pkgname-$pkgver.tar.bz2) -sha1sums=('2b34caa05a29f9055ea74365a5429e6ea79b32ed') +sha1sums=('26baec9dc39a203314c1b41c9e61828eebe95ee6') _F_gnome_schemas=('/etc/gconf/schemas/gwd.schemas' \ '/etc/gconf/schemas/compiz-zoom.schemas' \ '/etc/gconf/schemas/compiz-wobbly.schemas' \ From crazy at frugalware.org Thu Mar 13 19:46:23 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 19:46:24 2008 Subject: [Frugalware-git] frugalware-current: libsyncml-0.4.5-1-i686 Message-ID: <20080313184623.A88201190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89607d11eaf9152e719a7656681043656e76b0c2 commit 89607d11eaf9152e719a7656681043656e76b0c2 Author: crazy Date: Thu Mar 13 19:45:52 2008 +0100 libsyncml-0.4.5-1-i686 * New package for FS#2850 diff --git a/source/lib-extra/libsyncml/FrugalBuild b/source/lib-extra/libsyncml/FrugalBuild new file mode 100644 index 0000000..cc4b48d --- /dev/null +++ b/source/lib-extra/libsyncml/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libsyncml +pkgver=0.4.5 +pkgrel=1 +pkgdesc="Libsyncml is a implementation of the SyncML protocol." +url="http://libsyncml.opensync.org/" +depends=('libsoup' 'openobex' 'wbxml2' 'expat' 'zlib' 'popt') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://libsyncml.opensync.org/wiki/download'|grep -m1 'libsyncml-\(.*\).tar.bz2'|Flasttarbz2" +source=(http://libsyncml.opensync.org/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('93794fd891def238025559cb74be18669fd5197a') + +# optimization OK From priyank at frugalware.org Thu Mar 13 19:48:19 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 19:48:21 2008 Subject: [Frugalware-git] frugalware-current: libcompizconfig-0.7.2-1-i686 Message-ID: <20080313184819.DF55C1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab5c326791ca6721283d23ba3a2f87ef2e013f1c commit ab5c326791ca6721283d23ba3a2f87ef2e013f1c Author: Priyank Date: Fri Mar 14 00:17:34 2008 +0530 libcompizconfig-0.7.2-1-i686 * Version bump diff --git a/source/xlib-extra/libcompizconfig/FrugalBuild b/source/xlib-extra/libcompizconfig/FrugalBuild index f7b9506..7e54d60 100644 --- a/source/xlib-extra/libcompizconfig/FrugalBuild +++ b/source/xlib-extra/libcompizconfig/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Priyank Gosalia pkgname=libcompizconfig -pkgver=0.6.0 +pkgver=0.7.2 pkgrel=1 pkgdesc="Compiz configuration system library" -depends=('libxml2' 'compiz>=0.6.0-4') +depends=('libxml2' 'compiz>=0.7.2') makedepends=('perl-xml-parser') groups=('xlib-extra') archs=('i686' 'x86_64') Finclude compiz -sha1sums=('53de25f2c3e3369840c4b8f49a163f8e3f6386a0') +sha1sums=('c1915ea6fa8b923ad0dcf6ccae05e909a999703b') # optimization OK From priyank at frugalware.org Thu Mar 13 19:52:52 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 19:52:53 2008 Subject: [Frugalware-git] frugalware-current: compiz-bcop-0.7.2-1-i686 Message-ID: <20080313185252.4C4641190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53f09ea4fc992b2b9591a27d36dcc9cb2c773ef1 commit 53f09ea4fc992b2b9591a27d36dcc9cb2c773ef1 Author: Priyank Date: Fri Mar 14 00:21:58 2008 +0530 compiz-bcop-0.7.2-1-i686 * Version bump diff --git a/source/apps-extra/compiz-bcop/FrugalBuild b/source/apps-extra/compiz-bcop/FrugalBuild index 671d297..91d2c50 100644 --- a/source/apps-extra/compiz-bcop/FrugalBuild +++ b/source/apps-extra/compiz-bcop/FrugalBuild @@ -9,5 +9,5 @@ url="http://www.compiz.org/" depends=('libxslt') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('4d6c3ce5b3b3aa531df7f366ee1e31236de8b30d') +sha1sums=('0e81f7b31359ae3785db8e4cd904663d61a7614c') From crazy at frugalware.org Thu Mar 13 19:53:09 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 19:53:12 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-syncml-0.22-1-i686 Message-ID: <20080313185309.D15D71190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d12cc269504c57f3e8ba141adb41c7422d6bec6 commit 9d12cc269504c57f3e8ba141adb41c7422d6bec6 Author: crazy Date: Thu Mar 13 19:52:30 2008 +0100 libopensync-plugin-syncml-0.22-1-i686 * New package for FS#2850 diff --git a/source/lib-extra/libopensync-plugin-syncml/FrugalBuild b/source/lib-extra/libopensync-plugin-syncml/FrugalBuild new file mode 100644 index 0000000..2576d7e --- /dev/null +++ b/source/lib-extra/libopensync-plugin-syncml/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-syncml +pkgver=0.22 +pkgrel=1 +pkgdesc="syncml plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'libsyncml' 'bluez-libs' 'libusb') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-syncml-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('983fd2ad84c17f486fe182d94e3e055a081706be') + +# optimization OK From priyank at frugalware.org Thu Mar 13 20:03:43 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 20:03:45 2008 Subject: [Frugalware-git] frugalware-current: compiz-plugins-main-0.7.2-1-i686 Message-ID: <20080313190343.EDF471190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fff2c07e3ae1775d23fe9eee5efe562d3cd60fa commit 5fff2c07e3ae1775d23fe9eee5efe562d3cd60fa Author: Priyank Date: Fri Mar 14 00:32:02 2008 +0530 compiz-plugins-main-0.7.2-1-i686 * Version bump diff --git a/source/x11-extra/compiz-plugins-main/FrugalBuild b/source/x11-extra/compiz-plugins-main/FrugalBuild index 5d082a0..82f479c 100644 --- a/source/x11-extra/compiz-plugins-main/FrugalBuild +++ b/source/x11-extra/compiz-plugins-main/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.33 SBU +# Compiling Time: 0.35 SBU # Maintainer: Priyank Gosalia pkgname=compiz-plugins-main @@ -6,11 +6,11 @@ pkgrel=1 _F_compiz_name="compiz-fusion-plugins-main" Finclude compiz pkgdesc="Main plugins for Compiz Fusion" -depends=('compiz>=0.6.0-4' 'compiz-bcop>=0.6.0' 'cairo' 'libjpeg' 'librsvg') +depends=('compiz>=0.7.2' 'compiz-bcop>=0.7.2' 'cairo' 'libjpeg' 'librsvg') makedepends=('pkgconfig' 'perl-xml-parser') groups=('x11-extra') archs=('i686' 'x86_64') _F_cd_path=$_F_compiz_name-$pkgver -sha1sums=('9c67ba9b974b8a6f06448581776307a7a77a35c6') +sha1sums=('ed6f03f8516af0a9e4d34051b4ca5eea2da0af09') # optimization OK From priyank at frugalware.org Thu Mar 13 20:13:13 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 20:13:15 2008 Subject: [Frugalware-git] frugalware-current: compiz-plugins-extra-0.7.2-1-i686 Message-ID: <20080313191313.AE8391190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=592b163278ac2ab4aed036496f3fc7a1a97d9c96 commit 592b163278ac2ab4aed036496f3fc7a1a97d9c96 Author: Priyank Date: Fri Mar 14 00:40:32 2008 +0530 compiz-plugins-extra-0.7.2-1-i686 * Version bump diff --git a/source/x11-extra/compiz-plugins-extra/FrugalBuild b/source/x11-extra/compiz-plugins-extra/FrugalBuild index a7bae94..7c74f49 100644 --- a/source/x11-extra/compiz-plugins-extra/FrugalBuild +++ b/source/x11-extra/compiz-plugins-extra/FrugalBuild @@ -6,12 +6,12 @@ pkgrel=1 _F_compiz_name="compiz-fusion-plugins-extra" Finclude compiz pkgdesc="Extra plugins for Compiz Fusion" -depends=('compiz>=0.6.0-4' 'compiz-bcop>=0.6.0' 'compiz-plugins-main>=0.6.0' \ +depends=('compiz>=0.7.2' 'compiz-bcop>=0.7.2' 'compiz-plugins-main>=0.7.2' \ 'cairo' 'libjpeg' 'librsvg') makedepends=('pkgconfig' 'perl-xml-parser') groups=('x11-extra') archs=('i686' 'x86_64') _F_cd_path=$_F_compiz_name-$pkgver -sha1sums=('6675566de981f56a072175bdd93fcabf07c051f0') +sha1sums=('619038129d685a02e744c46fe367a54c2e841d1d') # optimization OK From priyank at frugalware.org Thu Mar 13 20:17:44 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 20:17:46 2008 Subject: [Frugalware-git] frugalware-current: compiz-emerald-0.7.2-1-i686 Message-ID: <20080313191744.89BCF1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3209734a897410db63e3d9f85c88fbfca0ea5574 commit 3209734a897410db63e3d9f85c88fbfca0ea5574 Author: Priyank Date: Fri Mar 14 00:46:26 2008 +0530 compiz-emerald-0.7.2-1-i686 * Version bump diff --git a/source/x11-extra/compiz-emerald/FrugalBuild b/source/x11-extra/compiz-emerald/FrugalBuild index 1ed6462..85a112c 100644 --- a/source/x11-extra/compiz-emerald/FrugalBuild +++ b/source/x11-extra/compiz-emerald/FrugalBuild @@ -3,11 +3,10 @@ pkgname=compiz-emerald _F_compiz_name=emerald -_F_compiz_version=0.5.2 Finclude compiz pkgrel=1 pkgdesc="Emerald window decorator for Compiz Fusion" -depends=('libxrender' 'compiz>=0.6.2' 'gtk+2' 'libwnck') +depends=('libxrender' 'compiz>=0.7.2' 'gtk+2' 'libwnck') makedepends=('perl-xml-parser') replaces=('emerald') groups=('x11-extra') @@ -15,6 +14,6 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet _F_cd_path="$_F_compiz_name-$pkgver" -sha1sums=('deefc2e92ea8581588e74194fbb2727a83ef9c64') +sha1sums=('b364bd0d19ed8add92796cb28fc8bab4dfdb3e76') # optimization OK From crazy at frugalware.org Thu Mar 13 20:18:55 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 20:18:56 2008 Subject: [Frugalware-git] frugalware-current: libopensync-plugin-irmc-0.22-1-i686 Message-ID: <20080313191855.0B0DF1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1dbe7b1ab78b05e3922a3d855b626712b0e7d3be commit 1dbe7b1ab78b05e3922a3d855b626712b0e7d3be Author: crazy Date: Thu Mar 13 20:18:14 2008 +0100 libopensync-plugin-irmc-0.22-1-i686 * New package * closes FS#2850 diff --git a/source/lib-extra/libopensync-plugin-irmc/FrugalBuild b/source/lib-extra/libopensync-plugin-irmc/FrugalBuild new file mode 100644 index 0000000..dd74c69 --- /dev/null +++ b/source/lib-extra/libopensync-plugin-irmc/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy + +pkgname=libopensync-plugin-irmc +pkgver=0.22 +pkgrel=1 +pkgdesc="irmc plugin for opensync" +url="http://www.opensync.org" +depends=('libopensync' 'zlib' 'openobex' 'mpeg4ip') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://www.opensync.org/wiki/download'|grep -om1 'libopensync-plugin-irmc-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" +source=($url/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('554aea9fbd46af4f85fcd1257c5d44074c75ffb2') + +# optimization OK From priyank at frugalware.org Thu Mar 13 20:21:19 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 20:21:21 2008 Subject: [Frugalware-git] frugalware-current: compizconfig-python-0.7.2-1-i686 Message-ID: <20080313192119.F377E1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f57a7d10133d794487f54e2d25cadf7e1ae57450 commit f57a7d10133d794487f54e2d25cadf7e1ae57450 Author: Priyank Date: Fri Mar 14 00:49:33 2008 +0530 compizconfig-python-0.7.2-1-i686 * Version bump diff --git a/source/xlib-extra/compizconfig-python/FrugalBuild b/source/xlib-extra/compizconfig-python/FrugalBuild index d6ef19f..de59a0d 100644 --- a/source/xlib-extra/compizconfig-python/FrugalBuild +++ b/source/xlib-extra/compizconfig-python/FrugalBuild @@ -5,9 +5,9 @@ pkgname=compizconfig-python pkgrel=1 Finclude compiz pkgdesc="Python bindings for libcompizconfig" -depends=('python' 'pkgconfig' 'pyrex' 'libcompizconfig>=0.6.0') +depends=('python' 'pkgconfig' 'pyrex' 'libcompizconfig>=0.7.2') groups=('xlib-extra') archs=('i686' 'x86_64') -sha1sums=('37c23084a3bb21b5bf07956793c70ff0af2ca9ea') +sha1sums=('570e463f808b1ef133244d9fbe1e45fb7b888c65') # optimization OK From priyank at frugalware.org Thu Mar 13 20:28:19 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 20:28:20 2008 Subject: [Frugalware-git] frugalware-current: ccsm-0.7.2-1-i686 Message-ID: <20080313192819.24E8C1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bec360c66e7bb95927f4da26cd032e60c1e1f37b commit bec360c66e7bb95927f4da26cd032e60c1e1f37b Author: Priyank Date: Fri Mar 14 00:56:59 2008 +0530 ccsm-0.7.2-1-i686 * Version bump diff --git a/source/gnome-extra/ccsm/FrugalBuild b/source/gnome-extra/ccsm/FrugalBuild index 2fb98ec..4af59bf 100644 --- a/source/gnome-extra/ccsm/FrugalBuild +++ b/source/gnome-extra/ccsm/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=ccsm -pkgrel=2 +pkgrel=1 Finclude compiz pkgdesc="CompizConfig settings manager" -rodepends=('pygtk' 'compizconfig-python>=0.6.0') +rodepends=('pygtk' 'compizconfig-python>=0.7.2') groups=('gnome-extra') replaces=('gset-compiz') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude gnome-scriptlet -sha1sums=('0dc8eba9c95e46b7e1b5748dfacdeb95d6bdc1d7') +sha1sums=('85a986c658ec7f4e34c0675dcc966938cf1585dd') build() { From priyank at frugalware.org Thu Mar 13 20:35:16 2008 From: priyank at frugalware.org (Priyank) Date: Thu Mar 13 20:35:17 2008 Subject: [Frugalware-git] frugalware-current: fusion-icon-20080307-1-i686 Message-ID: <20080313193516.6B5CB1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a38ede1b11d8959e1752ac236f8825140e4205d9 commit a38ede1b11d8959e1752ac236f8825140e4205d9 Author: Priyank Date: Fri Mar 14 01:03:56 2008 +0530 fusion-icon-20080307-1-i686 * Version bump to latest git snapshot diff --git a/source/gnome-extra/fusion-icon/FrugalBuild b/source/gnome-extra/fusion-icon/FrugalBuild index ee07ab8..029b450 100644 --- a/source/gnome-extra/fusion-icon/FrugalBuild +++ b/source/gnome-extra/fusion-icon/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=fusion-icon -pkgver=20071011 -pkgrel=2 +pkgver=20080307 +pkgrel=1 pkgdesc="A user-friendly tray icon for launching and managing Compiz Fusion" url="http://www.compiz.org/" -depends=() -rodepends=('pygtk' 'compiz>=0.6.2' 'ccsm>=0.6.0' 'mesademos' 'xvinfo') +depends=('libcompizconfig>=0.7.2') +rodepends=('pygtk' 'compiz>=0.7.2' 'ccsm>=0.7.2' 'mesademos' 'xvinfo') replaces=('desktop-effects') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -15,4 +15,4 @@ _F_gnome_iconcache=y Finclude gnome-scriptlet up2date="$pkgver" source=(ftp://ftp.frugalware.org/pub/other/sources/compiz/$pkgname-$pkgver.tar.bz2) -sha1sums=('6b8b31d2299a30063ec8427a5a1afd918d14c63b') +sha1sums=('70f65f9a4d2f07d8924372df915fd077fccc47cb') From crazy at frugalware.org Thu Mar 13 21:22:37 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 21:22:39 2008 Subject: [Frugalware-git] frugalware-current: freeimage-3.10.0-1-i686 Message-ID: <20080313202237.479291190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16d1236251fbd040cb2ff8edeffb8cf65541ad21 commit 16d1236251fbd040cb2ff8edeffb8cf65541ad21 Author: crazy Date: Thu Mar 13 21:20:21 2008 +0100 freeimage-3.10.0-1-i686 * New package for FS#2020 diff --git a/source/xlib-extra/freeimage/FrugalBuild b/source/xlib-extra/freeimage/FrugalBuild new file mode 100644 index 0000000..780f911 --- /dev/null +++ b/source/xlib-extra/freeimage/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling time: 0.44 SBU +# Maintainer: crazy + +pkgname=freeimage +pkgver=3.10.0 +pkgrel=1 +pkgdesc="Image library" +depends=('libstdc++') +makedepends=('hd2u') +groups=('xlib-extra') +archs=('i686') +Finclude sourceforge +url="http://freeimage.sourceforge.net/" +up2date="lynx -dump http://freeimage.sourceforge.net/download.html|grep -om1 'Download FreeImage\(.*\)'|sed 's/.*ge \(.*\).*/\1/'" +source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/freeimage/FreeImage3100.zip build-fix.patch) +sha1sums=('9590563e8abade9494fc6db6f6127fa3db42b8e1' \ + '665a8a302b9d420882eeb0697aeafb8ad050748e') + +## TODO: make it build with system libs +build() +{ + Fcd FreeImage + Fpatchall + Fsed '-O3' "$CXXFLAGS" Makefile* + Fmkdir usr/{include,lib} + make || Fdie + make -f Makefile.fip || Fdie + make DESTDIR=$Fdestdir install || Fdie + make -f Makefile.fip DESTDIR=$Fdestdir install || Fdie + + +} + +# optimization OK diff --git a/source/xlib-extra/freeimage/build-fix.patch b/source/xlib-extra/freeimage/build-fix.patch new file mode 100644 index 0000000..3f9cc0a --- /dev/null +++ b/source/xlib-extra/freeimage/build-fix.patch @@ -0,0 +1,52 @@ +diff -Naur FreeImage/Makefile.fip FreeImage-p/Makefile.fip +--- FreeImage/Makefile.fip 2007-08-25 16:57:54.000000000 +0200 ++++ FreeImage-p/Makefile.fip 2008-03-06 01:23:47.000000000 +0100 +@@ -56,16 +56,15 @@ + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) + + install: +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) +- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) +- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) +- ldconfig ++ install -m 644 -o root -g root $(HEADER) $(DESTDIR)$(INCDIR) ++ install -m 644 -o root -g root $(HEADERFIP) $(DESTDIR)$(INCDIR) ++ install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALLDIR) ++ install -m 755 -o root -g root $(SHAREDLIB) $(DESTDIR)$(INSTALLDIR) ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(INSTALLDIR)/$(VERLIBNAME) ++ ln -sf $(VERLIBNAME) $(DESTDIR)$(INSTALLDIR)/$(LIBNAME) + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) +diff -Naur FreeImage/Makefile.gnu FreeImage-p/Makefile.gnu +--- FreeImage/Makefile.gnu 2007-08-25 18:44:24.000000000 +0200 ++++ FreeImage-p/Makefile.gnu 2008-03-06 01:24:07.000000000 +0100 +@@ -55,15 +55,14 @@ + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) + + install: +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) +- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) +- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) +- ldconfig ++ install -m 644 -o root -g root $(HEADER) $(DESTDIR)$(INCDIR) ++ install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALLDIR) ++ install -m 755 -o root -g root $(SHAREDLIB) $(DESTDIR)$(INSTALLDIR) ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(INSTALLDIR)/$(VERLIBNAME) ++ ln -sf $(VERLIBNAME) $(DESTDIR)$(INSTALLDIR)/$(LIBNAME) + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) From crazy at frugalware.org Thu Mar 13 21:53:14 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 21:53:15 2008 Subject: [Frugalware-git] frugalware-current: ogre-1.4.7-1-i686 Message-ID: <20080313205314.9A43E1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=038aa1a97f059b5e48b79f616b8c755a6349499c commit 038aa1a97f059b5e48b79f616b8c755a6349499c Author: crazy Date: Thu Mar 13 21:49:29 2008 +0100 ogre-1.4.7-1-i686 * New package * closes FS#2020 diff --git a/source/xlib-extra/ogre/FrugalBuild b/source/xlib-extra/ogre/FrugalBuild new file mode 100644 index 0000000..f34ffed --- /dev/null +++ b/source/xlib-extra/ogre/FrugalBuild @@ -0,0 +1,37 @@ +# Compiling time: 4.32 SBU +# Maintainer: crazy + +pkgname=ogre +pkgver=1.4.7 +pkgrel=1 +pkgdesc="A scene-oriented flexible 3D engine written in C++" +depends=('freeimage' 'libstdc++' 'zziplib' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxaw' 'libxml2' 'mesa' 'openexr') +groups=('xlib-extra') +archs=('i686') +options=('scriptlet') +Finclude sourceforge +url="http://www.ogre3d.org" +up2date="lynx -dump http://downloads.sourceforge.net/ogre/|grep -om1 'ogre-linux_osx\(.*\).tar.bz2'|sed 's/.*v\(.*\).t.*/\1/;s/-/./g'" +source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-linux_osx-v$(echo $pkgver|tr '.' '-').tar.bz2) +_F_cd_path="${pkgname}new" +sha1sums=('d40c6c6500742aef8bb201265362d381ba2b7001') + +subpkgs=("$pkgname-docs") +subdescs=("Ogre Documentation") +subdepends=() +subgroups=('docs-extra') +subarchs=('i686') + +build() +{ + Fcd + find . -name CVS | xargs rm -rf || Fdie + Fbuild \ + --with-gui=gtk --with-platform=GLX \ + --enable-openexr --disable-cg + Fmkdir usr/share/doc/$pkgname-$pkgver/html + cp -ra Docs/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/html/ || Fdie + Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver/html +} + +# optimization OK From crazy at frugalware.org Thu Mar 13 22:17:03 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 22:17:05 2008 Subject: [Frugalware-git] frugalware-current: snack-2.2.10-1-i686 Message-ID: <20080313211703.5120B1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21d527ff659040be1c7f2a5220b09c7a110a6ad3 commit 21d527ff659040be1c7f2a5220b09c7a110a6ad3 Author: crazy Date: Thu Mar 13 22:16:15 2008 +0100 snack-2.2.10-1-i686 * New package * closes FS#2800 diff --git a/source/xmultimedia-extra/snack/FrugalBuild b/source/xmultimedia-extra/snack/FrugalBuild new file mode 100644 index 0000000..5b77113 --- /dev/null +++ b/source/xmultimedia-extra/snack/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 0.17 SBU +# Maintainer: crazy +# Contributor: bouleetbil + +pkgname=snack +pkgver=2.2.10 +pkgrel=1 +pkgdesc="Snack Sound Toolkit (Tcl)" +depends=('alsa-lib' 'tk' 'python' 'libxscrnsaver' 'libvorbis') +groups=('xmultimedia-extra') +archs=('i686') +url="http://www.speech.kth.se" +source=($url/$pkgname/dist/$pkgname$pkgver.tar.gz) +up2date="lynx -dump $url/$pkgname/download.html |grep 'Version '|cut -d ' ' -f 6 | sed -n '1p'" +sha1sums=('2c333fde061cf1cb7d5932c9cff4eb968c7d095a') + +build() +{ + Fcd $pkgname$pkgver/unix + Fsed '-O' "$CFLAGS" Makefile.in + Fbuild \ + --with-ogg-include=/usr/include \ + --with-ogg-lib=/usr/lib \ + --enable-alsa \ + --enable-threads \ + --libdir=/usr/lib \ + --includedir=/usr/include + cd ../python || Fdie + python setup.py install --root=$Fdestdir || Fdie +} + From crazy at frugalware.org Thu Mar 13 23:01:45 2008 From: crazy at frugalware.org (crazy) Date: Thu Mar 13 23:01:46 2008 Subject: [Frugalware-git] frugalware-current: qscintilla2-python-qt3-1.73_2.1-3-i686 Message-ID: <20080313220145.A6E9E1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe4947011d33de5b46f66986097080cb8bf28573 commit fe4947011d33de5b46f66986097080cb8bf28573 Author: crazy Date: Thu Mar 13 23:01:21 2008 +0100 qscintilla2-python-qt3-1.73_2.1-3-i686 * up2date fix diff --git a/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild b/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild index 8eea53d..1e57c8c 100644 --- a/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild +++ b/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild @@ -10,7 +10,7 @@ pkgrel=3 pkgdesc="QScintilla2 python bindings for QT3" url="http://www.riverbankcomputing.co.uk/qscintilla" license="GPL 2" -up2date="lynx -dump $url/download.php|grep -v "gpl-1.7"|grep -m1 'gpl-\(.*\).tar.gz'|sed 's/.*la-//;s/-gpl\(.*\).t.*/\1/;s/-/_/'" +up2date="lynx -dump $url/download.php|grep -v "gpl-1.7"|grep -m1 'gpl-\(.*\).tar.gz'|sed 's/.*-gpl-\(.*\).t.*/\1/'" source=(http://www.riverbankcomputing.com/Downloads/${origname}2/$origname-$ver1-gpl-$ver2.tar.gz designer.patch) groups=('xlib-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:10 2008 Subject: [Frugalware-git] frugalware-current: util.sh Message-ID: <20080313230608.12D221190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7211673f2e915c06ae513e1e7575611e18fd9bda commit 7211673f2e915c06ae513e1e7575611e18fd9bda Author: crazy Date: Sat Mar 8 13:17:37 2008 +0100 util.sh * remove gcc hack from here , never worked * will be moved to makepkg for now and for Kalgan+1 to makepkg.conf * added comment for LDFLAGS these have to be moved to makepkg.conf also diff --git a/source/include/util.sh b/source/include/util.sh index 49ed8d7..ef8d898 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -83,11 +83,7 @@ Flocalstatedir="/var" Fmenudir="/usr/share/applications" Farchs=('i686' 'x86_64' 'ppc') Fconfopts="--prefix=$Fprefix" -_gccver=`type -p gcc >/dev/null && gcc -dumpversion` -if [ "${_gccver%%.?}" == "4.2" ]; then - export CFLAGS="$CFLAGS -fno-strict-aliasing" - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" -fi +## Move to makepkg.conf for Kalgan+1 export LDFLAGS="-Wl,--hash-style=both" ### From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:12 2008 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.8-3-i686 Message-ID: <20080313230608.2505D1190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff593166a0ed7d7add97041ea266a3c6c8891521 commit ff593166a0ed7d7add97041ea266a3c6c8891521 Author: crazy Date: Sat Mar 8 13:44:40 2008 +0100 pacman-g2-3.6.8-3-i686 * prepare for rebuild / bump party ;) * added 2 patches to update CHOST, * first one updates configure.ac second patch is * adding an workaround for peoples are running stable * but uses current chroot ( eg: build servers mostly ) * moved the gcc hack from utils.sh to makepkg diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 63dbea0..4dec62a 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -6,11 +6,11 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 pkgver=3.6.8 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=2 +pkgrel=3 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) -depends=('libarchive>=2.0.27' 'glibc>=2.7') +depends=('libarchive>=2.0.27' 'glibc>=2.7' 'grep' 'util-linux-ng') makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \ 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') @@ -21,8 +21,11 @@ _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then source=($url/releases/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch) - signatures=("$source.asc" '') + http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch \ + makepkg-move-strict-aliasing-hack-here.patch \ + pacman-g2-CHOST-1.patch \ + pacman-g2-CHOST-2.patch) + signatures=("$source.asc" '' '' '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" diff --git a/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch b/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch new file mode 100644 index 0000000..02bbeaa --- /dev/null +++ b/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch @@ -0,0 +1,35 @@ +From b109f0c78f46a2d54af529ceb71c69a1476b24ec Mon Sep 17 00:00:00 2001 +From: crazy +Date: Fri, 7 Mar 2008 22:54:32 +0100 +Subject: [PATCH] makepkg: move strict-aliasing hack here + * while we still need -fno-strict-aliasing + * moved the hack from util.sh ( where it never worked ) + * to here. We can't do that from util.sh because + * makepkg.conf is sourced after util.sh so the *FLAGS are lost + +--- + scripts/makepkg | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index 5333002..a84c3ab 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -114,6 +114,14 @@ Fextract() { + # makepkg configuration + [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf + ++# we need -fno-strict-aliasing for gcc 4.2*++ ++_gccver=`type -p gcc >/dev/null && gcc -dumpversion` ++if [ "${_gccver%%.?}" == "4.3" ]; then ++ export CFLAGS="$CFLAGS -fno-strict-aliasing" ++ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" ++fi ++ ++ + INFAKEROOT= + if [ "$1" = "-F" ]; then + INFAKEROOT=1 +-- +1.5.4.3 + diff --git a/source/base/pacman-g2/pacman-g2-CHOST-1.patch b/source/base/pacman-g2/pacman-g2-CHOST-1.patch new file mode 100644 index 0000000..4435268 --- /dev/null +++ b/source/base/pacman-g2/pacman-g2-CHOST-1.patch @@ -0,0 +1,72 @@ +From d60831f10df7969ca4bc5d3aade7be99a9caa949 Mon Sep 17 00:00:00 2001 +From: crazy +Date: Fri, 7 Mar 2008 23:03:57 +0100 +Subject: [PATCH] configure.ac + * prepare for bump party ;) + * changed CHOST to ${CARCH}-frugalware-linux + +--- + configure.ac | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ac2d49b..936dde1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,7 @@ case "$host" in + CARCH="i686" + CARCHFLAGS="i686" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture]) +@@ -104,7 +104,7 @@ case "$host" in + CARCH="x86_64" + CARCHFLAGS="k8" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture]) +@@ -112,7 +112,7 @@ case "$host" in + CARCH="ia64" + CARCHFLAGS="ia64" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture]) +@@ -120,7 +120,7 @@ case "$host" in + CARCH="sparc" + CARCHFLAGS="v9" + MARCHFLAG="mcpu" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + ppc-* | powerpc-*) + AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture]) +@@ -129,7 +129,7 @@ case "$host" in + CARCH="ppc" + CARCHFLAGS="750" + MARCHFLAG="mcpu" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture]) + AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture]) +@@ -137,7 +137,7 @@ case "$host" in + CARCH="i386" + CARCHFLAGS="i386" + MARCHFLAG="march" +- CHOST="${host}" ++ CHOST="${CARCH}-frugalware-linux" + ;; + *) + AC_MSG_ERROR([Your architecture is not supported]) +-- +1.5.4.3 + diff --git a/source/base/pacman-g2/pacman-g2-CHOST-2.patch b/source/base/pacman-g2/pacman-g2-CHOST-2.patch new file mode 100644 index 0000000..e98968b --- /dev/null +++ b/source/base/pacman-g2/pacman-g2-CHOST-2.patch @@ -0,0 +1,18 @@ +diff --git a/scripts/makepkg b/scripts/makepkg +index a84c3ab..23d4924 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -114,6 +114,13 @@ Fextract() { + # makepkg configuration + [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf + ++## both are hacks , remove after 0.9 and move to makepkg.conf ++ ++if `$ECHO $CHOST|grep -q linux-gnu`; then ++ unset CHOST ++ export CHOST="`arch`-frugalware-linux" ++fi ++ + # we need -fno-strict-aliasing for gcc 4.2*++ + _gccver=`type -p gcc >/dev/null && gcc -dumpversion` + if [ "${_gccver%%.?}" == "4.3" ]; then diff --git a/source/base/pacman-g2/pacman-g2.install b/source/base/pacman-g2/pacman-g2.install index 6d2a8df..ee32082 100644 --- a/source/base/pacman-g2/pacman-g2.install +++ b/source/base/pacman-g2/pacman-g2.install @@ -28,6 +28,17 @@ post_upgrade() mv /var/lib/pacman{,-g2} ln -s pacman-g2 /var/lib/pacman fi + + ## sed in makepkg.* to cover conf.xxx files + PARCH=`arch` + if grep -q linux-gnu /etc/makepkg.conf*; then + if [ "$PARCH" = "i686" ]; then + sed -i -e 's/i686-pc-linux-gnu/i686-frugalware-linux/g' /etc/makepkg.conf* + else + sed -i -e 's/x86_64-unknown-linux-gnu/x86_64-frugalware-linux/g' /etc/makepkg.conf* + fi + ## yeah I know ppc but .. + fi } op=$1 From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:13 2008 Subject: [Frugalware-git] frugalware-current: binutils-2.18.50.0.4-1-i686 Message-ID: <20080313230608.381921190202@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7635c802ce09e8c76c6428a5f1bb5b53924d72a commit b7635c802ce09e8c76c6428a5f1bb5b53924d72a Author: crazy Date: Sat Mar 8 14:24:29 2008 +0100 binutils-2.18.50.0.4-1-i686 * Version bump * added "pacman-g2>=3.6.8-3" to depends * build with --build=$CARCH-frugalware-linux diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild index e0f2064..4655017 100644 --- a/source/devel/binutils/FrugalBuild +++ b/source/devel/binutils/FrugalBuild @@ -2,27 +2,30 @@ # Maintainer: VMiklos pkgname=binutils -pkgver=2.18.50.0.3 +pkgver=2.18.50.0.4 pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files" url="http://www.gnu.org/software/binutils/" -depends=('bash' 'glibc>=2.6-2') +depends=('bash' 'glibc>=2.6-2' 'pacman-g2>=3.6.8-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') # for now, we need a devel version to utilize glibc-2.7 -up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.3/'" +up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.4/'" #Fup2gnubz2 source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2) #source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2) #signatures=($source.sig) -sha1sums=('7c89bd6cf6eaa13a374e22cf4ba8a598aa251825') +sha1sums=('26167b7de585ccef184b045b232606cf89894d86') build() { Fcd Fpatchall autoconf || Fdie - Fmake --enable-shared --disable-werror + Fmake \ + --enable-shared \ + --disable-werror \ + --build=$CARCH-frugalware-linux Fmakeinstall if [ "$CARCH" == "x86_64" ]; then cd libiberty || Fdie From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:15 2008 Subject: [Frugalware-git] frugalware-current: glibc-2.7-2-i686 Message-ID: <20080313230608.764DC1190215@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f4dc5828dd34e992041d926deaec230e3fc51d3 commit 9f4dc5828dd34e992041d926deaec230e3fc51d3 Author: crazy Date: Sat Mar 8 18:41:37 2008 +0100 glibc-2.7-2-i686 * rebuild * added an small patch to fix the build with new gcc and binutils * added binutils and gcc to depends for this relbump diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index e49b118..7ae5d06 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -3,17 +3,18 @@ pkgname=glibc pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" -depends=() +depends=('binutils>=2.18.50.0.4' 'gcc>=4.3.0') rodepends=('tzdata') makedepends=('grep>=2.5.3-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz -source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2) -signatures=("$source.sig") +source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 \ + glibc-2.7-fnstsw.diff) +signatures=("$source.sig" '') ## XEN disabled for 0.7 #if [ "$CARCH" == "i686" ]; then @@ -34,10 +35,20 @@ _build() rm -rf ../glibc-build || Fdie mkdir ../glibc-build || Fdie cd ../glibc-build || Fdie - ../glibc-$pkgver/configure --prefix=/usr --with-tls --with-__thread \ - --enable-add-ons=nptl --enable-kernel=2.6.0 --without-cvs \ - --without-selinux --enable-shared --enable-bind-now \ - --enable-static --enable-all-warnings || Fdie + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CXX="g++" CC="gcc" \ + ../glibc-$pkgver/configure \ + --prefix=/usr \ + --with-tls \ + --with-__thread \ + --enable-add-ons=nptl \ + --enable-kernel=2.6.0 \ + --without-cvs \ + --without-selinux \ + --enable-shared \ + --enable-bind-now \ + --enable-static \ + --enable-all-warnings \ + --build=$CARCH-frugalware-linux || Fdie make || Fdie diff --git a/source/base/glibc/glibc-2.7-fnstsw.diff b/source/base/glibc/glibc-2.7-fnstsw.diff new file mode 100644 index 0000000..93b706b --- /dev/null +++ b/source/base/glibc/glibc-2.7-fnstsw.diff @@ -0,0 +1,17 @@ +--- + sysdeps/i386/fpu/ftestexcept.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: glibc-2.7/sysdeps/i386/fpu/ftestexcept.c +=================================================================== +--- glibc-2.7.orig/sysdeps/i386/fpu/ftestexcept.c 2004-03-05 11:14:48.000000000 +0100 ++++ glibc-2.7/sysdeps/i386/fpu/ftestexcept.c 2008-01-18 14:02:19.000000000 +0100 +@@ -26,7 +26,7 @@ + int + fetestexcept (int excepts) + { +- int temp; ++ unsigned short temp; + int xtemp = 0; + + /* Get current exceptions. */ From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:16 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-1-x86_64 Message-ID: <20080313230608.8511C119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7ea86af3815895ccc073d9cc071766e95605bd6 commit a7ea86af3815895ccc073d9cc071766e95605bd6 Author: crazy Date: Sat Mar 8 20:23:29 2008 +0100 gcc-4.3.0-1-x86_64 * multilib crap is broken again * lets see if that helps to fix it diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 0826e95..cf86fd4 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -95,7 +95,9 @@ build() --with-system-zlib \ --libdir=/usr/lib \ --disable-multilib \ + --enable-multilib=no \ --disable-libjava-multilib \ + --enable-libjava-multilib=no \ --enable-target-optspace \ --enable-bootstrap \ --with-bugurl="http://bugs.frugalware.org/" \ From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:21 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-2-i686 Message-ID: <20080313230608.8FCD011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ca07e811835d1760dc6464ffa1deed7e195bcd4 commit 9ca07e811835d1760dc6464ffa1deed7e195bcd4 Author: crazy Date: Sat Mar 8 21:14:42 2008 +0100 gcc-4.3.0-2-i686 * rebuild with glibc diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index cf86fd4..0068ddc 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gcc pkgver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" -depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc' 'mpfr') +depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc>=2.7-2' 'mpfr') makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ - 'glibc>=2.6.1-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ + 'glibc>=2.7-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ 'libxdamage' 'alsa-lib' 'pacman-g2>=3.6.8-3') provides=('c-compiler') groups=('devel' 'devel-core') From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:22 2008 Subject: [Frugalware-git] frugalware-current: binutils-2.18.50.0.4-2-i686 Message-ID: <20080313230608.9A41E11904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e766b64094ee25d99ee0ea08194a9687c18e9e5d commit e766b64094ee25d99ee0ea08194a9687c18e9e5d Author: crazy Date: Sat Mar 8 21:56:09 2008 +0100 binutils-2.18.50.0.4-2-i686 * rebuild with gcc and glibc diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild index 4655017..05a090e 100644 --- a/source/devel/binutils/FrugalBuild +++ b/source/devel/binutils/FrugalBuild @@ -3,10 +3,11 @@ pkgname=binutils pkgver=2.18.50.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files" url="http://www.gnu.org/software/binutils/" -depends=('bash' 'glibc>=2.6-2' 'pacman-g2>=3.6.8-3') +depends=('bash' 'glibc>=2.7-2') +makedepends=('gcc>=4.3.0-2' 'pacman-g2>=3.6.8-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') # for now, we need a devel version to utilize glibc-2.7 From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:24 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-1-i686 Message-ID: <20080313230608.5B65A1190203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e06e3651206bc30396b50edb7730523679befd02 commit e06e3651206bc30396b50edb7730523679befd02 Author: crazy Date: Sat Mar 8 16:21:09 2008 +0100 gcc-4.3.0-1-i686 * Version bump * a lot java changes * depends / makedepends fixes * build with --build=$CARCH-frugalware-linux , --with-bugurl * and --with-pkgversion diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 8a2932e..0826e95 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -2,21 +2,27 @@ # Maintainer: VMiklos pkgname=gcc -pkgver=4.2.3 +pkgver=4.3.0 pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" -depends=('binutils>=2.18.50.0.3' 'libstdc++') -makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' 'glibc>=2.6.1-2') +depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc' 'mpfr') +makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ + 'glibc>=2.6.1-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ + 'libxdamage' 'alsa-lib' 'pacman-g2>=3.6.8-3') provides=('c-compiler') groups=('devel' 'devel-core') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" -source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ +#source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ +source=(ftp://ftp.gwdg.de/pub/misc/gcc/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 \ ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2 \ README.Frugalware) -signatures=("$source.sig" '' '') +#signatures=("$source.sig" '' '') +sha1sums=('d6ae7f024b99ba9b85f253fdeb00a9a1d6f1fc8d' \ + 'd3c9af69bb788334a67039bbe056606e8590a8a7' \ + '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ @@ -32,12 +38,22 @@ subdescs=('GCC shared support library' 'GNU Standard C++ Library' \ 'Treelang support for GCC' \ 'FFI libraries from GCC' 'SSP libraries from GCC' \ 'GNU OpenMP runtime library') -subdepends=('glibc' 'libgcc' \ - 'libgcc' "gcc=$pkgver libgnat" \ - 'glibc' "gcc=$pkgver mpfr libgfortran" \ - 'libgcc zip' 'libgcj gtk+2 libart_lgpl libxtst' "gcc=$pkgver libgcj" \ - 'libgcc' "gcc=$pkgver libobjc" "gcc=$pkgver libobjc" \ - "gcc=$pkgver" "glibc" "glibc" "glibc") +subdepends=('glibc' \ + 'libgcc' \ + 'libgcc' \ + "glibc mpfr" \ + 'glibc' \ + "glibc mpfr" \ + 'libgcc zlib alsa-lib' \ + 'libgcj libart_lgpl gtk+2 libxml2 freetype2 libice libxtst libxau libxdmcp libxdamage libstdc++' \ + "libgcj zlib libgcj mpfr" \ + 'libgcc' \ + "glibc mpfr" \ + "glibc mpfr" \ + "glibc mpfr" \ + "glibc" \ + "glibc" \ + "glibc") subbackup=('' '' '' '' '' '' "usr/lib/gcj-$pkgver/classmap.db" '' '' '' '' '' '' '' '' '') subgroups=('base chroot-core' 'base chroot-core' \ 'lib-extra' 'devel-extra' \ @@ -72,6 +88,8 @@ build() --enable-threads=posix \ --enable-__cxa_atexit \ --enable-java-awt=gtk \ + --with-ecj \ + --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \ --enable-gtk-cairo \ --enable-plugin \ --with-system-zlib \ @@ -79,10 +97,20 @@ build() --disable-multilib \ --disable-libjava-multilib \ --enable-target-optspace \ - --enable-bootstrap + --enable-bootstrap \ + --with-bugurl="http://bugs.frugalware.org/" \ + --with-pkgversion="Frugalware Linux" \ + --enable-linux-futex \ + --disable-dependency-tracking \ + --enable-libstdcxx-allocator=new \ + --enable-hash-synchronization \ + --disable-libstdcxx-pch \ + --build=$CARCH-frugalware-linux + + ## libstdcxx-pch is really a waste of space , nothing need nor uses that make STAGE_CC_WRAPPER="$FCC" BOOT_CFLAGS="$CFLAGS" GCJFLAGS="$CFLAGS" bootstrap || return 1 - + unset MAKEFLAGS #this is needed by libffi Fmakeinstall @@ -140,12 +168,42 @@ build() # libstdc++ Fsplit libstdc++ usr/lib/libstdc++.* Fsplit libstdc++ usr/man/man3/ + ## always do this java stuff before gnat because gnat splits with gnat* + ## and we got now 'gnat'ive2ascii which is java stuff ;) + ## NOTE: old gcj-${pkgver} is now gcj-${pkgver}-xx + gcjpkgver=$(basename $Fdestdir/usr/lib/gcj-${pkgver}*) + # libgcj-awt + Fsplit libgcj-awt usr/lib/gcc/$CHOST/$pkgver/include/jawt*.h + Fsplit libgcj-awt usr/lib/${gcjpkgver}/lib{jawt,gcjwebplugin,gtkpeer}.* + Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/awt + Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/java/awt + Fsplit libgcj-awt usr/include/c++/$pkgver/java/awt + Fsplit libgcj-awt usr/include/c++/$pkgver/sun/awt + # libgcj + ## org , sun are libgcj incldes also + Fsplit libgcj usr/include/c++/$pkgver/[gjos]* + Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc + ## maybe we should add some libgcj-tools or libgcj-utils package ? - crazy - + Fsplit libgcj usr/bin/{jv-convert,gij,gjar,grmi*,gcj-dbtool,gorbd,gappletviewer,gjarsigner,gkeytool,addr2name.awk} + Fsplit libgcj usr/bin/{gtnameserv,gnative2ascii,gserialver,gc-analyze} + Fsplit libgcj usr/man/man1/{gjarsigner,gkeytool,gjar,jv-convert,gij,grmi*,gorbd,gcj-dbtool,gtnameserv}.1* + Fsplit libgcj usr/man/man1/{gnative2ascii,gserialver,gappletviewer,gc-analyze}.1* + Fsplit libgcj usr/lib/libgcj* + Fsplit libgcj usr/lib/libgij* + Fsplit libgcj usr/share/java + Fsplit libgcj usr/lib/security + Fsplit libgcj usr/lib/logging.properties + Fsplit libgcj usr/lib/${gcjpkgver} + # gcc-gcj + Fsplit gcc-gcj usr/bin/{gcj,$CHOST-gcj,gcjh,gjavah,jcf-dump} + Fsplit gcc-gcj usr/man/man1/{gcj,gcjh,gjavah,jcf-dump}.1* + Fsplit gcc-gcj usr/info/gcj* + Fsplit gcc-gcj usr/libexec/gcc/$CHOST/$pkgver/{jc1,jvgenmain,ecj1} # libgnat Fsplit libgnat usr/lib/libgnat*.so Fsplit libgnat usr/lib/libgnarl*.so # gcc-gnat Fsplit gcc-gnat usr/bin/gnat* - Fsplit gcc-gnat usr/bin/gpr* Fsplit gcc-gnat usr/info/gnat* Fsplit gcc-gnat usr/lib/gcc/$CHOST/$pkgver/adainclude Fsplit gcc-gnat usr/lib/gcc/$CHOST/$pkgver/adalib @@ -157,28 +215,6 @@ build() Fsplit gcc-gfortran usr/man/man1/gfortran.1* Fsplit gcc-gfortran usr/info/gfortran* Fsplit gcc-gfortran usr/libexec/gcc/$CHOST/$pkgver/f951 - # libgcj-awt - Fsplit libgcj-awt usr/lib/gcc/$CHOST/$pkgver/include/jawt*.h - Fsplit libgcj-awt usr/lib/gcj-$pkgver/lib{jawt,gcjwebplugin,gtkpeer}.* - Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/awt - Fsplit libgcj-awt usr/include/c++/$pkgver/gnu/java/awt - Fsplit libgcj-awt usr/include/c++/$pkgver/java/awt - # libgcj - Fsplit libgcj usr/include/c++/$pkgver/[gj]* - Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc - Fsplit libgcj usr/bin/{jv-convert,gij,jar,grmic,grmiregistry,gcj-dbtool,gappletviewer,gjarsigner,gkeytool} - Fsplit libgcj usr/man/man1/{jv-convert,gij,grmic,grmiregistry,gcj-dbtool}.1* - Fsplit libgcj usr/lib/libgcj* - Fsplit libgcj usr/lib/libgij* - Fsplit libgcj usr/share/java - Fsplit libgcj usr/lib/security - Fsplit libgcj usr/lib/logging.properties - Fsplit libgcj usr/lib/gcj-$pkgver - # gcc-gcj - Fsplit gcc-gcj usr/bin/{gcj,$CHOST-gcj,gcjh,$CHOST-gcjh,gjnih,jcf-dump,jv-scan} - Fsplit gcc-gcj usr/man/man1/{gcj,gcjh,gjnih,jcf-dump,jv-scan}.1* - Fsplit gcc-gcj usr/info/gcj* - Fsplit gcc-gcj usr/libexec/gcc/$CHOST/$pkgver/{jc1,jvgenmain} # libobjc Fsplit libobjc usr/lib/libobjc* # gcc-objc From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:25 2008 Subject: [Frugalware-git] frugalware-current: glibc-2.7-3-i686 Message-ID: <20080313230608.A971911904CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4495af73c1d1f433f2f36f60916997fdad5de8bb commit 4495af73c1d1f433f2f36f60916997fdad5de8bb Author: crazy Date: Sat Mar 8 22:35:24 2008 +0100 glibc-2.7-3-i686 * rebuild with gcc , binutils * moved things back to makedepends diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 7ae5d06..4f49f94 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=glibc pkgver=2.7 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" -depends=('binutils>=2.18.50.0.4' 'gcc>=4.3.0') +depends=() +makedepends=('binutils>=2.18.50.0.4-2' 'gcc>=4.3.0-2' 'grep>=2.5.3-2') rodepends=('tzdata') -makedepends=('grep>=2.5.3-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:27 2008 Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.77-1-i686 Message-ID: <20080313230608.B399F11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d5984119655ec6ac77b070af59f08f4ebfd1cfd commit 3d5984119655ec6ac77b070af59f08f4ebfd1cfd Author: crazy Date: Sun Mar 9 00:55:49 2008 +0100 java-gcj-compat-1.0.77-1-i686 * Version bump * build for gcj 4.3.0 * I ( yes me 'when-I-see-java-I-usually-run-away-crazy ;) ) * hope I didn't broke anything =) diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index bdade82..fcc5be6 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -2,38 +2,30 @@ # Maintainer: VMiklos pkgname=java-gcj-compat -pkgver=1.0.72 -pkgrel=8 -gccver=4.2.3 +pkgver=1.0.77 +pkgrel=1 +gccver=4.3.0 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" depends=("libgcj=$gccver" 'gjdoc') -makedepends=('gcc-gcj' 'ecj') +makedepends=('gcc-gcj=$gccver' 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://sources.redhat.com/pub/rhug/java-gcj-compat-$pkgver.tar.gz \ - java-gcj.sh) -sha1sums=('4f5267544927e1826facbd988ecb4992dde43f76'\ - '73c1f3cc2db4f63cb051e65f0c664358289e9f13') - -# yes, there is a newer version. to bump it, we have to patch gcc: -# http://gcc.gnu.org/ml/java-patches/2007-q1/msg00656.html -# and here are some infos about what new options gcc will need: -# http://gcc.gnu.org/ml/java-patches/2007-q1/msg00658.html -# a simple check is to -# ls libjava/classpath/tools/classes/com/sun/javadoc/SourcePosition.class -# if that file exists, then we can bump this pkg + java-gcj.sh symlink-gjar-fastjar-is-gone-since-gcc4.2.patch) +sha1sums=('07b4058ed0a254462d5196fee91e660d434f84ec' \ + '73c1f3cc2db4f63cb051e65f0c664358289e9f13' \ + 'f3cd78dde7169bfe841943ae508f5a073e2fc4e7') build() { - Fsed 'libgcj-tools' 'libgcj' Makefile.am - Fsed '4.1.2' $gccver Makefile.am - Fsed 'fastjar' 'jar' configure.ac Makefile.am + Fcd + Fpatchall Fautoreconf - Fbuild - Fln jvm/java-$javaver/lib/tools.jar /usr/lib/ + Fconf + Fmakeinstall Fexe /etc/profile.d/java-gcj.sh echo 'if [ -z "$CLASSPATH" ]; then' >>$Fdestdir/etc/profile.d/java-gcj.sh echo " export CLASSPATH=/usr/share/java/libgcj-$gccver.jar" >>$Fdestdir/etc/profile.d/java-gcj.sh @@ -42,10 +34,9 @@ build() >>$Fdestdir/etc/profile.d/java-gcj.sh echo "fi" >>$Fdestdir/etc/profile.d/java-gcj.sh Fln /usr/bin/gjdoc /usr/lib/jvm/java-$javaver/bin/javadoc - # gcc-4.2.0, no more fastjar - Frm /usr/bin/jar # openoffice.org wants this - Fln gcj-$gccver/libjawt.so /usr/lib + gcjver=$(basename /usr/lib/gcj-${gccver}*) + Fln gcj-$gcjver/libjawt.so /usr/lib } # optimization OK diff --git a/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch b/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch new file mode 100644 index 0000000..7f18ebf --- /dev/null +++ b/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch @@ -0,0 +1,12 @@ +diff -Naur java-gcj-compat-1.0.77/Makefile.am java-gcj-compat-1.0.77-p/Makefile.am +--- java-gcj-compat-1.0.77/Makefile.am 2007-06-26 21:51:19.000000000 +0200 ++++ java-gcj-compat-1.0.77-p/Makefile.am 2008-03-08 20:43:21.000000000 +0100 +@@ -17,7 +17,7 @@ + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS) + ln -sf ../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/java + ln -sf ../../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(JRE_BIN_DIR)/java +- ln -sf ../../../../bin/fastjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar ++ ln -sf ../../../../bin/gjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar + ln -sf ../../../../bin/sinjdoc $(DESTDIR)$(SDK_BIN_DIR)/javadoc + ln -sf ../../../../bin/grmic$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/rmic + ln -sf ../../../../bin/gjavah$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/javah From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:29 2008 Subject: [Frugalware-git] frugalware-current: ccache-2.4-7-i686 Message-ID: <20080313230608.BC45B11904D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7fda03b115367bbd31bd0b04fc3f48ead427d2d commit d7fda03b115367bbd31bd0b04fc3f48ead427d2d Author: crazy Date: Sun Mar 9 01:29:26 2008 +0100 ccache-2.4-7-i686 * rebuild * fixed symlink bug * added missing Fdie diff --git a/source/devel/ccache/FrugalBuild b/source/devel/ccache/FrugalBuild index 2a97dc3..5dccf93 100644 --- a/source/devel/ccache/FrugalBuild +++ b/source/devel/ccache/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ccache pkgver=2.4 -pkgrel=6 +pkgrel=7 pkgdesc="A fast compiler cache" url="http://ccache.samba.org" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep 'The latest release' | sed -e 's/.*ccache \(.*\)\..*/\1/'" @@ -18,11 +18,11 @@ sha1sums=('9833ec13de9b90d5409e60d679ac681115ef465e' \ build() { Fbuild Fmkdir /usr/lib/ccache/bin - for i in {$CARCH-pc-linux-gnu-,}{cc,c++,gcc,g++} + for i in {$CHOST-,}{cc,c++,gcc,g++} do Fln /usr/bin/ccache /usr/lib/ccache/bin/$i done - install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ + install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ || Fdie Fdoc README.Frugalware } From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:32 2008 Subject: [Frugalware-git] frugalware-current: gmp-4.2.2-2-i686 Message-ID: <20080313230608.DF69C1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18a59da4c3126a8c166287febd5ee5c309070335 commit 18a59da4c3126a8c166287febd5ee5c309070335 Author: crazy Date: Sun Mar 9 02:54:15 2008 +0100 gmp-4.2.2-2-i686 * release bump * added devel-core to groups * ( groups was twice in FB so one gone ) * added an patch to fix the build with gcc43 ( it needs cstdio ) * we need force the CHOST for this package * we also need to autoreconf , auto* is broken diff --git a/source/lib/gmp/FrugalBuild b/source/lib/gmp/FrugalBuild index 61081ba..a35f61c 100644 --- a/source/lib/gmp/FrugalBuild +++ b/source/lib/gmp/FrugalBuild @@ -4,26 +4,31 @@ pkgname=gmp pkgver=4.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNU multiple precision arithmetic library" url="http://swox.com/gmp/" -groups=('lib') archs=('i686' 'x86_64') -depends=('libstdc++') +depends=('libstdc++>=4.3.0-2') +makedepends=('libgcj') Fup2gnubz2 -groups=('lib') -source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2) +groups=('lib' 'devel-core') +source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 gcc43.patch) Finclude texinfo -signatures=($source.sig) +signatures=($source.sig '') build() { [ "$CARCH" == "i686" ] && export MPN_PATH="x86 generic" [ "$CARCH" == "x86_64" ] && export MPN_PATH="x86_64 generic" - Fbuild --enable-cxx \ + Fcd + Fpatchall + Fautoreconf + Fconf --enable-cxx \ --disable-static \ - --with-gnu-ld + --build=$CHOST Fmessage "Running make check" + make || Fdie + Fmakeinstall make check || Fdie } diff --git a/source/lib/gmp/gcc43.patch b/source/lib/gmp/gcc43.patch new file mode 100644 index 0000000..6f94c0d --- /dev/null +++ b/source/lib/gmp/gcc43.patch @@ -0,0 +1,9 @@ +diff -up gmp-4.2.2/gmp-h.in.pom gmp-4.2.2/gmp-h.in +--- gmp-4.2.2/gmp-h.in.pom 2007-09-03 18:05:40.000000000 +0200 ++++ gmp-4.2.2/gmp-h.in 2008-02-13 09:53:48.000000000 +0100 +@@ -22,6 +22,7 @@ along with the GNU MP Library. If not, + + #if defined (__cplusplus) + #include /* for std::istream, std::ostream, std::string */ ++#include + #endif From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:35 2008 Subject: [Frugalware-git] frugalware-current: mpfr-2.3.1-2-i686 Message-ID: <20080313230608.E958211904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac9759025dfcafa35f33857c66016ab9fdf64b16 commit ac9759025dfcafa35f33857c66016ab9fdf64b16 Author: crazy Date: Sun Mar 9 03:03:12 2008 +0100 mpfr-2.3.1-2-i686 * rebuild * added devel-core to groups diff --git a/source/lib/mpfr/FrugalBuild b/source/lib/mpfr/FrugalBuild index 5aa36b6..9dede71 100644 --- a/source/lib/mpfr/FrugalBuild +++ b/source/lib/mpfr/FrugalBuild @@ -9,11 +9,11 @@ if [ -n "$patchver" ]; then else pkgver=${basever} fi -pkgrel=1 +pkgrel=2 pkgdesc="Library for multiple-precision floating-point computations." url="http://www.mpfr.org/mpfr-current/" -depends=('gmp') -groups=('lib') +depends=('gmp>=4.2.2-2') +groups=('lib' 'devel-core') archs=('i686' 'x86_64') up2date="echo \$(lynx -dump $url |grep version|sed 's/.*n \(.*\) (.*/\1/;q')_\$(lynx -source -dump $url |grep 'patch[0-9]\{2\}'|sed -n 's/.*patch\([0-9]\{2\}\).*/\1/;$ p')|sed 's/_$//'" source=(http://www.mpfr.org/mpfr-current/mpfr-$basever.tar.bz2) From crazy at frugalware.org Fri Mar 14 00:06:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:36 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-2-i686 Message-ID: <20080313230609.0076511904D4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6088e3e6dfdc25e148875932f7bf44cb1fda8f07 commit 6088e3e6dfdc25e148875932f7bf44cb1fda8f07 Author: crazy Date: Sun Mar 9 03:06:47 2008 +0100 gcc-4.3.0-2-i686 * fixed splitting bug * not yet rebuild diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 0068ddc..e341e8c 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -183,7 +183,8 @@ build() Fsplit libgcj-awt usr/include/c++/$pkgver/sun/awt # libgcj ## org , sun are libgcj incldes also - Fsplit libgcj usr/include/c++/$pkgver/[gjos]* + Fsplit libgcj usr/include/c++/$pkgver/[gj]* + Fsplit libgcj usr/include/c++/$pkgver/{sun,org} Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc ## maybe we should add some libgcj-tools or libgcj-utils package ? - crazy - Fsplit libgcj usr/bin/{jv-convert,gij,gjar,grmi*,gcj-dbtool,gorbd,gappletviewer,gjarsigner,gkeytool,addr2name.awk} From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:38 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-2-i686 Message-ID: <20080313230609.0B12211904D5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b45c79d79d0a0cfde370a7354a2f75b10f9b2c95 commit b45c79d79d0a0cfde370a7354a2f75b10f9b2c95 Author: crazy Date: Sun Mar 9 15:36:14 2008 +0100 gcc-4.3.0-2-i686 * fix 64bit multilib crap * added an extra check to move the libs if * they still install in lib64 for some reason diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index e341e8c..df8419a 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -68,7 +68,7 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' build() { - Fsed '../lib64 ../lib' '. ../lib' gcc/config/i386/t-linux64 + Fsed 'lib64' 'lib' gcc/config/i386/t-linux64 # no fixincludes, thanks Fsed '\./fixinc\.sh' '-c true' gcc/Makefile.in # fix for newer xulrunner @@ -115,6 +115,12 @@ build() unset MAKEFLAGS #this is needed by libffi Fmakeinstall + + if [ -d $Fdestdir/usr/lib64 ]; then + Fmessage "Killing multilib CRAP!" + mv -f $Fdestdir/usr/lib64/* $Fdestdir/usr/lib/ || Fdie + rm -rf $Fdestdir/usr/lib64 || Fdie + fi # fix some junk in la files for lafile in `find $Fdestdir -name "*.la"` From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:39 2008 Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.77-1-x86_64 Message-ID: <20080313230609.16ED91190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1005cf76569d679d2212d2cd554ad09ec82017a1 commit 1005cf76569d679d2212d2cd554ad09ec82017a1 Author: crazy Date: Sun Mar 9 20:44:24 2008 +0100 java-gcj-compat-1.0.77-1-x86_64 * fix typo in makedepends diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index fcc5be6..6f0e913 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -9,7 +9,7 @@ javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" depends=("libgcj=$gccver" 'gjdoc') -makedepends=('gcc-gcj=$gccver' 'ecj') +makedepends=("gcc-gcj=$gccver" 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:41 2008 Subject: [Frugalware-git] frugalware-current: db-4.6.21-2-i686 Message-ID: <20080313230609.322DE1190202@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=971d69970177ca94aef77b29da3b387d788fb551 commit 971d69970177ca94aef77b29da3b387d788fb551 Author: crazy Date: Sun Mar 9 21:34:17 2008 +0100 db-4.6.21-2-i686 * rebuild * removed the java part from FrugalBuild * added missing Fdie's diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild index 4a7c34e..577b7c7 100644 --- a/source/base/db/FrugalBuild +++ b/source/base/db/FrugalBuild @@ -3,25 +3,16 @@ pkgname=db pkgver=4.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="The Berkeley DB embedded database system" url="http://www.sleepycat.com" -# maybe later we can enable java for i686 & x86_64 -ENABLE_JAVA=${ENABLE_JAVA:-0} -if [ "$ENABLE_JAVA" = "1" ]; then - Finclude java - makedepends=(${makedepends[@]} 'java-gcj-compat') -fi -depends=('libstdc++') +depends=('libstdc++>=4.3.0-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.oracle.com/technology/software/products/berkeley-db/index.html|grep '\]Berkeley DB'|sed 's/.*DB \([^ ]*\) .*/\1/;q'" -source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz \ - db-4.5.20-java-gcj.patch) -sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \ - 'c8063bb1e85f0a8d4ed420d43f2e165e6ba625fe') +source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz) +sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119') [ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --with-mutex=x86/gcc-assembly" -[ "$ENABLE_JAVA" = "1" ] && Fconfopts="$Fconfopts --enable-java" ### # NOTE! Every time you bump this package, perl-berkeleydb needs bumping, too! @@ -29,31 +20,20 @@ sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \ build() { - Fpatchall - cd build_unix + + Fcd + cd build_unix || Fdie ../dist/configure $Fconfopts --enable-compat185 \ - --enable-shared --enable-static --enable-cxx + --enable-shared --enable-static --enable-cxx || Fdie make LIBSO_LIBS=-lpthread || return 1 Fmakeinstall - Fmkdir /usr/share/java - if [ "$ENABLE_JAVA" = "1" ]; then - Fmv /usr/lib/db.jar /usr/share/java/ - # FIXME: Fjar's -Wl,-Bsymbolic causes DatabaseConfig.DEFAULT to return null. - # Doing just the same thing without -Wl,-Bsymbolic works. - cmd="gcj $CFLAGS -fPIC -fjni -findirect-dispatch \ - -fno-strict-aliasing -shared -o $Fdestdir/usr/lib/libdb.jar.so \ - $Fdestdir/usr/share/java/db.jar -L$Fdestdir/usr/lib -ldb \ - -ldb_java" - echo $cmd - $cmd || return 1 - fi Fmkdir /usr/share/doc/$pkgname-$pkgver Fmv /usr/docs/* /usr/share/doc/$pkgname-$pkgver/ Frm /usr/docs/ - cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ + cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie } # optimization ok From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:42 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-3-i686 Message-ID: <20080313230609.294DD1190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=db8217585f7b9c9469e0016defa4d615ddc5444f commit db8217585f7b9c9469e0016defa4d615ddc5444f Author: crazy Date: Sun Mar 9 20:46:26 2008 +0100 gcc-4.3.0-3-i686 * release bump to fix the splitting bug * ( last one for today really :D ) diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index df8419a..4296981 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gcc pkgver=4.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" -depends=('binutils>=2.18.50.0.4' 'libstdc++' 'glibc>=2.7-2' 'mpfr') +depends=('binutils>=2.18.50.0.4-2' 'libstdc++' 'glibc>=2.7-3' 'mpfr>=2.3.1-2') makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ - 'glibc>=2.7-2' 'ecj' 'gpm' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ + 'ecj' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ 'libxdamage' 'alsa-lib' 'pacman-g2>=3.6.8-3') provides=('c-compiler') groups=('devel' 'devel-core') From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:43 2008 Subject: [Frugalware-git] frugalware-current: sed-4.1.5-2-i686 Message-ID: <20080313230609.3CD1E119053A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f95fb1cc5892d8cc4b8d8fc66a8a45b672a23fa commit 5f95fb1cc5892d8cc4b8d8fc66a8a45b672a23fa Author: crazy Date: Sun Mar 9 21:57:38 2008 +0100 sed-4.1.5-2-i686 * rebuild diff --git a/source/base/sed/FrugalBuild b/source/base/sed/FrugalBuild index db1ab8d..959be2f 100644 --- a/source/base/sed/FrugalBuild +++ b/source/base/sed/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sed pkgver=4.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="GNU version of sed, a stream editor" url="http://www.gnu.org/software/sed" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:06:46 2008 Subject: [Frugalware-git] frugalware-current: ncurses-5.6-3-i686 Message-ID: <20080313230609.46556119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a0248ac319df3b61e13a6ed5938c441b0b24be7 commit 0a0248ac319df3b61e13a6ed5938c441b0b24be7 Author: crazy Date: Sun Mar 9 22:06:39 2008 +0100 ncurses-5.6-3-i686 * rebuild diff --git a/source/base/ncurses/FrugalBuild b/source/base/ncurses/FrugalBuild index 744a999..1355975 100644 --- a/source/base/ncurses/FrugalBuild +++ b/source/base/ncurses/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ncurses pkgver=5.6 -pkgrel=2 +pkgrel=3 pkgdesc="A System V Release 4.0 curses emulation library" url="http://www.gnu.org/software/ncurses/ncurses.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:19 2008 Subject: [Frugalware-git] frugalware-current: pcre-7.6-2-i686 Message-ID: <20080313230609.CEBE11190543@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d57736583741a2f610f2ccf5213343ba4cf32cdd commit d57736583741a2f610f2ccf5213343ba4cf32cdd Author: crazy Date: Sun Mar 9 23:41:13 2008 +0100 pcre-7.6-2-i686 * rebuild diff --git a/source/base/pcre/FrugalBuild b/source/base/pcre/FrugalBuild index d9240fb..f1471c7 100644 --- a/source/base/pcre/FrugalBuild +++ b/source/base/pcre/FrugalBuild @@ -4,12 +4,12 @@ pkgname=pcre pkgver=7.6 -pkgrel=1 +pkgrel=2 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('libstdc++') +depends=('libstdc++>=4.3.0-3') up2date="lynx -dump ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/|grep '.tar.gz$'|sort -n -r|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --disable-static --enable-utf8" From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:20 2008 Subject: [Frugalware-git] frugalware-current: readline-5.2-2-i686 Message-ID: <20080313230609.50C6C119053C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=20f7834d58e03d1cf9b834ef15968cb934d322d3 commit 20f7834d58e03d1cf9b834ef15968cb934d322d3 Author: crazy Date: Sun Mar 9 22:11:38 2008 +0100 readline-5.2-2-i686 * rebuild * added --build= to Fconf * unset MAKEFLAGS before Fmakeinstall diff --git a/source/base/readline/FrugalBuild b/source/base/readline/FrugalBuild index 2f346ab..e2ec549 100644 --- a/source/base/readline/FrugalBuild +++ b/source/base/readline/FrugalBuild @@ -3,10 +3,10 @@ pkgname=readline pkgver=5.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" url="http://www.gnu.org/" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') backup=("etc/inputrc") @@ -16,10 +16,13 @@ source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz \ build() { - Fconf + + Fconf \ + --build=$CHOST make SHLIB_LIBS=-lncurses || return 1 + unset MAKEFLAGS Fmakeinstall Ffile /etc/inputrc chmod 755 $Fdestdir/usr/lib/libreadline.so.$pkgver \ From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:21 2008 Subject: [Frugalware-git] frugalware-current: util.sh Message-ID: <20080313230609.5C4D61190215@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=026c4c82ff6aa52d9d9cada8cf047701d39e08d1 commit 026c4c82ff6aa52d9d9cada8cf047701d39e08d1 Author: crazy Date: Sun Mar 9 22:51:43 2008 +0100 util.sh * added Fbuildchost , which is set to `arch`-frugalware-linux * and if we find --build= in configure we use it automatically * in $Fconfopts diff --git a/source/include/util.sh b/source/include/util.sh index ef8d898..9f59ba5 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -82,6 +82,7 @@ Fsysconfdir="/etc" Flocalstatedir="/var" Fmenudir="/usr/share/applications" Farchs=('i686' 'x86_64' 'ppc') +Fbuildchost="`arch`-frugalware-linux" Fconfopts="--prefix=$Fprefix" ## Move to makepkg.conf for Kalgan+1 export LDFLAGS="-Wl,--hash-style=both" @@ -501,6 +502,8 @@ Fconf() { Fconfopts="$Fconfopts --sysconfdir=$Fsysconfdir" grep -q localstatedir $_F_conf_configure && \ Fconfopts="$Fconfopts --localstatedir=$Flocalstatedir" + grep -q 'build=' $_F_conf_configure && \ + Fconfopts="$Fconfopts --build=$Fbuildchost" $_F_conf_configure $Fconfopts "$@" || Fdie elif [ -f Makefile.PL ]; then if [ -z "$_F_conf_perl_pipefrom" ]; then From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:22 2008 Subject: [Frugalware-git] frugalware-current: bash-3.2_033-2-i686 Message-ID: <20080313230609.65D7B119053D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ca9f28626a89195cb4ed4790cf3aa8f23e3a513 commit 4ca9f28626a89195cb4ed4790cf3aa8f23e3a513 Author: crazy Date: Sun Mar 9 23:01:27 2008 +0100 bash-3.2_033-2-i686 * rebuild diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild index 21e5a8c..37103e6 100644 --- a/source/base/bash/FrugalBuild +++ b/source/base/bash/FrugalBuild @@ -9,11 +9,11 @@ if [ -z "$patchver" ]; then else pkgver=${basever}_$patchver fi -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" url="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" backup=(etc/{profile,shells,skel/.bashrc}) -depends=('glibc' 'readline') +depends=('glibc>=2.7-3' 'readline>=5.2-2') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') up2date="echo \$(lynx -dump $url|grep current|sed -n -e 's/.*bash-\(.*\)\. .*$/\1/' -e '1 p')\$(lynx -dump ftp://ftp.cwru.edu/pub/bash/bash-$basever-patches|grep 'bash${basever//.}-[0-9]\{3\}'|sed -n 's/.*bash${basever//.}-\([0-9]\{3\}\).*/_\1/;$ p')" From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:23 2008 Subject: [Frugalware-git] frugalware-current: coreutils-6.10-3-i686 Message-ID: <20080313230609.76FF9119053E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68a1e7d25b35f836668ea5620fca9bea1b82859d commit 68a1e7d25b35f836668ea5620fca9bea1b82859d Author: crazy Date: Sun Mar 9 23:12:31 2008 +0100 coreutils-6.10-3-i686 * rebuild diff --git a/source/base/coreutils/FrugalBuild b/source/base/coreutils/FrugalBuild index 45c6399..baf12e5 100644 --- a/source/base/coreutils/FrugalBuild +++ b/source/base/coreutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=coreutils pkgver=6.10 -pkgrel=2 +pkgrel=3 pkgdesc="These are the GNU core utilities, the basic command line programs" url="http://www.gnu.org/software/coreutils" -depends=('bash' 'glibc') +depends=('bash' 'glibc>=2.7-3') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:24 2008 Subject: [Frugalware-git] frugalware-current: bzip2-1.0.4-2-i686 Message-ID: <20080313230609.88E1C119053F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bedc6043c7fd3465a8bf9c85dda43a95447e2690 commit bedc6043c7fd3465a8bf9c85dda43a95447e2690 Author: crazy Date: Sun Mar 9 23:14:15 2008 +0100 bzip2-1.0.4-2-i686 * rebuild diff --git a/source/base/bzip2/FrugalBuild b/source/base/bzip2/FrugalBuild index 31bb14c..df4af3c 100644 --- a/source/base/bzip2/FrugalBuild +++ b/source/base/bzip2/FrugalBuild @@ -3,10 +3,10 @@ pkgname=bzip2 pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A block-sorting file compressor" url="http://www.bzip.org/" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'chroot-core') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep current|sed 's/.*s \(.*\), .*/\1/'" From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:25 2008 Subject: [Frugalware-git] frugalware-current: diffutils-2.8.1-3-i686 Message-ID: <20080313230609.99902119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf9cc5906b244a3e36372274be684a95ef67265f commit bf9cc5906b244a3e36372274be684a95ef67265f Author: crazy Date: Sun Mar 9 23:17:28 2008 +0100 diffutils-2.8.1-3-i686 * rebuild diff --git a/source/base/diffutils/FrugalBuild b/source/base/diffutils/FrugalBuild index 3233713..b98bdab 100644 --- a/source/base/diffutils/FrugalBuild +++ b/source/base/diffutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=diffutils pkgver=2.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Utility programs used for creating patch files" url="http://www.gnu.org/software/diffutils" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:28 2008 Subject: [Frugalware-git] frugalware-current: findutils-4.3.9-2-i686 Message-ID: <20080313230609.A39561190540@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=670ae8d37bf463b460d78476f068c7e06e7f820a commit 670ae8d37bf463b460d78476f068c7e06e7f820a Author: crazy Date: Sun Mar 9 23:19:28 2008 +0100 findutils-4.3.9-2-i686 * rebuild diff --git a/source/base/findutils/FrugalBuild b/source/base/findutils/FrugalBuild index 159ed12..fe7ffdc 100644 --- a/source/base/findutils/FrugalBuild +++ b/source/base/findutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=findutils pkgver=4.3.9 -pkgrel=1 +pkgrel=2 pkgdesc="Basic directory searching utilities" url="http://www.gnu.org/software/findutils" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="wget --passive-ftp -O - -q ftp://alpha.gnu.org/pub/gnu/findutils/|grep 'findutils.*.tar.gz<'|tail -n 1|sed 's/.*s-\(.*\)\.t.*/\1/'" From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:29 2008 Subject: [Frugalware-git] frugalware-current: gawk-3.1.6-2-i686 Message-ID: <20080313230609.B4CA71190541@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a18c54b85cf680811d0411548709aae7f2d50f41 commit a18c54b85cf680811d0411548709aae7f2d50f41 Author: crazy Date: Sun Mar 9 23:23:00 2008 +0100 gawk-3.1.6-2-i686 * rebuild diff --git a/source/base/gawk/FrugalBuild b/source/base/gawk/FrugalBuild index 24da2c7..3b2898b 100644 --- a/source/base/gawk/FrugalBuild +++ b/source/base/gawk/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gawk pkgver=3.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Gnu version of awk" url="http://www.gnu.org/software/gawk/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.gnu.org/gnu/gawk/|grep -- 'gawk-[0-9.]\+'|Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:30 2008 Subject: [Frugalware-git] frugalware-current: gettext-0.17-2-i686 Message-ID: <20080313230609.BAC601190542@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ddbcc8adf128675a5be1afabaf3bf439897d4291 commit ddbcc8adf128675a5be1afabaf3bf439897d4291 Author: crazy Date: Sun Mar 9 23:31:28 2008 +0100 gettext-0.17-2-i686 * rebuild diff --git a/source/base/gettext/FrugalBuild b/source/base/gettext/FrugalBuild index 0265660..d0749aa 100644 --- a/source/base/gettext/FrugalBuild +++ b/source/base/gettext/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gettext pkgver=0.17 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" url="http://www.gnu.org/software/gettext" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:31 2008 Subject: [Frugalware-git] frugalware-current: grep-2.5.3-3-i686 Message-ID: <20080313230609.D89501190544@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50ecb04460b04990b1b743325e7fd978fa95a3bc commit 50ecb04460b04990b1b743325e7fd978fa95a3bc Author: crazy Date: Sun Mar 9 23:43:13 2008 +0100 grep-2.5.3-3-i686 * rebuild diff --git a/source/base/grep/FrugalBuild b/source/base/grep/FrugalBuild index a078468..1c14fb7 100644 --- a/source/base/grep/FrugalBuild +++ b/source/base/grep/FrugalBuild @@ -4,10 +4,10 @@ pkgname=grep pkgver=2.5.3 extrapkgver= -pkgrel=2 +pkgrel=3 pkgdesc="Print lines matching a pattern" url="http://www.gnu.org/software/grep/grep.html" -depends=('pcre') +depends=('pcre>=7.6-2') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:32 2008 Subject: [Frugalware-git] frugalware-current: gzip-1.3.12-3-i686 Message-ID: <20080313230609.E3D5F1190545@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5505dad51431609fada25b5d00c9fcfd9da87d80 commit 5505dad51431609fada25b5d00c9fcfd9da87d80 Author: crazy Date: Sun Mar 9 23:45:16 2008 +0100 gzip-1.3.12-3-i686 * rebuild diff --git a/source/base/gzip/FrugalBuild b/source/base/gzip/FrugalBuild index 2fbc305..7efae43 100644 --- a/source/base/gzip/FrugalBuild +++ b/source/base/gzip/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gzip pkgver=1.3.12 -pkgrel=2 +pkgrel=3 pkgdesc="A file compression utility" url="http://www.gzip.org" depends=('bash') From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:33 2008 Subject: [Frugalware-git] frugalware-current: expat-2.0.1-2-i686 Message-ID: <20080313230609.C509E11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=498e5d727a48a59f9e30da3ae97533d9dd1eb78f commit 498e5d727a48a59f9e30da3ae97533d9dd1eb78f Author: crazy Date: Sun Mar 9 23:36:06 2008 +0100 expat-2.0.1-2-i686 * rebuild diff --git a/source/lib/expat/FrugalBuild b/source/lib/expat/FrugalBuild index 7aaf544..a67bbcd 100644 --- a/source/lib/expat/FrugalBuild +++ b/source/lib/expat/FrugalBuild @@ -4,15 +4,14 @@ pkgname=expat pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An XML Parser library written in C" url="http://expat.sf.net" -depends=('glibc') -rodepends=('coreutils') +depends=('glibc>=2.7-3') +rodepends=('coreutils>=6.10-3') groups=('lib' 'chroot-core') archs=('i686' 'x86_64') -_F_cd_path="$pkgname-2007-06-05" # is stable just wrong packaged :P Finclude sourceforge -sha1sums=('24515689805c63b0bcbed104841f7233c6e6a288') +sha1sums=('663548c37b996082db1f2f2c32af060d7aa15c2d') # optimization OK From crazy at frugalware.org Fri Mar 14 00:06:09 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:34 2008 Subject: [Frugalware-git] frugalware-current: make-3.81-3-i686 Message-ID: <20080313230609.ED5EA1190546@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2339cdd0194deafffcf200e57d014dc19942f421 commit 2339cdd0194deafffcf200e57d014dc19942f421 Author: crazy Date: Sun Mar 9 23:47:40 2008 +0100 make-3.81-3-i686 * rebuild diff --git a/source/devel/make/FrugalBuild b/source/devel/make/FrugalBuild index c1c3e9c..d6db112 100644 --- a/source/devel/make/FrugalBuild +++ b/source/devel/make/FrugalBuild @@ -3,10 +3,10 @@ pkgname=make pkgver=3.81 -pkgrel=1 +pkgrel=3 pkgdesc="GNU make utility to maintain groups of programs" url="http://www.gnu.org/software/make" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('devel' 'devel-core') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:36 2008 Subject: [Frugalware-git] frugalware-current: ed-0.8-2-i686 Message-ID: <20080313230610.1271911904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2171da22c3d1f874454ee635ec12d7ab2d12cef6 commit 2171da22c3d1f874454ee635ec12d7ab2d12cef6 Author: crazy Date: Sun Mar 9 23:49:23 2008 +0100 ed-0.8-2-i686 * rebuild diff --git a/source/base/ed/FrugalBuild b/source/base/ed/FrugalBuild index 7f6dab9..c6a2608 100644 --- a/source/base/ed/FrugalBuild +++ b/source/base/ed/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ed pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A POSIX-compliant line editor" url="http://www.gnu.org/software/ed/ed.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnubz2 From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:37 2008 Subject: [Frugalware-git] frugalware-current: patch-2.5.9-2-i686 Message-ID: <20080313230610.1BD9F1190547@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a2f2c6ca89b97dce06ca23dbf5bc28b8a2c00baa commit a2f2c6ca89b97dce06ca23dbf5bc28b8a2c00baa Author: crazy Date: Sun Mar 9 23:56:12 2008 +0100 patch-2.5.9-2-i686 * rebuild diff --git a/source/base/patch/FrugalBuild b/source/base/patch/FrugalBuild index c753805..1cbcca1 100644 --- a/source/base/patch/FrugalBuild +++ b/source/base/patch/FrugalBuild @@ -3,10 +3,10 @@ pkgname=patch pkgver=2.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to apply patch files to original sources" url="http://www.gnu.org/software/patch/patch.html" -depends=('ed') +depends=('ed>=0.8-2') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://bent.latency.net/bent/darcs/patch-2.5.9/src/ |Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:38 2008 Subject: [Frugalware-git] frugalware-current: gdbm-1.8.3-4-i686 Message-ID: <20080313230610.25EA61190548@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a049aed8169cd0cc0e744cdd36f6a24f0922fe73 commit a049aed8169cd0cc0e744cdd36f6a24f0922fe73 Author: crazy Date: Sun Mar 9 23:59:47 2008 +0100 gdbm-1.8.3-4-i686 * rebuild * unset MAKEFLAGS before Fmakeinstall diff --git a/source/base/gdbm/FrugalBuild b/source/base/gdbm/FrugalBuild index 360ef88..0982aea 100644 --- a/source/base/gdbm/FrugalBuild +++ b/source/base/gdbm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gdbm pkgver=1.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz @@ -16,6 +16,7 @@ sha1sums=('a0296b1986a99cb9ec0dc3b17ea99aec76e9b760') build() { Fmake || return 1 + unset MAKEFLAGS Fmakeinstall install-compat } From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:40 2008 Subject: [Frugalware-git] frugalware-current: popt-1.13-1-i686 Message-ID: <20080313230610.304C31190549@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f97828acf0508acb01f5ece84adbb76c86bbb9df commit f97828acf0508acb01f5ece84adbb76c86bbb9df Author: crazy Date: Mon Mar 10 00:10:55 2008 +0100 popt-1.13-1-i686 * Version bump * fixed broken , url , source and up2date * we need autoreconf when we use Fsed o Makefile.am's , heh diff --git a/source/base/popt/FrugalBuild b/source/base/popt/FrugalBuild index 7d8d5fc..e8158aa 100644 --- a/source/base/popt/FrugalBuild +++ b/source/base/popt/FrugalBuild @@ -3,20 +3,21 @@ # Maintainer: voroskoi pkgname=popt -pkgver=1.10.7 -pkgrel=2 +pkgver=1.13 +pkgrel=1 pkgdesc="A commandline option parser" -url="http://freshmeat.net/projects/popt/" -depends=('glibc' 'gettext') +url="http://rpm5.org" +depends=('glibc>=2.7-3' 'gettext>=0.17-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump ftp://jbj.org/pub/rpm-4.4.x|grep 'tar.gz'|grep 'popt-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" -source=(ftp://jbj.org/pub/rpm-4.4.x/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump http://rpm5.org/files/popt|Flasttar" +source=(http://rpm5.org/files/popt/$pkgname-$pkgver.tar.gz) build() { Fsed "@MARK64@" "" Makefile.am + Fautoreconf Fbuild } -sha1sums=('c1a22bd3b50b24f64654c69a6f91142ca54ca853') +sha1sums=('658bf2d2ec25e97816f5920bb24048cf252d053a') # optimization OK From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:43 2008 Subject: [Frugalware-git] frugalware-current: chkconfig-1.3.30c-1-i686 Message-ID: <20080313230610.458BF1190203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e527cb67d14d5a804935841ba470f3489750146 commit 3e527cb67d14d5a804935841ba470f3489750146 Author: crazy Date: Mon Mar 10 15:21:17 2008 +0100 chkconfig-1.3.30c-1-i686 * Version bump * fixed url , source * added up2date again and removed that comment * which is not true anymore * added an frugalware patch to make it ignore * .pacxxx backup files and removed verbose ( debug ?! ) * output on --add diff --git a/source/base/chkconfig/FrugalBuild b/source/base/chkconfig/FrugalBuild index 9a25a77..c4b8d9d 100644 --- a/source/base/chkconfig/FrugalBuild +++ b/source/base/chkconfig/FrugalBuild @@ -2,22 +2,23 @@ # Maintainer: VMiklos pkgname=chkconfig -pkgver=1.2.24h -pkgrel=6 +pkgver=1.3.30c +pkgrel=1 pkgdesc="Updates and queries runlevel information for system services" -url="http://www.fastcoder.net/~thumper/software/sysadmin/chkconfig/" -depends=('glibc' 'popt') +url="http://www.fastcoder.net/software/chkconfig/" +depends=('glibc>=2.7-3' 'popt>=1.13') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') -# silence up2date, newer versions may be problematic and we'll switch to -# upstart soon -up2date="$pkgver" -source=(http://www.fastcoder.net/~thumper/downloads/chkconfig/$pkgname-$pkgver.tar.gz) -sha1sums=('c22cab9f75e7acdc50f9a2061e224705c43437db') +up2date="lynx -dump http://www.fastcoder.net/downloads/|Flasttar" +source=( http://www.fastcoder.net/downloads/$pkgname-$pkgver.tar.gz frugalware.patch) +sha1sums=('5041858adc384863c66e4a4110c951c19e4a690c' \ + '218905354a6828c8d0e3a439be02d21fbb190552') build() { - Fbuild --with-init-dir=/etc/rc.d + Fbuild \ + --with-init-dir=/etc/rc.d + --enable-threads=posix Fmkdir /etc/rc.d/rc{S,0,1,2,3,4,5,6}.d } diff --git a/source/base/chkconfig/frugalware.patch b/source/base/chkconfig/frugalware.patch new file mode 100644 index 0000000..9dac5ee --- /dev/null +++ b/source/base/chkconfig/frugalware.patch @@ -0,0 +1,82 @@ +diff -Naur chkconfig-1.3.30c/chkconfig.c chkconfig-1.3.30c-p/chkconfig.c +--- chkconfig-1.3.30c/chkconfig.c 2007-04-01 23:36:25.000000000 +0200 ++++ chkconfig-1.3.30c-p/chkconfig.c 2008-03-10 15:14:15.000000000 +0100 +@@ -202,13 +202,14 @@ + + /* Skip files with known bad extensions */ + if ((dn = strrchr(ent->d_name, '.')) != NULL && +- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) ++ (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") ++ || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacsave") || !strcmp(dn, ".pacorig"))) + continue; +- ++ + dn = ent->d_name + strlen(ent->d_name) - 1; + if (*dn == '~' || *dn == ',') + continue; +- ++ + sprintf(fn, "%s/%s", conf.initdir, ent->d_name); + if (stat(fn, &sb)) { + continue; +@@ -224,7 +225,6 @@ + do { + nResolved = 0; + int i; +- + for (i = 0; i < numservs ; i++) { + if ((servs+i)->isLSB) + nResolved += frobOneDependencies(servs+i, servs, numservs, 0); +@@ -244,9 +244,13 @@ + return 1; + } + +- printf("start = %d\n", s.sPriority); +- printf("end = %d\n", s.kPriority); +- ++ #if 0 ++ ++ printf("start = %d\n", s.sPriority); ++ printf("end = %d\n", s.kPriority); ++ ++ #endif ++ + if (s.type == TYPE_XINETD) return 0; + if (s.isLSB) + frobDependencies(&s); +@@ -343,7 +347,7 @@ + + numServicesAlloced = 10; + services = malloc(sizeof(*services) * numServicesAlloced); +- ++ + if (!(dir = opendir(conf.initdir))) { + fprintf(stderr, _("failed to open %s: %s\n"), conf.initdir, + strerror(errno)); +@@ -361,13 +365,14 @@ + (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") + || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") + || !strcmp(dn, ".dpkg-dist") || !strcmp(dn, ".dpkg-old") +- || !strcmp(dn, ".dpkg-new"))) ++ || !strcmp(dn, ".dpkg-new") || !strcmp(dn, ".pacsave") ++ || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacorig"))) + continue; + + dn = ent->d_name + strlen(ent->d_name) - 1; + if (*dn == '~' || *dn == ',') + continue; +- ++ + sprintf(fn, "%s/%s", conf.initdir, ent->d_name); + if (stat(fn, &sb)) { + fprintf(stderr, _("error reading info for service %s: %s\n"), +@@ -421,7 +426,8 @@ + + /* Skip files with known bad extensions */ + if ((dn = strrchr(ent->d_name, '.')) != NULL && +- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) ++ (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") ++ ||!strcmp(dn, ".pacsave") || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacorig"))) + continue; + + dn = ent->d_name + strlen(ent->d_name) - 1; From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:45 2008 Subject: [Frugalware-git] frugalware-current: db-4.6.21-3-i686 Message-ID: <20080313230610.39A0C119054A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0fe2b980fd908233e6286abcc1ff397f66bd4b20 commit 0fe2b980fd908233e6286abcc1ff397f66bd4b20 Author: crazy Date: Mon Mar 10 01:25:28 2008 +0100 db-4.6.21-3-i686 * release bump * fix docs bug being installed twice * deleted all java docs we don't have java support for db yet diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild index 577b7c7..9e2e2a2 100644 --- a/source/base/db/FrugalBuild +++ b/source/base/db/FrugalBuild @@ -3,7 +3,7 @@ pkgname=db pkgver=4.6.21 -pkgrel=2 +pkgrel=3 pkgdesc="The Berkeley DB embedded database system" url="http://www.sleepycat.com" depends=('libstdc++>=4.3.0-3') @@ -31,9 +31,9 @@ build() Fmakeinstall Fmkdir /usr/share/doc/$pkgname-$pkgver + Frm /usr/docs/{java,gsg_txn/JAVA,gsg/JAVA,gsg_db_rep/JAVA} Fmv /usr/docs/* /usr/share/doc/$pkgname-$pkgver/ Frm /usr/docs/ - cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie } # optimization ok From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:47 2008 Subject: [Frugalware-git] frugalware-current: frugalware-0.8-2-i686 Message-ID: <20080313230610.4FE57119054B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b0724896d70420a93b4a82e49571c2235e138b8 commit 0b0724896d70420a93b4a82e49571c2235e138b8 Author: crazy Date: Mon Mar 10 15:28:39 2008 +0100 frugalware-0.8-2-i686 * release bump * added serice diff for new chkconfig * and fixed other minor issues in service * Ok @ vmiklos diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index a083068..751f570 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -3,15 +3,15 @@ pkgname=frugalware pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" depends=() -rodepends=('coreutils' 'chkconfig') +rodepends=('coreutils>=6.10-3' 'chkconfig>=1.3.30c') makedepends=('help2man') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,termcap}) up2date="lynx -dump $url |Flasttar" -source=($url/$pkgname-$pkgver.tar.gz) -signatures=("$source.asc") +source=($url/$pkgname-$pkgver.tar.gz service.diff) +signatures=("$source.asc" '') diff --git a/source/base/frugalware/service.diff b/source/base/frugalware/service.diff new file mode 100644 index 0000000..0743b94 --- /dev/null +++ b/source/base/frugalware/service.diff @@ -0,0 +1,121 @@ +diff -Naur frugalware-0.8/var/service frugalware-0.8-p/var/service +--- frugalware-0.8/var/service 2008-03-07 00:27:10.000000000 +0100 ++++ frugalware-0.8-p/var/service 2008-03-10 14:44:27.000000000 +0100 +@@ -1,3 +1,4 @@ ++ + #!/bin/sh + + # (c) 2003, 2004, 2008 Miklos Vajna +@@ -7,46 +8,65 @@ + TEXTDOMAIN=service + TEXTDOMAINDIR=/var/lib/frugalware/messages + ++ ++usage() ++{ ++ echo $"Usage: $0 service action" ++ echo ++ echo $"Actions:" ++ echo ++ echo $"start Start the service." ++ echo ++ echo $"stop Stop the service." ++ echo ++ echo $"status Status of the service (if it supports querying so)." ++ echo ++ echo $"restart Stop and start again the service." ++ echo ++ echo $"add Adds a new service for management by chkconfig." ++ echo ++ echo $"del Removes a service from chkconfig management." ++ echo ++ echo $"list List whether the service is stopped or started in each runlevel." ++ exit 0 ++} ++ ++if [ "$1" = "" ]; then ++ usage ++fi ++ + if [ "$1" = "--version" ]; then +- echo "service (pacman-tools) 0.2" ++ echo "service (pacman-tools) 0.2.1" + echo +- echo "Copyright (c) 2003-2007 by Miklos Vajna " ++ echo "Copyright (c) 2003-2008 by Miklos Vajna " + echo "This is free software; see the source for copying conditions. There is NO" + echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit 0 + elif [ "$1" = "--help" ]; then +- echo $"Usage: $0 service action" +- echo +- echo $"Actions:" +- echo +- echo $"start Start the service." +- echo +- echo $"stop Stop the service." +- echo +- echo $"status Status of the service (if it supports querying so)." +- echo +- echo $"restart Stop and start again the service." +- echo +- echo $"add Adds a new service for management by chkconfig." +- echo +- echo $"del Removes a service from chkconfig management." +- echo +- echo $"list List whether the service is stopped or started in each runlevel." +- exit 0 ++ usage + fi +-if [ "$1" = "list" ]; then +- chkconfig --list --level $2 | grep $2:$3 ++ ++if [ "$1" = "level" ]; then ++ if [ "$2" != "" ]; then ++ if [ "$3" != "" ]; then ++ ## well just support english for now 'on' is not ++ ## the same as Ein etc ++ LC_ALL=C; chkconfig --list --level $2 | grep $2:$3 ++ else ++ echo $"Usage: $0 level " ++ exit 1 ++ fi ++ else ++ echo $"Usage: $0 level " ++ exit 1 ++ fi + else + service=rc.$1 + name=/etc/rc.d/$service + if ! [ -z "$1" ]; then + if ! [ -e $name ]; then +- # this will print a nice error message +- chkconfig --list $service +- exit 1 +- fi +- if ! chkconfig --list $service >/dev/null 2>&1; then +- chkconfig --list $service ++ ## maybe typo ? ++ usage + exit 1 + fi + fi +@@ -55,7 +75,17 @@ + elif [ "$2" = "del" ]; then + chkconfig --del $service + elif [ "$2" = "list" ]; then +- chkconfig --list $service ++ chkconfig --list $service >/dev/null 2>&1 ++ RET=$? ++ if [ "$RET" = "0" ]; then ++ ## we are fine , the file $name ++ ## exists and is added list it ++ chkconfig --list $service ++ else ++ ## error , files exists but isn't added ++ echo $"Use $0 $1 add first." ++ exit 1 ++ fi + else + $name $2 + fi From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:48 2008 Subject: [Frugalware-git] frugalware-current: udev-118-7-i686 Message-ID: <20080313230610.5B85E119054C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6742df08d1c492222d1eac0d489bace87d17878 commit e6742df08d1c492222d1eac0d489bace87d17878 Author: crazy Date: Mon Mar 10 15:33:39 2008 +0100 udev-118-7-i686 * rebuild diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index e8817d0..9755b5d 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,13 +3,13 @@ pkgname=udev pkgver=118 -pkgrel=6 +pkgrel=7 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules} \ etc/sysconfig/blacklist) -depends=('glibc') -rodepends=('chkconfig' 'coreutils' 'grep') +depends=('glibc>=2.7-3') +rodepends=('chkconfig>=1.3.30c' 'coreutils>=6.10-3' 'grep>=2.5.3-3') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') conflicts=('devfsd' 'pcmcia-cs' 'hotplug') From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:50 2008 Subject: [Frugalware-git] frugalware-current: libtool-1.5.26-2-i686 Message-ID: <20080313230610.6592F119054D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e48b92adc0d180dbc2a8207afd9ebaaa6ccdc1e5 commit e48b92adc0d180dbc2a8207afd9ebaaa6ccdc1e5 Author: crazy Date: Mon Mar 10 15:36:23 2008 +0100 libtool-1.5.26-2-i686 * rebuild diff --git a/source/devel/libtool/FrugalBuild b/source/devel/libtool/FrugalBuild index 443c3d0..dd19621 100644 --- a/source/devel/libtool/FrugalBuild +++ b/source/devel/libtool/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libtool pkgver=1.5.26 -pkgrel=1 +pkgrel=2 pkgdesc="A generic library support script" url="http://www.gnu.org/software/libtool" depends=('bash') From crazy at frugalware.org Fri Mar 14 00:06:10 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:51 2008 Subject: [Frugalware-git] frugalware-current: perl-5.10.0-4-i686 Message-ID: <20080313230610.8D6AF1190930@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00a146f0a603be0f2b21d819a419f35ece619813 commit 00a146f0a603be0f2b21d819a419f35ece619813 Author: crazy Date: Mon Mar 10 15:51:43 2008 +0100 perl-5.10.0-4-i686 * rebuild diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild index 1649ea2..3fa85a0 100644 --- a/source/base/perl/FrugalBuild +++ b/source/base/perl/FrugalBuild @@ -4,16 +4,16 @@ pkgname=perl pkgver=5.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Practical Extraction and Report Language." url="http://www.perl.org/" -depends=('gdbm' 'db>=4.6.18') +depends=('gdbm>=1.8.3-4' 'db>=4.6.21-3') provides=('perl-version' 'perl-module-build' 'perl-io-zlib' \ 'perl-io-compress-zlib' 'perl-io-compress-base' 'perl-extutils-cbuilder' \ 'perl-compress-zlib' 'perl-compress-raw-zlib' 'perl-archive-tar' \ 'perl-digest-sha' 'perl-pod-simple' 'perl-pod-escapes') conflicts=(${provides[@]}) -rodepends=('udev') +rodepends=('udev>=118-7') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.perl.org/|grep -m1 'Current Release:'|sed 's/.*]\(.*\).*/\1/'" From crazy at frugalware.org Fri Mar 14 00:06:11 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:53 2008 Subject: [Frugalware-git] frugalware-current: tar-1.19-3-i686 Message-ID: <20080313230611.2B2B41190931@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8ac87a4c683fe4362a1351481671ea913c3b1ad commit f8ac87a4c683fe4362a1351481671ea913c3b1ad Author: crazy Date: Mon Mar 10 16:05:29 2008 +0100 tar-1.19-3-i686 * rebuild * added an patch to fix the build with gcc43 diff --git a/source/base/tar/FrugalBuild b/source/base/tar/FrugalBuild index bf99d4c..931b297 100644 --- a/source/base/tar/FrugalBuild +++ b/source/base/tar/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tar pkgver=1.19 -pkgrel=2 +pkgrel=3 pkgdesc="Utility used to store, backup, and transport files" url="http://www.gnu.org/software/tar/tar.html" depends=('bash') @@ -11,8 +11,8 @@ groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz tar.1 \ - $pkgname-1.18-lzma.patch) -signatures=($source.sig '' '') + $pkgname-1.18-lzma.patch gcc43.patch) +signatures=($source.sig '' '' '') build() { diff --git a/source/base/tar/gcc43.patch b/source/base/tar/gcc43.patch new file mode 100644 index 0000000..abe626e --- /dev/null +++ b/source/base/tar/gcc43.patch @@ -0,0 +1,33 @@ +diff -up tar-1.19/lib/argp-fmtstream.h.gcc43 tar-1.19/lib/argp-fmtstream.h +--- tar-1.19/lib/argp-fmtstream.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp-fmtstream.h 2008-02-13 16:56:58.000000000 +0100 +@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI +-#define ARGP_FS_EI extern inline ++# ifdef __GNUC_STDC_INLINE__ ++# define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) ++# else ++# define ARGP_FS_EI extern inline ++# endif + #endif + + ARGP_FS_EI size_t +diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h +--- tar-1.19/lib/argp.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp.h 2008-02-13 16:55:36.000000000 +0100 +@@ -580,7 +580,11 @@ extern void *__argp_input (const struct + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# if defined __GNUC_STDC_INLINE__ ++# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) ++# else ++# define ARGP_EI extern __inline__ ++# endif + # endif + + ARGP_EI void + From crazy at frugalware.org Fri Mar 14 00:06:11 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:54 2008 Subject: [Frugalware-git] frugalware-current: mktemp-1.5-2-i686 Message-ID: <20080313230611.7960211904CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c288587d8e22dfbd5b5ff24b398711d5b699b536 commit c288587d8e22dfbd5b5ff24b398711d5b699b536 Author: crazy Date: Mon Mar 10 16:10:13 2008 +0100 mktemp-1.5-2-i686 * rebuild * unset MAKEFLAGS , it does not like SMP diff --git a/source/base/mktemp/FrugalBuild b/source/base/mktemp/FrugalBuild index 535a24b..53aa5e5 100644 --- a/source/base/mktemp/FrugalBuild +++ b/source/base/mktemp/FrugalBuild @@ -3,10 +3,10 @@ pkgname=mktemp pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A small program to allow safe temporary file creation from shell scripts." url="http://www.mktemp.org/" -depends=('glibc') +depends=('glibc>=2.7-3') replaces=('debianutils') groups=('base' 'chroot-core') archs=('i686' 'x86_64') @@ -14,4 +14,5 @@ up2date="lynx -dump $url |grep current|sed 's/.*]\([^,]*\),.*/\1/'" source=(ftp://ftp.mktemp.org/pub/mktemp/mktemp-$pkgver.tar.gz) signatures=(ftp://ftp.mktemp.org/pub/mktemp/mktemp-$pkgver.tar.gz.sig) +unset MAKEFLAGS # optimization OK From crazy at frugalware.org Fri Mar 14 00:06:11 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:56 2008 Subject: [Frugalware-git] frugalware-current: bison-2.3-2-i686 Message-ID: <20080313230611.D05631190933@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d6c44fda980f29ec1e644749c04843240de3dbc commit 3d6c44fda980f29ec1e644749c04843240de3dbc Author: crazy Date: Mon Mar 10 16:42:01 2008 +0100 bison-2.3-2-i686 * rebuild diff --git a/source/devel/bison/FrugalBuild b/source/devel/bison/FrugalBuild index a0aca6d..aa9495d 100644 --- a/source/devel/bison/FrugalBuild +++ b/source/devel/bison/FrugalBuild @@ -3,10 +3,10 @@ pkgname=bison pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A general-purpose parser generator." url="http://www.gnu.org/software/bison/bison.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('devel' 'devel-core') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:11 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:57 2008 Subject: [Frugalware-git] frugalware-current: net-tools-1.60-25-i686 Message-ID: <20080313230611.A2FEE11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc03b143848e282a69d3a8fd8ba9592d3f109c37 commit dc03b143848e282a69d3a8fd8ba9592d3f109c37 Author: crazy Date: Mon Mar 10 16:37:04 2008 +0100 net-tools-1.60-25-i686 * rebuild * we need to touch both config.* files * after patching , if not it will live ask you about options * during building and this is not what we want diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index af44ed5..53fa256 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,10 +3,10 @@ pkgname=net-tools pkgver=1.60 -pkgrel=24 +pkgrel=25 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/" -depends=('mktemp' 'chkconfig') +depends=('mktemp>=1.5-2' 'chkconfig>=1.3.30c') groups=('base' 'chroot-core') conflicts=('hotplug') archs=('i686' 'x86_64' 'ppc') @@ -32,6 +32,7 @@ build() { unset MAKEFLAGS Fpatchall + touch config.* || Fdie Fsed '^\(COPTS = .*\) -O2 \(.*\)' "\1 $CFLAGS \2" Makefile Fmake make BASEDIR=$Fdestdir update From crazy at frugalware.org Fri Mar 14 00:06:12 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:08:59 2008 Subject: [Frugalware-git] frugalware-current: texinfo-4.11-2-i686 Message-ID: <20080313230612.6CDFF11904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e609d27daccb3158596d98b8a81cfc8fd3f91333 commit e609d27daccb3158596d98b8a81cfc8fd3f91333 Author: crazy Date: Mon Mar 10 16:51:57 2008 +0100 texinfo-4.11-2-i686 * rebuild diff --git a/source/base/texinfo/FrugalBuild b/source/base/texinfo/FrugalBuild index 1c9c6b0..386dd1a 100644 --- a/source/base/texinfo/FrugalBuild +++ b/source/base/texinfo/FrugalBuild @@ -4,12 +4,12 @@ pkgname=texinfo pkgver=4.11 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU info program and utilities" url="http://www.gnu.org/software/texinfo/" -depends=('ncurses' 'net-tools' 'grep' 'sed' 'udev' 'gawk') -rodepends=('shadow') -makedepends=('bison') +depends=('ncurses>=5.6-3' 'net-tools>=1.60-25' 'grep>=2.5.3-3' 'sed>=4.1.5-2' 'udev>=118-7' 'gawk>=3.1.6-2') +rodepends=('shadow>=4.1.0-4') +makedepends=('bison>=2.3-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64') options=('force') From crazy at frugalware.org Fri Mar 14 00:06:12 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:00 2008 Subject: [Frugalware-git] frugalware-current: shadow-4.1.0-4-i686 Message-ID: <20080313230612.3AE5011904D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f942d173efb08042b6f928dcef74bd1f65a051a commit 1f942d173efb08042b6f928dcef74bd1f65a051a Author: crazy Date: Mon Mar 10 16:46:12 2008 +0100 shadow-4.1.0-4-i686 * rebuild diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index 76c2321..503e9fc 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -3,13 +3,13 @@ pkgname=shadow pkgver=4.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Shadow password file utilities" url="http://pkg-shadow.alioth.debian.org/" pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow" backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits) -depends=('glibc') -rodepends=('frugalware') # for /etc/issue +depends=('glibc>=2.7-3') +rodepends=('frugalware>=0.8-2') # for /etc/issue groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $pkgurl |Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:12 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:03 2008 Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.40.6-2-i686 Message-ID: <20080313230612.915BB1190932@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f62686e2483c1df95b18599307d7343d8970aabb commit f62686e2483c1df95b18599307d7343d8970aabb Author: crazy Date: Mon Mar 10 16:56:23 2008 +0100 e2fsprogs-1.40.6-2-i686 * rebuild diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 2803b37..cd3701e 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -3,10 +3,10 @@ pkgname=e2fsprogs pkgver=1.40.6 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" url="http://e2fsprogs.sourceforge.net/" -depends=('glibc') +depends=('glibc>=2.7-3') rodepends=('coreutils') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') From crazy at frugalware.org Fri Mar 14 00:06:12 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:05 2008 Subject: [Frugalware-git] frugalware-current: zlib-1.2.3-5-i686 Message-ID: <20080313230612.AA1191190936@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67df475f394251fd1bb1b365a051404e183050a3 commit 67df475f394251fd1bb1b365a051404e183050a3 Author: crazy Date: Mon Mar 10 16:59:09 2008 +0100 zlib-1.2.3-5-i686 * rebuild diff --git a/source/base/zlib/FrugalBuild b/source/base/zlib/FrugalBuild index 8d8014e..28d98b5 100644 --- a/source/base/zlib/FrugalBuild +++ b/source/base/zlib/FrugalBuild @@ -4,10 +4,10 @@ pkgname=zlib pkgver=1.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="A compression/decompression library" url="http://www.zlib.net/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.zlib.net/ | grep -m 1 'zlib source code' | cut -d ' ' -f 16 | tr -d ," From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:06 2008 Subject: [Frugalware-git] frugalware-current: tzdata-2008a-1-i686 Message-ID: <20080313230613.12B041190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b19243aa2918f5c0aee7aa91233e8c44fe757315 commit b19243aa2918f5c0aee7aa91233e8c44fe757315 Author: crazy Date: Mon Mar 10 17:11:09 2008 +0100 tzdata-2008a-1-i686 * Version bump diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild index 3d4c4a4..999c621 100644 --- a/source/base/tzdata/FrugalBuild +++ b/source/base/tzdata/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: crazy pkgname=tzdata -pkgver=2007k +pkgver=2008a pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" url="http://www.twinsun.com/tz/tz-link.htm" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64') up2date="lynx -dump -nolist ftp://elsie.nci.nih.gov/pub/|grep tzdata|sed 's/.*ta\(.*\).t.*/\1/'" source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${pkgver}.tar.gz \ Makefile.patch) -sha1sums=('2ff7cf783186677689633a794481da2019b65507' \ - 'd64928c84555a67be2eace926c066911b35b0d39' \ +sha1sums=('aa68bc0bc1aba465692c8acefcf86641f240a802' \ + '0a43a9b96b48421657f0e09534a23b664fc58d18' \ 'e8890681333949977ccff0b7a429ad25ed78dbcf') build() From crazy at frugalware.org Fri Mar 14 00:06:12 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:07 2008 Subject: [Frugalware-git] frugalware-current: util-linux-ng-2.13.1-2-i686 Message-ID: <20080313230612.E457511904D4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97c062352cb6700959e53d817c8cfea1b18313b0 commit 97c062352cb6700959e53d817c8cfea1b18313b0 Author: crazy Date: Mon Mar 10 17:06:54 2008 +0100 util-linux-ng-2.13.1-2-i686 * rebuild diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index 6fa003f..5c66e78 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -3,11 +3,11 @@ pkgname=util-linux-ng pkgver=2.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') -depends=('bash' 'ncurses' 'zlib' 'e2fsprogs' 'texinfo') +depends=('bash' 'ncurses>=5.6-3' 'zlib>=1.2.3-5' 'e2fsprogs>=1.40.6-2' 'texinfo>=4.11-2') replaces=('util-linux' 'linux32') conflicts=('util-linux' 'linux32') provides=('util-linux' 'linux32') From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:09 2008 Subject: [Frugalware-git] frugalware-current: lha-1.14i_ac20050924p1-2-i686 Message-ID: <20080313230613.2B58911904D5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03e6a7d9bf788cc03bab04935f4ce9a6783ff8ae commit 03e6a7d9bf788cc03bab04935f4ce9a6783ff8ae Author: crazy Date: Mon Mar 10 17:15:18 2008 +0100 lha-1.14i_ac20050924p1-2-i686 * rebuild diff --git a/source/base/lha/FrugalBuild b/source/base/lha/FrugalBuild index 2164f26..2a21481 100644 --- a/source/base/lha/FrugalBuild +++ b/source/base/lha/FrugalBuild @@ -4,16 +4,14 @@ pkgname=lha pkgver=1.14i_ac20050924p1 rel_id=22231 -pkgrel=1 +pkgrel=2 pkgdesc="An archiving and compression utility for LHarc format archives." url="http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="elinks -dump http://sourceforge.jp/projects/lha/files/|grep tar.gz$|sed 's/.*lha-\(.*\)\.t.*/\1/;s/-/_/;q'" source=(http://osdn.dl.sourceforge.jp/$pkgname/$rel_id/$pkgname-${pkgver/_/-}.tar.gz) -# this can be removed after Frugalware 0.6 -options=('force') _F_cd_path="$pkgname-${pkgver/_/-}" # optimization OK sha1sums=('2491c8b584c21759f1d3819f57fa0e1cbc235092') From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:11 2008 Subject: [Frugalware-git] frugalware-current: module-init-tools-3.4-6-i686 Message-ID: <20080313230613.63F78119092F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da7a0273f60c30d6df5846008755c239d1de7560 commit da7a0273f60c30d6df5846008755c239d1de7560 Author: crazy Date: Mon Mar 10 17:19:43 2008 +0100 module-init-tools-3.4-6-i686 * rebuild diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 647e9e9..a2d4b53 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,11 +3,11 @@ pkgname=module-init-tools pkgver=3.4 -pkgrel=5 +pkgrel=6 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" -depends=('glibc') -makedepends=('zlib' 'docbook-utils' 'docbook-sgml-dtd-4.1' 'perl-sgmlspm') +depends=('glibc>=2.7-3') +makedepends=('zlib>=1.2.3-5' 'docbook-utils' 'docbook-sgml-dtd-4.1' 'perl-sgmlspm') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:12 2008 Subject: [Frugalware-git] frugalware-current: isapnptools-1.27-2-i686 Message-ID: <20080313230613.4FCE61190A3D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b63fac4e3fdbc1c860605a5f2badc8359f4f5fea commit b63fac4e3fdbc1c860605a5f2badc8359f4f5fea Author: crazy Date: Mon Mar 10 17:17:24 2008 +0100 isapnptools-1.27-2-i686 * rebuild diff --git a/source/base/isapnptools/FrugalBuild b/source/base/isapnptools/FrugalBuild index 80b4df5..3b03a85 100644 --- a/source/base/isapnptools/FrugalBuild +++ b/source/base/isapnptools/FrugalBuild @@ -3,10 +3,10 @@ pkgname=isapnptools pkgver=1.27 -pkgrel=1 +pkgrel=2 pkgdesc="allow ISA Plug-And-Play devices to be configured on a Linux machine" url="http://www.roestock.demon.co.uk/isapnptools/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep 'latest released'|sed 's/.*s \(.*\), .*/\1/'" From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:14 2008 Subject: [Frugalware-git] frugalware-current: libgpg-error-1.6-2-i686 Message-ID: <20080313230613.80A301190A42@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b0e7cca1529d09be48f78e0afcc2ed18351d89a commit 1b0e7cca1529d09be48f78e0afcc2ed18351d89a Author: crazy Date: Mon Mar 10 17:29:42 2008 +0100 libgpg-error-1.6-2-i686 * rebuild diff --git a/source/lib/libgpg-error/FrugalBuild b/source/lib/libgpg-error/FrugalBuild index 3e6c4dd..82601c4 100644 --- a/source/lib/libgpg-error/FrugalBuild +++ b/source/lib/libgpg-error/FrugalBuild @@ -4,12 +4,12 @@ pkgname=libgpg-error pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" groups=('lib') archs=('i686' 'x86_64') -depends=('glibc') +depends=('glibc>=2.7-3') up2date="lynx -dump http://www.gnupg.org/\(en\)/download/index.html |grep libgpg-error.*tar |sed -n -e 's/.*r-\(.*\)\.t.*/\1/;s/-/_/;1 p'" source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$pkgver.tar.bz2) sha1sums=('2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3') From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:16 2008 Subject: [Frugalware-git] frugalware-current: libgcrypt-1.4.0-2-i686 Message-ID: <20080313230613.A6D001190A44@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6a4d9fd073de4041e6af5fb8245cc00ed855139 commit e6a4d9fd073de4041e6af5fb8245cc00ed855139 Author: crazy Date: Mon Mar 10 17:34:28 2008 +0100 libgcrypt-1.4.0-2-i686 * rebuild diff --git a/source/lib/libgcrypt/FrugalBuild b/source/lib/libgcrypt/FrugalBuild index a69cf16..aa6e547 100644 --- a/source/lib/libgcrypt/FrugalBuild +++ b/source/lib/libgcrypt/FrugalBuild @@ -4,12 +4,12 @@ pkgname=libgcrypt pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Libgcrypt is a general purpose cryptographic library based on the code from GnuPG." url="http://www.gnu.org/directory/security/libgcrypt.html" groups=('lib') archs=('i686' 'x86_64') -depends=('libgpg-error' 'texinfo') +depends=('libgpg-error>=1.6-2' 'texinfo>=4.11-2') Finclude texinfo up2date="lynx -dump ftp://ftp.gnupg.org/gcrypt/$pkgname |Flasttar" source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:17 2008 Subject: [Frugalware-git] frugalware-current: glib2-2.14.6-2-i686 Message-ID: <20080313230613.C868B1190202@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cbdb3cc4695260ee280a5c6609068e6657b8d902 commit cbdb3cc4695260ee280a5c6609068e6657b8d902 Author: crazy Date: Mon Mar 10 17:48:47 2008 +0100 glib2-2.14.6-2-i686 * rebuild * removed CFLAGS hack we do so by default now diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index d1f18b3..e48e893 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -3,11 +3,11 @@ pkgname=glib2 pkgver=2.14.6 -pkgrel=1 +pkgrel=2 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" -depends=('glibc') -makedepends=('gtk-doc>=1.8-2') +depends=('glibc>=2.7-3') +makedepends=('gtk-doc>=1.8-2' 'libgcrypt>=1.4.0-2') groups=('base' 'chroot-core') archs=('i686' 'x86_64') options=('scriptlet') @@ -22,8 +22,6 @@ _F_cd_path="glib-$pkgver" sha1sums=('f2e2a5323357516ccb813d9e7f3921ef1e490079' \ '8aa98ec8c7a8aad90d27e6c81a7fee1c686914fe' \ 'a78a870e933a317148e11bffdf5d19c8fe4ac2bd') -# Don't touch that -export CFLAGS="$CFLAGS -fno-strict-aliasing" subpkgs=("$pkgname-docs") subdescs=("Glib2 Documentation") From crazy at frugalware.org Fri Mar 14 00:06:13 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:19 2008 Subject: [Frugalware-git] frugalware-current: parted-1.8.8-2-i686 Message-ID: <20080313230613.EFE8F1190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e926da3211b0181a73b8a7b2debda77a102cc2db commit e926da3211b0181a73b8a7b2debda77a102cc2db Author: crazy Date: Mon Mar 10 17:57:09 2008 +0100 parted-1.8.8-2-i686 * rebuild diff --git a/source/base/parted/FrugalBuild b/source/base/parted/FrugalBuild index 0fea558..631a161 100644 --- a/source/base/parted/FrugalBuild +++ b/source/base/parted/FrugalBuild @@ -3,11 +3,11 @@ pkgname=parted pkgver=1.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" url="http://www.gnu.org/software/parted/parted.html" -depends=('e2fsprogs' 'readline') -rodepends=('gawk' 'gzip' 'shadow' 'texinfo') +depends=('e2fsprogs>=1.40.6-2' 'readline>=5.2-2') +rodepends=('gawk>=3.1.6-2' 'gzip>=1.3.12-3' 'shadow>=4.1.0-4' 'texinfo>=4.11-2') groups=('base') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:20 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.3.2-1-i686 Message-ID: <20080313230614.3C42E1190A43@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1769d3ba855083b8dd5bd569f382697d48a018b commit a1769d3ba855083b8dd5bd569f382697d48a018b Author: crazy Date: Mon Mar 10 19:35:52 2008 +0100 ecj-3.3.2-1-i686 * Version bump ( round 1 ) * added an patch from fedora to fix problems with gcj4.3 diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index 7fb97c0..d90fbbb 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -2,22 +2,25 @@ # Maintainer: VMiklos pkgname=ecj -pkgver=3.3.1.1 -date=200710231652 +pkgver=3.3.2 +date=200802211800 +gccver=4.3.0 pkgrel=1 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'" -source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip) -sha1sums=('d29e04bca326e3c6551604de17a492239160d1cc') +source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip ecj-gcj.patch) +sha1sums=('c9229f01f991777829279d9907069e81857516ca' \ + '51bfaa1069ae5d0a81dee641fd8cfa093365d451') Finclude java -makedepends=('gcc-gcj') +makedepends=("gcc-gcj") build() { # this will be a separete package since these must be compiled with ecj + patch -p1 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE); ++ this.options.put( ++ CompilerOptions.OPTION_LineNumberAttribute, ++ level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE); ++ this.options.put( ++ CompilerOptions.OPTION_SourceFileAttribute, ++ CompilerOptions.GENERATE); ++ } ++ ++ private void readFileList(String file, ArrayList result) { ++ try { ++ BufferedReader b = new BufferedReader(new FileReader(file)); ++ String line; ++ while ((line = b.readLine()) != null) { ++ if (line.endsWith(SUFFIX_STRING_java)) ++ result.add(line); ++ } ++ b.close(); ++ } catch (IOException err) { ++ fail(err); ++ } ++ } ++ ++ private void readAllFileListFiles(ArrayList fileList, ArrayList result) { ++ Iterator it = fileList.iterator(); ++ while (it.hasNext()) { ++ readFileList((String) it.next(), result); ++ } ++ } ++ ++ private void handleWall(boolean enable) throws InvalidInputException { ++ // A somewhat arbitrary list. We use the GCC names ++ // here, and the local handleWarningToken translates ++ // for us. ++ handleWarningToken("constructor-name", enable, false); ++ handleWarningToken("pkg-default-method", enable, false); ++ handleWarningToken("masked-catch-block", enable, false); ++ handleWarningToken("all-deprecation", enable, false); ++ handleWarningToken("unused-local", enable, false); ++ handleWarningToken("unused-label", enable, false); ++ handleWarningToken("static-receiver", enable, false); ++ handleWarningToken("indirect-static", enable, false); ++ handleWarningToken("no-effect-assign", enable, false); ++ handleWarningToken("char-concat", enable, false); ++ handleWarningToken("useless-type-check", enable, false); ++ handleWarningToken("final-bound", enable, false); ++ handleWarningToken("assert-identifier", enable, false); ++ handleWarningToken("enum-identifier", enable, false); ++ handleWarningToken("finally", enable, false); ++ handleWarningToken("varargs-cast", enable, false); ++ handleWarningToken("unused", enable, false); ++ handleWarningToken("forbidden", enable, false); ++ } ++ ++ public void configure(String[] argv) throws InvalidInputException { ++ if ((argv == null) || (argv.length == 0)) { ++ // This is a "can't happen". ++ System.exit(1); ++ } ++ ++ ArrayList files = new ArrayList(); ++ ArrayList otherFiles = new ArrayList(); ++ String classpath = null; ++ boolean haveFileList = false; ++ boolean inhibitAllWarnings = false; ++ boolean treatWarningsAsErrors = false; ++ ++ for (int i = 0; i < argv.length; ++i) { ++ String currentArg = argv[i]; ++ ++ if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$ ++ // Simply accept the last one. ++ String encoding = getArgument(currentArg); ++ try { // ensure encoding is supported ++ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding); ++ } catch (UnsupportedEncodingException e) { ++ throw new InvalidInputException( ++ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$ ++ } ++ this.options.put(CompilerOptions.OPTION_Encoding, encoding); ++ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$ ++ String arg = getArgument(currentArg); ++ if (this.destinationPath != null) { ++ StringBuffer errorMessage = new StringBuffer(); ++ errorMessage.append("-d"); //$NON-NLS-1$ ++ errorMessage.append(' '); ++ errorMessage.append(arg); ++ throw new InvalidInputException( ++ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ ++ } ++ this.destinationPath = arg; ++ // this.generatePackagesStructure = true; ++ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ ++ classpath = getArgument(currentArg); ++ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ ++ ++i; ++ if (i >= argv.length) ++ throw new InvalidInputException(this.bind("gcc.zipArg")); //$NON-NLS-1$ ++ this.zipDestination = argv[i]; ++ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$ ++ ++i; ++ if (i >= argv.length) ++ throw new InvalidInputException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$ ++ this.zipDependencyDestination = argv[i]; ++ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$ ++ if (currentArg.equals("-g0")) { //$NON-NLS-1$ ++ setDebugLevel(0); ++ } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$ ++ || currentArg.equals("-g")) { //$NON-NLS-1$ ++ setDebugLevel(2); ++ } else { ++ // Handle -g1 but also things like -gstabs. ++ setDebugLevel(1); ++ } ++ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$ ++ treatWarningsAsErrors = true; ++ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$ ++ treatWarningsAsErrors = false; ++ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$ ++ handleWall(true); ++ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$ ++ handleWall(false); ++ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$ ++ handleWarningToken(currentArg.substring(5), false, false); ++ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$ ++ handleWarningToken(currentArg.substring(2), true, false); ++ } else if (currentArg.equals("-w")) { //$NON-NLS-1$ ++ inhibitAllWarnings = true; ++ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$ ++ // Ignore. ++ } else if (currentArg.equals("-v")) { //$NON-NLS-1$ ++ this.verbose = true; ++ } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$ ++ this.syntaxOnly = true; ++ } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$ ++ currentArg = getArgument(currentArg); ++ if (currentArg.equals("1.3")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3); ++ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4); ++ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); ++ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); ++ } else { ++ throw new InvalidInputException(this.bind("configure.source", currentArg)); //$NON-NLS-1$ ++ } ++ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$ ++ currentArg = getArgument(currentArg); ++ if (currentArg.equals("1.1")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1); ++ } else if (currentArg.equals("1.2")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2); ++ } else if (currentArg.equals("1.3")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3); ++ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4); ++ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); ++ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); ++ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$ ++ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14); ++ } else { ++ throw new InvalidInputException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$ ++ } ++ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$ ++ haveFileList = true; ++ } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) { ++ files.add(currentArg); ++ } else if (currentArg.charAt(0) == '-'){ ++ // FIXME: error if not a file? ++ } else { ++ otherFiles.add(currentArg); ++ } ++ } ++ ++ // Read the file list file. We read them all, but really there ++ // will only be one. ++ if (haveFileList) ++ readAllFileListFiles(otherFiles, files); ++ ++ this.filenames = (String[]) files.toArray(new String[0]); ++ this.encodings = new String[this.filenames.length]; ++ this.destinationPaths = new String[this.filenames.length]; ++ for (int i = 0; i < this.filenames.length; ++i) ++ this.destinationPaths[i] = this.destinationPath; ++ ++ // Classpath processing. ++ ArrayList result = new ArrayList(); ++ if (classpath == null) ++ throw new InvalidInputException(this.bind("gcc.noClasspath")); //$NON-NLS-1$ ++ parsePath(result, classpath); ++ ++ // We must always create both output files, even if one is not used. ++ // That way we will always pass valid zip file on to jc1. ++ try { ++ getZipOutput(); ++ getDependencyOutput(); ++ } catch (IOException err) { ++ fail(err); ++ } ++ ++ if (inhibitAllWarnings) ++ disableWarnings(); ++ if (treatWarningsAsErrors) ++ turnWarningsToErrors(); ++ ++ this.checkedClasspaths = new FileSystem.Classpath[result.size()]; ++ result.toArray(this.checkedClasspaths); ++ ++ this.logger.logCommandLineArguments(argv); ++ this.logger.logOptions(this.options); ++ this.logger.logClasspath(this.checkedClasspaths); ++ ++ this.repetitions = 1; ++ } ++ ++ public boolean compile(String[] argv) { ++ boolean result = super.compile(argv); ++ try { ++ if (zipStream != null) { ++ zipStream.finish(); ++ zipStream.close(); ++ } ++ if (zipDependencyStream != null) { ++ zipDependencyStream.finish(); ++ zipDependencyStream.close(); ++ } ++ } catch (IOException err) { ++ fail(err); ++ } ++ return result; ++ } ++ ++ public static void main(String[] argv) { ++ boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv); ++ System.exit(result ? 0 : 1); ++ } ++} + From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:22 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.3.2-2-i686 Message-ID: <20080313230614.660981190A46@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f3921fd692f801e8d931d292a6b18ea26bd340f commit 6f3921fd692f801e8d931d292a6b18ea26bd340f Author: crazy Date: Mon Mar 10 19:52:48 2008 +0100 ecj-3.3.2-2-i686 * release bump * added depends =$gccver on gcj * added ecj itself as makedepend for this release * jar -> gjar diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index d90fbbb..bdf475d 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -5,7 +5,7 @@ pkgname=ecj pkgver=3.3.2 date=200802211800 gccver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') @@ -15,7 +15,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjs sha1sums=('c9229f01f991777829279d9907069e81857516ca' \ '51bfaa1069ae5d0a81dee641fd8cfa093365d451') Finclude java -makedepends=("gcc-gcj") +makedepends=("gcc-gcj=$gccver" "$pkgname>=3.3.2") build() { @@ -31,7 +31,7 @@ build() gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1 find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \ - xargs jar cf eclipse-ecj.jar + xargs gjar cf eclipse-ecj.jar Ffilerel /usr/share/java/eclipse-ecj.jar Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:23 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.3.2-2-i686 Message-ID: <20080313230614.7A2BC119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9186691f08f74ba3313e9913faa5efb77ed1f828 commit 9186691f08f74ba3313e9913faa5efb77ed1f828 Author: crazy Date: Mon Mar 10 20:03:48 2008 +0100 ecj-3.3.2-2-i686 * change the depends on gcj to >= diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index bdf475d..a5561a5 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -15,7 +15,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjs sha1sums=('c9229f01f991777829279d9907069e81857516ca' \ '51bfaa1069ae5d0a81dee641fd8cfa093365d451') Finclude java -makedepends=("gcc-gcj=$gccver" "$pkgname>=3.3.2") +makedepends=("gcc-gcj>=$gccver" "$pkgname>=3.3.2") build() { From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:25 2008 Subject: [Frugalware-git] frugalware-current: fbset-2.1-3-i686 Message-ID: <20080313230614.8D37B1190934@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11f281ff853cae776e9a895d72e3d8f5511e82c1 commit 11f281ff853cae776e9a895d72e3d8f5511e82c1 Author: crazy Date: Mon Mar 10 20:39:49 2008 +0100 fbset-2.1-3-i686 * rebuild diff --git a/source/base/fbset/FrugalBuild b/source/base/fbset/FrugalBuild index 48b3df6..aa59423 100644 --- a/source/base/fbset/FrugalBuild +++ b/source/base/fbset/FrugalBuild @@ -3,10 +3,10 @@ pkgname=fbset pkgver=2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Show and modify frame buffer device settings" url="http://home.tvd.be/cr26864/Linux/fbdev/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fbset/|sed 's/_/-/;s/\.orig//'|Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:26 2008 Subject: [Frugalware-git] frugalware-current: libarchive-2.4.8-2-i686 Message-ID: <20080313230614.0AB201190A3B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ab206d238466611e0b762a77763849c3302713e commit 3ab206d238466611e0b762a77763849c3302713e Author: crazy Date: Mon Mar 10 18:01:07 2008 +0100 libarchive-2.4.8-2-i686 * rebuild diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild index 155cc5a..ca156b7 100644 --- a/source/base/libarchive/FrugalBuild +++ b/source/base/libarchive/FrugalBuild @@ -3,12 +3,12 @@ pkgname=libarchive pkgver=2.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="Library to create and read several different archive formats" groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') url="http://people.freebsd.org/~kientzle/libarchive/" -depends=('bzip2' 'zlib') +depends=('bzip2>=1.0.4-2' 'zlib>=1.2.3-5') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) sha1sums=('129b07ee35e3eede8581904272efe6950a99eaaa') From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:28 2008 Subject: [Frugalware-git] frugalware-current: which-2.19-2-i686 Message-ID: <20080313230614.9B5861190A47@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dee572dbbae29141f8ab14ce1f472852763087bb commit dee572dbbae29141f8ab14ce1f472852763087bb Author: crazy Date: Mon Mar 10 20:44:19 2008 +0100 which-2.19-2-i686 * rebuild diff --git a/source/base/which/FrugalBuild b/source/base/which/FrugalBuild index 9870ee2..07393e1 100644 --- a/source/base/which/FrugalBuild +++ b/source/base/which/FrugalBuild @@ -3,10 +3,10 @@ pkgname=which pkgver=2.19 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to show the full path of commands" url="http://www.xs4all.nl/~carlo17/which" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.xs4all.nl/~carlo17/which/NEWS|sed -n '1 p'|cut -d '>' -f 2|tr -d ' '" From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:29 2008 Subject: [Frugalware-git] frugalware-current: fdutils-5.5-4-i686 Message-ID: <20080313230614.B21DE119053A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa54e8e0619423dd9041e7ee2a7edd3eac2aed95 commit aa54e8e0619423dd9041e7ee2a7edd3eac2aed95 Author: crazy Date: Mon Mar 10 20:56:45 2008 +0100 fdutils-5.5-4-i686 * rebuild * unset MAKEFLAGS * added scriptlet option * ( I don't think this ever got build in a chroot :s ) diff --git a/source/base/fdutils/FrugalBuild b/source/base/fdutils/FrugalBuild index d4f8209..db1ac49 100644 --- a/source/base/fdutils/FrugalBuild +++ b/source/base/fdutils/FrugalBuild @@ -3,13 +3,14 @@ pkgname=fdutils pkgver=5.5 -pkgrel=3 +pkgrel=4 pkgdesc="Utilities for formatting floppies and configuring the floppy drive." url="http://fdutils.linux.lu/" -depends=('bash' 'glibc') +depends=('bash' 'glibc>=2.7-3') makedepends=('tetex') groups=('base') archs=('i686' 'x86_64') +options=('scriptlet') up2date="lynx -dump \"$url/download.html?no-to-this-CONstitution\"|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/$pkgname-$pkgver.tar.gz) sha1sums=('3e7478d321ff2f9bc1f53ed09f9585e6e8ca813f') @@ -20,6 +21,7 @@ build() Fconf # fix broken Makefile Fsed 'sysconfdir = /\(.*\)$' 'sysconfdir = ${prefix}/\1' src/Makefile + unset MAKEFLAGS make || return 1 Fmkdir /usr/{bin,etc,man/man1,man/man4,info} Fmakeinstall From crazy at frugalware.org Fri Mar 14 00:06:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:31 2008 Subject: [Frugalware-git] frugalware-current: flex-2.5.33-3-i686 Message-ID: <20080313230614.DBAAB1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e76bddd44888b7afdb291c1c0e9cf5f397da29d4 commit e76bddd44888b7afdb291c1c0e9cf5f397da29d4 Author: crazy Date: Mon Mar 10 21:01:59 2008 +0100 flex-2.5.33-3-i686 * rebuild diff --git a/source/base/flex/FrugalBuild b/source/base/flex/FrugalBuild index c52ce45..71bf467 100644 --- a/source/base/flex/FrugalBuild +++ b/source/base/flex/FrugalBuild @@ -3,10 +3,10 @@ pkgname=flex pkgver=2.5.33 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for generating text-scanning programs" url="http://flex.sourceforge.net" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge From crazy at frugalware.org Fri Mar 14 00:06:15 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:33 2008 Subject: [Frugalware-git] frugalware-current: updated-2.11-3-i686 Message-ID: <20080313230615.0656B119053C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7d7f558bd8cd6d8d8fb2bf71441f36fde5bc862 commit a7d7f558bd8cd6d8d8fb2bf71441f36fde5bc862 Author: crazy Date: Mon Mar 10 21:03:53 2008 +0100 updated-2.11-3-i686 * rebuild diff --git a/source/base/updated/FrugalBuild b/source/base/updated/FrugalBuild index fdd6e9a..6722c69 100644 --- a/source/base/updated/FrugalBuild +++ b/source/base/updated/FrugalBuild @@ -3,10 +3,10 @@ pkgname=updated pkgver=2.11 -pkgrel=2 +pkgrel=3 pkgdesc="an update daemon for Linux 2.0 or newer" url="http://www.ibiblio.org/pub/Linux/system/daemons/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/system/daemons/?M=D'|grep updated.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" From crazy at frugalware.org Fri Mar 14 00:06:15 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:34 2008 Subject: [Frugalware-git] frugalware-current: tree-1.5.1-2-i686 Message-ID: <20080313230615.29DFD1190935@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=875f3d8451a25b0c402e2a88c4ef63366ca8b7d8 commit 875f3d8451a25b0c402e2a88c4ef63366ca8b7d8 Author: crazy Date: Mon Mar 10 21:09:03 2008 +0100 tree-1.5.1-2-i686 * kind version bump * tarball is tree-1.5.1 but packaged is tree-1.5.1.1 diff --git a/source/base/tree/FrugalBuild b/source/base/tree/FrugalBuild index 4d34d0b..b09c781 100644 --- a/source/base/tree/FrugalBuild +++ b/source/base/tree/FrugalBuild @@ -3,10 +3,10 @@ pkgname=tree pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="List contents of directories in a tree-like format" url="ftp://mama.indstate.edu/linux/tree/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="wget --passive-ftp -O - -q $url |grep tree |grep tgz|tail -n 1|cut -d '>' -f 2|cut -d '<' -f 1|sed 's/.tgz//'|cut -d - -f 2" @@ -14,9 +14,10 @@ source=($url/$pkgname-$pkgver.tgz) build() { + Fcd $pkgname-${pkgver}.1 ## lol someone replaced the tarball Fsed '^\(CFLAGS=\)-O2' "\1$CFLAGS" Makefile Fbuild } # optimization ok -sha1sums=('f63dd27860c34c27fbaacc361b44f27607d2b100') +sha1sums=('ca4145bf1d2957ff3f4e6af0f64ce92d102fd356') From crazy at frugalware.org Fri Mar 14 00:06:15 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:35 2008 Subject: [Frugalware-git] frugalware-current: ppp-2.4.4-3-i686 Message-ID: <20080313230615.3CF531190215@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cb438e9b3119498899ddfb6bbe9b341e8455dcf commit 5cb438e9b3119498899ddfb6bbe9b341e8455dcf Author: crazy Date: Mon Mar 10 21:13:54 2008 +0100 ppp-2.4.4-3-i686 * rebuild diff --git a/source/base/ppp/FrugalBuild b/source/base/ppp/FrugalBuild index 9c221cf..af47f02 100644 --- a/source/base/ppp/FrugalBuild +++ b/source/base/ppp/FrugalBuild @@ -3,18 +3,18 @@ pkgname=ppp pkgver=2.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="The PPP (Point-to-Point Protocol) daemon" url="http://www.samba.org/ppp/" groups=('base') archs=('i686' 'x86_64') -depends=('glibc') +depends=('glibc>=2.7-3') backup=('etc/ppp/chap-secrets' 'etc/ppp/pap-secrets' 'etc/ppp/options') up2date="wget --passive-ftp -O - -q ftp://ftp.samba.org/pub/ppp/|grep ppp-.[0-9\.]*\.tar\.gz|tail -n 1|sed 's/.*ppp-\([0-9\.]*\)\.tar\.gz<.*/\1/'" source=(ftp://ftp.samba.org/pub/ppp/ppp-$pkgver.tar.gz ip-up ip-down) sha1sums=('9b91b0117e0a8bfaf8c4e894af79e0960dd36259' \ - '52b2e62a47050498846aa769495628da2a00fb31' \ - '09472529dfcf1f47d7e7f65067291f651c7ac476') + '52b2e62a47050498846aa769495628da2a00fb31' \ + '09472529dfcf1f47d7e7f65067291f651c7ac476') build() { From crazy at frugalware.org Fri Mar 14 00:06:16 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:35 2008 Subject: [Frugalware-git] frugalware-current: genpower-1.0.2-7-i686 Message-ID: <20080313230616.9148D1190A49@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd85a750dc43db90783799138a92ba27674c2afc commit fd85a750dc43db90783799138a92ba27674c2afc Author: crazy Date: Mon Mar 10 21:21:44 2008 +0100 genpower-1.0.2-7-i686 * rebuild diff --git a/source/base/genpower/FrugalBuild b/source/base/genpower/FrugalBuild index 56e9985..a240f4b 100644 --- a/source/base/genpower/FrugalBuild +++ b/source/base/genpower/FrugalBuild @@ -3,10 +3,10 @@ pkgname=genpower pkgver=1.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="UPS monitoring daemon" url="http://www.ibiblio.org/pub/linux/system/ups/!INDEX.html" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') backup=(etc/sysconfig/ups) groups=('base') archs=('i686' 'x86_64' 'ppc') From crazy at frugalware.org Fri Mar 14 00:06:15 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:37 2008 Subject: [Frugalware-git] frugalware-current: unzip-5.52-5-i686 Message-ID: <20080313230615.6515D1190A48@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d3bd6b315f8d2cbb74cb1109fa1cbd970a31a6a commit 0d3bd6b315f8d2cbb74cb1109fa1cbd970a31a6a Author: crazy Date: Mon Mar 10 21:20:06 2008 +0100 unzip-5.52-5-i686 * rebuild diff --git a/source/base/unzip/FrugalBuild b/source/base/unzip/FrugalBuild index 88f1d3c..adfd7e7 100644 --- a/source/base/unzip/FrugalBuild +++ b/source/base/unzip/FrugalBuild @@ -3,10 +3,10 @@ pkgname=unzip pkgver=5.52 -pkgrel=4 +pkgrel=5 pkgdesc="Info-ZIP's unzip utility" url="http://www.info-zip.org/UnZip.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.info-zip.org/UnZip.html|grep UnZip|sed -n 's/.*p \(.*\) \[.*/\1/;1 p'" From crazy at frugalware.org Fri Mar 14 00:06:17 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:38 2008 Subject: [Frugalware-git] frugalware-current: file-4.23-2-i686 Message-ID: <20080313230617.2E7AE119053D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f1c9154639e7a33072d892a8ba1bb6bbc76f33d commit 1f1c9154639e7a33072d892a8ba1bb6bbc76f33d Author: crazy Date: Mon Mar 10 21:26:29 2008 +0100 file-4.23-2-i686 * rebuild diff --git a/source/base/file/FrugalBuild b/source/base/file/FrugalBuild index 2054422..c207d00 100644 --- a/source/base/file/FrugalBuild +++ b/source/base/file/FrugalBuild @@ -3,10 +3,10 @@ pkgname=file pkgver=4.23 -pkgrel=1 +pkgrel=2 pkgdesc="File type identification utility" url="ftp://ftp.astron.com/pub/file" -depends=('glibc' 'zlib') +depends=('glibc>=2.7-3' 'zlib>=1.2.3-5') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="wget --passive-ftp -O - -q ftp://ftp.astron.com/pub/file/ |grep file |grep tar.gz|tail -n 1|cut -d '>' -f 2|cut -d '<' -f 1|sed 's/.tar.gz//'|cut -d - -f 2" From crazy at frugalware.org Fri Mar 14 00:06:17 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:40 2008 Subject: [Frugalware-git] frugalware-current: eject-2.1.5-2-i686 Message-ID: <20080313230617.A609E119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=139d479a28cac9551a23cc4aa11dbefacf60d11a commit 139d479a28cac9551a23cc4aa11dbefacf60d11a Author: crazy Date: Mon Mar 10 21:29:17 2008 +0100 eject-2.1.5-2-i686 * rebuild diff --git a/source/base/eject/FrugalBuild b/source/base/eject/FrugalBuild index f601816..6de29f3 100644 --- a/source/base/eject/FrugalBuild +++ b/source/base/eject/FrugalBuild @@ -3,10 +3,10 @@ pkgname=eject pkgver=2.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Allows removable media to be ejected under software control." url="http://members.rogers.com/jefftranter/eject.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://ca.geocities.com/jefftranter@rogers.com/eject.html' | Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:17 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:41 2008 Subject: [Frugalware-git] frugalware-current: groff-1.19.2-3-i686 Message-ID: <20080313230617.E712B1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a8e8b05395a0ca35ffbb404c5a50478cb9e7f2bf commit a8e8b05395a0ca35ffbb404c5a50478cb9e7f2bf Author: crazy Date: Mon Mar 10 21:33:49 2008 +0100 groff-1.19.2-3-i686 * rebuild diff --git a/source/base/groff/FrugalBuild b/source/base/groff/FrugalBuild index debe9b0..d13a03b 100644 --- a/source/base/groff/FrugalBuild +++ b/source/base/groff/FrugalBuild @@ -3,10 +3,10 @@ pkgname=groff pkgver=1.19.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNU troff text-formatting system" url="http://www.gnu.org/software/groff/groff.html" -depends=('perl' 'libstdc++') +depends=('perl>=5.10.0-4' 'libstdc++>=4.3.0-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.gnu.org/gnu/groff/|grep tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'|Fsort|sed -n '$ p'" From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:43 2008 Subject: [Frugalware-git] frugalware-current: mdadm-2.6.4-2-i686 Message-ID: <20080313230618.0158B119053E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=05ee93bdede8fcf525f08d71324cc796e4f0ac64 commit 05ee93bdede8fcf525f08d71324cc796e4f0ac64 Author: crazy Date: Mon Mar 10 21:37:10 2008 +0100 mdadm-2.6.4-2-i686 * rebuild diff --git a/source/base/mdadm/FrugalBuild b/source/base/mdadm/FrugalBuild index 1e98f9e..3770fbb 100644 --- a/source/base/mdadm/FrugalBuild +++ b/source/base/mdadm/FrugalBuild @@ -3,11 +3,11 @@ pkgname=mdadm pkgver=2.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for managing software RAID under Linux" url="http://www.kernel.org/pub/linux/utils/raid/mdadm/" -depends=('glibc') -makedepends=('groff') +depends=('glibc>=2.7-3') +makedepends=('groff>=1.19.2-3') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/{mdadm.conf,sysconfig/mdadm}) From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:45 2008 Subject: [Frugalware-git] frugalware-current: time-1.7-4-i686 Message-ID: <20080313230618.0DBBA119053F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0dba843e12cea4f938bdff692c2462065752f60b commit 0dba843e12cea4f938bdff692c2462065752f60b Author: crazy Date: Mon Mar 10 21:38:57 2008 +0100 time-1.7-4-i686 * rebuild diff --git a/source/base/time/FrugalBuild b/source/base/time/FrugalBuild index 32a39ad..603f00c 100644 --- a/source/base/time/FrugalBuild +++ b/source/base/time/FrugalBuild @@ -3,10 +3,10 @@ pkgname=time pkgver=1.7 -pkgrel=3 +pkgrel=4 pkgdesc="Time a simple command or give resource usage" url="http://www.gnu.org/software/time/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:46 2008 Subject: [Frugalware-git] frugalware-current: setserial-2.17-4-i686 Message-ID: <20080313230618.1EB081190540@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c896b9415be5e63d8bfde8baf41cb7b07d84973 commit 9c896b9415be5e63d8bfde8baf41cb7b07d84973 Author: crazy Date: Mon Mar 10 21:42:52 2008 +0100 setserial-2.17-4-i686 * rebuild diff --git a/source/base/setserial/FrugalBuild b/source/base/setserial/FrugalBuild index 0f61d30..56fece8 100644 --- a/source/base/setserial/FrugalBuild +++ b/source/base/setserial/FrugalBuild @@ -3,10 +3,10 @@ pkgname=setserial pkgver=2.17 -pkgrel=3 +pkgrel=4 pkgdesc="allows you to look at and change various attributes of a serial device" -depends=('glibc') -makedepends=('groff') +depends=('glibc>=2.7-3') +makedepends=('groff>=1.19.2-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:48 2008 Subject: [Frugalware-git] frugalware-current: adjtimex-1.21-2-i686 Message-ID: <20080313230618.2C39D1190541@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef3301dff78a5af9b3a3efcf7ccca9287368c1bb commit ef3301dff78a5af9b3a3efcf7ccca9287368c1bb Author: crazy Date: Mon Mar 10 21:44:42 2008 +0100 adjtimex-1.21-2-i686 * rebuild diff --git a/source/base/adjtimex/FrugalBuild b/source/base/adjtimex/FrugalBuild index 3f317db..05e7615 100644 --- a/source/base/adjtimex/FrugalBuild +++ b/source/base/adjtimex/FrugalBuild @@ -3,17 +3,17 @@ pkgname=adjtimex pkgver=1.21 -pkgrel=1 +pkgrel=2 pkgdesc="display or set the kernel time variables" url="http://www.ibiblio.org/linsearch/lsms/adjtimex.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.ibiblio.org/pub/Linux/system/admin/time/ | grep $pkgname | Flasttar" source=(http://www.ibiblio.org/pub/Linux/system/admin/time/$pkgname-$pkgver.tar.gz \ adjtimex-1.13-glibc.patch) sha1sums=('0a18b481005ca8d56bba3f56693a79e305bb6738' \ - '5c5e26a052c39da0c05610bd36e4a22a82a4f166') + '5c5e26a052c39da0c05610bd36e4a22a82a4f166') build() { Fcd From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:49 2008 Subject: [Frugalware-git] frugalware-current: sysfsutils-2.1.0-2-i686 Message-ID: <20080313230618.4984C1190937@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a2ef6a7a612f27089148176c6295ae3e725af516 commit a2ef6a7a612f27089148176c6295ae3e725af516 Author: crazy Date: Mon Mar 10 21:48:22 2008 +0100 sysfsutils-2.1.0-2-i686 * rebuild diff --git a/source/base/sysfsutils/FrugalBuild b/source/base/sysfsutils/FrugalBuild index 53e790d..cec8d0a 100644 --- a/source/base/sysfsutils/FrugalBuild +++ b/source/base/sysfsutils/FrugalBuild @@ -3,12 +3,12 @@ pkgname=sysfsutils pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="System utilities based on sysfs" _F_sourceforge_dirname="linux-diag" Finclude sourceforge url="http://linux-diag.sourceforge.net/Sysfsutils.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep '* v\. [0-9\._]* '|sed -n -e 's/.*v\. \([0-9\.]*\) .*/\1/' -e '1 p'" From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:51 2008 Subject: [Frugalware-git] frugalware-current: flex-2.5.35-1-x86_64 Message-ID: <20080313230618.6893A1190542@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=deb3d3b954c27195ce245dc570e7f1b1df56ab7d commit deb3d3b954c27195ce245dc570e7f1b1df56ab7d Author: crazy Date: Mon Mar 10 22:01:25 2008 +0100 flex-2.5.35-1-x86_64 * Version bump * .33 does not pass the test on 64bit * .34 was broken , .35 passes all 46 tests diff --git a/source/base/flex/FrugalBuild b/source/base/flex/FrugalBuild index 71bf467..9bc2bf7 100644 --- a/source/base/flex/FrugalBuild +++ b/source/base/flex/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=flex -pkgver=2.5.33 -pkgrel=3 +pkgver=2.5.35 +pkgrel=1 pkgdesc="A tool for generating text-scanning programs" url="http://flex.sourceforge.net" depends=('glibc>=2.7-3' 'bash') @@ -14,9 +14,9 @@ Finclude sourceforge # http://sourceforge.net/tracker/index.php?func=detail&aid=1849812&group_id=97492&atid=618177 # http://sourceforge.net/tracker/index.php?func=detail&aid=1849809&group_id=97492&atid=618177 # http://sourceforge.net/tracker/index.php?func=detail&aid=1849805&group_id=97492&atid=618177 -up2date="$up2date |sed 's/2.5.34/2.5.33/'" +#up2date="$up2date |sed 's/2.5.34/2.5.33/'" source=(${source[@]} lex) -sha1sums=('9bf2d66bb2e15c26c466eb88218cca6ad9476805' \ +sha1sums=('333c876a8e24ae5a17d9573459fc501b7721930b' \ '76701388d28fe8b1fb269c79c11a1316a02b4e46') options=('force') From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:53 2008 Subject: [Frugalware-git] frugalware-current: zip-2.32-2-i686 Message-ID: <20080313230618.77AEF1190543@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d3ac344dfe20337d000bf68d164ec5f1008b0f1 commit 9d3ac344dfe20337d000bf68d164ec5f1008b0f1 Author: crazy Date: Mon Mar 10 22:02:27 2008 +0100 zip-2.32-2-i686 * rebuild * changed the mirror , original source location is broken diff --git a/source/base/zip/FrugalBuild b/source/base/zip/FrugalBuild index 79203ac..7efecf1 100644 --- a/source/base/zip/FrugalBuild +++ b/source/base/zip/FrugalBuild @@ -3,14 +3,15 @@ pkgname=zip pkgver=2.32 -pkgrel=1 +pkgrel=2 pkgdesc="Info-ZIP's zip utility" url="http://www.info-zip.org/Zip.html" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.info-zip.org/Zip.html|grep Zip|sed -n 's/.*p \(.*\) \[.*/\1/;1 p'" -source=(http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz) +#source=(http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz) +source=(ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/src/zip232.tar.gz) sha1sums=('5bc562bf95d9aee0cb6625e6038898e1f191a4aa') build() From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:55 2008 Subject: [Frugalware-git] frugalware-current: hfsutils-3.2.6-2-i686 Message-ID: <20080313230618.81AB91190A4A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b4691decbeae11fffaa5c60f7486b62a1ddf549c commit b4691decbeae11fffaa5c60f7486b62a1ddf549c Author: crazy Date: Mon Mar 10 22:21:55 2008 +0100 hfsutils-3.2.6-2-i686 * rebuild diff --git a/source/base/hfsutils/FrugalBuild b/source/base/hfsutils/FrugalBuild index 80c5d59..51cbc68 100644 --- a/source/base/hfsutils/FrugalBuild +++ b/source/base/hfsutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=hfsutils pkgver=3.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="HFS FS Acess utils" url="http://www.mars.org/home/rob/proj/hfs/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'ppc' 'x86_64') up2date="lynx -dump ftp://ftp.mars.org/pub/hfs/ | grep -m1 'tar.gz'|sed 's/.*ils-//g'|sed 's/.tar.*//g'" From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:57 2008 Subject: [Frugalware-git] frugalware-current: dosfstools-2.11-3-i686 Message-ID: <20080313230618.A51AD1190A4C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57322c1363b13a479b1544ea8ae43de56d246c30 commit 57322c1363b13a479b1544ea8ae43de56d246c30 Author: crazy Date: Mon Mar 10 22:25:46 2008 +0100 dosfstools-2.11-3-i686 * rebuild diff --git a/source/base/dosfstools/FrugalBuild b/source/base/dosfstools/FrugalBuild index 41e2dcf..f9526f5 100644 --- a/source/base/dosfstools/FrugalBuild +++ b/source/base/dosfstools/FrugalBuild @@ -3,10 +3,10 @@ pkgname=dosfstools pkgver=2.11 -pkgrel=2 +pkgrel=3 pkgdesc="FAT/FAT32/VFAT filesystem checker" url="http://sparemint.atariforge.net/sparemint/html/packages/dosfstools.html" -depends=('glibc' 'bash') +depends=('glibc>=2.7-3' 'bash') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools|grep src.tar.gz$|sed 's/.*-\(.*\)\.src.*/\1/'|Fsort|tail -n 1" From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:09:58 2008 Subject: [Frugalware-git] frugalware-current: xfsprogs-attr-2.4.41_1-1-i686 Message-ID: <20080313230618.B87D61190A4D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76332bc58414d5ee333a9332f752613026fcce6b commit 76332bc58414d5ee333a9332f752613026fcce6b Author: crazy Date: Mon Mar 10 22:30:17 2008 +0100 xfsprogs-attr-2.4.41_1-1-i686 * Version bump * old source does not exists anymore I have to bump it diff --git a/source/base/xfsprogs-attr/FrugalBuild b/source/base/xfsprogs-attr/FrugalBuild index 315454a..2411bfe 100644 --- a/source/base/xfsprogs-attr/FrugalBuild +++ b/source/base/xfsprogs-attr/FrugalBuild @@ -3,19 +3,19 @@ # Contributor: VMiklos pkgname=xfsprogs-attr -pkgver=2.4.39_1 +pkgver=2.4.41_1 pkgrel=1 pkgdesc="Dynamic library for extended attribute support." url="http://oss.sgi.com/projects/xfs/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'attr_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'" source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_`echo ${pkgver} | sed -e 's/_/-/'`.tar.gz) -sha1sums=('d7b04e7a9b280862c2897432091b2da2efe8fa7a') +sha1sums=('868d1629ebe034c381ca221cdb5f45f71b1bf392') build() { - Fcd attr-2.4.39 + Fcd attr-2.4.41 Fmake --libdir=/lib --libexecdir=/usr/lib make DIST_ROOT=$Fdestdir install-dev install-lib install || Fdie } From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:00 2008 Subject: [Frugalware-git] frugalware-current: unarj-2.63a-3-i686 Message-ID: <20080313230618.9797D1190A4B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5edd464c995d4c5d87cf91a9e9767718bc7ba3f2 commit 5edd464c995d4c5d87cf91a9e9767718bc7ba3f2 Author: crazy Date: Mon Mar 10 22:24:23 2008 +0100 unarj-2.63a-3-i686 * rebuild diff --git a/source/base/unarj/FrugalBuild b/source/base/unarj/FrugalBuild index 0664f92..4fef0be 100644 --- a/source/base/unarj/FrugalBuild +++ b/source/base/unarj/FrugalBuild @@ -3,12 +3,12 @@ pkgname=unarj pkgver=2.63a -pkgrel=2 +pkgrel=3 pkgdesc="extract, test and view ARJ archives" url="http://www.ibiblio.org/pub/Linux/utils/compress/" up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/utils/compress/?M=D' |grep unarj.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://www.ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz) -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') sha1sums=('abd35d894444fea1a0bdc7472ed2346f0f8c6ba4') From crazy at frugalware.org Fri Mar 14 00:06:18 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:02 2008 Subject: [Frugalware-git] frugalware-current: xfsprogs-acl-2.2.47_1-1-i686 Message-ID: <20080313230618.D56851190A4F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=947cf0bb37204bb5c85423d2db9543e3fda3b04f commit 947cf0bb37204bb5c85423d2db9543e3fda3b04f Author: crazy Date: Mon Mar 10 22:36:10 2008 +0100 xfsprogs-acl-2.2.47_1-1-i686 * Version bump * same story =) source gone diff --git a/source/base/xfsprogs-acl/FrugalBuild b/source/base/xfsprogs-acl/FrugalBuild index 7438b7e..e1f7e80 100644 --- a/source/base/xfsprogs-acl/FrugalBuild +++ b/source/base/xfsprogs-acl/FrugalBuild @@ -3,17 +3,17 @@ # Contributor: VMiklos pkgname=xfsprogs-acl -pkgver=2.2.45_1 +pkgver=2.2.47_1 pkgrel=1 pkgdesc="Dynamic library for access control list support." url="http://oss.sgi.com/projects/xfs/" -depends=('xfsprogs-attr>=2.4.39_1') +depends=('xfsprogs-attr>=2.4.41_1') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'acl_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'" source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz \ acl-2.2.32-only-symlink-when-needed.patch0) -sha1sums=('264fae8dce2d19a11d50df9d1adbae301a442f1c' \ +sha1sums=('989a54cc2c600182cac9efafeaa73a4623852d1d' \ '79fefd16a84e51797165fc8438382382156a149b') build() @@ -21,7 +21,7 @@ build() ## see doc/INSTALL export OPTIMIZER="$CFLAGS" export DEBUG="-DNDEBUG" - Fcd acl-2.2.45 + Fcd acl-2.2.47 Fpatchall autoconf || return 1 Fconf --enable-lib64=no --libexecdir=/usr/libexec --bindir=/bin || return 1 From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:04 2008 Subject: [Frugalware-git] frugalware-current: xfsprogs-2.9.7_1-1-i686 Message-ID: <20080313230619.01C0E1190544@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eaabeb591aa39a5e06b6134c3c6498b3318899d4 commit eaabeb591aa39a5e06b6134c3c6498b3318899d4 Author: crazy Date: Mon Mar 10 23:03:38 2008 +0100 xfsprogs-2.9.7_1-1-i686 * Version bump * some cleanup ( for the rest I have to poke krix ) diff --git a/source/base/xfsprogs/FrugalBuild b/source/base/xfsprogs/FrugalBuild index 59cb3c1..100ea3d 100644 --- a/source/base/xfsprogs/FrugalBuild +++ b/source/base/xfsprogs/FrugalBuild @@ -3,27 +3,27 @@ # Contributor: VMiklos pkgname=xfsprogs -pkgver=2.9.4_1 +pkgver=2.9.7_1 pkgrel=1 pkgdesc="XFS filesystem-specific static libraries and headers." url="http://oss.sgi.com/projects/xfs/" -depends=('e2fsprogs') -makedepends=('xfsprogs-attr>=2.4.39_1') +depends=('e2fsprogs>=1.40.6-2') +makedepends=('xfsprogs-attr>=2.4.41_1') groups=('base') archs=('i686' 'x86_64' 'ppc') replaces=('xfsprogs-base') up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'xfsprogs_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'" source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz \ xfsprogs-sharedlibs.patch.gz) -sha1sums=('ee97510e8167edf1e5212da34028c77d911a7695' \ +sha1sums=('7cc9d12681597344978705e2c4a5bc54599e400a' \ 'd0db69f8de7a769272ae6584b5438a323628ab67') build() { unset MAKEFLAGS - Fcd $pkgname-2.9.4 + Fcd $pkgname-2.9.7 Fpatchall - DEBUG="-DNDEBUG" - OPTIMIZER="${CFLAGS}" + export DEBUG="-DNDEBUG" + export OPTIMIZER="" sed -i \ -e '/^GCFLAGS/s:-O1::' \ -e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${pkgname}-${pkgver}:" \ @@ -32,7 +32,6 @@ build() { autoconf || Fdie sed -i -e '/PLATFORM/d' configure || Fdie "sed PLATFORM" sed -i -e '/INSTALL.* -S .*LIBNAME/d' include/buildmacros || Fdie "sed symlinks" - unset CFLAGS Fmake --bindir=/bin \ --sbindir=/sbin \ --libexecdir=/usr/lib --enable-lib64=no \ From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:06 2008 Subject: [Frugalware-git] frugalware-current: xfsprogs-dmapi-2.2.8_1-3-i686 Message-ID: <20080313230619.3747B1190A4E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2166518af84cab0938605452aa6e082cea94d68 commit f2166518af84cab0938605452aa6e082cea94d68 Author: crazy Date: Mon Mar 10 23:09:41 2008 +0100 xfsprogs-dmapi-2.2.8_1-3-i686 * rebuild diff --git a/source/base/xfsprogs-dmapi/FrugalBuild b/source/base/xfsprogs-dmapi/FrugalBuild index e84752f..e8c8fcc 100644 --- a/source/base/xfsprogs-dmapi/FrugalBuild +++ b/source/base/xfsprogs-dmapi/FrugalBuild @@ -4,10 +4,10 @@ pkgname=xfsprogs-dmapi pkgver=2.2.8_1 -pkgrel=2 +pkgrel=3 pkgdesc="Data Management API static libraries and headers." url="http://oss.sgi.com/projects/xfs/" -depends=('xfsprogs>=2.8.16_1') +depends=('xfsprogs>=2.9.7_1') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'dmapi_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'" From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:08 2008 Subject: [Frugalware-git] frugalware-current: xfsprogs-xfsdump-2.2.48_1-1-i686 Message-ID: <20080313230619.4AFEA11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd3ef4d89d481b140a12955a70a19dff75b3d979 commit dd3ef4d89d481b140a12955a70a19dff75b3d979 Author: crazy Date: Mon Mar 10 23:17:24 2008 +0100 xfsprogs-xfsdump-2.2.48_1-1-i686 * Version bump diff --git a/source/base/xfsprogs-xfsdump/FrugalBuild b/source/base/xfsprogs-xfsdump/FrugalBuild index 6fcebf3..68de13e 100644 --- a/source/base/xfsprogs-xfsdump/FrugalBuild +++ b/source/base/xfsprogs-xfsdump/FrugalBuild @@ -3,23 +3,23 @@ # Contributor: VMiklos pkgname=xfsprogs-xfsdump -pkgver=2.2.46_1 +pkgver=2.2.48_1 pkgrel=1 pkgdesc="Administrative utilities for the XFS filesystem." url="http://oss.sgi.com/projects/xfs/" -depends=('xfsprogs-dmapi>=2.2.8_1-2' 'xfsprogs-attr>=2.4.39_1' 'ncurses') +depends=('xfsprogs-dmapi>=2.2.8_1-3' 'xfsprogs-attr>=2.4.41_1' 'ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'xfsdump_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'" source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz) -sha1sums=('98feca5b681a66db5dbd561b0eddefd269b70a35') +sha1sums=('bdfffa637efa23329899fd38d6b77119d51ea039') build() { ## see doc/INSTALL export OPTIMIZER="$CFLAGS" export DEBUG="-DNDEBUG" - Fcd xfsdump-2.2.46 + Fcd xfsdump-2.2.48 autoconf || return 1 Fconf --enable-lib64=no --libexecdir=/usr/libexec Fmake From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:09 2008 Subject: [Frugalware-git] frugalware-current: portmap-5beta-6-x86_64 Message-ID: <20080313230619.62CA91190A51@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7770352b7cb712916e7f6bcddff6a5d565e0f38a commit 7770352b7cb712916e7f6bcddff6a5d565e0f38a Author: crazy Date: Tue Mar 11 02:01:15 2008 +0100 portmap-5beta-6-x86_64 * rebuild * fixed makedepends * fixed CFLAGS * converted FB to F* commands diff --git a/source/base/portmap/FrugalBuild b/source/base/portmap/FrugalBuild index baa203a..f89950a 100644 --- a/source/base/portmap/FrugalBuild +++ b/source/base/portmap/FrugalBuild @@ -4,10 +4,11 @@ pkgname=portmap pkgver=5beta -pkgrel=5 +pkgrel=6 pkgdesc="RPC connection manager" url="ftp://ftp.porcupine.org/pub/security" -depends=('glibc') +depends=('glibc>=2.7-3') +makedepends=('tcp_wrappers') groups=('base') archs=('i686' 'x86_64') up2date="wget --passive-ftp -O - -q ftp://ftp.porcupine.org/pub/security/|grep 'portmap[[:print:]]*tar.gz<'|tail -n 1|cut -d _ -f 2|cut -d . -f 1" @@ -16,14 +17,15 @@ sha1sums=('783a322ca9220e4830664f94195ff923ce8a09d6' \ '63901011ef1eb163ad2bd8dd2a7e9af242f31482' \ 'bdd14477543527bd1aded1d750ebee86ff7bf74d') -build() { - cd $startdir/src/${pkgname}_${pkgver} - patch -p1 < $startdir/src/$pkgname-$pkgver.diff - - make || return 1 - - make DESTDIR=$startdir/pkg install - mkdir -p $startdir/pkg/etc/rc.d/rc.messages - install -m755 $startdir/src/rc.portmap $startdir/pkg/etc/rc.d/ - cp -a $startdir/messages/* $startdir/pkg/etc/rc.d/rc.messages/ +build() +{ + Fcd ${pkgname}_${pkgver} + Fpatchall + Fsed '-O2' "$CFLAGS" Makefile + Fmake + Fmakeinstall + Frcd + } + +# optimization OK From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:11 2008 Subject: [Frugalware-git] frugalware-current: acpid-1.0.6-2-x86_64 Message-ID: <20080313230619.A0BFE1190A52@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7191193ddf3a8533860263eec55025abe84c7a0 commit d7191193ddf3a8533860263eec55025abe84c7a0 Author: crazy Date: Tue Mar 11 02:03:43 2008 +0100 acpid-1.0.6-2-x86_64 * rebuild diff --git a/source/base/acpid/FrugalBuild b/source/base/acpid/FrugalBuild index f57c115..61a2e9f 100644 --- a/source/base/acpid/FrugalBuild +++ b/source/base/acpid/FrugalBuild @@ -3,9 +3,9 @@ pkgname=acpid pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for using ACPI power management" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:12 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.2.2-1-i686 Message-ID: <20080313230620.0595A1190547@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b572e25669d18d64428720ede2b1f2ee01ec7dfa commit b572e25669d18d64428720ede2b1f2ee01ec7dfa Author: crazy Date: Tue Mar 11 13:03:41 2008 +0100 ecj-3.2.2-1-i686 * well it helps when you dg add the patch first ;) diff --git a/source/devel-extra/ecj/ecj-square-bracket-classpath.diff b/source/devel-extra/ecj/ecj-square-bracket-classpath.diff new file mode 100644 index 0000000..689b625 --- /dev/null +++ b/source/devel-extra/ecj/ecj-square-bracket-classpath.diff @@ -0,0 +1,103 @@ +diff -urN org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java +--- org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java 2007-02-12 19:46:45.000000000 +0100 ++++ org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/Main.java 2007-03-03 19:56:45.000000000 +0100 +@@ -2723,6 +2723,10 @@ + ArrayList currentRuleSpecs = new ArrayList(defaultSize); + StringTokenizer tokenizer = new StringTokenizer(currentPath, + File.pathSeparator + "[]", true); //$NON-NLS-1$ ++ ArrayList tokens = new ArrayList(); ++ while (tokenizer.hasMoreTokens()) { ++ tokens.add(tokenizer.nextToken()); ++ } + // state machine + final int start = 0; + final int readyToClose = 1; +@@ -2737,14 +2741,20 @@ + // 'path[' 'path1;path2[' + final int rulesReadyToClose = 6; + // 'path[rule' 'path[rule1;rule2' ++ final int bracketOpened = 7; ++ // '.*[.*' ++ final int bracketClosed = 8; ++ // '.*([.*])+' + final int error = 99; + int state = start; + String token = null; +- while (tokenizer.hasMoreTokens() && state != error) { +- token = tokenizer.nextToken(); ++ int cursor = 0, tokensNb = tokens.size(), bracket = -1; ++ while (cursor < tokensNb && state != error) { ++ token = (String) tokens.get(cursor++); + if (token.equals(File.pathSeparator)) { + switch (state) { + case start: ++ case bracketOpened: + break; + case readyToClose: + case readyToCloseEndingWithRules: +@@ -2757,14 +2767,21 @@ + case rulesReadyToClose: + state = rulesNeedAnotherRule; + break; ++ case bracketClosed: ++ cursor = bracket + 1; ++ state = rulesStart; ++ break; + default: + state = error; + } + } else if (token.equals("[")) { //$NON-NLS-1$ + switch (state) { + case readyToClose: +- state = rulesStart; ++ bracket = cursor - 1; ++ case bracketClosed: ++ state = bracketOpened; + break; ++ case bracketOpened: + default: + state = error; + } +@@ -2773,6 +2790,10 @@ + case rulesReadyToClose: + state = readyToCloseEndingWithRules; + break; ++ case bracketOpened: ++ state = bracketClosed; ++ break; ++ case bracketClosed: + default: + state = error; + } +@@ -2789,10 +2810,22 @@ + state = rulesReadyToClose; + currentRuleSpecs.add(token); + break; ++ case bracketClosed: ++ for (int i = bracket; i < cursor ; i++) { ++ currentClasspathName += (String) tokens.get(i); ++ } ++ state = readyToClose; ++ break; ++ case bracketOpened: ++ break; + default: + state = error; + } + } ++ if (state == bracketClosed && cursor == tokensNb) { ++ cursor = bracket + 1; ++ state = rulesStart; ++ } + } + switch(state) { + case readyToClose: +@@ -2801,6 +2834,8 @@ + addNewEntry(paths, currentClasspathName, currentRuleSpecs, + customEncoding, isSourceOnly); + break; ++ case bracketOpened: ++ case bracketClosed: + default : + // we go on anyway + this.logger.logIncorrectClasspath(currentPath); From crazy at frugalware.org Fri Mar 14 00:06:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:14 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.2.2-1-i686 Message-ID: <20080313230619.BFB9711904CB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9bf4a6956eaf4e11046caaa587a4799ab4d784b1 commit 9bf4a6956eaf4e11046caaa587a4799ab4d784b1 Author: crazy Date: Tue Mar 11 12:58:06 2008 +0100 ecj-3.2.2-1-i686 * downgrade ( round 1 ) * ( but only from version , 3.3.1 package used 3.2.2 source heh ) * added comments on how to get the source and where to put it * also added comments about the 3.3* series * added fixup patches from vmiklos * added force to the package diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index a5561a5..48c51f5 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -2,25 +2,38 @@ # Maintainer: VMiklos pkgname=ecj -pkgver=3.3.2 +pkgver=3.2.2 date=200802211800 -gccver=4.3.0 -pkgrel=2 +pkgrel=1 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'" -source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip ecj-gcj.patch) -sha1sums=('c9229f01f991777829279d9907069e81857516ca' \ - '51bfaa1069ae5d0a81dee641fd8cfa093365d451') +## NOTE: when you bump that package you should _NOT_ use the source as is from ecplipe because +## it does not have any version and we end up to package it wrong. +## Also when you bump this package create a new dir in sources/ecj on our ftp ( eg: 3.3.1 ) +## get the ecjsrc.zip from eclipse and 'be sure is the version you want to bump to' and move it +## to be ecjsrc-$the_version.zip ( eg: ecjsrc-3.3.1.zip ) in that folder. +## NOTE2: 3.3* series have some problems with gcj 4.3* , until we figure why do not bump +## this package to any 3.3* series +## If someone wonders why we drop back to 3.2.2 that is simply because we used 3.2.2 and not 3.3.1.1 =) +## and this version does work. +#source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip \ +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgver/ecjsrc-$pkgver.zip \ + ecj-gcj.patch ecj-square-bracket-classpath.diff) +sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ + 'e79f7ca323e4e5dac8b15f498626413ffb7977cb' \ + '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java -makedepends=("gcc-gcj>=$gccver" "$pkgname>=3.3.2") +options=('force') +makedepends=("gcc-gcj") +_F_cd_path="." build() { + Fpatchall # this will be a separete package since these must be compiled with ecj - patch -p1 Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ea4bccd34325398ed34a812215d78d01e9b2b3c9 commit ea4bccd34325398ed34a812215d78d01e9b2b3c9 Author: crazy Date: Tue Mar 11 13:36:03 2008 +0100 ecj-3.2.2-2-i686 * release bump * build against gcj43 ( jaja hack hack :p) * added gccver * changed gcj makedepends to 'gcc-gcj>=$gccver' * added 'ecj=3.2.2' to makedepends ( do not change that for now ) * jar -> gjar diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index 48c51f5..1073241 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -4,7 +4,8 @@ pkgname=ecj pkgver=3.2.2 date=200802211800 -pkgrel=1 +gccver=4.3.0 +pkgrel=2 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') @@ -27,7 +28,7 @@ sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java options=('force') -makedepends=("gcc-gcj") +makedepends=("gcc-gcj>=$gccver" "$pkgname=3.2.2") _F_cd_path="." build() @@ -44,7 +45,7 @@ build() gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1 find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \ - xargs jar cf eclipse-ecj.jar + xargs gjar cf eclipse-ecj.jar Ffilerel /usr/share/java/eclipse-ecj.jar Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar From crazy at frugalware.org Fri Mar 14 00:06:20 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:17 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.0-4-i686 Message-ID: <20080313230620.6AE0A1190548@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2ee0afcc945470f7c5e6174176932a95866beec commit e2ee0afcc945470f7c5e6174176932a95866beec Author: crazy Date: Tue Mar 11 18:46:07 2008 +0100 gcc-4.3.0-4-i686 * release bump * added an patch to fix gjar problems with * './' prefixes not being stripped at all. diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 4296981..b301b9c 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gcc pkgver=4.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" depends=('binutils>=2.18.50.0.4-2' 'libstdc++' 'glibc>=2.7-3' 'mpfr>=2.3.1-2') @@ -18,11 +18,12 @@ up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" #source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ source=(ftp://ftp.gwdg.de/pub/misc/gcc/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 \ ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2 \ - README.Frugalware) + README.Frugalware gjar-prefix.patch) #signatures=("$source.sig" '' '') sha1sums=('d6ae7f024b99ba9b85f253fdeb00a9a1d6f1fc8d' \ 'd3c9af69bb788334a67039bbe056606e8590a8a7' \ - '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca') + '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca' \ + '0a9fa719eac4fef5e0fe29014421110635c50dcd') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ diff --git a/source/devel/gcc/gjar-prefix.patch b/source/devel/gcc/gjar-prefix.patch new file mode 100644 index 0000000..20363af --- /dev/null +++ b/source/devel/gcc/gjar-prefix.patch @@ -0,0 +1,36 @@ +diff -Naur gcc-4.3.0/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java gcc-4.3.0-p/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java +--- gcc-4.3.0/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java 2006-06-09 18:07:07.000000000 +0200 ++++ gcc-4.3.0-p/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java 2008-03-11 15:59:07.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Entry.java - represent a single file to write to a jar +- Copyright (C) 2006 Free Software Foundation, Inc. ++ Copyright (C) 2006, 2007 Free Software Foundation, Inc. + + This file is part of GNU Classpath. + +@@ -49,12 +49,22 @@ + public Entry(File file, String name) + { + this.file = file; +- this.name = name; ++ ++ /* Removes any './' prefixes automatically. Those caused trouble ++ * in (boot) classpath use-cases. See #32516. ++ */ ++ int start = 0; ++ while (name.length() > start + 2 ++ && name.codePointAt(start) == '.' ++ && name.codePointAt(start + 1) == File.separatorChar) ++ start += 2; ++ ++ this.name = name.substring(start); + } + + public Entry(File file) + { +- this.file = file; +- this.name = file.toString(); ++ this(file, file.toString()); + } ++ + } From crazy at frugalware.org Fri Mar 14 00:06:20 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:19 2008 Subject: [Frugalware-git] frugalware-current: fastjar-0.94-1-i686 Message-ID: <20080313230620.8CE361190546@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ef04e61bb70a831029d6130a00c6f9d8378d926 commit 8ef04e61bb70a831029d6130a00c6f9d8378d926 Author: crazy Date: Tue Mar 11 20:45:53 2008 +0100 fastjar-0.94-1-i686 * New package diff --git a/source/devel-extra/fastjar/FrugalBuild b/source/devel-extra/fastjar/FrugalBuild new file mode 100644 index 0000000..8703f58 --- /dev/null +++ b/source/devel-extra/fastjar/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 2.55 SBU +# Maintainer: crazy + +pkgname=fastjar +pkgver=0.94 +pkgrel=1 +pkgdesc="Fastjar is an implementation of Sun's jar utility" +depends=('zlib>=1.2.3-5') +groups=('devel-extra') +archs=('i686' 'x86_64') +Finclude sourceforge +sha1sums=('2b54b558bed1acef63455b27827b69e83c823f8d') + +# optimization OK + From crazy at frugalware.org Fri Mar 14 00:06:20 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:20 2008 Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.77-2-i686 Message-ID: <20080313230620.B46F31190A57@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e338d02c1aa397d9e8b07cf1f2287b9e7d2d92e3 commit e338d02c1aa397d9e8b07cf1f2287b9e7d2d92e3 Author: crazy Date: Tue Mar 11 20:50:30 2008 +0100 java-gcj-compat-1.0.77-2-i686 * relbump * droped the patch for now from source ( not yet removed ) * added fastjar to depends diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index 6f0e913..2606278 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -3,21 +3,20 @@ pkgname=java-gcj-compat pkgver=1.0.77 -pkgrel=1 +pkgrel=2 gccver=4.3.0 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" -depends=("libgcj=$gccver" 'gjdoc') +depends=("libgcj=$gccver" 'gjdoc' 'fastjar') makedepends=("gcc-gcj=$gccver" 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://sources.redhat.com/pub/rhug/java-gcj-compat-$pkgver.tar.gz \ - java-gcj.sh symlink-gjar-fastjar-is-gone-since-gcc4.2.patch) + java-gcj.sh) sha1sums=('07b4058ed0a254462d5196fee91e660d434f84ec' \ - '73c1f3cc2db4f63cb051e65f0c664358289e9f13' \ - 'f3cd78dde7169bfe841943ae508f5a073e2fc4e7') + '73c1f3cc2db4f63cb051e65f0c664358289e9f13') build() { From crazy at frugalware.org Fri Mar 14 00:06:20 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:22 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.2.2-3-i686 Message-ID: <20080313230620.F04A81190A54@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53e476d7d5c383c171cffbaf04460bab147edee5 commit 53e476d7d5c383c171cffbaf04460bab147edee5 Author: crazy Date: Tue Mar 11 21:03:20 2008 +0100 ecj-3.2.2-3-i686 * hack bump again diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index 1073241..b62d16f 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -5,7 +5,7 @@ pkgname=ecj pkgver=3.2.2 date=200802211800 gccver=4.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') @@ -20,6 +20,8 @@ up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release| ## this package to any 3.3* series ## If someone wonders why we drop back to 3.2.2 that is simply because we used 3.2.2 and not 3.3.1.1 =) ## and this version does work. +## NOTE3: Before you push an new update please _check_ if is working , to make a broken version +## compile again is a lot work #source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip \ source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgver/ecjsrc-$pkgver.zip \ ecj-gcj.patch ecj-square-bracket-classpath.diff) @@ -28,7 +30,7 @@ sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java options=('force') -makedepends=("gcc-gcj>=$gccver" "$pkgname=3.2.2") +makedepends=("gcc-gcj") _F_cd_path="." build() @@ -45,7 +47,7 @@ build() gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1 find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \ - xargs gjar cf eclipse-ecj.jar + xargs jar cf eclipse-ecj.jar Ffilerel /usr/share/java/eclipse-ecj.jar Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar From crazy at frugalware.org Fri Mar 14 00:06:21 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:24 2008 Subject: [Frugalware-git] frugalware-current: ecj-3.2.2-4-i686 Message-ID: <20080313230621.57EDE1190203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=853e51f086317b1bbd0494cd6ff9e148daf0e437 commit 853e51f086317b1bbd0494cd6ff9e148daf0e437 Author: crazy Date: Tue Mar 11 21:24:22 2008 +0100 ecj-3.2.2-4-i686 * build against right tree * added java-gcj-compat>=1.0.77-2 to makedepends diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index b62d16f..56cccef 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -5,7 +5,7 @@ pkgname=ecj pkgver=3.2.2 date=200802211800 gccver=4.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" groups=('devel-extra') @@ -30,7 +30,7 @@ sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java options=('force') -makedepends=("gcc-gcj") +makedepends=("gcc-gcj>=$gccver" "ecj>=3.2.2-3" "java-gcj-compat>=1.0.77-2") _F_cd_path="." build() From crazy at frugalware.org Fri Mar 14 00:06:21 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:25 2008 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.8-4-i686 Message-ID: <20080313230621.6E1631190549@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3a61a628fd35ccfb91db15068f993046f5a39eb commit a3a61a628fd35ccfb91db15068f993046f5a39eb Author: crazy Date: Tue Mar 11 21:35:22 2008 +0100 pacman-g2-3.6.8-4-i686 * rebuild diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 4dec62a..8498c6c 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -6,12 +6,12 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 pkgver=3.6.8 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=3 +pkgrel=4 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) -depends=('libarchive>=2.0.27' 'glibc>=2.7' 'grep' 'util-linux-ng') -makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \ +depends=('libarchive>=2.4.8-2' 'glibc>=2.7-3' 'grep>=2.5.3-3' 'util-linux-ng>=2.13.1-2') +makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat>=1.0.77-2' 'ecj>=3.2.2-4' 'mono' \ 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') Finclude mono From crazy at frugalware.org Fri Mar 14 00:06:21 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:26 2008 Subject: [Frugalware-git] frugalware-current: dialog-1.1_20071028-2-i686 Message-ID: <20080313230621.E4D83119054A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a87fdf3583bace6347676cda11e49e3796e4c9d commit 2a87fdf3583bace6347676cda11e49e3796e4c9d Author: crazy Date: Tue Mar 11 21:43:04 2008 +0100 dialog-1.1_20071028-2-i686 * rebuild diff --git a/source/base/dialog/FrugalBuild b/source/base/dialog/FrugalBuild index 5e820e1..f8aed73 100644 --- a/source/base/dialog/FrugalBuild +++ b/source/base/dialog/FrugalBuild @@ -3,10 +3,10 @@ pkgname=dialog pkgver=1.1_20071028 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to display dialog boxes from shell scripts" url="http://invisible-island.net/dialog/dialog.html" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump ftp://invisible-island.net/dialog/|grep tgz$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;$ p'" From crazy at frugalware.org Fri Mar 14 00:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:28 2008 Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.7.9-2-i686 Message-ID: <20080313230622.192791190A58@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d34c9b71617c14162cd92fd8131444ea10243227 commit d34c9b71617c14162cd92fd8131444ea10243227 Author: crazy Date: Tue Mar 11 21:48:06 2008 +0100 frugalwareutils-0.7.9-2-i686 * rebuild diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 7c4b3e7..248e969 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -3,11 +3,11 @@ pkgname=frugalwareutils pkgver=0.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" -depends=('glib2' 'ncurses' 'parted>=1.8.8' 'pacman-g2>=3.5.1') -makedepends=('dialog>=1.0_20051030-3' 'doxygen' 'asciidoc' 'docbook-xsl' \ +depends=('glib2>=2.14.6-2' 'ncurses>=5.6-3' 'parted>=1.8.8-2' 'pacman-g2>=3.6.8-4') +makedepends=('dialog>=1.1_20071028-2' 'doxygen' 'asciidoc' 'docbook-xsl' \ 'docbook-xml' 'sgml-common' 'po4a') groups=('base') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Mar 14 00:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:30 2008 Subject: [Frugalware-git] frugalware-current: cpio-2.9-3-i686 Message-ID: <20080313230622.3B58B119054C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8848677afe44c2b4c4c5d4521146be44e9a3610 commit b8848677afe44c2b4c4c5d4521146be44e9a3610 Author: crazy Date: Tue Mar 11 21:57:30 2008 +0100 cpio-2.9-3-i686 * rebuild * added gcc43 patch * depends fix diff --git a/source/base/cpio/FrugalBuild b/source/base/cpio/FrugalBuild index c39faeb..af7fcc2 100644 --- a/source/base/cpio/FrugalBuild +++ b/source/base/cpio/FrugalBuild @@ -3,17 +3,18 @@ pkgname=cpio pkgver=2.9 -pkgrel=2 +pkgrel=3 pkgdesc="A program to manage archives of files" url="http://www.gnu.org/software/cpio" -depends=('bash') +depends=('bash' 'glibc>=2.7-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnubz2 source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 \ - cpio-2.9-safer_name_suffix.patch) + cpio-2.9-safer_name_suffix.patch gcc43.patch) sha1sums=('ef381d0f33f1ea74475b6d813c42a74327762c4a' \ - '0c052bd7900bc8a39b74f36feab2d2358297f87b') + '0c052bd7900bc8a39b74f36feab2d2358297f87b' \ + '3533e0a6efc06a12e656ab6648f3100d12e105c0') build() { diff --git a/source/base/cpio/gcc43.patch b/source/base/cpio/gcc43.patch new file mode 100644 index 0000000..abe626e --- /dev/null +++ b/source/base/cpio/gcc43.patch @@ -0,0 +1,33 @@ +diff -up tar-1.19/lib/argp-fmtstream.h.gcc43 tar-1.19/lib/argp-fmtstream.h +--- tar-1.19/lib/argp-fmtstream.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp-fmtstream.h 2008-02-13 16:56:58.000000000 +0100 +@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI +-#define ARGP_FS_EI extern inline ++# ifdef __GNUC_STDC_INLINE__ ++# define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) ++# else ++# define ARGP_FS_EI extern inline ++# endif + #endif + + ARGP_FS_EI size_t +diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h +--- tar-1.19/lib/argp.h.gcc43 2007-09-28 15:11:36.000000000 +0200 ++++ tar-1.19/lib/argp.h 2008-02-13 16:55:36.000000000 +0100 +@@ -580,7 +580,11 @@ extern void *__argp_input (const struct + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# if defined __GNUC_STDC_INLINE__ ++# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) ++# else ++# define ARGP_EI extern __inline__ ++# endif + # endif + + ARGP_EI void + From crazy at frugalware.org Fri Mar 14 00:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:31 2008 Subject: [Frugalware-git] frugalware-current: psmisc-22.6-2-i686 Message-ID: <20080313230622.6A35C119054B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13376340a63986a607701cbacb17791acc7cb818 commit 13376340a63986a607701cbacb17791acc7cb818 Author: crazy Date: Tue Mar 11 22:00:28 2008 +0100 psmisc-22.6-2-i686 * rebuild diff --git a/source/base/psmisc/FrugalBuild b/source/base/psmisc/FrugalBuild index e799bae..eb7a6f2 100644 --- a/source/base/psmisc/FrugalBuild +++ b/source/base/psmisc/FrugalBuild @@ -3,9 +3,9 @@ pkgname=psmisc pkgver=22.6 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous procfs tools" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge From crazy at frugalware.org Fri Mar 14 00:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:33 2008 Subject: [Frugalware-git] frugalware-current: netkit-base-0.17-5-i686 Message-ID: <20080313230622.7EFAA1190A5B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=308dc71a0c65f6a5429607f7f0cde505af4e8f7b commit 308dc71a0c65f6a5429607f7f0cde505af4e8f7b Author: crazy Date: Tue Mar 11 23:50:43 2008 +0100 netkit-base-0.17-5-i686 * rebuild * converted FB to use F* commands diff --git a/source/base/netkit-base/FrugalBuild b/source/base/netkit-base/FrugalBuild index dcef5ea..5a16da5 100644 --- a/source/base/netkit-base/FrugalBuild +++ b/source/base/netkit-base/FrugalBuild @@ -4,12 +4,12 @@ pkgname=netkit-base pkgver=0.17 -pkgrel=4 +pkgrel=5 pkgdesc="This is netkit-base for Linux" url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" groups=('base') archs=('i686' 'x86_64') -depends=('glibc' 'portmap') +depends=('glibc>=2.7-3' 'portmap>=5beta-6') backup=(etc/{HOSTNAME,hosts,networks,nntpserver,protocols,resolv.conf,services} etc/hosts.{conf,allow,deny,equiv}) up2date="wget --passive-ftp -O - -q ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/|grep netkit-base.*tar.gz|sed -n -e 's/.*>netkit-base-\(.*\)\.tar\.gz.*/\1/' -e '1 p'" source=(ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-$pkgver.tar.gz \ @@ -20,22 +20,20 @@ sha1sums=('d1f610efa3320ecac75c2f13df8a45c84fc7d448' \ '08cabf0acb67286536478a0f43c3072d6133c513' \ 'f63ad8c3815d7ada3bd9deb0097038622e94f9f6') -build() { - cd $startdir/src/netkit-base-$pkgver - sed -i 's/localhost/localhost frugalware.local frugalware/' \ - etc.sample/hosts +build() + { + Fcd netkit-base-$pkgver + Fsed "localhost" "localhost frugalware.local frugalware" etc.sample/hosts - mkdir -p $startdir/pkg/{bin,etc} $startdir/pkg/usr/{sbin,man/man8} + Fmkdir {bin,etc} usr/{sbin,man/man8} install -m644 etc.sample/{host.conf,hosts,hosts.allow,hosts.deny,hosts.equiv,networks,nntpserver} \ - $startdir/pkg/etc/ - install -m644 $startdir/src/{protocols,services} $startdir/pkg/etc/ - grep -v domain etc.sample/resolv.conf > $startdir/pkg/etc/resolv.conf - echo "frugalware.local" > $startdir/pkg/etc/HOSTNAME + $Fdestdir/etc || Fdie + install -m644 $Fsrcdir/{protocols,services} $Fdestdir/etc || Fdie + grep -v domain etc.sample/resolv.conf > $startdir/pkg/etc/resolv.conf || Fdie + echo "frugalware.local" > $startdir/pkg/etc/HOSTNAME || Fdie - cd ../netdate - patch -p1 < $startdir/src/netdate.diff - make - make DESTDIR=$startdir/pkg install + cd ../netdate || Fdie + Fbuild } # optimization OK From crazy at frugalware.org Fri Mar 14 00:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:35 2008 Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-2-i686 Message-ID: <20080313230622.D1AFD1190A5A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5acdcf198a0186299f0580afe1675c64dde1262 commit d5acdcf198a0186299f0580afe1675c64dde1262 Author: crazy Date: Tue Mar 11 23:56:25 2008 +0100 sysklogd-1.5-2-i686 * rebuild * added missing depends=() diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index e32a474..b965397 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,11 +4,12 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Linux system logging utilities" url="http://www.ibiblio.org/pub/Linux/system/daemons/!INDEX" backup=(etc/syslog.conf etc/logrotate.d/syslog) -rodepends=('netkit-base') +depends=('glibc>=2.7-3') +rodepends=('netkit-base>=0.17-5') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://ftp.ibiblio.org/pub/Linux/system/daemons/?M=D'|grep sysklogd.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" From crazy at frugalware.org Fri Mar 14 00:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:37 2008 Subject: [Frugalware-git] frugalware-current: dcron-3.2-5-i686 Message-ID: <20080313230622.F06661190A5C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64ee9fed67cf6f714d37a1cec5940796c3b268b1 commit 64ee9fed67cf6f714d37a1cec5940796c3b268b1 Author: crazy Date: Wed Mar 12 00:02:17 2008 +0100 dcron-3.2-5-i686 * rebuild * added missing depends=() diff --git a/source/base/dcron/FrugalBuild b/source/base/dcron/FrugalBuild index 268148d..fb5e75b 100644 --- a/source/base/dcron/FrugalBuild +++ b/source/base/dcron/FrugalBuild @@ -3,10 +3,11 @@ pkgname=dcron pkgver=3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Dillon's Cron daemon" url="http://apollo.backplane.com/FreeSrc/" -rodepends=('sysklogd' 'psmisc') +depends=('glibc>=2.7-3') +rodepends=('sysklogd>=1.5-2' 'psmisc>=22.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(var/spool/cron/crontabs/root) From crazy at frugalware.org Fri Mar 14 00:06:23 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:39 2008 Subject: [Frugalware-git] frugalware-current: dhcpcd-3.1.8-2-i686 Message-ID: <20080313230623.1AD461190A55@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b545eecbf5d51811028bd9793f81a3b0b80c5c3 commit 1b545eecbf5d51811028bd9793f81a3b0b80c5c3 Author: crazy Date: Wed Mar 12 00:06:08 2008 +0100 dhcpcd-3.1.8-2-i686 * rebuild diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index 34cc740..f4087e5 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -3,13 +3,13 @@ pkgname=dhcpcd pkgver=3.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A DHCP client daemon" url="http://dhcpcd.berlios.de" groups=('base') archs=('i686' 'x86_64') -depends=('glibc') -rodepends=('frugalwareutils>=0.7.2') +depends=('glibc>=2.7-3') +rodepends=('frugalwareutils>=0.7.9-2') _F_berlios_ext=".tar.bz2" Finclude berlios source=(${source[@]} dhcpcd-3.0.17-service-paths.patch \ From crazy at frugalware.org Fri Mar 14 00:06:23 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:41 2008 Subject: [Frugalware-git] frugalware-current: gpm-1.20.1-14-i686 Message-ID: <20080313230623.6939D1190A5E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5570cb48e222c82e8f13f5cf855bb36d3c57899c commit 5570cb48e222c82e8f13f5cf855bb36d3c57899c Author: crazy Date: Wed Mar 12 00:17:05 2008 +0100 gpm-1.20.1-14-i686 * rebuild * added an patch to fix the build * OPEN_MAX gone in 2.6.23 diff --git a/source/base/gpm/FrugalBuild b/source/base/gpm/FrugalBuild index 76ad986..e959d40 100644 --- a/source/base/gpm/FrugalBuild +++ b/source/base/gpm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gpm pkgver=1.20.1 -pkgrel=13 +pkgrel=14 pkgdesc="General purpose mouse server" url="http://arcana.linux.it" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/gpm) @@ -15,10 +15,12 @@ source=(http://arcana.linux.it/pub/$pkgname/$pkgname-$pkgver.tar.gz rc.gpm \ rc.gpm-de.po gpm \ 01-mc-segfaults.patch \ gpm-1.20.1-ceilf-gcc4.patch \ - $pkgname-$pkgver-nodebug.patch) + $pkgname-$pkgver-nodebug.patch \ + openmax.patch) build() { + unset MAKEFLAGS Fbuild Frcd2 Ffile /etc/sysconfig/gpm @@ -27,9 +29,10 @@ build() # optimization OK sha1sums=('7a664bc1af6b39c41b1eeab96a48d46f423783b3' \ - '4d799baf9e0b5e5dbe3e34afcd847788c73bb8ed' \ - '2f7c697b367ac05c61ec9f09649407be55daee91' \ - '2a81304fa5332ee8d9051905c5adcac12b8f68be' \ - 'b0f48220a6d82df68e8812f477b06537acb52597' \ - '44cea22c374ff8690a09a7422749fc9a64f40468' \ - 'b2eb219209778f420e9453b579eb692ffd3c1f05') + '4d799baf9e0b5e5dbe3e34afcd847788c73bb8ed' \ + '2f7c697b367ac05c61ec9f09649407be55daee91' \ + '2a81304fa5332ee8d9051905c5adcac12b8f68be' \ + 'b0f48220a6d82df68e8812f477b06537acb52597' \ + '44cea22c374ff8690a09a7422749fc9a64f40468' \ + 'b2eb219209778f420e9453b579eb692ffd3c1f05' \ + '3a2f888b6639a940f1ab90eddc839d650bbbdbbb') diff --git a/source/base/gpm/openmax.patch b/source/base/gpm/openmax.patch new file mode 100644 index 0000000..0a968f9 --- /dev/null +++ b/source/base/gpm/openmax.patch @@ -0,0 +1,25 @@ +--- gpm-1.20.1/src/prog/gpm-root.y.openmax 2002-12-24 23:57:16.000000000 +0100 ++++ gpm-1.20.1/src/prog/gpm-root.y 2007-07-24 20:45:46.000000000 +0200 +@@ -525,7 +525,9 @@ + open("/dev/null",O_RDONLY); /* stdin */ + open(consolename,O_WRONLY); /* stdout */ + dup(1); /* stderr */ +- for (i=3;iarg,(char *)NULL); + exit(1); /* shouldn't happen */ + default: return 0; +--- gpm-1.20.1/src/special.c.openmax 2007-07-24 20:45:46.000000000 +0200 ++++ gpm-1.20.1/src/special.c 2007-07-24 20:45:46.000000000 +0200 +@@ -156,7 +156,9 @@ + open(GPM_NULL_DEV,O_RDONLY); /* stdin */ + open(console.device, O_WRONLY); /* stdout */ + dup(1); /* stderr */ +- for (i=3;i Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5307695ecf433a785b6879a887212ee214a2959 commit e5307695ecf433a785b6879a887212ee214a2959 Author: crazy Date: Wed Mar 12 00:34:24 2008 +0100 irqbalance-0.55-2-i686 * rebuild diff --git a/source/base/irqbalance/FrugalBuild b/source/base/irqbalance/FrugalBuild index 64b3778..5d31f2b 100644 --- a/source/base/irqbalance/FrugalBuild +++ b/source/base/irqbalance/FrugalBuild @@ -3,10 +3,10 @@ pkgname=irqbalance pkgver=0.55 -pkgrel=1 +pkgrel=2 pkgdesc="Distributes interrupts over the processors and cores you have." url="http://irqbalance.org/" -depends=('glib2') +depends=('glib2>=2.14.6-2') backup=(etc/sysconfig/$pkgname) groups=('base') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Mar 14 00:06:24 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:48 2008 Subject: [Frugalware-git] frugalware-current: jfsutils-1.1.12-2-i686 Message-ID: <20080313230624.0FF941190A5F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e34a7b140191d313b45051b648865d7a4117ed4c commit e34a7b140191d313b45051b648865d7a4117ed4c Author: crazy Date: Wed Mar 12 00:50:33 2008 +0100 jfsutils-1.1.12-2-i686 * rebuild diff --git a/source/base/jfsutils/FrugalBuild b/source/base/jfsutils/FrugalBuild index 270784d..dcc2b24 100644 --- a/source/base/jfsutils/FrugalBuild +++ b/source/base/jfsutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=jfsutils pkgver=1.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="JFS filesystem utilities" url="http://www-124.ibm.com/developerworks/oss/jfs/" -depends=('e2fsprogs') +depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://jfs.sourceforge.net/source.html |grep jfsutils |sed 's/.*utils-\(.*\)\.t.*/\1/;q'" From crazy at frugalware.org Fri Mar 14 00:06:24 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:49 2008 Subject: [Frugalware-git] frugalware-current: kbd-1.12-26-i686 Message-ID: <20080313230624.491F31190A61@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81a497cd438b55ec7c6c1b72063487b311462f92 commit 81a497cd438b55ec7c6c1b72063487b311462f92 Author: crazy Date: Wed Mar 12 01:08:47 2008 +0100 kbd-1.12-26-i686 * rebuild diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index a751d17..5df822f 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,11 +3,11 @@ pkgname=kbd pkgver=1.12 -pkgrel=25 +pkgrel=26 pkgdesc="Keyboard maps and console fonts" url="http://www.ibiblio.org/pub/Linux/system/keyboards/" up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/system/keyboards/?C=M;O=D'|grep kbd.*tar.gz$ | grep -v 'GR' |sed -n 's/.*d-\(.*\)\.t.*/\1/;1 p'" -depends=('sed' 'bash') +depends=('sed>=4.1.5-2' 'bash') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/font) From crazy at frugalware.org Fri Mar 14 00:06:24 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:50 2008 Subject: [Frugalware-git] frugalware-current: less-418-2-i686 Message-ID: <20080313230624.9858011904CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e12f51d1b2eaafb251d7d177060ede4547411c5f commit e12f51d1b2eaafb251d7d177060ede4547411c5f Author: crazy Date: Wed Mar 12 01:18:36 2008 +0100 less-418-2-i686 * rebuild diff --git a/source/base/less/FrugalBuild b/source/base/less/FrugalBuild index 539eb52..64119d8 100644 --- a/source/base/less/FrugalBuild +++ b/source/base/less/FrugalBuild @@ -3,10 +3,10 @@ pkgname=less pkgver=418 -pkgrel=1 +pkgrel=2 pkgdesc="A paginator similar to more" url="http://www.greenwoodsoftware.com/less" -depends=('ncurses' 'bash' 'file') +depends=('ncurses>=5.6-3' 'bash' 'file>=4.23-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.greenwoodsoftware.com/less/download.html |grep -m 1 .tar.gz | Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:24 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:51 2008 Subject: [Frugalware-git] frugalware-current: pciutils-2.2.10-2-i686 Message-ID: <20080313230624.A8CC31190545@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ae6ac117d1007fcbd2e08114d906d1c78790961 commit 0ae6ac117d1007fcbd2e08114d906d1c78790961 Author: crazy Date: Wed Mar 12 01:33:40 2008 +0100 pciutils-2.2.10-2-i686 * rebuild diff --git a/source/base/pciutils/FrugalBuild b/source/base/pciutils/FrugalBuild index f29846d..9cc4fb8 100644 --- a/source/base/pciutils/FrugalBuild +++ b/source/base/pciutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=pciutils pkgver=2.2.10 -pkgrel=1 +pkgrel=2 pkgdesc="PCI utilities" url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" -depends=('zlib') +depends=('zlib>=1.2.3-5') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.kernel.org/pub/software/utils/pciutils/|Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:24 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:51 2008 Subject: [Frugalware-git] frugalware-current: pcmciautils-014-3-i686 Message-ID: <20080313230624.CFBB61190931@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61a65c57008268c593649da99c89ee58fc0f642f commit 61a65c57008268c593649da99c89ee58fc0f642f Author: crazy Date: Wed Mar 12 01:58:20 2008 +0100 pcmciautils-014-3-i686 * rebuild * fix for CFLAGS * also while our cis tarball gone for some reason * I've put slack's one on our ftp now diff --git a/source/base/pcmciautils/FrugalBuild b/source/base/pcmciautils/FrugalBuild index 3b4b02b..1136fe1 100644 --- a/source/base/pcmciautils/FrugalBuild +++ b/source/base/pcmciautils/FrugalBuild @@ -3,23 +3,25 @@ pkgname=pcmciautils pkgver=014 -pkgrel=2 +pkgrel=3 pkgdesc="Contains the initialization tools necessary to allow the PCMCIA subsystem to behave as every other hotpluggable bus system." url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -depends=('sysfsutils>=1.3.0' 'module-init-tools>=3.2' 'udev') +depends=('sysfsutils>=2.1.0-2' 'module-init-tools>=3.4-6' 'udev>=118-7') groups=('base') backup=('etc/pcmcia/config.opts' 'etc/udev/rules.d/60-pcmcia.rules') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep '\.tar.bz2$'|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-$pkgver.tar.bz2 \ - http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/base/pcmciautils/cis-3.2.8.tar.gz \ + http://ftp.frugalware.org/pub/other/sources/$pkgname/cis-cs-3.2.8.tar.gz \ pcmciautils-014-udev094.diff) signatures=("${source[0]}.sign" '' '') build() { unset MAKEFLAGS + Fcd + Fsed 'CFLAGS := -pipe' "CFLAGS := $CFLAGS" Makefile Fbuild Fmkdir /lib/firmware - Ffilerel $Fsrcdir/*.cis /lib/firmware + Ffilerel $Fsrcdir/lib/firmware/*.cis /lib/firmware Fln pccardctl /sbin/lspcmcia } From crazy at frugalware.org Fri Mar 14 00:06:25 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:53 2008 Subject: [Frugalware-git] frugalware-current: procps-3.2.7-5-i686 Message-ID: <20080313230625.1AF511190933@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14e511a5ee676f5d050d01f32b8a6ce5c8a6c6bc commit 14e511a5ee676f5d050d01f32b8a6ce5c8a6c6bc Author: crazy Date: Wed Mar 12 02:11:51 2008 +0100 procps-3.2.7-5-i686 * rebuild diff --git a/source/base/procps/FrugalBuild b/source/base/procps/FrugalBuild index 13f1c22..0e6b997 100644 --- a/source/base/procps/FrugalBuild +++ b/source/base/procps/FrugalBuild @@ -3,10 +3,10 @@ pkgname=procps pkgver=3.2.7 -pkgrel=4 +pkgrel=5 pkgdesc="utilities for displaying process information" url="http://procps.sf.net" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=('etc/sysctl.conf') From crazy at frugalware.org Fri Mar 14 00:06:25 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:54 2008 Subject: [Frugalware-git] frugalware-current: sharutils-4.2.1-3-i686 Message-ID: <20080313230625.77DD1119054D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=415334cf2cfbcf194b8ffdfb684ad8559a08ea2e commit 415334cf2cfbcf194b8ffdfb684ad8559a08ea2e Author: crazy Date: Wed Mar 12 02:38:26 2008 +0100 sharutils-4.2.1-3-i686 * rebuild diff --git a/source/base/sharutils/FrugalBuild b/source/base/sharutils/FrugalBuild index af11911..9c22dcc 100644 --- a/source/base/sharutils/FrugalBuild +++ b/source/base/sharutils/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sharutils pkgver=4.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="GNU shar makes so-called shell archives out of many files" url="http://www.gnu.org/software/sharutils/" -depends=('gettext') +depends=('gettext>=0.17-2') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:25 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:56 2008 Subject: [Frugalware-git] frugalware-current: rp-pppoe-3.8-3-i686 Message-ID: <20080313230625.3FCC811904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ac4444f9f977eb2f12984a3f9ab3db673a4ae40 commit 8ac4444f9f977eb2f12984a3f9ab3db673a4ae40 Author: crazy Date: Wed Mar 12 02:33:23 2008 +0100 rp-pppoe-3.8-3-i686 * rebuild * added missing Fdie's * source and url fix diff --git a/source/base/rp-pppoe/FrugalBuild b/source/base/rp-pppoe/FrugalBuild index 35085fb..d0cc088 100644 --- a/source/base/rp-pppoe/FrugalBuild +++ b/source/base/rp-pppoe/FrugalBuild @@ -3,15 +3,15 @@ pkgname=rp-pppoe pkgver=3.8 -pkgrel=2 +pkgrel=3 pkgdesc="Roaring Penguin PPPoE client" -url="http://www.roaringpenguin.com/pppoe/" +url="http://www.roaringpenguin.com/products/pppoe" groups=('base') archs=('i686' 'x86_64') -depends=('ppp') +depends=('ppp>=2.4.4-3') backup=(etc/ppp/{pppoe.conf,firewall-standalone,firewall-masq,pppoe-server-options}) up2date="lynx -dump $url |grep tar.gz|sed -n -e 's/.*rp-pppoe-\(.*\)\.tar\.gz .*/\1/' -e '1 p'" -source=(http://www.roaringpenguin.com/penguin/pppoe/$pkgname-$pkgver.tar.gz \ +source=(http://www.roaringpenguin.com/files/download/$pkgname-$pkgver.tar.gz \ rc.adsl) sha1sums=('d9a4346701e580b4a6049a940557b38533f9e8f7' \ 'f79284e0beab4d3362c468faead10a43dd71607e') @@ -19,10 +19,10 @@ sha1sums=('d9a4346701e580b4a6049a940557b38533f9e8f7' \ build() { Fcd - cd src + cd src || Fdie Fmake make RPM_INSTALL_ROOT=$Fdestdir install - cd ../gui + cd ../gui || Fdie Fmake make RPM_INSTALL_ROOT=$Fdestdir install Frcd adsl From crazy at frugalware.org Fri Mar 14 00:06:25 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:58 2008 Subject: [Frugalware-git] frugalware-current: slocate-3.1-4-i686 Message-ID: <20080313230625.C8B8A11904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a46b746f5f9814b129b15894b318963174f24be5 commit a46b746f5f9814b129b15894b318963174f24be5 Author: crazy Date: Wed Mar 12 02:43:15 2008 +0100 slocate-3.1-4-i686 * rebuild diff --git a/source/base/slocate/FrugalBuild b/source/base/slocate/FrugalBuild index ff72f5b..f4b49e8 100644 --- a/source/base/slocate/FrugalBuild +++ b/source/base/slocate/FrugalBuild @@ -3,10 +3,10 @@ pkgname=slocate pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Security Enhanced version of the GNU Locate" url="http://www.geekreview.org/slocate" -depends=('util-linux' 'frugalware') +depends=('util-linux-ng>=2.13.1-2' 'frugalware>=0.8-2') groups=('base') archs=('i686' 'x86_64') backup=('etc/updatedb.conf') From crazy at frugalware.org Fri Mar 14 00:06:25 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:10:59 2008 Subject: [Frugalware-git] frugalware-current: sysvinit-2.86-28-i686 Message-ID: <20080313230625.DDDC31190A56@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f80e244301dc4eaa2a3cfcaed2843a33019e959 commit 6f80e244301dc4eaa2a3cfcaed2843a33019e959 Author: crazy Date: Wed Mar 12 02:49:13 2008 +0100 sysvinit-2.86-28-i686 * rebuild diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index 3bd731b..1c7cde1 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sysvinit pkgver=2.86 -pkgrel=27 +pkgrel=28 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" -depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'gawk') +depends=('shadow>=4.1.0-4' 'util-linux-ng>=2.13.1-2' 'coreutils>=6.10-3' 'glibc>=2.7-3' 'gawk>=3.1.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/{inittab,rc.d/rc.local}) From crazy at frugalware.org Fri Mar 14 00:06:25 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:01 2008 Subject: [Frugalware-git] frugalware-current: tcsh-6.15.00-2-i686 Message-ID: <20080313230626.04A351190A60@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb09113cebe99d2f23e3958b00314d9462e7e2b3 commit eb09113cebe99d2f23e3958b00314d9462e7e2b3 Author: crazy Date: Wed Mar 12 02:53:27 2008 +0100 tcsh-6.15.00-2-i686 * rebuild diff --git a/source/base/tcsh/FrugalBuild b/source/base/tcsh/FrugalBuild index e0f3bf5..c0b9c43 100644 --- a/source/base/tcsh/FrugalBuild +++ b/source/base/tcsh/FrugalBuild @@ -3,10 +3,10 @@ pkgname=tcsh pkgver=6.15.00 -pkgrel=1 +pkgrel=2 pkgdesc="Enhanced version of the Berkeley C shell" url="http://www.tcsh.org/Welcome" -depends=('ncurses') +depends=('ncurses>=5.6-3') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/csh.login) From crazy at frugalware.org Fri Mar 14 00:06:26 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:03 2008 Subject: [Frugalware-git] frugalware-current: reiserfsprogs-3.6.19-3-i686 Message-ID: <20080313230626.42E5B11904D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7648da274b3adefcbcd7227d3bc7c93b51c867d commit c7648da274b3adefcbcd7227d3bc7c93b51c867d Author: crazy Date: Wed Mar 12 03:12:32 2008 +0100 reiserfsprogs-3.6.19-3-i686 * rebuild * added 2 patches to fix the build diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index 7c73f3a..e1fffcc 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -3,18 +3,23 @@ pkgname=reiserfsprogs pkgver=3.6.19 -pkgrel=2 +pkgrel=3 pkgdesc="Reiserfs utilities" url="http://www.namesys.com" -depends=('e2fsprogs') +depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" -source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188') +#source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://www.sfr-fresh.com/linux/misc/$pkgname-$pkgver.tar.gz \ + reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) +sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ + 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ + 'fd97c2e9c9a8dc2064e74e41e7f6b4d8e3b61a09') build() { + unset MAKEFLAGS Fbuild || return 1 Fmv /usr/sbin / Fln reiserfsck /sbin/fsck.reiserfs diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch new file mode 100644 index 0000000..2146c94 --- /dev/null +++ b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch @@ -0,0 +1,12 @@ +diff -ur reiserfsprogs-3.6.19.orig/fsck/main.c reiserfsprogs-3.6.19/fsck/main.c +--- reiserfsprogs-3.6.19.orig/fsck/main.c 2004-10-07 15:04:08.000000000 +0100 ++++ reiserfsprogs-3.6.19/fsck/main.c 2007-05-02 16:05:08.000000000 +0100 +@@ -416,7 +416,7 @@ + (data->log == stdout) ? "stdout" : + (data->log_file_name ? data->log_file_name : "fsck.run")); + +- if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you want to " ++ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) && !user_confirmed (warn_to, "\nDo you want to " + "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n")) + exit (EXIT_USER); + } diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch new file mode 100644 index 0000000..5883ce8 --- /dev/null +++ b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch @@ -0,0 +1,35 @@ +backported from 3.6.20 + +http://bugs.gentoo.org/153494 + +--- include/reiserfs_fs.h ++++ include/reiserfs_fs.h +@@ -38,14 +38,22 @@ + # define extern_inline + #endif + +-#include +- + #ifndef get_unaligned +-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ +- defined(__PPC) || defined(powerpc) || defined(__powerpc__) +-# define get_unaligned(ptr) (*(ptr)) +-# define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) ++#define get_unaligned(ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp; \ ++ memcpy(&__tmp, (ptr), sizeof(*(ptr))); \ ++ __tmp; \ ++}) + #endif ++ ++#ifndef put_unaligned ++#define put_unaligned(val, ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp = (val); \ ++ memcpy((ptr), &__tmp, sizeof(*(ptr))); \ ++ (void)0; \ ++}) + #endif + + #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) From crazy at frugalware.org Fri Mar 14 00:06:26 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:04 2008 Subject: [Frugalware-git] frugalware-current: apmd-3.0.2-7-i686 Message-ID: <20080313230626.D46661190932@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73c798898705eb30628129237eb14bbccf45bbf5 commit 73c798898705eb30628129237eb14bbccf45bbf5 Author: crazy Date: Wed Mar 12 03:48:22 2008 +0100 apmd-3.0.2-7-i686 * rebuild * added some Fsed's to fix the build * and some other issues diff --git a/source/base/apmd/FrugalBuild b/source/base/apmd/FrugalBuild index 722a042..569b774 100644 --- a/source/base/apmd/FrugalBuild +++ b/source/base/apmd/FrugalBuild @@ -3,10 +3,10 @@ pkgname=apmd pkgver=3.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="Set of tools for managing notebook power consumption" url="http://alumnit.ca/~apenwarr/apmd/" -depends=('glibc') +depends=('glibc>=2.7-3') makedepends=('libx11' 'libxaw') groups=('base') archs=('i686' 'x86_64') @@ -26,6 +26,9 @@ build() Fcd $pkgname Fpatchall || return 1 Fsed '-I/usr/src/linux/include' '-I/usr/include' Makefile + Fsed '-Vt' '' Makefile + Fsed '/X11R6' '' Makefile + Fsed '-O' "$CFLAGS" Makefile Fmake || return 1 Fmkdir /etc /usr Fmakeinstall PREFIX=$Fdestdir/usr APMD_PROXY_DIR=$Fdestdir/etc @@ -33,3 +36,5 @@ build() } # vim: ft=sh + +# optimization OK From crazy at frugalware.org Fri Mar 14 00:06:26 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:06 2008 Subject: [Frugalware-git] frugalware-current: reiserfsprogs-3.6.19-3-i686 Message-ID: <20080313230626.88E4C1190A64@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=786c227a8fe06677e4018a697b7c31409b0153a0 commit 786c227a8fe06677e4018a697b7c31409b0153a0 Author: crazy Date: Wed Mar 12 03:16:42 2008 +0100 reiserfsprogs-3.6.19-3-i686 * better source url * re added up2date diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index e1fffcc..f04c7b2 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -9,9 +9,10 @@ url="http://www.namesys.com" depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" +#up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" #source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -source=(http://www.sfr-fresh.com/linux/misc/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump http://mirror.trouble-free.net/sources/|Flasttar" +source=(http://mirror.trouble-free.net/sources//$pkgname-$pkgver.tar.gz \ reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ From crazy at frugalware.org Fri Mar 14 00:06:27 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:08 2008 Subject: [Frugalware-git] frugalware-current: man-1.6f-2-i686 Message-ID: <20080313230627.0639D1190A63@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2535843a2ca654dec4e997b7751261ee0cbf9c72 commit 2535843a2ca654dec4e997b7751261ee0cbf9c72 Author: crazy Date: Wed Mar 12 03:58:38 2008 +0100 man-1.6f-2-i686 * rebuild * workaround SMP build diff --git a/source/base/man/FrugalBuild b/source/base/man/FrugalBuild index f06049c..8d47925 100644 --- a/source/base/man/FrugalBuild +++ b/source/base/man/FrugalBuild @@ -3,10 +3,10 @@ pkgname=man pkgver=1.6f -pkgrel=1 +pkgrel=2 pkgdesc="A utility for reading man pages" url="http://primates.ximian.com/~flucifredi/man/" -depends=('groff' 'less' 'gzip' 'gawk' 'coreutils' 'bash') +depends=('groff>=1.19.2-3' 'less>=418-2' 'gzip>=1.3.12-3' 'gawk>=3.1.6-2' 'coreutils>=6.10-3' 'bash') backup=(etc/profile.d/man-colors.sh) groups=('base') archs=('i686' 'x86_64' 'ppc') @@ -25,6 +25,7 @@ sha1sums=('c97012607ed9d75a6eee7e66d257a99a8ed86918' \ build() { + unset MAKEFLAGS Fpatchall ./configure -confdir=/etc +lang all +fhs || Fdie From crazy at frugalware.org Fri Mar 14 00:06:27 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:09 2008 Subject: [Frugalware-git] frugalware-current: lua-5.1.2-2-i686 Message-ID: <20080313230627.D1BBA1190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef2675ad31ae3f245e53258ad3668e4fe1307ed4 commit ef2675ad31ae3f245e53258ad3668e4fe1307ed4 Author: crazy Date: Wed Mar 12 04:03:57 2008 +0100 lua-5.1.2-2-i686 * rebuild diff --git a/source/apps/lua/FrugalBuild b/source/apps/lua/FrugalBuild index b85f80a..3396d3c 100644 --- a/source/apps/lua/FrugalBuild +++ b/source/apps/lua/FrugalBuild @@ -4,10 +4,10 @@ pkgname=lua pkgver=5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/" -depends=('readline') +depends=('readline>=5.2-2') groups=('apps' 'devel-core') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.lua.org/ftp/'|Flasttar" From crazy at frugalware.org Fri Mar 14 00:06:28 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:11 2008 Subject: [Frugalware-git] frugalware-current: rsync-2.6.9-4-i686 Message-ID: <20080313230628.698ED11904D4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=521c6d80da238fbdd1a92771bbab72c300138d17 commit 521c6d80da238fbdd1a92771bbab72c300138d17 Author: crazy Date: Wed Mar 12 04:16:28 2008 +0100 rsync-2.6.9-4-i686 * rebuild * fixed source location * fixed broken up2date ( a newer version is out ) diff --git a/source/network/rsync/FrugalBuild b/source/network/rsync/FrugalBuild index 8e74a64..dea34d6 100644 --- a/source/network/rsync/FrugalBuild +++ b/source/network/rsync/FrugalBuild @@ -4,16 +4,16 @@ pkgname=rsync pkgver=2.6.9 -pkgrel=3 +pkgrel=4 pkgdesc="An open source utility that provides fast incremental file transfer." url="http://samba.anu.edu.au/rsync/" groups=('network' 'devel-core') archs=('i686' 'x86_64') backup=(etc/rsyncd.conf) -depends=('popt') +depends=('popt>=1.13') install=$pkgname.install -up2date="lynx -dump $url|grep 'released\.' |grep -v pre|sed -ne 's/.*n \(.*\) h.*/\1/' -e '1 p'" -source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump http://samba.anu.edu.au/rsync/|grep -m1 'Rsync version \(.*\) released'|sed 's/.*on \(.*\) re.*/\1/'" +source=(http://samba.org/ftp/rsync/src/$pkgname-$pkgver.tar.gz \ http://www.suse.de/~krahmer/rsync-2.6.9-fname-obo.diff \ http://rsync.samba.org/ftp/rsync/munge-symlinks-2.6.9.diff \ rsyncd.conf rc.rsyncd) From crazy at frugalware.org Fri Mar 14 00:06:28 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:13 2008 Subject: [Frugalware-git] frugalware-current: pkgconfig-0.23-2-i686 Message-ID: <20080313230628.79BEF1190A59@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf578bba1cf9dbeed6d89cfa423ca6245bc1a87b commit cf578bba1cf9dbeed6d89cfa423ca6245bc1a87b Author: crazy Date: Wed Mar 12 04:19:41 2008 +0100 pkgconfig-0.23-2-i686 * rebuild diff --git a/source/lib/pkgconfig/FrugalBuild b/source/lib/pkgconfig/FrugalBuild index b773a68..868b259 100644 --- a/source/lib/pkgconfig/FrugalBuild +++ b/source/lib/pkgconfig/FrugalBuild @@ -3,11 +3,11 @@ pkgname=pkgconfig pkgver=0.23 -pkgrel=1 +pkgrel=2 pkgdesc="A system for managing library compile/link flags" url="http://freedesktop.org/wiki/Software_2fpkgconfig" groups=('lib' 'devel-core') -depends=('glibc' 'glib2') +depends=('glibc>=2.7-3' 'glib2>=2.14.6-2') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://www.freedesktop.org/software/pkgconfig/releases/?C=M;O=D' | grep tar\.gz | sed -n 's/.*-\([0-9\.]\+\)\.tar.*/\1/;1 p'" source=(http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-$pkgver.tar.gz $pkgname.sh) From crazy at frugalware.org Fri Mar 14 00:06:27 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:14 2008 Subject: [Frugalware-git] frugalware-current: fakeroot-1.9.3-2-i686 Message-ID: <20080313230627.E79971190A62@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a1a03ff3a40aade8c032e6164169ea51c561d2f commit 3a1a03ff3a40aade8c032e6164169ea51c561d2f Author: crazy Date: Wed Mar 12 04:06:14 2008 +0100 fakeroot-1.9.3-2-i686 * rebuild diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index ec028b4..a4bd84d 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -4,10 +4,10 @@ pkgname=fakeroot pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" -depends=('glibc') +depends=('glibc>=2.7-3') makedepends=('po4a') groups=('devel' 'devel-core') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Mar 14 00:06:28 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:16 2008 Subject: [Frugalware-git] frugalware-current: openssl-0.9.8-12-i686 Message-ID: <20080313230628.997E311904D5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aadcd24656ce6d790a493d9be3413404d553c7ff commit aadcd24656ce6d790a493d9be3413404d553c7ff Author: crazy Date: Wed Mar 12 04:33:02 2008 +0100 openssl-0.9.8-12-i686 * rebuild diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild index 93bfc61..1f7cc70 100644 --- a/source/lib/openssl/FrugalBuild +++ b/source/lib/openssl/FrugalBuild @@ -5,13 +5,13 @@ pkgname=openssl pkgver=0.9.8 pkgextraver=g -pkgrel=11 +pkgrel=12 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" url="http://www.openssl.org/source/" groups=('lib' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('glibc') -makedepends=('util-linux') +depends=('glibc>=2.7-3') +makedepends=('util-linux-ng>=2.13.1-2') up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'" source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff) signatures=("$source.asc" '') From crazy at frugalware.org Fri Mar 14 00:06:28 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:18 2008 Subject: [Frugalware-git] frugalware-current: python-2.5.2-2-i686 Message-ID: <20080313230628.F3B1C1190936@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cd6538a4ae30b50fe7d27a7ce357ae76ca247c93 commit cd6538a4ae30b50fe7d27a7ce357ae76ca247c93 Author: crazy Date: Wed Mar 12 04:46:05 2008 +0100 python-2.5.2-2-i686 * rebuild diff --git a/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild index 9a9b589..f0adfb1 100644 --- a/source/devel/python/FrugalBuild +++ b/source/devel/python/FrugalBuild @@ -4,10 +4,10 @@ pkgname=python pkgver=2.5.2 shortpkgver=2.5 # 2.3 if $pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level scripting language" url="http://www.python.org" -depends=('glibc' 'db>=4.6.18' 'bzip2' 'gdbm' 'openssl' 'glib2') +depends=('glibc>=2.7-3' 'db>=4.6.21-3' 'bzip2>=1.0.4-2' 'gdbm>=1.8.3-4' 'openssl>=0.9.8-12' 'glib2>=2.14.6-2') makedepends=('tk>=8.5' 'gtk+2') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:19 2008 Subject: [Frugalware-git] frugalware-current: bc-1.06-5-i686 Message-ID: <20080313230629.0E5D8119092F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b5508f51628e732ad10fee47d5d138adad427e2 commit 9b5508f51628e732ad10fee47d5d138adad427e2 Author: crazy Date: Wed Mar 12 04:55:38 2008 +0100 bc-1.06-5-i686 * rebuild diff --git a/source/apps/bc/FrugalBuild b/source/apps/bc/FrugalBuild index 2688151..7526c28 100644 --- a/source/apps/bc/FrugalBuild +++ b/source/apps/bc/FrugalBuild @@ -3,10 +3,10 @@ pkgname=bc pkgver=1.06 -pkgrel=4 +pkgrel=5 pkgdesc="An arbitrary precision calculator language" url="http://www.gnu.org/software/bc/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('apps' 'chroot-core') archs=('i686' 'x86_64') Fup2gnugz From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:20 2008 Subject: [Frugalware-git] frugalware-current: distcc-2.18.3-4-i686 Message-ID: <20080313230629.1ED331190A5D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06c8022d4929f521c3c5c63a14917164770b27d2 commit 06c8022d4929f521c3c5c63a14917164770b27d2 Author: crazy Date: Wed Mar 12 05:02:31 2008 +0100 distcc-2.18.3-4-i686 * rebuild * fixed symlink bug diff --git a/source/devel-extra/distcc/FrugalBuild b/source/devel-extra/distcc/FrugalBuild index e108de7..296c651 100644 --- a/source/devel-extra/distcc/FrugalBuild +++ b/source/devel-extra/distcc/FrugalBuild @@ -4,11 +4,11 @@ pkgname=distcc pkgver=2.18.3 -pkgrel=3 +pkgrel=4 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.samba.org" -depends=('popt' 'gcc') -rodepends=('shadow') +depends=('popt>=1.13' 'gcc>=4.3.0-4') +rodepends=('shadow>=4.1.0-4') groups=('devel-extra' 'chroot-core') archs=('i686' 'x86_64') up2date="lynx -dump http://distcc.samba.org/download.html | grep tar.bz2 | sed -ne 's/.*-\(.*\)\.t.*/\1/;s/systray-plugin-//;1 p'" @@ -26,12 +26,10 @@ build() Frcd distccd Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver Fmkdir /usr/lib/$pkgname/bin - for i in {$CARCH-pc-linux-gnu-,}{cc,c++,gcc,g++} + for i in {$CHOST-,}{cc,c++,gcc,g++} do Fln /usr/bin/$pkgname /usr/lib/$pkgname/bin/$i done } -# optimalization OK - # optimization OK From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:21 2008 Subject: [Frugalware-git] frugalware-current: libidn-0.5.20-3-i686 Message-ID: <20080313230629.2DC6F1190A65@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e4affbbdb8ac2a9b883b867799fdd24f5e45073 commit 2e4affbbdb8ac2a9b883b867799fdd24f5e45073 Author: crazy Date: Wed Mar 12 05:09:35 2008 +0100 libidn-0.5.20-3-i686 * rebuild diff --git a/source/lib/libidn/FrugalBuild b/source/lib/libidn/FrugalBuild index 30151dd..fb5f86b 100644 --- a/source/lib/libidn/FrugalBuild +++ b/source/lib/libidn/FrugalBuild @@ -3,11 +3,11 @@ pkgname=libidn pkgver=0.5.20 -pkgrel=2 +pkgrel=3 pkgdesc="GNU Libidn is an implementation of the Stringprep,Punycode and IDNA specification." url="http://www.gnu.org/software/libidn/" -depends=('glibc') -makedepends=('java-gcj-compat' 'ecj' 'gcc-gcj' 'libtool') +depends=('glibc>=2.7-3') +makedepends=('java-gcj-compat>=1.0.77-2' 'ecj>=3.2.2-4' 'gcc-gcj>=4.3.0-4' 'libtool>=1.5.26-2') archs=('i686' 'x86_64') groups=('lib' 'chroot-core') up2date=$pkgver From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:23 2008 Subject: [Frugalware-git] frugalware-current: libxml2-2.6.31-2-i686 Message-ID: <20080313230629.3BEEA1190A66@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=20cdbae1353f7527f00843d52ff32494ed294a46 commit 20cdbae1353f7527f00843d52ff32494ed294a46 Author: crazy Date: Wed Mar 12 05:17:09 2008 +0100 libxml2-2.6.31-2-i686 * rebuild diff --git a/source/lib/libxml2/FrugalBuild b/source/lib/libxml2/FrugalBuild index ec853c6..7cabdc4 100644 --- a/source/lib/libxml2/FrugalBuild +++ b/source/lib/libxml2/FrugalBuild @@ -4,13 +4,13 @@ pkgname=libxml2 pkgver=2.6.31 -pkgrel=1 +pkgrel=2 pkgdesc="XML parsing library" url="http://www.xmlsoft.org/" groups=('lib' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('zlib') -makedepends=('python>=2.5' 'readline') +depends=('zlib>=1.2.3-5') +makedepends=('python>=2.5.2-2' 'readline>=5.2-2') #up2date="lynx -dump 'ftp://xmlsoft.org/libxml2/'|grep -m1 'LATEST_LIBXML2_IS_'|sed 's/.*xml2-\(.*\).t.*/\1/'" up2date="lynx -dump 'ftp://xmlsoft.org/libxml2/'|grep 'libxml2-\(.*\).tar.gz'|Flasttar" source=(ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz) From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:24 2008 Subject: [Frugalware-git] frugalware-current: sudo-1.6.9p14-1-i686 Message-ID: <20080313230629.4942B1190A67@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1daa073a0aee5b128355511e3acaf36ea60f7841 commit 1daa073a0aee5b128355511e3acaf36ea60f7841 Author: crazy Date: Wed Mar 12 05:24:50 2008 +0100 sudo-1.6.9p14-1-i686 * Version bump * old source gone diff --git a/source/apps/sudo/FrugalBuild b/source/apps/sudo/FrugalBuild index c9c670b..cecbed1 100644 --- a/source/apps/sudo/FrugalBuild +++ b/source/apps/sudo/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: VMiklos pkgname=sudo -pkgver=1.6.9p12 +pkgver=1.6.9p14 pkgrel=1 pkgdesc="Give limited root privileges to certain users" url="http://www.sudo.ws/" -depends=('glibc') +depends=('glibc>=2.7-3') groups=('apps' 'chroot-core') archs=('i686' 'x86_64') backup=('etc/sudoers') up2date="lynx -dump http://www.sudo.ws/|grep 'stable version is'|sed 's/.*sudo \(.*\), .*/\1/'" source=(http://www.sudo.ws/$pkgname/dist/$pkgname-$pkgver.tar.gz sudo.sh) -sha1sums=('c2b07c68d2026fb3e7786b2c9a8fb0c519a830f8' \ +sha1sums=('71ac10f51c1b3d6338ac936fe39be3009ea4dbb4' \ 'ff0745f1d95c614f55e8fd1f85abee2486cf24ba') build() From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:25 2008 Subject: [Frugalware-git] frugalware-current: distcc-2.18.3-5-i686 Message-ID: <20080313230629.5978E1190A42@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=536cae0be986d4914d8cc88bd000a1c079f4c0ef commit 536cae0be986d4914d8cc88bd000a1c079f4c0ef Author: crazy Date: Wed Mar 12 05:32:25 2008 +0100 distcc-2.18.3-5-i686 * fix another bug * sysconfig/distccd need be in backup() diff --git a/source/devel-extra/distcc/FrugalBuild b/source/devel-extra/distcc/FrugalBuild index 296c651..c8dd77a 100644 --- a/source/devel-extra/distcc/FrugalBuild +++ b/source/devel-extra/distcc/FrugalBuild @@ -4,12 +4,13 @@ pkgname=distcc pkgver=2.18.3 -pkgrel=4 +pkgrel=5 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.samba.org" depends=('popt>=1.13' 'gcc>=4.3.0-4') rodepends=('shadow>=4.1.0-4') groups=('devel-extra' 'chroot-core') +backup=('etc/sysconfig/distccd') archs=('i686' 'x86_64') up2date="lynx -dump http://distcc.samba.org/download.html | grep tar.bz2 | sed -ne 's/.*-\(.*\)\.t.*/\1/;s/systray-plugin-//;1 p'" source=(http://distcc.samba.org/ftp/distcc/$pkgname-$pkgver.tar.bz2 \ From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:27 2008 Subject: [Frugalware-git] frugalware-current: wget-1.11-2-i686 Message-ID: <20080313230629.664A61190A68@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ca7c48966a39b6cfac05e8661c77a550a59a9e9 commit 5ca7c48966a39b6cfac05e8661c77a550a59a9e9 Author: crazy Date: Wed Mar 12 05:38:49 2008 +0100 wget-1.11-2-i686 * rebuild diff --git a/source/network/wget/FrugalBuild b/source/network/wget/FrugalBuild index e3c870a..6ac45d2 100644 --- a/source/network/wget/FrugalBuild +++ b/source/network/wget/FrugalBuild @@ -4,7 +4,7 @@ pkgname=wget pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="A network utility to retrieve files from the Web" url="http://www.gnu.org/software/wget/wget.html" depends=('openssl=0.9.8') From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:29 2008 Subject: [Frugalware-git] frugalware-current: lynx-2.8.6-2-i686 Message-ID: <20080313230629.751141190A69@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1767446b982c663f0eda89bf491aa77dfc83426a commit 1767446b982c663f0eda89bf491aa77dfc83426a Author: crazy Date: Wed Mar 12 05:49:02 2008 +0100 lynx-2.8.6-2-i686 * rebuild * sha1sums fix diff --git a/source/network/lynx/FrugalBuild b/source/network/lynx/FrugalBuild index ee44730..5fe218c 100644 --- a/source/network/lynx/FrugalBuild +++ b/source/network/lynx/FrugalBuild @@ -4,12 +4,12 @@ pkgname=lynx pkgver=2.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="A fully-featured text mode World Wide Web (WWW) client." url="http://lynx.isc.org/" groups=('network' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -depends=('ncurses' 'openssl' 'zlib') +depends=('ncurses>=5.6-3' 'openssl>=0.9.8-12' 'zlib>=1.2.3-5') up2date="lynx -dump $url|grep stable|sed -e 's/.*lynx\(.*\)\. .*/\1/' -e 's/-/./g'" source=(http://lynx.isc.org/release/$pkgname$pkgver.tar.gz) @@ -22,6 +22,6 @@ build() { --enable-libjs --libdir=/etc/lynx Fmakeinstall } -sha1sums=('b3bddc2a7abdf1993ce54e9ee2f635f30d7950c3') +sha1sums=('621d03b2f94abfe152f52a6a25864f04256ea139') # optimization OK From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:31 2008 Subject: [Frugalware-git] frugalware-current: gnupg-1.4.8-2-i686 Message-ID: <20080313230629.83B8D1190A6A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18832d830ee3db86ee22a8b0c5df3c926f11610a commit 18832d830ee3db86ee22a8b0c5df3c926f11610a Author: crazy Date: Wed Mar 12 05:53:58 2008 +0100 gnupg-1.4.8-2-i686 * rebuild diff --git a/source/apps/gnupg/FrugalBuild b/source/apps/gnupg/FrugalBuild index 7390c3a..b6543f8 100644 --- a/source/apps/gnupg/FrugalBuild +++ b/source/apps/gnupg/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gnupg pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="GnuPG is a complete and free replacement for PGP" url="http://www.gnupg.org/" -depends=('zlib' 'bzip2' 'readline') +depends=('zlib>=1.2.3-5' 'bzip2>=1.0.4-2' 'readline>=5.2-2') groups=('apps' 'chroot-core') archs=('i686' 'x86_64') # yes, this is intentional, voroskoi will bump this pkg to 2.x when he says 2.x From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:32 2008 Subject: [Frugalware-git] frugalware-current: lynx-2.8.6-2-x86_64 Message-ID: <20080313230629.A0ACB1190A3D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a537f6f36b42bd0eb1ce39c68ecc254cbed16a8 commit 4a537f6f36b42bd0eb1ce39c68ecc254cbed16a8 Author: crazy Date: Wed Mar 12 06:10:56 2008 +0100 lynx-2.8.6-2-x86_64 * workaround SMP build diff --git a/source/network/lynx/FrugalBuild b/source/network/lynx/FrugalBuild index 5fe218c..4e7130a 100644 --- a/source/network/lynx/FrugalBuild +++ b/source/network/lynx/FrugalBuild @@ -14,6 +14,7 @@ up2date="lynx -dump $url|grep stable|sed -e 's/.*lynx\(.*\)\. .*/\1/' -e 's/-/./ source=(http://lynx.isc.org/release/$pkgname$pkgver.tar.gz) build() { + unset MAKEFLAGS Fcd $pkgname`echo $pkgver|sed 's/\./-/g'` Fpatchall # --libdir is needed for config files, not real libraries. So put it those to /etc/lynx From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:34 2008 Subject: [Frugalware-git] frugalware-current: elinks-0.11.3-5-i686 Message-ID: <20080313230629.AC1601190A6B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d1248886089a67106c9e4d92daaee2a6089e785 commit 4d1248886089a67106c9e4d92daaee2a6089e785 Author: crazy Date: Wed Mar 12 06:19:01 2008 +0100 elinks-0.11.3-5-i686 * rebuild diff --git a/source/network/elinks/FrugalBuild b/source/network/elinks/FrugalBuild index 5e16a32..dad02df 100644 --- a/source/network/elinks/FrugalBuild +++ b/source/network/elinks/FrugalBuild @@ -4,10 +4,11 @@ pkgname=elinks pkgver=0.11.3 -pkgrel=4 +pkgrel=5 pkgdesc="An advanced and well-established feature-rich text mode web browser" url="http://elinks.or.cz/" -depends=('openssl' 'glibc' 'gpm' 'zlib' 'bzip2' 'libidn' 'expat' 'ncurses' 'perl>=5.10.0') +depends=('openssl>=0.9.8-12' 'glibc>=2.7-3' 'gpm>=1.20.1-14' 'zlib>=1.2.3-5' \ + 'bzip2>=1.0.4-2' 'libidn>=0.5.20-3' 'expat>=2.0.1-2' 'ncurses>=5.6-3' 'perl>=5.10.0-4') #makedepends=('samba') # smb support is disabled by upstream (security reasons) groups=('network' 'chroot-core') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:36 2008 Subject: [Frugalware-git] frugalware-current: kernel-2.6.24-4-i686 Message-ID: <20080313230629.CA0621190A44@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e3b2d572d2ae8a36ccabdcd2c74503ca5d1def6 commit 3e3b2d572d2ae8a36ccabdcd2c74503ca5d1def6 Author: crazy Date: Wed Mar 12 20:55:02 2008 +0100 kernel-2.6.24-4-i686 * release bump * added backport patch from 2.6.25-rc5 to fix gcc43 issue diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 9f2e16b..fc534d2 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 14.33 SBU # Maintainer: VMiklos -_F_kernel_patches=(revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch) +_F_kernel_patches=(revert-NET_Add-if_addrlabel.h-to_sanitized_headers.patch gcc43.patch) Finclude kernel diff --git a/source/base/kernel/gcc43.patch b/source/base/kernel/gcc43.patch new file mode 100644 index 0000000..58cbe7b --- /dev/null +++ b/source/base/kernel/gcc43.patch @@ -0,0 +1,29 @@ +commit 38332cb98772f5ea757e6486bed7ed0381cb5f98 +Author: Segher Boessenkool +Date: Tue Mar 4 14:59:54 2008 -0800 + + time: prevent the loop in timespec_add_ns() from being optimised away + + Since some architectures don't support __udivdi3(). + + Signed-off-by: Segher Boessenkool + Cc: john stultz + Cc: Ingo Molnar + Signed-off-by: Andrew Morton + Signed-off-by: Thomas Gleixner + +diff --git a/include/linux/time.h b/include/linux/time.h +index 2091a19..d32ef0a 100644 +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:37 2008 Subject: [Frugalware-git] frugalware-current: kernel-version.sh Message-ID: <20080313230629.BB06D1190A6C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cdeff4c43a0892e7903f8f51344e4741ba40917 commit 0cdeff4c43a0892e7903f8f51344e4741ba40917 Author: crazy Date: Wed Mar 12 07:00:30 2008 +0100 kernel-version.sh * release bump diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 6d0bc1c..f5f4ab6 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,5 +16,5 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.24 -_F_kernelver_rel=3 +_F_kernelver_rel=4 _F_kernelver_stable=3 From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:39 2008 Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-10-i686 Message-ID: <20080313230629.D8CD91190A6D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=523e29f3d3ea8dea4a2d6645f82b364b0bc6d1c1 commit 523e29f3d3ea8dea4a2d6645f82b364b0bc6d1c1 Author: crazy Date: Wed Mar 12 21:58:54 2008 +0100 acerhk-0.5.35-10-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 44c349f..ce64176 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=9 +pkgrel=10 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From crazy at frugalware.org Fri Mar 14 00:06:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:41 2008 Subject: [Frugalware-git] frugalware-current: acx100-20071003-10-i686 Message-ID: <20080313230629.E8F7A1190A6E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab31238f3f33b89375c416c49b80abde21ed9d04 commit ab31238f3f33b89375c416c49b80abde21ed9d04 Author: crazy Date: Wed Mar 12 22:01:57 2008 +0100 acx100-20071003-10-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index dad78bc..6fb7e9d 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20071003 -pkgrel=9 +pkgrel=10 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:43 2008 Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.20-7-i686 Message-ID: <20080313230630.0B4FF1190202@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9bdb1d6e435a00cad6ea40f63fcfcd98dd64e3d4 commit 9bdb1d6e435a00cad6ea40f63fcfcd98dd64e3d4 Author: crazy Date: Wed Mar 12 22:06:35 2008 +0100 gspcav1-1.00.20-7-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index dac3636..7b1b80e 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.20 -pkgrel=6 +pkgrel=7 pkgdate=20071224 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:45 2008 Subject: [Frugalware-git] frugalware-current: nvidia-169.12-3-i686 Message-ID: <20080313230630.1A10F1190A6F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5c31e8bb9a79886ce331797db2aac30d5fad557 commit d5c31e8bb9a79886ce331797db2aac30d5fad557 Author: crazy Date: Wed Mar 12 22:11:29 2008 +0100 nvidia-169.12-3-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 8db6a2f..35538e9 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=169.12 -pkgrel=2 +pkgrel=3 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:46 2008 Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-25-i686 Message-ID: <20080313230630.28B241190A70@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d1feb247b402f7e947285c0860e3ca5bdd1b7a0 commit 1d1feb247b402f7e947285c0860e3ca5bdd1b7a0 Author: crazy Date: Wed Mar 12 22:17:39 2008 +0100 kqemu-1.3.0pre11-25-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index b01ab77..91e7138 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=24 +pkgrel=25 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:47 2008 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-19-i686 Message-ID: <20080313230630.3987F1190539@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9fef780aab57a56970fd509c255eb9138095f393 commit 9fef780aab57a56970fd509c255eb9138095f393 Author: crazy Date: Wed Mar 12 22:20:32 2008 +0100 wlan-ng-0.2.8-19-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index c803b55..0c4f1c5 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.8 -pkgrel=18 +pkgrel=19 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:48 2008 Subject: [Frugalware-git] frugalware-current: lirc-0.8.2-19-i686 Message-ID: <20080313230630.480A91190A71@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=667a942105697619a7580a11c774abdd2c04d458 commit 667a942105697619a7580a11c774abdd2c04d458 Author: crazy Date: Wed Mar 12 22:24:20 2008 +0100 lirc-0.8.2-19-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index c3663b9..bf121d7 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.2 -pkgrel=18 +pkgrel=19 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:49 2008 Subject: [Frugalware-git] frugalware-current: ipw3945-1.2.2-14-i686 Message-ID: <20080313230630.56C9F1190A72@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e0c05bbecf73129c752bade148d8d3fdd9aeb9e9 commit e0c05bbecf73129c752bade148d8d3fdd9aeb9e9 Author: crazy Date: Wed Mar 12 22:27:37 2008 +0100 ipw3945-1.2.2-14-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild index 8eed76a..85eeb6f 100644 --- a/source/network-extra/ipw3945/FrugalBuild +++ b/source/network-extra/ipw3945/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ipw3945 pkgver=1.2.2 -pkgrel=13 +pkgrel=14 pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux" _F_sourceforge_ext=".tgz" Finclude sourceforge kernel-module From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:50 2008 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.51-7-i686 Message-ID: <20080313230630.639CE1190A73@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4af795910fe5787b5f339735d044d5c0a87a0beb commit 4af795910fe5787b5f339735d044d5c0a87a0beb Author: crazy Date: Wed Mar 12 22:30:37 2008 +0100 ndiswrapper-1.51-7-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 8fe67ba..53e87a4 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.51 -pkgrel=6 +pkgrel=7 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:52 2008 Subject: [Frugalware-git] frugalware-current: r8169-6.004.00-9-i686 Message-ID: <20080313230630.724651190A74@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c528f16f50d962cc5bcb334abc99114f3d6f0aab commit c528f16f50d962cc5bcb334abc99114f3d6f0aab Author: crazy Date: Wed Mar 12 22:33:15 2008 +0100 r8169-6.004.00-9-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 7701204..75fa1c2 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.004.00 -pkgrel=8 +pkgrel=9 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:54 2008 Subject: [Frugalware-git] frugalware-current: redirfs-0.2-4-i686 Message-ID: <20080313230630.8F90F1190A75@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27d63a7c9704182bece588f5c66e1a86b7477b5a commit 27d63a7c9704182bece588f5c66e1a86b7477b5a Author: crazy Date: Wed Mar 12 22:47:49 2008 +0100 redirfs-0.2-4-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 33e565d..920b1b7 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=redirfs pkgver=0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Redirecting FileSystem" url="http://redirfs.org/" _F_kernelmod_scriptlet=$pkgname.install From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:55 2008 Subject: [Frugalware-git] frugalware-current: madwifi-0.9.4-3-i686 Message-ID: <20080313230630.80E8F1190A43@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88d388945a23d6372795d712d99f70482856ffbf commit 88d388945a23d6372795d712d99f70482856ffbf Author: crazy Date: Wed Mar 12 22:45:19 2008 +0100 madwifi-0.9.4-3-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 53b65bd..b127865 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" Finclude kernel-module From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:57 2008 Subject: [Frugalware-git] frugalware-current: fglrx-8.42.3-11-i686 Message-ID: <20080313230630.AC7FF1190A77@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=10928eac59bc46fabb311abae290db63e29fc378 commit 10928eac59bc46fabb311abae290db63e29fc378 Author: crazy Date: Wed Mar 12 23:00:55 2008 +0100 fglrx-8.42.3-11-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 9944d89..d8199c0 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=fglrx pkgver=8.42.3 -pkgrel=10 +pkgrel=11 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:11:59 2008 Subject: [Frugalware-git] frugalware-current: nvidia-96xx-96.43.05-5-i686 Message-ID: <20080313230630.9C98D1190A76@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3066242b07a834beacadf7a9cbb7bd093a5681ab commit 3066242b07a834beacadf7a9cbb7bd093a5681ab Author: crazy Date: Wed Mar 12 22:52:27 2008 +0100 nvidia-96xx-96.43.05-5-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index f797b76..6233199 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx pkgver=96.43.05 -pkgrel=4 +pkgrel=5 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:01 2008 Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-32-i686 Message-ID: <20080313230630.BADEF1190A78@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a73e85b6c83108be211662a2a909bc60b3bac30 commit 4a73e85b6c83108be211662a2a909bc60b3bac30 Author: crazy Date: Wed Mar 12 23:08:46 2008 +0100 qc-usb-0.6.6-32-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 1aa4229..0b52d74 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=31 +pkgrel=32 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:03 2008 Subject: [Frugalware-git] frugalware-current: dazuko-2.3.4-11-i686 Message-ID: <20080313230630.C9AD81190A46@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4554685d16cfb71ed378e980c2d0d61ed0e50ff8 commit 4554685d16cfb71ed378e980c2d0d61ed0e50ff8 Author: crazy Date: Wed Mar 12 23:11:14 2008 +0100 dazuko-2.3.4-11-i686 rebuilt with kernel-2.6.24-4 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 0e40c13..0e7f955 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -4,7 +4,7 @@ pkgname=dazuko pkgver=2.3.4 redirver=0.2 -pkgrel=10 +pkgrel=11 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:05 2008 Subject: [Frugalware-git] frugalware-current: virtualbox-1.5.6_1-3-i686 Message-ID: <20080313230630.D8A6A1190A79@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0007fc676ba96dbce383d5a82ea46bf02f1a44ea commit 0007fc676ba96dbce383d5a82ea46bf02f1a44ea Author: crazy Date: Thu Mar 13 00:07:54 2008 +0100 virtualbox-1.5.6_1-3-i686 * rebuilt with kernel-2.6.24-4 * added patches for gcc43 to fix the build diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 9d0e590..8ccc680 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -5,7 +5,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.5.6_1 -pkgrel=2 +pkgrel=3 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" _F_kernelmod_scriptlet=$pkgname.install @@ -18,13 +18,17 @@ groups=('xapps-extra') archs=('i686' '!x86_64') up2date="lynx -dump http://www.virtualbox.org/wiki/Downloads | grep 'OSE tarball' | sed 's/.*VirtualBox //' | sed 's/ OSE.*//'" source=(http://www.virtualbox.org/download/$(echo $pkgver|sed 's/_.*//')/${realname}-${pkgver/_/-}_OSE.tar.bz2 \ - vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules) + vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules \ + use-o3-to-workaround-gcc-ice.diff virtualbox-gcc43-fixes.diff virtualbox-validate-op-gcc43.diff) sha1sums=('1cb11c012b9143e14f2eada645757cae8886d0d1' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ '07f49d0c5fac8311ec87d1a38a981de9ba3a4e07' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c' \ - '4fccf6d7030af764dfb7eb54763fb2abe544af6f') + '4fccf6d7030af764dfb7eb54763fb2abe544af6f' \ + 'f8875f474975d33ef2c8707bde4710c7c72f9727' \ + '17f6f99a344ac9a088fef826249a38e6cce2c11d' \ + 'c2d014abf3801f0a87142fc3a6d08a782cd5ef9c') _F_cd_path="${realname}-$(echo $pkgver|sed 's/_.*//')_OSE" vboxrealpkgver="$(echo $pkgver|sed 's/_.*//')" options=('scriptlet') diff --git a/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff b/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff new file mode 100644 index 0000000..f3346be --- /dev/null +++ b/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff @@ -0,0 +1,14 @@ +--- src/recompiler/Makefile.kmk ++++ src/recompiler/Makefile.kmk +@@ -231,9 +231,9 @@ + + # Extra flags for these source modules. + target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls +-target-i386/op.c_CFLAGS.x86 = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 ++target-i386/op.c_CFLAGS.x86 = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 + target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4 +-target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse ++target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse + cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse + + diff --git a/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff b/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff new file mode 100644 index 0000000..a508fb2 --- /dev/null +++ b/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff @@ -0,0 +1,21 @@ +--- src/VBox/Main/VMMDevInterface.cpp.old 2008-01-27 16:50:02.000000000 +0100 ++++ src/VBox/Main/VMMDevInterface.cpp 2008-01-27 16:50:28.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef VBOX_HGCM + #include "hgcm/HGCM.h" +--- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.old 2008-01-27 16:49:32.000000000 +0100 ++++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-01-27 16:49:48.000000000 +0100 +@@ -28,6 +28,8 @@ + #include "VBoxRegistrationDlg.h" + #endif + ++#include ++ + #include + #include + #include diff --git a/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff b/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff new file mode 100644 index 0000000..34ac3ba --- /dev/null +++ b/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff @@ -0,0 +1,13 @@ +Index: src/recompiler/InnoTek/op-validate.sed +=================================================================== +--- src/recompiler/InnoTek/op-validate.sed.orig ++++ src/recompiler/InnoTek/op-validate.sed +@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan + /\.Lfe[0-9][0-9]*:/d + /\.LFE[0-9][0-9]*:/d + /size[[:space:]]/d ++/p2align[[:space:]]/d ++/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d + /^[/#]NO_APP[[:space:]]*$/d + /^$/!b bad + b end From crazy at frugalware.org Fri Mar 14 00:06:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:07 2008 Subject: [Frugalware-git] frugalware-current: antlr-2.7.7-2-x86_64 Message-ID: <20080313230630.E92021190A7A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e76bc9cafc3647ef2b3f4f7be1c676a7bd87a03 commit 7e76bc9cafc3647ef2b3f4f7be1c676a7bd87a03 Author: crazy Date: Thu Mar 13 00:33:42 2008 +0100 antlr-2.7.7-2-x86_64 * relbump * recompiled with libgcj * added an patch to fix the build * source fix diff --git a/source/devel-extra/antlr/FrugalBuild b/source/devel-extra/antlr/FrugalBuild index 1d3edcd..ae78c8e 100644 --- a/source/devel-extra/antlr/FrugalBuild +++ b/source/devel-extra/antlr/FrugalBuild @@ -3,23 +3,23 @@ pkgname=antlr pkgver=2.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="ANother Tool for Language Recognition" url="http://www.antlr.org/" Finclude java -makedepends=('ecj' 'java-gcj-compat' 'gcc-gcj') +makedepends=('ecj>=3.2.2-4' 'java-gcj-compat>=1.0.77-2' 'gcc-gcj>=4.3.0-4') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.antlr.org/download.html|grep -m1 'antlr-\(.*\).tar.gz'|Flasttar" -source=(http://www.antlr.org/download/antlr-$pkgver.tar.gz) +source=(http://www.antlr2.org/download/antlr-$pkgver.tar.gz gcc43.patch) build() { JAVAC=ecj Fbuild # install the proper java/python bindings Fjar antlr/antlr.jar - cd lib/python - rm Makefile* + cd lib/python || Fdie + rm Makefile* || Fdie Fmakeinstall # then clean up the junk Frm /usr/lib/antlr.{jar,py} /usr/{sbin,bin/antlr} @@ -28,4 +28,5 @@ build() # optimization OK -sha1sums=('802655c343cc7806aaf1ec2177a0e663ff209de1') +sha1sums=('802655c343cc7806aaf1ec2177a0e663ff209de1' \ + 'fd0bbcab73d75ab2e0487e5eed4260120c3b66fa') diff --git a/source/devel-extra/antlr/gcc43.patch b/source/devel-extra/antlr/gcc43.patch new file mode 100644 index 0000000..5ce5d8c --- /dev/null +++ b/source/devel-extra/antlr/gcc43.patch @@ -0,0 +1,11 @@ +diff -Naur antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7-p/lib/cpp/antlr/CharScanner.hpp +--- antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100 ++++ antlr-2.7.7-p/lib/cpp/antlr/CharScanner.hpp 2008-03-13 00:22:30.000000000 +0100 +@@ -24,6 +24,7 @@ + # include + #endif + ++#include + #include + #include + #include From crazy at frugalware.org Fri Mar 14 00:06:31 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:09 2008 Subject: [Frugalware-git] frugalware-current: octave-3.0.0-2-i686 Message-ID: <20080313230631.01F941190A7B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e8e30d1f9a9e8bae4a86b1aa5b24a85dfcfd8ab commit 1e8e30d1f9a9e8bae4a86b1aa5b24a85dfcfd8ab Author: crazy Date: Thu Mar 13 02:32:40 2008 +0100 octave-3.0.0-2-i686 * recompiled with libgfortran * added an patch to fix the build diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild index 3f0064c..540a18f 100644 --- a/source/apps-extra/octave/FrugalBuild +++ b/source/apps-extra/octave/FrugalBuild @@ -3,14 +3,15 @@ pkgname=octave pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Octave is a high-level language, primarily intended for numerical computations." url="http://www.octave.org/" -depends=('libstdc++' 'fftw' 'libgfortran' 'readline') +depends=('libstdc++>=4.3.0-4' 'fftw' 'libgfortran>=4.3.0-4' 'readline>=5.2-2') makedepends=('gcc-gfortran') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Stable|sed 's/.* \([0-9.]\+\) (.*/\1/'" -source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('874b3d40db5d882e37614ffa6cdb9fdd71e173f8') +source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 gcc43.patch) +sha1sums=('874b3d40db5d882e37614ffa6cdb9fdd71e173f8' \ + 'f04865197157ace7891e68044ac7ad49ddb699cd') # optimization OK diff --git a/source/apps-extra/octave/gcc43.patch b/source/apps-extra/octave/gcc43.patch new file mode 100644 index 0000000..74790f6 --- /dev/null +++ b/source/apps-extra/octave/gcc43.patch @@ -0,0 +1,11 @@ +diff -Naur octave-3.0.0/src/mxarray.h.in octave-3.0.0-p/src/mxarray.h +--- octave-3.0.0/src/mxarray.h.in 2007-12-21 21:15:10.000000000 +0100 ++++ octave-3.0.0-p/src/mxarray.h.in 2008-03-13 01:08:37.000000000 +0100 +@@ -45,6 +45,7 @@ + + #if ! defined (MXARRAY_H) + #define MXARRAY_H ++#include + + typedef enum + { From crazy at frugalware.org Fri Mar 14 00:06:31 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:11 2008 Subject: [Frugalware-git] frugalware-current: amule-2.1.3-13-x86_64 Message-ID: <20080313230631.113541190A7C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=574de967220659db981358c387adbda0d062532c commit 574de967220659db981358c387adbda0d062532c Author: crazy Date: Thu Mar 13 03:16:34 2008 +0100 amule-2.1.3-13-x86_64 * recompiled * added an patch to fix the build * amulecmd and webserver option are disabled for this release * will fix soon diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild index 218ace0..921ba6e 100644 --- a/source/xapps-extra/amule/FrugalBuild +++ b/source/xapps-extra/amule/FrugalBuild @@ -3,7 +3,7 @@ pkgname=amule pkgver=2.1.3 -pkgrel=12 +pkgrel=13 pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="aMule" @@ -11,23 +11,27 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.amule.org/" replaces=('xmule') -source=($source aMule-wx.patch fix-broken-server.met-link.patch) -depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.3' 'gd' 'curl') +source=($source aMule-wx.patch fix-broken-server.met-link.patch gcc43.patch) +depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.4' 'gd' 'curl') up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10" license="GPL2" groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') Fconfopts="$Fconfopts --enable-cas --enable-wxcas \ - --enable-amulecmd --enable-amulecmdgui \ - --enable-webserver --enable-webservergui \ + --disable-amulecmd --disable-amulecmdgui \ + --disable-webserver --disable-webservergui \ --enable-kad-compile --enable-amule-daemon \ --enable-alc --enable-alcc \ --enable-ccache --disable-debug" +# br0ken gcc43 - will fix soon -- crazy -- +# --enable-webserver --enable-webservergui +# --enable-amulecmd --enable-amulecmdgui _F_cd_path="aMule-$pkgver" sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \ 'bd048f7b88ff4c19841f606d03c5a9750e6e6945' \ - '5c74fe3e13cad5d40def64e873f3fe6114ecb91a') + '5c74fe3e13cad5d40def64e873f3fe6114ecb91a' \ + 'ce6e079ad3422e76d12152d59e992488956f327c') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated" # optimization OK diff --git a/source/xapps-extra/amule/gcc43.patch b/source/xapps-extra/amule/gcc43.patch new file mode 100644 index 0000000..aea9e00 --- /dev/null +++ b/source/xapps-extra/amule/gcc43.patch @@ -0,0 +1,11 @@ +diff -Naur aMule-2.1.3/src/ED2KLinkParser.cpp aMule-2.1.3-p/src/ED2KLinkParser.cpp +--- aMule-2.1.3/src/ED2KLinkParser.cpp 2006-01-30 19:53:03.000000000 +0100 ++++ aMule-2.1.3-p/src/ED2KLinkParser.cpp 2008-03-13 02:53:08.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #ifdef __APPLE__ + #include From crazy at frugalware.org Fri Mar 14 00:06:31 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 00:12:13 2008 Subject: [Frugalware-git] frugalware-current: gdb-6.7.1-3-i686 Message-ID: <20080313230631.2212A119053B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f60342ce675c8b418fa40361aa15916ac2aa229 commit 1f60342ce675c8b418fa40361aa15916ac2aa229 Author: crazy Date: Thu Mar 13 14:31:35 2008 +0100 gdb-6.7.1-3-i686 * rebuilt diff --git a/source/devel/gdb/FrugalBuild b/source/devel/gdb/FrugalBuild index 5194444..cc25570 100644 --- a/source/devel/gdb/FrugalBuild +++ b/source/devel/gdb/FrugalBuild @@ -4,13 +4,13 @@ pkgname=gdb pkgver=6.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Gnu Project Debugger" url="http://www.gnu.org/software/gdb/download/" -depends=('readline' 'mpfr' 'expat') +depends=('readline>=5.2-2' 'mpfr>=2.3.1-2' 'expat>=2.0.1-2') groups=('devel') archs=('i686' 'x86_64') -makedepends=('gmp') +makedepends=('gmp>=4.2.2-2') Fup2gnubz2 source=(http://ftp.gnu.org/gnu/gdb/$pkgname-$pkgver.tar.bz2) sha1sums=('4ecfb5896d511111d9a5d91e937501caa9d33ced') @@ -23,7 +23,7 @@ build() { # Fpatch 02-gdb-6.3-readline_docs.patch # Fixes CVE-2006-4146 SEC bug # Fpatch gdb-cve-2006-4146-sec.patch - Fmake --with-gmp=/usr --with-mpfr=/usr + Fmake --with-gmp=/usr --with-mpfr=/usr --disable-werror Fmakeinstall Frm /usr/include/{bfd.h,symcat.h,ansidecl.h,bfdlink.h} Frm /usr/lib/{libopcodes.a,libopcodes.la} From vmiklos at frugalware.org Fri Mar 14 01:40:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 01:40:13 2008 Subject: [Frugalware-git] frugalware-current: plib-1.8.5-1-i686 Message-ID: <20080314004008.A571A1190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5433a5533e9ce91174591fe895d499532dd98321 commit 5433a5533e9ce91174591fe895d499532dd98321 Author: Miklos Vajna Date: Fri Mar 14 01:39:57 2008 +0100 plib-1.8.5-1-i686 - version bump diff --git a/source/lib-extra/plib/FrugalBuild b/source/lib-extra/plib/FrugalBuild index d852dbf..d1c3a23 100644 --- a/source/lib-extra/plib/FrugalBuild +++ b/source/lib-extra/plib/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=plib -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 pkgdesc="A Suite of Portable Game Libraries." url="http://plib.sourceforge.net/" @@ -12,6 +12,5 @@ makedepends=('mesa' 'libxt') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep latest|sed 's/.*s \(.*\) - .*/\1/'" source=($url/dist/$pkgname-$pkgver.tar.gz) -sha1sums=('16d3faab36fdde85c5bf620046b56c65dfad6769') - -# optimalization ok +sha1sums=('c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc') +# optimization OK From vmiklos at frugalware.org Fri Mar 14 01:40:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 01:40:14 2008 Subject: [Frugalware-git] frugalware-current: dejavu-ttf-2.24-1-i686 Message-ID: <20080314004008.75E4511901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3dde9f18cf7028a0492527ab094627d0a63fb529 commit 3dde9f18cf7028a0492527ab094627d0a63fb529 Author: Miklos Vajna Date: Fri Mar 14 01:15:23 2008 +0100 dejavu-ttf-2.24-1-i686 - version bump - updated dejavu-ttf.xml diff --git a/source/x11/dejavu-ttf/FrugalBuild b/source/x11/dejavu-ttf/FrugalBuild index 3fbf52e..1dc1019 100644 --- a/source/x11/dejavu-ttf/FrugalBuild +++ b/source/x11/dejavu-ttf/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=dejavu-ttf -pkgver=2.23 +pkgver=2.24 pkgrel=1 pkgdesc="DejaVu fonts" _F_sourceforge_dirname="dejavu" @@ -15,8 +15,8 @@ makedepends=('fop-devel') groups=('x11' 'xorg-core' 'xorg-fonts') archs=('i686' 'x86_64') source=($source dejavu-ttf.xml) -sha1sums=('c539aaba1f38d337a39474822165b1f4eb28bce7' \ - 'e78cf8b8a2484540820629e93f73f794e061eeed') +sha1sums=('515bcef5c1d831a523d7d5a57363ad68de7c3275' \ + 'f60609b7977fed34547b9f01c659af022d042049') build() { diff --git a/source/x11/dejavu-ttf/dejavu-ttf.xml b/source/x11/dejavu-ttf/dejavu-ttf.xml index 4cb0a29..3b2985c 100644 --- a/source/x11/dejavu-ttf/dejavu-ttf.xml +++ b/source/x11/dejavu-ttf/dejavu-ttf.xml @@ -1,64 +1,64 @@ - + metrics-file='/usr/share/fop/DejaVuSansCondensed.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansCondensed-Bold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed-Bold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansCondensed-BoldOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed-BoldOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansCondensed-Oblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed-Oblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifCondensed.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifCondensed-Bold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed-Bold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifCondensed-BoldItalic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed-BoldItalic.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifCondensed-Italic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed-Italic.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansMono.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansMono-Bold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansMono-BoldOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansMono-Oblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf'> + + metrics-file='/usr/share/fop/DejaVuSans-Bold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf'> + metrics-file='/usr/share/fop/DejaVuSans-BoldOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf'> + metrics-file='/usr/share/fop/DejaVuSans-Oblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf'> + metrics-file='/usr/share/fop/DejaVuSerif-Bold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf'> + metrics-file='/usr/share/fop/DejaVuSerif-BoldItalic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif-BoldItalic.ttf'> + metrics-file='/usr/share/fop/DejaVuSerif-Italic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif-Italic.ttf'> From crazy at frugalware.org Fri Mar 14 02:01:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 02:01:26 2008 Subject: [Frugalware-git] frugalware-current: re2c-0.13.2-1-i686 Message-ID: <20080314010122.CD15E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=111f3130ce49e054054f4ce120b3273c0b7e7fc1 commit 111f3130ce49e054054f4ce120b3273c0b7e7fc1 Author: crazy Date: Fri Mar 14 02:00:55 2008 +0100 re2c-0.13.2-1-i686 * Version bump diff --git a/source/devel/re2c/FrugalBuild b/source/devel/re2c/FrugalBuild index 575a2d6..091df3c 100644 --- a/source/devel/re2c/FrugalBuild +++ b/source/devel/re2c/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=re2c -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=1 pkgdesc="re2c is an tool for generating C based recognizers from regular expressions" depends=('libstdc++') @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') Finclude sourceforge url="http://re2c.org/" up2date="lynx -dump -nolist 'http://sourceforge.net/project/showfiles.php?group_id=96864'| grep -o 're2c-\(.*\).tar.gz'|Flasttar" -sha1sums=('e9e10f2795bfdeb2d1cc7de925ed5dbd9be88353') +sha1sums=('679f4367c0d5423a988466573de085fbf398bf2a') # optimization OK From crazy at frugalware.org Fri Mar 14 02:05:14 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 02:05:16 2008 Subject: [Frugalware-git] frugalware-current: cppunit-1.12.1-1-i686 Message-ID: <20080314010514.1A7DC11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=553c84319af0f46288e59f24e90145b14bc2452f commit 553c84319af0f46288e59f24e90145b14bc2452f Author: crazy Date: Fri Mar 14 02:04:40 2008 +0100 cppunit-1.12.1-1-i686 * Version bump diff --git a/source/devel-extra/cppunit/FrugalBuild b/source/devel-extra/cppunit/FrugalBuild index e2ee78f..b2657e2 100644 --- a/source/devel-extra/cppunit/FrugalBuild +++ b/source/devel-extra/cppunit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=cppunit -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=1 pkgdesc="CppUnit is the C++ port of the famous JUnit framework for unit testing." url="http://cppunit.sourceforge.net/cgi-bin/moin.cgi" @@ -12,6 +12,6 @@ license="LGPL" groups=('devel-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('1d20e9d648ca94163598883b5146185f39c002f3') +sha1sums=('f1ab8986af7a1ffa6760f4bacf5622924639bf4a') # optimization OK From crazy at frugalware.org Fri Mar 14 02:06:22 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 02:06:23 2008 Subject: [Frugalware-git] frugalware-current: loudmouth-1.3.4-1-i686 Message-ID: <20080314010622.2EDE711901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=369db8eb58730799e7f101beaaf7b9f216ec481a commit 369db8eb58730799e7f101beaaf7b9f216ec481a Author: crazy Date: Fri Mar 14 02:05:57 2008 +0100 loudmouth-1.3.4-1-i686 * Version bump diff --git a/source/apps-extra/loudmouth/FrugalBuild b/source/apps-extra/loudmouth/FrugalBuild index cb877db..e690263 100644 --- a/source/apps-extra/loudmouth/FrugalBuild +++ b/source/apps-extra/loudmouth/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=loudmouth -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="A lightweight and easy-to-use C library for programming with the Jabber protocol." url="http://www.loudmouth-project.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump "$url/download"|Flasttarbz2" source=(http://ftp.imendio.com/pub/imendio/$pkgname/src/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --enable-debug=no" -sha1sums=('2729ee95bcafedea0cabd9259adfcc0039f4dd85') +sha1sums=('6395ad13f98d861209a6ea8e6dee60c9c440125a') # optimization OK From crazy at frugalware.org Fri Mar 14 02:08:29 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 02:08:31 2008 Subject: [Frugalware-git] frugalware-current: msmtp-1.4.14-1-i686 Message-ID: <20080314010829.6019B11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88f782f7c3072eed61d0ba1b982a9e0e3eb2f16d commit 88f782f7c3072eed61d0ba1b982a9e0e3eb2f16d Author: crazy Date: Fri Mar 14 02:08:04 2008 +0100 msmtp-1.4.14-1-i686 * Version bump diff --git a/source/network-extra/msmtp/FrugalBuild b/source/network-extra/msmtp/FrugalBuild index 4711d2c..afeda6a 100644 --- a/source/network-extra/msmtp/FrugalBuild +++ b/source/network-extra/msmtp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=msmtp -pkgver=1.4.13 +pkgver=1.4.14 pkgrel=1 pkgdesc="msmtp is small light SMTP Client" license="GPL 2" @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge depends=('libgcrypt' 'gnutls' 'zlib' 'libidn' 'gettext') -sha1sums=('c1d0dee2b8e035289a0467d687ec8066dba61e97') +sha1sums=('f42403348a3c7dd3ca802714915aab8f90142381') # optimization OK From vmiklos at frugalware.org Fri Mar 14 02:40:17 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 02:40:19 2008 Subject: [Frugalware-git] homepage-ng: Newsletter issue 18 Message-ID: <20080314014017.8F88B11901AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=61c9b6951edb6cc783f454ad79b1e15571aa40c5 commit 61c9b6951edb6cc783f454ad79b1e15571aa40c5 Author: Russell Dickenson Date: Thu Mar 13 21:52:38 2008 +1000 Newsletter issue 18 diff --git a/frugalware/images/interviews/hermier.jpg b/frugalware/images/interviews/hermier.jpg new file mode 100644 index 0000000..89e318e Binary files /dev/null and b/frugalware/images/interviews/hermier.jpg differ diff --git a/frugalware/weeklynews/issue18.html b/frugalware/weeklynews/issue18.html new file mode 100755 index 0000000..75231d1 --- /dev/null +++ b/frugalware/weeklynews/issue18.html @@ -0,0 +1,165 @@ +

Table of Contents

+ + + +

Welcome

+

+ The newsletter's aim is to keep you up to date with what's happened recently in the world of the Linux distribution 'Frugalware'. +

+

+ Features of this issue include: +

    +
  • Party time! Kalgan is released.
    • +
  • (Another) memory donation - I'm sure about this one :)
    • +
  • Money, money, money!
    • +
  • Tip - Troubleshooting the launch of GUI appplications
    • +
  • (Lots of) security announcements
    • +
+

+ + +

Events

+

+ Here's a selection of events which have occurred since the previous newsletter: +

+
    +
  • +

    Party time! Kalgan is released.

    +

    The release of Frugalware 0.8 - code-named "Kalgan" - was announced on 11 March 2008 by vmiklos. For full details of what this release brings, read his post. Just one of the many advances is the new tool 'FUN' - Frugalware Update Notifier. Now you'll know when you're having fun :)

    +
    • +
  • +

    (Another) memory donation - I'm sure about this one :)

    +

    IroNiQ donated 1 GB RAM which was installed in Genesis - one of the build servers. Many thanks to IroNiQ for his kind donation.

    +
    • +
  • +

    Money, money, money!

    +

    Distrowatch recently donated US$340 to the Frugalware project with the text "Frugalware Linux is an independent distribution developed by Miklós Vajna and a small developer community. It was originally inspired by the simplicity of Slackware Linux, but the developers also included Pacman, the excellent package manager from Arch Linux. Pacman, and its graphical front-end, now form an integral part of Frugalware Linux. The project also prides itself on providing the very latest software packages in the repositories, on having a regular 6-month release cycle, and on providing complete security support for the distribution during its lifespan. Frugalware Linux might not be a particularly widely-used distro, but the dedication of the development team is exemplary and they continue to deliver improved releases every few months." Thank you to Distrowatch! Of course credit for a great distribution goes to all past and present Frugalware developers and contributors.

    +
    • +
  • +

    VMiklos translates splashy

    +

    It was noted in the release notes for splashy 0.3.9 that vmiklos provided a Hungarian translation. This is just one example where Frugalware developers contribute to projects which benefit Frugalware and other Linux distributions.

    +
    • +
  • +

    Happy birthday to Frugalware-fr

    +

    The web site of the French-language Frugalware community recently celebrated its first birthday. Congratulations to devil505 (its creator) all those who have contributed to its success. Frugalware aims to be accessible to everyone, regardless of the language they speak. The French-language Frugalware community helps in that effort.

    +
    • +
  • +

    "Bouleetbil the Builder"

    +

    Bouleetbil recently approached the development team and offered his help, particularly in maintaining packages. Since there are many packages whose maintainer has since left the Frugalware project, bouleetbil was asked to look first at these and see which packages he might like to update. He's already making great progress with the help of the developers, particularly crazy and vmiklos.

    +
    • +
  • +

    It's all Greek to me :)

    +

    Bill Tux recently approached the development team offering to provide Greek translation of the various Frugalware projects. As I mentioned above, making Frugalware available to people in their own language is welcome.

    +
    • +
+ + + +

Frugalware's developers are people too!

+

This is a new feature of the newsletter in which various Frugalware developers reveal a little about themselves. The aim is to show that "Frugalware's developers are people too!" I thank the developers for taking the time to answer the questions. There will be one interview per newsletter (until we run out of developers).

+ +

hermier

+

This issue's interview is with hermier, whose roles in the Frugalware development team include: documentation, translation administrator and maintenance of the nvidia package. Please stand and hum the French national anthem while you read his interview.

+ +
+
What's your name?
+
Michel Hermier
+
What's your IRC nickname?
+
hermier
+
In what country do you live?
+
France
+
In what country were you born?
+
France
+
What do you like the most about where you live?
+
It's near the forest, mountains, beach, and most import - near my family.
+
What do you do for the Frugalware project?
+
I try to be the (infamous) documentation manager, translation administrator and (nvidia) package maintainer.
+
What motivates you to work on Frugalware?
+
In a few words: reactivity, speed of programs. If you only see read 3 words instead of 4, it's because reactivity counts twice here ;) Seriously, the team are quick to answer your problems, the number of people involved is quite low, and has a great level of knowledge. In addition, the fact that we have a low number of patch is a great thing for me.
+
What do you do when you're not working on Frugalware?
+
Chatting with my friends on computers, hacking on KDE, and attempting to have a social life. I also like to watch movies on TV and in a cinema.
+
What's the view from your front door?
+
Open the door and have a look.
+
+ + +

Tips and tricks

+ Disclaimer - Be aware that the hints & tips provided here have NOT been tested and so come with no warranty. +
    +
  • +

    Troubleshooting the launch of GUI applications - by 'phayz'

    +

    You may find that after clicking on the menu item of a GUI application you see the 'busy'cursor, but the application itself doesn't start. This can happen for several reasons: a library conflict, a missing library etc. The problem is that you don't see the error messages that occur. If this happens to you, the best thing to do when diagnosing the problem is to launch the application from a terminal window. You will then see the error messages that appear and they'll give you a starting point for further troubleshooting.

    +
    • +
+

This section relies on your contributions! If have some tips and tricks that you would like to be shown in the newsletter, please post them on the forums in the Tips and Tricks section!

+ + + +

Focus On Package(s)

+ +

AbiWord

+

"AbiWord is a free word processing program similar to Microsoft Word. It is suitable for a wide variety of word processing tasks." While AbiWord may not have any many features as Microsoft Word or OpenOffice.org Writer, it's advantage is that it's much lighter in terms of resources. This is great for those PCs - like mine - which are not as powerful as the latest PCs. Even if you do have a powerful PC, it still makes a great word processor if you're doing mainly basic tasks. Try it and see for yourself.

+ + + +

Bug fixes

+ +

+ A list of bugs closed since the previous newsletter is available here. +

+ + + +

Security announcements

+

+ Remember - According to the normal support arrangements for Frugalware, the release of Frugalware 0.8 ("Kalgan") means that support for the previous release has ended. This means that no further security or bug fixes will be released for Frugalware 0.7 ("Sayshell"). +

+ +

+ Here is a list of security issues which have been discovered and fixed in the 0.7 release since the previous newsletter. +

+ +
    +
  • FSA393 - boost: Some vulnerabilities have been reported in Boost, which can be exploited by malicious people to cause a DoS (Denial of Service). Please upgrade to boost-1.34.0-6sayshell1.
    • +
  • FSA392 - bind: A vulnerability has been reported in ISC BIND, which can be exploited by malicious people to cause a DoS (Denial of Service) or to potentially compromise a vulnerable system.. Please upgrade to bind-9.4.1-3sayshell1.
    • +
  • FSA391 - wordpress: A vulnerability has been reported in WordPress, which can be exploited by malicious users to bypass certain security restrictions and to manipulate data. Please upgrade to wordpress-2.3.3-1sayshell1.
    • +
  • FSA390 - opera: Some vulnerabilities have been reported in Opera, which can be exploited by malicious people to conduct cross-site scripting attacks, disclose sensitive information, or to bypass certain security restrictions. Please upgrade to opera-9.26-1sayshell1.
    • +
  • FSA389 - kdebase: A weakness has been reported in KDE, which can be exploited by malicious, local users to cause a DoS (Denial of Service). Please upgrade to kdebase-3.5.7-4sayshell1.
    • +
  • FSA388 - wireshark: Some vulnerabilities have been reported in Wireshark, which can be exploited by malicious people to cause a DoS (Denial of Service). Please upgrade to wireshark-0.99.8-1sayshell1.
    • +
  • FSA387 - phpmyadmin: A vulnerability has been reported in phpMyAdmin, which can be exploited by malicious people to conduct SQL injection attacks. Please upgrade to phpmyadmin-2.11.5-1sayshell1.
    • +
  • FSA386 - rblibtorrent: A vulnerability has been reported in Rasterbar Software libtorrent, which can be exploited by malicious people to cause a DoS (Denial of Service). Please upgrade to rblibtorrent-0.12-6sayshell1.
    • +
  • FSA385 - cacti: Some vulnerabilities have been reported in Cacti, which can be exploited by malicious people to conduct HTTP response splitting, cross-site scripting, and SQL injection attacks. Please upgrade to cacti-0.8.6j-4sayshell1.
    • +
  • FSA384 - xine-lib: A vulnerability has been discovered in xine-lib, which can potentially be exploited by malicious people to compromise a user's system. Please upgrade to xine-lib-1.1.10.1-1sayshell1.
    • +
  • FSA383 - thunderbird: Some vulnerabilities have been reported in Mozilla Thunderbird, which can be exploited by malicious people to disclose sensitive information, bypass certain security restrictions, or potentially to compromise a user's system. Please upgrade to thunderbird-2.0.0.12-1sayshell1.
    • +
  • FSA382 - pcre: A vulnerability has been reported in PCRE, which potentially can be exploited by malicious people to cause a DoS (Denial of Service) or compromise an application using the library. Please upgrade to pcre-7.6-1sayshell1.
    • +
  • FSA381 - lighttpd: A vulnerability has been reported in lighttpd, which can be exploited by malicious people to cause a DoS (Denial of Service). Please upgrade to lighttpd-1.4.18-2sayshell1.
    • +
  • FSA380 - cups: A vulnerability has been discovered in CUPS, which can be exploited by malicious people to cause a DoS (Denial of Service) or to potentially compromise a vulnerable system. Please upgrade to cups-1.3.6-1sayshell1.
    • +
  • FSA379 - graphicsmagick: Some vulnerabilities have been reported in GraphicsMagick, which can be exploited by malicious people to conduct DoS (Denial of Service) attacks or compromise a user's system. Please upgrade to graphicsmagick-1.1.11-1sayshell1.
    • +
  • FSA378 - joomla: Hendrik-Jan Verheij has discovered a vulnerability in Joomla!, which can be exploited by malicious people to compromise a vulnerable system. Please upgrade to joomla-1.0.15-1sayshell1.
    • +
  • FSA377 - dbus: A security issue has been reported in D-Bus, which can be exploited by malicious, local users to bypass certain security restrictions. Please upgrade to dbus-1.0.3-1sayshell1.
    • +
  • FSA376 - clamav: Some vulnerabilities have been reported in ClamAV, which can be exploited by malicious people to cause a DoS (Denial of Service) or to potentially compromise a vulnerable system. Please upgrade to clamav-0.92.1-1sayshell1.
    • +
  • FSA375 - vlc: A vulnerability has been reported in VLC Media Player, which can potentially be exploited by malicious people to compromise a user's system. Please upgrade to vlc-0.8.6-8sayshell2.
    • +
  • FSA374 - seamonkey: Some vulnerabilities have been reported in Mozilla SeaMonkey, which can be exploited by malicious people to disclose sensitive information, bypass certain security restrictions, conduct spoofing attacks, or potentially to compromise a vulnerable system. Please upgrade to seamonkey-1.1.8-1sayshell1.
    • +
  • FSA373 - firefox: Some vulnerabilities and weaknesses have been reported Mozilla Firefox, which can be exploited by malicious people to disclose sensitive information, bypass certain security restrictions, conduct spoofing attacks, or to compromise a user's system. Please upgrade to firefox-2.0.0.12-1sayshell1.
    • +
  • FSA372 - kernel: A vulnerability have been reported in the Linux Kernel, which can be exploited by malicious, local users to disclose potentially sensitive information or gain escalated privileges. Please upgrade to kernel-2.6.22-7sayshell6.
    • +
+ + +

About the newsletter

+

Author

+

The Frugalware newsletter is written by Russell Dickenson (AKA phayz). Credit for the Frugalware distribution goes to the development team.

+

Translations

+

The newsletter is currently translated into French and Danish. The French translation is provided by the French Frugalware community. The Danish translation is provided by the Danish Frugalware community. Thanks to all those involved in providing and hosting these translations.

+

Release

+

To allow time for review and corrections, each newsletter is written ahead of its release date. Therefore it may not mention events which occured in the few days before its release - e.g. security fixes. To be sure that you've got the very latest information on these topics, go to the appropriate page of the Frugalware web site.

+

Feedback

+

If you have feedback about the Frugalware newsletter - whether good or bad - please provide it via the forums. Your feedback is valuable because we want the newsletter to meet the needs of Frugalware's users.

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index f764869..5437e6b 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -17,6 +17,26 @@ + 92 + Frugalware Newsletter Issue 18 + Thu Mar 13 21:42:43 AEST 2008 + phayz + 0 + + Features of this issue include: +
    +
  • Party time! Kalgan is released.
    • +
  • (Another) memory donation - I'm sure about this one :)
    • +
  • Money, money, money!
    • +
  • Tip - Troubleshooting the launch of GUI appplications
    • +
  • (Lots of) security announcements
    • +
+ You can read it here. We hope you like it! + ]]> + + + 91 Frugalware 0.8 (Kalgan) for i686 released Mon Mar 11 07:16:05 CET 2008 From iron at frugalware.org Fri Mar 14 08:31:26 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Mar 14 08:31:29 2008 Subject: [Frugalware-git] homepage-ng: newsletter: small correction in issue18 Message-ID: <20080314073126.C841F11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=3d8be672d975bb160171b3eb6f1d9a5e8bcc5890 commit 3d8be672d975bb160171b3eb6f1d9a5e8bcc5890 Author: Krisztian VASAS Date: Fri Mar 14 08:31:17 2008 +0100 newsletter: small correction in issue18 diff --git a/frugalware/weeklynews/issue18.html b/frugalware/weeklynews/issue18.html index 75231d1..9d25a48 100755 --- a/frugalware/weeklynews/issue18.html +++ b/frugalware/weeklynews/issue18.html @@ -38,7 +38,7 @@

  • (Another) memory donation - I'm sure about this one :)

    -

    IroNiQ donated 1 GB RAM which was installed in Genesis - one of the build servers. Many thanks to IroNiQ for his kind donation.

    +

    IroNiQ donated 1 GB RAM which was installed in Genesis - the main server. Many thanks to IroNiQ for his kind donation.

  • Money, money, money!

    @@ -107,7 +107,7 @@

    Focus On Package(s)

    AbiWord

    -

    "AbiWord is a free word processing program similar to Microsoft Word. It is suitable for a wide variety of word processing tasks." While AbiWord may not have any many features as Microsoft Word or OpenOffice.org Writer, it's advantage is that it's much lighter in terms of resources. This is great for those PCs - like mine - which are not as powerful as the latest PCs. Even if you do have a powerful PC, it still makes a great word processor if you're doing mainly basic tasks. Try it and see for yourself.

    +

    "AbiWord is a free word processing program similar to Microsoft Word. It is suitable for a wide variety of word processing tasks." While AbiWord may not have any many features as Microsoft Word or OpenOffice.org Writer, it's advantage is that it's much lighter in terms of resources. This is great for those PCs - like mine - which are not as powerful as the latest PCs. Even if you do have a powerful PC, it still makes a great word processor if you're doing mainly basic tasks. Try it and see for yourself.

    From voroskoi at frugalware.org Fri Mar 14 09:28:46 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Mar 14 09:28:48 2008 Subject: [Frugalware-git] frugalware-current: samba-3.0.28-2-i686 Message-ID: <20080314082846.895A911901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca90ac32d919394c58faaeb4d8773caf28676b12 commit ca90ac32d919394c58faaeb4d8773caf28676b12 Author: voroskoi Date: Fri Mar 14 09:28:12 2008 +0100 samba-3.0.28-2-i686 bump to patchlevel a diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index a2b987d..b5c17d2 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -4,8 +4,8 @@ pkgname=samba pkgver=3.0.28 -pkgextraver= -pkgrel=1 +pkgextraver=a +pkgrel=2 pkgdesc="SMB file and print server." url="http://www.samba.org" backup=(etc/logrotate.d/samba) @@ -86,7 +86,7 @@ build() Fsplit samba-swat usr/sbin/swat Fsplit samba-swat usr/share/swat } -sha1sums=('4fcad8134f89a123a254138de0ace4a13993b007' \ +sha1sums=('b4829b133af3865f6518bae14af4d989b6f1c31a' \ '13fd371189bfe637f3f13c62d44d9e761268119e' \ '0e407642fe6aa0c032df38aac3815eb08f07e35b') From janny at frugalware.org Fri Mar 14 09:59:25 2008 From: janny at frugalware.org (janny) Date: Fri Mar 14 09:59:26 2008 Subject: [Frugalware-git] frugalware-current: ksniffer-0.3.2-1-i686 Message-ID: <20080314085925.4EC1611901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=143f455767af7a7a32975648d28e50da7486bc35 commit 143f455767af7a7a32975648d28e50da7486bc35 Author: janny Date: Fri Mar 14 09:55:10 2008 +0100 ksniffer-0.3.2-1-i686 * version bump diff --git a/source/kde-extra/ksniffer/FrugalBuild b/source/kde-extra/ksniffer/FrugalBuild index 637058f..b5941f5 100644 --- a/source/kde-extra/ksniffer/FrugalBuild +++ b/source/kde-extra/ksniffer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=ksniffer -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="Network sniffing application for KDE" license="GPL" @@ -16,6 +16,6 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.ksniffer.org/" Fconfopts="--disable-debug --enable-final --with-gnu-ld" -sha1sums=('b11efdfce2927d38f21f67319fac31b109765b38') +sha1sums=('7cb0fc2f04213ef81051b8503f54769dbefa6bca') # optimization OK From janny at frugalware.org Fri Mar 14 11:15:01 2008 From: janny at frugalware.org (janny) Date: Fri Mar 14 11:15:02 2008 Subject: [Frugalware-git] frugalware-current: skype-2.0.0.63-1-i686 Message-ID: <20080314101501.79DAF11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50dfe5ff2aa8d524936231368433266335cc61f2 commit 50dfe5ff2aa8d524936231368433266335cc61f2 Author: janny Date: Fri Mar 14 11:13:38 2008 +0100 skype-2.0.0.63-1-i686 * version bump diff --git a/source/xapps-extra/skype/FrugalBuild b/source/xapps-extra/skype/FrugalBuild index 820ec87..f383b1f 100644 --- a/source/xapps-extra/skype/FrugalBuild +++ b/source/xapps-extra/skype/FrugalBuild @@ -2,36 +2,39 @@ # Maintainer: Janny pkgname=skype -pkgver=1.4.0.118 +pkgver=2.0.0.63 pkgrel=1 pkgdesc="Skype will let you make free calls to your friends all over the world." url="http://skype.com" rodepends=('libstdc++5' 'libsigc++2' 'qt4-qdbus' 'libqtgui' 'libqtnetwork' 'alsa-lib') groups=('xapps-extra') archs=('i686') -up2date="lynx -dump http://www.skype.com/download/skype/linux/ | grep Version | sed 's/.*n \(.*\). *for.*/\1/'" -source=(http://download.skype.com/linux/$pkgname-$pkgver.tar.bz2) +up2date="lynx -dump http://www.skype.com/intl/en/download/skype/linux/beta/choose/ | grep Version | sed 's/.*n \(.*\).*/\1/'" +source=(http://download.skype.com/linux/${pkgname}-${pkgver}.tar.bz2) license="skype-eula" options=('nobuild') -sha1sums=('8bf7737086702adbd276f081aad3bfe00ea8e22c') +sha1sums=('a787c6541aa1313f4600eb635b06ef808c11affa') build() { Fcd - # Install sound, language and icons directoryes - Fmkdir /usr/share/$pkgname - Fmkdir /usr/share/pixmaps/$pkgname - Ffilerel /usr/share/$pkgname/skype.conf - Ffilerel sounds/* /usr/share/$pkgname/sounds/ -# Ffilerel lang/* /usr/share/$pkgname/lang/ - Ffilerel icons/* /usr/share/pixmaps/skype - # Install desktop file - Ffilerel /usr/share/applications/$pkgname.desktop + Fmkdir usr/share/skype + # Install dbus system conf file + Ffilerel /etc/dbus-1/system.d/${pkgname}.conf # Install bin file Fexerel /usr/bin/skype -# Fexerel /usr/bin/skype-callto-handler + # Install desktop file + Ffilerel /usr/share/applications/${pkgname}.desktop + # Install icons files + Ffilerel icons/* usr/share/pixmaps/skype/ # Install desktop icon link Fln /usr/share/pixmaps/skype/SkypeBlue_48x48.png \ /usr/share/pixmaps/skype.png + Fln /usr/share/pixmaps/skype/SkypeBlue_48x48.png \ + /usr/share/icons/skype.png + # Install sound, avatars and language directoryes + Fcprrel sounds usr/share/skype/sounds/ + Fcprrel lang usr/share/skype/lang/ + Fcprrel avatars usr/share/skype/ } # optimization OK - noarch From vmiklos at frugalware.org Fri Mar 14 13:07:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 13:07:19 2008 Subject: [Frugalware-git] frugalware-current: seahorse-2.20.3-2-i686 Message-ID: <20080314120716.7470511901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa6a5a721fccdcfed2fa2bf91feff80054b349b2 commit aa6a5a721fccdcfed2fa2bf91feff80054b349b2 Author: Miklos Vajna Date: Fri Mar 14 13:06:45 2008 +0100 seahorse-2.20.3-2-i686 - rebuilt with gnutls=2.2.2-1 diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index 89526f7..6d3b3be 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -3,10 +3,10 @@ pkgname=seahorse pkgver=2.20.3 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" -depends=('gnutls=2.2.0-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ +depends=('gnutls=2.2.2-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' \ 'openssh' 'gconf>=2.20.0' 'avahi') makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' \ From crazy at frugalware.org Fri Mar 14 13:14:48 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 13:14:49 2008 Subject: [Frugalware-git] frugalware-current: vsftpd-2.0.6-1-i686 Message-ID: <20080314121448.8AFB211901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94486d40ad0e3d1e9a87e69a0db245fc34d9b76b commit 94486d40ad0e3d1e9a87e69a0db245fc34d9b76b Author: crazy Date: Fri Mar 14 13:14:10 2008 +0100 vsftpd-2.0.6-1-i686 * Version bump diff --git a/source/network-extra/vsftpd/FrugalBuild b/source/network-extra/vsftpd/FrugalBuild index 6111456..6244675 100644 --- a/source/network-extra/vsftpd/FrugalBuild +++ b/source/network-extra/vsftpd/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Kitoy pkgname=vsftpd -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=1 pkgdesc="A very secure ftp server" url="http://vsftpd.beasts.org/" @@ -14,7 +14,7 @@ groups=('network-extra') archs=('i686' 'x86_64') depends=('libcap' 'openssl' 'tcp_wrappers') backup=(etc/vsftpd.conf) -sha1sums=('9b6a079699aaeb01219665acf203c093f94faef0' \ +sha1sums=('23fcc21996cd1404f6957d83bfb2e8004401a858' \ 'ffc7521bc5845f2a382d56a2674680e903a9b895') build() From crazy at frugalware.org Fri Mar 14 13:19:46 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 13:19:47 2008 Subject: [Frugalware-git] frugalware-current: dejavu-lgc-ttf-2.24-1-i686 Message-ID: <20080314121946.0C23E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5ecd38b20368e378e480faea4d7a7d444cfd1e5 commit b5ecd38b20368e378e480faea4d7a7d444cfd1e5 Author: crazy Date: Fri Mar 14 13:18:13 2008 +0100 dejavu-lgc-ttf-2.24-1-i686 * Version bump diff --git a/source/x11/dejavu-lgc-ttf/FrugalBuild b/source/x11/dejavu-lgc-ttf/FrugalBuild index 3f3dae2..eaec12c 100644 --- a/source/x11/dejavu-lgc-ttf/FrugalBuild +++ b/source/x11/dejavu-lgc-ttf/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=dejavu-lgc-ttf -pkgver=2.23 +pkgver=2.24 pkgrel=1 pkgdesc="DejaVu fonts (LGC)" _F_sourceforge_dirname="dejavu" @@ -21,4 +21,4 @@ build() Ffilerel *.ttf /usr/lib/X11/fonts/TTF } -sha1sums=('31548769d255015e74551fa3129a2077f77d1acb') +sha1sums=('19050ad140749ca02170359ce99121cd3744cfb5') From vmiklos at frugalware.org Fri Mar 14 13:20:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 13:20:25 2008 Subject: [Frugalware-git] frugalware-current: libtool-2.2-1-i686 Message-ID: <20080314122018.3EAEA11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f9fc51fce016f170a808327e196157d34683f17c commit f9fc51fce016f170a808327e196157d34683f17c Author: Miklos Vajna Date: Fri Mar 14 13:19:52 2008 +0100 libtool-2.2-1-i686 - version bump - 2.2 after 1.5, heh diff --git a/source/devel/libtool/FrugalBuild b/source/devel/libtool/FrugalBuild index dd19621..a5dfb0c 100644 --- a/source/devel/libtool/FrugalBuild +++ b/source/devel/libtool/FrugalBuild @@ -2,13 +2,14 @@ # Maintainer: VMiklos pkgname=libtool -pkgver=1.5.26 -pkgrel=2 +pkgver=2.2 +pkgrel=1 pkgdesc="A generic library support script" url="http://www.gnu.org/software/libtool" depends=('bash') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') +_F_archive_nosort=y Fup2gnugz source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) signatures=($source.sig) From crazy at frugalware.org Fri Mar 14 13:41:12 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 13:41:13 2008 Subject: [Frugalware-git] frugalware-current: libwpd-0.8.14-1-i686 Message-ID: <20080314124112.1222B11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c3790c351d29e23fda8aee13c37cd090ae50a192 commit c3790c351d29e23fda8aee13c37cd090ae50a192 Author: crazy Date: Fri Mar 14 13:40:02 2008 +0100 libwpd-0.8.14-1-i686 * Version bump diff --git a/source/xlib/libwpd/FrugalBuild b/source/xlib/libwpd/FrugalBuild index 0c5788f..050f616 100644 --- a/source/xlib/libwpd/FrugalBuild +++ b/source/xlib/libwpd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libwpd -pkgver=0.8.13 +pkgver=0.8.14 pkgrel=1 pkgdesc="libwpd is a C++ library designed to help process WordPerfect documents." url="http://libwpd.sourceforge.net/" @@ -12,7 +12,7 @@ _F_sourceforge_prefix='libwpd-' Finclude sourceforge groups=('xlib') archs=('i686' 'x86_64') -sha1sums=('e202ad8a953f9d9cf6d63f6a8c052a0813e569f2') +sha1sums=('9d316c055f6f9e93896a1d8e8d81c6ea4a8a8a44') subpkgs=("$pkgname-docs") subdescs=("Libwpd Documentation") From vmiklos at frugalware.org Fri Mar 14 13:44:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 13:44:36 2008 Subject: [Frugalware-git] frugalware-current: busybox-1.9.1-1-i686 Message-ID: <20080314124435.ECAD211901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c75047921b64e57dafa1f9aaaa9c3aac1e5bbf5 commit 0c75047921b64e57dafa1f9aaaa9c3aac1e5bbf5 Author: Miklos Vajna Date: Fri Mar 14 13:44:21 2008 +0100 busybox-1.9.1-1-i686 - version bump - updated config diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index 064d623..1a71a1c 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=busybox -pkgver=1.8.2 +pkgver=1.9.1 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,8 +12,8 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://busybox.net/'|grep '(stable)'|sed 's/[^,]*BusyBox \([0-9.]*\) (.*/\1/'|Fsort|tail -n 1" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('cca3259c06c64ad4ba08070c8da32083d813057f' \ - '8d5d42a765ac206cbb670ccb249facea59e2f053') +sha1sums=('f978834055e9cc65395e23672de1a57904a61791' \ + 'ee90aaf9017bee8ee6aa1ff09a3e23b1b06d3cfe') build() { diff --git a/source/apps-extra/busybox/config b/source/apps-extra/busybox/config index aadf433..d6fe033 100644 --- a/source/apps-extra/busybox/config +++ b/source/apps-extra/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.8.2 -# Sun Jan 20 22:53:06 2008 +# Busybox version: 1.9.1 +# Fri Mar 14 13:38:16 2008 # CONFIG_HAVE_DOT_CONFIG=y @@ -83,6 +83,7 @@ CONFIG_FEATURE_EDITING_HISTORY=15 CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +CONFIG_FEATURE_COPYBUF_KB=4 CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y @@ -152,6 +153,7 @@ CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +# CONFIG_FEATURE_DF_INODE is not set CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -308,6 +310,7 @@ CONFIG_CMP=y CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y @@ -450,6 +453,8 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_FEATURE_MINIX2 is not set # CONFIG_GETOPT is not set CONFIG_HEXDUMP=y +# CONFIG_HD is not set +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set @@ -539,6 +544,7 @@ CONFIG_TIME=y # Networking Utilities # # CONFIG_FEATURE_IPV6 is not set +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set @@ -602,6 +608,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NC is not set # CONFIG_NC_SERVER is not set # CONFIG_NC_EXTRA is not set @@ -633,8 +640,10 @@ CONFIG_ROUTE=y # CONFIG_APP_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_APP_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_DEBUG is not set # CONFIG_FEATURE_RFC3397 is not set +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y @@ -673,7 +682,6 @@ CONFIG_UPTIME=y # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set # CONFIG_FEATURE_SH_IS_MSH is not set # CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y @@ -751,6 +759,7 @@ CONFIG_LOGGER=y # CONFIG_SETFILES is not set # CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set # CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set # # ipsvd utilities From crazy at frugalware.org Fri Mar 14 13:46:44 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 13:46:45 2008 Subject: [Frugalware-git] frugalware-current: libmcs-0.7.0-1-i686 Message-ID: <20080314124644.6051D11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=850ff906c2790e3443df4ad3b8f09e0c85ddb1f0 commit 850ff906c2790e3443df4ad3b8f09e0c85ddb1f0 Author: crazy Date: Fri Mar 14 13:46:11 2008 +0100 libmcs-0.7.0-1-i686 * Version bump diff --git a/source/lib-extra/libmcs/FrugalBuild b/source/lib-extra/libmcs/FrugalBuild index 6501738..26bb9d7 100644 --- a/source/lib-extra/libmcs/FrugalBuild +++ b/source/lib-extra/libmcs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=libmcs -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 pkgdesc="Simple, abstractable configuration library." url="http://www.atheme.org/projects/mcs.shtml" depends=('libmowgli>=0.6.0') @@ -14,4 +14,4 @@ replaces="mcs" provides="mcs" up2date="lynx -dump http://www.atheme.org/projects/mcs.shtml|grep 'The current version'|sed 's/.*is \(.*\),.*/\1/'" source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz) -sha1sums=('5cd3960f7a9c42eb136c49585a92be1e1549bd42') +sha1sums=('a4044047a31aaec8b6d97b6960f676eca9049cb1') From vmiklos at frugalware.org Fri Mar 14 13:50:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 13:51:00 2008 Subject: [Frugalware-git] frugalware-current: ejabberd-2.0.0-1-i686 Message-ID: <20080314125057.ACA9711901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8684bcc9b9c5620e39c1aba2ea349923ae29f91d commit 8684bcc9b9c5620e39c1aba2ea349923ae29f91d Author: Miklos Vajna Date: Fri Mar 14 13:50:46 2008 +0100 ejabberd-2.0.0-1-i686 - version bump diff --git a/source/network-extra/ejabberd/FrugalBuild b/source/network-extra/ejabberd/FrugalBuild index 04ad733..99a9e10 100644 --- a/source/network-extra/ejabberd/FrugalBuild +++ b/source/network-extra/ejabberd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=ejabberd -pkgver=1.1.4 +pkgver=2.0.0 pkgrel=1 pkgdesc="A free and open source instant messaging server written in Erlang." url="http://ejabberd.jabber.ru/" @@ -13,7 +13,7 @@ archs=('i686') up2date="lynx -dump http://www.process-one.net/en/ejabberd/archive/|grep -v beta |Flasttar" source=(http://www.process-one.net/downloads/ejabberd/$pkgver/ejabberd-$pkgver.tar.gz \ rc.ejabberd README.Frugalware) -sha1sums=('db6f521d45dece200de4eb6fc967c64728e8f6a3' \ +sha1sums=('d70257c1e75f59b7284d52c038431664cfd53e08' \ 'eb6e5a51a10fda5b1af1c4378e18700b9a575ef3' \ '1b31169bb44dabd8d862c603f8a79a5d4c6fa69d') From vmiklos at frugalware.org Fri Mar 14 14:00:24 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:00:26 2008 Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.40.8-1-i686 Message-ID: <20080314130024.EC88811901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e1c13301ee3c6533ca616fec3e43bf694a1c443 commit 5e1c13301ee3c6533ca616fec3e43bf694a1c443 Author: Miklos Vajna Date: Fri Mar 14 14:00:04 2008 +0100 e2fsprogs-1.40.8-1-i686 - version bump diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index cd3701e..db13da5 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=e2fsprogs -pkgver=1.40.6 -pkgrel=2 +pkgver=1.40.8 +pkgrel=1 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" url="http://e2fsprogs.sourceforge.net/" depends=('glibc>=2.7-3') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64' 'ppc') Finclude sourceforge source=(http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/e2fsprogs-$pkgver.tar.bz2 \ rc.fsck rc.random) -sha1sums=('eaf3b14d92a94d060c10860356518ee1a786b38e' \ +sha1sums=('4d02c2823b483386ec6060de329ebff92db38725' \ 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ '7d5e3eecbea952aa1f72808fb810892d82a35461') From vmiklos at frugalware.org Fri Mar 14 14:01:02 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:01:03 2008 Subject: [Frugalware-git] frugalware-current: flex-2.5.35-1-i686 Message-ID: <20080314130102.0BEB811901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54699681806671ffac482f747138e7fae41c4850 commit 54699681806671ffac482f747138e7fae41c4850 Author: Miklos Vajna Date: Fri Mar 14 14:00:51 2008 +0100 flex-2.5.35-1-i686 - up2date fix - some cleanup diff --git a/source/base/flex/FrugalBuild b/source/base/flex/FrugalBuild index 9bc2bf7..9bd6d03 100644 --- a/source/base/flex/FrugalBuild +++ b/source/base/flex/FrugalBuild @@ -9,12 +9,8 @@ url="http://flex.sourceforge.net" depends=('glibc>=2.7-3' 'bash') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') +_F_sourceforge_prefix="flex-" Finclude sourceforge -# avoid 2.5.34: it miscompiles itself and it break openoffice.org build: -# http://sourceforge.net/tracker/index.php?func=detail&aid=1849812&group_id=97492&atid=618177 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1849809&group_id=97492&atid=618177 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1849805&group_id=97492&atid=618177 -#up2date="$up2date |sed 's/2.5.34/2.5.33/'" source=(${source[@]} lex) sha1sums=('333c876a8e24ae5a17d9573459fc501b7721930b' \ '76701388d28fe8b1fb269c79c11a1316a02b4e46') From crazy at frugalware.org Fri Mar 14 14:12:47 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 14:12:48 2008 Subject: [Frugalware-git] frugalware-current: audacious-1.5.0-1-i686 Message-ID: <20080314131247.572B011901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99fe733c804435c3869ab98f0e8f4947791d1835 commit 99fe733c804435c3869ab98f0e8f4947791d1835 Author: crazy Date: Fri Mar 14 14:11:42 2008 +0100 audacious-1.5.0-1-i686 * Version bump diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild index 76756fb..cba867b 100644 --- a/source/xmultimedia-extra/audacious/FrugalBuild +++ b/source/xmultimedia-extra/audacious/FrugalBuild @@ -2,11 +2,12 @@ # Maintainer: crazy pkgname=audacious -pkgver=1.4.6 +pkgver=1.5.0 pkgrel=1 pkgdesc="Audacious is a fork from BMP 0.9.7.1" url="http://audacious-media-player.org/" -depends=('gtk+2>=2.12.7' 'taglib' 'libglade' 'libxml2' 'glib2>=2.14.2' 'libmcs>=0.6.0-2' 'dbus-glib') +depends=('gtk+2>=2.12.7' 'taglib' 'libglade' 'libxml2' 'glib2>=2.14.2' 'libmcs>=0.7.0' 'dbus-glib' 'freetype2' 'libxau' \ + 'libxdmcp' 'libmcs' 'libxdamage' 'libxext' 'libice') rodepends=('audacious-plugins') groups=('xmultimedia-extra') archs=('i686' 'x86_64') @@ -16,7 +17,7 @@ replaces=('bmp' 'bmp-docklet' 'bmp-mac') up2date="lynx -dump 'http://audacious-media-player.org/index.php?title=Downloads'|grep -m1 '.tbz2'|sed 's/.*ious-\(.*\).t.*/\1/;s/-/_/'" source=(http://distfiles.atheme.org/$pkgname-`echo $pkgver|sed 's/_/-/'`.tbz2) _F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`" -sha1sums=('87104f293bbb6a61130bf669a6b6510f68652670') +sha1sums=('43cdb1a11b4637bce979b730a6caba10d9e1ce18') build() { From vmiklos at frugalware.org Fri Mar 14 14:19:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:19:49 2008 Subject: [Frugalware-git] frugalware-current: reiserfsprogs-3.6.20-1-i686 Message-ID: <20080314131948.A94D311901A5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba596469db9e3d7ee2b5e80adf6a25bc05fa425b commit ba596469db9e3d7ee2b5e80adf6a25bc05fa425b Author: Miklos Vajna Date: Fri Mar 14 14:19:27 2008 +0100 reiserfsprogs-3.6.20-1-i686 - version bump - vanilla builds again, removed buildfix patches diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index f04c7b2..b9ff932 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=reiserfsprogs -pkgver=3.6.19 -pkgrel=3 +pkgver=3.6.20 +pkgrel=1 pkgdesc="Reiserfs utilities" url="http://www.namesys.com" depends=('e2fsprogs>=1.40.6-2') @@ -12,16 +12,13 @@ archs=('i686' 'x86_64' 'ppc') #up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" #source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) up2date="lynx -dump http://mirror.trouble-free.net/sources/|Flasttar" -source=(http://mirror.trouble-free.net/sources//$pkgname-$pkgver.tar.gz \ - reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) -sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ - 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ - 'fd97c2e9c9a8dc2064e74e41e7f6b4d8e3b61a09') +source=(http://mirror.trouble-free.net/sources//$pkgname-$pkgver.tar.gz) +sha1sums=('688b26c224769b46400e314c16f4185c55549e70') build() { unset MAKEFLAGS - Fbuild || return 1 + Fbuild Fmv /usr/sbin / Fln reiserfsck /sbin/fsck.reiserfs } diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch deleted file mode 100644 index 2146c94..0000000 --- a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur reiserfsprogs-3.6.19.orig/fsck/main.c reiserfsprogs-3.6.19/fsck/main.c ---- reiserfsprogs-3.6.19.orig/fsck/main.c 2004-10-07 15:04:08.000000000 +0100 -+++ reiserfsprogs-3.6.19/fsck/main.c 2007-05-02 16:05:08.000000000 +0100 -@@ -416,7 +416,7 @@ - (data->log == stdout) ? "stdout" : - (data->log_file_name ? data->log_file_name : "fsck.run")); - -- if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you want to " -+ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) && !user_confirmed (warn_to, "\nDo you want to " - "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n")) - exit (EXIT_USER); - } diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch deleted file mode 100644 index 5883ce8..0000000 --- a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch +++ /dev/null @@ -1,35 +0,0 @@ -backported from 3.6.20 - -http://bugs.gentoo.org/153494 - ---- include/reiserfs_fs.h -+++ include/reiserfs_fs.h -@@ -38,14 +38,22 @@ - # define extern_inline - #endif - --#include -- - #ifndef get_unaligned --#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ -- defined(__PPC) || defined(powerpc) || defined(__powerpc__) --# define get_unaligned(ptr) (*(ptr)) --# define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) -+#define get_unaligned(ptr) \ -+({ \ -+ __typeof__(*(ptr)) __tmp; \ -+ memcpy(&__tmp, (ptr), sizeof(*(ptr))); \ -+ __tmp; \ -+}) - #endif -+ -+#ifndef put_unaligned -+#define put_unaligned(val, ptr) \ -+({ \ -+ __typeof__(*(ptr)) __tmp = (val); \ -+ memcpy((ptr), &__tmp, sizeof(*(ptr))); \ -+ (void)0; \ -+}) - #endif - - #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) From vmiklos at frugalware.org Fri Mar 14 14:21:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:21:46 2008 Subject: [Frugalware-git] frugalware-current: aspell6-lt-1.2.1r0-1-i686 Message-ID: <20080314132144.4CCAB11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbd1ce37e3f54ac9007f69e762a68a48cb60f442 commit bbd1ce37e3f54ac9007f69e762a68a48cb60f442 Author: Miklos Vajna Date: Fri Mar 14 14:21:35 2008 +0100 aspell6-lt-1.2.1r0-1-i686 - version bump - added sbu diff --git a/source/locale-extra/aspell6-lt/FrugalBuild b/source/locale-extra/aspell6-lt/FrugalBuild index f5883c7..913219f 100644 --- a/source/locale-extra/aspell6-lt/FrugalBuild +++ b/source/locale-extra/aspell6-lt/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: ~1 minute +# Compiling Time: 0 SBU # Maintainer: VMiklos _F_aspell_lang=lt pkgname=aspell6-$_F_aspell_lang -pkgver=1.1+cvs20060103r0 +pkgver=1.2.1r0 pkgrel=1 pkgdesc="GNU Aspell 0.60 Lithuanian Dictionary Package" url="http://aspell.net/" @@ -11,4 +11,4 @@ depends=('aspell>=0.60') groups=('locale-extra') archs=('i686' 'x86_64') Finclude aspell -sha1sums=('41923d31285c8e7385ecf968d3534b00205b0f24') +sha1sums=('114c33dd042712dcef546b73dfbf889c1f7d7479') From vmiklos at frugalware.org Fri Mar 14 14:30:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:30:18 2008 Subject: [Frugalware-git] frugalware-current: vim-spell-de-20080213-1-i686 Message-ID: <20080314133016.0673811901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=194f6b4fc23dac1bc3eb22fca4cd72aa343cc3c6 commit 194f6b4fc23dac1bc3eb22fca4cd72aa343cc3c6 Author: Miklos Vajna Date: Fri Mar 14 14:24:37 2008 +0100 vim-spell-de-20080213-1-i686 - version bump diff --git a/source/locale-extra/vim-spell-de/FrugalBuild b/source/locale-extra/vim-spell-de/FrugalBuild index 35ef21b..dbc8f00 100644 --- a/source/locale-extra/vim-spell-de/FrugalBuild +++ b/source/locale-extra/vim-spell-de/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos _F_vim_lang=de -pkgver=20070930 +pkgver=20080213 _F_vim_desc=German _F_vim_encodings=('latin1' 'utf-8') _F_vim_sug_encodings=('latin1' 'utf-8') From vmiklos at frugalware.org Fri Mar 14 14:30:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:30:19 2008 Subject: [Frugalware-git] frugalware-current: vim-spell-es-20080213-1-i686 Message-ID: <20080314133016.23A911190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cfbbf856380e6511ad0d8dcfe0c8aeaeb0b627ab commit cfbbf856380e6511ad0d8dcfe0c8aeaeb0b627ab Author: Miklos Vajna Date: Fri Mar 14 14:28:07 2008 +0100 vim-spell-es-20080213-1-i686 - version bump diff --git a/source/locale-extra/vim-spell-es/FrugalBuild b/source/locale-extra/vim-spell-es/FrugalBuild index 708cd68..5e98519 100644 --- a/source/locale-extra/vim-spell-es/FrugalBuild +++ b/source/locale-extra/vim-spell-es/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos _F_vim_lang=es -pkgver=20070930 +pkgver=20080213 _F_vim_desc=Spanish _F_vim_encodings=('latin1' 'utf-8') _F_vim_sug_encodings=('latin1' 'utf-8') From vmiklos at frugalware.org Fri Mar 14 14:30:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:30:20 2008 Subject: [Frugalware-git] frugalware-current: vim-spell-hu-20080213-1-i686 Message-ID: <20080314133016.51C8D1190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=04f9736a72da6c6a8956253b93a532e4bb9cc6df commit 04f9736a72da6c6a8956253b93a532e4bb9cc6df Author: Miklos Vajna Date: Fri Mar 14 14:29:13 2008 +0100 vim-spell-hu-20080213-1-i686 - version bump diff --git a/source/locale-extra/vim-spell-hu/FrugalBuild b/source/locale-extra/vim-spell-hu/FrugalBuild index 988f986..37aba36 100644 --- a/source/locale-extra/vim-spell-hu/FrugalBuild +++ b/source/locale-extra/vim-spell-hu/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos _F_vim_lang=hu -pkgver=20070930 +pkgver=20080213 _F_vim_desc=Hungarian _F_vim_encodings=('cp1250' 'iso-8859-2' 'utf-8') Finclude vim-spell From vmiklos at frugalware.org Fri Mar 14 14:30:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 14:30:21 2008 Subject: [Frugalware-git] frugalware-current: vim-spell-fr-20080217-1-i686 Message-ID: <20080314133016.5A08D1190202@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=75a87db67f3c75c6050335c0de56ab44b0afa964 commit 75a87db67f3c75c6050335c0de56ab44b0afa964 Author: Miklos Vajna Date: Fri Mar 14 14:29:58 2008 +0100 vim-spell-fr-20080217-1-i686 - version bump diff --git a/source/locale-extra/vim-spell-fr/FrugalBuild b/source/locale-extra/vim-spell-fr/FrugalBuild index 1765fdf..37efe29 100644 --- a/source/locale-extra/vim-spell-fr/FrugalBuild +++ b/source/locale-extra/vim-spell-fr/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: VMiklos _F_vim_lang=fr -pkgver=20070930 +pkgver=20080217 _F_vim_desc=French _F_vim_encodings=('latin1' 'utf-8') _F_vim_sug_encodings=('latin1' 'utf-8') Finclude vim-spell -sha1sums=('64a793a44143773b428315b670be4b0060c4205d' \ - 'd9a9e2c7d49d04c10b2d91d898ec09f3f3170c60' \ - '3583c11a96486b32df56d7ee44614ff650024484' \ - '16e5c417e3f5c8632acf5c09cb7fd036b4435a81' \ - '1c05c48382617c6c528c7e25164678f201337f4d') +sha1sums=('b76922f10e9df3bb2322035cc2ca4530589ffd0a' \ + '11c5614f14f8fcc03f983b072e41a5a16ebdf19d' \ + 'f63b24a5dd648d861f3b42fd70a277fd070af841' \ + '8091e33273a9f93b38338097f9f85939c60a2f13' \ + 'b5224c6515d27f03bfb8da2d28de45a05f2a12b0') From crazy at frugalware.org Fri Mar 14 14:46:05 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 14:46:07 2008 Subject: [Frugalware-git] frugalware-current: audacious-plugins-1.5.0-1-i686 Message-ID: <20080314134605.BA99911901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=217293d5d95939f8fecac571639aeb00546a503a commit 217293d5d95939f8fecac571639aeb00546a503a Author: crazy Date: Fri Mar 14 14:43:27 2008 +0100 audacious-plugins-1.5.0-1-i686 * Version bump * disabled projectm subpackage , does not work diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild b/source/xmultimedia-extra/audacious-plugins/FrugalBuild index ba2fbc5..0ca8c06 100644 --- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild +++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild @@ -2,15 +2,17 @@ # Maintainer: crazy pkgname=audacious-plugins -pkgver=1.4.5 +pkgver=1.5.0 pkgrel=1 pkgdesc="Plugins for audacious." url="http://audacious-media-player.org/" -depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.6' 'faad2' \ +depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.5.0' 'faad2' \ 'flac>=1.1.4' 'libvorbis' 'adplug>=2.1' 'libmodplug' 'unzip' 'libnms' 'glib2>=2.14.2' \ 'lame' 'libmad' 'libsndfile' 'libxcomposite' 'imlib2' 'libcdio') -makedepends=('jack' 'arts' 'esd' 'libsamplerate' 'lirc' 'libprojectm>=1.01' 'neon' 'wavpack>=4.40.0' \ +makedepends=('jack' 'arts' 'esd' 'libsamplerate' 'lirc' 'neon' 'wavpack>=4.40.0' \ 'libsidplay' 'libsidplay2' 'libmtp' 'libmpcdec' 'libmms' 'taglib') +conflicts=('audacious-plugin-projectm') +replaces=('audacious-plugin-projectm') groups=('xmultimedia-extra') archs=('i686' 'x86_64') options=('scriptlet') @@ -19,21 +21,20 @@ source=(http://distfiles.atheme.org/$pkgname-`echo $pkgver|sed 's/_/-/'`.tbz2) _F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`" subpkgs=("audacious-plugin-arts" "audacious-plugin-esd" "audacious-plugin-jack" "audacious-plugin-lirc" \ - "audacious-plugin-projectm" "audacious-plugin-neon" "audacious-plugin-wavpack" "audacious-plugin-sidplay" \ + "audacious-plugin-neon" "audacious-plugin-wavpack" "audacious-plugin-sidplay" \ "audacious-plugin-mtp" "audacious-plugin-musepack" "audacious-plugin-mms") subdescs=('Audacious arts output plugin' 'Audacious esd output plugin' 'Audacious jack output plugin' \ - 'Audacious lirc plugin' 'Audacious projectm visualization plugin' 'Audacious neon transport plugin' \ + 'Audacious lirc plugin' 'Audacious neon transport plugin' \ 'Audacious wavpack input plugin' 'Audacious sid input plugin' 'Audacious mtp plugin' \ 'Audacious musepack input plugin' 'Audacious mms transport plugin') subdepends=("$pkgname=$pkgver arts" "$pkgname=$pkgver esd" "$pkgname=$pkgver libsamplerate jack" \ - "$pkgname=$pkgver lirc" "$pkgname=$pkgver libprojectm>=1.01" "$pkgname=$pkgver neon" \ + "$pkgname=$pkgver lirc" "$pkgname=$pkgver neon" \ "$pkgname=$pkgver wavpack>=4.40.0" "$pkgname=$pkgver libsidplay libsidplay2" "$pkgname=$pkgver libmtp" \ "$pkgname=$pkgver libmpcdec taglib" "$pkgname=$pkgver libmms") subgroups=('xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' \ - 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' \ - 'xmultimedia-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ - 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') + 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') build() { @@ -53,7 +54,7 @@ build() Fsplit audacious-plugin-esd usr/lib/audacious/Output/ESD.so Fsplit audacious-plugin-jack usr/lib/audacious/Output/jackout.so Fsplit audacious-plugin-lirc usr/lib/audacious/General/lirc.so - Fsplit audacious-plugin-projectm usr/lib/audacious/Visualization/projectm*.so + #Fsplit audacious-plugin-projectm usr/lib/audacious/Visualization/projectm*.so Fsplit audacious-plugin-neon usr/lib/audacious/Transport/neon.so Fsplit audacious-plugin-wavpack usr/lib/audacious/Input/wavpack.so Fsplit audacious-plugin-sidplay usr/lib/audacious/Input/sid.so @@ -63,4 +64,4 @@ build() } # optimalization OK -sha1sums=('188449c8e25bae89126970c49f46bb1b82513df0') +sha1sums=('eb9df7e7f652ecad0910f46b9e484dea798c0564') From crazy at frugalware.org Fri Mar 14 15:00:32 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 15:00:35 2008 Subject: [Frugalware-git] frugalware-current: libggz-0.0.14.1-1-i686 Message-ID: <20080314140032.BA5FA11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e98b3d79562d75051f8801c0e7e47b090e078986 commit e98b3d79562d75051f8801c0e7e47b090e078986 Author: crazy Date: Fri Mar 14 15:00:06 2008 +0100 libggz-0.0.14.1-1-i686 * Version bump diff --git a/source/lib-extra/libggz/FrugalBuild b/source/lib-extra/libggz/FrugalBuild index ad07cfc..7973fd6 100644 --- a/source/lib-extra/libggz/FrugalBuild +++ b/source/lib-extra/libggz/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libggz -pkgver=0.0.14 +pkgver=0.0.14.1 pkgrel=1 pkgdesc="Low-level library for C development" url="http://www.ggzgamingzone.org" @@ -12,6 +12,6 @@ archs=('i686') up2date="lynx -dump 'http://ftp.belnet.be/packages/ggzgamingzone/ggz/?C=M;O=A'| grep '/[0-9]'|tail -n1|sed 's/.*z\/\(.*\)\//\1/'" source=(http://ftp.belnet.be/packages/ggzgamingzone/ggz/$pkgver/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --disable-debug --with-tls=OpenSSL" -sha1sums=('fd4d24e2b429da7f947df79d062b2ba005206c0e') +sha1sums=('8a602e60606c89fd13ad93bb84a8be466fd457ef') # optimization OK From crazy at frugalware.org Fri Mar 14 15:03:17 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 15:03:17 2008 Subject: [Frugalware-git] frugalware-current: ggz-client-libs-0.0.14.1-1-i686 Message-ID: <20080314140317.09BB811901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56f1038798fcb8816fbbab6b9ba754b46451a1f6 commit 56f1038798fcb8816fbbab6b9ba754b46451a1f6 Author: crazy Date: Fri Mar 14 15:02:50 2008 +0100 ggz-client-libs-0.0.14.1-1-i686 * Version bump diff --git a/source/lib-extra/ggz-client-libs/FrugalBuild b/source/lib-extra/ggz-client-libs/FrugalBuild index 29bbbcd..784561b 100644 --- a/source/lib-extra/ggz-client-libs/FrugalBuild +++ b/source/lib-extra/ggz-client-libs/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: crazy pkgname=ggz-client-libs -pkgver=0.0.14 +pkgver=0.0.14.1 pkgrel=1 pkgdesc="Client libraries for GGZ gaming zone" url="http://www.ggzgamingzone.org" -depends=('libggz' 'expat') +depends=('libggz>=0.0.14.1' 'expat') groups=('lib-extra') archs=('i686') up2date="lynx -dump 'http://ftp.belnet.be/packages/ggzgamingzone/ggz/?C=M;O=A'| grep '/[0-9]'|tail -n1|sed 's/.*z\/\(.*\)\//\1/'" source=(http://ftp.belnet.be/packages/ggzgamingzone/ggz/$pkgver/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --disable-debug" -sha1sums=('d36740e939828a1253788efe998a4109a49bed10') +sha1sums=('1328095d0f7e3415e1748208438127f0ee67a573') # optimization OK From crazy at frugalware.org Fri Mar 14 15:07:47 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 15:07:48 2008 Subject: [Frugalware-git] frugalware-current: glpk-4.27-1-i686 Message-ID: <20080314140747.5177E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c62a7eef88625aec8704f478b3284de522cf7055 commit c62a7eef88625aec8704f478b3284de522cf7055 Author: crazy Date: Fri Mar 14 15:07:11 2008 +0100 glpk-4.27-1-i686 * Version bump diff --git a/source/lib-extra/glpk/FrugalBuild b/source/lib-extra/glpk/FrugalBuild index 99144ad..7ad2689 100644 --- a/source/lib-extra/glpk/FrugalBuild +++ b/source/lib-extra/glpk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=glpk -pkgver=4.25 +pkgver=4.27 pkgrel=1 pkgdesc="GNU Linear Programming Kit" url="http://www.gnu.org/software/glpk/" @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') Fup2gnugz source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('cb85754303420fa4527bdef5822f6ab541c1148b') +sha1sums=('d4d1e02c07fbb726eb0ddff773bb90ab1763444a') # optimization OK From crazy at frugalware.org Fri Mar 14 15:27:47 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 15:27:49 2008 Subject: [Frugalware-git] frugalware-current: wxsvg-1.0b10-1-i686 Message-ID: <20080314142747.AF27511901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7d904c7ad418679d07bfe50448bc8766c2fb285 commit e7d904c7ad418679d07bfe50448bc8766c2fb285 Author: crazy Date: Fri Mar 14 15:26:57 2008 +0100 wxsvg-1.0b10-1-i686 * Version bump diff --git a/source/xlib-extra/wxsvg/FrugalBuild b/source/xlib-extra/wxsvg/FrugalBuild index 0d12d02..993b7b4 100644 --- a/source/xlib-extra/wxsvg/FrugalBuild +++ b/source/xlib-extra/wxsvg/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=wxsvg -pkgver=1.0b8_1 +pkgver=1.0b10 pkgrel=1 pkgdesc="wxSVG is C++ library to create, manipulate and render SVG files" _F_sourceforge_broken_up2date=1 @@ -12,12 +12,12 @@ depends=('libart_lgpl' 'libstdc++' 'wxgtk>=2.8.1' 'libxxf86vm' 'expat' 'libxdama source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz) groups=('xlib-extra') archs=('i686' 'x86_64') -sha1sums=('c30541ef6d254daf5043486d9483f059de27f642') +sha1sums=('e0b7c2ee74051d4538548ab817f7075d71cf9467') options=('scriptlet') build() { - Fcd $pkgname-1.0b8 + Fcd touch NEWS README || Fdie Fautoreconf Fbuild From crazy at frugalware.org Fri Mar 14 15:38:51 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 15:38:52 2008 Subject: [Frugalware-git] frugalware-current: dvdstyler-1.6.1_1-1-i686 Message-ID: <20080314143851.BDBB411901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e96761597eb40a80c3cc89688682e0ca2775d933 commit e96761597eb40a80c3cc89688682e0ca2775d933 Author: crazy Date: Fri Mar 14 15:37:58 2008 +0100 dvdstyler-1.6.1_1-1-i686 * Version bump diff --git a/source/xapps-extra/dvdstyler/FrugalBuild b/source/xapps-extra/dvdstyler/FrugalBuild index 9a0d8e5..5fd75fe 100644 --- a/source/xapps-extra/dvdstyler/FrugalBuild +++ b/source/xapps-extra/dvdstyler/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=dvdstyler -pkgver=1.6.0_2 +pkgver=1.6.1_1 pkgrel=1 pkgdesc="DVDStyler is a crossplatform dvd authoring system." _F_sourceforge_dirname="dvdstyler" @@ -12,17 +12,17 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.dvdstyler.de" makedepends=('dvdauthor' 'netpbm') -depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.9.0rc3' 'cdrtools' 'dvd+rw-tools' 'wxsvg>=1.0b8_1' 'libexif') +depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.9.0rc3' 'cdrtools' 'dvd+rw-tools' 'wxsvg>=1.0b10' 'libexif') license="GPL2" -source=(http://$_F_sourceforge_mirror.sourceforge.net/sourceforge/dvdstyler/DVDStyler-${pkgver}.tar.gz) +source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/dvdstyler/DVDStyler-${pkgver}.tar.gz) options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('d2474dca4dc2d37bc7c8118961cabb429c53afe2') +sha1sums=('eca8539b80af5d20cd54419fb2b3c3c0f57d2e95') build() { - Fcd DVDStyler-1.6.0 + Fcd DVDStyler-${pkgver} Fpatchall touch NEWS || Fdie Fautoreconf From priyank at frugalware.org Fri Mar 14 16:37:09 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 16:37:11 2008 Subject: [Frugalware-git] frugalware-current: bluez-libs-3.28-1-i686 Message-ID: <20080314153709.5764411901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ff3cb8768da055b56d248c75c30874b88421dc6 commit 9ff3cb8768da055b56d248c75c30874b88421dc6 Author: Priyank Date: Fri Mar 14 21:06:01 2008 +0530 bluez-libs-3.28-1-i686 * Version bump diff --git a/source/lib/bluez-libs/FrugalBuild b/source/lib/bluez-libs/FrugalBuild index 15d614e..b9bceaf 100644 --- a/source/lib/bluez-libs/FrugalBuild +++ b/source/lib/bluez-libs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=bluez-libs -pkgver=3.25 +pkgver=3.28 pkgrel=1 pkgdesc="Library to use the BlueZ Linux Bluetooth stack" url="http://bluez.sourceforge.net/" @@ -11,5 +11,5 @@ groups=('lib') archs=('i686' 'x86_64') up2date="lynx -dump http://www.bluez.org/download.html|grep 'bluez-libs-'|sed -n 's/.*bluez-libs-\(.*\)\.t.*/\1/; 1 p'" source=($url/download/$pkgname-$pkgver.tar.gz) -sha1sums=('1615bc7f70a17b48b77ca69e8c11b514b153b41e') +sha1sums=('2d2aeaf561f05e0d5fd61bccdc286aee1d812215') # optimization OK From crazy at frugalware.org Fri Mar 14 16:38:19 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 16:38:21 2008 Subject: [Frugalware-git] frugalware-current: wine-0.9.57-1-i686 Message-ID: <20080314153819.C9B6A11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89e655e276f4a474d8705a8d149532c7f9664033 commit 89e655e276f4a474d8705a8d149532c7f9664033 Author: crazy Date: Fri Mar 14 16:32:59 2008 +0100 wine-0.9.57-1-i686 * Version bump diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild index 55b7ef2..68aa76d 100644 --- a/source/xapps/wine/FrugalBuild +++ b/source/xapps/wine/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=wine -pkgver=0.9.56 -pkgrel=2 +pkgver=0.9.57 +pkgrel=1 pkgdesc="An Open Source implementation of the Windows API on top of X and Unix" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge @@ -30,7 +30,7 @@ build() Frcd2 } -sha1sums=('ef40fc70356394e570e48506c67c398abe4b509c' \ +sha1sums=('0c99c7dd2e2041dc3d8913d395619d04b7c76284' \ '95dc7fe8cc22452419ec7321da24465270bf3b3f' \ 'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \ '8b0f7b52885c8d78ba3096a16e9caff60ffe624f') From priyank at frugalware.org Fri Mar 14 16:41:18 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 16:41:19 2008 Subject: [Frugalware-git] frugalware-current: bluez-utils-3.28-1-i686 Message-ID: <20080314154118.BDA2E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=842b881e14d020fb56c7bb9bf5cbcae1d473801e commit 842b881e14d020fb56c7bb9bf5cbcae1d473801e Author: Priyank Date: Fri Mar 14 21:10:13 2008 +0530 bluez-utils-3.28-1-i686 * Version bump diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild index c4f8411..da7084b 100644 --- a/source/apps-extra/bluez-utils/FrugalBuild +++ b/source/apps-extra/bluez-utils/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=bluez-utils -pkgver=3.25 +pkgver=3.28 pkgrel=1 pkgdesc="Bluetooth tools and daemons" url="http://bluez.sourceforge.net/" -depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.25') +depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.28') makedepends=('alsa-lib' 'fuse') groups=('apps-extra') archs=('i686' 'x86_64') backup=(etc/sysconfig/bluetooth etc/bluetooth/hcid.conf etc/bluetooth/rfcomm.conf etc/bluetooth/uart.conf) up2date="lynx -dump http://www.bluez.org/download.html|grep bluez-utils-|sed -n 's/.*bluez-utils-\(.*\)\.t.*/\1/; 1 p'" source=("http://bluez.sourceforge.net/download/bluez-utils-$pkgver.tar.gz" rc.bluetooth uart.conf bluetooth.default) -sha1sums=('03a8553b6cc65857d7193813735693cf2bce82e5' \ +sha1sums=('95a823e7e85955d996c48374a6349d8ca7a35896' \ '831cbfe1e96fc72ca71e9ec5b2b0209512f90ccc' \ '706231256b0ef53e20f22b4f163e8008f092d28a' \ 'cc763966542a83f0de4c56268c541a7b43aa2182') From priyank at frugalware.org Fri Mar 14 16:47:49 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 16:47:51 2008 Subject: [Frugalware-git] frugalware-current: bluez-gnome-0.25-1-i686 Message-ID: <20080314154749.5EE4A11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d47e5cdd98a7a761cb3a5e77c4e290262293d892 commit d47e5cdd98a7a761cb3a5e77c4e290262293d892 Author: Priyank Date: Fri Mar 14 21:16:46 2008 +0530 bluez-gnome-0.25-1-i686 * Version bump diff --git a/source/gnome-extra/bluez-gnome/FrugalBuild b/source/gnome-extra/bluez-gnome/FrugalBuild index d28ac11..5038c40 100644 --- a/source/gnome-extra/bluez-gnome/FrugalBuild +++ b/source/gnome-extra/bluez-gnome/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Priyank Gosalia pkgname=bluez-gnome -pkgver=0.20 -pkgrel=2 +pkgver=0.25 +pkgrel=1 pkgdesc="Bluetooth tools for GNOME" url="http://www.bluez.org/" -depends=('dbus-glib>=0.71' 'openobex>=1.3-10' 'bluez-libs>=3.25' 'libnotify' 'gconf' 'gtk+2') -rodepends=('bluez-utils>=3.25' 'obex-data-server>=0.1') +depends=('dbus-glib>=0.71' 'openobex>=1.3-10' 'bluez-libs>=3.28' 'libnotify' 'gconf' 'gtk+2') +rodepends=('bluez-utils>=3.28' 'obex-data-server>=0.1') makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.bluez.org/download.html | grep $pkgname | Flasttar" source=(http://bluez.sourceforge.net/download/$pkgname-$pkgver.tar.gz \ $pkgname-0.7-categorize-menu-item.patch) -sha1sums=('5a13d81d70aaa82e865199fb5e3fc7d99ffb6133' \ +sha1sums=('22d4dbc2a14e5e6887e47da1c44fcadf5a39af54' \ 'ceebaca0a771d2de2544170bcc7cc9cd3e74e3f0') _F_gnome_desktop=y _F_gnome_iconcache=y From priyank at frugalware.org Fri Mar 14 16:49:11 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 16:49:14 2008 Subject: [Frugalware-git] frugalware-current: obex-data-server-0.3-1-i686 Message-ID: <20080314154911.9283311901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa3037cdac0a523688b38c6c5b221fd70a803b6f commit aa3037cdac0a523688b38c6c5b221fd70a803b6f Author: Priyank Date: Fri Mar 14 21:18:16 2008 +0530 obex-data-server-0.3-1-i686 * Version bump diff --git a/source/apps-extra/obex-data-server/FrugalBuild b/source/apps-extra/obex-data-server/FrugalBuild index b785499..41a1ac3 100644 --- a/source/apps-extra/obex-data-server/FrugalBuild +++ b/source/apps-extra/obex-data-server/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=obex-data-server -pkgver=0.1 +pkgver=0.3 pkgrel=1 pkgdesc="Obex Data Server daemon" url="http://tadas.dailyda.com/" -depends=('dbus' 'dbus-glib' 'bluez-libs>=3.25' 'bluez-utils>=3.25' 'openobex') +depends=('dbus' 'dbus-glib' 'bluez-libs>=3.28' 'bluez-utils>=3.28' 'openobex') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.bluez.org/download.html | grep $pkgname | Flasttar" options=('force') source=($url/software/$pkgname-$pkgver.tar.gz \ rc.obex-data-server) -sha1sums=('ea32302a62142c53f05b3e530b10f39a8a592c5f' \ +sha1sums=('799bd645c9d814ded5f74dd9e09cad7baa8c1f20' \ '74466810c3370d1ea4803496d192fefc512761f3') build() From vmiklos at frugalware.org Fri Mar 14 17:19:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 17:19:33 2008 Subject: [Frugalware-git] frugalware-current: courier-imap-4.3.0-1-i686 Message-ID: <20080314161931.D55C211901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a8667c7994660a49114cd30888621ab21449d97 commit 9a8667c7994660a49114cd30888621ab21449d97 Author: Miklos Vajna Date: Fri Mar 14 17:19:10 2008 +0100 courier-imap-4.3.0-1-i686 - fix up backup() diff --git a/source/network-extra/courier-imap/FrugalBuild b/source/network-extra/courier-imap/FrugalBuild index 42a56c9..b086c86 100644 --- a/source/network-extra/courier-imap/FrugalBuild +++ b/source/network-extra/courier-imap/FrugalBuild @@ -13,7 +13,7 @@ url="http://www.courier-mta.org/imap/" depends=('courier-authlib>=0.57') groups=('network-extra') archs=('i686' 'x86_64') -backup=('etc/courier/imapd','etc/courier/pop3d','etc/courier/imapd-ssl','etc/courier/pop3d-ssl') +backup=('etc/courier/imapd' 'etc/courier/pop3d' 'etc/courier/imapd-ssl' 'etc/courier/pop3d-ssl') makedepends=('postfix' 'openldap' 'mysql' 'postgresql' 'courier-authlib') up2date="lynx -dump 'http://www.courier-mta.org/download.php'|grep imap|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($source rc.courier-imapd rc.courier-imapd-ssl rc.courier-pop3d \ From crazy at frugalware.org Fri Mar 14 17:56:52 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 17:56:53 2008 Subject: [Frugalware-git] frugalware-current: kmenu-gnome-0.7.1-1-i686 Message-ID: <20080314165652.17BAB11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc002ea4835e21442d20da646e737a8a8644c3e0 commit cc002ea4835e21442d20da646e737a8a8644c3e0 Author: crazy Date: Fri Mar 14 17:56:09 2008 +0100 kmenu-gnome-0.7.1-1-i686 * Version bump diff --git a/source/kde-extra/kmenu-gnome/FrugalBuild b/source/kde-extra/kmenu-gnome/FrugalBuild index 72b8a6b..ed218d4 100644 --- a/source/kde-extra/kmenu-gnome/FrugalBuild +++ b/source/kde-extra/kmenu-gnome/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kmenu-gnome -pkgver=0.7 +pkgver=0.7.1 pkgrel=1 pkgdesc="K Menu with Gnome folder and extra icons." url="http://ariszlo.tripod.com/" @@ -12,7 +12,7 @@ groups=('kde-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.kde-apps.org/content/show.php?content=31025|grep -m 1 'Version:'|sed 's/.*:\ \ //'" source=(http://www.kde-apps.org/CONTENT/content-files/31025-$pkgname-$pkgver.tar.gz) -sha1sums=('044937cb052287e37351415c18ad4d209f1c6385') +sha1sums=('3a13ff009dd3790434685af02de56b68ade896a4') build() { From crazy at frugalware.org Fri Mar 14 18:12:30 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 18:12:31 2008 Subject: [Frugalware-git] frugalware-current: lmms-0.3.2-1-i686 Message-ID: <20080314171230.1381811901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ebf78de18ca899ddda6a0adfb8133ae083af41c commit 3ebf78de18ca899ddda6a0adfb8133ae083af41c Author: crazy Date: Fri Mar 14 18:08:59 2008 +0100 lmms-0.3.2-1-i686 * Version bump diff --git a/source/xmultimedia-extra/lmms/FrugalBuild b/source/xmultimedia-extra/lmms/FrugalBuild index e87bff1..e6a7462 100644 --- a/source/xmultimedia-extra/lmms/FrugalBuild +++ b/source/xmultimedia-extra/lmms/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=lmms -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="Linux MultiMedia Studio." depends=('sdl_sound' 'jack' 'libsamplerate' 'qt') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge source=($source fix-transaltion-detection.patch) -sha1sums=('e0418ea00367e4382721725021f3dceca7c8bb6b' \ +sha1sums=('e5222a5babea3224d3b65c3c343639025d6e167a' \ '8cc26dcf2ba498a5902e6b9b7a7dcd78d98ed55b') build() From crazy at frugalware.org Fri Mar 14 18:17:08 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 18:17:11 2008 Subject: [Frugalware-git] frugalware-current: libsigc++2-2.2.2-1-i686 Message-ID: <20080314171708.AF25211901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=410f93a66087e418674074d3a71e9daaa46966c5 commit 410f93a66087e418674074d3a71e9daaa46966c5 Author: crazy Date: Fri Mar 14 18:15:07 2008 +0100 libsigc++2-2.2.2-1-i686 * Version bump * New m8r diff --git a/source/lib/libsigc++2/FrugalBuild b/source/lib/libsigc++2/FrugalBuild index 48687af..b35d749 100644 --- a/source/lib/libsigc++2/FrugalBuild +++ b/source/lib/libsigc++2/FrugalBuild @@ -1,9 +1,9 @@ # Compiling Time: 0.01 SBU -# Maintainer: Zsolt Szalai +# Maintainer: crazy # Contributor: Shrift pkgname=libsigc++2 -pkgver=2.0.18 +pkgver=2.2.2 pkgrel=1 pkgdesc="A typesafe callback framework for C++" url="http://libsigc.sourceforge.net/" @@ -12,7 +12,7 @@ groups=('lib') archs=('i686' 'x86_64') _F_gnome_name="libsigc++" Finclude gnome -sha1sums=('75df46c977a3418bda4d5ae7e21c9ede28993835') +sha1sums=('e1d6446222410bf8d707c6d371101a6eb36e9121') _F_cd_path="${_F_gnome_name}-${pkgver}" # optimization ok From crazy at frugalware.org Fri Mar 14 18:20:26 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 18:20:28 2008 Subject: [Frugalware-git] frugalware-current: coccinella-0.96.6-1-i686 Message-ID: <20080314172026.3BA9B11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7180e70378130a65c06c65b0ae0cb5eaf22016a commit a7180e70378130a65c06c65b0ae0cb5eaf22016a Author: crazy Date: Fri Mar 14 18:18:11 2008 +0100 coccinella-0.96.6-1-i686 * Version bump diff --git a/source/xapps-extra/coccinella/FrugalBuild b/source/xapps-extra/coccinella/FrugalBuild index 9b68ec3..1e79c8c 100644 --- a/source/xapps-extra/coccinella/FrugalBuild +++ b/source/xapps-extra/coccinella/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=coccinella -pkgver=0.96.4.1 +pkgver=0.96.6 pkgrel=1 pkgdesc="A Jabber instant messaging client." depends=() @@ -27,4 +27,4 @@ build() Fln /usr/lib/$pkgname/Coccinella.tcl /usr/bin/$pkgname Fdesktop "/usr/bin/$pkgname" "/usr/lib/$pkgname/images/$pkgname.ico" "Network;InstantMessaging;" } -sha1sums=('76e324d97f418e095f2e4aedf693d4fe28341d9d') +sha1sums=('38d91093f61067575afdf5aa2168423592b1dee2') From crazy at frugalware.org Fri Mar 14 18:29:20 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 18:29:22 2008 Subject: [Frugalware-git] frugalware-current: sdparm-1.03-1-i686 Message-ID: <20080314172920.36EF211901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c0ee631468551ed9b54be0718e380172a59084f commit 2c0ee631468551ed9b54be0718e380172a59084f Author: crazy Date: Fri Mar 14 18:28:55 2008 +0100 sdparm-1.03-1-i686 * Version bump diff --git a/source/apps/sdparm/FrugalBuild b/source/apps/sdparm/FrugalBuild index dda52ab..a2658cd 100644 --- a/source/apps/sdparm/FrugalBuild +++ b/source/apps/sdparm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=sdparm -pkgver=1.02 +pkgver=1.03 pkgrel=1 pkgdesc="sdparm list or change SCSI/ATAPI disk parameters." url="http://sg.torque.net/sg/sdparm.html" @@ -12,6 +12,6 @@ groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://sg.torque.net/sg/sdparm.html|grep 'sdparm'|sort -n -r|grep -m1 '.tgz$'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://sg.torque.net/sg/p/$pkgname-$pkgver.tgz) -sha1sums=('9ba58c52904b4cff45ac06ed52de161af6e32f36') +sha1sums=('fe3c0be4ccab54f599a81fa1901879d091c4c411') # optimization OK From crazy at frugalware.org Fri Mar 14 18:37:47 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 18:37:49 2008 Subject: [Frugalware-git] frugalware-current: pinot-0.83-1-i686 Message-ID: <20080314173747.941DB11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c21a28d09a7f2f296581123966ce1ce61983dba commit 3c21a28d09a7f2f296581123966ce1ce61983dba Author: crazy Date: Fri Mar 14 18:36:26 2008 +0100 pinot-0.83-1-i686 * Version bump * added and patch to fix gcc43 issues diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild index c12e0c6..4bf55ab 100644 --- a/source/xapps-extra/pinot/FrugalBuild +++ b/source/xapps-extra/pinot/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=pinot -pkgver=0.82 +pkgver=0.83 pkgrel=1 pkgdesc="Personal search and metasearch for the Free Desktop" url="http://pinot.berlios.de/" @@ -15,12 +15,15 @@ license="GPL" options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -Finclude berlios -sha1sums=('0a230e7c1da2e7494d577fcb8759f8185f5dc4cf') +Finclude berlios +source=($source gcc43.patch) +sha1sums=('bb450b2e78c6a9254dc97a8f3aa714799cdbb333' \ + 'e7c7076fe9067d6c98b8662eee4ee2c23a7fd04d') build() { Fcd + Fpatchall touch INSTALL ChangeLog || Fdie mkdir m4 || Fdie Fautoreconf diff --git a/source/xapps-extra/pinot/gcc43.patch b/source/xapps-extra/pinot/gcc43.patch new file mode 100644 index 0000000..4f129cd --- /dev/null +++ b/source/xapps-extra/pinot/gcc43.patch @@ -0,0 +1,35 @@ +diff -upNr pinot-0.83.orign/IndexSearch/cjkv/CJKVTokenizer.cc pinot-0.83/IndexSearch/cjkv/CJKVTokenizer.cc +--- pinot-0.83.orign/IndexSearch/cjkv/CJKVTokenizer.cc 2008-02-26 14:16:53.000000000 +0100 ++++ pinot-0.83/IndexSearch/cjkv/CJKVTokenizer.cc 2008-03-08 09:24:41.000000000 +0100 +@@ -19,7 +19,7 @@ + + #include + #include +- ++#include + #include "CJKVTokenizer.h" + + #ifndef HAVE_UNICODE_H +diff -upNr pinot-0.83.orign/IndexSearch/Xapian/XapianEngine.cpp pinot-0.83/IndexSearch/Xapian/XapianEngine.cpp +--- pinot-0.83.orign/IndexSearch/Xapian/XapianEngine.cpp 2008-02-23 08:53:32.000000000 +0100 ++++ pinot-0.83/IndexSearch/Xapian/XapianEngine.cpp 2008-03-08 09:23:17.000000000 +0100 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -upNr pinot-0.83.orign/UI/GTK2/src/pinot-dbus-daemon.cc pinot-0.83/UI/GTK2/src/pinot-dbus-daemon.cc +--- pinot-0.83.orign/UI/GTK2/src/pinot-dbus-daemon.cc 2008-02-21 07:46:44.000000000 +0100 ++++ pinot-0.83/UI/GTK2/src/pinot-dbus-daemon.cc 2008-03-08 09:38:37.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include + From priyank at frugalware.org Fri Mar 14 19:44:49 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 19:44:50 2008 Subject: [Frugalware-git] frugalware-current: gnome-bluetooth-0.11.0-3-i686 Message-ID: <20080314184449.1D31311901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c82fcf554e5819a3e0388305c6e4f9e203cfe3dd commit c82fcf554e5819a3e0388305c6e4f9e203cfe3dd Author: Priyank Date: Sat Mar 15 00:13:51 2008 +0530 gnome-bluetooth-0.11.0-3-i686 * Rebuild with new bluez-utils-3.28 diff --git a/source/gnome-extra/gnome-bluetooth/FrugalBuild b/source/gnome-extra/gnome-bluetooth/FrugalBuild index c947449..62dba4e 100644 --- a/source/gnome-extra/gnome-bluetooth/FrugalBuild +++ b/source/gnome-extra/gnome-bluetooth/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-bluetooth pkgver=0.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GNOME Bluetooth Subsystem." url="http://www.usefulinc.com/software/gnome-bluetooth/" makedepends=('intltool' 'pkgconfig') -depends=('bluez-utils>=3.25' 'bluez-libs>=3.25' 'gob2' 'pygtk' \ +depends=('bluez-utils>=3.28' 'bluez-libs>=3.28' 'gob2' 'pygtk' \ 'librsvg>=2.18.2' 'gnome-python>=2.20.1' 'libbtctl-python>=0.9.0' \ 'libgnomeui>=2.20.0') groups=('gnome-extra') From priyank at frugalware.org Fri Mar 14 19:48:01 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 19:48:02 2008 Subject: [Frugalware-git] frugalware-current: kdebluetooth-1.0_beta8-7-i686 Message-ID: <20080314184801.41C4011901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b4b8ca0e1b9dba05b9169df246e06d7eda0037c commit 3b4b8ca0e1b9dba05b9169df246e06d7eda0037c Author: Priyank Date: Sat Mar 15 00:17:39 2008 +0530 kdebluetooth-1.0_beta8-7-i686 * Rebuild with new bluez-libs-3.28 diff --git a/source/kde-extra/kdebluetooth/FrugalBuild b/source/kde-extra/kdebluetooth/FrugalBuild index 02ff667..c885775 100644 --- a/source/kde-extra/kdebluetooth/FrugalBuild +++ b/source/kde-extra/kdebluetooth/FrugalBuild @@ -4,10 +4,10 @@ pkgname=kdebluetooth pkgver=1.0_beta8 -pkgrel=6 +pkgrel=7 pkgdesc="KDE Bluetooth Framework" -depends=('kdepim>=3.5.7' 'dbus>=1.0.2' 'bluez-libs>=3.24' 'openobex>=1.3-10' \ - 'bluez-utils>=3.24' 'obexftp>=0.20-5' 'libgcc' 'libxfixes') +depends=('kdepim>=3.5.7' 'dbus>=1.0.2' 'bluez-libs>=3.28' 'openobex>=1.3-10' \ + 'bluez-utils>=3.28' 'obexftp>=0.20-5' 'libgcc' 'libxfixes') groups=('kde-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="kde-bluetooth" From crazy at frugalware.org Fri Mar 14 19:50:50 2008 From: crazy at frugalware.org (crazy) Date: Fri Mar 14 19:50:52 2008 Subject: [Frugalware-git] frugalware-current: gparted-0.3.5-1-i686 Message-ID: <20080314185050.3516111901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=033e5a6dcca1fc8e8435a8a0453629323abfbe22 commit 033e5a6dcca1fc8e8435a8a0453629323abfbe22 Author: crazy Date: Fri Mar 14 19:46:06 2008 +0100 gparted-0.3.5-1-i686 * Version bump * new m8r * moved away from gnome * based on idea from Fedora ( thx guys ) start gparted using hal-lock * added some patches to kill that weird lock on hal * fix for crash logic * should fix at least one part from FS#2849 diff --git a/source/xapps-extra/gparted/FrugalBuild b/source/xapps-extra/gparted/FrugalBuild new file mode 100644 index 0000000..a4eb096 --- /dev/null +++ b/source/xapps-extra/gparted/FrugalBuild @@ -0,0 +1,44 @@ +# Compiling time: 0.51 SBU +# Maintainer: crazy + +pkgname=gparted +pkgver=0.3.5 +pkgrel=1 +pkgdesc="Parted GUI written in C++ using gtkmm as Graphical Toolkit" +url="http://gparted.sourceforge.net" +depends=('parted>=1.8.8' 'gtkmm' 'freetype2' 'pango>=1.15.3' 'hal') +makedepends=('perl-xml-parser') +archs=('i686' 'x86_64') +groups=('xapps-extra') +options=('scriptlet') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_prefix="$pkgname-" +Finclude sourceforge +source=($source gparted-desktop-gnome-patch.diff gparted-kde.desktop \ + do-not-lock-hal.patch \ + refresh_crash-fix.patch \ + $pkgname) +sha1sums=('e547c1e531185bfda00a230cc76d3ebc50a957a0' \ + '0c11e37ac18a190da5fd2588ba16acfe614570fc' \ + 'b11d446ce6a2fefd10fa0f081d61460e13144cc5' \ + '1948c5c1652eb1af81253da9433a82de90b6320d' \ + '8bbf3ef8a96c56a82a63cfa499ff56d5a6dc2788' \ + 'f664e953df692a22dda8b262a7a8b645787a1752') + + +build() +{ + Fcd + Fpatchall + autoconf || Fdie + Fmake + Fmakeinstall + ## need patch + Fmkdir /usr/share/applications/kde/ usr/sbin + Ffile gparted-kde.desktop /usr/share/applications/kde/gparted.desktop + ## that depends on do-not-lock-hal.patch + Fmv /usr/bin/gparted /usr/sbin/gparted.bin + Fexe /usr/bin/gparted +} + +# optimization OK diff --git a/source/xapps-extra/gparted/do-not-lock-hal.patch b/source/xapps-extra/gparted/do-not-lock-hal.patch new file mode 100644 index 0000000..15481c6 --- /dev/null +++ b/source/xapps-extra/gparted/do-not-lock-hal.patch @@ -0,0 +1,80 @@ +--- src/GParted_Core.cc 2008-02-04 09:35:47.000000000 -0500 ++++ src/GParted_Core.cc.new 2008-02-07 15:26:32.000000000 -0500 +@@ -38,8 +38,6 @@ + #include "../include/ufs.h" + + #include +-#include +-#include + #include + + std::vector libparted_messages ; //see ped_exception_handler() +@@ -47,13 +45,6 @@ + namespace GParted + { + +-// Clean up the fdi when terminating +-void sig_fdi_cleanup( int signum ) +-{ +- remove( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ); +- raise( signum ); +-} +- + GParted_Core::GParted_Core() + { + lp_device = NULL ; +@@ -63,44 +54,6 @@ + + ped_exception_set_handler( ped_exception_handler ) ; + +- //make sure that the fdi is cleaned up on all but the most forceful +- //program exits +- struct sigaction sa; +- sa.sa_handler = sig_fdi_cleanup; +- sigemptyset( &sa.sa_mask ); +- sa.sa_flags = SA_RESETHAND; +- if( sigaction( SIGHUP, &sa, NULL ) == -1 || +- sigaction( SIGINT, &sa, NULL ) == -1 || +- sigaction( SIGQUIT, &sa, NULL ) == -1 || +- sigaction( SIGILL, &sa, NULL ) == -1 || +- sigaction( SIGABRT, &sa, NULL ) == -1 || +- sigaction( SIGFPE, &sa, NULL ) == -1 || +- sigaction( SIGSEGV, &sa, NULL ) == -1 || +- sigaction( SIGPIPE, &sa, NULL ) == -1 || +- sigaction( SIGALRM, &sa, NULL ) == -1 || +- sigaction( SIGTERM, &sa, NULL ) == -1 || +- sigaction( SIGUSR1, &sa, NULL ) == -1 || +- sigaction( SIGUSR2, &sa, NULL ) == -1 || +- sigaction( SIGBUS, &sa, NULL ) == -1 || +- sigaction( SIGXCPU, &sa, NULL ) == -1 || +- sigaction( SIGXFSZ, &sa, NULL ) == -1 ) +- perror( "Could not set signal handler" ); +- +- //disable automount //FIXME: temporary hack, till i find a better solution... +- std::ofstream fdi_file( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ) ; +- if ( fdi_file ) +- { +- fdi_file << "" ; +- fdi_file << "" ; +- fdi_file << "" ; +- fdi_file << "false" ; +- fdi_file << "" ; +- fdi_file << "" ; +- fdi_file << "" ; +- +- fdi_file .close() ; +- } +- + //get valid flags ... + for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( NULL ) ) ; + flag ; +@@ -2332,8 +2285,6 @@ + if ( p_filesystem ) + delete p_filesystem ; + +- //remove .fdi file.. +- remove( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ) ; + } + + } //GParted + diff --git a/source/xapps-extra/gparted/gparted b/source/xapps-extra/gparted/gparted new file mode 100644 index 0000000..5a3cec5 --- /dev/null +++ b/source/xapps-extra/gparted/gparted @@ -0,0 +1,9 @@ +#!/bin/sh + +## remove that crap if found +if [ -e /usr/share/hal/fdi/policy/gparted-disable-automount.fdi ]; then + /usr/bin/rm -rf /usr/share/hal/fdi/policy/gparted-disable-automount.fdi +fi + +## Idea stolen from fedora +/usr/bin/hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive --run /usr/sbin/gparted.bin diff --git a/source/xapps-extra/gparted/gparted-desktop-gnome-patch.diff b/source/xapps-extra/gparted/gparted-desktop-gnome-patch.diff new file mode 100644 index 0000000..d44e960 --- /dev/null +++ b/source/xapps-extra/gparted/gparted-desktop-gnome-patch.diff @@ -0,0 +1,30 @@ +diff -urN gparted-0.3.3.orig/gparted.desktop gparted-0.3.3/gparted.desktop +--- gparted-0.3.3.orig/gparted.desktop 2006-12-06 19:43:59.000000000 +0100 ++++ gparted-0.3.3/gparted.desktop 2006-12-06 19:45:00.000000000 +0100 +@@ -62,9 +62,10 @@ + Comment[vi]=Bộ hiệu chỉnh phân vùng Gnome + Comment[zh_HK]=GNOME 分割區編輯器 + Comment[zh_TW]=GNOME 分割區編輯器 +-Exec=gparted ++Exec=gksu gparted + Icon=gparted.png + Terminal=false + Type=Application + Categories=GNOME;Application;System; + StartupNotify=true ++NotShowIn=KDE +diff -urN gparted-0.3.3.orig/gparted.desktop.in gparted-0.3.3/gparted.desktop.in +--- gparted-0.3.3.orig/gparted.desktop.in 2006-12-06 19:43:59.000000000 +0100 ++++ gparted-0.3.3/gparted.desktop.in 2006-12-06 19:45:10.000000000 +0100 +@@ -2,9 +2,10 @@ + Encoding=UTF-8 + _Name=GParted + _Comment=GNOME Partition Editor +-Exec=gparted ++Exec=gksu gparted + Icon=gparted.png + Terminal=false + Type=Application + Categories=GNOME;Application;System; + StartupNotify=true ++NotShowIn=KDE diff --git a/source/xapps-extra/gparted/gparted-kde.desktop b/source/xapps-extra/gparted/gparted-kde.desktop new file mode 100644 index 0000000..a1604eb --- /dev/null +++ b/source/xapps-extra/gparted/gparted-kde.desktop @@ -0,0 +1,62 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GParted +Name[bg]=GParted +Name[ca]=GParted +Name[cs]=GParted +Name[de]=GParted +Name[el]=GParted +Name[en_CA]=GParted +Name[en_GB]=GParted +Name[es]=GParted +Name[fi]=GParted +Name[fr]=GParted +Name[gl]=GParted +Name[he]=GParted +Name[hu]=GParted +Name[it]=GParted +Name[lt]=GParted +Name[mk]=Гпартед +Name[nl]=GParted +Name[pa]=GParted +Name[pt]=GParted +Name[pt_BR]=GParted +Name[ru]=GParted +Name[sv]=GParted +Name[uk]=GParted +Name[vi]=GParted +Name[zh_CN]=GParted +Name[zh_TW]=GParted +Comment=Gnome Partition Editor +Comment[bg]=GNOME Редактор на дялове на хард диск +Comment[ca]=Editor de particions del GNOME +Comment[cs]=Editor oddílů pro Gnome +Comment[de]=GNOME Partitionierungswerkzeug +Comment[el]=Επεξεργαστής διαμερισμάτων δίσκων του Gnome +Comment[en_CA]=Gnome Partition Editor +Comment[en_GB]=Gnome Partition Editor +Comment[es]=Editor de particiones de Gnome +Comment[fi]=Gnomen levyosioiden muokkain +Comment[fr]=Éditeur de partition de Gnome +Comment[gl]=Editor de particións de Gnome +Comment[he]=עורך המחיצות של GNOME +Comment[hu]=Gnome partíciószerkesztő +Comment[it]=Editor di partizioni per GNOME +Comment[lt]=Gnome skirsnių redaktorius +Comment[mk]=Уредувач на партиции за Гном +Comment[nl]=Gnome Partitiebewerker +Comment[pa]=ਗਨੋਮ ਭਾਗ ਸੰਪਾਦਕ +Comment[pt]=Editor de Partições do Gnome +Comment[pt_BR]=Editor de Partições do GNOME +Comment[ru]=Редактор разделов диска для GNOME +Comment[sv]=Gnome-partitionsredigerare +Comment[uk]=Редактор розділів дисків для GNOME +Comment[vi]=Bộ hiệu chỉnh phân vùng Gnome +Comment[zh_CN]=Gnome 分区编辑器 +Comment[zh_TW]=Gnome 分割區編輯器 +Exec=kdesu gparted +Icon=gparted.png +Terminal=false +Type=Application +Categories=KDE;Application;System; +OnlyShowIn=KDE diff --git a/source/xapps-extra/gparted/gparted.install b/source/xapps-extra/gparted/gparted.install new file mode 100644 index 0000000..2143dcc --- /dev/null +++ b/source/xapps-extra/gparted/gparted.install @@ -0,0 +1,26 @@ +post_install() +{ + echo -n "updating desktop database..." + if update-desktop-database > /dev/null 2>&1 ; then + echo " done." + else + echo " failed." + fi +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + post_install +} + +op=$1 +shift + +$op $* + +# vim: ft=sh diff --git a/source/xapps-extra/gparted/refresh_crash-fix.patch b/source/xapps-extra/gparted/refresh_crash-fix.patch new file mode 100644 index 0000000..1f202b9 --- /dev/null +++ b/source/xapps-extra/gparted/refresh_crash-fix.patch @@ -0,0 +1,53 @@ +--- include/Win_GParted.h 2006-11-25 09:56:30.000000000 -0500 ++++ include/Win_GParted.h.new 2007-10-30 00:37:29.000000000 -0400 +@@ -233,6 +233,7 @@ + unsigned short new_count;//new_count keeps track of the new created partitions + FS fs ; + bool OPERATIONSLIST_OPEN ; ++ sigc::connection combo_devices_signal_changed_id ; + + GParted_Core gparted_core ; + std::vector device_info ; +--- src/Win_GParted.cc 2008-02-04 09:35:47.000000000 -0500 ++++ src/Win_GParted.cc.new 2008-02-07 15:34:30.000000000 -0500 +@@ -260,7 +260,8 @@ + combo_devices .pack_start( treeview_devices_columns .device ) ; + combo_devices .pack_start( treeview_devices_columns .size, false ) ; + +- combo_devices .signal_changed() .connect( sigc::mem_fun(*this, &Win_GParted::combo_devices_changed) ); ++ combo_devices_signal_changed_id = ++ combo_devices .signal_changed() .connect( sigc::mem_fun(*this, &Win_GParted::combo_devices_changed) ); + + hbox_toolbar .pack_start( combo_devices, Gtk::PACK_SHRINK ) ; + } +@@ -502,6 +503,7 @@ + + void Win_GParted::refresh_combo_devices() + { ++ combo_devices_signal_changed_id .block() ; + liststore_devices ->clear() ; + + menu = manage( new Gtk::Menu() ) ; +@@ -538,6 +540,7 @@ + menubar_main .items()[ 0 ] .get_submenu() ->items()[ 1 ] .set_submenu( *menu ) ; + } + ++ combo_devices_signal_changed_id .unblock() ; + combo_devices .set_active( current_device ) ; + } + +@@ -916,13 +919,8 @@ + + void Win_GParted::combo_devices_changed() + { +- unsigned int old_current_device = current_device; + //set new current device + current_device = combo_devices .get_active_row_number() ; +- if ( current_device == (unsigned int) -1 ) +- current_device = old_current_device; +- if ( current_device >= devices .size() ) +- current_device = 0 ; + set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) ); + + //refresh label_device_info + From priyank at frugalware.org Fri Mar 14 19:53:55 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 19:53:57 2008 Subject: [Frugalware-git] frugalware-current: bluez-utils-3.28-2-i686 Message-ID: <20080314185355.D88CF1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=735ddfd84999b8237b06091fb88b14ee2bb5c161 commit 735ddfd84999b8237b06091fb88b14ee2bb5c161 Author: Priyank Date: Sat Mar 15 00:22:46 2008 +0530 bluez-utils-3.28-2-i686 * Added --enable-sdpd diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild index 27af002..92957d1 100644 --- a/source/apps-extra/bluez-utils/FrugalBuild +++ b/source/apps-extra/bluez-utils/FrugalBuild @@ -24,8 +24,7 @@ build() { Ffile uart.conf /etc/bluetooth/uart.conf Fbuild --enable-network --enable-audio --enable-input \ --enable-hal --enable-inotify --enable-usb --enable-hcid \ - --enable-sdpd - --enable-configfiles --enable-hid2hci --enable-glib \ + --enable-sdpd --enable-configfiles --enable-hid2hci --enable-glib \ --disable-initscripts --disable-pcmciarules --enable-bccmd \ --enable-cups cd daemon From priyank at frugalware.org Fri Mar 14 19:53:55 2008 From: priyank at frugalware.org (Priyank) Date: Fri Mar 14 19:53:59 2008 Subject: [Frugalware-git] frugalware-current: bluez-utils-3.28-2-i686 Message-ID: <20080314185355.B9B9211901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ad1e666d2fc04dca7215e9a0d516dd9ce18c2f9 commit 5ad1e666d2fc04dca7215e9a0d516dd9ce18c2f9 Author: Priyank Date: Sat Mar 15 00:20:31 2008 +0530 bluez-utils-3.28-2-i686 * Added missing sdpd binary diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild index da7084b..27af002 100644 --- a/source/apps-extra/bluez-utils/FrugalBuild +++ b/source/apps-extra/bluez-utils/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bluez-utils pkgver=3.28 -pkgrel=1 +pkgrel=2 pkgdesc="Bluetooth tools and daemons" url="http://bluez.sourceforge.net/" depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.28') @@ -24,6 +24,7 @@ build() { Ffile uart.conf /etc/bluetooth/uart.conf Fbuild --enable-network --enable-audio --enable-input \ --enable-hal --enable-inotify --enable-usb --enable-hcid \ + --enable-sdpd --enable-configfiles --enable-hid2hci --enable-glib \ --disable-initscripts --disable-pcmciarules --enable-bccmd \ --enable-cups From vmiklos at frugalware.org Fri Mar 14 21:41:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 21:41:46 2008 Subject: [Frugalware-git] frugalware-current: include/util.sh: add support for setup.rb Message-ID: <20080314204142.B486111901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49281c10414d862306eb23ce1f339ac41bbfccee commit 49281c10414d862306eb23ce1f339ac41bbfccee Author: Miklos Vajna Date: Fri Mar 14 21:41:29 2008 +0100 include/util.sh: add support for setup.rb diff --git a/source/include/util.sh b/source/include/util.sh index 9f59ba5..41608ab 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -517,6 +517,8 @@ Fconf() { ruby extconf.rb --prefix="$Fprefix" "$@" || Fdie elif [ -f configure.rb ]; then ./configure.rb --prefix="$Fprefix" "$@" || Fdie + elif [ -f setup.rb ]; then + ruby setup.rb config "$@" || Fdie fi } @@ -531,6 +533,8 @@ Fmake() { make || Fdie elif [ -f setup.py ]; then python setup.py build "$@" || Fdie + elif [ -f setup.rb ]; then + ruby setup.rb setup "$@" || Fdie else Fmessage "No Makefile or setup.py found!" Fdie @@ -570,6 +574,8 @@ Fmakeinstall() { fi elif [ -f setup.py ]; then python setup.py install --prefix "$Fprefix" --root "$Fdestdir" "$@" || Fdie + elif [ -f setup.rb ]; then + ruby setup.rb install --prefix=$Fdestdir || Fdie else Fmessage "No Makefile or setup.py found!" Fdie From vmiklos at frugalware.org Fri Mar 14 21:45:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 21:45:29 2008 Subject: [Frugalware-git] frugalware-current: racc-1.4.5-1-i686 Message-ID: <20080314204528.E799711901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7202865425f1521d1608a5478c95384ebae8120c commit 7202865425f1521d1608a5478c95384ebae8120c Author: Miklos Vajna Date: Fri Mar 14 21:44:51 2008 +0100 racc-1.4.5-1-i686 - new package - from bouleetbil - closes #2809 diff --git a/source/lib-extra/racc/FrugalBuild b/source/lib-extra/racc/FrugalBuild new file mode 100644 index 0000000..73db33a --- /dev/null +++ b/source/lib-extra/racc/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos +# Contributor: bouleetbil + +pkgname=racc +pkgver=1.4.5 +pkgrel=1 +pkgdesc="A LALR(1) parser generator for Ruby" +url="http://www.loveruby.net/en/racc.html" +depends=('ruby') +groups=('lib-extra') +archs=('i686') +up2date="lynx -dump lynx -dump $url |grep tar.gz | grep $pkgname- | cut -d '-' -f 2" +_F_cd_path="$pkgname-$pkgver-all" +source=(http://i.loveruby.net/archive/racc/$_F_cd_path.tar.gz) +sha1sums=('80ec24d4c9db09812514b5b2f0db988ce7de2898') + +# optimization OK From vmiklos at frugalware.org Fri Mar 14 23:01:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 23:01:10 2008 Subject: [Frugalware-git] homepage-ng: Sayshell: End of life Message-ID: <20080314220108.7D09D11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=fb3696504e5d83641968fdde8b967992f9223562 commit fb3696504e5d83641968fdde8b967992f9223562 Author: Miklos Vajna Date: Fri Mar 14 23:00:59 2008 +0100 Sayshell: End of life diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 5437e6b..6f65688 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -17,6 +17,25 @@ + 93 + Sayshell: End of life + Fri Mar 14 22:46:09 CET 2008 + vmiklos + 0 +
    + We have released FSA296 to FSA393 for Sayshell. That means 98 security problems were issued in half a year.
    + If you update to Kalgan, it will also fix the following vulnerabilities:
    + + ]]> +     +     + 92 Frugalware Newsletter Issue 18 Thu Mar 13 21:42:43 AEST 2008 From vmiklos at frugalware.org Fri Mar 14 23:15:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Mar 14 23:15:51 2008 Subject: [Frugalware-git] pacman-tools: rc.syncpkg{d, cd}: silence warning when no pidfile found Message-ID: <20080314221549.0780311901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=fe09384e14be26467a345e3be1bac7608e218f8f commit fe09384e14be26467a345e3be1bac7608e218f8f Author: Miklos Vajna Date: Fri Mar 14 23:13:19 2008 +0100 rc.syncpkg{d,cd}: silence warning when no pidfile found diff --git a/syncpkgd/rc.syncpkgcd b/syncpkgd/rc.syncpkgcd old mode 100644 new mode 100755 index 9333bd6..03f962d --- a/syncpkgd/rc.syncpkgcd +++ b/syncpkgd/rc.syncpkgcd @@ -14,7 +14,7 @@ TEXTDOMAINDIR=/lib/initscripts/messages actions=(restart start status stop) daemon=$"package builder client daemon" -pid="cat /var/lock/syncpkgcd.pid" +pid="cat /var/lock/syncpkgcd.pid 2> /dev/null" rc_start() { @@ -32,7 +32,7 @@ rc_stop() stop_msg if [[ "$(eval $pid)" != "" ]] ; then kill $(eval $pid) - : > /var/lock/syncpkgcd.pid + rm /var/lock/syncpkgcd.pid ok $? else ok 999 diff --git a/syncpkgd/rc.syncpkgd b/syncpkgd/rc.syncpkgd old mode 100644 new mode 100755 index fe619d9..6f632ab --- a/syncpkgd/rc.syncpkgd +++ b/syncpkgd/rc.syncpkgd @@ -14,7 +14,7 @@ TEXTDOMAINDIR=/lib/initscripts/messages actions=(restart start status stop) daemon=$"package builder daemon" -pid="cat /var/lock/syncpkgd.pid" +pid="cat /var/lock/syncpkgd.pid 2> /dev/null" rc_start() { @@ -32,7 +32,7 @@ rc_stop() stop_msg if [[ "$(eval $pid)" != "" ]] ; then kill $(eval $pid) - : > /var/lock/syncpkgd.pid + rm /var/lock/syncpkgd.pid ok $? else ok 999 From hermier at frugalware.org Fri Mar 14 23:25:58 2008 From: hermier at frugalware.org (Michel Hermier) Date: Fri Mar 14 23:25:59 2008 Subject: [Frugalware-git] homepage-ng: news_fr.xml Message-ID: <20080314222558.1FEB61190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=92eb48d68e4f357091d4c4146e9e2c13fc07020b commit 92eb48d68e4f357091d4c4146e9e2c13fc07020b Author: Michel Hermier Date: Fri Mar 14 23:24:09 2008 +0100 news_fr.xml * Add lastests news entries. diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml index 072245b..2a342a1 100644 --- a/frugalware/xml/news_fr.xml +++ b/frugalware/xml/news_fr.xml @@ -17,6 +17,45 @@ + 93 + Sayshell: Fin de vie + Fri Mar 14 22:46:09 CET 2008 + vmiklos + 0 +
    + Nous avons publié les FSA296 à FSA393 pour Sayshell. Cela signifie que 98 problèmes de sécurité on été découvert en la moitié d'une année.
    + Si vous mettez à jour vers Kalgan, cela résoudra aussi les vulnérabilités suivante:
    + + ]]> +     +     + + 92 + Lettre d'information Frugalware numéro 18 + Thu Mar 13 21:42:43 AEST 2008 + phayz + 0 + + Dans ce numéro: +
      +
    • C'est la fête! Kalgan est disponible.
      • +
    • (Encore un) don de mémoire - Je suis certains de celui là :)
      • +
    • L'argent, toujours l'argent!
      • +
    • Astuce - Résoudre les problêmes de lancement des applications graphiques
      • +
    • (De nombreuses) annonces de sécurités
      • +
    + You can read it here. We hope you like it! + ]]> +     +     + 91 Frugalware 0.8rc2 (Kalgan) pour i686 est disponible Mon Mar 11 07:16:05 CET 2008 @@ -564,14 +603,14 @@ a1321a1f978bfedf8cf7fdd33c90e858bd881e10 frugalware-0.8pre1-i686-dvd1.iso
    Nous avons publié les FSA135 à FSA295 pour Terminus. Cela signifie que 161 problèmes de sécurité on été découvert en la moitié d'une année.
    - Si vous mettez à jour vers Sayshell, cela résoudra aussi les vulnérabilités suivante:
    -
      -
    • #2055 - MySQL
      • -
    • #2291 - mldonkey
      • -
    • #2409 - QGit
      • -
    • #2424 - OpenOffice
      • -
    • #2429 - VMware
      • -
    • #2456 - ImageMagick
      • + Si vous mettez à jour vers Sayshell, cela résoudra aussi les vulnérabilités suivante:
      + ]]> From hermier at frugalware.org Fri Mar 14 23:25:54 2008 From: hermier at frugalware.org (Michel Hermier) Date: Fri Mar 14 23:26:01 2008 Subject: [Frugalware-git] homepage-ng: news.xml Message-ID: <20080314222554.4EAF111901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a6e3acc50118ca2a72cebe8cf2cfc8839e042bc0 commit a6e3acc50118ca2a72cebe8cf2cfc8839e042bc0 Author: Michel Hermier Date: Fri Mar 14 23:20:53 2008 +0100 news.xml * Fix typo, application don't have 3p, it's only in the "Charmed" drama. diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 6f65688..d9b8a1c 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -48,7 +48,7 @@
    • Party time! Kalgan is released.
    • (Another) memory donation - I'm sure about this one :)
    • Money, money, money!
      • -
    • Tip - Troubleshooting the launch of GUI appplications
      • +
    • Tip - Troubleshooting the launch of GUI applications
    • (Lots of) security announcements
    You can read it here. We hope you like it! From vmiklos at frugalware.org Sat Mar 15 00:03:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:03:10 2008 Subject: [Frugalware-git] test: test1 Message-ID: <20080314230308.CC40A11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=7b2fc48f4b7fc445ab390a03a4e1985408d562cf commit 7b2fc48f4b7fc445ab390a03a4e1985408d562cf Author: Miklos Vajna Date: Fri Mar 14 23:45:53 2008 +0100 test1 diff --git a/test.c b/test.c index 257cc56..7898192 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -foo +a From vmiklos at frugalware.org Sat Mar 15 00:03:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:03:12 2008 Subject: [Frugalware-git] test: test2 Message-ID: <20080314230308.EA1BD1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=0fbad90e691488f5c3bea65025d4f2a39a2c1e64 commit 0fbad90e691488f5c3bea65025d4f2a39a2c1e64 Author: Miklos Vajna Date: Fri Mar 14 23:46:02 2008 +0100 test2 diff --git a/test.c b/test.c index 7898192..6178079 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -a +b From crazy at frugalware.org Sat Mar 15 00:09:57 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 00:09:59 2008 Subject: [Frugalware-git] frugalware-current: swig-1.3.34-1-i686 Message-ID: <20080314230957.A13C011901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccbeb6427db50b4c0597202019f0601e1402ec1b commit ccbeb6427db50b4c0597202019f0601e1402ec1b Author: crazy Date: Sat Mar 15 00:08:46 2008 +0100 swig-1.3.34-1-i686 * Version bump * depends fix diff --git a/source/devel-extra/swig/FrugalBuild b/source/devel-extra/swig/FrugalBuild index c2c78b1..477c2d9 100644 --- a/source/devel-extra/swig/FrugalBuild +++ b/source/devel-extra/swig/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: Miklos Nemeth pkgname=swig -pkgver=1.3.31 +pkgver=1.3.34 pkgrel=1 pkgdesc="SWIG interface compiler" url="http://www.swig.org" archs=('i686' 'x86_64') -depends=() +depends=('libstdc++>=4.3.0-4') groups=('devel-extra') Finclude sourceforge up2date="lynx -dump http://www.swig.org/download.html|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" -sha1sums=('3369543fa178bdeaa597dba806be04b9c8d0f12c') +sha1sums=('36f17ac2eae74f7ebc2e0d0e954ddbbd115eba06') # optimization OK From vmiklos at frugalware.org Sat Mar 15 00:14:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:14:21 2008 Subject: [Frugalware-git] test: test3 Message-ID: <20080314231419.7885B11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=e3ad2aee49ba5a278d6d86c3eb01b3e63bc76ed5 commit e3ad2aee49ba5a278d6d86c3eb01b3e63bc76ed5 Author: Miklos Vajna Date: Sat Mar 15 00:09:56 2008 +0100 test3 diff --git a/test.c b/test.c index 6178079..f2ad6c7 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -b +c From vmiklos at frugalware.org Sat Mar 15 00:14:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:14:22 2008 Subject: [Frugalware-git] test: test4 Message-ID: <20080314231419.9BED11190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=82f9890ae0628056883e0b1a1c5f812d6503ce64 commit 82f9890ae0628056883e0b1a1c5f812d6503ce64 Author: Miklos Vajna Date: Sat Mar 15 00:10:00 2008 +0100 test4 diff --git a/test.c b/test.c index f2ad6c7..4bcfe98 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -c +d From vmiklos at frugalware.org Sat Mar 15 00:15:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:15:25 2008 Subject: [Frugalware-git] test: test5 Message-ID: <20080314231514.027EA11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=265c6bd0f3c73b52bb114952fb6859c427ace1c5 commit 265c6bd0f3c73b52bb114952fb6859c427ace1c5 Author: Miklos Vajna Date: Sat Mar 15 00:13:37 2008 +0100 test5 diff --git a/test.c b/test.c index 4bcfe98..7ed6ff8 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -d +5 From vmiklos at frugalware.org Sat Mar 15 00:15:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:15:29 2008 Subject: [Frugalware-git] test: test6 Message-ID: <20080314231514.195E21190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=27867a156846a3f9a82ae55e41a971eb727d1308 commit 27867a156846a3f9a82ae55e41a971eb727d1308 Author: Miklos Vajna Date: Sat Mar 15 00:13:37 2008 +0100 test6 diff --git a/test.c b/test.c index 7ed6ff8..1e8b314 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -5 +6 From vmiklos at frugalware.org Sat Mar 15 00:15:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:15:31 2008 Subject: [Frugalware-git] test: test7 Message-ID: <20080314231514.21E741190201@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=106ef42482aa7abe8e376d434e3c9157e37f494e commit 106ef42482aa7abe8e376d434e3c9157e37f494e Author: Miklos Vajna Date: Sat Mar 15 00:13:37 2008 +0100 test7 diff --git a/test.c b/test.c index 1e8b314..7f8f011 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -6 +7 From vmiklos at frugalware.org Sat Mar 15 00:15:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:15:32 2008 Subject: [Frugalware-git] test: test8 Message-ID: <20080314231514.2B05F1190202@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=1cfda3dd0d0e43d9bde449d7af6aa36cb4fb0625 commit 1cfda3dd0d0e43d9bde449d7af6aa36cb4fb0625 Author: Miklos Vajna Date: Sat Mar 15 00:13:37 2008 +0100 test8 diff --git a/test.c b/test.c index 7f8f011..45a4fb7 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -7 +8 From vmiklos at frugalware.org Sat Mar 15 00:15:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Mar 15 00:15:33 2008 Subject: [Frugalware-git] test: test9 Message-ID: <20080314231514.348451190203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=test.git;a=commitdiff;h=cf3ada57ebbce6e0d4ce59286adb5327810a80dd commit cf3ada57ebbce6e0d4ce59286adb5327810a80dd Author: Miklos Vajna Date: Sat Mar 15 00:13:38 2008 +0100 test9 diff --git a/test.c b/test.c index 45a4fb7..ec63514 100644 --- a/test.c +++ b/test.c @@ -1 +1 @@ -8 +9 From crazy at frugalware.org Sat Mar 15 00:18:08 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 00:18:09 2008 Subject: [Frugalware-git] frugalware-current: inkscape-0.45.1-5-i686 Message-ID: <20080314231808.243D711901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e91ac47438b5717d7087cce86fda53a11d2fb45c commit e91ac47438b5717d7087cce86fda53a11d2fb45c Author: crazy Date: Sat Mar 15 00:17:05 2008 +0100 inkscape-0.45.1-5-i686 * added an patch to fix perl5.10 issues * with 0.46 ( not yet version bumped ) diff --git a/source/xapps-extra/inkscape/perl5.10.patch b/source/xapps-extra/inkscape/perl5.10.patch new file mode 100644 index 0000000..a7042cd --- /dev/null +++ b/source/xapps-extra/inkscape/perl5.10.patch @@ -0,0 +1,25 @@ +diff -Naur inkscape-0.46/src/Makefile.am inkscape-0.46-p/src/Makefile.am +--- inkscape-0.46/src/Makefile.am 2008-03-11 05:44:31.000000000 +0100 ++++ inkscape-0.46-p/src/Makefile.am 2008-03-14 22:21:53.000000000 +0100 +@@ -25,7 +25,8 @@ + $(POPPLER_GLIB_CFLAGS) \ + -DPOTRACE=\"potrace\" \ + $(INKSCAPE_CFLAGS) \ +- -I$(top_srcdir)/cxxtest ++ -I$(top_srcdir)/cxxtest \ ++ -I$(top_srcdir)/src/extension/script + + include Makefile_insert + include application/Makefile_insert +diff -Naur inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp +--- inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp 2008-03-11 05:20:25.000000000 +0100 ++++ inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp 2008-03-14 22:36:24.000000000 +0100 +@@ -724,7 +724,7 @@ + /* #define SWIG_croakf(x...) { SWIG_SetErrorf(x); goto fail; } */ + + +-typedef XS(SwigPerlWrapper); ++typedef XSPROTO(SwigPerlWrapper); + typedef SwigPerlWrapper *SwigPerlWrapperPtr; + + /* Structure for command table */ From crazy at frugalware.org Sat Mar 15 00:38:02 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 00:38:04 2008 Subject: [Frugalware-git] frugalware-current: inkscape-0.45.1-5-i686 Message-ID: <20080314233802.A9BB311901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=02ce12f2ba4b1c6622e038a861f4b6edf77cbff3 commit 02ce12f2ba4b1c6622e038a861f4b6edf77cbff3 Author: crazy Date: Sat Mar 15 00:19:51 2008 +0100 inkscape-0.45.1-5-i686 * New m8r diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild index a48bcf2..e189c95 100644 --- a/source/xapps-extra/inkscape/FrugalBuild +++ b/source/xapps-extra/inkscape/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 4.23 SBU -# Maintainer: DNAku +# Maintainer: crazy # Contributor: Shrift pkgname=inkscape From crazy at frugalware.org Sat Mar 15 00:38:02 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 00:38:06 2008 Subject: [Frugalware-git] frugalware-current: dnsmasq-2.41-1-i686 Message-ID: <20080314233802.C718B1190200@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd0d7dadb0f5d095d3fc29beca698352d9bce529 commit fd0d7dadb0f5d095d3fc29beca698352d9bce529 Author: crazy Date: Sat Mar 15 00:37:20 2008 +0100 dnsmasq-2.41-1-i686 * Version bump * new m8r diff --git a/source/network-extra/dnsmasq/FrugalBuild b/source/network-extra/dnsmasq/FrugalBuild index 15faf3c..453b717 100644 --- a/source/network-extra/dnsmasq/FrugalBuild +++ b/source/network-extra/dnsmasq/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.02 SBU -# Maintainer: DNAku +# Maintainer: crazy +# Contributor: DNAku pkgname=dnsmasq -pkgver=2.40 +pkgver=2.41 pkgrel=1 pkgdesc="Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server." url="http://thekelleys.org.uk/dnsmasq/doc.html" @@ -13,12 +14,14 @@ groups=('network-extra') up2date="lynx -dump http://www.thekelleys.org.uk/dnsmasq |grep 'LATEST'|sed 's/ //g'|sed 's/.].*//g'|sed 's/.*_//g'|sed -e '/^$/d'" source=(http://thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz \ rc.dnsmasq dnsmasq.conf makefile.patch) -sha1sums=('4af93b18c262b83e5f6bd24004483aa2ec6f3d20' \ +sha1sums=('18ab4f28a3b9300a04f9a4db9cfc3a5d9bc46c55' \ '6d3cb198ff8aec2b5b7f1b51d4cb3cfd44c9d8fd' \ 'fd09fa99f453cf81e905e2de4da2137e8c3be3d4' \ - '08365f004c5361448e5b84a5cac9e12c65f3fa79') + 'b1e390905416f9f055ed28d2e5bbef7cfc6f38eb') build() { + Fcd + Fsed 'nawk' 'awk' Makefile Fbuild Ffile /etc/dnsmasq.conf Fmkdir var/lib/misc diff --git a/source/network-extra/dnsmasq/makefile.patch b/source/network-extra/dnsmasq/makefile.patch index 4bfbe39..b4edce4 100644 --- a/source/network-extra/dnsmasq/makefile.patch +++ b/source/network-extra/dnsmasq/makefile.patch @@ -1,13 +1,16 @@ -diff -urN dnsmasq-2.39.orig/Makefile dnsmasq-2.39/Makefile ---- dnsmasq-2.39.orig/Makefile 2007-05-07 17:43:09.000000000 +0100 -+++ dnsmasq-2.39/Makefile 2007-05-07 17:43:22.000000000 +0100 -@@ -1,4 +1,4 @@ --PREFIX ?= /usr/local +diff -Naur dnsmasq-2.41/Makefile dnsmasq-2.41-p/Makefile +--- dnsmasq-2.41/Makefile 2007-10-21 22:02:03.000000000 +0200 ++++ dnsmasq-2.41-p/Makefile 2008-03-15 00:25:06.000000000 +0100 +@@ -13,7 +13,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-PREFIX = /usr/local +PREFIX ?= /usr - BINDIR ?= ${PREFIX}/sbin - MANDIR ?= ${PREFIX}/share/man - LOCALEDIR ?= ${PREFIX}/share/locale -@@ -18,7 +18,7 @@ + BINDIR = ${PREFIX}/sbin + MANDIR = ${PREFIX}/share/man + LOCALEDIR = ${PREFIX}/share/locale +@@ -47,7 +47,7 @@ rm -f *~ $(SRC)/*.mo contrib/*/*~ */*~ $(SRC)/*.pot rm -f $(SRC)/*.o $(SRC)/dnsmasq.a $(SRC)/dnsmasq core */core @@ -15,4 +18,4 @@ diff -urN dnsmasq-2.39.orig/Makefile dnsmasq-2.39/Makefile +install : all install-common install-i18n install-common : - install -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8 + $(INSTALL) -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8 From crazy at frugalware.org Sat Mar 15 00:44:33 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 00:44:34 2008 Subject: [Frugalware-git] frugalware-current: libnids-1.23-1-i686 Message-ID: <20080314234433.41D6511901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a8be47544ac4cebfca8cb45e0848bf2114a4945 commit 8a8be47544ac4cebfca8cb45e0848bf2114a4945 Author: crazy Date: Sat Mar 15 00:43:31 2008 +0100 libnids-1.23-1-i686 * Version bump * new m8r * removed fugly up2date line diff --git a/source/lib-extra/libnids/FrugalBuild b/source/lib-extra/libnids/FrugalBuild index c7e330f..bd343c1 100644 --- a/source/lib-extra/libnids/FrugalBuild +++ b/source/lib-extra/libnids/FrugalBuild @@ -1,16 +1,15 @@ # Compiling Time: 0.02 SBU -# Maintainer: DNAku +# Maintainer: crazy pkgname=libnids -pkgver=1.22 +pkgver=1.23 pkgrel=1 pkgdesc="Libnids is an implementation of an E-componenet of Network Intrusion Detection System" Finclude sourceforge depends=('libpcap' 'glib2' 'libnet>=1.1.2.1-3') archs=('i686' 'x86_64') groups=('lib-extra') -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=92215 |grep libnids-[0-9] |grep -m1 tar |sed -e 's/.*s-//g' -e 's/.t.*//g'" -sha1sums=('321b0c10e1b192bc150dbe18844cdf7735663cde') +sha1sums=('105bff0d0d35ab95ec90cce98cfb409f64ed44b4') build() { From crazy at frugalware.org Sat Mar 15 00:55:36 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 00:55:37 2008 Subject: [Frugalware-git] frugalware-current: lives-0.9.8.9-1-i686 Message-ID: <20080314235536.E236E11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c769d54b58262d45b178e48620a1e1893558c49 commit 4c769d54b58262d45b178e48620a1e1893558c49 Author: crazy Date: Sat Mar 15 00:54:34 2008 +0100 lives-0.9.8.9-1-i686 * Version bump * New m8r diff --git a/source/xapps-extra/lives/FrugalBuild b/source/xapps-extra/lives/FrugalBuild index 35ce3bb..95e4710 100644 --- a/source/xapps-extra/lives/FrugalBuild +++ b/source/xapps-extra/lives/FrugalBuild @@ -1,9 +1,9 @@ # Compiling Time: 0.28 SBU -# Maintainer: DNAku +# Maintainer: crazy # Contributor: Tuxbubling pkgname=lives -pkgver=0.9.8.6 +pkgver=0.9.8.9 pkgrel=1 pkgdesc="LiVES is a powerful video system aimed at the digital video artist and VJ." depends=('mplayer' 'imagemagick' 'gtk+2>=2.10.2' 'libjpeg' 'sox' 'transcode>=1.0.3' \ @@ -13,10 +13,10 @@ rodepends=('perl' 'python') groups=('xapps-extra') options=('scriptlet') archs=('i686' 'x86_64') -sha1sums=('2eab03fc256438b77b19061cf66b111b8782e539') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.xs4all.nl/~salsaman/lives/" +sha1sums=('1c35ba0e51f266fe01ec7e3ce3af31fd8c13013b') build() { From crazy at frugalware.org Sat Mar 15 01:11:07 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 01:11:09 2008 Subject: [Frugalware-git] frugalware-current: guile-1.8.4-1-i686 Message-ID: <20080315001107.B1F9811901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00f4930e6ff05847834ece2ad481990f35f3248b commit 00f4930e6ff05847834ece2ad481990f35f3248b Author: crazy Date: Sat Mar 15 01:09:21 2008 +0100 guile-1.8.4-1-i686 * Version bump * killed hardcoded -Werror , man I hate these folks diff --git a/source/devel/guile/FrugalBuild b/source/devel/guile/FrugalBuild index 62626ce..480eb6f 100644 --- a/source/devel/guile/FrugalBuild +++ b/source/devel/guile/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=guile -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=1 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" @@ -13,7 +13,17 @@ archs=('i686' 'x86_64') Fup2gnugz source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz guile-1.8.0-deplibs-x86-64.patch) Fconfopts="$Fconfopts --disable-networking --with-threads" -sha1sums=('26cf7b70d4caff8fe2a5fbcc363f2457bc591c2b' \ +sha1sums=('1e80fe242acfde2bfa39fd1e8409a8f010e24e2b' \ 'e201dfab1f6d6f8a5574572e7da5f91a530215a0') +build() +{ + Fcd + ## yeah f***ing fix your code before adding something + ## like this by default + Fsed '-Werror' '' configure.in + Fautoreconf + Fbuild +} + # optimization OK From crazy at frugalware.org Sat Mar 15 01:15:06 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 01:15:08 2008 Subject: [Frugalware-git] frugalware-current: libmtp-0.2.6.1-1-i686 Message-ID: <20080315001506.7C42A11901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7146ec03084c9db7a6442c4a3540f1b3891c435b commit 7146ec03084c9db7a6442c4a3540f1b3891c435b Author: crazy Date: Sat Mar 15 01:14:41 2008 +0100 libmtp-0.2.6.1-1-i686 * Version bump diff --git a/source/lib-extra/libmtp/FrugalBuild b/source/lib-extra/libmtp/FrugalBuild index bd822ee..262fc3b 100644 --- a/source/lib-extra/libmtp/FrugalBuild +++ b/source/lib-extra/libmtp/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: crazy pkgname=libmtp -pkgver=0.2.5 +pkgver=0.2.6.1 pkgrel=1 pkgdesc="libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)." depends=('libusb') groups=('lib-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('c5297f2aa5dc47755f417a8977250d58d5a1282c') +sha1sums=('c91a12b24dad033f71b4dafeda113eb281991543') # optimization OK From crazy at frugalware.org Sat Mar 15 01:18:18 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 01:18:20 2008 Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.7.5-1-i686 Message-ID: <20080315001818.1CC4711901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=33fae6acb908c0825a38feaf27feb8b64c3a8dfc commit 33fae6acb908c0825a38feaf27feb8b64c3a8dfc Author: crazy Date: Sat Mar 15 01:17:40 2008 +0100 telepathy-glib-0.7.5-1-i686 * Version bump diff --git a/source/lib-extra/telepathy-glib/FrugalBuild b/source/lib-extra/telepathy-glib/FrugalBuild index 5346d61..891b167 100644 --- a/source/lib-extra/telepathy-glib/FrugalBuild +++ b/source/lib-extra/telepathy-glib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.7.1 +pkgver=0.7.5 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" @@ -14,6 +14,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) #signatures=(${source[0]}.asc) # no .asc for .12,.13 :s -sha1sums=('3aa977a939c4d85492d11e185d8e140cc2fb8b58') +sha1sums=('4e82a0b982144d477e9f35180e6e87f26667df8d') # optimization OK From crazy at frugalware.org Sat Mar 15 01:20:48 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 01:20:50 2008 Subject: [Frugalware-git] frugalware-current: libtelepathy-0.3.3-1-i686 Message-ID: <20080315002048.982D411901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76595bff6ee12ae1616d1164d52ca98e1a601a52 commit 76595bff6ee12ae1616d1164d52ca98e1a601a52 Author: crazy Date: Sat Mar 15 01:20:26 2008 +0100 libtelepathy-0.3.3-1-i686 * Version bump diff --git a/source/lib-extra/libtelepathy/FrugalBuild b/source/lib-extra/libtelepathy/FrugalBuild index 6a41ec1..43fe978 100644 --- a/source/lib-extra/libtelepathy/FrugalBuild +++ b/source/lib-extra/libtelepathy/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: AlexExtreme pkgname=libtelepathy -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" -depends=('glib2' 'dbus-glib>=0.74' 'libxslt' 'telepathy-glib>=0.7.1') +depends=('glib2' 'dbus-glib>=0.74' 'libxslt' 'telepathy-glib>=0.7.5') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://telepathy.freedesktop.org/releases/libtelepathy/|Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('9fa2fcf1113b8f9a74d348e9f044de906b2dd7fd') +sha1sums=('d5aa10a30570dedd89cfe45c4e928263bd32b888') # optimization OK From crazy at frugalware.org Sat Mar 15 01:38:42 2008 From: crazy at frugalware.org (crazy) Date: Sat Mar 15 01:38:45 2008 Subject: [Frugalware-git] frugalware-current: rapidsvn-0.9.6-1-i686 Message-ID: <20080315003842.56A4511901D8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6cb6c71952d54e05e1cb3e622928d607c58330a3 commit 6cb6c71952d54e05e1cb3e622928d607c58330a3 Author: crazy Date: Sat Mar 15 01:38:00 2008 +0100 rapidsvn-0.9.6-1-i686 * Version bump diff --git a/source/xapps-extra/rapidsvn/FrugalBuild b/source/xapps-extra/rapidsvn/FrugalBuild index f9effda..55dba1a 100644 --- a/source/xapps-extra/rapidsvn/FrugalBuild +++ b/source/xapps-extra/rapidsvn/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=rapidsvn -pkgver=0.9.4 +pkgver=0.9.6 pkgrel=1 pkgdesc="GUI front-end for Subversion" url="http://rapidsvn.tigris.org/" @@ -11,9 +11,8 @@ rodepends=('libsvncpp') groups=('xapps-extra') archs=('i686') up2date="lynx -dump 'http://rapidsvn.tigris.org/'|grep 'latest release:' |sed 's/.*: \(.*\) .*/\1/'" -source=(http://www.rapidsvn.org/download/release/$pkgver/$pkgname-$pkgver.tar.gz wx28.patch) -sha1sums=('0f8eff53964f641253d6a4be82187ab9f30168c7' \ - '3cefddbd8ef4d96f7269fee3a51684193686f86c') +source=(http://www.rapidsvn.org/download/release/$pkgver/$pkgname-$pkgver.tar.gz) +sha1sums=('266f846437e3bbce1707799ec0d95c2d1be43b4a') options=('scriptlet') subpkgs=('libsvncpp') @@ -22,8 +21,6 @@ subdepends=('libstdc++') subgroups=('lib-extra') subarchs=('i686') -export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - build() { Fcd diff --git a/source/xapps-extra/rapidsvn/wx28.patch b/source/xapps-extra/rapidsvn/wx28.patch deleted file mode 100644 index f8aa30b..0000000 --- a/source/xapps-extra/rapidsvn/wx28.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur rapidsvn-0.9.4/src/add_action.cpp rapidsvn-0.9.4-wx28/src/add_action.cpp ---- rapidsvn-0.9.4/src/add_action.cpp 2006-12-08 18:47:07.000000000 +0100 -+++ rapidsvn-0.9.4-wx28/src/add_action.cpp 2007-12-07 17:26:17.000000000 +0100 -@@ -23,12 +23,12 @@ - * ==================================================================== - */ - --// svncpp --#include "svncpp/client.hpp" -- - // wxWidgets - #include "wx/intl.h" - -+// svncpp -+#include "svncpp/client.hpp" -+ - // app - #include "ids.hpp" - #include "add_action.hpp" -diff -Naur rapidsvn-0.9.4/src/checkout_dlg.cpp rapidsvn-0.9.4-wx28/src/checkout_dlg.cpp ---- rapidsvn-0.9.4/src/checkout_dlg.cpp 2006-12-08 18:47:07.000000000 +0100 -+++ rapidsvn-0.9.4-wx28/src/checkout_dlg.cpp 2007-12-07 17:26:17.000000000 +0100 -@@ -256,7 +256,6 @@ - - BEGIN_EVENT_TABLE (CheckoutDlg, wxDialog) - EVT_BUTTON (ID_BUTTON_BROWSE, CheckoutDlg::OnBrowse) -- EVT_BUTTON (wxID_OK, CheckoutDlg::OnOK) - EVT_CHECKBOX (ID_USELATEST, CheckoutDlg::OnUseLatest) - EVT_TEXT (-1, CheckoutDlg::OnText) - // EVT_BUTTON (wxID_HELP, CheckoutDlg::OnHelp) -diff -Naur rapidsvn-0.9.4/src/export_dlg.cpp rapidsvn-0.9.4-wx28/src/export_dlg.cpp ---- rapidsvn-0.9.4/src/export_dlg.cpp 2006-12-08 18:47:07.000000000 +0100 -+++ rapidsvn-0.9.4-wx28/src/export_dlg.cpp 2007-12-07 17:26:17.000000000 +0100 -@@ -295,7 +295,6 @@ - - BEGIN_EVENT_TABLE (ExportDlg, wxDialog) - EVT_BUTTON (ID_BUTTON