From vmiklos at frugalware.org Wed Aug 1 00:05:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 00:05:22 2007 Subject: [Frugalware-git] frugalware-current: libetpan-0.49-2-i686 Message-ID: <20070731220520.478C313A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c1edbdd623548b795ddee7303d85249cbc5745fd commit c1edbdd623548b795ddee7303d85249cbc5745fd Author: VMiklos Date: Wed Aug 1 00:05:12 2007 +0200 libetpan-0.49-2-i686 rebuilt with db-4.6 diff --git a/source/lib-extra/libetpan/FrugalBuild b/source/lib-extra/libetpan/FrugalBuild index 568c98a..3a87b66 100644 --- a/source/lib-extra/libetpan/FrugalBuild +++ b/source/lib-extra/libetpan/FrugalBuild @@ -4,14 +4,15 @@ pkgname=libetpan pkgver=0.49 -pkgrel=1 +pkgrel=2 pkgdesc="A mail library" url="http://libetpan.sourceforge.net/" -depends=('openssl' 'db>=4.5.20' 'cyrus-sasl' 'glibc') +depends=('openssl' 'db>=4.6.18' 'cyrus-sasl' 'glibc') groups=('lib-extra') archs=('x86_64' 'i686') _F_sourceforge_broken_up2date=1 Finclude sourceforge +sha1sums=('857fb35678aed2b7a67bea37907c0f4faec6f17f') build() { @@ -21,5 +22,4 @@ build() chmod +x $Fdestdir/usr/lib/libetpan.so* || Fdie } -sha1sums=('857fb35678aed2b7a67bea37907c0f4faec6f17f') # optimization OK From vmiklos at frugalware.org Wed Aug 1 00:09:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 00:09:17 2007 Subject: [Frugalware-git] frugalware-current: bogofilter-1.1.5-2-i686 Message-ID: <20070731220915.7421D13A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cb0ffcf02372ab92c5ea7adcc79f838bc53aa365 commit cb0ffcf02372ab92c5ea7adcc79f838bc53aa365 Author: VMiklos Date: Wed Aug 1 00:09:03 2007 +0200 bogofilter-1.1.5-2-i686 rebuilt with db-4.6 diff --git a/source/network-extra/bogofilter/FrugalBuild b/source/network-extra/bogofilter/FrugalBuild index 0374afd..285eaa3 100644 --- a/source/network-extra/bogofilter/FrugalBuild +++ b/source/network-extra/bogofilter/FrugalBuild @@ -3,13 +3,13 @@ pkgname=bogofilter pkgver=1.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A very fast Bayesian spam filtering tool." _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://bogofilter.sourceforge.net/" license="GPL2" -depends=('glibc' 'db>=4.5.20') +depends=('db>=4.6.18') backup=(etc/bogofilter.cf) groups=('network-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Wed Aug 1 00:21:08 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 00:21:10 2007 Subject: [Frugalware-git] frugalware-current: apache-2.2.4-4-i686 Message-ID: <20070731222108.3854313A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=078f571a0597e1e72c26070f9c095ff328545114 commit 078f571a0597e1e72c26070f9c095ff328545114 Author: VMiklos Date: Wed Aug 1 00:20:58 2007 +0200 apache-2.2.4-4-i686 rebuilt with db-4.6 diff --git a/source/network/apache/FrugalBuild b/source/network/apache/FrugalBuild index 603e684..8fb44b7 100644 --- a/source/network/apache/FrugalBuild +++ b/source/network/apache/FrugalBuild @@ -4,12 +4,12 @@ pkgname=apache pkgver=2.2.4 -pkgrel=3 +pkgrel=4 pkgdesc="A high performance Unix-based HTTP server (with SSL)" url="http://httpd.apache.org/" backup=(etc/httpd/conf/{httpd.conf,ssl.conf,ssl.crt/server.crt,ssl.csr/server.csr,ssl.key/server.key} \ var/www/html/index.html) -depends=('gdbm' 'db>=4.5.20' 'openssl' 'expat' 'apr-util>=1.2.8-2') +depends=('gdbm' 'db>=4.6.18' 'openssl' 'expat' 'apr-util>=1.2.8-3') groups=('network') archs=('i686' 'x86_64') up2date="lynx -dump http://httpd.apache.org/download.cgi |grep 'best available'|sed 's/.*r \(.*\) i.*/\1/;q'" From vmiklos at frugalware.org Wed Aug 1 00:35:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 00:35:58 2007 Subject: [Frugalware-git] frugalware-current: python-2.5.1-3-i686 Message-ID: <20070731223556.6DA1913A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=18f48adb938e0ace3db410486c67aeb342993681 commit 18f48adb938e0ace3db410486c67aeb342993681 Author: VMiklos Date: Wed Aug 1 00:35:47 2007 +0200 python-2.5.1-3-i686 rebuilt with db-4.6 diff --git a/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild index 47e0bdc..07614eb 100644 --- a/source/devel/python/FrugalBuild +++ b/source/devel/python/FrugalBuild @@ -4,10 +4,10 @@ pkgname=python pkgver=2.5.1 shortpkgver=2.5 # 2.3 if $pkgver=2.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level scripting language" url="http://www.python.org" -depends=('glibc' 'db>=4.5.20' 'bzip2' 'gdbm' 'openssl' 'glib2') +depends=('glibc' 'db>=4.6.18' 'bzip2' 'gdbm' 'openssl' 'glib2') makedepends=('tk' 'gtk+2') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') From vmiklos at frugalware.org Wed Aug 1 00:55:49 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 00:55:51 2007 Subject: [Frugalware-git] frugalware-current: libgda-3.0.1-2-i686 Message-ID: <20070731225549.3FAB013A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a84e310cb53e99345ba264c1ac5536a8bc2a54c0 commit a84e310cb53e99345ba264c1ac5536a8bc2a54c0 Author: VMiklos Date: Wed Aug 1 00:55:39 2007 +0200 libgda-3.0.1-2-i686 rebuilt with db-4.6 diff --git a/source/gnome/libgda/FrugalBuild b/source/gnome/libgda/FrugalBuild index 59851e3..75a41ac 100644 --- a/source/gnome/libgda/FrugalBuild +++ b/source/gnome/libgda/FrugalBuild @@ -3,11 +3,11 @@ pkgname=libgda pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An interface to the GDA architecture" url="http://www.gnome-db.org/" depends=('glib2' 'libxslt' 'readline' 'popt' 'scrollkeeper' 'libpq' 'libmysqlclient' 'libldap' 'gamin') -makedepends=('intltool' 'perl-xml' 'db>=4.5' 'unixodbc' 'gtk-doc' 'openldap' 'mysql' 'postgresql' 'gnome-common') +makedepends=('intltool' 'perl-xml' 'db>=4.6.18' 'unixodbc' 'gtk-doc' 'openldap' 'mysql' 'postgresql' 'gnome-common') groups=('gnome' 'gnome-libs') archs=('i686' 'x86_64') _F_gnome_scrollkeeper=y From boobaa at frugalware.org Wed Aug 1 07:42:56 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 07:42:58 2007 Subject: [Frugalware-git] frugalware-current: drupal-5.2-1-i686 Message-ID: <20070801054256.D7B6F13A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=56cbe871c204270f6256233acee11de318705249 commit 56cbe871c204270f6256233acee11de318705249 Author: CSÉCSY László Date: Wed Aug 1 07:42:35 2007 +0200 drupal-5.2-1-i686 version bump closes #2295 in -current updated up2date (exclude devel versions) diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild index 47d1d36..66b3f41 100644 --- a/source/network-extra/drupal/FrugalBuild +++ b/source/network-extra/drupal/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: AlexExtreme pkgname=drupal -pkgver=5.1 -pkgrel=2 +pkgver=5.2 +pkgrel=1 pkgdesc="An advanced content management system to manage your website" url="http://drupal.org" rodepends=('apache' 'php' 'mysql' 'webappconfig') depends=() groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://drupal.org/download | grep -m1 '.tar.gz' | Flasttar" +up2date="lynx -dump http://drupal.org/download | grep -m1 'l-[0-9\.]*.tar.gz' | Flasttar" backup=(var/www/drupal/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ drupalsetup README.Frugalware) -sha1sums=('2306dcce888272cdcc7d26101e76d80113f6c0b2' \ +sha1sums=('d6460630b5c946c0fff152da5a83ff638fb8b097' \ 'c56deef0edee4cea4b9391d20358eb7e2faf0005' \ '64c0eadd7a2e00b11644458a4eeea8e3203fa739') options=('stick') From boobaa at frugalware.org Wed Aug 1 08:14:54 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 08:14:57 2007 Subject: [Frugalware-git] boobaa: postfix-2.4.4-1-i686 Message-ID: <20070801061454.CE3B913A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=5ebfabcea137bdcc69e814df8eb1b2c6b506cf54 commit 5ebfabcea137bdcc69e814df8eb1b2c6b506cf54 Author: CSÉCSY László Date: Wed Aug 1 08:13:59 2007 +0200 postfix-2.4.4-1-i686 version bump updated VDA patch's version (it is released in parallel with postfix) new m8r, ok by iron diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index 33838af..0833a0f 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -1,12 +1,13 @@ # Compiling Time: 0.70 SBU -# Maintainer: Karoly CZOVEK +# Maintainer: CSÉCSY László +# Former m8r: Karoly CZOVEK # Contributor: VMiklos # Contributor: Krisztian VASAS pkgname=postfix -pkgver=2.4.3 -pkgrel=2 -vdaver=2.4.0 +pkgver=2.4.4 +pkgrel=1 +vdaver=2.4.4 pkgdesc="A fast, easy to administer, and secure MTA" url="http://www.postfix.org/" depends=('db>=4.6.18' 'pcre' 'cyrus-sasl' 'libmysqlclient' 'libldap' 'libpq>=8.2-1') @@ -25,12 +26,12 @@ up2date="lynx -dump $mirror/index.html|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.g source=($mirror/official/$pkgname-$pkgver.tar.gz \ rc.$pkgname \ README.Frugalware - http://vda.sourceforge.net/VDA/postfix-$vdaver-vda.patch.gz) + http://vda.sourceforge.net/VDA/postfix-$vdaver-vda-ng.patch.gz) -sha1sums=('7d3625332bb3e877e59ef01fad56b444ac59967b'\ +sha1sums=('7ccac18b06de24bbf1069a4265044e1cdfb40d35'\ 'aef63e40eb4321f2cf7985983964e93e9c2a4cd0'\ 'b05736300a01bc6d4d0ca7bb92704de29b68651d'\ - '0e1de0bb9de24ea9766d9930a945e3b94fc2a250') + '4e2905606da03a3f117fa4b4b703c3c5b2f1c174') APPLY_PATCH_VDA=${APPLY_PATCH_VDA:-1} USE_FEATURE_SASL=${USE_FEATURE_SASL:-1} @@ -71,7 +72,7 @@ build() fi if [ $APPLY_PATCH_VDA -eq 1 ]; then - Fpatch postfix-$vdaver-vda.patch + Fpatch postfix-$vdaver-vda-ng.patch fi Fcd From vmiklos at frugalware.org Wed Aug 1 09:22:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 09:22:11 2007 Subject: [Frugalware-git] frugalware-current: gnome-vfs-2.18.1-5-i686 Message-ID: <20070801072209.66C0213A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a422b703d89938510fe5eddb46ea59a8cfe1fb84 commit a422b703d89938510fe5eddb46ea59a8cfe1fb84 Author: VMiklos Date: Wed Aug 1 09:21:51 2007 +0200 gnome-vfs-2.18.1-5-i686 rebuilt with db-4.6 diff --git a/source/gnome/gnome-vfs/FrugalBuild b/source/gnome/gnome-vfs/FrugalBuild index 2fdb0a5..44910f7 100644 --- a/source/gnome/gnome-vfs/FrugalBuild +++ b/source/gnome/gnome-vfs/FrugalBuild @@ -4,11 +4,11 @@ pkgname=gnome-vfs pkgver=2.18.1 -pkgrel=4 +pkgrel=5 pkgdesc="GNOME Virtual File System" url="http://www.gnome.org/" depends=('gconf>=2.18.0.1' 'bzip2' 'hal>=0.5.8.1' 'dbus-glib>=0.71' 'gnome-mime-data' 'gamin' \ - 'avahi-glib>=0.6.17' 'xfsprogs-acl' 'heimdal>=1.0' 'db>=4.5.20') + 'avahi-glib>=0.6.17' 'xfsprogs-acl' 'heimdal>=1.0' 'db>=4.6.18') makedepends=('intltool' 'gtk-doc' 'samba') rodepends=('gnome-mount>=0.6') groups=('gnome' 'gnome-core') From vmiklos at frugalware.org Wed Aug 1 10:01:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 10:01:59 2007 Subject: [Frugalware-git] frugalware-current: evolution-data-server-1.10.3.1-3-i686 Message-ID: <20070801080151.3F3BA13A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8b0cd9029540f01f6130aebb33bfda8517185c71 commit 8b0cd9029540f01f6130aebb33bfda8517185c71 Author: VMiklos Date: Wed Aug 1 10:01:41 2007 +0200 evolution-data-server-1.10.3.1-3-i686 rebuilt with db-4.6 diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index ef80315..8d810ac 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -3,15 +3,16 @@ pkgname=evolution-data-server pkgver=1.10.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" url="http://www.gnome.org/" depends=('nss>=3.11.5' 'libsoup>=2.2.100-2' 'libgnomeui>=2.18.0' 'heimdal>=1.0' 'gnome-keyring>=0.8' \ - 'db>=4.5.20') + 'db>=4.6.18') makedepends=('intltool' 'gtk-doc' 'openldap>=2.3.24') groups=('gnome' 'gnome-core') archs=('i686' 'x86_64') Finclude gnome +sha1sums=('d6406d617a8d72b20a1c26083f0d2c090092d6e0') subpkgs=('evolution-data-server-ldap') subdescs=('Evolution Data Server LDAP extensions.') @@ -26,6 +27,5 @@ build() { Fsplit evolution-data-server-ldap usr/lib/libexchange-storage* Fsplit evolution-data-server-ldap usr/lib/evolution-data-server-1.2/extensions/libebookbackendldap* } -sha1sums=('d6406d617a8d72b20a1c26083f0d2c090092d6e0') # optimization OK From boobaa at frugalware.org Wed Aug 1 10:05:54 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 10:05:56 2007 Subject: [Frugalware-git] frugalware-current: kdeaddons-3.5.7-2-i686 Message-ID: <20070801080554.48BA613A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6d2d22c5bd86c4be3e31e7a4b61d239f244bdccf commit 6d2d22c5bd86c4be3e31e7a4b61d239f244bdccf Author: CSÉCSY László Date: Wed Aug 1 10:04:23 2007 +0200 kdeaddons-3.5.7-2-i686 rebuilt with db-4.6 diff --git a/source/kde/kdeaddons/FrugalBuild b/source/kde/kdeaddons/FrugalBuild index 8c5f5da..3ca447c 100644 --- a/source/kde/kdeaddons/FrugalBuild +++ b/source/kde/kdeaddons/FrugalBuild @@ -3,12 +3,12 @@ pkgname=kdeaddons pkgver=3.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="Additional plugins and scripts for some KDE applications." groups=('kde') archs=('i686' 'x86_64') makedepends=('xmms') -depends=('kdemultimedia>=3.5.7' 'kdegames>=3.5.7' 'sdl' 'db>=4.5.20') +depends=('kdemultimedia>=3.5.7' 'kdegames>=3.5.7' 'sdl' 'db>=4.6.18') _F_kde_split_docs=1 Finclude kde Fconfopts="$Fconfopts --with-sdl" From vmiklos at frugalware.org Wed Aug 1 10:19:16 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 10:19:18 2007 Subject: [Frugalware-git] frugalware-current: klibido-0.2.5-4-i686 Message-ID: <20070801081916.122BD13A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=696bf0276d4ba474dddc00eaf3f3609df4fb7825 commit 696bf0276d4ba474dddc00eaf3f3609df4fb7825 Author: VMiklos Date: Wed Aug 1 10:19:00 2007 +0200 klibido-0.2.5-4-i686 rebuilt with db-4.6 diff --git a/source/kde-extra/klibido/FrugalBuild b/source/kde-extra/klibido/FrugalBuild index 9238ab0..bafe5dc 100644 --- a/source/kde-extra/klibido/FrugalBuild +++ b/source/kde-extra/klibido/FrugalBuild @@ -3,9 +3,9 @@ pkgname=klibido pkgver=0.2.5 -pkgrel=3 +pkgrel=4 pkgdesc="KLibido is a KDE usenet news grabber for Linux." -depends=('db>=4.5.20' 'uudeview' 'kdelibs') +depends=('db>=4.6.18' 'uudeview' 'kdelibs') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_defaults=0 From boobaa at frugalware.org Wed Aug 1 11:24:16 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 11:24:18 2007 Subject: [Frugalware-git] frugalware-current: subversion-1.4.4-4-i686 Message-ID: <20070801092416.771FE13A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fe7bca81391f6978c39bc0b5c68e6eb176d40321 commit fe7bca81391f6978c39bc0b5c68e6eb176d40321 Author: CSÉCSY László Date: Wed Aug 1 11:23:49 2007 +0200 subversion-1.4.4-4-i686 rebuilt with db-4.6-based apr-util & apache diff --git a/source/devel-extra/subversion/FrugalBuild b/source/devel-extra/subversion/FrugalBuild index 1283ef0..eecb348 100644 --- a/source/devel-extra/subversion/FrugalBuild +++ b/source/devel-extra/subversion/FrugalBuild @@ -3,10 +3,10 @@ pkgname=subversion pkgver=1.4.4 -pkgrel=3 +pkgrel=4 pkgdesc="A version control system that is a compelling replacement for CVS." url="http://subversion.tigris.org/" -depends=('neon>=0.26.4-2' 'apr-util>=1.2.8-2' 'apr>=1.2.9') +depends=('neon>=0.26.4-2' 'apr-util>=1.2.8-3' 'apr>=1.2.9') makedepends=('apache>=2.2.4-3' 'swig' 'ruby') groups=('devel-extra') archs=('i686' 'x86_64') @@ -18,7 +18,7 @@ subpkgs=('mod_svn' "$pkgname-svnserve" "$pkgname-bindings") subdescs=('SVN module for apache 2.X webservers to use SVN server via apache' \ 'Standalone SVN server daemon' \ 'Python,Ruby,Perl bindings for subversion') -subdepends=("apache>=2.2.4-3 $pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver perl python ruby swig") +subdepends=("apache>=2.2.4-4 $pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver perl python ruby swig") subgroups=('devel-extra' 'devel-extra' 'devel-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') subbackup=('etc/httpd/conf/modules.d/mod_dav_svn.conf' '' '') From vmiklos at frugalware.org Wed Aug 1 11:27:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 11:27:41 2007 Subject: [Frugalware-git] frugalware-current: monodevelop-0.14-3-i686 Message-ID: <20070801092738.496FF13A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=041c13a3cd305c5a07558d8a937e254286ab1f24 commit 041c13a3cd305c5a07558d8a937e254286ab1f24 Author: VMiklos Date: Wed Aug 1 11:27:19 2007 +0200 monodevelop-0.14-3-i686 rebuitl with firefox-2.0.0.6 diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index 5f7326f..9ab9308 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -3,10 +3,10 @@ pkgname=monodevelop pkgver=0.14 -pkgrel=2 +pkgrel=3 pkgdesc="A project to port SharpDevelop to Gtk#" url="http://www.mono-project.com/" -depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' 'mono-tools' 'firefox=2.0.0.5' 'ikvm' 'boo' 'gnome-sharp') +depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' 'mono-tools' 'firefox=2.0.0.6' 'ikvm' 'boo' 'gnome-sharp') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') From boobaa at frugalware.org Wed Aug 1 15:55:36 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 15:55:40 2007 Subject: [Frugalware-git] frugalware-current: kdesdk-3.5.7-2-i686 Message-ID: <20070801135536.B5BF713A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d0796d5648a186318d7b21efe95548d6424719bf commit d0796d5648a186318d7b21efe95548d6424719bf Author: CSÉCSY László Date: Wed Aug 1 15:55:07 2007 +0200 kdesdk-3.5.7-2-i686 rebuilt with db-4.6-based subversion diff --git a/source/kde-extra/kdesdk/FrugalBuild b/source/kde-extra/kdesdk/FrugalBuild index a534c7f..8679dc3 100644 --- a/source/kde-extra/kdesdk/FrugalBuild +++ b/source/kde-extra/kdesdk/FrugalBuild @@ -3,11 +3,11 @@ pkgname=kdesdk pkgver=3.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Software Development Kit." groups=('kde-extra') archs=('i686' 'x86_64') -depends=('kdebase>=3.5.7' 'db>=4.5.20' 'subversion>=1.4.0-3') +depends=('kdebase>=3.5.7' 'db>=4.6.18' 'subversion>=1.4.0-4') makedepends=('doxygen' 'cvs' 'qt-docs') _F_kde_split_docs=1 Finclude kde From priyank at frugalware.org Wed Aug 1 16:05:18 2007 From: priyank at frugalware.org (Priyank) Date: Wed Aug 1 16:05:22 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: fixes in cb_gfpm_refresh_button_clicked() Message-ID: <20070801140518.D2D7013A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=793c630131d76f89042747a1d0a76ae69a77dc2b commit 793c630131d76f89042747a1d0a76ae69a77dc2b Author: Priyank Date: Wed Aug 1 19:34:45 2007 +0530 gfpm-interface: fixes in cb_gfpm_refresh_button_clicked() * Display a confirmation to the user * Pass the list of packages to cb_gfpm_apply_button_clicked() diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index fce3551..34ab396 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -823,12 +823,23 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) { g_print ("error %s", pacman_strerror(pm_errno)); } - packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); + packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); if (gfpm_plist_question("Following packages will be upgraded. Do you want to continue ?", gfpm_pmlist_to_glist(packages)) == GTK_RESPONSE_YES) { + + PM_LIST *i = NULL; + gfpm_package_list_free (GFPM_INSTALL_LIST); + gfpm_package_list_free (GFPM_REMOVE_LIST); + for (i=pacman_list_first(packages);i;i=pacman_list_next(i)) + { + PM_SYNCPKG *sync = pacman_list_getdata (i); + PM_PKG *pk = pacman_sync_getinfo (sync, PM_SYNC_PKG); + gfpm_package_list_add (GFPM_INSTALL_LIST, pacman_pkg_getinfo(pk, PM_PKG_NAME)); + } + pacman_trans_release (); cb_gfpm_apply_btn_clicked (NULL, NULL); } - + cleanup: pacman_pkg_free (pm_lpkg); pacman_pkg_free (pm_spkg); diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index e8693cd..f56e4d7 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -310,7 +310,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) pkgname = pacman_pkg_getinfo (pkg, PM_PKG_NAME); pkgver = pacman_pkg_getinfo (pkg, PM_PKG_VERSION); gtk_list_store_append (store, &iter); - pkgstring = g_strdup_printf("%s%s", pkgname, pkgver); + pkgstring = g_strdup_printf("%s-%s", pkgname, pkgver); gtk_list_store_set (store, &iter, 0, pkgstring, -1); g_free (pkgstring); } From boobaa at frugalware.org Wed Aug 1 16:13:39 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 16:13:41 2007 Subject: [Frugalware-git] frugalware-current: ekiga-2.0.9-1-i686 Message-ID: <20070801141339.0A4B413A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e25ed52b2a14631dd3eab5568cdd0fa7144db0d0 commit e25ed52b2a14631dd3eab5568cdd0fa7144db0d0 Author: CSÉCSY László Date: Wed Aug 1 16:13:32 2007 +0200 ekiga-2.0.9-1-i686 rebuilt with heimdal-1.0-based evo-da-se per iron's req on irc diff --git a/source/gnome/ekiga/FrugalBuild b/source/gnome/ekiga/FrugalBuild index 2a597e5..4177ce1 100644 --- a/source/gnome/ekiga/FrugalBuild +++ b/source/gnome/ekiga/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Ekiga is an open source VoIP and Telephony client" url="http://ekiga.org" groups=('gnome') archs=('i686' 'x86_64') -depends=('opal>=2.2.8' 'dbus-glib>=0.71-2' 'gnome-desktop>=2.18.0' 'evolution-data-server>=1.10.0' 'avahi-glib>=0.6.19') +depends=('opal>=2.2.8' 'dbus-glib>=0.71-2' 'gnome-desktop>=2.18.0' 'evolution-data-server>=1.10.3.1-2' 'avahi-glib>=0.6.19') makedepends=('intltool' 'gnome-doc-utils') _F_gnome_schemas=('/etc/gconf/schemas/ekiga.schemas') _F_gnome_scrollkeeper="y" From vmiklos at frugalware.org Wed Aug 1 16:19:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 16:19:15 2007 Subject: [Frugalware-git] frugalware-current: xgl-20060505-8-i686 Message-ID: <20070801141912.CEDC013A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1197a624f1b64e1bc46e6e08827c10c704034861 commit 1197a624f1b64e1bc46e6e08827c10c704034861 Author: VMiklos Date: Wed Aug 1 16:18:56 2007 +0200 xgl-20060505-8-i686 patch from Alex: - mention desktop-effects - no longer refer to no longer existing compiz-cvs - other fixes diff --git a/source/x11-extra/xgl/FrugalBuild b/source/x11-extra/xgl/FrugalBuild index 4281f60..d9a9f7c 100644 --- a/source/x11-extra/xgl/FrugalBuild +++ b/source/x11-extra/xgl/FrugalBuild @@ -5,7 +5,7 @@ pkgname=xgl pkgver=20060505 mesaver=20060505 mesaname=Mesa-cvs -pkgrel=7 +pkgrel=8 pkgdesc="OpenGL accelerated X server" url="http://www.freedesktop.org/Software/Xgl" groups=('x11-extra') @@ -25,13 +25,13 @@ source=(http://ftp.frugalware.org/pub/other/sources/xgl/$pkgname-$pkgver.tar.bz2 autogen-no-run-configure.patch \ README.Frugalware fw-xgl-control) sha1sums=('65f14bbccdb080512a19131522f51602e4501ca9' \ - '5ea5b7a76de393098e0171e4e2a48a7969a5356c' \ - 'f31702e0029b2d68018598e73ed55c4d6c58367b' \ - '859b98a4049400be152032fc09ceff2afe9e6dcf' \ - '863ad92892785c3785b122bf54d0def4d4d2732c' \ - '9080a863743aa22710edb4ca5e5552b48db00e6f' \ - '4549a22a758a0beaa0b13af5b63fc6b8e98fd6dc' \ - '12b9ef1d31b058f484d5ade0d8a987b7e2579c92') + '5ea5b7a76de393098e0171e4e2a48a7969a5356c' \ + 'f31702e0029b2d68018598e73ed55c4d6c58367b' \ + '859b98a4049400be152032fc09ceff2afe9e6dcf' \ + '863ad92892785c3785b122bf54d0def4d4d2732c' \ + '9080a863743aa22710edb4ca5e5552b48db00e6f' \ + '355a6b1c34420f12774045e821a447fab7074d39' \ + '6efd93510083337d4f58e427fae26bace535bb91') build() { Fpatchall diff --git a/source/x11-extra/xgl/README.Frugalware b/source/x11-extra/xgl/README.Frugalware index b534aef..5575b1c 100644 --- a/source/x11-extra/xgl/README.Frugalware +++ b/source/x11-extra/xgl/README.Frugalware @@ -61,7 +61,7 @@ $ su - Enter your root password, then run: --------------------------------------- -# pacman-g2 -Sy mesa-cvs xgl compiz-cvs +# pacman-g2 -Sy mesa-cvs xgl compiz desktop-effects --------------------------------------- Now run: diff --git a/source/x11-extra/xgl/fw-xgl-control b/source/x11-extra/xgl/fw-xgl-control index 57f2bbe..71e80a0 100644 --- a/source/x11-extra/xgl/fw-xgl-control +++ b/source/x11-extra/xgl/fw-xgl-control @@ -1,9 +1,9 @@ #!/bin/bash # Frugalware Xgl Control script. -# Copyright (C) 2006 Alex Smith +# Copyright (C) 2007 Alex Smith -PACMAN="/usr/bin/pacman" +PACMAN="/usr/bin/pacman-g2" USE_COLOR="Y" CARD="" OPTS="" @@ -174,24 +174,10 @@ case $1 in msg "Detecting cards..." detectcard if [ "$GDM" ]; then - msg "Checking if compiz-cvs is available..." + msg "Checking if compiz is available..." fi if [ "$GDM" -a "`type -p compiz`" ]; then - ENABLE_COMPIZ=1 - msg "Compiz detected. If you would like to use Beryl instead, set ENABLE_COMPIZ" - msg "to 0 in /etc/sysconfig/compiz and follow the steps outlined at the bottom of" - msg "this page: http://wiki.beryl-project.org/index.php/Install/Frugalware" - msg "Checking if CGWD is available..." - if [ -x "/usr/bin/cgwd" ]; then - USE_CGWD=1 - msg "CGWD is installed so I will enable it. If you don't want to use it, set" - msg "USE_CGWD to 0 in /etc/sysconfig/compiz" - else - USE_CGWD=0 - fi - else - ENABLE_COMPIZ=0 - USE_CGWD=0 + msg "Compiz detected. You probably want to install desktop-effects. Do this afterwards with pacman" fi if [ "`type -p beryl-manager`" ]; then ENABLE_BERYL=1 @@ -210,14 +196,6 @@ case $1 in sed -i "s|^ServerArgsLocal=.*|ServerArgsLocal=$OPTS|" /usr/share/config/kdm/kdmrc sed -i "s|^ServerCmd=.*|ServerCmd=/usr/bin/Xgl|" /usr/share/config/kdm/kdmrc fi - if [ "$GDM" ]; then - msg "Configuring Compiz..." - echo "# Should compiz be run when Gnome or Xfce starts?" > /etc/sysconfig/compiz - echo "ENABLE_COMPIZ=${ENABLE_COMPIZ}" >> /etc/sysconfig/compiz - echo "" >> /etc/sysconfig/compiz - echo "# Shall we use CGWD instead of gnome-window-decorator? Only works if cgwd is installed" >> /etc/sysconfig/compiz - echo "USE_CGWD=${USE_CGWD}" >> /etc/sysconfig/compiz - fi if [ "$KDM" -a -x /usr/env/beryl.sh ]; then msg "Configuring Beryl..." echo "# Should beryl be run when KDE starts?" > /etc/sysconfig/beryl @@ -230,14 +208,6 @@ case $1 in fi ;; -d|--disable|--disable-xgl) - if [ "$GDM" ]; then - msg "Disabling Compiz..." - echo "# Should compiz be run when Gnome starts?" > /etc/sysconfig/compiz - echo "ENABLE_COMPIZ=0" >> /etc/sysconfig/compiz - echo "" >> /etc/sysconfig/compiz - echo "# Shall we use CGWD instead of gnome-window-decorator? Only works if cgwd is installed" >> /etc/sysconfig/compiz - echo "USE_CGWD=0" >> /etc/sysconfig/compiz - fi if [ "$KDM" -a -x /usr/env/beryl.sh ]; then msg "Disabling Beryl..." echo "# Should beryl be run when KDE starts?" > /etc/sysconfig/beryl @@ -259,7 +229,7 @@ case $1 in fi ;; *) - msg "Frugalware Xgl Control 0.1.3 Copyright (C) 2006 Alex Smith" + msg "Frugalware Xgl Control 0.2.0 Copyright (C) 2007 Alex Smith" msg2 "Usage: $0 --enable-xgl" msg2 " $0 --disable-xgl" exit 1 From boobaa at frugalware.org Wed Aug 1 16:53:44 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 16:53:47 2007 Subject: [Frugalware-git] frugalware-current: ekiga-2.0.9-2-i686 Message-ID: <20070801145344.B45F113A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=94598b9799e0165751eef1016dd402d12a8ef175 commit 94598b9799e0165751eef1016dd402d12a8ef175 Author: CSÉCSY László Date: Wed Aug 1 16:53:33 2007 +0200 ekiga-2.0.9-2-i686 shame on me: I have forgotten the relbump diff --git a/source/gnome/ekiga/FrugalBuild b/source/gnome/ekiga/FrugalBuild index 4177ce1..1390ed5 100644 --- a/source/gnome/ekiga/FrugalBuild +++ b/source/gnome/ekiga/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ekiga pkgver=2.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Ekiga is an open source VoIP and Telephony client" url="http://ekiga.org" groups=('gnome') From priyank at frugalware.org Wed Aug 1 17:01:00 2007 From: priyank at frugalware.org (Priyank) Date: Wed Aug 1 17:01:01 2007 Subject: [Frugalware-git] gfpm: gfpm-progress: now also displays the number of bytes recieved. Message-ID: <20070801150100.1AC2313A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=029bc8082bce60d435421d1715c097aed3d1bebc commit 029bc8082bce60d435421d1715c097aed3d1bebc Author: Priyank Date: Wed Aug 1 20:30:35 2007 +0530 gfpm-progress: now also displays the number of bytes recieved. diff --git a/glade/gfpm.glade b/glade/gfpm.glade index 15eb02c..e8e4490 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -587,6 +587,7 @@ Installed packages True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 False @@ -599,10 +600,27 @@ Installed packages - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + 1 + - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + False + 2 + diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 34ab396..3580ecf 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -791,7 +791,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) gfpm_progress_set_main_text (_("Synchronizing package databases")); gfpm_progress_show (TRUE); - ret = pacman_db_update (1, sync_db); + ret = pacman_db_update (0, sync_db); gfpm_progress_show (FALSE); /* check for a pacman-g2 update */ pm_lpkg = pacman_db_readpkg (local_db, "pacman-g2"); diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 500e46f..3135364 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -37,6 +37,7 @@ GtkWidget *progresswindow = NULL; static GtkWidget *main_label = NULL; static GtkWidget *sub_label = NULL; static GtkWidget *rate_label = NULL; +static GtkWidget *rec_label = NULL; static GtkWidget *rate_box = NULL; float rate; @@ -60,6 +61,7 @@ gfpm_progress_init (void) sub_label = glade_xml_get_widget (xml, "sub_pr_label"); rate_label = glade_xml_get_widget (xml, "rate_pr_label"); rate_box = glade_xml_get_widget (xml, "rate_pr_box"); + rec_label = glade_xml_get_widget (xml, "rx_pr_label"); return; } @@ -84,6 +86,7 @@ gfpm_progress_update (netbuf *ctl, int xferred, void *arg) char rate_text[10]; struct timeval t1; float tdiff; + gchar *rx_str = NULL; ctl = NULL; size = *(int*)arg; @@ -111,6 +114,9 @@ gfpm_progress_update (netbuf *ctl, int xferred, void *arg) { sprintf (rate_text, "%6.1fK/s", rate); } + rx_str = g_strdup_printf ("%dK / %dK", (xferred+offset)/1024, size/1024); + gtk_label_set_text (GTK_LABEL(rec_label), rx_str); + while (gtk_events_pending ()) gtk_main_iteration (); gtk_progress_bar_set_text (progressbar, text); @@ -181,6 +187,7 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) if (data1 == NULL) return; gtk_widget_hide (rate_box); + gtk_widget_hide (rec_label); while (gtk_events_pending ()) gtk_main_iteration (); switch (event) @@ -225,6 +232,7 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) case PM_TRANS_EVT_RETRIEVE_START: substr = g_strdup_printf (_("Retrieving packages from %s"), (char*)data1); m = 1; gtk_widget_show (rate_box); + gtk_widget_show (rec_label); break; default: return; } From priyank at frugalware.org Wed Aug 1 17:42:59 2007 From: priyank at frugalware.org (Priyank) Date: Wed Aug 1 17:43:02 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: added a 'download only' option to apply dialog. Message-ID: <20070801154259.3EF3213A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=f369961cf03249364db98410e0bbfad8591bfc87 commit f369961cf03249364db98410e0bbfad8591bfc87 Author: Priyank Date: Wed Aug 1 21:12:25 2007 +0530 gfpm-interface: added a 'download only' option to apply dialog. diff --git a/glade/gfpm.glade b/glade/gfpm.glade index e8e4490..99c1709 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -938,7 +938,7 @@ Installed packages - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -952,10 +952,17 @@ Installed packages - - - - + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Download only (do not install/upgrade) + 0 + True + + + 1 + diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 3580ecf..6d9af05 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -61,6 +61,7 @@ static GtkWidget *gfpm_inst_upgcheck; static GtkWidget *gfpm_inst_depcheck; static GtkWidget *gfpm_inst_forcheck; static GtkWidget *gfpm_apply_inst_depcheck; +static GtkWidget *gfpm_apply_inst_dwocheck; static GtkWidget *gfpm_apply_rem_depcheck; static void cb_gfpm_repos_combo_changed (GtkComboBox *combo, gpointer data); @@ -102,6 +103,7 @@ gfpm_interface_init (void) gfpm_inst_forcheck = glade_xml_get_widget (xml, "forcheck"); gfpm_apply_inst_depcheck = glade_xml_get_widget (xml, "applyinstdepcheck"); gfpm_apply_rem_depcheck = glade_xml_get_widget (xml, "applyremdepcheck"); + gfpm_apply_inst_dwocheck = glade_xml_get_widget (xml, "applyinstdwcheck"); /* Setup repository combobox */ widget = glade_xml_get_widget (xml, "combobox_repos"); @@ -321,6 +323,8 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gint flags = 0; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfpm_apply_inst_depcheck))) flags |= PM_TRANS_FLAG_NODEPS; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfpm_apply_inst_dwocheck))) + flags |= PM_TRANS_FLAG_DOWNLOADONLY; /* create transaction */ if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, NULL, gfpm_progress_install) == -1) { From boobaa at frugalware.org Wed Aug 1 17:54:01 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Aug 1 17:54:03 2007 Subject: [Frugalware-git] frugalware-current: evolution-2.10.3-3-i686 Message-ID: <20070801155401.75D4913A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f5afc13060f325beeb248c893efe51a9067b58b7 commit f5afc13060f325beeb248c893efe51a9067b58b7 Author: CSÉCSY László Date: Wed Aug 1 17:53:49 2007 +0200 evolution-2.10.3-3-i686 rebuilt with db-4.6-based evo-da-se diff --git a/source/gnome/evolution/FrugalBuild b/source/gnome/evolution/FrugalBuild index bb3612a..377501d 100644 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@ -3,10 +3,10 @@ pkgname=evolution pkgver=2.10.3 -pkgrel=2 +pkgrel=3 pkgdesc="Integrated mail, calendar and address book suite for GNOME" url="http://www.gnome.org/projects/evolution/" -depends=('gail>=1.18.0' 'gal>=2.5.3-3' 'evolution-data-server>=1.10.3.1' 'gtkhtml>=3.14.3' \ +depends=('gail>=1.18.0' 'gal>=2.5.3-3' 'evolution-data-server>=1.10.3.1-3' 'gtkhtml>=3.14.3' \ 'gnome-spell>=1.0.7-3' 'scrollkeeper' 'heimdal>=1.0' \ 'evolution-data-server-ldap>=1.10.3.1' 'libbonobo>=2.18.0' 'nss>=3.11.5' 'nspr>=4.6.6' \ 'libnotify') From priyank at frugalware.org Wed Aug 1 18:12:45 2007 From: priyank at frugalware.org (Priyank) Date: Wed Aug 1 18:12:50 2007 Subject: [Frugalware-git] gfpm: gfpm: added icon from frugalpkg Message-ID: <20070801161245.EA21613A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=45dc344f751d95968dbb85dcefea11748d903b6a commit 45dc344f751d95968dbb85dcefea11748d903b6a Author: Priyank Date: Wed Aug 1 21:42:19 2007 +0530 gfpm: added icon from frugalpkg * Restructured glade and icon dirs and accordingly modified the build system * gfpm.png is now installed under /usr/share/icons/hicolor/.. diff --git a/Makefile.am b/Makefile.am index c05dd29..c01c5fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,2 @@ -SUBDIRS = src po +SUBDIRS = src data po -sharedir = $(pkgdatadir) -share_DATA = glade/gfpm.glade glade/gfpmlog.png - -EXTRA_DIST = $(share_DATA) diff --git a/configure.ac b/configure.ac index ec43797..2f533d7 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,9 @@ dnl ========================================================================== AC_OUTPUT([ src/Makefile +data/Makefile +data/icons/Makefile +data/icons/48x48/Makefile po/Makefile.in Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..35d75e1 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,7 @@ +SUBDIRS = icons + +gladedir = $(datadir)/gfpm +glade_DATA = gfpm.glade gfpmlog.png + +EXTRA_DIST = $(glade_DATA) + diff --git a/data/gfpm.glade b/data/gfpm.glade new file mode 100644 index 0000000..99c1709 --- /dev/null +++ b/data/gfpm.glade @@ -0,0 +1,1095 @@ + + + + + + gfpm - Frugalware Package Manager + GTK_WIN_POS_CENTER + 800 + 600 + + + + True + + + True + + + True + _Gfpm + True + + + + + True + E_xit + True + + + + True + gtk-quit + 1 + + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Options + 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 + _Clear package cache + True + + + + gtk-clear + + + + + + + + + + + True + _Help + True + + + + + True + About Gfpm + _About Gfpm + True + + + True + gtk-about + 1 + + + + + + + + + + + False + + + + + True + GTK_TOOLBAR_BOTH + + + True + Apply Changes + Apply + gtk-apply + + + False + + + + + True + Refresh the package lists + Synchronize + True + gtk-refresh + + + False + + + + + True + Refresh the package lists + Install from file + True + gtk-go-down + + + + False + + + + + True + Help + True + gtk-help + + + False + + + + + True + + + 20 + True + + + + + False + False + + + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Search packages + + + + + True + True + + + 1 + + + + + + + False + False + + + + + True + + + True + 10 + gtk-find + 3 + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Quit + gtk-quit + + + + False + + + + + False + 1 + + + + + True + 170 + + + True + + + True + 4 + 0 + GTK_SHADOW_IN + + + True + 5 + 5 + 5 + 5 + + + True + + + True + All packages +Installed packages + + + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + 2 + False + True + + + + + 2 + 1 + + + + + + + + + + + False + True + + + + + True + 300 + + + True + 5 + 0 + GTK_SHADOW_IN + + + True + 5 + 5 + 5 + 5 + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + + + + + + + + + True + <b>Packages</b> + True + + + label_item + + + + + False + True + + + + + True + 5 + 0 + GTK_SHADOW_IN + + + True + 5 + 5 + 5 + 5 + + + True + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + False + True + + + + + False + + + + + True + Detials + + + tab + False + False + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + False + False + + + + + 1 + False + + + + + True + Files + + + tab + 1 + False + False + + + + + + + + + True + <b>Information</b> + True + + + label_item + + + + + True + True + + + + + True + True + + + + + 3 + + + + + True + 5 + + + False + GTK_PACK_END + 2 + + + + + + + window1 + False + GTK_WIN_POS_CENTER_ALWAYS + True + True + True + False + GDK_GRAVITY_CENTER + + + True + + + True + gfpmlog.png + + + False + False + + + + + + + + + + 350 + 125 + Gfpm + False + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + 8 + + + True + + + True + 0 + Please wait... + + + False + False + 4 + + + + + True + 0.10000000149011612 + + + False + False + 4 + 1 + + + + + False + + + + + True + True + 0.10000000149 + + + + False + False + 3 + 1 + + + + + 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 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Transfer Rate: + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + False + 1 + + + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + False + 2 + + + + + False + 4 + 2 + + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 8 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Remove old packages from cache + 0 + True + True + + + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Remove all packages from cache + 0 + True + True + rem_old_opt + + + False + 1 + + + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_EDGE + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-apply + True + 0 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + 1 + + + + + False + GTK_PACK_END + + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Install package from file + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Force install + 0 + True + + + False + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Upgrade existing + 0 + True + + + False + 3 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Skip dependency checks + 0 + True + + + False + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_EDGE + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + 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 + gtk-apply + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Install + + + 1 + + + + + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + 1 + + + + + False + GTK_PACK_END + + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_WIN_POS_CENTER_ON_PARENT + 350 + GDK_WINDOW_TYPE_HINT_DIALOG + mainwindow + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + The following operations will be performed + + + False + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Install packages:</b> + True + + + False + + + + + 110 + 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_ETCHED_OUT + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 4 + Total size: + + + False + 2 + + + + + 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 + Skip dependency checks + 0 + True + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Download only (do not install/upgrade) + 0 + True + + + 1 + + + + + 3 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + 2 + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Remove packages:</b> + True + + + False + + + + + 110 + 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_ETCHED_OUT + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 3 + Total size: + + + False + 2 + + + + + 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 + Skip dependency checks + 0 + True + + + + + + + + + + + 3 + + + + + 3 + + + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + + + + + + + False + GTK_PACK_END + + + + + + diff --git a/data/gfpmlog.png b/data/gfpmlog.png new file mode 100644 index 0000000..852f9b5 Binary files /dev/null and b/data/gfpmlog.png differ diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am new file mode 100644 index 0000000..22db3f6 --- /dev/null +++ b/data/icons/48x48/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = gfpm.png + +EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/48x48/gfpm.png b/data/icons/48x48/gfpm.png new file mode 100644 index 0000000..0648259 Binary files /dev/null and b/data/icons/48x48/gfpm.png differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 0000000..be1dcdd --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,13 @@ +SUBDIRS = 48x48 + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + diff --git a/glade/gfpm.glade b/glade/gfpm.glade deleted file mode 100644 index 99c1709..0000000 --- a/glade/gfpm.glade +++ /dev/null @@ -1,1095 +0,0 @@ - - - - - - gfpm - Frugalware Package Manager - GTK_WIN_POS_CENTER - 800 - 600 - - - - True - - - True - - - True - _Gfpm - True - - - - - True - E_xit - True - - - - True - gtk-quit - 1 - - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Options - 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 - _Clear package cache - True - - - - gtk-clear - - - - - - - - - - - True - _Help - True - - - - - True - About Gfpm - _About Gfpm - True - - - True - gtk-about - 1 - - - - - - - - - - - False - - - - - True - GTK_TOOLBAR_BOTH - - - True - Apply Changes - Apply - gtk-apply - - - False - - - - - True - Refresh the package lists - Synchronize - True - gtk-refresh - - - False - - - - - True - Refresh the package lists - Install from file - True - gtk-go-down - - - - False - - - - - True - Help - True - gtk-help - - - False - - - - - True - - - 20 - True - - - - - False - False - - - - - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Search packages - - - - - True - True - - - 1 - - - - - - - False - False - - - - - True - - - True - 10 - gtk-find - 3 - - - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Quit - gtk-quit - - - - False - - - - - False - 1 - - - - - True - 170 - - - True - - - True - 4 - 0 - GTK_SHADOW_IN - - - True - 5 - 5 - 5 - 5 - - - True - - - True - All packages -Installed packages - - - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - 2 - False - True - - - - - 2 - 1 - - - - - - - - - - - False - True - - - - - True - 300 - - - True - 5 - 0 - GTK_SHADOW_IN - - - True - 5 - 5 - 5 - 5 - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - - - - - - - - - True - <b>Packages</b> - True - - - label_item - - - - - False - True - - - - - True - 5 - 0 - GTK_SHADOW_IN - - - True - 5 - 5 - 5 - 5 - - - True - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - False - True - - - - - False - - - - - True - Detials - - - tab - False - False - - - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - False - False - - - - - 1 - False - - - - - True - Files - - - tab - 1 - False - False - - - - - - - - - True - <b>Information</b> - True - - - label_item - - - - - True - True - - - - - True - True - - - - - 3 - - - - - True - 5 - - - False - GTK_PACK_END - 2 - - - - - - - window1 - False - GTK_WIN_POS_CENTER_ALWAYS - True - True - True - False - GDK_GRAVITY_CENTER - - - True - - - True - gfpmlog.png - - - False - False - - - - - - - - - - 350 - 125 - Gfpm - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - 8 - - - True - - - True - 0 - Please wait... - - - False - False - 4 - - - - - True - 0.10000000149011612 - - - False - False - 4 - 1 - - - - - False - - - - - True - True - 0.10000000149 - - - - False - False - 3 - 1 - - - - - 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 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Transfer Rate: - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - False - 1 - - - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - False - 2 - - - - - False - 4 - 2 - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove old packages from cache - 0 - True - True - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove all packages from cache - 0 - True - True - rem_old_opt - - - False - 1 - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_EDGE - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-apply - True - 0 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - 0 - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Install package from file - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Force install - 0 - True - - - False - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Upgrade existing - 0 - True - - - False - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Skip dependency checks - 0 - True - - - False - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_EDGE - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - 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 - gtk-apply - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Install - - - 1 - - - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - 0 - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - GTK_WIN_POS_CENTER_ON_PARENT - 350 - GDK_WINDOW_TYPE_HINT_DIALOG - mainwindow - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - The following operations will be performed - - - False - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Install packages:</b> - True - - - False - - - - - 110 - 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_ETCHED_OUT - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 4 - Total size: - - - False - 2 - - - - - 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 - Skip dependency checks - 0 - True - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Download only (do not install/upgrade) - 0 - True - - - 1 - - - - - 3 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 2 - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Remove packages:</b> - True - - - False - - - - - 110 - 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_ETCHED_OUT - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 3 - Total size: - - - False - 2 - - - - - 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 - Skip dependency checks - 0 - True - - - - - - - - - - - 3 - - - - - 3 - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - - - - - - - False - GTK_PACK_END - - - - - - diff --git a/glade/gfpmlog.png b/glade/gfpmlog.png deleted file mode 100644 index 852f9b5..0000000 Binary files a/glade/gfpmlog.png and /dev/null differ From priyank at frugalware.org Wed Aug 1 18:16:50 2007 From: priyank at frugalware.org (Priyank) Date: Wed Aug 1 18:16:51 2007 Subject: [Frugalware-git] gfpm: gfpm-about.c: fix copyright year. Message-ID: <20070801161650.52E2813A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=10d5c78e6d2ad907204364a94f210d01403b89f5 commit 10d5c78e6d2ad907204364a94f210d01403b89f5 Author: Priyank Date: Wed Aug 1 21:46:27 2007 +0530 gfpm-about.c: fix copyright year. diff --git a/src/gfpm-about.c b/src/gfpm-about.c index dcddb1c..ee3260c 100644 --- a/src/gfpm-about.c +++ b/src/gfpm-about.c @@ -60,7 +60,7 @@ gfpm_about (void) gtk_show_about_dialog (GTK_WINDOW(gfpm_mw), "name", PACKAGE, "version", VERSION, - "copyright", _("(C) 2007 Frugalware Developer Team (GPL)"), + "copyright", _("(C) 2006-2007 Frugalware Developer Team (GPL)"), "comments", _("A graphical package manager for Frugalware Linux."), "license", license, "authors", authors, From vmiklos at frugalware.org Wed Aug 1 22:16:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 22:16:26 2007 Subject: [Frugalware-git] frugalware-current: gcc-4.2.1-2-i686 Message-ID: <20070801201622.2CBA413A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c25e45ac425de3610d65df6fc4b9ac66930eda77 commit c25e45ac425de3610d65df6fc4b9ac66930eda77 Author: VMiklos Date: Wed Aug 1 22:15:53 2007 +0200 gcc-4.2.1-2-i686 new libgomp subpackage diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 8d0f788..24dcd1d 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gcc pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" depends=('binutils' 'libstdc++') @@ -23,30 +23,32 @@ subpkgs=('libgcc' 'libstdc++' \ 'libgfortran' 'gcc-gfortran' \ 'libgcj' 'libgcj-awt' 'gcc-gcj' \ 'libobjc' 'gcc-objc' 'gcc-objc++' \ - 'gcc-treelang' 'libffi' 'libssp') + 'gcc-treelang' 'libffi' 'libssp' 'libgomp') subdescs=('GCC shared support library' 'GNU Standard C++ Library' \ 'Ada 95 runtime shared libraries' 'Ada 95 support for GCC' \ 'Fortran 95 runtime' 'Fortran 95 support for GCC' \ 'Java runtime library for gcc' 'AWT peer libraries for libgcj' 'Java support for GCC' \ 'Objective-C runtime' 'Objective-C support for GCC' 'Objective-C++ support for GCC' \ 'Treelang support for GCC' \ - 'FFI libraries from GCC' 'SSP libraries from 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") -subbackup=('' '' '' '' '' '' "usr/lib/gcj-$pkgver/classmap.db" '' '' '' '' '' '' '' '') + "gcc=$pkgver" "glibc" "glibc" "glibc") +subbackup=('' '' '' '' '' '' "usr/lib/gcj-$pkgver/classmap.db" '' '' '' '' '' '' '' '' '') subgroups=('lib chroot-core' 'lib chroot-core' \ 'lib-extra' 'devel-extra' \ 'lib-extra' 'devel-extra' \ 'lib' 'xlib' 'devel-extra' \ 'lib-extra' 'devel-extra' 'devel-extra' \ - 'devel-extra' 'lib' 'lib') + 'devel-extra' 'lib' 'lib' 'lib') 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' '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') [ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --libdir=/usr/lib --disable-multilib" @@ -75,7 +77,7 @@ build() make STAGE_CC_WRAPPER="$FCC" BOOT_CFLAGS="$CFLAGS" GCJFLAGS="$CFLAGS" bootstrap || return 1 - unset MAKEFLAGS # this is needed by libffi , FIXME - crazy - + unset MAKEFLAGS #this is needed by libffi Fmakeinstall # conflicts with binutils @@ -176,6 +178,9 @@ build() # libssp Fsplit libssp usr/lib/libssp* Fsplit libssp usr/lib/gcc/$CHOST/$pkgver/include/ssp/ + # libgomp + Fsplit libgomp usr/info/libgomp.info + Fsplit libgomp usr/lib/libgomp.* } # optimization OK From vmiklos at frugalware.org Wed Aug 1 22:44:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 22:44:09 2007 Subject: [Frugalware-git] frugalware-current: live-2007.07.25-1-i686 Message-ID: <20070801204407.6E71113A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=399e2dff37ce1ed5c64afc92da71face748b3798 commit 399e2dff37ce1ed5c64afc92da71face748b3798 Author: VMiklos Date: Wed Aug 1 22:43:45 2007 +0200 live-2007.07.25-1-i686 version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index 38f6c81..0f62a2c 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=live -pkgver=2007.07.10 +pkgver=2007.07.25 pkgrel=1 pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming" url="http://www.live555.com/" @@ -11,7 +11,7 @@ groups=('multimedia') archs=('i686' 'x86_64') up2date="lynx -dump http://www.live555.com/liveMedia/public/|grep tar.gz$|sed 's/.*live.\(.*\)\.t.*/\1/;q'" source=(http://www.live555.com/liveMedia/public/live.$pkgver.tar.gz) -sha1sums=('add00efa0bbb137e7d3248742521053360c4068b') +sha1sums=('424f98f24f8ce701f1064c3678616337faa9e8d3') build() { From vmiklos at frugalware.org Wed Aug 1 23:22:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 1 23:22:48 2007 Subject: [Frugalware-git] frugalware-current: flac-1.2.0-1-i686 Message-ID: <20070801212246.0722913A400D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ea01d9a9f601d8e8adb668418d6b0549dd368139 commit ea01d9a9f601d8e8adb668418d6b0549dd368139 Author: VMiklos Date: Wed Aug 1 23:22:36 2007 +0200 flac-1.2.0-1-i686 version bump no sover++ this time ;) diff --git a/source/multimedia/flac/FrugalBuild b/source/multimedia/flac/FrugalBuild index 49b1b30..d4b0801 100644 --- a/source/multimedia/flac/FrugalBuild +++ b/source/multimedia/flac/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=flac -pkgver=1.1.4 +pkgver=1.2.0 pkgrel=1 pkgdesc="Free Lossless Audio Coder" depends=('libogg') @@ -11,8 +11,8 @@ groups=('multimedia') archs=('i686' 'x86_64') Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=13478|grep -m1 'flac-\(.*\)-src'|sed 's/.*flac-\(.*\)-src.*/\1/'" +sha1sums=('019f50a71a755b2d4247cae8f9fb2264de61916d') if [ "$CARCH" == "x86_64" ]; then Fconfopts="$Fconfopts --enable-sse" fi -sha1sums=('b4ce77a96d7ec89a1555b016d90ad4899e613141') # optimization OK From vmiklos at frugalware.org Thu Aug 2 09:15:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 09:15:25 2007 Subject: [Frugalware-git] frugalware-current: gcc-4.2.1-2-i686 Message-ID: <20070802071520.B1F5113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ccda6c5e30b13f3b0ee2f1ddfa5659e75e3c9caa commit ccda6c5e30b13f3b0ee2f1ddfa5659e75e3c9caa Author: VMiklos Date: Thu Aug 2 09:14:59 2007 +0200 gcc-4.2.1-2-i686 up2date fix diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 24dcd1d..b7e0944 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -12,7 +12,7 @@ provides=('c-compiler') groups=('devel' 'devel-core') archs=('i686' 'x86_64') options=('scriptlet') -up2date="lynx -dump $url|grep Current|sed 's/.*GCC \(.*\) (.*/\1/'" +up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.0.tar.bz2 \ README.Frugalware) From boobaa at frugalware.org Thu Aug 2 09:17:56 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Aug 2 09:18:01 2007 Subject: [Frugalware-git] frugalware-current: validator-0.8.0-2-i686 Message-ID: <20070802071756.EE2E913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=07e58a4790f311fa3e3c39f8ce4a66fd5aa599a7 commit 07e58a4790f311fa3e3c39f8ce4a66fd5aa599a7 Author: CSÉCSY László Date: Thu Aug 2 09:17:30 2007 +0200 validator-0.8.0-2-i686 added a patch to be able to start mod_proxyless httpd with validator ok by vmiklos@ diff --git a/source/network-extra/validator/FrugalBuild b/source/network-extra/validator/FrugalBuild index ed666af..8102a47 100644 --- a/source/network-extra/validator/FrugalBuild +++ b/source/network-extra/validator/FrugalBuild @@ -3,7 +3,7 @@ pkgname=validator pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The W3C Markup Validator." url="http://validator.w3.org/" rodepends=('perl-config-general' 'perl-net-ip' 'perl-set-intspan' \ @@ -14,13 +14,16 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://validator.w3.org/whatsnew.html|grep Release|sed 's/.* -- \(.*\) R.*/\1/;q'" source=($url/dist/validator-${pkgver//./_}.tar.gz \ - $url/dist/sgml-lib-${pkgver//./_}.tar.gz) + $url/dist/sgml-lib-${pkgver//./_}.tar.gz \ + proxy.patch) sha1sums=('e3c7ff52ae2df23d4c0b9a1160199c186d4352b4' \ - '0e4663b0341aa781840eb27193e37269dcd649ee') + '0e4663b0341aa781840eb27193e37269dcd649ee' \ + '32d2f8042488d778acb64a39d997e0fe73bed61a') build() { Fcd + Fpatchall Fmkdir /var/www/validator Fsed '#Base = /usr/local/validator' 'Base = /var/www/validator' htdocs/config/validator.conf Fsed 'Library = \$Base' 'Library = /var/www/validator' htdocs/config/validator.conf diff --git a/source/network-extra/validator/proxy.patch b/source/network-extra/validator/proxy.patch new file mode 100644 index 0000000..ad2a1de --- /dev/null +++ b/source/network-extra/validator/proxy.patch @@ -0,0 +1,14 @@ +diff -Naur validator-0.8.0-orig/httpd/conf/httpd.conf validator-0.8.0/httpd/conf/httpd.conf +--- validator-0.8.0-orig/httpd/conf/httpd.conf 2007-07-25 03:26:39.000000000 +0200 ++++ validator-0.8.0/httpd/conf/httpd.conf 2007-08-02 09:12:20.000000000 +0200 +@@ -70,8 +70,9 @@ + RewriteRule /w3c-validator/whatsnew.atom$ http://www.w3.org/QA/Tools/validator-whatsnew.atom [P,L] + + ++ + + Order Deny,Allow + Allow from all + +- ++ From vmiklos at frugalware.org Thu Aug 2 09:35:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 09:35:17 2007 Subject: [Frugalware-git] frugalware-current: os-prober-1.21-1-i686 Message-ID: <20070802073515.DF6A513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=03f8a0f291b9f220cb457c53b2ae2b596a21fc31 commit 03f8a0f291b9f220cb457c53b2ae2b596a21fc31 Author: VMiklos Date: Thu Aug 2 09:34:59 2007 +0200 os-prober-1.21-1-i686 version bump diff --git a/source/base/os-prober/FrugalBuild b/source/base/os-prober/FrugalBuild index 174b27f..5c70567 100644 --- a/source/base/os-prober/FrugalBuild +++ b/source/base/os-prober/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=os-prober -pkgver=1.19 +pkgver=1.21 pkgrel=1 pkgdesc="Utility to detect other OSes on a set of drives." url="http://packages.debian.org/os-prober" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.debian.org/debian/pool/main/o/os-prober/|Flasttar|sed 's/.*_//'" source=(http://ftp.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.gz \ os-prober-frugalware.diff) -sha1sums=('cf36f3d0302404f83d80a58fca800d64db640e53' \ +sha1sums=('f8c9f29f145f7e25139d7c0f4d08a291bbea6d41' \ 'f32a69a86bf8c03478a14f74d69d46d05e909615') options=('force') From vmiklos at frugalware.org Thu Aug 2 09:38:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 09:38:02 2007 Subject: [Frugalware-git] frugalwareutils: libfwgrubconfig/os_prober(): port to os-prober 1.21 Message-ID: <20070802073800.A5A6F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils/.git;a=commitdiff;h=2a321dee6107a72ab0cc149847e4079a2d5d0722 commit 2a321dee6107a72ab0cc149847e4079a2d5d0722 Author: VMiklos Date: Thu Aug 2 09:37:46 2007 +0200 libfwgrubconfig/os_prober(): port to os-prober 1.21 just don't use the removed --mounted option, mounted parts are automatically deteced now diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index 4edebc2..f8c9acf 100644 --- a/libfwgrubconfig/libfwgrubconfig.c +++ b/libfwgrubconfig/libfwgrubconfig.c @@ -525,7 +525,7 @@ static int os_prober(FILE *fp) if(stat("/usr/bin/linux-boot-prober", &buf)) continue; - ptr = g_strdup_printf("linux-boot-prober --mounted %s", entry->rootdev); + ptr = g_strdup_printf("linux-boot-prober %s", entry->rootdev); pp = popen(ptr, "r"); free(ptr); if(!pp) From boobaa at frugalware.org Thu Aug 2 09:49:12 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Aug 2 09:49:14 2007 Subject: [Frugalware-git] boobaa: amavisd-new-2.5.2-1-i686 Message-ID: <20070802074912.8B2D713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=1c4317cfb0831057b3e1888c1d705c0662f7823d commit 1c4317cfb0831057b3e1888c1d705c0662f7823d Author: CSÉCSY László Date: Thu Aug 2 09:33:32 2007 +0200 amavisd-new-2.5.2-1-i686 version bump new m8r (ok by iron) changing UID/GID, so upgrade will break amavis without RTFM lots of other fixes & changes diff --git a/source/network-extra/amavisd-new/FrugalBuild b/source/network-extra/amavisd-new/FrugalBuild index 21e086e..f86b57d 100644 --- a/source/network-extra/amavisd-new/FrugalBuild +++ b/source/network-extra/amavisd-new/FrugalBuild @@ -1,31 +1,31 @@ # Compiling Time: 0.01 SBU -# Maintainer: Karoly CZOVEK +# Maintainer: CSÉCSY László +# Former m8r: Karoly CZOVEK # Contributor: Zoltan Kiss pkgname=amavisd-new -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="Amavisd-new is a high-performance interface between mailer (MTA) and content checkers" url="http://www.ijs.si/software/amavisd/" -depends=('perl-archive-tar' 'perl-archive-zip' 'perl-bdb' 'perl-convert-tnef' \ - 'perl-convert-uulib' 'perl-io-stringy' 'perl-io-zlib' \ - 'perl-mailtools' 'perl-mime-tools' 'perl-net-server' \ +depends=('perl-archive-tar' 'perl-archive-zip' 'perl-bdb' 'perl-convert-tnef'\ + 'perl-convert-uulib' 'perl-io-stringy' 'perl-io-zlib'\ + 'perl-mailtools' 'perl-mime-tools' 'perl-net-server'\ 'perl-unix-syslog' 'spamassassin') backup=('etc/amavis/20-userconf' 'etc/amavis/10-amavisconf') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep -A 2 'Most recent versions'|grep 'amavis' |sed 's/.*amavisd-new-\(.*\)\.tar.*/\1/;q'" source=($url/amavisd-new-$pkgver.tar.gz 10-amavisconf 20-userconf \ - rc.amavisd-new amavisconf) -sha1sums=('1a93e3c773f51d2c5062ee9fc5a4b0a782758c43' \ - '648421546adab952f6ace5834c269f8a80256b84' \ - '681dea305554a05b4a7279b56c7c1282650fcb8f' \ - 'b0f1274ac015a13a1ebd2cb8d4b2e001bc57f78d' \ - '0817540bbce13a5ac1861d1e82dcbcf740f977e8') - + rc.amavisd-new amavisconf README.Frugalware) +sha1sums=('2465131448ce10dac8511450695ff63bc565e6db' \ + '648421546adab952f6ace5834c269f8a80256b84' \ + '681dea305554a05b4a7279b56c7c1282650fcb8f' \ + 'abbe37aedba303f48e7827841e9e84dc2bb02ca7' \ + '0817540bbce13a5ac1861d1e82dcbcf740f977e8' \ + 'f09d2c56d797c699c3dffcc0c21b293d0098d0a5') build() { - Fcd Fsed "'-Home'=>'/var/amavis/db'" "'-Home'=>'/var/lib/amavis/db'" \ amavisd-agent @@ -38,7 +38,7 @@ build() { Fmkdir var/lib/amavis/tmp var/lib/amavis/var var/lib/amavis/db \ var/lib/amavis/helpers var/lib/amavis/quarantine \ var/lib/amavis/home var/lock/amavis - Fexerel usr/share/doc/$pkgname-$pkgver/examples/amavisd-release + Fexerel usr/share/doc/$pkgname-$pkgver/examples/amavisd-release Ffilerel usr/share/doc/$pkgname-$pkgver/examples/amavisd.conf-sample Ffilerel usr/share/doc/$pkgname-$pkgver/examples/amavisd.conf-default Ffilerel LDAP.schema usr/share/doc/$pkgname-$pkgver/ldap/amavis.schema @@ -55,7 +55,4 @@ build() { Fmkdir /usr/sbin Fln ../../var/lib/frugalware/system/amavisconf /usr/sbin/amavisconf } - -# optimalization OK - -# vim: ft=sh +# optimization OK diff --git a/source/network-extra/amavisd-new/README.Frugalware b/source/network-extra/amavisd-new/README.Frugalware new file mode 100644 index 0000000..f6fd954 --- /dev/null +++ b/source/network-extra/amavisd-new/README.Frugalware @@ -0,0 +1,13 @@ +From amavisd-new-2.5.2-1 we no longer use a random uid/gid, but dedicated +ones. Because of this amavis service will not start if you have it installed +before, so you have to correct this by issuing these commands: + +------------ +groupmod -g 40 amavis +usermod -u 40 -g 40 amavis +chown -R amavis:amavis /var/lib/amavis +chown -R amavis:amavis /var/lock/amavis +------------ + +You should chown any other amavis-owned stuff you may have lying around, these +are only the default ones. diff --git a/source/network-extra/amavisd-new/amavisd-new.install b/source/network-extra/amavisd-new/amavisd-new.install index c98bc91..2a1f928 100644 --- a/source/network-extra/amavisd-new/amavisd-new.install +++ b/source/network-extra/amavisd-new/amavisd-new.install @@ -1,8 +1,11 @@ post_install() { - /usr/sbin/groupadd amavis - /usr/sbin/useradd -g amavis -d /var/lib/amavis -s /bin/false \ - -c "Amavisd-new" amavis + if ! grep -q '^amavis:' /etc/group ; then + groupadd -g 40 amavis + fi + if ! grep -q '^amavis:' /etc/passwd ; then + useradd -u 40 -g 40 -s /bin/false -c "Amavisd-new" -d /var/lib/amavis amavis + fi chown -R amavis.amavis /var/lib/amavis chown -R amavis.amavis /var/lock/amavis echo "Please run 'amavisconf' to configure amavis!" @@ -10,9 +13,9 @@ post_install() pre_remove() { - /usr/sbin/chkconfig --del rc.amavisd-new - /usr/sbin/userdel -r amavis >/dev/null 2>&1 - /usr/sbin/groupdel amavis >/dev/null 2>&1 + chkconfig --del rc.amavisd-new + userdel -r amavis >/dev/null 2>&1 + groupdel amavis >/dev/null 2>&1 } op=$1 diff --git a/source/network-extra/amavisd-new/messages/amavisd-new.en b/source/network-extra/amavisd-new/messages/amavisd-new.en index 08eef64..8d3a985 100644 --- a/source/network-extra/amavisd-new/messages/amavisd-new.en +++ b/source/network-extra/amavisd-new/messages/amavisd-new.en @@ -2,3 +2,5 @@ stopamavisd="Stopping amavisd-new" startamavisd="Starting amavisd-new" nramavisd="Amavisd-new not running" aramavisd="Amavisd-new already running" +uamavis="Wrong uid, read /usr/share/doc/amavisd-new-*/README.Frugalware" +gamavis="Wrong gid, read /usr/share/doc/amavisd-new-*/README.Frugalware" diff --git a/source/network-extra/amavisd-new/messages/amavisd-new.hu b/source/network-extra/amavisd-new/messages/amavisd-new.hu index 19182af..e3311c6 100644 --- a/source/network-extra/amavisd-new/messages/amavisd-new.hu +++ b/source/network-extra/amavisd-new/messages/amavisd-new.hu @@ -1,4 +1,6 @@ stopamavisd="Amavisd-new leállítása" startamavisd="Amavisd-new indítása" nramavisd="Az Amavisd-new nem fut" -aramavisd="Az Amavisd-new már fut" \ No newline at end of file +aramavisd="Az Amavisd-new már fut" +uamavis="Hibás uid, olvassa el az /usr/share/doc/amavisd-new-*/README.Frugalware-t" +gamavis="Hibás gid, olvassa el az /usr/share/doc/amavisd-new-*/README.Frugalware-t" diff --git a/source/network-extra/amavisd-new/rc.amavisd-new b/source/network-extra/amavisd-new/rc.amavisd-new index 0b987ca..df5dc32 100644 --- a/source/network-extra/amavisd-new/rc.amavisd-new +++ b/source/network-extra/amavisd-new/rc.amavisd-new @@ -16,37 +16,45 @@ confdir="/etc/amavis" cmd_opts="" get_params() { - PARAMS="" - for i in `ls -1 $confdir` - do - PARAMS="$PARAMS -c $confdir/$i" - done + PARAMS="" + for i in `ls -1 $confdir` + do + PARAMS="$PARAMS -c $confdir/$i" + done } - if [ "$1" = "stop" ]; then - if [ ! -e $pid_file ]; then - echo -n "$nramavisd" - ok 1 - exit 0 - fi - stop "$stopamavisd" - kill -TERM `cat $pid_file` - rm $pid_file - ok $? - elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start - else # start - if [ -e $pid_file ]; then - echo -n "$aramavisd" - ok 1 - exit 0 - fi - get_params - $prog $PARAMS $opts - start "$startamavisd" - ok $? + if [ ! -e $pid_file ]; then + echo -n "$nramavisd" + ok 1 + exit 0 + fi + stop "$stopamavisd" + kill -TERM `cat $pid_file` + rm $pid_file + ok $? +elif [ "$1" = "restart" ]; then + "$0" stop + sleep 1 + "$0" start +else # start + if [ $(id -u amavis) != 40 ]; then + echo -n "$uamavis" + ok 999 + exit 0 + fi + if [ $(id -g amavis) != 40 ]; then + echo -n "$gamavis" + ok 999 + exit 0 + fi + if [ -e $pid_file ]; then + echo -n "$aramavisd" + ok 1 + exit 0 + fi + get_params + $prog $PARAMS $opts + start "$startamavisd" + ok $? fi - \ No newline at end of file From boobaa at frugalware.org Thu Aug 2 09:49:12 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Aug 2 09:49:14 2007 Subject: [Frugalware-git] boobaa: Changing uid/gid of amavis Message-ID: <20070802074912.9F49913A4028@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=7e7fd355444c5b2fd6121b3bc1f24f55b0920039 commit 7e7fd355444c5b2fd6121b3bc1f24f55b0920039 Author: CSÉCSY László Date: Thu Aug 2 09:35:56 2007 +0200 Changing uid/gid of amavis and removing that damned rc-foo.new file (vmiklos: why doesn't dg want to record this change?) diff --git a/docs/ids.txt b/docs/ids.txt index afb37a8..f44f8c7 100644 --- a/docs/ids.txt +++ b/docs/ids.txt @@ -7,7 +7,6 @@ `---------------`---------------`----------------------------------------------- User Group Package -------------------------------------------------------------------------------- -amavis amavis amavisd-new munin munin munin and munin-node -------------------------------------------------------------------------------- @@ -58,7 +57,7 @@ ID User Package Group Package 037 netdev shadow 038 messagebus dbus messagebus dbus 039 hald hal hald hal -040 +040 amavis amavisd-new amavis amavisd-new 041 042 gdm shadow gdm shadow 043 shadow shadow diff --git a/source/network-extra/amavisd-new/rc.amavisd-new.new b/source/network-extra/amavisd-new/rc.amavisd-new.new deleted file mode 100644 index 5600819..0000000 --- a/source/network-extra/amavisd-new/rc.amavisd-new.new +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2005 Zoltan Kiss -# rc.amavisd-new for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 81 32 -# description: Starts and stops the Amavis mail filter daemon. - -source /lib/initscripts/functions -TEXTDOMAIN=amavisd-new - -actions=(restart start status stop) -daemon="Amavisd-new" - -pid="$(pidof amavisd 2> /dev/null)" - -rc_start() -{ - start_msg - if [ -z ${pid} ] ; then - PARAMS= - for i in `ls -1 /etc/amavis` ; do - PARAMS="${PARAMS} -c /etc/amavis/${i}" - done - - /usr/sbin/amavisd ${PARAMS} - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z ${pid} ] ; then - killall amavisd - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh From vmiklos at frugalware.org Thu Aug 2 10:08:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 10:08:43 2007 Subject: [Frugalware-git] frugalware-current: aterm-1.0.1-1-i686 Message-ID: <20070802080839.AA69113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=08f9e7d66eada9394f5749deb09b147d261071f1 commit 08f9e7d66eada9394f5749deb09b147d261071f1 Author: VMiklos Date: Thu Aug 2 10:08:25 2007 +0200 aterm-1.0.1-1-i686 version bump diff --git a/source/xlib/aterm/FrugalBuild b/source/xlib/aterm/FrugalBuild index 1f03105..b4fa398 100644 --- a/source/xlib/aterm/FrugalBuild +++ b/source/xlib/aterm/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=aterm -pkgver=1.0.0 -pkgrel=3 +pkgver=1.0.1 +pkgrel=1 pkgdesc="A VT100 terminal emulator for X with transparency support" url="http://aterm.sourceforge.net/" depends=('libxext' 'libsm' 'libxt') @@ -11,8 +11,7 @@ groups=('xlib') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('806fd20aec2851c5eea26d9e6a707985da3579a3') +sha1sums=('a975753b415306a0734efc3773de8a86129bb54b') Fconfopts="$Fconfopts --enable-transparency=yes --enable-background-image --enable-fading \ --enable-menubar --enable-graphics" - -# optimalization OK +# optimization OK From boobaa at frugalware.org Thu Aug 2 10:10:59 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Aug 2 10:11:02 2007 Subject: [Frugalware-git] boobaa: postfix-2.4.5-1-i686 Message-ID: <20070802081059.3A83613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=5be57f38fb3b2f24a5629f70bd1ad56a20d35db8 commit 5be57f38fb3b2f24a5629f70bd1ad56a20d35db8 Author: CSÉCSY László Date: Thu Aug 2 10:10:44 2007 +0200 postfix-2.4.5-1-i686 version bump diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index 0833a0f..87ede9c 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -5,9 +5,9 @@ # Contributor: Krisztian VASAS pkgname=postfix -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 -vdaver=2.4.4 +vdaver=2.4.5 pkgdesc="A fast, easy to administer, and secure MTA" url="http://www.postfix.org/" depends=('db>=4.6.18' 'pcre' 'cyrus-sasl' 'libmysqlclient' 'libldap' 'libpq>=8.2-1') @@ -28,10 +28,10 @@ source=($mirror/official/$pkgname-$pkgver.tar.gz \ README.Frugalware http://vda.sourceforge.net/VDA/postfix-$vdaver-vda-ng.patch.gz) -sha1sums=('7ccac18b06de24bbf1069a4265044e1cdfb40d35'\ +sha1sums=('dc3616ffd441c23748273527b6693835f3502ad2'\ 'aef63e40eb4321f2cf7985983964e93e9c2a4cd0'\ 'b05736300a01bc6d4d0ca7bb92704de29b68651d'\ - '4e2905606da03a3f117fa4b4b703c3c5b2f1c174') + '7bc3a9639e64747b49bd862dc7cc326ab3aacd72') APPLY_PATCH_VDA=${APPLY_PATCH_VDA:-1} USE_FEATURE_SASL=${USE_FEATURE_SASL:-1} From boobaa at frugalware.org Thu Aug 2 15:21:14 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Aug 2 15:21:17 2007 Subject: [Frugalware-git] frugalware-current: postgrey-1.30-1-i686 Message-ID: <20070802132114.60D6113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5f2051f956267d51d1bb0015ee71c383c192ccca commit 5f2051f956267d51d1bb0015ee71c383c192ccca Author: CSÉCSY László Date: Thu Aug 2 15:21:07 2007 +0200 postgrey-1.30-1-i686 version bump diff --git a/source/network-extra/postgrey/FrugalBuild b/source/network-extra/postgrey/FrugalBuild index bbedd60..29e5fcd 100644 --- a/source/network-extra/postgrey/FrugalBuild +++ b/source/network-extra/postgrey/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=postgrey -pkgver=1.29 +pkgver=1.30 pkgrel=1 pkgdesc="a Postfix policy server implementing greylisting" url="http://isg.ee.ethz.ch/tools/postgrey/" @@ -31,7 +31,7 @@ build() Frcd2 $pkgname } # optimization OK - noarch -sha1sums=('648be42d92bd182db0cab5c4b308a8466f9371e6'\ +sha1sums=('83a18df994bdc521b4c67480db8ead77a1590aab'\ '74b36884ccc3935dc84e662500e72efbe0748d81'\ 'b078a79443d0807456483f33f64c2ee86bf7367a'\ '3d5691e5021265ac1667b2254558ca0388e61d9d'\ From priyank at frugalware.org Thu Aug 2 15:33:30 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 15:33:31 2007 Subject: [Frugalware-git] frugalware-current: pyrenamer-0.3-1-i686 Message-ID: <20070802133330.7D3FD13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ed0e0fee46ad0706019255ce1c0d450df7473801 commit ed0e0fee46ad0706019255ce1c0d450df7473801 Author: Priyank Date: Thu Aug 2 18:55:09 2007 +0530 pyrenamer-0.3-1-i686 * Version bump * Added python-eyed3 to depends * Added perl-xml to makedepends diff --git a/source/gnome-extra/pyrenamer/FrugalBuild b/source/gnome-extra/pyrenamer/FrugalBuild index 92a78cc..aae5b46 100644 --- a/source/gnome-extra/pyrenamer/FrugalBuild +++ b/source/gnome-extra/pyrenamer/FrugalBuild @@ -3,15 +3,16 @@ # Contributor: devil505 pkgname=pyrenamer -pkgver=0.1 +pkgver=0.3 pkgrel=1 pkgdesc="A mass file renamer written in PyGTK." url="http://www.infinicode.org/code/pyrenamer/" -depends=('pygtk' 'gconf' 'gtk+2') +depends=('pygtk' 'gconf' 'gtk+2' 'python-eyed3') +makedepends=('perl-xml') groups=('gnome-extra') archs=('i686') up2date="lynx -dump $url | grep -m1 tar.gz | Flasttar" source=($url/$pkgname-$pkgver.tar.gz) _F_gnome_schemas=('/etc/gconf/schemas/pyrename-schemas') Finclude gnome-scriptlet -sha1sums=('3e4eede8a28a16aab9e0d3b86f73fc6957d22bb7') +sha1sums=('01f9dde862688db3a92c6ebe537fe099249bc23c') From priyank at frugalware.org Thu Aug 2 16:17:47 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 16:17:50 2007 Subject: [Frugalware-git] gfpm: gfpm-util: new function gfpm_vercmp() to compare versions of packages. Message-ID: <20070802141748.1132513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=5a6d7135d9b87c8fa37304377c9eea4f990a1045 commit 5a6d7135d9b87c8fa37304377c9eea4f990a1045 Author: Priyank Date: Thu Aug 2 19:46:49 2007 +0530 gfpm-util: new function gfpm_vercmp() to compare versions of packages. diff --git a/src/gfpm-util.c b/src/gfpm-util.c index 2a4a632..928d77d 100644 --- a/src/gfpm-util.c +++ b/src/gfpm-util.c @@ -41,4 +41,49 @@ gfpm_pmlist_to_glist (PM_LIST *list) return ret; } + +gint +gfpm_vercmp (const char *str1, const char *str2) +{ + int l1 = 0, l2 = 0; + char st1[l1]; + char st2[l2]; + register int i; + int j = 0; + int v1, v2; + + if (str1 == NULL || str2 == NULL) + return -1; + l1 = strlen(str1); + l2 = strlen(str2); + for (i=0;i v2) + return 1; + + return -1; +} \ No newline at end of file diff --git a/src/gfpm-util.h b/src/gfpm-util.h index 1d49cd7..fbe5849 100644 --- a/src/gfpm-util.h +++ b/src/gfpm-util.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -15,4 +16,6 @@ char * gfpm_bold (const char *); GList * gfpm_pmlist_to_glist (PM_LIST *); +gint gfpm_vercmp (const char *, const char *); + #endif From priyank at frugalware.org Thu Aug 2 16:22:29 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 16:22:31 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: use gfpm_vercmp() to decide whether a package needs to be updated. Message-ID: <20070802142229.7A0D713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=7002d720d97304c44351f923a87b2b139292cef2 commit 7002d720d97304c44351f923a87b2b139292cef2 Author: Priyank Date: Thu Aug 2 19:51:41 2007 +0530 gfpm-interface: use gfpm_vercmp() to decide whether a package needs to be updated. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 6d9af05..a5c8f69 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -509,12 +509,18 @@ gfpm_load_pkgs_tvw (const char *group_name) char *v1 = (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION); char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); if (v1!=NULL && v2!=NULL) - { if (!strcmp(v1,v2)) + { + gint ret = gfpm_vercmp (v1, v2); + if (!ret) + up = FALSE; + else if (ret == -1) + up = TRUE; + else up = FALSE; } else { - up = TRUE; + up = FALSE; } gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, TRUE, @@ -985,12 +991,17 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); if (v1!=NULL && v2!=NULL) { - if (!strcmp(v1,v2)) + gint ret = gfpm_vercmp (v1, v2); + if (!ret) + up = FALSE; + else if (ret == -1) + up = TRUE; + else up = FALSE; } else - { - up = TRUE; + { + up = FALSE; } gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, From priyank at frugalware.org Thu Aug 2 16:39:44 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 16:39:46 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: display groups information in package info. Message-ID: <20070802143944.B1D4513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=ed99a5a0498b737ef46a3254ba6ca539b285d206 commit ed99a5a0498b737ef46a3254ba6ca539b285d206 Author: Priyank Date: Thu Aug 2 20:08:50 2007 +0530 gfpm-interface: display groups information in package info. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index a5c8f69..2c757c9 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -621,6 +621,23 @@ gfpm_load_info_tvw (const char *pkg_name) -1); g_free (st); g_string_free (str, TRUE); + + /* populate groups */ + temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_GROUPS); + str = g_string_new (""); + for (i=temp;i;i=pacman_list_next(i)) + { + str = g_string_append (str, (char*)pacman_list_getdata(i)); + str = g_string_append (str, " "); + } + gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = (char*)gfpm_bold (_("Group(s):")); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, + 0, st, + 1, (char*)str->str, + -1); + g_free (st); + g_string_free (str, TRUE); /* populate provides */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_PROVIDES); From priyank at frugalware.org Thu Aug 2 16:42:57 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 16:42:58 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: don't display Description in packages treeview. Message-ID: <20070802144257.A15ED13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=383dd4134d4320e6f5b924445aa0bbee86abc6d5 commit 383dd4134d4320e6f5b924445aa0bbee86abc6d5 Author: Priyank Date: Thu Aug 2 20:12:05 2007 +0530 gfpm-interface: don't display Description in packages treeview. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 2c757c9..58a64e1 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -123,13 +123,13 @@ gfpm_interface_init (void) g_signal_connect (selection, "changed", G_CALLBACK(cb_gfpm_groups_tvw_selected), NULL); /* Setup pkgs treeview */ - store = gtk_list_store_new (6, + store = gtk_list_store_new (5, G_TYPE_BOOLEAN, /* Install status */ GDK_TYPE_PIXBUF, /* Status icon */ G_TYPE_STRING, /* Package name */ G_TYPE_STRING, /* Installed version */ - G_TYPE_STRING, /* Latest version */ - G_TYPE_STRING); /* Package Description */ + G_TYPE_STRING); /* Latest version */ + //G_TYPE_STRING); /* Package Description */ GtkTreeViewColumn *column; renderer = gtk_cell_renderer_toggle_new (); @@ -175,6 +175,7 @@ gfpm_interface_init (void) gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column); + /* renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Description"), renderer, @@ -182,7 +183,7 @@ gfpm_interface_init (void) NULL); gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column); - + */ gtk_tree_view_set_model (GTK_TREE_VIEW(gfpm_pkgs_tvw), GTK_TREE_MODEL(store)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_pkgs_tvw)); @@ -498,7 +499,7 @@ gfpm_load_pkgs_tvw (const char *group_name) 2, g_strstrip((char*)pacman_list_getdata (i)), 3, (check==TRUE)?(char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION) : NULL, 4, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION), - 5, g_strstrip((char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC)), + //5, g_strstrip((char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC)), -1); } else if (r == 0) @@ -528,7 +529,7 @@ gfpm_load_pkgs_tvw (const char *group_name) 2, g_strstrip((char*)pacman_list_getdata (i)), 3, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION), 4, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION), - 5, g_strstrip((char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_DESC)), + //5, g_strstrip((char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_DESC)), -1); } pacman_pkg_free (pm_pkg); From vmiklos at frugalware.org Thu Aug 2 16:48:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 16:48:46 2007 Subject: [Frugalware-git] homepage-ng: FSA235-firefox Message-ID: <20070802144845.0E56213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=5098e097c99ab0a7be5679d2a53aa9db9411697d commit 5098e097c99ab0a7be5679d2a53aa9db9411697d Author: VMiklos Date: Thu Aug 2 16:48:39 2007 +0200 FSA235-firefox diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 05f7134..e1c9b3f 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,37 @@ + 235 + 2007-08-02 + vmiklos + firefox + 2.0.0.4-1terminus1 + 2.0.0.6-1terminus1 + http://bugs.frugalware.org/task/2252 + http://bugs.frugalware.org/task/2253 + http://bugs.frugalware.org/task/2303 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3656 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3670 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3734 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3735 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3736 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3737 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3738 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3089 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3844 + 1) Michal Zalewski has discovered a vulnerability in Mozilla Firefox, which can be exploited by malicious people to disclose sensitive information and conduct spoofing attacks. + The vulnerability is caused due to an error in the handling of the "wyciwyg://" URI handler. This can be exploited to access or spoof contents from a previously cached web site e.g. via HTTP 302 redirects when a user visits a malicious web page. + 2) The problem is that Firefox registers the "firefoxurl://" URI handler and allows invoking firefox with arbitrary command line arguments. Using e.g. the "-chrome" parameter it is possible to execute arbitrary Javascript in chrome context. This can be exploited to execute arbitrary commands e.g. when a user visits a malicious web site using other browsers. + 3) Various errors in the browser engine can be exploited to cause memory corruption and potentially to execute arbitrary code. + 4) Various errors in the Javascript engine can be exploited to cause memory corruption and potentially to execute arbitrary code. + 5) An error in the "addEventListener" and "setTimeout" methods can be exploited to inject script into another site's context, circumventing the browser's same-origin policy. + 6) An error in the cross-domain handling can be exploited to inject arbitrary HTML and script code in a sub-frame of another web site. + 7) An unspecified error in the handling of elements outside of documents allows an attacker to call an event handler and execute arbitrary code with chrome privileges. + 8) An unspecified error in the handling of "XPCNativeWrapper" can lead to execution of user-supplied code. + 9) The vulnerability is caused due to an error within the handling of "about:blank" pages loaded by chrome in an addon. This can be exploited to execute script code under chrome privileges by e.g. clicking on a link opened in an "about:blank" window created and populated in a certain ways by an addon. + Successful exploitation requires that certain addons are installed. + + 234 2007-07-31 vmiklos From priyank at frugalware.org Thu Aug 2 16:49:05 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 16:49:06 2007 Subject: [Frugalware-git] gfpm: gfpm: modified the window size a bit and other minor ui details Message-ID: <20070802144905.7978013A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=94012fa4a46207133a385fc8e16145cec66c85ed commit 94012fa4a46207133a385fc8e16145cec66c85ed Author: Priyank Date: Thu Aug 2 20:17:55 2007 +0530 gfpm: modified the window size a bit and other minor ui details diff --git a/data/gfpm.glade b/data/gfpm.glade index 99c1709..f7beafd 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -5,7 +5,7 @@ gfpm - Frugalware Package Manager GTK_WIN_POS_CENTER - 800 + 700 600 @@ -312,7 +312,7 @@ Installed packages True - 300 + 250 True diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 58a64e1..3268c99 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -88,7 +88,7 @@ gfpm_interface_init (void) gfpm_statusbar = glade_xml_get_widget (xml, "statusbar"); gtk_widget_show (gfpm_splash); while (gtk_events_pending()) - gtk_main_iteration (); + gtk_main_iteration (); gfpm_groups_tvw = glade_xml_get_widget (xml, "grouptreeview"); gfpm_pkgs_tvw = glade_xml_get_widget (xml, "pkgstreeview"); @@ -111,9 +111,6 @@ gfpm_interface_init (void) gtk_combo_box_set_active (GTK_COMBO_BOX(widget), 0); g_signal_connect (G_OBJECT(widget), "changed", G_CALLBACK(cb_gfpm_repos_combo_changed), NULL); - /* Refresh db button */ - //g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_refresh_button_clicked), NULL); - /* Setup groups treeview */ store = gtk_list_store_new (1, G_TYPE_STRING); renderer = gtk_cell_renderer_text_new (); From priyank at frugalware.org Thu Aug 2 17:02:26 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 17:02:28 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: minor ui fix. Message-ID: <20070802150226.DFC9C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=11c4c6002e1cd20e8cdf50e4c1c54ac583c9b410 commit 11c4c6002e1cd20e8cdf50e4c1c54ac583c9b410 Author: Priyank Date: Thu Aug 2 20:31:29 2007 +0530 gfpm-interface: minor ui fix. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 3268c99..2d0504e 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -153,6 +153,7 @@ gfpm_interface_init (void) "text", 2, NULL); gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_column_set_min_width (column, 140); gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column); From priyank at frugalware.org Thu Aug 2 17:18:16 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 17:18:18 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: display license for installed packages. Message-ID: <20070802151816.B2E8C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=a9e72ee6b001dcf4c8b3cd52b382f98e59ff8a52 commit a9e72ee6b001dcf4c8b3cd52b382f98e59ff8a52 Author: Priyank Date: Thu Aug 2 20:47:25 2007 +0530 gfpm-interface: display license for installed packages. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 2d0504e..5056cfe 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -603,7 +603,22 @@ gfpm_load_info_tvw (const char *pkg_name) 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC), -1); g_free (st); - + /* populate license */ + temp = pacman_pkg_getinfo (pm_lpkg, PM_PKG_LICENSE); + str = g_string_new (""); + for (i=temp;i;i=pacman_list_next(i)) + { + str = g_string_append (str, (char*)pacman_list_getdata(i)); + str = g_string_append (str, " "); + } + gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = (char*)gfpm_bold (_("License:")); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, + 0, st, + 1, (char*)str->str, + -1); + g_free (st); + g_string_free (str, TRUE); /* populate depends */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_DEPENDS); str = g_string_new (""); @@ -1026,7 +1041,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) 2, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_NAME), 3, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION), 4, (char*)pacman_pkg_getinfo (pm_spkg, PM_PKG_VERSION), - 5, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_DESC), + //5, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_DESC), -1); pacman_pkg_free (pm_lpkg); pacman_pkg_free (pm_spkg); @@ -1067,7 +1082,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) 1, (inst==TRUE)?(up==TRUE)?icon_up:icon_yes:icon_no, 2, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_NAME), 4, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION), - 5, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC), + //5, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC), -1); pacman_pkg_free (pm_pkg); pacman_pkg_free (pm_lpkg); From vmiklos at frugalware.org Thu Aug 2 17:28:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 17:28:52 2007 Subject: [Frugalware-git] frugalware-current: vim-7.1-3-i686 Message-ID: <20070802152851.87C9D13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a031a3120048797ee2c6a4184f51aa52f6889e25 commit a031a3120048797ee2c6a4184f51aa52f6889e25 Author: VMiklos Date: Thu Aug 2 17:28:34 2007 +0200 vim-7.1-3-i686 added 7.1.039 secfix closes #2292 minor improvement in the documentation diff --git a/source/apps/vim/FrugalBuild b/source/apps/vim/FrugalBuild index 6788732..7fc0f07 100644 --- a/source/apps/vim/FrugalBuild +++ b/source/apps/vim/FrugalBuild @@ -3,7 +3,7 @@ pkgname=vim pkgver=7.1 -pkgrel=2 +pkgrel=3 pkgdesc="VIM - Vi IMproved console" url="http://www.vim.org" depends=('ncurses') @@ -14,12 +14,14 @@ backup=(usr/share/vim/vimrc) up2date="lynx -dump $url/sources.php|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(ftp://ftp.vim.org/pub/vim/unix/$pkgname-$pkgver.tar.bz2 \ gvim.xpm README.Frugalware \ - vim-vimrc.diff frugalware.diff) + vim-vimrc.diff frugalware.diff \ + ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039) sha1sums=('981e1acecc4d8f15680b6e160de84aed038d857d' \ 'f7262c7429c42b7c1ef9cf1eaa6aa12292933525' \ - 'dbc8b65e621b860b53980c69bea0e6266b9ac4c3' \ + '50e139d94557b2ca361fed2130af103c47a8d654' \ 'b9e10d7c38b57798929bc184431cc79c21b7af75' \ - '8a695e1126830bc5318232d6eaddedf28aaa5b66') + '8a695e1126830bc5318232d6eaddedf28aaa5b66' \ + '87ee68d607022d1dea8496c9a6a88185040d292e') subpkgs=('gvim') subdescs=("VIM - Vi IMproved console (GTK version)") @@ -31,6 +33,7 @@ build() { Fcd vim${pkgver/.} Fpatchall + Fpatch 7.1.039 cd src # first build gvim Fmake --with-x --enable-gui=gtk2 --enable-multibyte diff --git a/source/apps/vim/README.Frugalware b/source/apps/vim/README.Frugalware index e5fd62e..6776fc3 100644 --- a/source/apps/vim/README.Frugalware +++ b/source/apps/vim/README.Frugalware @@ -41,10 +41,13 @@ spell check support: ---- set encoding=latin2 map :setlocal spell spelllang=en_gb -map :setlocal spell spelllang=hu_hu +map :setlocal spell spelllang=hu map :setlocal nospell ---- +NOTE: The language code is sometimes in an `xx` and sometimes is in an `xx_yy` +form. This is something you need to figure out for your language. + See the upstream documentation for more info about spell check support: ---- From priyank at frugalware.org Thu Aug 2 18:06:08 2007 From: priyank at frugalware.org (Priyank) Date: Thu Aug 2 18:06:10 2007 Subject: [Frugalware-git] gfpm: gfpm: display Reason for installed packages. Message-ID: <20070802160608.6F59F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=5d3e23882235f4a5580f4d562a79f939714251b6 commit 5d3e23882235f4a5580f4d562a79f939714251b6 Author: Priyank Date: Thu Aug 2 21:35:18 2007 +0530 gfpm: display Reason for installed packages. * modified the main window size a bit. diff --git a/data/gfpm.glade b/data/gfpm.glade index f7beafd..5647692 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -5,8 +5,8 @@ gfpm - Frugalware Package Manager GTK_WIN_POS_CENTER - 700 - 600 + 740 + 575 diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 5056cfe..f6d30b4 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -604,21 +604,24 @@ gfpm_load_info_tvw (const char *pkg_name) -1); g_free (st); /* populate license */ - temp = pacman_pkg_getinfo (pm_lpkg, PM_PKG_LICENSE); - str = g_string_new (""); - for (i=temp;i;i=pacman_list_next(i)) + if (inst == TRUE) { - str = g_string_append (str, (char*)pacman_list_getdata(i)); - str = g_string_append (str, " "); + temp = pacman_pkg_getinfo (pm_lpkg, PM_PKG_LICENSE); + str = g_string_new (""); + for (i=temp;i;i=pacman_list_next(i)) + { + str = g_string_append (str, (char*)pacman_list_getdata(i)); + str = g_string_append (str, " "); + } + gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = (char*)gfpm_bold (_("License:")); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, + 0, st, + 1, (char*)str->str, + -1); + g_free (st); + g_string_free (str, TRUE); } - gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = (char*)gfpm_bold (_("License:")); - gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, st, - 1, (char*)str->str, - -1); - g_free (st); - g_string_free (str, TRUE); /* populate depends */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_DEPENDS); str = g_string_new (""); @@ -780,6 +783,25 @@ gfpm_load_info_tvw (const char *pkg_name) g_free (st); } g_string_free (str, TRUE); + + st = (char*)gfpm_bold (_("Reason:")); + gtk_list_store_append (GTK_LIST_STORE(model), &iter); + switch ((int)pacman_pkg_getinfo (pm_lpkg, PM_PKG_REASON)) + { + case PM_PKG_REASON_EXPLICIT: gtk_list_store_set (GTK_LIST_STORE(model), &iter, + 0, st, + 1, _("Explicitly Installed"), + -1); + break; + case PM_PKG_REASON_DEPEND: gtk_list_store_set (GTK_LIST_STORE(model), &iter, + 0, st, + 1, _("Installed as a dependency for another package"), + -1); + break; + default: break; + } + g_free (st); + } return; From krics at linuxforum.hu Thu Aug 2 19:51:19 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 19:51:21 2007 Subject: [Frugalware-git] frugalware-current: medit-0.8.9-1-x86_64 Message-ID: <20070802175119.733D313A4028@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2abc686b5192de33cf17369fafbefb53e43eb1ee commit 2abc686b5192de33cf17369fafbefb53e43eb1ee Author: Christian Hamar alias krix Date: Thu Aug 2 19:51:00 2007 +0200 medit-0.8.9-1-x86_64 * Version bump diff --git a/source/xapps-extra/medit/FrugalBuild b/source/xapps-extra/medit/FrugalBuild index 45fec33..df9cb14 100644 --- a/source/xapps-extra/medit/FrugalBuild +++ b/source/xapps-extra/medit/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: detto pkgname=medit -pkgver=0.8.8 +pkgver=0.8.9 pkgrel=1 pkgdesc="A useful programming and around-programming text editor." depends=('libxml2' 'pygtk') @@ -15,7 +15,7 @@ _F_sourceforge_dirname="mooedit" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=167563|grep -m1 'medit-\(.*\).tar.bz2'|sed 's/.*it-\(.*\).t.*/\1/'" source=(${source[@]} kill_iconcacheupdate.patch) -sha1sums=('6b2e8b19fc59439e7ab5ab67379ce0aa5a60dcb5' \ +sha1sums=('3836889e9c634f88c728c17bb85582f591f1787d' \ '9af280e0d17a19c908c83fd4e7914730a0b876a8') # optimization OK From krics at linuxforum.hu Thu Aug 2 19:51:19 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 19:51:22 2007 Subject: [Frugalware-git] frugalware-current: mldonkey-2.9.0-1-x86_64 Message-ID: <20070802175119.51E8213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d90c5888f0a90abe9df473a5ed4c2f73d4bc3829 commit d90c5888f0a90abe9df473a5ed4c2f73d4bc3829 Author: Christian Hamar alias krix Date: Tue Jul 31 20:35:01 2007 +0200 mldonkey-2.9.0-1-x86_64 * VErsion bump diff --git a/source/gnome-extra/mldonkey/FrugalBuild b/source/gnome-extra/mldonkey/FrugalBuild index b50ae85..2863b60 100644 --- a/source/gnome-extra/mldonkey/FrugalBuild +++ b/source/gnome-extra/mldonkey/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=mldonkey -pkgver=2.8.7 +pkgver=2.9.0 pkgrel=1 pkgdesc="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface." _F_sourceforge_ext=".tar.bz2" @@ -27,5 +27,5 @@ build() { Fmakeinstall } -sha1sums=('598e1443ac9b7684301892b620e620d11c333001') +sha1sums=('7cde099f99dc23ea284bc6661a1d83be92ac170b') # optimization OK From krics at linuxforum.hu Thu Aug 2 20:01:11 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 20:01:15 2007 Subject: [Frugalware-git] frugalware-current: cvs2cl-2.67-1-x86_64 Message-ID: <20070802180111.75F8813A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=29c73bdfc5c365682b5d8a014736898faaaeab78 commit 29c73bdfc5c365682b5d8a014736898faaaeab78 Author: Christian Hamar alias krix Date: Thu Aug 2 20:01:00 2007 +0200 cvs2cl-2.67-1-x86_64 * Version bump diff --git a/source/apps-extra/cvs2cl/FrugalBuild b/source/apps-extra/cvs2cl/FrugalBuild index 61c9bc3..ceaf5ef 100644 --- a/source/apps-extra/cvs2cl/FrugalBuild +++ b/source/apps-extra/cvs2cl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cvs2cl -pkgver=2.62 +pkgver=2.67 pkgrel=1 pkgdesc="produces a GNU-style ChangeLog for CVS-controlled sources" url="http://www.red-bean.com/cvs2cl/" From krics at linuxforum.hu Thu Aug 2 20:03:33 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 20:03:35 2007 Subject: [Frugalware-git] frugalware-current: debootstrap-1.0.1-1-x86_64 Message-ID: <20070802180333.B269D13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fa331a317260344aa0bdac9354cb80266c53b20d commit fa331a317260344aa0bdac9354cb80266c53b20d Author: Christian Hamar alias krix Date: Thu Aug 2 20:03:22 2007 +0200 debootstrap-1.0.1-1-x86_64 * Version bump diff --git a/source/apps-extra/debootstrap/FrugalBuild b/source/apps-extra/debootstrap/FrugalBuild index 5df852d..b53fa99 100644 --- a/source/apps-extra/debootstrap/FrugalBuild +++ b/source/apps-extra/debootstrap/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: Bence Nagy pkgname=debootstrap -pkgver=1.0.0 +pkgver=1.0.1 srcver=`echo $pkgver | tr "_" "-"` pkgrel=1 pkgdesc="Bootstrap a basic Debian system" @@ -20,4 +20,4 @@ build() { cp -R usr/ $Fdestdir || Fdie } -sha1sums=('4b9619d52731fee5d957f388d4f88b7e2772d46a') +sha1sums=('9c973e6ce8ee955b3da928ea1bbdc5d9825b86b9') From krics at linuxforum.hu Thu Aug 2 20:06:10 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 20:06:12 2007 Subject: [Frugalware-git] frugalware-current: lcdf-typetools-2.65-1-x86_64 Message-ID: <20070802180610.BE5D713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5dae0f0763944a095939db788e6307665136a473 commit 5dae0f0763944a095939db788e6307665136a473 Author: Christian Hamar alias krix Date: Thu Aug 2 20:06:00 2007 +0200 lcdf-typetools-2.65-1-x86_64 * Version bump diff --git a/source/apps-extra/lcdf-typetools/FrugalBuild b/source/apps-extra/lcdf-typetools/FrugalBuild index 5fb75a5..9f2c816 100644 --- a/source/apps-extra/lcdf-typetools/FrugalBuild +++ b/source/apps-extra/lcdf-typetools/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: Bence Nagy pkgname=lcdf-typetools -pkgver=2.64 +pkgver=2.65 pkgrel=1 pkgdesc="Several command-line programs for manipulating PostScript Type 1 and PostScript-flavored OpenType fonts" url="http://www.lcdf.org/type" @@ -13,5 +13,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.lcdf.org/type | grep \"lcdf-typetools-.*.tar.gz\" | tail -n 1 | sed \"s/.*lcdf-typetools-\(.*\).tar.gz.*/\1/\"" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('c6543598ddf0eec02324b9dd285be73e3ea6db33') +sha1sums=('7b241ca435b1e6782e2dd12018c31133085dac3c') # optimization OK From krics at linuxforum.hu Thu Aug 2 20:14:44 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 20:14:45 2007 Subject: [Frugalware-git] frugalware-current: doxygen-1.5.3-1-x86_64 Message-ID: <20070802181444.3866013A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d656a253a48a8697d9037d4d3f2a43458d647e52 commit d656a253a48a8697d9037d4d3f2a43458d647e52 Author: Christian Hamar alias krix Date: Thu Aug 2 20:14:11 2007 +0200 doxygen-1.5.3-1-x86_64 * Version bump * Removed latexgen patch (in upstream) diff --git a/source/devel-extra/doxygen/FrugalBuild b/source/devel-extra/doxygen/FrugalBuild index 6036744..dab190e 100644 --- a/source/devel-extra/doxygen/FrugalBuild +++ b/source/devel-extra/doxygen/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=doxygen -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 pkgdesc="Doxygen is the documentation system for C/C++" url="http://www.doxygen.org/" @@ -14,8 +14,7 @@ up2date="lynx -dump ftp://ftp.stack.nl/pub/users/dimitri/|grep 'doxygen-[0-9\.]* source=(ftp://ftp.stack.nl/pub/users/dimitri/$pkgname-$pkgver.src.tar.gz \ doxygen-cflags-and-misc-fixes.patch \ doxygen-use-system-png.patch \ - doxygen-qstring-gcc4.patch0 \ - doxygen-latexgen.patch) + doxygen-qstring-gcc4.patch0) build() { Fcd @@ -33,9 +32,8 @@ build() { $Fdestdir/usr/share/doc/$pkgname-$pkgver } -sha1sums=('92749928d041cc9972b6304f170d29019eb148e5'\ - '08e08e9fee37844a00db0eb261bd704c95ac109e'\ - 'a500895e541227daf5791af1ae5f267ebb1ae7d4'\ - '4d4583ea8acc976a7f0f9dafa28c70f6cc494729'\ - '220b73bb741432f58b9bb2711521fc65b147c1ec') +sha1sums=('13bb3c234d1ec429919673b87bd42f849708b808' \ + '08e08e9fee37844a00db0eb261bd704c95ac109e' \ + 'a500895e541227daf5791af1ae5f267ebb1ae7d4' \ + '4d4583ea8acc976a7f0f9dafa28c70f6cc494729') # optimization OK diff --git a/source/devel-extra/doxygen/doxygen-latexgen.patch b/source/devel-extra/doxygen/doxygen-latexgen.patch deleted file mode 100644 index 52e1a21..0000000 --- a/source/devel-extra/doxygen/doxygen-latexgen.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur doxygen-1.5.2.orig/src/latexgen.cpp doxygen-1.5.2/src/latexgen.cpp ---- doxygen-1.5.2.orig/src/latexgen.cpp 2007-04-07 18:35:18.000000000 +0200 -+++ doxygen-1.5.2/src/latexgen.cpp 2007-04-07 18:37:27.000000000 +0200 -@@ -237,16 +237,16 @@ - } - if (Config_getBool("PDF_HYPERLINKS")) - { -- t << "\\ifx\\pdfoutput\\undefined" << endl -- << "\\usepackage[ps2pdf," << endl -+ t << "\\usepackage{ifpdf}" << endl -+ << "\\ifpdf" << endl -+ << "\\usepackage[pdftex," << endl - << " pagebackref=true," << endl - << " colorlinks=true," << endl - << " linkcolor=blue," << endl - << " unicode" << endl - << " ]{hyperref}" << endl -- << "\\usepackage{pspicture}" << endl - << "\\else" << endl -- << "\\usepackage[pdftex," << endl -+ << "\\usepackage[ps2pdf," << endl - << " pagebackref=true," << endl - << " colorlinks=true," << endl - << " linkcolor=blue," << endl From krics at linuxforum.hu Thu Aug 2 20:20:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 20:20:29 2007 Subject: [Frugalware-git] frugalware-current: notecase-1.6.1-1-x86_64 Message-ID: <20070802182026.DCE3113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=79e03de1aff718ddfa97cee3cae11bbe6fc3b61f commit 79e03de1aff718ddfa97cee3cae11bbe6fc3b61f Author: Christian Hamar alias krix Date: Thu Aug 2 20:20:15 2007 +0200 notecase-1.6.1-1-x86_64 * Version bump diff --git a/source/gnome-extra/notecase/FrugalBuild b/source/gnome-extra/notecase/FrugalBuild index 03b53e7..fd6cee9 100644 --- a/source/gnome-extra/notecase/FrugalBuild +++ b/source/gnome-extra/notecase/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=notecase -pkgver=1.5.8 +pkgver=1.6.1 pkgrel=1 pkgdesc="a hierarchical note manager (aka. outliner)" url="http://notecase.sourceforge.net/" @@ -14,5 +14,5 @@ _F_gnome_desktop="y" _F_gnome_mime="y" Finclude sourceforge gnome-scriptlet options=('scriptlet') +sha1sums=('78bbffc67912c805ba8234af9a8e6e81bfafedc8') # optimization OK -sha1sums=('cc60ecb855d392ecb1f0b395c0b2e4001cce9080') From krics at linuxforum.hu Thu Aug 2 20:22:44 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 20:22:48 2007 Subject: [Frugalware-git] frugalware-current: winki-0.4.4-1-x86_64 Message-ID: <20070802182244.B1EB913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=709f09722028273775d03bf105eafd30fb322715 commit 709f09722028273775d03bf105eafd30fb322715 Author: Christian Hamar alias krix Date: Thu Aug 2 20:22:32 2007 +0200 winki-0.4.4-1-x86_64 * Version bump diff --git a/source/gnome-extra/winki/FrugalBuild b/source/gnome-extra/winki/FrugalBuild index 6394c90..80a8071 100644 --- a/source/gnome-extra/winki/FrugalBuild +++ b/source/gnome-extra/winki/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: BMH1980 pkgname=winki -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 pkgdesc="GTK frontend to mencoder, mplayer and lsdvd" url="http://www.winki-the-ripper.de" @@ -16,7 +16,7 @@ makedepends=('python') rodepends=('gnome-python' 'libdvb' 'lsdvd' 'mplayer' 'vcdimager') _F_gnome_desktop="y" Finclude gnome-scriptlet -sha1sums=('ab08999750276806769f8f2304e59afada6cac85') +sha1sums=('1a6cf66f6934b7d1495becce1968d64ae2879362') build() { From krics at linuxforum.hu Thu Aug 2 22:40:11 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 22:40:14 2007 Subject: [Frugalware-git] frugalware-current: wesnoth-1.2.6-1-x86_64 Message-ID: <20070802204011.C67B213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=80ce8c49e1393a6663a27736fa88411b99783ec4 commit 80ce8c49e1393a6663a27736fa88411b99783ec4 Author: Christian Hamar alias krix Date: Thu Aug 2 22:39:55 2007 +0200 wesnoth-1.2.6-1-x86_64 * Version bump diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild index f294468..a542394 100644 --- a/source/games-extra/wesnoth/FrugalBuild +++ b/source/games-extra/wesnoth/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=wesnoth -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world" url="http://www.wesnoth.org/" @@ -15,6 +15,6 @@ source=(http://www.wesnoth.org/files/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --enable-server --enable-editor --enable-tools \ --enable-campaing-server --with-kde --with-gnome \ --with-fifodir=/var/run/wesnothd" -sha1sums=('87e0b77aaba3a2d0cda391ca1ec0ae028d839dc5') +sha1sums=('09c531f77856387239c94fc2c3e2f0b07f30dc32') # optimization OK From vmiklos at frugalware.org Thu Aug 2 23:24:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:24:42 2007 Subject: [Frugalware-git] frugalware-current: csup-20060318-1-x86_64 Message-ID: <20070802212440.C0D2C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=df12c2543726bb34850ebe65d536dcfa78bce119 commit df12c2543726bb34850ebe65d536dcfa78bce119 Author: VMiklos Date: Thu Aug 2 23:24:20 2007 +0200 csup-20060318-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/csup/FrugalBuild b/source/devel-extra/csup/FrugalBuild index 4524e3f..d7aa501 100644 --- a/source/devel-extra/csup/FrugalBuild +++ b/source/devel-extra/csup/FrugalBuild @@ -10,7 +10,7 @@ depends=('openssl' 'zlib' 'glibc') # can be removed after Frugalware-0.7 is out replaces=('cvsup') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url |Flasttgz" source=(http://mu.org/~mux/csup-snap-$pkgver.tgz) sha1sums=('209c53137245e3e5e2cea98151115043d993ce35') From vmiklos at frugalware.org Thu Aug 2 23:25:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:25:49 2007 Subject: [Frugalware-git] frugalware-current: splix-1.0.1-2-x86_64 Message-ID: <20070802212548.A46D313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d01a527b3849465f59845988caae04c18f3a904d commit d01a527b3849465f59845988caae04c18f3a904d Author: VMiklos Date: Thu Aug 2 23:25:45 2007 +0200 splix-1.0.1-2-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/splix/FrugalBuild b/source/apps-extra/splix/FrugalBuild index e354056..3c5c5ca 100644 --- a/source/apps-extra/splix/FrugalBuild +++ b/source/apps-extra/splix/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Splix is a driver for SPL printers (Samsung and several Xerox printers) makedepends=('cupsddk') depends=('cups>=1.2') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_ext="$pkgextraver.tar.bz2" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=175815 |grep splix.*tar |sed -ne 's/.*x-\(.*\).ta.*/\1/;1p'|sed s/$pkgextraver//" From vmiklos at frugalware.org Thu Aug 2 23:27:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:27:07 2007 Subject: [Frugalware-git] frugalware-current: gperf-3.0.3-1-x86_64 Message-ID: <20070802212707.1C67613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0f3b322b0fb0d3a3fd604c5876a54b5f0efef2ed commit 0f3b322b0fb0d3a3fd604c5876a54b5f0efef2ed Author: VMiklos Date: Thu Aug 2 23:27:03 2007 +0200 gperf-3.0.3-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/gperf/FrugalBuild b/source/devel-extra/gperf/FrugalBuild index 03029ba..cca6ac4 100644 --- a/source/devel-extra/gperf/FrugalBuild +++ b/source/devel-extra/gperf/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A perfect hash function generator." url="http://www.gnu.org/software/gperf/" depends=('libstdc++') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.gnu.org/pub/gnu/gperf/|Flasttar" source=(http://ftp.gnu.org/pub/gnu/gperf/gperf-$pkgver.tar.gz) signatures=($source.sig) From vmiklos at frugalware.org Thu Aug 2 23:27:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:27:42 2007 Subject: [Frugalware-git] frugalware-current: cddb-py-1.4-1-x86_64 Message-ID: <20070802212739.C3E7B13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=29e0e4b51e56ae62b46895f0f7744f97ad05a916 commit 29e0e4b51e56ae62b46895f0f7744f97ad05a916 Author: VMiklos Date: Thu Aug 2 23:27:36 2007 +0200 cddb-py-1.4-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/cddb-py/FrugalBuild b/source/devel-extra/cddb-py/FrugalBuild index ee5fe0d..a4a69d9 100644 --- a/source/devel-extra/cddb-py/FrugalBuild +++ b/source/devel-extra/cddb-py/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Access the CDDB and FreeDB online databases of audio CD track titles an _F_sourceforge_name=CDDB _F_sourceforge_dirname=$pkgname Finclude sourceforge -archs=('i686') +archs=('i686' 'x86_64') groups=('devel-extra') depends=('python') sha1sums=('4b101ff3a0a5895385dffac8ab807400f682a195') From krics at linuxforum.hu Thu Aug 2 23:34:34 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Aug 2 23:34:36 2007 Subject: [Frugalware-git] frugalware-current: dhcp-3.0.6-1-x86_64 Message-ID: <20070802213434.B64CF13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=abafb3f6d9d7d4429b28dd40976d2ca25d177dc5 commit abafb3f6d9d7d4429b28dd40976d2ca25d177dc5 Author: Christian Hamar alias krix Date: Thu Aug 2 23:34:14 2007 +0200 dhcp-3.0.6-1-x86_64 * Version bump * Freshed up networkmanager patch - Deleted lease file check from the patch (that part in upstream now) diff --git a/source/network/dhcp/FrugalBuild b/source/network/dhcp/FrugalBuild index d055db6..a4ba3e9 100644 --- a/source/network/dhcp/FrugalBuild +++ b/source/network/dhcp/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: ~0.2 SBU +# Compiling Time: 0.30 SBU # Maintainer: AlexExtreme pkgname=dhcp -pkgver=3.0.5 +pkgver=3.0.6 pkgrel=1 pkgdesc="The ISC DHCP server" url="http://www.isc.org/sw/dhcp/" @@ -14,12 +14,12 @@ backup=('etc/dhcpd.conf') up2date="lynx -dump $url |grep dhcp-[0-9] |sed -ne 's/.*p-\(.*\).t.*/\1/;1 p'" source=(ftp://ftp.isc.org/isc/$pkgname/$pkgname-$pkgver.tar.gz \ rc.dhcpd rc.dhcpd-hu.po README.Frugalware $pkgname-3.0.4-networkmanager-fixes.patch dhclient.conf) -sha1sums=('6501ba0e3dbd83ff57d3274538c4e4a1848ffc64' \ - '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ - 'fd70ba41e16c15d69529eeb216be103e042f3437' \ - '0aa3103883d0df5d9aa56defb39b22966af35a60' \ - 'ff249ec72b41dc0050348feb2aa205a63a857f6f' \ - 'ce6545dad5c371b269da8f689f6d3599feefc4da') +sha1sums=('204e509580d57d0cfff23529274612ca8c710efb' \ + '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ + 'fd70ba41e16c15d69529eeb216be103e042f3437' \ + '0510d9057df9dcf1c476961930f0ac65f7de87f9' \ + '2540c8bbef1d67e1e21ef8ce291cfe7bb85ec4d7' \ + 'ce6545dad5c371b269da8f689f6d3599feefc4da') subpkgs=('dhclient') subdescs=('The ISC DHCP client') subgroups=('network') diff --git a/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch b/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch index e25c820..5614bdd 100644 --- a/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch +++ b/source/network/dhcp/dhcp-3.0.4-networkmanager-fixes.patch @@ -78,7 +78,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c "[-s server]"); log_error (" [-cf config-file] [-lf lease-file]%s", "[-pf pid-file] [-e VAR=val]"); -@@ -869,7 +886,7 @@ +@@ -867,7 +884,7 @@ /* If the BOUND/RENEW code detects another machine using the offered address, it exits nonzero. We need to send a DHCPDECLINE and toss the lease. */ @@ -87,7 +87,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c make_decline (client, client -> new); send_decline (client); destroy_client_lease (client -> new); -@@ -2433,8 +2450,28 @@ +@@ -2447,8 +2464,28 @@ struct envadd_state { struct client_state *client; const char *prefix; @@ -116,7 +116,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c void client_option_envadd (struct option_cache *oc, struct packet *packet, struct lease *lease, struct client_state *client_state, -@@ -2451,6 +2488,31 @@ +@@ -2465,6 +2502,31 @@ in_options, cfg_options, scope, oc, MDL)) { if (data.len) { char name [256]; @@ -148,7 +148,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c if (dhcp_option_ev_name (name, sizeof name, oc -> option)) { client_envadd (es -> client, es -> prefix, -@@ -2479,6 +2541,7 @@ +@@ -2493,6 +2555,7 @@ es.client = client; es.prefix = prefix; @@ -156,21 +156,7 @@ diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c client_envadd (client, prefix, "ip_address", "%s", piaddr (lease -> address)); -@@ -2607,6 +2670,13 @@ - wstatus = 0; - } - } else { -+ /* -+ We don't want to pass an open file descriptor for -+ dhclient.leases when executing dhclient-script. -+ Debian bug #147582 -+ */ -+ if (leaseFile) -+ fclose (leaseFile); - execve (scriptName, argv, envp); - log_error ("execve (%s, ...): %m", scriptName); - exit (0); -@@ -2690,7 +2760,14 @@ +@@ -2709,7 +2772,14 @@ s = option -> name; if (j + 1 == buflen) return 0; From vmiklos at frugalware.org Thu Aug 2 23:38:17 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:38:19 2007 Subject: [Frugalware-git] frugalware-current: mlt-0.2.3-2-x86_64 Message-ID: <20070802213817.C54C313A4028@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=57b0115107d9ecf0c5cb3f44a397706156f2d369 commit 57b0115107d9ecf0c5cb3f44a397706156f2d369 Author: VMiklos Date: Thu Aug 2 23:38:04 2007 +0200 mlt-0.2.3-2-x86_64 added x86_64 to archs() diff --git a/source/xmultimedia-extra/mlt/FrugalBuild b/source/xmultimedia-extra/mlt/FrugalBuild index ba8b720..37c0357 100644 --- a/source/xmultimedia-extra/mlt/FrugalBuild +++ b/source/xmultimedia-extra/mlt/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="MLT is an open source multimedia framework, designed and developed for depends=('libsamplerate' 'alsa-lib' 'libdv' 'libxcb' 'ffmpeg>=20070422' 'libmad' 'libdv' 'libvorbis' 'lame' 'libogg') makedepends=('qt' 'gtk+2' 'freetype2>=2.3.4' 'sox' 'jack' 'libxml2' 'sdlimage' 'libquicktime>=1.0.0' 'zlib' 'ladspa_sdk') groups=('xmultimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge source=($source no-O4s-and-other-crap-thx.patch) @@ -27,6 +27,7 @@ subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() { + [ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --disable-mmx" Fbuild --enable-gpl --enable-motion-est Fsplit $pkgname-lumas usr/share/$pkgname/modules/lumas/ Fsplit $pkgname-qimage usr/share/$pkgname/modules/libmltqimage.so From vmiklos at frugalware.org Thu Aug 2 23:42:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:42:44 2007 Subject: [Frugalware-git] frugalware-current: beautifulsoup-3.0.4-1-x86_64 Message-ID: <20070802214242.E433F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=07038f921bc7aed6c5aba360fd31508ca5fcf266 commit 07038f921bc7aed6c5aba360fd31508ca5fcf266 Author: VMiklos Date: Thu Aug 2 23:42:36 2007 +0200 beautifulsoup-3.0.4-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/beautifulsoup/FrugalBuild b/source/lib-extra/beautifulsoup/FrugalBuild index 5830654..4fd13d3 100644 --- a/source/lib-extra/beautifulsoup/FrugalBuild +++ b/source/lib-extra/beautifulsoup/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Beautiful Soup is a Python HTML/XML parser designed for quick turnaroun url="http://www.crummy.com/software/BeautifulSoup/" depends=('python>=2.5') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.crummy.com/software/BeautifulSoup/ | grep -i 'latest version' | sed 's/.*Soup version //' | sed 's/\,.*//'" source=(http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup.tar.gz) sha1sums=('431121839a83393aa3f161bd756c4fa2acf063ef') From vmiklos at frugalware.org Thu Aug 2 23:48:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:48:05 2007 Subject: [Frugalware-git] frugalware-current: commoncpp2-1.5.7-1-x86_64 Message-ID: <20070802214803.C790F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=72cab22638e314e9f66d71925c45edb46715ca53 commit 72cab22638e314e9f66d71925c45edb46715ca53 Author: VMiklos Date: Thu Aug 2 23:48:00 2007 +0200 commoncpp2-1.5.7-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/commoncpp2/FrugalBuild b/source/lib-extra/commoncpp2/FrugalBuild index 3a761dd..abdb31c 100644 --- a/source/lib-extra/commoncpp2/FrugalBuild +++ b/source/lib-extra/commoncpp2/FrugalBuild @@ -8,7 +8,7 @@ url="http://wiki.gnutelephony.org/index.php/GNU_Common_CPP_Framework" pkgdesc="GNU Common C++ is a portable and highly optimized class framework for writing C++ applications." depends=('glibc' 'openssl' 'zlib' 'libgcc' 'libstdc++') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') Fconfopts="$Fconfopts --with-openssl" up2date="lynx -dump http://ftp.gnu.org/pub/gnu/commoncpp/|Flasttar" source=(http://ftp.gnu.org/pub/gnu/commoncpp/commoncpp2-$pkgver.tar.gz gcc42-atomicity.diff) From vmiklos at frugalware.org Thu Aug 2 23:50:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:50:15 2007 Subject: [Frugalware-git] frugalware-current: ccrtp-1.5.1-1-x86_64 Message-ID: <20070802215013.826BD13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f558d2f863527be214a0466655773cbf4ca64e70 commit f558d2f863527be214a0466655773cbf4ca64e70 Author: VMiklos Date: Thu Aug 2 23:50:09 2007 +0200 ccrtp-1.5.1-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/ccrtp/FrugalBuild b/source/lib-extra/ccrtp/FrugalBuild index fa6887a..e670fdd 100644 --- a/source/lib-extra/ccrtp/FrugalBuild +++ b/source/lib-extra/ccrtp/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="GNU ccRTP is an implementation of RTP, the real-time transport protocol url="http://wiki.gnutelephony.org/index.php/GNU_ccRTP" depends=('commoncpp2') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.gnu.org/pub/gnu/ccrtp/ |grep ccrtp- |Flasttar" source=(http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-$pkgver.tar.gz) signatures=($source.sig) From vmiklos at frugalware.org Thu Aug 2 23:52:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:52:57 2007 Subject: [Frugalware-git] frugalware-current: clinkc-2.1-2-x86_64 Message-ID: <20070802215256.ADC9F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ec388c89ffa3ca6a6e8d0887d9f95343cda2ec4a commit ec388c89ffa3ca6a6e8d0887d9f95343cda2ec4a Author: VMiklos Date: Thu Aug 2 23:52:53 2007 +0200 clinkc-2.1-2-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/clinkc/FrugalBuild b/source/lib-extra/clinkc/FrugalBuild index 24cb78c..7480266 100644 --- a/source/lib-extra/clinkc/FrugalBuild +++ b/source/lib-extra/clinkc/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="CyberLink for C is a UPnP library using C for small and embedded platfo depends=('libxml2' 'expat' 'curl') makedepends=('doxygen') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') Finclude sourceforge sha1sums=('2aaf3a58422bb97c30f20fc0e2b8ff8d3c529da3') _F_cd_path="$pkgname" From vmiklos at frugalware.org Thu Aug 2 23:54:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:54:58 2007 Subject: [Frugalware-git] frugalware-current: librdf-1.0.6-2-x86_64 Message-ID: <20070802215457.1129A13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5782877555c3cc6d24af61326696792553fdb07d commit 5782877555c3cc6d24af61326696792553fdb07d Author: VMiklos Date: Thu Aug 2 23:54:54 2007 +0200 librdf-1.0.6-2-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/librdf/FrugalBuild b/source/lib-extra/librdf/FrugalBuild index 8f91ba9..900d73d 100644 --- a/source/lib-extra/librdf/FrugalBuild +++ b/source/lib-extra/librdf/FrugalBuild @@ -10,7 +10,7 @@ url="http://librdf.org/" depends=('raptor>=1.4.15' 'rasqal>=0.9.14' 'db>=4.6.18' 'sqlite3>=3.3.17' 'libpq>=8.2.4' 'libxml2' 'openssl') makedepends=('postgresql>=8.2.4') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url|grep -om1 'redland-\(.*\).tar.gz'|Flasttar" source=(http://download.librdf.org/source/$origname-$pkgver.tar.gz) Fconfopts="$Fconfopts --with-raptor=system --with-rasqal=system --with-sqlit=yes --with-sqlite-version=3" From vmiklos at frugalware.org Thu Aug 2 23:55:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:55:45 2007 Subject: [Frugalware-git] frugalware-current: libmimic-1.0.4-1-x86_64 Message-ID: <20070802215543.E10C713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2523cf1f800c5135d96d1cea29c06a6320666414 commit 2523cf1f800c5135d96d1cea29c06a6320666414 Author: VMiklos Date: Thu Aug 2 23:55:40 2007 +0200 libmimic-1.0.4-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/libmimic/FrugalBuild b/source/lib-extra/libmimic/FrugalBuild index fc88161..e21a383 100644 --- a/source/lib-extra/libmimic/FrugalBuild +++ b/source/lib-extra/libmimic/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="libmimic is an open source video encoding/decoding library for MSN Mess url="http://farsight.sourceforge.net" depends=('glib2') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_dirname="farsight" Finclude sourceforge up2date="$up2date | sed 's/${pkgname}_//'" From vmiklos at frugalware.org Thu Aug 2 23:56:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Aug 2 23:56:29 2007 Subject: [Frugalware-git] frugalware-current: pylirc-0.0.5-1-x86_64 Message-ID: <20070802215629.14D1013A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=251e8d447989feab1f06bcc043ccfa566cb59a7b commit 251e8d447989feab1f06bcc043ccfa566cb59a7b Author: VMiklos Date: Thu Aug 2 23:56:25 2007 +0200 pylirc-0.0.5-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/pylirc/FrugalBuild b/source/lib-extra/pylirc/FrugalBuild index 11d0138..1917639 100644 --- a/source/lib-extra/pylirc/FrugalBuild +++ b/source/lib-extra/pylirc/FrugalBuild @@ -9,7 +9,7 @@ Finclude sourceforge url="http://pylirc.mccabe.nu" depends=('lirc' 'python>=2.5') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('90b016dc0ab1ad237603cbafa74c6625c6227a80') # optimization OK From vmiklos at frugalware.org Fri Aug 3 00:01:16 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:01:17 2007 Subject: [Frugalware-git] frugalware-current: sofia-sip-1.12.6-1-x86_64 Message-ID: <20070802220116.0BF6C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1843d8cd85187495d99faec37b04242d7ed88d7b commit 1843d8cd85187495d99faec37b04242d7ed88d7b Author: VMiklos Date: Fri Aug 3 00:01:09 2007 +0200 sofia-sip-1.12.6-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/sofia-sip/FrugalBuild b/source/lib-extra/sofia-sip/FrugalBuild index a7418b4..8102ee9 100644 --- a/source/lib-extra/sofia-sip/FrugalBuild +++ b/source/lib-extra/sofia-sip/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Sofia-SIP is an open-source SIP User-Agent library" url="http://sofia-sip.sourceforge.net/" depends=('glib2' 'openssl') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_broken_up2date=1 Finclude sourceforge sha1sums=('4930b76c6857eb1f1022d730df39f297229e7a2d') From vmiklos at frugalware.org Fri Aug 3 00:02:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:02:32 2007 Subject: [Frugalware-git] frugalware-current: squirrelmail-i18n-1.4.9_20070106-2-x86_64 Message-ID: <20070802220231.6C9A513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=27b3d8a05250cd99be6f7be33c7fe16839e1a069 commit 27b3d8a05250cd99be6f7be33c7fe16839e1a069 Author: VMiklos Date: Fri Aug 3 00:02:26 2007 +0200 squirrelmail-i18n-1.4.9_20070106-2-x86_64 added x86_64 to archs() diff --git a/source/locale-extra/squirrelmail-i18n/FrugalBuild b/source/locale-extra/squirrelmail-i18n/FrugalBuild index ea84d93..530cc57 100644 --- a/source/locale-extra/squirrelmail-i18n/FrugalBuild +++ b/source/locale-extra/squirrelmail-i18n/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Localization for SquirrelMail" url="http://www.squirrelmail.org/" rodepends=('squirrelmail') groups=('locale-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_ext=.tar.bz2 _F_sourceforge_dirname="squirrelmail" Finclude sourceforge From vmiklos at frugalware.org Fri Aug 3 00:03:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:03:49 2007 Subject: [Frugalware-git] frugalware-current: ncmpc-0.11.1-1-x86_64 Message-ID: <20070802220348.6AE7213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=64909311b0b3740d27f9b4c864ce3cc7ae4adc39 commit 64909311b0b3740d27f9b4c864ce3cc7ae4adc39 Author: VMiklos Date: Fri Aug 3 00:03:45 2007 +0200 ncmpc-0.11.1-1-x86_64 added x86_64 to archs() diff --git a/source/multimedia-extra/ncmpc/FrugalBuild b/source/multimedia-extra/ncmpc/FrugalBuild index b10a015..67cd2b2 100644 --- a/source/multimedia-extra/ncmpc/FrugalBuild +++ b/source/multimedia-extra/ncmpc/FrugalBuild @@ -9,10 +9,8 @@ url="http://www.musicpd.org/ncmpc.shtml" license="GPL2" depends=('glib2' 'ncurses') groups=('multimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://hem.bredband.net/kaw/ncmpc/files/|grep -o '[0-9\.]\+\.tar\.gz'|tail -n 1|sed 's/.tar.gz//'" source=(http://hem.bredband.net/kaw/ncmpc/files/$pkgname-$pkgver.tar.gz) sha1sums=('f1998f1d245386eb103ae12c50cf1bf0f5985ed7') - -# optimalization OK -# vim: ft=sh +# optimization OK From vmiklos at frugalware.org Fri Aug 3 00:04:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:04:49 2007 Subject: [Frugalware-git] frugalware-current: ptabtools-0.4.3-1-x86_64 Message-ID: <20070802220446.CA54413A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=25eaa57bd9ae375ba89916b72836bded726fb7e6 commit 25eaa57bd9ae375ba89916b72836bded726fb7e6 Author: VMiklos Date: Fri Aug 3 00:04:43 2007 +0200 ptabtools-0.4.3-1-x86_64 added x86_64 to archs() diff --git a/source/multimedia-extra/ptabtools/FrugalBuild b/source/multimedia-extra/ptabtools/FrugalBuild index a97fcf6..9c2564a 100644 --- a/source/multimedia-extra/ptabtools/FrugalBuild +++ b/source/multimedia-extra/ptabtools/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Tools to convert PowerTab files to various formats." url="http://jelmer.vernstok.nl/oss/ptabtools/" depends=('popt' 'glib' 'libxml2') -archs=('i686') +archs=('i686' 'x86_64') groups=('multimedia-extra') up2date="lynx -dump $url | grep tarball | sed 's/.*ls.//g' |sed 's/.(.*//g'" #tar.gz seems damaged, using this until a new version is released From vmiklos at frugalware.org Fri Aug 3 00:05:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:06:01 2007 Subject: [Frugalware-git] frugalware-current: curlftpfs-0.9.1-1-x86_64 Message-ID: <20070802220558.49CA913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a2102922fc40ffc5f9bef995b454634db84164f2 commit a2102922fc40ffc5f9bef995b454634db84164f2 Author: VMiklos Date: Fri Aug 3 00:05:53 2007 +0200 curlftpfs-0.9.1-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/curlftpfs/FrugalBuild b/source/network-extra/curlftpfs/FrugalBuild index 9ae89ba..dcf29ee 100644 --- a/source/network-extra/curlftpfs/FrugalBuild +++ b/source/network-extra/curlftpfs/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A FTP filesystem based on cURL and FUSE" url="http://curlftpfs.sourceforge.net/" depends=('fuse' 'curl') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') Finclude sourceforge sha1sums=('768385f68f7e128ec9e852bbf7860a632e8e3c46') From vmiklos at frugalware.org Fri Aug 3 00:08:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:08:44 2007 Subject: [Frugalware-git] frugalware-current: dante-1.1.19-1-x86_64 Message-ID: <20070802220843.A1C1113A4028@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0266e16ea60808417074912ed315b2da01ed2489 commit 0266e16ea60808417074912ed315b2da01ed2489 Author: VMiklos Date: Fri Aug 3 00:08:26 2007 +0200 dante-1.1.19-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/dante/FrugalBuild b/source/network-extra/dante/FrugalBuild index 4ff27a5..d7cf9cf 100644 --- a/source/network-extra/dante/FrugalBuild +++ b/source/network-extra/dante/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.inet.no/dante/" depends=('glibc') backup=(etc/socks.conf etc/sockd.conf) groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="elinks -dump ftp://ftp.inet.no/pub/socks/ 2>/dev/null|Flasttar" source=(ftp://ftp.inet.no/pub/socks/dante-$pkgver.tar.gz README.Frugalware) sha1sums=('e366a60a880ceff6205f7cd87249c7322b844d3c' \ From vmiklos at frugalware.org Fri Aug 3 00:12:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:12:54 2007 Subject: [Frugalware-git] frugalware-current: dspam-3.8.0-1-x86_64 Message-ID: <20070802221253.7D1F113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e48f13a44c3927616605ea39fdf4a996469ac1fa commit e48f13a44c3927616605ea39fdf4a996469ac1fa Author: VMiklos Date: Fri Aug 3 00:12:46 2007 +0200 dspam-3.8.0-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/dspam/FrugalBuild b/source/network-extra/dspam/FrugalBuild index 1bc8f49..ed94685 100644 --- a/source/network-extra/dspam/FrugalBuild +++ b/source/network-extra/dspam/FrugalBuild @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="DSPAM is a scalable and open-source content-based spam filter designed for multi-user enterprise systems." url="http://dspam.nuclearelephant.com/" groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') makedepends=('mysql' 'postgresql') depends=('glibc' 'libpq' 'libmysqlclient') Fconfopts="$Fconfopts --sysconfdir=/etc/dspam --with-logdir=/var/log/dspam" From vmiklos at frugalware.org Fri Aug 3 00:15:25 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:15:25 2007 Subject: [Frugalware-git] pacman-tools: repoman: upload fpms before push Message-ID: <20070802221525.29F3E13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=583cd8a5ed36607fd5ed006b73d281075b80abf6 commit 583cd8a5ed36607fd5ed006b73d281075b80abf6 Author: VMiklos Date: Fri Aug 3 00:14:01 2007 +0200 repoman: upload fpms before push - this way we can determine if an automated build is necessary or not right after the push - thx krix for the idea diff --git a/repoman b/repoman index 08ea268..1648c96 100755 --- a/repoman +++ b/repoman @@ -385,6 +385,13 @@ sync() { ls *-$arch.fpm &>/dev/null && srcdel + if ls *-$arch.fpm &>/dev/null; then + for i in *-$arch.fpm + do + echo ${options[@]} | grep -q nobuild || dry_run upload $i frugalware-$arch/ + done + fi + modpkgname=$(echo $pkgname | sed 's/\+/\\+/g') if [ -n "$noask" ]; then opts="-a" @@ -400,13 +407,6 @@ sync() # here we _could_ upload the new sources but that'll be done by changelog() - if ls *-$arch.fpm &>/dev/null; then - for i in *-$arch.fpm - do - echo ${options[@]} | grep -q nobuild || dry_run upload $i frugalware-$arch/ - done - fi - buildlog="$pkgname-$pkgver-$pkgrel-$arch.log" if [ -f $buildlog -o -f $buildlog.bz2 ]; then [ -f $buildlog ] && dry_run bzip2 $buildlog From vmiklos at frugalware.org Fri Aug 3 00:16:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:16:36 2007 Subject: [Frugalware-git] frugalware-current: ifplugd-0.28-1-x86_64 Message-ID: <20070802221634.D5D8313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=87f8ac92e7d3b4651e770caf7e1ce6d2eb3fedc3 commit 87f8ac92e7d3b4651e770caf7e1ce6d2eb3fedc3 Author: VMiklos Date: Fri Aug 3 00:16:23 2007 +0200 ifplugd-0.28-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/ifplugd/FrugalBuild b/source/network-extra/ifplugd/FrugalBuild index ed07cf7..312ab6c 100644 --- a/source/network-extra/ifplugd/FrugalBuild +++ b/source/network-extra/ifplugd/FrugalBuild @@ -9,7 +9,7 @@ url="http://0pointer.de/lennart/projects/ifplugd/" depends=('libdaemon' 'bash') groups=('network-extra') backup=(etc/ifplugd/ifplugd.conf) -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://0pointer.de/lennart/projects/ifplugd/ | grep -i 'current release' | sed 's/.*[0-9]\]//'" source=($url/$pkgname-$pkgver.tar.gz iface-fix.patch rc.ifplugd ifplugd.action) sha1sums=('0f00e6b544c0b7ed6c66fc58cb74f038d3fba77a' \ From vmiklos at frugalware.org Fri Aug 3 00:17:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:17:25 2007 Subject: [Frugalware-git] frugalware-current: postgrey-1.30-1-x86_64 Message-ID: <20070802221723.B603013A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7bda49258cf1d888780e7493e9729ceee79faa09 commit 7bda49258cf1d888780e7493e9729ceee79faa09 Author: VMiklos Date: Fri Aug 3 00:17:19 2007 +0200 postgrey-1.30-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/postgrey/FrugalBuild b/source/network-extra/postgrey/FrugalBuild index 29e5fcd..b70358f 100644 --- a/source/network-extra/postgrey/FrugalBuild +++ b/source/network-extra/postgrey/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="a Postfix policy server implementing greylisting" url="http://isg.ee.ethz.ch/tools/postgrey/" depends=('perl>=5.6.0' 'perl-net-server' 'perl-io-multiplex' 'perl-berkeleydb' 'db>=4.1' 'postfix>=2.1') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://isg.ee.ethz.ch/tools/$pkgname/pub/ | grep 'http.*tar\.gz' | sed 's/.*-\(.*\)\.t.*/\1/'" source=(http://isg.ee.ethz.ch/tools/$pkgname/pub/$pkgname-$pkgver.tar.gz \ rc.$pkgname rc.$pkgname-hu.po README.Frugalware $pkgname \ From vmiklos at frugalware.org Fri Aug 3 00:19:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 00:19:41 2007 Subject: [Frugalware-git] frugalware-current: autoconf-archive-2007_07_31-1-x86_64 Message-ID: <20070802221940.79C5613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=069bd6a0278a4e6477618065b97646fb971a7ee0 commit 069bd6a0278a4e6477618065b97646fb971a7ee0 Author: VMiklos Date: Fri Aug 3 00:19:33 2007 +0200 autoconf-archive-2007_07_31-1-x86_64 version bump diff --git a/source/devel-extra/autoconf-archive/FrugalBuild b/source/devel-extra/autoconf-archive/FrugalBuild index 78ef16d..6165a37 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=2007_06_27 +pkgver=2007_07_31 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=('a4c4028b3d115ebab6de2b91d4f9bf9117a12ccc') +sha1sums=('a39f805e02865a96cfd13e2360a0f4f0ef344a23') _F_cd_path="autoconf-archive-${pkgver//_/-}" From janny at frugalware.org Fri Aug 3 05:06:52 2007 From: janny at frugalware.org (janny) Date: Fri Aug 3 05:06:54 2007 Subject: [Frugalware-git] fwlive: add fwlive packages repo Message-ID: <20070803030652.DBB9513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive/.git;a=commitdiff;h=f5d8e4ff750a21fef4e1a7c8a42d8e2722e95845 commit f5d8e4ff750a21fef4e1a7c8a42d8e2722e95845 Author: janny Date: Thu Aug 2 21:30:38 2007 +0200 add fwlive packages repo diff --git a/Makefile b/Makefile index ce8fb8c..fd53aef 100644 --- a/Makefile +++ b/Makefile @@ -41,11 +41,16 @@ all: checkroot check-tree checkfiles chroot-mkdirs create-pkgdb cache-mount inst check-tree: source /etc/repoman.conf; \ grep -v Include /etc/pacman.conf >${PACCONF}; \ + echo "Include = /etc/pacman.d/janny" >> ${PACCONF}; \ for i in `echo ${TREE}|sed 's/,/ /g'`; do \ repo=$$(eval "echo \$${$${i}_fdb/.fdb}"); \ [ -z "$$repo" ] && repo="$$i"; \ echo "Include = /etc/pacman.d/$$repo" >> ${PACCONF}; \ done + if [ ! -e /etc/pacman.d/janny ] ; then \ + echo "[janny]" > /etc/pacman.d/janny; \ + echo "Server = http://ftp.frugalware.org/pub/other/people/janny/fwlive/frugalware-i686/" >> /etc/pacman.d/janny; \ + fi parse_cmdline: parse_cmdline.in sed 's/@FWLLLANG@/$(FWLLLANG)/' $@.in > $@ diff --git a/config b/config index fa72886..f78a5e7 100644 --- a/config +++ b/config @@ -63,7 +63,7 @@ SAVEDIRS = etc home root var CONFIG_SETUP = y # additional packages to be installed by the profiles -DRIVERS = ndiswrapper ipw2200-firmware acx100 madwifi rt2500 +DRIVERS = ndiswrapper-fwlive ipw2200-firmware acx100 madwifi rt2500 INST_MUSTHAVE_APPS = busybox-fwlive util-linux grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) @@ -74,15 +74,16 @@ INST_MUSTHAVE_APPS += fwsetup endif INST_MIN_APPS = ${INST_MUSTHAVE_APPS} ${DRIVERS} openssh mc wget lynx nmap \ irssi dbus hal wireless_tools vim elinks links -INST_SERVER_APPS = ${INST_MIN_APPS} ncftp iptables proftpd fuseftp postfix bind \ +INST_SERVER_APPS = ${INST_MIN_APPS} ncftp iptables fuseftp postfix bind \ mysql libmysqlclient php php-cgi apache pure-ftpd phpmyadmin samba dhcp \ dhcpcd lighttpd fcgi INST_X_APPS = ${INST_MIN_APPS} xorg-server xorg-drivers fvwm mplayer alsa-utils -INST_EXTRA_APPS = gimp gwenview wireshark kaffeine kasablanca scribus ktorrent -INST_LOCALE_APPS = firefox-hu kde-i18n-hu openoffice.org-dict-hu \ - openoffice.org-i18n-hu bibletime-i18n firefox-de firefox-fr kde-i18n-de \ - kde-i18n-fr openoffice.org-dict-fr k3b-i18n openoffice.org-i18n-de \ - openoffice.org-i18n-fr openoffice.org-dict-de +INST_EXTRA_APPS = gimp gwenview wireshark kaffeine kasablanca ktorrent +INST_LOCALE_APPS = firefox-hu firefox-de firefox-fr \ + kde-i18n-hu kde-i18n-de kde-i18n-fr \ + 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_KDE_APPS = ${INST_X_APPS} kdebase openoffice.org-kde firefox kmplayer \ flashplugin qtparted k3b INST_FULL_APPS = ${INST_SERVER_APPS} ${INST_KDE_APPS} ${INST_EXTRA_APPS} ${INST_LOCALE_APPS} From krics at linuxforum.hu Fri Aug 3 07:26:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 07:26:44 2007 Subject: [Frugalware-git] frugalware-current: dhcp-3.0.6-1-i686 Message-ID: <20070803052641.AC13B13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=044ad81964465bab383120a3944ea36d4d971bb9 commit 044ad81964465bab383120a3944ea36d4d971bb9 Author: Christian Hamar alias krix Date: Fri Aug 3 07:25:25 2007 +0200 dhcp-3.0.6-1-i686 * Fixed SHA1 for networkmanager patch diff --git a/source/network/dhcp/FrugalBuild b/source/network/dhcp/FrugalBuild index a4ba3e9..a422166 100644 --- a/source/network/dhcp/FrugalBuild +++ b/source/network/dhcp/FrugalBuild @@ -18,7 +18,7 @@ sha1sums=('204e509580d57d0cfff23529274612ca8c710efb' \ '78b0defcc0dbdc85b947bdf9c0037b0530358a32' \ 'fd70ba41e16c15d69529eeb216be103e042f3437' \ '0510d9057df9dcf1c476961930f0ac65f7de87f9' \ - '2540c8bbef1d67e1e21ef8ce291cfe7bb85ec4d7' \ + '638b5a5eb6e4459db52e6e65c7d015d246b70e3e' \ 'ce6545dad5c371b269da8f689f6d3599feefc4da') subpkgs=('dhclient') subdescs=('The ISC DHCP client') From krics at linuxforum.hu Fri Aug 3 07:50:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 07:50:23 2007 Subject: [Frugalware-git] frugalware-current: cairomm-1.4.4-1-i686 Message-ID: <20070803055018.E447C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=67f585486352700835eea927ecd33cbf14c2d645 commit 67f585486352700835eea927ecd33cbf14c2d645 Author: Christian Hamar alias krix Date: Fri Aug 3 07:48:58 2007 +0200 cairomm-1.4.4-1-i686 * Version bump diff --git a/source/xlib/cairomm/FrugalBuild b/source/xlib/cairomm/FrugalBuild index e4e1bbe..ad5f6e6 100644 --- a/source/xlib/cairomm/FrugalBuild +++ b/source/xlib/cairomm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cairomm -pkgver=1.4.2 +pkgver=1.4.4 pkgrel=1 pkgdesc="C++ bindings for cairo" url="http://cairographics.org" @@ -13,5 +13,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/releases/ |grep ]LATEST-cairomm|sed 's/.*mm-\([^ ]*\) .*/\1/'" source=($url/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('5e0411a67d8f427a7fb514f27b8d15298f6dffe6') # optimization OK -sha1sums=('35fe91777ded82332f731a4d933c9f3eeb575707') From krics at linuxforum.hu Fri Aug 3 08:10:29 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 08:10:31 2007 Subject: [Frugalware-git] frugalware-current: libglademm-2.6.4-4-i686 Message-ID: <20070803061029.A6DA813A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c7d1dfd789652a43ded72de96397f52147de4562 commit c7d1dfd789652a43ded72de96397f52147de4562 Author: Christian Hamar alias krix Date: Fri Aug 3 08:09:07 2007 +0200 libglademm-2.6.4-4-i686 * Release bump due cairomm diff --git a/source/gnome-extra/libglademm/FrugalBuild b/source/gnome-extra/libglademm/FrugalBuild index 48bfe45..46f2bc9 100644 --- a/source/gnome-extra/libglademm/FrugalBuild +++ b/source/gnome-extra/libglademm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libglademm pkgver=2.6.4 -pkgrel=3 +pkgrel=4 pkgdesc="C++ interface for Libglade" url="http://www.gnome.org/" -depends=('gtkmm>=2.10.10-3' 'libglade' 'cairomm=1.4.2') +depends=('gtkmm>=2.10.10-3' 'libglade' 'cairomm>=1.4.4') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome From krics at linuxforum.hu Fri Aug 3 08:19:01 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 08:19:02 2007 Subject: [Frugalware-git] frugalware-current: lostirc-0.4.6-3-i686 Message-ID: <20070803061901.D648913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fbd2f0206bf341edc7657a7ab8f908d913d95eeb commit fbd2f0206bf341edc7657a7ab8f908d913d95eeb Author: Christian Hamar alias krix Date: Fri Aug 3 08:17:10 2007 +0200 lostirc-0.4.6-3-i686 * Release bump due cairomm diff --git a/source/gnome-extra/lostirc/FrugalBuild b/source/gnome-extra/lostirc/FrugalBuild index 7b51362..025038f 100644 --- a/source/gnome-extra/lostirc/FrugalBuild +++ b/source/gnome-extra/lostirc/FrugalBuild @@ -3,9 +3,9 @@ pkgname=lostirc pkgver=0.4.6 -pkgrel=2 +pkgrel=3 pkgdesc="A simple but functional graphical IRC client." -depends=('atk' 'gtkmm' 'freetype2' 'pango' 'cairomm>=1.2.2') +depends=('atk' 'gtkmm' 'freetype2' 'pango' 'cairomm>=1.4.4') options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Fri Aug 3 09:21:02 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:21:05 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-1.0.1-1-i686 Message-ID: <20070803072102.C61D213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6f100673d53d64e8419b5cf29fbdb9f105052c93 commit 6f100673d53d64e8419b5cf29fbdb9f105052c93 Author: crazy Date: Fri Aug 3 09:20:29 2007 +0200 ivtv-utils-1.0.1-1-i686 * Version bump diff --git a/source/apps-extra/ivtv-utils/FrugalBuild b/source/apps-extra/ivtv-utils/FrugalBuild index 0f2647d..7e0776c 100644 --- a/source/apps-extra/ivtv-utils/FrugalBuild +++ b/source/apps-extra/ivtv-utils/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ivtv-utils branch=1.0.x -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Tools for managing the hardware supported by ivtv driver" url="http://ivtvdriver.org/index.php/Main_Page" @@ -16,7 +16,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://ivtvdriver.org/index.php/Main_Page|grep -m1 'ivtv-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://dl.ivtvdriver.org/ivtv/archive/$branch/ivtv-$pkgver.tar.gz \ http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz) -sha1sums=('ad300f240cac119dff5e308cdda9cad7494883b3' \ +sha1sums=('212c2bb217fda7e3adaf6ff8d2bceabecaa88fbd' \ '68fef52289fed191aac19ce4c0f84fb25740f028') subpkgs=('ivtv-firmware') From crazy at frugalware.org Fri Aug 3 09:22:36 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:22:37 2007 Subject: [Frugalware-git] frugalware-current: perl-net-server-0.97-1-i686 Message-ID: <20070803072236.0DF1213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f0a707273f03eabc1422c5ae4f8749cd8332fd53 commit f0a707273f03eabc1422c5ae4f8749cd8332fd53 Author: crazy Date: Fri Aug 3 09:22:07 2007 +0200 perl-net-server-0.97-1-i686 * Version bump diff --git a/source/devel/perl-net-server/FrugalBuild b/source/devel/perl-net-server/FrugalBuild index aa4efa5..59e989c 100644 --- a/source/devel/perl-net-server/FrugalBuild +++ b/source/devel/perl-net-server/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Net-Server _F_perl_author=R/RH/RHANDOM -pkgver=0.96 +pkgver=0.97 pkgrel=1 pkgdesc="Extensible, general Perl server engine" Finclude perl archs=('i686' 'x86_64') groups=('devel') -sha1sums=('41981121a3305b559b46256b0cf698d5afc31949') +sha1sums=('3c1adddc4e66b15c2973176ef66cac36400b2237') From crazy at frugalware.org Fri Aug 3 09:24:31 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:24:34 2007 Subject: [Frugalware-git] frugalware-current: perl-io-zlib-1.07-1-i686 Message-ID: <20070803072431.97DEB13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a663df55d099a3ffc9454f90b854a761826119ec commit a663df55d099a3ffc9454f90b854a761826119ec Author: crazy Date: Fri Aug 3 09:24:01 2007 +0200 perl-io-zlib-1.07-1-i686 * Version bump diff --git a/source/devel/perl-io-zlib/FrugalBuild b/source/devel/perl-io-zlib/FrugalBuild index c685b0f..75ce626 100644 --- a/source/devel/perl-io-zlib/FrugalBuild +++ b/source/devel/perl-io-zlib/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=IO-Zlib _F_perl_author=T/TO/TOMHUGHES -pkgver=1.05 +pkgver=1.07 pkgdesc="IO:: style interface to Compress::Zlib" Finclude perl pkgrel=1 archs=('i686' 'x86_64') groups=('devel') -sha1sums=('d265abfb95cb47bceb55f46560950267e79f9fd1') +sha1sums=('15ac10b54966f8b87f5ea10463c6342bbdeecc9d') From crazy at frugalware.org Fri Aug 3 09:27:52 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:27:53 2007 Subject: [Frugalware-git] frugalware-current: perl-net-dbus-0.33.5-1-i686 Message-ID: <20070803072752.1BC6613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f69cae8a70659b7c3555abb437413f63e610b520 commit f69cae8a70659b7c3555abb437413f63e610b520 Author: crazy Date: Fri Aug 3 09:27:21 2007 +0200 perl-net-dbus-0.33.5-1-i686 * Version bump diff --git a/source/devel/perl-net-dbus/FrugalBuild b/source/devel/perl-net-dbus/FrugalBuild index 9ad228a..af05b3a 100644 --- a/source/devel/perl-net-dbus/FrugalBuild +++ b/source/devel/perl-net-dbus/FrugalBuild @@ -3,13 +3,13 @@ _F_perl_name=Net-DBus _F_perl_author=D/DA/DANBERR -pkgver=0.33.4 +pkgver=0.33.5 pkgrel=1 pkgdesc="Perl extension for the DBus message system" depends=('perl-xml-twig' 'dbus>=0.93' 'glibc') Finclude perl archs=('i686' 'x86_64') groups=('devel') -sha1sums=('c705a0cd2102948ed4d2867ead794ab279feeaea') +sha1sums=('44d14c42122f392cdd187d19e2c24610acfb79fa') # optimization OK From crazy at frugalware.org Fri Aug 3 09:28:59 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:29:01 2007 Subject: [Frugalware-git] frugalware-current: perl-mailtools-2.00_02-1-i686 Message-ID: <20070803072859.2E8AD13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f84efc15f0416241855bb5c22364433f7fbcc8a4 commit f84efc15f0416241855bb5c22364433f7fbcc8a4 Author: crazy Date: Fri Aug 3 09:28:30 2007 +0200 perl-mailtools-2.00_02-1-i686 * Version bump diff --git a/source/devel-extra/perl-mailtools/FrugalBuild b/source/devel-extra/perl-mailtools/FrugalBuild index 810f22c..7d5c9fc 100644 --- a/source/devel-extra/perl-mailtools/FrugalBuild +++ b/source/devel-extra/perl-mailtools/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=perl-mailtools -pkgver=1.77 +pkgver=2.00_02 pkgrel=1 pkgdesc="Manipulate email in perl programs" url="http://cpan.org/" @@ -29,4 +29,4 @@ build() { # optimalization OK -sha1sums=('32de77a2826e0c7d89c62002ef5cf0d1ba32b23e') +sha1sums=('14dc91f2258f4a001d40cafc5edd9b1f511bc700') From crazy at frugalware.org Fri Aug 3 09:31:27 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:31:30 2007 Subject: [Frugalware-git] frugalware-current: lzma-4.32.0beta4-1-i686 Message-ID: <20070803073127.E1F7013A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c7a953ec8b914c619fb8365e78286de854a640f7 commit c7a953ec8b914c619fb8365e78286de854a640f7 Author: crazy Date: Fri Aug 3 09:30:58 2007 +0200 lzma-4.32.0beta4-1-i686 * Version bump diff --git a/source/apps-extra/lzma/FrugalBuild b/source/apps-extra/lzma/FrugalBuild index e2ca833..2a1f4d6 100644 --- a/source/apps-extra/lzma/FrugalBuild +++ b/source/apps-extra/lzma/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=lzma -pkgver=4.32.0beta3 +pkgver=4.32.0beta4 pkgrel=1 pkgdesc="High compression utility based on LZMA SDK" url="http://tukaani.org/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://tukaani.org/lzma/download|grep -m1 .tar.gz|sed -e 's/.*]lzma-//' -e 's/.tar.gz//'" source=($url/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('ca86955f438b1e874a4a3f1bff28b80bbb3f80eb') +sha1sums=('367fc3ba4e95a1f1b4f8e6d17b6a996ef39adddc') if [ "$CARCH" == "x86_64" ]; then export CFLAGS="$CFLAGS -fPIC" From crazy at frugalware.org Fri Aug 3 09:32:59 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:33:01 2007 Subject: [Frugalware-git] frugalware-current: bluez-hcidump-1.39-1-i686 Message-ID: <20070803073259.7587113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=54dd09770aafcbb407756cd52fe1c2f6ffe308e0 commit 54dd09770aafcbb407756cd52fe1c2f6ffe308e0 Author: crazy Date: Fri Aug 3 09:32:28 2007 +0200 bluez-hcidump-1.39-1-i686 * Version bump diff --git a/source/apps-extra/bluez-hcidump/FrugalBuild b/source/apps-extra/bluez-hcidump/FrugalBuild index 18db4da..aab7340 100644 --- a/source/apps-extra/bluez-hcidump/FrugalBuild +++ b/source/apps-extra/bluez-hcidump/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=bluez-hcidump -pkgver=1.37 +pkgver=1.39 pkgrel=1 pkgdesc="Bluetooth packet analyzer" url="http://www.bluez.org" @@ -11,6 +11,6 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.bluez.org/download.html|grep bluez-hcidump-|sed -n 's/.*bluez-hcidump-\(.*\)\.t.*/\1/; 1 p'" source=(http://bluez.sourceforge.net/download/$pkgname-$pkgver.tar.gz) -sha1sums=('1965857d06b26ba434649c5846363ec34c82b7f3') +sha1sums=('1caac44de2673b98c270780f702efb9d184dcaec') # optimization OK From crazy at frugalware.org Fri Aug 3 09:36:48 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:36:50 2007 Subject: [Frugalware-git] frugalware-current: lighttpd-1.4.16-1-i686 Message-ID: <20070803073648.8116D13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c3548410ea6e4e475d2b6db65651f5036bccffe6 commit c3548410ea6e4e475d2b6db65651f5036bccffe6 Author: crazy Date: Fri Aug 3 09:36:17 2007 +0200 lighttpd-1.4.16-1-i686 * Version bump diff --git a/source/network-extra/lighttpd/FrugalBuild b/source/network-extra/lighttpd/FrugalBuild index e79df26..e3ed116 100644 --- a/source/network-extra/lighttpd/FrugalBuild +++ b/source/network-extra/lighttpd/FrugalBuild @@ -3,27 +3,25 @@ # Contributor: BMH1980 pkgname=lighttpd -pkgver=1.4.15 -pkgrel=2 +pkgver=1.4.16 +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 \ - SA26130.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=('742b567eca011fa5ef2cc506038389a4959eab56' \ +sha1sums=('8f137ff71f629fe24a745c758b72dce24a8669f2' \ '1a1d742bba61f24b42a4aea99623ceabbd345d3e' \ 'f30cb68ad73467a43317afabe0f4a90472df222e' \ 'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \ - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \ - '6af229f0b0699fb64769f269f40b534c6e1fbbeb') + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') build() { From crazy at frugalware.org Fri Aug 3 09:39:16 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:39:18 2007 Subject: [Frugalware-git] frugalware-current: libpcap-0.9.7-1-i686 Message-ID: <20070803073916.9759613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ae27d99c9af13c710b7a27c19e9d0b4b0e39ec3d commit ae27d99c9af13c710b7a27c19e9d0b4b0e39ec3d Author: crazy Date: Fri Aug 3 09:38:44 2007 +0200 libpcap-0.9.7-1-i686 * Version bump diff --git a/source/lib/libpcap/FrugalBuild b/source/lib/libpcap/FrugalBuild index 5c84eeb..340e002 100644 --- a/source/lib/libpcap/FrugalBuild +++ b/source/lib/libpcap/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Shrift pkgname=libpcap -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="Library for tcpdump" url="http://www.tcpdump.org" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') source=($url/release/$pkgname-$pkgver.tar.gz) up2date="lynx -dump $url/release/|grep libpcap-.*gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" Fconfopts="$Fconfopts --enable-yydebug --enable-ipv6" -sha1sums=('e6514fb3b5589e77ebb67501da3bcc12624d6607') +sha1sums=('0e2e494d8a66dd644fff03dcad7887164aef9b0e') # optimization OK From crazy at frugalware.org Fri Aug 3 09:43:50 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 09:43:54 2007 Subject: [Frugalware-git] frugalware-current: tcpdump-3.9.7-1-i686 Message-ID: <20070803074350.9A4F6167800D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=975568971ae537989a5fed15d6ce9595213887aa commit 975568971ae537989a5fed15d6ce9595213887aa Author: crazy Date: Fri Aug 3 09:43:19 2007 +0200 tcpdump-3.9.7-1-i686 * Version bump diff --git a/source/network/tcpdump/FrugalBuild b/source/network/tcpdump/FrugalBuild index f950081..a499916 100644 --- a/source/network/tcpdump/FrugalBuild +++ b/source/network/tcpdump/FrugalBuild @@ -3,17 +3,15 @@ # Contributor: Shrift pkgname=tcpdump -pkgver=3.9.6 -pkgrel=2 +pkgver=3.9.7 +pkgrel=1 pkgdesc="Tcpdump is for dumping traffic on a network" url="http://www.tcpdump.org" -depends=('openssl' 'libpcap>=0.9.6') +depends=('openssl' 'libpcap>=0.9.7') groups=('network') archs=('i686' 'x86_64') -source=($url/release/$pkgname-$pkgver.tar.gz CVE-2007-1218.patch CVE-2007-3798.patch) +source=($url/release/$pkgname-$pkgver.tar.gz) up2date="lynx -dump $url/release/|grep 'tcpdump-\(.*\).tar.gz'|Flasttar" Fconfopts="$Fconfopts --enable-ipv6" -sha1sums=('a07907268c200f90a8b7c5dbc6a1427917cc1058' \ - '329385e248a9e28793095caa618fbd7826cd937f' \ - 'e347e948bf47994c770d35d3a5d1753e723b51e3') +sha1sums=('5d2a95f0de1cbae70ba01c64f9a2c0fac0183dba') # optimization OK From krics at linuxforum.hu Fri Aug 3 09:49:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 09:49:13 2007 Subject: [Frugalware-git] frugalware-current: libetpan-0.50-1-i686 Message-ID: <20070803074912.303B8167800D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1439201312a5f4579c6871ab843dc48d34f5ed4f commit 1439201312a5f4579c6871ab843dc48d34f5ed4f Author: Christian Hamar alias krix Date: Fri Aug 3 09:47:32 2007 +0200 libetpan-0.50-1-i686 * Version bump * Added a fix for build from SVN backport diff --git a/source/lib-extra/libetpan/FrugalBuild b/source/lib-extra/libetpan/FrugalBuild index 3a87b66..6ed222c 100644 --- a/source/lib-extra/libetpan/FrugalBuild +++ b/source/lib-extra/libetpan/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: free-zombie pkgname=libetpan -pkgver=0.49 -pkgrel=2 +pkgver=0.50 +pkgrel=1 pkgdesc="A mail library" url="http://libetpan.sourceforge.net/" depends=('openssl' 'db>=4.6.18' 'cyrus-sasl' 'glibc') @@ -12,7 +12,10 @@ groups=('lib-extra') archs=('x86_64' 'i686') _F_sourceforge_broken_up2date=1 Finclude sourceforge -sha1sums=('857fb35678aed2b7a67bea37907c0f4faec6f17f') +# Need to remove on next upstream. THis buildfix from SVN backport. -krix +source=(${source[@]} buildfix_backport.patch) +sha1sums=('6bcfe4dc78a563169dac8fac17afde8f67032303' \ + '10595691b0ca580219a39f4a6aa3f1ed7b50b8d8') build() { diff --git a/source/lib-extra/libetpan/buildfix_backport.patch b/source/lib-extra/libetpan/buildfix_backport.patch new file mode 100644 index 0000000..193822a --- /dev/null +++ b/source/lib-extra/libetpan/buildfix_backport.patch @@ -0,0 +1,26 @@ +diff -Naur libetpan-0.50.orig/src/low-level/smtp/mailsmtp.c libetpan-0.50/src/low-level/smtp/mailsmtp.c +--- libetpan-0.50.orig/src/low-level/smtp/mailsmtp.c 2007-08-03 09:36:30.000000000 +0200 ++++ libetpan-0.50/src/low-level/smtp/mailsmtp.c 2007-08-03 09:36:23.000000000 +0200 +@@ -32,7 +32,7 @@ + */ + + /* +- * $Id: mailsmtp.c,v 1.29 2007/07/21 18:44:40 hoa Exp $ ++ * $Id: mailsmtp.c,v 1.30 2007/07/25 16:28:33 hoa Exp $ + */ + + #ifdef HAVE_CONFIG_H +@@ -1257,11 +1257,11 @@ + unsigned int max_decoded; + char * p; + +- p = strchr(f->pop3_response, '\r'); ++ p = strchr(session->response, '\r'); + if (p != NULL) { + * p = '\0'; + } +- p = strchr(f->pop3_response, '\n'); ++ p = strchr(session->response, '\n'); + if (p != NULL) { + * p = '\0'; + } From vmiklos at frugalware.org Fri Aug 3 09:54:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 09:54:38 2007 Subject: [Frugalware-git] homepage-ng: FSA236-vim Message-ID: <20070803075436.D50FE167800D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=d857821bfcfc23b721377a22d6b603cda7c75cf9 commit d857821bfcfc23b721377a22d6b603cda7c75cf9 Author: VMiklos Date: Fri Aug 3 09:54:30 2007 +0200 FSA236-vim diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index e1c9b3f..b4b4efd 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 236 + 2007-08-03 + vmiklos + vim + 7.0-4terminus1 + 7.0-4terminus2 + http://bugs.frugalware.org/task/2292 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2953 + Secunia Research has discovered a vulnerability in Vim, which can be exploited by malicious people to compromise a vulnerable system. + A format string error in the "helptags_one()" function in src/ex_cmds.c when running the "helptags" command can be exploited to execute arbitrary code via specially crafted help files. + Successful exploitation requires that the user is tricked into running "helptags" on malicious data. + + 235 2007-08-02 vmiklos From vmiklos at frugalware.org Fri Aug 3 10:09:14 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 10:09:16 2007 Subject: [Frugalware-git] frugalware-current: grep-2.5.3-1-i686 Message-ID: <20070803080914.B172913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7a053608589e58bd44a62cac6ce7d8cbcf9eab37 commit 7a053608589e58bd44a62cac6ce7d8cbcf9eab37 Author: VMiklos Date: Fri Aug 3 10:08:59 2007 +0200 grep-2.5.3-1-i686 version bump diff --git a/source/base/grep/FrugalBuild b/source/base/grep/FrugalBuild index 2142302..73cfb61 100644 --- a/source/base/grep/FrugalBuild +++ b/source/base/grep/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: VMiklos pkgname=grep -pkgver=2.5.1 -extrapkgver=a -pkgrel=4 +pkgver=2.5.3 +extrapkgver= +pkgrel=1 pkgdesc="Print lines matching a pattern" url="http://www.gnu.org/software/grep/grep.html" depends=('pcre') @@ -12,7 +12,7 @@ groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://ftp.gnu.org/pub/gnu/grep/?M=D'|grep tar.gz$|sed -n 's/.*p-\(.*\).tar.gz$/\1/;s/$extrapkgver//;1 p'" source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver$extrapkgver.tar.gz) -sha1sums=('494f2518e7f8bb039423e3159e4d41a0c9b34217') +sha1sums=('8b1ac61470b02bcdac67a5de816d9d51f1a603bf') build() { From crazy at frugalware.org Fri Aug 3 10:35:46 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 10:35:47 2007 Subject: [Frugalware-git] frugalware-current: thunderbird-2.0.0.6-1-i686 Message-ID: <20070803083546.1EEDC13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=683638cd3736a106462c903388df974cbfdd64b3 commit 683638cd3736a106462c903388df974cbfdd64b3 Author: crazy Date: Fri Aug 3 10:35:01 2007 +0200 thunderbird-2.0.0.6-1-i686 * Version bump * closes #2304 in -current diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index de5349b..d9759e4 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Krisztian VASAS pkgname=thunderbird -pkgver=2.0.0.5 +pkgver=2.0.0.6 pkgrel=1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" From vmiklos at frugalware.org Fri Aug 3 10:45:18 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 10:45:27 2007 Subject: [Frugalware-git] frugalware-current: tcpdump-3.9.7-1-i686 Message-ID: <20070803084518.7039513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ec7940dfaca0930de3e6d45af3de74c983a5d787 commit ec7940dfaca0930de3e6d45af3de74c983a5d787 Author: VMiklos Date: Fri Aug 3 10:44:44 2007 +0200 tcpdump-3.9.7-1-i686 remove no longer used patches diff --git a/source/network/tcpdump/CVE-2007-1218.patch b/source/network/tcpdump/CVE-2007-1218.patch deleted file mode 100644 index b7ff4b9..0000000 --- a/source/network/tcpdump/CVE-2007-1218.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur tcpdump-3.9.5/print-802_11.c tcpdump-3.9.5-p/print-802_11.c ---- tcpdump-3.9.5/print-802_11.c 2006-06-14 00:25:43.000000000 +0200 -+++ tcpdump-3.9.5-p/print-802_11.c 2007-03-08 20:03:40.000000000 +0100 -@@ -264,7 +264,7 @@ - - if (pbody->tim.length <= 3) - break; -- if (pbody->rates.length > sizeof pbody->tim.bitmap) -+ if (pbody->tim.length - 3 > sizeof pbody->tim.bitmap) - return; - if (!TTEST2(*(p + offset), pbody->tim.length - 3)) - return; diff --git a/source/network/tcpdump/CVE-2007-3798.patch b/source/network/tcpdump/CVE-2007-3798.patch deleted file mode 100644 index fd4c2c3..0000000 --- a/source/network/tcpdump/CVE-2007-3798.patch +++ /dev/null @@ -1,98 +0,0 @@ -=================================================================== -RCS file: /tcpdump/master/tcpdump/print-bgp.c,v -retrieving revision 1.91.2.11 -retrieving revision 1.91.2.12 -diff -u -r1.91.2.11 -r1.91.2.12 ---- tcpdump/print-bgp.c 2007/02/26 13:31:33 1.91.2.11 -+++ tcpdump/print-bgp.c 2007/07/14 22:26:35 1.91.2.12 -@@ -36,7 +36,7 @@ - - #ifndef lint - static const char rcsid[] _U_ = -- "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.9 2006/02/02 12:36:46 hannes Exp $"; -+ "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.12 2007/07/14 22:26:35 guy Exp $"; - #endif - - #include -@@ -609,6 +609,26 @@ - return -2; - } - -+/* -+ * As I remember, some versions of systems have an snprintf() that -+ * returns -1 if the buffer would have overflowed. If the return -+ * value is negative, set buflen to 0, to indicate that we've filled -+ * the buffer up. -+ * -+ * If the return value is greater than buflen, that means that -+ * the buffer would have overflowed; again, set buflen to 0 in -+ * that case. -+ */ -+#define UPDATE_BUF_BUFLEN(buf, buflen, strlen) \ -+ if (strlen<0) \ -+ buflen=0; \ -+ else if ((u_int)strlen>buflen) \ -+ buflen=0; \ -+ else { \ -+ buflen-=strlen; \ -+ buf+=strlen; \ -+ } -+ - static int - decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen) - { -@@ -619,11 +639,13 @@ - tlen=plen; - pptr+=2; - TCHECK2(pptr[0],15); -+ buf[0]='\0'; - strlen=snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u", - bgp_vpn_rd_print(pptr), - EXTRACT_16BITS(pptr+8), - EXTRACT_16BITS(pptr+10), - EXTRACT_24BITS(pptr+12)>>4); /* the label is offsetted by 4 bits so lets shift it right */ -+ UPDATE_BUF_BUFLEN(buf, buflen, strlen); - pptr+=15; - tlen-=15; - -@@ -639,23 +661,32 @@ - - switch(tlv_type) { - case 1: -- strlen+=snprintf(buf+strlen,buflen-strlen, "\n\t\tcircuit status vector (%u) length: %u: 0x", -- tlv_type, -- tlv_len); -+ if (buflen!=0) { -+ strlen=snprintf(buf,buflen, "\n\t\tcircuit status vector (%u) length: %u: 0x", -+ tlv_type, -+ tlv_len); -+ UPDATE_BUF_BUFLEN(buf, buflen, strlen); -+ } - ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */ - while (ttlv_len>0) { - TCHECK(pptr[0]); -- strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++); -+ if (buflen!=0) { -+ strlen=snprintf(buf,buflen, "%02x",*pptr++); -+ UPDATE_BUF_BUFLEN(buf, buflen, strlen); -+ } - ttlv_len--; - } - break; - default: -- snprintf(buf+strlen,buflen-strlen, "\n\t\tunknown TLV #%u, length: %u", -- tlv_type, -- tlv_len); -+ if (buflen!=0) { -+ strlen=snprintf(buf,buflen, "\n\t\tunknown TLV #%u, length: %u", -+ tlv_type, -+ tlv_len); -+ UPDATE_BUF_BUFLEN(buf, buflen, strlen); -+ } - break; - } -- tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it tright */ -+ tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it right */ - } - return plen+2; - From vmiklos at frugalware.org Fri Aug 3 10:45:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 10:45:27 2007 Subject: [Frugalware-git] frugalware-current: lighttpd-1.4.16-1-i686 Message-ID: <20070803084523.E902513A4028@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=73f225cfcafcdb7265ebd822b630e389d516ee16 commit 73f225cfcafcdb7265ebd822b630e389d516ee16 Author: VMiklos Date: Fri Aug 3 10:45:14 2007 +0200 lighttpd-1.4.16-1-i686 remove unused patch diff --git a/source/network-extra/lighttpd/SA26130.patch b/source/network-extra/lighttpd/SA26130.patch deleted file mode 100644 index c242f9c..0000000 --- a/source/network-extra/lighttpd/SA26130.patch +++ /dev/null @@ -1,483 +0,0 @@ -diff -Naur lighttpd-1.4.15/NEWS lighttpd-1.4.15-sec/NEWS ---- lighttpd-1.4.15/NEWS 2007-04-13 22:50:48.000000000 +0200 -+++ lighttpd-1.4.15-sec/NEWS 2007-07-21 13:19:27.000000000 +0200 -@@ -8,12 +8,21 @@ - * fixed broken Set-Cookie headers - - - 1.4.14 - 2007-04-13 -+ * fixed accepting more connections then requested (#1216) - - * fix crash if gethostbyaddr() failed on redirect [1718] - * properly handle 206 responses generated by *cgi scripts. (#755) [1716] - * added HTTPS=on to the environment of cgi scripts (#861) [1684] - * fix handling of 303 (#1045) [1678] -+ * fixed mem-leak in mod_auth (reported by Stefan Esser) -+ * fixed crash with md5-sess and cnonce not set in mod_auth (reported by Stefan Esser) -+ * fixed missing check for base64 encoded string in mod_auth and Basic auth -+ (reported by Stefan Esser) -+ * fixed possible crash in Auth-Digest header parser on trailing WS in -+ mod_auth (reported by Stefan Esser) - * made the configure check for lua more portable [1677] -+ * fixed crash on 32bit archs when debug-msgs are printed in mod_scgi, mod_fastcgi -+ and mod_webdav (#1263) - * added mod_extforward module [1665] - * references to the fam stat cache engine should be conditional (#1039) [1664] - * fix http 500 errors (colin.stephen/at/o2.com) #1041 [1663] -diff -Naur lighttpd-1.4.15/src/connections.c lighttpd-1.4.15-sec/src/connections.c ---- lighttpd-1.4.15/src/connections.c 2007-04-13 17:26:31.000000000 +0200 -+++ lighttpd-1.4.15-sec/src/connections.c 2007-07-21 13:19:01.000000000 +0200 -@@ -1252,6 +1252,16 @@ - socklen_t cnt_len; - /* accept it and register the fd */ - -+ /** -+ * check if we can still open a new connections -+ * -+ * see #1216 -+ */ -+ -+ if (srv->conns->used >= srv->max_conns) { -+ return NULL; -+ } -+ - cnt_len = sizeof(cnt_addr); - - if (-1 == (cnt = accept(srv_socket->fd, (struct sockaddr *) &cnt_addr, &cnt_len))) { -@@ -1265,6 +1275,9 @@ - case ECONNABORTED: /* this is a FreeBSD thingy */ - /* we were stopped _after_ we had a connection */ - break; -+ case EMFILE: -+ /* out of fds */ -+ break; - default: - log_error_write(srv, __FILE__, __LINE__, "ssd", "accept failed:", strerror(errno), errno); - } -diff -Naur lighttpd-1.4.15/src/http_auth.c lighttpd-1.4.15-sec/src/http_auth.c ---- lighttpd-1.4.15/src/http_auth.c 2007-04-13 17:26:31.000000000 +0200 -+++ lighttpd-1.4.15-sec/src/http_auth.c 2007-07-21 13:18:47.000000000 +0200 -@@ -830,7 +830,13 @@ - - username = buffer_init(); - -- base64_decode(username, realm_str); -+ if (!base64_decode(username, realm_str)) { -+ buffer_free(username); -+ -+ log_error_write(srv, __FILE__, __LINE__, "sb", "decodeing base64-string failed", username); -+ -+ return 0; -+ } - - /* r2 == user:password */ - if (NULL == (pw = strchr(username->ptr, ':'))) { -@@ -967,7 +973,7 @@ - for (c = b->ptr; *c; c++) { - /* skip whitespaces */ - while (*c == ' ' || *c == '\t') c++; -- if (!c) break; -+ if (!*c) break; - - for (i = 0; dkv[i].key; i++) { - if ((0 == strncmp(c, dkv[i].key, dkv[i].key_len))) { -@@ -1016,6 +1022,21 @@ - - log_error_write(srv, __FILE__, __LINE__, "s", - "digest: missing field"); -+ -+ buffer_free(b); -+ return -1; -+ } -+ -+ /** -+ * protect the md5-sess against missing cnonce and nonce -+ */ -+ if (algorithm && -+ 0 == strcasecmp(algorithm, "md5-sess") && -+ (!nonce || !cnonce)) { -+ log_error_write(srv, __FILE__, __LINE__, "s", -+ "digest: (md5-sess: missing field"); -+ -+ buffer_free(b); - return -1; - } - -diff -Naur lighttpd-1.4.15/src/mod_access.c lighttpd-1.4.15-sec/src/mod_access.c ---- lighttpd-1.4.15/src/mod_access.c 2007-02-08 17:34:46.000000000 +0100 -+++ lighttpd-1.4.15-sec/src/mod_access.c 2007-07-21 13:19:17.000000000 +0200 -@@ -111,6 +111,15 @@ - } - #undef PATCH - -+/** -+ * URI handler -+ * -+ * we will get called twice: -+ * - after the clean up of the URL and -+ * - after the pathinfo checks are done -+ * -+ * this handles the issue of trailing slashes -+ */ - URIHANDLER_FUNC(mod_access_uri_handler) { - plugin_data *p = p_d; - int s_len; -@@ -122,28 +131,41 @@ - - s_len = con->uri.path->used - 1; - -+ if (con->conf.log_request_handling) { -+ log_error_write(srv, __FILE__, __LINE__, "s", -+ "-- mod_access_uri_handler called"); -+ } -+ - for (k = 0; k < p->conf.access_deny->used; k++) { - data_string *ds = (data_string *)p->conf.access_deny->data[k]; - int ct_len = ds->value->used - 1; -+ int denied = 0; - -- if (ct_len > s_len) continue; - -+ if (ct_len > s_len) continue; - if (ds->value->used == 0) continue; - - /* if we have a case-insensitive FS we have to lower-case the URI here too */ - - if (con->conf.force_lowercase_filenames) { - if (0 == strncasecmp(con->uri.path->ptr + s_len - ct_len, ds->value->ptr, ct_len)) { -- con->http_status = 403; -- -- return HANDLER_FINISHED; -+ denied = 1; - } - } else { - if (0 == strncmp(con->uri.path->ptr + s_len - ct_len, ds->value->ptr, ct_len)) { -- con->http_status = 403; -+ denied = 1; -+ } -+ } - -- return HANDLER_FINISHED; -+ if (denied) { -+ con->http_status = 403; -+ -+ if (con->conf.log_request_handling) { -+ log_error_write(srv, __FILE__, __LINE__, "sb", -+ "url denied as we match:", ds->value); - } -+ -+ return HANDLER_FINISHED; - } - } - -@@ -158,7 +180,8 @@ - - p->init = mod_access_init; - p->set_defaults = mod_access_set_defaults; -- p->handle_uri_clean = mod_access_uri_handler; -+ p->handle_uri_clean = mod_access_uri_handler; -+ p->handle_subrequest_start = mod_access_uri_handler; - p->cleanup = mod_access_free; - - p->data = NULL; -diff -Naur lighttpd-1.4.15/src/mod_fastcgi.c lighttpd-1.4.15-sec/src/mod_fastcgi.c ---- lighttpd-1.4.15/src/mod_fastcgi.c 2007-04-13 17:26:31.000000000 +0200 -+++ lighttpd-1.4.15-sec/src/mod_fastcgi.c 2007-07-21 13:19:27.000000000 +0200 -@@ -2964,7 +2964,7 @@ - * - */ - -- log_error_write(srv, __FILE__, __LINE__, "ssdsd", -+ log_error_write(srv, __FILE__, __LINE__, "ssosd", - "[REPORT ME] connection was dropped after accept(). reconnect() denied:", - "write-offset:", hctx->wb->bytes_out, - "reconnect attempts:", hctx->reconnects); -diff -Naur lighttpd-1.4.15/src/mod_scgi.c lighttpd-1.4.15-sec/src/mod_scgi.c ---- lighttpd-1.4.15/src/mod_scgi.c 2007-02-08 17:34:45.000000000 +0100 -+++ lighttpd-1.4.15-sec/src/mod_scgi.c 2007-07-21 13:19:27.000000000 +0200 -@@ -2286,7 +2286,7 @@ - * - */ - -- log_error_write(srv, __FILE__, __LINE__, "ssdsd", -+ log_error_write(srv, __FILE__, __LINE__, "ssosd", - "[REPORT ME] connection was dropped after accept(). reconnect() denied:", - "write-offset:", hctx->wb->bytes_out, - "reconnect attempts:", hctx->reconnects); -@@ -2536,7 +2536,7 @@ - return HANDLER_WAIT_FOR_FD; - } - -- log_error_write(srv, __FILE__, __LINE__, "sdsdsd", -+ log_error_write(srv, __FILE__, __LINE__, "sosdsd", - "response not sent, request sent:", hctx->wb->bytes_out, - "connection-fd:", con->fd, - "fcgi-fd:", hctx->fd); -diff -Naur lighttpd-1.4.15/src/mod_webdav.c lighttpd-1.4.15-sec/src/mod_webdav.c ---- lighttpd-1.4.15/src/mod_webdav.c 2007-04-13 17:26:31.000000000 +0200 -+++ lighttpd-1.4.15-sec/src/mod_webdav.c 2007-07-21 13:19:27.000000000 +0200 -@@ -1035,7 +1035,7 @@ - } - - if (XML_ERR_OK != (err = xmlParseChunk(ctxt, c->file.mmap.start + c->offset, weHave, 0))) { -- log_error_write(srv, __FILE__, __LINE__, "sddd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err); -+ log_error_write(srv, __FILE__, __LINE__, "sodd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err); - } - - c->offset += weHave; -@@ -1053,7 +1053,7 @@ - } - - if (XML_ERR_OK != (err = xmlParseChunk(ctxt, c->mem->ptr + c->offset, weHave, 0))) { -- log_error_write(srv, __FILE__, __LINE__, "sddd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err); -+ log_error_write(srv, __FILE__, __LINE__, "sodd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err); - } - - c->offset += weHave; -diff -Naur lighttpd-1.4.15/src/request.c lighttpd-1.4.15-sec/src/request.c ---- lighttpd-1.4.15/src/request.c 2007-04-13 17:26:31.000000000 +0200 -+++ lighttpd-1.4.15-sec/src/request.c 2007-07-21 13:17:56.000000000 +0200 -@@ -284,8 +284,6 @@ - - int done = 0; - -- data_string *ds = NULL; -- - /* - * Request: "^(GET|POST|HEAD) ([^ ]+(\\?[^ ]+|)) (HTTP/1\\.[01])$" - * Option : "^([-a-zA-Z]+): (.+)$" -@@ -715,12 +713,24 @@ - switch(*cur) { - case '\r': - if (con->parse_request->ptr[i+1] == '\n') { -+ data_string *ds = NULL; -+ - /* End of Headerline */ - con->parse_request->ptr[i] = '\0'; - con->parse_request->ptr[i+1] = '\0'; - - if (in_folding) { -- if (!ds) { -+ buffer *key_b; -+ /** -+ * we use a evil hack to handle the line-folding -+ * -+ * As array_insert_unique() deletes 'ds' in the case of a duplicate -+ * ds points somewhere and we get a evil crash. As a solution we keep the old -+ * "key" and get the current value from the hash and append us -+ * -+ * */ -+ -+ if (!key || !key_len) { - /* 400 */ - - if (srv->srvconf.log_request_header_on_error) { -@@ -737,7 +747,15 @@ - con->response.keep_alive = 0; - return 0; - } -- buffer_append_string(ds->value, value); -+ -+ key_b = buffer_init(); -+ buffer_copy_string_len(key_b, key, key_len); -+ -+ if (NULL != (ds = (data_string *)array_get_element(con->request.headers, key_b->ptr))) { -+ buffer_append_string(ds->value, value); -+ } -+ -+ buffer_free(key_b); - } else { - int s_len; - key = con->parse_request->ptr + first; -@@ -969,7 +987,12 @@ - first = i+1; - is_key = 1; - value = 0; -- key_len = 0; -+#if 0 -+ /** -+ * for Bug 1230 keep the key_len a live -+ */ -+ key_len = 0; -+#endif - in_folding = 0; - } else { - if (srv->srvconf.log_request_header_on_error) { -diff -Naur lighttpd-1.4.15/src/server.c lighttpd-1.4.15-sec/src/server.c ---- lighttpd-1.4.15/src/server.c 2007-04-13 17:26:31.000000000 +0200 -+++ lighttpd-1.4.15-sec/src/server.c 2007-07-21 13:19:01.000000000 +0200 -@@ -775,6 +775,22 @@ - return -1; - } - -+ /** -+ * we are not root can can't increase the fd-limit, but we can reduce it -+ */ -+ if (srv->srvconf.max_fds && srv->srvconf.max_fds < rlim.rlim_cur) { -+ /* set rlimits */ -+ -+ rlim.rlim_cur = srv->srvconf.max_fds; -+ -+ if (0 != setrlimit(RLIMIT_NOFILE, &rlim)) { -+ log_error_write(srv, __FILE__, __LINE__, -+ "ss", "couldn't set 'max filedescriptors'", -+ strerror(errno)); -+ return -1; -+ } -+ } -+ - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { - srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; - } else { -diff -Naur lighttpd-1.4.15/tests/core-request.t lighttpd-1.4.15-sec/tests/core-request.t ---- lighttpd-1.4.15/tests/core-request.t 2007-02-08 17:34:47.000000000 +0100 -+++ lighttpd-1.4.15-sec/tests/core-request.t 2007-07-21 13:17:56.000000000 +0200 -@@ -8,7 +8,7 @@ - - use strict; - use IO::Socket; --use Test::More tests => 33; -+use Test::More tests => 36; - use LightyTest; - - my $tf = LightyTest->new(); -@@ -273,6 +273,38 @@ - $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; - ok($tf->handle_http($t) == 0, 'uppercase filenames'); - -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; -+ok($tf->handle_http($t) == 0, '#1209 - duplicate headers with line-wrapping'); -+ -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; -+ok($tf->handle_http($t) == 0, '#1209 - duplicate headers with line-wrapping - test 2'); -+ -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; -+ok($tf->handle_http($t) == 0, '#1209 - duplicate headers with line-wrapping - test 3'); -+ -+ -+ - - ok($tf->stop_proc == 0, "Stopping lighttpd"); - -diff -Naur lighttpd-1.4.15/tests/docroot/www/Makefile.am lighttpd-1.4.15-sec/tests/docroot/www/Makefile.am ---- lighttpd-1.4.15/tests/docroot/www/Makefile.am 2007-02-08 17:34:47.000000000 +0100 -+++ lighttpd-1.4.15-sec/tests/docroot/www/Makefile.am 2007-07-21 13:19:17.000000000 +0200 -@@ -1,5 +1,5 @@ - EXTRA_DIST=cgi.php cgi.pl dummydir index.html index.txt phpinfo.php \ - redirect.php cgi-pathinfo.pl get-env.php get-server-env.php \ - nph-status.pl prefix.fcgi get-header.pl ssi.shtml get-post-len.pl \ -- exec-date.shtml -+ exec-date.shtml index.html~ - SUBDIRS=go indexfile expire -diff -Naur lighttpd-1.4.15/tests/mod-access.t lighttpd-1.4.15-sec/tests/mod-access.t ---- lighttpd-1.4.15/tests/mod-access.t 2007-02-08 17:34:47.000000000 +0100 -+++ lighttpd-1.4.15-sec/tests/mod-access.t 2007-07-21 13:19:17.000000000 +0200 -@@ -8,7 +8,7 @@ - - use strict; - use IO::Socket; --use Test::More tests => 3; -+use Test::More tests => 4; - use LightyTest; - - my $tf = LightyTest->new(); -@@ -23,5 +23,12 @@ - $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ]; - ok($tf->handle_http($t) == 0, 'forbid access to ...~'); - -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ]; -+ok($tf->handle_http($t) == 0, '#1230 - forbid access to ...~ - trailing slash'); -+ - ok($tf->stop_proc == 0, "Stopping lighttpd"); - -diff -Naur lighttpd-1.4.15/tests/mod-auth.t lighttpd-1.4.15-sec/tests/mod-auth.t ---- lighttpd-1.4.15/tests/mod-auth.t 2007-02-08 17:34:47.000000000 +0100 -+++ lighttpd-1.4.15-sec/tests/mod-auth.t 2007-07-21 13:18:47.000000000 +0200 -@@ -8,7 +8,7 @@ - - use strict; - use IO::Socket; --use Test::More tests => 10; -+use Test::More tests => 13; - use LightyTest; - - my $tf = LightyTest->new(); -@@ -93,6 +93,43 @@ - $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 400 } ]; - ok($tf->handle_http($t) == 0, 'Digest-Auth: missing nc (noncecount instead), no crash'); - -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; -+ok($tf->handle_http($t) == 0, 'Basic-Auth: Invalid Base64'); -+ -+ -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; -+ok($tf->handle_http($t) == 0, 'Digest-Auth: md5-sess + missing cnonce'); -+ -+$t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; -+ok($tf->handle_http($t) == 0, 'Digest-Auth: trailing WS'); -+ - - - ok($tf->stop_proc == 0, "Stopping lighttpd"); -diff -Naur lighttpd-1.4.15/tests/prepare.sh lighttpd-1.4.15-sec/tests/prepare.sh ---- lighttpd-1.4.15/tests/prepare.sh 2007-02-08 17:34:48.000000000 +0100 -+++ lighttpd-1.4.15-sec/tests/prepare.sh 2007-07-21 13:19:17.000000000 +0200 -@@ -25,6 +25,7 @@ - # copy everything into the right places - cp $srcdir/docroot/www/*.html \ - $srcdir/docroot/www/*.php \ -+ $srcdir/docroot/www/*.html~ \ - $srcdir/docroot/www/*.pl \ - $srcdir/docroot/www/*.fcgi \ - $srcdir/docroot/www/*.shtml \ From krics at linuxforum.hu Fri Aug 3 10:55:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 10:55:48 2007 Subject: [Frugalware-git] frugalware-current: mksh-R30-1-i686 Message-ID: <20070803085547.B2A6913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=72ee7b2f72faee7c7b61031d78ccf13dfeaf3bb8 commit 72ee7b2f72faee7c7b61031d78ccf13dfeaf3bb8 Author: Christian Hamar alias krix Date: Fri Aug 3 10:54:18 2007 +0200 mksh-R30-1-i686 * Version bump diff --git a/source/apps-extra/mksh/FrugalBuild b/source/apps-extra/mksh/FrugalBuild index 2503a68..2ca9efb 100644 --- a/source/apps-extra/mksh/FrugalBuild +++ b/source/apps-extra/mksh/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DNAku pkgname=mksh -pkgver=R29g +pkgver=R30 pkgrel=1 pkgdesc="The MirOS KornShell" url="http://mirbsd.de/mksh" @@ -26,5 +26,5 @@ build() { Ffilerel mksh.1 /usr/man/man1/mksh.1 } -sha1sums=('e4c01e53ede31e560fe164842d0a44bf516dc074') +sha1sums=('2784ffb60e53d0739b06512f1642d867ccd23319') # optimization OK From krics at linuxforum.hu Fri Aug 3 11:06:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 11:06:26 2007 Subject: [Frugalware-git] frugalware-current: gnome-themes-extras-2.19.6-1-i686 Message-ID: <20070803090621.DC95613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b40a98796bdbc6135de674127034d22eab9619fe commit b40a98796bdbc6135de674127034d22eab9619fe Author: Christian Hamar alias krix Date: Fri Aug 3 11:04:59 2007 +0200 gnome-themes-extras-2.19.6-1-i686 * Version bump diff --git a/source/gnome-extra/gnome-themes-extras/FrugalBuild b/source/gnome-extra/gnome-themes-extras/FrugalBuild index c44a843..a557d2e 100644 --- a/source/gnome-extra/gnome-themes-extras/FrugalBuild +++ b/source/gnome-extra/gnome-themes-extras/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-themes-extras -pkgver=0.9.0 +pkgver=2.19.6 pkgrel=1 pkgdesc="Extra data files for the GNOME games" url="http://www.gnome.org/" depends=('gnome-themes') -makedepends=('perl-xml-simple') +makedepends=('perl-xml-simple' 'icon-naming-utils') groups=('gnome-extra') archs=('x86_64' 'i686') _F_gnome_devel="y" Finclude gnome -sha1sums=('0f6006a25e52f49fdb2bc6537bd2915b7d6d1e0f') +sha1sums=('5a9fd4e51dab4e096d2ed7491e3a9382074187db') From priyank at frugalware.org Fri Aug 3 11:11:35 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 11:11:44 2007 Subject: [Frugalware-git] frugalware-current: gogh-0.1.2.1-1-i686 Message-ID: <20070803091135.9DD8213A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a9df51cc7a33380499af078c0dfa2208254bec59 commit a9df51cc7a33380499af078c0dfa2208254bec59 Author: Priyank Date: Fri Aug 3 14:36:04 2007 +0530 gogh-0.1.2.1-1-i686 * Version bump diff --git a/source/gnome-extra/gogh/FrugalBuild b/source/gnome-extra/gogh/FrugalBuild index dd43af9..16fd567 100644 --- a/source/gnome-extra/gogh/FrugalBuild +++ b/source/gnome-extra/gogh/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=gogh -pkgver=0.1.2 +pkgver=0.1.2.1 pkgrel=1 pkgdesc="Gogh is a GNU/Linux bitmap graphics editor." url="http://goghproject.com/" @@ -16,7 +16,7 @@ _F_desktop_icon="gogh.png" _F_desktop_categories="Graphics;VectorGraphics;GTK;" _F_cd_path="${pkgname/g/G}-$pkgver" Finclude python -sha1sums=('f1601599bbd88dd1a6031a4e027e72f2cb1ffd76' \ +sha1sums=('cb08611d180a431c159e566095f80d15a9467303' \ 'de14ef7f2b3a1b1960dcfd3f88783c43ac85372f') build() From krics at linuxforum.hu Fri Aug 3 11:26:11 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Aug 3 11:26:13 2007 Subject: [Frugalware-git] frugalware-current: graphviz-2.14-1-i686 Message-ID: <20070803092611.7ADEB13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d2339b6c16d5532382c427a8d27ef9e3ddc91c33 commit d2339b6c16d5532382c427a8d27ef9e3ddc91c33 Author: Christian Hamar alias krix Date: Fri Aug 3 11:24:41 2007 +0200 graphviz-2.14-1-i686 * Version bump diff --git a/source/xapps-extra/graphviz/FrugalBuild b/source/xapps-extra/graphviz/FrugalBuild index 1bf9213..2440232 100644 --- a/source/xapps-extra/graphviz/FrugalBuild +++ b/source/xapps-extra/graphviz/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=graphviz -pkgver=2.12 +pkgver=2.14 pkgrel=1 pkgdesc="Open Source Graph Visualization Software" url="http://www.graphviz.org/" @@ -13,7 +13,7 @@ archs=('x86_64' 'i686') up2date="lynx -dump http://www.graphviz.org/pub/graphviz/ARCHIVE/|grep 'graphviz-[0-9\.]*.tar.gz$'|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$pkgname-$pkgver.tar.gz) install=$pkgname.install -sha1sums=('aa48a926395a57c6c7e1e755b9432a29461538e3') +sha1sums=('685cbbc3d2038d3c214ed6c4d66fb9b8354341dc') build() { From crazy at frugalware.org Fri Aug 3 11:39:40 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 11:39:42 2007 Subject: [Frugalware-git] frugalware-current: wine-0.9.42-1-i686 Message-ID: <20070803093940.7D1C913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=30765584798148a54deba375516a20dcd6e9f5e7 commit 30765584798148a54deba375516a20dcd6e9f5e7 Author: crazy Date: Fri Aug 3 11:38:55 2007 +0200 wine-0.9.42-1-i686 * Version bump diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild index a3b0993..8fb64de 100644 --- a/source/xapps/wine/FrugalBuild +++ b/source/xapps/wine/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=wine -pkgver=0.9.41 +pkgver=0.9.42 pkgrel=1 pkgdesc="An Open Source implementation of the Windows API on top of X and Unix" _F_sourceforge_ext=".tar.bz2" @@ -30,7 +30,7 @@ build() Frcd2 } -sha1sums=('afe78726e9dbc50bc1161dcb59587c22954ffc39' \ +sha1sums=('6de5fd2270034915bc86ef61bb96480d1c357545' \ 'a9c70a49cef90cf60c2e90e63753858387f7117a' \ 'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \ '8b0f7b52885c8d78ba3096a16e9caff60ffe624f') From crazy at frugalware.org Fri Aug 3 11:47:16 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 11:47:18 2007 Subject: [Frugalware-git] frugalware-current: msmtp-1.4.13-1-i686 Message-ID: <20070803094716.5BBA913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5e9937de342f44be02aab4884cbbbe23585de39 commit c5e9937de342f44be02aab4884cbbbe23585de39 Author: crazy Date: Fri Aug 3 11:46:44 2007 +0200 msmtp-1.4.13-1-i686 * Version bump diff --git a/source/network-extra/msmtp/FrugalBuild b/source/network-extra/msmtp/FrugalBuild index 07d7330..4711d2c 100644 --- a/source/network-extra/msmtp/FrugalBuild +++ b/source/network-extra/msmtp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=msmtp -pkgver=1.4.12 +pkgver=1.4.13 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=('d747862b31994b9451ed0b7a7aba1bcb472a508e') # optimization OK From crazy at frugalware.org Fri Aug 3 12:08:00 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 12:08:04 2007 Subject: [Frugalware-git] frugalware-current: dosbox-0.71-1-i686 Message-ID: <20070803100800.8766B13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6bc4811d03bfc9389994fd0ba039176b3d51a9c4 commit 6bc4811d03bfc9389994fd0ba039176b3d51a9c4 Author: crazy Date: Fri Aug 3 12:07:26 2007 +0200 dosbox-0.71-1-i686 * Version bump diff --git a/source/xapps-extra/dosbox/FrugalBuild b/source/xapps-extra/dosbox/FrugalBuild index c61c81f..a8220a6 100644 --- a/source/xapps-extra/dosbox/FrugalBuild +++ b/source/xapps-extra/dosbox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=dosbox -pkgver=0.70 +pkgver=0.71 pkgrel=1 pkgdesc="PC emulator with builtin DOS for running DOS games" url="http://dosbox.sourceforge.net/" @@ -10,6 +10,6 @@ depends=('sdl_net' 'libgl' 'sdl_sound' 'libdrm' 'libxxf86vm' 'libpng' 'mesa') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('de2f63b7246c0e1f7a473b0d4571c4da391a340e') +sha1sums=('dab2efbbc95eadbd34839abac3cbdd950deb0671') # optimization OK From crazy at frugalware.org Fri Aug 3 12:16:39 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 12:16:42 2007 Subject: [Frugalware-git] frugalware-current: sip-4.7-1-i686 Message-ID: <20070803101639.5066E13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=291c4d1cd59b10414eccf7c86d89a206c34f3723 commit 291c4d1cd59b10414eccf7c86d89a206c34f3723 Author: crazy Date: Fri Aug 3 12:16:04 2007 +0200 sip-4.7-1-i686 * Version bump diff --git a/source/xlib/sip/FrugalBuild b/source/xlib/sip/FrugalBuild index 845eeab..5e2fffe 100644 --- a/source/xlib/sip/FrugalBuild +++ b/source/xlib/sip/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=sip -pkgver=4.6 +pkgver=4.7 pkgrel=1 pkgdesc="SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries" url="http://www.riverbankcomputing.co.uk/sip/index.php" @@ -23,6 +23,6 @@ build() Fsed "CFLAGS = -pipe -fPIC -O2 -w" "CFLAGS = $CFLAGS -fPIC -w" siplib/Makefile Fbuild } -sha1sums=('604fef1204942146091df32f0e2276c5ab77a71c') +sha1sums=('e1f70a613ab64c1c2227ef2e49a64265a30dc65a') # optimization OK From priyank at frugalware.org Fri Aug 3 12:34:16 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 12:34:18 2007 Subject: [Frugalware-git] gfpm: gfpm: new icon - now in 32x32, 48x48 and 128x128 sizes. Message-ID: <20070803103416.A25BD13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=dc22cd11244b5cad8919deec4f76715255636bf0 commit dc22cd11244b5cad8919deec4f76715255636bf0 Author: Priyank Date: Fri Aug 3 16:03:09 2007 +0530 gfpm: new icon - now in 32x32, 48x48 and 128x128 sizes. diff --git a/configure.ac b/configure.ac index 2f533d7..83bdf5b 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,9 @@ AC_OUTPUT([ src/Makefile data/Makefile data/icons/Makefile +data/icons/32x32/Makefile data/icons/48x48/Makefile +data/icons/128x128/Makefile po/Makefile.in Makefile ]) diff --git a/data/icons/128x128/Makefile.am b/data/icons/128x128/Makefile.am new file mode 100644 index 0000000..13b5fd9 --- /dev/null +++ b/data/icons/128x128/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/128x128/apps +icon_DATA = gfpm.png + +EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/128x128/gfpm.png b/data/icons/128x128/gfpm.png new file mode 100644 index 0000000..b1824e8 Binary files /dev/null and b/data/icons/128x128/gfpm.png differ diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am new file mode 100644 index 0000000..9444d82 --- /dev/null +++ b/data/icons/32x32/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/32x32/apps +icon_DATA = gfpm.png + +EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/32x32/gfpm.png b/data/icons/32x32/gfpm.png new file mode 100644 index 0000000..cae6c34 Binary files /dev/null and b/data/icons/32x32/gfpm.png differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index be1dcdd..e8e0166 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = 48x48 +SUBDIRS = 32x32 48x48 128x128 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor From crazy at frugalware.org Fri Aug 3 12:47:59 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 12:48:01 2007 Subject: [Frugalware-git] frugalware-current: pyqt4-4.3-1-i686 Message-ID: <20070803104759.D7DB913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5b6b5d896d4db380d7861b6dc36f058cc03b5c43 commit 5b6b5d896d4db380d7861b6dc36f058cc03b5c43 Author: crazy Date: Fri Aug 3 12:47:23 2007 +0200 pyqt4-4.3-1-i686 * Version bump diff --git a/source/kde-extra/pyqt4/FrugalBuild b/source/kde-extra/pyqt4/FrugalBuild index a1c0cc1..d3b376e 100644 --- a/source/kde-extra/pyqt4/FrugalBuild +++ b/source/kde-extra/pyqt4/FrugalBuild @@ -3,11 +3,11 @@ pkgname=pyqt4 origname=PyQt -pkgver=4.2 -pkgrel=2 +pkgver=4.3 +pkgrel=1 pkgdesc="PyQt4 is a set of Python bindings for the Qt4 toolkit." url="http://www.riverbankcomputing.co.uk/pyqt/index.php" -depends=('qt4>=4.2.3-2' 'sip>=4.6' 'qscintilla2-qt4') +depends=('qt4>=4.2.3-2' 'sip>=4.7' 'qscintilla2-qt4') up2date="lynx -dump http://www.riverbankcomputing.co.uk/pyqt/download.php |grep 'PyQt-x11-gpl-4' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'" source=(http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/$origname-x11-gpl-$pkgver.tar.gz) #up2date="$pkgver" @@ -32,6 +32,6 @@ build() Fmakeinstall INSTALL_ROOT=$Fdestdir } -sha1sums=('10bdcb34883f4a9e12772dcdfa6d33737423f487') +sha1sums=('cefd8b0d7ff88277280e872bfb3130069504b8ff') # optimization OK From priyank at frugalware.org Fri Aug 3 12:54:01 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 12:54:03 2007 Subject: [Frugalware-git] gfpm: gfpm: new splash screen Message-ID: <20070803105401.9611813A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=19a7ff0432a55bb310fd70f0efa1fda104959434 commit 19a7ff0432a55bb310fd70f0efa1fda104959434 Author: Priyank Date: Fri Aug 3 16:22:58 2007 +0530 gfpm: new splash screen diff --git a/data/Makefile.am b/data/Makefile.am index 35d75e1..587b764 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = icons gladedir = $(datadir)/gfpm -glade_DATA = gfpm.glade gfpmlog.png +glade_DATA = gfpm.glade splash.png EXTRA_DIST = $(glade_DATA) diff --git a/data/gfpm.glade b/data/gfpm.glade index 5647692..e4c309e 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -494,7 +494,7 @@ Installed packages True - gfpmlog.png + splash.png False diff --git a/data/gfpmlog.png b/data/gfpmlog.png deleted file mode 100644 index 852f9b5..0000000 Binary files a/data/gfpmlog.png and /dev/null differ diff --git a/data/splash.png b/data/splash.png new file mode 100644 index 0000000..e26f2c0 Binary files /dev/null and b/data/splash.png differ diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index f6d30b4..bbc9cee 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -90,6 +90,7 @@ gfpm_interface_init (void) while (gtk_events_pending()) gtk_main_iteration (); + sleep (2); gfpm_groups_tvw = glade_xml_get_widget (xml, "grouptreeview"); gfpm_pkgs_tvw = glade_xml_get_widget (xml, "pkgstreeview"); gfpm_info_tvw = glade_xml_get_widget (xml, "infotreeview"); From crazy at frugalware.org Fri Aug 3 13:07:40 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 13:07:43 2007 Subject: [Frugalware-git] frugalware-current: pyqt-3.17.3-1-i686 Message-ID: <20070803110740.E000C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c217c584e78a84f19ce828389ba627f2104ba013 commit c217c584e78a84f19ce828389ba627f2104ba013 Author: crazy Date: Fri Aug 3 13:07:08 2007 +0200 pyqt-3.17.3-1-i686 * Version bump diff --git a/source/kde/pyqt/FrugalBuild b/source/kde/pyqt/FrugalBuild index 4d92dc9..65bce20 100644 --- a/source/kde/pyqt/FrugalBuild +++ b/source/kde/pyqt/FrugalBuild @@ -3,12 +3,12 @@ pkgname=pyqt origname=PyQt -pkgver=3.17.2 +pkgver=3.17.3 pkgrel=1 pkgdesc="PyQt is a set of Python bindings for the Qt toolkit." url="http://www.riverbankcomputing.co.uk/pyqt/index.php" # sip,qscintilla: see BTS-278 -depends=('qt' 'sip>=4.6' 'qscintilla>=1.71') +depends=('qt' 'sip>=4.7' 'qscintilla>=1.71') up2date="lynx -dump http://www.riverbankcomputing.co.uk/pyqt/download.php |grep 'PyQt-x11-gpl-3' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'" source=(http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/$origname-x11-gpl-$pkgver.tar.gz) #up2date="lynx -dump http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt3/|Flasttar" @@ -25,6 +25,6 @@ build() { Fmake Fmakeinstall } -sha1sums=('34ae00693ed54aa64ca931909bad19ccd4918d81') +sha1sums=('ab74c9090564a09e90c57148f9193843b37fd53f') # optimization OK From voroskoi at frugalware.org Fri Aug 3 13:42:44 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Aug 3 13:42:46 2007 Subject: [Frugalware-git] frugalware-current: ethtool-6-1-i686 Message-ID: <20070803114244.F2FE513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=613d16b6e80f3e1e6b62893c540395b8a161f9ca commit 613d16b6e80f3e1e6b62893c540395b8a161f9ca Author: voroskoi Date: Fri Aug 3 13:38:13 2007 +0200 ethtool-6-1-i686 version bump diff --git a/source/network/ethtool/FrugalBuild b/source/network/ethtool/FrugalBuild index cf671da..5e52ad5 100644 --- a/source/network/ethtool/FrugalBuild +++ b/source/network/ethtool/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=ethtool -pkgver=5 +pkgver=6 pkgrel=1 pkgdesc="A tool for setting ethernet parameters" _F_sourceforge_dirname="gkernel" @@ -12,6 +12,6 @@ Finclude sourceforge depends=('glibc') groups=('network') archs=('i686' 'x86_64') -sha1sums=('b4ae709d2305819e235a067d029b762427ce337b') +sha1sums=('808fda9c353714ad1d5f0428e7347fca8c0c23f6') # optimization OK From crazy at frugalware.org Fri Aug 3 13:47:38 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 13:47:40 2007 Subject: [Frugalware-git] frugalware-current: eric4-4.0.1-1-i686 Message-ID: <20070803114738.C59B713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2ba8c2c137c593595980de13bd324e4f3ed86fe3 commit 2ba8c2c137c593595980de13bd324e4f3ed86fe3 Author: crazy Date: Fri Aug 3 13:46:47 2007 +0200 eric4-4.0.1-1-i686 * Version bump diff --git a/source/xapps-extra/eric4/FrugalBuild b/source/xapps-extra/eric4/FrugalBuild index 26cae90..013db52 100644 --- a/source/xapps-extra/eric4/FrugalBuild +++ b/source/xapps-extra/eric4/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=eric4 -pkgver=4.0.0 +pkgver=4.0.1 pkgrel=1 pkgdesc="Eric4 is a full featured Python (and Ruby) IDE that is written in PyQt4." _F_sourceforge_dirname="eric-ide" @@ -18,7 +18,7 @@ source=($source \ groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') -depends=('pyqt4' 'qscintilla2-qt4' 'qscintilla2-python-qt4') +depends=('pyqt4>=4.3' 'qscintilla2-qt4' 'qscintilla2-python-qt4') rodepends=('shared-mime-info') subpkgs=("$pkgname-i18n-de" "$pkgname-i18n-fr" "$pkgname-i18n-ru" "$pkgname-i18n-cs_cz") @@ -45,9 +45,9 @@ build() Fsplit $pkgname-i18n-ru $_F_python_libdir/eric4/i18n/eric4_ru.qm Fsplit $pkgname-i18n-cs_cz $_F_python_libdir/eric4/i18n/eric4_cs_CZ.qm } -sha1sums=('8264c7a8f9b2261ccb4fe1cc06dcf5c35164b191'\ - 'de8d4ecf273f84a1d7b54b8656f9a68b3cf5dabb'\ - '7c9dbf887e802d379a7eb01d37da3762444eec55'\ - 'bcce1e35c9aa8f48195b2d4a87f01fb42a91b643'\ - 'a53f22fb7d2a7014f14bce59c518b711f53d2412'\ - 'a45dc892e51a061cfccfa1add539cb7ff803fe60') +sha1sums=('9f5682e4d9754ce87daf6bd7c3ad92f644c64c99' \ + '99f5ae661460c1333ae09b35c892a43fe1395b61' \ + '86e1619c243ea62ed302ab8d15d250830fe93c85' \ + '3f8e8c9e2d35269e509e526fc04e1094f56d4e74' \ + 'ed1ba6c667b016d3b8ec2fec539054ac33d1fa44' \ + 'bdc6b72e48c1cab4bf779ed72a61b42cc1f997e5') diff --git a/source/xapps-extra/eric4/eric4.desktop b/source/xapps-extra/eric4/eric4.desktop index 3013fcf..0e15b1d 100644 --- a/source/xapps-extra/eric4/eric4.desktop +++ b/source/xapps-extra/eric4/eric4.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Eric +Name=Eric4 Comment=Python (and Ruby) IDE Exec=eric4 Terminal=false From crazy at frugalware.org Fri Aug 3 13:51:20 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 13:51:29 2007 Subject: [Frugalware-git] frugalware-current: libburn-0.3.8-1-i686 Message-ID: <20070803115120.A69EB13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=51880022b9a821803d775ca37c6409be9725d5a9 commit 51880022b9a821803d775ca37c6409be9725d5a9 Author: crazy Date: Fri Aug 3 13:50:48 2007 +0200 libburn-0.3.8-1-i686 * Version bump diff --git a/source/lib-extra/libburn/FrugalBuild b/source/lib-extra/libburn/FrugalBuild index 46907ae..21388bc 100644 --- a/source/lib-extra/libburn/FrugalBuild +++ b/source/lib-extra/libburn/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libburn -pkgver=0.3.6 +pkgver=0.3.8 pkgrel=1 pkgdesc="Disc reading/writing library." url="http://libburnia.pykix.org/" @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://libburnia.pykix.org|grep -m1 'libburn-\(.*\).tar.gz'|sed 's/.*-\(.*\).tar.gz.*/\1/'" source=(http://libburnia-download.pykix.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('228b55cca80f3e846a8a213d136a6c30207f0b43') +sha1sums=('462f4d044734ccb52405a44fe18c5ba90a373521') # optimization OK From voroskoi at frugalware.org Fri Aug 3 13:53:24 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Aug 3 13:53:27 2007 Subject: [Frugalware-git] frugalware-current: whois-4.7.22-1-i686 Message-ID: <20070803115324.E566813A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c3ed7f597f728facbe7c76424a787c6ea501acb5 commit c3ed7f597f728facbe7c76424a787c6ea501acb5 Author: voroskoi Date: Fri Aug 3 13:45:56 2007 +0200 whois-4.7.22-1-i686 version bump diff --git a/source/network/whois/FrugalBuild b/source/network/whois/FrugalBuild index c0ce303..3011104 100644 --- a/source/network/whois/FrugalBuild +++ b/source/network/whois/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=whois -pkgver=4.7.21 +pkgver=4.7.22 pkgrel=1 pkgdesc="The GNU whois client" url="http://www.linux.it/~md/software/" @@ -25,8 +25,8 @@ build() Ffile $pkgname-$pkgver/whois.conf /etc/whois.conf } -sha1sums=('3569982ff0a7ce9fd967af05a773e6e80aea0bcf'\ - '07bc0caaa23521d35d75584fdb5f95f1befdba25'\ +sha1sums=('fcf7d35b188fba56fbefba2e1fd5b94dc516f0ae' \ + '07bc0caaa23521d35d75584fdb5f95f1befdba25' \ '50e73d59b53cadf80e3c5aa8c1c8eb6667fa80e6') # optimization OK From crazy at frugalware.org Fri Aug 3 13:54:22 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 13:54:24 2007 Subject: [Frugalware-git] frugalware-current: dbus-python-0.82.2-1-i686 Message-ID: <20070803115422.30BB913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b0da3d32b4ffaa7da7b5b20617361a734f31a4a1 commit b0da3d32b4ffaa7da7b5b20617361a734f31a4a1 Author: crazy Date: Fri Aug 3 13:53:47 2007 +0200 dbus-python-0.82.2-1-i686 * Version bump diff --git a/source/apps/dbus-python/FrugalBuild b/source/apps/dbus-python/FrugalBuild index 5dc8f2f..38aef71 100644 --- a/source/apps/dbus-python/FrugalBuild +++ b/source/apps/dbus-python/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=dbus-python -pkgver=0.82.1 +pkgver=0.82.2 pkgrel=1 pkgdesc="Python bindings for D-BUS" url="http://www.freedesktop.org/wiki/Software_2fDBusBindings" From boobaa at frugalware.org Fri Aug 3 14:05:08 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Aug 3 14:05:20 2007 Subject: [Frugalware-git] frugalware-current: amavisd-new-2.5.2-1-i686 Message-ID: <20070803120508.86CDB13A4028@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1c4317cfb0831057b3e1888c1d705c0662f7823d commit 1c4317cfb0831057b3e1888c1d705c0662f7823d Author: CSÉCSY László Date: Thu Aug 2 09:33:32 2007 +0200 amavisd-new-2.5.2-1-i686 version bump new m8r (ok by iron) changing UID/GID, so upgrade will break amavis without RTFM lots of other fixes & changes diff --git a/source/network-extra/amavisd-new/FrugalBuild b/source/network-extra/amavisd-new/FrugalBuild index 21e086e..f86b57d 100644 --- a/source/network-extra/amavisd-new/FrugalBuild +++ b/source/network-extra/amavisd-new/FrugalBuild @@ -1,31 +1,31 @@ # Compiling Time: 0.01 SBU -# Maintainer: Karoly CZOVEK +# Maintainer: CSÉCSY László +# Former m8r: Karoly CZOVEK # Contributor: Zoltan Kiss pkgname=amavisd-new -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="Amavisd-new is a high-performance interface between mailer (MTA) and content checkers" url="http://www.ijs.si/software/amavisd/" -depends=('perl-archive-tar' 'perl-archive-zip' 'perl-bdb' 'perl-convert-tnef' \ - 'perl-convert-uulib' 'perl-io-stringy' 'perl-io-zlib' \ - 'perl-mailtools' 'perl-mime-tools' 'perl-net-server' \ +depends=('perl-archive-tar' 'perl-archive-zip' 'perl-bdb' 'perl-convert-tnef'\ + 'perl-convert-uulib' 'perl-io-stringy' 'perl-io-zlib'\ + 'perl-mailtools' 'perl-mime-tools' 'perl-net-server'\ 'perl-unix-syslog' 'spamassassin') backup=('etc/amavis/20-userconf' 'etc/amavis/10-amavisconf') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep -A 2 'Most recent versions'|grep 'amavis' |sed 's/.*amavisd-new-\(.*\)\.tar.*/\1/;q'" source=($url/amavisd-new-$pkgver.tar.gz 10-amavisconf 20-userconf \ - rc.amavisd-new amavisconf) -sha1sums=('1a93e3c773f51d2c5062ee9fc5a4b0a782758c43' \ - '648421546adab952f6ace5834c269f8a80256b84' \ - '681dea305554a05b4a7279b56c7c1282650fcb8f' \ - 'b0f1274ac015a13a1ebd2cb8d4b2e001bc57f78d' \ - '0817540bbce13a5ac1861d1e82dcbcf740f977e8') - + rc.amavisd-new amavisconf README.Frugalware) +sha1sums=('2465131448ce10dac8511450695ff63bc565e6db' \ + '648421546adab952f6ace5834c269f8a80256b84' \ + '681dea305554a05b4a7279b56c7c1282650fcb8f' \ + 'abbe37aedba303f48e7827841e9e84dc2bb02ca7' \ + '0817540bbce13a5ac1861d1e82dcbcf740f977e8' \ + 'f09d2c56d797c699c3dffcc0c21b293d0098d0a5') build() { - Fcd Fsed "'-Home'=>'/var/amavis/db'" "'-Home'=>'/var/lib/amavis/db'" \ amavisd-agent @@ -38,7 +38,7 @@ build() { Fmkdir var/lib/amavis/tmp var/lib/amavis/var var/lib/amavis/db \ var/lib/amavis/helpers var/lib/amavis/quarantine \ var/lib/amavis/home var/lock/amavis - Fexerel usr/share/doc/$pkgname-$pkgver/examples/amavisd-release + Fexerel usr/share/doc/$pkgname-$pkgver/examples/amavisd-release Ffilerel usr/share/doc/$pkgname-$pkgver/examples/amavisd.conf-sample Ffilerel usr/share/doc/$pkgname-$pkgver/examples/amavisd.conf-default Ffilerel LDAP.schema usr/share/doc/$pkgname-$pkgver/ldap/amavis.schema @@ -55,7 +55,4 @@ build() { Fmkdir /usr/sbin Fln ../../var/lib/frugalware/system/amavisconf /usr/sbin/amavisconf } - -# optimalization OK - -# vim: ft=sh +# optimization OK diff --git a/source/network-extra/amavisd-new/README.Frugalware b/source/network-extra/amavisd-new/README.Frugalware new file mode 100644 index 0000000..f6fd954 --- /dev/null +++ b/source/network-extra/amavisd-new/README.Frugalware @@ -0,0 +1,13 @@ +From amavisd-new-2.5.2-1 we no longer use a random uid/gid, but dedicated +ones. Because of this amavis service will not start if you have it installed +before, so you have to correct this by issuing these commands: + +------------ +groupmod -g 40 amavis +usermod -u 40 -g 40 amavis +chown -R amavis:amavis /var/lib/amavis +chown -R amavis:amavis /var/lock/amavis +------------ + +You should chown any other amavis-owned stuff you may have lying around, these +are only the default ones. diff --git a/source/network-extra/amavisd-new/amavisd-new.install b/source/network-extra/amavisd-new/amavisd-new.install index c98bc91..2a1f928 100644 --- a/source/network-extra/amavisd-new/amavisd-new.install +++ b/source/network-extra/amavisd-new/amavisd-new.install @@ -1,8 +1,11 @@ post_install() { - /usr/sbin/groupadd amavis - /usr/sbin/useradd -g amavis -d /var/lib/amavis -s /bin/false \ - -c "Amavisd-new" amavis + if ! grep -q '^amavis:' /etc/group ; then + groupadd -g 40 amavis + fi + if ! grep -q '^amavis:' /etc/passwd ; then + useradd -u 40 -g 40 -s /bin/false -c "Amavisd-new" -d /var/lib/amavis amavis + fi chown -R amavis.amavis /var/lib/amavis chown -R amavis.amavis /var/lock/amavis echo "Please run 'amavisconf' to configure amavis!" @@ -10,9 +13,9 @@ post_install() pre_remove() { - /usr/sbin/chkconfig --del rc.amavisd-new - /usr/sbin/userdel -r amavis >/dev/null 2>&1 - /usr/sbin/groupdel amavis >/dev/null 2>&1 + chkconfig --del rc.amavisd-new + userdel -r amavis >/dev/null 2>&1 + groupdel amavis >/dev/null 2>&1 } op=$1 diff --git a/source/network-extra/amavisd-new/messages/amavisd-new.en b/source/network-extra/amavisd-new/messages/amavisd-new.en index 08eef64..8d3a985 100644 --- a/source/network-extra/amavisd-new/messages/amavisd-new.en +++ b/source/network-extra/amavisd-new/messages/amavisd-new.en @@ -2,3 +2,5 @@ stopamavisd="Stopping amavisd-new" startamavisd="Starting amavisd-new" nramavisd="Amavisd-new not running" aramavisd="Amavisd-new already running" +uamavis="Wrong uid, read /usr/share/doc/amavisd-new-*/README.Frugalware" +gamavis="Wrong gid, read /usr/share/doc/amavisd-new-*/README.Frugalware" diff --git a/source/network-extra/amavisd-new/messages/amavisd-new.hu b/source/network-extra/amavisd-new/messages/amavisd-new.hu index 19182af..e3311c6 100644 --- a/source/network-extra/amavisd-new/messages/amavisd-new.hu +++ b/source/network-extra/amavisd-new/messages/amavisd-new.hu @@ -1,4 +1,6 @@ stopamavisd="Amavisd-new leállítása" startamavisd="Amavisd-new indítása" nramavisd="Az Amavisd-new nem fut" -aramavisd="Az Amavisd-new már fut" \ No newline at end of file +aramavisd="Az Amavisd-new már fut" +uamavis="Hibás uid, olvassa el az /usr/share/doc/amavisd-new-*/README.Frugalware-t" +gamavis="Hibás gid, olvassa el az /usr/share/doc/amavisd-new-*/README.Frugalware-t" diff --git a/source/network-extra/amavisd-new/rc.amavisd-new b/source/network-extra/amavisd-new/rc.amavisd-new index 0b987ca..df5dc32 100644 --- a/source/network-extra/amavisd-new/rc.amavisd-new +++ b/source/network-extra/amavisd-new/rc.amavisd-new @@ -16,37 +16,45 @@ confdir="/etc/amavis" cmd_opts="" get_params() { - PARAMS="" - for i in `ls -1 $confdir` - do - PARAMS="$PARAMS -c $confdir/$i" - done + PARAMS="" + for i in `ls -1 $confdir` + do + PARAMS="$PARAMS -c $confdir/$i" + done } - if [ "$1" = "stop" ]; then - if [ ! -e $pid_file ]; then - echo -n "$nramavisd" - ok 1 - exit 0 - fi - stop "$stopamavisd" - kill -TERM `cat $pid_file` - rm $pid_file - ok $? - elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start - else # start - if [ -e $pid_file ]; then - echo -n "$aramavisd" - ok 1 - exit 0 - fi - get_params - $prog $PARAMS $opts - start "$startamavisd" - ok $? + if [ ! -e $pid_file ]; then + echo -n "$nramavisd" + ok 1 + exit 0 + fi + stop "$stopamavisd" + kill -TERM `cat $pid_file` + rm $pid_file + ok $? +elif [ "$1" = "restart" ]; then + "$0" stop + sleep 1 + "$0" start +else # start + if [ $(id -u amavis) != 40 ]; then + echo -n "$uamavis" + ok 999 + exit 0 + fi + if [ $(id -g amavis) != 40 ]; then + echo -n "$gamavis" + ok 999 + exit 0 + fi + if [ -e $pid_file ]; then + echo -n "$aramavisd" + ok 1 + exit 0 + fi + get_params + $prog $PARAMS $opts + start "$startamavisd" + ok $? fi - \ No newline at end of file From boobaa at frugalware.org Fri Aug 3 14:05:08 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Aug 3 14:05:20 2007 Subject: [Frugalware-git] frugalware-current: postfix-2.4.4-1-i686 Message-ID: <20070803120508.466D913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5ebfabcea137bdcc69e814df8eb1b2c6b506cf54 commit 5ebfabcea137bdcc69e814df8eb1b2c6b506cf54 Author: CSÉCSY László Date: Wed Aug 1 08:13:59 2007 +0200 postfix-2.4.4-1-i686 version bump updated VDA patch's version (it is released in parallel with postfix) new m8r, ok by iron diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index 33838af..0833a0f 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -1,12 +1,13 @@ # Compiling Time: 0.70 SBU -# Maintainer: Karoly CZOVEK +# Maintainer: CSÉCSY László +# Former m8r: Karoly CZOVEK # Contributor: VMiklos # Contributor: Krisztian VASAS pkgname=postfix -pkgver=2.4.3 -pkgrel=2 -vdaver=2.4.0 +pkgver=2.4.4 +pkgrel=1 +vdaver=2.4.4 pkgdesc="A fast, easy to administer, and secure MTA" url="http://www.postfix.org/" depends=('db>=4.6.18' 'pcre' 'cyrus-sasl' 'libmysqlclient' 'libldap' 'libpq>=8.2-1') @@ -25,12 +26,12 @@ up2date="lynx -dump $mirror/index.html|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.g source=($mirror/official/$pkgname-$pkgver.tar.gz \ rc.$pkgname \ README.Frugalware - http://vda.sourceforge.net/VDA/postfix-$vdaver-vda.patch.gz) + http://vda.sourceforge.net/VDA/postfix-$vdaver-vda-ng.patch.gz) -sha1sums=('7d3625332bb3e877e59ef01fad56b444ac59967b'\ +sha1sums=('7ccac18b06de24bbf1069a4265044e1cdfb40d35'\ 'aef63e40eb4321f2cf7985983964e93e9c2a4cd0'\ 'b05736300a01bc6d4d0ca7bb92704de29b68651d'\ - '0e1de0bb9de24ea9766d9930a945e3b94fc2a250') + '4e2905606da03a3f117fa4b4b703c3c5b2f1c174') APPLY_PATCH_VDA=${APPLY_PATCH_VDA:-1} USE_FEATURE_SASL=${USE_FEATURE_SASL:-1} @@ -71,7 +72,7 @@ build() fi if [ $APPLY_PATCH_VDA -eq 1 ]; then - Fpatch postfix-$vdaver-vda.patch + Fpatch postfix-$vdaver-vda-ng.patch fi Fcd From boobaa at frugalware.org Fri Aug 3 14:05:08 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Aug 3 14:05:21 2007 Subject: [Frugalware-git] frugalware-current: Changing uid/gid of amavis Message-ID: <20070803120508.B625313A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7e7fd355444c5b2fd6121b3bc1f24f55b0920039 commit 7e7fd355444c5b2fd6121b3bc1f24f55b0920039 Author: CSÉCSY László Date: Thu Aug 2 09:35:56 2007 +0200 Changing uid/gid of amavis and removing that damned rc-foo.new file (vmiklos: why doesn't dg want to record this change?) diff --git a/docs/ids.txt b/docs/ids.txt index afb37a8..f44f8c7 100644 --- a/docs/ids.txt +++ b/docs/ids.txt @@ -7,7 +7,6 @@ `---------------`---------------`----------------------------------------------- User Group Package -------------------------------------------------------------------------------- -amavis amavis amavisd-new munin munin munin and munin-node -------------------------------------------------------------------------------- @@ -58,7 +57,7 @@ ID User Package Group Package 037 netdev shadow 038 messagebus dbus messagebus dbus 039 hald hal hald hal -040 +040 amavis amavisd-new amavis amavisd-new 041 042 gdm shadow gdm shadow 043 shadow shadow diff --git a/source/network-extra/amavisd-new/rc.amavisd-new.new b/source/network-extra/amavisd-new/rc.amavisd-new.new deleted file mode 100644 index 5600819..0000000 --- a/source/network-extra/amavisd-new/rc.amavisd-new.new +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2005 Zoltan Kiss -# rc.amavisd-new for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 81 32 -# description: Starts and stops the Amavis mail filter daemon. - -source /lib/initscripts/functions -TEXTDOMAIN=amavisd-new - -actions=(restart start status stop) -daemon="Amavisd-new" - -pid="$(pidof amavisd 2> /dev/null)" - -rc_start() -{ - start_msg - if [ -z ${pid} ] ; then - PARAMS= - for i in `ls -1 /etc/amavis` ; do - PARAMS="${PARAMS} -c /etc/amavis/${i}" - done - - /usr/sbin/amavisd ${PARAMS} - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z ${pid} ] ; then - killall amavisd - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh From boobaa at frugalware.org Fri Aug 3 14:05:09 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Aug 3 14:05:21 2007 Subject: [Frugalware-git] frugalware-current: postfix-2.4.5-1-i686 Message-ID: <20070803120509.0594413A402D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5be57f38fb3b2f24a5629f70bd1ad56a20d35db8 commit 5be57f38fb3b2f24a5629f70bd1ad56a20d35db8 Author: CSÉCSY László Date: Thu Aug 2 10:10:44 2007 +0200 postfix-2.4.5-1-i686 version bump diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index 0833a0f..87ede9c 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -5,9 +5,9 @@ # Contributor: Krisztian VASAS pkgname=postfix -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 -vdaver=2.4.4 +vdaver=2.4.5 pkgdesc="A fast, easy to administer, and secure MTA" url="http://www.postfix.org/" depends=('db>=4.6.18' 'pcre' 'cyrus-sasl' 'libmysqlclient' 'libldap' 'libpq>=8.2-1') @@ -28,10 +28,10 @@ source=($mirror/official/$pkgname-$pkgver.tar.gz \ README.Frugalware http://vda.sourceforge.net/VDA/postfix-$vdaver-vda-ng.patch.gz) -sha1sums=('7ccac18b06de24bbf1069a4265044e1cdfb40d35'\ +sha1sums=('dc3616ffd441c23748273527b6693835f3502ad2'\ 'aef63e40eb4321f2cf7985983964e93e9c2a4cd0'\ 'b05736300a01bc6d4d0ca7bb92704de29b68651d'\ - '4e2905606da03a3f117fa4b4b703c3c5b2f1c174') + '7bc3a9639e64747b49bd862dc7cc326ab3aacd72') APPLY_PATCH_VDA=${APPLY_PATCH_VDA:-1} USE_FEATURE_SASL=${USE_FEATURE_SASL:-1} From crazy at frugalware.org Fri Aug 3 14:10:29 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 14:10:37 2007 Subject: [Frugalware-git] frugalware-current: pinot-0.75-1-i686 Message-ID: <20070803121030.0A91713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c697a3f912866c2e3e21780a9ca808ed4511aeeb commit c697a3f912866c2e3e21780a9ca808ed4511aeeb Author: crazy Date: Fri Aug 3 14:09:39 2007 +0200 pinot-0.75-1-i686 * Version bump diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild index 0765dc9..7c85c3b 100644 --- a/source/xapps-extra/pinot/FrugalBuild +++ b/source/xapps-extra/pinot/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=pinot -pkgver=0.74 -pkgrel=2 +pkgver=0.75 +pkgrel=1 pkgdesc="Personal search and metasearch for the Free Desktop" url="http://pinot.berlios.de/" depends=('openssl' 'curl' 'cairomm' 'dbus-glib' 'xapian-core>=1.0.2' 'gmime' 'atk' 'gtkmm' 'boost>=1.34.0-4' \ @@ -17,5 +17,5 @@ groups=('xapps-extra') archs=('i686' 'x86_64') Finclude berlios unset MAKEFLAGS -sha1sums=('5af42b4505790af81bfc32e0e539bc5cdb0408f0') +sha1sums=('7e4c7316af01eb5e514bee013646ce03f6f74617') # optimization OK From crazy at frugalware.org Fri Aug 3 14:26:10 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 14:26:13 2007 Subject: [Frugalware-git] frugalware-current: graphicsmagick-1.1.8-1-i686 Message-ID: <20070803122610.BB0AC13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=45cab66a365b6071ba0ed9aaba90d8171073d41d commit 45cab66a365b6071ba0ed9aaba90d8171073d41d Author: crazy Date: Fri Aug 3 14:25:36 2007 +0200 graphicsmagick-1.1.8-1-i686 * Version bump diff --git a/source/xapps-extra/graphicsmagick/FrugalBuild b/source/xapps-extra/graphicsmagick/FrugalBuild index b8dcb9a..5205d83 100644 --- a/source/xapps-extra/graphicsmagick/FrugalBuild +++ b/source/xapps-extra/graphicsmagick/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=graphicsmagick -pkgver=1.1.7 -pkgrel=3 +pkgver=1.1.8 +pkgrel=1 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') @@ -12,15 +12,9 @@ _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="GraphicsMagick" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -source=($source graphicsmagick-1.1.7-overflow.patch0 \ - graphicsmagick-libpng.patch \ - CVE-2006-5456.patch) url="http://www.graphicsmagick.org/" _F_cd_path="GraphicsMagick-$pkgver" -sha1sums=('b2d3878be34e6d0a8a19e991b7f99da30b02df7e' \ - 'ae474ea3348a7d08c7c1026a34a5cf9f37170305' \ - '6944c767dd885e6356c29dd21ae717327c42d9a0' \ - 'b2dfffdb603b2e3526c2af49790a67432230a60f') +sha1sums=('fdd10d47f208d278f66b9f0ff69f814c67fbeab3') subpkgs=("$pkgname-docs") subdescs=('GraphicsMagick Documentation') From crazy at frugalware.org Fri Aug 3 14:27:50 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 14:27:51 2007 Subject: [Frugalware-git] frugalware-current: errr why I need commit -a to remove files ? Message-ID: <20070803122750.66ACB13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5acfb4df20c196ea5e430d698fd18e1bf63733f2 commit 5acfb4df20c196ea5e430d698fd18e1bf63733f2 Author: crazy Date: Fri Aug 3 14:27:05 2007 +0200 errr why I need commit -a to remove files ? diff --git a/source/xapps-extra/graphicsmagick/CVE-2006-5456.patch b/source/xapps-extra/graphicsmagick/CVE-2006-5456.patch deleted file mode 100644 index 759f6d6..0000000 --- a/source/xapps-extra/graphicsmagick/CVE-2006-5456.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rup GraphicsMagick-1.1.7.orig/coders/dcm.c GraphicsMagick-1.1.7/coders/dcm.c ---- GraphicsMagick-1.1.7.orig/coders/dcm.c 2006-10-16 16:48:31.000000000 +0200 -+++ GraphicsMagick-1.1.7/coders/dcm.c 2006-10-16 16:56:13.000000000 +0200 -@@ -3022,7 +3022,7 @@ static Image *ReadDCMImage(const ImageIn - /* - Photometric interpretation. - */ -- for (i=0; i < (long) length; i++) -+ for (i=0; i < (long) Min(length, MaxTextExtent-1); i++) - photometric[i]=data[i]; - photometric[i]='\0'; - break; -diff -rup GraphicsMagick-1.1.7.orig/coders/palm.c GraphicsMagick-1.1.7/coders/palm.c ---- GraphicsMagick-1.1.7.orig/coders/palm.c 2006-10-16 16:48:31.000000000 +0200 -+++ GraphicsMagick-1.1.7/coders/palm.c 2006-10-16 16:56:13.000000000 +0200 -@@ -541,7 +541,7 @@ static Image *ReadPALMImage(const ImageI - image->compression = RLECompression; - for (i = 0; i < (long) bytes_per_row; ) - { -- count = ReadBlobByte(image); -+ count = Min(ReadBlobByte(image), bytes_per_row-i); - byte = ReadBlobByte(image); - memset(one_row + i, (int) byte, count); - i += count; -@@ -579,6 +579,8 @@ static Image *ReadPALMImage(const ImageI - indexes=GetIndexes(image); - if(bits_per_pixel == 16) - { -+ if (image->columns > 2*bytes_per_row) -+ ThrowReaderException(CorruptImageError,CorruptImage,image); - for (x=0; x < (long) image->columns; x++) - { - color16 = (*ptr++ << 8); -@@ -595,6 +597,8 @@ static Image *ReadPALMImage(const ImageI - bit = 8 - bits_per_pixel; - for(x = 0; x < (long) image->columns; x++) - { -+ if (ptr - one_row >= bytes_per_row) -+ ThrowReaderException(CorruptImageError,CorruptImage,image); - index =(IndexPacket) (mask - (((*ptr) & (mask << bit)) >> bit)); - indexes[x] = index; - *q++ = image->colormap[index]; diff --git a/source/xapps-extra/graphicsmagick/graphicsmagick-1.1.7-overflow.patch0 b/source/xapps-extra/graphicsmagick/graphicsmagick-1.1.7-overflow.patch0 deleted file mode 100644 index 88ff71f..0000000 --- a/source/xapps-extra/graphicsmagick/graphicsmagick-1.1.7-overflow.patch0 +++ /dev/null @@ -1,11 +0,0 @@ ---- magick/image.c.orig 2006-02-11 19:07:59.000000000 +0100 -+++ magick/image.c 2006-02-11 19:08:06.000000000 +0100 -@@ -6250,7 +6250,7 @@ - /* - Rectify multi-image file support. - */ -- FormatString(filename,image_info->filename,0); -+ FormatString(filename,"%s",image_info->filename,0); - if ((LocaleCompare(filename,image_info->filename) != 0) && - (strchr(filename,'%') == (char *) NULL)) - image_info->adjoin=False; diff --git a/source/xapps-extra/graphicsmagick/graphicsmagick-libpng.patch b/source/xapps-extra/graphicsmagick/graphicsmagick-libpng.patch deleted file mode 100644 index b5398a0..0000000 --- a/source/xapps-extra/graphicsmagick/graphicsmagick-libpng.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur GraphicsMagick-1.1.7.old/coders/png.c GraphicsMagick-1.1.7/coders/png.c ---- GraphicsMagick-1.1.7.old/coders/png.c 2006-06-21 12:25:40.000000000 -0400 -+++ GraphicsMagick-1.1.7/coders/png.c 2006-06-21 12:30:42.000000000 -0400 -@@ -1709,7 +1709,7 @@ - #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \ - && (PNG_LIBPNG_VER >= 10200) - /* Disable thread-unsafe features of pnggccrd */ -- if (png_access_version() >= 10200) -+ if (png_access_version_number() >= 10200) - { - png_uint_32 mmx_disable_mask=0; - png_uint_32 asm_flags; -@@ -1718,8 +1718,8 @@ - | PNG_ASM_FLAG_MMX_READ_FILTER_SUB \ - | PNG_ASM_FLAG_MMX_READ_FILTER_AVG \ - | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ); -- asm_flags=png_get_asm_flags(png_ptr); -- png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask); -+ asm_flags=png_get_asm_flags(ping); -+ png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask); - } - #endif - From priyank at frugalware.org Fri Aug 3 14:49:19 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 14:49:26 2007 Subject: [Frugalware-git] gfpm: gfpm: don't print contents of package lists anymore. Message-ID: <20070803124919.B0E4A13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=bf0e918d2b33594cf776748df7a81b9d987fefdc commit bf0e918d2b33594cf776748df7a81b9d987fefdc Author: Priyank Date: Fri Aug 3 18:18:04 2007 +0530 gfpm: don't print contents of package lists anymore. * gettextized a string diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index bbc9cee..0e3ec3b 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -888,7 +888,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) g_print ("error %s", pacman_strerror(pm_errno)); } packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); - if (gfpm_plist_question("Following packages will be upgraded. Do you want to continue ?", gfpm_pmlist_to_glist(packages)) == GTK_RESPONSE_YES) + if (gfpm_plist_question(_("Following packages will be upgraded. Do you want to continue ?"), gfpm_pmlist_to_glist(packages)) == GTK_RESPONSE_YES) { PM_LIST *i = NULL; @@ -1171,13 +1171,6 @@ cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, g gfpm_package_list_del (GFPM_INSTALL_LIST, pkg); } - /* remove the following snippet after testing */ - g_print ("Contents of INSTALL LIST\n"); - gfpm_package_list_print (GFPM_INSTALL_LIST); - - g_print ("Contents of REMOVE LIST\n"); - gfpm_package_list_print (GFPM_REMOVE_LIST); - g_free (pkg); gtk_tree_path_free (path); From priyank at frugalware.org Fri Aug 3 15:08:41 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 15:08:43 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: refresh packages view after a package is installed/removed Message-ID: <20070803130841.BFFE313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=471c5db6b5258f4d48e940cbae9e298e6a5f4629 commit 471c5db6b5258f4d48e940cbae9e298e6a5f4629 Author: Priyank Date: Fri Aug 3 18:37:37 2007 +0530 gfpm-interface: refresh packages view after a package is installed/removed diff --git a/src/gfpm-db.c b/src/gfpm-db.c index b5b8a84..34ca785 100644 --- a/src/gfpm-db.c +++ b/src/gfpm-db.c @@ -52,4 +52,4 @@ gfpm_db_cleanup (void) return; } - + diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 0e3ec3b..3987bf5 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -45,6 +45,10 @@ extern GfpmList *install_list; extern GfpmList *remove_list; extern char *repo; +/* current group the user is browsing */ +/* used for refreshing the views after a package update */ +static gchar *current_group = NULL; + /* The GFPM main window */ GtkWidget *gfpm_mw; @@ -369,6 +373,10 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_apply_dlg_reset (); } gfpm_progress_show (FALSE); + if (current_group != NULL) + { + gfpm_load_pkgs_tvw (current_group); + } return; } @@ -535,6 +543,8 @@ gfpm_load_pkgs_tvw (const char *group_name) pacman_pkg_free (pm_lpkg); } gfpm_update_status (_("Loading package list ...DONE")); + g_free (current_group); + current_group = g_strdup (group_name); g_object_unref (icon_yes); g_object_unref (icon_no); From crazy at frugalware.org Fri Aug 3 15:14:19 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 15:14:21 2007 Subject: [Frugalware-git] frugalware-current: qt-3.3.8-4-i686 Message-ID: <20070803131419.EE95313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5107d3225e58ff9f98a608ab341a46cc5a9fdd5 commit c5107d3225e58ff9f98a608ab341a46cc5a9fdd5 Author: crazy Date: Fri Aug 3 15:13:46 2007 +0200 qt-3.3.8-4-i686 * SEC relbump * added CVE-2007-3388.patch * closes #2311 in -current diff --git a/source/kde/qt/CVE-2007-3388.patch b/source/kde/qt/CVE-2007-3388.patch new file mode 100644 index 0000000..97210c7 --- /dev/null +++ b/source/kde/qt/CVE-2007-3388.patch @@ -0,0 +1,184 @@ +diff -Naurp qt-x11-free-3.3.8/src/sql/qdatatable.cpp qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp +--- qt-x11-free-3.3.8/src/sql/qdatatable.cpp 2007-01-11 14:46:33.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -1043,8 +1043,8 @@ bool QDataTable::insertCurrent() + return FALSE; + if ( !sqlCursor()->canInsert() ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::insertCurrent: insert not allowed for " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::insertCurrent: insert not allowed for %s", ++ sqlCursor()->name().latin1() ); + #endif + endInsert(); + return FALSE; +@@ -1117,16 +1117,16 @@ bool QDataTable::updateCurrent() + return FALSE; + if ( sqlCursor()->primaryIndex().count() == 0 ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::updateCurrent: no primary index for " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::updateCurrent: no primary index for %s", ++ sqlCursor()->name().latin1() ); + #endif + endUpdate(); + return FALSE; + } + if ( !sqlCursor()->canUpdate() ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::updateCurrent: updates not allowed for " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::updateCurrent: updates not allowed for %s", ++ sqlCursor()->name().latin1() ); + #endif + endUpdate(); + return FALSE; +@@ -1191,8 +1191,8 @@ bool QDataTable::deleteCurrent() + return FALSE; + if ( sqlCursor()->primaryIndex().count() == 0 ) { + #ifdef QT_CHECK_RANGE +- qWarning("QDataTable::deleteCurrent: no primary index " + +- sqlCursor()->name() ); ++ qWarning("QDataTable::deleteCurrent: no primary index %s", ++ sqlCursor()->name().latin1() ); + #endif + return FALSE; + } +diff -Naurp qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp +--- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp 2007-01-11 16:03:02.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -234,7 +234,8 @@ QSqlDatabase* QSqlDatabaseManager::datab + db->open(); + #ifdef QT_CHECK_RANGE + if ( !db->isOpen() ) +- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() ); ++ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s", ++ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() ); + #endif + } + return db; +@@ -686,7 +687,7 @@ void QSqlDatabase::init( const QString& + if ( !d->driver ) { + #ifdef QT_CHECK_RANGE + qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() ); +- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") ); ++ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() ); + #endif + d->driver = new QNullDriver(); + d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) ); +diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlindex.cpp qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp +--- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp 2007-01-11 14:46:35.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -273,7 +273,7 @@ QSqlIndex QSqlIndex::fromStringList( con + if ( field ) + newSort.append( *field, desc ); + else +- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" ); ++ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1()); + } + return newSort; + } +diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp +--- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp 2007-01-11 14:46:35.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -298,7 +298,7 @@ int QSqlRecord::position( const QString& + return i; + } + #ifdef QT_CHECK_RANGE +- qWarning( "QSqlRecord::position: unable to find field " + name ); ++ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() ); + #endif + return -1; + } +@@ -313,7 +313,7 @@ QSqlField* QSqlRecord::field( int i ) + checkDetach(); + if ( !sh->d->contains( i ) ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); ++ qWarning( "QSqlRecord::field: index out of range: %d", i ); + #endif + return 0; + } +@@ -344,7 +344,7 @@ const QSqlField* QSqlRecord::field( int + { + if ( !sh->d->contains( i ) ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); ++ qWarning( "QSqlRecord::field: index out of range: %d", i ); + #endif // QT_CHECK_RANGE + return 0; + } +diff -Naurp qt-x11-free-3.3.8/src/tools/qglobal.cpp qt-x11-free-3.3.8-p/src/tools/qglobal.cpp +--- qt-x11-free-3.3.8/src/tools/qglobal.cpp 2007-02-02 15:01:06.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/tools/qglobal.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -680,7 +680,7 @@ void qSystemWarning( const char* msg, in + if ( code != -1 ) + qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) ); + else +- qWarning( msg ); ++ qWarning( "%s", msg ); + #endif + #else + Q_UNUSED( msg ); +diff -Naurp qt-x11-free-3.3.8/src/widgets/qtextedit.cpp qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp +--- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-02-02 15:01:23.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -6349,7 +6349,7 @@ void QTextEdit::optimParseTags( QString + cur = tag->prev; + if ( !cur ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 ); ++ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 ); + #endif + return; // something is wrong - give up + } +@@ -6372,7 +6372,7 @@ void QTextEdit::optimParseTags( QString + break; + } else if ( !cur->leftTag ) { + #ifdef QT_CHECK_RANGE +- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 ); ++ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 ); + #endif + return; // something is amiss - give up + } +diff -Naurp qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp +--- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp 2007-02-02 15:01:03.000000000 +0100 ++++ qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp 2007-08-03 14:39:11.000000000 +0200 +@@ -978,7 +978,7 @@ bool QSvgDevice::play( const QDomNode &n + // ### catch references to embedded .svg files + QPixmap pix; + if ( !pix.load( href ) ) { +- qWarning( "QSvgDevice::play: Couldn't load image "+href ); ++ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() ); + break; + } + pt->drawPixmap( QRect( x1, y1, w, h ), pix ); +@@ -1024,8 +1024,8 @@ bool QSvgDevice::play( const QDomNode &n + break; + } + case InvalidElement: +- qWarning( "QSvgDevice::play: unknown element type " + +- node.nodeName() ); ++ qWarning( "QSvgDevice::play: unknown element type %s", ++ node.nodeName().latin1() ); + break; + }; + +@@ -1111,7 +1111,7 @@ double QSvgDevice::parseLen( const QStri + { + QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") ); + if ( reg.search( str ) == -1 ) { +- qWarning( "QSvgDevice::parseLen: couldn't parse " + str ); ++ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() ); + if ( ok ) + *ok = FALSE; + return 0.0; +@@ -1140,7 +1140,7 @@ double QSvgDevice::parseLen( const QStri + else if ( u == "pc" ) + dbl *= m.logicalDpiX() / 6.0; + else +- qWarning( "QSvgDevice::parseLen: Unknown unit " + u ); ++ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() ); + } + if ( ok ) + *ok = TRUE; diff --git a/source/kde/qt/FrugalBuild b/source/kde/qt/FrugalBuild index 8ba765d..28a8e21 100644 --- a/source/kde/qt/FrugalBuild +++ b/source/kde/qt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt pkgver=3.3.8 -pkgrel=3 +pkgrel=4 pkgmore=x11-free pkgdesc="The QT GUI toolkit." url="http://www.trolltech.com/products/qt" @@ -22,7 +22,8 @@ source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \ 02-qt-rpath+FW.patch \ 03-qt-uic.patch \ 04-qt-visibility.patch \ - Qt-3.3.8-UTF-8-fix.diff) + Qt-3.3.8-UTF-8-fix.diff \ + CVE-2007-3388.patch) export QTDIR=$startdir/src/$pkgname-$pkgmore-$pkgver export PATH=${QTDIR}/bin:${PATH} @@ -84,13 +85,14 @@ build() Fsplit qt-docs usr/lib/qt/doc } -sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'\ - '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0'\ - '0464d40d9bd518fe8d139b1306136089349a4cdf'\ - '7562323175ec47483dcb45c2857519f6276e0a51'\ - '54d37e3988c4b195ae960ef2c59e678151115211'\ - '0d5fcbe569723792700bad3c82abe34d5e5163c4'\ - 'dba54b91b2b00c1d052ac512d824b29d31aefb89'\ - '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871'\ - '418b09fee387959f45f75fb20fb1e54c0f14b1cb') +sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \ + '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \ + '0464d40d9bd518fe8d139b1306136089349a4cdf' \ + '7562323175ec47483dcb45c2857519f6276e0a51' \ + '54d37e3988c4b195ae960ef2c59e678151115211' \ + '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ + 'dba54b91b2b00c1d052ac512d824b29d31aefb89' \ + '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \ + '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \ + 'f7634fb0419bda723053adb885facd270ccb10ec') # optimization OK From boobaa at frugalware.org Fri Aug 3 15:18:33 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Aug 3 15:18:35 2007 Subject: [Frugalware-git] frugalware-current: horde-webmail-1.0.1-2-i686 Message-ID: <20070803131833.8582713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ae755b590e9628176c5e006174ac9a02c441abf4 commit ae755b590e9628176c5e006174ac9a02c441abf4 Author: CSÉCSY László Date: Fri Aug 3 15:18:21 2007 +0200 horde-webmail-1.0.1-2-i686 added some more config files to backup() diff --git a/source/network-extra/horde-webmail/FrugalBuild b/source/network-extra/horde-webmail/FrugalBuild index 39dde39..310a0c1 100644 --- a/source/network-extra/horde-webmail/FrugalBuild +++ b/source/network-extra/horde-webmail/FrugalBuild @@ -3,7 +3,7 @@ pkgname=horde-webmail pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="a free, enterprise ready, browser based communication suite" url="http://horde.org/webmail/" rodepends=('php>=4.3.0') @@ -11,7 +11,7 @@ groups=('network-extra') archs=('i686') up2date="lynx -dump http://www.horde.org/download/app/?app=webmail | grep \.tar\.gz | sed 's/.*-\(.*\)\.t.*/\1/'" source=(ftp://ftp.horde.org/pub/$pkgname/$pkgname-$pkgver.tar.gz README.Frugalware) -backup=(var/www/$pkgname/config/conf.php) +backup=(var/www/$pkgname/config/{conf,hooks,mime_drivers,motd,nls,prefs,registry}.php) options=('stick') build() From crazy at frugalware.org Fri Aug 3 16:34:12 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 16:34:15 2007 Subject: [Frugalware-git] frugalware-current: xpdf-3.02-3-i686 Message-ID: <20070803143412.C3C2E13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2970b3b594c51c48f9486c3b3c209a8673e79bd7 commit 2970b3b594c51c48f9486c3b3c209a8673e79bd7 Author: crazy Date: Fri Aug 3 16:33:29 2007 +0200 xpdf-3.02-3-i686 * SEC relbump * closes #2299 in -current diff --git a/source/xapps/xpdf/FrugalBuild b/source/xapps/xpdf/FrugalBuild index 3b3650e..a4df5f3 100644 --- a/source/xapps/xpdf/FrugalBuild +++ b/source/xapps/xpdf/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xpdf pkgver=3.02 -pkgrel=2 +pkgrel=3 pkgdesc="PDF viewer for X" url="http://www.foolabs.com/xpdf/" backup=('etc/xpdfrc') @@ -12,11 +12,14 @@ backup=('etc/xpdfrc') groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep released|sed 's/.*f \(.*\) w.*/\1/'" -source=(ftp://ftp.foolabs.com/pub/xpdf/$pkgname-$pkgver.tar.gz) -sha1sums=('f9940698840c8a8045677e8be68ab8580903e20a') +source=(ftp://ftp.foolabs.com/pub/xpdf/$pkgname-$pkgver.tar.gz \ + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch) +sha1sums=('f9940698840c8a8045677e8be68ab8580903e20a' \ + 'cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d') -build() { - Fsed "/usr/local/share/ghostscript" "/usr/share/ghostscript" doc/sample-xpdfrc +build() +{ + Fsed "/usr/local/share/ghostscript" "/usr/share/ghostscript" doc/sample-xpdfrc Fsed "^#\(displayFontT1\)" "\1" doc/sample-xpdfrc Fbuild --enable-a4-paper --with-freetype2-includes=/usr/include/freetype2 Ffilerel xpdf/xpdfIcon.xpm /usr/share/pixmaps/xpdf.xpm From priyank at frugalware.org Fri Aug 3 17:01:13 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 17:01:16 2007 Subject: [Frugalware-git] gfpm: gfpm: allow user to select which packages to upgrade after a sync operation. Message-ID: <20070803150113.D399613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=d282d006b526f918f08d42d5283cebcfa01e5e9a commit d282d006b526f918f08d42d5283cebcfa01e5e9a Author: Priyank Date: Fri Aug 3 20:30:19 2007 +0530 gfpm: allow user to select which packages to upgrade after a sync operation. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 3987bf5..44868dc 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -373,6 +373,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_apply_dlg_reset (); } gfpm_progress_show (FALSE); + if (current_group != NULL) { gfpm_load_pkgs_tvw (current_group); @@ -543,6 +544,7 @@ gfpm_load_pkgs_tvw (const char *group_name) pacman_pkg_free (pm_lpkg); } gfpm_update_status (_("Loading package list ...DONE")); + g_free (current_group); current_group = g_strdup (group_name); @@ -900,7 +902,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); if (gfpm_plist_question(_("Following packages will be upgraded. Do you want to continue ?"), gfpm_pmlist_to_glist(packages)) == GTK_RESPONSE_YES) { - + /* PM_LIST *i = NULL; gfpm_package_list_free (GFPM_INSTALL_LIST); gfpm_package_list_free (GFPM_REMOVE_LIST); @@ -910,6 +912,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) PM_PKG *pk = pacman_sync_getinfo (sync, PM_SYNC_PKG); gfpm_package_list_add (GFPM_INSTALL_LIST, pacman_pkg_getinfo(pk, PM_PKG_NAME)); } + */ pacman_trans_release (); cb_gfpm_apply_btn_clicked (NULL, NULL); } @@ -1171,10 +1174,7 @@ cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, g else { if (inst == TRUE) - { gfpm_package_list_add (GFPM_REMOVE_LIST, pkg); - g_print ("adding to remove list\n"); - } else gfpm_package_list_del (GFPM_REMOVE_LIST, pkg); diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index f56e4d7..13311f0 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -38,6 +38,8 @@ static GtkWidget *gfpm_apply_rem_box; static GtkWidget *gfpm_apply_inst_sizelbl; static GtkWidget *gfpm_apply_rem_sizelbl; +static void cb_gfpm_plist_question_upgrade_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); + void gfpm_messages_init (void) { @@ -285,6 +287,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) GtkWidget *tvw; gint ret; GList *l; + GtkTreeViewColumn *column; dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -295,24 +298,47 @@ gfpm_plist_question (const char *main_msg, GList *packages) swindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL)); gtk_scrolled_window_set_policy (swindow, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); tvw = gtk_tree_view_new (); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tvw), FALSE); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tvw), TRUE); gtk_container_add (GTK_CONTAINER(swindow), tvw); - store = gtk_list_store_new (1, G_TYPE_STRING); + store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + r = gtk_cell_renderer_toggle_new (); + column = gtk_tree_view_column_new_with_attributes (_("Upgrade"), r, "active", 0, NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_append_column (GTK_TREE_VIEW(tvw), column); + g_signal_connect (r, "toggled", G_CALLBACK(cb_gfpm_plist_question_upgrade_toggled), store); + r = gtk_cell_renderer_text_new (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Package"), r, "text", 1, NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_column_set_expand (column, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW(tvw), column); + + r = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Version"), r, "text", 2, NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_column_set_min_width (column, 70); + gtk_tree_view_append_column (GTK_TREE_VIEW(tvw), column); + + r = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Size"), r, "text", 3, NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_append_column (GTK_TREE_VIEW(tvw), column); + for (l=g_list_first(packages);l;l=g_list_next(l)) { - char *pkgname, *pkgver; - char *pkgstring; + char *pkgname = NULL; + char *pkgver = NULL; + char *size = NULL; + float s = 0; PM_SYNCPKG *sync = l->data; PM_PKG *pkg = pacman_sync_getinfo (sync, PM_SYNC_PKG); - pkgname = pacman_pkg_getinfo (pkg, PM_PKG_NAME); pkgver = pacman_pkg_getinfo (pkg, PM_PKG_VERSION); + s = (float)((long)pacman_pkg_getinfo (pkg, PM_PKG_SIZE)/1024)/1024; + asprintf (&size, "%0.2f MB", s); gtk_list_store_append (store, &iter); - pkgstring = g_strdup_printf("%s-%s", pkgname, pkgver); - gtk_list_store_set (store, &iter, 0, pkgstring, -1); - g_free (pkgstring); + gtk_list_store_set (store, &iter, 0, TRUE, 1, pkgname, 2, pkgver, 3, size, -1); + g_free (size); } gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); gtk_widget_set_size_request (tvw, 230, 120); @@ -321,11 +347,49 @@ gfpm_plist_question (const char *main_msg, GList *packages) gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); ret = gtk_dialog_run (GTK_DIALOG(dialog)); + + if (ret == GTK_RESPONSE_YES) + { + gfpm_package_list_free (GFPM_INSTALL_LIST); + gfpm_package_list_free (GFPM_REMOVE_LIST); + GtkTreeIter i; + GtkTreeModel *model; + gboolean v; + model = gtk_tree_view_get_model(GTK_TREE_VIEW(tvw)); + v = gtk_tree_model_get_iter_first (model, &i); + while (v!=FALSE) + { + gchar *pkgname = NULL; + gboolean sel; + gtk_tree_model_get (model, &i, 0, &sel, 1, &pkgname, -1); + if ((sel==TRUE) && (pkgname!=NULL)) + gfpm_package_list_add (GFPM_INSTALL_LIST, pkgname); + g_free (pkgname); + v = gtk_tree_model_iter_next (model, &i); + } + } gtk_widget_destroy (dialog); return ret; } +static void +cb_gfpm_plist_question_upgrade_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreePath *path; + gboolean check; + + model = (GtkTreeModel *)data; + path = gtk_tree_path_new_from_string (path_str); + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, 0, &check, -1); + /* manually toggle the toggle button */ + check ^= 1; + gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, check, -1); +} + void gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) { @@ -336,6 +400,7 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) GtkTreeIter iter; GtkWidget *tvw; GList *l; + gchar *pkgname; if (packages == NULL) return; @@ -367,6 +432,7 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_widget_destroy (dialog); return; From priyank at frugalware.org Fri Aug 3 17:03:56 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 17:03:58 2007 Subject: [Frugalware-git] gfpm: silenced a few compiler warnings and removed unused vars. Message-ID: <20070803150356.7A28113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=a6c72b7c067063c3873f92993d24b3ebda167233 commit a6c72b7c067063c3873f92993d24b3ebda167233 Author: Priyank Date: Fri Aug 3 20:33:08 2007 +0530 silenced a few compiler warnings and removed unused vars. diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 13311f0..3f251d4 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE #include "gfpm-messages.h" #include "gfpm-packagelist.h" #include @@ -182,7 +183,7 @@ gfpm_apply_dlg_show (void) gint res; gfpm_apply_dlg_populate (); - res = gtk_dialog_run (gfpm_apply_dlg); + res = gtk_dialog_run (GTK_DIALOG(gfpm_apply_dlg)); return res; } @@ -400,7 +401,6 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) GtkTreeIter iter; GtkWidget *tvw; GList *l; - gchar *pkgname; if (packages == NULL) return; From priyank at frugalware.org Fri Aug 3 17:12:59 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 17:13:00 2007 Subject: [Frugalware-git] gfpm: gfpm-messages: set the shadow type of scrolled window to GTK_SHADOW_ETCHED_OUT to make it look a bit less ugly. Message-ID: <20070803151259.0EA6113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=f40863c2bc6d53130e4c4ab7781540431eac3160 commit f40863c2bc6d53130e4c4ab7781540431eac3160 Author: Priyank Date: Fri Aug 3 20:42:09 2007 +0530 gfpm-messages: set the shadow type of scrolled window to GTK_SHADOW_ETCHED_OUT to make it look a bit less ugly. diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 3f251d4..9d3e09a 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -298,6 +298,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) main_msg); swindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL)); gtk_scrolled_window_set_policy (swindow, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (swindow, GTK_SHADOW_ETCHED_OUT); tvw = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tvw), TRUE); gtk_container_add (GTK_CONTAINER(swindow), tvw); From vmiklos at frugalware.org Fri Aug 3 17:22:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Aug 3 17:22:03 2007 Subject: [Frugalware-git] pacman-g2: pacman_pkg_vercmp(): correct doxygen documentation Message-ID: <20070803152203.91E3713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=5a2d1498dfb33b718bdd208d41c3e752371f71bd commit 5a2d1498dfb33b718bdd208d41c3e752371f71bd Author: VMiklos Date: Fri Aug 3 17:21:46 2007 +0200 pacman_pkg_vercmp(): correct doxygen documentation diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index d31f806..9cce943 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -619,8 +619,8 @@ int pacman_pkg_checkmd5sum(pmpkg_t *pkg) /** Compare versions. * @param ver1 first version * @param ver2 secont version - * @return postive, 0 or negative if ver1 is less, equal or more - * than ver2, respectively. + * @return negative, 0 or positive if ver1 is less, equal or more than ver2, + * respectively. */ int pacman_pkg_vercmp(const char *ver1, const char *ver2) { From priyank at frugalware.org Fri Aug 3 17:44:47 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 17:44:48 2007 Subject: [Frugalware-git] pacman-g2: pacman_pkg_vercmp(): spell fix in doxygen documentation. Message-ID: <20070803154447.DE5EF13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=a890633c8abacd7e0ee702d9890e7575cfce798a commit a890633c8abacd7e0ee702d9890e7575cfce798a Author: Priyank Date: Fri Aug 3 21:13:50 2007 +0530 pacman_pkg_vercmp(): spell fix in doxygen documentation. diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index fc7a305..14b1fef 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -616,7 +616,7 @@ int pacman_pkg_checkmd5sum(pmpkg_t *pkg) /** Compare versions. * @param ver1 first version - * @param ver2 secont version + * @param ver2 second version * @return negative, 0 or positive if ver1 is less, equal or more than ver2, * respectively. */ From crazy at frugalware.org Fri Aug 3 17:53:06 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 17:53:07 2007 Subject: [Frugalware-git] frugalware-current: kdegraphics-3.5.7-2-i686 Message-ID: <20070803155306.3B73A13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9de5d5af8b372a3664ed16643ba95ed0cc0cd244 commit 9de5d5af8b372a3664ed16643ba95ed0cc0cd244 Author: crazy Date: Fri Aug 3 17:48:37 2007 +0200 kdegraphics-3.5.7-2-i686 * SEC relbump * closes #2302 in -current diff --git a/source/kde/kdegraphics/FrugalBuild b/source/kde/kdegraphics/FrugalBuild index dd7c117..c6cca24 100644 --- a/source/kde/kdegraphics/FrugalBuild +++ b/source/kde/kdegraphics/FrugalBuild @@ -3,16 +3,18 @@ pkgname=kdegraphics pkgver=3.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Graphics Programs" groups=('kde') archs=('i686' 'x86_64') depends=('kdebase>=3.5.7' 'imlib' 'freeglut' 'lcms' 'sane-backends' 't1lib' 'libgphoto2' \ - 'fribidi' 'poppler-qt' 'xespgs' 'xpdf' 'urw-fonts' 'openexr>=1.4.0a-2') + 'fribidi' 'poppler-qt' 'xespgs' 'xpdf>=3.02-3' 'urw-fonts' 'openexr>=1.4.0a-2') makedepends=('doxygen' 'qt-docs') rodepends=('ocrad') _F_kde_split_docs=1 Finclude kde +source=($source \ + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdegraphics-CVE-2007-3387.diff) Fconfopts="$Fconfopts --disable-kpdf-drm --with-openexr --with-gphoto2-libraries=/usr/lib \ --with-gphoto2-includes=/usr/include/gphoto2 --with-imlib-config=/usr/bin \ --with-jpeg=/usr/lib --with-tiff=/usr/lib --with-poppler" @@ -23,5 +25,6 @@ subdepends=("$pkgname=$pkgver") subgroups=('kde-extra kde-docs') subarchs=('i686 x86_64') -sha1sums=('2b6ca2c27f565b5ca4a40d461db7b4038658b5f3') +sha1sums=('2b6ca2c27f565b5ca4a40d461db7b4038658b5f3' \ + '64b9823af4c8f975011862e3fb15ef724a6253df') # optimization OK From crazy at frugalware.org Fri Aug 3 18:35:51 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 18:35:53 2007 Subject: [Frugalware-git] frugalware-current: kaffeine-0.8.5-1-i686 Message-ID: <20070803163551.3273313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f8335115e601f4f54408ec1c0be82f4a24f16bd5 commit f8335115e601f4f54408ec1c0be82f4a24f16bd5 Author: crazy Date: Fri Aug 3 18:34:03 2007 +0200 kaffeine-0.8.5-1-i686 * Version bump diff --git a/source/kde/kaffeine/FrugalBuild b/source/kde/kaffeine/FrugalBuild index 6743f75..9c17cfe 100644 --- a/source/kde/kaffeine/FrugalBuild +++ b/source/kde/kaffeine/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=kaffeine -pkgver=0.8.4 -pkgrel=3 +pkgver=0.8.5 +pkgrel=1 pkgdesc="Kaffeine is full featured Media Player for KDE3." url="http://kaffeine.sourceforge.net/" depends=('kdebase>=3.5.7' 'xine-lib>=1.1.7' 'popt' 'libxml2' 'lame' 'cdparanoia' \ @@ -22,5 +22,5 @@ build() Frm /usr/share/mimelnk/application/x-mplayer2.desktop } -sha1sums=('03d2a83d107f801b10c702f750bb95ad1bef344b') +sha1sums=('2a993555cf1b4295230a69fd74d68ed06c3e5ae8') # optimization OK From crazy at frugalware.org Fri Aug 3 18:55:13 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 18:55:14 2007 Subject: [Frugalware-git] frugalware-current: kmymoney2-0.8.7-1-i686 Message-ID: <20070803165513.6C46113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=60b1cec3320f3c91ee82afd2eb67765e65c33a75 commit 60b1cec3320f3c91ee82afd2eb67765e65c33a75 Author: crazy Date: Fri Aug 3 18:52:01 2007 +0200 kmymoney2-0.8.7-1-i686 * Version bump diff --git a/source/kde-extra/kmymoney2/FrugalBuild b/source/kde-extra/kmymoney2/FrugalBuild index 270b2a2..8c7d2c3 100644 --- a/source/kde-extra/kmymoney2/FrugalBuild +++ b/source/kde-extra/kmymoney2/FrugalBuild @@ -3,15 +3,16 @@ # Contributor: BMH1980 pkgname=kmymoney2 -pkgver=0.8.6 +pkgver=0.8.7 pkgrel=1 pkgdesc="Personal finance software for KDE" -depends=('kdelibs>=3.5.6' 'libofx>=0.8.2') +depends=('kdelibs>=3.5.7' 'libofx>=0.8.2') groups=('kde-extra') archs=('i686' 'x86_64') license="GPL 2" _F_kde_defaults=0 +_F_sourceforge_ext=".tar.bz2" Finclude sourceforge kde +sha1sums=('6fcf599c1515ca016a17e8f004593a69bcb47510') -sha1sums=('4a7efc6ccb8a637611563e0cff6a365882a06f0f') # optimization OK From crazy at frugalware.org Fri Aug 3 18:57:07 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 18:57:08 2007 Subject: [Frugalware-git] frugalware-current: 7zip-4.51-1-i686 Message-ID: <20070803165707.211FA13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=601aa1739d7e8c6c8efd64565371af5d03eeb734 commit 601aa1739d7e8c6c8efd64565371af5d03eeb734 Author: crazy Date: Fri Aug 3 18:55:52 2007 +0200 7zip-4.51-1-i686 * Version bump diff --git a/source/apps-extra/7zip/FrugalBuild b/source/apps-extra/7zip/FrugalBuild index ff643f5..3e89c00 100644 --- a/source/apps-extra/7zip/FrugalBuild +++ b/source/apps-extra/7zip/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=7zip -pkgver=4.49 +pkgver=4.51 pkgrel=1 pkgdesc="7-Zip is a file archiver with high compression ratio." _F_sourceforge_name="p7zip" @@ -36,5 +36,5 @@ build() } -sha1sums=('0049df96c9b35e904393afea52b8670bb1bee22a') +sha1sums=('e3708dc69ec44dba554ab15d0cacbc226eae9420') # optimization OK From crazy at frugalware.org Fri Aug 3 18:59:12 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 18:59:19 2007 Subject: [Frugalware-git] frugalware-current: sdl_ttf-2.0.9-1-i686 Message-ID: <20070803165912.D431313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=064f978afc01e49aac5de440572683558a8ee9c5 commit 064f978afc01e49aac5de440572683558a8ee9c5 Author: crazy Date: Fri Aug 3 18:58:31 2007 +0200 sdl_ttf-2.0.9-1-i686 * Version bump diff --git a/source/xlib-extra/sdl_ttf/FrugalBuild b/source/xlib-extra/sdl_ttf/FrugalBuild index 3f31345..d800fbd 100644 --- a/source/xlib-extra/sdl_ttf/FrugalBuild +++ b/source/xlib-extra/sdl_ttf/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=sdl_ttf -pkgver=2.0.8 +pkgver=2.0.9 pkgrel=1 pkgdesc="SDL_ttf is a TrueType font rendering library." url="http://www.libsdl.org/projects/SDL_ttf" @@ -11,7 +11,7 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.libsdl.org/projects/SDL_ttf|grep -m1 'SDL_ttf-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=($url/release/SDL_ttf-$pkgver.tar.gz) -sha1sums=('a2c4cb1525173414ca7e5eaefbabadca69bd1114') +sha1sums=('6bc3618b08ddbbf565fe8f63f624782c15e1cef2') build() { From crazy at frugalware.org Fri Aug 3 19:01:12 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 19:01:17 2007 Subject: [Frugalware-git] frugalware-current: sdl_net-1.2.7-1-i686 Message-ID: <20070803170112.DCF7F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7d3b24ffe31fdff1aa7f854aa6a4322f9f44f8e1 commit 7d3b24ffe31fdff1aa7f854aa6a4322f9f44f8e1 Author: crazy Date: Fri Aug 3 19:00:22 2007 +0200 sdl_net-1.2.7-1-i686 * Version bump diff --git a/source/xlib-extra/sdl_net/FrugalBuild b/source/xlib-extra/sdl_net/FrugalBuild index 6b0eb1b..69a7a5e 100644 --- a/source/xlib-extra/sdl_net/FrugalBuild +++ b/source/xlib-extra/sdl_net/FrugalBuild @@ -4,7 +4,7 @@ pkgname=sdl_net realname=SDL_net -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc="A small sample cross-platform networking library" url="http://www.libsdl.org/projects/SDL_net/" @@ -14,6 +14,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url|grep -m1 'SDL_net-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=($url/release/$realname-$pkgver.tar.gz) _F_cd_path="$realname-$pkgver" -sha1sums=('bac98a482ffeec405c8405669dc2bb5d2e7db451') +sha1sums=('b46c7e3221621cc34fec1238f1b5f0ce8972274d') # optimization OK From crazy at frugalware.org Fri Aug 3 19:36:53 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 19:36:56 2007 Subject: [Frugalware-git] frugalware-current: wormux-0.7.9-2-i686 Message-ID: <20070803173653.CCDF113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=82d3f6026ab3cc03ec1055286efefa5b4a1ee073 commit 82d3f6026ab3cc03ec1055286efefa5b4a1ee073 Author: crazy Date: Fri Aug 3 19:24:41 2007 +0200 wormux-0.7.9-2-i686 * rebuild * aded build() to sed off -Werror diff --git a/source/games-extra/wormux/FrugalBuild b/source/games-extra/wormux/FrugalBuild index da347eb..14de54c 100644 --- a/source/games-extra/wormux/FrugalBuild +++ b/source/games-extra/wormux/FrugalBuild @@ -4,14 +4,21 @@ pkgname=wormux pkgver=0.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="Wormux is free software clone of the Worms(R) series of games, developed by Team17." url="http://www.wormux.org/" -depends=('sdl_net' 'openssl' 'curl>=7.16.0' 'sdl_ttf>=2.0' 'sdl_gfx>=2.0.13' 'sdl_mixer>=1.2' 'sdlimage>=1.2' 'libxml++>=2.6') +depends=('sdl_net>=1.2.7' 'openssl' 'curl>=7.16.0' 'sdl_ttf>=2.0.9' 'sdl_gfx>=2.0.13' 'sdl_mixer>=1.2' 'sdlimage>=1.2' 'libxml++>=2.6') groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.wormux.org/wiki/en/download.php|Flasttar" source=(http://download.gna.org/wormux/wormux-$pkgver.tar.gz) sha1sums=('70ffc7e7edc0292122ce609eb82c0111987bbd12') +build() +{ + Fcd + Fsed '-Werror' '' src/Makefile* + Fbuild +} + # optimization OK From crazy at frugalware.org Fri Aug 3 20:03:01 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:03:02 2007 Subject: [Frugalware-git] frugalware-current: libvorbis-1.2.0-1-i686 Message-ID: <20070803180301.6D20613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=45c9fd5f680b4e9033d6fb31e217d90efccefafa commit 45c9fd5f680b4e9033d6fb31e217d90efccefafa Author: crazy Date: Fri Aug 3 20:02:04 2007 +0200 libvorbis-1.2.0-1-i686 * SEC version bump * added build() to sed off -O20 ... * closes #2293 in -current diff --git a/source/lib/libvorbis/FrugalBuild b/source/lib/libvorbis/FrugalBuild index c77f6de..b1d811b 100644 --- a/source/lib/libvorbis/FrugalBuild +++ b/source/lib/libvorbis/FrugalBuild @@ -1,10 +1,9 @@ # Compiling Time: 0.01 SBU # Contributor: VMiklos # Maintainer: Zsolt Szalai -# Modified by Laszlo Dvornik pkgname=libvorbis -pkgver=1.1.2 +pkgver=1.2.0 pkgrel=1 pkgdesc="Vorbis codec library" url="http://www.vorbis.com/" @@ -13,6 +12,15 @@ archs=('i686' 'x86_64' 'ppc') depends=('glibc' 'libogg') up2date="pud -p http://www.xiph.org/downloads/ -e 'libvorbis-(.*?)\.tar'"; source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz) -sha1sums=('26289fc41aa5436b1a277d726bb5cb106d675c35') +sha1sums=('6ff5f9d9d71cc385ee180171cc21af5653b76a16') + +build() +{ + Fcd + ## god ... + Fsed '-O20' '' configure* + Fautoreconf + Fbuild +} # optimization OK From crazy at frugalware.org Fri Aug 3 20:07:35 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:07:36 2007 Subject: [Frugalware-git] frugalware-current: hardinfo-0.4.2.2-1-i686 Message-ID: <20070803180735.27F5513A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=05f6529b8e0ba5ac6d50cdf21fb39d582e097ace commit 05f6529b8e0ba5ac6d50cdf21fb39d582e097ace Author: crazy Date: Fri Aug 3 20:06:47 2007 +0200 hardinfo-0.4.2.2-1-i686 * Version bump diff --git a/source/gnome-extra/hardinfo/FrugalBuild b/source/gnome-extra/hardinfo/FrugalBuild index 89f4b49..acbd4d2 100644 --- a/source/gnome-extra/hardinfo/FrugalBuild +++ b/source/gnome-extra/hardinfo/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Devil505 pkgname=hardinfo -pkgver=0.4.2.1 -pkgrel=2 +pkgver=0.4.2.2 +pkgrel=1 pkgdesc="A system information and benchmark tool." _F_berlios_ext=".tar.bz2" Finclude berlios @@ -13,5 +13,5 @@ options=('scriptlet') depends=('gtk+2' 'libsoup' 'pciutils') groups=('gnome-extra') archs=('i686') -sha1sums=('7d73a7235879f8c1e4eb48d03bf34f1bee7e7b38'\ +sha1sums=('e3ec42cdb5ee03b002aa071d418f951579998408' \ '18894bbc8fb42655660e700543adb04db5568308') From crazy at frugalware.org Fri Aug 3 20:08:00 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:08:04 2007 Subject: [Frugalware-git] frugalware-current: perl-net-dns-0.61-1-i686 Message-ID: <20070803180800.C825C13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=14a31ef6e5a9d5ba64ece552bf0a1eb2b0e2d6df commit 14a31ef6e5a9d5ba64ece552bf0a1eb2b0e2d6df Author: crazy Date: Fri Aug 3 20:07:13 2007 +0200 perl-net-dns-0.61-1-i686 * Version bump diff --git a/source/devel-extra/perl-net-dns/FrugalBuild b/source/devel-extra/perl-net-dns/FrugalBuild index 67c60f7..6cc791f 100644 --- a/source/devel-extra/perl-net-dns/FrugalBuild +++ b/source/devel-extra/perl-net-dns/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=Net-DNS _F_perl_author=O/OL/OLAF -pkgver=0.60 +pkgver=0.61 pkgrel=1 pkgdesc="Perl interface to the DNS resolver" url="http://cpan.org/" @@ -11,7 +11,7 @@ depends=('perl' 'perl-digest-hmac' 'perl-net-ip' 'perl-io-socket-inet6') Finclude perl groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('87faa1d6c4d5a9e360314a39dee6825864e06c62') +sha1sums=('56a6eaba303e45035ab71f47c0ccc14eafbc1bad') Fconfopts="$Fconfopts --noonline-tests" # optimization OK From crazy at frugalware.org Fri Aug 3 20:10:26 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:10:27 2007 Subject: [Frugalware-git] frugalware-current: perl-poe-filter-ircd-2.31-1-i686 Message-ID: <20070803181026.5082713A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3c8ecdd69a4d8d03aa7a69be09c541b180a8766a commit 3c8ecdd69a4d8d03aa7a69be09c541b180a8766a Author: crazy Date: Fri Aug 3 20:09:43 2007 +0200 perl-poe-filter-ircd-2.31-1-i686 * Version bump diff --git a/source/devel-extra/perl-poe-filter-ircd/FrugalBuild b/source/devel-extra/perl-poe-filter-ircd/FrugalBuild index 42d07ef..bd0b8fc 100644 --- a/source/devel-extra/perl-poe-filter-ircd/FrugalBuild +++ b/source/devel-extra/perl-poe-filter-ircd/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=POE-Filter-IRCD _F_perl_author=B/BI/BINGOS -pkgver=2.30 +pkgver=2.31 pkgrel=1 pkgdesc="A POE-based parser for the IRC protocol." depends=('perl-poe>=0.33') Finclude perl groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('43d33cfa4a6d18f541811559661b7fe80729e2e6') +sha1sums=('819f0a07b2620cfb608abeac6334348bdc431403') From crazy at frugalware.org Fri Aug 3 20:11:09 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:11:12 2007 Subject: [Frugalware-git] frugalware-current: perl-file-chdir-0.09-1-i686 Message-ID: <20070803181109.64A3813A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a3bffa81abdd2e35bc623f2f6de3e04c1e04d128 commit a3bffa81abdd2e35bc623f2f6de3e04c1e04d128 Author: crazy Date: Fri Aug 3 20:10:26 2007 +0200 perl-file-chdir-0.09-1-i686 * Version bump diff --git a/source/devel-extra/perl-file-chdir/FrugalBuild b/source/devel-extra/perl-file-chdir/FrugalBuild index 207fac0..fff50ba 100644 --- a/source/devel-extra/perl-file-chdir/FrugalBuild +++ b/source/devel-extra/perl-file-chdir/FrugalBuild @@ -4,11 +4,11 @@ pkgname=perl-file-chdir _F_perl_name=File-chdir _F_perl_author=D/DA/DAGOLDEN -pkgver=0.08 +pkgver=0.09 pkgrel=1 pkgdesc="A more sensible way to change directories." depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('e31ad83c4dac042a7319a192d89404244ec808a7') +sha1sums=('7997c9af41fb14f98ee8d846e40d8666664f6187') From crazy at frugalware.org Fri Aug 3 20:13:14 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:13:15 2007 Subject: [Frugalware-git] frugalware-current: perl-clone-0.27-1-i686 Message-ID: <20070803181314.87C5F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a4328e4906d754f7a299e819562a6ef19de2cb3b commit a4328e4906d754f7a299e819562a6ef19de2cb3b Author: crazy Date: Fri Aug 3 20:12:27 2007 +0200 perl-clone-0.27-1-i686 * Version bump diff --git a/source/devel-extra/perl-clone/FrugalBuild b/source/devel-extra/perl-clone/FrugalBuild index d11e441..89ad430 100644 --- a/source/devel-extra/perl-clone/FrugalBuild +++ b/source/devel-extra/perl-clone/FrugalBuild @@ -4,11 +4,11 @@ pkgname=perl-clone _F_perl_name=Clone _F_perl_author=R/RD/RDF -pkgver=0.25 +pkgver=0.27 pkgrel=1 pkgdesc="recursively copy Perl datatypes" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('d857f061e785d5c171644d65a0426be8b1c3a7c5') +sha1sums=('c2280f418cbaa70d8a9d7e33f5cd288dbc71da42') From crazy at frugalware.org Fri Aug 3 20:14:00 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:14:02 2007 Subject: [Frugalware-git] frugalware-current: perl-poe-component-irc-5.34-1-i686 Message-ID: <20070803181400.4660113A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0ee025d0028d4787642575a0329ab333f0242194 commit 0ee025d0028d4787642575a0329ab333f0242194 Author: crazy Date: Fri Aug 3 20:13:12 2007 +0200 perl-poe-component-irc-5.34-1-i686 * Version bump diff --git a/source/devel-extra/perl-poe-component-irc/FrugalBuild b/source/devel-extra/perl-poe-component-irc/FrugalBuild index 1e4663e..408f8bf 100644 --- a/source/devel-extra/perl-poe-component-irc/FrugalBuild +++ b/source/devel-extra/perl-poe-component-irc/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=POE-Component-IRC _F_perl_author=B/BI/BINGOS -pkgver=5.32 +pkgver=5.34 pkgrel=1 pkgdesc="A fully event-driven IRC client module." -depends=('perl-poe' 'perl-poe-filter-ircd>=2.30' 'perl-poe-component-client-dns') +depends=('perl-poe' 'perl-poe-filter-ircd>=2.31' 'perl-poe-component-client-dns') Finclude perl groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('50059341fca270a7b96b96651ade759f26657acb') +sha1sums=('5c1b3d63e938aefe83a94b28023445707d4eaa6a') From crazy at frugalware.org Fri Aug 3 20:15:33 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:15:35 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-simple-2.17-1-i686 Message-ID: <20070803181533.E8E6313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=577e4eeb036ee7ac53077d8bb3bcbc5c587ca8e1 commit 577e4eeb036ee7ac53077d8bb3bcbc5c587ca8e1 Author: crazy Date: Fri Aug 3 20:14:48 2007 +0200 perl-xml-simple-2.17-1-i686 * Version bump diff --git a/source/devel/perl-xml-simple/FrugalBuild b/source/devel/perl-xml-simple/FrugalBuild index f21acb5..15045ba 100644 --- a/source/devel/perl-xml-simple/FrugalBuild +++ b/source/devel/perl-xml-simple/FrugalBuild @@ -4,11 +4,11 @@ pkgname=perl-xml-simple _F_perl_name=XML-Simple _F_perl_author=G/GR/GRANTM -pkgver=2.16 +pkgver=2.17 pkgrel=1 pkgdesc="Easy API to maintain XML (esp config files)" depends=('perl' 'perl-xml') Finclude perl groups=('devel') archs=('i686' 'x86_64') -sha1sums=('f4166d7632542c80933e3d684ddc452ac08e44ab') +sha1sums=('c3a83c3ac1172ab90afd5a5a56751026e7d51b3b') From crazy at frugalware.org Fri Aug 3 20:16:27 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:16:27 2007 Subject: [Frugalware-git] frugalware-current: perl-mp3-info-1.23-1-i686 Message-ID: <20070803181627.46ED313A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6ccd29a0c9d2268c13c911141e04ff7c1a96947d commit 6ccd29a0c9d2268c13c911141e04ff7c1a96947d Author: crazy Date: Fri Aug 3 20:15:41 2007 +0200 perl-mp3-info-1.23-1-i686 * Version bump diff --git a/source/devel/perl-mp3-info/FrugalBuild b/source/devel/perl-mp3-info/FrugalBuild index b9d676e..9ecef6f 100644 --- a/source/devel/perl-mp3-info/FrugalBuild +++ b/source/devel/perl-mp3-info/FrugalBuild @@ -3,9 +3,9 @@ _F_perl_name=MP3-Info _F_perl_author=D/DA/DANIEL -pkgver=1.22 +pkgver=1.23 pkgdesc="Manipulate / fetch info from MP3 audio files" Finclude perl groups=('devel') archs=('i686' 'x86_64') -sha1sums=('4cecb7b78e90b35e89b7fdb78ff6cf9b70289036') +sha1sums=('692297853bd4d1564a3e9739235a8d851c0b90cb') From crazy at frugalware.org Fri Aug 3 20:18:32 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:18:34 2007 Subject: [Frugalware-git] frugalware-current: perl-libwww-5.807-1-i686 Message-ID: <20070803181832.A5C7F13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=096198977d9122baa671e317a49e111ea363cdbe commit 096198977d9122baa671e317a49e111ea363cdbe Author: crazy Date: Fri Aug 3 20:17:42 2007 +0200 perl-libwww-5.807-1-i686 * Version bump diff --git a/source/devel/perl-libwww/FrugalBuild b/source/devel/perl-libwww/FrugalBuild index 8680c69..7d6bf9a 100644 --- a/source/devel/perl-libwww/FrugalBuild +++ b/source/devel/perl-libwww/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Zsolt Szalai pkgname=perl-libwww -pkgver=5.806 +pkgver=5.807 perlver=5.8.8 pkgrel=1 pkgdesc="A set of Perl modules which provides a simple and consistent API to the WWW." @@ -13,7 +13,7 @@ groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.cpan.org/authors/id/G/GA/GAAS/?M=D' |grep libwww-perl.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-$pkgver.tar.gz) -sha1sums=('b19603bfa6ba4819b9e7392f1f48d3e43c58ab5f') +sha1sums=('9b7738ea46b2b6d4fa81658bc3968fb0d421d62c') build() { cd $startdir/src/libwww-perl-$pkgver From crazy at frugalware.org Fri Aug 3 20:22:35 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:22:37 2007 Subject: [Frugalware-git] frugalware-current: svk-2.0.2-1-i686 Message-ID: <20070803182235.9D34613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=19fbaa3f94062582082f20637fc1ec01b9d92a68 commit 19fbaa3f94062582082f20637fc1ec01b9d92a68 Author: crazy Date: Fri Aug 3 20:21:20 2007 +0200 svk-2.0.2-1-i686 * Version bump diff --git a/source/devel-extra/svk/FrugalBuild b/source/devel-extra/svk/FrugalBuild index a3e3418..7033c7a 100644 --- a/source/devel-extra/svk/FrugalBuild +++ b/source/devel-extra/svk/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=SVK _F_perl_author=C/CL/CLKAO -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="A Distributed Version Control System" Finclude perl @@ -22,5 +22,5 @@ up2date="$up2date|sed 's/v//'" source=($_F_perl_url/$_F_perl_author/$_F_perl_name-v$pkgver$_F_perl_ext \ use-core-module-version-or-die-hard.patch) _F_cd_path="$_F_perl_name-v$pkgver" -sha1sums=('5d2d4b21f24c9fb36a241ac1dec91ac0a85f2acf'\ +sha1sums=('8d691c6e6b914e5b8e71ba75dee60b61fe90e54f' \ '1af15cc1d0067ca9d58ed993a2bd117ab2d67201') From crazy at frugalware.org Fri Aug 3 20:26:55 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:26:56 2007 Subject: [Frugalware-git] frugalware-current: m17n-lib-1.4.0-1-i686 Message-ID: <20070803182655.487EA13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=35a591692d2a926e9597453f0f25cebf95bc3d32 commit 35a591692d2a926e9597453f0f25cebf95bc3d32 Author: crazy Date: Fri Aug 3 20:26:24 2007 +0200 m17n-lib-1.4.0-1-i686 * up2date fix diff --git a/source/xlib-extra/m17n-lib/FrugalBuild b/source/xlib-extra/m17n-lib/FrugalBuild index cbd45f8..f57f2f8 100644 --- a/source/xlib-extra/m17n-lib/FrugalBuild +++ b/source/xlib-extra/m17n-lib/FrugalBuild @@ -9,9 +9,8 @@ url="http://www.m17n.org/" depends=('anthy' 'libxaw' 'fribidi' 'gd' 'libotf>=0.9.6' 'libxft' 'fontconfig' 'm17n-db>=1.4.0') groups=('xlib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url/m17n-lib-en/download.html|grep -m1 'm17n-lib-'|sed 's/.*-\(.*\).t.*/\1/'" +up2date="lynx -dump $url/m17n-lib-en/download.html|grep -v m17n-im|grep -m1 'm17n-lib-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz) sha1sums=('b01a53ae45228fc94285d19935c25ef6d8816068') - unset MAKEFLAGS # optimization OK From crazy at frugalware.org Fri Aug 3 20:33:02 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:33:04 2007 Subject: [Frugalware-git] frugalware-current: autogen-5.9.2-1-i686 Message-ID: <20070803183302.98EE913A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4913ab459f1cb265e16850a125b1f6796ee66091 commit 4913ab459f1cb265e16850a125b1f6796ee66091 Author: crazy Date: Fri Aug 3 20:32:08 2007 +0200 autogen-5.9.2-1-i686 * Version bump diff --git a/source/devel-extra/autogen/FrugalBuild b/source/devel-extra/autogen/FrugalBuild index 24da60c..70cc49a 100644 --- a/source/devel-extra/autogen/FrugalBuild +++ b/source/devel-extra/autogen/FrugalBuild @@ -2,16 +2,15 @@ # Maintainer: AlexExtreme pkgname=autogen -pkgver=5.9.1 +pkgver=5.9.2 pkgrel=1 pkgdesc="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text" -url="http://autogen.sourceforge.net" depends=('libxml2' 'guile') groups=('devel-extra') archs=('i686' 'x86_64') Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3593&package_id=3552' | grep -m2 '.tar.gz' | sed '/doc/d' | sed 's/.*autogen-//' | sed 's/\.tar.*//'" unset MAKEFLAGS -sha1sums=('ae27202a6e87ea304eddd15638977950ecf7abcb') +sha1sums=('b0e7fddf4401b779034cdf20bb5b54cd2196e681') # optimization OK From crazy at frugalware.org Fri Aug 3 20:33:37 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:33:39 2007 Subject: [Frugalware-git] frugalware-current: python-ldap-2.3.1-1-i686 Message-ID: <20070803183337.EB68613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6b4889fcef99a648145ef88c68f14f76f4e37048 commit 6b4889fcef99a648145ef88c68f14f76f4e37048 Author: crazy Date: Fri Aug 3 20:32:54 2007 +0200 python-ldap-2.3.1-1-i686 * Version bump diff --git a/source/devel-extra/python-ldap/FrugalBuild b/source/devel-extra/python-ldap/FrugalBuild index 9eb0390..b92be01 100644 --- a/source/devel-extra/python-ldap/FrugalBuild +++ b/source/devel-extra/python-ldap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=python-ldap -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc="This is a python module to access an LDAP server" groups=('devel-extra') @@ -10,6 +10,6 @@ archs=('i686' 'x86_64') depends=('python>=2.5' 'libldap') makedepends=('openldap') Finclude sourceforge -sha1sums=('37f1192ea19bae0d0221e155733f9cc39c2885b4') +sha1sums=('1ea659a53081ca6356507c74bc445c52ff9a5944') # optimization OK From crazy at frugalware.org Fri Aug 3 20:36:06 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:36:10 2007 Subject: [Frugalware-git] frugalware-current: xmltv-0.5.47-1-i686 Message-ID: <20070803183606.779BC13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=703a8fba09537e0026cb750640aafa0c464059b5 commit 703a8fba09537e0026cb750640aafa0c464059b5 Author: crazy Date: Fri Aug 3 20:35:10 2007 +0200 xmltv-0.5.47-1-i686 * Version bump diff --git a/source/apps-extra/xmltv/FrugalBuild b/source/apps-extra/xmltv/FrugalBuild index 401dd42..8b9e770 100644 --- a/source/apps-extra/xmltv/FrugalBuild +++ b/source/apps-extra/xmltv/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=xmltv -pkgver=0.5.46 +pkgver=0.5.47 pkgrel=1 pkgdesc="XMLTV is a set of programs to process TV (tvguide) listings and manage your TV viewing" _F_sourceforge_ext=".tar.bz2" @@ -13,7 +13,7 @@ depends=('perl-xml' 'perl-xml-twig' 'perl-libwww' 'perl-archive-zip' 'perl-cgi' 'perl-xml-writer' 'perl-unicode-string') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('3e4b70a7d927486ba8d1365d630b338b47178af6') +sha1sums=('c29ce6761c089aca21489ef8cb088c3757561895') build() { Fcd From crazy at frugalware.org Fri Aug 3 20:38:32 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:38:34 2007 Subject: [Frugalware-git] frugalware-current: syslog-ng-2.0.5-1-i686 Message-ID: <20070803183832.BBA5A13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a49300e4f55adb0be795a7b0b6897530890236a5 commit a49300e4f55adb0be795a7b0b6897530890236a5 Author: crazy Date: Fri Aug 3 20:37:47 2007 +0200 syslog-ng-2.0.5-1-i686 * Version bump diff --git a/source/apps-extra/syslog-ng/FrugalBuild b/source/apps-extra/syslog-ng/FrugalBuild index c2acd49..3d2a100 100644 --- a/source/apps-extra/syslog-ng/FrugalBuild +++ b/source/apps-extra/syslog-ng/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=syslog-ng -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc="A flexible system logging tool" url="http://www.balabit.com/products/syslog_ng/" @@ -17,9 +17,9 @@ up2date="lynx -dump http://www.balabit.com/downloads/files/syslog-ng/sources/sta source=(http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/$pkgname-$pkgver.tar.gz \ rc.syslog-ng syslog-ng.conf syslog-ng) backup=(etc/syslog-ng.conf) -sha1sums=('da782ef5ece1e38e04b39e67d851f1a86b556731'\ - '261b708d924538a7811be7ca09d1de36be414678'\ - '12abe05ce61a93cd8f3b578129f97ec6d50888bf'\ +sha1sums=('f514e2d2ae7831298e71d6fa9cc1817f7038431c' \ + '261b708d924538a7811be7ca09d1de36be414678' \ + '12abe05ce61a93cd8f3b578129f97ec6d50888bf' \ '2876e61d5e04f6117967da728bcb1d3b6785532f') build() { From crazy at frugalware.org Fri Aug 3 20:46:33 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:46:38 2007 Subject: [Frugalware-git] frugalware-current: gmime-2.2.10-1-i686 Message-ID: <20070803184633.DFF3613A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=992ba909b4522f1e755a39700d4eae500971fc70 commit 992ba909b4522f1e755a39700d4eae500971fc70 Author: crazy Date: Fri Aug 3 20:45:36 2007 +0200 gmime-2.2.10-1-i686 * Version bump diff --git a/source/lib/gmime/FrugalBuild b/source/lib/gmime/FrugalBuild index 7a7ae48..054414f 100644 --- a/source/lib/gmime/FrugalBuild +++ b/source/lib/gmime/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=gmime -pkgver=2.2.9 +pkgver=2.2.10 pkgrel=1 pkgdesc="Provides a core library and set of utilities for the creation and parsing of messages using MIME" url="http://spruce.sourceforge.net/gmime/" @@ -10,9 +10,10 @@ depends=('glib2' 'sharutils' 'zlib') makedepends=('gtk2-sharp') groups=('lib') archs=('i686' 'x86_64') +options=('scriptlet') up2date="lynx -dump http://spruce.sourceforge.net/gmime/sources/ | grep -m1 LATEST | sed 's/.*STABLE_IS_//' | sed 's/ .*//'" source=(http://spruce.sourceforge.net/gmime/sources/v2.2/$pkgname-$pkgver.tar.gz) -sha1sums=('e8ecc5d69b5c1e1e9c7fb11842aa38ed0ce62eb6') +sha1sums=('67ba36fd5ec77854670ef7155b30c8b50a8126a1') Finclude mono build() { From crazy at frugalware.org Fri Aug 3 20:49:15 2007 From: crazy at frugalware.org (crazy) Date: Fri Aug 3 20:49:16 2007 Subject: [Frugalware-git] frugalware-current: specto-0.2.2-1-i686 Message-ID: <20070803184915.3172A13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5a7858bb2859739ef39787d9d28be0c163691de1 commit 5a7858bb2859739ef39787d9d28be0c163691de1 Author: crazy Date: Fri Aug 3 20:48:28 2007 +0200 specto-0.2.2-1-i686 * Version bump diff --git a/source/gnome-extra/specto/FrugalBuild b/source/gnome-extra/specto/FrugalBuild index f37d3ab..1724d45 100644 --- a/source/gnome-extra/specto/FrugalBuild +++ b/source/gnome-extra/specto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=specto -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Specto is a desktop application that will watch for updates (web, im, irc...) and notify the user" url="http://specto.sourceforge.net" @@ -12,4 +12,4 @@ groups=('gnome-extra') archs=('x86_64' 'i686') up2date="lynx -dump http://code.google.com/p/specto/ | Flasttar" source=(http://specto.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('34c9db3a5e82a94e87a767789d2a351a35b3ec7d') +sha1sums=('ca2039f58e1c71343b2d11984862d115fdb6e5e0') From priyank at frugalware.org Fri Aug 3 21:31:42 2007 From: priyank at frugalware.org (Priyank) Date: Fri Aug 3 21:31:44 2007 Subject: [Frugalware-git] gfpm: gfpm-util: removed gfpm_vercmp() Message-ID: <20070803193142.1B70B13A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c709e21b00cf63099a1883eff4cf6a640b6062bd commit c709e21b00cf63099a1883eff4cf6a640b6062bd Author: Priyank Date: Sat Aug 4 00:13:26 2007 +0530 gfpm-util: removed gfpm_vercmp() * use pacman_pkg_vercmp() provided by libpacman. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 44868dc..fdac491 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -519,7 +519,7 @@ gfpm_load_pkgs_tvw (const char *group_name) char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); if (v1!=NULL && v2!=NULL) { - gint ret = gfpm_vercmp (v1, v2); + gint ret = pacman_pkg_vercmp (v1, v2); if (!ret) up = FALSE; else if (ret == -1) @@ -528,7 +528,7 @@ gfpm_load_pkgs_tvw (const char *group_name) up = FALSE; } else - { + { up = FALSE; } gtk_list_store_set (GTK_LIST_STORE(model), &iter, @@ -1058,7 +1058,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); if (v1!=NULL && v2!=NULL) { - gint ret = gfpm_vercmp (v1, v2); + gint ret = pacman_pkg_vercmp (v1, v2); if (!ret) up = FALSE; else if (ret == -1) diff --git a/src/gfpm-util.c b/src/gfpm-util.c index 928d77d..174ff82 100644 --- a/src/gfpm-util.c +++ b/src/gfpm-util.c @@ -42,48 +42,4 @@ gfpm_pmlist_to_glist (PM_LIST *list) return ret; } -gint -gfpm_vercmp (const char *str1, const char *str2) -{ - int l1 = 0, l2 = 0; - char st1[l1]; - char st2[l2]; - register int i; - int j = 0; - int v1, v2; - - if (str1 == NULL || str2 == NULL) - return -1; - l1 = strlen(str1); - l2 = strlen(str2); - for (i=0;i v2) - return 1; - - return -1; -} \ No newline at end of file diff --git a/src/gfpm-util.h b/src/gfpm-util.h index fbe5849..ce6981e 100644 --- a/src/gfpm-util.h +++ b/src/gfpm-util.h @@ -16,6 +16,4 @@ char * gfpm_bold (const char *); GList * gfpm_pmlist_to_glist (PM_LIST *); -gint gfpm_vercmp (const char *, const char *); - #endif From crazy at frugalware.org Sat Aug 4 02:13:48 2007 From: crazy at frugalware.org (crazy) Date: Sat Aug 4 02:13:50 2007 Subject: [Frugalware-git] frugalware-current: koffice-1.6.3-2-i686 Message-ID: <20070804001348.4D92813A4022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ea8dbd851e3d660a39cfcad4d21056935c34f759 commit ea8dbd851e3d660a39cfcad4d21056935c34f759 Author: crazy Date: Sat Aug 4 01:52:28 2007 +0200 koffice-1.6.3-2-i686 * SEC relbump * fix makedepends * closes #2301 in -current diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index 413c755..8b7fa9b 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -4,12 +4,12 @@ pkgname=koffice pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org" depends=('libkexif' 'kdebase>=3.5.7' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ - 'python>=2.5' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt' 'graphicsmagick' 'readline') -makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.7' 'mysql' 'pkgconfig') + 'python>=2.5' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt' 'graphicsmagick>=1.1.8' 'readline') +makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.7' 'mysql' 'pkgconfig' 'postgresql') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_split_docs=1 @@ -18,7 +18,8 @@ Finclude kde url="http://www.koffice.org" up2date="lynx -dump http://ftp.gwdg.de/pub/x11/kde/stable|grep 'koffice-'|grep -v latest|sort -n -r|head -n 1|sed -e 's/.*-\(.*\)/\1/' -e 's|/||g'" source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-$pkgver/src/$pkgname-$pkgver.tar.bz2 \ - desktop-files.patch) + desktop-files.patch \ + ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff) subpkgs=("$pkgname-docs") subdescs=('Koffice Documentation.') @@ -28,6 +29,7 @@ subarchs=('i686 x86_64') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" -sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3'\ - 'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a') +sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \ + 'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \ + 'bff4f540389a77320bc87e2dedece50b82932e59') # optimization OK From voroskoi at frugalware.org Sat Aug 4 10:51:46 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Aug 4 10:51:48 2007 Subject: [Frugalware-git] frugalware-current: lftp-3.5.12-1-i686 Message-ID: <20070804085146.1CB5D13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f945d71930e8473b0c06d581f82adaa9825d011c commit f945d71930e8473b0c06d581f82adaa9825d011c Author: voroskoi Date: Sat Aug 4 10:43:05 2007 +0200 lftp-3.5.12-1-i686 version bump diff --git a/source/network-extra/lftp/FrugalBuild b/source/network-extra/lftp/FrugalBuild index 636a9ec..2e4e82d 100644 --- a/source/network-extra/lftp/FrugalBuild +++ b/source/network-extra/lftp/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=lftp -pkgver=3.5.11 +pkgver=3.5.12 pkgrel=1 pkgdesc="A sophisticated ftp/http client, file transfer program" url="http://lftp.yar.ru/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') backup=('etc/lftp.conf') up2date="lynx -dump $url |grep released|sed -ne 's/.*p-\(.*\) r.*/\1/' -e '1 p'" source=(http://ftp.yars.free.net/pub/source/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('d9a3add50667cbdf98ee765d521b77f628612c0d') +sha1sums=('70a2fe381e4119b25e47076ba4a6a7000674c13f') # optimization OK From janny at frugalware.org Sat Aug 4 10:57:26 2007 From: janny at frugalware.org (janny) Date: Sat Aug 4 10:57:28 2007 Subject: [Frugalware-git] fwlive: add fwlive kernel specific modules in Message-ID: <20070804085726.E692B13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive/.git;a=commitdiff;h=1530a91511922d1d74864d9f3d758e7478610072 commit 1530a91511922d1d74864d9f3d758e7478610072 Author: janny Date: Sat Aug 4 10:56:56 2007 +0200 add fwlive kernel specific modules in diff --git a/config b/config index f78a5e7..1a35114 100644 --- a/config +++ b/config @@ -63,7 +63,12 @@ SAVEDIRS = etc home root var CONFIG_SETUP = y # additional packages to be installed by the profiles -DRIVERS = ndiswrapper-fwlive ipw2200-firmware acx100 madwifi rt2500 +DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \ + qc-usb-fwlive cdemu-fwlive truecrypt-fwlive dazuko-fwlive \ + busybox-fwlive lirc-fwlive acerhk-fwlive fglrx-fwlive \ + nvidia-96xx-fwlive nvidia-fwlive madwifi-fwlive rt2500-fwlive \ + wlan-ng-fwlive acx100-fwlive adm8211-fwlive ipw3945-fwlive \ + ndiswrapper-fwlive rt2400-fwlive rtl8110-fwlive kqemu-fwlive INST_MUSTHAVE_APPS = busybox-fwlive util-linux grub-theme-fwlive \ sudo aufs squashfs cdrtools ntfs-3g ifneq ($(ARCH),x86_64) From boobaa at frugalware.org Sat Aug 4 11:02:13 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Aug 4 11:02:15 2007 Subject: [Frugalware-git] frugalware-current: spamassassin-3.2.2-1-i686 Message-ID: <20070804090213.A0E3C13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=089efb95b5801a82188c4ea8908f232d3989f118 commit 089efb95b5801a82188c4ea8908f232d3989f118 Author: CSÉCSY LĂĄszlĂł Date: Sat Aug 4 11:01:30 2007 +0200 spamassassin-3.2.2-1-i686 version bump new m8r diff --git a/source/network-extra/spamassassin/FrugalBuild b/source/network-extra/spamassassin/FrugalBuild index 3851e4b..a39a025 100644 --- a/source/network-extra/spamassassin/FrugalBuild +++ b/source/network-extra/spamassassin/FrugalBuild @@ -1,8 +1,9 @@ # Compiling time: 0.07 SBU -# Maintainer: Bence Nagy +# Maintainer: CSÉCSY László +# Former m8r: Bence Nagy pkgname=spamassassin -pkgver=3.1.8 +pkgver=3.2.2 pkgrel=1 pkgdesc="A mail filter to identify spam." url="http://spamassassin.apache.org" @@ -27,7 +28,7 @@ build() { Frcd spamd Ffile /etc/sysconfig/spamd } -sha1sums=('08f81f72d8a783887cf815dfc55ea38e3582b966'\ +sha1sums=('e8ea034fa4f695607af0e596c86c5daf82f234e0'\ '3b47547d8649cbfb82b11276a3986e4e17d1c997'\ '4883d67843dc9b32f71667b8a2b549fb9f88a0b7') From voroskoi at frugalware.org Sat Aug 4 11:12:15 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Aug 4 11:12:16 2007 Subject: [Frugalware-git] frugalware-current: nginx-0.5.30-1-i686 Message-ID: <20070804091215.37E5413A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9f4c7294aaceaa4061e5a725ce1d583f7cf5a8b1 commit 9f4c7294aaceaa4061e5a725ce1d583f7cf5a8b1 Author: voroskoi Date: Sat Aug 4 11:06:29 2007 +0200 nginx-0.5.30-1-i686 version bump diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild index e9ac641..126ddd4 100644 --- a/source/network-extra/nginx/FrugalBuild +++ b/source/network-extra/nginx/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: voroskoi pkgname=nginx -pkgver=0.5.28 +pkgver=0.5.30 pkgrel=1 pkgdesc="[engine x] is a HTTP server and mail proxy server." url="http://nginx.net/" license="BSD" -depends=('glibc' 'pcre' 'openssl' 'zlib') +depends=('pcre' 'openssl' 'zlib') groups=('network-extra') archs=('i686' 'x86_64') provides=('httpd') @@ -49,7 +49,7 @@ build() { Fmv $Fsysconfdir/$pkgname/html $Flocalstatedir/www/$pkgname Fln $Flocalstatedir/www/$pkgname $Fsysconfdir/$pkgname/html } -sha1sums=('6aa6ab7c3ee231757a5f50f1eb1fc8d375fd074f' \ +sha1sums=('c795073ffc60b007c57bc29d8e61bbe772582838' \ 'e8cc09710ba365eb932d1710f4aac629e49452ff' \ 'da58d8a74dbb081c3dfb69317999e10f1ebf991e' \ '3a4cc4564ce610400e012d7c391107f33a258f1e') From voroskoi at frugalware.org Sat Aug 4 11:33:06 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Aug 4 11:33:07 2007 Subject: [Frugalware-git] frugalware-current: libevent-1.3-4-i686 Message-ID: <20070804093306.8C0CD13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=814fdba9be9c575f6ef3c06e8bf980642daf609b commit 814fdba9be9c575f6ef3c06e8bf980642daf609b Author: voroskoi Date: Sat Aug 4 11:28:40 2007 +0200 libevent-1.3-4-i686 bump to patchlevel c sha1->signatures diff --git a/source/lib/libevent/FrugalBuild b/source/lib/libevent/FrugalBuild index 9cf9c78..af1ad7a 100644 --- a/source/lib/libevent/FrugalBuild +++ b/source/lib/libevent/FrugalBuild @@ -4,8 +4,8 @@ pkgname=libevent pkgver=1.3 -pkgrel=3 -pkgextraver=b +pkgrel=4 +pkgextraver=c pkgdesc="Provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached" url="http://www.monkey.org/~provos/libevent/" groups=('lib') @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') depends=('glibc') up2date="lynx -dump http://www.monkey.org/~provos/libevent/|grep -om1 'libevent-\(.*\).tar.gz$'|sed 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//'" source=(http://www.monkey.org/~provos/$pkgname-$pkgver$pkgextraver.tar.gz) +signatures=($source.sig) -sha1sums=('41e2b71bcb51df4ef1563a11e8a726ecfd3907c1') # optimization OK From priyank at frugalware.org Sat Aug 4 11:38:15 2007 From: priyank at frugalware.org (Priyank) Date: Sat Aug 4 11:38:16 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: display License: only if exists. Message-ID: <20070804093815.2F16813A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=095380843d6b6f2a465dcd7c94d54c70bf5e9171 commit 095380843d6b6f2a465dcd7c94d54c70bf5e9171 Author: Priyank Date: Sat Aug 4 15:06:54 2007 +0530 gfpm-interface: display License: only if exists. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index fdac491..b35cbca 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -626,14 +626,17 @@ gfpm_load_info_tvw (const char *pkg_name) str = g_string_append (str, (char*)pacman_list_getdata(i)); str = g_string_append (str, " "); } - gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = (char*)gfpm_bold (_("License:")); - gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, st, - 1, (char*)str->str, - -1); - g_free (st); - g_string_free (str, TRUE); + if (str->len > 1) + { + st = (char*)gfpm_bold (_("License:")); + gtk_list_store_append (GTK_LIST_STORE(model), &iter); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, + 0, st, + 1, (char*)str->str, + -1); + g_free (st); + g_string_free (str, TRUE); + } } /* populate depends */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_DEPENDS); From priyank at frugalware.org Sat Aug 4 11:51:17 2007 From: priyank at frugalware.org (Priyank) Date: Sat Aug 4 11:51:18 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: fixed a bug in package search where packages were shown as installed even if they were not installed. Message-ID: <20070804095117.D44D513A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=b0497cd439e8f8d3f0c1a30eef972b278b653b6e commit b0497cd439e8f8d3f0c1a30eef972b278b653b6e Author: Priyank Date: Sat Aug 4 15:20:06 2007 +0530 gfpm-interface: fixed a bug in package search where packages were shown as installed even if they were not installed. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index b35cbca..05ba62c 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -1077,7 +1077,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) gtk_list_store_set (store, &iter, 0, TRUE, 1, (up==FALSE)?icon_yes:icon_up, - 2, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_NAME), + 2, (char*)pacman_pkg_getinfo (pm_spkg, PM_PKG_NAME), 3, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION), 4, (char*)pacman_pkg_getinfo (pm_spkg, PM_PKG_VERSION), //5, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_DESC), @@ -1114,7 +1114,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) if (inst == TRUE) gtk_list_store_set (store, &iter, 3, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION), -1); else - gtk_list_store_set (store, &iter, 3, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION), -1); + gtk_list_store_set (store, &iter, 3, NULL, -1); gtk_list_store_set (store, &iter, 0, inst, From voroskoi at frugalware.org Sat Aug 4 12:37:43 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Aug 4 12:37:45 2007 Subject: [Frugalware-git] frugalware-current: sqlite3-3.4.1-1-i686 Message-ID: <20070804103743.75B2E13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4eb34950df99f63047c51844284f70cbf08284a4 commit 4eb34950df99f63047c51844284f70cbf08284a4 Author: voroskoi Date: Sat Aug 4 12:29:13 2007 +0200 sqlite3-3.4.1-1-i686 version bump updated depends() diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild index e64966e..73d1317 100644 --- a/source/lib/sqlite3/FrugalBuild +++ b/source/lib/sqlite3/FrugalBuild @@ -3,11 +3,11 @@ # Maintainer: voroskoi pkgname=sqlite3 -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" -depends=('glibc' 'readline' 'ncurses') +depends=('readline') makedepends=('tcl') groups=('lib') archs=('i686' 'x86_64') @@ -27,6 +27,6 @@ build() Fexerel /usr/bin/lemon Ffilerel /usr/share/man/man1/$pkgname.1 } -sha1sums=('e3b4711a619a5af1ccb1232c76eb7534d25ab431') +sha1sums=('73cdeed7b01e107203ddddc75c02ef113564d5ce') # optimization OK From vmiklos at frugalware.org Sat Aug 4 13:15:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 13:15:59 2007 Subject: [Frugalware-git] frugalware-current: glibc-2.6-3-i686 Message-ID: <20070804111557.7306F13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7be356f23fc169ebce4aaa8dbd7d8ebddf4637bf commit 7be356f23fc169ebce4aaa8dbd7d8ebddf4637bf Author: VMiklos Date: Sat Aug 4 13:15:31 2007 +0200 glibc-2.6-3-i686 up2date fix thx crazy for noticing that this is buggy diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index ffe0886..eab86ca 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.gnu.org/software/libc/libc.html" depends=() groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://ftp.gnu.org/gnu/glibc/|grep 'glibc-[0-9\.]*tar.bz2$'|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" +up2date="lynx -dump http://ftp.gnu.org/gnu/glibc/?M=A|grep 'glibc-[0-9\.]*tar.gz$'|Flasttar" source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 \ glibc-2.6-malloc.diff) signatures=("$source.sig" '') From vmiklos at frugalware.org Sat Aug 4 13:21:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 13:21:26 2007 Subject: [Frugalware-git] frugalware-current: strace-4.5.16-1-i686 Message-ID: <20070804112124.B7F7813A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7340bb3c44a6486d8da342ab497b21eff2aa234c commit 7340bb3c44a6486d8da342ab497b21eff2aa234c Author: VMiklos Date: Sat Aug 4 13:21:15 2007 +0200 strace-4.5.16-1-i686 version bump diff --git a/source/devel/strace/FrugalBuild b/source/devel/strace/FrugalBuild index 07dfef5..c026628 100644 --- a/source/devel/strace/FrugalBuild +++ b/source/devel/strace/FrugalBuild @@ -2,16 +2,14 @@ # Maintainer: VMiklos pkgname=strace -pkgver=4.5.15 +pkgver=4.5.16 pkgrel=1 pkgdesc="A system call trace, which prints out a trace of all the system calls made by a another process/program." +url="http://www.liacs.nl/~wichert/strace/" depends=('glibc') groups=('devel') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -url="http://www.liacs.nl/~wichert/strace/" - +sha1sums=('cc4a40661eccb1aaf960ffa9fac95d754536a5c5') # optimization OK - -sha1sums=('a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48') From vmiklos at frugalware.org Sat Aug 4 13:23:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 13:23:59 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.4-1-i686 Message-ID: <20070804112358.0B28A13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f83890f3096434efe486681a8f6aeaf660a9fe4b commit f83890f3096434efe486681a8f6aeaf660a9fe4b Author: VMiklos Date: Sat Aug 4 13:23:51 2007 +0200 git-1.5.2.4-1-i686 up2date fix diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index cd2d90d..8a6ad99 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -10,7 +10,7 @@ depends=('curl>=7.16.0' 'openssl') makedepends=('asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common' 'xmlto') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump '$url/?C=M;O=D'|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" +up2date="lynx -dump '$url/?C=M;O=D'|grep 'git-[0-9.]*.tar.bz2$'|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/$pkgname-$pkgver.tar.bz2 \ gitweb.modules.d gitweb.conf README.Frugalware) signatures=(${source[0]}.sign '' '' '') From vmiklos at frugalware.org Sat Aug 4 13:38:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 13:38:49 2007 Subject: [Frugalware-git] frugalware-current: pysvn-1.5.2-1-i686 Message-ID: <20070804113848.530BE13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4c0452fc16eeb7adc49edb459344560e0d60a100 commit 4c0452fc16eeb7adc49edb459344560e0d60a100 Author: VMiklos Date: Sat Aug 4 13:38:39 2007 +0200 pysvn-1.5.2-1-i686 version bump updated -apr.diff diff --git a/source/devel-extra/pysvn/FrugalBuild b/source/devel-extra/pysvn/FrugalBuild index 0e250f9..0178fa9 100644 --- a/source/devel-extra/pysvn/FrugalBuild +++ b/source/devel-extra/pysvn/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=pysvn -pkgver=1.5.1 -pkgid=36248 +pkgver=1.5.2 +pkgid=38915 pkgrel=1 pkgdesc="Python bindings for Subversion" url="http://pysvn.tigris.org/servlets/ProjectDocumentList?folderID=1762" @@ -13,7 +13,9 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|Flasttar" source=(http://pysvn.tigris.org/files/documents/1233/$pkgid/pysvn-$pkgver.tar.gz \ - pysvn-1.5.0-apr.diff) + pysvn-1.5.2-apr.diff) +sha1sums=('5664894815a33c220ce4f8c06c8151ab0cfe7712' \ + '58204e409d3426cbb6508ea8310af8987e80cef2') Finclude python build() @@ -27,5 +29,3 @@ build() Fexerel pysvn/_pysvn_2_5.so $_F_python_libdir/pysvn/ } -sha1sums=('1f24b5b18bf93fc978afca049a219128c372ca57'\ - '1b2412c256caa8f938a029c4beee26310471c570') diff --git a/source/devel-extra/pysvn/pysvn-1.5.0-apr.diff b/source/devel-extra/pysvn/pysvn-1.5.0-apr.diff deleted file mode 100644 index d98a60e..0000000 --- a/source/devel-extra/pysvn/pysvn-1.5.0-apr.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur pysvn-1.5.0.orig/Source/setup.py pysvn-1.5.0/Source/setup.py ---- pysvn-1.5.0.orig/Source/setup.py 2006-10-16 23:51:38.000000000 +0200 -+++ pysvn-1.5.0/Source/setup.py 2006-10-23 17:03:17.000000000 +0200 -@@ -262,7 +262,7 @@ - -lsvn_client-1 \ - -lsvn_diff-1 \ - -lsvn_repos-1 \ -- -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -lcom_err -lresolv -lexpat -lneon -+ -lkrb5 -lcom_err -lresolv -lexpat -lneon - - #include pysvn_common.mak - ''' -@@ -478,8 +478,8 @@ - def find_apr_lib( self, argv ): - last_exception = None - for apr_libname, self.lib_apr in [ -- (self.is_mac_os_x and 'libapr-1.dylib' or 'libapr-1.so', 'apr-1'), -- (self.is_mac_os_x and 'libapr-0.dylib' or 'libapr-0.so', 'apr-0')]: -+ (self.is_mac_os_x and 'libapr-1.dylib' or 'libapr.so.1', 'apr-1'), -+ (self.is_mac_os_x and 'libapr-0.dylib' or 'libapr.so.0', 'apr-0')]: - try: - return self.find_dir( argv, - 'APR library', diff --git a/source/devel-extra/pysvn/pysvn-1.5.2-apr.diff b/source/devel-extra/pysvn/pysvn-1.5.2-apr.diff new file mode 100644 index 0000000..f04d180 --- /dev/null +++ b/source/devel-extra/pysvn/pysvn-1.5.2-apr.diff @@ -0,0 +1,22 @@ +--- pysvn-1.5.2.orig/Source/setup.py 2007-07-01 12:30:50.000000000 +0200 ++++ pysvn-1.5.2/Source/setup.py 2007-08-04 13:30:54.000000000 +0200 +@@ -331,7 +331,7 @@ + -lsvn_client-1 \ + -lsvn_diff-1 \ + -lsvn_repos-1 \ +- -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -lcom_err -lresolv -lexpat -lneon ++ -lkrb5 -lcom_err -lresolv -lexpat -lneon + + #include pysvn_common.mak + ''' +@@ -644,8 +644,8 @@ + + def find_apr_lib( self, argv ): + last_exception = None +- lib_list = [(self.get_lib_name_for_platform( 'libapr-1' ), 'apr-1'), +- (self.get_lib_name_for_platform( 'libapr-0' ), 'apr-0')] ++ lib_list = [('libapr.so.1', 'apr-1'), ++ ('libapr.so.0', 'apr-0')] + + for apr_libname, self.lib_apr in lib_list: + try: From vmiklos at frugalware.org Sat Aug 4 13:49:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 13:49:08 2007 Subject: [Frugalware-git] frugalware-current: intltool-0.36.0-1-i686 Message-ID: <20070804114907.06F0613A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5efe2ea0566456945bd2ab2cbe18159a2492f209 commit 5efe2ea0566456945bd2ab2cbe18159a2492f209 Author: VMiklos Date: Sat Aug 4 13:48:58 2007 +0200 intltool-0.36.0-1-i686 version bump diff --git a/source/gnome/intltool/FrugalBuild b/source/gnome/intltool/FrugalBuild index bc36eb3..0777b19 100644 --- a/source/gnome/intltool/FrugalBuild +++ b/source/gnome/intltool/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=intltool -pkgver=0.35.5 +pkgver=0.36.0 pkgrel=1 pkgdesc="Contains scripts and autoconf magic for internationalizing various kinds of data files." url="http://www.gnome.org/" @@ -11,4 +11,4 @@ groups=('gnome') archs=('i686' 'x86_64') _F_gnome_devel=y Finclude gnome -sha1sums=('df8aa0543e4d9fc100c3268aa6e6a777a81a2461') +sha1sums=('991aafd9b215e6131a57be2f8ed76df422e968da') From vmiklos at frugalware.org Sat Aug 4 13:55:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 13:55:43 2007 Subject: [Frugalware-git] frugalware-current: festival-1.4.3-2-i686 Message-ID: <20070804115535.2D7B113A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7494ebdfa506dd8d347d56b5e4ee052502e3bfc9 commit 7494ebdfa506dd8d347d56b5e4ee052502e3bfc9 Author: VMiklos Date: Sat Aug 4 13:55:30 2007 +0200 festival-1.4.3-2-i686 up2date fix diff --git a/source/apps-extra/festival/FrugalBuild b/source/apps-extra/festival/FrugalBuild index b1140f1..b4f37dc 100644 --- a/source/apps-extra/festival/FrugalBuild +++ b/source/apps-extra/festival/FrugalBuild @@ -10,7 +10,7 @@ pkgurl="http://www.speech.cs.cmu.edu/festival/cstr/festival/$pkgver" depends=('speech_tools') groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump '$pkgurl/../?M=D'|grep '][0-9\.]*/$'|sed -n 's|.*]\(.*\)/|\1|;$ p'" +up2date="lynx -dump $pkgurl/..|grep '][0-9.]*/ '|sed -n 's/.*]\(.*\)\/ .*/\1/;$ p'" source=($pkgurl/$pkgname-$pkgver-release.tar.gz \ $pkgname-$pkgver-gcc33.diff \ server.scm \ From vmiklos at frugalware.org Sat Aug 4 14:45:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 14:45:57 2007 Subject: [Frugalware-git] frugalware-current: wnews-0.8-1-i686 Message-ID: <20070804124556.887EA13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ceadbf242ff3a130d5761f896016dcc8782d5b20 commit ceadbf242ff3a130d5761f896016dcc8782d5b20 Author: VMiklos Date: Sat Aug 4 14:45:46 2007 +0200 wnews-0.8-1-i686 up2date fix diff --git a/source/network-extra/wnews/FrugalBuild b/source/network-extra/wnews/FrugalBuild index ad6a507..76765c8 100644 --- a/source/network-extra/wnews/FrugalBuild +++ b/source/network-extra/wnews/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.kerneled.org/projects/wnews/" depends=('ncurses') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url/releases|grep [0-9].tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'" +up2date="lynx -dump http://www.usinglinux.org/www/wnews.html|grep Version|sed 's/.* : //'" source=(http://www.kerneled.org/projects/wnews/releases/$pkgname-$pkgver.tar.gz) sha1sums=('32a20771a79a6c8d4b7d52f68098c859b10cb779') From vmiklos at frugalware.org Sat Aug 4 14:48:04 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 14:48:06 2007 Subject: [Frugalware-git] frugalware-current: ltp-20070630-1-i686 Message-ID: <20070804124804.7825113A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d477d074be54ee538ba1dcb66e3719809eedb1ac commit d477d074be54ee538ba1dcb66e3719809eedb1ac Author: VMiklos Date: Sat Aug 4 14:47:59 2007 +0200 ltp-20070630-1-i686 up2date fix diff --git a/source/apps-extra/ltp/FrugalBuild b/source/apps-extra/ltp/FrugalBuild index e3282ac..07c98dc 100644 --- a/source/apps-extra/ltp/FrugalBuild +++ b/source/apps-extra/ltp/FrugalBuild @@ -10,7 +10,7 @@ pkgdesc="Linux Test Project: testsuite for the Linux kernel" _F_sourceforge_ext=".tgz" Finclude sourceforge url="http://ltp.sourceforge.net/" -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=3382|grep ltp-full|sed 's/.*-\([^-]*\)\.t.*/\1/;q'" +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=3382|grep 'ltp-full-[0-9]*.tgz'|sed 's/.*-\([^-]*\)\.t.*/\1/;q'" depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Sat Aug 4 14:57:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 14:57:04 2007 Subject: [Frugalware-git] pacman-g2: replace hardcoded database and package extensions Message-ID: <20070804125703.BA62A13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=62e5504f07324778b08a8518006b4546b03d2105 commit 62e5504f07324778b08a8518006b4546b03d2105 Author: VMiklos Date: Sat Aug 4 14:56:48 2007 +0200 replace hardcoded database and package extensions with variables from /etc/makepkg.conf From: Marcus Habermehl diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index bf00ce6..16a5528 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -28,6 +28,12 @@ export CXXFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe" # Default name of build scripts export BUILDSCRIPT="FrugalBuild" +# Package extension +export PKG_EXT="fpm" + +# Database extension +export DB_EXT="fdb" + # Enable fakeroot for building packages as a non-root user export USE_FAKEROOT="y" diff --git a/scripts/gensync b/scripts/gensync index 9e20d2f..56bd9ca 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -40,12 +40,12 @@ usage() { echo ", unless an alternate [package_directory] is specified." echo echo "note: The name is important. It must be of the form" - echo " {treename}.fdb where {treename} is the name of the custom" + echo " {treename}.$DB_EXT where {treename} is the name of the custom" echo " package repository you configured in /etc/pacman.conf. The" echo " generated database must reside in the same directory as your" echo " custom packages (also configured in /etc/pacman.conf)" echo - echo "example: gensync /var/fst/local /home/mypkgs/custom.fdb" + echo "example: gensync /var/fst/local /home/mypkgs/custom.$DB_EXT" echo echo exit 0 @@ -74,9 +74,9 @@ get_sha1checksum() db_write_entry() { if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$1-$pkgver-$pkgrel-$arch.fpm" + pkgfile="$pkgdir/$1-$pkgver-$pkgrel-$arch.$PKG_EXT" else - pkgfile="$destdir/$1-$pkgver-$pkgrel-$arch.fpm" + pkgfile="$destdir/$1-$pkgver-$pkgrel-$arch.$PKG_EXT" fi csize=`du -b $pkgfile 2>/dev/null | cut -f1` usize=`LANG= LC_ALL= pacman-g2 -Qi -p $pkgfile 2>/dev/null|grep ^Size|sed 's/.*: \(.*\)/\1/'` diff --git a/scripts/makepkg b/scripts/makepkg index 2b946cd..5f2c37b 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -502,7 +502,7 @@ create_pkg() tar cvf /dev/null * | sort >.FILELIST # tar it up - msg2 "Compressing $1-$pkgver-$pkgrel-$CARCH.fpm " >&2 + msg2 "Compressing $1-$pkgver-$pkgrel-$CARCH.$PKG_EXT " >&2 unset extra if [ -f .INSTALL ]; then extra=".INSTALL" @@ -519,10 +519,10 @@ create_pkg() fi if [ "$INCHROOT" != "1" ]; then - tar $tarargs $PKGDEST/$1-$pkgver-$pkgrel-$CARCH.fpm .PKGINFO .FILELIST \ + tar $tarargs $PKGDEST/$1-$pkgver-$pkgrel-$CARCH.$PKG_EXT .PKGINFO .FILELIST \ $extra * else - tar $tarargs ../$1-$pkgver-$pkgrel-$CARCH.fpm .PKGINFO .FILELIST \ + tar $tarargs ../$1-$pkgver-$pkgrel-$CARCH.$PKG_EXT .PKGINFO .FILELIST \ $extra * fi @@ -582,23 +582,23 @@ install_pkg() { if [ "$INSTALL" = "1" -a "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then msg "Installing package(s) with pacman-g2 -U..." - targs="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.fpm" + targs="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" if [ ! -z "$subpkgs" ]; then i=0 for subpkg in "${subpkgs[@]}" do - targs="$targs $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.fpm" + targs="$targs $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" done fi pacman-g2 $PACMAN_OPTS -U $targs || exit $? elif [ "$INSTALL" = "1" -a "$DEP_SUDO" = "1" ]; then msg "Installing package(s) with sudo pacman-g2 -U..." - targs="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.fpm" + targs="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" if [ ! -z "$subpkgs" ]; then i=0 for subpkg in "${subpkgs[@]}" do - targs="$targs $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.fpm" + targs="$targs $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" done fi if [ "$INFAKEROOT" = "1" ]; then @@ -909,7 +909,7 @@ if [ ! -z "$subpkgs" ]; then fi fi -if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.fpm -a "$FORCE" = "0" -a "$GENSHA1" = "0" ]; then +if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT -a "$FORCE" = "0" -a "$GENSHA1" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "a package has already been built, installing existing package." install_pkg @@ -970,7 +970,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then cat /etc/pacman.conf |grep -v Include >$_F_makepkg_pacconf for i in `echo $TREE|sed 's/,/ /g'` do - repo=$(eval "echo \${${i}_fdb/.fdb}") + repo=$(eval "echo \${${i}_$DB_EXT/.$DB_EXT}") [ -z "$repo" ] && repo="$i" echo "Include = /etc/pacman.d/$repo" >>$_F_makepkg_pacconf done @@ -1049,11 +1049,11 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log fi - if [ -f $CHROOTDIR/var/tmp/fst/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.fpm ]; then - mv $CHROOTDIR/var/tmp/fst/*-${pkgver}-${pkgrel}-${CARCH}.fpm $PKGDEST + if [ -f $CHROOTDIR/var/tmp/fst/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT ]; then + mv $CHROOTDIR/var/tmp/fst/*-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT $PKGDEST if [ "`id -u`" = "0" ]; then chown `stat -c %u:%g $BUILDSCRIPT` \ - *-${pkgver}-${pkgrel}-${CARCH}.fpm + *-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT fi # copy back the buildscript, maybe modified cp $CHROOTDIR/var/tmp/fst/$BUILDSCRIPT ./ diff --git a/scripts/makeworld b/scripts/makeworld index 2afbb71..bd6e3bc 100755 --- a/scripts/makeworld +++ b/scripts/makeworld @@ -135,13 +135,13 @@ for category in $*; do if [ -f $BUILDSCRIPT ]; then . $BUILDSCRIPT buildstatus=0 - if [ ! -f $dest/$pkgname-$pkgver-$pkgrel-$CARCH.fpm ]; then + if [ ! -f $dest/$pkgname-$pkgver-$pkgrel-$CARCH.$PKG_EXT ]; then sudo makepkg $MAKEPKG_OPTS -R -L -u -k -m 2>>$toplevel/makepkg.log if [ $? -gt 0 ]; then buildstatus=2 else buildstatus=1 - mv $pkgname-$pkgver-$pkgrel-$CARCH.fpm $dest/ + mv $pkgname-$pkgver-$pkgrel-$CARCH.$PKG_EXT $dest/ fi fi d=`date +"[%b %d %H:%M]"` diff --git a/scripts/updatesync b/scripts/updatesync index 2727ad4..9565b72 100755 --- a/scripts/updatesync +++ b/scripts/updatesync @@ -45,7 +45,7 @@ usage() { echo "updatesync will calculate sha1sums of packages in the same directory as" echo ", unless an alternate [package_directory] is specified." echo - echo "example: updatesync upd /home/mypkgs/custom.fdb $BUILDSCRIPT" + echo "example: updatesync upd /home/mypkgs/custom.$DB_EXT $BUILDSCRIPT" echo echo exit 0 @@ -76,9 +76,9 @@ db_write_entry() { echo "updatesync: writing $1-$pkgver-$pkgrel" >&2 if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$1-$pkgver-$pkgrel-$arch.fpm" + pkgfile="$pkgdir/$1-$pkgver-$pkgrel-$arch.$PKG_EXT" else - pkgfile="$destdir/$1-$pkgver-$pkgrel-$arch.fpm" + pkgfile="$destdir/$1-$pkgver-$pkgrel-$arch.$PKG_EXT" fi csize=`du -b $pkgfile 2>/dev/null | cut -f1` usize=`LANG= LC_ALL= pacman-g2 -Qi -p $pkgfile 2>/dev/null|grep ^Size|sed 's/.*: \(.*\)/\1/'` From vmiklos at frugalware.org Sat Aug 4 15:32:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 15:32:56 2007 Subject: [Frugalware-git] pacman-tools: repoman: new _check_nobuild() function Message-ID: <20070804133255.658A313A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=4b430671d6bb03d7d19d0b272ec4f6753832c88b commit 4b430671d6bb03d7d19d0b272ec4f6753832c88b Author: VMiklos Date: Sat Aug 4 15:32:48 2007 +0200 repoman: new _check_nobuild() function till now if the main pkg was a nobuild one, we said the whole pkg is a nobuild one. but this is not correct: for exapmle the main fpm of the kde-i18n pkg can be a nobuild one, while the subpkgs are not diff --git a/repoman b/repoman index 1648c96..74c08d9 100755 --- a/repoman +++ b/repoman @@ -205,8 +205,8 @@ clean() # drop the group/ prefix if any i=${i#*/} msg "Cleaning up $i" - ssh $host "cd $path/frugalware-$arch && \ - echo ${options[@]} | grep -q nobuild || arch=$arch $sudo updatesync del $fdb $i && \ + ssh $host "`declare -f _check_nobuild`; cd $path/frugalware-$arch && \ + _check_nobuild || arch=$arch $sudo updatesync del $fdb $i && \ genchangelog --clean $i" done } @@ -227,14 +227,15 @@ changelog() catcmd="echo -n \"\"" fi _set_lockname - ssh $host "cd $path; \ + ssh $host "`declare -f _check_nobuild`; \ +cd $path; \ if [ ! -e $lock ]; then \ touch $lock; \ cd frugalware-$arch; \ if [ ! -e '$fdb' ]; then \ - echo ${options[@]} | grep -q nobuild || arch=$arch $sudo gensync ../source/$group/$pkg $fdb; \ + _check_nobuild || arch=$arch $sudo gensync ../source/$group/$pkg $fdb; \ else \ - echo ${options[@]} | grep -q nobuild || arch=$arch $sudo updatesync upd $fdb ../source/$group/$pkg/FrugalBuild; \ + _check_nobuild || arch=$arch $sudo updatesync upd $fdb ../source/$group/$pkg/FrugalBuild; \ fi; \ cd $path; rm $lock; \ cd $path/source/$group/$pkg; arch=$arch $sudo genchangelog; \ @@ -266,6 +267,20 @@ ask() fi } +_check_nobuild() +{ + # trick: we require subpkgs not to be set. this is because this way: + # 1) kde-i18n and such pkgs (only the main pkg is a nobuild one) is + # recgnized as a normal pkg + # 2) opera and friends (where we use nobuild is there because of + # license issues) will be recognized as a nobuild one + if echo ${options[@]} | grep -q nobuild && [ -z "$subpkgs" ]; then + return 0 + else + return 1 + fi +} + _do_record() { if [ "$F_makepkg_scm" = "git" ]; then @@ -388,7 +403,7 @@ sync() if ls *-$arch.fpm &>/dev/null; then for i in *-$arch.fpm do - echo ${options[@]} | grep -q nobuild || dry_run upload $i frugalware-$arch/ + _check_nobuild || dry_run upload $i frugalware-$arch/ done fi @@ -410,7 +425,7 @@ sync() buildlog="$pkgname-$pkgver-$pkgrel-$arch.log" if [ -f $buildlog -o -f $buildlog.bz2 ]; then [ -f $buildlog ] && dry_run bzip2 $buildlog - echo ${options[@]} | grep -q nobuild || dry_run upload $buildlog.bz2 source/$groups/$pkgname/ + _check_nobuild || dry_run upload $buildlog.bz2 source/$groups/$pkgname/ fi ls *-$arch.fpm &>/dev/null && fpmdel From vmiklos at frugalware.org Sat Aug 4 15:39:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 15:40:01 2007 Subject: [Frugalware-git] frugalware-current: user-mode-linux-2.6.22-1-i686 Message-ID: <20070804133959.5DD8A13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e5bc534a9a06bcde546c42e4894743f0250965f9 commit e5bc534a9a06bcde546c42e4894743f0250965f9 Author: VMiklos Date: Sat Aug 4 15:37:08 2007 +0200 user-mode-linux-2.6.22-1-i686 version bump built with CONFIG_MODULES=n added -aio.diff buildfix from the user-mode-linux-devel list diff --git a/source/apps-extra/user-mode-linux/FrugalBuild b/source/apps-extra/user-mode-linux/FrugalBuild index e12e134..435326b 100644 --- a/source/apps-extra/user-mode-linux/FrugalBuild +++ b/source/apps-extra/user-mode-linux/FrugalBuild @@ -2,41 +2,28 @@ # Maintainer: VMiklos pkgname=user-mode-linux -pkgver=2.6.21 -patchlevel=.5 -pkgrel=2 +pkgver=2.6.22 +patchlevel=.1 +pkgrel=1 pkgdesc="A safe, secure way of running Linux versions and Linux processes." url="http://user-mode-linux.sourceforge.net/" depends=('uml_utilities') groups=('apps-extra') -archs=('i686' 'x86_64') +archs=('i686') up2date="lynx -dump http://www.kernel.org/kdist/finger_banner |sed -n 's/.* \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'" +# check http://uml.nagafix.co.uk/kernels for configs source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver$patchlevel.tar.bz2 \ - config README.Frugalware) -signatures=($source.sign '' '') + config.i686 README.Frugalware linux-2.6.22-aio.diff) +signatures=($source.sign '' '' '') build() { Fcd linux-$pkgver$patchlevel - cp $Fsrcdir/config .config - Fsed "486" "`echo ${MARCH:-$CARCH}|sed 's/^i//'`" .config Fpatchall - yes "" | make config ARCH=um + cp $Fsrcdir/config.$CARCH .config Fsed "EXTRAVERSION =.*" "EXTRAVERSION = -fw$pkgrel" Makefile - export LDFLAGS="${LDFLAGS/-Wl,/}" make linux ARCH=um || return 1 - make modules ARCH=um || return 1 - - Fmkdir /usr/share/user-mode-linux Fexerel /usr/bin/linux - make modules_install \ - INSTALL_MOD_PATH=$Fdestdir/usr/share/user-mode-linux ARCH=um - for i in source build - do - Frm /usr/share/$pkgname/lib/modules/$pkgver-fw$pkgrel/$i - Fln /usr/src/linux \ - /usr/share/$pkgname/lib/modules/$pkgver-fw$pkgrel/$i - done Fdoc README.Frugalware } diff --git a/source/apps-extra/user-mode-linux/config b/source/apps-extra/user-mode-linux/config deleted file mode 100644 index 97b405b..0000000 --- a/source/apps-extra/user-mode-linux/config +++ /dev/null @@ -1,425 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.10 -# Fri Jan 21 20:36:52 2005 -# -CONFIG_USERMODE=y -CONFIG_MMU=y -CONFIG_UID16=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y - -# -# UML-specific options -# -CONFIG_MODE_TT=y -CONFIG_MODE_SKAS=y -CONFIG_NET=y -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=y -CONFIG_HOSTFS=y -CONFIG_MCONSOLE=y -# CONFIG_HOST_2G_2G is not set -# CONFIG_SMP is not set -CONFIG_NEST_LEVEL=0 -CONFIG_KERNEL_HALF_GIGS=1 -CONFIG_KERNEL_STACK_ORDER=2 -CONFIG_UML_REAL_TIME_CLOCK=y - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y -CONFIG_BROKEN_ON_SMP=y - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set -CONFIG_SYSCTL=y -# CONFIG_AUDIT is not set -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_HOTPLUG is not set -# CONFIG_IKCONFIG is not set -# CONFIG_EMBEDDED is not set -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SHMEM=y -# CONFIG_TINY_SHMEM is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y -CONFIG_MODVERSIONS=y -CONFIG_KMOD=y - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_DEBUG_DRIVER is not set - -# -# Character Devices -# -CONFIG_STDIO_CONSOLE=y -CONFIG_SSL=y -CONFIG_FD_CHAN=y -CONFIG_NULL_CHAN=y -CONFIG_PORT_CHAN=y -CONFIG_PTY_CHAN=y -CONFIG_TTY_CHAN=y -CONFIG_XTERM_CHAN=y -# CONFIG_NOCONFIG_CHAN is not set -CONFIG_CON_ZERO_CHAN="fd:0,fd:1" -CONFIG_CON_CHAN="xterm" -CONFIG_SSL_CHAN="pty" -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_WATCHDOG is not set -CONFIG_UML_SOUND=y -CONFIG_SOUND=y -CONFIG_HOSTAUDIO=y - -# -# Block Devices -# -CONFIG_BLK_DEV_UBD=y -# CONFIG_BLK_DEV_UBD_SYNC is not set -CONFIG_BLK_DEV_COW_COMMON=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=20480 -CONFIG_BLK_DEV_INITRD=y -CONFIG_NETDEVICES=y - -# -# UML Network Devices -# -CONFIG_UML_NET=y -CONFIG_UML_NET_ETHERTAP=y -CONFIG_UML_NET_TUNTAP=y -CONFIG_UML_NET_SLIP=y -CONFIG_UML_NET_DAEMON=y -CONFIG_UML_NET_MCAST=y -CONFIG_UML_NET_SLIRP=y - -# -# Networking support -# - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -# CONFIG_NETLINK_DEV is not set -CONFIG_UNIX=y -# CONFIG_NET_KEY is not set -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_IPV6 is not set -# CONFIG_NETFILTER is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_HW_FLOWCONTROL is not set - -# -# QoS and/or fair queueing -# -# CONFIG_NET_SCHED is not set -# CONFIG_NET_CLS_ROUTE is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -CONFIG_DUMMY=y -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -CONFIG_TUN=y - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=m - -# -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) -# -# CONFIG_NET_RADIO is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set -CONFIG_PPP=y -# CONFIG_PPP_MULTILINK is not set -# CONFIG_PPP_FILTER is not set -# CONFIG_PPP_ASYNC is not set -# CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set -# CONFIG_PPP_BSDCOMP is not set -# CONFIG_PPPOE is not set -CONFIG_SLIP=y -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -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 is not set -# CONFIG_JFS_FS is not set -# CONFIG_XFS_FS is not set -CONFIG_MINIX_FS=y -CONFIG_ROMFS_FS=y -CONFIG_QUOTA=y -# CONFIG_QFMT_V1 is not set -# CONFIG_QFMT_V2 is not set -CONFIG_QUOTACTL=y -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_SYSFS=y -CONFIG_DEVFS_FS=y -# CONFIG_DEVFS_MOUNT is not set -# CONFIG_DEVFS_DEBUG is not set -# CONFIG_DEVPTS_FS_XATTR is not set -CONFIG_TMPFS=y -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y - -# -# Miscellaneous filesystems -# -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set - -# -# Network File Systems -# -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -# CONFIG_NFSD is not set -# CONFIG_EXPORTFS is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_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 is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -CONFIG_LDM_DEBUG=y -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_EFI_PARTITION is not set - -# -# Native Language Support -# -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 - -# -# Security options -# -# CONFIG_SECURITY is not set - -# -# Cryptographic options -# -# CONFIG_CRYPTO is not set - -# -# Library routines -# -# CONFIG_CRC_CCITT is not set -# CONFIG_CRC32 is not set -# CONFIG_LIBCRC32C is not set -CONFIG_ZLIB_INFLATE=y - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set -# CONFIG_INPUT is not set - -# -# Kernel hacking -# -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_SPINLOCK is not set -CONFIG_DEBUG_INFO=y -CONFIG_FRAME_POINTER=y -CONFIG_PT_PROXY=y -# CONFIG_GPROF is not set -# CONFIG_GCOV is not set diff --git a/source/apps-extra/user-mode-linux/config.i686 b/source/apps-extra/user-mode-linux/config.i686 new file mode 100644 index 0000000..5839e5f --- /dev/null +++ b/source/apps-extra/user-mode-linux/config.i686 @@ -0,0 +1,856 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22.1 +# Sun Jul 22 22:40:16 2007 +# +CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig" +CONFIG_GENERIC_HARDIRQS=y +CONFIG_UML=y +CONFIG_MMU=y +CONFIG_NO_IOMEM=y +# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set +CONFIG_LOCKDEP_SUPPORT=y +# CONFIG_STACKTRACE_SUPPORT is not set +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_BUG=y +CONFIG_IRQ_RELEASE_METHOD=y + +# +# UML-specific options +# +CONFIG_STATIC_LINK=y +CONFIG_MODE_SKAS=y + +# +# Host processor type and features +# +# 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_MCORE2 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_X86_GENERIC=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_XADD=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +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_MODEL=4 +CONFIG_UML_X86=y +# CONFIG_64BIT is not set +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_HOST_VMSPLIT_3G=y +# CONFIG_HOST_VMSPLIT_3G_OPT is not set +# CONFIG_HOST_VMSPLIT_2G is not set +# CONFIG_HOST_VMSPLIT_1G is not set +CONFIG_TOP_ADDR=0xC0000000 +# CONFIG_3_LEVEL_PGTABLES is not set +CONFIG_STUB_CODE=0xbfffe000 +CONFIG_STUB_DATA=0xbffff000 +CONFIG_STUB_START=0xbfffe000 +CONFIG_ARCH_HAS_SC_SIGNALS=y +CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y +CONFIG_GENERIC_HWEIGHT=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_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_LD_SCRIPT_STATIC=y +CONFIG_NET=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=y +CONFIG_HOSTFS=y +CONFIG_HPPFS=y +CONFIG_MCONSOLE=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_NEST_LEVEL=0 +# CONFIG_HIGHMEM is not set +CONFIG_KERNEL_STACK_ORDER=2 +CONFIG_UML_REAL_TIME_CLOCK=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=128 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +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=y +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_TIMERFD=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_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +# CONFIG_MODULES is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# 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" + +# +# Block devices +# +CONFIG_BLK_DEV_UBD=y +CONFIG_BLK_DEV_UBD_SYNC=y +CONFIG_BLK_DEV_COW_COMMON=y +# CONFIG_MMAPPER is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=y +CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_ATA_OVER_ETH is not set + +# +# Character Devices +# +CONFIG_STDERR_CONSOLE=y +CONFIG_STDIO_CONSOLE=y +CONFIG_SSL=y +CONFIG_NULL_CHAN=y +CONFIG_PORT_CHAN=y +CONFIG_PTY_CHAN=y +CONFIG_TTY_CHAN=y +# CONFIG_XTERM_CHAN is not set +CONFIG_NOCONFIG_CHAN=y +CONFIG_CON_ZERO_CHAN="fd:0,fd:1" +CONFIG_CON_CHAN="pty" +CONFIG_SSL_CHAN="pty" +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +# CONFIG_RAW_DRIVER is not set +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_SOFT_WATCHDOG=y +CONFIG_UML_WATCHDOG=y +# CONFIG_UML_SOUND is not set +# CONFIG_SOUND is not set +# CONFIG_HOSTAUDIO is not set +# CONFIG_HW_RANDOM is not set +CONFIG_UML_RANDOM=y + +# +# Generic Driver Options +# +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 + +# +# Networking +# + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=y +CONFIG_IPV6_MIP6=y +CONFIG_INET6_XFRM_TUNNEL=y +CONFIG_INET6_TUNNEL=y +# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET6_XFRM_MODE_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_BEET=y +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y +CONFIG_IPV6_SIT=y +CONFIG_IPV6_TUNNEL=y +# CONFIG_IPV6_MULTIPLE_TABLES 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=y +CONFIG_NETFILTER_NETLINK_QUEUE=y +CONFIG_NETFILTER_NETLINK_LOG=y +CONFIG_NF_CONNTRACK_ENABLED=y +CONFIG_NF_CONNTRACK=y +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_SCTP is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=y +# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_IRC=y +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SIP is not set +CONFIG_NF_CONNTRACK_TFTP=y +# CONFIG_NF_CT_NETLINK is not set +CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_DSCP=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_NOTRACK=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_MATCH_COMMENT=y +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y +CONFIG_NETFILTER_XT_MATCH_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_DCCP=y +CONFIG_NETFILTER_XT_MATCH_DSCP=y +CONFIG_NETFILTER_XT_MATCH_ESP=y +CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_LENGTH=y +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_REALM=y +CONFIG_NETFILTER_XT_MATCH_SCTP=y +CONFIG_NETFILTER_XT_MATCH_STATE=y +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y +CONFIG_NETFILTER_XT_MATCH_STRING=y +CONFIG_NETFILTER_XT_MATCH_TCPMSS=y +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_IPRANGE=y +CONFIG_IP_NF_MATCH_TOS=y +CONFIG_IP_NF_MATCH_RECENT=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_AH=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_MATCH_OWNER=y +CONFIG_IP_NF_MATCH_ADDRTYPE=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_LOG=y +CONFIG_IP_NF_TARGET_ULOG=y +CONFIG_NF_NAT=y +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_SAME=y +CONFIG_NF_NAT_SNMP_BASIC=y +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_IRC=y +CONFIG_NF_NAT_TFTP=y +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +# CONFIG_NF_NAT_SIP is not set +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_TARGET_TOS=y +CONFIG_IP_NF_TARGET_ECN=y +CONFIG_IP_NF_TARGET_TTL=y +CONFIG_IP_NF_TARGET_CLUSTERIP=y +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARP_MANGLE=y + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_NF_CONNTRACK_IPV6=y +CONFIG_IP6_NF_QUEUE=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MATCH_RT=y +CONFIG_IP6_NF_MATCH_OPTS=y +CONFIG_IP6_NF_MATCH_FRAG=y +CONFIG_IP6_NF_MATCH_HL=y +CONFIG_IP6_NF_MATCH_OWNER=y +CONFIG_IP6_NF_MATCH_IPV6HEADER=y +CONFIG_IP6_NF_MATCH_AH=y +CONFIG_IP6_NF_MATCH_MH=y +CONFIG_IP6_NF_MATCH_EUI64=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_LOG=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_TARGET_HL=y +CONFIG_IP6_NF_RAW=y + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=y +CONFIG_BRIDGE_EBT_BROUTE=y +CONFIG_BRIDGE_EBT_T_FILTER=y +CONFIG_BRIDGE_EBT_T_NAT=y +CONFIG_BRIDGE_EBT_802_3=y +CONFIG_BRIDGE_EBT_AMONG=y +CONFIG_BRIDGE_EBT_ARP=y +CONFIG_BRIDGE_EBT_IP=y +CONFIG_BRIDGE_EBT_LIMIT=y +CONFIG_BRIDGE_EBT_MARK=y +CONFIG_BRIDGE_EBT_PKTTYPE=y +CONFIG_BRIDGE_EBT_STP=y +CONFIG_BRIDGE_EBT_VLAN=y +CONFIG_BRIDGE_EBT_ARPREPLY=y +CONFIG_BRIDGE_EBT_DNAT=y +CONFIG_BRIDGE_EBT_MARK_T=y +CONFIG_BRIDGE_EBT_REDIRECT=y +CONFIG_BRIDGE_EBT_SNAT=y +CONFIG_BRIDGE_EBT_LOG=y +CONFIG_BRIDGE_EBT_ULOG=y +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=y +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +CONFIG_LLC=y +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set + +# +# UML Network Devices +# +CONFIG_UML_NET=y +CONFIG_UML_NET_ETHERTAP=y +CONFIG_UML_NET_TUNTAP=y +CONFIG_UML_NET_SLIP=y +CONFIG_UML_NET_DAEMON=y +CONFIG_UML_NET_MCAST=y +# CONFIG_UML_NET_PCAP is not set +CONFIG_UML_NET_SLIRP=y + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_SYNC_TTY=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_MPPE=y +CONFIG_PPPOE=y +CONFIG_SLIP=y +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_SHAPER=y +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=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=y +CONFIG_FS_XIP=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +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 is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_GENERIC_ACL=y + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# 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=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=y + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_BIND34=y +CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_RPCSEC_GSS_SPKM3=y +CONFIG_SMB_FS=y +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=y +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_CIFS_UPCALL=y +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM 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_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set +# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +CONFIG_CRYPTO_TWOFISH_COMMON=y +CONFIG_CRYPTO_TWOFISH_586=y +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_AES_586 is not set +CONFIG_CRYPTO_CAST5=y +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=y +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CAMELLIA=y + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=y +CONFIG_TEXTSEARCH_BM=y +CONFIG_TEXTSEARCH_FSM=y +CONFIG_PLIST=y +CONFIG_HAS_DMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set +# CONFIG_INPUT is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS 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_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=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +# CONFIG_FORCED_INLINING is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_GPROF is not set +# CONFIG_GCOV is not set diff --git a/source/apps-extra/user-mode-linux/linux-2.6.22-aio.diff b/source/apps-extra/user-mode-linux/linux-2.6.22-aio.diff new file mode 100644 index 0000000..b2f5329 --- /dev/null +++ b/source/apps-extra/user-mode-linux/linux-2.6.22-aio.diff @@ -0,0 +1,94 @@ +Restructure do_aio thanks to commments from Ulrich and Al. + +Uli started this by seeing that UML's initialization of a struct iocb +initialized fields that it shouldn't. + +Al followed up by adding the following cleanups: + eliminating a variable by just using an anonymous structure in +its place. + hoisting a duplicated line out of the switch. + simplifying the error checking at the end. + +I added a severity to the printk. + +Signed-off-by: Jeff Dike +-- + arch/um/os-Linux/aio.c | 47 +++++++++++++++++------------------------------ + 1 file changed, 17 insertions(+), 30 deletions(-) + +Index: linux-2.6.17/arch/um/os-Linux/aio.c +=================================================================== +--- linux-2.6.17.orig/arch/um/os-Linux/aio.c 2007-07-23 14:58:18.000000000 -0400 ++++ linux-2.6.17/arch/um/os-Linux/aio.c 2007-07-23 14:59:13.000000000 -0400 +@@ -14,6 +14,7 @@ + #include "init.h" + #include "user.h" + #include "mode.h" ++#include "kern_constants.h" + + struct aio_thread_req { + enum aio_type type; +@@ -65,47 +66,33 @@ static long io_getevents(aio_context_t c + static int do_aio(aio_context_t ctx, enum aio_type type, int fd, char *buf, + int len, unsigned long long offset, struct aio_context *aio) + { +- struct iocb iocb, *iocbp = &iocb; ++ struct iocb *iocbp = & ((struct iocb) { ++ .aio_data = (unsigned long) aio, ++ .aio_fildes = fd, ++ .aio_buf = (unsigned long) buf, ++ .aio_nbytes = len, ++ .aio_offset = offset ++ }); + char c; +- int err; +- +- iocb = ((struct iocb) { .aio_data = (unsigned long) aio, +- .aio_reqprio = 0, +- .aio_fildes = fd, +- .aio_buf = (unsigned long) buf, +- .aio_nbytes = len, +- .aio_offset = offset, +- .aio_reserved1 = 0, +- .aio_reserved2 = 0, +- .aio_reserved3 = 0 }); + +- switch(type){ ++ switch (type) { + case AIO_READ: +- iocb.aio_lio_opcode = IOCB_CMD_PREAD; +- err = io_submit(ctx, 1, &iocbp); ++ iocbp->aio_lio_opcode = IOCB_CMD_PREAD; + break; + case AIO_WRITE: +- iocb.aio_lio_opcode = IOCB_CMD_PWRITE; +- err = io_submit(ctx, 1, &iocbp); ++ iocbp->aio_lio_opcode = IOCB_CMD_PWRITE; + break; + case AIO_MMAP: +- iocb.aio_lio_opcode = IOCB_CMD_PREAD; +- iocb.aio_buf = (unsigned long) &c; +- iocb.aio_nbytes = sizeof(c); +- err = io_submit(ctx, 1, &iocbp); ++ iocbp->aio_lio_opcode = IOCB_CMD_PREAD; ++ iocbp->aio_buf = (unsigned long) &c; ++ iocbp->aio_nbytes = sizeof(c); + break; + default: +- printk("Bogus op in do_aio - %d\n", type); +- err = -EINVAL; +- break; ++ printk(UM_KERN_ERR "Bogus op in do_aio - %d\n", type); ++ return -EINVAL; + } + +- if(err > 0) +- err = 0; +- else +- err = -errno; +- +- return err; ++ return (io_submit(ctx, 1, &iocbp) > 0) ? 0 : -errno; + } + + /* Initialized in an initcall and unchanged thereafter */ From vmiklos at frugalware.org Sat Aug 4 16:42:30 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 16:42:32 2007 Subject: [Frugalware-git] frugalware-current: thunderbird-es-ar-2.0.0.0-1-x86_64 Message-ID: <20070804144230.D1D9E13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5b7976b3515339b619da7c748559ec4406b8e81d commit 5b7976b3515339b619da7c748559ec4406b8e81d Author: VMiklos Date: Sat Aug 4 16:42:08 2007 +0200 thunderbird-es-ar-2.0.0.0-1-x86_64 typo fix diff --git a/source/locale-extra/thunderbird-es-ar/FrugalBuild b/source/locale-extra/thunderbird-es-ar/FrugalBuild index 0af9cca..668e6e2 100644 --- a/source/locale-extra/thunderbird-es-ar/FrugalBuild +++ b/source/locale-extra/thunderbird-es-ar/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy # Contributor: Krisztian VASAS -lang=es +lang=es-ar _F_thunderbird_lang=es-AR pkgname=thunderbird-$lang pkgver=2.0.0.0 From vmiklos at frugalware.org Sat Aug 4 17:47:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 17:47:33 2007 Subject: [Frugalware-git] frugalware-current: apache-2.2.4-5-i686 Message-ID: <20070804154727.4309313A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=48160b585d5ad47d5ced95b0e1e988a568d48b98 commit 48160b585d5ad47d5ced95b0e1e988a568d48b98 Author: VMiklos Date: Sat Aug 4 17:47:09 2007 +0200 apache-2.2.4-5-i686 added CVE-2006-5752.patch, CVE-2007-1863.patch and CVE-2007-3304.patch secfixes closes #2298 diff --git a/source/network/apache/CVE-2006-5752.patch b/source/network/apache/CVE-2006-5752.patch new file mode 100644 index 0000000..da8de63 --- /dev/null +++ b/source/network/apache/CVE-2006-5752.patch @@ -0,0 +1,40 @@ +--- trunk/modules/generators/mod_status.c 2007/06/20 17:22:08 549158 ++++ trunk/modules/generators/mod_status.c 2007/06/20 17:29:24 549159 +@@ -270,7 +270,7 @@ + if (r->method_number != M_GET) + return DECLINED; + +- ap_set_content_type(r, "text/html"); ++ ap_set_content_type(r, "text/html; charset=ISO-8859-1"); + + /* + * Simple table-driven form data set parser that lets you alter the header +@@ -299,7 +299,7 @@ + no_table_report = 1; + break; + case STAT_OPT_AUTO: +- ap_set_content_type(r, "text/plain"); ++ ap_set_content_type(r, "text/plain; charset=ISO-8859-1"); + short_report = 1; + break; + } +@@ -673,7 +673,8 @@ + ap_escape_html(r->pool, + ws_record->client), + ap_escape_html(r->pool, +- ws_record->request), ++ ap_escape_logitem(r->pool, ++ ws_record->request)), + ap_escape_html(r->pool, + ws_record->vhost)); + } +@@ -763,7 +764,8 @@ + ap_escape_html(r->pool, + ws_record->vhost), + ap_escape_html(r->pool, +- ws_record->request)); ++ ap_escape_logitem(r->pool, ++ ws_record->request))); + } /* no_table_report */ + } /* for (j...) */ + } /* for (i...) */ diff --git a/source/network/apache/CVE-2007-1863.patch b/source/network/apache/CVE-2007-1863.patch new file mode 100644 index 0000000..ac94b36 --- /dev/null +++ b/source/network/apache/CVE-2007-1863.patch @@ -0,0 +1,74 @@ +--- trunk/modules/cache/cache_util.c 2007/05/06 14:17:08 535616 ++++ trunk/modules/cache/cache_util.c 2007/05/06 14:35:02 535617 +@@ -243,7 +243,8 @@ + age = ap_cache_current_age(info, age_c, r->request_time); + + /* extract s-maxage */ +- if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "s-maxage", &val)) { ++ if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "s-maxage", &val) ++ && val != NULL) { + smaxage = apr_atoi64(val); + } + else { +@@ -252,7 +253,8 @@ + + /* extract max-age from request */ + if (!conf->ignorecachecontrol +- && cc_req && ap_cache_liststr(r->pool, cc_req, "max-age", &val)) { ++ && cc_req && ap_cache_liststr(r->pool, cc_req, "max-age", &val) ++ && val != NULL) { + maxage_req = apr_atoi64(val); + } + else { +@@ -260,7 +262,8 @@ + } + + /* extract max-age from response */ +- if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "max-age", &val)) { ++ if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "max-age", &val) ++ && val != NULL) { + maxage_cresp = apr_atoi64(val); + } + else { +@@ -282,7 +285,20 @@ + + /* extract max-stale */ + if (cc_req && ap_cache_liststr(r->pool, cc_req, "max-stale", &val)) { +- maxstale = apr_atoi64(val); ++ if(val != NULL) { ++ maxstale = apr_atoi64(val); ++ } ++ else { ++ /* ++ * If no value is assigned to max-stale, then the client is willing ++ * to accept a stale response of any age (RFC2616 14.9.3). We will ++ * set it to one year in this case as this situation is somewhat ++ * similar to a "never expires" Expires header (RFC2616 14.21) ++ * which is set to a date one year from the time the response is ++ * sent in this case. ++ */ ++ maxstale = APR_INT64_C(86400*365); ++ } + } + else { + maxstale = 0; +@@ -290,7 +306,8 @@ + + /* extract min-fresh */ + if (!conf->ignorecachecontrol +- && cc_req && ap_cache_liststr(r->pool, cc_req, "min-fresh", &val)) { ++ && cc_req && ap_cache_liststr(r->pool, cc_req, "min-fresh", &val) ++ && val != NULL) { + minfresh = apr_atoi64(val); + } + else { +@@ -418,6 +435,9 @@ + *val = apr_pstrmemdup(p, val_start, + next - val_start); + } ++ } ++ else { ++ *val = NULL; + } + } + return 1; diff --git a/source/network/apache/CVE-2007-3304.patch b/source/network/apache/CVE-2007-3304.patch new file mode 100644 index 0000000..2103e2d --- /dev/null +++ b/source/network/apache/CVE-2007-3304.patch @@ -0,0 +1,222 @@ +Index: server/mpm/prefork/prefork.c +=================================================================== +--- server/mpm/prefork/prefork.c (revision 551928) ++++ server/mpm/prefork/prefork.c (working copy) +@@ -1127,7 +1127,7 @@ + for (index = 0; index < ap_daemons_limit; ++index) { + if (ap_scoreboard_image->servers[index][0].status != SERVER_DEAD) { + /* Ask each child to close its listeners. */ +- kill(MPM_CHILD_PID(index), AP_SIG_GRACEFUL); ++ ap_mpm_safe_kill(MPM_CHILD_PID(index), AP_SIG_GRACEFUL); + active_children++; + } + } +@@ -1165,12 +1165,10 @@ + + active_children = 0; + for (index = 0; index < ap_daemons_limit; ++index) { +- if (MPM_CHILD_PID(index) != 0) { +- if (kill(MPM_CHILD_PID(index), 0) == 0) { +- active_children = 1; +- /* Having just one child is enough to stay around */ +- break; +- } ++ if (ap_mpm_safe_kill(MPM_CHILD_PID(index), 0) == APR_SUCCESS) { ++ active_children = 1; ++ /* Having just one child is enough to stay around */ ++ break; + } + } + } while (!shutdown_pending && active_children && +@@ -1222,7 +1220,7 @@ + * piped loggers, etc. They almost certainly won't handle + * it gracefully. + */ +- kill(ap_scoreboard_image->parent[index].pid, AP_SIG_GRACEFUL); ++ ap_mpm_safe_kill(ap_scoreboard_image->parent[index].pid, AP_SIG_GRACEFUL); + } + } + } +Index: server/mpm/worker/worker.c +=================================================================== +--- server/mpm/worker/worker.c (revision 551928) ++++ server/mpm/worker/worker.c (working copy) +@@ -1813,12 +1813,10 @@ + + active_children = 0; + for (index = 0; index < ap_daemons_limit; ++index) { +- if (MPM_CHILD_PID(index) != 0) { +- if (kill(MPM_CHILD_PID(index), 0) == 0) { +- active_children = 1; +- /* Having just one child is enough to stay around */ +- break; +- } ++ if (ap_mpm_safe_kill(MPM_CHILD_PID(index), 0) == APR_SUCCESS) { ++ active_children = 1; ++ /* Having just one child is enough to stay around */ ++ break; + } + } + } while (!shutdown_pending && active_children && +Index: server/mpm/experimental/event/event.c +=================================================================== +--- server/mpm/experimental/event/event.c (revision 551928) ++++ server/mpm/experimental/event/event.c (working copy) +@@ -1998,12 +1998,10 @@ + + active_children = 0; + for (index = 0; index < ap_daemons_limit; ++index) { +- if (MPM_CHILD_PID(index) != 0) { +- if (kill(MPM_CHILD_PID(index), 0) == 0) { +- active_children = 1; +- /* Having just one child is enough to stay around */ +- break; +- } ++ if (ap_mpm_safe_kill(MPM_CHILD_PID(index), 0) == APR_SUCCESS) { ++ active_children = 1; ++ /* Having just one child is enough to stay around */ ++ break; + } + } + } while (!shutdown_pending && active_children && +Index: server/mpm_common.c +=================================================================== +--- server/mpm_common.c (revision 551928) ++++ server/mpm_common.c (working copy) +@@ -126,6 +126,11 @@ + apr_proc_t proc; + apr_status_t waitret; + ++ /* Ensure pid sanity. */ ++ if (pid < 1) { ++ return 1; ++ } ++ + proc.pid = pid; + waitret = apr_proc_wait(&proc, NULL, NULL, APR_NOWAIT); + if (waitret != APR_CHILD_NOTDONE) { +@@ -305,6 +310,66 @@ + cur_extra = next; + } + } ++ ++/* Before sending the signal to the pid this function verifies that ++ * the pid is a member of the current process group; either using ++ * apr_proc_wait(), where waitpid() guarantees to fail for non-child ++ * processes; or by using getpgid() directly, if available. */ ++apr_status_t ap_mpm_safe_kill(pid_t pid, int sig) ++{ ++#ifndef HAVE_GETPGID ++ apr_proc_t proc; ++ apr_status_t rv; ++ apr_exit_why_e why; ++ int status; ++ ++ /* Ensure pid sanity */ ++ if (pid < 1) { ++ return APR_EINVAL; ++ } ++ ++ proc.pid = pid; ++ rv = apr_proc_wait(&proc, &status, &why, APR_NOWAIT); ++ if (rv == APR_CHILD_DONE) { ++#ifdef AP_MPM_WANT_PROCESS_CHILD_STATUS ++ /* The child already died - log the termination status if ++ * necessary: */ ++ ap_process_child_status(&proc, why, status); ++#endif ++ return APR_EINVAL; ++ } ++ else if (rv != APR_CHILD_NOTDONE) { ++ /* The child is already dead and reaped, or was a bogus pid - ++ * log this either way. */ ++ ap_log_error(APLOG_MARK, APLOG_NOTICE, rv, ap_server_conf, ++ "cannot send signal %d to pid %ld (non-child or " ++ "already dead)", sig, (long)pid); ++ return APR_EINVAL; ++ } ++#else ++ pid_t pg; ++ ++ /* Ensure pid sanity. */ ++ if (pid < 1) { ++ return APR_EINVAL; ++ } ++ ++ pg = getpgid(pid); ++ if (pg == -1) { ++ /* Process already dead... */ ++ return errno; ++ } ++ ++ if (pg != getpgrp()) { ++ ap_log_error(APLOG_MARK, APLOG_ALERT, 0, ap_server_conf, ++ "refusing to send signal %d to pid %ld outside " ++ "process group", sig, (long)pid); ++ return APR_EINVAL; ++ } ++#endif ++ ++ return kill(pid, sig) ? errno : APR_SUCCESS; ++} + #endif /* AP_MPM_WANT_RECLAIM_CHILD_PROCESSES */ + + #ifdef AP_MPM_WANT_WAIT_OR_TIMEOUT +Index: include/mpm_common.h +=================================================================== +--- include/mpm_common.h (revision 551928) ++++ include/mpm_common.h (working copy) +@@ -145,6 +145,19 @@ + #endif + + /** ++ * Safely signal an MPM child process, if the process is in the ++ * current process group. Otherwise fail. ++ * @param pid the process id of a child process to signal ++ * @param sig the signal number to send ++ * @return APR_SUCCESS if signal is sent, otherwise an error as per kill(3); ++ * APR_EINVAL is returned if passed either an invalid (< 1) pid, or if ++ * the pid is not in the current process group ++ */ ++#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES ++apr_status_t ap_mpm_safe_kill(pid_t pid, int sig); ++#endif ++ ++/** + * Determine if any child process has died. If no child process died, then + * this process sleeps for the amount of time specified by the MPM defined + * macro SCOREBOARD_MAINTENANCE_INTERVAL. +Index: include/ap_mmn.h +=================================================================== +--- include/ap_mmn.h (revision 551928) ++++ include/ap_mmn.h (working copy) +@@ -113,6 +113,8 @@ + * 20051115.3 (2.2.3) Added server_scheme member to server_rec (minor) + * 20051115.4 (2.2.4) Added ap_get_server_banner() and + * ap_get_server_description() (minor) ++ * 20051115.5 (2.2.5) Added ap_mpm_safe_kill() (minor) ++ * + */ + + #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */ +@@ -120,7 +122,7 @@ + #ifndef MODULE_MAGIC_NUMBER_MAJOR + #define MODULE_MAGIC_NUMBER_MAJOR 20051115 + #endif +-#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ ++#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ + + /** + * Determine if the server's current MODULE_MAGIC_NUMBER is at least a +Index: configure.in +=================================================================== +--- configure.in (revision 551928) ++++ configure.in (working copy) +@@ -392,6 +392,7 @@ + bindprocessor \ + prctl \ + timegm \ ++getpgid + ) + + dnl confirm that a void pointer is large enough to store a long integer diff --git a/source/network/apache/FrugalBuild b/source/network/apache/FrugalBuild index 8fb44b7..bd006de 100644 --- a/source/network/apache/FrugalBuild +++ b/source/network/apache/FrugalBuild @@ -4,7 +4,7 @@ pkgname=apache pkgver=2.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="A high performance Unix-based HTTP server (with SSL)" url="http://httpd.apache.org/" backup=(etc/httpd/conf/{httpd.conf,ssl.conf,ssl.crt/server.crt,ssl.csr/server.csr,ssl.key/server.key} \ @@ -16,19 +16,23 @@ up2date="lynx -dump http://httpd.apache.org/download.cgi |grep 'best available'| source=(http://www.apache.org/dist/httpd/httpd-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/apache/mkcert.tar.gz \ rc.httpd rc.httpd-hu.po httpd.conf ssl.conf \ - README.Frugalware index.html http://frugalware.org/images/frugalware.png) -signatures=($source.asc '' '' '' '' '' '' '' '') + README.Frugalware index.html http://frugalware.org/images/frugalware.png \ + CVE-2006-5752.patch CVE-2007-1863.patch CVE-2007-3304.patch) +signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '') build() { Fcd httpd-$pkgver Fsed '^#define AP_HTTPD_USER.*$' '#define AP_HTTPD_USER "nobody"' \ support/suexec.h - Fbuild --sysconfdir=/etc/httpd/conf --enable-layout=RedHat --datadir=/var/www \ + Fpatchall + autoconf || return 1 + Fmake --sysconfdir=/etc/httpd/conf --enable-layout=RedHat --datadir=/var/www \ --enable-modules=all --enable-mods-shared=all --enable-ssl \ --enable-so --with-apr=/usr --with-apr-util=/usr --enable-dbd \ --enable-proxy --enable-proxy-connect --enable-proxy-ftp \ --enable-proxy-http --enable-suexec + Fmakeinstall Fmv /usr/sbin/suexec /usr/bin/suexec Fmkdir /etc/httpd/conf/modules.d/ cp -a ../mkcert/* $Fdestdir/etc/httpd/conf/ From vmiklos at frugalware.org Sat Aug 4 18:43:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 18:43:36 2007 Subject: [Frugalware-git] frugalware-current: live-2007.08.03a-1-i686 Message-ID: <20070804164333.BC99513A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=221f1e133d7f767e51dac89bae923305e801875b commit 221f1e133d7f767e51dac89bae923305e801875b Author: VMiklos Date: Sat Aug 4 18:43:17 2007 +0200 live-2007.08.03a-1-i686 version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index 0f62a2c..8eafc90 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=live -pkgver=2007.07.25 +pkgver=2007.08.03a pkgrel=1 pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming" url="http://www.live555.com/" @@ -11,7 +11,7 @@ groups=('multimedia') archs=('i686' 'x86_64') up2date="lynx -dump http://www.live555.com/liveMedia/public/|grep tar.gz$|sed 's/.*live.\(.*\)\.t.*/\1/;q'" source=(http://www.live555.com/liveMedia/public/live.$pkgver.tar.gz) -sha1sums=('424f98f24f8ce701f1064c3678616337faa9e8d3') +sha1sums=('27e79c9c273a85b05bce75bd4d837254d74438e9') build() { From vmiklos at frugalware.org Sat Aug 4 19:44:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 19:44:37 2007 Subject: [Frugalware-git] frugalware-current: ltp-20070731-1-i686 Message-ID: <20070804174436.1D46513A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9a4ea1e34a17e31270371bfbc5dba4903733ce09 commit 9a4ea1e34a17e31270371bfbc5dba4903733ce09 Author: VMiklos Date: Sat Aug 4 19:44:05 2007 +0200 ltp-20070731-1-i686 version bump diff --git a/source/apps-extra/ltp/FrugalBuild b/source/apps-extra/ltp/FrugalBuild index 07c98dc..0355c79 100644 --- a/source/apps-extra/ltp/FrugalBuild +++ b/source/apps-extra/ltp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=ltp -pkgver=20070630 +pkgver=20070731 # sometimes != $pkgver realver=$pkgver pkgrel=1 @@ -27,7 +27,7 @@ build() { cp runltp runalltests.sh $Fdestdir/usr/bin/ || Fdie } -sha1sums=('1682c4b767f72619391b5fd2fb739023d582b4bc' \ +sha1sums=('c5f6d590f56cc6648eab36dc220b8966ef485a68' \ 'c7a2132257cf1c430a9692009952084746722c40' \ 'e9ff5dbafdd07ebe796b2f064066d7dbb7c7b6c5' \ '0a6f6665340d6745904936484c42e6e874a0fc2d') From vmiklos at frugalware.org Sat Aug 4 20:02:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 20:02:35 2007 Subject: [Frugalware-git] frugalware-current: grub-0.97-19-i686 Message-ID: <20070804180234.4D76613A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2388cbf7dff134fa0f9811329eca33d97254ef9d commit 2388cbf7dff134fa0f9811329eca33d97254ef9d Author: VMiklos Date: Sat Aug 4 20:02:13 2007 +0200 grub-0.97-19-i686 depends() fix diff --git a/source/base/grub/FrugalBuild b/source/base/grub/FrugalBuild index 1e80654..e4cdf67 100644 --- a/source/base/grub/FrugalBuild +++ b/source/base/grub/FrugalBuild @@ -10,7 +10,7 @@ depends=('texinfo') [ "$CARCH" == "i686" ] && depends=(${depends[@]} 'ncurses' 'mktemp') #makedepends=('gfxboot>=3.3.22' 'perl-html-parser' 'cpio') [ "$CARCH" == "x86_64" ] && makedepends=(${makedepends[@]} 'ncurses' 'mktemp') -rodepends=('grub-theme-frugalware') +rodepends=('grub-theme-frugalware' 'os-prober') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump ftp://alpha.gnu.org/gnu/grub/|grep 0.9.*tar.gz$|Flasttar" From vmiklos at frugalware.org Sat Aug 4 21:45:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 21:45:48 2007 Subject: [Frugalware-git] frugalware-current: python-2.5.1-4-i686 Message-ID: <20070804194546.6BFBC13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=18f7faa81d8806dc5bbcefdc0319ebc91248244f commit 18f7faa81d8806dc5bbcefdc0319ebc91248244f Author: VMiklos Date: Sat Aug 4 21:45:11 2007 +0200 python-2.5.1-4-i686 fixed setup.py for db-4.6, in the previous release we silently removed db support.. thx priyank for noticing it diff --git a/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild index 07614eb..162d4e7 100644 --- a/source/devel/python/FrugalBuild +++ b/source/devel/python/FrugalBuild @@ -4,7 +4,7 @@ pkgname=python pkgver=2.5.1 shortpkgver=2.5 # 2.3 if $pkgver=2.3.4 -pkgrel=3 +pkgrel=4 pkgdesc="A high-level scripting language" url="http://www.python.org" depends=('glibc' 'db>=4.6.18' 'bzip2' 'gdbm' 'openssl' 'glib2') @@ -29,6 +29,9 @@ build() { Fcd Python-$pkgver Fpatchall + # if this is no longer necessary, don't remove it, just comment, it's + # required regularly + Fsed 'max_db_ver = (4, 5)' 'max_db_ver = (4, 6)' setup.py Fconf --prefix=/usr --with-threads --enable-shared --enable-ipv6 || return 1 Fsed 'mozilla-firefox' 'firefox' Lib/webbrowser.py make || return 1 From priyank at frugalware.org Sat Aug 4 22:01:48 2007 From: priyank at frugalware.org (Priyank) Date: Sat Aug 4 22:01:52 2007 Subject: [Frugalware-git] frugalware-current: miro-0.9.8.1-1-i686 Message-ID: <20070804200148.3447013A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f52cad5f2fdbbb06298db3950ac9c9311ecbe4dd commit f52cad5f2fdbbb06298db3950ac9c9311ecbe4dd Author: Priyank Date: Sun Aug 5 01:28:22 2007 +0530 miro-0.9.8.1-1-i686 * Version bump diff --git a/source/gnome-extra/gogh/gogh.png b/source/gnome-extra/gogh/gogh.png deleted file mode 100644 index 8220292..0000000 Binary files a/source/gnome-extra/gogh/gogh.png and /dev/null differ diff --git a/source/xmultimedia-extra/miro/FrugalBuild b/source/xmultimedia-extra/miro/FrugalBuild index 9676896..801844e 100644 --- a/source/xmultimedia-extra/miro/FrugalBuild +++ b/source/xmultimedia-extra/miro/FrugalBuild @@ -2,21 +2,21 @@ # Maintainer: Priyank Gosalia pkgname=miro -pkgver=0.9.8 +pkgver=0.9.8.1 pkgrel=1 pkgdesc="The free and open source internet TV platform." url="http://www.getmiro.com/" -depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'boost' 'xine-lib' \ +depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'boost' 'xine-lib' 'db=4.6.18' 'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed') groups=('xmultimedia-extra') replaces=('democracy') conflicts=('democracy') archs=('i686') -up2date="lynx -dump http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/ | grep 'Miro' | Flasttar" +up2date="lynx -dump http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/ | grep -m1 tar.gz | Flasttar" source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \ qt-mt.pc dbus_python0.8_fixes.patch) -_F_cd_path="Miro-$pkgver" -sha1sums=('0d4b093b46922e4dec170c8b240e22c242ccb10c' \ +_F_cd_path="Miro-2007-07-24" +sha1sums=('8bbb80c673a283e2f0c4e0b1a333a2f9a8a638c8' \ '153e1902352eb4d724ec816b8097f01830178181' \ 'baed01f46d5606f106d01c573c9cbdf94044e961') From vmiklos at frugalware.org Sat Aug 4 22:07:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:07:14 2007 Subject: [Frugalware-git] pacman-tools: dg: added abbrev options to changes() Message-ID: <20070804200709.DEA7C13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=01c2424c80c01709a17258a3ee9a5caafe41c91a commit 01c2424c80c01709a17258a3ee9a5caafe41c91a Author: VMiklos Date: Sat Aug 4 22:04:33 2007 +0200 dg: added abbrev options to changes() diff --git a/darcs-git.py b/darcs-git.py index d6f04f6..c2ffbdd 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -501,7 +501,7 @@ Options: options.files = " ".join(argv[optind:]) if options.help: usage(0) - return os.system("git log -M %s %s %s %s" % (options.last, options.logopts, options.files, options.tags)) + return os.system("git log -M --abbrev-commit --abbrev=7 %s %s %s %s" % (options.last, options.logopts, options.files, options.tags)) def push(argv): def usage(ret): @@ -792,7 +792,8 @@ PURPOSE.""" % __version__ # this will exit if no root found if sys.argv[1] not in ["init", "get"]: get_root() - os.environ['GIT_PAGER'] = 'cat' + if sys.argv[1][:4] != "chan": + os.environ['GIT_PAGER'] = 'cat' if sys.argv[1][:3] == "rec": record(argv[1:]) elif sys.argv[1][:3] == "rev": From vmiklos at frugalware.org Sat Aug 4 22:07:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:07:14 2007 Subject: [Frugalware-git] pacman-tools: dg: small cleanup Message-ID: <20070804200710.532BB13A4050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=8d4305b968d022a1d0dfd159cf8807c244cf1b54 commit 8d4305b968d022a1d0dfd159cf8807c244cf1b54 Author: VMiklos Date: Sat Aug 4 22:06:42 2007 +0200 dg: small cleanup diff --git a/darcs-git.py b/darcs-git.py index c2ffbdd..82e2b81 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -501,7 +501,8 @@ Options: options.files = " ".join(argv[optind:]) if options.help: usage(0) - return os.system("git log -M --abbrev-commit --abbrev=7 %s %s %s %s" % (options.last, options.logopts, options.files, options.tags)) + return os.system(" ".join(['git log -M --abbrev-commit --abbrev=7', + options.last, options.logopts, options.files, options.tags])) def push(argv): def usage(ret): From vmiklos at frugalware.org Sat Aug 4 22:10:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:10:52 2007 Subject: [Frugalware-git] pacman-tools: remove obsolete checkworld Message-ID: <20070804201050.7BE0213A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=a3c1e04d88f1a7ef77835a546294f8e3cb979d65 commit a3c1e04d88f1a7ef77835a546294f8e3cb979d65 Author: VMiklos Date: Sat Aug 4 22:10:26 2007 +0200 remove obsolete checkworld diff --git a/checkworld b/checkworld deleted file mode 100644 index bea0f0c..0000000 --- a/checkworld +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# Last modified: Tue, 15 Mar 2005 19:30:06 +0100 -# (c) 2004 Vajna Miklos -# checkworld for pacman -# distributed under GPL License - -version=0.3 -countpkg=0 - -echo "checkworld $version (C) 2004 Miklos Vajna " - -function usage() -{ - cat < Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=1e4da1eeb7bbd9812f38e92207387879c50fb52b commit 1e4da1eeb7bbd9812f38e92207387879c50fb52b Author: VMiklos Date: Sat Aug 4 22:14:21 2007 +0200 remove obsolete group-order libpacan already provides this functionality diff --git a/group-order b/group-order deleted file mode 100644 index f137701..0000000 --- a/group-order +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# Copyright 2005 by CSÉCSY László -# This program is free software, released under the GPL v2 or any -# later version. Ideas from VMiklos, krix, xbit -# -# must be run as root -# takes one argument: the group to be examined - -OWNTMPDIR=`mktemp -d /tmp/order.XXXXXX` || exit 1 -GRPPKGS=`pacman -r $OWNTMPDIR -Syg $1 | grep -v '#\|::'` -GRPDEPS=`echo -n | pacman -r $OWNTMPDIR -Sy $GRPPKGS | grep -- '-[0-9\.]\+' | sed 's/^Targets: //;s/\(-[0-9]\+\) \([a-z]\)/\1\n\2/g;s/^ \+\(.*\)/\1/' | sed 's/-[^-]\+-[^-]\+$//'` -for i in $GRPDEPS -do - if echo "$GRPPKGS " | grep -q " $i " - then - echo $i - fi -done -rm -rf $OWNTMPDIR From vmiklos at frugalware.org Sat Aug 4 22:19:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:19:43 2007 Subject: [Frugalware-git] pacman-g2: Don't skip subpkgs on database creation, if the main package has set nobuild. Message-ID: <20070804201941.8E0AC13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=af65fab84b3bbc664442f7059ebc92f3ac421024 commit af65fab84b3bbc664442f7059ebc92f3ac421024 Author: VMiklos Date: Sat Aug 4 22:19:14 2007 +0200 Don't skip subpkgs on database creation, if the main package has set nobuild. This is usefull to build e.g. kde-i18n packages, with a single build script. Author: Marcus Habermehl diff --git a/scripts/gensync b/scripts/gensync index 56bd9ca..5f30d01 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -237,7 +237,7 @@ for file in `find $rootdir -name $BUILDSCRIPT`; do cd - >/dev/null db_write_entry $pkgname || die "error writing entry for $pkgname ($file)" fi - if [ ! -z "$subpkgs" ] && [ ! "$nobuild" -a ! "`check_option NOBUILD`" ]; then + if [ ! -z "$subpkgs" ]; then i=0 for subpkg in "${subpkgs[@]}" do @@ -254,7 +254,7 @@ for file in `find $rootdir -name $BUILDSCRIPT`; do conflicts="${subconflicts[$i]}" provides="${subprovides[$i]}" options="${suboptions[$i]}" - if in_array $arch ${archs[@]}; then + if in_array $arch ${archs[@]} && [ ! "`check_option NOBUILD`"]; then db_write_entry $subpkg || die "error writing entry for $subpkg ($file)" fi i=$(($i+1)) diff --git a/scripts/updatesync b/scripts/updatesync index 9565b72..20545a7 100755 --- a/scripts/updatesync +++ b/scripts/updatesync @@ -280,7 +280,7 @@ if [ "$action" = "upd" ]; then cd - >/dev/null db_write_entry $pkgname || die "error writing entry for $pkgname ($option)" fi - if [ ! -z "$subpkgs" ] || [ "$nobuild" -o "`check_option NOBUILD`" ]; then + if [ ! -z "$subpkgs" ]; then i=0 for subpkg in "${subpkgs[@]}" do @@ -297,7 +297,7 @@ if [ "$action" = "upd" ]; then conflicts="${subconflicts[$i]}" provides="${subprovides[$i]}" options="${suboptions[$i]}" - if in_array $arch ${archs[@]}; then + if in_array $arch ${archs[@]} && [ ! "`check_option NOBUILD`"]; then db_write_entry $subpkg || die "error writing entry for $subpkg ($option)" fi i=$(($i+1)) From vmiklos at frugalware.org Sat Aug 4 22:43:17 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:43:19 2007 Subject: [Frugalware-git] pacman-g2: Compress info pages. Message-ID: <20070804204317.D342513A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=e804504286ecdb6eee56a26bfaf7431728ff2507 commit e804504286ecdb6eee56a26bfaf7431728ff2507 Author: VMiklos Date: Sat Aug 4 22:42:44 2007 +0200 Compress info pages. Author: Marcus Habermehl diff --git a/scripts/makepkg b/scripts/makepkg index 5f2c37b..2ee6f39 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1502,9 +1502,9 @@ if [ -d pkg/usr/man ]; then rm -rf pkg/usr/man fi -# compress man pages -msg "Compressing man pages..." -find $startdir/{pkg,pkg.*}/{usr{,/local,/share},opt/*}/man -type f 2>/dev/null | while read i ; do +# compress info and manual pages +msg "Compressing info and manual pages..." +find $startdir/{pkg,pkg.*}/{usr{,/local,/share},opt/*}/{info,man} -type f 2>/dev/null | while read i ; do ext="${i##*.}" fn="${i##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then From vmiklos at frugalware.org Sat Aug 4 22:45:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:45:24 2007 Subject: [Frugalware-git] pacman-g2: Use /usr/share/info instead of /usr/info as it's specified in LSB. Message-ID: <20070804204522.4A8FB13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=2af9e5aa9b8425a216074cbafeb08e3d98aa41e0 commit 2af9e5aa9b8425a216074cbafeb08e3d98aa41e0 Author: VMiklos Date: Sat Aug 4 22:44:57 2007 +0200 Use /usr/share/info instead of /usr/info as it's specified in LSB. Author: Marcus Habermehl diff --git a/scripts/makepkg b/scripts/makepkg index 2ee6f39..0a8f222 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1488,11 +1488,11 @@ if [ -d pkg/usr/share/doc ]; then fi fi -# move /usr/share/info files to /usr/info -if [ -d pkg/usr/share/info ]; then - mkdir -p pkg/usr/info - cp -a pkg/usr/share/info/* pkg/usr/info/ - rm -rf pkg/usr/share/info +# move /usr/info files to /usr/share/info +if [ -d pkg/usr/info ]; then + mkdir -p pkg/usr/share/info + cp -a pkg/usr/info/* pkg/usr/share/info/ + rm -rf pkg/usr/info fi # move /usr/man files to /usr/share/man From vmiklos at frugalware.org Sat Aug 4 22:49:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:49:20 2007 Subject: [Frugalware-git] pacman-g2: Fix the update of symbolic links of manual pages in subpkgs. Message-ID: <20070804204919.B550513A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=37ee4874aa8b895eb63e985d0738ecef0c31f03d commit 37ee4874aa8b895eb63e985d0738ecef0c31f03d Author: VMiklos Date: Sat Aug 4 22:48:55 2007 +0200 Fix the update of symbolic links of manual pages in subpkgs. Author: Marcus Habermehl diff --git a/scripts/makepkg b/scripts/makepkg index 0a8f222..328e3f1 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1509,7 +1509,7 @@ find $startdir/{pkg,pkg.*}/{usr{,/local,/share},opt/*}/{info,man} -type f 2>/dev fn="${i##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find $startdir/pkg/{usr{,/local,/share},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do + find $startdir/{pkg,pkg.*}/{usr{,/local,/share},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do rm -f "$ln" ln -sf "${fn}.gz" "${ln}.gz" done From vmiklos at frugalware.org Sat Aug 4 22:56:25 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:56:26 2007 Subject: [Frugalware-git] pacman-g2: Extending the Changelog creation to create a Changelog from svn. Message-ID: <20070804205625.1031213A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=489db27f73adf4af4fcad56c247a718ac0543241 commit 489db27f73adf4af4fcad56c247a718ac0543241 Author: VMiklos Date: Sat Aug 4 22:56:00 2007 +0200 Extending the Changelog creation to create a Changelog from svn. Marcus Habermehl NOTE: I know, this is not useful for Frugalware, but it doesn't hurt and it's useful for others who use svn. diff --git a/scripts/makepkg b/scripts/makepkg index 328e3f1..5e18b75 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -923,18 +923,22 @@ fi indir=n if [ "$F_makepkg_scm" = "git" ]; then git rev-parse --git-dir &>/dev/null && indir=y -else +elif [ "$F_makepkg_scm" = "darcs" ]; then darcs --commands 2>&1|grep -q add && indir=y +elif [ "$F_makepkg_scm" = "svn" ]; then + svn info $BUILDSCRIPT &>/dev/null && indir=y fi if [ "$indir" = "y" ] && [ "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then if [ ! -e Changelog ] || [ `stat -c %Y Changelog` -lt `stat -c %Y $BUILDSCRIPT` ]; then msg "Generating the Changelog..." if [ "$F_makepkg_scm" = "git" ]; then git log $BUILDSCRIPT >Changelog - else + elif [ "$F_makepkg_scm" = "darcs" ]; then darcs changes $BUILDSCRIPT | \ sed "s|\(.*\)source/\(.*\)/$BUILDSCRIPT\(.*\)|\1\2\3|;/Can't find changes prior to:/,\$d" \ >Changelog + elif [ "$F_makepkg_scm" = "svn" ]; then + svn log $BUILDSCRIPT >Changelog fi if [ "`id -u`" = "0" ]; then chown `stat -c %u:%g $BUILDSCRIPT` \ From vmiklos at frugalware.org Sat Aug 4 22:57:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 22:57:43 2007 Subject: [Frugalware-git] pacman-g2: makepkg: clean up changelog, too Message-ID: <20070804205741.2934913A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=54bbc7bcdec4162ca960262cad86d186cbe09bbd commit 54bbc7bcdec4162ca960262cad86d186cbe09bbd Author: VMiklos Date: Sat Aug 4 22:57:16 2007 +0200 makepkg: clean up changelog, too noticed by Marcus Habermehl diff --git a/scripts/makepkg b/scripts/makepkg index 5e18b75..d797106 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1588,7 +1588,7 @@ fi cd $startdir if [ "$CLEANUP" = "1" ]; then msg "Cleaning up..." - rm -rf src pkg pkg.* + rm -rf src pkg pkg.* Changelog fi if [ "$RMDEPS" = "1" -a "`id -u`" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then From vmiklos at frugalware.org Sat Aug 4 23:01:21 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 23:01:23 2007 Subject: [Frugalware-git] pacman-g2: Replace msg in Fextract with msg2. Message-ID: <20070804210121.D48C713A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=d006f6e789221cd00dd22f3a79b4dec70ec90a05 commit d006f6e789221cd00dd22f3a79b4dec70ec90a05 Author: VMiklos Date: Sat Aug 4 23:00:58 2007 +0200 Replace msg in Fextract with msg2. Reason: Cosmetics Author: Marcus Habermehl (well, i apply this only because i have a good day ;) ) diff --git a/scripts/makepkg b/scripts/makepkg index d797106..f3bdc54 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -89,7 +89,7 @@ Fextract() { cmd="" ;; esac if [ "$cmd" != "" ]; then - msg " $cmd" + msg2 "$cmd" $cmd if [ $? -ne 0 ]; then # unzip will return a 1 as a warning, it is not an error From vmiklos at frugalware.org Sat Aug 4 23:04:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 23:04:41 2007 Subject: [Frugalware-git] pacman-g2: update NEWS after BMH's pathset :) Message-ID: <20070804210439.9B52A13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=62fedad9cccc5bef31af53a34205e36d0aa39d3b commit 62fedad9cccc5bef31af53a34205e36d0aa39d3b Author: VMiklos Date: Sat Aug 4 23:04:15 2007 +0200 update NEWS after BMH's pathset :) diff --git a/NEWS b/NEWS index 9ea8db2..2aaf458 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- + - makepkg: various minor fixes and improvements 3.6.0 - -Ss searches again in all repos, not only in the first one - updated curl example in pacman.conf so that it works again - issue a warning when you didn't do a -Sy for a long time From vmiklos at frugalware.org Sat Aug 4 23:22:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Aug 4 23:22:16 2007 Subject: [Frugalware-git] frugalware-current: nss_ldap-257-1-i686 Message-ID: <20070804212212.78BBA13A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c245b763cd3b9d7e06fba7ef5c1665e7b2782835 commit c245b763cd3b9d7e06fba7ef5c1665e7b2782835 Author: VMiklos Date: Sat Aug 4 23:21:39 2007 +0200 nss_ldap-257-1-i686 version bump diff --git a/source/network-extra/nss_ldap/FrugalBuild b/source/network-extra/nss_ldap/FrugalBuild index 8fdb8af..654624e 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=256 +pkgver=257 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=('8af21962f69d48bae507ee4633eaeb0496294c31') +sha1sums=('fc57c721bcbab7eaa3ddcf4953141ab03d788fc2') # optimization OK From voroskoi at frugalware.org Sun Aug 5 10:25:52 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Aug 5 10:25:54 2007 Subject: [Frugalware-git] frugalware-current: gamin-0.1.9-1-i686 Message-ID: <20070805082552.A527813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=26e7ff4a5706b04375786122cd88b20b7bff392c commit 26e7ff4a5706b04375786122cd88b20b7bff392c Author: voroskoi Date: Sun Aug 5 10:20:54 2007 +0200 gamin-0.1.9-1-i686 version bump diff --git a/source/apps/gamin/FrugalBuild b/source/apps/gamin/FrugalBuild index b1eb261..b045364 100644 --- a/source/apps/gamin/FrugalBuild +++ b/source/apps/gamin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=gamin -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=1 pkgdesc="Library providing the FAM File Alteration Monitor API" url="http://www.gnome.org/~veillard/gamin/" @@ -23,6 +23,6 @@ build() Fbuild --enable-docs --disable-dnotify --disable-debug Fdocrel doc/*.html } -sha1sums=('5dacc8c452d4aa5dc81eb6bee4a4bdc52fbfbe36') +sha1sums=('f8f8a4f0701a2c9a69634a60a135298db90d7779') # optimization OK From voroskoi at frugalware.org Sun Aug 5 10:51:43 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Aug 5 10:51:44 2007 Subject: [Frugalware-git] frugalware-current: rxvt-unicode-8.3-1-i686 Message-ID: <20070805085143.B08F113A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=aa56f0c7ef70747f4ee3d561daf052d7f372a16b commit aa56f0c7ef70747f4ee3d561daf052d7f372a16b Author: voroskoi Date: Sun Aug 5 10:47:09 2007 +0200 rxvt-unicode-8.3-1-i686 version bump updated depends() diff --git a/source/x11-extra/rxvt-unicode/FrugalBuild b/source/x11-extra/rxvt-unicode/FrugalBuild index 06413a4..bbcd7b7 100644 --- a/source/x11-extra/rxvt-unicode/FrugalBuild +++ b/source/x11-extra/rxvt-unicode/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: voroskoi pkgname=rxvt-unicode -pkgver=8.2 +pkgver=8.3 pkgrel=1 pkgdesc="rxvt-unicode is a clone of the well known terminal emulator rxvt" url="http://software.schmorp.de/" -depends=('libxcb' 'freetype2' 'libx11' 'libxrender' 'fontconfig' 'libxft' 'libgcc' 'libxpm') +depends=('libxft' 'libxpm' 'libgcc') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://dist.schmorp.de/rxvt-unicode/ |grep tar |sed -ne 's/.*e-\(.*\).t.*/\1/;1 p'" @@ -18,6 +18,6 @@ build() { export TERMINFO=$Fdestdir/usr/share/terminfo Fbuild } -sha1sums=('75c2834ae8506faa514713ad70e2276f4eb7d555') +sha1sums=('cd335c47543ba086585a296ca0fe7445c07120dd') # optimization OK From voroskoi at frugalware.org Sun Aug 5 11:24:51 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Aug 5 11:24:54 2007 Subject: [Frugalware-git] frugalware-current: hplip-2.7.7-1-i686 Message-ID: <20070805092451.E942F13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f4f47f67aa137b676d88d507536ff7c8fa91da1f commit f4f47f67aa137b676d88d507536ff7c8fa91da1f Author: voroskoi Date: Sun Aug 5 11:20:18 2007 +0200 hplip-2.7.7-1-i686 version bump enpty line fix in upstream diff --git a/source/apps-extra/hplip/FrugalBuild b/source/apps-extra/hplip/FrugalBuild index 1ac123f..3442c26 100644 --- a/source/apps-extra/hplip/FrugalBuild +++ b/source/apps-extra/hplip/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=hplip -pkgver=2.7.6 -pkgrel=2 +pkgver=2.7.7 +pkgrel=1 pkgextraver= _F_sourceforge_ext=$pkgextraver.tar.gz Finclude sourceforge @@ -17,9 +17,7 @@ provides=('hpijs') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep version |sed -e 's/.*ion \(.*\)/\1/' -e s/$pkgextraver//" -source=($source empty-line-removal-bug.patch) -sha1sums=('9e6bcd62f81b86a700ba3613061b245c07b2ea55' \ - '6031298d06941b6c82903f4d8430fb1afe84842c') +sha1sums=('5b80ba8a62035985cbc4a0ae656df8a1779dbbdb') build() { Fbuild --enable-doc-build --enable-foomatic-ppd-install \ From voroskoi at frugalware.org Sun Aug 5 11:24:52 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Aug 5 11:24:55 2007 Subject: [Frugalware-git] frugalware-current: tor-0.1.2.16-1-i686 Message-ID: <20070805092452.354C413A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=15817d7aa7e1515b1c8ddf123286daf8f420570a commit 15817d7aa7e1515b1c8ddf123286daf8f420570a Author: voroskoi Date: Sun Aug 5 11:20:34 2007 +0200 tor-0.1.2.16-1-i686 version bump diff --git a/source/network-extra/tor/FrugalBuild b/source/network-extra/tor/FrugalBuild index 95b27a2..c1684a5 100644 --- a/source/network-extra/tor/FrugalBuild +++ b/source/network-extra/tor/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=tor -pkgver=0.1.2.15 +pkgver=0.1.2.16 pkgrel=1 pkgdesc="An anonymous Internet communication system" url="http://tor.eff.org" From crazy at frugalware.org Sun Aug 5 13:29:31 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 13:29:34 2007 Subject: [Frugalware-git] frugalware-current: gstreamer-0.10.14-1-i686 Message-ID: <20070805112931.4003B13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d9482d965c1fdfc2216a6b601d3b8e51c0f523b1 commit d9482d965c1fdfc2216a6b601d3b8e51c0f523b1 Author: crazy Date: Sun Aug 5 13:27:59 2007 +0200 gstreamer-0.10.14-1-i686 * Version bump diff --git a/source/xmultimedia/gstreamer/FrugalBuild b/source/xmultimedia/gstreamer/FrugalBuild index 5df84bd..05f421f 100644 --- a/source/xmultimedia/gstreamer/FrugalBuild +++ b/source/xmultimedia/gstreamer/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=gstreamer -pkgver=0.10.13 +pkgver=0.10.14 pkgrel=1 pkgdesc="Open Source Multimedia Framework" url="http://gstreamer.freedesktop.org/" @@ -39,6 +39,6 @@ build() Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('6b5c4f7829625591233ba9082317f2b5eba7cc2b'\ +sha1sums=('29e02be4dbf50272086e436f3fab2dcfadaaff2b' \ 'b1a04cc8052418384e2f3a5de925abaeac8110ae') # optimization OK From crazy at frugalware.org Sun Aug 5 13:52:21 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 13:52:23 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-base-0.10.14-1-i686 Message-ID: <20070805115221.5CAB213A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3843701a311d7ca4df54e7505c3759a6c02bb749 commit 3843701a311d7ca4df54e7505c3759a6c02bb749 Author: crazy Date: Sun Aug 5 13:49:51 2007 +0200 gst-plugins-base-0.10.14-1-i686 * Version bump diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index bf549ef..1cf473f 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: crazy pkgname=gst-plugins-base -pkgver=0.10.13 +pkgver=0.10.14 pkgrel=1 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" -depends=('libxv' 'libsm' 'gstreamer>=0.10.13') +depends=('libxv' 'libsm' 'gstreamer>=0.10.14') rodepends=('libmms' 'hermes' 'ortp') makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.16.0-2' 'cdparanoia' 'pango' 'liboil>=0.3.10' \ 'alsa-lib' 'libtheora' 'fontconfig' 'dbus-glib>=0.71' 'avahi-glib>=0.6.14-2' \ @@ -17,12 +17,8 @@ archs=('i686' 'x86_64') options=('scriptlet') replaces=('gst-plugins') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" -source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2 \ - gstalsamixer_signals_support.patch \ - $pkgname-abi_fix.patch) -sha1sums=('dbab4468f3a1c12472ecc901d025a83cf9030215'\ - 'de0dce64feb2871a823dcacdb619e9d55712bbe0'\ - '8f07f4d47479ec7a004e6afdf0d7b8cf20ceaaef') +source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('54e7b2d482f6eef4dbbe7d4b5f59ada033e447ab') subpkgs=("$pkgname-gnomevfs" "$pkgname-cdparanoia" "$pkgname-pango" "$pkgname-alsa" \ "$pkgname-theora" "$pkgname-oil" "$pkgname-libvisual" "$pkgname-ogg" "$pkgname-vorbis" \ diff --git a/source/xmultimedia/gst-plugins-base/gst-plugins-base-abi_fix.patch b/source/xmultimedia/gst-plugins-base/gst-plugins-base-abi_fix.patch deleted file mode 100644 index d6b66e3..0000000 --- a/source/xmultimedia/gst-plugins-base/gst-plugins-base-abi_fix.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/gst-libs/gst/interfaces/mixer.c b/gst-libs/gst/interfaces/mixer.c -index 6058b9f..53fa498 100644 ---- a/gst-libs/gst/interfaces/mixer.c -+++ b/gst-libs/gst/interfaces/mixer.c -@@ -340,7 +340,7 @@ gst_mixer_record_toggled (GstMixer * mixer, - - void - gst_mixer_volume_changed (GstMixer * mixer, -- GstMixerTrack * track, const gint * volumes) -+ GstMixerTrack * track, gint * volumes) - { - g_return_if_fail (mixer != NULL); - g_return_if_fail (track != NULL); -@@ -353,7 +353,7 @@ gst_mixer_volume_changed (GstMixer * mixer, - - void - gst_mixer_option_changed (GstMixer * mixer, -- GstMixerOptions * opts, const gchar * value) -+ GstMixerOptions * opts, gchar * value) - { - g_return_if_fail (mixer != NULL); - g_return_if_fail (opts != NULL); -diff --git a/gst-libs/gst/interfaces/mixer.h b/gst-libs/gst/interfaces/mixer.h -index 28c5f11..459a142 100644 ---- a/gst-libs/gst/interfaces/mixer.h -+++ b/gst-libs/gst/interfaces/mixer.h -@@ -74,12 +74,6 @@ struct _GstMixerClass { - void (* set_record) (GstMixer *mixer, - GstMixerTrack *track, - gboolean record); -- void (* set_option) (GstMixer *mixer, -- GstMixerOptions *opts, -- gchar *value); -- const gchar * (* get_option) (GstMixer *mixer, -- GstMixerOptions *opts); -- - /* signals */ - void (* mute_toggled) (GstMixer *mixer, - GstMixerTrack *channel, -@@ -95,6 +89,13 @@ struct _GstMixerClass { - GstMixerOptions *opts, - const gchar *option); - -+ /* FIXME 0.11: move set/get function to virtual functions part */ -+ void (* set_option) (GstMixer *mixer, -+ GstMixerOptions *opts, -+ gchar *value); -+ const gchar * (* get_option) (GstMixer *mixer, -+ GstMixerOptions *opts); -+ - /*< private >*/ - gpointer _gst_reserved[GST_PADDING]; - }; -@@ -128,12 +129,13 @@ void gst_mixer_mute_toggled (GstMixer *mixer, - void gst_mixer_record_toggled (GstMixer *mixer, - GstMixerTrack *track, - gboolean record); -+/* FIXME 0.11: volumes and value shall be const */ - void gst_mixer_volume_changed (GstMixer *mixer, - GstMixerTrack *track, -- const gint *volumes); -+ gint *volumes); - void gst_mixer_option_changed (GstMixer *mixer, - GstMixerOptions *opts, -- const gchar *value); -+ gchar *value); - - G_END_DECLS - diff --git a/source/xmultimedia/gst-plugins-base/gstalsamixer_signals_support.patch b/source/xmultimedia/gst-plugins-base/gstalsamixer_signals_support.patch deleted file mode 100644 index c1571ef..0000000 --- a/source/xmultimedia/gst-plugins-base/gstalsamixer_signals_support.patch +++ /dev/null @@ -1,592 +0,0 @@ -diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c -index 931d98f..cd7ccbf 100644 ---- a/ext/alsa/gstalsamixer.c -+++ b/ext/alsa/gstalsamixer.c -@@ -42,6 +42,81 @@ - - #include "gstalsamixer.h" - -+static void gst_alsa_mixer_update_option (GstAlsaMixer * mixer, GstAlsaMixerOptions * alsa_opts); -+static void gst_alsa_mixer_update_track (GstAlsaMixer * mixer, GstAlsaMixerTrack * alsa_track); -+ -+static gboolean gst_alsa_mixer_prepare (GSource * source, gint * timeout); -+static gboolean gst_alsa_mixer_check (GSource * source); -+static gboolean gst_alsa_mixer_dispatch (GSource * source, GSourceFunc callback, gpointer user_data); -+static void gst_alsa_mixer_finalize (GSource * source); -+ -+static GMainContext *main_context; -+ -+typedef struct _GstAlsaMixerWatch GstAlsaMixerWatch; -+struct _GstAlsaMixerWatch -+{ -+ GSource source; -+ gint n_poll_fds; -+ GPollFD * poll_fds; -+}; -+ -+GSourceFuncs gst_alsa_mixer_watch_funcs = { -+ gst_alsa_mixer_prepare, -+ gst_alsa_mixer_check, -+ gst_alsa_mixer_dispatch, -+ gst_alsa_mixer_finalize -+}; -+ -+static gboolean -+gst_alsa_mixer_prepare (GSource * source, gint * timeout) -+{ -+ *timeout = -1; -+ return FALSE; -+} -+ -+static gboolean -+gst_alsa_mixer_check (GSource * source) -+{ -+ GstAlsaMixerWatch *watch = (GstAlsaMixerWatch *)source; -+ gint i; -+ gushort revents; -+ -+ /* Code based on snd_mixer_poll_descriptors_revents() adapted for glib */ -+ revents = 0; -+ for (i = 0; i < watch->n_poll_fds; ++i) { -+ revents |= watch->poll_fds[i].revents & (G_IO_IN|G_IO_ERR|G_IO_HUP); -+ } -+ -+ if (revents & G_IO_ERR || revents & G_IO_HUP) { -+ GST_WARNING ("ALSA poll fds returned ERR or HUP"); -+ return FALSE; -+ } -+ -+ return (revents & G_IO_IN); -+} -+ -+static gboolean -+gst_alsa_mixer_dispatch (GSource * source, GSourceFunc callback, gpointer user_data) -+{ -+ if (!callback) { -+ GST_WARNING ("Cannot get callback from ALSA mixer watcher"); -+ } -+ -+ return (*callback) (user_data); -+} -+ -+static void -+gst_alsa_mixer_finalize (GSource * source) -+{ -+ GstAlsaMixerWatch *watch = (GstAlsaMixerWatch *)source; -+ -+ if (watch->poll_fds != NULL) { -+ g_free (watch->poll_fds); -+ watch->poll_fds = NULL; -+ } -+ -+ watch->n_poll_fds = 0; -+} - - /* First some utils, then the mixer implementation */ - static gboolean -@@ -169,11 +244,72 @@ gst_alsa_mixer_find_master_mixer (GstAlsaMixer * mixer, snd_mixer_t * handle) - return NULL; - } - -+static gboolean -+gst_alsa_mixer_handle_source_callback (gpointer data) -+{ -+ GstAlsaMixer *mixer = (GstAlsaMixer *)data; -+ -+ GST_WARNING ("Source cb"); -+ snd_mixer_handle_events (mixer->handle); -+ -+ return TRUE; -+} -+ -+static int -+gst_alsa_mixer_handle_callback (snd_mixer_t *handle, unsigned int mask, snd_mixer_elem_t *elem) -+{ -+ GstAlsaMixer *mixer = (GstAlsaMixer *)snd_mixer_get_callback_private (handle); -+ GList *item; -+ -+ GST_WARNING ("ALSA cb"); -+ snd_mixer_handle_events (mixer->handle); -+ -+ for (item = mixer->tracklist; item != NULL; item = item->next) { -+ if (GST_IS_ALSA_MIXER_TRACK (item->data)) { -+ GstAlsaMixerTrack *item_alsa_track = GST_ALSA_MIXER_TRACK (item->data); -+ gst_alsa_mixer_update_track (mixer, item_alsa_track); -+ } else { -+ GstAlsaMixerOptions *item_alsa_options = GST_ALSA_MIXER_OPTIONS (item->data); -+ gst_alsa_mixer_update_option (mixer, item_alsa_options); -+ } -+ } -+ -+ return 0; -+} -+ -+int -+gst_alsa_mixer_elem_handle_callback (snd_mixer_elem_t *elem, unsigned int mask) -+{ -+ GstAlsaMixer *mixer = (GstAlsaMixer *)snd_mixer_elem_get_callback_private (elem); -+ GList *item; -+ -+ GST_WARNING ("ALSA elem cb"); -+ -+ for (item = mixer->tracklist; item != NULL; item = item->next) { -+ if (GST_IS_ALSA_MIXER_TRACK (item->data)) { -+ if (GST_ALSA_MIXER_TRACK (item->data)->element != elem) -+ continue; -+ -+ gst_alsa_mixer_update_track (mixer, GST_ALSA_MIXER_TRACK (item->data)); -+ } else if (GST_IS_ALSA_MIXER_OPTIONS (item->data)) { -+ if (GST_ALSA_MIXER_OPTIONS (item->data)->element != elem) -+ continue; -+ -+ gst_alsa_mixer_update_option (mixer, GST_ALSA_MIXER_OPTIONS (item->data)); -+ } -+ } -+ -+ return 0; -+} -+ - static void - gst_alsa_mixer_ensure_track_list (GstAlsaMixer * mixer) - { - gint i, count; - snd_mixer_elem_t *element, *master; -+ struct pollfd *pfds; -+ GstAlsaMixerWatch *watch; -+ GList *item; - - g_return_if_fail (mixer->handle != NULL); - -@@ -190,12 +326,11 @@ gst_alsa_mixer_ensure_track_list (GstAlsaMixer * mixer) - * Some ALSA tracks may have playback and capture capabilities. - * Here we model them as two separate GStreamer tracks. - */ -- -+ - for (i = 0; i < count; i++) { - GstMixerTrack *play_track = NULL; - GstMixerTrack *cap_track = NULL; - const gchar *name; -- GList *item; - gint samename = 0; - - name = snd_mixer_selem_get_name (element); -@@ -287,6 +422,58 @@ gst_alsa_mixer_ensure_track_list (GstAlsaMixer * mixer) - - element = snd_mixer_elem_next (element); - } -+ -+ if (mixer->handle_source != NULL) -+ return; -+ -+ snd_mixer_set_callback_private (mixer->handle, mixer); -+ snd_mixer_set_callback (mixer->handle, gst_alsa_mixer_handle_callback); -+ -+ main_context = g_main_context_default (); -+ -+ mixer->handle_source = g_source_new (&gst_alsa_mixer_watch_funcs, sizeof (GstAlsaMixerWatch)); -+ g_return_if_fail (main_context != NULL && mixer->handle_source != NULL); -+ -+ watch = (GstAlsaMixerWatch *)mixer->handle_source; -+ -+ count = snd_mixer_poll_descriptors_count (mixer->handle); -+ -+ pfds = g_newa (struct pollfd, count); -+ -+ watch->n_poll_fds = snd_mixer_poll_descriptors (mixer->handle, pfds, count);; -+ watch->poll_fds = g_new0 (GPollFD, count); -+ if (watch->poll_fds == NULL) { -+ GST_WARNING ("Cannot allocate poll descriptors"); -+ g_source_destroy (mixer->handle_source); -+ mixer->handle_source = NULL; -+ return; -+ } -+ -+ for (i = 0; i < watch->n_poll_fds; ++i) { -+ watch->poll_fds[i].fd = pfds[i].fd; -+ -+ if (pfds[i].events & POLLIN) watch->poll_fds[i].events |= G_IO_IN; -+ if (pfds[i].events & POLLOUT) watch->poll_fds[i].events |= G_IO_OUT; -+ if (pfds[i].events & POLLPRI) watch->poll_fds[i].events |= G_IO_PRI; -+ -+ g_source_add_poll (mixer->handle_source, &watch->poll_fds[i]); -+ } -+ -+ /* FIXME mixer has to be protected, since cb could be made from different thread ? */ -+ g_source_set_callback (mixer->handle_source, gst_alsa_mixer_handle_source_callback, mixer, NULL); -+ g_source_attach (mixer->handle_source, main_context); -+ -+ for (item = mixer->tracklist; item != NULL; item = item->next) { -+ snd_mixer_elem_t *temp; -+ -+ if (GST_IS_ALSA_MIXER_OPTIONS (item->data)) -+ temp = GST_ALSA_MIXER_OPTIONS (item->data)->element; -+ else -+ temp = GST_ALSA_MIXER_TRACK (item->data)->element; -+ -+ snd_mixer_elem_set_callback (temp, gst_alsa_mixer_elem_handle_callback); -+ snd_mixer_elem_set_callback_private (temp, mixer); -+ } - } - - -@@ -303,7 +490,7 @@ gst_alsa_mixer_new (const char *device, GstAlsaMixerDirection dir) - - ret->device = g_strdup (device); - ret->dir = dir; -- -+ - if (!gst_alsa_mixer_open (ret)) - goto error; - -@@ -322,6 +509,16 @@ gst_alsa_mixer_free (GstAlsaMixer * mixer) - { - g_return_if_fail (mixer != NULL); - -+ if (mixer->this) { -+ g_object_unref (G_OBJECT (mixer->this)); -+ mixer->this = NULL; -+ } -+ -+ if (mixer->handle_source) { -+ g_source_destroy (mixer->handle_source); -+ mixer->handle_source = NULL; -+ } -+ - if (mixer->device) { - g_free (mixer->device); - mixer->device = NULL; -@@ -356,16 +553,6 @@ gst_alsa_mixer_list_tracks (GstAlsaMixer * mixer) - return (const GList *) mixer->tracklist; - } - --static void --gst_alsa_mixer_update (GstAlsaMixer * mixer, GstAlsaMixerTrack * alsa_track) --{ -- snd_mixer_handle_events (mixer->handle); -- -- if (alsa_track) -- gst_alsa_mixer_track_update (alsa_track); --} -- -- - void - gst_alsa_mixer_get_volume (GstAlsaMixer * mixer, GstMixerTrack * track, - gint * volumes) -@@ -375,7 +562,7 @@ gst_alsa_mixer_get_volume (GstAlsaMixer * mixer, GstMixerTrack * track, - - g_return_if_fail (mixer->handle != NULL); - -- gst_alsa_mixer_update (mixer, alsa_track); -+ gst_alsa_mixer_track_update (alsa_track); - - if (track->flags & GST_MIXER_TRACK_OUTPUT) { /* return playback volume */ - -@@ -420,7 +607,7 @@ gst_alsa_mixer_set_volume (GstAlsaMixer * mixer, GstMixerTrack * track, - - g_return_if_fail (mixer->handle != NULL); - -- gst_alsa_mixer_update (mixer, alsa_track); -+ gst_alsa_mixer_track_update (alsa_track); - - if (track->flags & GST_MIXER_TRACK_OUTPUT) { - -@@ -461,7 +648,7 @@ gst_alsa_mixer_set_mute (GstAlsaMixer * mixer, GstMixerTrack * track, - - g_return_if_fail (mixer->handle != NULL); - -- gst_alsa_mixer_update (mixer, alsa_track); -+ gst_alsa_mixer_track_update (alsa_track); - - if (!!(mute) == !!(track->flags & GST_MIXER_TRACK_MUTE)) - return; -@@ -509,7 +696,7 @@ gst_alsa_mixer_set_record (GstAlsaMixer * mixer, - - g_return_if_fail (mixer->handle != NULL); - -- gst_alsa_mixer_update (mixer, alsa_track); -+ gst_alsa_mixer_track_update (alsa_track); - - if (!!(record) == !!(track->flags & GST_MIXER_TRACK_RECORD)) - return; -@@ -536,7 +723,7 @@ gst_alsa_mixer_set_record (GstAlsaMixer * mixer, - - if (item_alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CSWITCH_EXCL && - item_alsa_track->capture_group == alsa_track->capture_group) { -- gst_alsa_mixer_update (mixer, item_alsa_track); -+ gst_alsa_mixer_track_update (item_alsa_track); - } - } - } -@@ -562,8 +749,6 @@ gst_alsa_mixer_set_option (GstAlsaMixer * mixer, - - g_return_if_fail (mixer->handle != NULL); - -- gst_alsa_mixer_update (mixer, NULL); -- - for (item = opts->values; item != NULL; item = item->next, n++) { - if (!strcmp (item->data, value)) { - idx = n; -@@ -585,11 +770,54 @@ gst_alsa_mixer_get_option (GstAlsaMixer * mixer, GstMixerOptions * opts) - - g_return_val_if_fail (mixer->handle != NULL, NULL); - -- gst_alsa_mixer_update (mixer, NULL); -- - ret = snd_mixer_selem_get_enum_item (alsa_opts->element, 0, &idx); - if (ret == 0) - return g_list_nth_data (opts->values, idx); - else - return snd_strerror (ret); /* feeble attempt at error handling */ - } -+ -+static void -+gst_alsa_mixer_update_option (GstAlsaMixer * mixer, GstAlsaMixerOptions * alsa_opts) -+{ -+ gint ret; -+ guint idx; -+ const gchar *option; -+ -+ if (mixer->this == NULL) { -+ GST_WARNING ("Cannot send update notifications, no GstMixer * given"); -+ return; -+ } -+ -+ ret = snd_mixer_selem_get_enum_item (alsa_opts->element, 0, &idx); -+ if (ret == 0) { -+ option = g_list_nth_data (GST_MIXER_OPTIONS (alsa_opts)->values, idx); -+ gst_mixer_option_changed (mixer->this, GST_MIXER_OPTIONS (alsa_opts), option); -+ } -+} -+ -+static void -+gst_alsa_mixer_update_track (GstAlsaMixer * mixer, GstAlsaMixerTrack * alsa_track) -+{ -+ GstMixerTrack *track = (GstMixerTrack *) alsa_track; -+ -+ if (mixer->this == NULL) { -+ GST_WARNING ("Cannot send update notifications, no GstMixer * given"); -+ return; -+ } -+ -+ gst_alsa_mixer_track_update (alsa_track); -+ -+ gst_mixer_record_toggled (mixer->this, track, GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD)); -+ gst_mixer_mute_toggled (mixer->this, track, GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE)); -+ gst_mixer_volume_changed (mixer->this, track, alsa_track->volumes); -+} -+ -+void -+gst_alsa_mixer_set_this (GstAlsaMixer * mixer, GstMixer * this) -+{ -+ g_return_if_fail (mixer != NULL && mixer->this == NULL); -+ g_return_if_fail (this != NULL); -+ -+ mixer->this = g_object_ref (G_OBJECT (this)); -+} -diff --git a/ext/alsa/gstalsamixer.h b/ext/alsa/gstalsamixer.h -index 6c9eb1e..6208a1c 100644 ---- a/ext/alsa/gstalsamixer.h -+++ b/ext/alsa/gstalsamixer.h -@@ -51,7 +51,9 @@ struct _GstAlsaMixer - GList * tracklist; /* list of available tracks */ - - snd_mixer_t * handle; -+ GSource * handle_source; - -+ GstMixer * this; - gchar * device; - gchar * cardname; - -@@ -61,6 +63,8 @@ struct _GstAlsaMixer - - GstAlsaMixer* gst_alsa_mixer_new (const gchar *device, - GstAlsaMixerDirection dir); -+void gst_alsa_mixer_set_this (GstAlsaMixer *mixer, -+ GstMixer * this); - void gst_alsa_mixer_free (GstAlsaMixer *mixer); - - const GList* gst_alsa_mixer_list_tracks (GstAlsaMixer * mixer); -@@ -82,7 +86,6 @@ void gst_alsa_mixer_set_option (GstAlsaMixer * mixer, - const gchar* gst_alsa_mixer_get_option (GstAlsaMixer * mixer, - GstMixerOptions * opts); - -- - #define GST_IMPLEMENT_ALSA_MIXER_METHODS(Type, interface_as_function) \ - static gboolean \ - interface_as_function ## _supported (Type *this, GType iface_type) \ -diff --git a/ext/alsa/gstalsamixerelement.c b/ext/alsa/gstalsamixerelement.c -index 75d5b4a..0c76376 100644 ---- a/ext/alsa/gstalsamixerelement.c -+++ b/ext/alsa/gstalsamixerelement.c -@@ -44,23 +44,23 @@ GST_ELEMENT_DETAILS ("Alsa mixer", - static void gst_alsa_mixer_element_init_interfaces (GType type); - - GST_BOILERPLATE_FULL (GstAlsaMixerElement, gst_alsa_mixer_element, -- GstElement, GST_TYPE_ELEMENT, gst_alsa_mixer_element_init_interfaces) -+ GstElement, GST_TYPE_ELEMENT, gst_alsa_mixer_element_init_interfaces); - - /* massive macro that takes care of all the GstMixer stuff */ -- GST_IMPLEMENT_ALSA_MIXER_METHODS (GstAlsaMixerElement, gst_alsa_mixer_element); -+GST_IMPLEMENT_ALSA_MIXER_METHODS (GstAlsaMixerElement, gst_alsa_mixer_element); - -- static void gst_alsa_mixer_element_get_property (GObject * object, -- guint prop_id, GValue * value, GParamSpec * pspec); -- static void gst_alsa_mixer_element_set_property (GObject * object, -- guint prop_id, const GValue * value, GParamSpec * pspec); -- static void gst_alsa_mixer_element_finalize (GObject * object); -+static void gst_alsa_mixer_element_get_property (GObject * object, -+ guint prop_id, GValue * value, GParamSpec * pspec); -+static void gst_alsa_mixer_element_set_property (GObject * object, -+ guint prop_id, const GValue * value, GParamSpec * pspec); -+static void gst_alsa_mixer_element_finalize (GObject * object); - -- static GstStateChangeReturn gst_alsa_mixer_element_change_state (GstElement -- * element, GstStateChange transition); -+static GstStateChangeReturn gst_alsa_mixer_element_change_state (GstElement -+ * element, GstStateChange transition); - -- static gboolean -- gst_alsa_mixer_element_interface_supported (GstAlsaMixerElement * this, -- GType interface_type) -+static gboolean -+gst_alsa_mixer_element_interface_supported (GstAlsaMixerElement * this, -+ GType interface_type) - { - if (interface_type == GST_TYPE_MIXER) { - return gst_alsa_mixer_element_supported (this, interface_type); -@@ -214,6 +214,7 @@ gst_alsa_mixer_element_change_state (GstElement * element, - this->mixer = gst_alsa_mixer_new (this->device, GST_ALSA_MIXER_ALL); - if (!this->mixer) - goto open_failed; -+ gst_alsa_mixer_set_this (this->mixer, GST_MIXER (element)); - } - break; - default: -diff --git a/ext/alsa/gstalsamixertrack.c b/ext/alsa/gstalsamixertrack.c -index d7b8a93..76a5852 100644 ---- a/ext/alsa/gstalsamixertrack.c -+++ b/ext/alsa/gstalsamixertrack.c -@@ -239,6 +239,26 @@ gst_alsa_mixer_track_update (GstAlsaMixerTrack * alsa_track) - gint i; - gint audible = !(track->flags & GST_MIXER_TRACK_MUTE); - -+ if (alsa_track_has_cap (alsa_track, GST_ALSA_MIXER_TRACK_PVOLUME)) { -+ /* update playback volume */ -+ for (i = 0; i < track->num_channels; i++) { -+ long vol = 0; -+ -+ snd_mixer_selem_get_playback_volume (alsa_track->element, i, &vol); -+ alsa_track->volumes[i] = (gint) vol; -+ } -+ } -+ -+ if (alsa_track_has_cap (alsa_track, GST_ALSA_MIXER_TRACK_CVOLUME)) { -+ /* update capture volume */ -+ for (i = 0; i < track->num_channels; i++) { -+ long vol = 0; -+ -+ snd_mixer_selem_get_capture_volume (alsa_track->element, i, &vol); -+ alsa_track->volumes[i] = (gint) vol; -+ } -+ } -+ - /* Any updates in flags? */ - if (alsa_track_has_cap (alsa_track, GST_ALSA_MIXER_TRACK_PSWITCH)) { - int v = 0; -@@ -260,7 +280,7 @@ gst_alsa_mixer_track_update (GstAlsaMixerTrack * alsa_track) - - if (vol > track->min_volume) { - audible = 1; -- break; -+ break; - } - } - } -@@ -304,7 +324,7 @@ gst_alsa_mixer_track_update (GstAlsaMixerTrack * alsa_track) - - if (vol > track->min_volume) { - recording = 1; -- break; -+ break; - } - } - } -diff --git a/gst-libs/gst/interfaces/mixer.c b/gst-libs/gst/interfaces/mixer.c -index 116bab2..6058b9f 100644 ---- a/gst-libs/gst/interfaces/mixer.c -+++ b/gst-libs/gst/interfaces/mixer.c -@@ -340,7 +340,7 @@ gst_mixer_record_toggled (GstMixer * mixer, - - void - gst_mixer_volume_changed (GstMixer * mixer, -- GstMixerTrack * track, gint * volumes) -+ GstMixerTrack * track, const gint * volumes) - { - g_return_if_fail (mixer != NULL); - g_return_if_fail (track != NULL); -@@ -353,7 +353,7 @@ gst_mixer_volume_changed (GstMixer * mixer, - - void - gst_mixer_option_changed (GstMixer * mixer, -- GstMixerOptions * opts, gchar * value) -+ GstMixerOptions * opts, const gchar * value) - { - g_return_if_fail (mixer != NULL); - g_return_if_fail (opts != NULL); -@@ -361,5 +361,5 @@ gst_mixer_option_changed (GstMixer * mixer, - g_signal_emit (G_OBJECT (mixer), - gst_mixer_signals[SIGNAL_OPTION_CHANGED], 0, opts, value); - -- g_signal_emit_by_name (G_OBJECT (opts), "value_changed", value); -+ g_signal_emit_by_name (G_OBJECT (opts), "option_changed", value); - } -diff --git a/gst-libs/gst/interfaces/mixer.h b/gst-libs/gst/interfaces/mixer.h -index dde73ab..28c5f11 100644 ---- a/gst-libs/gst/interfaces/mixer.h -+++ b/gst-libs/gst/interfaces/mixer.h -@@ -74,6 +74,11 @@ struct _GstMixerClass { - void (* set_record) (GstMixer *mixer, - GstMixerTrack *track, - gboolean record); -+ void (* set_option) (GstMixer *mixer, -+ GstMixerOptions *opts, -+ gchar *value); -+ const gchar * (* get_option) (GstMixer *mixer, -+ GstMixerOptions *opts); - - /* signals */ - void (* mute_toggled) (GstMixer *mixer, -@@ -84,17 +89,11 @@ struct _GstMixerClass { - gboolean record); - void (* volume_changed) (GstMixer *mixer, - GstMixerTrack *channel, -- gint *volumes); -- -- void (* set_option) (GstMixer *mixer, -- GstMixerOptions *opts, -- gchar *value); -- const gchar * (* get_option) (GstMixer *mixer, -- GstMixerOptions *opts); -+ const gint *volumes); - - void (* option_changed) (GstMixer *mixer, - GstMixerOptions *opts, -- gchar *option); -+ const gchar *option); - - /*< private >*/ - gpointer _gst_reserved[GST_PADDING]; -@@ -131,10 +130,10 @@ void gst_mixer_record_toggled (GstMixer *mixer, - gboolean record); - void gst_mixer_volume_changed (GstMixer *mixer, - GstMixerTrack *track, -- gint *volumes); -+ const gint *volumes); - void gst_mixer_option_changed (GstMixer *mixer, - GstMixerOptions *opts, -- gchar *value); -+ const gchar *value); - - G_END_DECLS - From crazy at frugalware.org Sun Aug 5 13:58:59 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 13:59:02 2007 Subject: [Frugalware-git] frugalware-current: unicap-0.2.13-1-i686 Message-ID: <20070805115859.CB5CD13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=89e1cf7b4b67cc5be9534108f1d6123d4f42004f commit 89e1cf7b4b67cc5be9534108f1d6123d4f42004f Author: crazy Date: Sun Aug 5 13:58:02 2007 +0200 unicap-0.2.13-1-i686 * Version bump diff --git a/source/xlib-extra/unicap/FrugalBuild b/source/xlib-extra/unicap/FrugalBuild index 74cf5cb..9cc9ac3 100644 --- a/source/xlib-extra/unicap/FrugalBuild +++ b/source/xlib-extra/unicap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=unicap -pkgver=0.2.11 +pkgver=0.2.13 pkgrel=1 pkgdesc="unicap provides a uniform API for all kinds of video capture devices." url="http://unicap-imaging.org/" @@ -12,6 +12,6 @@ groups=('xlib-extra') archs=('i686') up2date="lynx -dump http://unicap-imaging.org/download.htm|grep -m1 '.tar.gz'|sed 's/.*cap-\(.*\).t.* .*/\1/'" source=($url/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('9456b58b6f5236926ae3b1c5c486dc7598a568bc') +sha1sums=('2f15aa36c80501017e11c2fadd63e120207aef91') # optimization OK From crazy at frugalware.org Sun Aug 5 14:01:20 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 14:01:22 2007 Subject: [Frugalware-git] frugalware-current: mutagen-1.12-1-i686 Message-ID: <20070805120120.22A2713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bf2bfacbc05b2d1156bac536e51afa97eb5b9633 commit bf2bfacbc05b2d1156bac536e51afa97eb5b9633 Author: crazy Date: Sun Aug 5 14:00:26 2007 +0200 mutagen-1.12-1-i686 * Version bump diff --git a/source/apps/mutagen/FrugalBuild b/source/apps/mutagen/FrugalBuild index 8009fb2..296028a 100644 --- a/source/apps/mutagen/FrugalBuild +++ b/source/apps/mutagen/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=mutagen -pkgver=1.11 -pkgrel=2 +pkgver=1.12 +pkgrel=1 pkgdesc="Mutagen is an audio metadata tag reader and writer." url="http://www.sacredchao.net/quodlibet/wiki" depends=('python>=2.5') @@ -11,4 +11,4 @@ groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://www.sacredchao.net/~piman/software|grep 'mutagen.*\.tar\.gz$'|sort -r -n|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.sacredchao.net/~piman/software/$pkgname-$pkgver.tar.gz) -sha1sums=('26c276b1d7d3bf1e5837c3e0071971b9d41ed5bf') +sha1sums=('f74ea15235e6fe766aef12cd31028d438940f1b9') From crazy at frugalware.org Sun Aug 5 14:03:49 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 14:03:52 2007 Subject: [Frugalware-git] frugalware-current: libmtp-0.2.0-1-i686 Message-ID: <20070805120349.E647C13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e41ab9280e1514a06c1edefabef77094dbddb29c commit e41ab9280e1514a06c1edefabef77094dbddb29c Author: crazy Date: Sun Aug 5 14:03:03 2007 +0200 libmtp-0.2.0-1-i686 * Version bump diff --git a/source/lib-extra/libmtp/FrugalBuild b/source/lib-extra/libmtp/FrugalBuild index 441d8d0..1975df2 100644 --- a/source/lib-extra/libmtp/FrugalBuild +++ b/source/lib-extra/libmtp/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: crazy pkgname=libmtp -pkgver=0.1.5 +pkgver=0.2.0 pkgrel=1 pkgdesc="libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)." -depends=('glibc' 'libusb') +depends=('libusb') groups=('lib-extra') archs=('i686' 'x86_64') Finclude sourceforge +sha1sums=('5c05a964656303bca07bf76dbbd9fd200abd0b94') -sha1sums=('8c9e0ba2cb63db3dd32e484906683b4e4ed7d770') # optimization OK From crazy at frugalware.org Sun Aug 5 14:08:18 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 14:08:25 2007 Subject: [Frugalware-git] frugalware-current: tastymenu-0.9-1-i686 Message-ID: <20070805120818.EE55313A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5674b1a4d33c4ff8f3c3d7ee6427727c4cfdb67 commit c5674b1a4d33c4ff8f3c3d7ee6427727c4cfdb67 Author: crazy Date: Sun Aug 5 14:07:25 2007 +0200 tastymenu-0.9-1-i686 * Version bump diff --git a/source/kde-extra/tastymenu/FrugalBuild b/source/kde-extra/tastymenu/FrugalBuild index f6a99b4..110eef9 100644 --- a/source/kde-extra/tastymenu/FrugalBuild +++ b/source/kde-extra/tastymenu/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=tastymenu -pkgver=0.8.2 +pkgver=0.9 pkgrel=1 pkgdesc="Tasty Menu is a KMenu replacement." depends=('kdelibs>=3.5.7') @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') _F_kde_id="41866" Finclude kde source=(http://www.notmart.org/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('03b3a9b3708676ffefeea8d58711b8860d68e13e') +sha1sums=('0f837a29edc3b2d1f1ac5c8145e184183768d12a') # optimization OK From crazy at frugalware.org Sun Aug 5 14:09:57 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 14:10:00 2007 Subject: [Frugalware-git] frugalware-current: perl-yaml-syck-0.95-1-i686 Message-ID: <20070805120957.CEED013A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b87f2e09677e0670782ae33cb4ac5b2945a389f0 commit b87f2e09677e0670782ae33cb4ac5b2945a389f0 Author: crazy Date: Sun Aug 5 14:09:08 2007 +0200 perl-yaml-syck-0.95-1-i686 * Version bump diff --git a/source/devel-extra/perl-yaml-syck/FrugalBuild b/source/devel-extra/perl-yaml-syck/FrugalBuild index 12eb341..fedf162 100644 --- a/source/devel-extra/perl-yaml-syck/FrugalBuild +++ b/source/devel-extra/perl-yaml-syck/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=YAML-Syck _F_perl_author=A/AU/AUDREYT -pkgver=0.94 +pkgver=0.95 pkgdesc="Fast, lightweight YAML loader and dumper" Finclude perl archs=('i686' 'x86_64') -sha1sums=('4f25668923a21835fd78f47205c9b80e45dd3366') +sha1sums=('9780db7ce3c658e686b29f6884c1882b3c236560') # optimization OK From crazy at frugalware.org Sun Aug 5 14:17:30 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 14:17:35 2007 Subject: [Frugalware-git] frugalware-current: gst-python-0.10.8-1-i686 Message-ID: <20070805121731.0112413A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c29f8c50752e42d6029d9c3bd2b1c2006d580e76 commit c29f8c50752e42d6029d9c3bd2b1c2006d580e76 Author: crazy Date: Sun Aug 5 14:16:37 2007 +0200 gst-python-0.10.8-1-i686 * Version bump * added missing scriptlet option diff --git a/source/xlib-extra/gst-python/FrugalBuild b/source/xlib-extra/gst-python/FrugalBuild index c61d3e5..be438fa 100644 --- a/source/xlib-extra/gst-python/FrugalBuild +++ b/source/xlib-extra/gst-python/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: DNAku =0.10.14' 'gst-plugins-base>=0.10.14' 'pygtk' 'libxml2') archs=('i686' 'x86_64') groups=('xlib-extra') +options=('scriptlet') up2date="lynx -dump http://gstreamer.freedesktop.org/src/gst-python/|grep tar.gz$|sed -n 's/.*n-\([^-]*\)-.*/\1/;$ p'|sed 's/.*on.//g'|sed 's/.tar.*//g'" source=(http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('2503d4ceab2574a818b2507fd5c9a417637bf550') +sha1sums=('e64d4bf2f668fd6c9dcdd9c17745fa616e12d96f') # optimization OK From crazy at frugalware.org Sun Aug 5 14:27:30 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 14:27:33 2007 Subject: [Frugalware-git] frugalware-current: libnids-1.22-1-i686 Message-ID: <20070805122730.B263513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=05266cdb30f6d4fb88e12e892c94d42de6df7d7d commit 05266cdb30f6d4fb88e12e892c94d42de6df7d7d Author: crazy Date: Sun Aug 5 14:26:39 2007 +0200 libnids-1.22-1-i686 * Version bump * fix build() ( RTFM helps ... ) brrr diff --git a/source/lib-extra/libnids/FrugalBuild b/source/lib-extra/libnids/FrugalBuild index e802068..0d50205 100644 --- a/source/lib-extra/libnids/FrugalBuild +++ b/source/lib-extra/libnids/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DNAku pkgname=libnids -pkgver=1.21 +pkgver=1.22 pkgrel=1 pkgdesc="Libnids is an implementation of an E-componenet of Network Intrusion Detection System" Finclude sourceforge @@ -10,20 +10,12 @@ depends=('libpcap' 'glib2' 'libnet') 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=('95d2b31c1d79b647d80ebe998d74146447b3fc17') +sha1sums=('321b0c10e1b192bc150dbe18844cdf7735663cde') build() { - Fmake --prefix=/usr - Fmkdir /usr/lib - Fmkdir /usr/man/man3 - Fmkdir /usr/include - Fmv ../src/$pkgname-$pkgver/src/libnids.a ../src/libnids.a - Ffile libnids.a /usr/lib/libnids.a - Fmv ../src/$pkgname-$pkgver/src/nids.h ../src/nids.h - Ffile nids.h /usr/include/nids.h - Fmv ../src/$pkgname-$pkgver/src/libnids.3 ../src/libnids.3 - Ffile libnids.3 /usr/man/man3/libnids.3 + Fmake --prefix=/usr --enable-shared + make install_prefix=$Fdestdir install || Fdie } # optimization OK From priyank at frugalware.org Sun Aug 5 15:47:02 2007 From: priyank at frugalware.org (Priyank) Date: Sun Aug 5 15:47:04 2007 Subject: [Frugalware-git] pacman-g2: pacman_sync_cleancache(): Fix doxygen documentation. Message-ID: <20070805134702.8FF2F13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=de2b6a0f2afa96212fbbe94e3524cff0257ff40b commit de2b6a0f2afa96212fbbe94e3524cff0257ff40b Author: Priyank Date: Sun Aug 5 19:13:19 2007 +0530 pacman_sync_cleancache(): Fix doxygen documentation. diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index 14b1fef..0590862 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -686,7 +686,7 @@ void *pacman_sync_getinfo(pmsyncpkg_t *sync, unsigned char parm) } /** Cleans the cache - * @ param full 0: only old packages, 1: all packages + * @param full 0: only old packages, 1: all packages * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int pacman_sync_cleancache(int full) From priyank at frugalware.org Sun Aug 5 16:35:18 2007 From: priyank at frugalware.org (Priyank) Date: Sun Aug 5 16:35:20 2007 Subject: [Frugalware-git] gfpm: gfpm_progress: hide the main window when the progress is displayed and re-show once progress is over. Message-ID: <20070805143518.9855413A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=f46cf94dcde145a01196bf2bb695194ea5817b6f commit f46cf94dcde145a01196bf2bb695194ea5817b6f Author: Priyank Date: Sun Aug 5 20:04:10 2007 +0530 gfpm_progress: hide the main window when the progress is displayed and re-show once progress is over. diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 3135364..3f69f9e 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -30,7 +30,8 @@ #include "config.h" #endif -extern GladeXML *xml; +extern GladeXML *xml; +extern GtkWidget *gfpm_mw; GtkProgressBar *progressbar = NULL; GtkWidget *progresswindow = NULL; @@ -70,9 +71,15 @@ void gfpm_progress_show (gboolean show) { if (show == TRUE) + { gtk_widget_show (progresswindow); + gtk_widget_hide (gfpm_mw); + } else + { gtk_widget_hide (progresswindow); + gtk_widget_show (gfpm_mw); + } return; } From priyank at frugalware.org Sun Aug 5 16:51:31 2007 From: priyank at frugalware.org (Priyank) Date: Sun Aug 5 16:51:33 2007 Subject: [Frugalware-git] gfpm: gfpm-systray: initial import of system tray icon for gfpm Message-ID: <20070805145131.3A18513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=abf43267e41024c24b177798f6e2500617f92d07 commit abf43267e41024c24b177798f6e2500617f92d07 Author: Priyank Date: Sun Aug 5 20:20:19 2007 +0530 gfpm-systray: initial import of system tray icon for gfpm diff --git a/src/Makefile.am b/src/Makefile.am index ab5937f..2a0b456 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ gfpm_SOURCES= \ gfpm-db.c \ gfpm-packagelist.c \ gfpm-progress.c \ + gfpm-systray.c \ gfpm-interface.c \ gfpm-messages.c \ gfpm-about.c \ diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 05ba62c..e7dee83 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -34,6 +34,7 @@ #include "gfpm-messages.h" #include "gfpm-packagelist.h" #include "gfpm-progress.h" +#include "gfpm-systray.h" #include "gfpm-util.h" #include "gfpm-about.h" #include "gfpm-db.h" @@ -237,6 +238,7 @@ gfpm_interface_init (void) gfpm_db_init (); gfpm_messages_init (); gfpm_progress_init (); + gfpm_systray_init (); /* load default repo */ gfpm_load_groups_tvw ("frugalware-current"); diff --git a/src/gfpm-systray.c b/src/gfpm-systray.c new file mode 100644 index 0000000..4431157 --- /dev/null +++ b/src/gfpm-systray.c @@ -0,0 +1,48 @@ +/* + * gfpm-systray.c for gfpm + * + * Copyright (C) 2007 by Priyank Gosalia + * + * 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. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include "gfpm-systray.h" + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +GtkStatusIcon *gfpm_statusicon; + +void +gfpm_systray_init (void) +{ + gfpm_statusicon = gtk_status_icon_new_from_icon_name ("gfpm"); + gtk_status_icon_set_visible (gfpm_statusicon, FALSE); + + return; +} + +void +gfpm_systray_set_visible (gboolean visible) +{ + gtk_status_icon_set_visible (gfpm_statusicon, FALSE); + + return; +} diff --git a/src/gfpm-systray.h b/src/gfpm-systray.h new file mode 100644 index 0000000..d9c1c6b --- /dev/null +++ b/src/gfpm-systray.h @@ -0,0 +1,15 @@ +#ifndef __GFPM_SYSTRAY_H__ +#define __GFPM_SYSTRAY_H__ + +#include +#include +#include +#include +#include +#include +#include + +void gfpm_systray_init (void); +void gfpm_systray_set_visible (gboolean); + +#endif From priyank at frugalware.org Sun Aug 5 17:07:34 2007 From: priyank at frugalware.org (Priyank) Date: Sun Aug 5 17:07:36 2007 Subject: [Frugalware-git] gfpm: gfpm: display the systray icon when progress bar is visible and allow user to hide the progress bar by clicking on the systray icon. Message-ID: <20070805150734.206C713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=cba23b13f94effc2f2692c229c2b1c4e1d90792e commit cba23b13f94effc2f2692c229c2b1c4e1d90792e Author: Priyank Date: Sun Aug 5 20:36:27 2007 +0530 gfpm: display the systray icon when progress bar is visible and allow user to hide the progress bar by clicking on the systray icon. diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 3f69f9e..8188572 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -25,6 +25,7 @@ #include #include "gfpm.h" #include "gfpm-progress.h" +#include "gfpm-systray.h" #ifdef HAVE_CONFIG_H #include "config.h" @@ -73,11 +74,13 @@ gfpm_progress_show (gboolean show) if (show == TRUE) { gtk_widget_show (progresswindow); + gfpm_systray_set_visible (TRUE); gtk_widget_hide (gfpm_mw); } else { gtk_widget_hide (progresswindow); + gfpm_systray_set_visible (FALSE); gtk_widget_show (gfpm_mw); } diff --git a/src/gfpm-systray.c b/src/gfpm-systray.c index 4431157..cb628a4 100644 --- a/src/gfpm-systray.c +++ b/src/gfpm-systray.c @@ -22,18 +22,24 @@ #include #include #include +#include #include "gfpm-systray.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif +extern GtkWidget *progresswindow; + GtkStatusIcon *gfpm_statusicon; +static void cb_gfpm_systray_activated (GtkStatusIcon *icon, gpointer data); + void gfpm_systray_init (void) { gfpm_statusicon = gtk_status_icon_new_from_icon_name ("gfpm"); + g_signal_connect (G_OBJECT(gfpm_statusicon), "activate", G_CALLBACK(cb_gfpm_systray_activated), NULL); gtk_status_icon_set_visible (gfpm_statusicon, FALSE); return; @@ -42,7 +48,18 @@ gfpm_systray_init (void) void gfpm_systray_set_visible (gboolean visible) { - gtk_status_icon_set_visible (gfpm_statusicon, FALSE); + gtk_status_icon_set_visible (gfpm_statusicon, visible); + + return; +} + +static void +cb_gfpm_systray_activated (GtkStatusIcon *icon, gpointer data) +{ + if (GTK_WIDGET_VISIBLE(progresswindow)) + gtk_widget_hide (progresswindow); + else + gtk_widget_show (progresswindow); return; } From crazy at frugalware.org Sun Aug 5 20:41:27 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 20:41:29 2007 Subject: [Frugalware-git] frugalware-current: libmtp-0.2.0-2-i686 Message-ID: <20070805184127.2B67613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b1917010b8e71a9f685558d41c358674f3b3d678 commit b1917010b8e71a9f685558d41c358674f3b3d678 Author: crazy Date: Sun Aug 5 20:40:31 2007 +0200 libmtp-0.2.0-2-i686 * relbump * fpm got corrupted diff --git a/source/lib-extra/libmtp/FrugalBuild b/source/lib-extra/libmtp/FrugalBuild index 1975df2..3df6225 100644 --- a/source/lib-extra/libmtp/FrugalBuild +++ b/source/lib-extra/libmtp/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libmtp pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)." depends=('libusb') groups=('lib-extra') From crazy at frugalware.org Sun Aug 5 21:07:57 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 21:07:59 2007 Subject: [Frugalware-git] frugalware-current: lzma-4.32.0beta5-1-i686 Message-ID: <20070805190757.3165513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d4af7604ccaebe78de78d3060ae591139795c14e commit d4af7604ccaebe78de78d3060ae591139795c14e Author: crazy Date: Sun Aug 5 21:07:03 2007 +0200 lzma-4.32.0beta5-1-i686 * Version bump diff --git a/source/apps-extra/lzma/FrugalBuild b/source/apps-extra/lzma/FrugalBuild index 2a1f4d6..8e01d73 100644 --- a/source/apps-extra/lzma/FrugalBuild +++ b/source/apps-extra/lzma/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=lzma -pkgver=4.32.0beta4 +pkgver=4.32.0beta5 pkgrel=1 pkgdesc="High compression utility based on LZMA SDK" url="http://tukaani.org/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://tukaani.org/lzma/download|grep -m1 .tar.gz|sed -e 's/.*]lzma-//' -e 's/.tar.gz//'" source=($url/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('367fc3ba4e95a1f1b4f8e6d17b6a996ef39adddc') +sha1sums=('b8a8c26b226f90a9707aedf961fa40c617872355') if [ "$CARCH" == "x86_64" ]; then export CFLAGS="$CFLAGS -fPIC" From priyank at frugalware.org Sun Aug 5 21:19:00 2007 From: priyank at frugalware.org (Priyank) Date: Sun Aug 5 21:19:02 2007 Subject: [Frugalware-git] gfpm: gfpm-systray: gfpm_systray_free(): new function to free the memory allocated to the statusicon. Message-ID: <20070805191900.48A3A13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=064f180a77d66faf3697e3c463ebc7d67d684f6f commit 064f180a77d66faf3697e3c463ebc7d67d684f6f Author: Priyank Date: Mon Aug 6 00:47:54 2007 +0530 gfpm-systray: gfpm_systray_free(): new function to free the memory allocated to the statusicon. diff --git a/src/gfpm-systray.c b/src/gfpm-systray.c index cb628a4..29520cb 100644 --- a/src/gfpm-systray.c +++ b/src/gfpm-systray.c @@ -46,6 +46,14 @@ gfpm_systray_init (void) } void +gfpm_systray_free (void) +{ + g_object_unref (gfpm_statusicon); + + return; +} + +void gfpm_systray_set_visible (gboolean visible) { gtk_status_icon_set_visible (gfpm_statusicon, visible); diff --git a/src/gfpm-systray.h b/src/gfpm-systray.h index d9c1c6b..0a9a774 100644 --- a/src/gfpm-systray.h +++ b/src/gfpm-systray.h @@ -10,6 +10,7 @@ #include void gfpm_systray_init (void); +void gfpm_systray_free (void); void gfpm_systray_set_visible (gboolean); #endif From priyank at frugalware.org Sun Aug 5 21:21:37 2007 From: priyank at frugalware.org (Priyank) Date: Sun Aug 5 21:21:38 2007 Subject: [Frugalware-git] gfpm: gfpm: unref the status icon once the gtk main loop terminates. Message-ID: <20070805192137.8E45813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=001b754dbc22f5c3e4f837688c96f891d903506e commit 001b754dbc22f5c3e4f837688c96f891d903506e Author: Priyank Date: Mon Aug 6 00:50:35 2007 +0530 gfpm: unref the status icon once the gtk main loop terminates. diff --git a/src/gfpm.c b/src/gfpm.c index 00b852e..c84efcb 100644 --- a/src/gfpm.c +++ b/src/gfpm.c @@ -29,6 +29,7 @@ #include "gfpm.h" #include "gfpm-interface.h" +#include "gfpm-systray.h" #include "gfpm-messages.h" #define GLADE_FILE "/share/gfpm/gfpm.glade" @@ -74,6 +75,7 @@ main (int argc, char *argv[]) gfpm_interface_init (); gtk_main (); gfpm_db_cleanup (); + gfpm_systray_free (); pacman_release (); return 0; From crazy at frugalware.org Sun Aug 5 21:39:56 2007 From: crazy at frugalware.org (crazy) Date: Sun Aug 5 21:39:58 2007 Subject: [Frugalware-git] frugalware-current: emelfm2-0.3.5-1-i686 Message-ID: <20070805193956.E543913A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=df56aeb1a474b741788246ccbee13bb97cb1f018 commit df56aeb1a474b741788246ccbee13bb97cb1f018 Author: crazy Date: Sun Aug 5 21:38:53 2007 +0200 emelfm2-0.3.5-1-i686 * Version bump diff --git a/source/xapps-extra/emelfm2/FrugalBuild b/source/xapps-extra/emelfm2/FrugalBuild index 9061f10..0b44a10 100644 --- a/source/xapps-extra/emelfm2/FrugalBuild +++ b/source/xapps-extra/emelfm2/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=emelfm2 -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="emelFM2 is a file manager that implements the popular two-pane design." url="http://www.emelfm2.net/" @@ -19,7 +19,7 @@ build() { Fcd Fpatchall - Fsed "DUMMY" "-Wall ${CFLAGS} -fno-strict-aliasing" Makefile.config + #Fsed "DUMMY" "-Wall ${CFLAGS} -fno-strict-aliasing" Makefile.config Fmake Fmakeinstall PREFIX=$Fdestdir/usr Fsed 'Categories=.*' 'Categories=Qt;Gtk;Utility;Application;' \ @@ -30,5 +30,5 @@ build() Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } -sha1sums=('ada0373c50916c7d7c7d08d40739b15759121572'\ - '7ad3546471bfa24e93d1dc78eb21eb8096cb8955') +sha1sums=('dde4c71458998c7519b8cddcd304798f04970bfb' \ + '7a244fe0831e635d3f0a637c5e9d046cb680dea6') diff --git a/source/xapps-extra/emelfm2/options.patch b/source/xapps-extra/emelfm2/options.patch index 9f5aec2..ea53775 100644 --- a/source/xapps-extra/emelfm2/options.patch +++ b/source/xapps-extra/emelfm2/options.patch @@ -59,12 +59,3 @@ diff -Naur emelfm2-0.3.4/Makefile.config emelfm2-0.3.4-p/Makefile.config # setting this to 1 enables a thumbnail viewer plugin. This uses libgimpthumbnail # for managing thumbnail-file cacheing in accord with freedesktop.org specification. -@@ -139,7 +139,7 @@ - #CFLAGS = -Wall -Wextra -Wno-unused -Winline - CFLAGS = -Wall -Winline - else --CFLAGS = -O2 -Wall -+CFLAGS = DUMMY - #CFLAGS = -O3 -Wall -march=athlon-tbird -mtune=athlon-tbird - #CFLAGS = -O3 -Wall -march=pentium -mtune=pentium4 - endif From vmiklos at frugalware.org Sun Aug 5 21:56:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Aug 5 21:56:07 2007 Subject: [Frugalware-git] frugalware-current: octave-2.9.13-1-i686 Message-ID: <20070805195605.3A9B613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f0235dc6693a616624642f8eecec952fb305647b commit f0235dc6693a616624642f8eecec952fb305647b Author: VMiklos Date: Sun Aug 5 21:55:44 2007 +0200 octave-2.9.13-1-i686 version bump diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild index 42b55a7..2bb19d0 100644 --- a/source/apps-extra/octave/FrugalBuild +++ b/source/apps-extra/octave/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=octave -pkgver=2.9.12 +pkgver=2.9.13 pkgrel=1 pkgdesc="Octave is a high-level language, primarily intended for numerical computations." url="http://www.octave.org/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Testing|sed 's/.*) \([^ ]*\) (.*/\1/'" source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('3b2435d24e4ae8d34d8ef1c5d82c02a0419c5af9') +sha1sums=('4983584a66c0ec11545cf840af5acc8eca48071b') # optimization OK From vmiklos at frugalware.org Sun Aug 5 22:09:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Aug 5 22:09:46 2007 Subject: [Frugalware-git] frugalware-current: docbook-xsl-1.73.0-2-i686 Message-ID: <20070805200944.653BB13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ced7dd58efedb5d2f1967bd8293a04bdde9660bd commit ced7dd58efedb5d2f1967bd8293a04bdde9660bd Author: VMiklos Date: Sun Aug 5 22:09:36 2007 +0200 docbook-xsl-1.73.0-2-i686 add patch from git ml to fix asciidoc build failures diff --git a/source/apps/docbook-xsl/FrugalBuild b/source/apps/docbook-xsl/FrugalBuild index 9668fe5..089bed8 100644 --- a/source/apps/docbook-xsl/FrugalBuild +++ b/source/apps/docbook-xsl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=docbook-xsl pkgver=1.73.0 -pkgrel=1 +pkgrel=2 pkgdesc="XML stylesheets for Docbook-xml transformations." depends=('libxml2' 'libxslt') rodepends=('sed') @@ -12,8 +12,12 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="docbook" Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=21935'|grep -m1 'docbook-xsl-\(.*\).tar.gz'|sed 's/.*xsl-\(.*\).t.*/\1/'" +source=($source docbook-xsl-manpages-charmap.patch) +sha1sums=('508872e782c4ada3929d43fe10bab73d2e969866' \ + 'c2848edfd21b171b936e471410ed98485fb15a25') build() { + Fpatchall Fmkdir usr/share/xml/docbook/xsl/ for fn in VERSION common html xhtml javahelp fo template lib manpages highlighting do @@ -22,5 +26,4 @@ build() { Fmkdir etc/xml } -sha1sums=('508872e782c4ada3929d43fe10bab73d2e969866') # optimization OK diff --git a/source/apps/docbook-xsl/docbook-xsl-manpages-charmap.patch b/source/apps/docbook-xsl/docbook-xsl-manpages-charmap.patch new file mode 100644 index 0000000..3906810 --- /dev/null +++ b/source/apps/docbook-xsl/docbook-xsl-manpages-charmap.patch @@ -0,0 +1,10 @@ +--- docbook-xsl-1.73.0/manpages/docbook.xsl.manpages-charmap 2007-07-23 16:24:23.000000000 +0100 ++++ docbook-xsl-1.73.0/manpages/docbook.xsl 2007-07-23 16:25:16.000000000 +0100 +@@ -37,6 +37,7 @@ + + + ++ + + + From vmiklos at frugalware.org Sun Aug 5 22:38:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Aug 5 22:38:32 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.4-2-i686 Message-ID: <20070805203832.2D2AB13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7be58bae45b9b6b2f0b4b93aaf4ea2a1846f4401 commit 7be58bae45b9b6b2f0b4b93aaf4ea2a1846f4401 Author: VMiklos Date: Sun Aug 5 22:38:20 2007 +0200 git-1.5.2.4-2-i686 rebuilt with docbook-xsl>=1.73.0-2 diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 8a6ad99..ae82379 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -3,11 +3,11 @@ pkgname=git pkgver=1.5.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="the stupid content tracker" url="http://www.kernel.org/pub/software/scm/git/" depends=('curl>=7.16.0' 'openssl') -makedepends=('asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common' 'xmlto') +makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'sgml-common' 'xmlto') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$url/?C=M;O=D'|grep 'git-[0-9.]*.tar.bz2$'|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" From hermier at frugalware.org Sun Aug 5 23:56:34 2007 From: hermier at frugalware.org (Michel Hermier) Date: Sun Aug 5 23:56:36 2007 Subject: [Frugalware-git] setup: A safer and simplier way to sort modules. Message-ID: <20070805215634.B10E413A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=94c135455cb720a75f2566d8210ff8c1bcda005f commit 94c135455cb720a75f2566d8210ff8c1bcda005f Author: Michel Hermier Date: Sun Aug 5 23:55:28 2007 +0200 A safer and simplier way to sort modules. Sorting modules using memcmp, to compare integers is not endianness safe, and it's much more simplier this way. diff --git a/src/setup.c b/src/setup.c index 072daed..4a238c4 100644 --- a/src/setup.c +++ b/src/setup.c @@ -41,7 +41,7 @@ int sort_plugins(gconstpointer a, gconstpointer b) { const plugin_t *pa = a; const plugin_t *pb = b; - return (memcmp(&pa->priority, &pb->priority, sizeof(int))); + return (pa->priority - pb->priority); } int add_plugin(char *filename) From vmiklos at frugalware.org Mon Aug 6 00:48:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 00:48:29 2007 Subject: [Frugalware-git] frugalware-current: libetpan-0.51-1-i686 Message-ID: <20070805224827.CDE9813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8c22cf25ce50062b2328ffb738700b8822a25c98 commit 8c22cf25ce50062b2328ffb738700b8822a25c98 Author: VMiklos Date: Mon Aug 6 00:47:46 2007 +0200 libetpan-0.51-1-i686 version bump removed svn backport diff --git a/source/lib-extra/libetpan/FrugalBuild b/source/lib-extra/libetpan/FrugalBuild index 6ed222c..0c57a9b 100644 --- a/source/lib-extra/libetpan/FrugalBuild +++ b/source/lib-extra/libetpan/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: free-zombie pkgname=libetpan -pkgver=0.50 +pkgver=0.51 pkgrel=1 pkgdesc="A mail library" url="http://libetpan.sourceforge.net/" @@ -13,9 +13,7 @@ archs=('x86_64' 'i686') _F_sourceforge_broken_up2date=1 Finclude sourceforge # Need to remove on next upstream. THis buildfix from SVN backport. -krix -source=(${source[@]} buildfix_backport.patch) -sha1sums=('6bcfe4dc78a563169dac8fac17afde8f67032303' \ - '10595691b0ca580219a39f4a6aa3f1ed7b50b8d8') +sha1sums=('a3660725c9fad8bfe6baa6afc0e87d4a768c14a0') build() { diff --git a/source/lib-extra/libetpan/buildfix_backport.patch b/source/lib-extra/libetpan/buildfix_backport.patch deleted file mode 100644 index 193822a..0000000 --- a/source/lib-extra/libetpan/buildfix_backport.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur libetpan-0.50.orig/src/low-level/smtp/mailsmtp.c libetpan-0.50/src/low-level/smtp/mailsmtp.c ---- libetpan-0.50.orig/src/low-level/smtp/mailsmtp.c 2007-08-03 09:36:30.000000000 +0200 -+++ libetpan-0.50/src/low-level/smtp/mailsmtp.c 2007-08-03 09:36:23.000000000 +0200 -@@ -32,7 +32,7 @@ - */ - - /* -- * $Id: mailsmtp.c,v 1.29 2007/07/21 18:44:40 hoa Exp $ -+ * $Id: mailsmtp.c,v 1.30 2007/07/25 16:28:33 hoa Exp $ - */ - - #ifdef HAVE_CONFIG_H -@@ -1257,11 +1257,11 @@ - unsigned int max_decoded; - char * p; - -- p = strchr(f->pop3_response, '\r'); -+ p = strchr(session->response, '\r'); - if (p != NULL) { - * p = '\0'; - } -- p = strchr(f->pop3_response, '\n'); -+ p = strchr(session->response, '\n'); - if (p != NULL) { - * p = '\0'; - } From vmiklos at frugalware.org Mon Aug 6 00:53:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 00:53:59 2007 Subject: [Frugalware-git] pacman-tools: updates for 0.9.7 Message-ID: <20070805225357.4D8F713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=4d52073aefbb45aaf726faf89462cedf2a936663 commit 4d52073aefbb45aaf726faf89462cedf2a936663 Author: VMiklos Date: Mon Aug 6 00:53:51 2007 +0200 updates for 0.9.7 diff --git a/Makefile b/Makefile index 6499eaf..420ed96 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.9.6 +VERSION = 0.9.7 LANGS = hu pl diff --git a/NEWS b/NEWS index 912cc47..eb9d550 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.9.7 - dg: various minor fixes + - repoman: warnings fixes + - repoman.1: documented fpmmerge subcommand + - repoman: support for having only the main pkg set as nobuild + (ie not the subpkgs) 0.9.6 - syncpkg: a typo rendered it unusable - repoman push now pulls before push - repoman now removes junk files even if they are in gitignore From vmiklos at frugalware.org Mon Aug 6 00:58:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 00:58:08 2007 Subject: [Frugalware-git] frugalware-current: docs/release-howto: update for git Message-ID: <20070805225807.1A2AF13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0bd04ad490317f43a2e96c39b7aa90a5125e6bbd commit 0bd04ad490317f43a2e96c39b7aa90a5125e6bbd Author: VMiklos Date: Mon Aug 6 00:58:00 2007 +0200 docs/release-howto: update for git diff --git a/docs/release-howto.txt b/docs/release-howto.txt index b886a5d..a3b5526 100644 --- a/docs/release-howto.txt +++ b/docs/release-howto.txt @@ -22,7 +22,7 @@ $ rsync -avP --delete-after frugalware-current/* frugalware-testing/ - run gensync to rebuild the fdbs - generate isos and test if everything is ok (ie. install from cd1-cd2 on i686, and start kde, or something) -- tag the release using darcs tag +- tag the release using git tag == Creating the stable tree @@ -50,8 +50,7 @@ STABLE = true in the Makefile - s/-current// in tools/mkpkglst - update VERSION in docs/Makefile -- check if the patches under `\_darcs/patches` are there -- update `\_darcs/prefs/motd` +- update `\.git/description` - update kernel FrugalBuild to hardwire the kernel release (`\_F_kernel_rel`) - update `/source/include/kernel-module.sh` (s/=/>=/) and rebuild the fdbs again From vmiklos at frugalware.org Mon Aug 6 01:01:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 01:01:25 2007 Subject: [Frugalware-git] setup: loadsouce/is_netinstall(): cleanup and memleak fix Message-ID: <20070805230123.551E613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=a54e80b57dfe3f2cd097adcf81b27405b663f8d6 commit a54e80b57dfe3f2cd097adcf81b27405b663f8d6 Author: VMiklos Date: Mon Aug 6 01:01:13 2007 +0200 loadsouce/is_netinstall(): cleanup and memleak fix thx hermier for noticing it diff --git a/src/plugins/loadsource.c b/src/plugins/loadsource.c index c0ae889..e611230 100644 --- a/src/plugins/loadsource.c +++ b/src/plugins/loadsource.c @@ -98,11 +98,17 @@ GList *grep_drives(char *file) int is_netinstall(char *path) { struct stat statbuf; - if(!(!stat(g_strdup_printf("%s/frugalware-%s", path, ARCH), &statbuf) - && S_ISDIR(statbuf.st_mode))) - return(1); + char *ptr; + int ret; + + ptr = g_strdup_printf("%s/frugalware-%s", path, ARCH); + if(!stat(ptr, &statbuf) + && S_ISDIR(statbuf.st_mode)) + ret = 0; else - return(0); + ret = 1; + FREE(ptr); + return(ret); } int run(GList **config) From krics at linuxforum.hu Mon Aug 6 07:48:02 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 07:48:06 2007 Subject: [Frugalware-git] frugalware-current: mesa-7.0.1-1-i686 Message-ID: <20070806054802.4D54E13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fc5f8fa79117e835a047142d6b27e44c2d3ac003 commit fc5f8fa79117e835a047142d6b27e44c2d3ac003 Author: Christian Hamar alias krix Date: Mon Aug 6 07:46:40 2007 +0200 mesa-7.0.1-1-i686 * Version bump (Bugfix release only as release notes say) diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 0fe9544..68c0af7 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mesa origname=Mesa -pkgver=7.0 +pkgver=7.0.1 pkgrel=1 pkgdesc="Mesa is a 3D graphics library" _F_sourceforge_dirname="mesa3d" @@ -32,6 +32,7 @@ subarchs=('i686 x86_64') # NOTE: If you bump version (major or minor) you need to review the symlinking at the end of this # file !!!! On minor bump last number will be changed. # Be SURE you checked in the FPM ! before uploading or anything else! +# Check: src/mesa/main/version.h for mesa proper version need for symlink. build() { Fcd $origname-$pkgver @@ -67,7 +68,7 @@ build() { cp -ar $Fsrcdir/lib{GL,GLU}.la $Fdestdir/usr/lib || Fdie chmod a+rx $Fdestdir/usr/lib/lib{GL,GLU}.la || Fdie - Fln libGLU.so.1.3.070100 /usr/lib/libGLU.so.1.3 + Fln libGLU.so.1.3.070001 /usr/lib/libGLU.so.1.3 Fln libGLw.so.1.0.0 /usr/lib/libGLw.so.1.0 # Remove glut.h because it conflicts with freeglut :P @@ -77,7 +78,7 @@ build() { Fsplit libgl usr/lib/libGL.la } -sha1sums=('08836795f2b9bb5300852ae46e3e488cb0f41c6b' \ +sha1sums=('51961ceeb1d2fb12e6de7c6a47e7b81f3cd5993f' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ '12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39' \ '426b0b08617ec19cba41ab20f3891cab82f205a2' \ From krics at linuxforum.hu Mon Aug 6 08:03:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 08:03:19 2007 Subject: [Frugalware-git] frugalware-current: mesademos-7.0.1-1-i686 Message-ID: <20070806060312.52DD013A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ce37728868c53a7a1a6249d2c8cc10f0ea1695db commit ce37728868c53a7a1a6249d2c8cc10f0ea1695db Author: Christian Hamar alias krix Date: Mon Aug 6 08:01:36 2007 +0200 mesademos-7.0.1-1-i686 * Version bump * Depending on 7.0.1 mesa diff --git a/source/x11/mesademos/FrugalBuild b/source/x11/mesademos/FrugalBuild index 6d04b09..318e9bd 100644 --- a/source/x11/mesademos/FrugalBuild +++ b/source/x11/mesademos/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=mesademos -pkgver=7.0 +pkgver=7.0.1 pkgrel=1 pkgdesc="OpenGL demonstration and test programs." _F_sourceforge_dirname="mesa3d" @@ -11,19 +11,19 @@ _F_sourceforge_name="MesaDemos" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://mesa3d.sourceforge.net/" -depends=('mesa>=7.0' 'libstdc++' 'freeglut' 'libx11>=1.1.1' 'libxmu' +depends=('mesa>=7.0.1' 'libstdc++' 'freeglut' 'libx11>=1.1.1' 'libxmu' 'libxi>=1.1.0' 'libdrm>=2.3.0' 'libxvmc' 'libxxf86vm') groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep release|sed 's/.*: //;q'" source=($source $pkgname-6.5.1-makefile.patch) -sha1sums=('1fd5909b99d163fea3f594ea50892f5cc32c9406' \ +sha1sums=('4d6cb158b58dbda9411d00e99a01031e13cae2ec' \ '16d41d20137358f09b91d93989b62ae3e01c5993') build() { - cd Mesa-$pkgver + cd Mesa-$pkgver || Fdie Fpatchall - cd progs/xdemos + cd progs/xdemos || Fdie make glxgears glxinfo glxdemo glxheads || Fdie Fexerel glxgears glxinfo glxdemo glxheads /usr/bin } From krics at linuxforum.hu Mon Aug 6 08:52:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 08:52:51 2007 Subject: [Frugalware-git] frugalware-current: xorg-server-1.2.0-7-i686 Message-ID: <20070806065249.EFE1A13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ebd9916b0e720a67bb97e3ec0ac0876f4336ba69 commit ebd9916b0e720a67bb97e3ec0ac0876f4336ba69 Author: Christian Hamar alias krix Date: Mon Aug 6 08:51:27 2007 +0200 xorg-server-1.2.0-7-i686 * Release bump due mesa 7.0.1 * Added --builder-addr to frugalware-devel@frugalware.org (maybe lists. ? :) diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 84c4aa7..b0b7b2f 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -3,14 +3,14 @@ pkgname=xorg-server pkgver=1.2.0 -pkgrel=6 -mesaver=7.0 +pkgrel=7 +mesaver=7.0.1 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64') depends=('libxfont' 'libx11>=1.1.2' 'xtrans' 'libxau' \ 'libxext' 'libxkbfile' 'libxdmcp' 'libxmu' 'libxrender' \ - 'libxi>=1.1.1' 'freetype2' 'mesa' 'font-cursor-misc' 'font-misc-misc' \ + 'libxi>=1.1.1' 'freetype2' 'mesa>=7.0.1' 'font-cursor-misc' 'font-misc-misc' \ 'xbitmaps' 'xkeyboard-config' 'iceauth' 'rgb' 'xauth' 'xinit' 'libxaw' \ 'libxpm' 'libxxf86misc' 'libxxf86vm' 'libxkbui' 'liblbxutil' \ 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb') @@ -99,6 +99,7 @@ build() { --with-vendor-web="http://www.frugalware.org" \ --with-os-name="Frugalware Linux" \ --with-os-vendor="Frugalware.org Development Team" \ + --with-builder-addr="frugalware-devel@frugalware.org" \ --with-xkb-output=/var/lib/xkb \ --with-xkb-path=/usr/lib/X11/xkb \ --disable-xorgcfg @@ -116,7 +117,7 @@ build() { } sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106' \ - '44006ac3a4924e07fed5e894d0ccdd78c43aaea9' \ + 'deb1002cf377ba8bd9407bd3cf573f8c8be31671' \ 'f31702e0029b2d68018598e73ed55c4d6c58367b' \ '859b98a4049400be152032fc09ceff2afe9e6dcf' \ '863ad92892785c3785b122bf54d0def4d4d2732c' \ From krics at linuxforum.hu Mon Aug 6 09:12:51 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 09:12:53 2007 Subject: [Frugalware-git] frugalware-current: lshw-B.02.11.01-1-i686 Message-ID: <20070806071251.163E513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=271940c8814415583bfc02cba346ca0a8696265d commit 271940c8814415583bfc02cba346ca0a8696265d Author: Christian Hamar alias krix Date: Mon Aug 6 09:11:13 2007 +0200 lshw-B.02.11.01-1-i686 * Version bump diff --git a/source/apps-extra/lshw/FrugalBuild b/source/apps-extra/lshw/FrugalBuild index d525fff..dd8c145 100644 --- a/source/apps-extra/lshw/FrugalBuild +++ b/source/apps-extra/lshw/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: BMH1980 pkgname=lshw -pkgver=B.02.11 +pkgver=B.02.11.01 pkgrel=1 pkgdesc="A tool to provide information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter" @@ -41,5 +41,5 @@ build() { Fsplit ${subpkgs[0]} usr/share/doc/${subpkgs[0]}-$pkgver } -sha1sums=('2a4dbbbd2ce24a936ae17eee21e8f5997612bd84') +sha1sums=('3a7e790b2912abb5d896a2de21c594009be52d78') # optimization OK From vmiklos at frugalware.org Mon Aug 6 09:39:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 09:39:50 2007 Subject: [Frugalware-git] setup: loadsource/is_netinstall(): more cleanup from hermier Message-ID: <20070806073948.70E9913A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=8ff156dea3ceb2bdca3ef1f1d8951a8087cba1d0 commit 8ff156dea3ceb2bdca3ef1f1d8951a8087cba1d0 Author: VMiklos Date: Mon Aug 6 09:39:43 2007 +0200 loadsource/is_netinstall(): more cleanup from hermier diff --git a/src/plugins/loadsource.c b/src/plugins/loadsource.c index e611230..d4a2c94 100644 --- a/src/plugins/loadsource.c +++ b/src/plugins/loadsource.c @@ -102,11 +102,7 @@ int is_netinstall(char *path) int ret; ptr = g_strdup_printf("%s/frugalware-%s", path, ARCH); - if(!stat(ptr, &statbuf) - && S_ISDIR(statbuf.st_mode)) - ret = 0; - else - ret = 1; + ret = !stat(ptr, &statbuf) && !S_ISDIR(statbuf.st_mode); FREE(ptr); return(ret); } From vmiklos at frugalware.org Mon Aug 6 09:56:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 09:56:25 2007 Subject: [Frugalware-git] frugalware-current: squeeze-0.2.1-2-i686 Message-ID: <20070806075623.9DA8413A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bd8fd5ea191d04bdf8ee9b86033686a1ce3ff4ad commit bd8fd5ea191d04bdf8ee9b86033686a1ce3ff4ad Author: VMiklos Date: Mon Aug 6 09:55:44 2007 +0200 squeeze-0.2.1-2-i686 rebuilt, x86_64 fpm is corrupted diff --git a/source/xfce4-extra/squeeze/FrugalBuild b/source/xfce4-extra/squeeze/FrugalBuild index 0757a18..4a6c1e6 100644 --- a/source/xfce4-extra/squeeze/FrugalBuild +++ b/source/xfce4-extra/squeeze/FrugalBuild @@ -3,7 +3,7 @@ pkgname=squeeze pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A modern and advanced archive manager for Xfce4." url="http://squeeze.xfce.org/" makedepends=('intltool' 'pkgconfig') From vmiklos at frugalware.org Mon Aug 6 10:33:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 10:33:05 2007 Subject: [Frugalware-git] frugalware-current: udev-114-1-i686 Message-ID: <20070806083303.2551D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=92283a4f2f0a6150ef529f981c7ed0f134df94fa commit 92283a4f2f0a6150ef529f981c7ed0f134df94fa Author: VMiklos Date: Mon Aug 6 10:32:56 2007 +0200 udev-114-1-i686 version bump diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index 4cbab77..75e3bb9 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=udev -pkgver=113 +pkgver=114 pkgrel=1 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" From vmiklos at frugalware.org Mon Aug 6 10:40:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 10:40:39 2007 Subject: [Frugalware-git] frugalware-current: python-gammu-0.21-1-i686 Message-ID: <20070806084036.B2D9113A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b54f519b7c77a17503fcf68a33e59f677cc8d93c commit b54f519b7c77a17503fcf68a33e59f677cc8d93c Author: VMiklos Date: Mon Aug 6 10:40:23 2007 +0200 python-gammu-0.21-1-i686 version bump removed svn backport diff --git a/source/devel-extra/python-gammu/FrugalBuild b/source/devel-extra/python-gammu/FrugalBuild index e0bfe98..140a0d3 100644 --- a/source/devel-extra/python-gammu/FrugalBuild +++ b/source/devel-extra/python-gammu/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=python-gammu -pkgver=0.20 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc="Python bingings for Gammu library." url="http://www.cihar.com/gammu/python/" depends=('python>=2.5' 'gammu>=1.11.91-2') @@ -11,13 +11,11 @@ groups=('devel-extra') archs=('x86_64' 'i686') up2date="lynx -dump $url |grep -m1 'python-gammu-.*\.tar\.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://dl.cihar.com/python-gammu/latest/$pkgname-$pkgver.tar.bz2 \ - destdir.patch \ - http://ftp.frugalware.org/pub/other/sources/$pkgname/python-gammu-0.21svn_backport.patch) + destdir.patch) export CFLAGS="$CFLAGS -fno-strict-aliasing" -sha1sums=('120a00e3b2adbd7188e2aa91e3da622a2214d757'\ - '73fabac20c406edb945eb54965b83922b3dd22f3'\ - '50162ba7acbecb32c352d09b4afc2676ab234b12') +sha1sums=('dc463d6647726075adb0789ec8a0d8087ef744cd' \ + '73fabac20c406edb945eb54965b83922b3dd22f3') # optimization OK From vmiklos at frugalware.org Mon Aug 6 10:47:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 10:47:59 2007 Subject: [Frugalware-git] frugalware-current: perl-libwww-5.808-1-i686 Message-ID: <20070806084758.42AEE13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5d4b6ce83af7bdaf6bc6f42136f244111e99b856 commit 5d4b6ce83af7bdaf6bc6f42136f244111e99b856 Author: VMiklos Date: Mon Aug 6 10:47:49 2007 +0200 perl-libwww-5.808-1-i686 version bump diff --git a/source/devel/perl-libwww/FrugalBuild b/source/devel/perl-libwww/FrugalBuild index 7d6bf9a..c2befc9 100644 --- a/source/devel/perl-libwww/FrugalBuild +++ b/source/devel/perl-libwww/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Zsolt Szalai pkgname=perl-libwww -pkgver=5.807 +pkgver=5.808 perlver=5.8.8 pkgrel=1 pkgdesc="A set of Perl modules which provides a simple and consistent API to the WWW." @@ -13,7 +13,7 @@ groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.cpan.org/authors/id/G/GA/GAAS/?M=D' |grep libwww-perl.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-$pkgver.tar.gz) -sha1sums=('9b7738ea46b2b6d4fa81658bc3968fb0d421d62c') +sha1sums=('9eeb0a88a4f08006ba4a798effd74b139867f3ab') build() { cd $startdir/src/libwww-perl-$pkgver From vmiklos at frugalware.org Mon Aug 6 10:55:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 10:55:37 2007 Subject: [Frugalware-git] frugalware-current: perl-poe-0.9999-1-i686 Message-ID: <20070806085535.8DD0613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4a9d77042c4ec8c397b9c476941111c95a5413f8 commit 4a9d77042c4ec8c397b9c476941111c95a5413f8 Author: VMiklos Date: Mon Aug 6 10:55:28 2007 +0200 perl-poe-0.9999-1-i686 version bump diff --git a/source/devel-extra/perl-poe/FrugalBuild b/source/devel-extra/perl-poe/FrugalBuild index 7ffbbec..6abc04c 100644 --- a/source/devel-extra/perl-poe/FrugalBuild +++ b/source/devel-extra/perl-poe/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Zsolt Szalai pkgname=perl-poe -pkgver=0.3501 +pkgver=0.9999 pkgrel=1 pkgdesc="portable multitasking and networking framework for Perl" _F_sourceforge_dirname="poe" @@ -23,4 +23,4 @@ build() { Fmakeinstall } -sha1sums=('512684a932d06df5339ce6e25bdfb156bc9ab4c4') +sha1sums=('541de21c56b8458b740d282fad804ed57903cc6d') From krics at linuxforum.hu Mon Aug 6 11:21:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 11:21:12 2007 Subject: [Frugalware-git] frugalware-current: gnome-speech-0.4.16-1-i686 Message-ID: <20070806092109.E817713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=605c45ff7dd35dfd9324a283f52d50b531ca5566 commit 605c45ff7dd35dfd9324a283f52d50b531ca5566 Author: Christian Hamar alias krix Date: Mon Aug 6 11:19:40 2007 +0200 gnome-speech-0.4.16-1-i686 * Version bump diff --git a/source/gnome-extra/gnome-speech/FrugalBuild b/source/gnome-extra/gnome-speech/FrugalBuild index 0a5e5ce..cfa5466 100644 --- a/source/gnome-extra/gnome-speech/FrugalBuild +++ b/source/gnome-extra/gnome-speech/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-speech -pkgver=0.4.15 +pkgver=0.4.16 pkgrel=1 pkgdesc="GNOME Text-to-Speech" url="http://www.gnome.org/" @@ -12,5 +12,5 @@ groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('6d386e3c32a14ed31581b2126c228741399aa91b') +sha1sums=('3412b42ecbc0b0d7dcd4bfa4ef255fa8327d7de4') # optimization OK From vmiklos at frugalware.org Mon Aug 6 11:33:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 11:33:33 2007 Subject: [Frugalware-git] frugalware-current: pacman-tools-0.9.7-1-i686 Message-ID: <20070806093331.9669613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=dc6ce178973c32a1784d0c64cf0a6cc8f64a3e11 commit dc6ce178973c32a1784d0c64cf0a6cc8f64a3e11 Author: VMiklos Date: Mon Aug 6 11:32:34 2007 +0200 pacman-tools-0.9.7-1-i686 version bump diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index 2003fc7..edd3ccb 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=pacman-tools -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="Tools for developers for managing packages" url="http://ftp.frugalware.org/pub/other/pacman-tools" From crazy at frugalware.org Mon Aug 6 12:04:15 2007 From: crazy at frugalware.org (crazy) Date: Mon Aug 6 12:04:17 2007 Subject: [Frugalware-git] frugalware-current: glibc-2.6.1-1-i686 Message-ID: <20070806100415.4405D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=31f1452ca496fe892e65be07db7c83c4eb175a97 commit 31f1452ca496fe892e65be07db7c83c4eb175a97 Author: crazy Date: Mon Aug 6 11:46:56 2007 +0200 glibc-2.6.1-1-i686 * Version bump * aded Fdie's in _build() * removed x86_64 from xen thing * added an workaround for makeinfo to fix the build diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index eab86ca..2025e86 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -2,17 +2,16 @@ # Maintainer: VMiklos pkgname=glibc -pkgver=2.6 -pkgrel=3 +pkgver=2.6.1 +pkgrel=1 pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" depends=() groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.gnu.org/gnu/glibc/?M=A|grep 'glibc-[0-9\.]*tar.gz$'|Flasttar" -source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 \ - glibc-2.6-malloc.diff) -signatures=("$source.sig" '') +source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2) +signatures=("$source.sig") if [ "$CARCH" == "i686" ]; then subpkgs=('glibc-xen') @@ -21,24 +20,25 @@ if [ "$CARCH" == "i686" ]; then subconflicts=('glibc') subprovides=('glibc') subgroups=('base-extra') - subarchs=('i686 x86_64') + subarchs=('i686') fi _build() { Ffilerel nscd/nscd.conf /etc/nscd.conf - - rm -rf ../glibc-build - mkdir ../glibc-build - cd ../glibc-build + ## use Fdie here and kill the build + ## if we get any errors. -- crazy -- + 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 --enable-bind-now \ - --without-cvs --without-selinux + --without-cvs --without-selinux || Fdie - make || return 1 + make || Fdie - make install_root=$Fdestdir install - make install_root=$Fdestdir localedata/install-locales + make install_root=$Fdestdir install || Fdie + make install_root=$Fdestdir localedata/install-locales || Fdie Frm /etc/ld.so.cache /etc/localtime Frm /usr/info/dir @@ -50,6 +50,8 @@ build() # no multilib thanks Fsed 'x86_64 \| ' '' sysdeps/unix/sysv/linux/configure{,.in} Fpatchall + ## fix BUILD + Fsed '$(MAKEINFO)' '$(MAKEINFO) --force --no-validate' manual/Makefile if [ "$CARCH" == "i686" ]; then xenflag="-mno-tls-direct-seg-refs" export CFLAGS="$CFLAGS $xenflag" diff --git a/source/base/glibc/glibc-2.6-malloc.diff b/source/base/glibc/glibc-2.6-malloc.diff deleted file mode 100644 index f259642..0000000 --- a/source/base/glibc/glibc-2.6-malloc.diff +++ /dev/null @@ -1,174 +0,0 @@ -2007-05-21 Jakub Jelinek - - * malloc/hooks.c (MALLOC_STATE_VERSION): Bump. - (public_sET_STATe): If ms->version < 3, put all chunks into - unsorted chunks and clear {fd,bk}_nextsize fields of largebin - chunks. - * malloc/malloc.c (do_check_malloc_state): Don't assert - n_mmaps is not greater than n_mmaps_max. - - * malloc/malloc.c [MALLOC_DEBUG]: Revert 2007-05-13 changes. - * malloc/hooks.c: Likewise. - * malloc/arena.c: Likewise. - * malloc/Makefile (CFLAGS-malloc.c): Revert accidental - 2007-05-07 commit. - ---- libc/malloc/arena.c.jj 2007-05-20 20:01:52.000000000 +0200 -+++ libc/malloc/arena.c 2007-05-21 11:18:13.000000000 +0200 -@@ -370,9 +370,6 @@ ptmalloc_init_minimal (void) - mp_.top_pad = DEFAULT_TOP_PAD; - #endif - mp_.n_mmaps_max = DEFAULT_MMAP_MAX; --#if MALLOC_DEBUG -- mp_.n_mmaps_cmax = DEFAULT_MMAP_MAX; --#endif - mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD; - mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD; - mp_.pagesize = malloc_getpagesize; ---- libc/malloc/malloc.c.jj 2007-05-20 20:01:52.000000000 +0200 -+++ libc/malloc/malloc.c 2007-05-21 11:19:32.000000000 +0200 -@@ -2358,9 +2358,6 @@ struct malloc_par { - /* Memory map support */ - int n_mmaps; - int n_mmaps_max; --#if MALLOC_DEBUG -- int n_mmaps_cmax; --#endif - int max_n_mmaps; - /* the mmap_threshold is dynamic, until the user sets - it manually, at which point we need to disable any -@@ -2876,8 +2873,6 @@ static void do_check_malloc_state(mstate - assert(total <= (unsigned long)(mp_.max_total_mem)); - assert(mp_.n_mmaps >= 0); - #endif -- assert(mp_.n_mmaps <= mp_.n_mmaps_cmax); -- assert(mp_.n_mmaps_max <= mp_.n_mmaps_cmax); - assert(mp_.n_mmaps <= mp_.max_n_mmaps); - - assert((unsigned long)(av->system_mem) <= -@@ -3475,13 +3470,6 @@ munmap_chunk(p) mchunkptr p; - } - - mp_.n_mmaps--; --#if MALLOC_DEBUG -- if (mp_.n_mmaps_cmax > mp_.n_mmaps_max) -- { -- assert (mp_.n_mmaps_cmax == mp_.n_mmaps + 1); -- mp_.n_mmaps_cmax = mp_.n_mmaps; -- } --#endif - mp_.mmapped_mem -= total_size; - - int ret __attribute__ ((unused)) = munmap((char *)block, total_size); -@@ -5397,9 +5385,6 @@ mstate av; size_t n_elements; size_t* si - mp_.n_mmaps_max = 0; - mem = _int_malloc(av, size); - mp_.n_mmaps_max = mmx; /* reset mmap */ --#if MALLOC_DEBUG -- mp_.n_mmaps_cmax = mmx; --#endif - if (mem == 0) - return 0; - -@@ -5725,17 +5710,8 @@ int mALLOPt(param_number, value) int par - res = 0; - else - #endif -- { --#if MALLOC_DEBUG -- if (mp_.n_mmaps <= value) -- mp_.n_mmaps_cmax = value; -- else -- mp_.n_mmaps_cmax = mp_.n_mmaps; --#endif -- -- mp_.n_mmaps_max = value; -- mp_.no_dyn_threshold = 1; -- } -+ mp_.n_mmaps_max = value; -+ mp_.no_dyn_threshold = 1; - break; - - case M_CHECK_ACTION: ---- libc/malloc/hooks.c.jj 2007-05-20 20:01:52.000000000 +0200 -+++ libc/malloc/hooks.c 2007-05-21 11:18:13.000000000 +0200 -@@ -496,7 +496,7 @@ free_starter(mem, caller) Void_t* mem; c - then the hooks are reset to 0. */ - - #define MALLOC_STATE_MAGIC 0x444c4541l --#define MALLOC_STATE_VERSION (0*0x100l + 2l) /* major*0x100 + minor */ -+#define MALLOC_STATE_VERSION (0*0x100l + 3l) /* major*0x100 + minor */ - - struct malloc_save_state { - long magic; -@@ -507,9 +507,6 @@ struct malloc_save_state { - unsigned long trim_threshold; - unsigned long top_pad; - unsigned int n_mmaps_max; --#if MALLOC_DEBUG -- unsigned int n_mmaps_cmax; --#endif - unsigned long mmap_threshold; - int check_action; - unsigned long max_sbrked_mem; -@@ -553,9 +550,6 @@ public_gET_STATe(void) - ms->trim_threshold = mp_.trim_threshold; - ms->top_pad = mp_.top_pad; - ms->n_mmaps_max = mp_.n_mmaps_max; --#if MALLOC_DEBUG -- ms->n_mmaps_cmax = mp_.n_mmaps_cmax; --#endif - ms->mmap_threshold = mp_.mmap_threshold; - ms->check_action = check_action; - ms->max_sbrked_mem = main_arena.max_system_mem; -@@ -601,8 +595,9 @@ public_sET_STATe(Void_t* msptr) - assert(ms->av[2*i+3] == 0); - first(b) = last(b) = b; - } else { -- if(iav[2*i+2]))==i && -- largebin_index(chunksize(ms->av[2*i+3]))==i)) { -+ if(ms->version >= 3 && -+ (iav[2*i+2]))==i && -+ largebin_index(chunksize(ms->av[2*i+3]))==i))) { - first(b) = ms->av[2*i+2]; - last(b) = ms->av[2*i+3]; - /* Make sure the links to the bins within the heap are correct. */ -@@ -622,14 +617,22 @@ public_sET_STATe(Void_t* msptr) - } - } - } -+ if (ms->version < 3) { -+ /* Clear fd_nextsize and bk_nextsize fields. */ -+ b = unsorted_chunks(&main_arena)->fd; -+ while (b != unsorted_chunks(&main_arena)) { -+ if (!in_smallbin_range(chunksize(b))) { -+ b->fd_nextsize = NULL; -+ b->bk_nextsize = NULL; -+ } -+ b = b->fd; -+ } -+ } - mp_.sbrk_base = ms->sbrk_base; - main_arena.system_mem = ms->sbrked_mem_bytes; - mp_.trim_threshold = ms->trim_threshold; - mp_.top_pad = ms->top_pad; - mp_.n_mmaps_max = ms->n_mmaps_max; --#if MALLOC_DEBUG -- mp_.n_mmaps_cmax = ms->n_mmaps_cmax; --#endif - mp_.mmap_threshold = ms->mmap_threshold; - check_action = ms->check_action; - main_arena.max_system_mem = ms->max_sbrked_mem; ---- libc/malloc/Makefile.jj 2007-04-30 11:51:54.000000000 +0200 -+++ libc/malloc/Makefile 2007-05-21 11:20:41.000000000 +0200 -@@ -104,7 +104,6 @@ $(objpfx)memusagestat: $(memusagestat-mo - include ../Rules - - CFLAGS-mcheck-init.c = $(PIC-ccflag) --CFLAGS-malloc.c += -DMALLOC_DEBUG - - $(objpfx)libmcheck.a: $(objpfx)mcheck-init.o - -rm -f $@ - - Jakub - From krics at linuxforum.hu Mon Aug 6 12:12:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 12:12:20 2007 Subject: [Frugalware-git] frugalware-current: swfdec-0.5.1-1-i686 Message-ID: <20070806101213.22C4D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bda683051e27753e7a47e93ea84e79b65004d1fe commit bda683051e27753e7a47e93ea84e79b65004d1fe Author: Christian Hamar alias krix Date: Mon Aug 6 12:10:43 2007 +0200 swfdec-0.5.1-1-i686 * Version bump * Added libsoup as depend diff --git a/source/xlib/swfdec/FrugalBuild b/source/xlib/swfdec/FrugalBuild index 92cd1e5..913a3d7 100644 --- a/source/xlib/swfdec/FrugalBuild +++ b/source/xlib/swfdec/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=swfdec -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Swfdec is a decoder/renderer library for Macromedia Flash animations.." url="http://swfdec.freedesktop.org/" license="LGPL" -depends=('libmad' 'gtk+2' 'liboil' 'ffmpeg>=20070422' 'alsa-lib' 'faad2' 'gstreamer') +depends=('libmad' 'gtk+2' 'liboil' 'ffmpeg>=20070422' 'alsa-lib' 'faad2' 'gstreamer' 'libsoup') options=('scriptlet') groups=('xlib') archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep -m1 'Swfdec [0-9]' | sed 's/.*Swfdec \(.*\) is.*/\1/'" +up2date="lynx -dump http://swfdec.freedesktop.org/|grep -om1 'swfdec-\(.*\).tar.gz$'|Flasttar" source=($url/download/$pkgname/0.5/$pkgname-$pkgver.tar.gz) -Fconfopts="${Fconfopts[@]} --enable-gnome-vfs=no" -sha1sums=('cf9a2b5e25c81cd4be4e962a510ac326a651937e') +Fconfopts="${Fconfopts[@]} --enable-gnome-vfs=no --enable-libsoup" +sha1sums=('a9bb3645cd2bf7838d3fbeb7f46c6359ae14e7bd') # optimization OK From krics at linuxforum.hu Mon Aug 6 12:23:37 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 12:23:42 2007 Subject: [Frugalware-git] frugalware-current: swfdec-mozilla-0.5.1-1-i686 Message-ID: <20070806102337.3216913A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b3776a9479be85fbeac539a190469a666aea1ec2 commit b3776a9479be85fbeac539a190469a666aea1ec2 Author: Christian Hamar alias krix Date: Mon Aug 6 12:22:11 2007 +0200 swfdec-mozilla-0.5.1-1-i686 * Version bump diff --git a/source/xlib-extra/swfdec-mozilla/FrugalBuild b/source/xlib-extra/swfdec-mozilla/FrugalBuild index 203bcde..6fd83e5 100644 --- a/source/xlib-extra/swfdec-mozilla/FrugalBuild +++ b/source/xlib-extra/swfdec-mozilla/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix pkgname=swfdec-mozilla -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Mozilla plugin that uses the Swfdec library for playing SWF files in a browser capable of loading NS-Plugins" url="http://swfdec.freedesktop.org/" license="LGPL" -depends=('swfdec=0.5.0' 'firefox') +depends=('swfdec=0.5.1' 'firefox') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep -m1 'Swfdec [0-9]' | sed 's/.*Swfdec \(.*\) is.*/\1/'" +up2date="lynx -dump http://swfdec.freedesktop.org/|grep -om1 'swfdec-\(.*\).tar.gz$'|Flasttar" source=($url/download/$pkgname/0.5/$pkgname-$pkgver.tar.gz) -sha1sums=('9b912440774bf017703736da293b60c5b49f5cdc') +sha1sums=('41c8e53f3ef6c64d82fc8d72304c78cc37a4effb') # optimization OK From vmiklos at frugalware.org Mon Aug 6 13:45:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 13:45:01 2007 Subject: [Frugalware-git] frugalware-current: user-mode-linux-2.6.22-1-x86_64 Message-ID: <20070806114500.3F47813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5cb10293885e729910c70b2ff46120a7363799cf commit 5cb10293885e729910c70b2ff46120a7363799cf Author: VMiklos Date: Sat Aug 4 19:30:46 2007 +0200 user-mode-linux-2.6.22-1-x86_64 readded x86_64 to archs() diff --git a/source/apps-extra/user-mode-linux/FrugalBuild b/source/apps-extra/user-mode-linux/FrugalBuild index 435326b..2a2e153 100644 --- a/source/apps-extra/user-mode-linux/FrugalBuild +++ b/source/apps-extra/user-mode-linux/FrugalBuild @@ -9,12 +9,12 @@ pkgdesc="A safe, secure way of running Linux versions and Linux processes." url="http://user-mode-linux.sourceforge.net/" depends=('uml_utilities') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.kernel.org/kdist/finger_banner |sed -n 's/.* \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'" # check http://uml.nagafix.co.uk/kernels for configs source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver$patchlevel.tar.bz2 \ - config.i686 README.Frugalware linux-2.6.22-aio.diff) -signatures=($source.sign '' '' '') + config.i686 config.x86_64 README.Frugalware linux-2.6.22-aio.diff) +signatures=($source.sign '' '' '' '') build() { diff --git a/source/apps-extra/user-mode-linux/config.x86_64 b/source/apps-extra/user-mode-linux/config.x86_64 new file mode 100644 index 0000000..f3db075 --- /dev/null +++ b/source/apps-extra/user-mode-linux/config.x86_64 @@ -0,0 +1,793 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22.1 +# Fri Jul 13 18:44:24 2007 +# +CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig" +CONFIG_GENERIC_HARDIRQS=y +CONFIG_UML=y +CONFIG_MMU=y +CONFIG_NO_IOMEM=y +# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set +CONFIG_LOCKDEP_SUPPORT=y +# CONFIG_STACKTRACE_SUPPORT is not set +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_BUG=y +CONFIG_IRQ_RELEASE_METHOD=y + +# +# UML-specific options +# +CONFIG_STATIC_LINK=y +CONFIG_MODE_SKAS=y +CONFIG_UML_X86=y +CONFIG_64BIT=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_TOP_ADDR=0x80000000 +CONFIG_3_LEVEL_PGTABLES=y +CONFIG_STUB_CODE=0x7fbfffe000 +CONFIG_STUB_DATA=0x7fbffff000 +CONFIG_STUB_START=0x7fbfffe000 +# CONFIG_ARCH_HAS_SC_SIGNALS is not set +# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set +CONFIG_SMP_BROKEN=y +CONFIG_GENERIC_HWEIGHT=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_SPLIT_PTLOCK_CPUS=4 +CONFIG_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_LD_SCRIPT_STATIC=y +CONFIG_NET=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=y +CONFIG_HOSTFS=y +CONFIG_HPPFS=y +CONFIG_MCONSOLE=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_NEST_LEVEL=0 +CONFIG_KERNEL_STACK_ORDER=2 +CONFIG_UML_REAL_TIME_CLOCK=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=128 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +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=y +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_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +# CONFIG_MODULES is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# Block devices +# +CONFIG_BLK_DEV_UBD=y +CONFIG_BLK_DEV_UBD_SYNC=y +CONFIG_BLK_DEV_COW_COMMON=y +# CONFIG_MMAPPER is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=y +CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_ATA_OVER_ETH is not set + +# +# Character Devices +# +CONFIG_STDERR_CONSOLE=y +CONFIG_STDIO_CONSOLE=y +CONFIG_SSL=y +CONFIG_NULL_CHAN=y +CONFIG_PORT_CHAN=y +CONFIG_PTY_CHAN=y +CONFIG_TTY_CHAN=y +# CONFIG_XTERM_CHAN is not set +CONFIG_NOCONFIG_CHAN=y +CONFIG_CON_ZERO_CHAN="fd:0,fd:1" +CONFIG_CON_CHAN="pty" +CONFIG_SSL_CHAN="pty" +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +# CONFIG_RAW_DRIVER is not set +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_SOFT_WATCHDOG=y +CONFIG_UML_WATCHDOG=y +# CONFIG_UML_SOUND is not set +# CONFIG_SOUND is not set +# CONFIG_HOSTAUDIO is not set +# CONFIG_HW_RANDOM is not set +CONFIG_UML_RANDOM=y + +# +# Generic Driver Options +# +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 + +# +# Networking +# + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=y +CONFIG_IPV6_MIP6=y +CONFIG_INET6_XFRM_TUNNEL=y +CONFIG_INET6_TUNNEL=y +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y +CONFIG_IPV6_SIT=y +CONFIG_IPV6_TUNNEL=y +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +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=y +CONFIG_NETFILTER_NETLINK_QUEUE=y +CONFIG_NETFILTER_NETLINK_LOG=y +CONFIG_NF_CONNTRACK_ENABLED=y +CONFIG_NF_CONNTRACK=y +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_SCTP is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=y +# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_IRC=y +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SIP is not set +CONFIG_NF_CONNTRACK_TFTP=y +# CONFIG_NF_CT_NETLINK is not set +CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_DSCP=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_NOTRACK=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_MATCH_COMMENT=y +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y +CONFIG_NETFILTER_XT_MATCH_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_DCCP=y +CONFIG_NETFILTER_XT_MATCH_DSCP=y +CONFIG_NETFILTER_XT_MATCH_ESP=y +CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_LENGTH=y +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_REALM=y +CONFIG_NETFILTER_XT_MATCH_SCTP=y +CONFIG_NETFILTER_XT_MATCH_STATE=y +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y +CONFIG_NETFILTER_XT_MATCH_STRING=y +CONFIG_NETFILTER_XT_MATCH_TCPMSS=y +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_IPRANGE=y +CONFIG_IP_NF_MATCH_TOS=y +CONFIG_IP_NF_MATCH_RECENT=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_AH=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_MATCH_OWNER=y +CONFIG_IP_NF_MATCH_ADDRTYPE=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_LOG=y +CONFIG_IP_NF_TARGET_ULOG=y +CONFIG_NF_NAT=y +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_SAME=y +CONFIG_NF_NAT_SNMP_BASIC=y +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_IRC=y +CONFIG_NF_NAT_TFTP=y +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +# CONFIG_NF_NAT_SIP is not set +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_TARGET_TOS=y +CONFIG_IP_NF_TARGET_ECN=y +CONFIG_IP_NF_TARGET_TTL=y +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARP_MANGLE=y + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_NF_CONNTRACK_IPV6 is not set +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=y +CONFIG_BRIDGE_EBT_BROUTE=y +CONFIG_BRIDGE_EBT_T_FILTER=y +CONFIG_BRIDGE_EBT_T_NAT=y +CONFIG_BRIDGE_EBT_802_3=y +CONFIG_BRIDGE_EBT_AMONG=y +CONFIG_BRIDGE_EBT_ARP=y +CONFIG_BRIDGE_EBT_IP=y +CONFIG_BRIDGE_EBT_LIMIT=y +CONFIG_BRIDGE_EBT_MARK=y +CONFIG_BRIDGE_EBT_PKTTYPE=y +CONFIG_BRIDGE_EBT_STP=y +CONFIG_BRIDGE_EBT_VLAN=y +CONFIG_BRIDGE_EBT_ARPREPLY=y +CONFIG_BRIDGE_EBT_DNAT=y +CONFIG_BRIDGE_EBT_MARK_T=y +CONFIG_BRIDGE_EBT_REDIRECT=y +CONFIG_BRIDGE_EBT_SNAT=y +CONFIG_BRIDGE_EBT_LOG=y +CONFIG_BRIDGE_EBT_ULOG=y +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=y +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +CONFIG_LLC=y +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set + +# +# UML Network Devices +# +CONFIG_UML_NET=y +CONFIG_UML_NET_ETHERTAP=y +CONFIG_UML_NET_TUNTAP=y +CONFIG_UML_NET_SLIP=y +CONFIG_UML_NET_DAEMON=y +CONFIG_UML_NET_MCAST=y +# CONFIG_UML_NET_PCAP is not set +CONFIG_UML_NET_SLIRP=y + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_SYNC_TTY=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_MPPE=y +CONFIG_PPPOE=y +CONFIG_SLIP=y +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_SHAPER=y +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=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=y +CONFIG_FS_XIP=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +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 is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_GENERIC_ACL=y + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# 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=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=y + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_BIND34=y +CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_RPCSEC_GSS_SPKM3=y +CONFIG_SMB_FS=y +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=y +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_CIFS_UPCALL=y +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM 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_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set +# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_WP512=y +CONFIG_CRYPTO_TGR192=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=y +CONFIG_CRYPTO_BLOWFISH=y +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_COMMON=y +CONFIG_CRYPTO_TWOFISH_X86_64=y +CONFIG_CRYPTO_SERPENT=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_X86_64=y +CONFIG_CRYPTO_CAST5=y +CONFIG_CRYPTO_CAST6=y +CONFIG_CRYPTO_TEA=y +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_KHAZAD=y +CONFIG_CRYPTO_ANUBIS=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CAMELLIA=y + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=y +CONFIG_TEXTSEARCH_BM=y +CONFIG_TEXTSEARCH_FSM=y +CONFIG_PLIST=y +CONFIG_HAS_DMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set +# CONFIG_INPUT is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB 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_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=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +# CONFIG_FORCED_INLINING is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_GPROF is not set +# CONFIG_GCOV is not set From priyank at frugalware.org Mon Aug 6 15:30:41 2007 From: priyank at frugalware.org (Priyank) Date: Mon Aug 6 15:30:45 2007 Subject: [Frugalware-git] gfpm: gfpm: do not hide the progress bar when syncing. Instead, hide it only when actually download packages. Message-ID: <20070806133041.79D5A13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c9b8cfd17fdca0567df73a4cb432ce2a624ec511 commit c9b8cfd17fdca0567df73a4cb432ce2a624ec511 Author: Priyank Date: Mon Aug 6 18:58:54 2007 +0530 gfpm: do not hide the progress bar when syncing. Instead, hide it only when actually download packages. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index e7dee83..51a3d2f 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -294,7 +294,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) return; } - gfpm_progress_show (TRUE); + gfpm_progress_show (TRUE, 0); GList *i = NULL; PM_LIST *data, *pkgs; for (i = (GList*)remove_list; i; i = i->next) @@ -344,7 +344,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) return; } - gfpm_progress_show (TRUE); + gfpm_progress_show (TRUE, 0); GList *i = NULL; PM_LIST *data, *pkgs; for (i = (GList*)install_list; i; i = i->next) @@ -374,7 +374,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_package_list_free (GFPM_INSTALL_LIST); gfpm_apply_dlg_reset (); } - gfpm_progress_show (FALSE); + gfpm_progress_show (FALSE, 0); if (current_group != NULL) { @@ -871,9 +871,9 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) "Do you want to continue upgrading pacman-g2 ?"); gfpm_progress_set_main_text (_("Synchronizing package databases")); - gfpm_progress_show (TRUE); + gfpm_progress_show (TRUE, 1); ret = pacman_db_update (0, sync_db); - gfpm_progress_show (FALSE); + gfpm_progress_show (FALSE, 1); /* check for a pacman-g2 update */ pm_lpkg = pacman_db_readpkg (local_db, "pacman-g2"); pm_spkg = pacman_db_readpkg (sync_db, "pacman-g2"); @@ -1274,7 +1274,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) } return; } - gfpm_progress_show (TRUE); + gfpm_progress_show (TRUE, 0); /* add the target */ pacman_trans_addtarget ((char*)fpm); if (pacman_trans_prepare(&trans_data) == -1) @@ -1348,7 +1348,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) g_string_free (errorstr, FALSE); pacman_trans_release (); gtk_widget_hide (gfpm_inst_from_file_dlg); - gfpm_progress_show (FALSE); + gfpm_progress_show (FALSE, 0); return; } diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 8188572..d897b5c 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -69,19 +69,25 @@ gfpm_progress_init (void) } void -gfpm_progress_show (gboolean show) +gfpm_progress_show (gboolean show, gint sync) { if (show == TRUE) { gtk_widget_show (progresswindow); - gfpm_systray_set_visible (TRUE); - gtk_widget_hide (gfpm_mw); + if (!sync) + { + gtk_widget_hide (gfpm_mw); + gfpm_systray_set_visible (TRUE); + } } else { gtk_widget_hide (progresswindow); - gfpm_systray_set_visible (FALSE); - gtk_widget_show (gfpm_mw); + if (!sync) + { + gtk_widget_show (gfpm_mw); + gfpm_systray_set_visible (FALSE); + } } return; diff --git a/src/gfpm-progress.h b/src/gfpm-progress.h index d4a4fee..ec587b7 100644 --- a/src/gfpm-progress.h +++ b/src/gfpm-progress.h @@ -20,7 +20,7 @@ int gfpm_progress_update (netbuf *, int, void *); void gfpm_progress_install (unsigned char, char *, int, int, int); -void gfpm_progress_show (gboolean); +void gfpm_progress_show (gboolean, gint); void gfpm_progress_set_main_text (const char *msg); From krics at linuxforum.hu Mon Aug 6 18:15:05 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 18:15:07 2007 Subject: [Frugalware-git] gfpm: AUTHORS fix. (And test git) Message-ID: <20070806161505.5461213A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=31f35ea54a97df67d0e486ce6c7fd2b1f68a4d62 commit 31f35ea54a97df67d0e486ce6c7fd2b1f68a4d62 Author: Christian Hamar alias krix Date: Mon Aug 6 18:14:56 2007 +0200 AUTHORS fix. (And test git) diff --git a/AUTHORS b/AUTHORS index 2592fbf..f7776ca 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,3 @@ Priyank M. Gosalia -Christian Hamar +Christian Hamar alias krix Miklos Nemeth From krics at linuxforum.hu Mon Aug 6 18:50:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 18:51:00 2007 Subject: [Frugalware-git] gfpm: Initial support for debug enable Message-ID: <20070806165058.85DB613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=4a445baf06a5312f218cdd7c8a91faa52a252f4d commit 4a445baf06a5312f218cdd7c8a91faa52a252f4d Author: Christian Hamar alias krix Date: Mon Aug 6 18:50:46 2007 +0200 Initial support for debug enable * Well. ./configure --enable debug ships CFLAGS like : -ggdb3 -Wall -Werror -DGFPM_DEBUG * Use can use #if GFPM_DEBUG writefooo because debug stuffs diff --git a/configure.ac b/configure.ac index 83bdf5b..d75d1ab 100644 --- a/configure.ac +++ b/configure.ac @@ -10,15 +10,31 @@ AC_PROG_INTLTOOL([0.21]) AC_PROG_LIBTOOL AM_INIT_AUTOMAKE -AC_PROG_CC +AC_PROG_CC(GCC) AC_HEADER_STDC AC_CHECK_HEADERS([locale.h stdlib.h string.h sys/ioctl.h unistd.h alpm.h]) -if test "${GCC}" = "yes" -then - CFLAGS="${CFLAGS} -pipe -Wall" +if test "${GCC}" = "yes" ; then + CFLAGS="${ENV_CFLAGS} -pipe" fi +AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support], debug="yes") +dnl Check for debug enabled or not +AC_MSG_CHECKING(for debug request) +if test "x$debug" = "xyes" ; then + AC_DEFINE(GFPM_DEBUG, 1, [Debug support: enabled]) + CFLAGS="${CFLAGS} -ggdb3 -Wall -Werror -DGFPM_DEBUG" + debug=yes + AC_MSG_RESULT(yes) +else + AC_DEFINE(GFPM_DEBUG, 0, [Debug support: disabled]) + CFLAGS="${CFLAGS} -Wall" + debug=no + AC_MSG_RESULT(no) +fi + +AC_SUBST([GFPM_DEBUG]) + ALL_LINGUAS="" GETTEXT_PACKAGE=gfpm AC_SUBST(GETTEXT_PACKAGE) @@ -52,4 +68,5 @@ Gfpm $VERSION configuration summary: source code location : ${srcdir} compiler : ${CC} compiler flags : ${CFLAGS} + debug support : ${debug} " From krics at linuxforum.hu Mon Aug 6 19:01:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 19:02:00 2007 Subject: [Frugalware-git] gfpm: Fix 3 warnings Message-ID: <20070806170158.9E37513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=9d742ae02c02a4ba29544af1553bd589586cbd98 commit 9d742ae02c02a4ba29544af1553bd589586cbd98 Author: Christian Hamar alias krix Date: Mon Aug 6 19:00:50 2007 +0200 Fix 3 warnings * First fix a newline (somehow broken :S what editor you got priyank?) * Fixed two cast (g_list_lenght(foo) need a (GList *)foo cast diff --git a/src/gfpm-packagelist.c b/src/gfpm-packagelist.c index f0cd567..4990c1b 100644 --- a/src/gfpm-packagelist.c +++ b/src/gfpm-packagelist.c @@ -154,7 +154,7 @@ gfpm_package_list_is_empty (GfpmListType type) { if (install_list == NULL) return 0; - else if (g_list_length(install_list)==0) + else if (g_list_length((GList *)install_list)==0) return 0; else return 1; @@ -164,7 +164,7 @@ gfpm_package_list_is_empty (GfpmListType type) { if (remove_list == NULL) return 0; - else if (g_list_length(remove_list)==0) + else if (g_list_length((GList *)remove_list)==0) return 0; else return 1; From krics at linuxforum.hu Mon Aug 6 19:03:07 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 19:03:08 2007 Subject: [Frugalware-git] gfpm: Fix 2 warnings Message-ID: <20070806170307.970A513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c6112ed9458cc4d261f54718e55cee533d6ad94f commit c6112ed9458cc4d261f54718e55cee533d6ad94f Author: Christian Hamar alias krix Date: Mon Aug 6 19:03:00 2007 +0200 Fix 2 warnings * Fixes newline (missed somehow in first commit) * Replace for (temp; temp!=NULL; ...) with for (; temp!=NULL; ...) diff --git a/src/gfpm-packagelist.c b/src/gfpm-packagelist.c index 4990c1b..eca65f1 100644 --- a/src/gfpm-packagelist.c +++ b/src/gfpm-packagelist.c @@ -86,7 +86,7 @@ gfpm_package_list_del (GfpmListType type, const gchar *item) else temp = remove_list; - for (temp; temp!=NULL; temp=temp->next) + for (; temp!=NULL; temp=temp->next) { if (strcmp (item, temp->data) == 0) break; From krics at linuxforum.hu Mon Aug 6 19:10:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 19:10:27 2007 Subject: [Frugalware-git] gfpm: Fix 2 warnings again Message-ID: <20070806171026.078CD13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=975a045b8acf4af9650c28225a02f334a79947cc commit 975a045b8acf4af9650c28225a02f334a79947cc Author: Christian Hamar alias krix Date: Mon Aug 6 19:10:18 2007 +0200 Fix 2 warnings again * Use (long) cast instead of (int) * Include gfpm-db.h in gfpm.c diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 51a3d2f..a9cf51a 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -804,7 +804,7 @@ gfpm_load_info_tvw (const char *pkg_name) st = (char*)gfpm_bold (_("Reason:")); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - switch ((int)pacman_pkg_getinfo (pm_lpkg, PM_PKG_REASON)) + switch ((long)pacman_pkg_getinfo (pm_lpkg, PM_PKG_REASON)) { case PM_PKG_REASON_EXPLICIT: gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, diff --git a/src/gfpm.c b/src/gfpm.c index c84efcb..cf9807e 100644 --- a/src/gfpm.c +++ b/src/gfpm.c @@ -31,6 +31,7 @@ #include "gfpm-interface.h" #include "gfpm-systray.h" #include "gfpm-messages.h" +#include "gfpm-db.h" #define GLADE_FILE "/share/gfpm/gfpm.glade" From krics at linuxforum.hu Mon Aug 6 19:11:03 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 19:11:04 2007 Subject: [Frugalware-git] gfpm: * Fix for newline error (TAB in last line) Message-ID: <20070806171103.3859D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=145f15617627032c554bfcfae6bf81f01f42f7b3 commit 145f15617627032c554bfcfae6bf81f01f42f7b3 Author: Christian Hamar alias krix Date: Mon Aug 6 19:10:57 2007 +0200 * Fix for newline error (TAB in last line) diff --git a/src/gfpm-util.c b/src/gfpm-util.c index 174ff82..b8271f1 100644 --- a/src/gfpm-util.c +++ b/src/gfpm-util.c @@ -41,5 +41,3 @@ gfpm_pmlist_to_glist (PM_LIST *list) return ret; } - - \ No newline at end of file From krics at linuxforum.hu Mon Aug 6 19:22:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 19:22:30 2007 Subject: [Frugalware-git] gfpm: Rewrite --enable-debug and extend with werror Message-ID: <20070806172228.AF21813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=8cd3bbf1246bcf81d69325cb2e5591c01877b5e0 commit 8cd3bbf1246bcf81d69325cb2e5591c01877b5e0 Author: Christian Hamar alias krix Date: Mon Aug 6 19:22:20 2007 +0200 Rewrite --enable-debug and extend with werror * So you got now --enable-debug (which omits -ggdb3 -Wall stuffs) and you got a --enable-werror which omits -Werror flag. * Cleanup and cosmetics for AC_MSG_ARG and other stuffs diff --git a/configure.ac b/configure.ac index d75d1ab..ced6367 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,27 @@ if test "${GCC}" = "yes" ; then CFLAGS="${ENV_CFLAGS} -pipe" fi -AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support], debug="yes") +AC_ARG_ENABLE(werror, + AC_HELP_STRING([ --enable-werror], [Enable -Werror usage]), [werror="yes"]) +AC_ARG_ENABLE(debug, + AC_HELP_STRING([ --enable-debug], [Enable debugging support]), [debug="yes"]) + +dnl Check for Werror request +AC_MSG_CHECKING(for werror usage) +if test "x$werror" = "xyes" ; then + CFLAGS="${CFLAGS} -Werror" + werror=yes + AC_MSG_RESULT(yes) +else + werror=no + AC_MSG_RESULT(no) +fi + dnl Check for debug enabled or not AC_MSG_CHECKING(for debug request) if test "x$debug" = "xyes" ; then AC_DEFINE(GFPM_DEBUG, 1, [Debug support: enabled]) - CFLAGS="${CFLAGS} -ggdb3 -Wall -Werror -DGFPM_DEBUG" + CFLAGS="${CFLAGS} -ggdb3 -Wall -DGFPM_DEBUG" debug=yes AC_MSG_RESULT(yes) else @@ -69,4 +84,5 @@ Gfpm $VERSION configuration summary: compiler : ${CC} compiler flags : ${CFLAGS} debug support : ${debug} + werror usage : ${werror} " From krics at linuxforum.hu Mon Aug 6 19:26:43 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Aug 6 19:26:45 2007 Subject: [Frugalware-git] gfpm: autoclean.sh additions Message-ID: <20070806172643.CE74713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=ea2719fa3e502894b1548247b18a5c5a13e68e9a commit ea2719fa3e502894b1548247b18a5c5a13e68e9a Author: Christian Hamar alias krix Date: Mon Aug 6 19:26:37 2007 +0200 autoclean.sh additions * Added data/*.in data/icons/*.in for cleanup * Remove generated intltool-* (not the .in's) diff --git a/autoclean.sh b/autoclean.sh index 9b19162..644b037 100644 --- a/autoclean.sh +++ b/autoclean.sh @@ -18,3 +18,8 @@ rm -rf compile rm -rf libtool rm -rf mkinstalldirs rm -rf config.rpath +rm -rf data/Makefile.in +rm -rf data/icons/Makefile.in +rm -rf data/icons/{32x32,128x128,48x48}/Makefile.in +rm -rf po/stamp-it +rm -rf intltool-{extract,merge,update} From priyank at frugalware.org Mon Aug 6 19:35:22 2007 From: priyank at frugalware.org (Priyank) Date: Mon Aug 6 19:35:24 2007 Subject: [Frugalware-git] gfpm: gfpm-progress.c: whitespace fixes. Message-ID: <20070806173522.D737813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=7d2270a15dfd3c0b1d9361e7d5b5066b5f6f6b75 commit 7d2270a15dfd3c0b1d9361e7d5b5066b5f6f6b75 Author: Priyank Date: Mon Aug 6 23:04:39 2007 +0530 gfpm-progress.c: whitespace fixes. diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index d897b5c..423df99 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -72,7 +72,7 @@ void gfpm_progress_show (gboolean show, gint sync) { if (show == TRUE) - { + { gtk_widget_show (progresswindow); if (!sync) { @@ -81,7 +81,7 @@ gfpm_progress_show (gboolean show, gint sync) } } else - { + { gtk_widget_hide (progresswindow); if (!sync) { From vmiklos at frugalware.org Mon Aug 6 20:45:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 20:45:53 2007 Subject: [Frugalware-git] pacman-tools: add buildsystem support for syncpkgd Message-ID: <20070806184551.58CAD13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=5382b5b49dce2bfe5f1e081a1e4844bf8c5a4637 commit 5382b5b49dce2bfe5f1e081a1e4844bf8c5a4637 Author: VMiklos Date: Mon Aug 6 20:45:37 2007 +0200 add buildsystem support for syncpkgd diff --git a/Makefile b/Makefile index 0acca12..207219c 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ install: $(INSTALL) -m644 mkiso/volumes.xml $(DESTDIR)$(docdir)/volumes.xml $(INSTALL) -m644 apidocs/*.3 $(DESTDIR)$(man3dir) $(INSTALL) -m644 fwmakepkg.3 $(DESTDIR)$(man3dir) - make -C syncpkgd DESTDIR=$(DESTDIR) + make -C syncpkgd DESTDIR=$(DESTDIR) install clean: rm -rf genauthors apidocs fwmakepkg.3 diff --git a/syncpkgd/Makefile b/syncpkgd/Makefile new file mode 100644 index 0000000..7299849 --- /dev/null +++ b/syncpkgd/Makefile @@ -0,0 +1,11 @@ +install: + mkdir -p $(DESTDIR)/etc/syncpkgcd + install -g 2 -u 12 -m600 cconfig.py $(DESTDIR)/etc/syncpkgcd/cconfig.py + mkdir -p $(DESTDIR)/etc/syncpkgd + install -g 2 -u 12 -m600 dconfig.py $(DESTDIR)/etc/syncpkgd/dconfig.py + mkdir -p $(DESTDIR)/etc/rc.d + install rc.syncpkgcd $(DESTDIR)/etc/rc.d/rc.syncpkgcd + install rc.syncpkgd $(DESTDIR)/etc/rc.d/rc.syncpkgd + mkdir -p $(DESTDIR)/usr/bin + install syncpkgcd.py $(DESTDIR)/usr/bin/syncpkgcd + install syncpkgd.py $(DESTDIR)/usr/bin/syncpkgd From vmiklos at frugalware.org Mon Aug 6 20:56:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 20:56:09 2007 Subject: [Frugalware-git] pacman-tools: create empty log/lock files with proper permissions Message-ID: <20070806185609.6F4BE13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=868ed7b89f813a8ab77cc4e8a43360d44cb9d999 commit 868ed7b89f813a8ab77cc4e8a43360d44cb9d999 Author: VMiklos Date: Mon Aug 6 20:56:04 2007 +0200 create empty log/lock files with proper permissions diff --git a/syncpkgd/Makefile b/syncpkgd/Makefile index 7299849..f64deb0 100644 --- a/syncpkgd/Makefile +++ b/syncpkgd/Makefile @@ -9,3 +9,18 @@ install: mkdir -p $(DESTDIR)/usr/bin install syncpkgcd.py $(DESTDIR)/usr/bin/syncpkgcd install syncpkgd.py $(DESTDIR)/usr/bin/syncpkgd + mkdir -p $(DESTDIR)/var/log/syncpkgd/clientlogs + chown 12:2 $(DESTDIR)/var/log/syncpkgd/clientlogs + mkdir -p $(DESTDIR)/var/log/syncpkgd + touch $(DESTDIR)/var/log/syncpkgd/daemon.log + chown 12:2 $(DESTDIR)/var/log/syncpkgd/daemon.log + mkdir -p $(DESTDIR)/var/lock + touch $(DESTDIR)/var/lock/syncpkgd.pid + chown 12:2 $(DESTDIR)/var/lock/syncpkgd.pid + mkdir -p $(DESTDIR)/var/run + touch $(DESTDIR)/var/run/syncpkgd.status + chown 12:2 $(DESTDIR)/var/run/syncpkgd.status + touch $(DESTDIR)/var/log/syncpkgcd.log + chown 12:2 $(DESTDIR)/var/log/syncpkgcd.log + touch $(DESTDIR)/var/lock/syncpkgcd.pid + chown 12:2 $(DESTDIR)/var/lock/syncpkgcd.pid diff --git a/syncpkgd/rc.syncpkgcd b/syncpkgd/rc.syncpkgcd index d6d0cd7..49bed99 100644 --- a/syncpkgd/rc.syncpkgcd +++ b/syncpkgd/rc.syncpkgcd @@ -32,7 +32,7 @@ rc_stop() stop_msg if [[ "$(eval $pid)" != "" ]] ; then kill -INT $(eval $pid) - rm /var/run/syncpkgcd.pid + : > /var/run/syncpkgcd.pid ok $? else ok 999 diff --git a/syncpkgd/rc.syncpkgd b/syncpkgd/rc.syncpkgd index d49333c..53a3623 100644 --- a/syncpkgd/rc.syncpkgd +++ b/syncpkgd/rc.syncpkgd @@ -32,7 +32,7 @@ rc_stop() stop_msg if [[ "$(eval $pid)" != "" ]] ; then kill -INT $(eval $pid) - rm /var/run/syncpkgd.pid + : > /var/run/syncpkgd.pid ok $? else ok 999 From vmiklos at frugalware.org Mon Aug 6 22:03:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:03:31 2007 Subject: [Frugalware-git] pacman-tools: remove old rc.syncpkgd Message-ID: <20070806200326.DF76713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=328b744febdd7906712bb0721cf5d4d58bcd1497 commit 328b744febdd7906712bb0721cf5d4d58bcd1497 Author: VMiklos Date: Mon Aug 6 21:17:12 2007 +0200 remove old rc.syncpkgd diff --git a/Makefile b/Makefile index 207219c..d6961b9 100644 --- a/Makefile +++ b/Makefile @@ -60,13 +60,7 @@ install: $(INSTALL) -d $(DESTDIR)$(sysconfdir)/repoman.d $(INSTALL) -d $(DESTDIR)$(docdir) $(INSTALL) -d $(DESTDIR)/home/syncpkgd - $(INSTALL) -d $(DESTDIR)/etc/rc.d - for i in $(LANGS); do \ - mkdir -p $(DESTDIR)/lib/initscripts/messages/`echo $$i|sed 's/.*-\(.*\).po/\1/'`/LC_MESSAGES/; \ - done chown syncpkgd:daemon $(DESTDIR)/home/syncpkgd - $(INSTALL) -d $(DESTDIR)/var/log/syncpkg - chown syncpkgd:daemon $(DESTDIR)/var/log/syncpkg $(INSTALL) chkworld $(DESTDIR)$(bindir)/chkworld $(INSTALL) -m644 chkworld.1 $(DESTDIR)$(man1dir) $(INSTALL) chkdep $(DESTDIR)$(bindir)/chkdep @@ -82,13 +76,6 @@ install: $(INSTALL) -m644 repoman.conf $(DESTDIR)$(sysconfdir) $(INSTALL) -m644 repoman.d/current $(DESTDIR)$(sysconfdir)/repoman.d/current $(INSTALL) -m644 repoman.d/stable $(DESTDIR)$(sysconfdir)/repoman.d/stable - $(INSTALL) syncpkg $(DESTDIR)$(bindir) - $(INSTALL) -m644 syncpkg.conf $(DESTDIR)$(sysconfdir) - $(INSTALL) syncpkgd $(DESTDIR)$(sbindir) - $(INSTALL) rc.syncpkgd $(DESTDIR)/etc/rc.d - for i in $(LANGS); do \ - msgfmt -c --statistics -o $(DESTDIR)/lib/initscripts/messages/`echo $$i|sed 's/.*-\(.*\).po/\1/'`/LC_MESSAGES/syncpkgd.mo rc.syncpkgd-$$i; \ - done $(INSTALL) fwmakepkg $(DESTDIR)$(libdir) $(INSTALL) movepkg $(DESTDIR)$(bindir) $(INSTALL) pacman-source $(DESTDIR)$(bindir) diff --git a/rc.syncpkgd b/rc.syncpkgd deleted file mode 100644 index 6d899d8..0000000 --- a/rc.syncpkgd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# (c) 2006 Miklos Vajna -# rc.syncpkgd for Frugalware -# distributed under GPL License - -# chkconfig: 2345 95 05 -# description: Package builder daemon. - -source /lib/initscripts/functions -TEXTDOMAIN=syncpkgd -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start status stop) -daemon=$"package builder daemon" - -pid="ps -C syncpkgd -o pid=" - -rc_start() -{ - start_msg - if [[ "$(eval $pid)" == "" ]] ; then - syncpkgd - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [[ "$(eval $pid)" != "" ]] ; then - killall syncpkgd - rm /var/run/syncpkgd.pid - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh diff --git a/rc.syncpkgd-hu.po b/rc.syncpkgd-hu.po deleted file mode 100644 index db076f4..0000000 --- a/rc.syncpkgd-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# Hungarian translations for rc.syncpkgd package. -# Copyright (C) 2006 THE rc.syncpkgd'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.syncpkgd package. -# , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.syncpkgd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-30 22:49+0100\n" -"PO-Revision-Date: 2006-01-30 22:49+0100\n" -"Last-Translator: \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.syncpkgd:15 -msgid "package builder daemon" -msgstr "csomagfordító démon" diff --git a/rc.syncpkgd-pl.po b/rc.syncpkgd-pl.po deleted file mode 100644 index 7f5a035..0000000 --- a/rc.syncpkgd-pl.po +++ /dev/null @@ -1,20 +0,0 @@ -# Polish translations for rc.syncpkgd package. -# Copyright (C) 2006 THE rc.syncpkgd'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.syncpkgd package. -# , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.syncpkgd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 00:20+0200\n" -"PO-Revision-Date: 2006-04-08 12:19+0900\n" -"Last-Translator: Piotr Maliński \n" -"Language-Team: Polish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.syncpkgd:15 -msgid "package builder daemon" -msgstr "demon budujący pakiety" diff --git a/rc.syncpkgd.pot b/rc.syncpkgd.pot deleted file mode 100644 index 061bf1b..0000000 --- a/rc.syncpkgd.pot +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-30 22:49+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.syncpkgd:15 -msgid "package builder daemon" -msgstr "" From vmiklos at frugalware.org Mon Aug 6 22:03:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:03:32 2007 Subject: [Frugalware-git] pacman-tools: err, install has -o, not -u Message-ID: <20070806200327.021B013A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=1dee7eb571b96c77f35f11c70f9b3da021acb0dd commit 1dee7eb571b96c77f35f11c70f9b3da021acb0dd Author: VMiklos Date: Mon Aug 6 21:22:27 2007 +0200 err, install has -o, not -u diff --git a/syncpkgd/Makefile b/syncpkgd/Makefile index f64deb0..21894e3 100644 --- a/syncpkgd/Makefile +++ b/syncpkgd/Makefile @@ -1,8 +1,8 @@ install: mkdir -p $(DESTDIR)/etc/syncpkgcd - install -g 2 -u 12 -m600 cconfig.py $(DESTDIR)/etc/syncpkgcd/cconfig.py + install -g 2 -o 12 -m600 cconfig.py $(DESTDIR)/etc/syncpkgcd/cconfig.py mkdir -p $(DESTDIR)/etc/syncpkgd - install -g 2 -u 12 -m600 dconfig.py $(DESTDIR)/etc/syncpkgd/dconfig.py + install -g 2 -o 12 -m600 dconfig.py $(DESTDIR)/etc/syncpkgd/dconfig.py mkdir -p $(DESTDIR)/etc/rc.d install rc.syncpkgcd $(DESTDIR)/etc/rc.d/rc.syncpkgcd install rc.syncpkgd $(DESTDIR)/etc/rc.d/rc.syncpkgd From vmiklos at frugalware.org Mon Aug 6 22:14:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:14:40 2007 Subject: [Frugalware-git] pacman-tools: syncpkgd: typo fixes Message-ID: <20070806201434.8A6F013A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=76f7075fd07f2313bb4b82aba969e80a218c69ac commit 76f7075fd07f2313bb4b82aba969e80a218c69ac Author: VMiklos Date: Mon Aug 6 22:14:29 2007 +0200 syncpkgd: typo fixes diff --git a/syncpkgd/syncpkgd.py b/syncpkgd/syncpkgd.py index 3a542aa..3c72d7d 100644 --- a/syncpkgd/syncpkgd.py +++ b/syncpkgd/syncpkgd.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import sys, getopt, os, pwd, sha, time, base64, re, pickle sys.path.append("/etc/syncpkgd") from SimpleXMLRPCServer import SimpleXMLRPCServer @@ -184,7 +186,7 @@ if __name__ == "__main__": elif opt in ("-h", "--help"): options.help = True elif opt in ("-l", "--logfile"): - options.log = arg + options.logfile = arg elif opt in ("-p", "--pidfile"): options.pidfile = arg elif opt in ("-s", "--statusfile"): From vmiklos at frugalware.org Mon Aug 6 22:18:21 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:18:26 2007 Subject: [Frugalware-git] pacman-tools: syncpkgd: handle EOFError for the status file Message-ID: <20070806201821.75B4913A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=d305690f10905364283807f86cba3c8a27c922d9 commit d305690f10905364283807f86cba3c8a27c922d9 Author: VMiklos Date: Mon Aug 6 22:17:58 2007 +0200 syncpkgd: handle EOFError for the status file diff --git a/syncpkgd/syncpkgd.py b/syncpkgd/syncpkgd.py index 3c72d7d..9be8cfd 100644 --- a/syncpkgd/syncpkgd.py +++ b/syncpkgd/syncpkgd.py @@ -18,6 +18,8 @@ class Actions: sock.close() except IOError: pass + except EOFError: + pass def __log(self, user, pkg, action): self.logsock.write("%s\n" % "; ".join([time.ctime(), user, pkg, action])) From vmiklos at frugalware.org Mon Aug 6 22:21:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:21:06 2007 Subject: [Frugalware-git] pacman-tools: rc.syncpkgd: typo fix Message-ID: <20070806202103.666F813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=9c670b2982d6a3ade010bf39c3ae988d6f392978 commit 9c670b2982d6a3ade010bf39c3ae988d6f392978 Author: VMiklos Date: Mon Aug 6 22:20:34 2007 +0200 rc.syncpkgd: typo fix diff --git a/syncpkgd/rc.syncpkgd b/syncpkgd/rc.syncpkgd index 53a3623..8210f55 100644 --- a/syncpkgd/rc.syncpkgd +++ b/syncpkgd/rc.syncpkgd @@ -32,7 +32,7 @@ rc_stop() stop_msg if [[ "$(eval $pid)" != "" ]] ; then kill -INT $(eval $pid) - : > /var/run/syncpkgd.pid + : > /var/lock/syncpkgd.pid ok $? else ok 999 From vmiklos at frugalware.org Mon Aug 6 22:51:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:51:15 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: add python header Message-ID: <20070806205113.6696D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=edf2f9b11d709870c9078a3b5e0b36679c20ad25 commit edf2f9b11d709870c9078a3b5e0b36679c20ad25 Author: VMiklos Date: Mon Aug 6 22:36:34 2007 +0200 syncpkgcd: add python header diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 25f297f..a59fd68 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import xmlrpclib, time, os, getopt, sys, socket, glob, base64 sys.path.append("/etc/syncpkgcd") from cconfig import config From vmiklos at frugalware.org Mon Aug 6 22:51:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 22:51:15 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: typo fixes Message-ID: <20070806205113.81B4913A404F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=91f26ab71153877344d21a25833ce7282670e21e commit 91f26ab71153877344d21a25833ce7282670e21e Author: VMiklos Date: Mon Aug 6 22:51:07 2007 +0200 syncpkgcd: typo fixes diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index a59fd68..3dda3fd 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import xmlrpclib, time, os, getopt, sys, socket, glob, base64 +import xmlrpclib, time, os, getopt, sys, socket, glob, base64, pwd sys.path.append("/etc/syncpkgcd") from cconfig import config @@ -169,7 +169,7 @@ if __name__ == "__main__": elif opt in ("-h", "--help"): options.help = True elif opt in ("-l", "--logfile"): - options.log = arg + options.logfile = arg elif opt in ("-p", "--pidfile"): options.pidfile = arg elif opt in ("-u", "--uid"): From vmiklos at frugalware.org Mon Aug 6 23:29:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 23:29:31 2007 Subject: [Frugalware-git] frugalware-current: libarchive-2.2.6-1-x86_64 Message-ID: <20070806212929.E022B13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1234ef24d6a04ac21152bc92749e730d5820cf33 commit 1234ef24d6a04ac21152bc92749e730d5820cf33 Author: VMiklos Date: Mon Aug 6 23:29:16 2007 +0200 libarchive-2.2.6-1-x86_64 version bump removed leftover device_nodes_fix.patch diff --git a/source/lib/libarchive/FrugalBuild b/source/lib/libarchive/FrugalBuild index c4f743e..1fd8ecc 100644 --- a/source/lib/libarchive/FrugalBuild +++ b/source/lib/libarchive/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libarchive -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="Library to create and read several different archive formats" groups=('lib' 'chroot-core') @@ -11,6 +11,5 @@ url="http://people.freebsd.org/~kientzle/libarchive/" depends=('bzip2' 'zlib') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) -sha1sums=('fd04f17397c7af6c8964bde02146eda391413bf4') - +sha1sums=('3e8b69479c1f9beaf01d3b1672573ac33a74b120') # optimization OK diff --git a/source/lib/libarchive/device_nodes_fix.patch b/source/lib/libarchive/device_nodes_fix.patch deleted file mode 100644 index 9ea77fc..0000000 --- a/source/lib/libarchive/device_nodes_fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur libarchive-2.1.10/libarchive/archive_entry.c libarchive-2.1.10-p/libarchive/archive_entry.c ---- libarchive-2.1.10/libarchive/archive_entry.c 2007-04-28 04:34:46.000000000 +0200 -+++ libarchive-2.1.10-p/libarchive/archive_entry.c 2007-05-03 17:24:57.000000000 +0200 -@@ -99,6 +99,18 @@ - #undef max - #define max(a, b) ((a)>(b)?(a):(b)) - -+static void -+dev_set_major(dev_t *d, dev_t m) -+{ -+ *d = makedev(m, minor(*d)); -+} -+ -+static void -+dev_set_minor(dev_t *d, dev_t m) -+{ -+ *d = makedev(major(*d), m); -+} -+ - /* - * Handle wide character (i.e., Unicode) and non-wide character - * strings transparently. -@@ -780,19 +792,13 @@ - void - archive_entry_set_devmajor(struct archive_entry *entry, dev_t m) - { -- dev_t d; -- -- d = entry->ae_stat.st_dev; -- entry->ae_stat.st_dev = makedev(major(m), minor(d)); -+ dev_set_major(&entry->ae_stat.st_dev, m); - } - - void - archive_entry_set_devminor(struct archive_entry *entry, dev_t m) - { -- dev_t d; -- -- d = entry->ae_stat.st_dev; -- entry->ae_stat.st_dev = makedev(major(d), minor(m)); -+ dev_set_minor(entry->ae_stat.st_dev, m); - } - - /* Set symlink if symlink is already set, else set hardlink. */ -@@ -858,19 +864,13 @@ - void - archive_entry_set_rdevmajor(struct archive_entry *entry, dev_t m) - { -- dev_t d; -- -- d = entry->ae_stat.st_rdev; -- entry->ae_stat.st_rdev = makedev(major(m), minor(d)); -+ dev_set_major(&entry->ae_stat.st_rdev, m); - } - - void - archive_entry_set_rdevminor(struct archive_entry *entry, dev_t m) - { -- dev_t d; -- -- d = entry->ae_stat.st_rdev; -- entry->ae_stat.st_rdev = makedev(major(d), minor(m)); -+ dev_set_minor(&entry->ae_stat.st_rdev, m); - } - - void From vmiklos at frugalware.org Mon Aug 6 23:58:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Aug 6 23:58:45 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: /home/vmiklos fixes Message-ID: <20070806215843.67C0513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=60b89ddda6e221efbc4178e3f1f88354dcf7c0d1 commit 60b89ddda6e221efbc4178e3f1f88354dcf7c0d1 Author: VMiklos Date: Mon Aug 6 23:58:37 2007 +0200 syncpkgcd: /home/vmiklos fixes diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 3dda3fd..8526b46 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -81,7 +81,7 @@ class Syncpkgcd: pkgver = "-".join(pkgarr[-3:-1]) arch = pkgarr[-1] self.log(pkg, "starting build") - sock = os.popen(". ~/.repoman.conf; echo $fst_root; echo $%s_servers" % tree) + sock = os.popen("export HOME=/home/syncpkgd; . ~/.repoman.conf; echo $fst_root; echo $%s_servers" % tree) buf = sock.readlines() sock.close() fst_root = buf[0].strip() @@ -126,7 +126,7 @@ class Syncpkgcd: self.system("sudo makepkg -t %s -C" % tree) if self.system("sudo makepkg -t %s -cu" % tree): self.log(pkg, "makepkg failed") - sock.open("%s.log" % pkg.split('/')[-1]) + sock = open("%s.log" % pkg.split('/')[-1]) server.report_result(config.server_user, config.server_pass, pkg, 1, base64.encodestring(sock.read())) sock.close() return @@ -140,7 +140,7 @@ class Syncpkgcd: def system(self, cmd): logfile = "syncpkgcd-%s.log" % time.strftime("%Y%m%d", time.localtime()) - return os.system("%s >> %s 2>&1" % (cmd, logfile)) + return os.system("export HOME=/home/syncpkgd; %s >> %s 2>&1" % (cmd, logfile)) def go(self, pkgname): for root, dirs, files in os.walk("."): From vmiklos at frugalware.org Tue Aug 7 00:34:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 00:34:24 2007 Subject: [Frugalware-git] frugalware-current: bluez-libs-3.13-1-i686 Message-ID: <20070806223422.045EC13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9c000623bce62caaf4b5560bdf9448920094f1ee commit 9c000623bce62caaf4b5560bdf9448920094f1ee Author: VMiklos Date: Tue Aug 7 00:33:52 2007 +0200 bluez-libs-3.13-1-i686 version bump diff --git a/source/lib/bluez-libs/FrugalBuild b/source/lib/bluez-libs/FrugalBuild index fbcb31d..129926c 100644 --- a/source/lib/bluez-libs/FrugalBuild +++ b/source/lib/bluez-libs/FrugalBuild @@ -2,15 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=bluez-libs -pkgver=3.12 +pkgver=3.13 pkgrel=1 pkgdesc="Library to use the BlueZ Linux Bluetooth stack" url="http://bluez.sourceforge.net/" depends=() 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'" +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=('cb2766e8e2251468dbe1b2c209d08322b44d2fb3') +sha1sums=('88eb695a18e7d2ed865c7a8a08fd615263cf0348') # optimization OK From vmiklos at frugalware.org Tue Aug 7 00:52:49 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 00:52:51 2007 Subject: [Frugalware-git] homepage-ng: FSA237-apache Message-ID: <20070806225249.8F1F213A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=6c6f1ae3fac8e772de4eb7cbe7be96a7dc324977 commit 6c6f1ae3fac8e772de4eb7cbe7be96a7dc324977 Author: VMiklos Date: Tue Aug 7 00:52:41 2007 +0200 FSA237-apache diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index b4b4efd..ad42050 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,22 @@ + 237 + 2007-08-07 + vmiklos + apache + 2.2.4-1 + 2.2.4-2terminus1 + http://bugs.frugalware.org/task/2298 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-5752 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1863 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3304 + Some vulnerabilities have been acknowledged in Apache, which can be exploited by malicious, local users to cause a DoS (Denial of Service) and by malicious people to conduct cross-site scripting attacks. + 1) An error in the mod_status module can be exploited by malicious people to conduct cross-site scripting attacks. + 2) An error in the Multi-Processing Module (MPM) can be exploited by malicious, local users to cause a DoS. + 3) An error in the mod_cache module in the handling of Cache-Control headers can be exploited to crash the child process via specially crafted requests. This could lead to a DoS if using a threaded Multi-Processing Module. + + 236 2007-08-03 vmiklos From vmiklos at frugalware.org Tue Aug 7 01:03:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 01:03:55 2007 Subject: [Frugalware-git] frugalware-current: joomla-1.0.13-1-i686 Message-ID: <20070806230353.1632A13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1706d8a40368342e9f7c9e41ee8ec4ffd8b976af commit 1706d8a40368342e9f7c9e41ee8ec4ffd8b976af Author: VMiklos Date: Tue Aug 7 01:03:44 2007 +0200 joomla-1.0.13-1-i686 version bump closes #2290 diff --git a/source/network-extra/joomla/7832.diff b/source/network-extra/joomla/7832.diff deleted file mode 100644 index 2e49f31..0000000 --- a/source/network-extra/joomla/7832.diff +++ /dev/null @@ -1,132 +0,0 @@ -Index: 1.0/administrator/includes/admin.php -=================================================================== ---- 1.0/administrator/includes/admin.php (revision 7831) -+++ 1.0/administrator/includes/admin.php (revision 7832) -@@ -323,7 +323,7 @@ - $wrongSettingsTexts[] = 'PHP register_globals setting is `ON` instead of `OFF`'; - } - if ( RG_EMULATION != 0 ) { -- $wrongSettingsTexts[] = 'Joomla! RG_EMULATION setting is `ON` instead of `OFF` in file globals.php
`ON` by default for compatibility reasons'; -+ $wrongSettingsTexts[] = 'Joomla! "Register Globals Emulation" setting is `ON`.   To disable Register Globals Emulation, navigate to Site -> Global Configuration -> Server, select `OFF`, and save.
Register Globals Emulation is `ON` by default for backward compatibility.'; - } - - if ( count($wrongSettingsTexts) ) { -Index: 1.0/administrator/index.php -=================================================================== ---- 1.0/administrator/index.php (revision 7831) -+++ 1.0/administrator/index.php (revision 7832) -@@ -95,8 +95,7 @@ - session_start(); - - // construct Session ID -- $logintime = time(); -- $session_id = md5( $my->id . $my->username . $my->usertype . $logintime ); -+ $session_id = session_id(); - - // add Session ID entry to DB - $query = "INSERT INTO #__session" -Index: 1.0/includes/joomla.php -=================================================================== ---- 1.0/includes/joomla.php (revision 7831) -+++ 1.0/includes/joomla.php (revision 7832) -@@ -764,11 +764,11 @@ - $my->gid = intval( mosGetParam( $_SESSION, 'session_gid', '' ) ); - $my->params = mosGetParam( $_SESSION, 'session_user_params', '' ); - -- $session_id = mosGetParam( $_SESSION, 'session_id', '' ); -+ $old_session_id = mosGetParam( $_SESSION, 'session_id', '' ); - $logintime = mosGetParam( $_SESSION, 'session_logintime', '' ); - - // check to see if session id corresponds with correct format -- if ( $session_id == md5( $my->id . $my->username . $my->usertype . $logintime ) ) { -+ if (strlen($old_session_id) == 32) { - // if task action is to `save` or `apply` complete action before doing session checks. - if ($task != 'save' && $task != 'apply') { - // test for session_life_admin -@@ -789,11 +789,24 @@ - $this->_db->setQuery( $query ); - $this->_db->query(); - -+ // destroy the old session -+ $oldSession = $_SESSION; -+ session_destroy(); -+ -+ // create a clean session -+ session_start(); -+ session_regenerate_id(); -+ -+ // restore the old session state with a new id -+ $_SESSION = $oldSession; -+ $_SESSION['session_id'] = session_id(); -+ - // update session timestamp - $current_time = time(); - $query = "UPDATE #__session" - . "\n SET time = " . $this->_db->Quote( $current_time ) -- . "\n WHERE session_id = " . $this->_db->Quote( $session_id ) -+ . "\n , session_id = " . $this->_db->Quote( session_id() ) -+ . "\n WHERE session_id = " . $this->_db->Quote( $old_session_id ) - ; - $this->_db->setQuery( $query ); - $this->_db->query(); -@@ -804,7 +817,7 @@ - // check against db record of session - $query = "SELECT COUNT( session_id )" - . "\n FROM #__session" -- . "\n WHERE session_id = " . $this->_db->Quote( $session_id ) -+ . "\n WHERE session_id = " . $this->_db->Quote( session_id() ) - . "\n AND username = ". $this->_db->Quote( $my->username ) - . "\n AND userid = ". intval( $my->id ) - ; -@@ -860,7 +873,7 @@ - $_SESSION['task'] = $task; - } - } -- } else if ($session_id == '') { -+ } else if ($old_session_id == '') { - // no session_id as user has not attempted to login, or session.auto_start is switched on - if (ini_get( 'session.auto_start' ) || !ini_get( 'session.use_cookies' )) { - echo "\n"; -@@ -2478,6 +2491,9 @@ - return false; - } - -+ $ignoreList = array('description'); -+ $this->filter($ignoreList); -+ - // check for existing name - $query = "SELECT id" - . "\n FROM #__categories " -@@ -2544,6 +2560,10 @@ - $this->_error = "Your Section must have a name."; - return false; - } -+ -+ $ignoreList = array('description'); -+ $this->filter($ignoreList); -+ - // check for existing name - $query = "SELECT id" - . "\n FROM #__sections " -@@ -2742,6 +2762,10 @@ - function check() { - $this->id = (int) $this->id; - $this->params = (string) trim( $this->params . ' ' ); -+ -+ $ignoreList = array( 'link' ); -+ $this->filter( $ignoreList ); -+ - return true; - } - } -@@ -3152,6 +3176,10 @@ - $msg = $iFilter->process( $msg ); - } - -+ // Strip out any line breaks and throw away the rest -+ $url = preg_split("/[\r\n]/", $url); -+ $url = $url[0]; -+ - if ($iFilter->badAttributeValue( array( 'href', $url ))) { - $url = $GLOBALS['mosConfig_live_site']; - } diff --git a/source/network-extra/joomla/FrugalBuild b/source/network-extra/joomla/FrugalBuild index dc47572..f0b5fd6 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.12 -pkgrel=2 +pkgver=1.0.13 +pkgrel=1 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,15 +11,13 @@ 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://ftp.frugalware.org/pub/other/sources/joomla/Joomla_"$pkgver"-Stable-Full_Package.tar.gz joomlasetup README.Frugalware \ -7832.diff) -sha1sums=('3719d9b3b8ea9d32d4ad1b2ab34a2b21698718d9' \ +source=(http://joomlacode.org/gf/download/frsrelease/4508/13216/Joomla_$pkgver-Stable-Full_Package.tar.gz \ + joomlasetup README.Frugalware) +sha1sums=('91934fe13e65ccb679ba50db1962449c306211df' \ '436fa260a2750e2394eb23f1504757bdb8045af1' \ - 'c079d041113ca5302340955027a5e313bee47f4a' \ - 'f10b9f0c2b6e6bfe36574cfd6851ed300ea438e9') + 'c079d041113ca5302340955027a5e313bee47f4a') build() { - patch -p1 < 7832.diff || Fdie sed -i "s/#__/jos_/g" installation/sql/joomla.sql || Fdie sed -i "s/#__/jos_/g" installation/sql/sample_data.sql || Fdie Fmkdir /var/www/joomla From krics at linuxforum.hu Tue Aug 7 08:28:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 08:28:24 2007 Subject: [Frugalware-git] gfpm: Removed po/Changelog (empty file) Message-ID: <20070807062822.7DB7413A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=b21e67245922bb1069b201966f92614358619cff commit b21e67245922bb1069b201966f92614358619cff Author: Christian Hamar alias krix Date: Tue Aug 7 08:25:49 2007 +0200 Removed po/Changelog (empty file) diff --git a/po/ChangeLog b/po/ChangeLog deleted file mode 100644 index e69de29..0000000 From krics at linuxforum.hu Tue Aug 7 08:45:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 08:45:52 2007 Subject: [Frugalware-git] gfpm: * Bring autogen.sh from gnetconfig (PO dir fix) Message-ID: <20070807064550.8F0CD13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=60b55d5af19ce9755a6b3b600a0c066b6e16a78b commit 60b55d5af19ce9755a6b3b600a0c066b6e16a78b Author: Christian Hamar alias krix Date: Tue Aug 7 08:44:30 2007 +0200 * Bring autogen.sh from gnetconfig (PO dir fix) * Fixed POTFILES.in (data/glade* instead of glade/*) * autoclean.sh fixed some stuff to delete in po dir diff --git a/intltool-extract.in b/intltool-extract.in deleted file mode 100644 index b81e9b4..0000000 --- a/intltool-extract.in +++ /dev/null @@ -1,861 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Extractor -# -# Copyright (C) 2000-2001, 2003 Free Software Foundation. -# -# Intltool 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. -# -# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Darin Adler -# - -## Release information -my $PROGRAM = "intltool-extract"; -my $PACKAGE = "intltool"; -my $VERSION = "0.35.5"; - -## Loaded modules -use strict; -use File::Basename; -use Getopt::Long; - -## Scalars used by the option stuff -my $TYPE_ARG = "0"; -my $LOCAL_ARG = "0"; -my $HELP_ARG = "0"; -my $VERSION_ARG = "0"; -my $UPDATE_ARG = "0"; -my $QUIET_ARG = "0"; -my $SRCDIR_ARG = "."; - -my $FILE; -my $OUTFILE; - -my $gettext_type = ""; -my $input; -my %messages = (); -my %loc = (); -my %count = (); -my %comments = (); -my $strcount = 0; - -my $XMLCOMMENT = ""; - -## Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -## Always print first -$| = 1; - -## Handle options -GetOptions ( - "type=s" => \$TYPE_ARG, - "local|l" => \$LOCAL_ARG, - "help|h" => \$HELP_ARG, - "version|v" => \$VERSION_ARG, - "update" => \$UPDATE_ARG, - "quiet|q" => \$QUIET_ARG, - "srcdir=s" => \$SRCDIR_ARG, - ) or &error; - -&split_on_argument; - - -## Check for options. -## This section will check for the different options. - -sub split_on_argument { - - if ($VERSION_ARG) { - &version; - - } elsif ($HELP_ARG) { - &help; - - } elsif ($LOCAL_ARG) { - &place_local; - &extract; - - } elsif ($UPDATE_ARG) { - &place_normal; - &extract; - - } elsif (@ARGV > 0) { - &place_normal; - &message; - &extract; - - } else { - &help; - - } -} - -sub place_normal { - $FILE = $ARGV[0]; - $OUTFILE = "$FILE.h"; - - my $dirname = dirname ($OUTFILE); - if (! -d "$dirname" && $dirname ne "") { - system ("mkdir -p $dirname"); - } -} - -sub place_local { - $FILE = $ARGV[0]; - $OUTFILE = fileparse($FILE, ()); - if (!-e "tmp/") { - system("mkdir tmp/"); - } - $OUTFILE = "./tmp/$OUTFILE.h" -} - -sub determine_type { - if ($TYPE_ARG =~ /^gettext\/(.*)/) { - $gettext_type=$1 - } -} - -## Sub for printing release information -sub version{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Copyright (C) 2000, 2003 Free Software Foundation, Inc. -Written by Kenneth Christiansen, 2000. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -## Sub for printing usage information -sub help { - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... [FILENAME] -Generates a header file from an XML source file. - -It grabs all strings between <_translatable_node> and its end tag in -XML files. Read manpage (man ${PROGRAM}) for more info. - - --type=TYPE Specify the file type of FILENAME. Currently supports: - "gettext/glade", "gettext/ini", "gettext/keys" - "gettext/rfc822deb", "gettext/schemas", - "gettext/scheme", "gettext/xml", "gettext/quoted" - -l, --local Writes output into current working directory - (conflicts with --update) - --update Writes output into the same directory the source file - reside (conflicts with --local) - --srcdir Root of the source tree - -v, --version Output version information and exit - -h, --help Display this help and exit - -q, --quiet Quiet mode - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -## Sub for printing error messages -sub error{ - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - -sub message { - print "Generating C format header file for translation.\n" unless $QUIET_ARG; -} - -sub extract { - &determine_type; - - &convert; - - open OUT, ">$OUTFILE"; - binmode (OUT) if $^O eq 'MSWin32'; - &msg_write; - close OUT; - - print "Wrote $OUTFILE\n" unless $QUIET_ARG; -} - -sub convert { - - ## Reading the file - { - local (*IN); - local $/; #slurp mode - open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!"; - $input = ; - } - - &type_ini if $gettext_type eq "ini"; - &type_keys if $gettext_type eq "keys"; - &type_xml if $gettext_type eq "xml"; - &type_glade if $gettext_type eq "glade"; - &type_scheme if $gettext_type eq "scheme"; - &type_schemas if $gettext_type eq "schemas"; - &type_rfc822deb if $gettext_type eq "rfc822deb"; - &type_quoted if $gettext_type eq "quoted"; -} - -sub entity_decode_minimal -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - - return $_; -} - -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - s/<//g; - - return $_; -} - -sub escape_char -{ - return '\"' if $_ eq '"'; - return '\n' if $_ eq "\n"; - return '\\\\' if $_ eq '\\'; - - return $_; -} - -sub escape -{ - my ($string) = @_; - return join "", map &escape_char, split //, $string; -} - -sub type_ini { - ### For generic translatable desktop files ### - while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) { - if (defined($2)) { - $comments{$3} = $2; - } - $messages{$3} = []; - } -} - -sub type_keys { - ### For generic translatable mime/keys files ### - while ($input =~ /^\s*_\w+=(.*)$/mg) { - $messages{$1} = []; - } -} - -sub type_xml { - ### For generic translatable XML files ### - my $tree = readXml($input); - parseTree(0, $tree); -} - -sub print_var { - my $var = shift; - my $vartype = ref $var; - - if ($vartype =~ /ARRAY/) { - my @arr = @{$var}; - print "[ "; - foreach my $el (@arr) { - print_var($el); - print ", "; - } - print "] "; - } elsif ($vartype =~ /HASH/) { - my %hash = %{$var}; - print "{ "; - foreach my $key (keys %hash) { - print "$key => "; - print_var($hash{$key}); - print ", "; - } - print "} "; - } else { - print $var; - } -} - -# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ## differences comment) -sub getAttributeString -{ - my $sub = shift; - my $do_translate = shift || 1; - my $language = shift || ""; - my $translate = shift; - my $result = ""; - foreach my $e (reverse(sort(keys %{ $sub }))) { - my $key = $e; - my $string = $sub->{$e}; - my $quote = '"'; - - $string =~ s/^[\s]+//; - $string =~ s/[\s]+$//; - - if ($string =~ /^'.*'$/) - { - $quote = "'"; - } - $string =~ s/^['"]//g; - $string =~ s/['"]$//g; - - ## differences from intltool-merge.in.in - if ($key =~ /^_/) { - $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT; - $messages{entity_decode($string)} = []; - $$translate = 2; - } - ## differences end here from intltool-merge.in.in - $result .= " $key=$quote$string$quote"; - } - return $result; -} - -# Verbatim copy from intltool-merge.in.in -sub getXMLstring -{ - my $ref = shift; - my $spacepreserve = shift || 0; - my @list = @{ $ref }; - my $result = ""; - - my $count = scalar(@list); - my $attrs = $list[0]; - my $index = 1; - - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - - while ($index < $count) { - my $type = $list[$index]; - my $content = $list[$index+1]; - if (! $type ) { - # We've got CDATA - if ($content) { - # lets strip the whitespace here, and *ONLY* here - $content =~ s/\s+/ /gs if (!$spacepreserve); - $result .= $content; - } - } elsif ( "$type" ne "1" ) { - # We've got another element - $result .= "<$type"; - $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements - if ($content) { - my $subresult = getXMLstring($content, $spacepreserve); - if ($subresult) { - $result .= ">".$subresult . ""; - } else { - $result .= "/>"; - } - } else { - $result .= "/>"; - } - } - $index += 2; - } - return $result; -} - -# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed -# Translate list of nodes if necessary -sub translate_subnodes -{ - my $fh = shift; - my $content = shift; - my $language = shift || ""; - my $singlelang = shift || 0; - my $spacepreserve = shift || 0; - - my @nodes = @{ $content }; - - my $count = scalar(@nodes); - my $index = 0; - while ($index < $count) { - my $type = $nodes[$index]; - my $rest = $nodes[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } -} - -# Based on traverse() in intltool-merge.in.in -sub traverse -{ - my $fh = shift; # unused, to allow us to sync code between -merge and -extract - my $nodename = shift; - my $content = shift; - my $language = shift || ""; - my $spacepreserve = shift || 0; - - if ($nodename && "$nodename" eq "1") { - $XMLCOMMENT = $content; - } elsif ($nodename) { - # element - my @all = @{ $content }; - my $attrs = shift @all; - my $translate = 0; - my $outattr = getAttributeString($attrs, 1, $language, \$translate); - - if ($nodename =~ /^_/) { - $translate = 1; - $nodename =~ s/^_//; - } - my $lookup = ''; - - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - if ($translate) { - $lookup = getXMLstring($content, $spacepreserve); - if (!$spacepreserve) { - $lookup =~ s/^\s+//s; - $lookup =~ s/\s+$//s; - } - - if ($lookup && $translate != 2) { - $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT; - $messages{$lookup} = []; - } elsif ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } - } else { - $XMLCOMMENT = ""; - my $count = scalar(@all); - if ($count > 0) { - my $index = 0; - while ($index < $count) { - my $type = $all[$index]; - my $rest = $all[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } - } - } - $XMLCOMMENT = ""; - } -} - - -# Verbatim copy from intltool-merge.in.in, $fh for compatibility -sub parseTree -{ - my $fh = shift; - my $ref = shift; - my $language = shift || ""; - - my $name = shift @{ $ref }; - my $cont = shift @{ $ref }; - - while (!$name || "$name" eq "1") { - $name = shift @{ $ref }; - $cont = shift @{ $ref }; - } - - my $spacepreserve = 0; - my $attrs = @{$cont}[0]; - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - traverse($fh, $name, $cont, $language, $spacepreserve); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_comment -{ - my $expat = shift; - my $data = $expat->original_string(); - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $data =~ s/^$//s; - push @$clist, 1 => $data; -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_cdatastart -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 0 => $expat->original_string(); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_cdataend -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $clist->[$pos] .= $expat->original_string(); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_char -{ - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - # Use original_string so that we retain escaped entities - # in CDATA sections. - # - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_start -{ - my $expat = shift; - my $tag = shift; - my @origlist = (); - - # Use original_string so that we retain escaped entities - # in attribute values. We must convert the string to an - # @origlist array to conform to the structure of the Tree - # Style. - # - my @original_array = split /\x/, $expat->original_string(); - my $source = $expat->original_string(); - - # Remove leading tag. - # - $source =~ s|^\s*<\s*(\S+)||s; - - # Grab attribute key/value pairs and push onto @origlist array. - # - while ($source) - { - if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; - push @origlist, $1; - push @origlist, '"' . $2 . '"'; - } - elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; - push @origlist, $1; - push @origlist, "'" . $2 . "'"; - } - else - { - last; - } - } - - my $ol = [ { @origlist } ]; - - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $ol; - $expat->{Curlist} = $ol; -} - -# Copied from intltool-merge.in.in and added comment handler. -sub readXml -{ - my $xmldoc = shift || return; - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - my $xp = new XML::Parser(Style => 'Tree'); - $xp->setHandlers(Char => \&intltool_tree_char); - $xp->setHandlers(Start => \&intltool_tree_start); - $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); - $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); - - ## differences from intltool-merge.in.in - $xp->setHandlers(Comment => \&intltool_tree_comment); - ## differences end here from intltool-merge.in.in - - my $tree = $xp->parse($xmldoc); - #print_var($tree); - -# Hello thereHowdydo -# would be: -# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, -# [{}, 0, "Howdy", ref, [{}]], 0, "do" ] ] - - return $tree; -} - -sub type_schemas { - ### For schemas XML files ### - - # FIXME: We should handle escaped < (less than) - while ($input =~ / - \s* - (\s*(?:\s*)?(.*?)\s*<\/default>\s*)? - (\s*(?:\s*)?(.*?)\s*<\/short>\s*)? - (\s*(?:\s*)?(.*?)\s*<\/long>\s*)? - <\/locale> - /sgx) { - my @totranslate = ($3,$6,$9); - my @eachcomment = ($2,$5,$8); - foreach (@totranslate) { - my $currentcomment = shift @eachcomment; - next if !$_; - s/\s+/ /g; - $messages{entity_decode_minimal($_)} = []; - $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment)); - } - } -} - -sub type_rfc822deb { - ### For rfc822-style Debian configuration files ### - - my $lineno = 1; - my $type = ''; - while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg) - { - my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5); - while ($pre =~ m/\n/g) - { - $lineno ++; - } - $lineno += length($newline); - my @str_list = rfc822deb_split(length($underscore), $text); - for my $str (@str_list) - { - $strcount++; - $messages{$str} = []; - $loc{$str} = $lineno; - $count{$str} = $strcount; - my $usercomment = ''; - while($pre =~ s/(^|\n)#([^\n]*)$//s) - { - $usercomment = "\n" . $2 . $usercomment; - } - $comments{$str} = $tag . $usercomment; - } - $lineno += ($text =~ s/\n//g); - } -} - -sub rfc822deb_split { - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - # When first argument is 2, the string is a comma separated list of - # values. - my $type = shift; - my $text = shift; - $text =~ s/^[ \t]//mg; - return (split(/, */, $text, 0)) if $type ne 1; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - for my $line (split (/\n/, $text)) - { - chomp $line; - if ($line =~ /^\.\s*$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $line =~ s/\s+$//; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /\n$/; - $str .= $line; - } - } - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - return @list; -} - -sub type_quoted { - while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { - my $message = $1; - my $before = $`; - $message =~ s/\\\"/\"/g; - $before =~ s/[^\n]//g; - $messages{$message} = []; - $loc{$message} = length ($before) + 2; - } -} - -sub type_glade { - ### For translatable Glade XML files ### - - my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message"; - - while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) { - # Glade sometimes uses tags that normally mark translatable things for - # little bits of non-translatable content. We work around this by not - # translating strings that only includes something like label4 or window1. - $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/; - } - - while ($input =~ /(..[^<]*)<\/items>/sg) { - for my $item (split (/\n/, $1)) { - $messages{entity_decode($item)} = []; - } - } - - ## handle new glade files - while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) { - $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/; - if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) { - $comments{entity_decode($3)} = entity_decode($2) ; - } - } - while ($input =~ /]*)"\s+description="([^>]+)"\/>/sg) { - $messages{entity_decode_minimal($2)} = []; - } -} - -sub type_scheme { - my ($line, $i, $state, $str, $trcomment, $char); - for $line (split(/\n/, $input)) { - $i = 0; - $state = 0; # 0 - nothing, 1 - string, 2 - translatable string - while ($i < length($line)) { - if (substr($line,$i,1) eq "\"") { - if ($state == 2) { - $comments{$str} = $trcomment if ($trcomment); - $messages{$str} = []; - $str = ''; - $state = 0; $trcomment = ""; - } elsif ($state == 1) { - $str = ''; - $state = 0; $trcomment = ""; - } else { - $state = 1; - $str = ''; - if ($i>0 && substr($line,$i-1,1) eq '_') { - $state = 2; - } - } - } elsif (!$state) { - if (substr($line,$i,1) eq ";") { - $trcomment = substr($line,$i+1); - $trcomment =~ s/^;*\s*//; - $i = length($line); - } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) { - $trcomment = ""; - } - } else { - if (substr($line,$i,1) eq "\\") { - $char = substr($line,$i+1,1); - if ($char ne "\"" && $char ne "\\") { - $str = $str . "\\"; - } - $i++; - } - $str = $str . substr($line,$i,1); - } - $i++; - } - } -} - -sub msg_write { - my @msgids; - if (%count) - { - @msgids = sort { $count{$a} <=> $count{$b} } keys %count; - } - else - { - @msgids = sort keys %messages; - } - for my $message (@msgids) - { - my $offsetlines = 1; - $offsetlines++ if $message =~ /%/; - if (defined ($comments{$message})) - { - while ($comments{$message} =~ m/\n/g) - { - $offsetlines++; - } - } - print OUT "# ".($loc{$message} - $offsetlines). " \"$FILE\"\n" - if defined $loc{$message}; - print OUT "/* ".$comments{$message}." */\n" - if defined $comments{$message}; - print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; - - my @lines = split (/\n/, $message, -1); - for (my $n = 0; $n < @lines; $n++) - { - if ($n == 0) - { - print OUT "char *s = N_(\""; - } - else - { - print OUT " \""; - } - - print OUT escape($lines[$n]); - - if ($n < @lines - 1) - { - print OUT "\\n\"\n"; - } - else - { - print OUT "\");\n"; - } - } - } -} - diff --git a/intltool-merge.in b/intltool-merge.in deleted file mode 100644 index 3015d44..0000000 --- a/intltool-merge.in +++ /dev/null @@ -1,1403 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Merger -# -# Copyright (C) 2000, 2003 Free Software Foundation. -# Copyright (C) 2000, 2001 Eazel, Inc -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Maciej Stachowiak -# Kenneth Christiansen -# Darin Adler -# -# Proper XML UTF-8'ification written by Cyrille Chepelov -# - -## Release information -my $PROGRAM = "intltool-merge"; -my $PACKAGE = "intltool"; -my $VERSION = "0.35.5"; - -## Loaded modules -use strict; -use Getopt::Long; -use Text::Wrap; -use File::Basename; - -my $must_end_tag = -1; -my $last_depth = -1; -my $translation_depth = -1; -my @tag_stack = (); -my @entered_tag = (); -my @translation_strings = (); -my $leading_space = ""; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $BA_STYLE_ARG = 0; -my $XML_STYLE_ARG = 0; -my $KEYS_STYLE_ARG = 0; -my $DESKTOP_STYLE_ARG = 0; -my $SCHEMAS_STYLE_ARG = 0; -my $RFC822DEB_STYLE_ARG = 0; -my $QUOTED_STYLE_ARG = 0; -my $QUIET_ARG = 0; -my $PASS_THROUGH_ARG = 0; -my $UTF8_ARG = 0; -my $MULTIPLE_OUTPUT = 0; -my $cache_file; - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "quiet|q" => \$QUIET_ARG, - "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility - "ba-style|b" => \$BA_STYLE_ARG, - "xml-style|x" => \$XML_STYLE_ARG, - "keys-style|k" => \$KEYS_STYLE_ARG, - "desktop-style|d" => \$DESKTOP_STYLE_ARG, - "schemas-style|s" => \$SCHEMAS_STYLE_ARG, - "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, - "quoted-style" => \$QUOTED_STYLE_ARG, - "pass-through|p" => \$PASS_THROUGH_ARG, - "utf8|u" => \$UTF8_ARG, - "multiple-output|m" => \$MULTIPLE_OUTPUT, - "cache|c=s" => \$cache_file - ) or &error; - -my $PO_DIR; -my $FILE; -my $OUTFILE; - -my %po_files_by_lang = (); -my %translations = (); -my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -# Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -# XML quoted string contents -my $q = "[^\\\"]*"; - -## Check for options. - -if ($VERSION_ARG) -{ - &print_version; -} -elsif ($HELP_ARG) -{ - &print_help; -} -elsif ($BA_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &ba_merge_translations; - &finalize; -} -elsif ($XML_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &xml_merge_output; - &finalize; -} -elsif ($KEYS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &keys_merge_translations; - &finalize; -} -elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &desktop_merge_translations; - &finalize; -} -elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &schemas_merge_translations; - &finalize; -} -elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &rfc822deb_merge_translations; - &finalize; -} -elsif ($QUOTED_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - "ed_merge_translations; - &finalize; -} -else -{ - &print_help; -} - -exit; - -## Sub for printing release information -sub print_version -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) ${VERSION} -Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -Copyright (C) 2000-2001 Eazel, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -## Sub for printing usage information -sub print_help -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE -Generates an output file that includes some localized attributes from an -untranslated source file. - -Mandatory options: (exactly one must be specified) - -b, --ba-style includes translations in the bonobo-activation style - -d, --desktop-style includes translations in the desktop style - -k, --keys-style includes translations in the keys style - -s, --schemas-style includes translations in the schemas style - -r, --rfc822deb-style includes translations in the RFC822 style - --quoted-style includes translations in the quoted string style - -x, --xml-style includes translations in the standard xml style - -Other options: - -u, --utf8 convert all strings to UTF-8 before merging - (default for everything except RFC822 style) - -p, --pass-through deprecated, does nothing and issues a warning - -m, --multiple-output output one localized file per locale, instead of - a single file containing all localized elements - -c, --cache=FILE specify cache file name - (usually \$top_builddir/po/.intltool-merge-cache) - -q, --quiet suppress most messages - --help display this help and exit - --version output version information and exit - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - - -## Sub for printing error messages -sub print_error -{ - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - - -sub print_message -{ - print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG; -} - - -sub preparation -{ - $PO_DIR = $ARGV[0]; - $FILE = $ARGV[1]; - $OUTFILE = $ARGV[2]; - - &gather_po_files; - &get_translation_database; -} - -# General-purpose code for looking up translations in .po files - -sub po_file2lang -{ - my ($tmp) = @_; - $tmp =~ s/^.*\/(.*)\.po$/$1/; - return $tmp; -} - -sub gather_po_files -{ - for my $po_file (glob "$PO_DIR/*.po") { - $po_files_by_lang{po_file2lang($po_file)} = $po_file; - } -} - -sub get_local_charset -{ - my ($encoding) = @_; - my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias"; - - # seek character encoding aliases in charset.alias (glib) - - if (open CHARSET_ALIAS, $alias_file) - { - while () - { - next if /^\#/; - return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) - } - - close CHARSET_ALIAS; - } - - # if not found, return input string - - return $encoding; -} - -sub get_po_encoding -{ - my ($in_po_file) = @_; - my $encoding = ""; - - open IN_PO_FILE, $in_po_file or die; - while () - { - ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" - if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) - { - $encoding = $1; - last; - } - } - close IN_PO_FILE; - - if (!$encoding) - { - print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG; - $encoding = "ISO-8859-1"; - } - - system ("$iconv -f $encoding -t UTF-8 <$devnull 2>$devnull"); - if ($?) { - $encoding = get_local_charset($encoding); - } - - return $encoding -} - -sub utf8_sanity_check -{ - print STDERR "Warning: option --pass-through has been removed.\n" if $PASS_THROUGH_ARG; - $UTF8_ARG = 1; -} - -sub get_translation_database -{ - if ($cache_file) { - &get_cached_translation_database; - } else { - &create_translation_database; - } -} - -sub get_newest_po_age -{ - my $newest_age; - - foreach my $file (values %po_files_by_lang) - { - my $file_age = -M $file; - $newest_age = $file_age if !$newest_age || $file_age < $newest_age; - } - - $newest_age = 0 if !$newest_age; - - return $newest_age; -} - -sub create_cache -{ - print "Generating and caching the translation database\n" unless $QUIET_ARG; - - &create_translation_database; - - open CACHE, ">$cache_file" || die; - print CACHE join "\x01", %translations; - close CACHE; -} - -sub load_cache -{ - print "Found cached translation database\n" unless $QUIET_ARG; - - my $contents; - open CACHE, "<$cache_file" || die; - { - local $/; - $contents = ; - } - close CACHE; - %translations = split "\x01", $contents; -} - -sub get_cached_translation_database -{ - my $cache_file_age = -M $cache_file; - if (defined $cache_file_age) - { - if ($cache_file_age <= &get_newest_po_age) - { - &load_cache; - return; - } - print "Found too-old cached translation database\n" unless $QUIET_ARG; - } - - &create_cache; -} - -sub create_translation_database -{ - for my $lang (keys %po_files_by_lang) - { - my $po_file = $po_files_by_lang{$lang}; - - if ($UTF8_ARG) - { - my $encoding = get_po_encoding ($po_file); - - if (lc $encoding eq "utf-8") - { - open PO_FILE, "<$po_file"; - } - else - { - print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;; - - open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; - } - } - else - { - open PO_FILE, "<$po_file"; - } - - my $nextfuzzy = 0; - my $inmsgid = 0; - my $inmsgstr = 0; - my $msgid = ""; - my $msgstr = ""; - - while () - { - $nextfuzzy = 1 if /^#, fuzzy/; - - if (/^msgid "((\\.|[^\\]+)*)"/ ) - { - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - $msgid = ""; - $msgstr = ""; - - if ($nextfuzzy) { - $inmsgid = 0; - } else { - $msgid = unescape_po_string($1); - $inmsgid = 1; - } - $inmsgstr = 0; - $nextfuzzy = 0; - } - - if (/^msgstr "((\\.|[^\\]+)*)"/) - { - $msgstr = unescape_po_string($1); - $inmsgstr = 1; - $inmsgid = 0; - } - - if (/^"((\\.|[^\\]+)*)"/) - { - $msgid .= unescape_po_string($1) if $inmsgid; - $msgstr .= unescape_po_string($1) if $inmsgstr; - } - } - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - } -} - -sub finalize -{ -} - -sub unescape_one_sequence -{ - my ($sequence) = @_; - - return "\\" if $sequence eq "\\\\"; - return "\"" if $sequence eq "\\\""; - return "\n" if $sequence eq "\\n"; - return "\r" if $sequence eq "\\r"; - return "\t" if $sequence eq "\\t"; - return "\b" if $sequence eq "\\b"; - return "\f" if $sequence eq "\\f"; - return "\a" if $sequence eq "\\a"; - return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7) - - return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/); - return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/); - - # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug #48489 - - return $sequence; -} - -sub unescape_po_string -{ - my ($string) = @_; - - $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg; - - return $string; -} - -## NOTE: deal with < - < but not > - > because it seems its ok to have -## > in the entity. For further info please look at #84738. -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - s/</; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; - # Binmode so that selftest works ok if using a native Win32 Perl... - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) - { - print OUTPUT $1; - - my $node = $2 . "\n"; - - my @strings = (); - $_ = $node; - while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) { - push @strings, entity_decode($3); - } - print OUTPUT; - - my %langs; - for my $string (@strings) - { - for my $lang (keys %po_files_by_lang) - { - $langs{$lang} = 1 if $translations{$lang, $string}; - } - } - - for my $lang (sort keys %langs) - { - $_ = $node; - s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; - s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; - print OUTPUT; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - - -## XML (non-bonobo-activation) merge code - - -# Process tag attributes -# Only parameter is a HASH containing attributes -> values mapping -sub getAttributeString -{ - my $sub = shift; - my $do_translate = shift || 0; - my $language = shift || ""; - my $result = ""; - my $translate = shift; - foreach my $e (reverse(sort(keys %{ $sub }))) { - my $key = $e; - my $string = $sub->{$e}; - my $quote = '"'; - - $string =~ s/^[\s]+//; - $string =~ s/[\s]+$//; - - if ($string =~ /^'.*'$/) - { - $quote = "'"; - } - $string =~ s/^['"]//g; - $string =~ s/['"]$//g; - - if ($do_translate && $key =~ /^_/) { - $key =~ s|^_||g; - if ($language) { - # Handle translation - my $decode_string = entity_decode($string); - my $translation = $translations{$language, $decode_string}; - if ($translation) { - $translation = entity_encode($translation); - $string = $translation; - } - $$translate = 2; - } else { - $$translate = 2 if ($translate && (!$$translate)); # watch not to "overwrite" $translate - } - } - - $result .= " $key=$quote$string$quote"; - } - return $result; -} - -# Returns a translatable string from XML node, it works on contents of every node in XML::Parser tree -sub getXMLstring -{ - my $ref = shift; - my $spacepreserve = shift || 0; - my @list = @{ $ref }; - my $result = ""; - - my $count = scalar(@list); - my $attrs = $list[0]; - my $index = 1; - - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - - while ($index < $count) { - my $type = $list[$index]; - my $content = $list[$index+1]; - if (! $type ) { - # We've got CDATA - if ($content) { - # lets strip the whitespace here, and *ONLY* here - $content =~ s/\s+/ /gs if (!$spacepreserve); - $result .= $content; - } - } elsif ( "$type" ne "1" ) { - # We've got another element - $result .= "<$type"; - $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements - if ($content) { - my $subresult = getXMLstring($content, $spacepreserve); - if ($subresult) { - $result .= ">".$subresult . ""; - } else { - $result .= "/>"; - } - } else { - $result .= "/>"; - } - } - $index += 2; - } - return $result; -} - -# Translate list of nodes if necessary -sub translate_subnodes -{ - my $fh = shift; - my $content = shift; - my $language = shift || ""; - my $singlelang = shift || 0; - my $spacepreserve = shift || 0; - - my @nodes = @{ $content }; - - my $count = scalar(@nodes); - my $index = 0; - while ($index < $count) { - my $type = $nodes[$index]; - my $rest = $nodes[$index+1]; - if ($singlelang) { - my $oldMO = $MULTIPLE_OUTPUT; - $MULTIPLE_OUTPUT = 1; - traverse($fh, $type, $rest, $language, $spacepreserve); - $MULTIPLE_OUTPUT = $oldMO; - } else { - traverse($fh, $type, $rest, $language, $spacepreserve); - } - $index += 2; - } -} - -sub isWellFormedXmlFragment -{ - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - - my $fragment = shift; - return 0 if (!$fragment); - - $fragment = "$fragment"; - my $xp = new XML::Parser(Style => 'Tree'); - my $tree = 0; - eval { $tree = $xp->parse($fragment); }; - return $tree; -} - -sub traverse -{ - my $fh = shift; - my $nodename = shift; - my $content = shift; - my $language = shift || ""; - my $spacepreserve = shift || 0; - - if (!$nodename) { - if ($content =~ /^[\s]*$/) { - $leading_space .= $content; - } - print $fh $content; - } else { - # element - my @all = @{ $content }; - my $attrs = shift @all; - my $translate = 0; - my $outattr = getAttributeString($attrs, 1, $language, \$translate); - - if ($nodename =~ /^_/) { - $translate = 1; - $nodename =~ s/^_//; - } - my $lookup = ''; - - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - print $fh "<$nodename", $outattr; - if ($translate) { - $lookup = getXMLstring($content, $spacepreserve); - if (!$spacepreserve) { - $lookup =~ s/^\s+//s; - $lookup =~ s/\s+$//s; - } - - if ($lookup || $translate == 2) { - my $translation = $translations{$language, $lookup} if isWellFormedXmlFragment($translations{$language, $lookup}); - if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) { - $translation = $lookup if (!$translation); - print $fh " xml:lang=\"", $language, "\"" if $language; - print $fh ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } else { - print $fh $translation; - } - print $fh ""; - - return; # this means there will be no same translation with xml:lang="$language"... - # if we want them both, just remove this "return" - } else { - print $fh ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } else { - print $fh $lookup; - } - print $fh ""; - } - } else { - print $fh "/>"; - } - - for my $lang (sort keys %po_files_by_lang) { - if ($MULTIPLE_OUTPUT && $lang ne "$language") { - next; - } - if ($lang) { - # Handle translation - # - my $translate = 0; - my $localattrs = getAttributeString($attrs, 1, $lang, \$translate); - my $translation = $translations{$lang, $lookup} if isWellFormedXmlFragment($translations{$lang, $lookup}); - if ($translate && !$translation) { - $translation = $lookup; - } - - if ($translation || $translate) { - print $fh "\n"; - $leading_space =~ s/.*\n//g; - print $fh $leading_space; - print $fh "<", $nodename, " xml:lang=\"", $lang, "\"", $localattrs, ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $lang, 1, $spacepreserve); - } else { - print $fh $translation; - } - print $fh ""; - } - } - } - - } else { - my $count = scalar(@all); - if ($count > 0) { - print $fh ">"; - my $index = 0; - while ($index < $count) { - my $type = $all[$index]; - my $rest = $all[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } - print $fh ""; - } else { - print $fh "/>"; - } - } - } -} - -sub intltool_tree_comment -{ - my $expat = shift; - my $data = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 1 => $data; -} - -sub intltool_tree_cdatastart -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 0 => $expat->original_string(); -} - -sub intltool_tree_cdataend -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $clist->[$pos] .= $expat->original_string(); -} - -sub intltool_tree_char -{ - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - # Use original_string so that we retain escaped entities - # in CDATA sections. - # - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -sub intltool_tree_start -{ - my $expat = shift; - my $tag = shift; - my @origlist = (); - - # Use original_string so that we retain escaped entities - # in attribute values. We must convert the string to an - # @origlist array to conform to the structure of the Tree - # Style. - # - my @original_array = split /\x/, $expat->original_string(); - my $source = $expat->original_string(); - - # Remove leading tag. - # - $source =~ s|^\s*<\s*(\S+)||s; - - # Grab attribute key/value pairs and push onto @origlist array. - # - while ($source) - { - if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; - push @origlist, $1; - push @origlist, '"' . $2 . '"'; - } - elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; - push @origlist, $1; - push @origlist, "'" . $2 . "'"; - } - else - { - last; - } - } - - my $ol = [ { @origlist } ]; - - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $ol; - $expat->{Curlist} = $ol; -} - -sub readXml -{ - my $filename = shift || return; - if(!-f $filename) { - die "ERROR Cannot find filename: $filename\n"; - } - - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - my $xp = new XML::Parser(Style => 'Tree'); - $xp->setHandlers(Char => \&intltool_tree_char); - $xp->setHandlers(Start => \&intltool_tree_start); - $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); - $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); - my $tree = $xp->parsefile($filename); - -# Hello thereHowdydo -# would be: -# [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, [{}, -# 0, "Howdy", ref, [{}]], 0, "do" ] ] - - return $tree; -} - -sub print_header -{ - my $infile = shift; - my $fh = shift; - my $source; - - if(!-f $infile) { - die "ERROR Cannot find filename: $infile\n"; - } - - print $fh qq{\n}; - { - local $/; - open DOCINPUT, "<${FILE}" or die; - $source = ; - close DOCINPUT; - } - if ($source =~ /()/s) - { - print $fh "$1\n"; - } - elsif ($source =~ /(]*>)/s) - { - print $fh "$1\n"; - } -} - -sub parseTree -{ - my $fh = shift; - my $ref = shift; - my $language = shift || ""; - - my $name = shift @{ $ref }; - my $cont = shift @{ $ref }; - - while (!$name || "$name" eq "1") { - $name = shift @{ $ref }; - $cont = shift @{ $ref }; - } - - my $spacepreserve = 0; - my $attrs = @{$cont}[0]; - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - traverse($fh, $name, $cont, $language, $spacepreserve); -} - -sub xml_merge_output -{ - my $source; - - if ($MULTIPLE_OUTPUT) { - for my $lang (sort keys %po_files_by_lang) { - if ( ! -d $lang ) { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree, $lang); - close OUTPUT; - print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; - } - } - open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED $OUTFILE\n" unless $QUIET_ARG; -} - -sub keys_merge_translations -{ - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/[$lang]$1=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; -} - -sub desktop_merge_translations -{ - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/${1}[$lang]=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; -} - -sub schemas_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - # FIXME: support attribute translations - - # Empty nodes never need translation, so unmark all of them. - # For example, <_foo/> is just replaced by . - $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; - - while ($source =~ s/ - (.*?) - (\s+)((\s*) - (\s*(?:\s*)?(.*?)\s*<\/default>)?(\s*) - (\s*(?:\s*)?(.*?)\s*<\/short>)?(\s*) - (\s*(?:\s*)?(.*?)\s*<\/long>)?(\s*) - <\/locale>) - //sx) - { - print OUTPUT $1; - - my $locale_start_spaces = $2 ? $2 : ''; - my $default_spaces = $4 ? $4 : ''; - my $short_spaces = $7 ? $7 : ''; - my $long_spaces = $10 ? $10 : ''; - my $locale_end_spaces = $13 ? $13 : ''; - my $c_default_block = $3 ? $3 : ''; - my $default_string = $6 ? $6 : ''; - my $short_string = $9 ? $9 : ''; - my $long_string = $12 ? $12 : ''; - - print OUTPUT "$locale_start_spaces$c_default_block"; - - $default_string =~ s/\s+/ /g; - $default_string = entity_decode($default_string); - $short_string =~ s/\s+/ /g; - $short_string = entity_decode($short_string); - $long_string =~ s/\s+/ /g; - $long_string = entity_decode($long_string); - - for my $lang (sort keys %po_files_by_lang) - { - my $default_translation = $translations{$lang, $default_string}; - my $short_translation = $translations{$lang, $short_string}; - my $long_translation = $translations{$lang, $long_string}; - - next if (!$default_translation && !$short_translation && - !$long_translation); - - print OUTPUT "\n$locale_start_spaces"; - - print OUTPUT "$default_spaces"; - - if ($default_translation) - { - $default_translation = entity_encode($default_translation); - print OUTPUT "$default_translation"; - } - - print OUTPUT "$short_spaces"; - - if ($short_translation) - { - $short_translation = entity_encode($short_translation); - print OUTPUT "$short_translation"; - } - - print OUTPUT "$long_spaces"; - - if ($long_translation) - { - $long_translation = entity_encode($long_translation); - print OUTPUT "$long_translation"; - } - - print OUTPUT "$locale_end_spaces"; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - -sub rfc822deb_merge_translations -{ - my %encodings = (); - for my $lang (keys %po_files_by_lang) { - $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' : get_po_encoding($po_files_by_lang{$lang})); - } - - my $source; - - $Text::Wrap::huge = 'overflow'; - $Text::Wrap::break = qr/\n|\s(?=\S)/; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg) - { - my $sep = $1; - my $non_translated_line = $3.$4; - my $string = $5; - my $underscore = length($2); - next if $underscore eq 0 && $non_translated_line =~ /^#/; - # Remove [] dummy strings - my $stripped = $string; - $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2; - $stripped =~ s/\[\s[^\[\]]*\]$//; - $non_translated_line .= $stripped; - - print OUTPUT $sep.$non_translated_line; - - if ($underscore) - { - my @str_list = rfc822deb_split($underscore, $string); - - for my $lang (sort keys %po_files_by_lang) - { - my $is_translated = 1; - my $str_translated = ''; - my $first = 1; - - for my $str (@str_list) - { - my $translation = $translations{$lang, $str}; - - if (!$translation) - { - $is_translated = 0; - last; - } - - # $translation may also contain [] dummy - # strings, mostly to indicate an empty string - $translation =~ s/\[\s[^\[\]]*\]$//; - - if ($first) - { - if ($underscore eq 2) - { - $str_translated .= $translation; - } - else - { - $str_translated .= - Text::Tabs::expand($translation) . - "\n"; - } - } - else - { - if ($underscore eq 2) - { - $str_translated .= ', ' . $translation; - } - else - { - $str_translated .= Text::Tabs::expand( - Text::Wrap::wrap(' ', ' ', $translation)) . - "\n .\n"; - } - } - $first = 0; - - # To fix some problems with Text::Wrap::wrap - $str_translated =~ s/(\n )+\n/\n .\n/g; - } - next unless $is_translated; - - $str_translated =~ s/\n \.\n$//; - $str_translated =~ s/\s+$//; - - $_ = $non_translated_line; - s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s; - print OUTPUT; - } - } - } - print OUTPUT "\n"; - - close OUTPUT; - close INPUT; -} - -sub rfc822deb_split -{ - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - # When first argument is 2, the string is a comma separated list of - # values. - my $type = shift; - my $text = shift; - $text =~ s/^[ \t]//mg; - return (split(/, */, $text, 0)) if $type ne 1; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - - for my $line (split (/\n/, $text)) - { - chomp $line; - if ($line =~ /^\.\s*$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $line =~ s/\s+$//; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /\n$/; - $str .= $line; - } - } - - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - - return @list; -} - -sub quoted_translation -{ - my ($lang, $string) = @_; - - $string =~ s/\\\"/\"/g; - - my $translation = $translations{$lang, $string}; - $translation = $string if !$translation; - - $translation =~ s/\"/\\\"/g; - return $translation -} - -sub quoted_merge_translations -{ - if (!$MULTIPLE_OUTPUT) { - print "Quoted only supports Multiple Output.\n"; - exit(1); - } - - for my $lang (sort keys %po_files_by_lang) { - if ( ! -d $lang ) { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - open INPUT, "<${FILE}" or die; - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - while () - { - s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; - print OUTPUT; - } - close OUTPUT; - close INPUT; - } -} diff --git a/intltool-update.in b/intltool-update.in deleted file mode 100644 index 6dbe75b..0000000 --- a/intltool-update.in +++ /dev/null @@ -1,1090 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Updater -# -# Copyright (C) 2000-2003 Free Software Foundation. -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Maciej Stachowiak -# Darin Adler - -## Release information -my $PROGRAM = "intltool-update"; -my $VERSION = "0.35.5"; -my $PACKAGE = "intltool"; - -## Loaded modules -use strict; -use Getopt::Long; -use Cwd; -use File::Copy; -use File::Find; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $DIST_ARG = 0; -my $POT_ARG = 0; -my $HEADERS_ARG = 0; -my $MAINTAIN_ARG = 0; -my $REPORT_ARG = 0; -my $VERBOSE = 0; -my $GETTEXT_PACKAGE = ""; -my $OUTPUT_FILE = ""; - -my @languages; -my %varhash = (); -my %po_files_by_lang = (); - -# Regular expressions to categorize file types. -# FIXME: Please check if the following is correct - -my $xml_support = -"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required) -"ui|". # Bonobo specific - User Interface desc. files -"lang|". # ? -"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required) -"scm(?:\\.in)*|". # ? (Note: .in is not required) -"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files -"etspec|". # ? -"server(?:\\.in)+|". # Bonobo specific -"sheet(?:\\.in)+|". # ? -"schemas(?:\\.in)+|". # GConf specific -"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. -"kbd(?:\\.in)+"; # GOK specific. - -my $ini_support = -"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"caves(?:\\.in)+|". # GNOME Games specific -"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"soundlist(?:\\.in)+|". # GNOME specific -"keys(?:\\.in)+|". # GNOME Mime database specific -"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"service(?:\\.in)+"; # DBus specific - -my $buildin_gettext_support = -"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; - -## Always flush buffer when printing -$| = 1; - -## Sometimes the source tree will be rooted somewhere else. -my $SRCDIR = $ENV{"srcdir"} || "."; -my $POTFILES_in; - -$POTFILES_in = "<$SRCDIR/POTFILES.in"; - -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "dist|d" => \$DIST_ARG, - "pot|p" => \$POT_ARG, - "headers|s" => \$HEADERS_ARG, - "maintain|m" => \$MAINTAIN_ARG, - "report|r" => \$REPORT_ARG, - "verbose|x" => \$VERBOSE, - "gettext-package|g=s" => \$GETTEXT_PACKAGE, - "output-file|o=s" => \$OUTPUT_FILE, - ) or &Console_WriteError_InvalidOption; - -&Console_Write_IntltoolHelp if $HELP_ARG; -&Console_Write_IntltoolVersion if $VERSION_ARG; - -my $arg_count = ($DIST_ARG > 0) - + ($POT_ARG > 0) - + ($HEADERS_ARG > 0) - + ($MAINTAIN_ARG > 0) - + ($REPORT_ARG > 0); - -&Console_Write_IntltoolHelp if $arg_count > 1; - -my $PKGNAME = FindPackageName (); - -# --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown"; - -if ($POT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; -} -elsif ($HEADERS_ARG) -{ - &GenerateHeaders; -} -elsif ($MAINTAIN_ARG) -{ - &FindLeftoutFiles; -} -elsif ($REPORT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; - &Console_Write_CoverageReport; -} -elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) -{ - my $lang = $ARGV[0]; - - ## Report error if the language file supplied - ## to the command line is non-existent - &Console_WriteError_NotExisting("$SRCDIR/$lang.po") - if ! -s "$SRCDIR/$lang.po"; - - if (!$DIST_ARG) - { - print "Working, please wait..." if $VERBOSE; - &GenerateHeaders; - &GeneratePOTemplate; - } - &POFile_Update ($lang, $OUTPUT_FILE); - &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE); -} -else -{ - &Console_Write_IntltoolHelp; -} - -exit; - -######### - -sub Console_Write_IntltoolVersion -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -sub Console_Write_IntltoolHelp -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... LANGCODE -Updates PO template files and merge them with the translations. - -Mode of operation (only one is allowed): - -p, --pot generate the PO template only - -s, --headers generate the header files in POTFILES.in - -m, --maintain search for left out files from POTFILES.in - -r, --report display a status report for the module - -d, --dist merge LANGCODE.po with existing PO template - -Extra options: - -g, --gettext-package=NAME override PO template name, useful with --pot - -o, --output-file=FILE write merged translation to FILE - -x, --verbose display lots of feedback - --help display this help and exit - --version output version information and exit - -Examples of use: -${PROGRAM} --pot just create a new PO template -${PROGRAM} xy create new PO template and merge xy.po with it - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -sub echo_n -{ - my $str = shift; - my $ret = `echo "$str"`; - - $ret =~ s/\n$//; # do we need the "s" flag? - - return $ret; -} - -sub POFile_DetermineType ($) -{ - my $type = $_; - my $gettext_type; - - my $xml_regex = "(?:" . $xml_support . ")"; - my $ini_regex = "(?:" . $ini_support . ")"; - my $buildin_regex = "(?:" . $buildin_gettext_support . ")"; - - if ($type =~ /\[type: gettext\/([^\]].*)]/) - { - $gettext_type=$1; - } - elsif ($type =~ /schemas(\.in)+$/) - { - $gettext_type="schemas"; - } - elsif ($type =~ /glade2?(\.in)*$/) - { - $gettext_type="glade"; - } - elsif ($type =~ /scm(\.in)*$/) - { - $gettext_type="scheme"; - } - elsif ($type =~ /keys(\.in)+$/) - { - $gettext_type="keys"; - } - - # bucket types - - elsif ($type =~ /$xml_regex$/) - { - $gettext_type="xml"; - } - elsif ($type =~ /$ini_regex$/) - { - $gettext_type="ini"; - } - elsif ($type =~ /$buildin_regex$/) - { - $gettext_type="buildin"; - } - else - { - $gettext_type="unknown"; - } - - return "gettext\/$gettext_type"; -} - -sub TextFile_DetermineEncoding ($) -{ - my $gettext_code="ASCII"; # All files are ASCII by default - my $filetype=`file $_ | cut -d ' ' -f 2`; - - if ($? eq "0") - { - if ($filetype =~ /^(ISO|UTF)/) - { - chomp ($gettext_code = $filetype); - } - elsif ($filetype =~ /^XML/) - { - $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 - } - } - - return $gettext_code; -} - -sub isNotValidMissing -{ - my ($file) = @_; - - return if $file =~ /^\{arch\}\/.*$/; - return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/; -} - -sub FindLeftoutFiles -{ - my (@buf_i18n_plain, - @buf_i18n_xml, - @buf_i18n_xml_unmarked, - @buf_i18n_ini, - @buf_potfiles, - @buf_potfiles_ignore, - @buf_allfiles, - @buf_allfiles_sorted, - @buf_potfiles_sorted, - @buf_potfiles_ignore_sorted - ); - - ## Search and find all translatable files - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, ".."; - - - open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; - @buf_potfiles = grep !/^(#|\s*$)/, ; - close POTFILES; - - foreach (@buf_potfiles) { - s/^\[.*]\s*//; - } - - print "Searching for missing translatable files...\n" if $VERBOSE; - - ## Check if we should ignore some found files, when - ## comparing with POTFILES.in - foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") - { - (-s "$SRCDIR/$ignore") or next; - - if ("$ignore" eq "POTFILES.ignore") - { - print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". - "content of this file to POTFILES.skip.\n"; - } - - print "Found $ignore: Ignoring files...\n" if $VERBOSE; - open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n"; - - while () - { - push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; - } - close FILE; - - @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore); - } - - foreach my $file (@buf_i18n_plain) - { - my $in_comment = 0; - my $in_macro = 0; - - open FILE, "<$file"; - while () - { - # Handle continued multi-line comment. - if ($in_comment) - { - next unless s-.*\*/--; - $in_comment = 0; - } - - # Handle continued macro. - if ($in_macro) - { - $in_macro = 0 unless /\\$/; - next; - } - - # Handle start of macro (or any preprocessor directive). - if (/^\s*\#/) - { - $in_macro = 1 if /^([^\\]|\\.)*\\$/; - next; - } - - # Handle comments and quoted text. - while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy - { - my $match = $1; - if ($match eq "/*") - { - if (!s-/\*.*?\*/--) - { - s-/\*.*--; - $in_comment = 1; - } - } - elsif ($match eq "//") - { - s-//.*--; - } - else # ' or " - { - if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) - { - warn "mismatched quotes at line $. in $file\n"; - s-$match.*--; - } - } - } - - if (/\w\.GetString *\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - - ## N_ Q_ and _ are the three macros defined in gi8n.h - if (/[NQ]?_ *\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml) - { - open FILE, "<$file"; - - while () - { - # FIXME: share the pattern matching code with intltool-extract - if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_ini) - { - open FILE, "<$file"; - while () - { - if (/_(.*)=/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml_unmarked) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - } - - - @buf_allfiles_sorted = sort (@buf_allfiles); - @buf_potfiles_sorted = sort (@buf_potfiles); - - my %in2; - foreach (@buf_potfiles_sorted) - { - $in2{$_} = 1; - } - - foreach (@buf_potfiles_ignore_sorted) - { - $in2{$_} = 1; - } - - my @result; - - foreach (@buf_allfiles_sorted) - { - if (!exists($in2{$_})) - { - push @result, $_ - } - } - - my @buf_potfiles_notexist; - - foreach (@buf_potfiles_sorted) - { - chomp (my $dummy = $_); - if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy")) - { - push @buf_potfiles_notexist, $_; - } - } - - ## Save file with information about the files missing - ## if any, and give information about this procedure. - if (@result + @buf_potfiles_notexist > 0) - { - if (@result) - { - print "\n" if $VERBOSE; - unlink "missing"; - open OUT, ">missing"; - print OUT @result; - close OUT; - warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". - "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; - print STDERR @result, "\n"; - warn "If some of these files are left out on purpose then please add them to\n". - "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". - "of left out files has been written in the current directory.\n"; - } - if (@buf_potfiles_notexist) - { - unlink "notexist"; - open OUT, ">notexist"; - print OUT @buf_potfiles_notexist; - close OUT; - warn "\n" if ($VERBOSE or @result); - warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; - warn @buf_potfiles_notexist, "\n"; - warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n". - "containing this list of absent files has been written in the current directory.\n"; - } - } - - ## If there is nothing to complain about, notify the user - else { - print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; - } -} - -sub Console_WriteError_InvalidOption -{ - ## Handle invalid arguments - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit 1; -} - -sub GenerateHeaders -{ - my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract"; - - ## Generate the .h header files, so we can allow glade and - ## xml translation support - if (! -x "$EXTRACT") - { - print STDERR "\n *** The intltool-extract script wasn't found!" - ."\n *** Without it, intltool-update can not generate files.\n"; - exit; - } - else - { - open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n"; - - while () - { - chomp; - next if /^\[\s*encoding/; - - ## Find xml files in POTFILES.in and generate the - ## files with help from the extract script - - my $gettext_type= &POFile_DetermineType ($1); - - if (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[[^\[].*]\s*//; - - my $filename = "../$_"; - - if ($VERBOSE) - { - system ($EXTRACT, "--update", "--srcdir=$SRCDIR", - "--type=$gettext_type", $filename); - } - else - { - system ($EXTRACT, "--update", "--type=$gettext_type", - "--srcdir=$SRCDIR", "--quiet", $filename); - } - } - } - close FILE; - } -} - -# -# Generate .pot file from POTFILES.in -# -sub GeneratePOTemplate -{ - my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; - my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; - chomp $XGETTEXT; - - if (! -x $XGETTEXT) - { - print STDERR " *** xgettext is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - print "Building $MODULE.pot...\n" if $VERBOSE; - - open INFILE, $POTFILES_in; - unlink "POTFILES.in.temp"; - open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing"); - - my $gettext_support_nonascii = 0; - - # checks for GNU gettext >= 0.12 - my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`; - if ($? == 0) - { - $gettext_support_nonascii = 1; - } - else - { - # urge everybody to upgrade gettext - print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". - " strings. That means you should install a version of gettext\n". - " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". - " or have to let non-ASCII strings untranslated. (If there is any)\n"; - } - - my $encoding = "ASCII"; - my $forced_gettext_code; - my @temp_headers; - my $encoding_problem_is_reported = 0; - - while () - { - next if (/^#/ or /^\s*$/); - - chomp; - - my $gettext_code; - - if (/^\[\s*encoding:\s*(.*)\s*\]/) - { - $forced_gettext_code=$1; - } - elsif (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[.*]\s*//; - print OUTFILE "../$_.h\n"; - push @temp_headers, "../$_.h"; - $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - else - { - print OUTFILE "$SRCDIR/../$_\n"; - $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - - next if (! $gettext_support_nonascii); - - if (defined $forced_gettext_code) - { - $encoding=$forced_gettext_code; - } - elsif (defined $gettext_code and "$encoding" ne "$gettext_code") - { - if ($encoding eq "ASCII") - { - $encoding=$gettext_code; - } - elsif ($gettext_code ne "ASCII") - { - # Only report once because the message is quite long - if (! $encoding_problem_is_reported) - { - print STDERR "WARNING: You should use the same file encoding for all your project files,\n". - " but $PROGRAM thinks that most of the source files are in\n". - " $encoding encoding, while \"$_\" is (likely) in\n". - " $gettext_code encoding. If you are sure that all translatable strings\n". - " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". - " line to POTFILES.in:\n\n". - " [encoding: UTF-8]\n\n". - " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". - "(such warning message will only be reported once.)\n"; - $encoding_problem_is_reported = 1; - } - } - } - } - - close OUTFILE; - close INFILE; - - unlink "$MODULE.pot"; - my @xgettext_argument=("$XGETTEXT", - "--add-comments", - "--directory\=\.", - "--output\=$MODULE\.pot", - "--files-from\=\.\/POTFILES\.in\.temp"); - my $XGETTEXT_KEYWORDS = &FindPOTKeywords; - push @xgettext_argument, $XGETTEXT_KEYWORDS; - my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; - push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; - push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); - push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; - my $xgettext_command = join ' ', @xgettext_argument; - - # intercept xgettext error message - print "Running $xgettext_command\n" if $VERBOSE; - my $xgettext_error_msg = `$xgettext_command 2>\&1`; - my $command_failed = $?; - - unlink "POTFILES.in.temp"; - - print "Removing generated header (.h) files..." if $VERBOSE; - unlink foreach (@temp_headers); - print "done.\n" if $VERBOSE; - - if (! $command_failed) - { - if (! -e "$MODULE.pot") - { - print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; - } - else - { - print "Wrote $MODULE.pot\n" if $VERBOSE; - } - } - else - { - if ($xgettext_error_msg =~ /--from-code/) - { - # replace non-ASCII error message with a more useful one. - print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". - " string marked for translation. Please make sure that all strings marked\n". - " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". - " following line to POTFILES.in and rerun $PROGRAM:\n\n". - " [encoding: UTF-8]\n\n"; - } - else - { - print STDERR "$xgettext_error_msg"; - if (-e "$MODULE.pot") - { - # is this possible? - print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". - " Please consult error message above if there is any.\n"; - } - else - { - print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". - " error message above if there is any.\n"; - } - } - exit (1); - } -} - -sub POFile_Update -{ - -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; - - my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; - my ($lang, $outfile) = @_; - - print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; - - my $infile = "$SRCDIR/$lang.po"; - $outfile = "$SRCDIR/$lang.po" if ($outfile eq ""); - - # I think msgmerge won't overwrite old file if merge is not successful - system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot"); -} - -sub Console_WriteError_NotExisting -{ - my ($file) = @_; - - ## Report error if supplied language file is non-existing - print STDERR "$PROGRAM: $file does not exist!\n"; - print STDERR "Try '$PROGRAM --help' for more information.\n"; - exit; -} - -sub GatherPOFiles -{ - my @po_files = glob ("./*.po"); - - @languages = map (&POFile_GetLanguage, @po_files); - - foreach my $lang (@languages) - { - $po_files_by_lang{$lang} = shift (@po_files); - } -} - -sub POFile_GetLanguage ($) -{ - s/^(.*\/)?(.+)\.po$/$2/; - return $_; -} - -sub Console_Write_TranslationStatus -{ - my ($lang, $output_file) = @_; - my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; - - $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); - - system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file); -} - -sub Console_Write_CoverageReport -{ - my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; - - &GatherPOFiles; - - foreach my $lang (@languages) - { - print "$lang: "; - &POFile_Update ($lang, ""); - } - - print "\n\n * Current translation support in $MODULE \n\n"; - - foreach my $lang (@languages) - { - print "$lang: "; - system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); - } -} - -sub SubstituteVariable -{ - my ($str) = @_; - - # always need to rewind file whenever it has been accessed - seek (CONF, 0, 0); - - # cache each variable. varhash is global to we can add - # variables elsewhere. - while () - { - if (/^(\w+)=(.*)$/) - { - ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/; - } - } - - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; - my $sub = ""; - # Ignore recursive definitions of variables - $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; - - return SubstituteVariable ("$untouched$sub$rest"); - } - - # We're using Perl backticks ` and "echo -n" here in order to - # expand any shell escapes (such as backticks themselves) in every variable - return echo_n ($str); -} - -sub CONF_Handle_Open -{ - my $base_dirname = getcwd(); - $base_dirname =~ s@.*/@@; - - my ($conf_in, $src_dir); - - if ($base_dirname =~ /^po(-.+)?$/) - { - if (-f "Makevars") - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_builddir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - if (-f "$src_dir" . "/configure.ac") { - $conf_in = "$src_dir" . "/configure.ac" . "\n"; - } else { - $conf_in = "$src_dir" . "/configure.in" . "\n"; - } - last; - } - } - close IN; - - $conf_in || die "Cannot find top_builddir in Makevars."; - } - elsif (-f "../configure.ac") - { - $conf_in = "../configure.ac"; - } - elsif (-f "../configure.in") - { - $conf_in = "../configure.in"; - } - else - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_srcdir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - $conf_in = "$src_dir" . "/configure.in" . "\n"; - - last; - } - } - close IN; - - $conf_in || die "Cannot find top_srcdir in Makefile."; - } - - open (CONF, "<$conf_in"); - } - else - { - print STDERR "$PROGRAM: Unable to proceed.\n" . - "Make sure to run this script inside the po directory.\n"; - exit; - } -} - -sub FindPackageName -{ - my $version; - my $domain = &FindMakevarsDomain; - my $name = $domain || "untitled"; - - &CONF_Handle_Open; - - my $conf_source; { - local (*IN); - open (IN, "<&CONF") || return $name; - seek (IN, 0, 0); - local $/; # slurp mode - $conf_source = ; - close IN; - } - - # priority for getting package name: - # 1. GETTEXT_PACKAGE - # 2. first argument of AC_INIT (with >= 2 arguments) - # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) - - # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m - # the \s makes this not work, why? - if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - # \s makes this not work, why? - $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; - - # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value - # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables. - $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g; - - $name = $domain if $domain; - - $name = SubstituteVariable ($name); - $name =~ s/^["'](.*)["']$/$1/; - - return $name if $name; -} - - -sub FindPOTKeywords -{ - - my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_"; - my $varname = "XGETTEXT_OPTIONS"; - my $make_source; { - local (*IN); - open (IN, "; - close IN; - } - - $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; - - return $keywords; -} - -sub FindMakevarsDomain -{ - - my $domain = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m; - $domain =~ s/^\s+//; - $domain =~ s/\s+$//; - - return $domain; -} - -sub FindMakevarsBugAddress -{ - - my $address = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m; - $address =~ s/^\s+//; - $address =~ s/\s+$//; - - return $address; -} From krics at linuxforum.hu Tue Aug 7 08:46:33 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 08:46:35 2007 Subject: [Frugalware-git] gfpm: Now really the autoofoo* patch Message-ID: <20070807064633.2AB5113A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=acd59a3f0d1130a7e0903e7c73d72752247733c2 commit acd59a3f0d1130a7e0903e7c73d72752247733c2 Author: Christian Hamar alias krix Date: Tue Aug 7 08:45:12 2007 +0200 Now really the autoofoo* patch * ^^ diff --git a/autoclean.sh b/autoclean.sh index 644b037..dd6decb 100644 --- a/autoclean.sh +++ b/autoclean.sh @@ -23,3 +23,5 @@ rm -rf data/icons/Makefile.in rm -rf data/icons/{32x32,128x128,48x48}/Makefile.in rm -rf po/stamp-it rm -rf intltool-{extract,merge,update} +rm -rf po/POTFILES +rm -rf po/Makefile{.in,.in.in} diff --git a/autogen.sh b/autogen.sh index 4840678..f99a8ac 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,63 @@ #!/bin/sh -e +gen_pot() +{ + cd po/ + mv Makevars Makevars.tmp + cp /usr/bin/intltool-extract ./ + intltool-update --pot --gettext-package=gfpm + rm intltool-extract + mv Makevars.tmp Makevars + cd - >/dev/null +} + +import_pootle() +{ + po_dir=~/git/translations/po + if [ -d $po_dir ]; then + : > po/LINGUAS + for i in $(/bin/ls $po_dir/gfpm) + do + [ -e $po_dir/gfpm/$i/gnetconfig.po ] || continue + cp $po_dir/gfpm/$i/gnetconfig.po po/$i.po + if msgfmt -c --statistics -o po/$i.gmo po/$i.po; then + echo $i >> po/LINGUAS + else + echo "WARNING: po/$i.po will break your build!" + fi + done + else + echo "WARNING: no po files will be used" + fi +} + +cd `dirname $0` + +if [ "$1" == "--pot-only" ]; then + gen_pot + exit 0 +fi + +if [ "$1" == "--dist" ]; then + ver=`grep AC_INIT configure.ac|sed 's/.*, \([0-9\.]*\), .*/\1/'` + git-archive --format=tar --prefix=gfpm-$ver/ HEAD | tar xf - + git log --no-merges |git name-rev --tags --stdin > gfpm-$ver/ChangeLog + cd gfpm-$ver + ./autogen.sh --git + cd .. + tar czf gfpm-$ver.tar.gz gfpm-$ver + rm -rf gfpm-$ver + gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ + -ba -u 20F55619 gfpm-$ver.tar.gz + #mv gfpm-$ver.tar.gz.asc ../.. + exit 0 +fi + cat /usr/share/aclocal/libtool.m4 >> aclocal.m4 + +intltoolize -c -f --automake +import_pootle +gen_pot libtoolize -f -c aclocal --force autoheader -f @@ -8,3 +65,8 @@ autoconf -f cp -f $(dirname $(which automake))/../share/automake/mkinstalldirs ./ cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./ automake -a -c --gnu --foreign + +if [ "$1" == "--git" ]; then + rm -rf autom4te.cache +fi + diff --git a/po/POTFILES.in b/po/POTFILES.in index e8bbfea..2c2567a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ src/gfpm.c src/gfpm-packagelist.c src/gfpm-messages.c -glade/gfpm.glade +data/gfpm.glade From krics at linuxforum.hu Tue Aug 7 08:48:08 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 08:48:09 2007 Subject: [Frugalware-git] gfpm: * Removed Makefile.in.in Message-ID: <20070807064808.02A9913A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c8e0723d05a66175e6402c7ff2b64bb2dbc73823 commit c8e0723d05a66175e6402c7ff2b64bb2dbc73823 Author: Christian Hamar alias krix Date: Tue Aug 7 08:46:49 2007 +0200 * Removed Makefile.in.in * Added Makevars diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index 6d2cd50..0000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,254 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. -# -# - Modified by Owen Taylor to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -libdir = @libdir@ -localedir = $(libdir)/locale -gnulocaledir = $(datadir)/locale -gettextsrcdir = $(datadir)/glib-2.0/gettext/po -subdir = po - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ - -CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -SOURCES = -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ -$(POFILES) $(GMOFILES) $(SOURCES) - -POTFILES = \ - -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ - -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat - -.c.o: - $(COMPILE) $< - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ - fi; \ - done - if test "$(PACKAGE)" = "glib"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - done - if test "$(PACKAGE)" = "glib"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - fi - -check: all - -dvi info tags TAGS ID: - -mostlyclean: - rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp - rm -fr *.o - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) - -distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) - dists="$(DISTFILES)"; \ - for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - echo "$$lang:"; \ - if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -o $$tmpdir/$$lang.new.po $$lang; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -# POTFILES is created from POTFILES.in by stripping comments, empty lines -# and Intltool tags (enclosed in square brackets), and appending a full -# relative path to them -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' \ - -e "s/^\[.*\] +//" \ - -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) - -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..8167502 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,43 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = gnetconfig + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = ../ + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = \ + --keyword=_ --flag=_:1:pass-c-format \ + --keyword=N_ --flag=N_:1:pass-c-format + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Yoyodyne, Inc. + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = From vmiklos at frugalware.org Tue Aug 7 10:07:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 10:07:14 2007 Subject: [Frugalware-git] homepage-ng: FSA238-clamav Message-ID: <20070807080712.87FA813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=fe41638b4d75a7e5d491f602aa8c181ae78a2fd6 commit fe41638b4d75a7e5d491f602aa8c181ae78a2fd6 Author: VMiklos Date: Tue Aug 7 10:07:07 2007 +0200 FSA238-clamav diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index ad42050..8d5fec4 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 238 + 2007-08-07 + vmiklos + clamav + 0.90.2-1terminus2 + 0.90.2-1terminus3 + http://bugs.frugalware.org/task/2257 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3725 + Metaeye SG has reported a vulnerability in ClamAV, which can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerability is caused due to a NULL-pointer dereference error within libclamav/unrar/unrarvm.c when handling RAR archives and can be exploited to cause a crash via a specially crafted RAR archive. + + 237 2007-08-07 vmiklos From vmiklos at frugalware.org Tue Aug 7 10:11:17 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 10:11:18 2007 Subject: [Frugalware-git] homepage-ng: FSA239-libvorbis Message-ID: <20070807081117.3B77313A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=d8d15f4201efa4e3d8412546be56f7a4a4360ed7 commit d8d15f4201efa4e3d8412546be56f7a4a4360ed7 Author: VMiklos Date: Tue Aug 7 10:11:10 2007 +0200 FSA239-libvorbis diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 8d5fec4..d06b133 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,21 @@ + 239 + 2007-08-07 + vmiklos + libvorbis + 1.1.2-1 + 1.2.0-1terminus1 + http://bugs.frugalware.org/task/2293 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4029 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3106 + David Thiel has reported some vulnerabilities in libvorbis, which can be exploited by malicious people to cause a DoS (Denial of Service) and potentially compromise an application using the library. + 1) A boundary error exists in the way the "_01inverse()" function in res.c processes "blocksize_0" and "blocksize_1" values, which can be exploited to cause a heap overwrite. + 2) A boundary error exists in the way the "vorbis_info_clear()" function in info.c processes invalid mapping types, which can be exploited to trigger a call to a value outside the dispatch table. + 3) Invalid "blocksize" values passed to the "vorbis_dsp_clear()" function in block.c result in an invalid memory access, which can be exploited to cause a DoS. + + 238 2007-08-07 vmiklos From vmiklos at frugalware.org Tue Aug 7 10:32:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 10:32:41 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: fixes for the darcs part Message-ID: <20070807083240.2ADAE13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=2b90374ccc08224c6a26fa8903fe646e838279ec commit 2b90374ccc08224c6a26fa8903fe646e838279ec Author: VMiklos Date: Tue Aug 7 10:32:21 2007 +0200 syncpkgcd: fixes for the darcs part diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 8526b46..6a5a128 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -118,11 +118,11 @@ class Syncpkgcd: self.system("git clean -x -d") elif scm == "darcs": junk = [] - junk.append(glob.glob("*.fpm")) - junk.append(glob.glob("*.log")) - junk.append(glob.glob("*.log.bz2")) + junk.extend(glob.glob("*.fpm")) + junk.extend(glob.glob("*.log")) + junk.extend(glob.glob("*.log.bz2")) for i in junk: - os.unlink(junk) + os.unlink(i) self.system("sudo makepkg -t %s -C" % tree) if self.system("sudo makepkg -t %s -cu" % tree): self.log(pkg, "makepkg failed") @@ -145,6 +145,8 @@ class Syncpkgcd: def go(self, pkgname): for root, dirs, files in os.walk("."): for dir in dirs: + if "_darcs" in root: + continue if dir == pkgname: os.chdir(os.path.join(root, dir)) return From vmiklos at frugalware.org Tue Aug 7 10:45:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 10:45:22 2007 Subject: [Frugalware-git] homepage-ng: FSA240-joomla Message-ID: <20070807084520.AEB4213A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=56aebae79e3ebb0f7ef8826a08e60748e05b024a commit 56aebae79e3ebb0f7ef8826a08e60748e05b024a Author: VMiklos Date: Tue Aug 7 10:45:14 2007 +0200 FSA240-joomla diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index d06b133..5501ca8 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,20 @@ + 240 + 2007-08-07 + vmiklos + joomla + 1.0.12-2terminus1 + 1.0.13-1terminus1 + http://bugs.frugalware.org/task/2290 + No CVE for this issue, see: http://www.joomla.org/content/view/3677/1/ + Some vulnerabilities have been reported in Joomla!, which can be exploited by malicious people to conduct session fixation attacks, cross-site scripting attacks or HTTP response splitting attacks. + 1) Certain unspecified input passed in com_search, com_content and mod_login is not properly sanitised before being returned to a user. This can be exploited to execute arbitrary HTML and script code in a user's browser session in context of an affected site. + 2) Input passed to the "url" parameter 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. + 3) An error exists in the handling of sessions and can be exploited to hijack another user's session by tricking the user into logging in after following a specially crafted link. + + 239 2007-08-07 vmiklos From vmiklos at frugalware.org Tue Aug 7 11:12:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 11:12:15 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: typo fix when getting a fresh new darcs repo Message-ID: <20070807091213.BDCDC13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=e7c20a0749545d495221a71ee26c9897abf69e42 commit e7c20a0749545d495221a71ee26c9897abf69e42 Author: VMiklos Date: Tue Aug 7 11:12:07 2007 +0200 syncpkgcd: typo fix when getting a fresh new darcs repo diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 6a5a128..487fa7c 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -107,7 +107,7 @@ class Syncpkgcd: if scm == "git": self.system("git clone %s %s" % (url, tree)) elif scm == "darcs": - self.system("darcs get --partial" % (url, tree)) + self.system("darcs get --partial %s %s" % (url, tree)) try: os.chdir(tree) except OSError: From krics at linuxforum.hu Tue Aug 7 11:25:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 11:25:34 2007 Subject: [Frugalware-git] gfpm: chmod +x for autogen.sh Message-ID: <20070807092531.9943113A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=b1cc192b6358572bf1e7135bfc3044e9eb9cfe62 commit b1cc192b6358572bf1e7135bfc3044e9eb9cfe62 Author: Christian Hamar alias krix Date: Tue Aug 7 11:24:11 2007 +0200 chmod +x for autogen.sh diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 From vmiklos at frugalware.org Tue Aug 7 11:28:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 11:28:47 2007 Subject: [Frugalware-git] frugalware-current: tools/genpkgdbs: add gfpm.pot Message-ID: <20070807092844.040BA13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cec24b83a51b3510ea357c3faab2059b6212793e commit cec24b83a51b3510ea357c3faab2059b6212793e Author: VMiklos Date: Tue Aug 7 11:27:34 2007 +0200 tools/genpkgdbs: add gfpm.pot diff --git a/tools/genpkgdbs b/tools/genpkgdbs index 8780fc2..b0eec34 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -61,6 +61,7 @@ make -C /home/ftp/pub/other/fwlive/po pot /home/ftp/pub/other/pacman-g2/pacman-g2/autogen.sh --gettext-only --pot-only make -C /home/ftp/pub/other/frugalwareutils/frugalwareutils pot sudo -u priyank /home/ftp/pub/other/fw-control-center/fw-control-center/gnetconfig/autogen.sh --pot-only +sudo -u priyank /home/ftp/pub/other/gfpm/gfpm/autogen.sh --pot-only # transfer them From vmiklos at frugalware.org Tue Aug 7 11:28:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 11:28:47 2007 Subject: [Frugalware-git] frugalware-current: pacman-tools-0.9.7-1-i686 Message-ID: <20070807092844.0DCC713A4050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d9f7cc39cc509b3e694cacd80154c2258be35e23 commit d9f7cc39cc509b3e694cacd80154c2258be35e23 Author: VMiklos Date: Tue Aug 7 11:28:35 2007 +0200 pacman-tools-0.9.7-1-i686 update backup() diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index edd3ccb..da596dd 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -10,7 +10,7 @@ depends=('bash' 'perl' 'pacman-g2>=3.5.1' 'wget' 'python' 'libxml2' 'glib2') makedepends=('help2man' 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') -backup=(etc/{genchangelog,repoman,syncpkgd}.conf) +backup=(etc/{genchangelog,repoman}.conf etc/syncpkg{cd/c,d/d}config.py) up2date="lynx -dump $url|Flasttar" source=($url/$pkgname-$pkgver.tar.gz) options=('scriptlet') From krics at linuxforum.hu Tue Aug 7 11:29:37 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 11:29:38 2007 Subject: [Frugalware-git] gfpm: * Extended POTFILES.in for all source files Message-ID: <20070807092937.187CA13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=57607680dc630accf58c8cef005d46f0941f2b17 commit 57607680dc630accf58c8cef005d46f0941f2b17 Author: Christian Hamar alias krix Date: Tue Aug 7 11:28:16 2007 +0200 * Extended POTFILES.in for all source files diff --git a/po/POTFILES.in b/po/POTFILES.in index 2c2567a..7413219 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,9 @@ +src/gfpm-about.c +src/gfpm-db.c +src/gfpm-interface.c +src/gfpm-progress.c +src/gfpm-systray.c +src/gfpm-util.c src/gfpm.c src/gfpm-packagelist.c src/gfpm-messages.c From vmiklos at frugalware.org Tue Aug 7 11:42:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 11:42:10 2007 Subject: [Frugalware-git] homepage-ng: FSA241-xpdf Message-ID: <20070807094209.4E11C13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=f7d8225faa00cce4e589c3b61e9084a04382e024 commit f7d8225faa00cce4e589c3b61e9084a04382e024 Author: VMiklos Date: Tue Aug 7 11:42:02 2007 +0200 FSA241-xpdf diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 5501ca8..11237e6 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 241 + 2007-08-07 + vmiklos + xpdf + 3.01-4 + 3.02-1terminus1 + http://bugs.frugalware.org/task/2299 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3387 + A vulnerability has been reported in Xpdf, which potentially can be exploited by malicious people to compromise a user's system. + The vulnerability is caused due to an integer overflow within "StreamPredictor::StreamPredictor()" in xpdf/Stream.cc and can be exploited to cause a buffer overflow by e.g. tricking a user into opening a specially crafted PDF file in Xpdf. + Successful exploitation may allow the execution of arbitrary code. + + 240 2007-08-07 vmiklos From vmiklos at frugalware.org Tue Aug 7 12:43:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 12:43:41 2007 Subject: [Frugalware-git] pacman-tools: pootle-update: added gfpm Message-ID: <20070807104340.2166C13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=e0aec0daf95594820673ee3c84ec17e78f004ab0 commit e0aec0daf95594820673ee3c84ec17e78f004ab0 Author: VMiklos Date: Tue Aug 7 12:43:35 2007 +0200 pootle-update: added gfpm diff --git a/pootle-update b/pootle-update index 7679a46..3cbbc87 100644 --- a/pootle-update +++ b/pootle-update @@ -24,6 +24,7 @@ rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/tim rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/xconfig/po/xconfig.pot frugalwareutils/templates/xconfig.pot rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/xwmconfig/po/xwmconfig.pot frugalwareutils/templates/xwmconfig.pot rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gnetconfig/po/gnetconfig.pot fwcontrolcenter/templates/gnetconfig.pot +rsync rsync://rsync.frugalware.org/pub/other/gfpm/gfpm/po/gfpm.pot gfpm/templates/gfpm.pot echo "done." for i in * From vmiklos at frugalware.org Tue Aug 7 13:08:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 13:08:24 2007 Subject: [Frugalware-git] frugalware-current: splashy-0.3.5-1-i686 Message-ID: <20070807110822.A6C3513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=443a1fb756b0617f7cffd146580413d0f1a266da commit 443a1fb756b0617f7cffd146580413d0f1a266da Author: VMiklos Date: Tue Aug 7 13:08:12 2007 +0200 splashy-0.3.5-1-i686 version bump updated makedepends() for spilt directfb diff --git a/source/base/splashy/FrugalBuild b/source/base/splashy/FrugalBuild index 3f7b0f5..39b3088 100644 --- a/source/base/splashy/FrugalBuild +++ b/source/base/splashy/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: VMiklos pkgname=splashy -pkgver=0.3.3 +pkgver=0.3.5 themever=0.6 # see http://alioth.debian.org/project/showfiles.php?group_id=30657 -rel_id=1981 +rel_id=2071 pkgrel=1 pkgdesc="A complete user-space boot splash system" url="http://alioth.debian.org/projects/splashy/" depends=('libgcc') replaces=('bootsplash') conflicts=('bootsplash') -makedepends=('directfb>=0.9.25.1-5' 'glib2' 'procps') +makedepends=('directfb-input-keyboard>=0.9.25.1-5' 'glib2' 'procps') backup=(etc/splashy/config.xml) groups=('base') archs=('i686' 'x86_64') @@ -39,7 +39,7 @@ build() Fexe /etc/rc.d/rc.zz-splash } -sha1sums=('0e580a72fc8834b3a6f5fd16b3135089a90de301' \ +sha1sums=('9a3a012a1d1d3a16db2765d8b15deaa3312f6732' \ 'dac9317fdf981dd1b55dfd3043a6e86f40a5ff9e' \ '4979a54122223dc7d4324f52e120ff9005a8c17b' \ '006d65bb621d1108cbb994fb50712bad4d61b6d0' \ From krics at linuxforum.hu Tue Aug 7 13:11:08 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 13:11:10 2007 Subject: [Frugalware-git] gfpm: Whitespace fixes O_o 51 patchset Message-ID: <20070807111108.B3A9813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=1a9f0bd287e8023b79d72c4a7f6bf830ccbadcc3 commit 1a9f0bd287e8023b79d72c4a7f6bf830ccbadcc3 Author: Christian Hamar alias krix Date: Tue Aug 7 13:09:44 2007 +0200 Whitespace fixes O_o 51 patchset * Whitespace fixes from crazy patch URL was: http://crazy.dev.frugalware.org/some_more_cleanups.patch diff --git a/src/gfpm-about.c b/src/gfpm-about.c index ee3260c..a3fd8f0 100644 --- a/src/gfpm-about.c +++ b/src/gfpm-about.c @@ -19,14 +19,14 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include #include "gfpm.h" #include "gfpm-about.h" -static gchar *license = +static gchar *license = ("This program is free software; you can redistribute it and/or " "modify it under the terms of the GNU General Public Licence as " "published by the Free Software Foundation; either version 2 of the " diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index a9cf51a..13a988f 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -26,7 +26,7 @@ #include #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include "gfpm.h" @@ -94,7 +94,7 @@ gfpm_interface_init (void) gtk_widget_show (gfpm_splash); while (gtk_events_pending()) gtk_main_iteration (); - + sleep (2); gfpm_groups_tvw = glade_xml_get_widget (xml, "grouptreeview"); gfpm_pkgs_tvw = glade_xml_get_widget (xml, "pkgstreeview"); @@ -208,10 +208,10 @@ gfpm_interface_init (void) /* search */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "search_entry1")), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL); - + /* about */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "about_gfpm1")), "activate", G_CALLBACK(gfpm_about), NULL); - + /* aply */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_apply")), "clicked", G_CALLBACK(cb_gfpm_apply_btn_clicked), NULL); @@ -220,7 +220,7 @@ gfpm_interface_init (void) /* clear cache dialog */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "rem_apply")), "clicked", G_CALLBACK(cb_gfpm_clear_cache_apply_clicked), NULL); - + /* install from file */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "inst_from_file_install")), "clicked", G_CALLBACK(cb_gfpm_install_file_clicked), NULL); @@ -255,16 +255,16 @@ static void cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) { GString *errorstr = g_string_new (""); - + if (!gfpm_package_list_is_empty(GFPM_INSTALL_LIST) && !gfpm_package_list_is_empty(GFPM_REMOVE_LIST)) - { + { gfpm_message (_("No changes to apply.")); return; } if (gfpm_apply_dlg_show() != GTK_RESPONSE_OK) - { + { if (gfpm_question(_("Are you sure you want to cancel this operation ? \nNote: All changes made till now will be reverted."))==GTK_RESPONSE_YES) - { + { /* revert all changes */ gfpm_package_list_free (GFPM_INSTALL_LIST); gfpm_package_list_free (GFPM_REMOVE_LIST); @@ -293,7 +293,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_error (errorstr->str); return; } - + gfpm_progress_show (TRUE, 0); GList *i = NULL; PM_LIST *data, *pkgs; @@ -306,10 +306,10 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) g_print ("failed to prepare transaction (%s)\n", pacman_strerror(pm_errno)); pkgs = pacman_trans_getinfo (PM_TRANS_PACKAGES); if (pkgs == NULL) g_print ("pkgs is null.. bad bad bad!\n"); - + /* commit transaction */ if (pacman_trans_commit(&data) == -1) - { + { char *str = g_strdup_printf ("Failed to commit transaction (%s)", pacman_strerror(pm_errno)); errorstr = g_string_append (errorstr, str); gfpm_error (errorstr->str); @@ -343,7 +343,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_error (errorstr->str); return; } - + gfpm_progress_show (TRUE, 0); GList *i = NULL; PM_LIST *data, *pkgs; @@ -356,10 +356,10 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) g_print ("failed to prepare transaction (%s)\n", pacman_strerror(pm_errno)); pkgs = pacman_trans_getinfo (PM_TRANS_PACKAGES); if (pkgs == NULL) g_print ("pkgs is null.. bad bad bad!\n"); - + /* commit transaction */ if (pacman_trans_commit(&data) == -1) - { + { char *str = g_strdup_printf ("Failed to commit transaction (%s)", pacman_strerror(pm_errno)); errorstr = g_string_append (errorstr, str); gfpm_error (errorstr->str); @@ -520,7 +520,7 @@ gfpm_load_pkgs_tvw (const char *group_name) char *v1 = (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION); char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); if (v1!=NULL && v2!=NULL) - { + { gint ret = pacman_pkg_vercmp (v1, v2); if (!ret) up = FALSE; @@ -576,7 +576,7 @@ gfpm_load_info_tvw (const char *pkg_name) if (!strcmp(repo,"local")) pm_pkg = pacman_db_readpkg (local_db, (char*)pkg_name); else - { + { pm_pkg = pacman_db_readpkg (sync_db, (char*)pkg_name); r = 1; } @@ -604,14 +604,14 @@ gfpm_load_info_tvw (const char *pkg_name) 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_NAME), -1); g_free (st); - gtk_list_store_append (GTK_LIST_STORE(model), &iter); + gtk_list_store_append (GTK_LIST_STORE(model), &iter); st = (char*)gfpm_bold (_("Version:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION), -1); g_free (st); - gtk_list_store_append (GTK_LIST_STORE(model), &iter); + gtk_list_store_append (GTK_LIST_STORE(model), &iter); st = (char*)gfpm_bold (_("Description:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, @@ -656,7 +656,7 @@ gfpm_load_info_tvw (const char *pkg_name) -1); g_free (st); g_string_free (str, TRUE); - + /* populate groups */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_GROUPS); str = g_string_new (""); @@ -693,7 +693,7 @@ gfpm_load_info_tvw (const char *pkg_name) g_free (st); } g_string_free (str, TRUE); - + /* populate conflicts */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_CONFLICTS); str = g_string_new (""); @@ -801,7 +801,7 @@ gfpm_load_info_tvw (const char *pkg_name) g_free (st); } g_string_free (str, TRUE); - + st = (char*)gfpm_bold (_("Reason:")); gtk_list_store_append (GTK_LIST_STORE(model), &iter); switch ((long)pacman_pkg_getinfo (pm_lpkg, PM_PKG_REASON)) @@ -819,7 +819,7 @@ gfpm_load_info_tvw (const char *pkg_name) default: break; } g_free (st); - + } return; @@ -839,7 +839,7 @@ gfpm_load_files_txtvw (const char *pkg_name, gboolean inst) if (inst == TRUE) { pkg = pacman_db_readpkg (local_db, (char*)pkg_name); - gtk_text_buffer_insert (buffer, &iter, _("Files in package:\n"), -1); + gtk_text_buffer_insert (buffer, &iter, _("Files in package:\n"), -1); for (i = pacman_pkg_getinfo(pkg, PM_PKG_FILES); i; i = pacman_list_next(i)) { gtk_text_buffer_insert (buffer, &iter, " /", -1); @@ -865,7 +865,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) gint ret; PM_PKG *pm_lpkg, *pm_spkg; PM_LIST *packages; - static gchar *updatestr = + static gchar *updatestr = ("Gfpm has detected a newer version of the pacman-g2 package. " "It is recommended that you allow gfpm to upgrade pacman-g2 first. " "Do you want to continue upgrading pacman-g2 ?"); @@ -881,13 +881,13 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) (char*)pacman_pkg_getinfo(pm_spkg, PM_PKG_VERSION))) { if (gfpm_question (updatestr) == GTK_RESPONSE_YES) - { + { gfpm_package_list_add (GFPM_INSTALL_LIST, "pacman-g2"); cb_gfpm_apply_btn_clicked (NULL, NULL); goto cleanup; } } - + if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) { gchar *str; @@ -901,10 +901,10 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) return; } if (pacman_trans_sysupgrade()==-1) - { + { g_print ("error %s", pacman_strerror(pm_errno)); } - packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); + packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); if (gfpm_plist_question(_("Following packages will be upgraded. Do you want to continue ?"), gfpm_pmlist_to_glist(packages)) == GTK_RESPONSE_YES) { /* @@ -1052,7 +1052,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) PM_PKG *pm_spkg; PM_PKG *pm_lpkg; gboolean up = FALSE; - + while (gtk_events_pending()) gtk_main_iteration (); for (i=l;i;i=pacman_list_next(i)) @@ -1099,7 +1099,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) pm_pkg = pacman_db_readpkg (sync_db, pacman_list_getdata(i)); pm_lpkg = pacman_db_readpkg (local_db, pacman_list_getdata(i)); if (pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION)!=NULL) - { + { inst = TRUE; char *v1 = (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION); char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); @@ -1249,7 +1249,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) fpm = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(gfpm_inst_filechooser)); if (fpm == NULL) - { + { gfpm_error (_("No package selected for install. Please select a package to install.")); return; } @@ -1278,7 +1278,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) /* add the target */ pacman_trans_addtarget ((char*)fpm); if (pacman_trans_prepare(&trans_data) == -1) - { + { PM_LIST *i; GList *pkgs = NULL; @@ -1290,7 +1290,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) case PM_ERR_UNSATISFIED_DEPS: for (i=pacman_list_first(trans_data);i;i=pacman_list_next(i)) { - GString *depstring = g_string_new (""); + GString *depstring = g_string_new (""); PM_DEPMISS *m = pacman_list_getdata (i); depstring = g_string_append (depstring, (char*)pacman_dep_getinfo(m,PM_DEP_NAME)); switch ((long)pacman_dep_getinfo(m, PM_DEP_MOD)) @@ -1319,7 +1319,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) case PM_ERR_CONFLICTING_DEPS: for (i=pacman_list_first(trans_data);i;i=pacman_list_next(i)) { - GString *depstring = g_string_new (""); + GString *depstring = g_string_new (""); PM_DEPMISS *m = pacman_list_getdata (i); depstring = g_string_append (depstring, (char*)pacman_dep_getinfo(m, PM_DEP_NAME)); pkgs = g_list_append (pkgs, (char*)depstring->str); @@ -1333,7 +1333,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) goto cleanup; } if (pacman_trans_commit(&trans_data) == -1) - { + { str = g_strdup_printf (_("Failed to commit transaction (%s)\n"), pacman_strerror (pm_errno)); gfpm_error (str); g_free (str); diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 9d3e09a..851b991 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -48,7 +48,7 @@ gfpm_messages_init (void) GtkListStore *store = NULL; GtkWidget *button = NULL; - /* lookup necessary widgets */ + /* lookup necessary widgets */ gfpm_apply_dlg = glade_xml_get_widget (xml, "apply_dlg"); gfpm_apply_inst_tvw = glade_xml_get_widget (xml, "insttvw"); gfpm_apply_inst_box = glade_xml_get_widget (xml, "instbox"); @@ -76,7 +76,7 @@ gfpm_messages_init (void) gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_apply_rem_tvw), -1, _("Package"), ren, "text", 0, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_apply_rem_tvw), -1, _("Size"), ren, "text", 1, NULL); gtk_tree_view_set_model (GTK_TREE_VIEW(gfpm_apply_rem_tvw), GTK_TREE_MODEL(store)); - + } static void @@ -86,7 +86,7 @@ gfpm_apply_dlg_populate (void) gboolean rem = FALSE; if (gfpm_package_list_is_empty(GFPM_INSTALL_LIST)) - { + { gfpm_apply_dlg_show_inst_box (TRUE); inst = TRUE; } @@ -99,7 +99,7 @@ gfpm_apply_dlg_populate (void) } else gfpm_apply_dlg_show_rem_box (FALSE); - + /* populate package lists */ if (inst) { @@ -108,7 +108,7 @@ gfpm_apply_dlg_populate (void) GtkTreeIter iter; float totalisize = 0; gchar *totaltext = NULL; - + store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gfpm_apply_inst_tvw))); for (i=(GList*)install_list;i;i=g_list_next(i)) { @@ -122,7 +122,7 @@ gfpm_apply_dlg_populate (void) totalisize += s; } asprintf (&size, "%0.2f MB", s); - gtk_list_store_append (store, &iter); + gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, (char*)i->data, 1, size, -1); pacman_pkg_free (pkg); if (size) g_free (size); @@ -152,10 +152,11 @@ gfpm_apply_dlg_populate (void) totalrsize += s; } asprintf (&size, "%0.2f MB", s); - gtk_list_store_append (store, &iter); + gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, (char*)i->data, 1, size, -1); pacman_pkg_free (pkg); - if (size) g_free (size); + if (size) + g_free (size); } totaltext = g_strdup_printf (_("Total package size: %0.2f MB"), totalrsize); gtk_label_set_text (GTK_LABEL(gfpm_apply_rem_sizelbl), totaltext); @@ -175,13 +176,13 @@ gfpm_apply_dlg_reset (void) gtk_widget_hide (gfpm_apply_dlg); return; -} +} gint gfpm_apply_dlg_show (void) { gint res; - + gfpm_apply_dlg_populate (); res = gtk_dialog_run (GTK_DIALOG(gfpm_apply_dlg)); @@ -192,7 +193,7 @@ void gfpm_apply_dlg_hide (void) { gtk_widget_hide (gfpm_apply_dlg); - + return; } @@ -308,13 +309,13 @@ gfpm_plist_question (const char *main_msg, GList *packages) gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW(tvw), column); g_signal_connect (r, "toggled", G_CALLBACK(cb_gfpm_plist_question_upgrade_toggled), store); - + r = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Package"), r, "text", 1, NULL); gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW(tvw), column); - + r = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Version"), r, "text", 2, NULL); gtk_tree_view_column_set_resizable (column, FALSE); @@ -402,7 +403,7 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) GtkTreeIter iter; GtkWidget *tvw; GList *l; - + if (packages == NULL) return; dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), @@ -433,7 +434,7 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); gtk_dialog_run (GTK_DIALOG(dialog)); - + gtk_widget_destroy (dialog); return; diff --git a/src/gfpm-packagelist.c b/src/gfpm-packagelist.c index eca65f1..d63e062 100644 --- a/src/gfpm-packagelist.c +++ b/src/gfpm-packagelist.c @@ -1,6 +1,6 @@ /*************************************************************************** * gfpm-packagelist.c - * Author: Priyank Gosalia + * Author: Priyank Gosalia * Copyright 2006-2007 Frugalware Developer Team ****************************************************************************/ @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include "gfpm-packagelist.h" diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 423df99..af083d1 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -28,7 +28,7 @@ #include "gfpm-systray.h" #ifdef HAVE_CONFIG_H - #include "config.h" +#include "config.h" #endif extern GladeXML *xml; @@ -111,7 +111,7 @@ gfpm_progress_update (netbuf *ctl, int xferred, void *arg) gettimeofday (&t1, NULL); if (xferred+offset == size) t = t0; - tdiff = t1.tv_sec-t.tv_sec + (float)(t1.tv_usec-t.tv_usec) / 1000000; + tdiff = t1.tv_sec-t.tv_sec + (float)(t1.tv_usec-t.tv_usec) / 1000000; if (xferred+offset == size) { rate = xferred / (tdiff * 1024); @@ -132,7 +132,7 @@ gfpm_progress_update (netbuf *ctl, int xferred, void *arg) } rx_str = g_strdup_printf ("%dK / %dK", (xferred+offset)/1024, size/1024); gtk_label_set_text (GTK_LABEL(rec_label), rx_str); - + while (gtk_events_pending ()) gtk_main_iteration (); gtk_progress_bar_set_text (progressbar, text); @@ -253,7 +253,7 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) default: return; } if (m == 1) - { + { gfpm_progress_set_main_text (substr); m = 0; } @@ -268,7 +268,7 @@ void gfpm_progress_set_main_text (const char *msg) { if (msg != NULL) - { + { gchar *markup = g_markup_printf_escaped ("%s", msg); gtk_label_set_markup (GTK_LABEL(main_label), markup); g_free (markup); diff --git a/src/gfpm-systray.c b/src/gfpm-systray.c index 29520cb..a2fffdf 100644 --- a/src/gfpm-systray.c +++ b/src/gfpm-systray.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #define _GNU_SOURCE #include #include @@ -26,7 +26,7 @@ #include "gfpm-systray.h" #ifdef HAVE_CONFIG_H - #include "config.h" +#include "config.h" #endif extern GtkWidget *progresswindow; diff --git a/src/gfpm.c b/src/gfpm.c index cf9807e..0363228 100644 --- a/src/gfpm.c +++ b/src/gfpm.c @@ -24,7 +24,7 @@ #include #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include "gfpm.h" @@ -48,7 +48,7 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - /* FIX ME */ + /* FIX ME */ /*if ( geteuid() != 0 ) { gfpm_error (_("Gfpm should be run as root.")); From priyank at frugalware.org Tue Aug 7 14:49:36 2007 From: priyank at frugalware.org (Priyank) Date: Tue Aug 7 14:49:39 2007 Subject: [Frugalware-git] gfpm: gfpm: whitespace fixes (thanks crazy) Message-ID: <20070807124936.8124013A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c6b3e96786029bdbe4b351cd186b8bef7bf34ef4 commit c6b3e96786029bdbe4b351cd186b8bef7bf34ef4 Author: Priyank Date: Tue Aug 7 18:18:43 2007 +0530 gfpm: whitespace fixes (thanks crazy) diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index af083d1..742f91f 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -182,7 +182,8 @@ gfpm_progress_install (unsigned char event, char *pkgname, int percent, int howm else main_text = g_strdup (_("Checking package for file conflicts")); break; - default: return; + default: + return; } gfpm_progress_set_main_text (main_text); sub_text = g_strdup_printf ("(%d/%d) %s", remain, howmany, pkgname); @@ -208,49 +209,70 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) gtk_main_iteration (); switch (event) { - case PM_TRANS_EVT_CHECKDEPS_START: substr = g_strdup(_("Checking dependencies")); - break; - case PM_TRANS_EVT_FILECONFLICTS_START: substr = g_strdup (_("Checking for file conflicts")); - break; - case PM_TRANS_EVT_RESOLVEDEPS_START: substr = g_strdup (_("Resolving dependencies")); - break; - case PM_TRANS_EVT_INTERCONFLICTS_START: substr = g_strdup (_("Looking for inter-conflicts")); - break; + case PM_TRANS_EVT_CHECKDEPS_START: + substr = g_strdup(_("Checking dependencies")); + break; + case PM_TRANS_EVT_FILECONFLICTS_START: + substr = g_strdup (_("Checking for file conflicts")); + break; + case PM_TRANS_EVT_RESOLVEDEPS_START: + substr = g_strdup (_("Resolving dependencies")); + break; + case PM_TRANS_EVT_INTERCONFLICTS_START: + substr = g_strdup (_("Looking for inter-conflicts")); + break; case PM_TRANS_EVT_CHECKDEPS_DONE: case PM_TRANS_EVT_RESOLVEDEPS_DONE: - case PM_TRANS_EVT_INTERCONFLICTS_DONE: substr = g_strdup (_("Done")); - break; - case PM_TRANS_EVT_ADD_START: substr = g_strdup_printf (_("installing %s"), (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME)); - break; - case PM_TRANS_EVT_ADD_DONE: substr = g_strdup_printf (_("installed %s"), (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME)); - break; - case PM_TRANS_EVT_UPGRADE_START: substr = g_strdup_printf (_("upgrading %s"), (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME)); - break; - case PM_TRANS_EVT_UPGRADE_DONE: substr = g_strdup_printf (_("upgraded %s from %s to %s"), - (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME), - (char*)pacman_pkg_getinfo(data2, PM_PKG_VERSION), - (char*)pacman_pkg_getinfo(data1, PM_PKG_VERSION)); - break; - case PM_TRANS_EVT_REMOVE_START: substr = g_strdup (_("Removing package")); - break; - case PM_TRANS_EVT_REMOVE_DONE: substr = g_strdup (_("Done")); - break; - case PM_TRANS_EVT_INTEGRITY_START: substr = g_strdup (_("Checking package integrity")); - break; - case PM_TRANS_EVT_INTEGRITY_DONE: substr = g_strdup (_("Done")); - break; - case PM_TRANS_EVT_SCRIPTLET_INFO: substr = g_strdup ((char*)data1); - break; - case PM_TRANS_EVT_SCRIPTLET_START: substr = g_strdup ((char*)data1); - break; - case PM_TRANS_EVT_SCRIPTLET_DONE: substr = g_strdup (_("Done")); - break; - case PM_TRANS_EVT_RETRIEVE_START: substr = g_strdup_printf (_("Retrieving packages from %s"), (char*)data1); - m = 1; - gtk_widget_show (rate_box); - gtk_widget_show (rec_label); - break; - default: return; + case PM_TRANS_EVT_INTERCONFLICTS_DONE: + substr = g_strdup (_("Done")); + break; + case PM_TRANS_EVT_ADD_START: + substr = g_strdup_printf (_("installing %s"), + (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME)); + break; + case PM_TRANS_EVT_ADD_DONE: + substr = g_strdup_printf (_("installed %s"), + (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME)); + break; + case PM_TRANS_EVT_UPGRADE_START: + substr = g_strdup_printf (_("upgrading %s"), + (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME)); + break; + case PM_TRANS_EVT_UPGRADE_DONE: + substr = g_strdup_printf (_("upgraded %s from %s to %s"), + (char*)pacman_pkg_getinfo(data1, PM_PKG_NAME), + (char*)pacman_pkg_getinfo(data2, PM_PKG_VERSION), + (char*)pacman_pkg_getinfo(data1, PM_PKG_VERSION)); + break; + case PM_TRANS_EVT_REMOVE_START: + substr = g_strdup (_("Removing package")); + break; + case PM_TRANS_EVT_REMOVE_DONE: + substr = g_strdup (_("Done")); + break; + case PM_TRANS_EVT_INTEGRITY_START: + substr = g_strdup (_("Checking package integrity")); + break; + case PM_TRANS_EVT_INTEGRITY_DONE: + substr = g_strdup (_("Done")); + break; + case PM_TRANS_EVT_SCRIPTLET_INFO: + substr = g_strdup ((char*)data1); + break; + case PM_TRANS_EVT_SCRIPTLET_START: + substr = g_strdup ((char*)data1); + break; + case PM_TRANS_EVT_SCRIPTLET_DONE: + substr = g_strdup (_("Done")); + break; + case PM_TRANS_EVT_RETRIEVE_START: + substr = g_strdup_printf (_("Retrieving packages from %s"), (char*)data1); + m = 1; + gtk_widget_show (rate_box); + gtk_widget_show (rec_label); + break; + default: + return; } if (m == 1) { From krics at linuxforum.hu Tue Aug 7 14:52:42 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 14:52:44 2007 Subject: [Frugalware-git] gfpm: autoclean.sh - small addition Message-ID: <20070807125242.82F5513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=3ed91ea8df4c8e7fa658c828ba51aaf7a35d1ce8 commit 3ed91ea8df4c8e7fa658c828ba51aaf7a35d1ce8 Author: Christian Hamar alias krix Date: Tue Aug 7 14:51:19 2007 +0200 autoclean.sh - small addition * rm -rf intltool-*.in files too (autogenerated) diff --git a/autoclean.sh b/autoclean.sh index dd6decb..b92372c 100644 --- a/autoclean.sh +++ b/autoclean.sh @@ -23,5 +23,6 @@ rm -rf data/icons/Makefile.in rm -rf data/icons/{32x32,128x128,48x48}/Makefile.in rm -rf po/stamp-it rm -rf intltool-{extract,merge,update} +rm -rf intltool-{extract,merge,update}.in rm -rf po/POTFILES rm -rf po/Makefile{.in,.in.in} From krics at linuxforum.hu Tue Aug 7 14:54:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Aug 7 14:54:27 2007 Subject: [Frugalware-git] gfpm: Removed 1 FIXME entry :P Message-ID: <20070807125422.8757F13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=6894a15faa0c35b4fff70618786369941d33364c commit 6894a15faa0c35b4fff70618786369941d33364c Author: Christian Hamar alias krix Date: Tue Aug 7 14:53:00 2007 +0200 Removed 1 FIXME entry :P * Removed FIXME entry from gfpm.c (geteuid check to see if running as root) * Removed the whole check function, because it solved in other place diff --git a/src/gfpm.c b/src/gfpm.c index 0363228..d404b3c 100644 --- a/src/gfpm.c +++ b/src/gfpm.c @@ -48,13 +48,6 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - /* FIX ME */ - /*if ( geteuid() != 0 ) - { - gfpm_error (_("Gfpm should be run as root.")); - return 1; - }*/ - path = g_strdup_printf ("%s%s", PREFIX, GLADE_FILE); xml = glade_xml_new (path, NULL, NULL); g_free (path); From priyank at frugalware.org Tue Aug 7 15:58:43 2007 From: priyank at frugalware.org (Priyank) Date: Tue Aug 7 15:58:45 2007 Subject: [Frugalware-git] frugalware-current: control-center-2.18.1-4-i686 Message-ID: <20070807135843.66FD513A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0655f52781b8bd3ff6ac3ce9a993ca52715c21fe commit 0655f52781b8bd3ff6ac3ce9a993ca52715c21fe Author: Priyank Date: Tue Aug 7 19:26:37 2007 +0530 control-center-2.18.1-4-i686 * rebuild against new db * added db>=4.6.18 to depends diff --git a/source/gnome/control-center/FrugalBuild b/source/gnome/control-center/FrugalBuild index 607f546..ad4f796 100644 --- a/source/gnome/control-center/FrugalBuild +++ b/source/gnome/control-center/FrugalBuild @@ -3,13 +3,13 @@ pkgname=control-center pkgver=2.18.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNOME Control Center" url="http://www.gnome.org/" depends=('gnome-desktop>=2.18.1' 'gnome-menus>=2.18.0' 'metacity>=2.18.1' 'libgnomekbd>=2.18.1' \ 'nautilus>=2.18.1' 'gst-plugins-base>=0.10.10-2' 'desktop-file-utils' \ 'evolution-data-server>=1.10.1' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ - 'gnome-vfs>=2.18.1' 'gnome-panel>=2.18.1' 'heimdal>=1.0') + 'gnome-vfs>=2.18.1' 'gnome-panel>=2.18.1' 'heimdal>=1.0' 'db>=4.6.18') makedepends=('intltool' 'gnome-doc-utils>=0.9.2' 'gnome-common') rodepends=('gst-plugins-base-alsa>=0.10.10-2' 'gst-plugins-base-gnomevfs>=0.10.10-2') groups=('gnome' 'gnome-core') From vmiklos at frugalware.org Tue Aug 7 17:06:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Aug 7 17:06:17 2007 Subject: [Frugalware-git] frugalware-current: t/s/syncpkgd: new stat Message-ID: <20070807150615.2754613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7740f829164ff45d056c532cd5e6dca6231a77b9 commit 7740f829164ff45d056c532cd5e6dca6231a77b9 Author: VMiklos Date: Tue Aug 7 17:05:21 2007 +0200 t/s/syncpkgd: new stat diff --git a/t/s/syncpkgd b/t/s/syncpkgd new file mode 100755 index 0000000..fce3063 --- /dev/null +++ b/t/s/syncpkgd @@ -0,0 +1,84 @@ +#!/usr/bin/env python + +import os, stat, time, sys + +fpms = { + 'i686': [], + 'x86_64': [] + } + +def how_old(epoch): + age = int(time.time()) - int(epoch) + if age > 60*60*24*365*2: + s = str(age/60/60/24/365) + s += " years" + elif age > 60*60*24*(365/12)*2: + s = str(age/60/60/24/(365/12)) + s += " months" + elif age > 60*60*24*7*2: + s = str(age/60/60/24/7) + s += " weeks" + elif age > 60*60*24*2: + s = str(age/60/60/24) + s += " days" + elif age > 60*60*2: + s = str(age/60/60) + s += " hours" + elif age > 60*2: + s = str(age/60) + s += " minutes" + else: + s = str(age) + s += " seconds" + return s + +def tobuild(pkg): + ret = [] + # Build the command to read the FrugalBuilds + command = 'cd %s; ' + command += 'source /usr/lib/frugalware/fwmakepkg' + command += ' ; source FrugalBuild' + command += ' ; [ -n "${nobuild}" ] && exit' + command += ' ; echo ${options[@]} | grep -q nobuild && exit' + command += ' ; echo "${pkgname}-${pkgver}-${pkgrel}"' + command += ' ; echo "${archs[@]}"' + sock = os.popen(command % os.path.split(pkg)[0]) + lines = sock.readlines() + sock.close() + if not len(lines): + return ret + archs = lines[1].strip().split() + for i in archs: + if i not in fpms.keys(): + continue + full = "-".join([lines[0].strip(), i]) + try: + os.stat("frugalware-%s/%s.fpm" % (i, full)) + except OSError: + ret.append(full) + return ret + +if len(sys.argv) > 1: + if sys.argv[1] == "--help": + print "not yet synced packages" + sys.exit(0) + +os.chdir("../..") + +for root, dirs, files in os.walk("source"): + for file in files: + if file == "FrugalBuild": + fb = os.path.join(root, file) + missing = tobuild(fb) + for i in missing: + old = os.stat(fb)[stat.ST_MTIME] + fpms[i.split('-')[-1]].append("%s is missing (FB is %s old)" % (i, how_old(old))) +archs = fpms.keys() +archs.sort() +sorted = [] +for i in archs: + v = fpms[i] + v.sort() + sorted.extend(v) +for i in sorted: + print i From boobaa at frugalware.org Tue Aug 7 17:15:31 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Aug 7 17:15:37 2007 Subject: [Frugalware-git] frugalware-current: perl-5.8.8-4-i686 Message-ID: <20070807151531.C334D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=df2cef7dd6188b5a45ae0dd3ca388965cf940fa4 commit df2cef7dd6188b5a45ae0dd3ca388965cf940fa4 Author: CSÉCSY László Date: Tue Aug 7 17:15:15 2007 +0200 perl-5.8.8-4-i686 rebuilt with db-4.6 added a patch from http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html - just to be able to compile it with gcc-4.2 :S diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild index 30df754..e92c797 100644 --- a/source/base/perl/FrugalBuild +++ b/source/base/perl/FrugalBuild @@ -4,23 +4,27 @@ pkgname=perl pkgver=5.8.8 -pkgrel=3 +pkgrel=4 pkgdesc="Practical Extraction and Report Language" url="http://www.perl.org/" -depends=('gdbm' 'db>=4.5.20') +depends=('gdbm' 'db>=4.6.18') rodepends=('udev') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.cpan.org/src/README.html|grep stable|sed -n 's/.*s \(.*\)\. T.*/\1/;1 p'" source=(http://www.cpan.org/src/5.0/$pkgname-$pkgver.tar.bz2 \ - $pkgname.install libnet.cfg perl-5.8.6-picdl.patch0) + $pkgname.install libnet.cfg perl-5.8.6-picdl.patch0 \ + perl-5.8.8-gcc-4.2.patch) sha1sums=('4aab490040727ca4419098720eca2ba4367df539' \ '384b7620e9758245db64190138011fc5e9f51956' \ '92179e28215bf7b802ded72e0ca6e473a21f5003' \ - '3000bd0130ed20e0ff5d9fb0147240e3909473a7') + '3000bd0130ed20e0ff5d9fb0147240e3909473a7' \ + '41aa378ab49869a4964acea882f47a3a8b826357') build() { + unset MAKEFLAGS cd $startdir/src/$pkgname-$pkgver + Fpatch $pkgname-$pkgver-gcc-4.2.patch || return 1 # Fpatch $pkgname-$pkgver.patch || return 1 [ "$CARCH" == "x86_64" ] && (Fpatch perl-5.8.6-picdl.patch0 || return 1) ./Configure -de -Dprefix=/usr -Dinstallprefix=$startdir/pkg/usr \ diff --git a/source/base/perl/perl-5.8.8-gcc-4.2.patch b/source/base/perl/perl-5.8.8-gcc-4.2.patch new file mode 100644 index 0000000..6e9961a --- /dev/null +++ b/source/base/perl/perl-5.8.8-gcc-4.2.patch @@ -0,0 +1,11 @@ +diff -Naur perl-5.8.8-orig/makedepend.SH perl-5.8.8/makedepend.SH +--- perl-5.8.8-orig/makedepend.SH 2003-06-05 20:11:10.000000000 +0200 ++++ perl-5.8.8/makedepend.SH 2007-08-07 17:07:10.000000000 +0200 +@@ -167,6 +167,7 @@ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ ++ -e '/^#.*/d' \ + -e '/^#.*"-"/d' \ + -e '/: file path prefix .* never used$/d' \ + -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ From crazy at frugalware.org Tue Aug 7 22:08:51 2007 From: crazy at frugalware.org (crazy) Date: Tue Aug 7 22:08:52 2007 Subject: [Frugalware-git] frugalware-current: libmtp-0.2.1-1-i686 Message-ID: <20070807200851.36AA313A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c2106fe455ac89fc93f261c92838ee8532286471 commit c2106fe455ac89fc93f261c92838ee8532286471 Author: crazy Date: Tue Aug 7 22:07:12 2007 +0200 libmtp-0.2.1-1-i686 * Version bump diff --git a/source/lib-extra/libmtp/FrugalBuild b/source/lib-extra/libmtp/FrugalBuild index 3df6225..454c153 100644 --- a/source/lib-extra/libmtp/FrugalBuild +++ b/source/lib-extra/libmtp/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: crazy pkgname=libmtp -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.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=('5c05a964656303bca07bf76dbbd9fd200abd0b94') +sha1sums=('395a24c815967af7a2b8e2034fc0e24f19bca268') # optimization OK From crazy at frugalware.org Tue Aug 7 22:14:44 2007 From: crazy at frugalware.org (crazy) Date: Tue Aug 7 22:14:46 2007 Subject: [Frugalware-git] frugalware-current: gnomad2-2.8.13-2-i686 Message-ID: <20070807201444.1ABFE13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5b4e082ae7d0a484cc25d62152486f9651a8093d commit 5b4e082ae7d0a484cc25d62152486f9651a8093d Author: crazy Date: Tue Aug 7 22:13:18 2007 +0200 gnomad2-2.8.13-2-i686 * rebuild with libmtp * removed custom up2date line diff --git a/source/gnome-extra/gnomad2/FrugalBuild b/source/gnome-extra/gnomad2/FrugalBuild index 3e94877..7cc57bc 100644 --- a/source/gnome-extra/gnomad2/FrugalBuild +++ b/source/gnome-extra/gnomad2/FrugalBuild @@ -1,20 +1,20 @@ # Compiling Time: 0.10 SBU # Maintainer: Christian Hamar alias krix -# Old Maintainer: BMH1980 +# Contributor: BMH1980 pkgname=gnomad2 pkgver=2.8.13 -pkgrel=1 +pkgrel=2 pkgdesc="Gnomad2 transfer tracks/files from/to a Creative Nomad Jukebox (all brands)." url="http://gnomad2.sourceforge.net/" -depends=('gtk+2>=2.10.2' 'libmtp>=0.0.14' 'libid3tag' 'libnjb' 'dbus-glib') +depends=('gtk+2>=2.10.2' 'libmtp>=0.2.1' 'libid3tag' 'libnjb' 'dbus-glib') makedepends=('perl-xml') license="GPL2" groups=('gnome-extra') archs=('i686' 'x86_64') options=('scriptlet') +_F_sourceforge_broken_up2date=1 Finclude sourceforge -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=65573'|grep -m1 'gnomad2-'|sed 's/.*-\(.*\).t.*/\1/'" - sha1sums=('d61b41998873b789e396b3943b3e706332d9d25b') + # optimization OK From crazy at frugalware.org Tue Aug 7 22:45:14 2007 From: crazy at frugalware.org (crazy) Date: Tue Aug 7 22:45:17 2007 Subject: [Frugalware-git] frugalware-current: amarok-1.4.6-3-i686 Message-ID: <20070807204514.E281D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7573a0955d7f34ae295f91f23b7c7833701535da commit 7573a0955d7f34ae295f91f23b7c7833701535da Author: crazy Date: Tue Aug 7 22:39:22 2007 +0200 amarok-1.4.6-3-i686 * rebuild with libmtp diff --git a/source/kde-extra/amarok/FrugalBuild b/source/kde-extra/amarok/FrugalBuild index 134ca4c..024601e 100644 --- a/source/kde-extra/amarok/FrugalBuild +++ b/source/kde-extra/amarok/FrugalBuild @@ -4,10 +4,10 @@ pkgname=amarok pkgver=1.4.6 -pkgrel=2 +pkgrel=3 pkgdesc="amaroK is a music player for Linux and Unix with an intuitive interface" depends=('libtunepimp>=0.5.2-2' 'xine-lib' 'libifp' 'kdebase>=3.5.7' 'taglib' 'libnjb' \ - 'libgpod>=0.5.2' 'ruby' 'python>=2.5' 'libvisual-plugins' 'libmtp' 'libkarma' \ + 'libgpod>=0.5.2' 'ruby' 'python>=2.5' 'libvisual-plugins' 'libmtp>=0.2.1' 'libkarma' \ 'curl>=7.16.1' 'libmysqlclient') makedepends=('mysql') rodepends=('unzip') From krics at linuxforum.hu Wed Aug 8 07:48:19 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Aug 8 07:48:21 2007 Subject: [Frugalware-git] frugalware-current: libetpan-0.52-1-i686 Message-ID: <20070808054819.BEB2D13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=004c563f069dc1c4fb8549cc449051d7857a1b66 commit 004c563f069dc1c4fb8549cc449051d7857a1b66 Author: Christian Hamar alias krix Date: Wed Aug 8 07:46:45 2007 +0200 libetpan-0.52-1-i686 * Version bump diff --git a/source/lib-extra/libetpan/FrugalBuild b/source/lib-extra/libetpan/FrugalBuild index 0c57a9b..77b6dd1 100644 --- a/source/lib-extra/libetpan/FrugalBuild +++ b/source/lib-extra/libetpan/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: free-zombie pkgname=libetpan -pkgver=0.51 +pkgver=0.52 pkgrel=1 pkgdesc="A mail library" url="http://libetpan.sourceforge.net/" @@ -12,8 +12,7 @@ groups=('lib-extra') archs=('x86_64' 'i686') _F_sourceforge_broken_up2date=1 Finclude sourceforge -# Need to remove on next upstream. THis buildfix from SVN backport. -krix -sha1sums=('a3660725c9fad8bfe6baa6afc0e87d4a768c14a0') +sha1sums=('e2fdf76b471e57a153bad4c4def7fde512385021') build() { From vmiklos at frugalware.org Wed Aug 8 09:56:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 09:56:07 2007 Subject: [Frugalware-git] frugalware-current: validator-0.8.1-1-x86_64 Message-ID: <20070808075605.5A31313A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8f87bdcc04f30b0cb14495427718617c5b27cf7a commit 8f87bdcc04f30b0cb14495427718617c5b27cf7a Author: VMiklos Date: Wed Aug 8 09:55:49 2007 +0200 validator-0.8.1-1-x86_64 version bump diff --git a/source/network-extra/validator/FrugalBuild b/source/network-extra/validator/FrugalBuild index 8102a47..646493c 100644 --- a/source/network-extra/validator/FrugalBuild +++ b/source/network-extra/validator/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=validator -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="The W3C Markup Validator." url="http://validator.w3.org/" rodepends=('perl-config-general' 'perl-net-ip' 'perl-set-intspan' \ @@ -16,9 +16,9 @@ up2date="lynx -dump http://validator.w3.org/whatsnew.html|grep Release|sed 's/.* source=($url/dist/validator-${pkgver//./_}.tar.gz \ $url/dist/sgml-lib-${pkgver//./_}.tar.gz \ proxy.patch) -sha1sums=('e3c7ff52ae2df23d4c0b9a1160199c186d4352b4' \ - '0e4663b0341aa781840eb27193e37269dcd649ee' \ - '32d2f8042488d778acb64a39d997e0fe73bed61a') +sha1sums=('eef9f1e15831812059650499d96e0fa04649ef38' \ + 'f572f27f5c7fbbe98b6242035a2e2e3fedf4f0aa' \ + '32d2f8042488d778acb64a39d997e0fe73bed61a') build() { From vmiklos at frugalware.org Wed Aug 8 09:58:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 09:58:46 2007 Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.5_5-1-i686 Message-ID: <20070808075845.DB3B713A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=53f1b93ff4100ad2dccfd9e668e5411b2fabff5b commit 53f1b93ff4100ad2dccfd9e668e5411b2fabff5b Author: VMiklos Date: Wed Aug 8 09:58:18 2007 +0200 imagemagick-6.3.5_5-1-i686 version bump depends() fix (thx hermier) diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 2fa0e40..f2705ba 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,11 +3,11 @@ # Maintainer: voroskoi pkgname=imagemagick -pkgver=6.3.5_2 +pkgver=6.3.5_5 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files" url="http://www.imagemagick.org" -depends=('lcms' 'libxext' 'libxt' 'bzip2' 'libgcc' 'expat' 'libx11>=1.1.1-2' 'djvulibre') +depends=('lcms' 'libxext' 'libxt' 'bzip2' 'libgcc' 'libgomp' 'expat' 'libx11>=1.1.1-2' 'djvulibre') makedepends=('mpeg2dec' 'graphviz') groups=('xapps') archs=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('scriptlet') up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ libpng_mmx_patch_x86_64.patch) -sha1sums=('693d2f0a320da7a19aa6b63c2e572c555b88bb10' \ +sha1sums=('24dc7121add3e82848ba73924315958276ef4bb6' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { From vmiklos at frugalware.org Wed Aug 8 10:10:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 10:10:11 2007 Subject: [Frugalware-git] frugalware-current: cvs2cl-2.67-2-i686 Message-ID: <20070808081009.D337113A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fbe5244e44982af5c7d6152f52bd6f5d9710f2d9 commit fbe5244e44982af5c7d6152f52bd6f5d9710f2d9 Author: VMiklos Date: Wed Aug 8 10:09:50 2007 +0200 cvs2cl-2.67-2-i686 relbump, upstream source has been changed without a verbump diff --git a/source/apps-extra/cvs2cl/FrugalBuild b/source/apps-extra/cvs2cl/FrugalBuild index ceaf5ef..1793536 100644 --- a/source/apps-extra/cvs2cl/FrugalBuild +++ b/source/apps-extra/cvs2cl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cvs2cl pkgver=2.67 -pkgrel=1 +pkgrel=2 pkgdesc="produces a GNU-style ChangeLog for CVS-controlled sources" url="http://www.red-bean.com/cvs2cl/" depends=('perl' 'cvs') @@ -11,6 +11,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/$pkgname.pl|grep Revision|sed -n 's/.*: \(.*\) .*/\1/;1 p'" source=($url/$pkgname.pl) +sha1sums=('37c77b591ff6f654a069c53692c2224cce18f1c7') build() { cd $Fsrcdir || Fdie @@ -19,5 +20,4 @@ build() { Fln /usr/bin/cvs2cl.pl /usr/bin/cvs2cl } -sha1sums=('9c066cd6aff809ae9ffc7b7d53a8a3992b0ecc54') # optimization OK From hermier at frugalware.org Wed Aug 8 10:12:11 2007 From: hermier at frugalware.org (Michel Hermier) Date: Wed Aug 8 10:12:15 2007 Subject: [Frugalware-git] pacman-g2: libpacman: I feel missing a _pacman_log before a pacman_logaction. Message-ID: <20070808081211.6273C13A4050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=238deb9a80f3f3a6fceaddc5a27a11b9635b47ce commit 238deb9a80f3f3a6fceaddc5a27a11b9635b47ce Author: Michel Hermier Date: Wed Aug 8 10:10:45 2007 +0200 libpacman: I feel missing a _pacman_log before a pacman_logaction. diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 6c1d801..a1620ca 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -515,6 +515,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db) archive_entry_set_pathname (entry, temp); if(archive_read_extract (archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) { + _pacman_log(PM_LOG_ERROR, _("could not extract %s (%s)"), pathname, strerror(errno)); pacman_logaction(_("could not extract %s (%s)"), pathname, strerror(errno)); errors++; unlink(temp); From vmiklos at frugalware.org Wed Aug 8 10:31:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 10:31:53 2007 Subject: [Frugalware-git] frugalware-current: wnews-0.8-1-i686 Message-ID: <20070808083150.CCAE813A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fee6f8fb7a6276d4f5a1c5a6f851ea9c338a4106 commit fee6f8fb7a6276d4f5a1c5a6f851ea9c338a4106 Author: VMiklos Date: Wed Aug 8 10:31:36 2007 +0200 wnews-0.8-1-i686 source() fix diff --git a/source/network-extra/wnews/FrugalBuild b/source/network-extra/wnews/FrugalBuild index 76765c8..a83d50b 100644 --- a/source/network-extra/wnews/FrugalBuild +++ b/source/network-extra/wnews/FrugalBuild @@ -10,7 +10,7 @@ depends=('ncurses') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.usinglinux.org/www/wnews.html|grep Version|sed 's/.* : //'" -source=(http://www.kerneled.org/projects/wnews/releases/$pkgname-$pkgver.tar.gz) +source=(http://ftp.frugalware.org/pub/other/sources/wnews/wnews-$pkgver.tar.gz) sha1sums=('32a20771a79a6c8d4b7d52f68098c859b10cb779') build() From vmiklos at frugalware.org Wed Aug 8 11:24:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 11:24:17 2007 Subject: [Frugalware-git] homepage-ng: syncpkgd: redirect to the buildlogs page Message-ID: <20070808092415.54FA613A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=9f47c4d50f94e6ac99b59dbb962fb0d2585e55c5 commit 9f47c4d50f94e6ac99b59dbb962fb0d2585e55c5 Author: VMiklos Date: Wed Aug 8 11:19:46 2007 +0200 syncpkgd: redirect to the buildlogs page also remove the old code diff --git a/syncpkgd/config.php b/syncpkgd/config.php deleted file mode 100644 index 72213ef..0000000 --- a/syncpkgd/config.php +++ /dev/null @@ -1,6 +0,0 @@ - "University of Debrecen", - "helicon" => "TeleDataCast Kft.", - "yugo" => "The Computer and Automation Research Institute, Hungarian Academy of Sciences."); -?> diff --git a/syncpkgd/functions.php b/syncpkgd/functions.php deleted file mode 100644 index de48e1a..0000000 --- a/syncpkgd/functions.php +++ /dev/null @@ -1,121 +0,0 @@ - diff --git a/syncpkgd/index.php b/syncpkgd/index.php index 2383f43..0c91b4a 100644 --- a/syncpkgd/index.php +++ b/syncpkgd/index.php @@ -1,20 +1,4 @@ diff --git a/syncpkgd/templates/day.php b/syncpkgd/templates/day.php deleted file mode 100644 index 9b04855..0000000 --- a/syncpkgd/templates/day.php +++ /dev/null @@ -1,16 +0,0 @@ - - - - Logs for <? print($day); ?> - - - -
The following logs are available for :
- " . $i["fullname"] . " " . - ($i["exitcode"] ? "built" : "failed") . "
\n"); - } ?> -
- - diff --git a/syncpkgd/templates/hardware.php b/syncpkgd/templates/hardware.php deleted file mode 100644 index 30557e6..0000000 --- a/syncpkgd/templates/hardware.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - Hardware informations for <? print($host); ?> - - - -
- Network connection:
- CPU:
- Memory: MB
-
- - diff --git a/syncpkgd/templates/log.php b/syncpkgd/templates/log.php deleted file mode 100644 index da883ee..0000000 --- a/syncpkgd/templates/log.php +++ /dev/null @@ -1,40 +0,0 @@ - - - - Buildlog - - - - 
-\1',
-	'\1',
-	'\1',
-	'\1',
-	'\1',
-	'\1',
-	'&');
-
-	$fp = fopen($log, "r");
-	if($fp)
-	{
-		while (!feof($fp))
-		{
-			print(preg_replace($search, $replace, fgets($fp)));
-		}
-		fclose($fp);
-	}
-?>
-
- - diff --git a/syncpkgd/templates/main.php b/syncpkgd/templates/main.php deleted file mode 100644 index de62a2c..0000000 --- a/syncpkgd/templates/main.php +++ /dev/null @@ -1,38 +0,0 @@ - - - - <? print("Welcome to $host!"); ?> - - - -
Welcome to buildserver of - Frugalware Linux.
- The following buildlogs are available:
-
    - $i\n"); - } ?> -
-
General statistics:
- \n"); - if($buildstat != false) - print("Currently building the $buildstat package.
\n"); - } - else - print("The package builder daemon is not running.
\n"); - if($sync) - print("The package builder is running, started on " . - $syncdate . ".
\n"); - else - print("The package builder is sleeping, will be started again on " . - $syncdate . ".
\n"); - print("Avarage load for the past one minute: " . $loadstat . "
\n"); - print("Hardware informations.
\n"); - ?> -
- - From vmiklos at frugalware.org Wed Aug 8 13:31:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 13:31:46 2007 Subject: [Frugalware-git] homepage-ng: FSA242-drupal Message-ID: <20070808113144.7364E13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=545ceb4a8643710c344cab93fb45e29444898501 commit 545ceb4a8643710c344cab93fb45e29444898501 Author: VMiklos Date: Wed Aug 8 13:31:38 2007 +0200 FSA242-drupal diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 11237e6..f5ea3f4 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 242 + 2007-08-08 + vmiklos + drupal + 4.7.5-1 + 4.7.7-1terminus1 + http://bugs.frugalware.org/task/2295 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4064 + Multiple cross-site scripting (XSS) vulnerabilities in Drupal 5.x before 5.2, and 4.7.x before 4.7.7, + (1) allow remote attackers to inject arbitrary web script or HTML via "some server variables," including PHP_SELF; and + (2) allow remote authenticated administrators to inject arbitrary web script or HTML via custom content type names. + + 241 2007-08-07 vmiklos From vmiklos at frugalware.org Wed Aug 8 14:38:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 14:39:01 2007 Subject: [Frugalware-git] frugalware-current: sysklogd-1.4.1-7-i686 Message-ID: <20070808123900.0CC3F13A402C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=db3daa73f1b2cfa7b4adc713d7015ea9b34b8ac2 commit db3daa73f1b2cfa7b4adc713d7015ea9b34b8ac2 Author: VMiklos Date: Wed Aug 8 14:38:32 2007 +0200 sysklogd-1.4.1-7-i686 rodepends() fix diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index 1d9e838..9b06c3c 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=7 pkgdesc="Linux system logging utilities" url="http://www.ibiblio.org/pub/Linux/system/daemons/!INDEX" backup=(etc/syslog.conf etc/logrotate.d/syslog) -rodepends=('logrotate' 'netkit-base') +rodepends=('netkit-base') 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 vmiklos at frugalware.org Wed Aug 8 14:50:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 14:50:41 2007 Subject: [Frugalware-git] frugalware-current: logrotate-3.7.5-1-i686 Message-ID: <20070808125039.4814313A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c1bf1694a3340d6ab4316475aa01a0e11d5e4716 commit c1bf1694a3340d6ab4316475aa01a0e11d5e4716 Author: VMiklos Date: Wed Aug 8 14:48:04 2007 +0200 logrotate-3.7.5-1-i686 moved to apps diff --git a/source/apps/logrotate/FrugalBuild b/source/apps/logrotate/FrugalBuild new file mode 100644 index 0000000..6f18eb8 --- /dev/null +++ b/source/apps/logrotate/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=logrotate +pkgver=3.7.5 +# lynx -dump http://cvs.fedora.redhat.com/viewcvs/devel/logrotate/sources?view=markup |grep tar |sed -e 's/ .*//' +pkg_md5="2b25c645bbcc52abc12ba6a4d52b18e5" +pkgrel=1 +pkgdesc="Rotates, compresses, removes and mails system log files." +url="http://cvs.fedora.redhat.com" +depends=('popt') +rodepends=('mailx') +groups=('apps') +archs=('i686' 'x86_64' 'ppc') +up2date="lynx -dump $url/viewcvs/devel/logrotate/sources?view=markup |grep tar |sed -e 's/.*-\(.*\).t.*/\1/'" +source=("$url/repo/dist/logrotate/logrotate-$pkgver.tar.gz/$pkg_md5/logrotate-$pkgver.tar.gz" \ + logrotate.conf logrotate) + +build() +{ + Fsed 'CFLAGS = -Wall' "CFLAGS = -Wall $CFLAGS" Makefile + Fmkdir /etc/logrotate.d + Fpatchall + Fmake + make PREFIX=$Fdestdir install || Fdie + Ffile /etc/logrotate.conf + Fexe /etc/cron.daily/logrotate +} + +sha1sums=('7c9dee4d4df97af2f6d919e2eac61f6a673bd13a'\ + '4cdc2cfc1077668fae05bfb0ce61bfd781c34d95'\ + 'cadda9e47640ea91e5f1488b518e4982acebad49') +# optimization OK diff --git a/source/apps/logrotate/logrotate b/source/apps/logrotate/logrotate new file mode 100644 index 0000000..e8ab921 --- /dev/null +++ b/source/apps/logrotate/logrotate @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/sbin/logrotate /etc/logrotate.conf diff --git a/source/apps/logrotate/logrotate.conf b/source/apps/logrotate/logrotate.conf new file mode 100644 index 0000000..606513b --- /dev/null +++ b/source/apps/logrotate/logrotate.conf @@ -0,0 +1,49 @@ +# /etc/logrotate.conf +# +# logrotate is designed to ease administration of systems that generate large +# numbers of log files. It allows automatic rotation, compression, removal, and +# mailing of log files. Each log file may be handled daily, weekly, monthly, or +# when it grows too large. +# +# logrotate is normally run daily from root's crontab. +# +# For more details, see "man logrotate". + +# rotate log files weekly: +weekly + +# keep 4 weeks worth of backlogs: +rotate 4 + +# create new (empty) log files after rotating old ones: +create + +# uncomment this if you want your log files compressed: +#compress + +# some packages install log rotation information in this directory: +include /etc/logrotate.d + +# Rotate /var/log/wtmp: +/var/log/wtmp { + monthly + create 0664 root utmp + rotate 1 +} + +#/var/log/httpd/*.log { +# monthly +# missingok +# rotate 3 +# compress +# delaycompress +# postrotate +# if [ -f /var/run/httpd.pid ]; then +# /etc/rc.d/rc.httpd restart > /dev/null +# fi +# endscript +#} + +# Note that /var/log/lastlog is not rotated. This is intentional, and it should +# not be. The lastlog file is a database, and is also a sparse file that takes +# up much less space on the drive than it appears. diff --git a/source/base/logrotate/FrugalBuild b/source/base/logrotate/FrugalBuild deleted file mode 100644 index 5087410..0000000 --- a/source/base/logrotate/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=logrotate -pkgver=3.7.5 -# lynx -dump http://cvs.fedora.redhat.com/viewcvs/devel/logrotate/sources?view=markup |grep tar |sed -e 's/ .*//' -pkg_md5="2b25c645bbcc52abc12ba6a4d52b18e5" -pkgrel=1 -pkgdesc="Rotates, compresses, removes and mails system log files." -url="http://cvs.fedora.redhat.com" -depends=('popt') -rodepends=('mailx') -groups=('base') -archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $url/viewcvs/devel/logrotate/sources?view=markup |grep tar |sed -e 's/.*-\(.*\).t.*/\1/'" -source=("$url/repo/dist/logrotate/logrotate-$pkgver.tar.gz/$pkg_md5/logrotate-$pkgver.tar.gz" \ - logrotate.conf logrotate) - -build() -{ - Fsed 'CFLAGS = -Wall' "CFLAGS = -Wall $CFLAGS" Makefile - Fmkdir /etc/logrotate.d - Fpatchall - Fmake - make PREFIX=$Fdestdir install || Fdie - Ffile /etc/logrotate.conf - Fexe /etc/cron.daily/logrotate -} - -sha1sums=('7c9dee4d4df97af2f6d919e2eac61f6a673bd13a'\ - '4cdc2cfc1077668fae05bfb0ce61bfd781c34d95'\ - 'cadda9e47640ea91e5f1488b518e4982acebad49') -# optimization OK diff --git a/source/base/logrotate/logrotate b/source/base/logrotate/logrotate deleted file mode 100644 index e8ab921..0000000 --- a/source/base/logrotate/logrotate +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/sbin/logrotate /etc/logrotate.conf diff --git a/source/base/logrotate/logrotate.conf b/source/base/logrotate/logrotate.conf deleted file mode 100644 index 606513b..0000000 --- a/source/base/logrotate/logrotate.conf +++ /dev/null @@ -1,49 +0,0 @@ -# /etc/logrotate.conf -# -# logrotate is designed to ease administration of systems that generate large -# numbers of log files. It allows automatic rotation, compression, removal, and -# mailing of log files. Each log file may be handled daily, weekly, monthly, or -# when it grows too large. -# -# logrotate is normally run daily from root's crontab. -# -# For more details, see "man logrotate". - -# rotate log files weekly: -weekly - -# keep 4 weeks worth of backlogs: -rotate 4 - -# create new (empty) log files after rotating old ones: -create - -# uncomment this if you want your log files compressed: -#compress - -# some packages install log rotation information in this directory: -include /etc/logrotate.d - -# Rotate /var/log/wtmp: -/var/log/wtmp { - monthly - create 0664 root utmp - rotate 1 -} - -#/var/log/httpd/*.log { -# monthly -# missingok -# rotate 3 -# compress -# delaycompress -# postrotate -# if [ -f /var/run/httpd.pid ]; then -# /etc/rc.d/rc.httpd restart > /dev/null -# fi -# endscript -#} - -# Note that /var/log/lastlog is not rotated. This is intentional, and it should -# not be. The lastlog file is a database, and is also a sparse file that takes -# up much less space on the drive than it appears. From vmiklos at frugalware.org Wed Aug 8 14:55:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 14:55:26 2007 Subject: [Frugalware-git] frugalware-current: usbutils-0.72-1-i686 Message-ID: <20070808125524.8817B13A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d81463fa61ee69b3a06d35ef0bdcc8d5703cb0a1 commit d81463fa61ee69b3a06d35ef0bdcc8d5703cb0a1 Author: VMiklos Date: Wed Aug 8 14:54:58 2007 +0200 usbutils-0.72-1-i686 moved to apps diff --git a/source/apps/usbutils/FrugalBuild b/source/apps/usbutils/FrugalBuild new file mode 100644 index 0000000..783e1ff --- /dev/null +++ b/source/apps/usbutils/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.02 SBU +# Maintainer: VMiklos + +pkgname=usbutils +pkgver=0.72 +pkgrel=1 +pkgdesc="USB utilities - lsusb,usbmodules" +_F_sourceforge_dirname="linux-usb" +Finclude sourceforge +url="http://www.linux-usb.org/" +depends=('libusb') +groups=('apps') +archs=('i686' 'x86_64' 'ppc') +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3581&package_id=142529' |grep ]$pkgname-.*.tar.gz | head -n 1 | sed 's/.*usbutils-\(.*\).tar.gz.*/\1/'" +source=($source usb-update-pathfix.patch) +sha1sums=('891b8825d964880146d5c980e52bb9e23d92fe2b' \ + '8d13c50067d2db27d4b9001563dee9efb89106a4') + +build() { + Fsed "/usr/share/usb.ids" "/usr/share/usbutils/usb.ids" lsusb.8 + ./update-usbids.sh || Fdie + Fbuild --datadir=/usr/share/usbutils --enable-usbmodules + Fexerel update-usbids.sh /usr/sbin/update-usbids +} + +# optimization ok diff --git a/source/apps/usbutils/usb-update-pathfix.patch b/source/apps/usbutils/usb-update-pathfix.patch new file mode 100644 index 0000000..cd805b9 --- /dev/null +++ b/source/apps/usbutils/usb-update-pathfix.patch @@ -0,0 +1,12 @@ +diff -Naur usbutils-0.71.orig/update-usbids.sh usbutils-0.71/update-usbids.sh +--- usbutils-0.71.orig/update-usbids.sh 2005-07-01 12:24:55.000000000 +0200 ++++ usbutils-0.71/update-usbids.sh 2005-07-01 12:29:57.000000000 +0200 +@@ -4,7 +4,7 @@ + + set -e + SRC="http://www.linux-usb.org/usb.ids" +-DEST=usb.ids ++DEST=/usr/share/usbutils/usb.ids + + if which wget >/dev/null ; then + DL="wget -O $DEST.new $SRC" diff --git a/source/base/usbutils/FrugalBuild b/source/base/usbutils/FrugalBuild deleted file mode 100644 index 606dc1a..0000000 --- a/source/base/usbutils/FrugalBuild +++ /dev/null @@ -1,26 +0,0 @@ -# Compiling Time: 0.02 SBU -# Maintainer: VMiklos - -pkgname=usbutils -pkgver=0.72 -pkgrel=1 -pkgdesc="USB utilities - lsusb,usbmodules" -_F_sourceforge_dirname="linux-usb" -Finclude sourceforge -url="http://www.linux-usb.org/" -depends=('libusb') -groups=('base') -archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3581&package_id=142529' |grep ]$pkgname-.*.tar.gz | head -n 1 | sed 's/.*usbutils-\(.*\).tar.gz.*/\1/'" -source=($source usb-update-pathfix.patch) -sha1sums=('891b8825d964880146d5c980e52bb9e23d92fe2b' \ - '8d13c50067d2db27d4b9001563dee9efb89106a4') - -build() { - Fsed "/usr/share/usb.ids" "/usr/share/usbutils/usb.ids" lsusb.8 - ./update-usbids.sh || Fdie - Fbuild --datadir=/usr/share/usbutils --enable-usbmodules - Fexerel update-usbids.sh /usr/sbin/update-usbids -} - -# optimization ok diff --git a/source/base/usbutils/usb-update-pathfix.patch b/source/base/usbutils/usb-update-pathfix.patch deleted file mode 100644 index cd805b9..0000000 --- a/source/base/usbutils/usb-update-pathfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur usbutils-0.71.orig/update-usbids.sh usbutils-0.71/update-usbids.sh ---- usbutils-0.71.orig/update-usbids.sh 2005-07-01 12:24:55.000000000 +0200 -+++ usbutils-0.71/update-usbids.sh 2005-07-01 12:29:57.000000000 +0200 -@@ -4,7 +4,7 @@ - - set -e - SRC="http://www.linux-usb.org/usb.ids" --DEST=usb.ids -+DEST=/usr/share/usbutils/usb.ids - - if which wget >/dev/null ; then - DL="wget -O $DEST.new $SRC" From vmiklos at frugalware.org Wed Aug 8 15:01:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 15:01:11 2007 Subject: [Frugalware-git] frugalware-current: popt-1.10.7-2-i686 Message-ID: <20070808130109.8D61213A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4f1f9ac6b7183bc7d65f8ef7891b47320ed121d3 commit 4f1f9ac6b7183bc7d65f8ef7891b47320ed121d3 Author: VMiklos Date: Wed Aug 8 15:00:54 2007 +0200 popt-1.10.7-2-i686 moved to base diff --git a/source/base/popt/FrugalBuild b/source/base/popt/FrugalBuild new file mode 100644 index 0000000..7d8d5fc --- /dev/null +++ b/source/base/popt/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.08 SBU +# Contributor: VMiklos +# Maintainer: voroskoi + +pkgname=popt +pkgver=1.10.7 +pkgrel=2 +pkgdesc="A commandline option parser" +url="http://freshmeat.net/projects/popt/" +depends=('glibc' 'gettext') +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) + +build() { + Fsed "@MARK64@" "" Makefile.am + Fbuild +} +sha1sums=('c1a22bd3b50b24f64654c69a6f91142ca54ca853') + +# optimization OK diff --git a/source/lib/popt/FrugalBuild b/source/lib/popt/FrugalBuild deleted file mode 100644 index 2256cf1..0000000 --- a/source/lib/popt/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling Time: 0.08 SBU -# Contributor: VMiklos -# Maintainer: voroskoi - -pkgname=popt -pkgver=1.10.7 -pkgrel=2 -pkgdesc="A commandline option parser" -url="http://freshmeat.net/projects/popt/" -depends=('glibc' 'gettext') -groups=('lib' '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) - -build() { - Fsed "@MARK64@" "" Makefile.am - Fbuild -} -sha1sums=('c1a22bd3b50b24f64654c69a6f91142ca54ca853') - -# optimization OK From vmiklos at frugalware.org Wed Aug 8 15:07:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 15:07:39 2007 Subject: [Frugalware-git] frugalware-current: gcc-4.2.1-2-i686 Message-ID: <20070808130738.B362013A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=692ed4312f86d645e589f5458c6a7cfd0a19a384 commit 692ed4312f86d645e589f5458c6a7cfd0a19a384 Author: VMiklos Date: Wed Aug 8 15:07:01 2007 +0200 gcc-4.2.1-2-i686 moved libstdc++ and libgcc to base diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index b7e0944..fcded49 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -39,7 +39,7 @@ subdepends=('glibc' 'libgcc' \ 'libgcc' "gcc=$pkgver libobjc" "gcc=$pkgver libobjc" \ "gcc=$pkgver" "glibc" "glibc" "glibc") subbackup=('' '' '' '' '' '' "usr/lib/gcj-$pkgver/classmap.db" '' '' '' '' '' '' '' '' '') -subgroups=('lib chroot-core' 'lib chroot-core' \ +subgroups=('base chroot-core' 'base chroot-core' \ 'lib-extra' 'devel-extra' \ 'lib-extra' 'devel-extra' \ 'lib' 'xlib' 'devel-extra' \ From vmiklos at frugalware.org Wed Aug 8 15:08:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 15:08:59 2007 Subject: [Frugalware-git] frugalware-current: alsa-firmware-1.0.14-1-i686 Message-ID: <20070808130857.BA6FA13A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=88298083e776b340e9aa1aa86ce5368eef1e641a commit 88298083e776b340e9aa1aa86ce5368eef1e641a Author: VMiklos Date: Wed Aug 8 15:08:42 2007 +0200 alsa-firmware-1.0.14-1-i686 moved to base diff --git a/source/base/alsa-firmware/FrugalBuild b/source/base/alsa-firmware/FrugalBuild new file mode 100644 index 0000000..04ec83e --- /dev/null +++ b/source/base/alsa-firmware/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.32 SBU +# Maintainer: VMiklos + +pkgname=alsa-firmware +pkgver=1.0.14 +pkgrel=1 +pkgdesc="Firmwares for ALSA." +url="http://www.alsa-project.org" +groups=('base') +archs=('i686' 'x86_64') +# we need the devel snapshot for kernel-2.6.21 +#up2date="lynx -dump $url |grep -om1 'alsa-firmware-\(.*\)tar.bz2'|sed 's/.*firmware-\(.*\).t.*/\1/'" +up2date="lynx -dump ftp://ftp.alsa-project.org/pub/firmware/|grep bz2$|sed 's/.*firmware-\(.*\).tar.bz2/\1/'|Fsort|tail -n 1" +source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2) +sha1sums=('ccc86da526b62aabb3119b5bf03a7e4de0133a9b') +# optimization OK diff --git a/source/multimedia/alsa-firmware/FrugalBuild b/source/multimedia/alsa-firmware/FrugalBuild deleted file mode 100644 index 600681f..0000000 --- a/source/multimedia/alsa-firmware/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.32 SBU -# Maintainer: VMiklos - -pkgname=alsa-firmware -pkgver=1.0.14 -pkgrel=1 -pkgdesc="Firmwares for ALSA." -url="http://www.alsa-project.org" -groups=('multimedia') -archs=('i686' 'x86_64') -# we need the devel snapshot for kernel-2.6.21 -#up2date="lynx -dump $url |grep -om1 'alsa-firmware-\(.*\)tar.bz2'|sed 's/.*firmware-\(.*\).t.*/\1/'" -up2date="lynx -dump ftp://ftp.alsa-project.org/pub/firmware/|grep bz2$|sed 's/.*firmware-\(.*\).tar.bz2/\1/'|Fsort|tail -n 1" -source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2) -sha1sums=('ccc86da526b62aabb3119b5bf03a7e4de0133a9b') -# optimization OK From vmiklos at frugalware.org Wed Aug 8 15:11:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 15:11:24 2007 Subject: [Frugalware-git] frugalware-current: texinfo-4.9-1-i686 Message-ID: <20070808131123.403B813A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d10692bf70ba8fbbc93ec060b76da54e858a7ba0 commit d10692bf70ba8fbbc93ec060b76da54e858a7ba0 Author: VMiklos Date: Wed Aug 8 15:11:11 2007 +0200 texinfo-4.9-1-i686 moved to base diff --git a/source/apps/texinfo/CVE-2006-4810.patch b/source/apps/texinfo/CVE-2006-4810.patch deleted file mode 100644 index f3dcc91..0000000 --- a/source/apps/texinfo/CVE-2006-4810.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- texinfo-4.7.orig/util/texindex.c -+++ texinfo-4.7/util/texindex.c -@@ -99,6 +99,9 @@ - /* Directory to use for temporary files. On Unix, it ends with a slash. */ - char *tempdir; - -+/* Start of filename to use for temporary files. */ -+char *tempbase; -+ - /* Number of last temporary file. */ - int tempcount; - -@@ -144,7 +147,7 @@ - void fatal (const char *format, const char *arg); - void error (const char *format, const char *arg); - void *xmalloc (), *xrealloc (); --char *concat (char *s1, char *s2); -+static char *concat3 (const char *, const char *, const char *); - void flush_tempfiles (int to_count); - - #define MAX_IN_CORE_SORT 500000 -@@ -190,6 +193,11 @@ - - decode_command (argc, argv); - -+ /* XXX mkstemp not appropriate, as we need to have somewhat predictable -+ * names. But race condition was fixed, see maketempname. -+ */ -+ tempbase = mktemp (concat3 ("txiXXXXXX", "", "")); -+ - /* Process input files completely, one by one. */ - - for (i = 0; i < num_infiles; i++) -@@ -220,7 +228,7 @@ - - outfile = outfiles[i]; - if (!outfile) -- outfile = concat (infiles[i], "s"); -+ outfile = concat3 (infiles[i], "s", ""); - - need_initials = 0; - first_initial = '\0'; -@@ -318,7 +326,7 @@ - if (tempdir == NULL) - tempdir = DEFAULT_TMPDIR; - else -- tempdir = concat (tempdir, "/"); -+ tempdir = concat3 (tempdir, "/", ""); - - keep_tempfiles = 0; - -@@ -384,26 +392,25 @@ - usage (1); - } - --/* Return a name for temporary file COUNT. */ -+/* Return a name for temporary file COUNT, or NULL if failure. */ - - static char * - maketempname (int count) - { -- static char *tempbase = NULL; - char tempsuffix[10]; -+ char *name; -+ int fd; - -- if (!tempbase) -+ sprintf (tempsuffix, ".%d", count); -+ name = concat3 (tempdir, tempbase, tempsuffix); -+ fd = open (name, O_CREAT|O_EXCL|O_WRONLY, 0600); -+ if (fd == -1) -+ return NULL; -+ else - { -- int fd; -- tempbase = concat (tempdir, "txidxXXXXXX"); -- -- fd = mkstemp (tempbase); -- if (fd == -1) -- pfatal_with_name (tempbase); -+ close(fd); -+ return(name); - } -- -- sprintf (tempsuffix, ".%d", count); -- return concat (tempbase, tempsuffix); - } - - -@@ -837,7 +844,7 @@ - { - buffer = (char *) xrealloc (buffer, linebuffer->size *= 2); - p += buffer - linebuffer->buffer; -- end += buffer - linebuffer->buffer; -+ end = buffer + linebuffer->size; - linebuffer->buffer = buffer; - } - if (c < 0 || c == '\n') -@@ -931,6 +938,8 @@ - for (i = 0; i < ntemps; i++) - { - char *newtemp = maketempname (++tempcount); -+ if (!newtemp) -+ pfatal_with_name("temp file"); - sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp); - if (!keep_tempfiles) - unlink (tempfiles[i]); -@@ -1401,6 +1410,8 @@ - if (i + 1 == ntemps) - nf = nfiles - i * MAX_DIRECT_MERGE; - tempfiles[i] = maketempname (++tempcount); -+ if (!tempfiles[i]) -+ pfatal_with_name("temp file"); - value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]); - } - -@@ -1612,17 +1623,18 @@ - } - - --/* Return a newly-allocated string concatenating S1 and S2. */ -+/* Return a newly-allocated string concatenating S1, S2, and S3. */ - --char * --concat (char *s1, char *s2) -+static char * -+concat3 (const char *s1, const char *s2, const char *s3) - { -- int len1 = strlen (s1), len2 = strlen (s2); -- char *result = (char *) xmalloc (len1 + len2 + 1); -+ int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3); -+ char *result = (char *) xmalloc (len1 + len2 + len3 + 1); - - strcpy (result, s1); - strcpy (result + len1, s2); -- *(result + len1 + len2) = 0; -+ strcpy (result + len1 + len2, s3); -+ *(result + len1 + len2 + len3) = 0; - - return result; - } diff --git a/source/apps/texinfo/FrugalBuild b/source/apps/texinfo/FrugalBuild deleted file mode 100644 index eba7526..0000000 --- a/source/apps/texinfo/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling time: 0.17 SBU -# Maintainer: crazy -# Contributor: Laszlo Dvornik - -pkgname=texinfo -pkgver=4.9 -pkgrel=1 -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') -groups=('apps' 'chroot-core') -archs=('i686' 'x86_64') -options=('force') -up2date="lynx -dump 'http://ftp.gnu.org/gnu/texinfo/?M=D'|grep tar.bz2|sed -n 's/.*-\(.*\).t.*/\1/;1 p'" -source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 mkinfodir CVE-2006-4810.patch) -sha1sums=('19a0cc0b56cbfcfe610925bef31e0bdf749492c9' \ - 'd744345f082e32af0675a0b9d3287c6b8d4600a7' \ - '8ab71e415364ca70dbc3ea1d028b1989860c9d8f') - - -build() -{ - Fbuild - Fexe /usr/bin/mkinfodir -} - -# optimization ok diff --git a/source/apps/texinfo/mkinfodir b/source/apps/texinfo/mkinfodir deleted file mode 100644 index 6eb0437..0000000 --- a/source/apps/texinfo/mkinfodir +++ /dev/null @@ -1,233 +0,0 @@ -#!/bin/bash -# $Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ -# Generate the top-level Info node, given a directory of Info files -# and (optionally) a skeleton file. The output will be suitable for a -# top-level dir file. The skeleton file contains info topic names in the -# order they should appear in the output. There are three special -# lines that alter the behavior: a line consisting of just "--" causes -# the next line to be echoed verbatim to the output. A line -# containing just "%%" causes all the remaining filenames (wildcards -# allowed) in the rest of the file to be ignored. A line containing -# just "!!" exits the script when reached (unless preceded by a line -# containing just "--"). Once the script reaches the end of the -# skeleton file, it goes through the remaining files in the directory -# in order, putting their entries at the end. The script will use the -# ENTRY information in each info file if it exists. Otherwise it will -# make a minimal entry. - -# sent by Jeffrey Osier , who thinks it came from -# zoo@winternet.com (david d `zoo' zuhn) - -# modified 7 April 1995 by Joe Harrington to -# take special flags - -INFODIR=$1 -if [ $# = 2 ] ; then - SKELETON=$2 -else - SKELETON=/dev/null -fi - -skip= - -if [ $# -gt 2 ] ; then - echo usage: $0 info-directory [ skeleton-file ] 1>&2 - exit 1 -elif [ -z "${INFODIR}" ] ; then - INFODIR="%%DEFAULT_INFO_DIR%%" -else - true -fi - -if [ ! -d ${INFODIR} ] ; then - echo "$0: first argument must specify a directory" - exit 1 -fi - -### output the dir header -echo "-*- Text -*-" -echo "This file was generated automatically by $0." -echo "This version was generated on `date`" -echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`" - -cat << moobler -\$Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ -This is the file .../info/dir, which contains the topmost node of the -Info hierarchy. The first time you invoke Info you start off -looking at that node, which is (dir)Top. - -File: dir Node: Top This is the top of the INFO tree - - This (the Directory node) gives a menu of major topics. - Typing "q" exits, "?" lists all Info commands, "d" returns here, - "h" gives a primer for first-timers, - "mEmacs" visits the Emacs topic, etc. - - In Emacs, you can click mouse button 2 on a menu item or cross reference - to select it. - -* Menu: The list of major topics begins on the next line. - -moobler - -### go through the list of files in the skeleton. If an info file -### exists, grab the ENTRY information from it. If an entry exists -### use it, otherwise create a minimal dir entry. -### -### Then remove that file from the list of existing files. If any -### additional files remain (ones that don't have a skeleton entry), -### then generate entries for those in the same way, putting the info for -### those at the end.... - -infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')` - -# echoing gets clobbered by backquotes; we do it the hard way... -lines=`wc $SKELETON | awk '{print $1}'` -line=1 -while [ $lines -ge $line ] ; do - # Read one line from the file. This is so that we can echo lines with - # whitespace and quoted characters in them. - fileline=`awk NR==$line $SKELETON` - - # flag fancy features - if [ ! -z "$echoline" ] ; then # echo line - echo "$fileline" - fileline= - echoline= - elif [ "${fileline}" = "--" ] ; then # should we echo the next line? - echoline=1 - elif [ "${fileline}" = "%%" ] ; then # eliminate remaining files from dir? - skip=1 - elif [ "${fileline}" = "!!" ] ; then # quit now - exit 0 - fi - - # handle files if they exist - for file in $fileline"" ; do # expand wildcards ("" handles blank lines) - - fname= - - if [ -z "$echoline" -a ! -z "$file" ] ; then - - # Find the file to operate upon. Check both possible names. - infoname=`echo $file | sed 's/\.gz$//'` - infoname=`echo $infoname | sed 's/\.info$//'` - noext= - ext= - if [ -f ${INFODIR}/$infoname ] ; then - noext=$infoname - fi - if [ -f ${INFODIR}/${infoname}.info ] ; then - ext=${infoname}.info - fi - if [ -f ${INFODIR}/${infoname}.info.gz ] ; then - ext=${infoname}.info.gz - fi - # If it exists with both names take what was said in the file. - if [ ! -z "$ext" -a ! -z "$noext" ]; then - fname=$file - warn="### Warning: $ext and $noext both exist! Using ${file}. ###" - elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then - # just take the name if it exists only once - fname=${noext}${ext} - fi - - # if we found something and aren't skipping, do the entry - if [ ! -z "$fname" ] ; then - if [ -z "$skip" ] ; then - - if [ ! -z "$warn" ] ; then # issue any warning - echo $warn - warn= - fi - if [ "${fname##*.}" = "gz" ] ; then - entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ` - else - entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname` - fi - if [ ! -z "${entry}" ] ; then - echo "${entry}" - else - echo "* ${infoname}: (${infoname})." - fi - fi - - # remove the name from the directory listing - infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/ / /g"` - - fi - - fi - - done - - line=`expr $line + 1` -done - -if [ -z "${infofiles}" ] ; then - exit 0 -elif [ $lines -gt 0 ]; then - echo -fi - -# Sort remaining files by INFO-DIR-SECTION. -prevsect= -filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \ - fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \ - sort -t: -k2 -k1 | tr ' ' '_')` -for sectdata in ${filesectdata}; do - file=`echo ${sectdata} | cut -d: -f1` - section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file} 2>/dev/null` - infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/ / /g"` - - if [ "${prevsect}" != "${section}" ] ; then - if [ ! -z "${prevsect}" ] ; then - echo "" - fi - echo "${section}" - prevsect="${section}" - fi - infoname=`echo $file | sed 's/\.gz$//'` - infoname=`echo $infoname | sed 's/\.info$//'` - if [ "${file##*.}" = "gz" ] ; then - entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ` - else - entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file 2>/dev/null` - fi - if [ ! -z "${entry}" ] ; then - echo "${entry}" - elif [ ! -d "${INFODIR}/${file}" ] ; then - echo "* ${infoname}: (${infoname})." - fi -done - -# Process miscellaneous files. -for file in ${infofiles}; do - if [ ! -z "${prevsect}" ] ; then - echo "" - echo "Miscellaneous" - prevsect="" - fi - - infoname=`echo $file | sed 's/\.gz$//'` - infoname=`echo $infoname | sed 's/\.info$//'` - if [ "${file##*.}" = "gz" ] ; then - entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d'` - else - entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file` - fi - - - if [ ! -z "${entry}" ] ; then - echo "${entry}" - elif [ ! -d "${INFODIR}/${file}" ] ; then - echo "* ${infoname}: (${infoname})." - fi -done - diff --git a/source/apps/texinfo/texinfo.install b/source/apps/texinfo/texinfo.install deleted file mode 100644 index 766019d..0000000 --- a/source/apps/texinfo/texinfo.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() -{ - echo -n "generating the top-level Info node... " - mkinfodir /usr/info > /usr/info/dir 2>/dev/null - echo "done." -} - -post_upgrade() -{ - post_install -} - -pre_remove() -{ - echo -n "removing the top-level Info node... " - rm -f /usr/info/dir - echo "done." -} - -op=$1 -shift - -$op $* - -# vim: ft=sh diff --git a/source/base/texinfo/CVE-2006-4810.patch b/source/base/texinfo/CVE-2006-4810.patch new file mode 100644 index 0000000..f3dcc91 --- /dev/null +++ b/source/base/texinfo/CVE-2006-4810.patch @@ -0,0 +1,141 @@ +--- texinfo-4.7.orig/util/texindex.c ++++ texinfo-4.7/util/texindex.c +@@ -99,6 +99,9 @@ + /* Directory to use for temporary files. On Unix, it ends with a slash. */ + char *tempdir; + ++/* Start of filename to use for temporary files. */ ++char *tempbase; ++ + /* Number of last temporary file. */ + int tempcount; + +@@ -144,7 +147,7 @@ + void fatal (const char *format, const char *arg); + void error (const char *format, const char *arg); + void *xmalloc (), *xrealloc (); +-char *concat (char *s1, char *s2); ++static char *concat3 (const char *, const char *, const char *); + void flush_tempfiles (int to_count); + + #define MAX_IN_CORE_SORT 500000 +@@ -190,6 +193,11 @@ + + decode_command (argc, argv); + ++ /* XXX mkstemp not appropriate, as we need to have somewhat predictable ++ * names. But race condition was fixed, see maketempname. ++ */ ++ tempbase = mktemp (concat3 ("txiXXXXXX", "", "")); ++ + /* Process input files completely, one by one. */ + + for (i = 0; i < num_infiles; i++) +@@ -220,7 +228,7 @@ + + outfile = outfiles[i]; + if (!outfile) +- outfile = concat (infiles[i], "s"); ++ outfile = concat3 (infiles[i], "s", ""); + + need_initials = 0; + first_initial = '\0'; +@@ -318,7 +326,7 @@ + if (tempdir == NULL) + tempdir = DEFAULT_TMPDIR; + else +- tempdir = concat (tempdir, "/"); ++ tempdir = concat3 (tempdir, "/", ""); + + keep_tempfiles = 0; + +@@ -384,26 +392,25 @@ + usage (1); + } + +-/* Return a name for temporary file COUNT. */ ++/* Return a name for temporary file COUNT, or NULL if failure. */ + + static char * + maketempname (int count) + { +- static char *tempbase = NULL; + char tempsuffix[10]; ++ char *name; ++ int fd; + +- if (!tempbase) ++ sprintf (tempsuffix, ".%d", count); ++ name = concat3 (tempdir, tempbase, tempsuffix); ++ fd = open (name, O_CREAT|O_EXCL|O_WRONLY, 0600); ++ if (fd == -1) ++ return NULL; ++ else + { +- int fd; +- tempbase = concat (tempdir, "txidxXXXXXX"); +- +- fd = mkstemp (tempbase); +- if (fd == -1) +- pfatal_with_name (tempbase); ++ close(fd); ++ return(name); + } +- +- sprintf (tempsuffix, ".%d", count); +- return concat (tempbase, tempsuffix); + } + + +@@ -837,7 +844,7 @@ + { + buffer = (char *) xrealloc (buffer, linebuffer->size *= 2); + p += buffer - linebuffer->buffer; +- end += buffer - linebuffer->buffer; ++ end = buffer + linebuffer->size; + linebuffer->buffer = buffer; + } + if (c < 0 || c == '\n') +@@ -931,6 +938,8 @@ + for (i = 0; i < ntemps; i++) + { + char *newtemp = maketempname (++tempcount); ++ if (!newtemp) ++ pfatal_with_name("temp file"); + sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp); + if (!keep_tempfiles) + unlink (tempfiles[i]); +@@ -1401,6 +1410,8 @@ + if (i + 1 == ntemps) + nf = nfiles - i * MAX_DIRECT_MERGE; + tempfiles[i] = maketempname (++tempcount); ++ if (!tempfiles[i]) ++ pfatal_with_name("temp file"); + value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]); + } + +@@ -1612,17 +1623,18 @@ + } + + +-/* Return a newly-allocated string concatenating S1 and S2. */ ++/* Return a newly-allocated string concatenating S1, S2, and S3. */ + +-char * +-concat (char *s1, char *s2) ++static char * ++concat3 (const char *s1, const char *s2, const char *s3) + { +- int len1 = strlen (s1), len2 = strlen (s2); +- char *result = (char *) xmalloc (len1 + len2 + 1); ++ int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3); ++ char *result = (char *) xmalloc (len1 + len2 + len3 + 1); + + strcpy (result, s1); + strcpy (result + len1, s2); +- *(result + len1 + len2) = 0; ++ strcpy (result + len1 + len2, s3); ++ *(result + len1 + len2 + len3) = 0; + + return result; + } diff --git a/source/base/texinfo/FrugalBuild b/source/base/texinfo/FrugalBuild new file mode 100644 index 0000000..eba7526 --- /dev/null +++ b/source/base/texinfo/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling time: 0.17 SBU +# Maintainer: crazy +# Contributor: Laszlo Dvornik + +pkgname=texinfo +pkgver=4.9 +pkgrel=1 +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') +groups=('apps' 'chroot-core') +archs=('i686' 'x86_64') +options=('force') +up2date="lynx -dump 'http://ftp.gnu.org/gnu/texinfo/?M=D'|grep tar.bz2|sed -n 's/.*-\(.*\).t.*/\1/;1 p'" +source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 mkinfodir CVE-2006-4810.patch) +sha1sums=('19a0cc0b56cbfcfe610925bef31e0bdf749492c9' \ + 'd744345f082e32af0675a0b9d3287c6b8d4600a7' \ + '8ab71e415364ca70dbc3ea1d028b1989860c9d8f') + + +build() +{ + Fbuild + Fexe /usr/bin/mkinfodir +} + +# optimization ok diff --git a/source/base/texinfo/mkinfodir b/source/base/texinfo/mkinfodir new file mode 100644 index 0000000..6eb0437 --- /dev/null +++ b/source/base/texinfo/mkinfodir @@ -0,0 +1,233 @@ +#!/bin/bash +# $Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ +# Generate the top-level Info node, given a directory of Info files +# and (optionally) a skeleton file. The output will be suitable for a +# top-level dir file. The skeleton file contains info topic names in the +# order they should appear in the output. There are three special +# lines that alter the behavior: a line consisting of just "--" causes +# the next line to be echoed verbatim to the output. A line +# containing just "%%" causes all the remaining filenames (wildcards +# allowed) in the rest of the file to be ignored. A line containing +# just "!!" exits the script when reached (unless preceded by a line +# containing just "--"). Once the script reaches the end of the +# skeleton file, it goes through the remaining files in the directory +# in order, putting their entries at the end. The script will use the +# ENTRY information in each info file if it exists. Otherwise it will +# make a minimal entry. + +# sent by Jeffrey Osier , who thinks it came from +# zoo@winternet.com (david d `zoo' zuhn) + +# modified 7 April 1995 by Joe Harrington to +# take special flags + +INFODIR=$1 +if [ $# = 2 ] ; then + SKELETON=$2 +else + SKELETON=/dev/null +fi + +skip= + +if [ $# -gt 2 ] ; then + echo usage: $0 info-directory [ skeleton-file ] 1>&2 + exit 1 +elif [ -z "${INFODIR}" ] ; then + INFODIR="%%DEFAULT_INFO_DIR%%" +else + true +fi + +if [ ! -d ${INFODIR} ] ; then + echo "$0: first argument must specify a directory" + exit 1 +fi + +### output the dir header +echo "-*- Text -*-" +echo "This file was generated automatically by $0." +echo "This version was generated on `date`" +echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`" + +cat << moobler +\$Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ +This is the file .../info/dir, which contains the topmost node of the +Info hierarchy. The first time you invoke Info you start off +looking at that node, which is (dir)Top. + +File: dir Node: Top This is the top of the INFO tree + + This (the Directory node) gives a menu of major topics. + Typing "q" exits, "?" lists all Info commands, "d" returns here, + "h" gives a primer for first-timers, + "mEmacs" visits the Emacs topic, etc. + + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. + +* Menu: The list of major topics begins on the next line. + +moobler + +### go through the list of files in the skeleton. If an info file +### exists, grab the ENTRY information from it. If an entry exists +### use it, otherwise create a minimal dir entry. +### +### Then remove that file from the list of existing files. If any +### additional files remain (ones that don't have a skeleton entry), +### then generate entries for those in the same way, putting the info for +### those at the end.... + +infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')` + +# echoing gets clobbered by backquotes; we do it the hard way... +lines=`wc $SKELETON | awk '{print $1}'` +line=1 +while [ $lines -ge $line ] ; do + # Read one line from the file. This is so that we can echo lines with + # whitespace and quoted characters in them. + fileline=`awk NR==$line $SKELETON` + + # flag fancy features + if [ ! -z "$echoline" ] ; then # echo line + echo "$fileline" + fileline= + echoline= + elif [ "${fileline}" = "--" ] ; then # should we echo the next line? + echoline=1 + elif [ "${fileline}" = "%%" ] ; then # eliminate remaining files from dir? + skip=1 + elif [ "${fileline}" = "!!" ] ; then # quit now + exit 0 + fi + + # handle files if they exist + for file in $fileline"" ; do # expand wildcards ("" handles blank lines) + + fname= + + if [ -z "$echoline" -a ! -z "$file" ] ; then + + # Find the file to operate upon. Check both possible names. + infoname=`echo $file | sed 's/\.gz$//'` + infoname=`echo $infoname | sed 's/\.info$//'` + noext= + ext= + if [ -f ${INFODIR}/$infoname ] ; then + noext=$infoname + fi + if [ -f ${INFODIR}/${infoname}.info ] ; then + ext=${infoname}.info + fi + if [ -f ${INFODIR}/${infoname}.info.gz ] ; then + ext=${infoname}.info.gz + fi + # If it exists with both names take what was said in the file. + if [ ! -z "$ext" -a ! -z "$noext" ]; then + fname=$file + warn="### Warning: $ext and $noext both exist! Using ${file}. ###" + elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then + # just take the name if it exists only once + fname=${noext}${ext} + fi + + # if we found something and aren't skipping, do the entry + if [ ! -z "$fname" ] ; then + if [ -z "$skip" ] ; then + + if [ ! -z "$warn" ] ; then # issue any warning + echo $warn + warn= + fi + if [ "${fname##*.}" = "gz" ] ; then + entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ + -e '/END-INFO-DIR-ENTRY/,$d' ` + else + entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ + -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname` + fi + if [ ! -z "${entry}" ] ; then + echo "${entry}" + else + echo "* ${infoname}: (${infoname})." + fi + fi + + # remove the name from the directory listing + infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/ / /g"` + + fi + + fi + + done + + line=`expr $line + 1` +done + +if [ -z "${infofiles}" ] ; then + exit 0 +elif [ $lines -gt 0 ]; then + echo +fi + +# Sort remaining files by INFO-DIR-SECTION. +prevsect= +filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \ + fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \ + sort -t: -k2 -k1 | tr ' ' '_')` +for sectdata in ${filesectdata}; do + file=`echo ${sectdata} | cut -d: -f1` + section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file} 2>/dev/null` + infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/ / /g"` + + if [ "${prevsect}" != "${section}" ] ; then + if [ ! -z "${prevsect}" ] ; then + echo "" + fi + echo "${section}" + prevsect="${section}" + fi + infoname=`echo $file | sed 's/\.gz$//'` + infoname=`echo $infoname | sed 's/\.info$//'` + if [ "${file##*.}" = "gz" ] ; then + entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \ + -e '/END-INFO-DIR-ENTRY/,$d' ` + else + entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ + -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file 2>/dev/null` + fi + if [ ! -z "${entry}" ] ; then + echo "${entry}" + elif [ ! -d "${INFODIR}/${file}" ] ; then + echo "* ${infoname}: (${infoname})." + fi +done + +# Process miscellaneous files. +for file in ${infofiles}; do + if [ ! -z "${prevsect}" ] ; then + echo "" + echo "Miscellaneous" + prevsect="" + fi + + infoname=`echo $file | sed 's/\.gz$//'` + infoname=`echo $infoname | sed 's/\.info$//'` + if [ "${file##*.}" = "gz" ] ; then + entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ + -e '/END-INFO-DIR-ENTRY/,$d'` + else + entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ + -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file` + fi + + + if [ ! -z "${entry}" ] ; then + echo "${entry}" + elif [ ! -d "${INFODIR}/${file}" ] ; then + echo "* ${infoname}: (${infoname})." + fi +done + diff --git a/source/base/texinfo/texinfo.install b/source/base/texinfo/texinfo.install new file mode 100644 index 0000000..766019d --- /dev/null +++ b/source/base/texinfo/texinfo.install @@ -0,0 +1,25 @@ +post_install() +{ + echo -n "generating the top-level Info node... " + mkinfodir /usr/info > /usr/info/dir 2>/dev/null + echo "done." +} + +post_upgrade() +{ + post_install +} + +pre_remove() +{ + echo -n "removing the top-level Info node... " + rm -f /usr/info/dir + echo "done." +} + +op=$1 +shift + +$op $* + +# vim: ft=sh From vmiklos at frugalware.org Wed Aug 8 15:14:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 15:14:48 2007 Subject: [Frugalware-git] frugalware-current: texinfo-4.9-1-i686 Message-ID: <20070808131447.6EFE513A4069@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=74a8bd8a432109c29e664e0351b4fa4f7f58c520 commit 74a8bd8a432109c29e664e0351b4fa4f7f58c520 Author: VMiklos Date: Wed Aug 8 15:14:42 2007 +0200 texinfo-4.9-1-i686 forgot to update groups() diff --git a/source/base/texinfo/FrugalBuild b/source/base/texinfo/FrugalBuild index eba7526..b40c05e 100644 --- a/source/base/texinfo/FrugalBuild +++ b/source/base/texinfo/FrugalBuild @@ -10,7 +10,7 @@ url="http://www.gnu.org/software/texinfo/" depends=('ncurses' 'net-tools' 'grep' 'sed' 'udev' 'gawk') rodepends=('shadow') makedepends=('bison') -groups=('apps' 'chroot-core') +groups=('base' 'chroot-core') archs=('i686' 'x86_64') options=('force') up2date="lynx -dump 'http://ftp.gnu.org/gnu/texinfo/?M=D'|grep tar.bz2|sed -n 's/.*-\(.*\).t.*/\1/;1 p'" From vmiklos at frugalware.org Wed Aug 8 15:26:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 15:26:41 2007 Subject: [Frugalware-git] frugalware-current: glib2-2.12.13-1-i686 Message-ID: <20070808132638.CD68C13A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=71a37cd2a2dd33f11f5fee16b0e65ae24bf4f0e2 commit 71a37cd2a2dd33f11f5fee16b0e65ae24bf4f0e2 Author: VMiklos Date: Wed Aug 8 15:26:09 2007 +0200 glib2-2.12.13-1-i686 moved to base diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild new file mode 100644 index 0000000..bc2eec8 --- /dev/null +++ b/source/base/glib2/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling time: 3.33 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=glib2 +pkgver=2.12.13 +pkgrel=1 +pkgdesc="Common C routines used by GTK+2 and other libraries" +url="http://www.gtk.org/" +depends=('glibc') +makedepends=('gtk-doc') +groups=('base' 'chroot-core') +archs=('i686' 'x86_64') +options=('scriptlet') +_F_gnome_name="glib" +_F_gnome_devel="n" +Finclude gnome +_F_cd_path="glib-$pkgver" +Fconfopts="$Fconfopts --enable-gtk-doc --enable-static" +sha1sums=('81ce0e53f5583be970623d12523c785a392647bf') + +# optimization OK diff --git a/source/lib/glib2/FrugalBuild b/source/lib/glib2/FrugalBuild deleted file mode 100644 index 8afc529..0000000 --- a/source/lib/glib2/FrugalBuild +++ /dev/null @@ -1,21 +0,0 @@ -# Compiling time: 3.33 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=glib2 -pkgver=2.12.13 -pkgrel=1 -pkgdesc="Common C routines used by GTK+2 and other libraries" -url="http://www.gtk.org/" -depends=('glibc') -makedepends=('gtk-doc') -groups=('lib' 'chroot-core') -archs=('i686' 'x86_64') -options=('scriptlet') -_F_gnome_name="glib" -_F_gnome_devel="n" -Finclude gnome -_F_cd_path="glib-$pkgver" -Fconfopts="$Fconfopts --enable-gtk-doc --enable-static" -sha1sums=('81ce0e53f5583be970623d12523c785a392647bf') - -# optimization OK From priyank at frugalware.org Wed Aug 8 15:55:52 2007 From: priyank at frugalware.org (Priyank) Date: Wed Aug 8 15:55:53 2007 Subject: [Frugalware-git] frugalware-current: tea-17.1.4-1-i686 Message-ID: <20070808135552.603A113A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a357fb7f520c7e65edf12db99eda1c45ecef3aae commit a357fb7f520c7e65edf12db99eda1c45ecef3aae Author: Priyank Date: Wed Aug 8 19:21:43 2007 +0530 tea-17.1.4-1-i686 * Version bump diff --git a/source/gnome-extra/tea/FrugalBuild b/source/gnome-extra/tea/FrugalBuild index 3a1c2e3..093b953 100644 --- a/source/gnome-extra/tea/FrugalBuild +++ b/source/gnome-extra/tea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tea -pkgver=17.1.0 +pkgver=17.1.4 pkgrel=1 pkgdesc="TEA is a GTK2-based text editor for Linux and *BSD." _F_sourceforge_name=tea-editor @@ -19,7 +19,7 @@ _F_desktop_name=Tea _F_desktop_icon=tea.png _F_desktop_categories="Utility;Editor;" _F_cd_path="$pkgname-$pkgver" -sha1sums=('49d45c848b576e7a681daa559536bfc953134bd1') +sha1sums=('0dbe9a932cdb5268f1558eafb50de3510a4e6cf2') build() { From vmiklos at frugalware.org Wed Aug 8 17:16:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 17:16:44 2007 Subject: [Frugalware-git] frugalware-current: parted-1.8.7-1-i686 Message-ID: <20070808151641.09B2713A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0f8abb77bf77200dbd25734e4bab7e0896e081a6 commit 0f8abb77bf77200dbd25734e4bab7e0896e081a6 Author: VMiklos Date: Wed Aug 8 17:15:55 2007 +0200 parted-1.8.7-1-i686 moved to base diff --git a/source/apps/parted/FrugalBuild b/source/apps/parted/FrugalBuild deleted file mode 100644 index 5001e71..0000000 --- a/source/apps/parted/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling Time: 0.29 SBU -# Maintainer: VMiklos - -pkgname=parted -pkgver=1.8.7 -pkgrel=1 -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') -groups=('apps') -archs=('i686' 'x86_64') -up2date="lynx -dump 'http://ftp.gnu.org/gnu/parted/?M=D'|grep parted-[0-9\.]*tar.gz$|sed -n -e 's/.*parted-\(.*\)\.tar\.gz$/\1/' -e '1 p'" -source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -signatures=($source.sig) -Fconfopts="$Fconfopts --disable-Werror --with-readline" -Finclude texinfo -# optimization OK diff --git a/source/base/parted/FrugalBuild b/source/base/parted/FrugalBuild new file mode 100644 index 0000000..0059509 --- /dev/null +++ b/source/base/parted/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.29 SBU +# Maintainer: VMiklos + +pkgname=parted +pkgver=1.8.7 +pkgrel=1 +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') +groups=('base') +archs=('i686' 'x86_64') +up2date="lynx -dump 'http://ftp.gnu.org/gnu/parted/?M=D'|grep parted-[0-9\.]*tar.gz$|sed -n -e 's/.*parted-\(.*\)\.tar\.gz$/\1/' -e '1 p'" +source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +signatures=($source.sig) +Fconfopts="$Fconfopts --disable-Werror --with-readline" +Finclude texinfo +# optimization OK From vmiklos at frugalware.org Wed Aug 8 17:18:11 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 17:18:13 2007 Subject: [Frugalware-git] frugalware-current: pcre-7.2-1-i686 Message-ID: <20070808151811.DB5B113A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=deabeaa3d12abe440fed54c819c4c9ca0da306f4 commit deabeaa3d12abe440fed54c819c4c9ca0da306f4 Author: VMiklos Date: Wed Aug 8 17:17:45 2007 +0200 pcre-7.2-1-i686 moved to base diff --git a/source/base/pcre/FrugalBuild b/source/base/pcre/FrugalBuild new file mode 100644 index 0000000..9b02ff9 --- /dev/null +++ b/source/base/pcre/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.29 SBU +# Contributor: VMiklos +# Maintainer: voroskoi + +pkgname=pcre +pkgver=7.2 +pkgrel=1 +pkgdesc="Perl-compatible regular expression library" +url="http://pcre.sourceforge.net" +groups=('base' 'chroot-core') +archs=('i686' 'x86_64' 'ppc') +depends=('glibc' 'libstdc++' 'libgcc') +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" +options=('nodocs') +signatures=($source.sig) + +# optimization OK diff --git a/source/lib/pcre/FrugalBuild b/source/lib/pcre/FrugalBuild deleted file mode 100644 index 561498a..0000000 --- a/source/lib/pcre/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling Time: 0.29 SBU -# Contributor: VMiklos -# Maintainer: voroskoi - -pkgname=pcre -pkgver=7.2 -pkgrel=1 -pkgdesc="Perl-compatible regular expression library" -url="http://pcre.sourceforge.net" -groups=('lib' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') -depends=('glibc' 'libstdc++' 'libgcc') -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" -options=('nodocs') -signatures=($source.sig) - -# optimization OK From vmiklos at frugalware.org Wed Aug 8 17:19:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 17:19:55 2007 Subject: [Frugalware-git] frugalware-current: groff-1.19.2-2-i686 Message-ID: <20070808151953.5826C13A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=30ffa3cea58480dc37b5cae7e506012e7517e9d9 commit 30ffa3cea58480dc37b5cae7e506012e7517e9d9 Author: VMiklos Date: Wed Aug 8 17:19:29 2007 +0200 groff-1.19.2-2-i686 moved to base diff --git a/source/apps/groff/FrugalBuild b/source/apps/groff/FrugalBuild deleted file mode 100644 index 525fec2..0000000 --- a/source/apps/groff/FrugalBuild +++ /dev/null @@ -1,27 +0,0 @@ -# Compiling Time: 0.48 SBU -# Maintainer: VMiklos - -pkgname=groff -pkgver=1.19.2 -pkgrel=2 -pkgdesc="GNU troff text-formatting system" -url="http://www.gnu.org/software/groff/groff.html" -depends=('perl' 'libstdc++') -groups=('apps') -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'" -source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz) -sha1sums=('cfad99a5c52933a6a9180e394bd94fbaec0ac956') - -build() -{ - unset MAKEFLAGS - Fmkdir /usr - Fbuild - Fln eqn /usr/bin/geqn - Fln tbl /usr/bin/gtbl - Fln soelim /usr/bin/zsoelim - Frm /usr/lib -} - -# optimization OK diff --git a/source/base/groff/FrugalBuild b/source/base/groff/FrugalBuild new file mode 100644 index 0000000..debe9b0 --- /dev/null +++ b/source/base/groff/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.48 SBU +# Maintainer: VMiklos + +pkgname=groff +pkgver=1.19.2 +pkgrel=2 +pkgdesc="GNU troff text-formatting system" +url="http://www.gnu.org/software/groff/groff.html" +depends=('perl' 'libstdc++') +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'" +source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz) +sha1sums=('cfad99a5c52933a6a9180e394bd94fbaec0ac956') + +build() +{ + unset MAKEFLAGS + Fmkdir /usr + Fbuild + Fln eqn /usr/bin/geqn + Fln tbl /usr/bin/gtbl + Fln soelim /usr/bin/zsoelim + Frm /usr/lib +} + +# optimization OK From vmiklos at frugalware.org Wed Aug 8 17:21:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 17:21:28 2007 Subject: [Frugalware-git] frugalware-current: libarchive-2.2.6-1-i686 Message-ID: <20070808152127.C61D413A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5dff2a7804f4d9eea2a08240a366ff2619392665 commit 5dff2a7804f4d9eea2a08240a366ff2619392665 Author: VMiklos Date: Wed Aug 8 17:21:04 2007 +0200 libarchive-2.2.6-1-i686 moved to base diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild new file mode 100644 index 0000000..df9a93f --- /dev/null +++ b/source/base/libarchive/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.30 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=libarchive +pkgver=2.2.6 +pkgrel=1 +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') +up2date="lynx -dump $url |Flasttar" +source=($url/src/$pkgname-$pkgver.tar.gz) +sha1sums=('3e8b69479c1f9beaf01d3b1672573ac33a74b120') +# optimization OK diff --git a/source/lib/libarchive/FrugalBuild b/source/lib/libarchive/FrugalBuild deleted file mode 100644 index 1fd8ecc..0000000 --- a/source/lib/libarchive/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.30 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=libarchive -pkgver=2.2.6 -pkgrel=1 -pkgdesc="Library to create and read several different archive formats" -groups=('lib' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') -url="http://people.freebsd.org/~kientzle/libarchive/" -depends=('bzip2' 'zlib') -up2date="lynx -dump $url |Flasttar" -source=($url/src/$pkgname-$pkgver.tar.gz) -sha1sums=('3e8b69479c1f9beaf01d3b1672573ac33a74b120') -# optimization OK From vmiklos at frugalware.org Wed Aug 8 17:23:30 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 17:23:35 2007 Subject: [Frugalware-git] frugalware-current: sysfsutils-2.1.0-1-i686 Message-ID: <20070808152330.5A0BB13A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=00135db2b16f770dc67a777b1f4627b991bd0d29 commit 00135db2b16f770dc67a777b1f4627b991bd0d29 Author: VMiklos Date: Wed Aug 8 17:23:05 2007 +0200 sysfsutils-2.1.0-1-i686 moved to base diff --git a/source/apps/sysfsutils/FrugalBuild b/source/apps/sysfsutils/FrugalBuild deleted file mode 100644 index 3e772bc..0000000 --- a/source/apps/sysfsutils/FrugalBuild +++ /dev/null @@ -1,17 +0,0 @@ -# Compiling Time: 0.12 SBU -# Maintainer: VMiklos - -pkgname=sysfsutils -pkgver=2.1.0 -pkgrel=1 -pkgdesc="System utilities based on sysfs" -_F_sourceforge_dirname="linux-diag" -Finclude sourceforge -url="http://linux-diag.sourceforge.net/Sysfsutils.html" -depends=('glibc') -groups=('apps') -archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep '* v\. [0-9\._]* '|sed -n -e 's/.*v\. \([0-9\.]*\) .*/\1/' -e '1 p'" -sha1sums=('b3cb316c652b09ec66f93f4ea98a93a7a1001678') - -# optimization OK diff --git a/source/base/sysfsutils/FrugalBuild b/source/base/sysfsutils/FrugalBuild new file mode 100644 index 0000000..53e790d --- /dev/null +++ b/source/base/sysfsutils/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.12 SBU +# Maintainer: VMiklos + +pkgname=sysfsutils +pkgver=2.1.0 +pkgrel=1 +pkgdesc="System utilities based on sysfs" +_F_sourceforge_dirname="linux-diag" +Finclude sourceforge +url="http://linux-diag.sourceforge.net/Sysfsutils.html" +depends=('glibc') +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'" +sha1sums=('b3cb316c652b09ec66f93f4ea98a93a7a1001678') + +# optimization OK From vmiklos at frugalware.org Wed Aug 8 17:26:01 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Aug 8 17:26:13 2007 Subject: [Frugalware-git] frugalware-current: netkit-base-0.17-4-i686 Message-ID: <20070808152601.42BBB13A4021@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5225f703e998fc5c436c3bde2b778daa67b0ce25 commit 5225f703e998fc5c436c3bde2b778daa67b0ce25 Author: VMiklos Date: Wed Aug 8 17:25:35 2007 +0200 netkit-base-0.17-4-i686 moved to base diff --git a/source/base/netkit-base/FrugalBuild b/source/base/netkit-base/FrugalBuild new file mode 100644 index 0000000..dcef5ea --- /dev/null +++ b/source/base/netkit-base/FrugalBuild @@ -0,0 +1,41 @@ +# Compiling Time: 0.03 SBU +# Contributor: VMiklos +# Maintainer: Zsolt Szalai + +pkgname=netkit-base +pkgver=0.17 +pkgrel=4 +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') +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 \ + protocols services netdate.tar.gz netdate.diff) +sha1sums=('d1f610efa3320ecac75c2f13df8a45c84fc7d448' \ + '36e00edc99e7a869f1b5584f2080323b70938807' \ + '5c8348adb79fdd86fd2f6685e01920ff13c823fe' \ + '08cabf0acb67286536478a0f43c3072d6133c513' \ + 'f63ad8c3815d7ada3bd9deb0097038622e94f9f6') + +build() { + cd $startdir/src/netkit-base-$pkgver + sed -i 's/localhost/localhost frugalware.local frugalware/' \ + etc.sample/hosts + + mkdir -p $startdir/pkg/{bin,etc} $startdir/pkg/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 + + cd ../netdate + patch -p1 < $startdir/src/netdate.diff + make + make DESTDIR=$startdir/pkg install +} + +# optimization OK diff --git a/source/base/netkit-base/netdate.diff b/source/base/netkit-base/netdate.diff new file mode 100644 index 0000000..7461ab3 --- /dev/null +++ b/source/base/netkit-base/netdate.diff @@ -0,0 +1,277 @@ +diff -Naur netdate.orig/Makefile netdate/Makefile +--- netdate.orig/Makefile 1996-08-14 19:19:54.000000000 +0200 ++++ netdate/Makefile 2004-07-19 15:29:12.000000000 +0200 +@@ -1,14 +1,14 @@ +-LDFLAGS += -N +-CFLAGS = $(O) -Wall ++ ++CC = gcc + + all: netdate + + netdate: netdate.o + + install: netdate +- install -s -m 0755 netdate /sbin/netdate +- install -m 0644 netdate.8 /usr/man/man8 ++ install -s netdate $(DESTDIR)/usr/sbin/netdate ++ install -m 0644 netdate.8 $(DESTDIR)/usr/man/man8/netdate.8 + + clean: +- rm -f netdate *.o core ++ rm -f netdate *~ *.o core + +diff -Naur netdate.orig/netdate.8 netdate/netdate.8 +--- netdate.orig/netdate.8 1996-08-14 19:19:54.000000000 +0200 ++++ netdate/netdate.8 2004-07-19 15:27:44.000000000 +0200 +@@ -53,40 +53,41 @@ + if that host supplies it. + .SH EXAMPLE + The most accurate hosts are named first in each example. +-Some such call on \fInetdate\fP should be put at the end of \fB/etc/rc.local\fP, ++Some such call on \fInetdate\fP should be put at the end of ++\fB/etc/rc.d/rc.local\fP, + so that the time will be set properly on system startup. +-It is also useful to have a shell script, e.g., \fB/etc/timehosts\fP, ++It is also useful to have a shell script, e.g., \fB/sbin/timehosts\fP, + which contains a call on \fInetdate\fP with arguments appropriate + to the local system, so that it is easy to set the time manually. +-.SH "netdate -l 30 udp dcn\-gateway tcp neighbor" +-\fIDcn\-gateway\fP is a hypothetical host which usually keeps time ++.SH "netdate -l 30 udp dcn\-gate tcp neighbor" ++\fIDcn\-gate\fP is a hypothetical host which usually keeps time + accurate to within milliseconds of Coordinated Universal Time, + but may occasionally be eight hours off. + \fINeighbor\fP is a neighbor of the local host which keeps time + with moderate accuracy. +-The time will be set to that of \fIdcn\-gateway\fP if that and \fIneighbor\fP ++The time will be set to that of \fIdcn\-gate\fP if that and \fIneighbor\fP + agree to within thirty seconds, else it will not be set at all. + This is almost good enough for most circumstances, but won't do + when the local host's time is known to be wrong (e.g., after + a long downtime or a bad crash) and must be set to something. + If one of the hosts named is inaccurate or not responding, there is a problem. +-.SH "netdate -l 30 udp dcn\-gateway tcp neighbor neighbor2" ++.SH "netdate -l 30 udp dcn\-gate tcp neighbor neighbor2" + Only two of the three hosts named must agree on the time. + The time will still be set (to that of the first neighbor), +-even if \fIdcn\-gateway\fP is far off as long as the two neighbors agree. ++even if \fIdcn\-gate\fP is far off as long as the two neighbors agree. + This is probably good enough for most cases. + One can arbitrarily gerrymander the vote for more insurance + (and less clarity), as in the following example. +-.SH "netdate\ udp\ dcn\-gateway\ dcn1\ tcp\ bbn\-unix\ localhost\ neighbor" ++.SH "netdate\ udp\ dcn\-gate\ dcn1\ tcp\ bbn\-unix\ localhost\ neighbor" + Here \fIdcn1\fP and \fIbbn\-unix\fP are more hypothetical very accurate + timekeepers, at least one of which keeps time independently from +-\fIdcn\-gateway\fP, one hopes. ++\fIdcn\-gate\fP, one hopes. + It is very likely that the time will be set to that one of those three + very accurate hosts, as long as at least two of them agree, or at least + one of them agrees with the neighbor or the local host's time. + If all the foreign hosts disagree, the time will not be set, + since \fBlocalhost\fP will be chosen as best. +-.SH "netdate\ \-l\ 3\ localhost\ localhost\ udp\ dcn\-gateway\ dcn1\ tcp\ bbn\-unix" ++.SH "netdate\ \-l\ 3\ localhost\ localhost\ udp\ dcn\-gate\ dcn1\ tcp\ bbn\-unix" + This example gives \fBlocalhost\fP two votes and declares it to usually + have the most accurate time. + All three foreign hosts must agree within three seconds +@@ -95,9 +96,9 @@ + Thus the time will be set only if it really needs to be. + .SH FILES + .nf +-/etc/inet/services for the time service port number +-/etc/inet/protocols for the protocol numbers +-/etc/wtmp to record time-setting ++/etc/services for the time service port number ++/etc/protocols for the protocol numbers ++/var/log/wtmp to record time-setting + .SH SEE ALSO + ARPANET Request for Comments 868, gettimeofday(2), date(1), + WWV (USA): +diff -Naur netdate.orig/netdate.c netdate/netdate.c +--- netdate.orig/netdate.c 1996-08-14 19:19:54.000000000 +0200 ++++ netdate/netdate.c 2004-07-19 15:27:44.000000000 +0200 +@@ -1,4 +1,4 @@ +-/* ++/* + NO WARRANTY + + THERE IS NO WARRANTY FOR THIS PROGRAM, TO THE EXTENT PERMITTED BY +@@ -8,8 +8,8 @@ + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM + IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +- ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +- ++ ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ++ + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL + ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE PROGRAM, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +@@ -18,8 +18,8 @@ + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), + EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +- SUCH DAMAGES. +- ++ SUCH DAMAGES. ++ + */ + + #ifndef lint +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + +@@ -42,17 +43,24 @@ + #include + #include + #include +-#define WTMP "/etc/wtmp" ++#define WTMP "/var/log/wtmp" + ++#ifndef __GLIBC__ + struct utmp wtmp[2] = { + { 0, 0, "|", "", 0, "", "", 0}, + { 0, 0, "{", "", 0, "", "", 0} + }; ++#else ++struct utmp wtmp[2] = { ++ { 0, 0, "|", "", "", "", {0, 0}, 0, {0, 0}, {0, 0, 0, 0}, "" }, ++ { 0, 0, "|", "", "", "", {0, 0}, 0, {0, 0}, {0, 0, 0, 0}, "" }, ++}; ++#endif + + char *service = "time"; + char *defaultproto = "udp"; + /* difference between 1900 (RFC868) and 1970 (UNIX) base times */ +-#define NETBASE 2208988800 ++#define NETBASE 2208988800u + + long limit = 5; + #define MAXHOSTS 20 +@@ -78,7 +86,6 @@ + + void usage (void); + int setproto (char *, struct timehost *); +-void main (int, char **); + int getdiff (struct timehost *); + int getdate (struct timehost *); + void printit (struct timehost *); +@@ -98,7 +105,7 @@ + fprintf (stderr, + "usage: %s [ -l limit ] host ...\n" + "%s tries to find a group of at least two hosts whose times agree\n" +-"within %d seconds, and sets the time to that of the first host in the group.\n", ++"within %ld seconds, and sets the time to that of the first host in the group.\n", + whoami, whoami, limit); + fprintf (stderr, + "The limit may be set with the -l option. Setting it to zero (or supplying\n" +@@ -112,7 +119,7 @@ + int verbose = 0; + int debug = 0; + +-void ++int + main (int argc, char **argv) + { + extern char *rindex(); +@@ -155,7 +162,7 @@ + if (*argv == NULL) + usage(); + if (debug) +- fprintf (stderr, "%s: rdate %d; verbose %d; limit %d.\n", ++ fprintf (stderr, "%s: rdate %d; verbose %d; limit %ld.\n", + whoami, rdate, verbose, limit); + for (thishost = &timehosts[0]; *argv != NULL; argv++) { + if (thishost >= tophost) { +@@ -189,7 +196,7 @@ + exit(1); + if ((thishost = mungediffs(thishost)) == NULL) { + fprintf (stderr, +- "No two hosts agree on the time within %d seconds\n", ++ "No two hosts agree on the time within %ld seconds\n", + limit); + exit(1); + } +@@ -258,7 +265,7 @@ + and return the first of that group. If no two hosts agree, + give up. + */ +- ++ + struct timehost * + mungediffs(struct timehost *tophost) + { +@@ -284,7 +291,7 @@ + } + } + if (verbose) { +- printf (" %d\n", thishost -> count); ++ printf (" %ld\n", thishost -> count); + (void)fflush(stdout); + } + if (thishost -> count > goodhost -> count) +@@ -312,13 +319,13 @@ + && abs((thishost -> then.tv_sec - now.tv_sec) - thishost -> difference) + > limit) { + fprintf (stderr, +- "Time from %s has varied more than the limit of %d seconds\n", ++ "Time from %s has varied more than the limit of %ld seconds\n", + thishost -> hostname, limit); + printit(thishost); + exit(1); + } + if (settimeofday (&thishost -> then, (struct timezone *)0) == -1) +- perror ("netdate; settimeofday"); ++ perror ("netdate: settimeofday"); + else { + int wf; + if ((wf = open(WTMP, 1)) >= 0) { +@@ -348,12 +355,12 @@ + (void)sprintf(newstring, "%s ", thishost -> hostname); + tvsub(&diff, &thishost -> then, &now); + printdiff(&newstring[strlen(newstring)], &diff); +- printf ("%-24s %.19s.%03d", newstring, ++ printf ("%-24s %.19s.%03ld", newstring, + ctime((unsigned long *)&thishost -> then.tv_sec), + thishost -> then.tv_usec / 1000); + if (verbose) { + tp = localtime((unsigned long *)&thishost -> acked); +- printf(" at %02d:%02d:%02d.%03d", ++ printf(" at %02d:%02d:%02d.%03ld", + tp -> tm_hour, tp -> tm_min, tp -> tm_sec, + thishost -> acked.tv_usec / 1000); + tvsub(&diff, &thishost -> acked, &thishost -> asked); +@@ -446,20 +453,23 @@ + perror("netdate: connect"); + goto bad; + } ++ + if (thishost -> socktype == SOCK_DGRAM) { +- if (write (s, "\n", 1) < 0) { ++ if (send (s, "\n", 1, 0) < 0) { + perror ("netdate: send"); + goto bad; + } + } +- nread = read (s, (char *)&thishost -> then, sizeof (thishost -> then)); ++ nread = recv (s, (char *)&thishost -> then, sizeof (thishost -> then), 0); + (void)gettimeofday (&thishost -> acked, (struct timezone *)0); + (void)alarm(0); + now = thishost -> acked; +- if (nread < sizeof(thishost -> then.tv_sec)) { ++ ++ if (nread != 4) { + perror ("netdate: read"); + goto bad; + } ++ + /* RFC 868 only allows seconds, but what the hell */ + if (nread == sizeof(thishost -> then)) + thishost -> then.tv_usec = ntohl(thishost -> then.tv_usec); diff --git a/source/base/netkit-base/netdate.tar.gz b/source/base/netkit-base/netdate.tar.gz new file mode 100644 index 0000000..7f00318 Binary files /dev/null and b/source/base/netkit-base/netdate.tar.gz differ diff --git a/source/base/netkit-base/protocols b/source/base/netkit-base/protocols new file mode 100644 index 0000000..db3254c --- /dev/null +++ b/source/base/netkit-base/protocols @@ -0,0 +1,146 @@ +# +# Internet protocols +# +# $FreeBSD: src/etc/protocols,v 1.16 2002/02/10 08:19:58 dd Exp $ +# from: @(#)protocols 5.1 (Berkeley) 4/17/89 +# +# See also http://www.iana.org/assignments/protocol-numbers +# +ip 0 IP # internet protocol, pseudo protocol number +#hopopt 0 HOPOPT # hop-by-hop options for ipv6 +icmp 1 ICMP # internet control message protocol +igmp 2 IGMP # internet group management protocol +ggp 3 GGP # gateway-gateway protocol +ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') +st2 5 ST2 # ST2 datagram mode (RFC 1819) +tcp 6 TCP # transmission control protocol +cbt 7 CBT # CBT, Tony Ballardie +egp 8 EGP # exterior gateway protocol +igp 9 IGP # any private interior gateway (Cisco: for IGRP) +bbn-rcc 10 BBN-RCC-MON # BBN RCC Monitoring +nvp 11 NVP-II # Network Voice Protocol +pup 12 PUP # PARC universal packet protocol +argus 13 ARGUS # ARGUS +emcon 14 EMCON # EMCON +xnet 15 XNET # Cross Net Debugger +chaos 16 CHAOS # Chaos +udp 17 UDP # user datagram protocol +mux 18 MUX # Multiplexing protocol +dcn 19 DCN-MEAS # DCN Measurement Subsystems +hmp 20 HMP # host monitoring protocol +prm 21 PRM # packet radio measurement protocol +xns-idp 22 XNS-IDP # Xerox NS IDP +trunk-1 23 TRUNK-1 # Trunk-1 +trunk-2 24 TRUNK-2 # Trunk-2 +leaf-1 25 LEAF-1 # Leaf-1 +leaf-2 26 LEAF-2 # Leaf-2 +rdp 27 RDP # "reliable datagram" protocol +irtp 28 IRTP # Internet Reliable Transaction Protocol +iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4 +netblt 30 NETBLT # Bulk Data Transfer Protocol +mfe-nsp 31 MFE-NSP # MFE Network Services Protocol +merit-inp 32 MERIT-INP # MERIT Internodal Protocol +sep 33 SEP # Sequential Exchange Protocol +3pc 34 3PC # Third Party Connect Protocol +idpr 35 IDPR # Inter-Domain Policy Routing Protocol +xtp 36 XTP # Xpress Tranfer Protocol +ddp 37 DDP # Datagram Delivery Protocol +idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto +tp++ 39 TP++ # TP++ Transport Protocol +il 40 IL # IL Transport Protocol +ipv6 41 IPV6 # ipv6 +sdrp 42 SDRP # Source Demand Routing Protocol +ipv6-route 43 IPV6-ROUTE # routing header for ipv6 +ipv6-frag 44 IPV6-FRAG # fragment header for ipv6 +idrp 45 IDRP # Inter-Domain Routing Protocol +rsvp 46 RSVP # Resource ReSerVation Protocol +gre 47 GRE # Generic Routing Encapsulation +mhrp 48 MHRP # Mobile Host Routing Protocol +bna 49 BNA # BNA +esp 50 ESP # encapsulating security payload +ah 51 AH # authentication header +i-nlsp 52 I-NLSP # Integrated Net Layer Security TUBA +swipe 53 SWIPE # IP with Encryption +narp 54 NARP # NBMA Address Resolution Protocol +mobile 55 MOBILE # IP Mobility +tlsp 56 TLSP # Transport Layer Security Protocol +skip 57 SKIP # SKIP +ipv6-icmp 58 IPV6-ICMP # ICMP for IPv6 +ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 +ipv6-opts 60 IPV6-OPTS # destination options for ipv6 +# 61 # any host internal protocol +cftp 62 CFTP # CFTP +# 63 # any local network +sat-expak 64 SAT-EXPAK # SATNET and Backroom EXPAK +kryptolan 65 KRYPTOLAN # Kryptolan +rvd 66 RVD # MIT Remote Virtual Disk Protocol +ippc 67 IPPC # Internet Pluribus Packet Core +# 68 # any distributed file system +sat-mon 69 SAT-MON # SATNET Monitoring +visa 70 VISA # VISA Protocol +ipcv 71 IPCV # Internet Packet Core Utility +cpnx 72 CPNX # Computer Protocol Network Executive +cphb 73 CPHB # Computer Protocol Heart Beat +wsn 74 WSN # Wang Span Network +pvp 75 PVP # Packet Video Protocol +br-sat-mon 76 BR-SAT-MON # Backroom SATNET Monitoring +sun-nd 77 SUN-ND # SUN ND PROTOCOL-Temporary +wb-mon 78 WB-MON # WIDEBAND Monitoring +wb-expak 79 WB-EXPAK # WIDEBAND EXPAK +iso-ip 80 ISO-IP # ISO Internet Protocol +vmtp 81 VMTP # Versatile Message Transport +secure-vmtp 82 SECURE-VMTP # SECURE-VMTP +vines 83 VINES # VINES +ttp 84 TTP # TTP +nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP +dgp 86 DGP # Dissimilar Gateway Protocol +tcf 87 TCF # TCF +eigrp 88 EIGRP # Enhanced Interior Routing Protocol (Cisco) +ospf 89 OSPFIGP # Open Shortest Path First IGP +sprite-rpc 90 Sprite-RPC # Sprite RPC Protocol +larp 91 LARP # Locus Address Resolution Protocol +mtp 92 MTP # Multicast Transport Protocol +ax.25 93 AX.25 # AX.25 Frames +ipip 94 IPIP # Yet Another IP encapsulation +micp 95 MICP # Mobile Internetworking Control Pro. +scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro. +etherip 97 ETHERIP # Ethernet-within-IP Encapsulation +encap 98 ENCAP # Yet Another IP encapsulation +# 99 # any private encryption scheme +gmtp 100 GMTP # GMTP +ifmp 101 IFMP # Ipsilon Flow Management Protocol +pnni 102 PNNI # PNNI over IP +pim 103 PIM # Protocol Independent Multicast +aris 104 ARIS # ARIS +scps 105 SCPS # SCPS +qnx 106 QNX # QNX +a/n 107 A/N # Active Networks +ipcomp 108 IPComp # IP Payload Compression Protocol +snp 109 SNP # Sitara Networks Protocol +compaq-peer 110 Compaq-Peer # Compaq Peer Protocol +ipx-in-ip 111 IPX-in-IP # IPX in IP +vrrp 112 VRRP # Virtual Router Redundancy Protocol +pgm 113 PGM # PGM Reliable Transport Protocol +# 114 # any 0-hop protocol +l2tp 115 L2TP # Layer Two Tunneling Protocol +ddx 116 DDX # D-II Data Exchange +iatp 117 IATP # Interactive Agent Transfer Protocol +st 118 ST # Schedule Transfer +srp 119 SRP # SpectraLink Radio Protocol +uti 120 UTI # UTI +smp 121 SMP # Simple Message Protocol +sm 122 SM # SM +ptp 123 PTP # Performance Transparency Protocol +isis 124 ISIS # ISIS over IPv4 +fire 125 FIRE +crtp 126 CRTP # Combat Radio Transport Protocol +crudp 127 CRUDP # Combat Radio User Datagram +sscopmce 128 SSCOPMCE +iplt 129 IPLT +sps 130 SPS # Secure Packet Shield +pipe 131 PIPE # Private IP Encapsulation within IP +sctp 132 SCTP # Stream Control Transmission Protocol +fc 133 FC # Fibre Channel +# 134-254 # Unassigned +divert 254 DIVERT # Divert pseudo-protocol [non IANA] +# 255 # Reserved diff --git a/source/base/netkit-base/services b/source/base/netkit-base/services new file mode 100644 index 0000000..d858163 --- /dev/null +++ b/source/base/netkit-base/services @@ -0,0 +1,2101 @@ +# +# Network services, Internet style +# +# Note that it is presently the policy of IANA to assign a single well-known +# port number for both TCP and UDP; hence, most entries here have two entries +# even if the protocol doesn't support UDP operations. +# +# The latest IANA port assignments can be gotten from +# +# http://www.iana.org/assignments/port-numbers +# +# The Well Known Ports are those from 0 through 1023. +# The Registered Ports are those from 1024 through 49151 +# The Dynamic and/or Private Ports are those from 49152 through 65535 +# +# Kerberos services are for Kerberos v4, and are unofficial. Sites running +# v5 should uncomment v5 entries and comment v4 entries. +# +# $FreeBSD: src/etc/services,v 1.86 2002/02/26 02:36:49 cjc Exp $ +# From: @(#)services 5.8 (Berkeley) 5/9/91 +# +# WELL KNOWN PORT NUMBERS +# +rtmp 1/ddp #Routing Table Maintenance Protocol +tcpmux 1/tcp #TCP Port Service Multiplexer +tcpmux 1/udp #TCP Port Service Multiplexer +nbp 2/ddp #Name Binding Protocol +compressnet 2/tcp #Management Utility +compressnet 2/udp #Management Utility +compressnet 3/tcp #Compression Process +compressnet 3/udp #Compression Process +echo 4/ddp #AppleTalk Echo Protocol +rje 5/tcp #Remote Job Entry +rje 5/udp #Remote Job Entry +zip 6/ddp #Zone Information Protocol +echo 7/tcp +echo 7/udp +discard 9/tcp sink null +discard 9/udp sink null +systat 11/tcp users #Active Users +systat 11/udp users #Active Users +daytime 13/tcp +daytime 13/udp +qotd 17/tcp quote #Quote of the Day +qotd 17/udp quote #Quote of the Day +msp 18/tcp #Message Send Protocol +msp 18/udp #Message Send Protocol +chargen 19/tcp ttytst source #Character Generator +chargen 19/udp ttytst source #Character Generator +ftp-data 20/tcp #File Transfer [Default Data] +ftp-data 20/udp #File Transfer [Default Data] +ftp 21/tcp #File Transfer [Control] +ftp 21/udp #File Transfer [Control] +ssh 22/tcp #Secure Shell Login +ssh 22/udp #Secure Shell Login +telnet 23/tcp +telnet 23/udp +# 24/tcp any private mail system +# 24/udp any private mail system +smtp 25/tcp mail #Simple Mail Transfer +smtp 25/udp mail #Simple Mail Transfer +nsw-fe 27/tcp #NSW User System FE +nsw-fe 27/udp #NSW User System FE +msg-icp 29/tcp #MSG ICP +msg-icp 29/udp #MSG ICP +msg-auth 31/tcp #MSG Authentication +msg-auth 31/udp #MSG Authentication +dsp 33/tcp #Display Support Protocol +dsp 33/udp #Display Support Protocol +# 35/tcp any private printer server +# 35/udp any private printer server +time 37/tcp timserver +time 37/udp timserver +rap 38/tcp #Route Access Protocol +rap 38/udp #Route Access Protocol +rlp 39/tcp resource #Resource Location Protocol +rlp 39/udp resource #Resource Location Protocol +graphics 41/tcp +graphics 41/udp +nameserver 42/tcp name #Host Name Server +nameserver 42/udp name #Host Name Server +nicname 43/tcp whois +nicname 43/udp whois +mpm-flags 44/tcp #MPM FLAGS Protocol +mpm-flags 44/udp #MPM FLAGS Protocol +mpm 45/tcp #Message Processing Module [recv] +mpm 45/udp #Message Processing Module [recv] +mpm-snd 46/tcp #MPM [default send] +mpm-snd 46/udp #MPM [default send] +ni-ftp 47/tcp #NI FTP +ni-ftp 47/udp #NI FTP +auditd 48/tcp #Digital Audit Daemon +auditd 48/udp #Digital Audit Daemon +tacacs 49/tcp #Login Host Protocol (TACACS) +tacacs 49/udp #Login Host Protocol (TACACS) +re-mail-ck 50/tcp #Remote Mail Checking Protocol +re-mail-ck 50/udp #Remote Mail Checking Protocol +la-maint 51/tcp #IMP Logical Address Maintenance +la-maint 51/udp #IMP Logical Address Maintenance +xns-time 52/tcp #XNS Time Protocol +xns-time 52/udp #XNS Time Protocol +domain 53/tcp #Domain Name Server +domain 53/udp #Domain Name Server +xns-ch 54/tcp #XNS Clearinghouse +xns-ch 54/udp #XNS Clearinghouse +isi-gl 55/tcp #ISI Graphics Language +isi-gl 55/udp #ISI Graphics Language +xns-auth 56/tcp #XNS Authentication +xns-auth 56/udp #XNS Authentication +mtp 57/tcp # deprecated +#PROBLEMS!============================================================== +# 57/tcp any private terminal access +#PROBLEMS!============================================================== +# 57/udp any private terminal access +xns-mail 58/tcp #XNS Mail +xns-mail 58/udp #XNS Mail +# 59/tcp any private file service +# 59/udp any private file service +ni-mail 61/tcp #NI MAIL +ni-mail 61/udp #NI MAIL +acas 62/tcp #ACA Services +acas 62/udp #ACA Services +whois++ 63/tcp +whois++ 63/udp +covia 64/tcp #Communications Integrator (CI) +covia 64/udp #Communications Integrator (CI) +tacacs-ds 65/tcp #TACACS-Database Service +tacacs-ds 65/udp #TACACS-Database Service +sql*net 66/tcp #Oracle SQL*NET +sql*net 66/udp #Oracle SQL*NET +bootps 67/tcp dhcps #Bootstrap Protocol Server +bootps 67/udp dhcps #Bootstrap Protocol Server +bootpc 68/tcp dhcpc #Bootstrap Protocol Client +bootpc 68/udp dhcpc #Bootstrap Protocol Client +tftp 69/tcp #Trivial File Transfer +tftp 69/udp #Trivial File Transfer +gopher 70/tcp +gopher 70/udp +netrjs-1 71/tcp #Remote Job Service +netrjs-1 71/udp #Remote Job Service +netrjs-2 72/tcp #Remote Job Service +netrjs-2 72/udp #Remote Job Service +netrjs-3 73/tcp #Remote Job Service +netrjs-3 73/udp #Remote Job Service +netrjs-4 74/tcp #Remote Job Service +netrjs-4 74/udp #Remote Job Service +# 75/tcp any private dial out service +# 75/udp any private dial out service +deos 76/tcp #Distributed External Object Store +deos 76/udp #Distributed External Object Store +netrjs 77/tcp +#PROBLEMS!============================================================== +# 77/tcp any private RJE service +#PROBLEMS!============================================================== +# 77/udp any private RJE service +vettcp 78/tcp +vettcp 78/udp +finger 79/tcp +finger 79/udp +http 80/tcp www www-http #World Wide Web HTTP +http 80/udp www www-http #World Wide Web HTTP +hosts2-ns 81/tcp #HOSTS2 Name Server +hosts2-ns 81/udp #HOSTS2 Name Server +xfer 82/tcp #XFER Utility +xfer 82/udp #XFER Utility +mit-ml-dev 83/tcp #MIT ML Device +mit-ml-dev 83/udp #MIT ML Device +ctf 84/tcp #Common Trace Facility +ctf 84/udp #Common Trace Facility +mit-ml-dev 85/tcp #MIT ML Device +mit-ml-dev 85/udp #MIT ML Device +mfcobol 86/tcp #Micro Focus Cobol +mfcobol 86/udp #Micro Focus Cobol +ttylink 87/tcp +#PROBLEMS!=========================================================== +# 87/tcp any private terminal link +#PROBLEMS!=========================================================== +# 87/udp any private terminal link +kerberos-sec 88/tcp kerberos # krb5 # Kerberos (v5) +kerberos-sec 88/udp kerberos # krb5 # Kerberos (v5) +su-mit-tg 89/tcp #SU/MIT Telnet Gateway +su-mit-tg 89/udp #SU/MIT Telnet Gateway +dnsix 90/tcp #DNSIX Securit Attribute Token Map +dnsix 90/udp #DNSIX Securit Attribute Token Map +mit-dov 91/tcp #MIT Dover Spooler +mit-dov 91/udp #MIT Dover Spooler +npp 92/tcp #Network Printing Protocol +npp 92/udp #Network Printing Protocol +dcp 93/tcp #Device Control Protocol +dcp 93/udp #Device Control Protocol +objcall 94/tcp #Tivoli Object Dispatcher +objcall 94/udp #Tivoli Object Dispatcher +supdup 95/tcp +supdup 95/udp +dixie 96/tcp #DIXIE Protocol Specification +dixie 96/udp #DIXIE Protocol Specification +swift-rvf 97/tcp #Swift Remote Virtural File Protocol +swift-rvf 97/udp #Swift Remote Virtural File Protocol +tacnews 98/tcp #TAC News, Unofficial: Red Hat linuxconf +tacnews 98/udp #TAC News, Unofficial: Red Hat linuxconf +metagram 99/tcp #Metagram Relay +metagram 99/udp #Metagram Relay +newacct 100/tcp #[unauthorized use] +hostname 101/tcp hostnames #NIC Host Name Server +hostname 101/udp hostnames #NIC Host Name Server +iso-tsap 102/tcp tsap #ISO-TSAP Class 0 +iso-tsap 102/udp tsap #ISO-TSAP Class 0 +gppitnp 103/tcp #Genesis Point-to-Point Trans Net +gppitnp 103/udp #Genesis Point-to-Point Trans Net +acr-nema 104/tcp #ACR-NEMA Digital Imag. & Comm. 300 +acr-nema 104/udp #ACR-NEMA Digital Imag. & Comm. 300 +csnet-ns 105/tcp cso-ns cso #Mailbox Name Nameserver +csnet-ns 105/udp cso-ns cso #Mailbox Name Nameserver +pop3pw 106/tcp 3com-tsmux #Eudora compatible PW changer +3com-tsmux 106/udp +rtelnet 107/tcp #Remote Telnet Service +rtelnet 107/udp #Remote Telnet Service +snagas 108/tcp #SNA Gateway Access Server +snagas 108/udp #SNA Gateway Access Server +pop2 109/tcp postoffice #Post Office Protocol - Version 2 +pop2 109/udp postoffice #Post Office Protocol - Version 2 +pop3 110/tcp #Post Office Protocol - Version 3 +pop3 110/udp #Post Office Protocol - Version 3 +sunrpc 111/tcp rpcbind #SUN Remote Procedure Call +sunrpc 111/udp rpcbind #SUN Remote Procedure Call +mcidas 112/tcp #McIDAS Data Transmission Protocol +mcidas 112/udp #McIDAS Data Transmission Protocol +auth 113/tcp ident tap #Authentication Service +auth 113/udp ident tap #Authentication Service +audionews 114/tcp #Audio News Multicast +audionews 114/udp #Audio News Multicast +sftp 115/tcp #Simple File Transfer Protocol +sftp 115/udp #Simple File Transfer Protocol +ansanotify 116/tcp #ANSA REX Notify +ansanotify 116/udp #ANSA REX Notify +uucp-path 117/tcp #UUCP Path Service +uucp-path 117/udp #UUCP Path Service +sqlserv 118/tcp #SQL Services +sqlserv 118/udp #SQL Services +nntp 119/tcp usenet #Network News Transfer Protocol +nntp 119/udp usenet #Network News Transfer Protocol +cfdptkt 120/tcp +cfdptkt 120/udp +erpc 121/tcp #Encore Expedited Remote Pro.Call +erpc 121/udp #Encore Expedited Remote Pro.Call +smakynet 122/tcp +smakynet 122/udp +ntp 123/tcp #Network Time Protocol +ntp 123/udp #Network Time Protocol +ansatrader 124/tcp #ANSA REX Trader +ansatrader 124/udp #ANSA REX Trader +locus-map 125/tcp #Locus PC-Interface Net Map Ser +locus-map 125/udp #Locus PC-Interface Net Map Ser +unitary 126/tcp #Unisys Unitary Login +unitary 126/udp #Unisys Unitary Login +locus-con 127/tcp #Locus PC-Interface Conn Server +locus-con 127/udp #Locus PC-Interface Conn Server +gss-xlicen 128/tcp #GSS X License Verification +gss-xlicen 128/udp #GSS X License Verification +pwdgen 129/tcp #Password Generator Protocol +pwdgen 129/udp #Password Generator Protocol +cisco-fna 130/tcp #cisco FNATIVE +cisco-fna 130/udp #cisco FNATIVE +cisco-tna 131/tcp #cisco TNATIVE +cisco-tna 131/udp #cisco TNATIVE +cisco-sys 132/tcp #cisco SYSMAINT +cisco-sys 132/udp #cisco SYSMAINT +statsrv 133/tcp #Statistics Service +statsrv 133/udp #Statistics Service +ingres-net 134/tcp #INGRES-NET Service +ingres-net 134/udp #INGRES-NET Service +loc-srv 135/tcp epmap #Location Service +loc-srv 135/udp epmap #Location Service +profile 136/tcp #PROFILE Naming System +profile 136/udp #PROFILE Naming System +netbios-ns 137/tcp #NETBIOS Name Service +netbios-ns 137/udp #NETBIOS Name Service +netbios-dgm 138/tcp #NETBIOS Datagram Service +netbios-dgm 138/udp #NETBIOS Datagram Service +netbios-ssn 139/tcp #NETBIOS Session Service +netbios-ssn 139/udp #NETBIOS Session Service +emfis-data 140/tcp #EMFIS Data Service +emfis-data 140/udp #EMFIS Data Service +emfis-cntl 141/tcp #EMFIS Control Service +emfis-cntl 141/udp #EMFIS Control Service +bl-idm 142/tcp #Britton-Lee IDM +bl-idm 142/udp #Britton-Lee IDM +imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 +imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 +NeWS 144/tcp # Window System +NeWS 144/udp # Window System +#PROBLEMS!============================================================== +#uma 144/tcp #Universal Management Architecture +#uma 144/udp #Universal Management Architecture +#PROBLEMS!============================================================== +uaac 145/tcp #UAAC Protocol +uaac 145/udp #UAAC Protocol +iso-tp0 146/tcp +iso-tp0 146/udp +iso-ip 147/tcp +iso-ip 147/udp +cronus 148/tcp jargon #CRONUS-SUPPORT +cronus 148/udp jargon #CRONUS-SUPPORT +aed-512 149/tcp #AED 512 Emulation Service +aed-512 149/udp #AED 512 Emulation Service +sql-net 150/tcp +sql-net 150/udp +hems 151/tcp +hems 151/udp +bftp 152/tcp #Background File Transfer Program +bftp 152/udp #Background File Transfer Program +sgmp 153/tcp +sgmp 153/udp +netsc-prod 154/tcp +netsc-prod 154/udp +netsc-dev 155/tcp +netsc-dev 155/udp +sqlsrv 156/tcp #SQL Service +sqlsrv 156/udp #SQL Service +knet-cmp 157/tcp #KNET/VM Command/Message Protocol +knet-cmp 157/udp #KNET/VM Command/Message Protocol +pcmail-srv 158/tcp #PCMail Server +pcmail-srv 158/udp #PCMail Server +nss-routing 159/tcp +nss-routing 159/udp +sgmp-traps 160/tcp +sgmp-traps 160/udp +snmp 161/tcp +snmp 161/udp +snmptrap 162/tcp snmp-trap +snmptrap 162/udp snmp-trap +cmip-man 163/tcp #CMIP/TCP Manager +cmip-man 163/udp #CMIP/TCP Manager +cmip-agent 164/tcp #CMIP/TCP Agent +smip-agent 164/udp #CMIP/TCP Agent +xns-courier 165/tcp #Xerox +xns-courier 165/udp #Xerox +s-net 166/tcp #Sirius Systems +s-net 166/udp #Sirius Systems +namp 167/tcp +namp 167/udp +rsvd 168/tcp +rsvd 168/udp +send 169/tcp +send 169/udp +print-srv 170/tcp #Network PostScript +print-srv 170/udp #Network PostScript +multiplex 171/tcp #Network Innovations Multiplex +multiplex 171/udp #Network Innovations Multiplex +cl/1 172/tcp #Network Innovations CL/1 +cl/1 172/udp #Network Innovations CL/1 +xyplex-mux 173/tcp +xyplex-mux 173/udp +mailq 174/tcp +mailq 174/udp +vmnet 175/tcp +vmnet 175/udp +genrad-mux 176/tcp +genrad-mux 176/udp +xdmcp 177/tcp #X Display Manager Control Protocol +xdmcp 177/udp #X Display Manager Control Protocol +NextStep 178/tcp nextstep NeXTStep #NextStep Window Server +NextStep 178/udp nextstep NeXTStep #NextStep Window Server +bgp 179/tcp #Border Gateway Protocol +bgp 179/udp #Border Gateway Protocol +ris 180/tcp #Intergraph +ris 180/udp #Intergraph +unify 181/tcp +unify 181/udp +audit 182/tcp #Unisys Audit SITP +audit 182/udp #Unisys Audit SITP +ocbinder 183/tcp +ocbinder 183/udp +ocserver 184/tcp +ocserver 184/udp +remote-kis 185/tcp +remote-kis 185/udp +kis 186/tcp #KIS Protocol +kis 186/udp #KIS Protocol +aci 187/tcp #Application Communication Interface +aci 187/udp #Application Communication Interface +mumps 188/tcp #Plus Five's MUMPS +mumps 188/udp #Plus Five's MUMPS +qft 189/tcp #Queued File Transport +qft 189/udp #Queued File Transport +gacp 190/tcp #Gateway Access Control Protocol +gacp 190/udp cacp #Gateway Access Control Protocol +prospero 191/tcp #Prospero Directory Service +prospero 191/udp #Prospero Directory Service +osu-nms 192/tcp #OSU Network Monitoring System +osu-nms 192/udp #OSU Network Monitoring System +srmp 193/tcp #Spider Remote Monitoring Protocol +srmp 193/udp #Spider Remote Monitoring Protocol +irc 194/tcp #Internet Relay Chat Protocol +irc 194/udp #Internet Relay Chat Protocol +dn6-nlm-aud 195/tcp #DNSIX Network Level Module Audit +dn6-nlm-aud 195/udp #DNSIX Network Level Module Audit +dn6-smm-red 196/tcp #DNSIX Session Mgt Module Audit Redir +dn6-smm-red 196/udp #DNSIX Session Mgt Module Audit Redir +dls 197/tcp #Directory Location Service +dls 197/udp #Directory Location Service +dls-mon 198/tcp #Directory Location Service Monitor +dls-mon 198/udp #Directory Location Service Monitor +smux 199/tcp +smux 199/udp +src 200/tcp #IBM System Resource Controller +src 200/udp #IBM System Resource Controller +at-rtmp 201/tcp #AppleTalk Routing Maintenance +at-rtmp 201/udp #AppleTalk Routing Maintenance +at-nbp 202/tcp #AppleTalk Name Binding +at-nbp 202/udp #AppleTalk Name Binding +at-3 203/tcp #AppleTalk Unused +at-3 203/udp #AppleTalk Unused +at-echo 204/tcp #AppleTalk Echo +at-echo 204/udp #AppleTalk Echo +at-5 205/tcp #AppleTalk Unused +at-5 205/udp #AppleTalk Unused +at-zis 206/tcp #AppleTalk Zone Information +at-zis 206/udp #AppleTalk Zone Information +at-7 207/tcp #AppleTalk Unused +at-7 207/udp #AppleTalk Unused +at-8 208/tcp #AppleTalk Unused +at-8 208/udp #AppleTalk Unused +qmtp 209/tcp #The Quick Mail Transfer Protocol +qmtp 209/udp #The Quick Mail Transfer Protocol +#PROBLEMS!============================================================== +#tam 209/tcp #Trivial Authenticated Mail Protocol +#tam 209/udp #Trivial Authenticated Mail Protocol +#PROBLEMS!============================================================== +z39.50 210/tcp wais #ANSI Z39.50 +z39.50 210/udp wais #ANSI Z39.50 +914c/g 211/tcp #Texas Instruments 914C/G Terminal +914c/g 211/udp #Texas Instruments 914C/G Terminal +anet 212/tcp #ATEXSSTR +anet 212/udp #ATEXSSTR +ipx 213/tcp +ipx 213/udp +vmpwscs 214/tcp +vmpwscs 214/udp +softpc 215/tcp #Insignia Solutions +softpc 215/udp #Insignia Solutions +CAIlic 216/tcp atls #Computer Associates Int'l License Server +CAIlic 216/udp atls #Computer Associates Int'l License Server +dbase 217/tcp #dBASE Unix +dbase 217/udp #dBASE Unix +mpp 218/tcp #Netix Message Posting Protocol +mpp 218/udp #Netix Message Posting Protocol +uarps 219/tcp #Unisys ARPs +uarps 219/udp #Unisys ARPs +imap3 220/tcp #Interactive Mail Access Protocol v3 +imap3 220/udp #Interactive Mail Access Protocol v3 +fln-spx 221/tcp #Berkeley rlogind with SPX auth +fln-spx 221/udp #Berkeley rlogind with SPX auth +rsh-spx 222/tcp #Berkeley rshd with SPX auth +rsh-spx 222/udp #Berkeley rshd with SPX auth +cdc 223/tcp #Certificate Distribution Center +cdc 223/udp #Certificate Distribution Center +direct 242/tcp +direct 242/udp +sur-meas 243/tcp #Survey Measurement +sur-meas 243/udp #Survey Measurement +dayna 244/tcp +dayna 244/udp +link 245/tcp +link 245/udp +dsp3270 246/tcp #Display Systems Protocol +dsp3270 246/udp #Display Systems Protocol + +subntbcst_tftp 247/tcp #subntbcst_tftp +subntbcst_tftp 247/udp #subntbcst_tftp +bhfhs 248/tcp +bhfhs 248/udp +# 249-255 reserved +rap 256/tcp +rap 256/udp +set 257/tcp #secure electronic transaction +set 257/udp #secure electronic transaction +yak-chat 258/tcp #yak winsock personal chat +yak-chat 258/udp #yak winsock personal chat +esro-gen 259/tcp #efficient short remote operations +esro-gen 259/udp #efficient short remote operations +openport 260/tcp +openport 260/udp +nsiiops 261/tcp #iiop name service over tls/ssl +nsiiops 261/udp #iiop name service over tls/ssl +arcisdms 262/tcp +arcisdms 262/udp +hdap 263/tcp +hdap 263/udp +bgmp 264/tcp +bgmp 264/udp +# 265-279 unassigned +http-mgmt 280/tcp +http-mgmt 280/udp +personal-link 281/tcp +personal-link 281/udp +cableport-ax 282/tcp #cable port a/x +cableport-ax 282/udp #cable port a/x +# 283-307 unassigned +novastorbakcup 308/tcp #novastor backup +novastorbakcup 308/udp #novastor backup +entrusttime 309/tcp +entrusttime 309/udp +bhmds 310/tcp +bhmds 310/udp +asip-webadmin 311/tcp #appleshare ip webadmin +asip-webadmin 311/udp #appleshare ip webadmin +vslmp 312/tcp +vslmp 312/udp +magenta-logic 313/tcp +magenta-logic 313/udp +opalis-robot 314/tcp +opalis-robot 314/udp +dpsi 315/tcp +dpsi 315/udp +decauth 316/tcp +decauth 316/udp +zannet 317/tcp +zannet 317/udp +# 318-320 #unassigned +pip 321/tcp +pip 321/udp +# 322-343 #unassigned +pdap 344/tcp #Prospero Data Access Protocol +pdap 344/udp #Prospero Data Access Protocol +pawserv 345/tcp #Perf Analysis Workbench +pawserv 345/udp #Perf Analysis Workbench +zserv 346/tcp #Zebra server +zserv 346/udp #Zebra server +fatserv 347/tcp #Fatmen Server +fatserv 347/udp #Fatmen Server +csi-sgwp 348/tcp #Cabletron Management Protocol +csi-sgwp 348/udp #Cabletron Management Protocol + + +mftp 349/tcp +mftp 349/udp +matip-type-a 350/tcp #MATIP Type A +matip-type-a 350/udp +matip-type-b 351/tcp #MATIP Type B +matip-type-b 351/udp +bhoetty 351/tcp #unassigned but widespread use +bhoetty 351/udp #unassigned but widespread use +dtag-ste-sb 352/tcp #DTAG +dtag-ste-sb 352/udp #DTAG +bhoedap4 352/tcp #unassigned but widespread use +bhoedap4 352/udp #unassigned but widespread use +ndsauth 353/tcp +ndsauth 353/udp +bh611 354/tcp +bh611 354/udp +datex-asn 355/tcp +datex-asn 355/udp +cloanto-net-1 356/tcp #Cloanto Net 1 +cloanto-net-1 356/udp +bhevent 357/tcp +bhevent 357/udp +shrinkwrap 358/tcp +shrinkwrap 358/udp +tenebris_nts 359/tcp #Tenebris Network Trace Service +tenebris_nts 359/udp #Tenebris Network Trace Service +scoi2odialog 360/tcp +scoi2odialog 360/udp +semantix 361/tcp +semantix 361/udp +srssend 362/tcp #SRS Send +srssend 362/udp #SRS Send +rsvp_tunnel 363/tcp +rsvp_tunnel 363/udp +aurora-cmgr 364/tcp +aurora-cmgr 364/udp +dtk 365/tcp #Deception Tool Kit - Fred Cohen +dtk 365/udp #Deception Tool Kit - Fred Cohen +odmr 366/tcp +odmr 366/udp +mortgageware 367/tcp +mortgageware 367/udp +qbikgdp 368/tcp #QbikGDP +qbikgdp 368/udp +rpc2portmap 369/tcp +rpc2portmap 369/udp +codaauth2 370/tcp +codaauth2 370/udp +clearcase 371/tcp +clearcase 371/udp +ulistserv 372/tcp ulistproc #Unix Listserv +ulistserv 372/udp ulistproc #Unix Listserv +legent-1 373/tcp #Legent Corporation (now Computer Associates Intl.) +legent-1 373/udp #Legent Corporation (now Computer Associates Intl.) +legent-2 374/tcp #Legent Corporation (now Computer Associates Intl.) +legent-2 374/udp #Legent Corporation (now Computer Associates Intl.) +hassle 375/tcp +hassle 375/udp +nip 376/tcp #Amiga Envoy Network Inquiry Proto +nip 376/udp #Amiga Envoy Network Inquiry Proto +tnETOS 377/tcp #NEC Corporation +tnETOS 377/udp #NEC Corporation +dsETOS 378/tcp #NEC Corporation +dsETOS 378/udp #NEC Corporation +is99c 379/tcp #TIA/EIA/IS-99 modem client +is99c 379/udp #TIA/EIA/IS-99 modem client +is99s 380/tcp #TIA/EIA/IS-99 modem server +is99s 380/udp #TIA/EIA/IS-99 modem server +hp-collector 381/tcp #hp performance data collector +hp-collector 381/udp #hp performance data collector +hp-managed-node 382/tcp #hp performance data managed node +hp-managed-node 382/udp #hp performance data managed node +hp-alarm-mgr 383/tcp #hp performance data alarm manager +hp-alarm-mgr 383/udp #hp performance data alarm manager +arns 384/tcp #A Remote Network Server System +arns 384/udp #A Remote Network Server System +ibm-app 385/tcp #IBM Application +ibm-app 385/udp #IBM Application +asa 386/tcp #ASA Message Router Object Def. +asa 386/udp #ASA Message Router Object Def. +aurp 387/tcp #Appletalk Update-Based Routing Pro. +aurp 387/udp #Appletalk Update-Based Routing Pro. +unidata-ldm 388/tcp #Unidata LDM Version 4 +unidata-ldm 388/udp #Unidata LDM Version 4 +ldap 389/tcp #Lightweight Directory Access Protocol +ldap 389/udp #Lightweight Directory Access Protocol +uis 390/tcp +uis 390/udp +synotics-relay 391/tcp #SynOptics SNMP Relay Port +synotics-relay 391/udp #SynOptics SNMP Relay Port +synotics-broker 392/tcp #SynOptics Port Broker Port +synotics-broker 392/udp #SynOptics Port Broker Port +dis 393/tcp #Data Interpretation System +dis 393/udp #Data Interpretation System +embl-ndt 394/tcp #EMBL Nucleic Data Transfer +embl-ndt 394/udp #EMBL Nucleic Data Transfer +netcp 395/tcp #NETscout Control Protocol +netcp 395/udp #NETscout Control Protocol +netware-ip 396/tcp #Novell Netware over IP +netware-ip 396/udp #Novell Netware over IP +mptn 397/tcp #Multi Protocol Trans. Net. +mptn 397/udp #Multi Protocol Trans. Net. +kryptolan 398/tcp +kryptolan 398/udp +iso-tsap-c2 399/tcp #ISO-TSAP Class 2 +iso-tsap-c2 399/udp #ISO-TSAP Class 2 +work-sol 400/tcp #Workstation Solutions +work-sol 400/udp #Workstation Solutions +ups 401/tcp #Uninterruptible Power Supply +ups 401/udp #Uninterruptible Power Supply +genie 402/tcp #Genie Protocol +genie 402/udp #Genie Protocol +decap 403/tcp +decap 403/udp +nced 404/tcp +nced 404/udp +ncld 405/tcp +ncld 405/udp +imsp 406/tcp #Interactive Mail Support Protocol +imsp 406/udp #Interactive Mail Support Protocol +timbuktu 407/tcp +timbuktu 407/udp +prm-sm 408/tcp #Prospero Resource Manager Sys. Man. +prm-sm 408/udp #Prospero Resource Manager Sys. Man. +prm-nm 409/tcp #Prospero Resource Manager Node Man. +prm-nm 409/udp #Prospero Resource Manager Node Man. +decladebug 410/tcp #DECLadebug Remote Debug Protocol +decladebug 410/udp #DECLadebug Remote Debug Protocol +rmt 411/tcp #Remote MT Protocol +rmt 411/udp #Remote MT Protocol +synoptics-trap 412/tcp #Trap Convention Port +synoptics-trap 412/udp #Trap Convention Port +smsp 413/tcp +smsp 413/udp +infoseek 414/tcp +infoseek 414/udp +bnet 415/tcp +bnet 415/udp +silverplatter 416/tcp +silverplatter 416/udp +onmux 417/tcp +onmux 417/udp +hyper-g 418/tcp +hyper-g 418/udp +ariel1 419/tcp +ariel1 419/udp +smpte 420/tcp +smpte 420/udp +ariel2 421/tcp +ariel2 421/udp +ariel3 422/tcp +ariel3 422/udp +opc-job-start 423/tcp #IBM Operations Planning and Control Start +opc-job-start 423/udp #IBM Operations Planning and Control Start +opc-job-track 424/tcp #IBM Operations Planning and Control Track +opc-job-track 424/udp #IBM Operations Planning and Control Track +icad-el 425/tcp +icad-el 425/udp +smartsdp 426/tcp +smartsdp 426/udp +svrloc 427/tcp #Server Location +svrloc 427/udp #Server Location +ocs_cmu 428/tcp +ocs_cmu 428/udp +ocs_amu 429/tcp +ocs_amu 429/udp +utmpsd 430/tcp +utmpsd 430/udp +utmpcd 431/tcp +utmpcd 431/udp +iasd 432/tcp +iasd 432/udp +nnsp 433/tcp +nnsp 433/udp +mobileip-agent 434/tcp +mobileip-agent 434/udp +mobilip-mn 435/tcp +mobilip-mn 435/udp +dna-cml 436/tcp +dna-cml 436/udp +comscm 437/tcp +comscm 437/udp +dsfgw 438/tcp +dsfgw 438/udp +dasp 439/tcp +dasp 439/udp +sgcp 440/tcp +sgcp 440/udp +decvms-sysmgt 441/tcp +decvms-sysmgt 441/udp +cvc_hostd 442/tcp +cvc_hostd 442/udp +https 443/tcp +https 443/udp +snpp 444/tcp #Simple Network Paging Protocol +snpp 444/udp #Simple Network Paging Protocol +# [RFC1568] +microsoft-ds 445/tcp +microsoft-ds 445/udp +ddm-rdb 446/tcp +ddm-rdb 446/udp +ddm-dfm 447/tcp +ddm-dfm 447/udp +ddm-ssl 448/tcp ddm-byte +ddm-ssl 448/udp ddm-byte +as-servermap 449/tcp #AS Server Mapper +as-servermap 449/udp #AS Server Mapper +tserver 450/tcp +tserver 450/udp +sfs-smp-net 451/tcp #Cray Network Semaphore server +sfs-smp-net 451/udp #Cray Network Semaphore server +sfs-config 452/tcp #Cray SFS config server +sfs-config 452/udp #Cray SFS config server +creativeserver 453/tcp #CreativeServer +creativeserver 453/udp #CreativeServer +contentserver 454/tcp #ContentServer +contentserver 454/udp #ContentServer +creativepartnr 455/tcp #CreativePartnr +creativepartnr 455/udp #CreativePartnr +macon-tcp 456/tcp +macon-udp 456/udp +scohelp 457/tcp +scohelp 457/udp +appleqtc 458/tcp #apple quick time +appleqtc 458/udp #apple quick time +ampr-rcmd 459/tcp +ampr-rcmd 459/udp +skronk 460/tcp +skronk 460/udp +datasurfsrv 461/tcp +datasurfsrv 461/udp +datasurfsrvsec 462/tcp +datasurfsrvsec 462/udp +alpes 463/tcp +alpes 463/udp +# +kpasswd5 464/tcp # Kerberos (v5) +kpasswd5 464/udp # Kerberos (v5) +#PROBLEMS!============================================================== +# IANA has offically assigned these two ports as ``kpasswd'' +#kpasswd 464/tcp # Kerberos (v5) +#kpasswd 464/udp # Kerberos (v5) +#PROBLEMS!============================================================== +smtps 465/tcp #smtp protocol over TLS/SSL (was ssmtp) +smtps 465/udp #smtp protocol over TLS/SSL (was ssmtp) +digital-vrc 466/tcp +digital-vrc 466/udp +mylex-mapd 467/tcp +mylex-mapd 467/udp +photuris 468/tcp +photuris 468/udp +rcp 469/tcp #Radio Control Protocol +rcp 469/udp #Radio Control Protocol +scx-proxy 470/tcp +scx-proxy 470/udp +mondex 471/tcp +mondex 471/udp +ljk-login 472/tcp +ljk-login 472/udp +hybrid-pop 473/tcp +hybrid-pop 473/udp +tn-tl-w1 474/tcp +tn-tl-w2 474/udp +tcpnethaspsrv 475/tcp +tcpnethaspsrv 475/udp +tn-tl-fd1 476/tcp +tn-tl-fd1 476/udp +ss7ns 477/tcp +ss7ns 477/udp +spsc 478/tcp +spsc 478/udp +iafserver 479/tcp +iafserver 479/udp +iafdbase 480/tcp +iafdbase 480/udp +ph 481/tcp +ph 481/udp +bgs-nsi 482/tcp +bgs-nsi 482/udp +ulpnet 483/tcp +ulpnet 483/udp +integra-sme 484/tcp #Integra Software Management Environment +integra-sme 484/udp #Integra Software Management Environment +powerburst 485/tcp #Air Soft Power Burst +powerburst 485/udp #Air Soft Power Burst +avian 486/tcp +avian 486/udp +saft 487/tcp #saft Simple Asynchronous File Transfer +saft 487/udp #saft Simple Asynchronous File Transfer +gss-http 488/tcp +gss-http 488/udp +nest-protocol 489/tcp +nest-protocol 489/udp +micom-pfs 490/tcp +micom-pfs 490/udp +go-login 491/tcp +go-login 491/udp +ticf-1 492/tcp #Transport Independent Convergence for FNA +ticf-1 492/udp #Transport Independent Convergence for FNA +ticf-2 493/tcp #Transport Independent Convergence for FNA +ticf-2 493/udp #Transport Independent Convergence for FNA +pov-ray 494/tcp +pov-ray 494/udp +intecourier 495/tcp +intecourier 495/udp +pim-rp-disc 496/tcp +pim-rp-disc 496/udp +dantz 497/tcp +dantz 497/udp +siam 498/tcp +siam 498/udp +iso-ill 499/tcp #ISO ILL Protocol +iso-ill 499/udp #ISO ILL Protocol +isakmp 500/tcp +isakmp 500/udp +stmf 501/tcp +stmf 501/udp +asa-appl-proto 502/tcp +asa-appl-proto 502/udp +intrinsa 503/tcp +intrinsa 503/udp +citadel 504/tcp +citadel 504/udp +mailbox-lm 505/tcp +mailbox-lm 505/udp +ohimsrv 506/tcp +ohimsrv 506/udp +crs 507/tcp +crs 507/udp +xvttp 508/tcp +xvttp 508/udp +snare 509/tcp +snare 509/udp +fcp 510/tcp #FirstClass Protocol +fcp 510/udp #FirstClass Protocol +passgo 511/tcp +passgo 511/udp +# +# Berkeley-specific services +# +exec 512/tcp #remote process execution; +# authentication performed using +# passwords and UNIX login names +biff 512/udp comsat #used by mail system to notify users +# of new mail received; currently +# receives messages only from +# processes on the same machine +login 513/tcp #remote login a la telnet; +# automatic authentication performed +# based on priviledged port numbers +# and distributed data bases which +# identify "authentication domains" +who 513/udp whod #maintains data bases showing who's +# logged in to machines on a local +# net and the load average of the +# machine +shell 514/tcp cmd #like exec, but automatic +# authentication is performed as for +# login server +syslog 514/udp +printer 515/tcp spooler +printer 515/udp spooler +videotex 516/tcp +videotex 516/udp +talk 517/tcp #like tenex link, but across +# machine - unfortunately, doesn't +# use link protocol (this is actually +# just a rendezvous port from which a +# tcp connection is established) +talk 517/udp #like tenex link, but across +# machine - unfortunately, doesn't +# use link protocol (this is actually +# just a rendezvous port from which a +# tcp connection is established) +ntalk 518/tcp +ntalk 518/udp +utime 519/tcp unixtime +utime 519/udp unixtime +efs 520/tcp #extended file name server +router 520/udp route routed #local routing process (on site); +# uses variant of Xerox NS routing +# information protocol +ripng 521/tcp +ripng 521/udp +ulp 522/tcp +ulp 522/udp +ibm-db2 523/tcp +ibm-db2 523/udp +ncp 524/tcp +ncp 524/udp +timed 525/tcp timeserver +timed 525/udp timeserver +tempo 526/tcp newdate +tempo 526/udp newdate +stx 527/tcp #Stock IXChange +stx 527/udp #Stock IXChange +custix 528/tcp #Customer IXChange +custix 528/udp #Customer IXChange +irc-serv 529/tcp +irc-serv 529/udp +courier 530/tcp rpc +courier 530/udp rpc +conference 531/tcp chat +conference 531/udp chat +netnews 532/tcp readnews +netnews 532/udp readnews +netwall 533/tcp #for emergency broadcasts +netwall 533/udp #for emergency broadcasts +mm-admin 534/tcp #MegaMedia Admin +mm-admin 534/udp #MegaMedia Admin +iiop 535/tcp +iiop 535/udp +opalis-rdv 536/tcp +opalis-rdv 536/udp +nmsp 537/tcp #Networked Media Streaming Protocol +nmsp 537/udp #Networked Media Streaming Protocol +gdomap 538/tcp +gdomap 538/udp +apertus-ldp 539/tcp #Apertus Technologies Load Determination +apertus-ldp 539/udp #Apertus Technologies Load Determination +uucp 540/tcp uucpd +uucp 540/udp uucpd +uucp-rlogin 541/tcp +uucp-rlogin 541/udp +commerce 542/tcp +commerce 542/udp +klogin 543/tcp # Kerberos (v4/v5) +klogin 543/udp # Kerberos (v4/v5) +kshell 544/tcp krcmd # Kerberos (v4/v5) +kshell 544/udp krcmd # Kerberos (v4/v5) +appleqtcsrvr 545/tcp +appleqtcsrvr 545/udp +dhcpv6-client 546/tcp #DHCPv6 Client +dhcpv6-client 546/udp #DHCPv6 Client +dhcpv6-server 547/tcp #DHCPv6 Server +dhcpv6-server 547/udp #DHCPv6 Server +afpovertcp 548/tcp #AFP over TCP +afpovertcp 548/udp #AFP over TCP +idfp 549/tcp +idfp 549/udp +new-rwho 550/tcp new-who +new-rwho 550/udp new-who +cybercash 551/tcp +cybercash 551/udp +deviceshare 552/tcp +deviceshare 552/udp +pirp 553/tcp +pirp 553/udp +rtsp 554/tcp #Real Time Stream Control Protocol +rtsp 554/udp #Real Time Stream Control Protocol +dsf 555/tcp +dsf 555/udp +remotefs 556/tcp rfs rfs_server # Brunhoff remote filesystem +remotefs 556/udp rfs rfs_server # Brunhoff remote filesystem +openvms-sysipc 557/tcp +openvms-sysipc 557/udp +sdnskmp 558/tcp +sdnskmp 558/udp +teedtap 559/tcp +teedtap 559/udp +rmonitor 560/tcp rmonitord +rmonitor 560/udp rmonitord +monitor 561/tcp +monitor 561/udp +chshell 562/tcp chcmd +chshell 562/udp chcmd +nntps 563/tcp snntp #nntp protocol over TLS/SSL +nntps 563/udp snntp #nntp protocol over TLS/SSL +9pfs 564/tcp #plan 9 file service +9pfs 564/udp #plan 9 file service +whoami 565/tcp +whoami 565/udp +streettalk 566/tcp +banyan-rpc 567/tcp +banyan-rpc 567/udp +ms-shuttle 568/tcp #Microsoft shuttle +ms-shuttle 568/udp #Microsoft shuttle +ms-rome 569/tcp #Microsoft rome +ms-rome 569/udp #Microsoft rome +meter 570/tcp #demon +meter 570/udp #demon +umeter 571/tcp #udemon +umeter 571/udp #udemon + + + +sonar 572/tcp +sonar 572/udp +banyan-vip 573/tcp +banyan-vip 573/udp +ftp-agent 574/tcp #FTP Software Agent System +ftp-agent 574/udp #FTP Software Agent System +vemmi 575/tcp +vemmi 575/udp +ipcd 576/tcp +ipcd 576/udp +vnas 577/tcp +vnas 577/udp +ipdd 578/tcp +ipdd 578/udp +decbsrv 579/tcp +decbsrv 579/udp +sntp-heartbeat 580/tcp +sntp-heartbeat 580/udp +bdp 581/tcp #Bundle Discovery Protocol +bdp 581/udp #Bundle Discovery Protocol +scc-security 582/tcp +scc-security 582/udp +philips-vc 583/tcp #Philips Video-Conferencing +philips-vc 583/udp #Philips Video-Conferencing +keyserver 584/tcp +keyserver 584/udp +imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, +imap4-ssl 585/udp # use 993 instead) +password-chg 586/tcp +password-chg 586/udp +submission 587/tcp +submission 587/udp +cal 588/tcp +cal 588/udp +eyelink 589/tcp +eyelink 589/udp +tns-cml 590/tcp +tns-cml 590/udp +http-alt 591/tcp #FileMaker, Inc. - HTTP Alternate (see Port 80) +http-alt 591/udp #FileMaker, Inc. - HTTP Alternate (see Port 80) +eudora-set 592/tcp +eudora-set 592/udp +http-rpc-epmap 593/tcp #HTTP RPC Ep Map +http-rpc-epmap 593/udp #HTTP RPC Ep Map +tpip 594/tcp +tpip 594/udp +cab-protocol 595/tcp +cab-protocol 595/udp +smsd 596/tcp +smsd 596/udp +ptcnameservice 597/tcp #PTC Name Service +ptcnameservice 597/udp #PTC Name Service +sco-websrvrmg3 598/tcp #SCO Web Server Manager 3 +sco-websrvrmg3 598/udp #SCO Web Server Manager 3 +acp 599/tcp #Aeolon Core Protocol +acp 599/udp #Aeolon Core Protocol +ipcserver 600/tcp #Sun IPC server +ipcserver 600/udp #Sun IPC server +nqs 607/tcp +nqs 607/udp +urm 606/tcp #Cray Unified Resource Manager +urm 606/udp #Cray Unified Resource Manager +sift-uft 608/tcp #Sender-Initiated/Unsolicited File Transfer +sift-uft 608/udp #Sender-Initiated/Unsolicited File Transfer +npmp-trap 609/tcp +npmp-trap 609/udp +npmp-local 610/tcp +npmp-local 610/udp +npmp-gui 611/tcp +npmp-gui 611/udp +sshell 614/tcp #SSLshell +sshell 614/udp +ginad 634/tcp +ginad 634/udp +ldaps 636/tcp sldap #ldap protocol over TLS/SSL +ldaps 636/udp sldap +mdqs 666/tcp +mdqs 666/udp +#PROBLEMS!=============================================== +doom 666/tcp #doom Id Software +doom 666/udp #doom Id Software +#PROBLEMS!=============================================== +acap 674/tcp #Application Configuration Access Protocol +acap 674/udp #Application Configuration Access Protocol +elcsd 704/tcp #errlog copy/server daemon +elcsd 704/udp #errlog copy/server daemon +entrustmanager 709/tcp #EntrustManager +entrustmanager 709/udp #EntrustManager +netviewdm1 729/tcp #IBM NetView DM/6000 Server/Client +netviewdm1 729/udp #IBM NetView DM/6000 Server/Client +netviewdm2 730/tcp #IBM NetView DM/6000 send/tcp +netviewdm2 730/udp #IBM NetView DM/6000 send/tcp +netviewdm3 731/tcp #IBM NetView DM/6000 receive/tcp +netviewdm3 731/udp #IBM NetView DM/6000 receive/tcp +netgw 741/tcp +netgw 741/udp +netrcs 742/tcp #Network based Rev. Cont. Sys. +netrcs 742/udp #Network based Rev. Cont. Sys. +flexlm 744/tcp #Flexible License Manager +flexlm 744/udp #Flexible License Manager +fujitsu-dev 747/tcp #Fujitsu Device Control +fujitsu-dev 747/udp #Fujitsu Device Control +ris-cm 748/tcp #Russell Info Sci Calendar Manager +ris-cm 748/udp #Russell Info Sci Calendar Manager +kerberos-adm 749/tcp #Kerberos administration (v5) +kerberos-adm 749/udp #Kerberos administration (v5) +kerberos-iv 750/udp kdc # Kerberos (v4) +kerberos-iv 750/tcp kdc # Kerberos (v4) +#PROBLEMS!======================================================== +#rfile 750/tcp +#loadav 750/udp +#PROBLEMS!======================================================== +kerberos_master 751/tcp # Kerberos `kadmin' (v4) +kerberos_master 751/udp # Kerberos `kadmin' (v4) +#PROBLEMS!======================================================== +pump 751/tcp +pump 751/udp +#PROBLEMS!======================================================== +qrh 752/tcp +qrh 752/udp +rrh 753/tcp +rrh 753/udp +krb_prop 754/tcp krb5_prop # kerberos/v5 server propagation +#PROBLEMS!======================================================== +tell 754/tcp #send +#PROBLEMS!======================================================== +tell 754/udp #send +nlogin 758/tcp +nlogin 758/udp +con 759/tcp +con 759/udp +krbupdate 760/tcp kreg # Kerberos (v4) registration +#PROBLEMS!======================================================== +ns 760/tcp +#PROBLEMS!======================================================== +ns 760/udp +kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" +#PROBLEMS!======================================================== +rxe 761/tcp +#PROBLEMS!======================================================== +rxe 761/udp +quotad 762/tcp +quotad 762/udp +cycleserv 763/tcp +cycleserv 763/udp +omserv 764/tcp +omserv 764/udp +webster 765/tcp +webster 765/udp +phonebook 767/tcp #phone +phonebook 767/udp #phone +vid 769/tcp +vid 769/udp +cadlock 770/tcp +cadlock 770/udp +rtip 771/tcp +rtip 771/udp +cycleserv2 772/tcp +cycleserv2 772/udp +submit 773/tcp +notify 773/udp +rpasswd 774/tcp +acmaint_dbd 774/udp +entomb 775/tcp +acmaint_transd 775/udp +wpages 776/tcp +wpages 776/udp +wpgs 780/tcp +wpgs 780/udp +concert 786/tcp +concert 786/udp +mdbs_daemon 800/tcp +mdbs_daemon 800/udp +device 801/tcp +device 801/udp +supfilesrv 871/tcp # for SUP +rsync 873/tcp +rsync 873/udp +accessbuilder 888/tcp +accessbuilder 888/udp +swat 901/tcp # samba web configuration tool +ftps-data 989/tcp # ftp protocol, data, over TLS/SSL +ftps-data 989/udp +ftps 990/tcp # ftp protocol, control, over TLS/SSL +ftps 990/udp +telnets 992/tcp # telnet protocol over TLS/SSL +telnets 992/udp +imaps 993/tcp # imap4 protocol over TLS/SSL +imaps 993/udp +ircs 994/tcp # irc protocol over TLS/SSL +ircs 994/udp +pop3s 995/tcp spop3 # pop3 protocol over TLS/SSL +pop3s 995/udp spop3 +vsinet 996/tcp +vsinet 996/udp +maitrd 997/tcp +maitrd 997/udp +busboy 998/tcp +puparp 998/udp +garcon 999/tcp +applix 999/udp #Applix ac +puprouter 999/tcp +puprouter 999/udp +cadlock 1000/tcp +ock 1000/udp +# +# REGISTERED PORT NUMBERS +# +blackjack 1025/tcp #network blackjack +blackjack 1025/udp #network blackjack +iad1 1030/tcp #BBN IAD +iad1 1030/udp #BBN IAD +iad2 1031/tcp #BBN IAD +iad2 1031/udp #BBN IAD +iad3 1032/tcp #BBN IAD +iad3 1032/udp #BBN IAD +nim 1058/tcp +nim 1058/udp +nimreg 1059/tcp +nimreg 1059/udp +instl_boots 1067/tcp #Installation Bootstrap Proto. Serv. +instl_boots 1067/udp #Installation Bootstrap Proto. Serv. +instl_bootc 1068/tcp #Installation Bootstrap Proto. Cli. +instl_bootc 1068/udp #Installation Bootstrap Proto. Cli. +socks 1080/tcp +socks 1080/udp +ansoft-lm-1 1083/tcp #Anasoft License Manager +ansoft-lm-1 1083/udp #Anasoft License Manager +ansoft-lm-2 1084/tcp #Anasoft License Manager +ansoft-lm-2 1084/udp #Anasoft License Manager +kpop 1109/tcp #Unofficial +kpop 1109/udp #Unofficial +nfsd-status 1110/tcp #Cluster status info +nfsd-keepalive 1110/udp #Client status info +supfiledbg 1127/tcp # for SUP +nfa 1155/tcp #Network File Access +nfa 1155/udp #Network File Access +phone 1167/udp #conference calling +skkserv 1178/tcp #SKK (kanji input) +lupa 1212/tcp +lupa 1212/udp +nerv 1222/tcp #SNI R&D network +nerv 1222/udp #SNI R&D network +hermes 1248/tcp +hermes 1248/udp +healthd 1281/tcp #healthd +healthd 1281/udp #healthd +alta-ana-lm 1346/tcp #Alta Analytics License Manager +alta-ana-lm 1346/udp #Alta Analytics License Manager +bbn-mmc 1347/tcp #multi media conferencing +bbn-mmc 1347/udp #multi media conferencing +bbn-mmx 1348/tcp #multi media conferencing +bbn-mmx 1348/udp #multi media conferencing +sbook 1349/tcp #Registration Network Protocol +sbook 1349/udp #Registration Network Protocol +editbench 1350/tcp #Registration Network Protocol +editbench 1350/udp #Registration Network Protocol +equationbuilder 1351/tcp #Digital Tool Works (MIT) +equationbuilder 1351/udp #Digital Tool Works (MIT) +lotusnote 1352/tcp #Lotus Note +lotusnote 1352/udp #Lotus Note +relief 1353/tcp #Relief Consulting +relief 1353/udp #Relief Consulting +rightbrain 1354/tcp #RightBrain Software +rightbrain 1354/udp #RightBrain Software +intuitive-edge 1355/tcp #Intuitive Edge +intuitive-edge 1355/udp #Intuitive Edge +cuillamartin 1356/tcp #CuillaMartin Company +cuillamartin 1356/udp #CuillaMartin Company +pegboard 1357/tcp #Electronic PegBoard +pegboard 1357/udp #Electronic PegBoard +connlcli 1358/tcp +connlcli 1358/udp +ftsrv 1359/tcp +ftsrv 1359/udp +mimer 1360/tcp +mimer 1360/udp +linx 1361/tcp +linx 1361/udp +timeflies 1362/tcp +timeflies 1362/udp +ndm-requester 1363/tcp #Network DataMover Requester +ndm-requester 1363/udp #Network DataMover Requester +ndm-server 1364/tcp #Network DataMover Server +ndm-server 1364/udp #Network DataMover Server +adapt-sna 1365/tcp #Network Software Associates +adapt-sna 1365/udp #Network Software Associates +netware-csp 1366/tcp #Novell NetWare Comm Service Platform +netware-csp 1366/udp #Novell NetWare Comm Service Platform +dcs 1367/tcp +dcs 1367/udp +screencast 1368/tcp +screencast 1368/udp +gv-us 1369/tcp #GlobalView to Unix Shell +gv-us 1369/udp #GlobalView to Unix Shell +us-gv 1370/tcp #Unix Shell to GlobalView +us-gv 1370/udp #Unix Shell to GlobalView +fc-cli 1371/tcp #Fujitsu Config Protocol +fc-cli 1371/udp #Fujitsu Config Protocol +fc-ser 1372/tcp #Fujitsu Config Protocol +fc-ser 1372/udp #Fujitsu Config Protocol +chromagrafx 1373/tcp +chromagrafx 1373/udp +molly 1374/tcp #EPI Software Systems +molly 1374/udp #EPI Software Systems +bytex 1375/tcp +bytex 1375/udp +ibm-pps 1376/tcp #IBM Person to Person Software +ibm-pps 1376/udp #IBM Person to Person Software +cichlid 1377/tcp #Cichlid License Manager +cichlid 1377/udp #Cichlid License Manager +elan 1378/tcp #Elan License Manager +elan 1378/udp #Elan License Manager +dbreporter 1379/tcp #Integrity Solutions +dbreporter 1379/udp #Integrity Solutions +telesis-licman 1380/tcp #Telesis Network License Manager +telesis-licman 1380/udp #Telesis Network License Manager +apple-licman 1381/tcp #Apple Network License Manager +apple-licman 1381/udp #Apple Network License Manager +#udt_os 1382/tcp +#udt_os 1382/udp +gwha 1383/tcp #GW Hannaway Network License Manager +gwha 1383/udp #GW Hannaway Network License Manager +os-licman 1384/tcp #Objective Solutions License Manager +os-licman 1384/udp #Objective Solutions License Manager +atex_elmd 1385/tcp #Atex Publishing License Manager +atex_elmd 1385/udp #Atex Publishing License Manager +checksum 1386/tcp #CheckSum License Manager +checksum 1386/udp #CheckSum License Manager +cadsi-lm 1387/tcp #Computer Aided Design Software Inc LM +cadsi-lm 1387/udp #Computer Aided Design Software Inc LM +objective-dbc 1388/tcp #Objective Solutions DataBase Cache +objective-dbc 1388/udp #Objective Solutions DataBase Cache +iclpv-dm 1389/tcp #Document Manager +iclpv-dm 1389/udp #Document Manager +iclpv-sc 1390/tcp #Storage Controller +iclpv-sc 1390/udp #Storage Controller +iclpv-sas 1391/tcp #Storage Access Server +iclpv-sas 1391/udp #Storage Access Server +iclpv-pm 1392/tcp #Print Manager +iclpv-pm 1392/udp #Print Manager +iclpv-nls 1393/tcp #Network Log Server +iclpv-nls 1393/udp #Network Log Server +iclpv-nlc 1394/tcp #Network Log Client +iclpv-nlc 1394/udp #Network Log Client +iclpv-wsm 1395/tcp #PC Workstation Manager software +iclpv-wsm 1395/udp #PC Workstation Manager software +dvl-activemail 1396/tcp #DVL Active Mail +dvl-activemail 1396/udp #DVL Active Mail +audio-activmail 1397/tcp #Audio Active Mail +audio-activmail 1397/udp #Audio Active Mail +video-activmail 1398/tcp #Video Active Mail +video-activmail 1398/udp #Video Active Mail +cadkey-licman 1399/tcp #Cadkey License Manager +cadkey-licman 1399/udp #Cadkey License Manager +cadkey-tablet 1400/tcp #Cadkey Tablet Daemon +cadkey-tablet 1400/udp #Cadkey Tablet Daemon +goldleaf-licman 1401/tcp #Goldleaf License Manager +goldleaf-licman 1401/udp #Goldleaf License Manager +prm-sm-np 1402/tcp #Prospero Resource Manager +prm-sm-np 1402/udp #Prospero Resource Manager +prm-nm-np 1403/tcp #Prospero Resource Manager +prm-nm-np 1403/udp #Prospero Resource Manager +igi-lm 1404/tcp #Infinite Graphics License Manager +igi-lm 1404/udp #Infinite Graphics License Manager +ibm-res 1405/tcp #IBM Remote Execution Starter +ibm-res 1405/udp #IBM Remote Execution Starter +netlabs-lm 1406/tcp #NetLabs License Manager +netlabs-lm 1406/udp #NetLabs License Manager +dbsa-lm 1407/tcp #DBSA License Manager +dbsa-lm 1407/udp #DBSA License Manager +sophia-lm 1408/tcp #Sophia License Manager +sophia-lm 1408/udp #Sophia License Manager +here-lm 1409/tcp #Here License Manager +here-lm 1409/udp #Here License Manager +hiq 1410/tcp #HiQ License Manager +hiq 1410/udp #HiQ License Manager +af 1411/tcp #AudioFile +af 1411/udp #AudioFile +innosys 1412/tcp +innosys 1412/udp +innosys-acl 1413/tcp +innosys-acl 1413/udp +ibm-mqseries 1414/tcp #IBM MQSeries +ibm-mqseries 1414/udp #IBM MQSeries +dbstar 1415/tcp +dbstar 1415/udp +novell-lu6.2 1416/tcp #Novell LU6.2 +novell-lu6.2 1416/udp #Novell LU6.2 +timbuktu-srv1 1417/tcp #Timbuktu Service 1 Port +timbuktu-srv1 1417/udp #Timbuktu Service 1 Port +timbuktu-srv2 1418/tcp #Timbuktu Service 2 Port +timbuktu-srv2 1418/udp #Timbuktu Service 2 Port +timbuktu-srv3 1419/tcp #Timbuktu Service 3 Port +timbuktu-srv3 1419/udp #Timbuktu Service 3 Port +timbuktu-srv4 1420/tcp #Timbuktu Service 4 Port +timbuktu-srv4 1420/udp #Timbuktu Service 4 Port +gandalf-lm 1421/tcp #Gandalf License Manager +gandalf-lm 1421/udp #Gandalf License Manager +autodesk-lm 1422/tcp #Autodesk License Manager +autodesk-lm 1422/udp #Autodesk License Manager +essbase 1423/tcp #Essbase Arbor Software +essbase 1423/udp #Essbase Arbor Software +hybrid 1424/tcp #Hybrid Encryption Protocol +hybrid 1424/udp #Hybrid Encryption Protocol +zion-lm 1425/tcp #Zion Software License Manager +zion-lm 1425/udp #Zion Software License Manager +sas-1 1426/tcp #Satellite-data Acquisition System 1 +sas-1 1426/udp #Satellite-data Acquisition System 1 +mloadd 1427/tcp #mloadd monitoring tool +mloadd 1427/udp #mloadd monitoring tool +informatik-lm 1428/tcp #Informatik License Manager +informatik-lm 1428/udp #Informatik License Manager +nms 1429/tcp #Hypercom NMS +nms 1429/udp #Hypercom NMS +tpdu 1430/tcp #Hypercom TPDU +tpdu 1430/udp #Hypercom TPDU +rgtp 1431/tcp #Reverse Gossip Transport +rgtp 1431/udp #Reverse Gossip Transport +blueberry-lm 1432/tcp #Blueberry Software License Manager +blueberry-lm 1432/udp #Blueberry Software License Manager +ms-sql-s 1433/tcp #Microsoft-SQL-Server +ms-sql-s 1433/udp #Microsoft-SQL-Server +ms-sql-m 1434/tcp #Microsoft-SQL-Monitor +ms-sql-m 1434/udp #Microsoft-SQL-Monitor +ibm-cics 1435/tcp +ibm-cics 1435/udp +sas-2 1436/tcp #Satellite-data Acquisition System 2 +sas-2 1436/udp #Satellite-data Acquisition System 2 +tabula 1437/tcp +tabula 1437/udp +eicon-server 1438/tcp #Eicon Security Agent/Server +eicon-server 1438/udp #Eicon Security Agent/Server +eicon-x25 1439/tcp #Eicon X25/SNA Gateway +eicon-x25 1439/udp #Eicon X25/SNA Gateway +eicon-slp 1440/tcp #Eicon Service Location Protocol +eicon-slp 1440/udp #Eicon Service Location Protocol +cadis-1 1441/tcp #Cadis License Management +cadis-1 1441/udp #Cadis License Management +cadis-2 1442/tcp #Cadis License Management +cadis-2 1442/udp #Cadis License Management +ies-lm 1443/tcp #Integrated Engineering Software +ies-lm 1443/udp #Integrated Engineering Software +marcam-lm 1444/tcp #Marcam License Management +marcam-lm 1444/udp #Marcam License Management +proxima-lm 1445/tcp #Proxima License Manager +proxima-lm 1445/udp #Proxima License Manager +ora-lm 1446/tcp #Optical Research Associates License Manager +ora-lm 1446/udp #Optical Research Associates License Manager +apri-lm 1447/tcp #Applied Parallel Research LM +apri-lm 1447/udp #Applied Parallel Research LM +oc-lm 1448/tcp #OpenConnect License Manager +oc-lm 1448/udp #OpenConnect License Manager +peport 1449/tcp +peport 1449/udp +dwf 1450/tcp #Tandem Distributed Workbench Facility +dwf 1450/udp #Tandem Distributed Workbench Facility +infoman 1451/tcp #IBM Information Management +infoman 1451/udp #IBM Information Management +gtegsc-lm 1452/tcp #GTE Government Systems License Man +gtegsc-lm 1452/udp #GTE Government Systems License Man +genie-lm 1453/tcp #Genie License Manager +genie-lm 1453/udp #Genie License Manager +interhdl_elmd 1454/tcp #interHDL License Manager +interhdl_elmd 1454/udp #interHDL License Manager +esl-lm 1455/tcp #ESL License Manager +esl-lm 1455/udp #ESL License Manager +dca 1456/tcp +dca 1456/udp +valisys-lm 1457/tcp #Valisys License Manager +valisys-lm 1457/udp #Valisys License Manager +nrcabq-lm 1458/tcp #Nichols Research Corp. +nrcabq-lm 1458/udp #Nichols Research Corp. +proshare1 1459/tcp #Proshare Notebook Application +proshare1 1459/udp #Proshare Notebook Application +proshare2 1460/tcp #Proshare Notebook Application +proshare2 1460/udp #Proshare Notebook Application +ibm_wrless_lan 1461/tcp #IBM Wireless LAN +ibm_wrless_lan 1461/udp #IBM Wireless LAN +world-lm 1462/tcp #World License Manager +world-lm 1462/udp #World License Manager +nucleus 1463/tcp +nucleus 1463/udp +msl_lmd 1464/tcp #MSL License Manager +msl_lmd 1464/udp #MSL License Manager +pipes 1465/tcp #Pipes Platform +pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com +oceansoft-lm 1466/tcp #Ocean Software License Manager +oceansoft-lm 1466/udp #Ocean Software License Manager +csdmbase 1467/tcp +csdmbase 1467/udp +csdm 1468/tcp +csdm 1468/udp +aal-lm 1469/tcp #Active Analysis Limited License Manager +aal-lm 1469/udp #Active Analysis Limited License Manager +uaiact 1470/tcp #Universal Analytics +uaiact 1470/udp #Universal Analytics +csdmbase 1471/tcp +csdmbase 1471/udp +csdm 1472/tcp +csdm 1472/udp +openmath 1473/tcp +openmath 1473/udp +telefinder 1474/tcp +telefinder 1474/udp +taligent-lm 1475/tcp #Taligent License Manager +taligent-lm 1475/udp #Taligent License Manager +clvm-cfg 1476/tcp +clvm-cfg 1476/udp +ms-sna-server 1477/tcp +ms-sna-server 1477/udp +ms-sna-base 1478/tcp +ms-sna-base 1478/udp +dberegister 1479/tcp +dberegister 1479/udp +pacerforum 1480/tcp +pacerforum 1480/udp +airs 1481/tcp +airs 1481/udp +miteksys-lm 1482/tcp #Miteksys License Manager +miteksys-lm 1482/udp #Miteksys License Manager +afs 1483/tcp #AFS License Manager +afs 1483/udp #AFS License Manager +confluent 1484/tcp #Confluent License Manager +confluent 1484/udp #Confluent License Manager +lansource 1485/tcp +lansource 1485/udp +nms_topo_serv 1486/tcp +nms_topo_serv 1486/udp +localinfosrvr 1487/tcp +localinfosrvr 1487/udp +docstor 1488/tcp +docstor 1488/udp +dmdocbroker 1489/tcp +dmdocbroker 1489/udp +insitu-conf 1490/tcp +insitu-conf 1490/udp +anynetgateway 1491/tcp +anynetgateway 1491/udp +stone-design-1 1492/tcp +stone-design-1 1492/udp +netmap_lm 1493/tcp +netmap_lm 1493/udp +ica 1494/tcp +ica 1494/udp +cvc 1495/tcp +cvc 1495/udp +liberty-lm 1496/tcp +liberty-lm 1496/udp +rfx-lm 1497/tcp +rfx-lm 1497/udp +watcom-sql 1498/tcp +watcom-sql 1498/udp +fhc 1499/tcp #Federico Heinz Consultora +fhc 1499/udp #Federico Heinz Consultora +vlsi-lm 1500/tcp #VLSI License Manager +vlsi-lm 1500/udp #VLSI License Manager +sas-3 1501/tcp #Satellite-data Acquisition System 3 +sas-3 1501/udp #Satellite-data Acquisition System 3 +shivadiscovery 1502/tcp #Shiva +shivadiscovery 1502/udp #Shiva +imtc-mcs 1503/tcp #Databeam +imtc-mcs 1503/udp #Databeam +evb-elm 1504/tcp #EVB Software Engineering License Manager +evb-elm 1504/udp #EVB Software Engineering License Manager +funkproxy 1505/tcp #Funk Software, Inc. +funkproxy 1505/udp #Funk Software, Inc. +utcd 1506/tcp #Universal Time daemon (utcd) +utcd 1506/udp #Universal Time daemon (utcd) +symplex 1507/tcp +symplex 1507/udp +diagmond 1508/tcp +diagmond 1508/udp +robcad-lm 1509/tcp #Robcad, Ltd. License Manager +robcad-lm 1509/udp #Robcad, Ltd. License Manager +mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. +mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. +3l-l1 1511/tcp +3l-l1 1511/udp +wins 1512/tcp #Microsoft's Windows Internet Name Service +wins 1512/udp #Microsoft's Windows Internet Name Service +fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc +fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc +fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc +fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc +ifor-protocol 1515/tcp +ifor-protocol 1515/udp +vpad 1516/tcp #Virtual Places Audio data +vpad 1516/udp #Virtual Places Audio data +vpac 1517/tcp #Virtual Places Audio control +vpac 1517/udp #Virtual Places Audio control +vpvd 1518/tcp #Virtual Places Video data +vpvd 1518/udp #Virtual Places Video data +vpvc 1519/tcp #Virtual Places Video control +vpvc 1519/udp #Virtual Places Video control +atm-zip-office 1520/tcp #atm zip office +atm-zip-office 1520/udp #atm zip office +ncube-lm 1521/tcp #nCube License Manager +ncube-lm 1521/udp #nCube License Manager +rna-lm 1522/tcp #Ricardo North America License Manager +rna-lm 1522/udp #Ricardo North America License Manager +cichild-lm 1523/tcp +cichild-lm 1523/udp +ingreslock 1524/tcp #ingres +ingreslock 1524/udp #ingres +prospero-np 1525/tcp #Prospero Directory Service non-priv +prospero-np 1525/udp #Prospero Directory Service non-priv +#PROBLEMS!======================================================== +orasrv 1525/tcp #oracle +orasrv 1525/udp #oracle +#PROBLEMS!======================================================== +pdap-np 1526/tcp #Prospero Data Access Prot non-priv +pdap-np 1526/udp #Prospero Data Access Prot non-priv +tlisrv 1527/tcp #oracle +tlisrv 1527/udp #oracle +mciautoreg 1528/tcp +mciautoreg 1528/udp +support 1529/tcp prmsd gnatsd # cygnus bug tracker +coauthor 1529/tcp #oracle +coauthor 1529/udp #oracle +rap-service 1530/tcp +rap-service 1530/udp +rap-listen 1531/tcp +rap-listen 1531/udp +miroconnect 1532/tcp +miroconnect 1532/udp +virtual-places 1533/tcp #Virtual Places Software +virtual-places 1533/udp #Virtual Places Software +micromuse-lm 1534/tcp +micromuse-lm 1534/udp +ampr-info 1535/tcp +ampr-info 1535/udp +ampr-inter 1536/tcp +ampr-inter 1536/udp +sdsc-lm 1537/tcp +sdsc-lm 1537/udp +3ds-lm 1538/tcp +3ds-lm 1538/udp +intellistor-lm 1539/tcp #Intellistor License Manager +intellistor-lm 1539/udp #Intellistor License Manager +rds 1540/tcp +rds 1540/udp +rds2 1541/tcp +rds2 1541/udp +gridgen-elmd 1542/tcp +gridgen-elmd 1542/udp +simba-cs 1543/tcp +simba-cs 1543/udp +aspeclmd 1544/tcp +aspeclmd 1544/udp +vistium-share 1545/tcp +vistium-share 1545/udp +abbaccuray 1546/tcp +abbaccuray 1546/udp +laplink 1547/tcp +laplink 1547/udp +axon-lm 1548/tcp #Axon License Manager +axon-lm 1548/udp #Axon License Manager +shivahose 1549/tcp #Shiva Hose +shivasound 1549/udp #Shiva Sound +3m-image-lm 1550/tcp #Image Storage license manager 3M Company +3m-image-lm 1550/udp #Image Storage license manager 3M Company +hecmtl-db 1551/tcp +hecmtl-db 1551/udp +pciarray 1552/tcp +pciarray 1552/udp +issd 1600/tcp +issd 1600/udp +# IMPORTANT NOTE: Ports 1645/1646 are the traditional radius ports used by +# many vendors without obtaining official IANA assignment. The official +# assignment is now ports 1812/1813 and users are encouraged to migrate +# when possible to these new ports. +#radius 1645/udp #RADIUS authentication protocol (old) +#radacct 1646/udp #RADIUS accounting protocol (old) +nkd 1650/tcp +nkd 1650/udp +shiva_confsrvr 1651/tcp +shiva_confsrvr 1651/udp +xnmp 1652/tcp +xnmp 1652/udp +netview-aix-1 1661/tcp +netview-aix-1 1661/udp +netview-aix-2 1662/tcp +netview-aix-2 1662/udp +netview-aix-3 1663/tcp +netview-aix-3 1663/udp +netview-aix-4 1664/tcp +netview-aix-4 1664/udp +netview-aix-5 1665/tcp +netview-aix-5 1665/udp +netview-aix-6 1666/tcp +netview-aix-6 1666/udp +netview-aix-7 1667/tcp +netview-aix-7 1667/udp +netview-aix-8 1668/tcp +netview-aix-8 1668/udp +netview-aix-9 1669/tcp +netview-aix-9 1669/udp +netview-aix-10 1670/tcp +netview-aix-10 1670/udp +netview-aix-11 1671/tcp +netview-aix-11 1671/udp +netview-aix-12 1672/tcp +netview-aix-12 1672/udp +pptp 1723/tcp #Point-to-point tunnelling protocol +# IMPORTANT NOTE: See comments for ports 1645/1646 when using older equipment +radius 1812/udp #RADIUS authentication protocol (IANA sanctioned) +radacct 1813/udp #RADIUS accounting protocol (IANA sanctioned) +licensedaemon 1986/tcp #cisco license management +licensedaemon 1986/udp #cisco license management +tr-rsrb-p1 1987/tcp #cisco RSRB Priority 1 port +tr-rsrb-p1 1987/udp #cisco RSRB Priority 1 port +tr-rsrb-p2 1988/tcp #cisco RSRB Priority 2 port +tr-rsrb-p2 1988/udp #cisco RSRB Priority 2 port +tr-rsrb-p3 1989/tcp #cisco RSRB Priority 3 port +tr-rsrb-p3 1989/udp #cisco RSRB Priority 3 port +#PROBLEMS!=================================================== +mshnet 1989/tcp #MHSnet system +mshnet 1989/udp #MHSnet system +#PROBLEMS!=================================================== +stun-p1 1990/tcp #cisco STUN Priority 1 port +stun-p1 1990/udp #cisco STUN Priority 1 port +stun-p2 1991/tcp #cisco STUN Priority 2 port +stun-p2 1991/udp #cisco STUN Priority 2 port +stun-p3 1992/tcp #cisco STUN Priority 3 port +stun-p3 1992/udp #cisco STUN Priority 3 port +#PROBLEMS!=================================================== +ipsendmsg 1992/tcp +ipsendmsg 1992/udp +#PROBLEMS!=================================================== +snmp-tcp-port 1993/tcp #cisco SNMP TCP port +snmp-tcp-port 1993/udp #cisco SNMP TCP port +stun-port 1994/tcp #cisco serial tunnel port +stun-port 1994/udp #cisco serial tunnel port +perf-port 1995/tcp #cisco perf port +perf-port 1995/udp #cisco perf port +tr-rsrb-port 1996/tcp #cisco Remote SRB port +tr-rsrb-port 1996/udp #cisco Remote SRB port +gdp-port 1997/tcp #cisco Gateway Discovery Protocol +gdp-port 1997/udp #cisco Gateway Discovery Protocol +x25-svc-port 1998/tcp #cisco X.25 service (XOT) +x25-svc-port 1998/udp #cisco X.25 service (XOT) +tcp-id-port 1999/tcp #cisco identification port +tcp-id-port 1999/udp #cisco identification port +callbook 2000/tcp +callbook 2000/udp +dc 2001/tcp +wizard 2001/udp #curry +globe 2002/tcp +globe 2002/udp +cfingerd 2003/tcp #GNU finger +mailbox 2004/tcp +emce 2004/udp #CCWS mm conf +berknet 2005/tcp +oracle 2005/udp +invokator 2006/tcp +raid-cc 2006/udp #raid +dectalk 2007/tcp +raid-am 2007/udp +conf 2008/tcp +terminaldb 2008/udp +news 2009/tcp +whosockami 2009/udp +search 2010/tcp +pipe_server 2010/udp +raid-cc 2011/tcp #raid +servserv 2011/udp +ttyinfo 2012/tcp +raid-ac 2012/udp +raid-am 2013/tcp +raid-cd 2013/udp +troff 2014/tcp +raid-sf 2014/udp +cypress 2015/tcp +raid-cs 2015/udp +bootserver 2016/tcp +bootserver 2016/udp +cypress-stat 2017/tcp +bootclient 2017/udp +terminaldb 2018/tcp +rellpack 2018/udp +whosockami 2019/tcp +about 2019/udp +xinupageserver 2020/tcp +xinupageserver 2020/udp +servexec 2021/tcp +xinuexpansion1 2021/udp +down 2022/tcp +xinuexpansion2 2022/udp +xinuexpansion3 2023/tcp +xinuexpansion3 2023/udp +xinuexpansion4 2024/tcp +xinuexpansion4 2024/udp +ellpack 2025/tcp +xribs 2025/udp +scrabble 2026/tcp +scrabble 2026/udp +shadowserver 2027/tcp +shadowserver 2027/udp +submitserver 2028/tcp +submitserver 2028/udp +device2 2030/tcp +device2 2030/udp +blackboard 2032/tcp +blackboard 2032/udp +glogger 2033/tcp +glogger 2033/udp +scoremgr 2034/tcp +scoremgr 2034/udp +imsldoc 2035/tcp +imsldoc 2035/udp +objectmanager 2038/tcp +objectmanager 2038/udp +lam 2040/tcp +lam 2040/udp +interbase 2041/tcp +interbase 2041/udp +isis 2042/tcp +isis 2042/udp +isis-bcast 2043/tcp +isis-bcast 2043/udp +rimsl 2044/tcp +rimsl 2044/udp +cdfunc 2045/tcp +cdfunc 2045/udp +sdfunc 2046/tcp +sdfunc 2046/udp +#dls 2047/tcp +#dls 2047/udp +dls-monitor 2048/tcp +dls-monitor 2048/udp +nfsd 2049/tcp nfs # NFS server daemon +nfsd 2049/udp nfs # NFS server daemon +#PROBLEMS!============================================================= +#shilp 2049/tcp +#shilp 2049/udp +#PROBLEMS!============================================================= +dlsrpn 2065/tcp #Data Link Switch Read Port Number +dlsrpn 2065/udp #Data Link Switch Read Port Number +dlswpn 2067/tcp #Data Link Switch Write Port Number +dlswpn 2067/udp #Data Link Switch Write Port Number +zephyr-clt 2103/udp #Zephyr serv-hm connection +zephyr-hm 2104/udp #Zephyr hostmanager +#PROBLEMS!============================================================= +#zephyr-hm-srv 2105/udp #Zephyr hm-serv connection +#PROBLEMS!============================================================= +eklogin 2105/tcp #Kerberos (v4) encrypted rlogin +eklogin 2105/udp #Kerberos (v4) encrypted rlogin +ekshell 2106/tcp #Kerberos (v4) encrypted rshell +ekshell 2106/udp #Kerberos (v4) encrypted rshell +rkinit 2108/tcp #Kerberos (v4) remote initialization +rkinit 2108/udp #Kerberos (v4) remote initialization +ats 2201/tcp #Advanced Training System Program +ats 2201/udp #Advanced Training System Program +ivs-video 2232/tcp #IVS Video default +ivs-video 2232/udp #IVS Video default +ivsd 2241/tcp #IVS Daemon +ivsd 2241/udp #IVS Daemon +pehelp 2307/tcp +pehelp 2307/udp +cvspserver 2401/tcp #CVS network server +cvspserver 2401/udp #CVS network server +venus 2430/tcp #venus +venus 2430/udp #venus +venus-se 2431/tcp #venus-se +venus-se 2431/udp #venus-se +codasrv 2432/tcp #codasrv +codasrv 2432/udp #codasrv +codasrv-se 2433/tcp #codasrv-se +codasrv-se 2433/udp #codasrv-se +rtsserv 2500/tcp #Resource Tracking system server +rtsserv 2500/udp #Resource Tracking system server +rtsclient 2501/tcp #Resource Tracking system client +rtsclient 2501/udp #Resource Tracking system client +hp-3000-telnet 2564/tcp #HP 3000 NS/VT block mode telnet +zebrasrv 2600/tcp #zebra service +zebra 2601/tcp #zebra vty +ripd 2602/tcp #RIPd vty +ripngd 2603/tcp #RIPngd vty +ospfd 2604/tcp #OSPFd vty +bgpd 2605/tcp #BGPd vty +ospf6d 2606/tcp #OSPF6d vty +listen 2766/tcp #System V listener port +www-dev 2784/tcp #world wide web - development +www-dev 2784/udp #world wide web - development +dict 2628/tcp #RFC 2229 +dict 2628/udp #RFC 2229 +NSWS 3049/tcp +NSWS 3049/udp +gds_db 3050/tcp #Firebird Daemon +sj3 3086/tcp #SJ3 (kanji input) +vmodem 3141/tcp +vmodem 3141/udp +ccmail 3264/tcp #cc:mail/lotus +ccmail 3264/udp #cc:mail/lotus +dec-notes 3333/tcp #DEC Notes +dec-notes 3333/udp #DEC Notes +rsvp-encap 3455/udp #RSVP encapsulated in UDP +mapper-nodemgr 3984/tcp #MAPPER network node manager +mapper-nodemgr 3984/udp #MAPPER network node manager +mapper-mapethd 3985/tcp #MAPPER TCP/IP server +mapper-mapethd 3985/udp #MAPPER TCP/IP server +mapper-ws_ethd 3986/tcp #MAPPER workstation server +mapper-ws_ethd 3986/udp #MAPPER workstation server +bmap 3421/tcp #Bull Apprise portmapper +bmap 3421/udp #Bull Apprise portmapper +prsvp 3455/tcp #RSVP Port +prsvp 3455/udp #RSVP Port +vat 3456/tcp #VAT default data +vat 3456/udp #VAT default data +vat-control 3457/tcp #VAT default control +vat-control 3457/udp #VAT default control +udt_os 3900/tcp #Unidata UDT OS +udt_os 3900/udp #Unidata UDT OS +netcheque 4008/tcp #NetCheque accounting +netcheque 4008/udp #NetCheque accounting +lockd 4045/udp # NFS lock daemon/manager +lockd 4045/tcp +nuts_dem 4132/tcp #NUTS Daemon +nuts_dem 4132/udp #NUTS Daemon +nuts_bootp 4133/tcp #NUTS Bootp Server +nuts_bootp 4133/udp #NUTS Bootp Server +rwhois 4321/tcp #Remote Who Is +rwhois 4321/udp #Remote Who Is +unicall 4343/tcp +unicall 4343/udp +krb524 4444/tcp +krb524 4444/udp +# PROBLEM krb524 assigned the port, +# PROBLEM nv used it without an assignment +nv-video 4444/tcp #NV Video default +nv-video 4444/udp #NV Video default +sae-urn 4500/tcp +sae-urn 4500/udp +fax 4557/tcp #FAX transmission service +hylafax 4559/tcp #HylaFAX client-server protocol +rfa 4672/tcp #remote file access server +rfa 4672/udp #remote file access server +commplex-main 5000/tcp +commplex-main 5000/udp +commplex-link 5001/tcp +commplex-link 5001/udp +rfe 5002/tcp #radio free ethernet +rfe 5002/udp #radio free ethernet +telelpathstart 5010/tcp +telelpathstart 5010/udp +telelpathattack 5011/tcp +telelpathattack 5011/udp +mmcc 5050/tcp #multimedia conference control tool +mmcc 5050/udp #multimedia conference control tool +rmonitor_secure 5145/tcp +rmonitor_secure 5145/udp +aol 5190/tcp #America-Online +aol 5190/udp #America-Online +aol-1 5191/tcp #AmericaOnline1 +aol-1 5191/udp #AmericaOnline1 +aol-2 5192/tcp #AmericaOnline2 +aol-2 5192/udp #AmericaOnline2 +aol-3 5193/tcp #AmericaOnline3 +aol-3 5193/udp #AmericaOnline3 +jabber-client 5222/tcp #Jabber Client Connection +jabber-client 5222/udp #Jabber Client Connection +padl2sim 5236/tcp +padl2sim 5236/udp +jabber-server 5269/tcp #Jabber Server Connection +jabber-server 5269/udp #Jabber Server Connection +hacl-hb 5300/tcp # HA cluster heartbeat +hacl-hb 5300/udp # HA cluster heartbeat +hacl-gs 5301/tcp # HA cluster general services +hacl-gs 5301/udp # HA cluster general services +hacl-cfg 5302/tcp # HA cluster configuration +hacl-cfg 5302/udp # HA cluster configuration +hacl-probe 5303/tcp # HA cluster probing +hacl-probe 5303/udp # HA cluster probing +hacl-local 5304/tcp +hacl-local 5304/udp +hacl-test 5305/tcp +hacl-test 5305/udp +cfengine 5308/tcp +cfengine 5308/udp +postgresql 5432/tcp #PostgreSQL Database +postgresql 5432/udp #PostgreSQL Database +rplay 5555/udp +canna 5680/tcp #Canna (Japanese Input) +proshareaudio 5713/tcp #proshare conf audio +proshareaudio 5713/udp #proshare conf audio +prosharevideo 5714/tcp #proshare conf video +prosharevideo 5714/udp #proshare conf video +prosharedata 5715/tcp #proshare conf data +prosharedata 5715/udp #proshare conf data +prosharerequest 5716/tcp #proshare conf request +prosharerequest 5716/udp #proshare conf request +prosharenotify 5717/tcp #proshare conf notify +prosharenotify 5717/udp #proshare conf notify +cvsup 5999/tcp #CVSup file transfer/John Polstra/FreeBSD +x11 6000/tcp #6000-6063 are assigned to X Window System +x11 6000/udp +x11-ssh 6010/tcp #Unofficial name, for convenience +x11-ssh 6010/udp +softcm 6110/tcp #HP SoftBench CM +softcm 6110/udp #HP SoftBench CM +spc 6111/tcp #HP SoftBench Sub-Process Control +spc 6111/udp #HP SoftBench Sub-Process Control +meta-corp 6141/tcp #Meta Corporation License Manager +meta-corp 6141/udp #Meta Corporation License Manager +aspentec-lm 6142/tcp #Aspen Technology License Manager +aspentec-lm 6142/udp #Aspen Technology License Manager +watershed-lm 6143/tcp #Watershed License Manager +watershed-lm 6143/udp #Watershed License Manager +statsci1-lm 6144/tcp #StatSci License Manager - 1 +statsci1-lm 6144/udp #StatSci License Manager - 1 +statsci2-lm 6145/tcp #StatSci License Manager - 2 +statsci2-lm 6145/udp #StatSci License Manager - 2 +lonewolf-lm 6146/tcp #Lone Wolf Systems License Manager +lonewolf-lm 6146/udp #Lone Wolf Systems License Manager +montage-lm 6147/tcp #Montage License Manager +montage-lm 6147/udp #Montage License Manager +ricardo-lm 6148/tcp #Ricardo North America License Manager +ricardo-lm 6148/udp #Ricardo North America License Manager +xdsxdm 6558/tcp +xdsxdm 6558/udp +ircd 6667/tcp #Internet Relay Chat (unoffical) +acmsoda 6969/tcp +acmsoda 6969/udp +afs3-fileserver 7000/tcp #file server itself +afs3-fileserver 7000/udp #file server itself +afs3-callback 7001/tcp #callbacks to cache managers +afs3-callback 7001/udp #callbacks to cache managers +afs3-prserver 7002/tcp #users & groups database +afs3-prserver 7002/udp #users & groups database +afs3-vlserver 7003/tcp #volume location database +afs3-vlserver 7003/udp #volume location database +afs3-kaserver 7004/tcp #AFS/Kerberos authentication service +afs3-kaserver 7004/udp #AFS/Kerberos authentication service +afs3-volser 7005/tcp #volume management server +afs3-volser 7005/udp #volume management server +afs3-errors 7006/tcp #error interpretation service +afs3-errors 7006/udp #error interpretation service +afs3-bos 7007/tcp #basic overseer process +afs3-bos 7007/udp #basic overseer process +afs3-update 7008/tcp #server-to-server updater +afs3-update 7008/udp #server-to-server updater +afs3-rmtsys 7009/tcp #remote cache manager service +afs3-rmtsys 7009/udp #remote cache manager service +afs3-resserver 7010/tcp #MR-AFS residence server +afs3-resserver 7010/udp #MR-AFS residence server +afs3-remio 7011/tcp #MR-AFS remote IO server +afs3-remio 7011/udp #MR-AFS remote IO server +ups-onlinet 7010/tcp #onlinet uninterruptable power supplies +ups-onlinet 7010/udp #onlinet uninterruptable power supplies +font-service 7100/tcp #X Font Service +font-service 7100/udp #X Font Service +fodms 7200/tcp #FODMS FLIP +fodms 7200/udp #FODMS FLIP +dlip 7201/tcp +dlip 7201/udp +natd 8668/divert # Network Address Translation +jetdirect 9100/tcp #HP JetDirect card +man 9535/tcp +man 9535/udp +sd 9876/tcp #Session Director +sd 9876/udp #Session Director +amanda 10080/udp #Dump server control +amandaidx 10082/tcp #Amanda indexing +amidxtape 10083/tcp #Amanda tape indexing +isode-dua 17007/tcp +isode-dua 17007/udp +biimenu 18000/tcp #Beckman Instruments, Inc. +biimenu 18000/udp #Beckman Instruments, Inc. +dbbrowse 47557/tcp #Databeam Corporation +dbbrowse 47557/udp #Databeam Corporation +wnn4 22273/tcp #Wnn4 (Japanese input) +wnn4_Cn 22289/tcp #Wnn4 (Chinese input) +wnn4_Tw 22321/tcp #Wnn4 (Taiwanse input) +wnn4_Kr 22305/tcp #Wnn4 (Korean input) +wnn6 22273/tcp #Wnn6 (Japanese input) +wnn6_Cn 22289/tcp #Wnn6 (Chinese input) +wnn6_Tw 22321/tcp #Wnn6 (Taiwanse input) +wnn6_Kr 22305/tcp #Wnn6 (Korean input) +wnn6_DS 26208/tcp #Wnn6 (Dserver) diff --git a/source/network/netkit-base/FrugalBuild b/source/network/netkit-base/FrugalBuild deleted file mode 100644 index 5344608..0000000 --- a/source/network/netkit-base/FrugalBuild +++ /dev/null @@ -1,41 +0,0 @@ -# Compiling Time: 0.03 SBU -# Contributor: VMiklos -# Maintainer: Zsolt Szalai - -pkgname=netkit-base -pkgver=0.17 -pkgrel=4 -pkgdesc="This is netkit-base for Linux" -url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" -groups=('network') -archs=('i686' 'x86_64') -depends=('glibc' 'portmap') -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 \ - protocols services netdate.tar.gz netdate.diff) -sha1sums=('d1f610efa3320ecac75c2f13df8a45c84fc7d448' \ - '36e00edc99e7a869f1b5584f2080323b70938807' \ - '5c8348adb79fdd86fd2f6685e01920ff13c823fe' \ - '08cabf0acb67286536478a0f43c3072d6133c513' \ - 'f63ad8c3815d7ada3bd9deb0097038622e94f9f6') - -build() { - cd $startdir/src/netkit-base-$pkgver - sed -i 's/localhost/localhost frugalware.local frugalware/' \ - etc.sample/hosts - - mkdir -p $startdir/pkg/{bin,etc} $startdir/pkg/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 - - cd ../netdate - patch -p1 < $startdir/src/netdate.diff - make - make DESTDIR=$startdir/pkg install -} - -# optimization OK diff --git a/source/network/netkit-base/netdate.diff b/source/network/netkit-base/netdate.diff deleted file mode 100644 index 7461ab3..0000000 --- a/source/network/netkit-base/netdate.diff +++ /dev/null @@ -1,277 +0,0 @@ -diff -Naur netdate.orig/Makefile netdate/Makefile ---- netdate.orig/Makefile 1996-08-14 19:19:54.000000000 +0200 -+++ netdate/Makefile 2004-07-19 15:29:12.000000000 +0200 -@@ -1,14 +1,14 @@ --LDFLAGS += -N --CFLAGS = $(O) -Wall -+ -+CC = gcc - - all: netdate - - netdate: netdate.o - - install: netdate -- install -s -m 0755 netdate /sbin/netdate -- install -m 0644 netdate.8 /usr/man/man8 -+ install -s netdate $(DESTDIR)/usr/sbin/netdate -+ install -m 0644 netdate.8 $(DESTDIR)/usr/man/man8/netdate.8 - - clean: -- rm -f netdate *.o core -+ rm -f netdate *~ *.o core - -diff -Naur netdate.orig/netdate.8 netdate/netdate.8 ---- netdate.orig/netdate.8 1996-08-14 19:19:54.000000000 +0200 -+++ netdate/netdate.8 2004-07-19 15:27:44.000000000 +0200 -@@ -53,40 +53,41 @@ - if that host supplies it. - .SH EXAMPLE - The most accurate hosts are named first in each example. --Some such call on \fInetdate\fP should be put at the end of \fB/etc/rc.local\fP, -+Some such call on \fInetdate\fP should be put at the end of -+\fB/etc/rc.d/rc.local\fP, - so that the time will be set properly on system startup. --It is also useful to have a shell script, e.g., \fB/etc/timehosts\fP, -+It is also useful to have a shell script, e.g., \fB/sbin/timehosts\fP, - which contains a call on \fInetdate\fP with arguments appropriate - to the local system, so that it is easy to set the time manually. --.SH "netdate -l 30 udp dcn\-gateway tcp neighbor" --\fIDcn\-gateway\fP is a hypothetical host which usually keeps time -+.SH "netdate -l 30 udp dcn\-gate tcp neighbor" -+\fIDcn\-gate\fP is a hypothetical host which usually keeps time - accurate to within milliseconds of Coordinated Universal Time, - but may occasionally be eight hours off. - \fINeighbor\fP is a neighbor of the local host which keeps time - with moderate accuracy. --The time will be set to that of \fIdcn\-gateway\fP if that and \fIneighbor\fP -+The time will be set to that of \fIdcn\-gate\fP if that and \fIneighbor\fP - agree to within thirty seconds, else it will not be set at all. - This is almost good enough for most circumstances, but won't do - when the local host's time is known to be wrong (e.g., after - a long downtime or a bad crash) and must be set to something. - If one of the hosts named is inaccurate or not responding, there is a problem. --.SH "netdate -l 30 udp dcn\-gateway tcp neighbor neighbor2" -+.SH "netdate -l 30 udp dcn\-gate tcp neighbor neighbor2" - Only two of the three hosts named must agree on the time. - The time will still be set (to that of the first neighbor), --even if \fIdcn\-gateway\fP is far off as long as the two neighbors agree. -+even if \fIdcn\-gate\fP is far off as long as the two neighbors agree. - This is probably good enough for most cases. - One can arbitrarily gerrymander the vote for more insurance - (and less clarity), as in the following example. --.SH "netdate\ udp\ dcn\-gateway\ dcn1\ tcp\ bbn\-unix\ localhost\ neighbor" -+.SH "netdate\ udp\ dcn\-gate\ dcn1\ tcp\ bbn\-unix\ localhost\ neighbor" - Here \fIdcn1\fP and \fIbbn\-unix\fP are more hypothetical very accurate - timekeepers, at least one of which keeps time independently from --\fIdcn\-gateway\fP, one hopes. -+\fIdcn\-gate\fP, one hopes. - It is very likely that the time will be set to that one of those three - very accurate hosts, as long as at least two of them agree, or at least - one of them agrees with the neighbor or the local host's time. - If all the foreign hosts disagree, the time will not be set, - since \fBlocalhost\fP will be chosen as best. --.SH "netdate\ \-l\ 3\ localhost\ localhost\ udp\ dcn\-gateway\ dcn1\ tcp\ bbn\-unix" -+.SH "netdate\ \-l\ 3\ localhost\ localhost\ udp\ dcn\-gate\ dcn1\ tcp\ bbn\-unix" - This example gives \fBlocalhost\fP two votes and declares it to usually - have the most accurate time. - All three foreign hosts must agree within three seconds -@@ -95,9 +96,9 @@ - Thus the time will be set only if it really needs to be. - .SH FILES - .nf --/etc/inet/services for the time service port number --/etc/inet/protocols for the protocol numbers --/etc/wtmp to record time-setting -+/etc/services for the time service port number -+/etc/protocols for the protocol numbers -+/var/log/wtmp to record time-setting - .SH SEE ALSO - ARPANET Request for Comments 868, gettimeofday(2), date(1), - WWV (USA): -diff -Naur netdate.orig/netdate.c netdate/netdate.c ---- netdate.orig/netdate.c 1996-08-14 19:19:54.000000000 +0200 -+++ netdate/netdate.c 2004-07-19 15:27:44.000000000 +0200 -@@ -1,4 +1,4 @@ --/* -+/* - NO WARRANTY - - THERE IS NO WARRANTY FOR THIS PROGRAM, TO THE EXTENT PERMITTED BY -@@ -8,8 +8,8 @@ - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM - IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -- ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -- -+ ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -+ - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL - ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR - REDISTRIBUTE THE PROGRAM, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -@@ -18,8 +18,8 @@ - DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD - PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), - EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGES. -- -+ SUCH DAMAGES. -+ - */ - - #ifndef lint -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include - -@@ -42,17 +43,24 @@ - #include - #include - #include --#define WTMP "/etc/wtmp" -+#define WTMP "/var/log/wtmp" - -+#ifndef __GLIBC__ - struct utmp wtmp[2] = { - { 0, 0, "|", "", 0, "", "", 0}, - { 0, 0, "{", "", 0, "", "", 0} - }; -+#else -+struct utmp wtmp[2] = { -+ { 0, 0, "|", "", "", "", {0, 0}, 0, {0, 0}, {0, 0, 0, 0}, "" }, -+ { 0, 0, "|", "", "", "", {0, 0}, 0, {0, 0}, {0, 0, 0, 0}, "" }, -+}; -+#endif - - char *service = "time"; - char *defaultproto = "udp"; - /* difference between 1900 (RFC868) and 1970 (UNIX) base times */ --#define NETBASE 2208988800 -+#define NETBASE 2208988800u - - long limit = 5; - #define MAXHOSTS 20 -@@ -78,7 +86,6 @@ - - void usage (void); - int setproto (char *, struct timehost *); --void main (int, char **); - int getdiff (struct timehost *); - int getdate (struct timehost *); - void printit (struct timehost *); -@@ -98,7 +105,7 @@ - fprintf (stderr, - "usage: %s [ -l limit ] host ...\n" - "%s tries to find a group of at least two hosts whose times agree\n" --"within %d seconds, and sets the time to that of the first host in the group.\n", -+"within %ld seconds, and sets the time to that of the first host in the group.\n", - whoami, whoami, limit); - fprintf (stderr, - "The limit may be set with the -l option. Setting it to zero (or supplying\n" -@@ -112,7 +119,7 @@ - int verbose = 0; - int debug = 0; - --void -+int - main (int argc, char **argv) - { - extern char *rindex(); -@@ -155,7 +162,7 @@ - if (*argv == NULL) - usage(); - if (debug) -- fprintf (stderr, "%s: rdate %d; verbose %d; limit %d.\n", -+ fprintf (stderr, "%s: rdate %d; verbose %d; limit %ld.\n", - whoami, rdate, verbose, limit); - for (thishost = &timehosts[0]; *argv != NULL; argv++) { - if (thishost >= tophost) { -@@ -189,7 +196,7 @@ - exit(1); - if ((thishost = mungediffs(thishost)) == NULL) { - fprintf (stderr, -- "No two hosts agree on the time within %d seconds\n", -+ "No two hosts agree on the time within %ld seconds\n", - limit); - exit(1); - } -@@ -258,7 +265,7 @@ - and return the first of that group. If no two hosts agree, - give up. - */ -- -+ - struct timehost * - mungediffs(struct timehost *tophost) - { -@@ -284,7 +291,7 @@ - } - } - if (verbose) { -- printf (" %d\n", thishost -> count); -+ printf (" %ld\n", thishost -> count); - (void)fflush(stdout); - } - if (thishost -> count > goodhost -> count) -@@ -312,13 +319,13 @@ - && abs((thishost -> then.tv_sec - now.tv_sec) - thishost -> difference) - > limit) { - fprintf (stderr, -- "Time from %s has varied more than the limit of %d seconds\n", -+ "Time from %s has varied more than the limit of %ld seconds\n", - thishost -> hostname, limit); - printit(thishost); - exit(1); - } - if (settimeofday (&thishost -> then, (struct timezone *)0) == -1) -- perror ("netdate; settimeofday"); -+ perror ("netdate: settimeofday"); - else { - int wf; - if ((wf = open(WTMP, 1)) >= 0) { -@@ -348,12 +355,12 @@ - (void)sprintf(newstring, "%s ", thishost -> hostname); - tvsub(&diff, &thishost -> then, &now); - printdiff(&newstring[strlen(newstring)], &diff); -- printf ("%-24s %.19s.%03d", newstring, -+ printf ("%-24s %.19s.%03ld", newstring, - ctime((unsigned long *)&thishost -> then.tv_sec), - thishost -> then.tv_usec / 1000); - if (verbose) { - tp = localtime((unsigned long *)&thishost -> acked); -- printf(" at %02d:%02d:%02d.%03d", -+ printf(" at %02d:%02d:%02d.%03ld", - tp -> tm_hour, tp -> tm_min, tp -> tm_sec, - thishost -> acked.tv_usec / 1000); - tvsub(&diff, &thishost -> acked, &thishost -> asked); -@@ -446,20 +453,23 @@ - perror("netdate: connect"); - goto bad; - } -+ - if (thishost -> socktype == SOCK_DGRAM) { -- if (write (s, "\n", 1) < 0) { -+ if (send (s, "\n", 1, 0) < 0) { - perror ("netdate: send"); - goto bad; - } - } -- nread = read (s, (char *)&thishost -> then, sizeof (thishost -> then)); -+ nread = recv (s, (char *)&thishost -> then, sizeof (thishost -> then), 0); - (void)gettimeofday (&thishost -> acked, (struct timezone *)0); - (void)alarm(0); - now = thishost -> acked; -- if (nread < sizeof(thishost -> then.tv_sec)) { -+ -+ if (nread != 4) { - perror ("netdate: read"); - goto bad; - } -+ - /* RFC 868 only allows seconds, but what the hell */ - if (nread == sizeof(thishost -> then)) - thishost -> then.tv_usec = ntohl(thishost -> then.tv_usec); diff --git a/source/network/netkit-base/netdate.tar.gz b/source/network/netkit-base/netdate.tar.gz deleted file mode 100644 index 7f00318..0000000 Binary files a/source/network/netkit-base/netdate.tar.gz and /dev/null differ diff --git a/source/network/netkit-base/protocols b/source/network/netkit-base/protocols deleted file mode 100644 index db3254c..0000000 --- a/source/network/netkit-base/protocols +++ /dev/null @@ -1,146 +0,0 @@ -# -# Internet protocols -# -# $FreeBSD: src/etc/protocols,v 1.16 2002/02/10 08:19:58 dd Exp $ -# from: @(#)protocols 5.1 (Berkeley) 4/17/89 -# -# See also http://www.iana.org/assignments/protocol-numbers -# -ip 0 IP # internet protocol, pseudo protocol number -#hopopt 0 HOPOPT # hop-by-hop options for ipv6 -icmp 1 ICMP # internet control message protocol -igmp 2 IGMP # internet group management protocol -ggp 3 GGP # gateway-gateway protocol -ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') -st2 5 ST2 # ST2 datagram mode (RFC 1819) -tcp 6 TCP # transmission control protocol -cbt 7 CBT # CBT, Tony Ballardie -egp 8 EGP # exterior gateway protocol -igp 9 IGP # any private interior gateway (Cisco: for IGRP) -bbn-rcc 10 BBN-RCC-MON # BBN RCC Monitoring -nv