From vmiklos at frugalware.org Sun Jul 1 14:20:52 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 14:20:54 2007 Subject: [Frugalware-git] frugalware-current: ed-0.6-1-x86_64 Message-ID: <20070701122052.064941868074@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5999c363642f758cce1c41fd16ab16c4c9a3660e commit 5999c363642f758cce1c41fd16ab16c4c9a3660e Author: VMiklos Date: Sat Jun 30 22:51:05 2007 +0200 ed-0.6-1-x86_64 - version bump - test patch in git: hopefully now the gitweb link in the generated mail will be ok :) diff --git a/source/base/ed/FrugalBuild b/source/base/ed/FrugalBuild index a7e4c2c..9368068 100644 --- a/source/base/ed/FrugalBuild +++ b/source/base/ed/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=ed -pkgver=0.5 +pkgver=0.6 pkgrel=1 pkgdesc="A POSIX-compliant line editor" url="http://www.gnu.org/software/ed/ed.html" From vmiklos at frugalware.org Sun Jul 1 14:20:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 14:20:54 2007 Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.40-1-x86_64 Message-ID: <20070701122051.D964B1868073@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=870e6a5a228dba5286959cbafd7bc7904f5dfe5c commit 870e6a5a228dba5286959cbafd7bc7904f5dfe5c Author: VMiklos Date: Sat Jun 30 22:28:30 2007 +0200 e2fsprogs-1.40-1-x86_64 version bump test patch in git diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 8f4d05e..fe292e5 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=e2fsprogs -pkgver=1.39 +pkgver=1.40 pkgrel=1 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" url="http://e2fsprogs.sourceforge.net/" @@ -24,6 +24,6 @@ build() } # optimization OK -sha1sums=('c2dad0c9bd76701eafe3804e2a7d072aa198f046' \ - 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ - '7d5e3eecbea952aa1f72808fb810892d82a35461') +sha1sums=('9a8c0d76313f2061228dbc6ee51d4bc054efcd2a' \ + 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ + '7d5e3eecbea952aa1f72808fb810892d82a35461') From vmiklos at frugalware.org Sun Jul 1 14:27:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 14:27:11 2007 Subject: [Frugalware-git] frugalware-current: busybox-1.6.1-1-i686 Message-ID: <20070701122709.3E89A186809D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b8621482ea31ca28fde31da84aa14fdf7e9897d0 commit b8621482ea31ca28fde31da84aa14fdf7e9897d0 Author: VMiklos Date: Sun Jul 1 14:20:35 2007 +0200 busybox-1.6.1-1-i686 version bump test bump in git diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index c468512..43888bf 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=busybox -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.busybox.net/downloads/?C=M;O=D' |grep [0-9].tar.bz2|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('bce33a204a943bf7438e1fdb8d8a28e8d99e9c81' \ +sha1sums=('ff79db26fa53c20808de4d6f3514f34044749a77' \ 'fc8f5aabdb53c823c942244c2046f3f61ec8169d') build() From vmiklos at frugalware.org Sun Jul 1 14:55:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 14:55:22 2007 Subject: [Frugalware-git] frugalware-current: busybox-1.6.1-1-i686 Message-ID: <20070701125520.DB6A3186809D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b8621482ea31ca28fde31da84aa14fdf7e9897d0 commit b8621482ea31ca28fde31da84aa14fdf7e9897d0 Author: VMiklos Date: Sun Jul 1 14:20:35 2007 +0200 busybox-1.6.1-1-i686 version bump test bump in git diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index c468512..43888bf 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=busybox -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.busybox.net/downloads/?C=M;O=D' |grep [0-9].tar.bz2|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('bce33a204a943bf7438e1fdb8d8a28e8d99e9c81' \ +sha1sums=('ff79db26fa53c20808de4d6f3514f34044749a77' \ 'fc8f5aabdb53c823c942244c2046f3f61ec8169d') build() From vmiklos at frugalware.org Sun Jul 1 15:03:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 15:03:27 2007 Subject: [Frugalware-git] frugalware-current: perl-log-log4perl-1.12-1-i686 Message-ID: <20070701130324.D44A5186809D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=50030fc6040b229b03e71789cfed4aa2c341d509 commit 50030fc6040b229b03e71789cfed4aa2c341d509 Author: VMiklos Date: Sun Jul 1 14:55:03 2007 +0200 perl-log-log4perl-1.12-1-i686 test bump in git diff --git a/source/devel-extra/perl-log-log4perl/FrugalBuild b/source/devel-extra/perl-log-log4perl/FrugalBuild index cd9ff77..36bc17e 100644 --- a/source/devel-extra/perl-log-log4perl/FrugalBuild +++ b/source/devel-extra/perl-log-log4perl/FrugalBuild @@ -3,8 +3,8 @@ _F_perl_name=Log-Log4perl _F_perl_author=M/MS/MSCHILLI -pkgver=1.10 +pkgver=1.12 pkgdesc="Log4j implementation for Perl" Finclude perl archs=('i686' 'x86_64') -sha1sums=('c2fe3b35b2b625b2fc1a92d5dadefce19e2e5ba1') +sha1sums=('c414a3ef40373318dffbae2f0959a0b66a15333c') From vmiklos at frugalware.org Sun Jul 1 15:22:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 15:23:03 2007 Subject: [Frugalware-git] frugalware-current: perl-yaml-syck-0.91-1-i686 Message-ID: <20070701132250.D42A5186809D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=80d752bb486990743db76dbb5c9fb0b92d3a4d86 commit 80d752bb486990743db76dbb5c9fb0b92d3a4d86 Author: VMiklos Date: Sun Jul 1 15:22:33 2007 +0200 perl-yaml-syck-0.91-1-i686 test bump in git diff --git a/source/devel-extra/perl-yaml-syck/FrugalBuild b/source/devel-extra/perl-yaml-syck/FrugalBuild index 2c13306..eb8b8f7 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.85 +pkgver=0.91 pkgdesc="Fast, lightweight YAML loader and dumper" Finclude perl archs=('i686' 'x86_64') -sha1sums=('22136cdd46579cd22649ca3bda069eb3e5cc3f1b') +sha1sums=('9c20f980dd31bce45c1133f882d163d89bf4f488') # optimization OK From vmiklos at frugalware.org Sun Jul 1 15:25:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 1 15:25:47 2007 Subject: [Frugalware-git] frugalware-current: perl-yaml-syck-0.91-1-i686 Message-ID: <20070701132545.1BFE1186809D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=80d752bb486990743db76dbb5c9fb0b92d3a4d86 commit 80d752bb486990743db76dbb5c9fb0b92d3a4d86 Author: VMiklos Date: Sun Jul 1 15:22:33 2007 +0200 perl-yaml-syck-0.91-1-i686 test bump in git diff --git a/source/devel-extra/perl-yaml-syck/FrugalBuild b/source/devel-extra/perl-yaml-syck/FrugalBuild index 2c13306..eb8b8f7 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.85 +pkgver=0.91 pkgdesc="Fast, lightweight YAML loader and dumper" Finclude perl archs=('i686' 'x86_64') -sha1sums=('22136cdd46579cd22649ca3bda069eb3e5cc3f1b') +sha1sums=('9c20f980dd31bce45c1133f882d163d89bf4f488') # optimization OK From vmiklos at frugalware.org Mon Jul 2 01:51:54 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 2 01:51:56 2007 Subject: [Frugalware-git] frugalware-current: perl-net-dns-0.60-1-i686 Message-ID: <20070701235154.7E93918680B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d27695e95a86257646bc034838b235328d12ef3a commit d27695e95a86257646bc034838b235328d12ef3a Author: VMiklos Date: Mon Jul 2 01:48:21 2007 +0200 perl-net-dns-0.60-1-i686 version bump test bump in git diff --git a/source/devel-extra/perl-net-dns/FrugalBuild b/source/devel-extra/perl-net-dns/FrugalBuild index 746dba0..67c60f7 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.59 +pkgver=0.60 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=('6269e05159494bc4115bf9e6dad003858c2188c3') +sha1sums=('87faa1d6c4d5a9e360314a39dee6825864e06c62') Fconfopts="$Fconfopts --noonline-tests" # optimization OK From vmiklos at frugalware.org Mon Jul 2 01:55:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 2 01:55:06 2007 Subject: [Frugalware-git] frugalware-current: iptables-1.3.8-1-i686 Message-ID: <20070701235505.D5E9E18680B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5d7ee15af96838a14031c90db6c3d29ed840179 commit c5d7ee15af96838a14031c90db6c3d29ed840179 Author: VMiklos Date: Mon Jul 2 01:54:51 2007 +0200 iptables-1.3.8-1-i686 version bump test bump in git diff --git a/source/network/iptables/FrugalBuild b/source/network/iptables/FrugalBuild index d5a6979..fa4d001 100644 --- a/source/network/iptables/FrugalBuild +++ b/source/network/iptables/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Zsolt Szalai pkgname=iptables -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=1 pkgdesc="IP packet filter administration" url="http://www.iptables.org/" @@ -37,8 +37,8 @@ build() } # optimization OK -sha1sums=('2f25e7a81fb3e81f92b0121d9dcd5a536854dc60' \ - '8d817150509f677370561bd412f49d2868f1eeef' \ - '0f8f613fe2daac570bece0df8711b4b6546a9e34' \ - '57af04722d7b42f128b96119ffa97fd3924f80b1' \ - '56ff89ba4ef72b0a203a1210e4fe9ea869e89ff5') +sha1sums=('948f361b194e989b39de4cfa3e95dbe634269ed0' \ + '8d817150509f677370561bd412f49d2868f1eeef' \ + '0f8f613fe2daac570bece0df8711b4b6546a9e34' \ + '57af04722d7b42f128b96119ffa97fd3924f80b1' \ + '56ff89ba4ef72b0a203a1210e4fe9ea869e89ff5') From vmiklos at frugalware.org Mon Jul 2 10:16:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 2 10:17:30 2007 Subject: [Frugalware-git] frugalware-current: live-2007.07.01-1-x86_64 Message-ID: <20070702081646.3C16318680ED@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bacc010195f5f90c596462b3dcd41c1fb7cae083 commit bacc010195f5f90c596462b3dcd41c1fb7cae083 Author: VMiklos Date: Mon Jul 2 10:12:40 2007 +0200 live-2007.07.01-1-x86_64 version bump test bump in git diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index 630cac1..b44562e 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=live -pkgver=2007.05.24 +pkgver=2007.07.01 pkgrel=1 pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming" url="http://www.live555.com/" @@ -33,6 +33,6 @@ build() Fexerel `find testProgs -type f -perm +111` /usr/bin/ } -sha1sums=('de85090e23e8f3f91909122f045d8c26d646fbe3') +sha1sums=('e5484b865c4dc5d56378db83356be6786f63447f') # optimization OK From vmiklos at frugalware.org Mon Jul 2 10:26:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 2 10:27:05 2007 Subject: [Frugalware-git] frugalware-current: acpid-1.0.6-1-x86_64 Message-ID: <20070702082650.49B1618680EB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3993e93246c36dbcdcacd18ab4134e091710652b commit 3993e93246c36dbcdcacd18ab4134e091710652b Author: VMiklos Date: Mon Jul 2 10:26:12 2007 +0200 acpid-1.0.6-1-x86_64 version bump test bump in git diff --git a/source/base/acpid/FrugalBuild b/source/base/acpid/FrugalBuild index fa719e6..5d10078 100644 --- a/source/base/acpid/FrugalBuild +++ b/source/base/acpid/FrugalBuild @@ -2,22 +2,21 @@ # Maintainer: VMiklos pkgname=acpid -pkgver=1.0.4 -pkgrel=5 +pkgver=1.0.6 +pkgrel=1 pkgdesc="Utilities for using ACPI power management" depends=('glibc') groups=('base') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge -source=(${source[@]} rc.acpid rc.acpid-{de,hu,it}.po acpi_handler.sh default $pkgname-$pkgver-gcc4.patch) -sha1sums=('229376815a861d798755c789727151dc0b2bc8a0' \ +source=(${source[@]} rc.acpid rc.acpid-{de,hu,it}.po acpi_handler.sh default) +sha1sums=('67a582cddcd82256e376f4b0749121d8e4ffcaf5' \ '009e8c404a93db943f57631bc95625609fb29255' \ '67c63dd3f5225c33170e1cfc549c0319ada21a84' \ 'fcf938454f809eeec394ebea64d7f10dfdf11caf' \ 'fd74c81eab81fad2eedf7f11ac14a33f97f2b213' \ 'f232c48dbd9200e4ac79e2edc6ab5929835f42e0' \ - 'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc' \ - '2b408f6a6100cba0c47f183b5859854ceaa9b34e') + 'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc') build() { diff --git a/source/base/acpid/acpid-1.0.4-gcc4.patch b/source/base/acpid/acpid-1.0.4-gcc4.patch deleted file mode 100644 index 471171a..0000000 --- a/source/base/acpid/acpid-1.0.4-gcc4.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- acpid-1.0.4/ud_socket.c.warning 2003-11-17 16:24:58.000000000 -0500 -+++ acpid-1.0.4/ud_socket.c 2005-03-16 17:51:40.000000000 -0500 -@@ -58,7 +58,7 @@ - while (1) { - int newsock = 0; - struct sockaddr_un cliaddr; -- int len = sizeof(struct sockaddr_un); -+ socklen_t len = sizeof(struct sockaddr_un); - - newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); - if (newsock < 0) { ---- acpid-1.0.4/acpid.c.warning 2004-10-17 18:33:51.000000000 -0400 -+++ acpid-1.0.4/acpid.c 2005-03-16 17:52:23.000000000 -0500 -@@ -61,7 +61,7 @@ - main(int argc, char **argv) - { - int event_fd; -- int sock_fd; -+ int sock_fd = -1; - - /* learn who we really are */ - progname = (const char *)strrchr(argv[0], '/'); -@@ -386,9 +386,7 @@ - umask(0); - - /* get outta the way */ -- chdir("/"); -- -- return 0; -+ return chdir("/"); - } - - static int From vmiklos at frugalware.org Thu Jul 5 21:54:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 5 21:54:41 2007 Subject: [Frugalware-git] frugalware: Makefile: updated dist target for git Message-ID: <20070705195434.B9D0D13A4053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware/.git;a=commitdiff;h=e169200958e97542db3d7d5b9a14df92085ce727 commit e169200958e97542db3d7d5b9a14df92085ce727 Author: VMiklos Date: Thu Jul 5 21:53:21 2007 +0200 Makefile: updated dist target for git diff --git a/Makefile b/Makefile index 0e9719c..75b4dca 100644 --- a/Makefile +++ b/Makefile @@ -133,12 +133,15 @@ ifeq ($(shell uname -m),x86_64) endif dist: - darcs changes >_darcs/pristine/Changelog - darcs dist -d frugalware-$(VERSION) + git-archive --format=tar --prefix=frugalware-$(VERSION)/ HEAD > frugalware-$(VERSION).tar + mkdir -p frugalware-$(VERSION) + git log > frugalware-$(VERSION)/Changelog + tar rf frugalware-$(VERSION).tar frugalware-$(VERSION)/Changelog + rm -rf frugalware-$(VERSION) + gzip -f -9 frugalware-$(VERSION).tar gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ -ba -u 20F55619 frugalware-$(VERSION).tar.gz mv frugalware-$(VERSION).tar.gz{,.asc} ../ - rm _darcs/pristine/Changelog release: darcs tag --checkpoint $(VERSION) From vmiklos at frugalware.org Thu Jul 5 22:52:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 5 22:52:56 2007 Subject: [Frugalware-git] pacman-tools: permission fixes Message-ID: <20070705205253.76B1513A4053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=be0e117b31fa7fbf8dce0cca7fd5b546193a118c commit be0e117b31fa7fbf8dce0cca7fd5b546193a118c Author: VMiklos Date: Thu Jul 5 22:39:32 2007 +0200 permission fixes diff --git a/bumppkg b/bumppkg old mode 100644 new mode 100755 diff --git a/darcs-git.py b/darcs-git.py old mode 100644 new mode 100755 From vmiklos at frugalware.org Thu Jul 5 22:52:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 5 22:52:56 2007 Subject: [Frugalware-git] pacman-tools: updated dist and release target for git Message-ID: <20070705205253.9399C13A4055@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=9e2395515ac34d417aab60d76e2f2fc13fe0136a commit 9e2395515ac34d417aab60d76e2f2fc13fe0136a Author: VMiklos Date: Thu Jul 5 22:51:42 2007 +0200 updated dist and release target for git diff --git a/Makefile b/Makefile index cb9ba0a..67ba312 100644 --- a/Makefile +++ b/Makefile @@ -118,15 +118,18 @@ clean: $(MAKE) -C mkiso clean dist: - darcs changes >_darcs/current/Changelog - darcs dist -d pacman-tools-$(VERSION) + git-archive --format=tar --prefix=pacman-tools-$(VERSION)/ HEAD > pacman-tools-$(VERSION).tar + mkdir -p pacman-tools-$(VERSION) + git log > pacman-tools-$(VERSION)/Changelog + tar rf pacman-tools-$(VERSION).tar pacman-tools-$(VERSION)/Changelog + rm -rf pacman-tools-$(VERSION) + gzip -f -9 pacman-tools-$(VERSION).tar gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ -ba -u 20F55619 pacman-tools-$(VERSION).tar.gz mv pacman-tools-$(VERSION).tar.gz{,.asc} ../ - rm _darcs/current/Changelog release: - darcs tag --checkpoint $(VERSION) + git tag $(VERSION) $(MAKE) dist apidocs: From vmiklos at frugalware.org Thu Jul 5 22:54:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 5 22:54:28 2007 Subject: [Frugalware-git] frugalware: Makefile: updated dist target for git Message-ID: <20070705205426.34F4F13A4053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware/.git;a=commitdiff;h=e169200958e97542db3d7d5b9a14df92085ce727 commit e169200958e97542db3d7d5b9a14df92085ce727 Author: VMiklos Date: Thu Jul 5 21:53:21 2007 +0200 Makefile: updated dist target for git diff --git a/Makefile b/Makefile index 0e9719c..75b4dca 100644 --- a/Makefile +++ b/Makefile @@ -133,12 +133,15 @@ ifeq ($(shell uname -m),x86_64) endif dist: - darcs changes >_darcs/pristine/Changelog - darcs dist -d frugalware-$(VERSION) + git-archive --format=tar --prefix=frugalware-$(VERSION)/ HEAD > frugalware-$(VERSION).tar + mkdir -p frugalware-$(VERSION) + git log > frugalware-$(VERSION)/Changelog + tar rf frugalware-$(VERSION).tar frugalware-$(VERSION)/Changelog + rm -rf frugalware-$(VERSION) + gzip -f -9 frugalware-$(VERSION).tar gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ -ba -u 20F55619 frugalware-$(VERSION).tar.gz mv frugalware-$(VERSION).tar.gz{,.asc} ../ - rm _darcs/pristine/Changelog release: darcs tag --checkpoint $(VERSION) From vmiklos at frugalware.org Fri Jul 6 10:31:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 10:31:36 2007 Subject: [Frugalware-git] homepage-ng: frugalware/darcs-posthook-security.py: cosmetic change to test hooks Message-ID: <20070706083134.70A2413A4104@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=33333c2345228a5da15c5f13a3a6e834788a2087 commit 33333c2345228a5da15c5f13a3a6e834788a2087 Author: VMiklos Date: Fri Jul 6 10:31:28 2007 +0200 frugalware/darcs-posthook-security.py: cosmetic change to test hooks diff --git a/frugalware/darcs-posthook-security.py b/frugalware/darcs-posthook-security.py index 8ce26e6..8078413 100644 --- a/frugalware/darcs-posthook-security.py +++ b/frugalware/darcs-posthook-security.py @@ -10,7 +10,7 @@ Frugalware Linux Homepage - New Generation @author Miklos Vajna - @copyright Copyright (C) 2006 Miklos Vajna + @copyright Copyright (C) 2006, 2007 Miklos Vajna """ from xml.dom import minidom From vmiklos at frugalware.org Fri Jul 6 19:18:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 19:18:48 2007 Subject: [Frugalware-git] pacman-tools: permission fixes Message-ID: <20070706171845.DF8D818681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=c48fa9e95e6fcc59660d58a11e0f5eed59b7b7cb commit c48fa9e95e6fcc59660d58a11e0f5eed59b7b7cb Author: VMiklos Date: Fri Jul 6 19:18:39 2007 +0200 permission fixes diff --git a/mkpkghtml b/mkpkghtml old mode 100644 new mode 100755 diff --git a/repoman b/repoman old mode 100644 new mode 100755 diff --git a/revdep-rebuild b/revdep-rebuild old mode 100644 new mode 100755 From vmiklos at frugalware.org Fri Jul 6 20:14:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 20:14:13 2007 Subject: [Frugalware-git] frugalware-current: dialog-1.1_20070704-1-i686 Message-ID: <20070706181410.99A3318681E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=55bb09796a9d243f2e4b52b63cdf46a244185291 commit 55bb09796a9d243f2e4b52b63cdf46a244185291 Author: VMiklos Date: Fri Jul 6 20:13:42 2007 +0200 dialog-1.1_20070704-1-i686 version bump first bump in git :) hopefully everything goes as planned diff --git a/source/base/dialog/FrugalBuild b/source/base/dialog/FrugalBuild index d1fd568..4e0d9c9 100644 --- a/source/base/dialog/FrugalBuild +++ b/source/base/dialog/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=dialog -pkgver=1.1_20070604 +pkgver=1.1_20070704 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" url="http://invisible-island.net/dialog/dialog.html" From vmiklos at frugalware.org Fri Jul 6 20:24:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 20:24:11 2007 Subject: [Frugalware-git] frugalware-current: tools/gitpull: new script for our gitweb mirror Message-ID: <20070706182407.B5BF118681E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=12ff96fb1db9f416bab9dc839d3c55e95d8529f3 commit 12ff96fb1db9f416bab9dc839d3c55e95d8529f3 Author: VMiklos Date: Fri Jul 6 20:24:03 2007 +0200 tools/gitpull: new script for our gitweb mirror diff --git a/tools/gitpull b/tools/gitpull new file mode 100755 index 0000000..a10fcc1 --- /dev/null +++ b/tools/gitpull @@ -0,0 +1,28 @@ +#!/bin/bash + +server="rsync://rsync.frugalware.org/pub/other/homepage-ng/git/repos/" + +cd `dirname $0`/../repos +: > projects.list +for i in `rsync $server|sed 's/.* \([^ ]\)/\1/;1 d'` +do + if [ -d $i ]; then + cd $i + git pull -q + cd .. + else + git clone -q $server/$i/.git + fi + rm -rf $i/.git/refs/remotes + rsync $server/$i/.git/owner $i/.git/ + rsync $server/$i/.git/description $i/.git/ + python -c "import os; sock = os.popen('rsync -l $server/$i'); buf = sock.read(); sock.close(); print 'rsync://rsync.frugalware.org' + os.path.abspath('$server/$i/../'[len('rsync://rsync.frugalware.org'):] + buf.split(' -> ')[1].strip()) + '/.git'" > $i/.git/cloneurl + echo "http://git.frugalware.org/repos/$i/.git" >> $i/.git/cloneurl + python -c "import os; sock = os.popen('rsync -l $server/$i'); buf = sock.read(); sock.close(); print 'nick@git.frugalware.org:/home/ftp' + os.path.abspath('$server/$i/../'[len('rsync://rsync.frugalware.org'):] + buf.split(' -> ')[1].strip()) + ' (for developers only)'" >> $i/.git/cloneurl + if [ -f $i/.git/owner ]; then + owner=$(python -c "from urllib import urlencode; owner='$(cat $i/.git/owner)'; print urlencode({'':owner.strip()})[1:]") + else + owner="Unknown" + fi + echo "$i%2F.git $owner" >> projects.list +done From vmiklos at frugalware.org Fri Jul 6 20:27:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 20:27:49 2007 Subject: [Frugalware-git] frugalware-current: pwgen-2.06-1-i686 Message-ID: <20070706182748.BA58118681E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d1a970992ee7786183d6477f652ab7143c9fcff1 commit d1a970992ee7786183d6477f652ab7143c9fcff1 Author: VMiklos Date: Fri Jul 6 20:27:35 2007 +0200 pwgen-2.06-1-i686 version bump diff --git a/source/apps-extra/pwgen/FrugalBuild b/source/apps-extra/pwgen/FrugalBuild index c1bc776..9e4db4e 100644 --- a/source/apps-extra/pwgen/FrugalBuild +++ b/source/apps-extra/pwgen/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: VMiklos pkgname=pwgen -pkgver=2.05 +pkgver=2.06 pkgrel=1 pkgdesc="A password generator." depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('73b34964f9f43a59b8511ce94266b7e7b5f6505e') +sha1sums=('43dc4fbe6c3bdf96ae24b20d44c4a4584df93d8e') # optimization OK From vmiklos at frugalware.org Fri Jul 6 21:08:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 21:08:42 2007 Subject: [Frugalware-git] pacman-tools: syncpkg: typo fix Message-ID: <20070706190840.43E0513A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=81fc2e4f9c60b08afdb501496ec7263a71af64ee commit 81fc2e4f9c60b08afdb501496ec7263a71af64ee Author: VMiklos Date: Fri Jul 6 21:08:33 2007 +0200 syncpkg: typo fix diff --git a/syncpkg b/syncpkg index 23de59d..649c28b 100644 --- a/syncpkg +++ b/syncpkg @@ -57,7 +57,7 @@ else tree=$1 fi -if ssh genesis.frugalware.org ls /home/ftp/pub/frugalware/frugalware-$tree/.git &>/dev/null +if ssh genesis.frugalware.org ls /home/ftp/pub/frugalware/frugalware-$tree/.git &>/dev/null; then scm=git else scm=darcs From vmiklos at frugalware.org Fri Jul 6 22:02:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 22:02:43 2007 Subject: [Frugalware-git] pacman-tools: remove old chkdep.pl Message-ID: <20070706200238.04A5013A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=4a89f8edb178e4d95f8eb0e4f1e3a682b3e89627 commit 4a89f8edb178e4d95f8eb0e4f1e3a682b3e89627 Author: VMiklos Date: Fri Jul 6 22:01:06 2007 +0200 remove old chkdep.pl diff --git a/chkdep.pl b/chkdep.pl deleted file mode 100644 index 268f129..0000000 --- a/chkdep.pl +++ /dev/null @@ -1,187 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -chkdep - checks dependencies of packages for Frugalware Linux - -=head1 SYNOPSIS - -chkdep [-vif] [-n package_name] -d dir | -p file - -=head1 DESCRIPTION - -Outputs a dependency array for a FrugalBuild scripts, containing the -the packages that are needed. - -=head1 WARNING - -This version of chkdep is _not_ compatible with version <= 1.0, -listing files in the command argument is deprecated. - -=head1 OPTIONS - -=over 4 - -=item B<-d dir> - -Check all executable files in dir directory with ldd and make depends array. - -=item B<-p file> - -If file is a tgz package, it will be extracted, making depends array. - -=item B<-n package_name> - -When the script can't determine the name of the package you're checking, -you can give it manually with this (ie. when you use the -d option). - -=item B<-f> - -Outputs the full dependency list. - -=item B<-e> - -Tells the groups of the full dependency list. - -=item B<-v> - -Be verbose. - -=item B<-i> - -Ignore fakeroot library if found. - -=back - -=head1 AUTHOR - -Written by Zsolt Szalai. - -=head1 BUGS - -Report bugs to . - -=head1 COPYRIGHT - -chkdep may be copied and modified under the terms of the GNU General Public -License v2. - -=cut - -use strict; -no warnings qw(uninitialized); -use Getopt::Std; -use Data::Dumper; -$Getopt::Std::STANDARD_HELP_VERSION = 1; -our $VERSION = "1.9"; - -my %alias = ( 'xorg' => 'x'); -my %reversalias = map { $alias{$_} => $_ } keys %alias; - -my %opts; -getopts('vid:p:fn:e', \%opts); - -sub HELP_MESSAGE(){ - print </dev/null'); - qx/$comm/; - return $name; -} - -sub ldddir{ #dir - my $dir = shift; - my $comm = 'find ' . $dir .' -perm -u+x ! -type d ! -type l -exec ldd {} \;'; - $comm .= ' 2>/dev/null' unless $opts{v}; - return qx/$comm/; - } - -HELP_MESSAGE && die "Wrong option!" unless %opts; - -my $dir = extractfpm $opts{p} if $opts{p}; -$dir = $opts{d} if $opts{d}; -my $pkgname; -$pkgname = $opts{n} or - ($pkgname) = qx"grep pkgname $dir/.PKGINFO 2>/dev/null" =~ /pkgname = (.*)$/; -if ($opts{v}){ - if (! $pkgname){ - print "Could not determine packag name!\n"; $pkgname = ''; - } else { - print "Package: $pkgname\n"; - } -} elsif (! $pkgname){$pkgname='';} - -my @ldd = ldddir $dir; - -if ($opts{p}){ - my $comm ="rm -rf $dir" . (($opts{v}) ? '' : ' 2>/dev/null'); - qx/$comm/; -} - -my %pkgs; #dependecies -my %libs; -my %depsdep; # the dependencies' dependencies - -for my $line (@ldd){ - if ($line =~ /(.*) => (.+) (?:\(.*\))?/){ - my ($linked, $lib) = ($1,$2); - if ($lib =~ /fakeroot/){ - print "fakeroot found in dependencies\n" if $opts{v}; - next if $opts{i}; - } - if ($lib =~ /not/) { - print "WARNING: $linked not found by ldd\n"; - } else { - if (! $libs{$lib}) { - $libs{$lib} = 1; - my ($pkg) = qx/LANG= LC_ALL= pacman -Qo $lib/ =~ /owned by (.*?)\s/; - print "WARNING: No package found containing $lib\n" if !$pkg && $opts{v}; - - if ($pkg ne $pkgname) { - unless ($opts{f}){ - my ($pkgdeps) = qx/LANG= LC_ALL= pacman -Qi $pkg/ =~ /Depends.*?: (.*?)Removes/s; - foreach my $dd (split(' ',$pkgdeps)){ - $depsdep{$dd} = 1; - } - } - # handle provides directive! - $pkg = $alias{$pkg} if $alias{$pkg}; - - $pkgs{$pkg} = 1; - } - } - } - } -} -my $deps = 'depends=('; -foreach my $key (keys %pkgs){ - $deps .= "\'$key\' " unless $depsdep{$key}; - if ($opts{e}){ - my $comm = "LANG= LC_ALL= pacman -Qi " . ($reversalias{$key} || $key); - my ($group) = qx/$comm/ =~ /Groups.*?: (.*?)$/sm; - printf "%-20s%s\n", "$key is in", $group; - } -} -chop $deps if %pkgs; -$deps = $deps . ')'; -print "$deps\n"; From vmiklos at frugalware.org Fri Jul 6 22:02:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 22:02:45 2007 Subject: [Frugalware-git] pacman-tools: Merge branch 'master' of vmiklos@frugalware.org:/home/ftp/pub/other/pacman-tools/pacman-tools Message-ID: <20070706200241.914B71678009@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=205a98815310ce2f04c5f2a7b85f5661c627daa3 commit 205a98815310ce2f04c5f2a7b85f5661c627daa3 Merge: 4a89f8e... 81fc2e4... Author: VMiklos Date: Fri Jul 6 22:01:15 2007 +0200 Merge branch 'master' of vmiklos@frugalware.org:/home/ftp/pub/other/pacman-tools/pacman-tools From vmiklos at frugalware.org Fri Jul 6 22:08:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 6 22:08:39 2007 Subject: [Frugalware-git] pacman-tools: drop chkperm Message-ID: <20070706200837.4CD5C13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=fbcfb44509bb4994e4c611d7bb755c35acea3421 commit fbcfb44509bb4994e4c611d7bb755c35acea3421 Author: VMiklos Date: Fri Jul 6 22:08:11 2007 +0200 drop chkperm diff --git a/Makefile b/Makefile index 67ba312..def96e9 100644 --- a/Makefile +++ b/Makefile @@ -36,15 +36,13 @@ sysconfdir = /etc docdir = /usr/share/doc/pacman-tools-$(VERSION) FINCDIR = $(shell source /usr/lib/frugalware/fwmakepkg; echo $$Fincdir) -compile: chkperm genauthors apidocs fwmakepkg.3 +compile: genauthors apidocs fwmakepkg.3 $(MAKE) -C mkiso $(MAKE) -C repoman.d chmod +x fwmirror pear-makefb chkdep darcs-git.py help2man -n "mirrors Frugalware archives" -S Frugalware -N ./fwmirror |sed 's/\\(co/(c)/' >fwmirror.1 help2man -n "Writes FrugalBuild scripts for PHP PEAR/PECL packages" -S Frugalware -N ./pear-makefb \ |sed 's/\\(co/(c)/' >pear-makefb.1 - help2man -n "controls upload rights for Frugalware packages" -S Frugalware -N ./chkperm |sed 's/\\(co/(c)/' \ - >chkperm.1 chmod +x fblint help2man -n "searches for common FrugalBuild problems" -S Frugalware -N ./fblint |sed 's/\\(co/(c)/' >fblint.1 help2man -n "Checks a package or directory for possible depends" -S Frugalware -N ./chkdep |sed 's/\\(co/(c)/' >chkdep.1 @@ -97,7 +95,6 @@ install: $(INSTALL) etcconfig.py $(DESTDIR)$(sbindir)/etcconfig $(INSTALL) rpm2fpm $(DESTDIR)$(bindir)/rpm2fpm $(INSTALL) fwcpan $(DESTDIR)$(bindir)/fwcpan - $(INSTALL) chkperm $(DESTDIR)$(bindir)/chkperm $(INSTALL) genauthors $(DESTDIR)$(bindir)/genauthors $(INSTALL) fblint $(DESTDIR)$(bindir)/fblint $(INSTALL) pootle-update $(DESTDIR)$(bindir)/pootle-update @@ -106,7 +103,6 @@ install: $(INSTALL) -m644 fwmirror.1 $(DESTDIR)$(man1dir) $(INSTALL) pear-makefb $(DESTDIR)$(bindir)/pear-makefb $(INSTALL) -m644 pear-makefb.1 $(DESTDIR)$(man1dir) - $(INSTALL) -m644 chkperm.1 $(DESTDIR)$(man1dir) $(INSTALL) -m644 fblint.1 $(DESTDIR)$(man1dir) $(INSTALL) -m644 mkiso/mkiso.8 $(DESTDIR)$(man8dir) $(INSTALL) -m644 mkiso/volumes.xml $(DESTDIR)$(docdir)/volumes.xml @@ -114,7 +110,7 @@ install: $(INSTALL) -m644 fwmakepkg.3 $(DESTDIR)$(man3dir) clean: - rm -rf chkperm genauthors apidocs fwmakepkg.3 + rm -rf genauthors apidocs fwmakepkg.3 $(MAKE) -C mkiso clean dist: diff --git a/chkperm.c b/chkperm.c deleted file mode 100644 index dd52411..0000000 --- a/chkperm.c +++ /dev/null @@ -1,147 +0,0 @@ -/* - * chkperm.c - * - * Copyright (c) 2006 by Miklos Vajna - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#include -#include -#include -#include -#include - -int parseMaintainer(xmlDoc *doc, xmlNode *cur, char *login) -{ - xmlChar *key; - char *ptr; - cur = cur->xmlChildrenNode; - int ret=0; - - while (cur != NULL) - { - if ((!xmlStrcmp(cur->name, (const xmlChar *)"email"))) - { - key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - ptr = (char*)key; - while(*ptr && *ptr != '@') - ptr++; - *ptr='\0'; - if ((!xmlStrcmp(key, (const xmlChar *)login))) - ret++; - xmlFree(key); - } - cur = cur->next; - } - return(ret); -} - -int parseTeam(xmlDoc *doc, xmlNode *cur, char *group, char *login) -{ - xmlChar *key; - cur = cur->xmlChildrenNode; - int ret=0, ok=0; - - while (cur != NULL) - { - if ((!xmlStrcmp(cur->name, (const xmlChar *)"name"))) - { - key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - xmlFree(key); - } - if ((!xmlStrcmp(cur->name, (const xmlChar *)"maintainer"))) - ok += parseMaintainer(doc, cur, login); - if ((!xmlStrcmp(cur->name, (const xmlChar *)"group"))) - { - key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - if (ok && (!xmlStrcmp(key, (const xmlChar *)group))) - ret++; - xmlFree(key); - } - cur = cur->next; - } - return(ret); -} - -int parseDoc(char *docname, char *group, char *login) -{ - xmlDocPtr doc; - xmlNodePtr cur; - int ret=0; - - doc = xmlParseFile(docname); - - if(doc == NULL) - { - fprintf(stderr, "document not parsed successfully\n"); - return(ret); - } - - cur = xmlDocGetRootElement(doc); - - if(cur == NULL) - { - fprintf(stderr, "empty document\n"); - xmlFreeDoc(doc); - return(ret); - } - - if(xmlStrcmp(cur->name, (const xmlChar *)"teams")) - { - fprintf(stderr, "document of the wrong type, root node != teams"); - xmlFreeDoc(doc); - return(ret); - } - - cur = cur->xmlChildrenNode; - while(cur != NULL) - { - if((!xmlStrcmp(cur->name, (const xmlChar *)"team"))) - ret += parseTeam(doc, cur, group, login); - - cur = cur->next; - } - - xmlFreeDoc(doc); - return(ret); -} - -int main(int argc, char **argv) -{ - char *login, *ptr; - - if(argc <= 2) - { - if(argc == 2 && !strcmp(argv[1], "--version")) - printf("chkperm (pacman-tools) 0.6.5\n\n" - "Copyright (c) 2006 by Miklos Vajna \n" - "This is free software; see the source for copying conditions. There is NO\n" - "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); - else if(argc == 2) - printf("Usage: %s /path/to/teams.xml \n", argv[0]); - return(1); - } - - login = strdup(getenv("HOME")); - while((ptr = strchr(login, '/')) != NULL) - login=ptr+1; - - if((ptr = strstr(argv[2], "-extra")) != NULL) - *ptr = '\0'; - - return(!parseDoc(argv[1], argv[2], login)); -} From voroskoi at frugalware.org Fri Jul 6 22:08:38 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Jul 6 22:08:39 2007 Subject: [Frugalware-git] frugalware-current: libksba-1.0.2-1-i686 Message-ID: <20070706200838.12EEE13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=01fd4252d0a3fb422c74830b2904342712382ae9 commit 01fd4252d0a3fb422c74830b2904342712382ae9 Author: voroskoi Date: Fri Jul 6 22:07:35 2007 +0200 libksba-1.0.2-1-i686 version bump sha1->signatures diff --git a/source/lib/libksba/FrugalBuild b/source/lib/libksba/FrugalBuild index 306c539..6453608 100644 --- a/source/lib/libksba/FrugalBuild +++ b/source/lib/libksba/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libksba -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Libksba is a CMS and X.509 access library." url="http://www.gnupg.org" @@ -10,9 +10,10 @@ makedepends=('libgpg-error') depends=('glibc') groups=('lib') archs=('i686' 'x86_64') +license="GPLv3" Finclude texinfo up2date="lynx -dump http://www.gnupg.org/\(en\)/download/index.html |grep libksba.*tar |sed -n -e 's/.*a-\(.*\)\.t.*/\1/;s/-/_/;1 p'" source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('d4d9a0f0295ba3192a6680b5544bbbbc4fd6c0b9') +signatures=($source.sig) # optimization OK From voroskoi at frugalware.org Fri Jul 6 22:18:50 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Jul 6 22:18:52 2007 Subject: [Frugalware-git] frugalware-current: libassuan-1.0.2-1-i686 Message-ID: <20070706201850.7E1D813A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3f652ea15464136ee1cbc2e8b659ba5208c805d6 commit 3f652ea15464136ee1cbc2e8b659ba5208c805d6 Author: voroskoi Date: Fri Jul 6 22:17:22 2007 +0200 libassuan-1.0.2-1-i686 version bump sha1->signatures diff --git a/source/lib/libassuan/FrugalBuild b/source/lib/libassuan/FrugalBuild index a9a8bf2..c10acb1 100644 --- a/source/lib/libassuan/FrugalBuild +++ b/source/lib/libassuan/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libassuan -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Libassuan is the IPC library used by some GnuPG related software." url="http://www.gnupg.org" @@ -10,9 +10,10 @@ depends=() # This time it's _really_ empty ;-) makedepends=('pth') # it must be compiled with pth for gpg-agent groups=('lib') archs=('i686' 'x86_64') +license="GPLv3" up2date="lynx -dump http://www.gnupg.org/\(en\)/download/index.html |grep libassuan.*tar |sed -n -e 's/.*n-\(.*\)\.t.*/\1/;s/-/_/;1 p'" source=(http://gd.tuwien.ac.at/privacy/gnupg/libassuan/libassuan-$pkgver.tar.bz2) Finclude texinfo -sha1sums=('4e12bd924e01c31c7d4c021b465c94ec55b1cb17') +signatures=($source.sig) # optimization OK From boobaa at frugalware.org Fri Jul 6 23:53:07 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 6 23:53:10 2007 Subject: [Frugalware-git] frugalware-current: wireshark-0.99.6-1-i686 Message-ID: <20070706215307.6C72C13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a43c6a454a4ecca055ef024479473d1eeb585e14 commit a43c6a454a4ecca055ef024479473d1eeb585e14 Author: CSÉCSY László Date: Fri Jul 6 22:53:07 2007 +0200 wireshark-0.99.6-1-i686 version bump closes #2218 in -current diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index ec7b147..3b36c90 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László pkgname=wireshark -pkgver=0.99.5 -pkgrel=3 +pkgver=0.99.6 +pkgrel=1 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" depends=('heimdal>=0.8' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=1.6.3') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump 'http://www.wireshark.org/download/src/?C=M;O=D' | grep -m1 tar.gz | sed 's/.*wireshark-\(.*\)\.tar\.gz.*/\1/'" source=(http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2) -sha1sums=('ec9a07f13d5cda3d310d8c8900362f7cb96f4042') +sha1sums=('91f57158a75adca36c79c35525eb3cf57b927075') build() { From vmiklos at frugalware.org Sat Jul 7 02:19:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 02:19:29 2007 Subject: [Frugalware-git] frugalware-current: docs/repos.txt: updated for git Message-ID: <20070707001927.E746A13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=78b06638be4830704bd379cde6141298b7daea2b commit 78b06638be4830704bd379cde6141298b7daea2b Author: VMiklos Date: Sat Jul 7 02:11:16 2007 +0200 docs/repos.txt: updated for git diff --git a/docs/repos.txt b/docs/repos.txt index eb6e153..715e0ac 100644 --- a/docs/repos.txt +++ b/docs/repos.txt @@ -1,44 +1,63 @@ -= Handling darcs repositories += Handling git repositories == Introduction -This document is for developers who want to publish a darcs repo on the -Frugalware FTP Server and on the Frugalware Darcsweb Interface. +This document is for developers who want to publish a git repository on the +Frugalware FTP Server and on the Frugalware Gitweb Interface. -== Location of the repo +== Location of the repository -Since a repo consists of plain files, we can and should place them on the ftp +Since a repository consists of plain files, we can and should place them on the ftp server (/home/ftp). To prevent further problems, always use the server name -"darcs.frugalware.org", currently it's an alias of genesis.frugalware.org. +"git.frugalware.org", currently it's an alias of genesis.frugalware.org. -First decide if it's a personal repo or a team one. For example if you create a -repo to update to a newer python version, then probably you will do all the -work, create it under /pub/other/people/nick/reponame. Simply create a dir and -issue "darcs init". +First decide if it's a personal repository or a team one. For example if you +create a repository to update to a newer python version, then probably you will +do all the work, create it under `/pub/other/people/nick/reponame`. Simply +create a dir, issue `git init` and push at least one commit to there. -Now anyone can "darcs get" it, using a "full mirror", for example -ftp://ftp5.frugalware.org/packages/frugalware/. +Now anyone can `git clone` it, using a 'full mirror', for example +`ftp://ftp12.frugalware.org/mirrors/ftp.frugalware.org/pub/`. -== Registering for the darcsweb interface +== Registering for the gitweb interface -If the repo is a team one, then create it under /pub/other. In this case -probably you want the darcsweb interface, too. To use it: +If the repository is a team one, then create it under /pub/other. In this case +probably you want the gitweb interface, too. To use it: -. Create the file _darcs/third_party/darcsweb/desc inside the repo with a short -(less than 80 chars) description. +. Update the file `.git/description` inside the repo with a short (less than 80 +chars) description. -. Create a _relative_ symlink to /pub/other/homepage-ng/darcs/repos. +. Create the file `.git/owner` inside the repo containing your name, _without_ +your email address. -After some time (max 30 mins) it should appear at http://darcs.frugalware.org/ +. Push a _relative_ symlink to the `homepage-ng` repository, see the existing +ones as a reference. -== Enabling hooks for your repo +After some time (a maximum of 30 minutes) it should appear at +`http://git.frugalware.org/`. -If you want email sending to the Frugalware-darcs list and you want CIA -notifications for each patch, put +== Enabling hooks for your repository --------------------------------------------------------------------- -apply posthook python /home/ftp/pub/other/darcs-hooks/darcs-hooks.py -apply run-posthook --------------------------------------------------------------------- +Currently you need hooks for the following reasons: +. If you don't use 'bare' repositories, then the content outside `.git` won't +be updated automatically, you need a hook to do so. -to _darcs/prefs/defaults. +. If you want CIA notification. + +. If you want sending mails to the `Frugalware-git` mailing list. + +. If you want to let other be able to clone your repository via 'dumb' +protocols like `http` or `rsync`. (This means that if you disable this hook, it +won't be accessible anonymously!) + +For the last one: + +---- +chmod +x .git/hooks/post-update +---- + +For the others: + +---- +ln -s /home/ftp/pub/other/git-hooks/git-hooks.py .git/hooks/post-receive +---- From vmiklos at frugalware.org Sat Jul 7 03:46:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 03:46:42 2007 Subject: [Frugalware-git] frugalware-current: stgit-0.12.1-1-i686 Message-ID: <20070707014639.F390813A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7185bdce03753332a2837ff967ed874d54303908 commit 7185bdce03753332a2837ff967ed874d54303908 Author: VMiklos Date: Sat Jul 7 03:45:41 2007 +0200 stgit-0.12.1-1-i686 new package diff --git a/source/devel-extra/stgit/FrugalBuild b/source/devel-extra/stgit/FrugalBuild new file mode 100644 index 0000000..9eb1e95 --- /dev/null +++ b/source/devel-extra/stgit/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0 SBU +# Maintainer: VMiklos + +pkgname=stgit +pkgver=0.12.1 +pkgrel=1 +pkgdesc="Provides similar functionality to Quilt on top of GIT." +url="http://www.procode.org/stgit/" +depends=('python' 'git') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump $url|Flasttar" +source=(http://homepage.ntlworld.com/cmarinas/stgit/stgit-$pkgver.tar.gz) +sha1sums=('6832ed2a83425896202eee9efda2aa9e26a961d2') From voroskoi at frugalware.org Sat Jul 7 07:58:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Jul 7 07:58:32 2007 Subject: [Frugalware-git] frugalware-current: freetype2-2.3.5-1-i686 Message-ID: <20070707055830.84AB113A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d860122d98511b44f6b10719fe9f47ea161734e2 commit d860122d98511b44f6b10719fe9f47ea161734e2 Author: voroskoi Date: Sat Jul 7 07:57:22 2007 +0200 freetype2-2.3.5-1-i686 version bump diff --git a/source/lib/freetype2/CVE-2007-2754.diff b/source/lib/freetype2/CVE-2007-2754.diff deleted file mode 100644 index caf4992..0000000 --- a/source/lib/freetype2/CVE-2007-2754.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- freetype2/src/truetype/ttgload.c 2007/04/09 08:40:11 1.177 -+++ freetype2/src/truetype/ttgload.c 2007/04/27 17:16:50 1.178 -@@ -271,7 +271,11 @@ - - n_points = 0; - if ( n_contours > 0 ) -+ { - n_points = cont[-1] + 1; -+ if ( n_points < 0 ) -+ goto Invalid_Outline; -+ } - - /* note that we will add four phantom points later */ - error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 ); -@@ -682,7 +686,7 @@ - FT_GlyphLoader gloader = loader->gloader; - FT_Error error = TT_Err_Ok; - FT_Outline* outline; -- FT_UInt n_points; -+ FT_Int n_points; - - - outline = &gloader->current.outline; -@@ -709,7 +713,7 @@ - /* Deltas apply to the unscaled data. */ - FT_Vector* deltas; - FT_Memory memory = loader->face->memory; -- FT_UInt i; -+ FT_Int i; - - - error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face), diff --git a/source/lib/freetype2/FrugalBuild b/source/lib/freetype2/FrugalBuild index 620acac..cf95fe6 100644 --- a/source/lib/freetype2/FrugalBuild +++ b/source/lib/freetype2/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=freetype2 -pkgver=2.3.4 -pkgrel=2 +pkgver=2.3.5 +pkgrel=1 pkgdesc="TrueType font rendering library - 2.0 series (with bytecode interpreter)" url="http://freetype.sourceforge.net" groups=('lib') @@ -13,8 +13,8 @@ depends=('zlib') _F_cd_path="freetype-$pkgver" up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3157&package_id=3121'|grep 'freetype-' |sed -e 's/.*type-\(.*\).tar.bz2.*/\1/;q'" source=(http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2 \ - freetype-2.2.1-memcpy-fix.patch CVE-2007-2754.diff) -signatures=("$source.sig" '' '') + freetype-2.2.1-memcpy-fix.patch) +signatures=("$source.sig" '') build() { Fsed '^/\* \(#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER\) \*/' '\1' include/freetype/config/ftoption.h From voroskoi at frugalware.org Sat Jul 7 08:14:47 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Jul 7 08:14:49 2007 Subject: [Frugalware-git] frugalware-current: removed libassuan rebuilds Message-ID: <20070707061447.865A713A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b6f505ac7d46f5cc8c537b99cf98ae9d21840117 commit b6f505ac7d46f5cc8c537b99cf98ae9d21840117 Author: voroskoi Date: Sat Jul 7 08:13:22 2007 +0200 removed libassuan rebuilds diff --git a/docs/rebuild.txt b/docs/rebuild.txt index 1bda4ae..5947c93 100644 --- a/docs/rebuild.txt +++ b/docs/rebuild.txt @@ -216,10 +216,6 @@ Ex.: 2.6->2.8) - obconf -== libassuan - -- gpg-agent - == pilot-link - gnome-pilot diff --git a/source/apps-extra/pinentry/pinentry.install b/source/apps-extra/pinentry/pinentry.install deleted file mode 100644 index da40cae..0000000 --- a/source/apps-extra/pinentry/pinentry.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - echo -n "generating the top-level Info node... " - mkinfodir /usr/info > /usr/info/dir - echo "done." -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -op=$1 -shift - -$op $* From voroskoi at frugalware.org Sat Jul 7 11:00:32 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Jul 7 11:00:34 2007 Subject: [Frugalware-git] frugalware-current: ktorrent-2.2-1-i686 Message-ID: <20070707090032.1F72B13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=29adcc2cd82e7f29d197a4c5ecf1a97d4c01d755 commit 29adcc2cd82e7f29d197a4c5ecf1a97d4c01d755 Author: voroskoi Date: Sat Jul 7 10:59:23 2007 +0200 ktorrent-2.2-1-i686 version bump updated depends() diff --git a/source/kde-extra/ktorrent/FrugalBuild b/source/kde-extra/ktorrent/FrugalBuild index ef0a604..64c9f7f 100644 --- a/source/kde-extra/ktorrent/FrugalBuild +++ b/source/kde-extra/ktorrent/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: voroskoi pkgname=ktorrent -pkgver=2.1.4 +pkgver=2.2 pkgrel=1 pkgdesc="KTorrent is a BitTorrent program for KDE." -depends=('libxi' 'libxmu' 'gmp' 'xfsprogs-attr' 'libgl' 'qt' 'kdelibs') +depends=('kdelibs' 'libgl' 'libxmu' 'libxi' 'libxdamage' 'gmp' 'avahi' 'dbus') groups=('kde-extra') archs=('i686' 'x86_64') Finclude kde url="http://ktorrent.pwsp.net/" up2date="lynx -dump $url/index.php?page=downloads |grep http.*tar.gz |sed -ne 's/.*t-\(.*\).t.*/\1/;1 p'" source=(http://ktorrent.pwsp.net/downloads/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('454992ec5f0b4f67e62474cf863a2d66dbd77f28') +sha1sums=('1adaa8267b05cc53bd0ef325c9571a378d2f73f8') # optimization OK From boobaa at frugalware.org Sat Jul 7 11:22:28 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 7 11:22:30 2007 Subject: [Frugalware-git] frugalware-current: hunspell-1.1.7-1-i686 Message-ID: <20070707092228.285C213A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bd24dab6d5956ceee97d2492c6ba89e32488d5da commit bd24dab6d5956ceee97d2492c6ba89e32488d5da Author: CSÉCSY László Date: Sat Jul 7 11:22:19 2007 +0200 hunspell-1.1.7-1-i686 version bump hopefully OOo will compile with this one hunspell-dict updates coming soon diff --git a/source/apps-extra/hunspell/FrugalBuild b/source/apps-extra/hunspell/FrugalBuild index 0ea37d4..d499472 100644 --- a/source/apps-extra/hunspell/FrugalBuild +++ b/source/apps-extra/hunspell/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=hunspell -pkgver=1.1.5_3 +pkgver=1.1.7 pkgrel=1 pkgdesc="An interactive Hungarian spell checker" url="http://hunspell.sourceforge.net/" @@ -16,7 +16,7 @@ up2date="lynx -dump http://hunspell.sourceforge.net/ | grep -m1 'http.*tar\.gz' source=(${source[@]} \ http://forditas.fsf.hu/scripts/huspell \ http://forditas.fsf.hu/scripts/huspell-po) -sha1sums=('2c75f83cf0fd543b4b70f828cdb55cfc614773f5' \ +sha1sums=('764344fb9fe960b266ac619c8c0288aa63d64d8f' \ '8beb23bebd6901d64901190f18ce996d5a9e6d4b' \ '69ccc901cb15fbc3d02ce752d74037e1b48ce077') From voroskoi at frugalware.org Sat Jul 7 11:46:32 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Jul 7 11:46:34 2007 Subject: [Frugalware-git] frugalware-current: pinentry-0.7.3-1-i686 Message-ID: <20070707094632.86ED013A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1479a881975b7f36cc3014096a9388e7abd65c44 commit 1479a881975b7f36cc3014096a9388e7abd65c44 Author: voroskoi Date: Sat Jul 7 11:44:02 2007 +0200 pinentry-0.7.3-1-i686 version bump using Finclude texinfo sha1->signatures build gtk+, gtk+2 and qt frontend as subpackage diff --git a/source/apps-extra/pinentry/FrugalBuild b/source/apps-extra/pinentry/FrugalBuild index b9654d0..7f76d24 100644 --- a/source/apps-extra/pinentry/FrugalBuild +++ b/source/apps-extra/pinentry/FrugalBuild @@ -2,29 +2,33 @@ # Maintainer: voroskoi pkgname=pinentry -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Applications for entering PINs or Passphrases." url="http://ftp.gnupg.org/gcrypt/pinentry/" +makedepends=('gtk+' 'gtk+2' 'qt') depends=('libcap' 'ncurses') groups=('apps-extra') archs=('i686' 'x86_64') -# It's temporary unnecessary because of the bad info file -#install=($pkgname.install) +Finclude texinfo up2date="lynx -dump http://ftp.gnupg.org/gcrypt/pinentry/ |grep pinentry.*tar |sed -e 's/.*y-\(.*\)\.t.*/\1/;s/-/_/' |sort -r |sed -n -e '1 p'" source=(http://ftp.gnupg.org/gcrypt/pinentry/$pkgname-$pkgver.tar.gz) -sha1sums=('aa113b08e315d22b6f70a634f459fdfbaa4dcaba') +options=('scriptlet') +signatures=($source.sig) + +subpkgs=('pinentry-gtk+' 'pinentry-gtk+2' 'pinentry-qt') +subdescs=('Applications for entering PINs or Passphrases.(gtk+)' 'Applications for entering PINs or Passphrases.(gtk+2)' 'Applications for entering PINs or Passphrases.(qt)') +subdepends=('gtk+ pinentry' 'gtk+2 pinentry' 'qt pinentry') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subgroups=('gnome-extra' 'gnome-extra' 'kde-extra') build() { - Fmake --disable-pinentry-gtk \ - --disable-pinentry-gtk2 \ - --disable-pinentry-qt || return 1 - Fmakeinstall - #Frm usr/info/dir - Frm usr/info - # I had to delete pinentry.info too, because it didn't work + Fbuild + Fln pinentry-curses $Fprefix/bin/pinentry + + Fsplit pinentry-gtk+ usr/bin/pinentry-gtk + Fsplit pinentry-gtk+2 usr/bin/pinentry-gtk-2 + Fsplit pinentry-qt usr/bin/pinentry-qt } # optimization OK - -# vim: ft=sh From boobaa at frugalware.org Sat Jul 7 12:29:53 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 7 12:29:56 2007 Subject: [Frugalware-git] frugalware-current: awstats-6.7-1-i686 Message-ID: <20070707102953.D240513A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2a633ccc719fe9de1be4a4bf0afae90b5c940042 commit 2a633ccc719fe9de1be4a4bf0afae90b5c940042 Author: CSÉCSY László Date: Sat Jul 7 12:26:10 2007 +0200 awstats-6.7-1-i686 version bump new m8r (ok by dnaku) reworked patches (removed non-working CVE stuff per voroskoi's advice) diff --git a/source/network-extra/awstats/FrugalBuild b/source/network-extra/awstats/FrugalBuild index 16084b1..25f811d 100644 --- a/source/network-extra/awstats/FrugalBuild +++ b/source/network-extra/awstats/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Tuxbubling pkgname=awstats -pkgver=6.5 -pkgrel=2 +pkgver=6.7 +pkgrel=1 pkgdesc="Free real-time logfile analyzer to get advanced statistics." Finclude sourceforge url="http://awstats.sourceforge.net/" @@ -13,8 +13,7 @@ archs=('i686' 'x86_64') depends=('apache' 'perl') backup=('etc/httpd/conf/httpd.conf') up2date="lynx -dump http://awstats.sourceforge.net/ | grep 'Last stable version is' | sed -ne 's/.* is//;1 p' | cut -f2 -d ' '" -source=($source awstats-6.4-fw.patch awstats.conf \ - awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff) +source=($source awstats-6.7-fw.patch awstats.conf) build() { @@ -36,7 +35,6 @@ build() # optimization ok -sha1sums=('0042e6b84983a3704b1c26d9d377154fafc8ab9b' \ - '160d3ed8c6966a564c16f04313c5d81d56a01ca0' \ - '63ff73a65caf7c05a69a6f15d4d2a99bfada5438' \ - '47d7c3cc0414f872799993007b92a176e3c9d0c1') +sha1sums=('b400a519263d2ed98c4a16d02a9cfceea315783c' \ + 'c402209ad0f94db9c5dc8b40744fbf61d64df7d6' \ + '63ff73a65caf7c05a69a6f15d4d2a99bfada5438') diff --git a/source/network-extra/awstats/awstats-6.4-fw.patch b/source/network-extra/awstats/awstats-6.4-fw.patch deleted file mode 100644 index ea6d1a4..0000000 --- a/source/network-extra/awstats/awstats-6.4-fw.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl ---- awstats-6.4/tools/awstats_buildstaticpages.pl 2005-02-20 17:11:06.000000000 +0100 -+++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl 2005-08-25 14:21:58.045625424 +0200 -@@ -293,8 +293,8 @@ - # Check if AWSTATS prog is found - my $AwstatsFound=0; - if (-s "$Awstats") { $AwstatsFound=1; } --elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { -- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; -+elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { -+ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; - $AwstatsFound=1; - } - if (! $AwstatsFound) { -diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_configure.pl ---- awstats-6.4/tools/awstats_configure.pl 2005-01-15 23:42:58.000000000 +0100 -+++ awstats-6.4_fw/tools/awstats_configure.pl 2005-08-25 14:21:58.045625424 +0200 -@@ -29,10 +29,10 @@ - $AWSTATS_DIRDATA_PATH - /; - $AWSTATS_PATH=''; --$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; --$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; --$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; --$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; -+$AWSTATS_ICON_PATH='/usr/lib/awstats/wwwroot/icon'; -+$AWSTATS_CSS_PATH='/usr/lib/awstats/wwwroot/css'; -+$AWSTATS_CLASSES_PATH='/usr/lib/awstats/wwwroot/classes'; -+$AWSTATS_CGI_PATH='/usr/lib/awstats/wwwroot/cgi-bin'; - $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux - $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux - -@@ -60,7 +60,7 @@ - @WEBCONF=( - 'C:/Program Files/Apache Group/Apache2/conf/httpd.conf', - 'C:/Program Files/Apache Group/Apache/conf/httpd.conf', --'/etc/httpd/httpd.conf', -+'/etc/httpd/conf/httpd.conf', - '/usr/local/apache/conf/httpd.conf', - '/usr/local/apache2/conf/httpd.conf' - ); -@@ -308,13 +308,13 @@ - $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; - $AWSTATS_PATH=~s/tools[\\\/]?$//; - $AWSTATS_PATH=~s/[\\\/]$//; -- if ($AWSTATS_PATH ne '/usr/local/awstats') { -- print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n"; -+ if ($AWSTATS_PATH ne '/usr/lib/awstats') { -+ print "Warning: AWStats standard directory on Linux OS is '/usr/lib/awstats'.\n"; - print "If you want to use standard directory, you should first move all content\n"; - print "of AWStats distribution from current directory:\n"; - print "$AWSTATS_PATH\n"; - print "to standard directory:\n"; -- print "/usr/local/awstats\n"; -+ print "/usr/lib/awstats\n"; - print "And then, run configure.pl from this location.\n"; - print "Do you want to continue setup from this NON standard directory [yN] ? "; - my $bidon=''; -@@ -418,7 +418,7 @@ - if ($bidon) { $ApachePath{"$bidon"}=1; } - - print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; -- print "Example: /etc/httpd/httpd.conf\n"; -+ print "Example: /etc/httpd/conf/httpd.conf\n"; - print "Example: /usr/local/apache2/conf/httpd.conf\n"; - print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; - $bidon=''; -diff -urN awstats-6.4/tools/awstats_updateall.pl awstats-6.4_fw/tools/awstats_updateall.pl ---- awstats-6.4/tools/awstats_updateall.pl 2004-06-07 14:27:26.000000000 +0200 -+++ awstats-6.4_fw/tools/awstats_updateall.pl 2005-08-25 14:21:58.046625272 +0200 -@@ -121,8 +121,8 @@ - # Check if AWSTATS prog is found - my $AwstatsFound=0; - if (-s "$Awstats") { $AwstatsFound=1; } -- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { -- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; -+ elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { -+ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; - $AwstatsFound=1; - } - if (! $AwstatsFound) { -diff -urN awstats-6.4/tools/httpd_conf awstats-6.4_fw/tools/httpd_conf ---- awstats-6.4/tools/httpd_conf 2004-01-13 14:25:56.000000000 +0100 -+++ awstats-6.4_fw/tools/httpd_conf 1970-01-01 01:00:00.000000000 +0100 -@@ -1,23 +0,0 @@ --# --# Content of this file, with correct values, can be automatically added to --# your Apache server by using the AWStats configure.pl tool. --# -- --# --# Directives to add to your Apache conf file to allow use of AWStats as a CGI. --# Note that path "/usr/local/awstats/" must reflect your AWStats install path. --# --Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/" --Alias /awstatscss "/usr/local/awstats/wwwroot/css/" --Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" --ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" -- --# --# This is to permit URL access to scripts/files in AWStats directory. --# -- -- Options None -- AllowOverride None -- Order allow,deny -- Allow from all -- -diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf ---- awstats-6.4/wwwroot/cgi-bin/awstats.model.conf 2005-02-24 22:08:40.000000000 +0100 -+++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf 2005-08-25 14:21:58.047625120 +0200 -@@ -48,7 +48,7 @@ - # If there is several log files from load balancing servers : - # Example: "/pathtotools/logresolvemerge.pl *.log |" - # --LogFile="/var/log/httpd/mylog.log" -+LogFile="/var/log/httpd/access_log" - - - # Enter the log file type you want to analyze. -@@ -145,7 +145,7 @@ - # Example: "ftp.domain.com" - # Example: "domain.com" - # --SiteDomain="" -+SiteDomain="localhost" - - - # Enter here all other possible domain names, addresses or virtual host -@@ -195,7 +195,7 @@ - # Example: "C:/awstats_data_dir" - # Default: "." (means same directory as awstats.pl) - # --DirData="." -+DirData="/var/lib/awstats" - - - # Relative or absolute web URL of your awstats cgi-bin directory. -diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.pl awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl ---- awstats-6.4/wwwroot/cgi-bin/awstats.pl 2005-02-24 22:02:23.000000000 +0100 -+++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl 2005-08-25 14:21:58.054624056 +0200 -@@ -1835,7 +1835,7 @@ - # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) - # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" - # Debian package : "/usr/share/awstats/plugins" -- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); -+ my @PossiblePluginsDir=("$DIR/plugins","/usr/lib/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); - my %DirAddedInINC=(); - - #Removed for security reason diff --git a/source/network-extra/awstats/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff b/source/network-extra/awstats/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff deleted file mode 100644 index a4e84d8..0000000 --- a/source/network-extra/awstats/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/awstats_buildstaticpages.pl ---- awstats-6.5.orig/tools/awstats_buildstaticpages.pl 2005-08-23 21:56:35.000000000 +0200 -+++ awstats-6.5/tools/awstats_buildstaticpages.pl 2006-06-21 12:16:54.000000000 +0200 -@@ -75,7 +75,7 @@ - # Return: None - #------------------------------------------------------------------------------ - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -@@ -95,7 +95,7 @@ - # print "$messagestring
\n"; - # } - # else { -- print "$messagestring\n"; -+ print STDERR "$messagestring\n"; - # } - # } - } -diff -Naur awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats_configure.pl ---- awstats-6.5.orig/tools/awstats_configure.pl 2005-04-22 19:34:05.000000000 +0200 -+++ awstats-6.5/tools/awstats_configure.pl 2006-06-21 12:16:54.000000000 +0200 -@@ -87,7 +87,7 @@ - # error - #------------------------------------------------------- - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -diff -Naur awstats-6.5.orig/tools/awstats_exportlib.pl awstats-6.5/tools/awstats_exportlib.pl ---- awstats-6.5.orig/tools/awstats_exportlib.pl 2003-12-06 00:53:38.000000000 +0100 -+++ awstats-6.5/tools/awstats_exportlib.pl 2006-06-21 12:16:54.000000000 +0200 -@@ -93,8 +93,8 @@ - my $thirdmessage=shift||""; - my $donotshowsetupinfo=shift||0; - if ($Debug) { debug("$message $secondmessage $thirdmessage",1); } -- print "$message"; -- print "\n"; -+ print STDERR "$message"; -+ print STDERR "\n"; - exit 1; - } - -diff -Naur awstats-6.5.orig/tools/awstats_updateall.pl awstats-6.5/tools/awstats_updateall.pl ---- awstats-6.5.orig/tools/awstats_updateall.pl 2005-04-22 19:34:05.000000000 +0200 -+++ awstats-6.5/tools/awstats_updateall.pl 2006-06-21 12:16:54.000000000 +0200 -@@ -36,7 +36,7 @@ - # Return: None - #------------------------------------------------------------------------------ - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -diff -Naur awstats-6.5.orig/tools/logresolvemerge.pl awstats-6.5/tools/logresolvemerge.pl ---- awstats-6.5.orig/tools/logresolvemerge.pl 2005-12-04 22:10:46.000000000 +0100 -+++ awstats-6.5/tools/logresolvemerge.pl 2006-06-21 12:16:32.000000000 +0200 -@@ -104,7 +104,7 @@ - # Return: None - #------------------------------------------------------------------------------ - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -@@ -133,7 +133,7 @@ - sub warning { - my $messagestring=shift; - if ($Debug) { debug("$messagestring",1); } -- print "$messagestring\n"; -+ print STDERR "$messagestring\n"; - } - - #----------------------------------------------------------------------------- -diff -Naur awstats-6.5.orig/tools/maillogconvert.pl awstats-6.5/tools/maillogconvert.pl ---- awstats-6.5.orig/tools/maillogconvert.pl 2005-04-22 19:34:05.000000000 +0200 -+++ awstats-6.5/tools/maillogconvert.pl 2006-06-21 12:16:54.000000000 +0200 -@@ -56,7 +56,7 @@ - #------------------------------------------------------- - - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -diff -Naur awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl awstats-6.5/wwwroot/cgi-bin/awstats.pl ---- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl 2005-11-24 21:11:19.000000000 +0100 -+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl 2006-06-21 12:16:54.000000000 +0200 -@@ -1131,7 +1131,7 @@ - my $configdir=shift; - my @PossibleConfigDir=(); - -- if ($configdir) { @PossibleConfigDir=("$configdir"); } -+ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); } - else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); } - - # Open config file -@@ -5534,7 +5534,7 @@ - $QueryString =~ s/&/&/g; - } - -- $QueryString = CleanFromCSSA($QueryString); -+ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString)); - - # Security test - if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); } -@@ -5542,7 +5542,7 @@ - # No update but report by default when run from a browser - $UpdateStats=($QueryString=~/update=1/i?1:0); - -- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } -@@ -5561,7 +5561,7 @@ - - # If migrate - if ($QueryString =~ /(^|-|&|&)migrate=([^&]+)/i) { -- $MigrateStats=&DecodeEncodedString("$2"); -+ $MigrateStats=&Sanitize(&DecodeEncodedString("$2")); - $MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/; - $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file - } -@@ -5591,7 +5591,7 @@ - # Update with no report by default when run from command line - $UpdateStats=1; - -- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } diff --git a/source/network-extra/awstats/awstats-6.7-fw.patch b/source/network-extra/awstats/awstats-6.7-fw.patch new file mode 100644 index 0000000..ea6d1a4 --- /dev/null +++ b/source/network-extra/awstats/awstats-6.7-fw.patch @@ -0,0 +1,150 @@ +diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl +--- awstats-6.4/tools/awstats_buildstaticpages.pl 2005-02-20 17:11:06.000000000 +0100 ++++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl 2005-08-25 14:21:58.045625424 +0200 +@@ -293,8 +293,8 @@ + # Check if AWSTATS prog is found + my $AwstatsFound=0; + if (-s "$Awstats") { $AwstatsFound=1; } +-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { +- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; ++elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { ++ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; + $AwstatsFound=1; + } + if (! $AwstatsFound) { +diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_configure.pl +--- awstats-6.4/tools/awstats_configure.pl 2005-01-15 23:42:58.000000000 +0100 ++++ awstats-6.4_fw/tools/awstats_configure.pl 2005-08-25 14:21:58.045625424 +0200 +@@ -29,10 +29,10 @@ + $AWSTATS_DIRDATA_PATH + /; + $AWSTATS_PATH=''; +-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; +-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; +-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; +-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; ++$AWSTATS_ICON_PATH='/usr/lib/awstats/wwwroot/icon'; ++$AWSTATS_CSS_PATH='/usr/lib/awstats/wwwroot/css'; ++$AWSTATS_CLASSES_PATH='/usr/lib/awstats/wwwroot/classes'; ++$AWSTATS_CGI_PATH='/usr/lib/awstats/wwwroot/cgi-bin'; + $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux + $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux + +@@ -60,7 +60,7 @@ + @WEBCONF=( + 'C:/Program Files/Apache Group/Apache2/conf/httpd.conf', + 'C:/Program Files/Apache Group/Apache/conf/httpd.conf', +-'/etc/httpd/httpd.conf', ++'/etc/httpd/conf/httpd.conf', + '/usr/local/apache/conf/httpd.conf', + '/usr/local/apache2/conf/httpd.conf' + ); +@@ -308,13 +308,13 @@ + $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; + $AWSTATS_PATH=~s/tools[\\\/]?$//; + $AWSTATS_PATH=~s/[\\\/]$//; +- if ($AWSTATS_PATH ne '/usr/local/awstats') { +- print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n"; ++ if ($AWSTATS_PATH ne '/usr/lib/awstats') { ++ print "Warning: AWStats standard directory on Linux OS is '/usr/lib/awstats'.\n"; + print "If you want to use standard directory, you should first move all content\n"; + print "of AWStats distribution from current directory:\n"; + print "$AWSTATS_PATH\n"; + print "to standard directory:\n"; +- print "/usr/local/awstats\n"; ++ print "/usr/lib/awstats\n"; + print "And then, run configure.pl from this location.\n"; + print "Do you want to continue setup from this NON standard directory [yN] ? "; + my $bidon=''; +@@ -418,7 +418,7 @@ + if ($bidon) { $ApachePath{"$bidon"}=1; } + + print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; +- print "Example: /etc/httpd/httpd.conf\n"; ++ print "Example: /etc/httpd/conf/httpd.conf\n"; + print "Example: /usr/local/apache2/conf/httpd.conf\n"; + print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; + $bidon=''; +diff -urN awstats-6.4/tools/awstats_updateall.pl awstats-6.4_fw/tools/awstats_updateall.pl +--- awstats-6.4/tools/awstats_updateall.pl 2004-06-07 14:27:26.000000000 +0200 ++++ awstats-6.4_fw/tools/awstats_updateall.pl 2005-08-25 14:21:58.046625272 +0200 +@@ -121,8 +121,8 @@ + # Check if AWSTATS prog is found + my $AwstatsFound=0; + if (-s "$Awstats") { $AwstatsFound=1; } +- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { +- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; ++ elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { ++ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; + $AwstatsFound=1; + } + if (! $AwstatsFound) { +diff -urN awstats-6.4/tools/httpd_conf awstats-6.4_fw/tools/httpd_conf +--- awstats-6.4/tools/httpd_conf 2004-01-13 14:25:56.000000000 +0100 ++++ awstats-6.4_fw/tools/httpd_conf 1970-01-01 01:00:00.000000000 +0100 +@@ -1,23 +0,0 @@ +-# +-# Content of this file, with correct values, can be automatically added to +-# your Apache server by using the AWStats configure.pl tool. +-# +- +-# +-# Directives to add to your Apache conf file to allow use of AWStats as a CGI. +-# Note that path "/usr/local/awstats/" must reflect your AWStats install path. +-# +-Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/" +-Alias /awstatscss "/usr/local/awstats/wwwroot/css/" +-Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" +-ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" +- +-# +-# This is to permit URL access to scripts/files in AWStats directory. +-# +- +- Options None +- AllowOverride None +- Order allow,deny +- Allow from all +- +diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf +--- awstats-6.4/wwwroot/cgi-bin/awstats.model.conf 2005-02-24 22:08:40.000000000 +0100 ++++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf 2005-08-25 14:21:58.047625120 +0200 +@@ -48,7 +48,7 @@ + # If there is several log files from load balancing servers : + # Example: "/pathtotools/logresolvemerge.pl *.log |" + # +-LogFile="/var/log/httpd/mylog.log" ++LogFile="/var/log/httpd/access_log" + + + # Enter the log file type you want to analyze. +@@ -145,7 +145,7 @@ + # Example: "ftp.domain.com" + # Example: "domain.com" + # +-SiteDomain="" ++SiteDomain="localhost" + + + # Enter here all other possible domain names, addresses or virtual host +@@ -195,7 +195,7 @@ + # Example: "C:/awstats_data_dir" + # Default: "." (means same directory as awstats.pl) + # +-DirData="." ++DirData="/var/lib/awstats" + + + # Relative or absolute web URL of your awstats cgi-bin directory. +diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.pl awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl +--- awstats-6.4/wwwroot/cgi-bin/awstats.pl 2005-02-24 22:02:23.000000000 +0100 ++++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl 2005-08-25 14:21:58.054624056 +0200 +@@ -1835,7 +1835,7 @@ + # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) + # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" + # Debian package : "/usr/share/awstats/plugins" +- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); ++ my @PossiblePluginsDir=("$DIR/plugins","/usr/lib/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); + my %DirAddedInINC=(); + + #Removed for security reason From janny at frugalware.org Sat Jul 7 12:57:55 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 12:57:58 2007 Subject: [Frugalware-git] frugalware-current: libkdcraw-0.1.1-1-i686 Message-ID: <20070707105755.D17FD13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=138344b903436576075b04ae78ffe5120df908c6 commit 138344b903436576075b04ae78ffe5120df908c6 Author: janny Date: Sat Jul 7 12:48:17 2007 +0200 libkdcraw-0.1.1-1-i686 * new package / new kipi-plugins depend diff --git a/source/kde-extra/libkdcraw/FrugalBuild b/source/kde-extra/libkdcraw/FrugalBuild new file mode 100644 index 0000000..071af1e --- /dev/null +++ b/source/kde-extra/libkdcraw/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Janny + +pkgname=libkdcraw +pkgver=0.1.1 +pkgrel=1 +pkgdesc="kde library for dcraw" +archs=('i686' 'x86_64') +url="http://kipi-plugins.sourceforge.net" +depends=('kdelibs') +groups=('kde-extra') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname="kipi" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +sha1sums=('6414d29fe865ad04650e25157d059481b421f1b6') + +# optimization OK From vmiklos at frugalware.org Sat Jul 7 13:48:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 13:48:59 2007 Subject: [Frugalware-git] fw-control-center: permission fixes Message-ID: <20070707114855.31DAC13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=80ccc1145cb6ef4fb558a9934685cd4bca416b34 commit 80ccc1145cb6ef4fb558a9934685cd4bca416b34 Author: VMiklos Date: Sat Jul 7 13:46:58 2007 +0200 permission fixes diff --git a/gnetconfig/autoclean.sh b/gnetconfig/autoclean.sh old mode 100644 new mode 100755 diff --git a/gnetconfig/autogen.sh b/gnetconfig/autogen.sh old mode 100644 new mode 100755 From vmiklos at frugalware.org Sat Jul 7 14:20:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 14:20:57 2007 Subject: [Frugalware-git] frugalware-current: docs/Makefile: po/*.po no longer tracked in this repo Message-ID: <20070707122055.12FC813A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b2b58792d5111da60cee2fbc8fd0191a993e1365 commit b2b58792d5111da60cee2fbc8fd0191a993e1365 Author: VMiklos Date: Sat Jul 7 14:16:57 2007 +0200 docs/Makefile: po/*.po no longer tracked in this repo diff --git a/docs/Makefile b/docs/Makefile index fd09291..3973d57 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -58,7 +58,6 @@ MERGE = : > $(2); \ sed -i '1i include::header.txt[]\n' $(2) I18NBUILD = po4a -k 0 po4a.cfg; \ - darcs revert -a po/*.po; \ for i in $(LANGS); \ do \ for j in Makefile $(shell grep link:.*html index.txt|grep -v manual.html |sed 's/.*:\(.*\)\[.*/\1/;s/html/txt/g'); \ From janny at frugalware.org Sat Jul 7 14:23:42 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 14:23:43 2007 Subject: [Frugalware-git] frugalware-current: kipi-plugins-0.1.4-1-i686 Message-ID: <20070707122342.1734513A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=66301c122142e552c5a31d40771f6a90c7d59114 commit 66301c122142e552c5a31d40771f6a90c7d59114 Author: janny Date: Sat Jul 7 14:22:59 2007 +0200 kipi-plugins-0.1.4-1-i686 version bump add 'libkexiv2' 'libkdcraw' to depends() correct SBU remove unused patch diff --git a/source/kde-extra/kipi-plugins/FrugalBuild b/source/kde-extra/kipi-plugins/FrugalBuild index ef642ac..1d553ec 100644 --- a/source/kde-extra/kipi-plugins/FrugalBuild +++ b/source/kde-extra/kipi-plugins/FrugalBuild @@ -1,13 +1,12 @@ -# Compiling time: 1.77 SBU +# Compiling time: 3.85 SBU # Maintainer: Janny pkgname=kipi-plugins -pkgver=0.1.3 -origver=`echo $pkgver|sed 's/0rc/0-rc/g'` -pkgrel=3 +pkgver=0.1.4 +pkgrel=1 pkgdesc="kipi-plugins is based in part on the work of the Independent JPEG Group." license="GPL" -depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.14') +depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.14' 'libkexiv2' 'libkdcraw') archs=('i686' 'x86_64') groups=('kde-extra') _F_cd_path="$pkgname-$origver" @@ -17,7 +16,6 @@ _F_sourceforge_broken_up2date=1 _F_kde_reconf=1 Finclude kde sourceforge Fconfopts="$Fconfopts --enable-closure" -source=($source exiv2-0.14.patch) -sha1sums=('9882d247e6e42e0206e295e85d141a184da138e6'\ - 'cf0316b896b459d968931489c62312e1915217ac') +sha1sums=('53d3609a257dfc0e429681438c60486cf4815fc6') + # optimization OK From janny at frugalware.org Sat Jul 7 14:50:59 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 14:51:01 2007 Subject: [Frugalware-git] frugalware-current: kipi-plugins-0.1.4-1-i686 Message-ID: <20070707125059.5779A13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f5bccb6dd21b42a4bebac82980361dfa18f21afb commit f5bccb6dd21b42a4bebac82980361dfa18f21afb Author: janny Date: Sat Jul 7 14:50:49 2007 +0200 kipi-plugins-0.1.4-1-i686 remove unused patch diff --git a/source/kde-extra/kipi-plugins/exiv2-0.14.patch b/source/kde-extra/kipi-plugins/exiv2-0.14.patch deleted file mode 100644 index 2934927..0000000 --- a/source/kde-extra/kipi-plugins/exiv2-0.14.patch +++ /dev/null @@ -1,353 +0,0 @@ ---- kipi-plugins-0.1.3/kipi-plugins/common/exiv2iface/exiv2iface.cpp.ark 2007-03-21 14:44:45.000000000 +0100 -+++ kipi-plugins-0.1.3/kipi-plugins/common/exiv2iface/exiv2iface.cpp 2007-03-21 14:44:54.000000000 +0100 -@@ -97,7 +97,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot clear Exif data using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -114,7 +114,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot clear Iptc data using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -153,7 +153,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get Exif data using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -192,7 +192,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get Iptc data using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -214,7 +214,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif data using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -236,7 +236,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Iptc data using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -271,7 +271,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot load metadata using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - return false; - } -@@ -329,7 +329,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot save metadata using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - return false; - } -@@ -362,7 +362,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Program identity into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -382,7 +382,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set image dimensions using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -404,7 +404,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif Thumbnail using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -434,7 +434,7 @@ - { - kdDebug() << "Cannot find Exif key '" - << exifTagName << "' into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -451,7 +451,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif tag string into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -481,7 +481,7 @@ - { - kdDebug() << "Cannot find Iptc key '" - << iptcTagName << "' into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -498,7 +498,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Iptc tag string into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -522,7 +522,7 @@ - { - kdDebug() << "Cannot find Exif key '" - << exifTagName << "' into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -547,7 +547,7 @@ - { - kdDebug() << "Cannot find Exif key '" - << exifTagName << "' into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -572,7 +572,7 @@ - { - kdDebug() << "Cannot find Iptc key '" - << iptcTagName << "' into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -597,7 +597,7 @@ - { - kdDebug() << "Cannot find Exif Rational value from key '" - << exifTagName << "' into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -614,7 +614,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif tag long value into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -631,7 +631,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif tag rational value into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -653,7 +653,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot remove Exif tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -675,7 +675,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot remove Iptc tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -717,7 +717,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get image preview using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -847,7 +847,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot parse Exif date & time tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -940,7 +940,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot parse Exif Orientation tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1007,7 +1007,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif Orientation tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1107,7 +1107,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get Exif GPS tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1229,7 +1229,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif GPS tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1264,7 +1264,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot remove Exif GPS tag using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1357,7 +1357,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get IPTC Keywords from image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1407,7 +1407,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set IPTC Keywords into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1440,7 +1440,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get IPTC Subjects from image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1490,7 +1490,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set IPTC Subjects into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1523,7 +1523,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot get IPTC Sub Categories from image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1573,7 +1573,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set IPTC Sub Categories into image using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1603,7 +1603,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot find Exif User Comment using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1645,7 +1645,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot set Exif Comment using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - -@@ -1718,7 +1718,7 @@ - catch( Exiv2::Error &e ) - { - kdDebug() << "Cannot convert Comment using Exiv2 (" -- << QString::fromLocal8Bit(e.what().c_str()) -+ << QString::fromLocal8Bit(e.what()) - << ")" << endl; - } - From vmiklos at frugalware.org Sat Jul 7 15:42:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 15:42:45 2007 Subject: [Frugalware-git] frugalware-current: t/fpmcorrupt: fix for /usr/bin/rm: Argument list too long Message-ID: <20070707134242.D3C5916A8016@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9c5b7a3239b409ee146b202cf55634541a3c617f commit 9c5b7a3239b409ee146b202cf55634541a3c617f Author: VMiklos Date: Sat Jul 7 15:40:57 2007 +0200 t/fpmcorrupt: fix for /usr/bin/rm: Argument list too long also fix a typo which caused the empty dir in /tmp not to be deleted diff --git a/t/fpmcorrupt b/t/fpmcorrupt index b98ac2d..ec7717d 100755 --- a/t/fpmcorrupt +++ b/t/fpmcorrupt @@ -12,6 +12,7 @@ for i in frugalware-* do arch=${i#frugalware-} cd $i + mkdir -p $tmp tar xf frugalware-current.fdb -C $tmp for j in `ls $tmp` do @@ -21,8 +22,6 @@ do grep -q `sha1sum $pkg |sed 's/ .*//'` $tmp/$j/desc || \ echo "$i/$pkg is corrupted" done - rm -rf $tmp/* + rm -rf $tmp cd .. done - -rm -rf tmp From vmiklos at frugalware.org Sat Jul 7 15:42:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 15:42:45 2007 Subject: [Frugalware-git] frugalware-current: tools/genpkgdbs: typo fix Message-ID: <20070707134242.B071013A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b7014fdccd912ee2b6591858392cccc37d5cde48 commit b7014fdccd912ee2b6591858392cccc37d5cde48 Author: VMiklos Date: Sat Jul 7 15:39:53 2007 +0200 tools/genpkgdbs: typo fix fix a typo introduced in e2ec8f3 diff --git a/tools/genpkgdbs b/tools/genpkgdbs index 3266a42..1d31ad3 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -33,7 +33,7 @@ echo " done" # setup -cd ../boot +cd boot rm * for i in ${Farchs[@]} do From janny at frugalware.org Sat Jul 7 15:58:32 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 15:58:34 2007 Subject: [Frugalware-git] frugalware-current: avidemux-2.4_preview2-1-i686 Message-ID: <20070707135832.BF94D13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6d385705bb511e4f9722bdbd50e96b9c94aae648 commit 6d385705bb511e4f9722bdbd50e96b9c94aae648 Author: janny Date: Sat Jul 7 15:57:41 2007 +0200 avidemux-2.4_preview2-1-i686 version bump remove unused patch diff --git a/source/gnome-extra/avidemux/FrugalBuild b/source/gnome-extra/avidemux/FrugalBuild index b9067ab..a947971 100644 --- a/source/gnome-extra/avidemux/FrugalBuild +++ b/source/gnome-extra/avidemux/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Janny pkgname=avidemux -pkgver=2.4_preview1 -pkgrel=2 +pkgver=2.4_preview2 +pkgrel=1 pkgdesc="A graphical tool to edit video (filter/re-encode/split)" url="http://fixounet.free.fr/avidemux/" depends=('a52dec>=0.7.4-2' 'sdl' 'lame' 'faac' 'libxml2' 'xvidcore' 'faad2' \ @@ -14,12 +14,13 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://fixounet.free.fr/avidemux/download.html|grep -m1 '.tar.gz'|sed 's/.*x_\(.*\).t.*/\1/'" source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}.tar.gz) #avidemux-2.1.2-x264.diff) license="GPL" -sha1sums=('be22e5da574870d92fcfac78fbfa8fc85ced3a41') +sha1sums=('2ce92ec3c5001215c0bb673c625c0d762b9b3c44') build() { unset MAKEFLAGS Fcd ${pkgname}_${pkgver} + make -f Makefile.dist || Fdie Fbuild --disable-warnings --enable-dependency-tracking --with-jsapi-include=/usr/include/js/ Fdesktop "${pkgname}2_gtk" "${pkgname}_icon.png" "GNOME;KDE;GTK;Multimedia;AudioVideo;Video;" Ficonrel ${pkgname}_icon.png diff --git a/source/gnome-extra/avidemux/avidemux-2.1.2-x264.diff b/source/gnome-extra/avidemux/avidemux-2.1.2-x264.diff deleted file mode 100644 index 126cf3c..0000000 --- a/source/gnome-extra/avidemux/avidemux-2.1.2-x264.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur avidemux-2.1.2.orig/avidemux/ADM_codecs/ADM_x264.cpp avidemux-2.1.2/avidemux/ADM_codecs/ADM_x264.cpp ---- avidemux-2.1.2.orig/avidemux/ADM_codecs/ADM_x264.cpp 2005-06-08 19:23:13.000000000 +0200 -+++ avidemux-2.1.2/avidemux/ADM_codecs/ADM_x264.cpp 2006-09-25 23:38:35.000000000 +0200 -@@ -200,7 +200,7 @@ - { - memset(¶m,0,sizeof(param)); - x264_param_default( ¶m ); -- param.rc.b_cbr=1; -+ param.rc.f_qcompress=0; - param.rc.i_bitrate=val/1000; - // param.rc.i_rc_buffer_size=val/1000; - // param.rc.i_rc_init_buffer=(val/1000)>>1; -@@ -234,7 +234,7 @@ - memset(¶m,0,sizeof(param)); - x264_param_default( ¶m ); - -- param.rc.b_cbr=1; -+ param.rc.f_qcompress=0; - param.rc.i_bitrate=val; - //param.rc.i_rc_buffer_size=val; - //param.rc.i_rc_init_buffer=val>>1; From vmiklos at frugalware.org Sat Jul 7 16:03:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 16:03:47 2007 Subject: [Frugalware-git] frugalware-current: util.sh: Fmake now returns an error if no makefile or setup.py found Message-ID: <20070707140329.1B39D13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=83f7e4e136d95f069a8de01e580d8607b41e0482 commit 83f7e4e136d95f069a8de01e580d8607b41e0482 Author: VMiklos Date: Sat Jul 7 15:58:45 2007 +0200 util.sh: Fmake now returns an error if no makefile or setup.py found diff --git a/source/include/util.sh b/source/include/util.sh index 9d45489..24f98aa 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -519,6 +519,9 @@ Fmake() { make || Fdie elif [ -f setup.py ]; then python setup.py build "$@" || Fdie + else + Fmessage "No Makefile or setup.py found!" + Fdie fi } From krics at linuxforum.hu Sat Jul 7 16:07:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 7 16:07:35 2007 Subject: [Frugalware-git] frugalware-current: nspr-4.6.7-1-x86_64 Message-ID: <20070707140731.9441313A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3efd627de5af1fdaff346009f2a88d4a23a0d277 commit 3efd627de5af1fdaff346009f2a88d4a23a0d277 Author: Christian Hamar alias krix Date: Sat Jul 7 16:07:20 2007 +0200 nspr-4.6.7-1-x86_64 * Version bump diff --git a/source/lib/nspr/FrugalBuild b/source/lib/nspr/FrugalBuild index 101d7c5..2b9d0e6 100644 --- a/source/lib/nspr/FrugalBuild +++ b/source/lib/nspr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=nspr -pkgver=4.6.6 +pkgver=4.6.7 pkgrel=1 pkgdesc="NSPR library from mozilla.org" url="http://www.mozilla.org/projects/nspr/" @@ -55,8 +55,8 @@ build() { Frm /usr/include/nspr4/md } -sha1sums=('5e0d35f0ae968dc7a38387688ecd9ea6002dcf5e'\ - '86f7724760f3d4c0295829b4a8b7e8685bccd588'\ - '6d3a40116e513721b782ad25d21447e3d3a91d6d'\ +sha1sums=('cf45319d02285ec5479445a1e9adfb9e94f55a6a' \ + '86f7724760f3d4c0295829b4a8b7e8685bccd588' \ + '6d3a40116e513721b782ad25d21447e3d3a91d6d' \ 'ca1ec22ec23134e8aab2589db33057439a75c2bd') # optimization OK From janny at frugalware.org Sat Jul 7 16:11:28 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 16:11:29 2007 Subject: [Frugalware-git] frugalware-current: sugarcrm-4.5.1e-1-i686 Message-ID: <20070707141128.4340F13A4052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a691661a7b624e31b01f79aa792c513e58ef11ad commit a691661a7b624e31b01f79aa792c513e58ef11ad Author: janny Date: Sat Jul 7 16:08:33 2007 +0200 sugarcrm-4.5.1e-1-i686 version bump move depends() in rodepends() diff --git a/source/network-extra/sugarcrm/FrugalBuild b/source/network-extra/sugarcrm/FrugalBuild index 757ed93..7558739 100644 --- a/source/network-extra/sugarcrm/FrugalBuild +++ b/source/network-extra/sugarcrm/FrugalBuild @@ -3,20 +3,20 @@ pkgname=sugarcrm origname=SugarOS -pkgver=4.5.1d +pkgver=4.5.1e pkgrel=1 pkgdesc="Opensourced CRM application." url="http://www.sugarforge.org" license="MPL-1.1" -depends=('apache' 'php' 'mysql' 'imap') +rodepends=('apache' 'php' 'mysql' 'imap') archs=('i686' 'x86_64') groups=('network-extra') up2date="lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed -n 's/.*-\([0-9\.a-z]\+\)\.zip.*/\1/;1p'" # check $dirnum -#dirnum=`lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed 's/.*.php\///g;s/\/.*.//;1q'` -dirnum=2894 +dirnum=`lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed 's/.*.php\///g;s/\/.*.//;1q'` +#dirnum=2894 source=(http://www.sugarforge.org/frs/download.php/$dirnum/$origname-$pkgver.zip README.Frugalware) -sha1sums=('b2e1c532bb83c9033549051d9c63b3cb824fd1a7'\ +sha1sums=('b321a8f8dbaf77d953bf1296708297ca97708b14' \ '2ad5db72181854016c96c83635244dc75226ff77') build() { From janny at frugalware.org Sat Jul 7 16:11:28 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 16:11:35 2007 Subject: [Frugalware-git] frugalware-current: sugarcrm-4.5.1e-1-i686 Message-ID: <20070707141128.9453C16A8016@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7555a1adb587c98402bd9e329bee2816c55f82a1 commit 7555a1adb587c98402bd9e329bee2816c55f82a1 Author: janny Date: Sat Jul 7 16:10:48 2007 +0200 sugarcrm-4.5.1e-1-i686 add new correct $dirnum diff --git a/source/network-extra/sugarcrm/FrugalBuild b/source/network-extra/sugarcrm/FrugalBuild index 7558739..ed01689 100644 --- a/source/network-extra/sugarcrm/FrugalBuild +++ b/source/network-extra/sugarcrm/FrugalBuild @@ -13,8 +13,8 @@ archs=('i686' 'x86_64') groups=('network-extra') up2date="lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed -n 's/.*-\([0-9\.a-z]\+\)\.zip.*/\1/;1p'" # check $dirnum -dirnum=`lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed 's/.*.php\///g;s/\/.*.//;1q'` -#dirnum=2894 +#dirnum=`lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed 's/.*.php\///g;s/\/.*.//;1q'` +dirnum=3103 source=(http://www.sugarforge.org/frs/download.php/$dirnum/$origname-$pkgver.zip README.Frugalware) sha1sums=('b321a8f8dbaf77d953bf1296708297ca97708b14' \ '2ad5db72181854016c96c83635244dc75226ff77') From krics at linuxforum.hu Sat Jul 7 16:17:01 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 7 16:18:05 2007 Subject: [Frugalware-git] frugalware-current: nss-3.11.7-1-x86_64 Message-ID: <20070707141701.829E017680A4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c54c14bbcab522aba23315d1603dce97c5d8834b commit c54c14bbcab522aba23315d1603dce97c5d8834b Author: Christian Hamar alias krix Date: Sat Jul 7 16:16:33 2007 +0200 nss-3.11.7-1-x86_64 * Version bump * Depends on latest nspr diff --git a/source/lib/nss/FrugalBuild b/source/lib/nss/FrugalBuild index 55340f4..5ccb076 100644 --- a/source/lib/nss/FrugalBuild +++ b/source/lib/nss/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=nss -pkgver=3.11.5 +pkgver=3.11.7 nspr_version=4.6 pkgrel=1 pkgdesc="NSS library from mozilla.org" @@ -11,7 +11,7 @@ pkgurl="http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/" groups=('lib') archs=('i686' 'x86_64') license="MPL GPL" -depends=('glibc' 'nspr>=4.6.6') +depends=('glibc' 'nspr>=4.6.7') up2date="lynx -dump '$pkgurl?C=M;D=A'|grep NSS|sed -n 's/.*NSS_\(.*\)_RTM.*/\1/;s/_/./g;$ p'" source=($pkgurl/NSS_${pkgver//./_}_RTM/src/$pkgname-$pkgver.tar.gz \ nss-config.in nss.pc.in) @@ -94,7 +94,7 @@ build() { done } -sha1sums=('2cde010908ab41777e43fda83be0a925010c4a09'\ - '7b9ee5db74e006eb520e9c71d4a88d606be4e8d1'\ +sha1sums=('501af41c4abc2300de2e5f90311583f47c19888c' \ + '7b9ee5db74e006eb520e9c71d4a88d606be4e8d1' \ '37de504fcc1c5b78e6199930b0e664e7269e0e99') # optimization OK From crazy at frugalware.org Sat Jul 7 16:27:34 2007 From: crazy at frugalware.org (crazy) Date: Sat Jul 7 16:27:38 2007 Subject: [Frugalware-git] frugalware-current: xapian-core-1.0.2-1-i686 Message-ID: <20070707142734.6614916A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a8a28795ac5056bb8b68a096abe426df8ebc4565 commit a8a28795ac5056bb8b68a096abe426df8ebc4565 Author: crazy Date: Sat Jul 7 16:26:23 2007 +0200 xapian-core-1.0.2-1-i686 * Version bump diff --git a/source/lib-extra/xapian-core/FrugalBuild b/source/lib-extra/xapian-core/FrugalBuild index 60e0874..b052f7a 100644 --- a/source/lib-extra/xapian-core/FrugalBuild +++ b/source/lib-extra/xapian-core/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=xapian-core -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Xapian is an Open Source Search Engine Library." url="http://www.xapian.org/" @@ -13,6 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.xapian.org/|grep 'stable version'|sed 's/.*is \(.*\), .*/\1/'" source=(http://www.oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('02ce597533fab605a9dd09e5f65e15d674c9c0f2') +sha1sums=('2be47ea020604270ccde8218a5de5647c9fe49ab') # optimization OK From krics at linuxforum.hu Sat Jul 7 16:27:46 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 7 16:27:49 2007 Subject: [Frugalware-git] frugalware-current: claws-mail-2.10.0-1-x86_64 Message-ID: <20070707142746.BCB2816A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fc10ae1d27679dbdc39499bd016daf21a7ac80c3 commit fc10ae1d27679dbdc39499bd016daf21a7ac80c3 Author: Christian Hamar alias krix Date: Sat Jul 7 16:27:30 2007 +0200 claws-mail-2.10.0-1-x86_64 * Version bump diff --git a/source/xapps-extra/claws-mail/FrugalBuild b/source/xapps-extra/claws-mail/FrugalBuild index 52ecc5c..cf0c1da 100644 --- a/source/xapps-extra/claws-mail/FrugalBuild +++ b/source/xapps-extra/claws-mail/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Bence Nagy pkgname=claws-mail -pkgver=2.9.2 +pkgver=2.10.0 pkgrel=1 pkgdesc="The extended version of Sylpheed, a GTK+ based, lightweight, and fast e-mail client" groups=('xapps-extra') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') options=('scriptlet') depends=('openssl' 'aspell' 'clamav' 'pilot-link>=0.12.1' \ 'gtk+2' 'gpgme' 'startup-notification' 'libldap' \ - 'spamassassin' 'curl' 'gdk-pixbuf' 'libetpan>=0.48' \ + 'spamassassin' 'curl' 'gdk-pixbuf' 'libetpan>=0.49' \ 'hicolor-icon-theme' 'glib2>=2.12.8' 'db') makedepends=('openldap') _F_sourceforge_ext=".tar.bz2" @@ -39,5 +39,5 @@ build() { Ffilerel claws-mail.desktop /usr/share/applications/claws-mail.desktop } -sha1sums=('3b15730065ca1e0c318592b39b02c2d0497e6ebc') +sha1sums=('0ee38ec2dd0c37941b0bcc4af7ab441ec432c63c') # optimization OK From vmiklos at frugalware.org Sat Jul 7 16:39:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 16:39:33 2007 Subject: [Frugalware-git] frugalware-current: util.sh: die in Fmakeinstall if no makefile or setup.py found Message-ID: <20070707143929.BB1E216A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8ba242b87e418c77ad4daf369b904fef9b1e7ada commit 8ba242b87e418c77ad4daf369b904fef9b1e7ada Author: VMiklos Date: Sat Jul 7 16:37:48 2007 +0200 util.sh: die in Fmakeinstall if no makefile or setup.py found diff --git a/source/include/util.sh b/source/include/util.sh index 24f98aa..c21bc8e 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -558,6 +558,9 @@ Fmakeinstall() { fi elif [ -f setup.py ]; then python setup.py install --prefix "$Fprefix" --root "$Fdestdir" "$@" || Fdie + else + Fmessage "No Makefile or setup.py found!" + Fdie fi if [ -e $Fdestdir/usr/info/dir ]; then Frm /usr/info/dir From krics at linuxforum.hu Sat Jul 7 16:43:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 7 16:43:43 2007 Subject: [Frugalware-git] frugalware-current: gnome-user-docs-2.18.2-1-x86_64 Message-ID: <20070707144341.8B85616A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8acd233e01af0ca69e2cb3d770745ffec4da4aa2 commit 8acd233e01af0ca69e2cb3d770745ffec4da4aa2 Author: Christian Hamar alias krix Date: Sat Jul 7 16:43:19 2007 +0200 gnome-user-docs-2.18.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-user-docs/FrugalBuild b/source/gnome/gnome-user-docs/FrugalBuild index 630bf0d..cab3637 100644 --- a/source/gnome/gnome-user-docs/FrugalBuild +++ b/source/gnome/gnome-user-docs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=gnome-user-docs -pkgver=2.18.1 +pkgver=2.18.2 pkgrel=1 pkgdesc="User documentation for GNOME" url="http://www.gnome.org/" @@ -14,4 +14,4 @@ archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet unset MAKEFLAGS -sha1sums=('5db90b31e7e26049a209f6eac03923ae25ec90a4') +sha1sums=('077fdaf2f24e739ebc9504436168dcbf15df3407') From vmiklos at frugalware.org Sat Jul 7 16:44:21 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 16:44:46 2007 Subject: [Frugalware-git] pacman-tools: repoman: push(): dg pull before dg push Message-ID: <20070707144421.DB09516A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=a37608e9006bf6f406266cf34995e3d51f5b081c commit a37608e9006bf6f406266cf34995e3d51f5b081c Author: VMiklos Date: Sat Jul 7 16:43:03 2007 +0200 repoman: push(): dg pull before dg push and abort on conficts diff --git a/repoman b/repoman index f8356ff..819c1b9 100755 --- a/repoman +++ b/repoman @@ -360,13 +360,15 @@ sync() ls *-$arch.fpm &>/dev/null && srcdel modpkgname=$(echo $pkgname | sed 's/\+/\\+/g') - if [ "$F_makepkg_scm" = "git" ]; then - cmd="dg push" + if [ -n "$noask" ]; then + opts="-a" else - cmd="darcs push --match 'name $modpkgname'" + opts="" fi - if [ -n "$noask" ]; then - cmd="$cmd -a" + if [ "$F_makepkg_scm" = "git" ]; then + cmd="dg pull $opts; git diff|grep -q -- 'diff --cc' && die 'detected conflicts'; dg push $opts" + else + cmd="darcs push --match 'name $modpkgname' $opts" fi dry_run "$cmd" || die "push failed" From vmiklos at frugalware.org Sat Jul 7 16:45:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 7 16:45:27 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.3-2-i686 Message-ID: <20070707144526.0AD4C16A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=87c1b02f83d30a4e16b329f83715a8df1ca8f133 commit 87c1b02f83d30a4e16b329f83715a8df1ca8f133 Author: VMiklos Date: Sat Jul 7 16:42:37 2007 +0200 git-1.5.2.3-2-i686 split gitk build documentation, don't use the prebuilt ones also build html docs (user manual, etc) diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 5435075..8e53543 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -3,24 +3,25 @@ pkgname=git pkgver=1.5.2.3 -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') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$url/?C=M;O=D'|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/$pkgname-$pkgver.tar.bz2 \ -$url/git-manpages-$pkgver.tar.bz2 \ -gitweb.modules.d gitweb.conf README.Frugalware) -signatures=(${source[0]}.sign ${source[1]}.sign '' '' '') +offline_doc.diff gitweb.modules.d gitweb.conf README.Frugalware) +signatures=(${source[0]}.sign '' '' '' '') +options=('scriptlet') -subpkgs=('gitweb') -subdescs=('Web interface for Git.') -subdepends=("git=$pkgver") -subbackup=('etc/gitweb.conf etc/httpd/conf/modules.d/gitweb.conf') -subgroups=('network-extra') -subarchs=('i686 x86_64') +subpkgs=('gitweb' 'gitk') +subdescs=('Web interface for Git.' 'Tk based git repository browser') +subdepends=("git=$pkgver" "git=$pkgver tk") +subbackup=('etc/gitweb.conf etc/httpd/conf/modules.d/gitweb.conf' '') +subgroups=('network-extra' 'xapps-extra') +subarchs=('i686 x86_64' 'i686 x86_64') build() { @@ -29,8 +30,13 @@ build() Fsed 'doc/' '' templates/hooks--post-receive make configure || return 1 Fmkdir /usr/bin - Fbuild - Fdocrel Documentation/SubmittingPatches Documentation/technical/* + Fpatchall + Fconf + make ASCIIDOC8=YesPlease all doc || return 1 + Fmakeinstall install-doc + make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver/html install-webdoc || return 1 + Fdocrel Documentation/SubmittingPatches + Fdocrel Documentation/technical # libgit Ffilerel /usr/lib/libgit.a @@ -45,16 +51,10 @@ build() Ffile gitweb.modules.d /etc/httpd/conf/modules.d/gitweb.conf Ffile /etc/gitweb.conf Fsplit gitweb /etc /var - - # man pages - cd $Fsrcdir - for i in man* - do - cd $i - Fmanrel * - cd .. - done Fdoc README.Frugalware + + # gitk + Fsplit gitk usr/bin/gitk } diff --git a/source/devel-extra/git/offline_doc.diff b/source/devel-extra/git/offline_doc.diff new file mode 100644 index 0000000..1ef191e --- /dev/null +++ b/source/devel-extra/git/offline_doc.diff @@ -0,0 +1,22 @@ +diff -Naur git-1.5.2.3.orig/Documentation/Makefile git-1.5.2.3/Documentation/Makefile +--- git-1.5.2.3.orig/Documentation/Makefile 2007-07-02 10:11:39.000000000 +0200 ++++ git-1.5.2.3/Documentation/Makefile 2007-07-07 14:49:41.000000000 +0200 +@@ -118,13 +118,17 @@ + $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< + mv $@+ $@ + ++DTDDIR=/usr/share/sgml/docbook/dtd/xml-dtd-4.2 ++ + %.1 %.5 %.7 : %.xml +- xmlto -m callouts.xsl man $< ++ xsltproc --nonet --path $(DTDDIR) /etc/asciidoc/docbook-xsl/manpage.xsl $< ++ sed -i 's/\\(bu/*/' $@ + + %.xml : %.txt + rm -f $@+ $@ + $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \ + $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< ++ sed -i '/ Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=28ab28310561f48240dea5b8eb6e61e709a87676 commit 28ab28310561f48240dea5b8eb6e61e709a87676 Author: crazy Date: Sat Jul 7 16:47:59 2007 +0200 pinot-0.74-2-i686 * rebuild with xapian diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild index a82e183..0765dc9 100644 --- a/source/xapps-extra/pinot/FrugalBuild +++ b/source/xapps-extra/pinot/FrugalBuild @@ -3,10 +3,10 @@ pkgname=pinot pkgver=0.74 -pkgrel=1 +pkgrel=2 pkgdesc="Personal search and metasearch for the Free Desktop" url="http://pinot.berlios.de/" -depends=('openssl' 'curl' 'cairomm' 'dbus-glib' 'xapian-core>=1.0.1' 'gmime' 'atk' 'gtkmm' 'boost>=1.34.0-4' \ +depends=('openssl' 'curl' 'cairomm' 'dbus-glib' 'xapian-core>=1.0.2' 'gmime' 'atk' 'gtkmm' 'boost>=1.34.0-4' \ 'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' \ 'shared-mime-info') makedepends=('desktop-file-utils') From crazy at frugalware.org Sat Jul 7 16:51:58 2007 From: crazy at frugalware.org (crazy) Date: Sat Jul 7 16:52:03 2007 Subject: [Frugalware-git] frugalware-current: recoll-1.8.1-4-i686 Message-ID: <20070707145158.34C0816A8067@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a42b5a93f71fbcbb6b3a7da07f83365ed1b53421 commit a42b5a93f71fbcbb6b3a7da07f83365ed1b53421 Author: crazy Date: Sat Jul 7 16:51:35 2007 +0200 recoll-1.8.1-4-i686 * rebuild with xapian diff --git a/source/xapps-extra/recoll/FrugalBuild b/source/xapps-extra/recoll/FrugalBuild index 9cd42fa..42e8f1f 100644 --- a/source/xapps-extra/recoll/FrugalBuild +++ b/source/xapps-extra/recoll/FrugalBuild @@ -3,11 +3,11 @@ pkgname=recoll pkgver=1.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="Recoll is a personal full text search tool for Unix/Linux." Finclude sourceforge url="http://www.lesbonscomptes.com/recoll/" -depends=('qt' 'xapian-core>=1.0.1' 'gamin' 'aspell') +depends=('qt' 'xapian-core>=1.0.2' 'gamin' 'aspell') rodepends=('xpdf' 'id3lib' 'catdoc' 'gawk' 'antiword' 'pstotext' 'djvulibre>=3.5.18' 'file' 'unrtf') backup=('usr/share/recoll/examples/{recoll.conf,mimemap,mimeconf}') license="GPL" From priyank at frugalware.org Sat Jul 7 17:02:25 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 7 17:02:28 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: marked some strins as translatable. Message-ID: <20070707150225.D34C116A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=f8b384bbdb02ec7f5b1293d35c9f17d2a5f098d4 commit f8b384bbdb02ec7f5b1293d35c9f17d2a5f098d4 Author: Priyank Date: Sat Jul 7 20:30:23 2007 +0530 gnetconfig: marked some strins as translatable. * Some indentation fixes. diff --git a/gnetconfig/src/gnetconfig-interface_opts.c b/gnetconfig/src/gnetconfig-interface_opts.c index 7b2da61..89da0b7 100644 --- a/gnetconfig/src/gnetconfig-interface_opts.c +++ b/gnetconfig/src/gnetconfig-interface_opts.c @@ -33,9 +33,9 @@ #include "gnetconfig-misc.h" extern fwnet_profile_t *active_profile; -extern GladeXML *xml; -extern GtkWidget *gn_main_window; -extern GtkWidget *gn_iflabel; +extern GladeXML *xml; +extern GtkWidget *gn_main_window; +extern GtkWidget *gn_iflabel; GtkWidget *gn_preup_treeview; GtkWidget *gn_predown_treeview; @@ -61,7 +61,7 @@ static void cb_gn_postdown_treeview_keypress (GtkWidget *widget, GdkEventKey *ev void gnetconfig_interface_opts_init (void) { - GtkWidget *widget = NULL; + GtkWidget *widget = NULL; GtkListStore *store_1 = NULL; GtkListStore *store_2 = NULL; GtkListStore *store_3 = NULL; @@ -153,13 +153,13 @@ gnetconfig_populate_opts (fwnet_interface_t *inte) { GtkTreeModel *model = NULL; GtkListStore *store = NULL; - GtkTreeIter iter1; - GtkTreeIter iter2; - GtkTreeIter iter3; - GtkTreeIter iter4; - GList *olist = NULL; - gchar *str = NULL; - GdkPixbuf *pixbuf = NULL; + GtkTreeIter iter1; + GtkTreeIter iter2; + GtkTreeIter iter3; + GtkTreeIter iter4; + GList *olist = NULL; + gchar *str = NULL; + GdkPixbuf *pixbuf = NULL; if (!inte) return; @@ -254,7 +254,7 @@ cb_gn_preup_add (GtkButton *button, gpointer data) { if (!command || !strlen(command)) { - gn_error ("Required field cannot be blank. Please provide a valid command name."); + gn_error (_("Required field cannot be blank. Please provide a valid command name.")); goto up; } ift->pre_ups = g_list_append (ift->pre_ups, (gpointer)strdup(command)); @@ -311,7 +311,7 @@ cb_gn_predown_add (GtkButton *button, gpointer data) { if (!command || !strlen(command)) { - gn_error ("Required field cannot be blank. Please provide a valid command name."); + gn_error (_("Required field cannot be blank. Please provide a valid command name.")); goto up; } ift->pre_downs = g_list_append (ift->pre_downs, (gpointer)strdup(command)); @@ -368,7 +368,7 @@ cb_gn_postup_add (GtkButton *button, gpointer data) { if (!command || !strlen(command)) { - gn_error ("Required field cannot be blank. Please provide a valid command name."); + gn_error (_("Required field cannot be blank. Please provide a valid command name.")); goto up; } ift->post_ups = g_list_append (ift->post_ups, (gpointer)strdup(command)); @@ -425,7 +425,7 @@ cb_gn_postdown_add (GtkButton *button, gpointer data) { if (!command || !strlen(command)) { - gn_error ("Required field cannot be blank. Please provide a valid command name."); + gn_error (_("Required field cannot be blank. Please provide a valid command name.")); goto up; } ift->post_downs = g_list_append (ift->post_downs, (gpointer)strdup(command)); From priyank at frugalware.org Sat Jul 7 17:17:31 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 7 17:17:33 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: whitespace cosmetics Message-ID: <20070707151731.37B7D16A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=a2466c44fad137d96828d66795c1fb6f73b2ae1c commit a2466c44fad137d96828d66795c1fb6f73b2ae1c Author: Priyank Date: Sat Jul 7 20:46:27 2007 +0530 gnetconfig: whitespace cosmetics diff --git a/gnetconfig/src/gnetconfig-interface_opts.c b/gnetconfig/src/gnetconfig-interface_opts.c index 89da0b7..0174ebf 100644 --- a/gnetconfig/src/gnetconfig-interface_opts.c +++ b/gnetconfig/src/gnetconfig-interface_opts.c @@ -129,21 +129,21 @@ gnetconfig_interface_opts_init (void) /* Keypress events */ g_signal_connect (G_OBJECT(gn_preup_treeview), - "key_release_event", - G_CALLBACK(cb_gn_preup_treeview_keypress), - NULL); + "key_release_event", + G_CALLBACK(cb_gn_preup_treeview_keypress), + NULL); g_signal_connect (G_OBJECT(gn_predown_treeview), - "key_release_event", - G_CALLBACK(cb_gn_predown_treeview_keypress), - NULL); + "key_release_event", + G_CALLBACK(cb_gn_predown_treeview_keypress), + NULL); g_signal_connect (G_OBJECT(gn_postup_treeview), - "key_release_event", - G_CALLBACK(cb_gn_postup_treeview_keypress), - NULL); + "key_release_event", + G_CALLBACK(cb_gn_postup_treeview_keypress), + NULL); g_signal_connect (G_OBJECT(gn_postdown_treeview), - "key_release_event", - G_CALLBACK(cb_gn_postdown_treeview_keypress), - NULL); + "key_release_event", + G_CALLBACK(cb_gn_postdown_treeview_keypress), + NULL); return; } @@ -367,7 +367,7 @@ cb_gn_postup_add (GtkButton *button, gpointer data) if (res == GTK_RESPONSE_ACCEPT) { if (!command || !strlen(command)) - { + { gn_error (_("Required field cannot be blank. Please provide a valid command name.")); goto up; } @@ -424,7 +424,7 @@ cb_gn_postdown_add (GtkButton *button, gpointer data) if (res == GTK_RESPONSE_ACCEPT) { if (!command || !strlen(command)) - { + { gn_error (_("Required field cannot be blank. Please provide a valid command name.")); goto up; } From janny at frugalware.org Sat Jul 7 17:52:05 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 17:52:08 2007 Subject: [Frugalware-git] frugalware-current: ksudoku-0.4-1-i686 Message-ID: <20070707155205.3DCC616A8067@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9e030e96f836c86736d300e25461d459296fef26 commit 9e030e96f836c86736d300e25461d459296fef26 Author: janny Date: Sat Jul 7 17:51:18 2007 +0200 ksudoku-0.4-1-i686 correction in FB diff --git a/source/kde-extra/ksudoku/FrugalBuild b/source/kde-extra/ksudoku/FrugalBuild index 7d8ec9c..4282ab1 100644 --- a/source/kde-extra/ksudoku/FrugalBuild +++ b/source/kde-extra/ksudoku/FrugalBuild @@ -14,9 +14,7 @@ groups=('kde-extra') _F_sourceforge_prefix=ksudoku- Finclude sourceforge options=('scriptlet') -#source=(${source[@]} ksudoku-0.3.diff) sha1sums=('f98a32f7f15ef73505ec89e4a7e79c7f53f856af') -# '3e613557d8e4aa3c2616920dd6535851562363a2') build() From janny at frugalware.org Sat Jul 7 17:52:04 2007 From: janny at frugalware.org (janny) Date: Sat Jul 7 17:52:08 2007 Subject: [Frugalware-git] frugalware-current: ksudoku-0.4-1-i686 Message-ID: <20070707155204.DB8FC16A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4ba5ddf2cefb5a48de49a759fbf7bb3d002d42fe commit 4ba5ddf2cefb5a48de49a759fbf7bb3d002d42fe Author: janny Date: Sat Jul 7 17:49:09 2007 +0200 ksudoku-0.4-1-i686 version bump remove unused patch diff --git a/source/kde-extra/ksudoku/FrugalBuild b/source/kde-extra/ksudoku/FrugalBuild index ecae829..7d8ec9c 100644 --- a/source/kde-extra/ksudoku/FrugalBuild +++ b/source/kde-extra/ksudoku/FrugalBuild @@ -2,36 +2,44 @@ # Maintainer: Janny pkgname=ksudoku -pkgver=0.3 -pkgrel=2 +pkgver=0.4 +pkgrel=1 pkgdesc="Sudoku Puzzle Generator and Solver for KDE." url="http://ksudoku.sourceforge.net" license="GPL2" depends=('kdelibs' 'glut') +makedepends=('cmake') archs=('i686' 'x86_64') groups=('kde-extra') _F_sourceforge_prefix=ksudoku- Finclude sourceforge options=('scriptlet') -source=(${source[@]} ksudoku-0.3.diff) -sha1sums=('fd2260a9220b92c6a3fa472bd70fb185942a29c4' '3e613557d8e4aa3c2616920dd6535851562363a2') +#source=(${source[@]} ksudoku-0.3.diff) +sha1sums=('f98a32f7f15ef73505ec89e4a7e79c7f53f856af') +# '3e613557d8e4aa3c2616920dd6535851562363a2') build() { - Fbuild --disable-final \ - --disable-dependency-tracking \ - --enable-dnotify \ - --with-alsa --disable-debug \ - --enable-sendfile \ - --enable-ltdl-install \ - --disable-warnings \ - --enable-mitshm \ - --with-libart \ - --with-lua-includes=/usr/include \ - --with-lua-libraries=/usr/lib \ - --with-acl \ - --enable-gcc-hidden-visibility + Fcd + cmake -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_CXX_FLAGS:STRING="-Wall" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \ + -DCMAKE_INSTALL_PREFIX:STRING=`kde-config --prefix` || Fdie + Fmake --disable-final \ + --disable-dependency-tracking \ + --enable-dnotify \ + --with-alsa --disable-debug \ + --enable-sendfile \ + --enable-ltdl-install \ + --disable-warnings \ + --enable-mitshm \ + --with-libart \ + --with-lua-includes=/usr/include \ + --with-lua-libraries=/usr/lib \ + --with-acl \ + --enable-gcc-hidden-visibility + Fmakeinstall DESTDIR=$Fdestdir } # optimalization ok diff --git a/source/kde-extra/ksudoku/ksudoku-0.3.diff b/source/kde-extra/ksudoku/ksudoku-0.3.diff deleted file mode 100644 index 4aeb82a..0000000 --- a/source/kde-extra/ksudoku/ksudoku-0.3.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur ksudoku-0.3/src/glwindow.cpp ksudoku-0.3.time/src/glwindow.cpp ---- ksudoku-0.3/src/glwindow.cpp 2005-09-29 17:16:04.000000000 +0200 -+++ ksudoku-0.3.time/src/glwindow.cpp 2006-01-08 21:59:36.000000000 +0100 -@@ -3,6 +3,7 @@ - #include - #include "ksudoku.h" - #include -+#include - GLUquadricObj *quadratic; // Used For Our Quadric - - const float PI2 = 2.0*3.1415926535f; // PI Squared -diff -Naur ksudoku-0.3/src/ksudokuview.cpp ksudoku-0.3.time/src/ksudokuview.cpp ---- ksudoku-0.3/src/ksudokuview.cpp 2005-09-29 17:15:47.000000000 +0200 -+++ ksudoku-0.3.time/src/ksudokuview.cpp 2006-01-08 21:59:40.000000000 +0100 -@@ -17,6 +17,7 @@ - #include - #include "ksudoku.h" - #include "knewdlg.h" -+#include - - ksudokuView::ksudokuView(QWidget *parent) - : QWidget(parent), From crazy at frugalware.org Sat Jul 7 19:15:33 2007 From: crazy at frugalware.org (crazy) Date: Sat Jul 7 19:15:35 2007 Subject: [Frugalware-git] frugalware-current: kde-theme-qtcurve-0.52.3-1-i686 Message-ID: <20070707171533.A339616A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8874c77c0222dc0da8544eb0858154209232ed98 commit 8874c77c0222dc0da8544eb0858154209232ed98 Author: crazy Date: Sat Jul 7 19:14:48 2007 +0200 kde-theme-qtcurve-0.52.3-1-i686 * Version bump diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index 2a5c928..1ad24fc 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kde-theme-qtcurve -pkgver=0.52.1 +pkgver=0.52.3 pkgrel=1 pkgdesc="KDE QtCurve Theme" depends=('kdelibs>=3.5.7') @@ -11,7 +11,7 @@ groups=('kde') archs=('i686' 'x86_64') _F_kde_id2="40492" Finclude kde -source=(http://home.freeuk.com/cpdrummond/{QtCurve-KDE3,QtCurve-Gtk2}-$pkgver.tar.gz admin_fix.patch QtCurve-KDE3-0.52.2.patch) +source=(http://home.freeuk.com/cpdrummond/{QtCurve-KDE3-$pkgver,QtCurve-Gtk2-0.52.2}.tar.gz admin_fix.patch) up2date="lynx -dump 'http://www.kde-look.org/content/show.php?content=40492'|grep 'Source download'| grep 'KDE 3'|sed 's/.*- \(.*\).*)/\1/'" subpkgs=('qtcurve-gtk2') @@ -24,13 +24,12 @@ subarchs=('i686 x86_64') build() { - Fcd QtCurve-Gtk2-$pkgver + Fcd QtCurve-Gtk2-0.52.2 Fmake --enable-mozilla-userjs Fmakeinstall Fsplit qtcurve-gtk2 /usr cd ../QtCurve-KDE3-$pkgver Fpatch admin_fix.patch - Fpatch QtCurve-KDE3-0.52.2.patch make -f admin/Makefile.common cvs || Fdie Fmake \ --disable-debug --without-debug \ @@ -39,8 +38,7 @@ build() Fmakeinstall } -sha1sums=('588c1546e964b473287956c33e13694de969de4d'\ - 'fed81447ed8f4116e2759a4eb918b612f1847ff5'\ - '5f99980cc75133c5a8c0b9ebc533aad6b257337d'\ - '125d2eb2be4d8de770e62923270381b5ab4e62fd') +sha1sums=('f7cbd978cc31f8665da0b10af20981899d8b6f88' \ + '0a3271e537f19ac95a9f6901966a2bb57f07ef1e' \ + '5f99980cc75133c5a8c0b9ebc533aad6b257337d') # optimization OK diff --git a/source/kde/kde-theme-qtcurve/QtCurve-KDE3-0.52.2.patch b/source/kde/kde-theme-qtcurve/QtCurve-KDE3-0.52.2.patch deleted file mode 100644 index 86e2b95..0000000 --- a/source/kde/kde-theme-qtcurve/QtCurve-KDE3-0.52.2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur QtCurve-KDE3-0.52.1/kde/qtcurve.cpp QtCurve-KDE3-0.52.2/kde/qtcurve.cpp ---- QtCurve-KDE3-0.52.1/kde/qtcurve.cpp 2007-06-20 23:10:07.000000000 +0200 -+++ QtCurve-KDE3-0.52.2/kde/qtcurve.cpp 2007-06-21 10:40:34.000000000 +0200 -@@ -5611,9 +5611,9 @@ - const QColor * QtCurveStyle::sliderColors(/*const QColorGroup &cg, */ SFlags flags) const - { - return (flags&Style_Enabled) -- ? /*SHADE_NONE!=opts.shadeSliders && cg.button()==itsButtonCols[ORIGINAL_SHADE] -- ? */itsSliderCols -- /*: buttonColors(cg)*/ -+ ? SHADE_NONE!=opts.shadeSliders //&& cg.button()==itsButtonCols[ORIGINAL_SHADE] -+ ? itsSliderCols -+ : itsButtonCols // buttonColors(cg) - : itsBackgroundCols; - } - From priyank at frugalware.org Sat Jul 7 20:48:05 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 7 20:48:08 2007 Subject: [Frugalware-git] frugalware-current: seahorse-1.0.1-2-i686 Message-ID: <20070707184805.E7E7E16A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fbf3bff6fb7cd46667dddb553c34d74c2545ad4c commit fbf3bff6fb7cd46667dddb553c34d74c2545ad4c Author: Priyank Date: Sun Jul 8 00:16:41 2007 +0530 seahorse-1.0.1-2-i686 * Splitted the package into * seahorse * seahorse-nautilus * gedit-encryption * Fix SBU diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index feb9eea..d823968 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -1,15 +1,16 @@ -# Compiling Time: 0.59 SBU +# Compiling Time: 0.34 SBU # Maintainer: Priyank Gosalia pkgname=seahorse pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" -depends=('gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'nautilus' \ - 'dbus' 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'openssh' \ - 'gedit' 'gconf' 'avahi') -makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils') +depends=('gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ + 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' \ + 'openssh' 'gconf' 'avahi') +makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' \ + 'nautilus>=2.18.3' 'gedit>=2.18.2') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/seahorse-gedit.schemas' @@ -18,6 +19,20 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet source=(${source[@]} seahorse-1.0.1-setuid-agent.patch) +sha1sums=('03e5232d47e0d9d16fe7a713b00533859583a8d8'\ + '5675eace4c9293f1b1b6b2c41beb0290600247d0') + +subpkgs=("gedit-encryption") +subdescs=('gedit encryption plugin') +subdepends=("$pkgname=$pkgver gedit>=2.18.2") +subgroups=('gnome-extra') +subarchs=('i686 x86_64') + +subpkgs=("$pkgname-nautilus") +subdescs=('Nautilus encryption extension') +subdepends=("$pkgname=$pkgver nautilus>=2.18.3") +subgroups=('gnome-extra') +subarchs=('i686 x86_64') build() { @@ -43,8 +58,10 @@ build() make || return 1 Fmakeinstall GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$Fdestdir Fbuild_gnome_scriptlet + + Fsplit gedit-encryption usr/lib/gedit-2/ + Fsplit $pkgname-nautilus usr/lib/nautilus/ } # optimization OK -sha1sums=('03e5232d47e0d9d16fe7a713b00533859583a8d8'\ - '5675eace4c9293f1b1b6b2c41beb0290600247d0') + From boobaa at frugalware.org Sat Jul 7 21:55:43 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 7 21:55:45 2007 Subject: [Frugalware-git] frugalware-current: man-pages-2.61-1-i686 Message-ID: <20070707195543.7614316A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8e8a13b0bbfb8bb12c0c9f47f2a3c26fe49a9eee commit 8e8a13b0bbfb8bb12c0c9f47f2a3c26fe49a9eee Author: CSÉCSY László Date: Sat Jul 7 21:55:30 2007 +0200 man-pages-2.61-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index 7d05c16..ac3ece3 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Former m8r: VMiklos pkgname=man-pages -pkgver=2.60 +pkgver=2.61 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } # optimization OK - noarch -sha1sums=('ab47e7061a594fda1af71bcaa70abaa6a9eb40e4') +sha1sums=('f1278be0bad139ed623e48731f0ad6a31ef208a6') From priyank at frugalware.org Sat Jul 7 22:08:52 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 7 22:08:55 2007 Subject: [Frugalware-git] frugalware-current: seahorse-1.0.1-3-i686 Message-ID: <20070707200852.9A8C816A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a83b5f1aa6fb70bbdabf3c37c60c09362e31e81b commit a83b5f1aa6fb70bbdabf3c37c60c09362e31e81b Author: Priyank Date: Sun Jul 8 01:34:33 2007 +0530 seahorse-1.0.1-3-i686 * Renamed subpackage gedit-encryption to seahorse-gedit * New subpackage gedit-applet diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index d823968..c14acc7 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -1,38 +1,35 @@ -# Compiling Time: 0.34 SBU +# Compiling Time: 0.36 SBU # Maintainer: Priyank Gosalia pkgname=seahorse pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" depends=('gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' \ 'openssh' 'gconf' 'avahi') makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' \ - 'nautilus>=2.18.3' 'gedit>=2.18.2') + 'nautilus>=2.18.3' 'gedit>=2.18.2' 'gnome-applets>=2.18.0') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/seahorse-gedit.schemas' '/etc/gconf/schemas/seahorse.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" +_F_gnome_iconcache="y" Finclude gnome gnome-scriptlet source=(${source[@]} seahorse-1.0.1-setuid-agent.patch) sha1sums=('03e5232d47e0d9d16fe7a713b00533859583a8d8'\ '5675eace4c9293f1b1b6b2c41beb0290600247d0') -subpkgs=("gedit-encryption") -subdescs=('gedit encryption plugin') -subdepends=("$pkgname=$pkgver gedit>=2.18.2") -subgroups=('gnome-extra') -subarchs=('i686 x86_64') - -subpkgs=("$pkgname-nautilus") -subdescs=('Nautilus encryption extension') -subdepends=("$pkgname=$pkgver nautilus>=2.18.3") -subgroups=('gnome-extra') -subarchs=('i686 x86_64') +subpkgs=("$pkgname-gedit" "$pkgname-nautilus" "$pkgname-applet") +subdescs=('seahorse encryption plugin for gedit' \ + 'seahorse encryption extension for nautilus' \ + 'seahorse panel applet for GNOME') +subdepends=("$pkgname=$pkgver gedit>=2.18.2" "$pkgname=$pkgver nautilus>=2.18.3" "$pkgname=$pkgver gnome-applets>=2.18.0") +subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') build() { @@ -59,9 +56,30 @@ build() Fmakeinstall GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$Fdestdir Fbuild_gnome_scriptlet - Fsplit gedit-encryption usr/lib/gedit-2/ + Fsplit $pkgname-gedit usr/lib/gedit-2/ Fsplit $pkgname-nautilus usr/lib/nautilus/ + Fsplit $pkgname-applet usr/lib/seahorse/seahorse-applet + Fsplit $pkgname-applet usr/share/omf/seahorse-applet/ + Fsplit $pkgname-applet usr/share/gnome/help/seahorse-applet/ + Fsplit $pkgname-applet usr/share/pixmaps/seahorse-applet.svg + Fsplit $pkgname-applet usr/share/seahorse/glade/seahorse-applet-preferences.glade + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-key.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-signed.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-text.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-key.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-signed.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-text.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/48x48/seahorse-applet.png + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-key.svg + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-text.svg + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg + Fsplit $pkgname-applet usr/share/pixmaps/seahorse/scalable/seahorse-applet.svg } # optimization OK - From vmiklos at frugalware.org Sun Jul 8 02:26:54 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 02:26:56 2007 Subject: [Frugalware-git] frugalware-current: archmage-0.1.9-1-i686 Message-ID: <20070708002654.8695C16A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d4ec3e59d4cd69687fcc48fd3c70d53467c9c9c9 commit d4ec3e59d4cd69687fcc48fd3c70d53467c9c9c9 Author: VMiklos Date: Sun Jul 8 02:08:12 2007 +0200 archmage-0.1.9-1-i686 version bump diff --git a/source/apps-extra/archmage/FrugalBuild b/source/apps-extra/archmage/FrugalBuild index 66d0d35..9c9b8a6 100644 --- a/source/apps-extra/archmage/FrugalBuild +++ b/source/apps-extra/archmage/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=archmage -pkgver=0.0.8 +pkgver=0.1.9 pkgrel=1 pkgdesc="A CHM (Compiled HTML) Decompressor." url="http://archmage.sourceforge.net/" @@ -11,7 +11,5 @@ backup=('etc/arch.conf') groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge - +sha1sums=('968f74fcb0e3019bc16eb3fc8e036d448ebbc450') # optimization OK - -sha1sums=('111254114bfc71f3fa509683eecdb60e167d80d6') From vmiklos at frugalware.org Sun Jul 8 02:28:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 02:28:58 2007 Subject: [Frugalware-git] pacman-tools: git clean -> git clean -x because there may be a .gitignore file Message-ID: <20070708002856.2F27116A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=787b82e4ce214dceab6fe4021fe4f78556568c6b commit 787b82e4ce214dceab6fe4021fe4f78556568c6b Author: VMiklos Date: Sun Jul 8 02:28:49 2007 +0200 git clean -> git clean -x because there may be a .gitignore file diff --git a/bumppkg b/bumppkg index 4d79df6..828bb59 100755 --- a/bumppkg +++ b/bumppkg @@ -62,7 +62,7 @@ src_cleanup() Fmessage "cleaning up old source files" root="`get_root`" if [ "$F_makepkg_scm" = "git" ]; then - git clean . + git clean -x . else local i workdir diff --git a/repoman b/repoman index 819c1b9..c99bbf4 100755 --- a/repoman +++ b/repoman @@ -305,7 +305,7 @@ srcdel() srclocal=(${srclocal[@]} ${signatures[@]}) if [ "$F_makepkg_scm" = "git" ]; then check_servers - for i in $(ssh $host "cd $path/$mydir; git clean -n ."|sed 's/.* remove //') + for i in $(ssh $host "cd $path/$mydir; git clean -n -x ."|sed 's/.* remove //') do if ! echo ${srclocal[@]} |grep -q $i && ! _is_log $i && [ "$i" != "Changelog" ]; then dry_run delete $mydir/$i From vmiklos at frugalware.org Sun Jul 8 02:31:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 02:31:31 2007 Subject: [Frugalware-git] frugalware-current: .gitignore: import Message-ID: <20070708003129.D158D16A8066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=771d0043995aea28a82e14e0a1323f8cf6c78c65 commit 771d0043995aea28a82e14e0a1323f8cf6c78c65 Author: VMiklos Date: Sun Jul 8 02:30:41 2007 +0200 .gitignore: import well, this is not a complete list, but at least git status now shows 225 untracked files, not 7915 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6a091b0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +Changelog +*.tar.gz +*.tar.bz2 +*.log.bz2 +*.zip +*.exe +*.tgz +*.html +*.asc +*.xpi +*.jar +*.run +*.rpm +*.deb +*.diff.gz +*.jpg From vmiklos at frugalware.org Sun Jul 8 02:31:30 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 02:31:31 2007 Subject: [Frugalware-git] frugalware-current: .gitignore: add *.sign and *.fpm Message-ID: <20070708003130.AD0BD16A8067@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ff7d64331b5ccbd2a5b444d8abe27e8586adddba commit ff7d64331b5ccbd2a5b444d8abe27e8586adddba Author: VMiklos Date: Sun Jul 8 02:31:12 2007 +0200 .gitignore: add *.sign and *.fpm diff --git a/.gitignore b/.gitignore index 6a091b0..f677804 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ Changelog *.deb *.diff.gz *.jpg +*.sign +*.fpm From voroskoi at frugalware.org Sun Jul 8 08:54:10 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 8 08:54:12 2007 Subject: [Frugalware-git] frugalware-current: ardour-2.0.3-1-i686 Message-ID: <20070708065410.846B816A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5915bcebc9f8fcf6cd1e8fef65b76f0c73a883c4 commit 5915bcebc9f8fcf6cd1e8fef65b76f0c73a883c4 Author: voroskoi Date: Sun Jul 8 08:52:40 2007 +0200 ardour-2.0.3-1-i686 version bump updated depends() diff --git a/source/xmultimedia-extra/ardour/FrugalBuild b/source/xmultimedia-extra/ardour/FrugalBuild index 7c81309..a1397b3 100644 --- a/source/xmultimedia-extra/ardour/FrugalBuild +++ b/source/xmultimedia-extra/ardour/FrugalBuild @@ -3,18 +3,18 @@ # Contributor: Tuxbubling pkgname=ardour -pkgver=2.0.2 -pkgrel=4 +pkgver=2.0.3 +pkgrel=1 pkgdesc="Ardour is a digital audio workstation." url="http://ardour.org/" -depends=('libstdc++' 'libgcc' 'flac' 'jack' 'liblrdf' 'libsamplerate' 'liblo' 'gtk+2' 'libgnomecanvas' 'libusb') +depends=('jack' 'liblrdf' 'libsamplerate' 'liblo' 'libusb' 'gtk+2' 'libgnomecanvas') makedepends=('scons' 'boost>=1.34.0-4') groups=('xmultimedia-extra') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump http://ardour.org/source_downloads|grep -om1 'ardour-\(.*\).tar.bz2'|Flasttarbz2" source=(http://ardour.org/files/releases/$pkgname-$pkgver.tar.bz2 libsndfile.patch) -sha1sums=('201b8925872e06651dc9c531c625e422cf39d26f'\ +sha1sums=('78d70ec5211697dc014577b9e58c7599f27a8426' \ '29a6030afada866a3ec78d74afd28e1dda20ce53') build() From crazy at frugalware.org Sun Jul 8 11:13:26 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 11:13:28 2007 Subject: [Frugalware-git] frugalware-current: expat-2.0.1-1-i686 Message-ID: <20070708091326.2E56716A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=41ef0a2b5891fd76c84536f9c10cf0f345884132 commit 41ef0a2b5891fd76c84536f9c10cf0f345884132 Author: crazy Date: Sun Jul 8 11:13:16 2007 +0200 expat-2.0.1-1-i686 * forgot to remove this slin hacks on bump diff --git a/source/lib/expat/expat.install b/source/lib/expat/expat.install deleted file mode 100644 index a3c93f4..0000000 --- a/source/lib/expat/expat.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() -{ - ln -sf /usr/lib/libexpat.so.1.5.0 /usr/lib/libexpat.so.0 -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - rm -f /usr/lib/libexpat.so.0 -} - -op=$1 -shift - -$op $* - -# vim: ft=sh From crazy at frugalware.org Sun Jul 8 11:40:25 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 11:40:28 2007 Subject: [Frugalware-git] frugalware-current: unicap-0.2.11-1-i686 Message-ID: <20070708094025.6654C16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e7f440d8137cd05ccf89431c6c738754d70c8b11 commit e7f440d8137cd05ccf89431c6c738754d70c8b11 Author: crazy Date: Sun Jul 8 11:40:15 2007 +0200 unicap-0.2.11-1-i686 * Version bump diff --git a/source/xlib-extra/unicap/FrugalBuild b/source/xlib-extra/unicap/FrugalBuild index c7bc2f5..74cf5cb 100644 --- a/source/xlib-extra/unicap/FrugalBuild +++ b/source/xlib-extra/unicap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=unicap -pkgver=0.2.9 +pkgver=0.2.11 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=('7337d02d94c4a1dc05174ead8d61c03cccf7c194') +sha1sums=('9456b58b6f5236926ae3b1c5c486dc7598a568bc') # optimization OK From crazy at frugalware.org Sun Jul 8 11:53:20 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 11:53:22 2007 Subject: [Frugalware-git] frugalware-current: gnupg2-2.0.5-1-i686 Message-ID: <20070708095320.BB96916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a13916c88368c2a3401857d4f38b3f355198a2c3 commit a13916c88368c2a3401857d4f38b3f355198a2c3 Author: crazy Date: Sun Jul 8 11:53:11 2007 +0200 gnupg2-2.0.5-1-i686 * Version bump diff --git a/source/apps/gnupg2/FrugalBuild b/source/apps/gnupg2/FrugalBuild index 1403d41..a483935 100644 --- a/source/apps/gnupg2/FrugalBuild +++ b/source/apps/gnupg2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnupg2 origname=gnupg -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc="GnuPG2 is the new modularized version of GnuPG supporting OpenPGP and S/MIME" url="http://www.gnupg.org/" @@ -24,6 +24,7 @@ subarchs=('i686 x86_64') build() { + unset MAKEFLAGS Fcd $origname-$pkgver Fbuild \ --enable-symcryptrun \ @@ -40,5 +41,5 @@ build() -sha1sums=('cc230636bb4226f6d7ac2db9b259d8e7f5529f84') +sha1sums=('9435e7fabe525ce943a5818008d412ecad244018') # optimization OK From crazy at frugalware.org Sun Jul 8 12:03:10 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 12:03:13 2007 Subject: [Frugalware-git] frugalware-current: qjackctl-0.2.23-1-i686 Message-ID: <20070708100311.102FA16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=80b7a8b68ce9b0b09af188ffb2162fcd14e1b4a2 commit 80b7a8b68ce9b0b09af188ffb2162fcd14e1b4a2 Author: crazy Date: Sun Jul 8 12:03:00 2007 +0200 qjackctl-0.2.23-1-i686 * Version bump diff --git a/source/xapps-extra/qjackctl/FrugalBuild b/source/xapps-extra/qjackctl/FrugalBuild index 130cd6a..4f30848 100644 --- a/source/xapps-extra/qjackctl/FrugalBuild +++ b/source/xapps-extra/qjackctl/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Christopher Albert pkgname=qjackctl -pkgver=0.2.22 +pkgver=0.2.23 pkgrel=1 pkgdesc="a simple Qt application to control the JACK sound server daemon" depends=('libxi' 'libgl' 'libstdc++' 'libdrm' 'libxxf86vm' 'jack' 'qt' 'libxmu') @@ -11,6 +11,6 @@ groups=('xapps-extra') archs=('x86_64' 'i686') options=('scriptlet') Finclude sourceforge -sha1sums=('d3ac6d3a3bd59ad99f9ef34588abc260608c67d5') +sha1sums=('e44b7487ab1e436e4c1bdf909e8e96d338c059c3') # optimization OK From voroskoi at frugalware.org Sun Jul 8 12:09:51 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 8 12:09:54 2007 Subject: [Frugalware-git] frugalware-current: texmaker-1.6-1-i686 Message-ID: <20070708100951.E5B8D16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9601880eea47069ab575d2d398ec662c7272235f commit 9601880eea47069ab575d2d398ec662c7272235f Author: voroskoi Date: Sun Jul 8 12:06:04 2007 +0200 texmaker-1.6-1-i686 version bump diff --git a/source/xapps-extra/texmaker/FrugalBuild b/source/xapps-extra/texmaker/FrugalBuild index 4ada368..2afe3e9 100644 --- a/source/xapps-extra/texmaker/FrugalBuild +++ b/source/xapps-extra/texmaker/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: voroskoi pkgname=texmaker -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="Texmaker is a free LaTeX editor." url="http://www.xm1math.net/texmaker/" -depends=('qt4>=4.2.2') +depends=('qt4>=4.3.0') rodepends=('xespgs') groups=('xapps-extra') archs=('i686') @@ -16,10 +16,10 @@ source=(http://www.xm1math.net/texmaker/texmaker-$pkgver.tar.bz2) build() { Fcd qmake -unix PREFIX=$Fprefix texmaker.pro + Fsed '-Os' '-O2' Makefile Fmake Fmakeinstall INSTALL_ROOT=$Fdestdir } - -sha1sums=('5b660823807bfb24e4384d912d68c1120434c033') +sha1sums=('8da3a6370214f97b568126439408a7774b017c1d') # optimization OK From crazy at frugalware.org Sun Jul 8 12:39:31 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 12:39:34 2007 Subject: [Frugalware-git] frugalware-current: taskjuggler-2.4.0-1-i686 Message-ID: <20070708103931.928AD16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=46e406fe99e1bb568246d4a97b8c24aecfcb32e1 commit 46e406fe99e1bb568246d4a97b8c24aecfcb32e1 Author: crazy Date: Sun Jul 8 12:38:39 2007 +0200 taskjuggler-2.4.0-1-i686 * Version bump diff --git a/source/kde-extra/taskjuggler/FrugalBuild b/source/kde-extra/taskjuggler/FrugalBuild index a7d9188..dfdae0e 100644 --- a/source/kde-extra/taskjuggler/FrugalBuild +++ b/source/kde-extra/taskjuggler/FrugalBuild @@ -3,10 +3,10 @@ # Contributor: Edo Hikmahtiar pkgname=taskjuggler -pkgver=2.3.1 +pkgver=2.4.0 pkgrel=1 pkgdesc="TaskJuggler is a modern and powerful project management tool." -depends=('kdepim>=3.5.6') +depends=('kdepim>=3.5.7') groups=('kde-extra') archs=('i686' 'x86_64') Finclude kde @@ -22,6 +22,6 @@ else export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated" fi -sha1sums=('fce20fcfae51e6cf2100d2fe82554d82d89fc823') +sha1sums=('e20e64d083d03979e58384fab568366b755032b5') # optimization OK From crazy at frugalware.org Sun Jul 8 12:46:29 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 12:46:31 2007 Subject: [Frugalware-git] frugalware-current: apr-1.2.9-1-i686 Message-ID: <20070708104629.1D65416A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7e68f9e33751f32f209ace194100b8c7fb41f049 commit 7e68f9e33751f32f209ace194100b8c7fb41f049 Author: crazy Date: Sun Jul 8 12:46:19 2007 +0200 apr-1.2.9-1-i686 * Version bump diff --git a/source/network/apr/FrugalBuild b/source/network/apr/FrugalBuild index 384d3bb..231642f 100644 --- a/source/network/apr/FrugalBuild +++ b/source/network/apr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=apr -pkgver=1.2.8 +pkgver=1.2.9 pkgrel=1 pkgdesc="Apache Portable Runtime" url="http://apr.apache.org/" @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/download.cgi|grep tar.gz$ |sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://apache.mirror.iphh.net/$pkgname/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --with-gnu-ld --with-threads --enable-layout=RedHat" -sha1sums=('b8c89bab084d1bae1cb15d7b9d5f40d03dfe2c4a') +sha1sums=('289657da57a6e7392c665dc9b44ada491724b537') # optimization OK From crazy at frugalware.org Sun Jul 8 12:54:39 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 12:54:41 2007 Subject: [Frugalware-git] frugalware-current: apr-util-1.2.8-2-i686 Message-ID: <20070708105439.28B1016A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=633f8141c4e443209aac18daf127d428d37c6a28 commit 633f8141c4e443209aac18daf127d428d37c6a28 Author: crazy Date: Sun Jul 8 12:54:29 2007 +0200 apr-util-1.2.8-2-i686 * rebuild with apr * up2date fix diff --git a/source/network/apr-util/FrugalBuild b/source/network/apr-util/FrugalBuild index cac2bc8..487a858 100644 --- a/source/network/apr-util/FrugalBuild +++ b/source/network/apr-util/FrugalBuild @@ -3,13 +3,13 @@ pkgname=apr-util pkgver=1.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="Apache Portable Runtime" url="http://apr.apache.org/" -depends=('apr=1.2.8' 'db>=4.5.20' 'gdbm' 'expat') +depends=('apr=1.2.9' 'db>=4.5.20' 'gdbm' 'expat') groups=('network') archs=('i686' 'x86_64') -up2date="lynx -dump $url/download.cgi|grep tar.gz$ |sed 's/.*-\(.*\)\.t.*/\1/;q'" +up2date="lynx -dump http://apache.mirror.iphh.net/apr/|grep 'apr-util-\(.*\).tar.bz2$'|Flasttarbz2" source=(http://apache.mirror.iphh.net/apr/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --with-apr=/usr \ --with-gdbm \ @@ -20,4 +20,3 @@ Fconfopts="$Fconfopts --with-apr=/usr \ sha1sums=('cef58fe4c282e7b449cd49d568914c8f4ee7cdc9') # optimization OK - From vmiklos at frugalware.org Sun Jul 8 12:56:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 12:56:20 2007 Subject: [Frugalware-git] frugalware-current: mpd-0.13.0-1-i686 Message-ID: <20070708105600.CF2DD16A807D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7f4a8eb04b4db579287987fed8a4a8ad1a1d72a5 commit 7f4a8eb04b4db579287987fed8a4a8ad1a1d72a5 Author: VMiklos Date: Sun Jul 8 12:55:16 2007 +0200 mpd-0.13.0-1-i686 added libshout to depends() no release bump yet diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index 530b377..b0ed186 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="the Music Player Daemon" url="http://musicpd.org" depends=('libmikmod>=3.1.7' 'flac>=1.1.3' 'libao' 'audiofile>=0.1.7' 'libvorbis' \ - 'faad2' 'libid3tag' 'libmad') + 'faad2' 'libid3tag' 'libmad' 'libshout') backup=('etc/mpd.conf') groups=('multimedia') archs=('i686' 'x86_64') From crazy at frugalware.org Sun Jul 8 13:02:17 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 13:02:19 2007 Subject: [Frugalware-git] frugalware-current: apache-2.2.4-3-i686 Message-ID: <20070708110217.5348416A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3761c5236f3fa0a6a8b014e3a2a9cfa293dac95c commit 3761c5236f3fa0a6a8b014e3a2a9cfa293dac95c Author: crazy Date: Sun Jul 8 13:02:08 2007 +0200 apache-2.2.4-3-i686 * rebuild with apr* diff --git a/source/network/apache/FrugalBuild b/source/network/apache/FrugalBuild index 79bf25a..603e684 100644 --- a/source/network/apache/FrugalBuild +++ b/source/network/apache/FrugalBuild @@ -4,12 +4,12 @@ pkgname=apache pkgver=2.2.4 -pkgrel=2 +pkgrel=3 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') +depends=('gdbm' 'db>=4.5.20' 'openssl' 'expat' 'apr-util>=1.2.8-2') 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 voroskoi at frugalware.org Sun Jul 8 13:16:34 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 8 13:16:37 2007 Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.5_0-1-i686 Message-ID: <20070708111634.AA7A216A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c74422917a11621a18a63421e4a36da5174ee38c commit c74422917a11621a18a63421e4a36da5174ee38c Author: voroskoi Date: Sun Jul 8 13:08:50 2007 +0200 imagemagick-6.3.5_0-1-i686 version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index b9d78fa..ba0ebca 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=imagemagick -pkgver=6.3.4_9 +pkgver=6.3.5_0 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files" url="http://www.imagemagick.org" @@ -29,7 +29,7 @@ build() { Frm /usr/lib/perl5/?.?.?/ Frm /usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi/auto/Image/Magick/.packlist } -sha1sums=('5869d2ee1d63b849b899637c7a39320d96022ab4'\ +sha1sums=('69ee277635fc7caf5506d92c8ca7986e0f5a5573' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') # optimization OK From crazy at frugalware.org Sun Jul 8 13:34:03 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 13:34:06 2007 Subject: [Frugalware-git] frugalware-current: subversion-1.4.4-2-i686 Message-ID: <20070708113403.ABAC616A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5412b3ad466d49fe7f1b40fe0306aaf64d0c8b2a commit 5412b3ad466d49fe7f1b40fe0306aaf64d0c8b2a Author: crazy Date: Sun Jul 8 13:21:56 2007 +0200 subversion-1.4.4-2-i686 * rebuild with apr* , apache diff --git a/source/devel-extra/subversion/FrugalBuild b/source/devel-extra/subversion/FrugalBuild index 02ab901..afed06c 100644 --- a/source/devel-extra/subversion/FrugalBuild +++ b/source/devel-extra/subversion/FrugalBuild @@ -3,11 +3,11 @@ pkgname=subversion pkgver=1.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="A version control system that is a compelling replacement for CVS." url="http://subversion.tigris.org/" -depends=('neon>=0.26.1' 'apr-util>=1.2.8' 'apr>=1.2.8') -makedepends=('apache>=2.2.3-2' 'swig' 'ruby') +depends=('neon>=0.26.1' 'apr-util>=1.2.8-2' 'apr>=1.2.9') +makedepends=('apache>=2.2.4-3' 'swig' 'ruby') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://subversion.tigris.org/project_packages.html|grep -m1 'The best available'|sed 's/.*]//'|tr -d [:blank:]" @@ -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 $pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver perl python ruby swig") +subdepends=("apache>=2.2.4-3 $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 crazy at frugalware.org Sun Jul 8 13:47:31 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 13:47:34 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-farsight-0.12.2-1-i686 Message-ID: <20070708114732.215D516A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e5c3215ffc443f17efc696ec222d3a37b06ccc1f commit e5c3215ffc443f17efc696ec222d3a37b06ccc1f Author: crazy Date: Sun Jul 8 13:47:21 2007 +0200 gst-plugins-farsight-0.12.2-1-i686 * Version bump diff --git a/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild b/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild index fcdca2b..fc44b4e 100644 --- a/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild +++ b/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=gst-plugins-farsight -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=1 pkgdesc="GStreamer plugin for Farsight" url="http://farsight.freedesktop.org/" @@ -11,7 +11,7 @@ groups=('xmultimedia-extra') archs=('i686') up2date="lynx -dump http://farsight.freedesktop.org/releases/$pkgname | Flasttar" source=(http://farsight.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('af0db65c77cc674fa6c49e499afdf9072ec63708') +sha1sums=('0315ce90f0b5e9a5389a257ad858d0cbd3ca9be1') build() { export PKG_CONFIG_PATH=/usr/lib/jingle-tapioca/lib/pkgconfig:$PKG_CONFIG_PATH From vmiklos at frugalware.org Sun Jul 8 13:51:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 13:51:39 2007 Subject: [Frugalware-git] pacman-tools: dg: fix for revert() Message-ID: <20070708115136.222EA16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=633932e722c2636585bd23188cb4421c91fdc67a commit 633932e722c2636585bd23188cb4421c91fdc67a Author: VMiklos Date: Sun Jul 8 13:51:29 2007 +0200 dg: fix for revert() diff --git a/darcs-git.py b/darcs-git.py index 791e569..a1beb7a 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -389,6 +389,7 @@ Options: else: print "Ok, if you don't want to revert anything, that's fine!" sys.exit(0) + os.chdir(os.path.split(get_root())[0]) for i in status.hunks: p = [] if i.picked == True: From crazy at frugalware.org Sun Jul 8 13:51:37 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 13:51:41 2007 Subject: [Frugalware-git] frugalware-current: farsight-0.1.21-1-i686 Message-ID: <20070708115137.6964916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ae69fc012ba35ced47bda6226c14ea4fbd293cc1 commit ae69fc012ba35ced47bda6226c14ea4fbd293cc1 Author: crazy Date: Sun Jul 8 13:51:29 2007 +0200 farsight-0.1.21-1-i686 * Version bump diff --git a/source/xlib-extra/farsight/FrugalBuild b/source/xlib-extra/farsight/FrugalBuild index cfb1987..3ce0441 100644 --- a/source/xlib-extra/farsight/FrugalBuild +++ b/source/xlib-extra/farsight/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: AlexExtreme pkgname=farsight -pkgver=0.1.19 +pkgver=0.1.21 pkgrel=1 pkgdesc="Farsight is an audio/video conferencing framework" url="http://farsight.freedesktop.org/" -depends=('dbus-glib>=0.71-2' 'gst-plugins-farsight' 'glib2' 'clinkc' 'sofia-sip') +depends=('dbus-glib>=0.74' 'gst-plugins-farsight>=0.12.2' 'glib2' 'clinkc' 'sofia-sip') groups=('xlib-extra') archs=('i686') up2date="lynx -dump http://farsight.freedesktop.org/releases/$pkgname | Flasttar" source=(http://farsight.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('cde1b005aaf10b71705141a1c74a0dc80978eebb') +sha1sums=('e37abac511cf9741247444bacf6b7f7676703834') build() { export PKG_CONFIG_PATH=/usr/lib/jingle-tapioca/lib/pkgconfig:$PKG_CONFIG_PATH From crazy at frugalware.org Sun Jul 8 13:52:54 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 13:52:56 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-sax-0.16-1-i686 Message-ID: <20070708115254.5906616A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=eea1712b3bd82f7ea76db228cc1d004ba0f054d8 commit eea1712b3bd82f7ea76db228cc1d004ba0f054d8 Author: crazy Date: Sun Jul 8 13:52:43 2007 +0200 perl-xml-sax-0.16-1-i686 * Version bump diff --git a/source/devel/perl-xml-sax/FrugalBuild b/source/devel/perl-xml-sax/FrugalBuild index 034bb0f..7d5a04f 100644 --- a/source/devel/perl-xml-sax/FrugalBuild +++ b/source/devel/perl-xml-sax/FrugalBuild @@ -3,13 +3,13 @@ _F_perl_name=XML-SAX _F_perl_author=G/GR/GRANTM -pkgver=0.15 +pkgver=0.16 pkgdesc="Simple API for XML" depends=('perl-xml-namespacesupport>=0.03') Finclude perl groups=('devel') archs=('x86_64' 'i686') -sha1sums=('afd1c30a7f577d6e69f831c4f0e49df68c96eccd') +sha1sums=('95ba0db1564547103c14ae4e2391d03883eb8dda') unset MAKEFLAGS build() { From vmiklos at frugalware.org Sun Jul 8 13:53:25 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 13:53:50 2007 Subject: [Frugalware-git] frugalware-current: asciidoc-8.2.1-4-i686 Message-ID: <20070708115326.8885516A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=520951a31439c76db5723059b6bd3fd071bc9515 commit 520951a31439c76db5723059b6bd3fd071bc9515 Author: VMiklos Date: Sun Jul 8 13:48:07 2007 +0200 asciidoc-8.2.1-4-i686 docbook.conf: default to offline build (use dtds from /usr/share instead of open-oasis.org) diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index 9e0deae..a96a6f0 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -3,12 +3,12 @@ pkgname=asciidoc pkgver=8.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" depends=() rodepends=('python>=2.3' 'libxslt') -makedepends=('imagemagick' 'libpng' 'libjpeg') +makedepends=('imagemagick' 'libpng' 'libjpeg' 'fontconfig') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" @@ -20,6 +20,7 @@ build() { Fsed 'MANDIR=/usr/local/man' "MANDIR=$Fdestdir/$Fprefix/man" install.sh Fsed 'CONFDIR=/etc/asciidoc' "CONFDIR=$Fdestdir/$Fsysconfdir/asciidoc" install.sh Fsed 'VIM_CONFDIR=/etc/vim' "VIM_CONFDIR=$Fdestdir/$Fprefix/share/vim" install.sh + Fsed 'http://www.oasis-open.org/docbook/xml/' 'file:///usr/share/sgml/docbook/dtd/xml-dtd-' docbook.conf sh install.sh # provive the images in jpg format, too. this is necessary as fop can't # use png images without license problems for pdfs From crazy at frugalware.org Sun Jul 8 13:54:09 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 13:54:11 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-writer-0.603-1-i686 Message-ID: <20070708115409.CD05916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5de05cfab59f3151cec74bc5c838967b8d845715 commit 5de05cfab59f3151cec74bc5c838967b8d845715 Author: crazy Date: Sun Jul 8 13:54:01 2007 +0200 perl-xml-writer-0.603-1-i686 * Version bump diff --git a/source/devel-extra/perl-xml-writer/FrugalBuild b/source/devel-extra/perl-xml-writer/FrugalBuild index 0a099f3..89b7474 100644 --- a/source/devel-extra/perl-xml-writer/FrugalBuild +++ b/source/devel-extra/perl-xml-writer/FrugalBuild @@ -3,8 +3,8 @@ _F_perl_name=XML-Writer _F_perl_author=J/JO/JOSEPHW -pkgver=0.602 +pkgver=0.603 pkgdesc="Perl extension for writing XML documents." Finclude perl -sha1sums=('920cab8f1c40f97c2a1563af2ddb26906c779a33') +sha1sums=('19d08cfa04a033bb0a1a6fbc551e7cfe131e1572') archs=(${archs[@]} 'x86_64') From crazy at frugalware.org Sun Jul 8 14:26:03 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 14:26:06 2007 Subject: [Frugalware-git] frugalware-current: meld-1.1.5.1-1-i686 Message-ID: <20070708122603.5040A16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f085d7494b9f0e7bf16653bb9c51fca96459a60c commit f085d7494b9f0e7bf16653bb9c51fca96459a60c Author: crazy Date: Sun Jul 8 14:25:47 2007 +0200 meld-1.1.5.1-1-i686 * Version bump diff --git a/source/gnome-extra/meld/FrugalBuild b/source/gnome-extra/meld/FrugalBuild index b28ba42..0ced487 100644 --- a/source/gnome-extra/meld/FrugalBuild +++ b/source/gnome-extra/meld/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=meld -pkgver=1.1.4 +pkgver=1.1.5.1 pkgrel=1 pkgdesc="a visual diff and merge tool" url="http://meld.sourceforge.net/" @@ -12,15 +12,12 @@ _F_gnome_desktop="y" _F_gnome_devel="y" _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet -source=(${source[@]} meld-ja-po-fix.patch \ - http://ftp.frugalware.org/pub/other/sources/$pkgname/meld-scrollkeeper-strip.patch \ - http://ftp.frugalware.org/pub/other/sources/$pkgname/meld-cvs-fixes.patch) +source=(${source[@]} \ + http://ftp.frugalware.org/pub/other/sources/$pkgname/meld-scrollkeeper-strip.patch) groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('52f51e5825b4e2bb56594a9f4e180908e714848f' \ - 'acc1e8bf0ed0b1d6db6e805d74c5576e226f0b56' \ - '3e22a6e2fc0fda1be9124bb93a436ed68b961599' \ - '1e4ab8b7bac602410c8082db963523d978534d82') +sha1sums=('047bc68184ed18d490bc41658c7d2d3d8950696a' \ + '3e22a6e2fc0fda1be9124bb93a436ed68b961599') build() { Fcd diff --git a/source/gnome-extra/meld/meld-ja-po-fix.patch b/source/gnome-extra/meld/meld-ja-po-fix.patch deleted file mode 100644 index 868d486..0000000 --- a/source/gnome-extra/meld/meld-ja-po-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur meld-1.1.4.orig/po/ja.po meld-1.1.4/po/ja.po ---- meld-1.1.4.orig/po/ja.po 2006-08-30 16:22:15.000000000 +0200 -+++ meld-1.1.4/po/ja.po 2006-08-30 16:22:23.000000000 +0200 -@@ -14,7 +14,7 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Generated-By: pygettext.py 1.5\n" --"Plural-Forms: nplurals=1; plural=0;\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #: ../dirdiff.py:252 ../dirdiff.py:267 - #, python-format From crazy at frugalware.org Sun Jul 8 14:28:50 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 14:28:52 2007 Subject: [Frugalware-git] frugalware-current: libfwbuilder-2.1.11-1-i686 Message-ID: <20070708122850.D41D216A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0e01e6f5eccc83610aa2bf35d2289c190ee08b58 commit 0e01e6f5eccc83610aa2bf35d2289c190ee08b58 Author: crazy Date: Sun Jul 8 14:26:57 2007 +0200 libfwbuilder-2.1.11-1-i686 * added missing return diff --git a/source/xlib-extra/libfwbuilder/FrugalBuild b/source/xlib-extra/libfwbuilder/FrugalBuild index 274b904..b31df2b 100644 --- a/source/xlib-extra/libfwbuilder/FrugalBuild +++ b/source/xlib-extra/libfwbuilder/FrugalBuild @@ -16,7 +16,7 @@ sha1sums=('e397d2ac572a3ed97ec59cb960fb5e65fa7c2620') build() { Fmake - make INSTALL_ROOT=$Fdestdir install + make INSTALL_ROOT=$Fdestdir install || return 1 } # optimization OK From crazy at frugalware.org Sun Jul 8 14:28:50 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 14:28:54 2007 Subject: [Frugalware-git] frugalware-current: fwbuilder-2.1.11-1-i686 Message-ID: <20070708122850.EE7EC16A8079@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fc5a7c6a24cccc7b781baf459e4e6c0ef919e675 commit fc5a7c6a24cccc7b781baf459e4e6c0ef919e675 Author: crazy Date: Sun Jul 8 14:27:54 2007 +0200 fwbuilder-2.1.11-1-i686 * added missing return diff --git a/source/xapps-extra/fwbuilder/FrugalBuild b/source/xapps-extra/fwbuilder/FrugalBuild index 6abec46..060f675 100644 --- a/source/xapps-extra/fwbuilder/FrugalBuild +++ b/source/xapps-extra/fwbuilder/FrugalBuild @@ -16,7 +16,7 @@ sha1sums=('871d2704b289b0d940ad5b7981ffe8364617ad45') build() { Fmake - make INSTALL_ROOT=$Fdestdir install + make INSTALL_ROOT=$Fdestdir install || return 1 } # optimization OK From vmiklos at frugalware.org Sun Jul 8 14:30:49 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 14:30:51 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.3-2-i686 Message-ID: <20070708123049.9F05916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b5da6a323318adfcb0c6d8a3eba921c4cb0b558b commit b5da6a323318adfcb0c6d8a3eba921c4cb0b558b Author: VMiklos Date: Sun Jul 8 14:30:23 2007 +0200 git-1.5.2.3-2-i686 makedepends() fix drop no longer needed offline_doc.diff workaround, newer asciidoc has a solution for this problem diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 8e53543..be88047 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -7,13 +7,13 @@ 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') +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'" source=($url/$pkgname-$pkgver.tar.bz2 \ -offline_doc.diff gitweb.modules.d gitweb.conf README.Frugalware) -signatures=(${source[0]}.sign '' '' '' '') +gitweb.modules.d gitweb.conf README.Frugalware) +signatures=(${source[0]}.sign '' '' '') options=('scriptlet') subpkgs=('gitweb' 'gitk') diff --git a/source/devel-extra/git/offline_doc.diff b/source/devel-extra/git/offline_doc.diff deleted file mode 100644 index 1ef191e..0000000 --- a/source/devel-extra/git/offline_doc.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur git-1.5.2.3.orig/Documentation/Makefile git-1.5.2.3/Documentation/Makefile ---- git-1.5.2.3.orig/Documentation/Makefile 2007-07-02 10:11:39.000000000 +0200 -+++ git-1.5.2.3/Documentation/Makefile 2007-07-07 14:49:41.000000000 +0200 -@@ -118,13 +118,17 @@ - $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< - mv $@+ $@ - -+DTDDIR=/usr/share/sgml/docbook/dtd/xml-dtd-4.2 -+ - %.1 %.5 %.7 : %.xml -- xmlto -m callouts.xsl man $< -+ xsltproc --nonet --path $(DTDDIR) /etc/asciidoc/docbook-xsl/manpage.xsl $< -+ sed -i 's/\\(bu/*/' $@ - - %.xml : %.txt - rm -f $@+ $@ - $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \ - $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< -+ sed -i '/ Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d2b048e8c60a0790e47254b98345e80f77aa8da3 commit d2b048e8c60a0790e47254b98345e80f77aa8da3 Author: VMiklos Date: Sun Jul 8 14:42:57 2007 +0200 os-prober-1.19-1-i686 version bump small cleanup diff --git a/source/base/os-prober/FrugalBuild b/source/base/os-prober/FrugalBuild index f6ec2f1..174b27f 100644 --- a/source/base/os-prober/FrugalBuild +++ b/source/base/os-prober/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=os-prober -pkgver=1.18 +pkgver=1.19 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=('c38e4fe62712a086bf43274491af7b9934b5136e' \ +sha1sums=('cf36f3d0302404f83d80a58fca800d64db640e53' \ 'f32a69a86bf8c03478a14f74d69d46d05e909615') options=('force') @@ -31,7 +31,7 @@ build() for i in os-probes os-probes/mounted os-probes/init \ linux-boot-probes linux-boot-probes/mounted do - Fmkdir /usr/lib/$i/ #? + Fmkdir /usr/lib/$i/ Fexerel $i/common/* /usr/lib/$i/ [ -e "$i/$_arch" -a "`ls $i/$_arch 2>&1`" ] && Fexerel $i/$_arch/* /usr/lib/$i done From crazy at frugalware.org Sun Jul 8 15:51:04 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 15:51:07 2007 Subject: [Frugalware-git] frugalware-current: monodevelop-0.14-1-i686 Message-ID: <20070708135104.9839916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=89889245aab596f294e916cb13aa9b89cde2a174 commit 89889245aab596f294e916cb13aa9b89cde2a174 Author: crazy Date: Sun Jul 8 15:49:46 2007 +0200 monodevelop-0.14-1-i686 * Version bump * up2date fix diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index 9fd096c..b23e86e 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -2,32 +2,31 @@ # Maintainer: AlexExtreme pkgname=monodevelop -pkgver=0.13.1 -pkgrel=3 +pkgver=0.14 +pkgrel=1 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.4' 'ikvm' 'boo' 'gnome-sharp') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://www.go-mono.com/sources-stable/'|grep monodevelop-[0-9\.]*.tar.gz | sed -n 's/.*-\(.*\).t.*/\1/;1 p'" -source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump 'http://www.go-mono.com/sources-stable/'|grep 'monodevelop-\(.*\).tar.bz2' |Flasttarbz2" +source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 \ boo_mimetype.patch \ - firefox.patch \ autogen.sh \ update_templates_for_gtk_sharp_2.8.x.patch) options=('scriptlet' 'force') _F_gnome_desktop=y _F_gnome_mime=y Finclude gnome-scriptlet mono -sha1sums=('d0d0d004504c06ab7323bf979701b101f54eb913' \ - '719b456cee8e5e2b4cf3778915464c191f246d98' \ - '12370d93a8ceb646d971605999796330a45bf36e' \ - '7e138cb136265162cdaf86520c4781b6ff2b9192' \ - 'db0fe450ef76f83853179bd0fd557f408175c3ee') +sha1sums=('b29762372464ec30301b485deade397919095ea6' \ + '719b456cee8e5e2b4cf3778915464c191f246d98' \ + '7e138cb136265162cdaf86520c4781b6ff2b9192' \ + 'db0fe450ef76f83853179bd0fd557f408175c3ee') Fconfopts="$Fconfopts --enable-java --enable-boo --enable-nunit --enable-versioncontrol" build() { + Fmonoexport Fcd Fpatchall diff --git a/source/gnome-extra/monodevelop/firefox.patch b/source/gnome-extra/monodevelop/firefox.patch deleted file mode 100644 index dd1a763..0000000 --- a/source/gnome-extra/monodevelop/firefox.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN monodevelop-0.13.1.orig/configure.in monodevelop-0.13.1/configure.in ---- monodevelop-0.13.1.orig/configure.in 2007-03-15 20:08:54.000000000 +0000 -+++ monodevelop-0.13.1/configure.in 2007-03-15 20:11:45.000000000 +0000 -@@ -252,6 +252,8 @@ - if !(test -n "$MOZILLA_HOME"); then - if test -n "$MOZILLA_FIVE_HOME"; then - MOZILLA_HOME=$MOZILLA_FIVE_HOME -+ elif [ -e /usr/lib/firefox ]; then -+ MOZILLA_HOME=/usr/lib/firefox - elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then - MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) - elif [ $(which mozilla 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then -diff -urN monodevelop-0.13.1.orig/monodevelop monodevelop-0.13.1/monodevelop ---- monodevelop-0.13.1.orig/monodevelop 2007-03-15 20:08:54.000000000 +0000 -+++ monodevelop-0.13.1/monodevelop 2007-03-15 20:11:26.000000000 +0000 -@@ -19,6 +19,8 @@ - #(NOTE: any changes to this block should be kept in sync with the one in configure.in) - if test -n "$MOZILLA_FIVE_HOME"; then - MOZILLA_HOME=$MOZILLA_FIVE_HOME -+elif [ -e /usr/lib/firefox ]; then -+ MOZILLA_HOME=/usr/lib/firefox - elif [ -f /opt/mozilla/lib/chrome/comm.jar ]; then - MOZILLA_HOME=/opt/mozilla/lib - elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then From crazy at frugalware.org Sun Jul 8 16:24:41 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 16:24:44 2007 Subject: [Frugalware-git] frugalware-current: libdaemon-0.11-1-i686 Message-ID: <20070708142441.C0D1216A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c82d8b1bf8ae125ccb53291cc16db2d7b171898a commit c82d8b1bf8ae125ccb53291cc16db2d7b171898a Author: crazy Date: Sun Jul 8 16:24:32 2007 +0200 libdaemon-0.11-1-i686 * Version bump diff --git a/source/lib/libdaemon/FrugalBuild b/source/lib/libdaemon/FrugalBuild index 6334df1..ec1d5a5 100644 --- a/source/lib/libdaemon/FrugalBuild +++ b/source/lib/libdaemon/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=libdaemon -pkgver=0.10 +pkgver=0.11 pkgrel=1 pkgdesc="libdaemon is a lightweight C library that eases the writing of UNIX daemons." url="http://0pointer.de/lennart/projects/libdaemon/" @@ -11,7 +11,7 @@ groups=('lib') archs=('i686' 'x86_64') up2date="lynx -dump http://0pointer.de/lennart/projects/libdaemon | grep 'libdaemon [0-9]' | sed 's/ //g' | sed 's/libdaemon//'" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('2606710f5b130078c313cbdb86765cf2da20c334') +sha1sums=('b20c048f6d36f6f72e320e2660d80df7c21ff48e') build() { Fbuild --disable-doxygen --disable-lynx diff --git a/source/network/avahi/avahi-0.6.19-fix-zssh-build.patch b/source/network/avahi/avahi-0.6.19-fix-zssh-build.patch deleted file mode 100644 index 1486797..0000000 --- a/source/network/avahi/avahi-0.6.19-fix-zssh-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN avahi-0.6.19.orig/avahi-ui-sharp/Makefile.am avahi-0.6.19/avahi-ui-sharp/Makefile.am ---- avahi-0.6.19.orig/avahi-ui-sharp/Makefile.am 2007-05-12 08:31:27.000000000 +0100 -+++ avahi-0.6.19/avahi-ui-sharp/Makefile.am 2007-05-12 08:32:38.000000000 +0100 -@@ -40,7 +40,7 @@ - $(srcdir)/gencfg.sh $(top_builddir)/avahi-common/libavahi-common.la < $< > $@ - - zssh.exe: $(srcdir)/zssh.cs -- mcs -out:$@ $^ -r:./avahi-ui-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix -+ mcs -out:$@ $^ -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix - - if HAVE_MONO - if HAVE_DBUS From crazy at frugalware.org Sun Jul 8 16:37:13 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 16:37:15 2007 Subject: [Frugalware-git] frugalware-current: avahi-0.6.20-1-i686 Message-ID: <20070708143713.0FD0916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1d76fbd9e40fb2da9d743d9ef71e0121db48ffb4 commit 1d76fbd9e40fb2da9d743d9ef71e0121db48ffb4 Author: crazy Date: Sun Jul 8 16:35:03 2007 +0200 avahi-0.6.20-1-i686 * Version bump * closes #2209 in -current diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index 52b35fe..cf525a9 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: AlexExtreme pkgname=avahi -pkgver=0.6.19 -pkgrel=2 +pkgver=0.6.20 +pkgrel=1 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64') url="http://www.avahi.org" groups=('network') -depends=('dbus-python>=0.80.2' 'libcap' 'nss-mdns' 'gdbm' 'libdaemon' 'shadow>=4.0.18.1-4' 'libssp') +depends=('dbus-python>=0.80.2' 'libcap' 'nss-mdns' 'gdbm' 'libdaemon>=0.11' 'shadow>=4.0.18.1-4' 'libssp') makedepends=('mono' 'pygtk' 'qt' 'qt4' 'gtk2-sharp') backup=(etc/avahi/avahi-daemon.conf) conflicts=('mdnsresponder') @@ -17,16 +17,14 @@ provides=('mdnsresponder') up2date="lynx -dump http://avahi.org/download/ | Flasttar" options=('scriptlet') source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz \ - rc.avahi-daemon{,-hu.po} rc.avahi-dnsconfd{,-hu.po} README.Frugalware \ - $pkgname-$pkgver-fix-zssh-build.patch) + rc.avahi-daemon{,-hu.po} rc.avahi-dnsconfd{,-hu.po} README.Frugalware) Finclude mono -sha1sums=('367322064a5dd66a0e69c75df9407ab3518aebdc' \ +sha1sums=('451a095440fba9bec2effa0730bb4ec29593d1b1' \ 'f66dd6671c303d5e5ba137b023786af3336957f0' \ '5f6b99e4917458b24736519bdd1e510763310589' \ '723e2e691d35063bd8aefeaf1063fdba812a9249' \ 'b31a9b9bf972739d2976ef510690968851e8b588' \ - '3cb0c4904bc323cba78234e4c5430478636fbf44' \ - '8996872a1eca3f26934b1a4720f4b1d86b02ae81') + '3cb0c4904bc323cba78234e4c5430478636fbf44') subpkgs=('avahi-glib' 'avahi-sharp' 'avahi-qt3' 'avahi-python' 'avahi-compat' 'avahi-gtk2' 'avahi-qt4' 'avahi-dnsconfd' 'libavahi-ui' 'libavahi-ui-sharp') subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings for Avahi' \ @@ -44,6 +42,7 @@ unset MAKEFLAGS build() { Fmonoexport + Fcd Fpatchall Fautoreconf Fmake --enable-qt4 \ From priyank at frugalware.org Sun Jul 8 17:27:24 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 8 17:27:27 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: dont allow duplicate interfaces to be added. Message-ID: <20070708152724.7E4B116A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=ca29dce58d5d0fce80d61f2d9f3501d12e07bfb6 commit ca29dce58d5d0fce80d61f2d9f3501d12e07bfb6 Author: Priyank Date: Sun Jul 8 20:55:43 2007 +0530 gnetconfig: dont allow duplicate interfaces to be added. * don't allow user to add the same interface if it already exists. diff --git a/gnetconfig/src/gnetconfig-new_interface.c b/gnetconfig/src/gnetconfig-new_interface.c index 5762d4f..45cab4b 100644 --- a/gnetconfig/src/gnetconfig-new_interface.c +++ b/gnetconfig/src/gnetconfig-new_interface.c @@ -248,7 +248,9 @@ static void cb_gn_new_int_save_clicked (GtkWidget *widget, gpointer data) { fwnet_interface_t *nif; + GList *ifs; gchar opts[50]; + gchar *name = NULL; if (gtk_entry_get_text(GTK_ENTRY(gn_nif_name_entry))==NULL || !strlen(gtk_entry_get_text(GTK_ENTRY(gn_nif_name_entry)))) { @@ -267,8 +269,20 @@ cb_gn_new_int_save_clicked (GtkWidget *widget, gpointer data) g_free (nif); return; } + /* check if an interface with this name already exists */ + name = (char*)gtk_entry_get_text(GTK_ENTRY(gn_nif_name_entry)); + for (ifs = active_profile->interfaces; ifs != NULL; ifs = g_list_next(ifs)) + { + fwnet_interface_t *temp = ifs->data; + if (!strcmp(temp->name,name)) + { + gn_error (_("An interface with the specified name already exists, please provide a different name.")); + return; + } + } + memset (nif, 0, sizeof(fwnet_interface_t)); - snprintf (nif->name, IF_NAMESIZE, (char*)gtk_entry_get_text(GTK_ENTRY(gn_nif_name_entry))); + snprintf (nif->name, IF_NAMESIZE, name); switch (gtk_combo_box_get_active (GTK_COMBO_BOX(gn_nconntype_combo))) { case GN_STATIC: From priyank at frugalware.org Sun Jul 8 17:40:25 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 8 17:40:26 2007 Subject: [Frugalware-git] frugalware-current: ntop-3.3-1-i686 Message-ID: <20070708154025.6191916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=30d25978d792256f27c1991fb587377def1af427 commit 30d25978d792256f27c1991fb587377def1af427 Author: Priyank Date: Sun Jul 8 14:35:04 2007 +0530 ntop-3.3-1-i686 * Version bump diff --git a/source/network-extra/ntop/FrugalBuild b/source/network-extra/ntop/FrugalBuild index 9f1ba98..523502e 100644 --- a/source/network-extra/ntop/FrugalBuild +++ b/source/network-extra/ntop/FrugalBuild @@ -1,19 +1,22 @@ -# Compiling Time: 0.84 SBU +# Compiling Time: 0.71 SBU # Maintainer: Priyank Gosalia pkgname=ntop -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="A network traffic probe that shows the network usage" url="http://www.ntop.org" -depends=('openssl' 'gd' 'gdbm' 'glib' 'libxml2' 'libpcap') +depends=('openssl' 'gd' 'gdbm' 'glib' 'libxml2' 'libpcap' 'rrdtool') groups=('network-extra') archs=('i686' 'x86_64') -_F_sourceforge_ext=.tgz +_F_sourceforge_ext=".tar.gz" Finclude sourceforge -sha1sums=('ab17e871890bc490746fe03f171523073b54e1e8') +sha1sums=('4b56f15eb502ea853308433589820161ce82c8d8') -build() { +build() +{ + Fcd + sh autogen.sh Fbuild Fmkdir var/ install -d -m755 --owner=nobody --group=nobody $Fdestdir/var/ntop || Fdie From crazy at frugalware.org Sun Jul 8 17:59:27 2007 From: crazy at frugalware.org (crazy) Date: Sun Jul 8 17:59:29 2007 Subject: [Frugalware-git] frugalware-current: gtk-gnutella-0.96.4-1-i686 Message-ID: <20070708155927.A79C616A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9098da83143241bb300b8723c94acecb0aad93f9 commit 9098da83143241bb300b8723c94acecb0aad93f9 Author: crazy Date: Sun Jul 8 17:50:05 2007 +0200 gtk-gnutella-0.96.4-1-i686 * Version bump diff --git a/source/xapps-extra/gtk-gnutella/FrugalBuild b/source/xapps-extra/gtk-gnutella/FrugalBuild index 2261cbd..19b8edf 100644 --- a/source/xapps-extra/gtk-gnutella/FrugalBuild +++ b/source/xapps-extra/gtk-gnutella/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: geekitus pkgname=gtk-gnutella -pkgver=0.96.3 +pkgver=0.96.4 pkgrel=1 pkgdesc="Gtk-Gnutella is a clone of Gnutella" depends=('gtk+2' 'glib2' 'libxml2') @@ -12,7 +12,7 @@ groups=('xapps-extra') options=('scriptlet') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('7469d4ea685c387f38e927efeb8b9947a9ec72e3') +sha1sums=('03893f83b44f677a6cc8af277115f40b6d208a18') build() { @@ -20,7 +20,7 @@ build() ./Configure -Dccflags="$CFLAGS" -Dprefix=/usr -Dprivlib=/usr/share/gtk-gnutella \ -Dofficial=true -Dgtkversion=2 -ders -U y make || return 1 - make install INSTALL_PREFIX=$startdir/pkg + make install INSTALL_PREFIX=$Fdestdir || return 1 } From boobaa at frugalware.org Sun Jul 8 19:10:40 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:10:44 2007 Subject: [Frugalware-git] frugalware-current: hunspell-de-20030617-2-i686 Message-ID: <20070708171040.CF32A16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c197e1787062b1ae31ae6cb0615c118529c01964 commit c197e1787062b1ae31ae6cb0615c118529c01964 Author: CSÉCSY László Date: Sun Jul 8 19:10:01 2007 +0200 hunspell-de-20030617-2-i686 get rid of dpkg depend diff --git a/source/locale-extra/hunspell-de/FrugalBuild b/source/locale-extra/hunspell-de/FrugalBuild index 30c3eb2..6b72410 100644 --- a/source/locale-extra/hunspell-de/FrugalBuild +++ b/source/locale-extra/hunspell-de/FrugalBuild @@ -4,10 +4,9 @@ lang=de_DE pkgname=hunspell-de pkgver=20030617 -pkgrel=1 +pkgrel=2 pkgdesc="German dictionary for Hunspell" url="http://lingucomponent.openoffice.org/spell_dic.html" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') diff --git a/source/locale-extra/hunspell-de/hunspell-de.install b/source/locale-extra/hunspell-de/hunspell-de.install index 48afd7f..a29022e 100644 --- a/source/locale-extra/hunspell-de/hunspell-de.install +++ b/source/locale-extra/hunspell-de/hunspell-de.install @@ -1,27 +1,43 @@ PLANG=de_DE post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:12:40 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:12:42 2007 Subject: [Frugalware-git] frugalware-current: hunspell-de_CH-20030228-2-i686 Message-ID: <20070708171240.3B30016A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=989993a6ec622a12fe188378497a14d9131d403d commit 989993a6ec622a12fe188378497a14d9131d403d Author: CSÉCSY László Date: Sun Jul 8 19:12:35 2007 +0200 hunspell-de_CH-20030228-2-i686 get rid of dpkg depend sha1sum fix diff --git a/source/locale-extra/hunspell-de_CH/FrugalBuild b/source/locale-extra/hunspell-de_CH/FrugalBuild index f47ca98..bf6ffd9 100644 --- a/source/locale-extra/hunspell-de_CH/FrugalBuild +++ b/source/locale-extra/hunspell-de_CH/FrugalBuild @@ -4,10 +4,9 @@ lang=de_CH pkgname=hunspell-$lang pkgver=20030228 -pkgrel=1 +pkgrel=2 pkgdesc="German (Switzerland) dictionary for Hunspell" url="http://lingucomponent.openoffice.org/spell_dic.html" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') @@ -15,7 +14,7 @@ archs=('i686' 'x86_64') up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep 'German (Switzerland)' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('be67899cdafced2bb64408deee687135bab16537') +sha1sums=('d39ad2549b003544111464ab928b6778b061cc8d') build() { Fmkdir usr/share/myspell diff --git a/source/locale-extra/hunspell-de_CH/hunspell-de_CH.install b/source/locale-extra/hunspell-de_CH/hunspell-de_CH.install index e98a820..46848b8 100644 --- a/source/locale-extra/hunspell-de_CH/hunspell-de_CH.install +++ b/source/locale-extra/hunspell-de_CH/hunspell-de_CH.install @@ -1,27 +1,43 @@ PLANG=de_CH post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:15:12 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:15:15 2007 Subject: [Frugalware-git] frugalware-current: hunspell-en-20050613-2-i686 Message-ID: <20070708171512.1313416A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=39d39cf4a2eb1580dbfcac4d8b86bc2bc4172699 commit 39d39cf4a2eb1580dbfcac4d8b86bc2bc4172699 Author: CSÉCSY László Date: Sun Jul 8 19:15:02 2007 +0200 hunspell-en-20050613-2-i686 get rid of dpkg depend diff --git a/source/locale-extra/hunspell-en/FrugalBuild b/source/locale-extra/hunspell-en/FrugalBuild index bdb2148..bb71568 100644 --- a/source/locale-extra/hunspell-en/FrugalBuild +++ b/source/locale-extra/hunspell-en/FrugalBuild @@ -4,10 +4,9 @@ lang=en_GB pkgname=hunspell-en pkgver=20050613 -pkgrel=1 +pkgrel=2 pkgdesc="English (United Kingdom) dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') diff --git a/source/locale-extra/hunspell-en/hunspell-en.install b/source/locale-extra/hunspell-en/hunspell-en.install index f6b9fe0..c8a636d 100644 --- a/source/locale-extra/hunspell-en/hunspell-en.install +++ b/source/locale-extra/hunspell-en/hunspell-en.install @@ -1,27 +1,43 @@ PLANG=en_GB post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:17:08 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:17:10 2007 Subject: [Frugalware-git] frugalware-current: hunspell-en_US-20060207-2-i686 Message-ID: <20070708171708.2CA9216A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=68df62d321b477d40f34dd35d4743e75ef35b502 commit 68df62d321b477d40f34dd35d4743e75ef35b502 Author: CSÉCSY László Date: Sun Jul 8 19:16:59 2007 +0200 hunspell-en_US-20060207-2-i686 get rid of dpkg depend diff --git a/source/locale-extra/hunspell-en_US/FrugalBuild b/source/locale-extra/hunspell-en_US/FrugalBuild index d47a5ea..1f19102 100644 --- a/source/locale-extra/hunspell-en_US/FrugalBuild +++ b/source/locale-extra/hunspell-en_US/FrugalBuild @@ -4,10 +4,9 @@ lang=en_US pkgname=hunspell-$lang pkgver=20060207 -pkgrel=1 +pkgrel=2 pkgdesc="English (United States) dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') diff --git a/source/locale-extra/hunspell-en_US/hunspell-en_US.install b/source/locale-extra/hunspell-en_US/hunspell-en_US.install index 5605c24..7b3035e 100644 --- a/source/locale-extra/hunspell-en_US/hunspell-en_US.install +++ b/source/locale-extra/hunspell-en_US/hunspell-en_US.install @@ -1,27 +1,43 @@ PLANG=en_US post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:18:34 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:18:36 2007 Subject: [Frugalware-git] frugalware-current: hunspell-es-20050510-2-i686 Message-ID: <20070708171834.EE58B16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=09bc7d82b7d566d0ba6bb4bbf7c3637977349607 commit 09bc7d82b7d566d0ba6bb4bbf7c3637977349607 Author: CSÉCSY László Date: Sun Jul 8 19:18:26 2007 +0200 hunspell-es-20050510-2-i686 get rid of dpkg depend sha1sum fix diff --git a/source/locale-extra/hunspell-es/FrugalBuild b/source/locale-extra/hunspell-es/FrugalBuild index 723fc25..f5ba394 100644 --- a/source/locale-extra/hunspell-es/FrugalBuild +++ b/source/locale-extra/hunspell-es/FrugalBuild @@ -4,10 +4,9 @@ lang=es_ES pkgname=hunspell-es pkgver=20050510 -pkgrel=1 +pkgrel=2 pkgdesc="Spanish (Spain-etal) dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') @@ -15,7 +14,7 @@ archs=('i686' 'x86_64') up2date="elinks -dump $url | grep 'Spanish (Spain-etal)' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('3801efb6d6252e40a743a913afc4f86bb8d3a3ef') +sha1sums=('2dfc1d641c6c6cab35252d420efa71e8eb1befdc') build() { Fmkdir usr/share/myspell diff --git a/source/locale-extra/hunspell-es/hunspell-es.install b/source/locale-extra/hunspell-es/hunspell-es.install index 0f41019..94aeb60 100644 --- a/source/locale-extra/hunspell-es/hunspell-es.install +++ b/source/locale-extra/hunspell-es/hunspell-es.install @@ -1,27 +1,43 @@ PLANG=es_ES post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:20:41 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:20:43 2007 Subject: [Frugalware-git] frugalware-current: hunspell-es_MX-20050505-2-i686 Message-ID: <20070708172041.595B316A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=087b6793ecc6e11677c58143c5ee66083720a3e2 commit 087b6793ecc6e11677c58143c5ee66083720a3e2 Author: CSÉCSY László Date: Sun Jul 8 19:20:34 2007 +0200 hunspell-es_MX-20050505-2-i686 get rid of dpkg depend sha1sum fix diff --git a/source/locale-extra/hunspell-es_MX/FrugalBuild b/source/locale-extra/hunspell-es_MX/FrugalBuild index 190beca..33b6e9b 100644 --- a/source/locale-extra/hunspell-es_MX/FrugalBuild +++ b/source/locale-extra/hunspell-es_MX/FrugalBuild @@ -4,10 +4,9 @@ lang=es_MX pkgname=hunspell-$lang pkgver=20050505 -pkgrel=1 +pkgrel=2 pkgdesc="Spanish (Mexico) dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') @@ -15,7 +14,7 @@ archs=('i686' 'x86_64') up2date="elinks -dump $url | grep 'Spanish (Mexico)' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('4cc6bd6f5985d876f6d1bb565051b8131ddb82e4') +sha1sums=('d70dd59ec4623dc5401dd5bb00ddd64340fd71ea') build() { Fmkdir usr/share/myspell diff --git a/source/locale-extra/hunspell-es_MX/hunspell-es_MX.install b/source/locale-extra/hunspell-es_MX/hunspell-es_MX.install index 1b90e80..616a178 100644 --- a/source/locale-extra/hunspell-es_MX/hunspell-es_MX.install +++ b/source/locale-extra/hunspell-es_MX/hunspell-es_MX.install @@ -1,27 +1,43 @@ PLANG=es_MX post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:23:17 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:23:20 2007 Subject: [Frugalware-git] frugalware-current: hunspell-fr-20020608-2-i686 Message-ID: <20070708172317.DFD4D16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=05e34d1c745e76346e85a336f469892e04bc592e commit 05e34d1c745e76346e85a336f469892e04bc592e Author: CSÉCSY László Date: Sun Jul 8 19:22:58 2007 +0200 hunspell-fr-20020608-2-i686 get rid of dpkg depend diff --git a/source/locale-extra/hunspell-fr/FrugalBuild b/source/locale-extra/hunspell-fr/FrugalBuild index f03c9f6..40755f3 100644 --- a/source/locale-extra/hunspell-fr/FrugalBuild +++ b/source/locale-extra/hunspell-fr/FrugalBuild @@ -4,10 +4,9 @@ lang=fr_FR pkgname=hunspell-fr pkgver=20020608 -pkgrel=1 +pkgrel=2 pkgdesc="French dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') diff --git a/source/locale-extra/hunspell-fr/hunspell-fr.install b/source/locale-extra/hunspell-fr/hunspell-fr.install index 60e2df2..751507b 100644 --- a/source/locale-extra/hunspell-fr/hunspell-fr.install +++ b/source/locale-extra/hunspell-fr/hunspell-fr.install @@ -1,27 +1,43 @@ PLANG=fr_FR post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:25:34 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:25:35 2007 Subject: [Frugalware-git] frugalware-current: hunspell-hu-20060727-2-i686 Message-ID: <20070708172534.5642116A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a8b9a38859823ab3ff4a52ccf687b2f32e34c99c commit a8b9a38859823ab3ff4a52ccf687b2f32e34c99c Author: CSÉCSY László Date: Sun Jul 8 19:25:26 2007 +0200 hunspell-hu-20060727-2-i686 get rid of dpkg depend diff --git a/source/locale-extra/hunspell-hu/FrugalBuild b/source/locale-extra/hunspell-hu/FrugalBuild index 58c3801..176e434 100644 --- a/source/locale-extra/hunspell-hu/FrugalBuild +++ b/source/locale-extra/hunspell-hu/FrugalBuild @@ -4,10 +4,9 @@ lang=hu_HU pkgname=hunspell-hu pkgver=20060727 -pkgrel=1 +pkgrel=2 pkgdesc="Hungarian dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') diff --git a/source/locale-extra/hunspell-hu/hunspell-hu.install b/source/locale-extra/hunspell-hu/hunspell-hu.install index 7a1522e..9bbef68 100644 --- a/source/locale-extra/hunspell-hu/hunspell-hu.install +++ b/source/locale-extra/hunspell-hu/hunspell-hu.install @@ -1,27 +1,43 @@ PLANG=hu_HU post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:28:21 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:28:24 2007 Subject: [Frugalware-git] frugalware-current: hunspell-it-20050118-2-i686 Message-ID: <20070708172822.07D9216A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ccb8503d89866024259cfef3339296919cd141ae commit ccb8503d89866024259cfef3339296919cd141ae Author: CSÉCSY László Date: Sun Jul 8 19:28:10 2007 +0200 hunspell-it-20050118-2-i686 get rid of dpkg depend sha1sum fix diff --git a/source/locale-extra/hunspell-it/FrugalBuild b/source/locale-extra/hunspell-it/FrugalBuild index 7013474..a00ba46 100644 --- a/source/locale-extra/hunspell-it/FrugalBuild +++ b/source/locale-extra/hunspell-it/FrugalBuild @@ -4,10 +4,9 @@ lang=it_IT pkgname=hunspell-it pkgver=20050118 -pkgrel=1 +pkgrel=2 pkgdesc="Italian dictionary for Hunspell" url="http://lingucomponent.openoffice.org/spell_dic.html" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') @@ -15,7 +14,7 @@ archs=('i686' 'x86_64') up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep Italian | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('6c27ad97400e6be0981bab403961794fc68eccb4') +sha1sums=('f92d7c81eda231e6615bffcc82372eb0f19c328f') build() { Fmkdir usr/share/myspell diff --git a/source/locale-extra/hunspell-it/hunspell-it.install b/source/locale-extra/hunspell-it/hunspell-it.install index bfabb95..99bf90e 100644 --- a/source/locale-extra/hunspell-it/hunspell-it.install +++ b/source/locale-extra/hunspell-it/hunspell-it.install @@ -1,27 +1,43 @@ PLANG=it_IT post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 19:31:04 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 19:31:07 2007 Subject: [Frugalware-git] frugalware-current: hunspell-sk-20050228-2-i686 Message-ID: <20070708173104.A4C9F16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=647dd33829f48683241ff22e6e51cd69531f74e4 commit 647dd33829f48683241ff22e6e51cd69531f74e4 Author: CSÉCSY László Date: Sun Jul 8 19:30:54 2007 +0200 hunspell-sk-20050228-2-i686 get rid of dpkg depend sha1sum fix diff --git a/source/locale-extra/hunspell-sk/FrugalBuild b/source/locale-extra/hunspell-sk/FrugalBuild index 567da1c..910223b 100644 --- a/source/locale-extra/hunspell-sk/FrugalBuild +++ b/source/locale-extra/hunspell-sk/FrugalBuild @@ -4,10 +4,9 @@ lang=sk_SK pkgname=hunspell-sk pkgver=20050228 -pkgrel=1 +pkgrel=2 pkgdesc="Slovak dictionary for Hunspell" url="http://lingucomponent.openoffice.org/spell_dic.html" -depends=('dpkg') rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') @@ -15,7 +14,7 @@ archs=('i686' 'x86_64') up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep Slovak | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('a5a703b2da40a16db166718372a2a6842f6671e2') +sha1sums=('38ff3e892eacbbb675cc8d833a8ddf18bdef62a8') build() { Fmkdir usr/share/myspell diff --git a/source/locale-extra/hunspell-sk/hunspell-sk.install b/source/locale-extra/hunspell-sk/hunspell-sk.install index 7fea34f..9364ea8 100644 --- a/source/locale-extra/hunspell-sk/hunspell-sk.install +++ b/source/locale-extra/hunspell-sk/hunspell-sk.install @@ -1,27 +1,43 @@ PLANG=sk_SK post_install() { - /usr/sbin/update-alternatives --install /usr/share/myspell/default.aff default.aff /usr/share/myspell/$PLANG.aff 01 - /usr/sbin/update-alternatives --install /usr/share/myspell/default.dic default.dic /usr/share/myspell/$PLANG.dic 01 + # oldskull alternatives: bye-bye + if [ $(readlink /usr/share/myspell/default.aff | grep alternatives) ]; then + rm -f /usr/share/myspell/default.aff + fi + if [ $(readlink /usr/share/myspell/default.dic | grep alternatives) ]; then + rm -f /usr/share/myspell/default.dic + fi + rm -f /etc/alternatives/default.{aff,dic} + # if there is no default dictionary, then install one + if [ ! -L /usr/share/myspell/default.aff ]; then + ln -s /usr/share/myspell/$PLANG.aff /usr/share/myspell/default.aff + fi + if [ ! -L /usr/share/myspell/default.dic ]; then + ln -s /usr/share/myspell/$PLANG.dic /usr/share/myspell/default.dic + fi } -pre_remove() +post_remove() { - /usr/sbin/update-alternatives --remove default.aff /usr/share/myspell/$PLANG.aff - /usr/sbin/update-alternatives --remove default.dic /usr/share/myspell/$PLANG.dic + # if we removed the default, then set up a new default (if any) + if [ "$(readlink /usr/share/myspell/default.aff)" == "/usr/share/myspell/$PLANG.aff" ]; then + rm -f /usr/share/myspell/default.aff + if [ -e /usr/share/myspell/*.aff ]; then + ln -s $(ls -1 /usr/share/myspell/*.aff 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.aff + fi + fi + if [ "$(readlink /usr/share/myspell/default.dic)" == "/usr/share/myspell/$PLANG.dic" ]; then + rm -f /usr/share/myspell/default.dic + if [ -e /usr/share/myspell/*.dic ]; then + ln -s $(ls -1 /usr/share/myspell/*.dic 2>/dev/null | grep -v default | head -n 1 | sed 's/\*//') /usr/share/myspell/default.dic + fi + fi } post_upgrade() { - aff=`readlink /etc/alternatives/default.aff` - if [ "$aff" == "/usr/share/myspell/$PLANG.aff" ]; then - /usr/sbin/update-alternatives --set default.aff /usr/share/myspell/$PLANG.aff - fi - dic=`readlink /etc/alternatives/default.dic` - if [ "$dic" == "/usr/share/myspell/$PLANG.dic" ]; then - /usr/sbin/update-alternatives --set default.dic /usr/share/myspell/$PLANG.dic - fi - exit 0 + post_install } op=$1 From boobaa at frugalware.org Sun Jul 8 20:06:33 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jul 8 20:06:36 2007 Subject: [Frugalware-git] frugalware-current: awstats-6.7-2-i686 Message-ID: <20070708180633.7695C16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=33230fa9f44dd5422852bfda93c1da6b40d4c68f commit 33230fa9f44dd5422852bfda93c1da6b40d4c68f Author: CSÉCSY László Date: Sun Jul 8 20:06:19 2007 +0200 awstats-6.7-2-i686 relbump, some hunks have been left off diff --git a/source/network-extra/awstats/FrugalBuild b/source/network-extra/awstats/FrugalBuild index 25f811d..6b093d8 100644 --- a/source/network-extra/awstats/FrugalBuild +++ b/source/network-extra/awstats/FrugalBuild @@ -1,10 +1,11 @@ # Compiling Time: 0.09 SBU -# Maintainer: DNAku +# Maintainer: CSÉCSY László +# Former m8r: DNAku # Contributor: Tuxbubling pkgname=awstats pkgver=6.7 -pkgrel=1 +pkgrel=2 pkgdesc="Free real-time logfile analyzer to get advanced statistics." Finclude sourceforge url="http://awstats.sourceforge.net/" @@ -35,6 +36,6 @@ build() # optimization ok -sha1sums=('b400a519263d2ed98c4a16d02a9cfceea315783c' \ +sha1sums=('7dab4208441bce494bf1b3937242794a2328ace1' \ 'c402209ad0f94db9c5dc8b40744fbf61d64df7d6' \ '63ff73a65caf7c05a69a6f15d4d2a99bfada5438') diff --git a/source/network-extra/awstats/awstats-6.7-fw.patch b/source/network-extra/awstats/awstats-6.7-fw.patch index ea6d1a4..50e9125 100644 --- a/source/network-extra/awstats/awstats-6.7-fw.patch +++ b/source/network-extra/awstats/awstats-6.7-fw.patch @@ -30,16 +30,16 @@ diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_co $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux -@@ -60,7 +60,7 @@ - @WEBCONF=( +@@ -61,7 +61,7 @@ 'C:/Program Files/Apache Group/Apache2/conf/httpd.conf', 'C:/Program Files/Apache Group/Apache/conf/httpd.conf', + '/Applications/MAMP/conf/apache/httpd.conf', -'/etc/httpd/httpd.conf', +'/etc/httpd/conf/httpd.conf', '/usr/local/apache/conf/httpd.conf', - '/usr/local/apache2/conf/httpd.conf' + '/usr/local/apache2/conf/httpd.conf', ); -@@ -308,13 +308,13 @@ +@@ -309,13 +309,13 @@ $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; $AWSTATS_PATH=~s/tools[\\\/]?$//; $AWSTATS_PATH=~s/[\\\/]$//; @@ -56,7 +56,7 @@ diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_co print "And then, run configure.pl from this location.\n"; print "Do you want to continue setup from this NON standard directory [yN] ? "; my $bidon=''; -@@ -418,7 +418,7 @@ +@@ -419,7 +419,7 @@ if ($bidon) { $ApachePath{"$bidon"}=1; } print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; @@ -118,7 +118,7 @@ diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/ # Enter the log file type you want to analyze. -@@ -145,7 +145,7 @@ +@@ -150,7 +150,7 @@ # Example: "ftp.domain.com" # Example: "domain.com" # @@ -127,7 +127,7 @@ diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/ # Enter here all other possible domain names, addresses or virtual host -@@ -195,7 +195,7 @@ +@@ -200,7 +200,7 @@ # Example: "C:/awstats_data_dir" # Default: "." (means same directory as awstats.pl) # From vmiklos at frugalware.org Sun Jul 8 21:46:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 21:46:09 2007 Subject: [Frugalware-git] pacman-tools: dg: fix for 'adding excluded deleted files to commit' Message-ID: <20070708194605.4547516A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=900080cd6e7fa8cb1e12398d1a701b0d8cd37247 commit 900080cd6e7fa8cb1e12398d1a701b0d8cd37247 Author: VMiklos Date: Sun Jul 8 21:45:37 2007 +0200 dg: fix for 'adding excluded deleted files to commit' fix for the following problem: you do a dg rm dir1/foo then a dg rec dir2, then dir1/foo gets included in the commit note: just doing an rm dir1/foo is not affected diff --git a/darcs-git.py b/darcs-git.py index 791e569..507b6da 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -314,7 +314,7 @@ Options: newlist.append(diff2filename(lines[0])) for i in newlist: os.system("git reset HEAD %s" % i) - os.system("git commit -m '%s' %s" % (options.name, options.edit)) + os.system("git commit -m '%s' %s %s" % (options.name, options.edit, options.files)) # readd the uncommitted new files for i in newlist: os.system("git add %s" % i) From vmiklos at frugalware.org Sun Jul 8 21:58:01 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 21:58:03 2007 Subject: [Frugalware-git] pacman-tools: dg: fix for patch names containing ' or " Message-ID: <20070708195801.6A29A16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=80a6fb5ca59f7f2839c0e7fcf8a6c3426adad48e commit 80a6fb5ca59f7f2839c0e7fcf8a6c3426adad48e Author: VMiklos Date: Sun Jul 8 21:57:55 2007 +0200 dg: fix for patch names containing ' or " thanks priyank :) diff --git a/darcs-git.py b/darcs-git.py index 200f375..4e4c935 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -295,7 +295,8 @@ Options: # patch. support this os.system("git ls-files -z --deleted | git update-index -z --remove --stdin") if first or merge or options.all: - os.system("git commit -a -m '%s' %s %s" % (options.name, options.edit, options.files)) + os.system("""git commit -a -m "%s" %s %s""" % + (options.name.replace('"', r'\"'), options.edit, options.files)) sys.exit(0) for i in status.hunks: p = [] @@ -314,7 +315,8 @@ Options: newlist.append(diff2filename(lines[0])) for i in newlist: os.system("git reset HEAD %s" % i) - os.system("git commit -m '%s' %s %s" % (options.name, options.edit, options.files)) + os.system("""git commit -m "%s" %s %s""" % + (options.name.replace('"', r'\"'), options.edit, options.files)) # readd the uncommitted new files for i in newlist: os.system("git add %s" % i) From vmiklos at frugalware.org Sun Jul 8 22:54:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 22:54:58 2007 Subject: [Frugalware-git] pacman-tools: dg: support for dir/file in rev -a Message-ID: <20070708205455.02DCC16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=d8f715589a8b55851822e98718cf6f6b5b0d2e6d commit d8f715589a8b55851822e98718cf6f6b5b0d2e6d Author: VMiklos Date: Sun Jul 8 22:54:49 2007 +0200 dg: support for dir/file in rev -a diff --git a/darcs-git.py b/darcs-git.py index 4e4c935..042944a 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -380,7 +380,7 @@ Options: print "There are no changes to revert!" sys.exit(0) if options.all: - os.system("git checkout -f") + os.system("git checkout %s" % options.files) print "Finished reverting." sys.exit(0) status = scan_dir(options.files) From vmiklos at frugalware.org Sun Jul 8 23:24:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 23:24:27 2007 Subject: [Frugalware-git] frugalware-current: stellarium-0.9.0-1-i686 Message-ID: <20070708212426.0B27E16A8079@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b404f0003a3398bdd8041de85a6d1eb38226343b commit b404f0003a3398bdd8041de85a6d1eb38226343b Author: VMiklos Date: Sun Jul 8 23:24:09 2007 +0200 stellarium-0.9.0-1-i686 version bump diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild index 4791ce9..15ae58e 100644 --- a/source/xapps-extra/stellarium/FrugalBuild +++ b/source/xapps-extra/stellarium/FrugalBuild @@ -3,16 +3,26 @@ # Contributor: Mcklaren pkgname=stellarium -pkgver=0.8.2 +pkgver=0.9.0 pkgrel=1 pkgdesc="A free open source planetarium for your computer." _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.stellarium.org/" -depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2') +depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg' 'qt4') license="GPL" groups=('xapps-extra') archs=('i686') -sha1sums=('f5721df4cd64ad1673d10a56e340d3d96d4827dd') +source=($source unused_moc.diff) +sha1sums=('696e0fa935b695763ab37c66ec5e189c3e6db9f9' \ + '1858fd653aa91bdf76cae9815819fb9db5c4b35a') + +build() +{ + Fcd + ./autogen.sh || return 1 + cp /usr/share/automake/mkinstalldirs . || return 1 + Fbuild --with-qt-dir=/usr +} # optimization OK diff --git a/source/xapps-extra/stellarium/unused_moc.diff b/source/xapps-extra/stellarium/unused_moc.diff new file mode 100644 index 0000000..f9b3683 --- /dev/null +++ b/source/xapps-extra/stellarium/unused_moc.diff @@ -0,0 +1,39 @@ +diff -Naur stellarium-0.9.0.orig/configure.ac stellarium-0.9.0/configure.ac +--- stellarium-0.9.0.orig/configure.ac 2007-06-06 10:25:19.000000000 +0200 ++++ stellarium-0.9.0/configure.ac 2007-07-07 19:07:52.000000000 +0200 +@@ -213,35 +213,6 @@ + } + EOF + +-AC_MSG_CHECKING(does moc work?) +-bnv_try_1="moc myqt.h -o moc_myqt.cpp" +-AC_TRY_EVAL(bnv_try_1) +-if test x"$ac_status" != x0; then +- AC_MSG_ERROR(moc doesn't work) +-fi +-AC_MSG_RESULT(yes) +-AC_MSG_CHECKING(can I compile moc_myqt.cpp?) +-bnv_try_2="$CXX -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp" +-AC_TRY_EVAL(bnv_try_2) +-if test x"$ac_status" != x0; then +- AC_MSG_ERROR(couldn't compile moc_myqt.cpp) +-fi +-AC_MSG_RESULT(yes) +-AC_MSG_CHECKING(can I compile myqt.cpp?) +-bnv_try_3="$CXX $QTINC -c $CXXFLAGS -o myqt.o myqt.cpp" +-AC_TRY_EVAL(bnv_try_3) +-if test x"$ac_status" != x0; then +- AC_MSG_ERROR(couldn't compile myqt.cpp) +-fi +-AC_MSG_RESULT(yes) +-AC_MSG_CHECKING(can I link against QT?) +-nv_try_4="$CXX $LIBS -o myqt myqt.o moc_myqt.o" +-AC_TRY_EVAL(bnv_try_4) +-if test x"$ac_status" != x0; then +- AC_MSG_ERROR(couldn't link) +-fi +-AC_MSG_RESULT(yes) +- + AC_MSG_CHECKING(for mkoctfile) + AC_TRY_EVAL(mkoctfile) + if test x"$ac_status" != x0; then From vmiklos at frugalware.org Sun Jul 8 23:24:25 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 8 23:24:27 2007 Subject: [Frugalware-git] frugalware-current: eh Message-ID: <20070708212425.D344D16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=02328171bcb0bae2512e6ca2c46fea5b41c9f45a commit 02328171bcb0bae2512e6ca2c46fea5b41c9f45a Author: VMiklos Date: Sun Jul 8 22:30:11 2007 +0200 eh diff --git a/source/network-extra/awstats/awstats-6.8-fw.patch b/source/network-extra/awstats/awstats-6.8-fw.patch new file mode 100644 index 0000000..01b18bd --- /dev/null +++ b/source/network-extra/awstats/awstats-6.8-fw.patch @@ -0,0 +1,141 @@ +diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl +--- awstats-6.4/tools/awstats_buildstaticpages.pl 2005-02-20 17:11:06.000000000 +0100 ++++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl 2005-08-25 14:21:58.045625424 +0200 +@@ -293,8 +293,8 @@ + # Check if AWSTATS prog is found + my $AwstatsFound=0; + if (-s "$Awstats") { $AwstatsFound=1; } +-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { +- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; ++elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { ++ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; + $AwstatsFound=1; + } + if (! $AwstatsFound) { +diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_configure.pl +--- awstats-6.4/tools/awstats_configure.pl 2005-01-15 23:42:58.000000000 +0100 ++++ awstats-6.4_fw/tools/awstats_configure.pl 2005-08-25 14:21:58.045625424 +0200 +@@ -29,10 +29,10 @@ + $AWSTATS_DIRDATA_PATH + /; + $AWSTATS_PATH=''; +-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; +-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; +-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; +-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; ++$AWSTATS_ICON_PATH='/usr/lib/awstats/wwwroot/icon'; ++$AWSTATS_CSS_PATH='/usr/lib/awstats/wwwroot/css'; ++$AWSTATS_CLASSES_PATH='/usr/lib/awstats/wwwroot/classes'; ++$AWSTATS_CGI_PATH='/usr/lib/awstats/wwwroot/cgi-bin'; + $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux + $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux + +@@ -308,13 +308,13 @@ + $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; + $AWSTATS_PATH=~s/tools[\\\/]?$//; + $AWSTATS_PATH=~s/[\\\/]$//; +- if ($AWSTATS_PATH ne '/usr/local/awstats') { +- print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n"; ++ if ($AWSTATS_PATH ne '/usr/lib/awstats') { ++ print "Warning: AWStats standard directory on Linux OS is '/usr/lib/awstats'.\n"; + print "If you want to use standard directory, you should first move all content\n"; + print "of AWStats distribution from current directory:\n"; + print "$AWSTATS_PATH\n"; + print "to standard directory:\n"; +- print "/usr/local/awstats\n"; ++ print "/usr/lib/awstats\n"; + print "And then, run configure.pl from this location.\n"; + print "Do you want to continue setup from this NON standard directory [yN] ? "; + my $bidon=''; +@@ -418,7 +418,7 @@ + if ($bidon) { $ApachePath{"$bidon"}=1; } + + print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; +- print "Example: /etc/httpd/httpd.conf\n"; ++ print "Example: /etc/httpd/conf/httpd.conf\n"; + print "Example: /usr/local/apache2/conf/httpd.conf\n"; + print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; + $bidon=''; +diff -urN awstats-6.4/tools/awstats_updateall.pl awstats-6.4_fw/tools/awstats_updateall.pl +--- awstats-6.4/tools/awstats_updateall.pl 2004-06-07 14:27:26.000000000 +0200 ++++ awstats-6.4_fw/tools/awstats_updateall.pl 2005-08-25 14:21:58.046625272 +0200 +@@ -121,8 +121,8 @@ + # Check if AWSTATS prog is found + my $AwstatsFound=0; + if (-s "$Awstats") { $AwstatsFound=1; } +- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { +- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; ++ elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { ++ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; + $AwstatsFound=1; + } + if (! $AwstatsFound) { +diff -urN awstats-6.4/tools/httpd_conf awstats-6.4_fw/tools/httpd_conf +--- awstats-6.4/tools/httpd_conf 2004-01-13 14:25:56.000000000 +0100 ++++ awstats-6.4_fw/tools/httpd_conf 1970-01-01 01:00:00.000000000 +0100 +@@ -1,23 +0,0 @@ +-# +-# Content of this file, with correct values, can be automatically added to +-# your Apache server by using the AWStats configure.pl tool. +-# +- +-# +-# Directives to add to your Apache conf file to allow use of AWStats as a CGI. +-# Note that path "/usr/local/awstats/" must reflect your AWStats install path. +-# +-Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/" +-Alias /awstatscss "/usr/local/awstats/wwwroot/css/" +-Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" +-ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" +- +-# +-# This is to permit URL access to scripts/files in AWStats directory. +-# +- +- Options None +- AllowOverride None +- Order allow,deny +- Allow from all +- +diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf +--- awstats-6.4/wwwroot/cgi-bin/awstats.model.conf 2005-02-24 22:08:40.000000000 +0100 ++++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf 2005-08-25 14:21:58.047625120 +0200 +@@ -48,7 +48,7 @@ + # If there is several log files from load balancing servers : + # Example: "/pathtotools/logresolvemerge.pl *.log |" + # +-LogFile="/var/log/httpd/mylog.log" ++LogFile="/var/log/httpd/access_log" + + + # Enter the log file type you want to analyze. +@@ -145,7 +145,7 @@ + # Example: "ftp.domain.com" + # Example: "domain.com" + # +-SiteDomain="" ++SiteDomain="localhost" + + + # Enter here all other possible domain names, addresses or virtual host +@@ -195,7 +195,7 @@ + # Example: "C:/awstats_data_dir" + # Default: "." (means same directory as awstats.pl) + # +-DirData="." ++DirData="/var/lib/awstats" + + + # Relative or absolute web URL of your awstats cgi-bin directory. +diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.pl awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl +--- awstats-6.4/wwwroot/cgi-bin/awstats.pl 2005-02-24 22:02:23.000000000 +0100 ++++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl 2005-08-25 14:21:58.054624056 +0200 +@@ -1835,7 +1835,7 @@ + # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) + # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" + # Debian package : "/usr/share/awstats/plugins" +- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); ++ my @PossiblePluginsDir=("$DIR/plugins","/usr/lib/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); + my %DirAddedInINC=(); + + #Removed for security reason From janny at frugalware.org Sun Jul 8 23:36:35 2007 From: janny at frugalware.org (janny) Date: Sun Jul 8 23:36:37 2007 Subject: [Frugalware-git] frugalware-current: perl-carp-clan-5.9-1-i686 Message-ID: <20070708213635.2C5D616A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e254554fec1299e62d25e88b71df71cb63fb8a95 commit e254554fec1299e62d25e88b71df71cb63fb8a95 Author: janny Date: Sun Jul 8 23:36:16 2007 +0200 perl-carp-clan-5.9-1-i686 new package diff --git a/source/devel-extra/perl-carp-clan/FrugalBuild b/source/devel-extra/perl-carp-clan/FrugalBuild new file mode 100644 index 0000000..e0c618f --- /dev/null +++ b/source/devel-extra/perl-carp-clan/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Janny + +_F_perl_name=Carp-Clan +_F_perl_author=J/JJ/JJORE +pkgver=5.9 +pkgdesc="Report errors from perspective of caller of a "clan" of modules" +depends=('') +Finclude perl +sha1sums=('d6058647c8ee80cb978a2c11896d04faede6c33d') From janny at frugalware.org Sun Jul 8 23:48:02 2007 From: janny at frugalware.org (janny) Date: Sun Jul 8 23:48:04 2007 Subject: [Frugalware-git] frugalware-current: perl-bit-vector-6.4-1-i686 Message-ID: <20070708214802.6A5B216A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ad19fe39d3c2a3a3a560873a74475bf4e01631c1 commit ad19fe39d3c2a3a3a560873a74475bf4e01631c1 Author: janny Date: Sun Jul 8 23:46:49 2007 +0200 perl-bit-vector-6.4-1-i686 new package diff --git a/source/devel-extra/perl-bit-vector/FrugalBuild b/source/devel-extra/perl-bit-vector/FrugalBuild new file mode 100644 index 0000000..ee424a5 --- /dev/null +++ b/source/devel-extra/perl-bit-vector/FrugalBuild @@ -0,0 +1,12 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Janny + +_F_perl_name=Bit-Vector +_F_perl_author=S/ST/STBEY +pkgver=6.4 +pkgdesc="Efficient bit vector, set of integers and "big int" math library" +depends=('') +Finclude perl +sha1sums=('f6ce6d7f791c24dc6195a241ec6183cbf335cb03') + +# optimization OK From janny at frugalware.org Sun Jul 8 23:48:02 2007 From: janny at frugalware.org (janny) Date: Sun Jul 8 23:48:05 2007 Subject: [Frugalware-git] frugalware-current: perl-bit-vector-6.4-1-i686 Message-ID: <20070708214802.8BA8C16A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4c686a24c1b7810133527969aac57dc601ab9c6e commit 4c686a24c1b7810133527969aac57dc601ab9c6e Author: janny Date: Sun Jul 8 23:47:56 2007 +0200 perl-bit-vector-6.4-1-i686 new package diff --git a/source/devel-extra/perl-bit-vector/FrugalBuild b/source/devel-extra/perl-bit-vector/FrugalBuild index ee424a5..7848f41 100644 --- a/source/devel-extra/perl-bit-vector/FrugalBuild +++ b/source/devel-extra/perl-bit-vector/FrugalBuild @@ -4,7 +4,7 @@ _F_perl_name=Bit-Vector _F_perl_author=S/ST/STBEY pkgver=6.4 -pkgdesc="Efficient bit vector, set of integers and "big int" math library" +pkgdesc="Efficient bit vector, set of integers and big int math library" depends=('') Finclude perl sha1sums=('f6ce6d7f791c24dc6195a241ec6183cbf335cb03') From janny at frugalware.org Sun Jul 8 23:56:42 2007 From: janny at frugalware.org (janny) Date: Sun Jul 8 23:56:43 2007 Subject: [Frugalware-git] frugalware-current: perl-date-calc-5.4-1-i686 Message-ID: <20070708215642.92A8716A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0b0a3985fb9e23639dcc25e0f5863e8d11c0c697 commit 0b0a3985fb9e23639dcc25e0f5863e8d11c0c697 Author: janny Date: Sun Jul 8 23:56:28 2007 +0200 perl-date-calc-5.4-1-i686 new package diff --git a/source/devel-extra/perl-date-calc/FrugalBuild b/source/devel-extra/perl-date-calc/FrugalBuild new file mode 100644 index 0000000..bbb4b89 --- /dev/null +++ b/source/devel-extra/perl-date-calc/FrugalBuild @@ -0,0 +1,12 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Date-Calc +_F_perl_author=S/ST/STBEY +pkgver=5.4 +pkgdesc="Gregorian calendar date calculations" +depends=('perl-carp-clan>=5.3' 'perl-bit-vector>=6.4') +Finclude perl +sha1sums=('630dfca054aaebd4535e2251c2c5c20d625f3f94') + +# optimization OK From boobaa at frugalware.org Mon Jul 9 00:11:25 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Jul 9 00:11:26 2007 Subject: [Frugalware-git] frugalware-current: workaround a dg bug @ awstats Message-ID: <20070708221125.2B45717680AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5365746c090155291e5246872a335198bbba3b6 commit c5365746c090155291e5246872a335198bbba3b6 Author: CSÉCSY László Date: Mon Jul 9 00:06:27 2007 +0200 workaround a dg bug @ awstats looks like dg cannot handle the case when a file is modified after renaming diff --git a/source/network-extra/awstats/awstats-6.7-fw.patch b/source/network-extra/awstats/awstats-6.7-fw.patch index 50e9125..e584806 100644 --- a/source/network-extra/awstats/awstats-6.7-fw.patch +++ b/source/network-extra/awstats/awstats-6.7-fw.patch @@ -1,6 +1,22 @@ -diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl ---- awstats-6.4/tools/awstats_buildstaticpages.pl 2005-02-20 17:11:06.000000000 +0100 -+++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl 2005-08-25 14:21:58.045625424 +0200 +diff -Naur awstats-6.7-orig/tools/awstats_buildstaticpages.pl awstats-6.7/tools/awstats_buildstaticpages.pl +--- awstats-6.7-orig/tools/awstats_buildstaticpages.pl 2006-02-08 22:26:14.000000000 +0100 ++++ awstats-6.7/tools/awstats_buildstaticpages.pl 2007-07-07 11:53:09.000000000 +0200 +@@ -127,13 +127,13 @@ + # Check config file in common possible directories : + # Windows : "$DIR" (same dir than awstats.pl) + # Standard, Mandrake and Debian package : "/etc/awstats" +- # Other possible directories : "/usr/local/etc/awstats", "/etc" ++ # Other possible directories : "/usr/lib/etc/awstats", "/etc" + # FHS standard, Suse package : "/etc/opt/awstats" + my $configdir=shift; + my @PossibleConfigDir=(); + + if ($configdir) { @PossibleConfigDir=("$configdir"); } +- else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); } ++ else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/lib/etc/awstats","/etc","/etc/opt/awstats"); } + + # Open config file + $FileConfig=$FileSuffix=''; @@ -293,8 +293,8 @@ # Check if AWSTATS prog is found my $AwstatsFound=0; @@ -12,9 +28,9 @@ diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/aws $AwstatsFound=1; } if (! $AwstatsFound) { -diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_configure.pl ---- awstats-6.4/tools/awstats_configure.pl 2005-01-15 23:42:58.000000000 +0100 -+++ awstats-6.4_fw/tools/awstats_configure.pl 2005-08-25 14:21:58.045625424 +0200 +diff -Naur awstats-6.7-orig/tools/awstats_configure.pl awstats-6.7/tools/awstats_configure.pl +--- awstats-6.7-orig/tools/awstats_configure.pl 2007-04-02 20:30:52.000000000 +0200 ++++ awstats-6.7/tools/awstats_configure.pl 2007-07-07 11:45:16.000000000 +0200 @@ -29,10 +29,10 @@ $AWSTATS_DIRDATA_PATH /; @@ -65,10 +81,10 @@ diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_co print "Example: /usr/local/apache2/conf/httpd.conf\n"; print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; $bidon=''; -diff -urN awstats-6.4/tools/awstats_updateall.pl awstats-6.4_fw/tools/awstats_updateall.pl ---- awstats-6.4/tools/awstats_updateall.pl 2004-06-07 14:27:26.000000000 +0200 -+++ awstats-6.4_fw/tools/awstats_updateall.pl 2005-08-25 14:21:58.046625272 +0200 -@@ -121,8 +121,8 @@ +diff -Naur awstats-6.7-orig/tools/awstats_updateall.pl awstats-6.7/tools/awstats_updateall.pl +--- awstats-6.7-orig/tools/awstats_updateall.pl 2006-07-24 00:57:48.000000000 +0200 ++++ awstats-6.7/tools/awstats_updateall.pl 2007-07-07 11:45:42.000000000 +0200 +@@ -130,8 +130,8 @@ # Check if AWSTATS prog is found my $AwstatsFound=0; if (-s "$Awstats") { $AwstatsFound=1; } @@ -79,38 +95,38 @@ diff -urN awstats-6.4/tools/awstats_updateall.pl awstats-6.4_fw/tools/awstats_up $AwstatsFound=1; } if (! $AwstatsFound) { -diff -urN awstats-6.4/tools/httpd_conf awstats-6.4_fw/tools/httpd_conf ---- awstats-6.4/tools/httpd_conf 2004-01-13 14:25:56.000000000 +0100 -+++ awstats-6.4_fw/tools/httpd_conf 1970-01-01 01:00:00.000000000 +0100 +diff -Naur awstats-6.7-orig/tools/httpd_conf awstats-6.7/tools/httpd_conf +--- awstats-6.7-orig/tools/httpd_conf 2006-07-23 00:08:08.000000000 +0200 ++++ awstats-6.7/tools/httpd_conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ --# --# Content of this file, with correct values, can be automatically added to --# your Apache server by using the AWStats configure.pl tool. --# -- --# --# Directives to add to your Apache conf file to allow use of AWStats as a CGI. --# Note that path "/usr/local/awstats/" must reflect your AWStats install path. --# --Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/" --Alias /awstatscss "/usr/local/awstats/wwwroot/css/" --Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" --ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" -- --# --# This is to permit URL access to scripts/files in AWStats directory. --# -- -- Options None -- AllowOverride None -- Order allow,deny -- Allow from all -- -diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf ---- awstats-6.4/wwwroot/cgi-bin/awstats.model.conf 2005-02-24 22:08:40.000000000 +0100 -+++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf 2005-08-25 14:21:58.047625120 +0200 +-# +-# Content of this file, with correct values, can be automatically added to +-# your Apache server by using the AWStats configure.pl tool. +-# +- +-# +-# Directives to add to your Apache conf file to allow use of AWStats as a CGI. +-# Note that path "/usr/local/awstats/" must reflect your AWStats install path. +-# +-Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/" +-Alias /awstatscss "/usr/local/awstats/wwwroot/css/" +-Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" +-ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" +- +-# +-# This is to permit URL access to scripts/files in AWStats directory. +-# +- +- Options None +- AllowOverride None +- Order allow,deny +- Allow from all +- +diff -Naur awstats-6.7-orig/wwwroot/cgi-bin/awstats.model.conf awstats-6.7/wwwroot/cgi-bin/awstats.model.conf +--- awstats-6.7-orig/wwwroot/cgi-bin/awstats.model.conf 2007-04-02 20:34:36.000000000 +0200 ++++ awstats-6.7/wwwroot/cgi-bin/awstats.model.conf 2007-07-07 11:50:05.000000000 +0200 @@ -48,7 +48,7 @@ - # If there is several log files from load balancing servers : + # If there are several log files from load balancing servers : # Example: "/pathtotools/logresolvemerge.pl *.log |" # -LogFile="/var/log/httpd/mylog.log" @@ -136,10 +152,28 @@ diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/ # Relative or absolute web URL of your awstats cgi-bin directory. -diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.pl awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl ---- awstats-6.4/wwwroot/cgi-bin/awstats.pl 2005-02-24 22:02:23.000000000 +0100 -+++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl 2005-08-25 14:21:58.054624056 +0200 -@@ -1835,7 +1835,7 @@ +diff -Naur awstats-6.7-orig/wwwroot/cgi-bin/awstats.pl awstats-6.7/wwwroot/cgi-bin/awstats.pl +--- awstats-6.7-orig/wwwroot/cgi-bin/awstats.pl 2007-03-06 18:35:20.000000000 +0100 ++++ awstats-6.7/wwwroot/cgi-bin/awstats.pl 2007-07-07 11:52:14.000000000 +0200 +@@ -1136,7 +1136,7 @@ + # Check config file in common possible directories : + # Windows : "$DIR" (same dir than awstats.pl) + # Standard, Mandrake and Debian package : "/etc/awstats" +- # Other possible directories : "/usr/local/etc/awstats", "/etc" ++ # Other possible directories : "/usr/lib/etc/awstats", "/etc" + # FHS standard, Suse package : "/etc/opt/awstats" + my $configdir=shift; + my @PossibleConfigDir=(); +@@ -1153,7 +1153,7 @@ + @PossibleConfigDir=("$configdir"); + #} + } +- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); } ++ else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/lib/etc/awstats","/etc","/etc/opt/awstats"); } + + # Open config file + $FileConfig=$FileSuffix=''; +@@ -1938,7 +1938,7 @@ # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" # Debian package : "/usr/share/awstats/plugins" From vmiklos at frugalware.org Mon Jul 9 00:16:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 00:16:45 2007 Subject: [Frugalware-git] frugalware-current: Revert "eh" Message-ID: <20070708221644.32A7816A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=55c79393240b856b4d5b4a29875e2ed28b8816a6 commit 55c79393240b856b4d5b4a29875e2ed28b8816a6 Author: VMiklos Date: Mon Jul 9 00:16:37 2007 +0200 Revert "eh" This reverts commit 02328171bcb0bae2512e6ca2c46fea5b41c9f45a. I pushed it accidently. diff --git a/source/network-extra/awstats/awstats-6.8-fw.patch b/source/network-extra/awstats/awstats-6.8-fw.patch deleted file mode 100644 index 01b18bd..0000000 --- a/source/network-extra/awstats/awstats-6.8-fw.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -urN awstats-6.4/tools/awstats_buildstaticpages.pl awstats-6.4_fw/tools/awstats_buildstaticpages.pl ---- awstats-6.4/tools/awstats_buildstaticpages.pl 2005-02-20 17:11:06.000000000 +0100 -+++ awstats-6.4_fw/tools/awstats_buildstaticpages.pl 2005-08-25 14:21:58.045625424 +0200 -@@ -293,8 +293,8 @@ - # Check if AWSTATS prog is found - my $AwstatsFound=0; - if (-s "$Awstats") { $AwstatsFound=1; } --elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { -- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; -+elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { -+ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; - $AwstatsFound=1; - } - if (! $AwstatsFound) { -diff -urN awstats-6.4/tools/awstats_configure.pl awstats-6.4_fw/tools/awstats_configure.pl ---- awstats-6.4/tools/awstats_configure.pl 2005-01-15 23:42:58.000000000 +0100 -+++ awstats-6.4_fw/tools/awstats_configure.pl 2005-08-25 14:21:58.045625424 +0200 -@@ -29,10 +29,10 @@ - $AWSTATS_DIRDATA_PATH - /; - $AWSTATS_PATH=''; --$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; --$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; --$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; --$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; -+$AWSTATS_ICON_PATH='/usr/lib/awstats/wwwroot/icon'; -+$AWSTATS_CSS_PATH='/usr/lib/awstats/wwwroot/css'; -+$AWSTATS_CLASSES_PATH='/usr/lib/awstats/wwwroot/classes'; -+$AWSTATS_CGI_PATH='/usr/lib/awstats/wwwroot/cgi-bin'; - $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux - $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux - -@@ -308,13 +308,13 @@ - $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; - $AWSTATS_PATH=~s/tools[\\\/]?$//; - $AWSTATS_PATH=~s/[\\\/]$//; -- if ($AWSTATS_PATH ne '/usr/local/awstats') { -- print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n"; -+ if ($AWSTATS_PATH ne '/usr/lib/awstats') { -+ print "Warning: AWStats standard directory on Linux OS is '/usr/lib/awstats'.\n"; - print "If you want to use standard directory, you should first move all content\n"; - print "of AWStats distribution from current directory:\n"; - print "$AWSTATS_PATH\n"; - print "to standard directory:\n"; -- print "/usr/local/awstats\n"; -+ print "/usr/lib/awstats\n"; - print "And then, run configure.pl from this location.\n"; - print "Do you want to continue setup from this NON standard directory [yN] ? "; - my $bidon=''; -@@ -418,7 +418,7 @@ - if ($bidon) { $ApachePath{"$bidon"}=1; } - - print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; -- print "Example: /etc/httpd/httpd.conf\n"; -+ print "Example: /etc/httpd/conf/httpd.conf\n"; - print "Example: /usr/local/apache2/conf/httpd.conf\n"; - print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; - $bidon=''; -diff -urN awstats-6.4/tools/awstats_updateall.pl awstats-6.4_fw/tools/awstats_updateall.pl ---- awstats-6.4/tools/awstats_updateall.pl 2004-06-07 14:27:26.000000000 +0200 -+++ awstats-6.4_fw/tools/awstats_updateall.pl 2005-08-25 14:21:58.046625272 +0200 -@@ -121,8 +121,8 @@ - # Check if AWSTATS prog is found - my $AwstatsFound=0; - if (-s "$Awstats") { $AwstatsFound=1; } -- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { -- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; -+ elsif (-s "/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl") { -+ $Awstats="/usr/lib/awstats/wwwroot/cgi-bin/awstats.pl"; - $AwstatsFound=1; - } - if (! $AwstatsFound) { -diff -urN awstats-6.4/tools/httpd_conf awstats-6.4_fw/tools/httpd_conf ---- awstats-6.4/tools/httpd_conf 2004-01-13 14:25:56.000000000 +0100 -+++ awstats-6.4_fw/tools/httpd_conf 1970-01-01 01:00:00.000000000 +0100 -@@ -1,23 +0,0 @@ --# --# Content of this file, with correct values, can be automatically added to --# your Apache server by using the AWStats configure.pl tool. --# -- --# --# Directives to add to your Apache conf file to allow use of AWStats as a CGI. --# Note that path "/usr/local/awstats/" must reflect your AWStats install path. --# --Alias /awstatsclasses "/usr/local/awstats/wwwroot/classes/" --Alias /awstatscss "/usr/local/awstats/wwwroot/css/" --Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" --ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" -- --# --# This is to permit URL access to scripts/files in AWStats directory. --# -- -- Options None -- AllowOverride None -- Order allow,deny -- Allow from all -- -diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.model.conf awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf ---- awstats-6.4/wwwroot/cgi-bin/awstats.model.conf 2005-02-24 22:08:40.000000000 +0100 -+++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.model.conf 2005-08-25 14:21:58.047625120 +0200 -@@ -48,7 +48,7 @@ - # If there is several log files from load balancing servers : - # Example: "/pathtotools/logresolvemerge.pl *.log |" - # --LogFile="/var/log/httpd/mylog.log" -+LogFile="/var/log/httpd/access_log" - - - # Enter the log file type you want to analyze. -@@ -145,7 +145,7 @@ - # Example: "ftp.domain.com" - # Example: "domain.com" - # --SiteDomain="" -+SiteDomain="localhost" - - - # Enter here all other possible domain names, addresses or virtual host -@@ -195,7 +195,7 @@ - # Example: "C:/awstats_data_dir" - # Default: "." (means same directory as awstats.pl) - # --DirData="." -+DirData="/var/lib/awstats" - - - # Relative or absolute web URL of your awstats cgi-bin directory. -diff -urN awstats-6.4/wwwroot/cgi-bin/awstats.pl awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl ---- awstats-6.4/wwwroot/cgi-bin/awstats.pl 2005-02-24 22:02:23.000000000 +0100 -+++ awstats-6.4_fw/wwwroot/cgi-bin/awstats.pl 2005-08-25 14:21:58.054624056 +0200 -@@ -1835,7 +1835,7 @@ - # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) - # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" - # Debian package : "/usr/share/awstats/plugins" -- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); -+ my @PossiblePluginsDir=("$DIR/plugins","/usr/lib/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); - my %DirAddedInINC=(); - - #Removed for security reason From janny at frugalware.org Mon Jul 9 00:35:02 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 00:35:04 2007 Subject: [Frugalware-git] frugalware-current: perl-file-find-closures-1.06-1-i686 Message-ID: <20070708223502.B19AE16A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d4d21a3a37a4f45bacdbedbe825a51fac56b45c0 commit d4d21a3a37a4f45bacdbedbe825a51fac56b45c0 Author: janny Date: Mon Jul 9 00:34:29 2007 +0200 perl-file-find-closures-1.06-1-i686 new package diff --git a/source/devel-extra/perl-file-find-closures/FrugalBuild b/source/devel-extra/perl-file-find-closures/FrugalBuild new file mode 100644 index 0000000..605bfca --- /dev/null +++ b/source/devel-extra/perl-file-find-closures/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Janny + +_F_perl_name=File-Find-Closures +_F_perl_author=B/BD/BDFOY +pkgver=1.06 +pkgdesc="functions you can use with File::Find" +depends=('') +Finclude perl +sha1sums=('c94ab2aee13e2ee68d9ae6b2dd34ad410648e97a') From janny at frugalware.org Mon Jul 9 00:44:54 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 00:44:56 2007 Subject: [Frugalware-git] frugalware-current: perl-text-glob-0.08-1-i686 Message-ID: <20070708224454.225A816A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=81ee6d5db7c3f504d95da87e98bf93070886e9c1 commit 81ee6d5db7c3f504d95da87e98bf93070886e9c1 Author: janny Date: Mon Jul 9 00:44:39 2007 +0200 perl-text-glob-0.08-1-i686 new package diff --git a/source/devel-extra/perl-text-glob/FrugalBuild b/source/devel-extra/perl-text-glob/FrugalBuild new file mode 100644 index 0000000..28a2d05 --- /dev/null +++ b/source/devel-extra/perl-text-glob/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Text-Glob +_F_perl_author=R/RC/RCLAMP +pkgver=0.08 +pkgdesc="match globbing patterns against text" +depends=('') +Finclude perl +sha1sums=('86b6a5e4cff2589d733975277b6f101b949ee975') From janny at frugalware.org Mon Jul 9 00:48:53 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 00:48:55 2007 Subject: [Frugalware-git] frugalware-current: perl-number-compare-0.01-1-i686 Message-ID: <20070708224854.014C716A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4fabec8f7dfd501ed472c6f5da9a89c7b8b48308 commit 4fabec8f7dfd501ed472c6f5da9a89c7b8b48308 Author: janny Date: Mon Jul 9 00:48:42 2007 +0200 perl-number-compare-0.01-1-i686 new package diff --git a/source/devel-extra/perl-number-compare/FrugalBuild b/source/devel-extra/perl-number-compare/FrugalBuild new file mode 100644 index 0000000..1d684fe --- /dev/null +++ b/source/devel-extra/perl-number-compare/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Number-Compare +_F_perl_author=R/RC/RCLAMP +pkgver=0.01 +pkgdesc="numeric comparisons" +depends=('') +Finclude perl +sha1sums=('d768ceab714b50fe1fa8e7d9133de736f58fb7b7') From janny at frugalware.org Mon Jul 9 00:52:07 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 00:52:09 2007 Subject: [Frugalware-git] frugalware-current: perl-file-find-rule-0.30-1-i686 Message-ID: <20070708225207.4EDB816A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=36cfe7574534c3264655b44028aa5bdd3471b060 commit 36cfe7574534c3264655b44028aa5bdd3471b060 Author: janny Date: Mon Jul 9 00:51:51 2007 +0200 perl-file-find-rule-0.30-1-i686 new package diff --git a/source/devel-extra/perl-file-find-rule/FrugalBuild b/source/devel-extra/perl-file-find-rule/FrugalBuild new file mode 100644 index 0000000..c4a0515 --- /dev/null +++ b/source/devel-extra/perl-file-find-rule/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Janny + +_F_perl_name=File-Find-Rule +_F_perl_author=R/RC/RCLAMP +pkgver=0.30 +pkgdesc="Alternative interface to File::Find" +depends=('perl-text-glob' 'perl-number-compare') +Finclude perl +sha1sums=('cd160432a028cf076988fa77ace3a8c3738dfa98') From janny at frugalware.org Mon Jul 9 00:58:15 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 00:58:16 2007 Subject: [Frugalware-git] frugalware-current: clamtk-2.99-1-i686 Message-ID: <20070708225815.9D82916A8078@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4d889b26999b317234ee3ecd57e9164cd5ecfd81 commit 4d889b26999b317234ee3ecd57e9164cd5ecfd81 Author: janny Date: Mon Jul 9 00:58:04 2007 +0200 clamtk-2.99-1-i686 new package closes #2233 diff --git a/source/xapps-extra/clamtk/FrugalBuild b/source/xapps-extra/clamtk/FrugalBuild new file mode 100644 index 0000000..2564cf1 --- /dev/null +++ b/source/xapps-extra/clamtk/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling time: 0.01 SBU +# Maintainer: Janny + +pkgname=clamtk +pkgver=2.99 +pkgrel=1 +pkgdesc="ClamTk is a GUI front-end for ClamAV using gtk2-perl" +url="http://clamtk.sourceforge.net/" +rodepends=('perl-gtk2' 'clamav' 'perl-date-calc' 'perl-file-find-rule' 'tk') +groups=('xapps-extra') +archs=('i686' 'x86_64') +Finclude sourceforge +sha1sums=('091431e7173e4e3c512433d3bc8683142d5895de') + +build() { + Fcd + Fexerel usr/bin/clamtk + Ficonrel ${pkgname}.{png,xpm} + Ffilerel $Fmenudir/${pkgname}.desktop + Ffilerel /usr/share/man/man1/${pkgname}.1.gz + for i in {cs_CZ,da,de,es,fr,it,pl,pt_BR,ru,zh_CN}; do + Ffilerel po/$i.mo usr/share/locale/$i/LC_MESSAGES/$pkgname.mo + done +} From vmiklos at frugalware.org Mon Jul 9 08:45:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 08:45:33 2007 Subject: [Frugalware-git] pacman-tools: dg: fix for rev -a Message-ID: <20070709064524.C50A817680AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=15a04b02e87a7c007804f480f0873a3ea9fb2e87 commit 15a04b02e87a7c007804f480f0873a3ea9fb2e87 Author: VMiklos Date: Mon Jul 9 02:48:06 2007 +0200 dg: fix for rev -a diff --git a/darcs-git.py b/darcs-git.py index 042944a..aa792d6 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -380,7 +380,10 @@ Options: print "There are no changes to revert!" sys.exit(0) if options.all: - os.system("git checkout %s" % options.files) + if(len(options.files)): + os.system("git checkout %s" % options.files) + else: + os.system("git checkout -f") print "Finished reverting." sys.exit(0) status = scan_dir(options.files) From vmiklos at frugalware.org Mon Jul 9 09:10:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 09:10:11 2007 Subject: [Frugalware-git] pacman-tools: dg: change cwd to root only in case we're not already there Message-ID: <20070709071010.4F25B17680AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=8aeaa02363159f4e5c7fb9ef1a6f54955854e558 commit 8aeaa02363159f4e5c7fb9ef1a6f54955854e558 Author: VMiklos Date: Mon Jul 9 09:10:04 2007 +0200 dg: change cwd to root only in case we're not already there diff --git a/darcs-git.py b/darcs-git.py index aa792d6..afccf7c 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -394,7 +394,9 @@ Options: else: print "Ok, if you don't want to revert anything, that's fine!" sys.exit(0) - os.chdir(os.path.split(get_root())[0]) + root = os.path.split(get_root())[0] + if len(root): + os.chdir(root) for i in status.hunks: p = [] if i.picked == True: From vmiklos at frugalware.org Mon Jul 9 09:29:16 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 09:29:18 2007 Subject: [Frugalware-git] pacman-tools: dg: handle the rename + update case like darcs did Message-ID: <20070709072916.2533817680AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=d9d8f70be172004fa1d0b67a15c2f77f853e66ea commit d9d8f70be172004fa1d0b67a15c2f77f853e66ea Author: VMiklos Date: Mon Jul 9 09:24:24 2007 +0200 dg: handle the rename + update case like darcs did diff --git a/darcs-git.py b/darcs-git.py index afccf7c..29edc16 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -313,6 +313,12 @@ Options: lines = i.text.split("\n") if "--- /dev/null" in lines: newlist.append(diff2filename(lines[0])) + else: + lines = i.text.split("\n") + if "--- /dev/null" in lines: + # this is a newly added file but maybe it has + # been updated since add. add it again + os.system("git add %s" % diff2filename(lines[0])) for i in newlist: os.system("git reset HEAD %s" % i) os.system("""git commit -m "%s" %s %s""" % From janny at frugalware.org Mon Jul 9 09:54:52 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 09:54:54 2007 Subject: [Frugalware-git] frugalware-current: clamtk-2.99-1-i686 Message-ID: <20070709075452.83EAB17680AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2b1897b48f24143c5dba2dcaeb70461bc5ee3447 commit 2b1897b48f24143c5dba2dcaeb70461bc5ee3447 Author: janny Date: Mon Jul 9 09:54:12 2007 +0200 clamtk-2.99-1-i686 remove 'tk' in depends() diff --git a/source/xapps-extra/clamtk/FrugalBuild b/source/xapps-extra/clamtk/FrugalBuild index 2564cf1..474a491 100644 --- a/source/xapps-extra/clamtk/FrugalBuild +++ b/source/xapps-extra/clamtk/FrugalBuild @@ -6,7 +6,7 @@ pkgver=2.99 pkgrel=1 pkgdesc="ClamTk is a GUI front-end for ClamAV using gtk2-perl" url="http://clamtk.sourceforge.net/" -rodepends=('perl-gtk2' 'clamav' 'perl-date-calc' 'perl-file-find-rule' 'tk') +rodepends=('perl-gtk2' 'clamav' 'perl-date-calc' 'perl-file-find-rule') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge From janny at frugalware.org Mon Jul 9 10:01:34 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 10:01:36 2007 Subject: [Frugalware-git] frugalware-current: perl-number-compare Message-ID: <20070709080134.46BD616A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=788519feb98b2167ccdcf26b7fb540166676f29c commit 788519feb98b2167ccdcf26b7fb540166676f29c Author: janny Date: Mon Jul 9 10:01:25 2007 +0200 perl-number-compare change maintainer diff --git a/source/devel-extra/perl-number-compare/FrugalBuild b/source/devel-extra/perl-number-compare/FrugalBuild index 1d684fe..999cb2d 100644 --- a/source/devel-extra/perl-number-compare/FrugalBuild +++ b/source/devel-extra/perl-number-compare/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: Janny _F_perl_name=Number-Compare _F_perl_author=R/RC/RCLAMP From janny at frugalware.org Mon Jul 9 10:02:57 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 10:02:59 2007 Subject: [Frugalware-git] frugalware-current: perl-text-glob-0.08-1-i686 Message-ID: <20070709080257.C334216A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cfd589fd57d001766077ebb247fb1978bb2573ea commit cfd589fd57d001766077ebb247fb1978bb2573ea Author: janny Date: Mon Jul 9 10:02:49 2007 +0200 perl-text-glob-0.08-1-i686 change maintainer diff --git a/source/devel-extra/perl-text-glob/FrugalBuild b/source/devel-extra/perl-text-glob/FrugalBuild index 28a2d05..237d31a 100644 --- a/source/devel-extra/perl-text-glob/FrugalBuild +++ b/source/devel-extra/perl-text-glob/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: Janny _F_perl_name=Text-Glob _F_perl_author=R/RC/RCLAMP From janny at frugalware.org Mon Jul 9 10:04:40 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 10:04:42 2007 Subject: [Frugalware-git] frugalware-current: perl-date-calc-5.4-1-i686 Message-ID: <20070709080440.42C4C16A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7cc8de2d4437998d97f513bb271017a9e7a76125 commit 7cc8de2d4437998d97f513bb271017a9e7a76125 Author: janny Date: Mon Jul 9 10:04:33 2007 +0200 perl-date-calc-5.4-1-i686 change maintainer diff --git a/source/devel-extra/perl-date-calc/FrugalBuild b/source/devel-extra/perl-date-calc/FrugalBuild index bbb4b89..493c25d 100644 --- a/source/devel-extra/perl-date-calc/FrugalBuild +++ b/source/devel-extra/perl-date-calc/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: Janny _F_perl_name=Date-Calc _F_perl_author=S/ST/STBEY From janny at frugalware.org Mon Jul 9 11:59:21 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 11:59:23 2007 Subject: [Frugalware-git] frugalware-current: gsambad-0.1.6-1-i686 Message-ID: <20070709095921.E384816A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=25e329dfbeb1cadfda4e680385d7337826762a91 commit 25e329dfbeb1cadfda4e680385d7337826762a91 Author: janny Date: Mon Jul 9 11:58:45 2007 +0200 gsambad-0.1.6-1-i686 new package diff --git a/source/xapps-extra/gsambad/FrugalBuild b/source/xapps-extra/gsambad/FrugalBuild new file mode 100644 index 0000000..8dbfa29 --- /dev/null +++ b/source/xapps-extra/gsambad/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling time: 0.05 SBU +# Maintainer: Janny + +pkgname=gsambad +pkgver=0.1.6 +pkgrel=1 +pkgdesc="GSAMBAD -- A GTK+ administation tool for the SAMBA server." +url="http://mange.dynup.net/linux.html" +license="GPL" +depends=('gtk+2') +rodepends=('samba') +archs=('i686' 'x86_64') +groups=('xapps-extra') +install=$pkgname.install +up2date="lynx -dump $url|grep $pkgname-[0-9\.]*\.tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" +source=(http://mange.dynalias.org/linux/gsambad/$pkgname-$pkgver.tar.gz netlogon_path.diff) +sha1sums=('c5098f1f80125a98a9de77f865635f94a5218f70' \ + 'a8095723e8ad4484de11855e8e75d5d83ecaebee') + +build () +{ + Fbuild + Fsed "Exec=gsambad" "Exec=gksu /usr/sbin/gsambad" desktop/net-gsambad.desktop + Ffilerel desktop/net-gsambad.desktop $Fmenudir/$pkgname.desktop + Fexerel scripts/gsambadpdf usr/bin/gsambadpdf + Frm usr/share/doc/$pkgname + Frm usr/share/pixmaps/$pkgname.png + Fln $pkgname/$pkgname.png usr/share/pixmaps/$pkgname.png +} + +# optimization OK + diff --git a/source/xapps-extra/gsambad/gsambad.install b/source/xapps-extra/gsambad/gsambad.install new file mode 100644 index 0000000..02f34f5 --- /dev/null +++ b/source/xapps-extra/gsambad/gsambad.install @@ -0,0 +1,11 @@ +post_install() { + if[ -e /etc/samba/private/smbpasswd ]; then + if[ !-e /etc/samba/smbpasswd ]; then + ln -s private/smbpasswd /etc/samba/smbpasswd + fi + fi +} + +post_upgrade() { + post_install() +} diff --git a/source/xapps-extra/gsambad/netlogon_path.diff b/source/xapps-extra/gsambad/netlogon_path.diff new file mode 100644 index 0000000..7baac46 --- /dev/null +++ b/source/xapps-extra/gsambad/netlogon_path.diff @@ -0,0 +1,21 @@ +diff -Naur gsambad-0.1.6.orig/Makefile.in gsambad-0.1.6/Makefile.in +--- gsambad-0.1.6.orig/Makefile.in 2007-06-16 23:53:50.000000000 +0200 ++++ gsambad-0.1.6/Makefile.in 2007-07-09 10:40:27.000000000 +0200 +@@ -653,12 +653,12 @@ + if test -d $(DESTDIR)$(bindir) && test ! -f $(DESTDIR)$(bindir)/gsambadpdf; then \ + cp scripts/gsambadpdf $(bindir)/; \ + fi; +- @echo Installing example logon script to static /home/netlogon. +- if test ! -d /home/netlogon; then \ +- mkdir -p /home/netlogon; \ ++ @echo Installing example logon script to static $(DESTDIR)$(sysconfdir)/gsambad/netlogon. ++ if test ! -d $(DESTDIR)$(sysconfdir)/gsambad/netlogon; then \ ++ mkdir -p $(DESTDIR)$(sysconfdir)/gsambad/netlogon; \ + fi; +- if test -d /home/netlogon && test ! -f /home/netlogon/example.bat; then \ +- cp scripts/example.bat /home/netlogon/; \ ++ if test -d $(DESTDIR)$(sysconfdir)/gsambad/netlogon && test ! -f $(DESTDIR)$(sysconfdir)/gsambad/netlogon/example.bat; then \ ++ cp scripts/example.bat $(DESTDIR)$(sysconfdir)/gsambad/netlogon/; \ + fi; + @echo "" + @echo "Start GSAMBAD by typing gsambad in a terminal" From janny at frugalware.org Mon Jul 9 13:21:32 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 13:21:35 2007 Subject: [Frugalware-git] frugalware-current: gsambad-0.1.6-1-i686 Message-ID: <20070709112132.5D20616A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3972db02538af89bad29ce86a586fa341ed44a0d commit 3972db02538af89bad29ce86a586fa341ed44a0d Author: janny Date: Mon Jul 9 13:21:09 2007 +0200 gsambad-0.1.6-1-i686 added options=('scriptlet') in FB add kde desktop file / crazy onto request diff --git a/source/xapps-extra/gsambad/FrugalBuild b/source/xapps-extra/gsambad/FrugalBuild index 8dbfa29..d3cde01 100644 --- a/source/xapps-extra/gsambad/FrugalBuild +++ b/source/xapps-extra/gsambad/FrugalBuild @@ -8,10 +8,10 @@ pkgdesc="GSAMBAD -- A GTK+ administation tool for the SAMBA server." url="http://mange.dynup.net/linux.html" license="GPL" depends=('gtk+2') -rodepends=('samba') +rodepends=('samba' 'gksu') archs=('i686' 'x86_64') groups=('xapps-extra') -install=$pkgname.install +options=('scriptlet') up2date="lynx -dump $url|grep $pkgname-[0-9\.]*\.tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://mange.dynalias.org/linux/gsambad/$pkgname-$pkgver.tar.gz netlogon_path.diff) sha1sums=('c5098f1f80125a98a9de77f865635f94a5218f70' \ @@ -22,6 +22,8 @@ build () Fbuild Fsed "Exec=gsambad" "Exec=gksu /usr/sbin/gsambad" desktop/net-gsambad.desktop Ffilerel desktop/net-gsambad.desktop $Fmenudir/$pkgname.desktop + Fsed "Exec=gksu /usr/sbin/gsambad" "Exec=kdesu /usr/sbin/gsambad" desktop/net-gsambad.desktop + Ffilerel desktop/net-gsambad.desktop $Fmenudir/kde/$pkgname.desktop Fexerel scripts/gsambadpdf usr/bin/gsambadpdf Frm usr/share/doc/$pkgname Frm usr/share/pixmaps/$pkgname.png diff --git a/source/xapps-extra/gsambad/gsambad.install b/source/xapps-extra/gsambad/gsambad.install index 02f34f5..241f6cc 100644 --- a/source/xapps-extra/gsambad/gsambad.install +++ b/source/xapps-extra/gsambad/gsambad.install @@ -4,6 +4,12 @@ post_install() { ln -s private/smbpasswd /etc/samba/smbpasswd fi fi + echo -n "updating desktop database..." + if update-desktop-database > /dev/null 2>&1 ; then + echo " done." + else + echo " failed." + fi } post_upgrade() { From janny at frugalware.org Mon Jul 9 13:51:44 2007 From: janny at frugalware.org (janny) Date: Mon Jul 9 13:51:46 2007 Subject: [Frugalware-git] frugalware-current: gsambad-0.1.6-1-i686 Message-ID: <20070709115144.361AE17680AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cc235bbe9b523aff5c381469acda2317f181bff9 commit cc235bbe9b523aff5c381469acda2317f181bff9 Author: janny Date: Mon Jul 9 13:51:23 2007 +0200 gsambad-0.1.6-1-i686 correction the in install file diff --git a/source/xapps-extra/gsambad/gsambad.install b/source/xapps-extra/gsambad/gsambad.install index 241f6cc..b58eddb 100644 --- a/source/xapps-extra/gsambad/gsambad.install +++ b/source/xapps-extra/gsambad/gsambad.install @@ -1,6 +1,6 @@ post_install() { - if[ -e /etc/samba/private/smbpasswd ]; then - if[ !-e /etc/samba/smbpasswd ]; then + if [ -e /etc/samba/private/smbpasswd ]; then + if [ !-e /etc/samba/smbpasswd ]; then ln -s private/smbpasswd /etc/samba/smbpasswd fi fi @@ -13,5 +13,5 @@ post_install() { } post_upgrade() { - post_install() + post_install } From priyank at frugalware.org Mon Jul 9 14:02:27 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 9 14:02:28 2007 Subject: [Frugalware-git] frugalware-current: xchat-gnome-0.18-1-i686 Message-ID: <20070709120227.6297016A807A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9cb7e17e3736e2bb08eb2baf9dc74e4f9015f63f commit 9cb7e17e3736e2bb08eb2baf9dc74e4f9015f63f Author: Priyank Date: Mon Jul 9 17:15:06 2007 +0530 xchat-gnome-0.18-1-i686 * Version bump diff --git a/source/gnome-extra/xchat-gnome/FrugalBuild b/source/gnome-extra/xchat-gnome/FrugalBuild index fc79ab5..1d7d22a 100644 --- a/source/gnome-extra/xchat-gnome/FrugalBuild +++ b/source/gnome-extra/xchat-gnome/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.78 SBU +# Compiling Time: 0.67 SBU # Maintainer: Priyank Gosalia pkgname=xchat-gnome -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="GNOME frontend to the popular X-Chat IRC client." url="http://xchat-gnome.navi.cx/" @@ -11,8 +11,8 @@ makedepends=('perl' 'tcl' 'gettext' 'python' 'intltool' 'gnome-doc-utils') options=('NOLIBTOOL') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://xchat-gnome.navi.cx/?page_id=15 | grep -m1 tar.bz2$ | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(http://flapjack.navi.cx/releases/xchat-gnome/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump $url/?page_id=15 | grep -m1 tar.bz2$ | Flasttarbz2" +source=(http://releases.navi.cx/xchat-gnome/$pkgname-$pkgver.tar.bz2) _F_gnome_schemas=('/etc/gconf/schemas/apps_xchat.schemas' '/etc/gconf/schemas/notification.schemas' '/etc/gconf/schemas/urlscraper.schemas' @@ -22,9 +22,10 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome-scriptlet Fconfopts="$Fconfopts --enable-ipv6 --disable-gtkfe --enable-shm" -sha1sums=('bf827dd8563cf707c1f8ef713ef6834efb169c8a') +sha1sums=('0391bfeaac53697cc080478c74c5e0de0423c636') -build() { +build() +{ Fcd Fbuild_slice_scrollkeeper Fbuild From priyank at frugalware.org Mon Jul 9 14:13:38 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 9 14:14:01 2007 Subject: [Frugalware-git] frugalware-current: sleepd-1.3.10-1-i686 Message-ID: <20070709121338.4408817680AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e7d795ece7f2a5f8844661e8f20abfbe93ea1a74 commit e7d795ece7f2a5f8844661e8f20abfbe93ea1a74 Author: Priyank Date: Mon Jul 9 17:41:51 2007 +0530 sleepd-1.3.10-1-i686 * Version bump diff --git a/source/apps-extra/sleepd/FrugalBuild b/source/apps-extra/sleepd/FrugalBuild index eba3213..0946834 100644 --- a/source/apps-extra/sleepd/FrugalBuild +++ b/source/apps-extra/sleepd/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=sleepd -pkgver=1.3.9 -pkgrel=2 +pkgver=1.3.10 +pkgrel=1 pkgdesc="A daemon to put a laptop to sleep if it is not being used or if the battery is low." url="http://kitenet.net/~joey/code/sleepd.html" depends=('apmd') @@ -13,8 +13,8 @@ backup=('etc/sleepd.conf') up2date="lynx -dump -nolist http://ftp.debian.org/debian/pool/main/s/sleepd/?M=D | grep -m1 tar.gz | sed 's/.*d_\(.*\).t.*/\1/'" source=(http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_$pkgver.tar.gz \ sleepd.conf rc.sleepd) -sha1sums=('869201a7e19e3de2f30ce7fdb591dac8568d7e17'\ - '13f636770e35ab44a3d891431abc743b684057ab'\ +sha1sums=('f0c317c96a7b34b628fc7654e6f0a7e7aa8ac895' \ + '13f636770e35ab44a3d891431abc743b684057ab' \ '417e5397a1daf5ee0b0b7bbf6ed1c3377c081257') build() From vmiklos at frugalware.org Mon Jul 9 18:54:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 18:54:03 2007 Subject: [Frugalware-git] homepage-ng: translations: new git repo Message-ID: <20070709165400.B161D16A8091@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=0f514d07064aca60c3677a45b01344c403b9d6ef commit 0f514d07064aca60c3677a45b01344c403b9d6ef Author: VMiklos Date: Mon Jul 9 18:53:20 2007 +0200 translations: new git repo diff --git a/git/repos/translations b/git/repos/translations new file mode 120000 index 0000000..5ac23ad --- /dev/null +++ b/git/repos/translations @@ -0,0 +1 @@ +../../../translations \ No newline at end of file From vmiklos at frugalware.org Mon Jul 9 20:00:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 20:00:39 2007 Subject: [Frugalware-git] kernel2622: kernel-2.6.22-1-i686 Message-ID: <20070709180037.589B216A8091@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=2beeace20810a8457fdc4cdd26b9522f58db99fd commit 2beeace20810a8457fdc4cdd26b9522f58db99fd Author: VMiklos Date: Mon Jul 9 19:26:40 2007 +0200 kernel-2.6.22-1-i686 version bump added two hotfix from lkml updated config drop already merged patches diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 6b7bc06..7a6d9de 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 11.74 SBU # Maintainer: VMiklos -_F_kernel_patches=(pppoe.patch) +_F_kernel_patches=(aacraid.diff pxa27x.diff) Finclude kernel diff --git a/source/base/kernel/aacraid.diff b/source/base/kernel/aacraid.diff new file mode 100644 index 0000000..05765df --- /dev/null +++ b/source/base/kernel/aacraid.diff @@ -0,0 +1,35 @@ +Are the shortlogs useful - yes .. they catch what appear to be mistakes + +Specifically: What happened to the aacraid ioctl security fix ? Did someone decide it +wasn't needed or did it get lost somewhere on the way ? + +While this looks scary the only obvious exploit cases are where the user can +open a device level file on an AACraid. Very few people put scanners or CD +devices on one so the actual impact is probably minimal. + +Alan + +-- + +Signed-off-by: Alan Cox + +--- a/drivers/scsi/aacraid/linit.c 2007-07-09 10:51:55.653223304 +0100 ++++ b/drivers/scsi/aacraid/linit.c 2007-07-09 10:51:55.653223304 +0100 +@@ -453,6 +453,8 @@ + static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg) + { + struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; ++ if (!capable(CAP_SYS_RAWIO)) ++ return -EPERM; + return aac_do_ioctl(dev, cmd, arg); + } + +@@ -645,6 +647,8 @@ + static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) + { + struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; ++ if (!capable(CAP_SYS_RAWIO)) ++ return -EPERM; + return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg); + } + diff --git a/source/base/kernel/config b/source/base/kernel/config index ca53585..1a2216d 100644 --- a/source/base/kernel/config +++ b/source/base/kernel/config @@ -1,5 +1,7 @@ # # Automatically generated make config: don't edit +# Linux kernel version: 2.6.22 +# Mon Jul 9 02:28:26 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -12,6 +14,7 @@ CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y CONFIG_ZONE_DMA=y +CONFIG_QUICKLIST=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y @@ -45,6 +48,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 CONFIG_CPUSETS=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -63,14 +67,20 @@ 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_SLAB=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 -# CONFIG_SLOB is not set # # Loadable module support @@ -122,11 +132,11 @@ CONFIG_X86_PC=y # CONFIG_X86_ES7000 is not set # CONFIG_PARAVIRT is not set # CONFIG_M386 is not set -CONFIG_M486=y +# CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set -# CONFIG_M686 is not set +CONFIG_M686=y # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set # CONFIG_MPENTIUMM is not set @@ -144,26 +154,31 @@ CONFIG_M486=y # 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_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_MODEL=4 CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y -# CONFIG_SCHED_MC is not set +CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -207,6 +222,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 +CONFIG_NR_QUICK=1 # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -257,8 +273,6 @@ CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_IBM_BAY=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set @@ -268,16 +282,11 @@ CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m - -# -# APM (Advanced Power Management) BIOS Support -# -CONFIG_APM=y +CONFIG_APM=m # CONFIG_APM_IGNORE_USER_SUSPEND is not set # CONFIG_APM_DO_ENABLE is not set # CONFIG_APM_CPU_IDLE is not set # CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_RTC_IS_GMT is not set # CONFIG_APM_ALLOW_INTS is not set CONFIG_APM_REAL_MODE_POWER_OFF=y @@ -331,15 +340,14 @@ CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_PCI=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y +CONFIG_PCI_GODIRECT=y +# CONFIG_PCI_GOANY is not set CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y CONFIG_ISA_DMA_API=y @@ -380,15 +388,8 @@ CONFIG_I82365=m CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=m - -# -# PCI Hotplug Support -# CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -CONFIG_HOTPLUG_PCI_IBM=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set @@ -409,7 +410,6 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -462,6 +462,8 @@ CONFIG_TCP_CONG_VEGAS=m CONFIG_TCP_CONG_SCALABLE=m # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_CUBIC is not set # CONFIG_DEFAULT_HTCP is not set @@ -470,15 +472,12 @@ CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set - -# -# IP: Virtual Server Configuration -# # CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IPV6_ROUTE_INFO is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -506,8 +505,6 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK_ENABLED=m -CONFIG_NF_CONNTRACK_SUPPORT=y -# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set CONFIG_NF_CONNTRACK=m CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y @@ -654,25 +651,13 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m # CONFIG_BRIDGE_EBT_ULOG is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -710,9 +695,6 @@ CONFIG_WAN_ROUTER=m # CONFIG_NET_SCHED=y CONFIG_NET_SCH_FIFO=y -CONFIG_NET_SCH_CLK_JIFFIES=y -# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set -# CONFIG_NET_SCH_CLK_CPU is not set # # Queueing/Scheduling @@ -831,6 +813,7 @@ CONFIG_GIRBIL_DONGLE=m CONFIG_MCP2120_DONGLE=m CONFIG_OLD_BELKIN_DONGLE=m CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m # # Old SIR device drivers @@ -880,6 +863,20 @@ CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +# CONFIG_MAC80211_LEDS is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -887,8 +884,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y -CONFIG_FIB_RULES=y +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m # # Device Drivers @@ -906,10 +903,6 @@ CONFIG_FW_LOADER=y # Connector - unified userspace <-> kernelspace linker # CONFIG_CONNECTOR=m - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_CONCAT=m @@ -957,7 +950,6 @@ CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_ABSENT=m -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -1009,27 +1001,34 @@ CONFIG_MTD_DOCPROBE=m CONFIG_MTD_DOCECC=m # CONFIG_MTD_DOCPROBE_ADVANCED is not set CONFIG_MTD_DOCPROBE_ADDRESS=0 - -# -# NAND Flash Device Drivers -# CONFIG_MTD_NAND=m CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_CS553X=m CONFIG_MTD_NAND_NANDSIM=m - -# -# OneNAND Flash Device Drivers -# +CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OTP=y # +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set + +# # Parallel port support # CONFIG_PARPORT=m @@ -1092,8 +1091,8 @@ CONFIG_PARIDE_KBIC=m CONFIG_PARIDE_KTTI=m CONFIG_PARIDE_ON20=m CONFIG_PARIDE_ON26=m -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_BLK_CPQ_DA=y +CONFIG_BLK_CPQ_CISS_DA=y CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=y CONFIG_BLK_DEV_UMEM=m @@ -1116,16 +1115,17 @@ CONFIG_ATA_OVER_ETH=m # Misc devices # CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ASUS_LAPTOP=m CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m - -# -# ATA/ATAPI/MFM/RLL support -# +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y CONFIG_IDE=y CONFIG_BLK_DEV_IDE=y @@ -1144,6 +1144,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_BLK_DEV_IDEACPI is not set # CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes @@ -1154,6 +1155,7 @@ CONFIG_BLK_DEV_CMD640_ENHANCED=y CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_IDEPCI_PCIBUS_ORDER=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_OPTI621=y @@ -1233,7 +1235,8 @@ CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1260,7 +1263,6 @@ CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=y CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_PROBE_EISA_VL is not set # CONFIG_AIC7XXX_DEBUG_ENABLE is not set CONFIG_AIC7XXX_DEBUG_MASK=0 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set @@ -1268,7 +1270,6 @@ CONFIG_SCSI_AIC7XXX_OLD=m CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=4 CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_ENABLE_RD_STRM is not set # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set @@ -1323,7 +1324,6 @@ CONFIG_SCSI_NCR_Q720=m CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 CONFIG_SCSI_NCR53C8XX_SYNC=20 -# CONFIG_SCSI_NCR53C8XX_PROFILE is not set CONFIG_SCSI_PAS16=m CONFIG_SCSI_PSI240I=m CONFIG_SCSI_QLOGIC_FAS=m @@ -1333,7 +1333,6 @@ CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_SEAGATE=m CONFIG_SCSI_SIM710=m -CONFIG_53C700_IO_MAPPED=y CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -1355,12 +1354,9 @@ CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y CONFIG_SATA_AHCI=y CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=y @@ -1377,12 +1373,11 @@ CONFIG_SATA_ULI=y CONFIG_SATA_VIA=y CONFIG_SATA_VITESSE=y CONFIG_SATA_INIC162X=m -CONFIG_SATA_INTEL_COMBINED=y -CONFIG_SATA_ACPI=y CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m @@ -1453,6 +1448,7 @@ CONFIG_DM_CRYPT=m # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set # # Fusion MPT device support @@ -1468,27 +1464,29 @@ CONFIG_FUSION_LAN=m # # IEEE 1394 (FireWire) support # +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m CONFIG_IEEE1394=y # # Subsystem Options # # CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y # -# Device Drivers +# Controllers # CONFIG_IEEE1394_PCILYNX=m CONFIG_IEEE1394_OHCI1394=m # -# Protocol Drivers +# Protocols # CONFIG_IEEE1394_VIDEO1394=m CONFIG_IEEE1394_SBP2=m # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m @@ -1505,11 +1503,7 @@ CONFIG_I2O_BUS=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m - -# -# Macintosh device drivers -# -# CONFIG_MAC_EMUMOUSEBTN is not set +# CONFIG_MACINTOSH_DRIVERS is not set # # Network device support @@ -1521,10 +1515,6 @@ CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m CONFIG_NET_SB1000=m - -# -# ARCnet devices -# CONFIG_ARCNET=m CONFIG_ARCNET_1201=m CONFIG_ARCNET_1051=m @@ -1536,10 +1526,6 @@ CONFIG_ARCNET_RIM_I=m CONFIG_ARCNET_COM20020=m CONFIG_ARCNET_COM20020_ISA=m CONFIG_ARCNET_COM20020_PCI=m - -# -# PHY device support -# CONFIG_PHYLIB=m # @@ -1611,7 +1597,7 @@ CONFIG_EEXPRESS=m CONFIG_EEXPRESS_PRO=m CONFIG_HPLAN_PLUS=m CONFIG_HPLAN=m -CONFIG_LP486E=m +# CONFIG_LP486E is not set CONFIG_ETH16I=m CONFIG_NE2000=m CONFIG_ZNET=m @@ -1659,10 +1645,7 @@ CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m - -# -# Ethernet (1000 Mbit) -# +CONFIG_NETDEV_1000=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m @@ -1684,10 +1667,7 @@ CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m - -# -# Ethernet (10000 Mbit) -# +CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y @@ -1698,10 +1678,8 @@ CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m - -# -# Token Ring devices -# +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -1716,28 +1694,16 @@ CONFIG_MADGEMC=m CONFIG_SMCTR=m # -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -CONFIG_NET_WIRELESS_RTNETLINK=y - -# -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_ARLAN=m CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m - -# -# Wireless 802.11b ISA/PCI cards support -# CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set @@ -1745,8 +1711,11 @@ CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y # CONFIG_IPW2200_RADIOTAP is not set # CONFIG_IPW2200_PROMISCUOUS is not set -# CONFIG_IPW2200_QOS is not set +CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1755,29 +1724,20 @@ CONFIG_NORTEL_HERMES=m CONFIG_PCI_HERMES=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE is not set CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m CONFIG_BCM43XX=m -# CONFIG_BCM43XX_DEBUG is not set +CONFIG_BCM43XX_DEBUG=y CONFIG_BCM43XX_DMA=y CONFIG_BCM43XX_PIO=y CONFIG_BCM43XX_DMA_AND_PIO_MODE=y @@ -1785,11 +1745,32 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y # CONFIG_BCM43XX_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set -CONFIG_NET_WIRELESS=y # -# PCMCIA network device support +# USB Network Adapters # +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_3C574=m @@ -1801,10 +1782,6 @@ CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m CONFIG_ARCNET_COM20020_CS=m CONFIG_PCMCIA_IBMTR=m - -# -# Wan interfaces -# CONFIG_WAN=y CONFIG_HOSTESS_SV11=m CONFIG_COSA=m @@ -1846,10 +1823,7 @@ CONFIG_LAPBETHER=m CONFIG_X25_ASY=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set - -# -# ATM drivers -# +CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m @@ -1903,7 +1877,6 @@ CONFIG_NET_FC=y CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y -CONFIG_NETPOLL_RX=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y @@ -1968,6 +1941,7 @@ CONFIG_PHONE_IXJ_PCMCIA=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1995,7 +1969,14 @@ CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_ATIXL=y CONFIG_MOUSE_LOGIBM=m @@ -2026,6 +2007,13 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m # CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2036,10 +2024,23 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m CONFIG_INPUT_UINPUT=m # @@ -2133,10 +2134,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m - -# -# Watchdog Cards -# CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2154,7 +2151,6 @@ CONFIG_IB700_WDT=m CONFIG_IBMASR=m CONFIG_WAFER_WDT=m CONFIG_I6300ESB_WDT=m -CONFIG_I8XX_TCO=m CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_SC1200_WDT=m @@ -2248,11 +2244,9 @@ CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m CONFIG_TELCLOCK=m - -# -# I2C support -# +CONFIG_DEVPORT=y CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m # @@ -2281,11 +2275,13 @@ CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m +CONFIG_I2C_SIMTEC=m CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m # CONFIG_I2C_STUB is not set +CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_VOODOO3=m @@ -2322,6 +2318,7 @@ CONFIG_SPI_BITBANG=m # SPI Protocol Masters # CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m # # Dallas's 1-wire bus @@ -2343,13 +2340,10 @@ CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -2365,6 +2359,7 @@ CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM70=m @@ -2378,6 +2373,7 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m @@ -2395,6 +2391,7 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2409,14 +2406,7 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# +CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TVAUDIO=m @@ -2426,6 +2416,9 @@ CONFIG_VIDEO_TDA9875=m CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m CONFIG_VIDEO_KS0127=m @@ -2436,10 +2429,14 @@ CONFIG_VIDEO_SAA7114=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_VIVI=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y @@ -2477,14 +2474,12 @@ CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_CAFE_CCIC=m - -# -# V4L USB devices -# +CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_29XXX is not set -# CONFIG_VIDEO_PVRUSB2_24XXX is not set +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y # CONFIG_VIDEO_PVRUSB2_SYSFS is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_USBVISION=m @@ -2503,10 +2498,8 @@ CONFIG_USB_STV680=m CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set - -# -# Radio Adapters -# +CONFIG_USB_ZR364XX=m +CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_CADET=m CONFIG_RADIO_RTRACK=m CONFIG_RADIO_RTRACK2=m @@ -2523,13 +2516,9 @@ CONFIG_RADIO_TYPHOON=m CONFIG_RADIO_TYPHOON_PROC_FS=y CONFIG_RADIO_ZOLTRIX=m CONFIG_USB_DSBR=m - -# -# Digital Video Broadcasting Devices -# -CONFIG_DVB=y CONFIG_DVB_CORE=m CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y # # Supported SAA7146 based PCI Adapters @@ -2563,6 +2552,7 @@ CONFIG_DVB_USB_GP8PSK=m CONFIG_DVB_USB_NOVA_T_USB2=m CONFIG_DVB_USB_TTUSB2=m CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_CINERGYT2=m @@ -2629,6 +2619,7 @@ CONFIG_DVB_DIB7000P=m # CONFIG_DVB_VES1820=m CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m CONFIG_DVB_STV0297=m # @@ -2645,9 +2636,9 @@ CONFIG_DVB_LGDT330X=m # CONFIG_DVB_PLL=m CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m CONFIG_DVB_TUNER_QT1010=m CONFIG_DVB_TUNER_MT2060=m -CONFIG_DVB_TUNER_LGH06XF=m # # Miscellaneous devices @@ -2663,6 +2654,7 @@ CONFIG_VIDEO_BUF_DVB=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_DAB=y CONFIG_USB_DABUSB=m # @@ -2672,12 +2664,28 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# +CONFIG_VGASTATE=m CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set CONFIG_FB_DDC=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y @@ -2695,6 +2703,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m CONFIG_FB_VESA=y +# CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -2702,6 +2711,8 @@ CONFIG_FB_VESA=y CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y # CONFIG_FB_I810_I2C is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m CONFIG_FB_INTEL=m # CONFIG_FB_INTEL_DEBUG is not set CONFIG_FB_INTEL_I2C=y @@ -2731,8 +2742,11 @@ CONFIG_FB_SIS_315=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set # CONFIG_FB_CYBLA is not set # CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set # CONFIG_FB_GEODE is not set CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set @@ -2758,10 +2772,6 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set - -# -# Logo configuration -# # CONFIG_LOGO is not set # @@ -2841,9 +2851,11 @@ CONFIG_SND_SB8=m CONFIG_SND_SB16=m CONFIG_SND_SBAWE=m CONFIG_SND_SB16_CSP=y +# CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL is not set CONFIG_SND_SGALAXY=m CONFIG_SND_SSCAPE=m CONFIG_SND_WAVEFRONT=m +# CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL is not set # # PCI devices @@ -2895,7 +2907,9 @@ CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_KORG1212=m +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MAESTRO3=m +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MIXART=m CONFIG_SND_NM256=m CONFIG_SND_PCXHR=m @@ -2909,6 +2923,7 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set CONFIG_SND_AC97_POWER_SAVE=y # @@ -2916,6 +2931,8 @@ CONFIG_SND_AC97_POWER_SAVE=y # CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +# CONFIG_SND_USB_CAIAQ_INPUT is not set # # PCMCIA devices @@ -2924,7 +2941,7 @@ CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # -# SoC audio support +# System on Chip audio support # # CONFIG_SND_SOC is not set @@ -2941,6 +2958,19 @@ CONFIG_HID=y # CONFIG_HID_DEBUG is not set # +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y + +# # USB support # CONFIG_USB_ARCH_HAS_HCD=y @@ -2953,6 +2983,7 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set @@ -3003,69 +3034,10 @@ CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_LIBUSUAL is not set # -# USB Input Devices -# -CONFIG_USB_HID=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -CONFIG_HID_FF=y -CONFIG_HID_PID=y -CONFIG_LOGITECH_FF=y -CONFIG_PANTHERLORD_FF=y -CONFIG_THRUSTMASTER_FF=y -CONFIG_ZEROPLUS_FF=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m -CONFIG_USB_POWERMATE=m -CONFIG_USB_TOUCHSCREEN=m -CONFIG_USB_TOUCHSCREEN_EGALAX=y -CONFIG_USB_TOUCHSCREEN_PANJIT=y -CONFIG_USB_TOUCHSCREEN_3M=y -CONFIG_USB_TOUCHSCREEN_ITM=y -CONFIG_USB_TOUCHSCREEN_ETURBO=y -CONFIG_USB_TOUCHSCREEN_GUNZE=y -CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y -CONFIG_USB_YEALINK=m -CONFIG_USB_XPAD=m -CONFIG_USB_ATI_REMOTE=m -CONFIG_USB_ATI_REMOTE2=m -CONFIG_USB_KEYSPAN_REMOTE=m -CONFIG_USB_APPLETOUCH=m -CONFIG_USB_GTCO=m - -# # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET_MII=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_MON is not set # @@ -3172,6 +3144,7 @@ CONFIG_USB_XUSBATM=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FSL_USB2 is not set CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set @@ -3189,13 +3162,18 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set # -# MMC/SD Card support +# MMC/SD Card Drivers # -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=m + +# +# MMC/SD Host Controller Drivers +# CONFIG_MMC_SDHCI=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -3224,6 +3202,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y @@ -3231,6 +3210,7 @@ CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -3265,30 +3245,44 @@ CONFIG_RTC_CLASS=m # # RTC interfaces # -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m # -# RTC drivers +# I2C RTC drivers # -CONFIG_RTC_DRV_CMOS=m -CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m + +# +# SPI RTC drivers +# CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_TEST=m CONFIG_RTC_DRV_MAX6902=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_V3020=m # +# on-CPU RTC drivers +# + +# # DMA Engine support # CONFIG_DMA_ENGINE=y @@ -3463,6 +3457,7 @@ CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3485,7 +3480,7 @@ CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_DEBUG is not set # CONFIG_9P_FS is not set # @@ -3509,6 +3504,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -3558,8 +3554,6 @@ CONFIG_NLS_UTF8=m # Distributed Lock Manager # CONFIG_DLM=m -CONFIG_DLM_TCP=y -# CONFIG_DLM_SCTP is not set # CONFIG_DLM_DEBUG is not set # @@ -3579,7 +3573,6 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 CONFIG_DEBUG_BUGVERBOSE=y CONFIG_EARLY_PRINTK=y CONFIG_X86_FIND_SMP_CONFIG=y @@ -3603,6 +3596,7 @@ CONFIG_SECURITY_ROOTPLUG=m # CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y @@ -3621,6 +3615,7 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_BLOWFISH=m @@ -3656,12 +3651,15 @@ CONFIG_CRYPTO_DEV_GEODE=m CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3669,6 +3667,7 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y diff --git a/source/base/kernel/pppoe.patch b/source/base/kernel/pppoe.patch deleted file mode 100644 index dfa4c10..0000000 --- a/source/base/kernel/pppoe.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Florian Zumbiehl -Date: Fri, 20 Apr 2007 23:58:14 +0000 (-0700) -Subject: [PPPOE]: memory leak when socket is release()d before PPPIOCGCHAN has been called ... -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=202a03acf9994076055df40ae093a5c5474ad0bd - -[PPPOE]: memory leak when socket is release()d before PPPIOCGCHAN has been called on it - -below you find a patch that fixes a memory leak when a PPPoE socket is -release()d after it has been connect()ed, but before the PPPIOCGCHAN ioctl -ever has been called on it. - -This is somewhat of a security problem, too, since PPPoE sockets can be -created by any user, so any user can easily allocate all the machine's -RAM to non-swappable address space and thus DoS the system. - -Is there any specific reason for PPPoE sockets being available to any -unprivileged process, BTW? After all, you need a packet socket for the -discovery stage anyway, so it's unlikely that any unprivileged process -will ever need to create a PPPoE socket, no? Allocating all session IDs -for a known AC is a kind of DoS, too, after all - with Juniper ERXes, -this is really easy, actually, since they don't ever assign session ids -above 8000 ... - -Signed-off-by: Florian Zumbiehl -Acked-by: Michal Ostrowski -Signed-off-by: David S. Miller ---- - -diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c -index 9315046..3f8115d 100644 ---- a/drivers/net/pppox.c -+++ b/drivers/net/pppox.c -@@ -58,7 +58,7 @@ void pppox_unbind_sock(struct sock *sk) - { - /* Clear connection to ppp device, if attached. */ - -- if (sk->sk_state & (PPPOX_BOUND | PPPOX_ZOMBIE)) { -+ if (sk->sk_state & (PPPOX_BOUND | PPPOX_CONNECTED | PPPOX_ZOMBIE)) { - ppp_unregister_channel(&pppox_sk(sk)->chan); - sk->sk_state = PPPOX_DEAD; - } diff --git a/source/base/kernel/pxa27x.diff b/source/base/kernel/pxa27x.diff new file mode 100644 index 0000000..a061352 --- /dev/null +++ b/source/base/kernel/pxa27x.diff @@ -0,0 +1,22 @@ +The PXA2xx keyboard driver does not compile with 2.6.22 +The following patch fixes it + +Signed-off-by: Mike Rapoport +Acked-by: Rodolfo Giometti + + drivers/input/keyboard/pxa27x_keyboard.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c +index f9e82c9..ebe5eac 100644 +--- a/drivers/input/keyboard/pxa27x_keyboard.c ++++ b/drivers/input/keyboard/pxa27x_keyboard.c +@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform_device *pdev) + KPREC = pdata->reg_kprec; + + /* Enable unit clock */ +- pxa_set_cken(CKEN19_KEYPAD, 1); ++ pxa_set_cken(CKEN_KEYPAD, 1); + } + + mutex_unlock(&input_dev->mutex); diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index cfab3a2..c3e0e77 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -15,6 +15,6 @@ # * _F_kernelver_rel: the kernel release # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### -_F_kernelver_ver=2.6.21 -_F_kernelver_rel=3 -_F_kernelver_stable=5 +_F_kernelver_ver=2.6.22 +_F_kernelver_rel=1 +#_F_kernelver_stable=1 From vmiklos at frugalware.org Mon Jul 9 20:20:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 20:20:47 2007 Subject: [Frugalware-git] kernel2622: rlocate-0.5.5-12-i686 Message-ID: <20070709182043.A70A316A8091@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=001a81e38e3367ce88a1bf4b1dc7a6d8643027e7 commit 001a81e38e3367ce88a1bf4b1dc7a6d8643027e7 Author: VMiklos Date: Mon Jul 9 20:20:25 2007 +0200 rlocate-0.5.5-12-i686 rebuild in kernel2622 diff --git a/source/apps-extra/rlocate/FrugalBuild b/source/apps-extra/rlocate/FrugalBuild index 99ad716..b5cc85b 100644 --- a/source/apps-extra/rlocate/FrugalBuild +++ b/source/apps-extra/rlocate/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rlocate pkgver=0.5.5 -pkgrel=11 +pkgrel=12 pkgdesc="rlocate is an implementation of the locate command" Finclude kernel-module depends=(${depends[@]} 'glibc' 'util-linux' 'psmisc') From priyank at frugalware.org Mon Jul 9 20:51:13 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 9 20:51:15 2007 Subject: [Frugalware-git] frugalware-current: armagetronad-0.2.8.2.1-1-i686 Message-ID: <20070709185113.3104316A8091@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=91637d5ff176605654b924adaf577511a3406f08 commit 91637d5ff176605654b924adaf577511a3406f08 Author: Priyank Date: Tue Jul 10 00:20:16 2007 +0530 armagetronad-0.2.8.2.1-1-i686 * New package / Closes #1122 diff --git a/source/games-extra/armagetronad/FrugalBuild b/source/games-extra/armagetronad/FrugalBuild new file mode 100644 index 0000000..015e374 --- /dev/null +++ b/source/games-extra/armagetronad/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.53 SBU +# Maintainer: Priyank Gosalia +# Contributor: free-zombie + +pkgname=armagetronad +pkgver=0.2.8.2.1 +pkgrel=1 +pkgdesc="A TRON clone in 3D" +url="http://www.armagetronad.net/" +depends=('sdlimage' 'libjpeg' 'libpng' 'zlib' 'mesa' 'libgl' 'libxml2' 'libstdc++' 'libx11') +groups=('games-extra') +archs=('i686') +_F_sourceforge_ext=".src.tar.bz2" +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/project/showfiles.php\?group_id=110997 | grep -m1 src.tar.bz2 | sed 's/^.*-\(.*\).src.*$/\1/'" +sha1sums=('5df5f1b767ee8dcb0f50ce8459a9acfcdb073a66') + +# optimization OK From vmiklos at frugalware.org Mon Jul 9 21:02:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 21:02:50 2007 Subject: [Frugalware-git] kernel2622: acerhk-0.5.35-4-i686 Message-ID: <20070709190248.CABE416A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=ca1cb7a4cd1943dedaec7ca5e7cbbbd2bb9150ec commit ca1cb7a4cd1943dedaec7ca5e7cbbbd2bb9150ec Author: VMiklos Date: Mon Jul 9 21:02:31 2007 +0200 acerhk-0.5.35-4-i686 rebuild in kernel2622 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 496f63e..eeafb68 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=3 +pkgrel=4 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From voroskoi at frugalware.org Mon Jul 9 21:10:35 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Jul 9 21:10:36 2007 Subject: [Frugalware-git] frugalware-current: nginx-0.5.27-1-i686 Message-ID: <20070709191035.D845016A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=047dbb85345f38936e7f5f0a2d383f902d861d21 commit 047dbb85345f38936e7f5f0a2d383f902d861d21 Author: voroskoi Date: Mon Jul 9 21:08:47 2007 +0200 nginx-0.5.27-1-i686 version bump diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild index 9ab211b..3f730bd 100644 --- a/source/network-extra/nginx/FrugalBuild +++ b/source/network-extra/nginx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=nginx -pkgver=0.5.26 +pkgver=0.5.27 pkgrel=1 pkgdesc="[engine x] is a HTTP server and mail proxy server." url="http://nginx.net/" @@ -49,7 +49,7 @@ build() { Fmv $Fsysconfdir/$pkgname/html $Flocalstatedir/www/$pkgname Fln $Flocalstatedir/www/$pkgname $Fsysconfdir/$pkgname/html } -sha1sums=('86b7ccc4bfbaa44bca979e23c4a5bbf0ef090ee3' \ +sha1sums=('e51c0f2b29d88a664ecf196b6c77badcfcc695e2' \ 'e8cc09710ba365eb932d1710f4aac629e49452ff' \ 'da58d8a74dbb081c3dfb69317999e10f1ebf991e' \ '3a4cc4564ce610400e012d7c391107f33a258f1e') From voroskoi at frugalware.org Mon Jul 9 21:22:42 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Jul 9 21:22:43 2007 Subject: [Frugalware-git] frugalware-current: vtun-3.0.1-1-i686 Message-ID: <20070709192242.4DBF017680B8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3d3019a89f925800893a1f760d29fd5208da8c99 commit 3d3019a89f925800893a1f760d29fd5208da8c99 Author: voroskoi Date: Mon Jul 9 21:20:53 2007 +0200 vtun-3.0.1-1-i686 version bump diff --git a/source/network-extra/vtun/FrugalBuild b/source/network-extra/vtun/FrugalBuild index 4601e72..9838e66 100644 --- a/source/network-extra/vtun/FrugalBuild +++ b/source/network-extra/vtun/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=vtun -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="The easiest way to create Virtual Tunnels over TCP/IP networks" Finclude sourceforge url="http://vtun.sourceforge.net/" @@ -14,8 +14,8 @@ depends=('openssl>=0.9.8' 'zlib' 'lzo') backup=('etc/vtund.conf') source=($source rc.vtund lzo_fixes.diff) up2date="lynx -dump $url|grep Released|sed -ne 's/.*n \(.*\)$/\1/;1 p'" -sha1sums=('546d4d198b5e0839f81b14dd53253710c1394bf8'\ - '42b02a5fea33c66ac64bbd478c63bdd7ce4c6af3'\ +sha1sums=('b2081ee7238109beef09c1a2aaaf73c331e667e3' \ + '42b02a5fea33c66ac64bbd478c63bdd7ce4c6af3' \ 'f72f1f70e4c23c5cba004192080d09049ac0f188') build() { From vmiklos at frugalware.org Mon Jul 9 21:24:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 21:24:30 2007 Subject: [Frugalware-git] kernel2622: kqemu-1.3.0pre11-10-i686 Message-ID: <20070709192427.D7DFD16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=487f01dab4a90f0a783aceb886370d98d6280278 commit 487f01dab4a90f0a783aceb886370d98d6280278 Author: VMiklos Date: Mon Jul 9 21:15:33 2007 +0200 kqemu-1.3.0pre11-10-i686 rebuild in kernel2622 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index 2a58558..e2c4fcf 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=9 +pkgrel=10 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') @@ -12,6 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep kqemu.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=($url/kqemu-$pkgver.tar.gz) +sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71') build() { @@ -22,4 +23,3 @@ build() echo 'KERNEL=="kqemu*", NAME="%k", GROUP="users", MODE="0660"' \ > $Fdestdir/etc/udev/rules.d/48-qemu.rules } -sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71') From vmiklos at frugalware.org Mon Jul 9 21:29:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 21:29:35 2007 Subject: [Frugalware-git] kernel2622: truecrypt-4.3-7-i686 Message-ID: <20070709192933.B6CAD16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=b78713e4bbb1fc6096e73d64b95805edc751bec1 commit b78713e4bbb1fc6096e73d64b95805edc751bec1 Author: VMiklos Date: Mon Jul 9 21:29:23 2007 +0200 truecrypt-4.3-7-i686 rebuild in kernel2622 diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild index fb5fe54..c9b2aab 100644 --- a/source/apps-extra/truecrypt/FrugalBuild +++ b/source/apps-extra/truecrypt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=truecrypt pkgver=4.3 pkgextraver=a -pkgrel=6 +pkgrel=7 pkgdesc="A free open-source disk encryption software" url="http://www.truecrypt.org/" Finclude kernel-module From vmiklos at frugalware.org Mon Jul 9 21:47:16 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 21:47:20 2007 Subject: [Frugalware-git] kernel2622: fglrx-8.38.6-2-i686 Message-ID: <20070709194716.CA55B16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=599a65800158a984792d8dd28e32aa0e9dc65275 commit 599a65800158a984792d8dd28e32aa0e9dc65275 Author: VMiklos Date: Mon Jul 9 21:43:01 2007 +0200 fglrx-8.38.6-2-i686 rebuild in kernel2622 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 6ffc606..b0d857e 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=fglrx pkgver=8.38.6 -pkgrel=1 +pkgrel=2 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From vmiklos at frugalware.org Mon Jul 9 22:11:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 22:11:13 2007 Subject: [Frugalware-git] kernel2622: qc-usb-0.6.6-17-i686 Message-ID: <20070709201112.4526D16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=f398e93b96b653b61b804b1e5f7a229c5f5163f5 commit f398e93b96b653b61b804b1e5f7a229c5f5163f5 Author: VMiklos Date: Mon Jul 9 22:11:02 2007 +0200 qc-usb-0.6.6-17-i686 rebuild in kernel2622 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index a9c11af..c489890 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=16 +pkgrel=17 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Mon Jul 9 22:19:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 22:19:41 2007 Subject: [Frugalware-git] kernel2622: ipw3945-1.2.1-4-i686 Message-ID: <20070709201939.6410116A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=ce5e09f38767e790755680b98d155f4b53b996d3 commit ce5e09f38767e790755680b98d155f4b53b996d3 Author: VMiklos Date: Mon Jul 9 22:19:31 2007 +0200 ipw3945-1.2.1-4-i686 rebuild in kernel2622 diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild index 2b50dbb..18d681d 100644 --- a/source/network-extra/ipw3945/FrugalBuild +++ b/source/network-extra/ipw3945/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ipw3945 pkgver=1.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux" _F_sourceforge_ext=".tgz" Finclude sourceforge kernel-module From vmiklos at frugalware.org Mon Jul 9 22:52:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 22:52:52 2007 Subject: [Frugalware-git] kernel2622: dazuko-2.3.3-6-i686 Message-ID: <20070709205250.C054716A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=aa61b9fec7b428b6786c1504ccb5dd6d3c39f95c commit aa61b9fec7b428b6786c1504ccb5dd6d3c39f95c Author: VMiklos Date: Mon Jul 9 22:52:37 2007 +0200 dazuko-2.3.3-6-i686 rebuild in kernel2622 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 7c69e2c..4e94420 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dazuko pkgver=2.3.3 -pkgrel=5 +pkgrel=6 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From voroskoi at frugalware.org Mon Jul 9 22:53:44 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Jul 9 22:53:46 2007 Subject: [Frugalware-git] homepage-ng: FSA217-xvidcore Message-ID: <20070709205344.CC14F16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=40af978ea4b1d9448646e9219e27032aa1207638 commit 40af978ea4b1d9448646e9219e27032aa1207638 Author: voroskoi Date: Mon Jul 9 22:51:45 2007 +0200 FSA217-xvidcore diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index ac018ea..e68a7e4 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 217 + 2007-07-09 + voroskoi + xvidcore + 1.1.2-1 + 1.1.3-1terminus1 + http://bugs.frugalware.org/task/2212 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3329 + Trixter Jack has reported a vulnerability in the Xvid library, which can be exploited by malicious people to compromise an application using the library. + The vulnerability is caused due to an array indexing error in the "get_intra_block()" function within src/bitstream/mbcoding.c while processing Xvid Avi files. This can be exploited to corrupt memory via a specially crafted file. Successful exploitation may allow execution of arbitrary code. + + 216 2007-07-05 voroskoi From vmiklos at frugalware.org Mon Jul 9 23:00:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 23:00:40 2007 Subject: [Frugalware-git] homepage-ng: hooks: first update the working dir and _then_ check for news/fsas Message-ID: <20070709210039.3785D16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=1fbc25117641e36758e145fe935ccdf9ecaaaa1d commit 1fbc25117641e36758e145fe935ccdf9ecaaaa1d Author: VMiklos Date: Mon Jul 9 22:59:57 2007 +0200 hooks: first update the working dir and _then_ check for news/fsas diff --git a/Makefile b/Makefile index 96d3ece..fc5977a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ hook: + cd .git && python /home/ftp/pub/other/git-hooks/git-hooks.py python frugalware/darcs-posthook.py python frugalware/darcs-posthook-security.py - cd .git && python /home/ftp/pub/other/git-hooks/git-hooks.py From vmiklos at frugalware.org Mon Jul 9 23:04:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 23:04:42 2007 Subject: [Frugalware-git] kernel2622: nvidia-100.14.09-3-i686 Message-ID: <20070709210441.4EDB216A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=6f6abbd3add9002171e6116f8b72bc73700d4621 commit 6f6abbd3add9002171e6116f8b72bc73700d4621 Author: VMiklos Date: Mon Jul 9 23:04:31 2007 +0200 nvidia-100.14.09-3-i686 rebuild in kernel2622 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 734b63e..6cfced5 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=100.14.09 -pkgrel=2 +pkgrel=3 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From vmiklos at frugalware.org Mon Jul 9 23:20:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 23:20:07 2007 Subject: [Frugalware-git] kernel2622: gspcav1-1.00.18-5-i686 Message-ID: <20070709212003.B20E316A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=e1e8ede244e4780a181803d73079402222c5abf6 commit e1e8ede244e4780a181803d73079402222c5abf6 Author: VMiklos Date: Mon Jul 9 23:19:51 2007 +0200 gspcav1-1.00.18-5-i686 rebuild in kernel2622 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index 8faa4fc..954b248 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.18 -pkgrel=4 +pkgrel=5 pkgdate=20070508 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From vmiklos at frugalware.org Mon Jul 9 23:25:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 23:25:51 2007 Subject: [Frugalware-git] kernel2622: ndiswrapper-1.47-3-i686 Message-ID: <20070709212545.5EAF616A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=e7d4ed3267c2e9f4c456f7af576cbb999a59212e commit e7d4ed3267c2e9f4c456f7af576cbb999a59212e Author: VMiklos Date: Mon Jul 9 23:25:35 2007 +0200 ndiswrapper-1.47-3-i686 rebuild in kernel2622 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 06c90af..7606289 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.47 -pkgrel=2 +pkgrel=3 pkgdesc="Wrapper for using Windows drivers for some wireless cards" Finclude kernel-module sourceforge unset install From vmiklos at frugalware.org Mon Jul 9 23:34:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 23:34:53 2007 Subject: [Frugalware-git] kernel2622: nvidia-96xx-1.0_9639-3-i686 Message-ID: <20070709213450.9E47D16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=46175a2a591b8b68e55d7c2e65e6fc3560aedb40 commit 46175a2a591b8b68e55d7c2e65e6fc3560aedb40 Author: VMiklos Date: Mon Jul 9 23:34:38 2007 +0200 nvidia-96xx-1.0_9639-3-i686 rebuild in kernel2622 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index 8b63bb2..a892d70 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=nvidia-96xx pkgver=1.0_9639 nvver=`echo $pkgver|sed 's/_/-/'` -pkgrel=2 +pkgrel=3 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From vmiklos at frugalware.org Mon Jul 9 23:43:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 9 23:43:52 2007 Subject: [Frugalware-git] kernel2622: lirc-0.8.2-3-i686 Message-ID: <20070709214351.0073616A8091@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=00ed3c774cbc64d4370145d1863fc3c4efef9b97 commit 00ed3c774cbc64d4370145d1863fc3c4efef9b97 Author: VMiklos Date: Mon Jul 9 23:43:38 2007 +0200 lirc-0.8.2-3-i686 rebuild in kernel2622 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 10a28e8..0d68a7c 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Tue Jul 10 00:03:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 00:03:36 2007 Subject: [Frugalware-git] kernel2622: ivtv-0.10.3-4-i686 Message-ID: <20070709220334.3177617680B8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=e9dde7e83cdfa7dffcbe49af8181af8563381911 commit e9dde7e83cdfa7dffcbe49af8181af8563381911 Author: VMiklos Date: Tue Jul 10 00:03:21 2007 +0200 ivtv-0.10.3-4-i686 remove kernel module, it's already in kernel-2.6.22 diff --git a/source/multimedia-extra/ivtv/FrugalBuild b/source/multimedia-extra/ivtv/FrugalBuild index 41a0694..db480a0 100644 --- a/source/multimedia-extra/ivtv/FrugalBuild +++ b/source/multimedia-extra/ivtv/FrugalBuild @@ -5,10 +5,9 @@ pkgname=ivtv branch=0.10.x pkgver=0.10.3 -pkgrel=3 +pkgrel=4 pkgdesc="Linux module and a driver for X11 for hardware based on Conexant's codec chip." url="http://ivtvdriver.org/index.php/Main_Page" -Finclude kernel-module rodepends=("$pkgname-firmware") groups=('multimedia-extra') archs=('i686') @@ -31,7 +30,6 @@ build() do Fsed "-O2" "$CFLAGS" $crap done - KDIR=$_F_kernelmod_dir/build cd utils make || Fdie Fmakeinstall PREFIX=/usr @@ -44,11 +42,6 @@ build() done ## utils and the test tools Fsplit $pkgname-utils /usr - ## kernel mod - cd ../driver - Fsed '/sbin/depmod -a' '#/sbin/depmod -a' Makefile - make KDIR=$_F_kernelmod_dir/build || Fdie - Fmakeinstall KDIR=$_F_kernelmod_dir/build cd .. ## firmware Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware From vmiklos at frugalware.org Tue Jul 10 00:23:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 00:23:13 2007 Subject: [Frugalware-git] kernel2622: ivtv-utils-0.10.3-4-i686 Message-ID: <20070709222310.D247417680B8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=2a44e77c04ffd3f0b6ebbaca53faf860b8fd8b93 commit 2a44e77c04ffd3f0b6ebbaca53faf860b8fd8b93 Author: VMiklos Date: Tue Jul 10 00:22:58 2007 +0200 ivtv-utils-0.10.3-4-i686 remove empty ivtv pkg ok crazy@ diff --git a/source/multimedia-extra/ivtv/FrugalBuild b/source/multimedia-extra/ivtv/FrugalBuild index db480a0..f1bee98 100644 --- a/source/multimedia-extra/ivtv/FrugalBuild +++ b/source/multimedia-extra/ivtv/FrugalBuild @@ -2,28 +2,30 @@ # Maintainer: crazy -pkgname=ivtv +pkgname=ivtv-utils branch=0.10.x pkgver=0.10.3 pkgrel=4 -pkgdesc="Linux module and a driver for X11 for hardware based on Conexant's codec chip." +pkgdesc="Tools for managing the hardware supported by ivtv driver" url="http://ivtvdriver.org/index.php/Main_Page" -rodepends=("$pkgname-firmware") -groups=('multimedia-extra') +depends=('libstdc++') +rodepends=('ivtv-firmware') +conflicts=('ivtv') +groups=('apps-extra') archs=('i686') up2date="lynx -dump http://ivtvdriver.org/index.php/Main_Page|grep -m1 'ivtv-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" -source=(http://dl.ivtvdriver.org/$pkgname/archive/$branch/$pkgname-$pkgver.tar.gz \ - http://dl.ivtvdriver.org/$pkgname/firmware/firmware.tar.gz) +source=(http://dl.ivtvdriver.org/ivtv/archive/$branch/ivtv-$pkgver.tar.gz \ + http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz) -subpkgs=("$pkgname-utils" "$pkgname-firmware") -subdescs=("Tools for managing the hardware supported by ivtv driver" "Firmware for Hauppauge PVR and Conexant based cards") -subdepends=('libstdc++' 'udev') -subgroups=('apps-extra' 'multimedia-extra') -subarchs=('i686' 'i686') +subpkgs=('ivtv-firmware') +subdescs=("Firmware for Hauppauge PVR and Conexant based cards") +subdepends=('udev') +subgroups=('multimedia-extra') +subarchs=('i686') build() { - Fcd + Fcd ivtv-$pkgver Fpatchall ## man some apps have such crappy and broken build tools ... for crap in `find . -name Makefile` @@ -40,12 +42,10 @@ build() do cp $tool $Fdestdir/usr/bin/ done - ## utils and the test tools - Fsplit $pkgname-utils /usr cd .. ## firmware Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware - Fsplit $pkgname-firmware lib/firmware + Fsplit ivtv-firmware lib/firmware ## docs Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver } From vmiklos at frugalware.org Tue Jul 10 00:24:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 00:24:38 2007 Subject: [Frugalware-git] kernel2622: ivtv-utils-0.10.3-4-i686 Message-ID: <20070709222435.C07D017680B8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=a92089939a4cab15a8da6274d1ea83c38565993b commit a92089939a4cab15a8da6274d1ea83c38565993b Author: VMiklos Date: Tue Jul 10 00:24:27 2007 +0200 ivtv-utils-0.10.3-4-i686 brr, forgot to rename the dir diff --git a/source/multimedia-extra/ivtv-utils/FrugalBuild b/source/multimedia-extra/ivtv-utils/FrugalBuild new file mode 100644 index 0000000..f1bee98 --- /dev/null +++ b/source/multimedia-extra/ivtv-utils/FrugalBuild @@ -0,0 +1,55 @@ +# Compiling Time: 0.05 SBU +# Maintainer: crazy + + +pkgname=ivtv-utils +branch=0.10.x +pkgver=0.10.3 +pkgrel=4 +pkgdesc="Tools for managing the hardware supported by ivtv driver" +url="http://ivtvdriver.org/index.php/Main_Page" +depends=('libstdc++') +rodepends=('ivtv-firmware') +conflicts=('ivtv') +groups=('apps-extra') +archs=('i686') +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) + +subpkgs=('ivtv-firmware') +subdescs=("Firmware for Hauppauge PVR and Conexant based cards") +subdepends=('udev') +subgroups=('multimedia-extra') +subarchs=('i686') + +build() +{ + Fcd ivtv-$pkgver + Fpatchall + ## man some apps have such crappy and broken build tools ... + for crap in `find . -name Makefile` + do + Fsed "-O2" "$CFLAGS" $crap + done + cd utils + make || Fdie + Fmakeinstall PREFIX=/usr + cd ../test + make || Fdie + ## lalala this should be 'make install' :D + for tool in ivtv-pcm-tester vbi vbi-detect vbi-passthrough wss + do + cp $tool $Fdestdir/usr/bin/ + done + cd .. + ## firmware + Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware + Fsplit ivtv-firmware lib/firmware + ## docs + Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver +} + +sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ + '68fef52289fed191aac19ce4c0f84fb25740f028') +# optimization OK diff --git a/source/multimedia-extra/ivtv/FrugalBuild b/source/multimedia-extra/ivtv/FrugalBuild deleted file mode 100644 index f1bee98..0000000 --- a/source/multimedia-extra/ivtv/FrugalBuild +++ /dev/null @@ -1,55 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: crazy - - -pkgname=ivtv-utils -branch=0.10.x -pkgver=0.10.3 -pkgrel=4 -pkgdesc="Tools for managing the hardware supported by ivtv driver" -url="http://ivtvdriver.org/index.php/Main_Page" -depends=('libstdc++') -rodepends=('ivtv-firmware') -conflicts=('ivtv') -groups=('apps-extra') -archs=('i686') -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) - -subpkgs=('ivtv-firmware') -subdescs=("Firmware for Hauppauge PVR and Conexant based cards") -subdepends=('udev') -subgroups=('multimedia-extra') -subarchs=('i686') - -build() -{ - Fcd ivtv-$pkgver - Fpatchall - ## man some apps have such crappy and broken build tools ... - for crap in `find . -name Makefile` - do - Fsed "-O2" "$CFLAGS" $crap - done - cd utils - make || Fdie - Fmakeinstall PREFIX=/usr - cd ../test - make || Fdie - ## lalala this should be 'make install' :D - for tool in ivtv-pcm-tester vbi vbi-detect vbi-passthrough wss - do - cp $tool $Fdestdir/usr/bin/ - done - cd .. - ## firmware - Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware - Fsplit ivtv-firmware lib/firmware - ## docs - Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver -} - -sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ - '68fef52289fed191aac19ce4c0f84fb25740f028') -# optimization OK From vmiklos at frugalware.org Tue Jul 10 00:31:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 00:31:11 2007 Subject: [Frugalware-git] kernel2622: rtl8110-1.06-4-i686 Message-ID: <20070709223110.B688917680B8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=ad559f1d272bc615743d0f12a7acbbf21c1008bd commit ad559f1d272bc615743d0f12a7acbbf21c1008bd Author: VMiklos Date: Tue Jul 10 00:31:00 2007 +0200 rtl8110-1.06-4-i686 rebuild in kernel2622 diff --git a/source/network-extra/rtl8110/FrugalBuild b/source/network-extra/rtl8110/FrugalBuild index d2b5841..c289eab 100644 --- a/source/network-extra/rtl8110/FrugalBuild +++ b/source/network-extra/rtl8110/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rtl8110 pkgver=1.06 -pkgrel=3 +pkgrel=4 pkgdesc="Realtek driver(r1000) for RTL8169/8110 cards." url="http://www.realtek.com.tw" Finclude kernel-module From vmiklos at frugalware.org Tue Jul 10 09:46:01 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 09:46:02 2007 Subject: [Frugalware-git] kernel2622: virtualbox-1.4.0-3-i686 Message-ID: <20070710074601.D76A1186816A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=45f0c4b333fa45b82ac262400491c6ee566237b6 commit 45f0c4b333fa45b82ac262400491c6ee566237b6 Author: VMiklos Date: Tue Jul 10 09:45:49 2007 +0200 virtualbox-1.4.0-3-i686 rebuild in kernel2622 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index e8088c3..863282a 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -4,7 +4,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" Finclude kernel-module From vmiklos at frugalware.org Tue Jul 10 10:25:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 10:25:29 2007 Subject: [Frugalware-git] frugalware-current: joomla-1.0.12-2-i686 Message-ID: <20070710082528.06E18186816A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=949f32cffe68c662dee4832bef3cbcb492b60e40 commit 949f32cffe68c662dee4832bef3cbcb492b60e40 Author: VMiklos Date: Tue Jul 10 10:24:53 2007 +0200 joomla-1.0.12-2-i686 added secfix backport from svn closes #2216 diff --git a/source/network-extra/joomla/7832.diff b/source/network-extra/joomla/7832.diff new file mode 100644 index 0000000..2e49f31 --- /dev/null +++ b/source/network-extra/joomla/7832.diff @@ -0,0 +1,132 @@ +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 373ff9b..dc47572 100644 --- a/source/network-extra/joomla/FrugalBuild +++ b/source/network-extra/joomla/FrugalBuild @@ -3,17 +3,23 @@ pkgname=joomla pkgver=1.0.12 -pkgrel=1 +pkgrel=2 pkgdesc="One of the most powerful Open Source Content Management Systems on the planet" url="http://www.joomla.org/" -depends=('apache' 'php' 'mysql' 'webappconfig') +rodepends=('apache' 'php' 'mysql' 'webappconfig') 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) +source=(http://ftp.frugalware.org/pub/other/sources/joomla/Joomla_"$pkgver"-Stable-Full_Package.tar.gz joomlasetup README.Frugalware \ +7832.diff) +sha1sums=('3719d9b3b8ea9d32d4ad1b2ab34a2b21698718d9' \ + '436fa260a2750e2394eb23f1504757bdb8045af1' \ + 'c079d041113ca5302340955027a5e313bee47f4a' \ + 'f10b9f0c2b6e6bfe36574cfd6851ed300ea438e9') 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 @@ -24,6 +30,3 @@ build() { Fexe /usr/bin/joomlasetup Fmv /var/www/joomla/configuration.php-dist /var/www/joomla/configuration.php } -sha1sums=('3719d9b3b8ea9d32d4ad1b2ab34a2b21698718d9' \ - '436fa260a2750e2394eb23f1504757bdb8045af1' \ - 'c079d041113ca5302340955027a5e313bee47f4a') From voroskoi at frugalware.org Tue Jul 10 12:31:34 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Jul 10 12:31:37 2007 Subject: [Frugalware-git] frugalware-current: gaupol-0.8-1-i686 Message-ID: <20070710103134.5211A16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a84ab7aa2ed76d85fb041c863b53140056525515 commit a84ab7aa2ed76d85fb041c863b53140056525515 Author: voroskoi Date: Tue Jul 10 12:28:34 2007 +0200 gaupol-0.8-1-i686 version bump updated depends(), added license diff --git a/source/gnome-extra/gaupol/FrugalBuild b/source/gnome-extra/gaupol/FrugalBuild index e513ab4..3c3b599 100644 --- a/source/gnome-extra/gaupol/FrugalBuild +++ b/source/gnome-extra/gaupol/FrugalBuild @@ -2,17 +2,18 @@ # Maintainer: voroskoi pkgname=gaupol -pkgver=0.7.2 +pkgver=0.8 pkgrel=1 pkgdesc="Gaupol is a subtitle editor for text-based subtitles." url="http://home.gna.org/gaupol/" -depends=('pygtk>=2.8' 'pyenchant>=1.1.3') +depends=('pygtk>=2.10' 'pyenchant>=1.1.3') makedepends=('intltool') rodepends=('chardet') groups=('gnome-extra') archs=('i686' 'x86_64') +license="GPLv3" up2date="lynx -dump $url/download.html |grep gaupol.*.tar |sed -ne 's/.*l-\(.*\).t.*/\1/;1 p'" -source=(http://download.gna.org/gaupol/0.7/$pkgname-$pkgver.tar.gz) -sha1sums=('2120f6b64c5715d9c409bc3f9171f4344bf22388') +source=(http://download.gna.org/gaupol/0.8/$pkgname-$pkgver.tar.gz) +sha1sums=('d65811e2b7d72ee442493ca8fbd38a01faaf79f9') # optimization OK - noarch From vmiklos at frugalware.org Tue Jul 10 13:36:02 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 13:36:04 2007 Subject: [Frugalware-git] frugalware-current: kvirc-3.2.5-1-i686 Message-ID: <20070710113602.0E48416A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=710be9e102811ce1e82f7b6fafdd231bb485c62d commit 710be9e102811ce1e82f7b6fafdd231bb485c62d Author: VMiklos Date: Tue Jul 10 13:35:48 2007 +0200 kvirc-3.2.5-1-i686 version bump added 630.diff secfix closes #2214 diff --git a/source/kde-extra/kvirc/630.diff b/source/kde-extra/kvirc/630.diff new file mode 100644 index 0000000..4780da5 --- /dev/null +++ b/source/kde-extra/kvirc/630.diff @@ -0,0 +1,11 @@ +Index: kvirc/src/kvirc/kernel/kvi_ircurl.cpp +=================================================================== +--- kvirc/src/kvirc/kernel/kvi_ircurl.cpp (revision 246) ++++ kvirc/src/kvirc/kernel/kvi_ircurl.cpp (revision 630) +@@ -44,4 +44,6 @@ + // irc[6]://[:][/[?]] + KviStr szUrl = url; ++ szUrl.replaceAll("$","\\$"); ++ szUrl.replaceAll(";","\\;"); + bool bIpV6 = false; + bool bSSL = false; diff --git a/source/kde-extra/kvirc/FrugalBuild b/source/kde-extra/kvirc/FrugalBuild index bb1146b..a423f61 100644 --- a/source/kde-extra/kvirc/FrugalBuild +++ b/source/kde-extra/kvirc/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=kvirc -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.5 +pkgrel=1 pkgdesc="Graphical Irc client for K Desktop" depends=('kdenetwork') groups=('kde-extra') @@ -11,8 +11,9 @@ archs=('i686' 'x86_64') Finclude kde url="http://www.kvirc.net" up2date="lynx -dump http://www.kvirc.net |grep 'Latest stable' | sed 's/.*]\([0-9\.]*\)$/\1/'" -source=(ftp://ftp.kvirc.de/pub/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.bz2) -sha1sums=('890871ffc76b62d6e538db80b1f4162a7792769d') +source=(ftp://ftp.kvirc.de/pub/$pkgname/snapshots/source/$pkgname-$pkgver.tar.bz2 630.diff) +sha1sums=('f1944e301c154bdc4bc33bc22a816ebc37e573ca' \ + 'e4854d2ea43b173729df1d20c71cc7e68a1e2c5a') build() { @@ -21,3 +22,5 @@ build() /usr/share/services/irc.protocol.kvirc } + +# optimization OK From vmiklos at frugalware.org Tue Jul 10 13:42:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 13:42:38 2007 Subject: [Frugalware-git] kernel2622: kernel-2.6.22-1-i686 Message-ID: <20070710114236.34BFE16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=18ff88deeb7c1377707e0aeefec3f59d7b32e5cc commit 18ff88deeb7c1377707e0aeefec3f59d7b32e5cc Author: VMiklos Date: Tue Jul 10 13:42:22 2007 +0200 kernel-2.6.22-1-i686 added jbd fix from lkml diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 7a6d9de..20db954 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 11.74 SBU # Maintainer: VMiklos -_F_kernel_patches=(aacraid.diff pxa27x.diff) +_F_kernel_patches=(aacraid.diff pxa27x.diff jbd.diff) Finclude kernel diff --git a/source/base/kernel/jbd.diff b/source/base/kernel/jbd.diff new file mode 100644 index 0000000..11901c5 --- /dev/null +++ b/source/base/kernel/jbd.diff @@ -0,0 +1,18 @@ +We have to check that also the second checkpoint list is non-empty before +dropping the transaction. + +Signed-off-by: Jan Kara + +diff -rupX /home/jack/.kerndiffexclude linux-2.6.16-rc1/fs/jbd/commit.c linux-2.6.16-rc1-1-checkpoint-fix/fs/jbd/commit.c +--- linux-2.6.16-rc1/fs/jbd/commit.c 2006-01-15 00:20:12.000000000 +0100 ++++ linux-2.6.16-rc1-1-checkpoint-fix/fs/jbd/commit.c 2006-01-17 23:35:19.000000000 +0100 +@@ -829,7 +829,8 @@ restart_loop: + journal->j_committing_transaction = NULL; + spin_unlock(&journal->j_state_lock); + +- if (commit_transaction->t_checkpoint_list == NULL) { ++ if (commit_transaction->t_checkpoint_list == NULL && ++ commit_transaction->t_checkpoint_io_list == NULL) { + __journal_drop_transaction(journal, commit_transaction); + } else { + if (journal->j_checkpoint_transactions == NULL) { From vmiklos at frugalware.org Tue Jul 10 14:33:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 14:34:01 2007 Subject: [Frugalware-git] kernel2622: acx100-0.3.36-11-i686 Message-ID: <20070710123359.5864416A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=ceae36eb5fdecbd089d94c0e327c6b6696c7fd7f commit ceae36eb5fdecbd089d94c0e327c6b6696c7fd7f Author: VMiklos Date: Tue Jul 10 14:33:40 2007 +0200 acx100-0.3.36-11-i686 added -kernel2622.diff diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index a26e028..8c2e101 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 pkgver=0.3.36 pkgdate=20070101 -pkgrel=10 +pkgrel=11 pkgdesc="The ACX100/ACX111 wireless network driver." url="http://www.cmartin.tk/acx" Finclude kernel-module @@ -14,11 +14,13 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url |grep acx-2 |Flasttarbz2 |sed s/$pkgdate/$pkgver/" source=($url/acx-$pkgdate.tar.bz2 \ http://195.66.192.167/linux/acx_patches/fw.tar.bz2 \ - http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin) + http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin \ + acx100-0.3.36-kernel2622.diff) build() { # no Fcheckkernel, crosscompilation verified Fcd acx-$pkgdate + Fpatchall make -C $_F_kernelmod_dir/build M=`pwd` || Fdie Fmkdir $_F_kernelmod_dir/net Ffilerel $_F_kernelmod_dir/net/acx.ko @@ -34,6 +36,7 @@ build() { # optimalization OK - uses the kernel's option -sha1sums=('5c7259c09bc754529910aceead6087876177a143'\ - '5b5ef1a9d6441f5f8345e1957cd7686e730897f6'\ - '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4') +sha1sums=('5c7259c09bc754529910aceead6087876177a143' \ + '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ + '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \ + '2a385b78e656d6430bb730594cbb7724901e5d58') diff --git a/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff b/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff new file mode 100644 index 0000000..535bc89 --- /dev/null +++ b/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff @@ -0,0 +1,11 @@ +--- a/common.c ++++ b/common.c +@@ -2760,7 +2760,7 @@ acx_l_rxmonitor(acx_device_t *adev, cons + skb->dev = adev->ndev; + skb->dev->last_rx = jiffies; + +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); From vmiklos at frugalware.org Tue Jul 10 14:58:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 14:58:49 2007 Subject: [Frugalware-git] kernel2622: wlan-ng-0.2.8-3-i686 Message-ID: <20070710125848.63A9716A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=713c50fe83309406ef29f2dae37584f1858add7f commit 713c50fe83309406ef29f2dae37584f1858add7f Author: VMiklos Date: Tue Jul 10 14:58:36 2007 +0200 wlan-ng-0.2.8-3-i686 added -kernel2622.diff diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index 073dbed..07af071 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -13,9 +13,10 @@ archs=('i686' 'x86_64') backup=(etc/wlan/wlan.conf) up2date="lynx -dump ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/|grep tar.bz2$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-//;$ p'" source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-$pkgname-$pkgver.tar.bz2 \ - rc.wlan) -sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de'\ - '3c50d5e942999a968437093a17e3864a4733e11e') + rc.wlan wlan-ng-0.2.8-kernel2622.diff) +sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de' \ + '3c50d5e942999a968437093a17e3864a4733e11e' \ + '0f44af63867c2d8494aefb9d0cf61742ba322222') build() { diff --git a/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2622.diff b/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2622.diff new file mode 100644 index 0000000..a0ce4d9 --- /dev/null +++ b/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2622.diff @@ -0,0 +1,48 @@ +diff -Naur linux-wlan-ng-0.2.8.orig/src/p80211/p80211conv.c linux-wlan-ng-0.2.8/src/p80211/p80211conv.c +--- linux-wlan-ng-0.2.8.orig/src/p80211/p80211conv.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-07-10 14:53:04.000000000 +0200 +@@ -498,7 +498,7 @@ + } + + skb->protocol = eth_type_trans(skb, netdev); +- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ ++ skb->mac_header = (unsigned char *) e_hdr; /* new MAC header */ + + /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ + /* jkriegl: only process signal/noise if requested by iwspy */ +diff -Naur linux-wlan-ng-0.2.8.orig/src/p80211/p80211netdev.c linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c +--- linux-wlan-ng-0.2.8.orig/src/p80211/p80211netdev.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-07-10 14:53:04.000000000 +0200 +@@ -389,7 +389,7 @@ + + /* set up various data fields */ + skb->dev = dev; +- skb->mac.raw = skb->data ; ++ skb_reset_mac_header(skb); + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); +diff -Naur linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c +--- linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-07-10 14:53:04.000000000 +0200 +@@ -3645,7 +3645,7 @@ + /* the prism2 cards don't return the FCS */ + datap = skb_put(skb, WLAN_CRC_LEN); + memset (datap, 0xff, WLAN_CRC_LEN); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); +diff -Naur linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c +--- linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x_usb.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-07-10 14:53:04.000000000 +0200 +@@ -4255,7 +4255,7 @@ + /* The prism2 series does not return the CRC */ + memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); + +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); From vmiklos at frugalware.org Tue Jul 10 15:10:08 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 15:10:09 2007 Subject: [Frugalware-git] frugalware-current: docs/Makefile: darcs -> git Message-ID: <20070710131008.4F03616A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=107bdd7058496970920353f8706caf10204eb29a commit 107bdd7058496970920353f8706caf10204eb29a Author: VMiklos Date: Tue Jul 10 15:09:21 2007 +0200 docs/Makefile: darcs -> git diff --git a/docs/Makefile b/docs/Makefile index 3973d57..616d1df 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell date +%Y%m%d) (-current) #VERSION = 0.6 (Terminus) -PO_DIR ?= ~/darcs/translations/po +PO_DIR ?= ~/git/translations/po XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2 # force the usage of gcj, we have no time to test fop with other jdks From crazy at frugalware.org Tue Jul 10 15:19:58 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 10 15:20:00 2007 Subject: [Frugalware-git] frugalware-current: scribus-1.3.4-2-i686 Message-ID: <20070710131958.825AE16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6b72576fe8165c4cbe0655c8067842c483b73f7e commit 6b72576fe8165c4cbe0655c8067842c483b73f7e Author: crazy Date: Tue Jul 10 15:19:23 2007 +0200 scribus-1.3.4-2-i686 * relbump * build with --enable-gcc-symbol-visibility * droped hyphenation-symlink.patch for now ( not yet removed from tree ) * recompiled with freetype2 2.3.5 ( I still get random segfaults from TT_Load_Simple_Glyph(), need to look at that ) * should fix #2238 diff --git a/source/xapps-extra/scribus/FrugalBuild b/source/xapps-extra/scribus/FrugalBuild index 6af4e2c..198d232 100644 --- a/source/xapps-extra/scribus/FrugalBuild +++ b/source/xapps-extra/scribus/FrugalBuild @@ -4,10 +4,10 @@ pkgname=scribus pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A professional desktop publishing application" url="http://www.scribus.org.uk" -depends=('cairo' 'qt' 'cups' 'freetype2' 'lcms' 'libxml2' 'libstdc++' \ +depends=('cairo' 'qt' 'cups' 'freetype2>=2.3.5' 'lcms' 'libxml2' 'libstdc++' \ 'libgcc' 'libxau' 'libxdmcp' 'libxcb' 'libgl' 'libxmu' 'libxi' \ 'libice' 'libxxf86vm' 'libdrm' 'libxt' 'libxfixes' 'python>=2.5' \ 'xespgs' 'libart_lgpl>=2.3.19-2') @@ -17,19 +17,16 @@ options=('scriptlet') _F_sourceforge_ext=".tar.bz2" _F_kde_defaults=0 Finclude kde sourceforge -source=(${source[@]} hyphenation-symlink.patch) +#source=(${source[@]} hyphenation-symlink.patch) build() { - Fcd - make -f admin/Makefile.common cvs || Fdie - Fbuild --enable-cairo + Fbuild --enable-cairo --enable-gcc-symbol-visibility Fsed "scribusicon" "/usr/share/pixmaps/scribusicon.png" scribus.desktop Ffilerel /usr/share/applications/scribus.desktop # for Huhyphn Frm /usr/lib/scribus/dicts/hyph_hu.dic } -sha1sums=('6e9d6c12202501b7c84bc386bde2a082f1a62b9b'\ - '56fa91e98aa256a4195ebd7e07f227c299ca75c7') +sha1sums=('6e9d6c12202501b7c84bc386bde2a082f1a62b9b') # optimization OK From vmiklos at frugalware.org Tue Jul 10 15:22:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 15:22:14 2007 Subject: [Frugalware-git] kernel2622: rt2500-1.1.0_b4-22-i686 Message-ID: <20070710132213.23ED416A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=5757ce3058467f765026747933ba75915e24b121 commit 5757ce3058467f765026747933ba75915e24b121 Author: VMiklos Date: Tue Jul 10 15:22:03 2007 +0200 rt2500-1.1.0_b4-22-i686 added -linux2622.patch diff --git a/source/network-extra/rt2500/FrugalBuild b/source/network-extra/rt2500/FrugalBuild index 8b263a0..a7a69d9 100644 --- a/source/network-extra/rt2500/FrugalBuild +++ b/source/network-extra/rt2500/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rt2500 pkgver=1.1.0_b4 -pkgrel=21 +pkgrel=22 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 and rt2500 chipsets." _F_sourceforge_dirname="rt2400" Finclude kernel-module sourceforge @@ -11,7 +11,10 @@ url="http://rt2x00.serialmonkey.com/wiki/index.php" groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/Downloads|grep 2500.*download$|sed 's/.*2500-\(.*\)\.t.*/\1/;s/-/_/'" -source=($source rt2500-1.1.0_b4-linux2620.patch) +source=($source rt2500-1.1.0_b4-linux26{20,22}.patch) +sha1sums=('dd9a747c819a6507ea3ef9e803d4fae1074d84df' \ + '32d014a546b6b4cda9b81f95e184a0e8f05c5698' \ + 'fb25d996030d6fb803d9ae0a41a6aceed5b57c43') build() { @@ -25,5 +28,3 @@ build() make KERNDIR=$_F_kernelmod_dir/build Ffilerel $_F_kernelmod_dir/kernel/drivers/net/wireless/rt2500.ko } -sha1sums=('dd9a747c819a6507ea3ef9e803d4fae1074d84df'\ - '32d014a546b6b4cda9b81f95e184a0e8f05c5698') diff --git a/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch b/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch new file mode 100644 index 0000000..249fe2f --- /dev/null +++ b/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch @@ -0,0 +1,11 @@ +--- Module/rtmp_data.c.orig 2007-07-10 15:16:31.000000000 +0200 ++++ Module/rtmp_data.c 2007-07-10 15:16:51.000000000 +0200 +@@ -1196,7 +1196,7 @@ + + skb->dev = pAdapter->net_dev; + memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_802_2); + skb->ip_summed = CHECKSUM_NONE; From vmiklos at frugalware.org Tue Jul 10 15:37:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 15:37:58 2007 Subject: [Frugalware-git] kernel2622: rt2400-1.2.2_b3-4-i686 Message-ID: <20070710133756.AFF3916A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=bc76f41965f21eeeccda7cd2a9a31ca87be867cb commit bc76f41965f21eeeccda7cd2a9a31ca87be867cb Author: VMiklos Date: Tue Jul 10 15:37:48 2007 +0200 rt2400-1.2.2_b3-4-i686 added -kernel2622.diff diff --git a/source/network-extra/rt2400/FrugalBuild b/source/network-extra/rt2400/FrugalBuild index ff624dd..f0722e7 100644 --- a/source/network-extra/rt2400/FrugalBuild +++ b/source/network-extra/rt2400/FrugalBuild @@ -3,16 +3,18 @@ pkgname=rt2400 pkgver=1.2.2_b3 -pkgrel=3 +pkgrel=4 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 chipsets." Finclude kernel-module sourceforge url="http://rt2x00.serialmonkey.com/wiki/index.php" groups=('network-extra') archs=('i686') up2date="lynx -dump $url/Downloads|grep 2400.*download$|sed 's/.*2400-\(.*\)\.t.*/\1/;s/-/_/;q'" -source=($source rt2400-1.2.2_b3-cvs_fixes.diff) -sha1sums=('b572d027c4433b964a7c613a31885a2e0853d92a'\ - 'e0435cc51fececdc38bb64d17d25ce727a2ee8e3') +source=($source rt2400-1.2.2_b3-cvs_fixes.diff \ +rt2400-1.2.2_b3-kernel2622.diff) +sha1sums=('b572d027c4433b964a7c613a31885a2e0853d92a' \ + 'e0435cc51fececdc38bb64d17d25ce727a2ee8e3' \ + '355f7e94ce5477b775b1d2183e7d7d720ab71201') build() { diff --git a/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff b/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff new file mode 100644 index 0000000..dd5dfc7 --- /dev/null +++ b/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff @@ -0,0 +1,11 @@ +--- Module/rtmp_data.c.orig 2007-07-10 15:33:35.000000000 +0200 ++++ Module/rtmp_data.c 2007-07-10 15:33:49.000000000 +0200 +@@ -110,7 +110,7 @@ + { + skb->dev = pAd->net_dev; + memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_802_2); + skb->ip_summed = CHECKSUM_NONE; From vmiklos at frugalware.org Tue Jul 10 15:47:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 15:47:57 2007 Subject: [Frugalware-git] kernel2622: adm8211-20060111-23-i686 Message-ID: <20070710134755.A43E416A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=41c617d5bb6b87e18ecfa3868523652aac300bac commit 41c617d5bb6b87e18ecfa3868523652aac300bac Author: VMiklos Date: Tue Jul 10 15:47:44 2007 +0200 adm8211-20060111-23-i686 added -linux2622.patch diff --git a/source/network-extra/adm8211/FrugalBuild b/source/network-extra/adm8211/FrugalBuild index 1d5428b..3ef0086 100644 --- a/source/network-extra/adm8211/FrugalBuild +++ b/source/network-extra/adm8211/FrugalBuild @@ -3,14 +3,17 @@ pkgname=adm8211 pkgver=20060111 -pkgrel=22 +pkgrel=23 pkgdesc="IEEE 802.11 wireless LAN driver for adm8211 based cards" url="http://aluminum.sourmilk.net/adm8211/" Finclude kernel-module groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=($url/$pkgname-$pkgver.tar.bz2 adm8211-20060111-linux2620.patch) +source=($url/$pkgname-$pkgver.tar.bz2 adm8211-20060111-linux26{20,22}.patch) +sha1sums=('69658563c465c5c40d803d528ac3834d81d2cd0a' \ + '553e345e276a6981f21da4fd2d3ac5521bab370c' \ + '3cc4e06831cdd6deaf8af201dc8166a4f08daa9e') build() { @@ -24,5 +27,3 @@ build() Fmake Fmakeinstall } -sha1sums=('69658563c465c5c40d803d528ac3834d81d2cd0a'\ - '553e345e276a6981f21da4fd2d3ac5521bab370c') diff --git a/source/network-extra/adm8211/adm8211-20060111-linux2622.patch b/source/network-extra/adm8211/adm8211-20060111-linux2622.patch new file mode 100644 index 0000000..630a8b3 --- /dev/null +++ b/source/network-extra/adm8211/adm8211-20060111-linux2622.patch @@ -0,0 +1,29 @@ +--- adm8211/adm8211_hw.c.orig 2007-07-10 15:43:39.000000000 +0200 ++++ adm8211/adm8211_hw.c 2007-07-10 15:44:47.000000000 +0200 +@@ -516,7 +516,7 @@ + ieee->stats.rx_packets++; + + skb->pkt_type = PACKET_OTHERHOST; +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + netif_rx(skb); + dev->last_rx = jiffies; +@@ -734,7 +734,7 @@ + #endif + stat->rssi = rssi; + stat->rate = rate; +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->protocol = __constant_htons(ETH_P_802_2); + skb_queue_tail(&priv->rx_queue, skb); + tasklet_schedule(&priv->rx_tasklet); +@@ -2392,7 +2392,7 @@ + + int adm8211_80211_header_parse(struct sk_buff *skb, unsigned char *haddr) + { +- memcpy(haddr, skb->mac.raw + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ ++ memcpy(haddr, skb->mac_header + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ + return ETH_ALEN; + } + From vmiklos at frugalware.org Tue Jul 10 14:51:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 16:24:05 2007 Subject: [Frugalware-git] kernel2622: madwifi-0.9.3.1-4-i686 Message-ID: <20070710125112.45AEF16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=fdbaf746932c46cfa1254e3f989e2e4af555b04d commit fdbaf746932c46cfa1254e3f989e2e4af555b04d Author: VMiklos Date: Tue Jul 10 14:50:56 2007 +0200 madwifi-0.9.3.1-4-i686 added -kernel2622.diff diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index b3bf7a3..963948a 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" Finclude kernel-module @@ -13,7 +13,10 @@ makedepends=(${makedepends[@]} 'sharutils') groups=('network') archs=('i686' 'x86_64') Finclude sourceforge -source=($source madwifi-0.9.3-cflags.diff) +source=($source madwifi-0.9.3-cflags.diff madwifi-0.9.3.1-kernel2622.diff) +sha1sums=('690543c825b8b49186e4613a286b39114fff3c11' \ + '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \ + '68f582befc69053f5961f1fa6c88d5695b1b1b81') # If the package needs testing, feel free to poke Benjamin Woods @@ -27,7 +30,5 @@ build() BINDIR=/usr/bin MANDIR=/usr/man } -sha1sums=('690543c825b8b49186e4613a286b39114fff3c11'\ - '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35') # optimization OK diff --git a/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff b/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff new file mode 100644 index 0000000..2087c3e --- /dev/null +++ b/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff @@ -0,0 +1,3960 @@ +diff -Naur madwifi-0.9.3.1.orig/Makefile.inc madwifi-0.9.3.1/Makefile.inc +--- madwifi-0.9.3.1.orig/Makefile.inc 2007-01-18 09:26:23.000000000 +0100 ++++ madwifi-0.9.3.1/Makefile.inc 2007-07-10 14:45:07.000000000 +0200 +@@ -146,7 +146,7 @@ + # + TOOLS= $(TOP)/tools + +-COPTS+= -Werror ++#COPTS+= -Werror + INCS= -include $(TOP)/include/compat.h -I$(TOP)/include + + # TARGET defines the target platform architecture. It must match one of +diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c madwifi-0.9.3.1/net80211/ieee80211_input.c +--- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c 2007-05-23 10:43:05.000000000 +0200 ++++ madwifi-0.9.3.1/net80211/ieee80211_input.c 2007-07-10 14:45:21.000000000 +0200 +@@ -1048,11 +1048,12 @@ + * incoming fragments + * XXX 4-address/QoS frames? + */ +- else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + +- hdrlen) { ++ else if (skb_end_pointer(skb) - skb->head < ++ ni->ni_vap->iv_dev->mtu + hdrlen) { + ni->ni_rxfrag = skb_copy_expand(skb, 0, + (ni->ni_vap->iv_dev->mtu + hdrlen) - +- (skb->end - skb->head), GFP_ATOMIC); ++ (skb_end_pointer(skb) - skb->head), ++ GFP_ATOMIC); + dev_kfree_skb(skb); + } + } +@@ -1136,8 +1137,8 @@ + } + if (skb1 != NULL) { + skb1->dev = dev; +- skb1->mac.raw = skb1->data; +- skb1->nh.raw = skb1->data + sizeof(struct ether_header); ++ skb_reset_mac_header(skb1); ++ skb1->network_header = skb1->data + sizeof(struct ether_header); + skb1->protocol = __constant_htons(ETH_P_802_2); + /* XXX insert vlan tag before queue it? */ + dev_queue_xmit(skb1); +@@ -2259,7 +2260,7 @@ + if (skb1 == NULL) + return; + skb1->dev = dev; +- skb1->mac.raw = skb1->data; ++ skb_reset_mac_header(skb1); + skb1->ip_summed = CHECKSUM_NONE; + skb1->pkt_type = PACKET_OTHERHOST; + skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ +@@ -2534,7 +2535,7 @@ + + skb->dev = dev; + skb->protocol = eth_type_trans(skb, dev); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + ieee80211_deliver_data(ni, skb); + return; + } +@@ -3712,15 +3713,15 @@ + ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) + { + struct ethhdr *eth; +- +- skb->mac.raw=skb->data; ++ ++ skb_reset_mac_header(skb); + skb_pull(skb, ETH_HLEN); + /* + * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but + * since that's an inline and not a define there's + * no easy way to do this cleanly. + */ +- eth = (struct ethhdr *)skb->mac.raw; ++ eth = eth_hdr(skb); + + if (*eth->h_dest & 1) + if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) +diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c.orig madwifi-0.9.3.1/net80211/ieee80211_input.c.orig +--- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ madwifi-0.9.3.1/net80211/ieee80211_input.c.orig 2007-07-10 14:45:14.000000000 +0200 +@@ -0,0 +1,3856 @@ ++/*- ++ * Copyright (c) 2001 Atsushi Onoe ++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote products ++ * derived from this software without specific prior written permission. ++ * ++ * Alternatively, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2 as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * $Id: ieee80211_input.c 2366 2007-05-23 08:43:05Z mrenzmann $ ++ */ ++#ifndef EXPORT_SYMTAB ++#define EXPORT_SYMTAB ++#endif ++ ++/* ++ * IEEE 802.11 input handling. ++ */ ++#ifndef AUTOCONF_INCLUDED ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* wireless_send_event(..) */ ++#include /* SIOCGIWTHRSPY */ ++#include /* ARPHRD_ETHER */ ++ ++#include "if_llc.h" ++#include "if_ethersubr.h" ++#include "if_media.h" ++#include "if_athproto.h" ++ ++#include ++ ++#ifdef IEEE80211_DEBUG ++/* ++ * Decide if a received management frame should be ++ * printed when debugging is enabled. This filters some ++ * of the less interesting frames that come frequently ++ * (e.g. beacons). ++ */ ++static __inline int ++doprint(struct ieee80211vap *vap, int subtype) ++{ ++ switch (subtype) { ++ case IEEE80211_FC0_SUBTYPE_BEACON: ++ return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN); ++ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ++ return (vap->iv_opmode == IEEE80211_M_IBSS); ++ } ++ return 1; ++} ++ ++/* ++ * Emit a debug message about discarding a frame or information ++ * element. One format is for extracting the mac address from ++ * the frame header; the other is for when a header is not ++ * available or otherwise appropriate. ++ */ ++#define IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) do { \ ++ if ((_vap)->iv_debug & (_m)) \ ++ ieee80211_discard_frame(_vap, _wh, _type, _fmt, __VA_ARGS__);\ ++} while (0) ++#define IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) do { \ ++ if ((_vap)->iv_debug & (_m)) \ ++ ieee80211_discard_ie(_vap, _wh, _type, _fmt, __VA_ARGS__);\ ++} while (0) ++#define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) do { \ ++ if ((_vap)->iv_debug & (_m)) \ ++ ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\ ++} while (0) ++ ++static const u_int8_t *ieee80211_getbssid(struct ieee80211vap *, ++ const struct ieee80211_frame *); ++static void ieee80211_discard_frame(struct ieee80211vap *, ++ const struct ieee80211_frame *, const char *, const char *, ...); ++static void ieee80211_discard_ie(struct ieee80211vap *, ++ const struct ieee80211_frame *, const char *, const char *, ...); ++static void ieee80211_discard_mac(struct ieee80211vap *, ++ const u_int8_t mac[IEEE80211_ADDR_LEN], const char *, ++ const char *, ...); ++#else ++#define IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) ++#define IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) ++#define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) ++#endif /* IEEE80211_DEBUG */ ++ ++static struct sk_buff *ieee80211_defrag(struct ieee80211_node *, ++ struct sk_buff *, int); ++static void ieee80211_deliver_data(struct ieee80211_node *, struct sk_buff *); ++static struct sk_buff *ieee80211_decap(struct ieee80211vap *, ++ struct sk_buff *, int); ++static void ieee80211_send_error(struct ieee80211_node *, const u_int8_t *, ++ int, int); ++static void ieee80211_recv_pspoll(struct ieee80211_node *, struct sk_buff *); ++static int accept_data_frame(struct ieee80211vap *, struct ieee80211_node *, ++ struct ieee80211_key *, struct sk_buff *, struct ether_header *); ++ ++ ++#ifdef ATH_SUPERG_FF ++static void athff_decap(struct sk_buff *); ++#endif ++#ifdef USE_HEADERLEN_RESV ++static __be16 ath_eth_type_trans(struct sk_buff *, struct net_device *); ++#endif ++ ++/* Enhanced iwspy support */ ++#if WIRELESS_EXT >= 16 ++ ++#ifndef IW_QUAL_QUAL_UPDATED ++#define IW_QUAL_QUAL_UPDATED 0x01 ++#define IW_QUAL_LEVEL_UPDATED 0x02 ++#define IW_QUAL_NOISE_UPDATED 0x04 ++#endif /* IW_QUAL_QUAL_UPDATED */ ++ ++/** ++ * This function is a clone of set_quality(..) in ieee80211_wireless.c ++ */ ++static void ++set_quality(struct iw_quality *iq, u_int rssi, int noise) ++{ ++ iq->qual = rssi; ++ ++ iq->noise = noise; ++ iq->level = iq->noise + iq->qual; ++ iq->updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | ++ IW_QUAL_NOISE_UPDATED; ++} ++ ++/** ++ * Given a node and the rssi value of a just received frame from the node, this ++ * function checks if to raise an iwspy event because we iwspy the node and rssi ++ * exceeds threshold (if active). ++ * ++ * @param vap: vap ++ * @param ni: sender node ++ * @param rssi: rssi value of received frame ++ */ ++static void ++iwspy_event(struct ieee80211vap *vap, struct ieee80211_node *ni, u_int rssi) ++{ ++ if (vap->iv_spy.thr_low && vap->iv_spy.num && ni && (rssi < ++ vap->iv_spy.thr_low || rssi > vap->iv_spy.thr_high)) { ++ int i; ++ for (i = 0; i < vap->iv_spy.num; i++) { ++ if (IEEE80211_ADDR_EQ(ni->ni_macaddr, ++ &(vap->iv_spy.mac[i * IEEE80211_ADDR_LEN]))) { ++ ++ union iwreq_data wrq; ++ struct iw_thrspy thr; ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DEBUG, ++ "%s: we spy %s, threshold is active " ++ "and rssi exceeds it -> raise an iwspy" ++ " event\n", __func__, ether_sprintf( ++ ni->ni_macaddr)); ++ memset(&wrq, 0, sizeof(wrq)); ++ wrq.data.length = 1; ++ memset(&thr, 0, sizeof(struct iw_thrspy)); ++ memcpy(thr.addr.sa_data, ni->ni_macaddr, ++ IEEE80211_ADDR_LEN); ++ thr.addr.sa_family = ARPHRD_ETHER; ++ set_quality(&thr.qual, rssi, vap->iv_ic->ic_channoise); ++ set_quality(&thr.low, vap->iv_spy.thr_low, vap->iv_ic->ic_channoise); ++ set_quality(&thr.high, vap->iv_spy.thr_high, vap->iv_ic->ic_channoise); ++ wireless_send_event(vap->iv_dev, ++ SIOCGIWTHRSPY, &wrq, (char*) &thr); ++ break; ++ } ++ } ++ } ++} ++ ++#else ++#define iwspy_event(_vap, _ni, _rssi) ++#endif /* WIRELESS_EXT >= 16 */ ++ ++/* ++ * Process a received frame. The node associated with the sender ++ * should be supplied. If nothing was found in the node table then ++ * the caller is assumed to supply a reference to ic_bss instead. ++ * The RSSI and a timestamp are also supplied. The RSSI data is used ++ * during AP scanning to select a AP to associate with; it can have ++ * any units so long as values have consistent units and higher values ++ * mean ``better signal''. The receive timestamp is currently not used ++ * by the 802.11 layer. ++ * ++ * Context: softIRQ (tasklet) ++ */ ++int ++ieee80211_input(struct ieee80211_node *ni, ++ struct sk_buff *skb, int rssi, u_int32_t rstamp) ++{ ++#define HAS_SEQ(type) ((type & 0x4) == 0) ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = vap->iv_ic; ++ struct net_device *dev = vap->iv_dev; ++ struct ieee80211_frame *wh; ++ struct ieee80211_key *key; ++ struct ether_header *eh; ++#ifdef ATH_SUPERG_FF ++ struct llc *llc; ++#endif ++ int hdrspace; ++ u_int8_t dir, type, subtype; ++ u_int8_t *bssid; ++ u_int16_t rxseq; ++ ++ KASSERT(ni != NULL, ("null node")); ++ ni->ni_inact = ni->ni_inact_reload; ++ ++ KASSERT(skb->len >= sizeof(struct ieee80211_frame_min), ++ ("frame length too short: %u", skb->len)); ++ ++ /* XXX adjust device in sk_buff? */ ++ ++ type = -1; /* undefined */ ++ /* ++ * In monitor mode, send everything directly to bpf. ++ * Also do not process frames w/o i_addr2 any further. ++ * XXX may want to include the CRC ++ */ ++ if (vap->iv_opmode == IEEE80211_M_MONITOR) ++ goto out; ++ ++ if (skb->len < sizeof(struct ieee80211_frame_min)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, ++ ni->ni_macaddr, NULL, ++ "too short (1): len %u", skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ /* ++ * Bit of a cheat here, we use a pointer for a 3-address ++ * frame format but don't reference fields past outside ++ * ieee80211_frame_min w/o first validating the data is ++ * present. ++ */ ++ wh = (struct ieee80211_frame *)skb->data; ++ ++ if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != ++ IEEE80211_FC0_VERSION_0) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, ++ ni->ni_macaddr, NULL, "wrong version %x", wh->i_fc[0]); ++ vap->iv_stats.is_rx_badversion++; ++ goto err; ++ } ++ ++ dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; ++ type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; ++ subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; ++ if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ bssid = wh->i_addr2; ++ if (!IEEE80211_ADDR_EQ(bssid, ni->ni_bssid)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ iwspy_event(vap, ni, rssi); ++ break; ++ case IEEE80211_M_IBSS: ++ case IEEE80211_M_AHDEMO: ++ if (dir != IEEE80211_FC1_DIR_NODS) ++ bssid = wh->i_addr1; ++ else if (type == IEEE80211_FC0_TYPE_CTL) ++ bssid = wh->i_addr1; ++ else { ++ if (skb->len < sizeof(struct ieee80211_frame)) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_ANY, ni->ni_macaddr, ++ NULL, "too short (2): len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ bssid = wh->i_addr3; ++ } ++ /* Do not try to find a node reference if the packet really did come from the BSS */ ++ if (type == IEEE80211_FC0_TYPE_DATA && ni == vap->iv_bss && ++ !IEEE80211_ADDR_EQ(vap->iv_bss->ni_macaddr, wh->i_addr2)) { ++ /* Try to find sender in local node table. */ ++ ni = ieee80211_find_node(vap->iv_bss->ni_table, wh->i_addr2); ++ if (ni == NULL) { ++ /* ++ * Fake up a node for this newly discovered ++ * member of the IBSS. This should probably ++ * done after an ACL check. ++ */ ++ ni = ieee80211_fakeup_adhoc_node(vap, ++ wh->i_addr2); ++ if (ni == NULL) { ++ /* NB: stat kept for alloc failure */ ++ goto err; ++ } ++ } ++ } ++ iwspy_event(vap, ni, rssi); ++ break; ++ case IEEE80211_M_HOSTAP: ++ if (dir != IEEE80211_FC1_DIR_NODS) ++ bssid = wh->i_addr1; ++ else if (type == IEEE80211_FC0_TYPE_CTL) ++ bssid = wh->i_addr1; ++ else { ++ if (skb->len < sizeof(struct ieee80211_frame)) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_ANY, ni->ni_macaddr, ++ NULL, "too short (2): len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ bssid = wh->i_addr3; ++ } ++ /* ++ * Validate the bssid. ++ */ ++#ifdef ATH_SUPERG_XR ++ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && ++ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { ++ /* ++ * allow MGT frames to vap->iv_xrvap. ++ * this will allow roaming between XR and normal vaps ++ * without station dis associating from previous vap. ++ */ ++ if (!(vap->iv_xrvap && ++ IEEE80211_ADDR_EQ(bssid, vap->iv_xrvap->iv_bss->ni_bssid) && ++ type == IEEE80211_FC0_TYPE_MGT && ++ ni != vap->iv_bss)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss or xrbss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ } ++#else ++ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && ++ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ ++#endif ++ break; ++ case IEEE80211_M_WDS: ++ if (skb->len < sizeof(struct ieee80211_frame_addr4)) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_ANY, ni->ni_macaddr, ++ NULL, "too short (3): len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ bssid = wh->i_addr1; ++ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && ++ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ if (!IEEE80211_ADDR_EQ(wh->i_addr2, vap->wds_mac)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ wh->i_addr2, NULL, "%s", "not from DS"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ break; ++ default: ++ /* XXX catch bad values */ ++ goto out; ++ } ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ if (HAS_SEQ(type)) { ++ u_int8_t tid; ++ if (IEEE80211_QOS_HAS_SEQ(wh)) { ++ tid = ((struct ieee80211_qosframe *)wh)-> ++ i_qos[0] & IEEE80211_QOS_TID; ++ if (TID_TO_WME_AC(tid) >= WME_AC_VI) ++ ic->ic_wme.wme_hipri_traffic++; ++ tid++; ++ } else ++ tid = 0; ++ rxseq = le16toh(*(__le16 *)wh->i_seq); ++ if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) && ++ IEEE80211_SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) { ++ /* duplicate, discard */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, "duplicate", ++ "seqno <%u,%u> fragno <%u,%u> tid %u", ++ rxseq >> IEEE80211_SEQ_SEQ_SHIFT, ++ ni->ni_rxseqs[tid] >> ++ IEEE80211_SEQ_SEQ_SHIFT, ++ rxseq & IEEE80211_SEQ_FRAG_MASK, ++ ni->ni_rxseqs[tid] & ++ IEEE80211_SEQ_FRAG_MASK, ++ tid); ++ vap->iv_stats.is_rx_dup++; ++ IEEE80211_NODE_STAT(ni, rx_dup); ++ goto out; ++ } ++ ni->ni_rxseqs[tid] = rxseq; ++ } ++ } ++ ++ switch (type) { ++ case IEEE80211_FC0_TYPE_DATA: ++ hdrspace = ieee80211_hdrspace(ic, wh); ++ if (skb->len < hdrspace) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "too short: len %u, expecting %u", ++ skb->len, hdrspace); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; /* XXX */ ++ } ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ if ((dir != IEEE80211_FC1_DIR_FROMDS) && ++ (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) && ++ (dir == IEEE80211_FC1_DIR_DSTODS)))) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ if ((dev->flags & IFF_MULTICAST) && ++ IEEE80211_IS_MULTICAST(wh->i_addr1)) { ++ if (IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_myaddr)) { ++ /* ++ * In IEEE802.11 network, multicast packet ++ * sent from me is broadcasted from AP. ++ * It should be silently discarded for ++ * SIMPLEX interface. ++ * ++ * NB: Linux has no IFF_ flag to indicate ++ * if an interface is SIMPLEX or not; ++ * so we always assume it to be true. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, NULL, "%s", "multicast echo"); ++ vap->iv_stats.is_rx_mcastecho++; ++ goto out; ++ } ++ /* ++ * if it is brodcasted by me on behalf of ++ * a station behind me, drop it. ++ */ ++ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) { ++ struct ieee80211_node_table *nt; ++ struct ieee80211_node *ni_wds; ++ nt = &ic->ic_sta; ++ ni_wds = ieee80211_find_wds_node(nt, wh->i_addr3); ++ if (ni_wds) { ++ ieee80211_free_node(ni_wds); /* Decr ref count */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, NULL, "%s", ++ "multicast echo originated from node behind me"); ++ vap->iv_stats.is_rx_mcastecho++; ++ goto out; ++ } ++ } ++ } ++ break; ++ case IEEE80211_M_IBSS: ++ case IEEE80211_M_AHDEMO: ++ if (dir != IEEE80211_FC1_DIR_NODS) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ /* XXX no power-save support */ ++ break; ++ case IEEE80211_M_HOSTAP: ++ if ((dir != IEEE80211_FC1_DIR_TODS) && ++ (dir != IEEE80211_FC1_DIR_DSTODS)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ /* check if source STA is associated */ ++ if (ni == vap->iv_bss) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "data", "%s", "unknown src"); ++ /* NB: caller deals with reference */ ++ if (vap->iv_state == IEEE80211_S_RUN) ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_NOT_AUTHED); ++ vap->iv_stats.is_rx_notassoc++; ++ goto err; ++ } ++ if (ni->ni_associd == 0) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "data", "%s", "unassoc src"); ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_DISASSOC, ++ IEEE80211_REASON_NOT_ASSOCED); ++ vap->iv_stats.is_rx_notassoc++; ++ goto err; ++ } ++ /* ++ * If we're a 4 address packet, make sure we have an entry in ++ * the node table for the packet source address (addr4). ++ * If not, add one. ++ */ ++ if (dir == IEEE80211_FC1_DIR_DSTODS) { ++ struct ieee80211_node_table *nt; ++ struct ieee80211_frame_addr4 *wh4; ++ struct ieee80211_node *ni_wds; ++ if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "data", "%s", "4 addr not allowed"); ++ goto err; ++ } ++ wh4 = (struct ieee80211_frame_addr4 *)skb->data; ++ nt = &ic->ic_sta; ++ ni_wds = ieee80211_find_wds_node(nt, wh4->i_addr4); ++ /* Last call increments ref count if !NULL */ ++ if ((ni_wds != NULL) && (ni_wds != ni)) { ++ /* ++ * node with source address (addr4) moved ++ * to another WDS capable station. remove the ++ * reference to the previous station and add ++ * reference to the new one ++ */ ++ (void) ieee80211_remove_wds_addr(nt, wh4->i_addr4); ++ ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0); ++ } ++ if (ni_wds == NULL) ++ ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0); ++ else ++ ieee80211_free_node(ni_wds); /* Decr ref count */ ++ } ++ ++ /* ++ * Check for power save state change. ++ */ ++ if (!(ni->ni_flags & IEEE80211_NODE_UAPSD)) { ++ if ((wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) ^ ++ (ni->ni_flags & IEEE80211_NODE_PWR_MGT)) ++ ieee80211_node_pwrsave(ni, wh->i_fc[1] & IEEE80211_FC1_PWR_MGT); ++ } else if (ni->ni_flags & IEEE80211_NODE_PS_CHANGED) { ++ int pwr_save_changed = 0; ++ IEEE80211_LOCK_IRQ(ic); ++ if ((*(__le16 *)(&wh->i_seq[0])) == ni->ni_pschangeseq) { ++ ni->ni_flags &= ~IEEE80211_NODE_PS_CHANGED; ++ pwr_save_changed = 1; ++ } ++ IEEE80211_UNLOCK_IRQ(ic); ++ if (pwr_save_changed) ++ ieee80211_node_pwrsave(ni, wh->i_fc[1] & IEEE80211_FC1_PWR_MGT); ++ } ++ break; ++ case IEEE80211_M_WDS: ++ if (dir != IEEE80211_FC1_DIR_DSTODS) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ break; ++ default: ++ /* XXX here to keep compiler happy */ ++ goto out; ++ } ++ ++ /* ++ * Handle privacy requirements. Note that we ++ * must not be preempted from here until after ++ * we (potentially) call ieee80211_crypto_demic; ++ * otherwise we may violate assumptions in the ++ * crypto cipher modules used to do delayed update ++ * of replay sequence numbers. ++ */ ++ if (wh->i_fc[1] & IEEE80211_FC1_PROT) { ++ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { ++ /* ++ * Discard encrypted frames when privacy is off. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "WEP", "%s", "PRIVACY off"); ++ vap->iv_stats.is_rx_noprivacy++; ++ IEEE80211_NODE_STAT(ni, rx_noprivacy); ++ goto out; ++ } ++ key = ieee80211_crypto_decap(ni, skb, hdrspace); ++ if (key == NULL) { ++ /* NB: stats+msgs handled in crypto_decap */ ++ IEEE80211_NODE_STAT(ni, rx_wepfail); ++ goto out; ++ } ++ wh = (struct ieee80211_frame *)skb->data; ++ wh->i_fc[1] &= ~IEEE80211_FC1_PROT; ++ } else ++ key = NULL; ++ ++ /* ++ * Next up, any fragmentation. ++ */ ++ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { ++ skb = ieee80211_defrag(ni, skb, hdrspace); ++ if (skb == NULL) { ++ /* Fragment dropped or frame not complete yet */ ++ goto out; ++ } ++ } ++ wh = NULL; /* no longer valid, catch any uses */ ++ ++ /* ++ * Next strip any MSDU crypto bits. ++ */ ++ if (key != NULL && ++ !ieee80211_crypto_demic(vap, key, skb, hdrspace)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "demic error"); ++ IEEE80211_NODE_STAT(ni, rx_demicfail); ++ goto out; ++ } ++ ++ /* ++ * Finally, strip the 802.11 header. ++ */ ++ skb = ieee80211_decap(vap, skb, hdrspace); ++ if (skb == NULL) { ++ /* don't count Null data frames as errors */ ++ if (subtype == IEEE80211_FC0_SUBTYPE_NODATA) ++ goto out; ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "decap error"); ++ vap->iv_stats.is_rx_decap++; ++ IEEE80211_NODE_STAT(ni, rx_decap); ++ goto err; ++ } ++ eh = (struct ether_header *) skb->data; ++ ++ if (! accept_data_frame(vap, ni, key, skb, eh)) ++ goto out; ++ ++ vap->iv_devstats.rx_packets++; ++ vap->iv_devstats.rx_bytes += skb->len; ++ IEEE80211_NODE_STAT(ni, rx_data); ++ IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len); ++ ic->ic_lastdata = jiffies; ++ ++#ifdef ATH_SUPERG_FF ++ /* check for FF */ ++ llc = (struct llc *) (skb->data + sizeof(struct ether_header)); ++ if (ntohs(llc->llc_snap.ether_type) == (u_int16_t)ATH_ETH_TYPE) { ++ struct sk_buff *skb1 = NULL; ++ struct ether_header *eh_tmp; ++ struct athl2p_tunnel_hdr *ath_hdr; ++ int frame_len; ++ ++ /* NB: assumes linear (i.e., non-fragmented) skb */ ++ ++ /* check length > header */ ++ if (skb->len < sizeof(struct ether_header) + LLC_SNAPFRAMELEN ++ + roundup(sizeof(struct athl2p_tunnel_hdr) - 2, 4) + 2) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "decap error"); ++ vap->iv_stats.is_rx_decap++; ++ IEEE80211_NODE_STAT(ni, rx_decap); ++ goto err; ++ } ++ ++ /* get to the tunneled headers */ ++ ath_hdr = (struct athl2p_tunnel_hdr *) ++ skb_pull(skb, sizeof(struct ether_header) + LLC_SNAPFRAMELEN); ++ eh_tmp = (struct ether_header *) ++ skb_pull(skb, roundup(sizeof(struct athl2p_tunnel_hdr) - 2, 4) + 2); ++ /* sanity check for malformed 802.3 length */ ++ frame_len = ntohs(eh_tmp->ether_type); ++ if (skb->len < roundup(sizeof(struct ether_header) + frame_len, 4)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "decap error"); ++ vap->iv_stats.is_rx_decap++; ++ IEEE80211_NODE_STAT(ni, rx_decap); ++ goto err; ++ } ++ ++ /* only implementing FF now. drop all others. */ ++ if (ath_hdr->proto != ATH_L2TUNNEL_PROTO_FF) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_SUPG | IEEE80211_MSG_INPUT, ++ eh->ether_shost, "fast-frame", ++ "bad atheros tunnel prot %u", ++ ath_hdr->proto); ++ vap->iv_stats.is_rx_badathtnl++; ++ goto err; ++ } ++ vap->iv_stats.is_rx_ffcnt++; ++ ++ skb1 = skb_clone(skb, GFP_ATOMIC); /* XXX: GFP_ATOMIC is overkill? */ ++ ++ /* we now have 802.3 MAC hdr followed by 802.2 LLC/SNAP. convert to DIX */ ++ athff_decap(skb); ++ ++ /* remove second frame from end of first */ ++ skb_trim(skb, sizeof(struct ether_header) + frame_len - LLC_SNAPFRAMELEN); ++ ++ /* prepare second tunneled frame */ ++ skb_pull(skb1, roundup(sizeof(struct ether_header) + frame_len, 4)); ++ athff_decap(skb1); ++ ++ /* deliver the frames */ ++ ieee80211_deliver_data(ni, skb); ++ ieee80211_deliver_data(ni, skb1); ++ } else { ++ /* assume non-atheros llc type */ ++ ieee80211_deliver_data(ni, skb); ++ } ++#else /* !ATH_SUPERG_FF */ ++ ieee80211_deliver_data(ni, skb); ++#endif ++ return IEEE80211_FC0_TYPE_DATA; ++ ++ case IEEE80211_FC0_TYPE_MGT: ++ /* ++ * WDS opmode do not support management frames ++ */ ++ if (vap->iv_opmode == IEEE80211_M_WDS) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ goto out; ++ } ++ IEEE80211_NODE_STAT(ni, rx_mgmt); ++ if (dir != IEEE80211_FC1_DIR_NODS) { ++ vap->iv_stats.is_rx_wrongdir++; ++ goto err; ++ } ++ if (skb->len < sizeof(struct ieee80211_frame)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, ++ ni->ni_macaddr, "mgt", "too short: len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++#ifdef IEEE80211_DEBUG ++ if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) || ++ ieee80211_msg_dumppkts(vap)) { ++ ieee80211_note(vap, "received %s from %s rssi %d\n", ++ ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ ether_sprintf(wh->i_addr2), rssi); ++ } ++#endif ++ if (wh->i_fc[1] & IEEE80211_FC1_PROT) { ++ if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) { ++ /* ++ * Only shared key auth frames with a challenge ++ * should be encrypted, discard all others. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "WEP set but not permitted"); ++ vap->iv_stats.is_rx_mgtdiscard++; /* XXX */ ++ goto out; ++ } ++ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { ++ /* ++ * Discard encrypted frames when privacy is off. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "mgt", "%s", "WEP set but PRIVACY off"); ++ vap->iv_stats.is_rx_noprivacy++; ++ goto out; ++ } ++ hdrspace = ieee80211_hdrspace(ic, wh); ++ key = ieee80211_crypto_decap(ni, skb, hdrspace); ++ if (key == NULL) { ++ /* NB: stats+msgs handled in crypto_decap */ ++ goto out; ++ } ++ wh = (struct ieee80211_frame *)skb->data; ++ wh->i_fc[1] &= ~IEEE80211_FC1_PROT; ++ } ++ ic->ic_recv_mgmt(ni, skb, subtype, rssi, rstamp); ++ goto out; ++ ++ case IEEE80211_FC0_TYPE_CTL: ++ IEEE80211_NODE_STAT(ni, rx_ctrl); ++ vap->iv_stats.is_rx_ctl++; ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) ++ if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) ++ ieee80211_recv_pspoll(ni, skb); ++ goto out; ++ ++ default: ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, NULL, "bad frame type 0x%x", type); ++ /* should not come here */ ++ break; ++ } ++err: ++ vap->iv_devstats.rx_errors++; ++out: ++ if (skb != NULL) ++ dev_kfree_skb(skb); ++ return type; ++#undef HAS_SEQ ++} ++EXPORT_SYMBOL(ieee80211_input); ++ ++ ++/* ++ * Determines whether a frame should be accepted, based on information ++ * about the frame's origin and encryption, and policy for this vap. ++ */ ++static int accept_data_frame(struct ieee80211vap *vap, ++ struct ieee80211_node *ni, struct ieee80211_key *key, ++ struct sk_buff *skb, struct ether_header *eh) ++{ ++#define IS_EAPOL(eh) ((eh)->ether_type == __constant_htons(ETHERTYPE_PAE)) ++#define PAIRWISE_SET(vap) ((vap)->iv_nw_keys[0].wk_cipher != &ieee80211_cipher_none) ++ if (IS_EAPOL(eh)) { ++ /* encrypted eapol is always OK */ ++ if (key) ++ return 1; ++ /* cleartext eapol is OK if we don't have pairwise keys yet */ ++ if (! PAIRWISE_SET(vap)) ++ return 1; ++ /* cleartext eapol is OK if configured to allow it */ ++ if (! IEEE80211_VAP_DROPUNENC_EAPOL(vap)) ++ return 1; ++ /* cleartext eapol is OK if other unencrypted is OK */ ++ if (! (vap->iv_flags & IEEE80211_F_DROPUNENC)) ++ return 1; ++ /* not OK */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ eh->ether_shost, "data", ++ "unauthorized port: ether type 0x%x len %u", ++ ntohs(eh->ether_type), skb->len); ++ vap->iv_stats.is_rx_unauth++; ++ vap->iv_devstats.rx_errors++; ++ IEEE80211_NODE_STAT(ni, rx_unauth); ++ return 0; ++ } ++ ++ if (!ieee80211_node_is_authorized(ni)) { ++ /* ++ * Deny any non-PAE frames received prior to ++ * authorization. For open/shared-key ++ * authentication the port is mark authorized ++ * after authentication completes. For 802.1x ++ * the port is not marked authorized by the ++ * authenticator until the handshake has completed. ++ */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ eh->ether_shost, "data", ++ "unauthorized port: ether type 0x%x len %u", ++ ntohs(eh->ether_type), skb->len); ++ vap->iv_stats.is_rx_unauth++; ++ vap->iv_devstats.rx_errors++; ++ IEEE80211_NODE_STAT(ni, rx_unauth); ++ return 0; ++ } else { ++ /* ++ * When denying unencrypted frames, discard ++ * any non-PAE frames received without encryption. ++ */ ++ if ((vap->iv_flags & IEEE80211_F_DROPUNENC) && key == NULL) { ++ IEEE80211_NODE_STAT(ni, rx_unencrypted); ++ return 0; ++ } ++ } ++ return 1; ++ ++#undef IS_EAPOL ++#undef PAIRWISE_SET ++} ++ ++ ++/* ++ * Context: softIRQ (tasklet) ++ */ ++int ++ieee80211_input_all(struct ieee80211com *ic, ++ struct sk_buff *skb, int rssi, u_int32_t rstamp) ++{ ++ struct ieee80211vap *vap; ++ int type = -1; ++ ++ /* XXX locking */ ++ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { ++ struct ieee80211_node *ni; ++ struct sk_buff *skb1; ++ ++ if (TAILQ_NEXT(vap, iv_next) != NULL) { ++ skb1 = skb_copy(skb, GFP_ATOMIC); ++ if (skb1 == NULL) { ++ /* XXX stat+msg */ ++ continue; ++ } ++ } else { ++ skb1 = skb; ++ skb = NULL; ++ } ++ ni = ieee80211_ref_node(vap->iv_bss); ++ type = ieee80211_input(ni, skb1, rssi, rstamp); ++ ieee80211_free_node(ni); ++ } ++ if (skb != NULL) /* no vaps, reclaim skb */ ++ dev_kfree_skb(skb); ++ return type; ++} ++EXPORT_SYMBOL(ieee80211_input_all); ++ ++/* ++ * This function reassemble fragments using the skb of the 1st fragment, ++ * if large enough. If not, a new skb is allocated to hold incoming ++ * fragments. ++ * ++ * Fragments are copied at the end of the previous fragment. A different ++ * strategy could have been used, where a non-linear skb is allocated and ++ * fragments attached to that skb. ++ */ ++static struct sk_buff * ++ieee80211_defrag(struct ieee80211_node *ni, struct sk_buff *skb, int hdrlen) ++{ ++ struct ieee80211_frame *wh = (struct ieee80211_frame *) skb->data; ++ u_int16_t rxseq, last_rxseq; ++ u_int8_t fragno, last_fragno; ++ u_int8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG; ++ ++ rxseq = le16_to_cpu(*(__le16 *)wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; ++ fragno = le16_to_cpu(*(__le16 *)wh->i_seq) & IEEE80211_SEQ_FRAG_MASK; ++ ++ /* Quick way out, if there's nothing to defragment */ ++ if (!more_frag && fragno == 0 && ni->ni_rxfrag == NULL) ++ return skb; ++ ++ /* ++ * Remove frag to ensure it doesn't get reaped by timer. ++ */ ++ if (ni->ni_table == NULL) { ++ /* ++ * Should never happen. If the node is orphaned (not in ++ * the table) then input packets should not reach here. ++ * Otherwise, a concurrent request that yanks the table ++ * should be blocked by other interlocking and/or by first ++ * shutting the driver down. Regardless, be defensive ++ * here and just bail ++ */ ++ /* XXX need msg+stat */ ++ dev_kfree_skb(skb); ++ return NULL; ++ } ++ ++ /* ++ * Use this lock to make sure ni->ni_rxfrag is ++ * not freed by the timer process while we use it. ++ * XXX bogus ++ */ ++ IEEE80211_NODE_LOCK_IRQ(ni->ni_table); ++ ++ /* ++ * Update the time stamp. As a side effect, it ++ * also makes sure that the timer will not change ++ * ni->ni_rxfrag for at least 1 second, or in ++ * other words, for the remaining of this function. ++ */ ++ ni->ni_rxfragstamp = jiffies; ++ ++ IEEE80211_NODE_UNLOCK_IRQ(ni->ni_table); ++ ++ /* ++ * Validate that fragment is in order and ++ * related to the previous ones. ++ */ ++ if (ni->ni_rxfrag) { ++ struct ieee80211_frame *lwh; ++ ++ lwh = (struct ieee80211_frame *) ni->ni_rxfrag->data; ++ last_rxseq = le16_to_cpu(*(__le16 *)lwh->i_seq) >> ++ IEEE80211_SEQ_SEQ_SHIFT; ++ last_fragno = le16_to_cpu(*(__le16 *)lwh->i_seq) & ++ IEEE80211_SEQ_FRAG_MASK; ++ if (rxseq != last_rxseq ++ || fragno != last_fragno + 1 ++ || (!IEEE80211_ADDR_EQ(wh->i_addr1, lwh->i_addr1)) ++ || (!IEEE80211_ADDR_EQ(wh->i_addr2, lwh->i_addr2)) ++ || (ni->ni_rxfrag->end - ni->ni_rxfrag->tail < ++ skb->len)) { ++ /* ++ * Unrelated fragment or no space for it, ++ * clear current fragments ++ */ ++ dev_kfree_skb(ni->ni_rxfrag); ++ ni->ni_rxfrag = NULL; ++ } ++ } ++ ++ /* If this is the first fragment */ ++ if (ni->ni_rxfrag == NULL && fragno == 0) { ++ ni->ni_rxfrag = skb; ++ /* If more frags are coming */ ++ if (more_frag) { ++ if (skb_is_nonlinear(skb)) { ++ /* ++ * We need a continous buffer to ++ * assemble fragments ++ */ ++ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); ++ dev_kfree_skb(skb); ++ } ++ /* ++ * Check that we have enough space to hold ++ * incoming fragments ++ * XXX 4-address/QoS frames? ++ */ ++ else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + ++ hdrlen) { ++ ni->ni_rxfrag = skb_copy_expand(skb, 0, ++ (ni->ni_vap->iv_dev->mtu + hdrlen) - ++ (skb->end - skb->head), GFP_ATOMIC); ++ dev_kfree_skb(skb); ++ } ++ } ++ } else { ++ if (ni->ni_rxfrag) { ++ struct ieee80211_frame *lwh = (struct ieee80211_frame *) ++ ni->ni_rxfrag->data; ++ ++ /* ++ * We know we have enough space to copy, ++ * we've verified that before ++ */ ++ /* Copy current fragment at end of previous one */ ++ memcpy(ni->ni_rxfrag->tail, ++ skb->data + hdrlen, skb->len - hdrlen); ++ /* Update tail and length */ ++ skb_put(ni->ni_rxfrag, skb->len - hdrlen); ++ /* Keep a copy of last sequence and fragno */ ++ *(__le16 *) lwh->i_seq = *(__le16 *) wh->i_seq; ++ } ++ /* we're done with the fragment */ ++ dev_kfree_skb(skb); ++ } ++ ++ if (more_frag) { ++ /* More to come */ ++ skb = NULL; ++ } else { ++ /* Last fragment received, we're done! */ ++ skb = ni->ni_rxfrag; ++ ni->ni_rxfrag = NULL; ++ } ++ return skb; ++} ++ ++static void ++ieee80211_deliver_data(struct ieee80211_node *ni, struct sk_buff *skb) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct net_device *dev = vap->iv_dev; ++ struct ether_header *eh = (struct ether_header *) skb->data; ++ ++#ifdef ATH_SUPERG_XR ++ /* ++ * if it is a XR vap, send the data to associated normal net ++ * device. XR vap has a net device which is not registered with ++ * OS. ++ */ ++ if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR) ++ dev = vap->iv_xrvap->iv_dev; ++#endif ++ ++ /* perform as a bridge within the vap */ ++ /* XXX intra-vap bridging only */ ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP && ++ (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) { ++ struct sk_buff *skb1 = NULL; ++ ++ if (ETHER_IS_MULTICAST(eh->ether_dhost)) ++ skb1 = skb_copy(skb, GFP_ATOMIC); ++ else { ++ /* ++ * Check if destination is associated with the ++ * same vap and authorized to receive traffic. ++ * Beware of traffic destined for the vap itself; ++ * sending it will not work; just let it be ++ * delivered normally. ++ */ ++ struct ieee80211_node *ni1 = ieee80211_find_node( ++ &vap->iv_ic->ic_sta, eh->ether_dhost); ++ if (ni1 != NULL) { ++ if (ni1->ni_vap == vap && ++ ieee80211_node_is_authorized(ni1) && ++ ni1 != vap->iv_bss) { ++ skb1 = skb; ++ skb = NULL; ++ } ++ /* XXX statistic? */ ++ ieee80211_free_node(ni1); ++ } ++ } ++ if (skb1 != NULL) { ++ skb1->dev = dev; ++ skb_reset_mac_header(skb1); ++ skb1->network_header = skb1->data + sizeof(struct ether_header); ++ skb1->protocol = __constant_htons(ETH_P_802_2); ++ /* XXX insert vlan tag before queue it? */ ++ dev_queue_xmit(skb1); ++ } ++ } ++ ++ if (skb != NULL) { ++ skb->dev = dev; ++ ++#ifdef USE_HEADERLEN_RESV ++ skb->protocol = ath_eth_type_trans(skb, dev); ++#else ++ skb->protocol = eth_type_trans(skb, dev); ++#endif ++ if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) { ++ /* attach vlan tag */ ++ vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan); ++ } else ++ netif_rx(skb); ++ dev->last_rx = jiffies; ++ } ++} ++ ++static struct sk_buff * ++ieee80211_decap(struct ieee80211vap *vap, struct sk_buff *skb, int hdrlen) ++{ ++ struct ieee80211_qosframe_addr4 wh; /* Max size address frames */ ++ struct ether_header *eh; ++ struct llc *llc; ++ __be16 ether_type = 0; ++ ++ memcpy(&wh, skb->data, hdrlen); /* Only copy hdrlen over */ ++ llc = (struct llc *) skb_pull(skb, hdrlen); ++ if (skb->len >= LLC_SNAPFRAMELEN && ++ llc->llc_dsap == LLC_SNAP_LSAP && llc->llc_ssap == LLC_SNAP_LSAP && ++ llc->llc_control == LLC_UI && llc->llc_snap.org_code[0] == 0 && ++ llc->llc_snap.org_code[1] == 0 && llc->llc_snap.org_code[2] == 0) { ++ ether_type = llc->llc_un.type_snap.ether_type; ++ skb_pull(skb, LLC_SNAPFRAMELEN); ++ llc = NULL; ++ } ++ eh = (struct ether_header *) skb_push(skb, sizeof(struct ether_header)); ++ switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) { ++ case IEEE80211_FC1_DIR_NODS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2); ++ break; ++ case IEEE80211_FC1_DIR_TODS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2); ++ break; ++ case IEEE80211_FC1_DIR_FROMDS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr3); ++ break; ++ case IEEE80211_FC1_DIR_DSTODS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr4); ++ break; ++ } ++ if (!ALIGNED_POINTER(skb->data + sizeof(*eh), u_int32_t)) { ++ struct sk_buff *n; ++ ++ /* XXX does this always work? */ ++ n = skb_copy(skb, GFP_ATOMIC); ++ dev_kfree_skb(skb); ++ if (n == NULL) ++ return NULL; ++ skb = n; ++ eh = (struct ether_header *) skb->data; ++ } ++ if (llc != NULL) ++ eh->ether_type = htons(skb->len - sizeof(*eh)); ++ else ++ eh->ether_type = ether_type; ++ return skb; ++} ++ ++/* ++ * Install received rate set information in the node's state block. ++ */ ++int ++ieee80211_setup_rates(struct ieee80211_node *ni, ++ const u_int8_t *rates, const u_int8_t *xrates, int flags) ++{ ++ struct ieee80211_rateset *rs = &ni->ni_rates; ++ ++ memset(rs, 0, sizeof(*rs)); ++ rs->rs_nrates = rates[1]; ++ memcpy(rs->rs_rates, rates + 2, rs->rs_nrates); ++ if (xrates != NULL) { ++ u_int8_t nxrates; ++ /* ++ * Tack on 11g extended supported rate element. ++ */ ++ nxrates = xrates[1]; ++ if (rs->rs_nrates + nxrates > IEEE80211_RATE_MAXSIZE) { ++ struct ieee80211vap *vap = ni->ni_vap; ++ ++ nxrates = IEEE80211_RATE_MAXSIZE - rs->rs_nrates; ++ IEEE80211_NOTE(vap, IEEE80211_MSG_XRATE, ni, ++ "extended rate set too large;" ++ " only using %u of %u rates", ++ nxrates, xrates[1]); ++ vap->iv_stats.is_rx_rstoobig++; ++ } ++ memcpy(rs->rs_rates + rs->rs_nrates, xrates+2, nxrates); ++ rs->rs_nrates += nxrates; ++ } ++ return ieee80211_fix_rate(ni, flags); ++} ++ ++static void ++ieee80211_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh, ++ int rssi, u_int32_t rstamp, u_int16_t seq, u_int16_t status) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ ++ if (ni->ni_authmode == IEEE80211_AUTH_SHARED) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "open auth", ++ "bad sta auth mode %u", ni->ni_authmode); ++ vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ /* XXX hack to workaround calling convention */ ++ ++ /* XXX To send the frame to the requesting STA, we have to ++ * create a node for the station that we're going to reject. ++ * The node will be freed automatically */ ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_dup_bss(vap, wh->i_addr2); ++ if (ni == NULL) ++ return; ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, ++ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), ++ ieee80211_node_refcnt(ni)); ++ } ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, ++ (seq + 1) | (IEEE80211_STATUS_ALG << 16)); ++ return; ++ } ++ } ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_IBSS: ++ if (vap->iv_state != IEEE80211_S_RUN || ++ seq != IEEE80211_AUTH_OPEN_REQUEST) { ++ vap->iv_stats.is_rx_bad_auth++; ++ return; ++ } ++ ieee80211_new_state(vap, IEEE80211_S_AUTH, ++ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); ++ break; ++ ++ case IEEE80211_M_AHDEMO: ++ case IEEE80211_M_WDS: ++ /* should not come here */ ++ break; ++ ++ case IEEE80211_M_HOSTAP: ++ if (vap->iv_state != IEEE80211_S_RUN || ++ seq != IEEE80211_AUTH_OPEN_REQUEST) { ++ vap->iv_stats.is_rx_bad_auth++; ++ return; ++ } ++ /* always accept open authentication requests */ ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_dup_bss(vap, wh->i_addr2); ++ if (ni == NULL) ++ return; ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, ++ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), ++ ieee80211_node_refcnt(ni)); ++ ++ } else if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0) ++ (void) ieee80211_ref_node(ni); ++ /* ++ * Mark the node as referenced to reflect that it's ++ * reference count has been bumped to ensure it remains ++ * after the transaction completes. ++ */ ++ ni->ni_flags |= IEEE80211_NODE_AREF; ++ ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); ++ IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ++ ni, "station authenticated (%s)", "open"); ++ /* ++ * When 802.1x is not in use mark the port ++ * authorized at this point so traffic can flow. ++ */ ++ if (ni->ni_authmode != IEEE80211_AUTH_8021X) ++ ieee80211_node_authorize(ni); ++ break; ++ ++ case IEEE80211_M_STA: ++ if (vap->iv_state != IEEE80211_S_AUTH || ++ seq != IEEE80211_AUTH_OPEN_RESPONSE) { ++ vap->iv_stats.is_rx_bad_auth++; ++ return; ++ } ++ if (status != 0) { ++ IEEE80211_NOTE(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "open auth failed (reason %d)", status); ++ vap->iv_stats.is_rx_auth_fail++; ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, ++ IEEE80211_SCAN_FAIL_STATUS); ++ } else ++ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); ++ break; ++ case IEEE80211_M_MONITOR: ++ break; ++ } ++} ++ ++/* ++ * Send a management frame error response to the specified ++ * station. If ni is associated with the station then use ++ * it; otherwise allocate a temporary node suitable for ++ * transmitting the frame and then free the reference so ++ * it will go away as soon as the frame has been transmitted. ++ */ ++static void ++ieee80211_send_error(struct ieee80211_node *ni, ++ const u_int8_t *mac, int subtype, int arg) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ int istmp; ++ ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_tmp_node(vap, mac); ++ if (ni == NULL) { ++ /* XXX msg */ ++ return; ++ } ++ istmp = 1; ++ } else ++ istmp = 0; ++ IEEE80211_SEND_MGMT(ni, subtype, arg); ++ if (istmp) ++ ieee80211_free_node(ni); ++} ++ ++static int ++alloc_challenge(struct ieee80211_node *ni) ++{ ++ if (ni->ni_challenge == NULL) ++ MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN, ++ M_DEVBUF, M_NOWAIT); ++ if (ni->ni_challenge == NULL) { ++ IEEE80211_NOTE(ni->ni_vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "%s", "shared key challenge alloc failed"); ++ /* XXX statistic */ ++ } ++ return (ni->ni_challenge != NULL); ++} ++ ++/* XXX TODO: add statistics */ ++static void ++ieee80211_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, ++ u_int8_t *frm, u_int8_t *efrm, int rssi, u_int32_t rstamp, ++ u_int16_t seq, u_int16_t status) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ u_int8_t *challenge; ++ int allocbs, estatus; ++ ++ /* ++ * NB: this can happen as we allow pre-shared key ++ * authentication to be enabled w/o wep being turned ++ * on so that configuration of these can be done ++ * in any order. It may be better to enforce the ++ * ordering in which case this check would just be ++ * for sanity/consistency. ++ */ ++ estatus = 0; /* NB: silence compiler */ ++ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "%s", " PRIVACY is disabled"); ++ estatus = IEEE80211_STATUS_ALG; ++ goto bad; ++ } ++ /* ++ * Pre-shared key authentication is evil; accept ++ * it only if explicitly configured (it is supported ++ * mainly for compatibility with clients like OS X). ++ */ ++ if (ni->ni_authmode != IEEE80211_AUTH_AUTO && ++ ni->ni_authmode != IEEE80211_AUTH_SHARED) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad sta auth mode %u", ni->ni_authmode); ++ vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ ++ estatus = IEEE80211_STATUS_ALG; ++ goto bad; ++ } ++ ++ challenge = NULL; ++ if (frm + 1 < efrm) { ++ if ((frm[1] + 2) > (efrm - frm)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "ie %d/%d too long", ++ frm[0], (frm[1] + 2) - (efrm - frm)); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ if (*frm == IEEE80211_ELEMID_CHALLENGE) ++ challenge = frm; ++ frm += frm[1] + 2; ++ } ++ switch (seq) { ++ case IEEE80211_AUTH_SHARED_CHALLENGE: ++ case IEEE80211_AUTH_SHARED_RESPONSE: ++ if (challenge == NULL) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "%s", "no challenge"); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ if (challenge[1] != IEEE80211_CHALLENGE_LEN) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad challenge len %d", challenge[1]); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ default: ++ break; ++ } ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_MONITOR: ++ case IEEE80211_M_AHDEMO: ++ case IEEE80211_M_IBSS: ++ case IEEE80211_M_WDS: ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad operating mode %u", vap->iv_opmode); ++ return; ++ case IEEE80211_M_HOSTAP: ++ if (vap->iv_state != IEEE80211_S_RUN) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad state %u", vap->iv_state); ++ estatus = IEEE80211_STATUS_ALG; /* XXX */ ++ goto bad; ++ } ++ switch (seq) { ++ case IEEE80211_AUTH_SHARED_REQUEST: ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_dup_bss(vap, wh->i_addr2); ++ if (ni == NULL) { ++ /* NB: no way to return an error */ ++ return; ++ } ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, ++ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), ++ ieee80211_node_refcnt(ni)); ++ ++ allocbs = 1; ++ } else { ++ if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0) ++ (void) ieee80211_ref_node(ni); ++ allocbs = 0; ++ } ++ /* ++ * Mark the node as referenced to reflect that it's ++ * reference count has been bumped to ensure it remains ++ * after the transaction completes. ++ */ ++ ni->ni_flags |= IEEE80211_NODE_AREF; ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ if (!alloc_challenge(ni)) { ++ /* NB: don't return error so they rexmit */ ++ return; ++ } ++ get_random_bytes(ni->ni_challenge, ++ IEEE80211_CHALLENGE_LEN); ++ IEEE80211_NOTE(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "shared key %sauth request", allocbs ? "" : "re"); ++ break; ++ case IEEE80211_AUTH_SHARED_RESPONSE: ++ if (ni == vap->iv_bss) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key response", ++ "%s", "unknown station"); ++ /* NB: don't send a response */ ++ return; ++ } ++ if (ni->ni_challenge == NULL) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key response", ++ "%s", "no challenge recorded"); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ if (memcmp(ni->ni_challenge, &challenge[2], ++ challenge[1]) != 0) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key response", ++ "%s", "challenge mismatch"); ++ vap->iv_stats.is_rx_auth_fail++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ IEEE80211_NOTE(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "station authenticated (%s)", "shared key"); ++ ieee80211_node_authorize(ni); ++ break; ++ default: ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad seq %d", seq); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_SEQUENCE; ++ goto bad; ++ } ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); ++ break; ++ ++ case IEEE80211_M_STA: ++ if (vap->iv_state != IEEE80211_S_AUTH) ++ return; ++ switch (seq) { ++ case IEEE80211_AUTH_SHARED_PASS: ++ if (ni->ni_challenge != NULL) { ++ FREE(ni->ni_challenge, M_DEVBUF); ++ ni->ni_challenge = NULL; ++ } ++ if (status != 0) { ++ IEEE80211_NOTE_MAC(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ++ ieee80211_getbssid(vap, wh), ++ "shared key auth failed (reason %d)", ++ status); ++ vap->iv_stats.is_rx_auth_fail++; ++ /* XXX IEEE80211_SCAN_FAIL_STATUS */ ++ goto bad; ++ } ++ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); ++ break; ++ case IEEE80211_AUTH_SHARED_CHALLENGE: ++ if (!alloc_challenge(ni)) ++ goto bad; ++ /* XXX could optimize by passing recvd challenge */ ++ memcpy(ni->ni_challenge, &challenge[2], challenge[1]); ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); ++ break; ++ default: ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH, ++ wh, "shared key auth", "bad seq %d", seq); ++ vap->iv_stats.is_rx_bad_auth++; ++ goto bad; ++ } ++ break; ++ } ++ return; ++bad: ++ /* ++ * Send an error response; but only when operating as an AP. ++ */ ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ /* XXX hack to workaround calling convention */ ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_AUTH, ++ (seq + 1) | (estatus<<16)); ++ } else if (vap->iv_opmode == IEEE80211_M_STA) { ++ /* ++ * Kick the state machine. This short-circuits ++ * using the mgt frame timeout to trigger the ++ * state transition. ++ */ ++ if (vap->iv_state == IEEE80211_S_AUTH) ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); ++ } ++} ++ ++/* Verify the existence and length of __elem or get out. */ ++#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do { \ ++ if ((__elem) == NULL) { \ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ ++ wh, ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ "%s", "no " #__elem ); \ ++ vap->iv_stats.is_rx_elem_missing++; \ ++ return; \ ++ } \ ++ if ((__elem)[1] > (__maxlen)) { \ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ ++ wh, ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ "bad " #__elem " len %d", (__elem)[1]); \ ++ vap->iv_stats.is_rx_elem_toobig++; \ ++ return; \ ++ } \ ++} while (0) ++ ++#define IEEE80211_VERIFY_LENGTH(_len, _minlen) do { \ ++ if ((_len) < (_minlen)) { \ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ ++ wh, ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ "%s", "ie too short"); \ ++ vap->iv_stats.is_rx_elem_toosmall++; \ ++ return; \ ++ } \ ++} while (0) ++ ++#ifdef IEEE80211_DEBUG ++static void ++ieee80211_ssid_mismatch(struct ieee80211vap *vap, const char *tag, ++ u_int8_t mac[IEEE80211_ADDR_LEN], u_int8_t *ssid) ++{ ++ printf("[%s] discard %s frame, ssid mismatch: ", ++ ether_sprintf(mac), tag); ++ ieee80211_print_essid(ssid + 2, ssid[1]); ++ printf("\n"); ++} ++ ++#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ ++ if ((_ssid)[1] != 0 && \ ++ ((_ssid)[1] != (_ni)->ni_esslen || \ ++ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ ++ if (ieee80211_msg_input(vap)) \ ++ ieee80211_ssid_mismatch(vap, \ ++ ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ wh->i_addr2, _ssid); \ ++ vap->iv_stats.is_rx_ssidmismatch++; \ ++ return; \ ++ } \ ++} while (0) ++#else /* !IEEE80211_DEBUG */ ++#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ ++ if ((_ssid)[1] != 0 && \ ++ ((_ssid)[1] != (_ni)->ni_esslen || \ ++ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ ++ vap->iv_stats.is_rx_ssidmismatch++; \ ++ return; \ ++ } \ ++} while (0) ++#endif /* !IEEE80211_DEBUG */ ++ ++/* unaligned little endian access */ ++#define LE_READ_2(p) \ ++ ((u_int16_t) \ ++ ((((const u_int8_t *)(p))[0] ) | \ ++ (((const u_int8_t *)(p))[1] << 8))) ++#define LE_READ_4(p) \ ++ ((u_int32_t) \ ++ ((((const u_int8_t *)(p))[0] ) | \ ++ (((const u_int8_t *)(p))[1] << 8) | \ ++ (((const u_int8_t *)(p))[2] << 16) | \ ++ (((const u_int8_t *)(p))[3] << 24))) ++ ++static __inline int ++iswpaoui(const u_int8_t *frm) ++{ ++ return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI); ++} ++ ++static __inline int ++iswmeoui(const u_int8_t *frm) ++{ ++ return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI); ++} ++ ++static __inline int ++iswmeparam(const u_int8_t *frm) ++{ ++ return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && ++ frm[6] == WME_PARAM_OUI_SUBTYPE; ++} ++ ++static __inline int ++iswmeinfo(const u_int8_t *frm) ++{ ++ return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && ++ frm[6] == WME_INFO_OUI_SUBTYPE; ++} ++ ++static __inline int ++isatherosoui(const u_int8_t *frm) ++{ ++ return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI); ++} ++ ++/* ++ * Convert a WPA cipher selector OUI to an internal ++ * cipher algorithm. Where appropriate we also ++ * record any key length. ++ */ ++static int ++wpa_cipher(u_int8_t *sel, u_int8_t *keylen) ++{ ++#define WPA_SEL(x) (((x) << 24) | WPA_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case WPA_SEL(WPA_CSE_NULL): ++ return IEEE80211_CIPHER_NONE; ++ case WPA_SEL(WPA_CSE_WEP40): ++ if (keylen) ++ *keylen = 40 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case WPA_SEL(WPA_CSE_WEP104): ++ if (keylen) ++ *keylen = 104 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case WPA_SEL(WPA_CSE_TKIP): ++ return IEEE80211_CIPHER_TKIP; ++ case WPA_SEL(WPA_CSE_CCMP): ++ return IEEE80211_CIPHER_AES_CCM; ++ } ++ return 32; /* NB: so 1<< is discarded */ ++#undef WPA_SEL ++} ++ ++/* ++ * Convert a WPA key management/authentication algorithm ++ * to an internal code. ++ */ ++static int ++wpa_keymgmt(u_int8_t *sel) ++{ ++#define WPA_SEL(x) (((x)<<24)|WPA_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case WPA_SEL(WPA_ASE_8021X_UNSPEC): ++ return WPA_ASE_8021X_UNSPEC; ++ case WPA_SEL(WPA_ASE_8021X_PSK): ++ return WPA_ASE_8021X_PSK; ++ case WPA_SEL(WPA_ASE_NONE): ++ return WPA_ASE_NONE; ++ } ++ return 0; /* NB: so is discarded */ ++#undef WPA_SEL ++} ++ ++/* ++ * Parse a WPA information element to collect parameters ++ * and validate the parameters against what has been ++ * configured for the system. ++ */ ++static int ++ieee80211_parse_wpa(struct ieee80211vap *vap, u_int8_t *frm, ++ struct ieee80211_rsnparms *rsn_parm, const struct ieee80211_frame *wh) ++{ ++ u_int8_t len = frm[1]; ++ u_int32_t w; ++ int n; ++ ++ /* ++ * Check the length once for fixed parts: OUI, type, ++ * version, mcast cipher, and 2 selector counts. ++ * Other, variable-length data, must be checked separately. ++ */ ++ if (!(vap->iv_flags & IEEE80211_F_WPA1)) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "vap not WPA, flags 0x%x", vap->iv_flags); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ ++ if (len < 14) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "too short, len %u", len); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 6, len -= 4; /* NB: len is payload only */ ++ /* NB: iswapoui already validated the OUI and type */ ++ w = LE_READ_2(frm); ++ if (w != WPA_VERSION) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "bad version %u", w); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 2; ++ len -= 2; ++ ++ /* multicast/group cipher */ ++ w = wpa_cipher(frm, &rsn_parm->rsn_mcastkeylen); ++ if (w != rsn_parm->rsn_mcastcipher) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "mcast cipher mismatch; got %u, expected %u", ++ w, rsn_parm->rsn_mcastcipher); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 4; ++ len -= 4; ++ ++ /* unicast ciphers */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n*4+2) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "ucast cipher data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= 1 << wpa_cipher(frm, &rsn_parm->rsn_ucastkeylen); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_ucastcipherset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "%s", "ucast cipher set empty"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & (1 << IEEE80211_CIPHER_TKIP)) ++ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_TKIP; ++ else ++ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM; ++ ++ /* key management algorithms */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n * 4) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "key mgmt alg data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= wpa_keymgmt(frm); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_keymgmtset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "%s", "no acceptable key mgmt alg"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & WPA_ASE_8021X_UNSPEC) ++ rsn_parm->rsn_keymgmt = WPA_ASE_8021X_UNSPEC; ++ else ++ rsn_parm->rsn_keymgmt = WPA_ASE_8021X_PSK; ++ ++ if (len > 2) /* optional capabilities */ ++ rsn_parm->rsn_caps = LE_READ_2(frm); ++ ++ return 0; ++} ++ ++/* ++ * Convert an RSN cipher selector OUI to an internal ++ * cipher algorithm. Where appropriate we also ++ * record any key length. ++ */ ++static int ++rsn_cipher(u_int8_t *sel, u_int8_t *keylen) ++{ ++#define RSN_SEL(x) (((x) << 24) | RSN_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case RSN_SEL(RSN_CSE_NULL): ++ return IEEE80211_CIPHER_NONE; ++ case RSN_SEL(RSN_CSE_WEP40): ++ if (keylen) ++ *keylen = 40 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case RSN_SEL(RSN_CSE_WEP104): ++ if (keylen) ++ *keylen = 104 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case RSN_SEL(RSN_CSE_TKIP): ++ return IEEE80211_CIPHER_TKIP; ++ case RSN_SEL(RSN_CSE_CCMP): ++ return IEEE80211_CIPHER_AES_CCM; ++ case RSN_SEL(RSN_CSE_WRAP): ++ return IEEE80211_CIPHER_AES_OCB; ++ } ++ return 32; /* NB: so 1<< is discarded */ ++#undef RSN_SEL ++} ++ ++/* ++ * Convert an RSN key management/authentication algorithm ++ * to an internal code. ++ */ ++static int ++rsn_keymgmt(u_int8_t *sel) ++{ ++#define RSN_SEL(x) (((x) << 24) | RSN_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case RSN_SEL(RSN_ASE_8021X_UNSPEC): ++ return RSN_ASE_8021X_UNSPEC; ++ case RSN_SEL(RSN_ASE_8021X_PSK): ++ return RSN_ASE_8021X_PSK; ++ case RSN_SEL(RSN_ASE_NONE): ++ return RSN_ASE_NONE; ++ } ++ return 0; /* NB: so is discarded */ ++#undef RSN_SEL ++} ++ ++/* ++ * Parse a WPA/RSN information element to collect parameters ++ * and validate the parameters against what has been ++ * configured for the system. ++ */ ++static int ++ieee80211_parse_rsn(struct ieee80211vap *vap, u_int8_t *frm, ++ struct ieee80211_rsnparms *rsn_parm, const struct ieee80211_frame *wh) ++{ ++ u_int8_t len = frm[1]; ++ u_int32_t w; ++ int n; ++ ++ /* ++ * Check the length once for fixed parts: ++ * version, mcast cipher, and 2 selector counts. ++ * Other, variable-length data, must be checked separately. ++ */ ++ if (!(vap->iv_flags & IEEE80211_F_WPA2)) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "vap not RSN, flags 0x%x", vap->iv_flags); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ ++ if (len < 10) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "too short, len %u", len); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 2; ++ w = LE_READ_2(frm); ++ if (w != RSN_VERSION) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "bad version %u", w); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 2; ++ len -= 2; ++ ++ /* multicast/group cipher */ ++ w = rsn_cipher(frm, &rsn_parm->rsn_mcastkeylen); ++ if (w != rsn_parm->rsn_mcastcipher) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "mcast cipher mismatch; got %u, expected %u", ++ w, rsn_parm->rsn_mcastcipher); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 4; ++ len -= 4; ++ ++ /* unicast ciphers */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n * 4 + 2) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "ucast cipher data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= 1 << rsn_cipher(frm, &rsn_parm->rsn_ucastkeylen); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_ucastcipherset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "%s", "ucast cipher set empty"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & (1<rsn_ucastcipher = IEEE80211_CIPHER_TKIP; ++ else ++ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM; ++ ++ /* key management algorithms */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n * 4) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "key mgmt alg data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= rsn_keymgmt(frm); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_keymgmtset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "%s", "no acceptable key mgmt alg"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & RSN_ASE_8021X_UNSPEC) ++ rsn_parm->rsn_keymgmt = RSN_ASE_8021X_UNSPEC; ++ else ++ rsn_parm->rsn_keymgmt = RSN_ASE_8021X_PSK; ++ ++ /* optional RSN capabilities */ ++ if (len > 2) ++ rsn_parm->rsn_caps = LE_READ_2(frm); ++ /* XXXPMKID */ ++ ++ return 0; ++} ++ ++void ++ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie) ++{ ++ u_int ielen = ie[1] + 2; ++ /* ++ * Record information element for later use. ++ */ ++ if (*iep == NULL || (*iep)[1] != ie[1]) { ++ if (*iep != NULL) ++ FREE(*iep, M_DEVBUF); ++ MALLOC(*iep, void*, ielen, M_DEVBUF, M_NOWAIT); ++ } ++ if (*iep != NULL) ++ memcpy(*iep, ie, ielen); ++} ++EXPORT_SYMBOL(ieee80211_saveie); ++ ++static int ++ieee80211_parse_wmeie(u_int8_t *frm, const struct ieee80211_frame *wh, ++ struct ieee80211_node *ni) ++{ ++ u_int len = frm[1]; ++ ++ if (len != 7) { ++ IEEE80211_DISCARD_IE(ni->ni_vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, ++ wh, "WME IE", "too short, len %u", len); ++ return -1; ++ } ++ ni->ni_uapsd = frm[WME_CAPINFO_IE_OFFSET]; ++ if (ni->ni_uapsd) { ++ ni->ni_flags |= IEEE80211_NODE_UAPSD; ++ switch (WME_UAPSD_MAXSP(ni->ni_uapsd)) { ++ case 1: ++ ni->ni_uapsd_maxsp = 2; break; ++ case 2: ++ ni->ni_uapsd_maxsp = 4; break; ++ case 3: ++ ni->ni_uapsd_maxsp = 6; break; ++ default: ++ ni->ni_uapsd_maxsp = WME_UAPSD_NODE_MAXQDEPTH; ++ } ++ } ++ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_POWER, ni, ++ "UAPSD bit settings from STA: %02x", ni->ni_uapsd); ++ ++ return 1; ++} ++ ++static int ++ieee80211_parse_wmeparams(struct ieee80211vap *vap, u_int8_t *frm, ++ const struct ieee80211_frame *wh, u_int8_t *qosinfo) ++{ ++#define MS(_v, _f) (((_v) & _f) >> _f##_S) ++ struct ieee80211_wme_state *wme = &vap->iv_ic->ic_wme; ++ u_int len = frm[1], qosinfo_count; ++ int i; ++ ++ *qosinfo = 0; ++ ++ if (len < sizeof(struct ieee80211_wme_param)-2) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, ++ wh, "WME", "too short, len %u", len); ++ return -1; ++ } ++ *qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)]; ++ qosinfo_count = *qosinfo & WME_QOSINFO_COUNT; ++ /* XXX do proper check for wraparound */ ++ if (qosinfo_count == wme->wme_wmeChanParams.cap_info_count) ++ return 0; ++ frm += __offsetof(struct ieee80211_wme_param, params_acParams); ++ for (i = 0; i < WME_NUM_AC; i++) { ++ struct wmeParams *wmep = ++ &wme->wme_wmeChanParams.cap_wmeParams[i]; ++ /* NB: ACI not used */ ++ wmep->wmep_acm = MS(frm[0], WME_PARAM_ACM); ++ wmep->wmep_aifsn = MS(frm[0], WME_PARAM_AIFSN); ++ wmep->wmep_logcwmin = MS(frm[1], WME_PARAM_LOGCWMIN); ++ wmep->wmep_logcwmax = MS(frm[1], WME_PARAM_LOGCWMAX); ++ wmep->wmep_txopLimit = LE_READ_2(frm + 2); ++ frm += 4; ++ } ++ wme->wme_wmeChanParams.cap_info_count = qosinfo_count; ++ return 1; ++#undef MS ++} ++ ++static void ++ieee80211_parse_athParams(struct ieee80211_node *ni, u_int8_t *ie) ++{ ++#ifdef ATH_SUPERG_DYNTURBO ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = ni->ni_ic; ++#endif /* ATH_SUPERG_DYNTURBO */ ++ struct ieee80211_ie_athAdvCap *athIe = ++ (struct ieee80211_ie_athAdvCap *) ie; ++ ++ ni->ni_ath_flags = athIe->athAdvCap_capability; ++ if (ni->ni_ath_flags & IEEE80211_ATHC_COMP) ++ ni->ni_ath_defkeyindex = LE_READ_2(&athIe->athAdvCap_defKeyIndex); ++#if 0 ++ /* NB: too noisy */ ++ IEEE80211_NOTE(vap, IEEE80211_MSG_SUPG, ni, ++ "recv ath params: caps 0x%x flags 0x%x defkeyix %u", ++ athIe->athAdvCap_capability, ni->ni_ath_flags, ++ ni->ni_ath_defkeyindex); ++#endif ++#ifdef ATH_SUPERG_DYNTURBO ++ if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_ATHC_TURBOP)) { ++ u_int16_t curflags, newflags; ++ ++ /* ++ * Check for turbo mode switch. Calculate flags ++ * for the new mode and effect the switch. ++ */ ++ newflags = curflags = ic->ic_bsschan->ic_flags; ++ /* NB: ATHC_BOOST is not in ic_ath_cap, so get it from the ie */ ++ if (athIe->athAdvCap_capability & IEEE80211_ATHC_BOOST) ++ newflags |= IEEE80211_CHAN_TURBO; ++ else ++ newflags &= ~IEEE80211_CHAN_TURBO; ++ if (newflags != curflags) ++ ieee80211_dturbo_switch(ic, newflags); ++ } ++#endif /* ATH_SUPERG_DYNTURBO */ ++} ++ ++static void ++forward_mgmt_to_app(struct ieee80211vap *vap, int subtype, struct sk_buff *skb, ++ struct ieee80211_frame *wh) ++{ ++ struct net_device *dev = vap->iv_dev; ++ int filter_type = 0; ++ ++ switch (subtype) { ++ case IEEE80211_FC0_SUBTYPE_BEACON: ++ filter_type = IEEE80211_FILTER_TYPE_BEACON; ++ break; ++ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ++ filter_type = IEEE80211_FILTER_TYPE_PROBE_REQ; ++ break; ++ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: ++ filter_type = IEEE80211_FILTER_TYPE_PROBE_RESP; ++ break; ++ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: ++ filter_type = IEEE80211_FILTER_TYPE_ASSOC_REQ; ++ break; ++ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: ++ filter_type = IEEE80211_FILTER_TYPE_ASSOC_RESP; ++ break; ++ case IEEE80211_FC0_SUBTYPE_AUTH: ++ filter_type = IEEE80211_FILTER_TYPE_AUTH; ++ break; ++ case IEEE80211_FC0_SUBTYPE_DEAUTH: ++ filter_type = IEEE80211_FILTER_TYPE_DEAUTH; ++ break; ++ case IEEE80211_FC0_SUBTYPE_DISASSOC: ++ filter_type = IEEE80211_FILTER_TYPE_DISASSOC; ++ break; ++ default: ++ break; ++ } ++ ++ if (filter_type && ((vap->app_filter & filter_type) == filter_type)) { ++ struct sk_buff *skb1; ++ ++ skb1 = skb_copy(skb, GFP_ATOMIC); ++ if (skb1 == NULL) ++ return; ++ skb1->dev = dev; ++ skb_reset_mac_header(skb1); ++ skb1->ip_summed = CHECKSUM_NONE; ++ skb1->pkt_type = PACKET_OTHERHOST; ++ skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ ++ ++ netif_rx(skb1); ++ } ++} ++ ++void ++ieee80211_saveath(struct ieee80211_node *ni, u_int8_t *ie) ++{ ++ const struct ieee80211_ie_athAdvCap *athIe = ++ (const struct ieee80211_ie_athAdvCap *) ie; ++ ++ ni->ni_ath_flags = athIe->athAdvCap_capability; ++ if (ni->ni_ath_flags & IEEE80211_ATHC_COMP) ++ ni->ni_ath_defkeyindex = LE_READ_2(&athIe->athAdvCap_defKeyIndex); ++ ieee80211_saveie(&ni->ni_ath_ie, ie); ++} ++ ++struct ieee80211_channel * ++ieee80211_doth_findchan(struct ieee80211vap *vap, u_int8_t chan) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ struct ieee80211_channel *c; ++ int flags, freq; ++ ++ /* NB: try first to preserve turbo */ ++ flags = ic->ic_bsschan->ic_flags & IEEE80211_CHAN_ALL; ++ freq = ieee80211_ieee2mhz(chan, 0); ++ c = ieee80211_find_channel(ic, freq, flags); ++ if (c == NULL) ++ c = ieee80211_find_channel(ic, freq, 0); ++ return c; ++} ++ ++static void ++ieee80211_doth_cancel_cs(struct ieee80211vap *vap) ++{ ++ del_timer(&vap->iv_csa_timer); ++ if (vap->iv_csa_jiffies) ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "channel switch canceled (was: to %u in %u " ++ "tbtt, mode %u)\n", vap->iv_csa_chan->ic_ieee, ++ vap->iv_csa_count, vap->iv_csa_mode); ++ vap->iv_csa_jiffies = 0; ++} ++ ++static void ++ieee80211_doth_switch_channel(struct ieee80211vap *vap) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: Channel switch to %d NOW!\n", ++ __func__, vap->iv_csa_chan->ic_ieee); ++#if 0 ++ /* XXX does not belong here? */ ++ /* XXX doesn't stop management frames */ ++ /* XXX who restarts the queue? */ ++ /* NB: for now, error here is non-catastrophic. ++ * in the future we may need to ensure we ++ * stop xmit on this channel. ++ */ ++ netif_stop_queue(ic->ic_dev); ++#endif ++ ++ vap->iv_csa_jiffies = 0; /* supress "cancel" msg */ ++ ieee80211_doth_cancel_cs(vap); ++ ++ ic->ic_prevchan = ic->ic_curchan; ++ ic->ic_curchan = ic->ic_bsschan = vap->iv_csa_chan; ++ ic->ic_set_channel(ic); ++} ++ ++static void ++ieee80211_doth_switch_channel_tmr(unsigned long arg) ++{ ++ struct ieee80211vap *vap = (struct ieee80211vap *)arg; ++ ieee80211_doth_switch_channel(vap); ++} ++ ++static int ++ieee80211_parse_csaie(struct ieee80211_node *ni, u_int8_t *frm, ++ const struct ieee80211_frame *wh) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = vap->iv_ic; ++ struct ieee80211_channel *c; ++ struct ieee80211_ie_csa *csa_ie = (struct ieee80211_ie_csa *)frm; ++ ++ if (!frm) { ++ /* we had CS underway but now we got Beacon without CSA IE */ ++ /* XXX abuse? */ ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch is scheduled, but we got " ++ "Beacon without CSA IE!\n", __func__); ++ ++ ieee80211_doth_cancel_cs(vap); ++ return 0; ++ } ++ ++ if (csa_ie->csa_len != 3) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, ++ wh, "channel switch", "invalid length %u", ++ csa_ie->csa_len); ++ return -1; ++ } ++ ++ if (isclr(ic->ic_chan_avail, csa_ie->csa_chan)) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, ++ wh, "channel switch", "invalid channel %u", ++ csa_ie->csa_chan); ++ return -1; ++ } ++ ++ if ((c = ieee80211_doth_findchan(vap, csa_ie->csa_chan)) == NULL) { ++ /* XXX something wrong */ ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, ++ wh, "channel switch", ++ "channel %u lookup failed", csa_ie->csa_chan); ++ return -1; ++ } ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch to %u in %u tbtt (mode %u) announced\n", ++ __func__, csa_ie->csa_chan, csa_ie->csa_count, ++ csa_ie->csa_mode); ++ ++ if (vap->iv_csa_jiffies) { ++ /* CSA was received recently */ ++ if (c != vap->iv_csa_chan) { ++ /* XXX abuse? */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch channel " ++ "changed from %u to %u!\n", __func__, ++ vap->iv_csa_chan->ic_ieee, ++ csa_ie->csa_chan); ++ ++ if (vap->iv_csa_count > IEEE80211_CSA_PROTECTION_PERIOD) ++ ieee80211_doth_cancel_cs(vap); ++ return 0; ++ } ++ ++ if (csa_ie->csa_mode != vap->iv_csa_mode) { ++ /* Can be abused, but with no (to little) impact. */ ++ ++ /* CS mode change has no influence on our actions since ++ * we don't respect cs modes at all (yet). Complain and ++ * forget. */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch mode changed from " ++ "%u to %u!\n", __func__, ++ vap->iv_csa_mode, csa_ie->csa_mode); ++ } ++ ++ if (csa_ie->csa_count >= vap->iv_csa_count) { ++ /* XXX abuse? what for? */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch count didn't " ++ "decrease (%u -> %u)!\n", __func__, ++ vap->iv_csa_count, csa_ie->csa_count); ++ return 0; ++ } ++ ++ { ++ u_int32_t elapsed = IEEE80211_JIFFIES_TO_TU( ++ jiffies - vap->iv_csa_jiffies); ++ u_int32_t cnt_diff = vap->iv_csa_count - ++ csa_ie->csa_count; ++ u_int32_t expected = ni->ni_intval * cnt_diff; ++ int32_t delta = elapsed - expected; ++ if (delta < 0) ++ delta = -delta; ++ if (delta > IEEE80211_CSA_SANITY_THRESHOLD) { ++ /* XXX abuse? for now, it's safer to cancel CS ++ * than to follow it blindly */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: %u.%02u bintvals elapsed, " ++ "but count dropped by %u (delta" ++ " = %u TUs)\n", __func__, ++ elapsed / ni->ni_intval, ++ elapsed * 100 / ni->ni_intval ++ % 100, cnt_diff, delta); ++ ++ ieee80211_doth_cancel_cs(vap); ++ return 0; ++ } ++ } ++ ++ vap->iv_csa_count = csa_ie->csa_count; ++ mod_timer(&vap->iv_csa_timer, jiffies + ++ IEEE80211_TU_TO_JIFFIES(vap->iv_csa_count ++ * ni->ni_intval + 10)); ++ } else { ++ /* CSA wasn't received recently, so this is the first one in ++ * the sequence. */ ++ ++ if (csa_ie->csa_count < IEEE80211_CSA_PROTECTION_PERIOD) { ++ /* XXX abuse? */ ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | ++ IEEE80211_MSG_DOTH, ++ wh, "channel switch", ++ "initial announcement: channel switch" ++ " would occur too soon (in %u tbtt)", ++ csa_ie->csa_count); ++ return 0; ++ } ++ ++ vap->iv_csa_mode = csa_ie->csa_mode; ++ vap->iv_csa_count = csa_ie->csa_count; ++ vap->iv_csa_chan = c; ++ ++ vap->iv_csa_timer.function = ieee80211_doth_switch_channel_tmr; ++ vap->iv_csa_timer.data = (unsigned long)vap; ++ vap->iv_csa_timer.expires = jiffies + IEEE80211_TU_TO_JIFFIES( ++ vap->iv_csa_count * ni->ni_intval + 10); ++ add_timer(&vap->iv_csa_timer); ++ } ++ ++ vap->iv_csa_jiffies = jiffies; ++ ++ if (vap->iv_csa_count <= 1) ++ ieee80211_doth_switch_channel(vap); ++ ++ return 0; ++} ++ ++/* XXX. Not the right place for such a definition */ ++struct l2_update_frame { ++ struct ether_header eh; ++ u8 dsap; ++ u8 ssap; ++ u8 control; ++ u8 xid[3]; ++} __packed; ++ ++static void ++ieee80211_deliver_l2uf(struct ieee80211_node *ni) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct net_device *dev = vap->iv_dev; ++ struct sk_buff *skb; ++ struct l2_update_frame *l2uf; ++ struct ether_header *eh; ++ ++ skb = dev_alloc_skb(sizeof(*l2uf)); ++ if (!skb) { ++ printk("ieee80211_deliver_l2uf: no buf available\n"); ++ return; ++ } ++ skb_put(skb, sizeof(*l2uf)); ++ l2uf = (struct l2_update_frame *)(skb->data); ++ eh = &l2uf->eh; ++ /* dst: Broadcast address */ ++ IEEE80211_ADDR_COPY(eh->ether_dhost, dev->broadcast); ++ /* src: associated STA */ ++ IEEE80211_ADDR_COPY(eh->ether_shost, ni->ni_macaddr); ++ eh->ether_type = htons(skb->len - sizeof(*eh)); ++ ++ l2uf->dsap = 0; ++ l2uf->ssap = 0; ++ l2uf->control = 0xf5; ++ l2uf->xid[0] = 0x81; ++ l2uf->xid[1] = 0x80; ++ l2uf->xid[2] = 0x00; ++ ++ skb->dev = dev; ++ skb->protocol = eth_type_trans(skb, dev); ++ skb_reset_mac_header(skb); ++ ieee80211_deliver_data(ni, skb); ++ return; ++} ++ ++static __inline int ++contbgscan(struct ieee80211vap *vap) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ ++ return ((ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN) && ++ time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle)); ++} ++ ++static __inline int ++startbgscan(struct ieee80211vap *vap) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ ++ return ((vap->iv_flags & IEEE80211_F_BGSCAN) && ++ !IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) && ++ time_after(jiffies, ic->ic_lastscan + vap->iv_bgscanintvl) && ++ time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle)); ++} ++ ++ ++/* ++ * Context: SoftIRQ ++ */ ++void ++ieee80211_recv_mgmt(struct ieee80211_node *ni, struct sk_buff *skb, ++ int subtype, int rssi, u_int32_t rstamp) ++{ ++#define ISPROBE(_st) ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) ++#define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = vap->iv_ic; ++ struct ieee80211_frame *wh; ++ u_int8_t *frm, *efrm; ++ u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath; ++ u_int8_t rate; ++ int reassoc, resp, allocbs; ++ u_int8_t qosinfo; ++ ++ wh = (struct ieee80211_frame *) skb->data; ++ frm = (u_int8_t *)&wh[1]; ++ efrm = skb->data + skb->len; ++ ++ /* forward management frame to application */ ++ if (vap->iv_opmode != IEEE80211_M_MONITOR) ++ forward_mgmt_to_app(vap, subtype, skb, wh); ++ ++ switch (subtype) { ++ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: ++ case IEEE80211_FC0_SUBTYPE_BEACON: { ++ struct ieee80211_scanparams scan; ++ ++ /* ++ * We process beacon/probe response frames: ++ * o when scanning, or ++ * o station mode when associated (to collect state ++ * updates such as 802.11g slot time), or ++ * o adhoc mode (to discover neighbors) ++ * Frames otherwise received are discarded. ++ */ ++ if (!((ic->ic_flags & IEEE80211_F_SCAN) || ++ (vap->iv_opmode == IEEE80211_M_STA && ni->ni_associd) || ++ vap->iv_opmode == IEEE80211_M_IBSS)) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ /* ++ * beacon/probe response frame format ++ * [8] time stamp ++ * [2] beacon interval ++ * [2] capability information ++ * [tlv] ssid ++ * [tlv] supported rates ++ * [tlv] country information ++ * [tlv] parameter set (FH/DS) ++ * [tlv] erp information ++ * [tlv] extended supported rates ++ * [tlv] WME ++ * [tlv] WPA or RSN ++ * [tlv] Atheros Advanced Capabilities ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 12); ++ memset(&scan, 0, sizeof(scan)); ++ scan.tstamp = frm; ++ frm += 8; ++ scan.bintval = le16toh(*(__le16 *)frm); ++ frm += 2; ++ scan.capinfo = le16toh(*(__le16 *)frm); ++ frm += 2; ++ scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); ++ scan.chan = scan.bchan; ++ ++ while (frm < efrm) { ++ /* Agere element in beacon */ ++ if ((*frm == IEEE80211_ELEMID_AGERE1) || ++ (*frm == IEEE80211_ELEMID_AGERE2)) { ++ frm = efrm; ++ continue; ++ } ++ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_SSID: ++ scan.ssid = frm; ++ break; ++ case IEEE80211_ELEMID_RATES: ++ scan.rates = frm; ++ break; ++ case IEEE80211_ELEMID_COUNTRY: ++ scan.country = frm; ++ break; ++ case IEEE80211_ELEMID_FHPARMS: ++ if (ic->ic_phytype == IEEE80211_T_FH) { ++ scan.fhdwell = LE_READ_2(&frm[2]); ++ scan.chan = IEEE80211_FH_CHAN(frm[4], frm[5]); ++ scan.fhindex = frm[6]; ++ } ++ break; ++ case IEEE80211_ELEMID_DSPARMS: ++ /* ++ * XXX hack this since depending on phytype ++ * is problematic for multi-mode devices. ++ */ ++ if (ic->ic_phytype != IEEE80211_T_FH) ++ scan.chan = frm[2]; ++ break; ++ case IEEE80211_ELEMID_TIM: ++ /* XXX ATIM? */ ++ scan.tim = frm; ++ scan.timoff = frm - skb->data; ++ break; ++ case IEEE80211_ELEMID_IBSSPARMS: ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ scan.xrates = frm; ++ break; ++ case IEEE80211_ELEMID_ERP: ++ if (frm[1] != 1) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID, wh, "ERP", ++ "bad len %u", frm[1]); ++ vap->iv_stats.is_rx_elem_toobig++; ++ break; ++ } ++ scan.erp = frm[2]; ++ break; ++ case IEEE80211_ELEMID_RSN: ++ scan.rsn = frm; ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ if (iswpaoui(frm)) ++ scan.wpa = frm; ++ else if (iswmeparam(frm) || iswmeinfo(frm)) ++ scan.wme = frm; ++ else if (isatherosoui(frm)) ++ scan.ath = frm; ++ break; ++ case IEEE80211_ELEMID_CHANSWITCHANN: ++ if (ic->ic_flags & IEEE80211_F_DOTH) ++ scan.csa = frm; ++ break; ++ default: ++ IEEE80211_DISCARD_IE(vap, IEEE80211_MSG_ELEMID, ++ wh, "unhandled", ++ "id %u, len %u", *frm, frm[1]); ++ vap->iv_stats.is_rx_elem_unknown++; ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE); ++ IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN); ++#if IEEE80211_CHAN_MAX < 255 ++ if (scan.chan > IEEE80211_CHAN_MAX) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "invalid channel %u", scan.chan); ++ vap->iv_stats.is_rx_badchan++; ++ return; ++ } ++#endif ++ if (scan.chan != scan.bchan && ++ ic->ic_phytype != IEEE80211_T_FH) { ++ /* ++ * Frame was received on a channel different from the ++ * one indicated in the DS params element id; ++ * silently discard it. ++ * ++ * NB: this can happen due to signal leakage. ++ * But we should take it for FH phy because ++ * the rssi value should be correct even for ++ * different hop pattern in FH. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "for off-channel %u", scan.chan); ++ vap->iv_stats.is_rx_chanmismatch++; ++ return; ++ } ++ ++ /* IEEE802.11 does not specify the allowed range for ++ * beacon interval. We discard any beacons with a ++ * beacon interval outside of an arbitrary range in ++ * order to protect against attack. ++ */ ++ if (!(IEEE80211_BINTVAL_MIN <= scan.bintval && ++ scan.bintval <= IEEE80211_BINTVAL_MAX)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_SCAN, ++ wh, "beacon", "invalid beacon interval (%u)", ++ scan.bintval); ++ return; ++ } ++ ++ /* ++ * Count frame now that we know it's to be processed. ++ */ ++ if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) ++ IEEE80211_NODE_STAT(ni, rx_beacons); ++ else ++ IEEE80211_NODE_STAT(ni, rx_proberesp); ++ ++ /* ++ * When operating in station mode, check for state updates. ++ * Be careful to ignore beacons received while doing a ++ * background scan. We consider only 11g/WMM stuff right now. ++ */ ++ if (vap->iv_opmode == IEEE80211_M_STA && ++ ni->ni_associd != 0 && ++ IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid)) { ++ /* record tsf of last beacon */ ++ memcpy(ni->ni_tstamp.data, scan.tstamp, ++ sizeof(ni->ni_tstamp)); ++ if (ni->ni_erp != scan.erp) { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, ++ "erp change: was 0x%x, now 0x%x", ++ ni->ni_erp, scan.erp); ++ if (scan.erp & IEEE80211_ERP_USE_PROTECTION) ++ ic->ic_flags |= IEEE80211_F_USEPROT; ++ else ++ ic->ic_flags &= ~IEEE80211_F_USEPROT; ++ ni->ni_erp = scan.erp; ++ /* XXX statistic */ ++ } ++ if ((ni->ni_capinfo ^ scan.capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, ++ "capabilities change: was 0x%x, now 0x%x", ++ ni->ni_capinfo, scan.capinfo); ++ /* ++ * NB: we assume short preamble doesn't ++ * change dynamically ++ */ ++ ieee80211_set_shortslottime(ic, ++ IEEE80211_IS_CHAN_A(ic->ic_bsschan) || ++ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); ++ ni->ni_capinfo = scan.capinfo; ++ /* XXX statistic */ ++ } ++ if (scan.wme != NULL && ++ (ni->ni_flags & IEEE80211_NODE_QOS)) { ++ int _retval; ++ if ((_retval = ieee80211_parse_wmeparams(vap, scan.wme, wh, &qosinfo)) >= 0) { ++ if (qosinfo & WME_CAPINFO_UAPSD_EN) ++ ni->ni_flags |= IEEE80211_NODE_UAPSD; ++ if (_retval > 0) ++ ieee80211_wme_updateparams(vap); ++ } ++ } else ++ ni->ni_flags &= ~IEEE80211_NODE_UAPSD; ++ if (scan.ath != NULL) ++ ieee80211_parse_athParams(ni, scan.ath); ++ if (scan.csa != NULL || vap->iv_csa_jiffies) ++ ieee80211_parse_csaie(ni, scan.csa, wh); ++ if (scan.tim != NULL) { ++ /* ++ * Check the TIM. For now we drop out of ++ * power save mode for any reason. ++ */ ++ struct ieee80211_tim_ie *tim = ++ (struct ieee80211_tim_ie *) scan.tim; ++ int aid = IEEE80211_AID(ni->ni_associd); ++ int ix = aid / NBBY; ++ int min = tim->tim_bitctl &~ 1; ++ int max = tim->tim_len + min - 4; ++ if ((tim->tim_bitctl&1) || ++ (min <= ix && ix <= max && ++ isset(tim->tim_bitmap - min, aid))) ++ ieee80211_sta_pwrsave(vap, 0); ++ vap->iv_dtim_count = tim->tim_count; ++ } ++ ++ /* WDS/Repeater: re-schedule software beacon timer for STA */ ++ if (vap->iv_state == IEEE80211_S_RUN && ++ vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) { ++ mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period); ++ } ++ ++ /* ++ * If scanning, pass the info to the scan module. ++ * Otherwise, check if it's the right time to do ++ * a background scan. Background scanning must ++ * be enabled and we must not be operating in the ++ * turbo phase of dynamic turbo mode. Then, ++ * it's been a while since the last background ++ * scan and if no data frames have come through ++ * recently, kick off a scan. Note that this ++ * is the mechanism by which a background scan ++ * is started _and_ continued each time we ++ * return on-channel to receive a beacon from ++ * our ap. ++ */ ++ if (ic->ic_flags & IEEE80211_F_SCAN) ++ ieee80211_add_scan(vap, &scan, wh, ++ subtype, rssi, rstamp); ++ else if (contbgscan(vap) || startbgscan(vap)) ++ ieee80211_bg_scan(vap); ++ return; ++ } ++ /* ++ * If scanning, just pass information to the scan module. ++ */ ++ if (ic->ic_flags & IEEE80211_F_SCAN) { ++ ieee80211_add_scan(vap, &scan, wh, subtype, rssi, rstamp); ++ return; ++ } ++ if (scan.capinfo & IEEE80211_CAPINFO_IBSS) { ++ if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) { ++ /* Create a new entry in the neighbor table. */ ++ ni = ieee80211_add_neighbor(vap, wh, &scan); ++ } else { ++ /* ++ * Copy data from beacon to neighbor table. ++ * Some of this information might change after ++ * ieee80211_add_neighbor(), so we just copy ++ * everything over to be safe. ++ */ ++ ni->ni_esslen = scan.ssid[1]; ++ memcpy(ni->ni_essid, scan.ssid + 2, scan.ssid[1]); ++ IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3); ++ memcpy(ni->ni_tstamp.data, scan.tstamp, ++ sizeof(ni->ni_tstamp)); ++ ni->ni_intval = IEEE80211_BINTVAL_SANITISE(scan.bintval); ++ ni->ni_capinfo = scan.capinfo; ++ ni->ni_chan = ic->ic_curchan; ++ ni->ni_fhdwell = scan.fhdwell; ++ ni->ni_fhindex = scan.fhindex; ++ ni->ni_erp = scan.erp; ++ ni->ni_timoff = scan.timoff; ++ if (scan.wme != NULL) ++ ieee80211_saveie(&ni->ni_wme_ie, scan.wme); ++ if (scan.wpa != NULL) ++ ieee80211_saveie(&ni->ni_wpa_ie, scan.wpa); ++ if (scan.rsn != NULL) ++ ieee80211_saveie(&ni->ni_rsn_ie, scan.rsn); ++ if (scan.ath != NULL) ++ ieee80211_saveath(ni, scan.ath); ++ ++ /* NB: must be after ni_chan is setup */ ++ ieee80211_setup_rates(ni, scan.rates, ++ scan.xrates, IEEE80211_F_DOSORT); ++ } ++ if (ni != NULL) { ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ } ++ } ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ++ if (vap->iv_opmode == IEEE80211_M_STA || ++ vap->iv_opmode == IEEE80211_M_AHDEMO || ++ vap->iv_state != IEEE80211_S_RUN) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ if (IEEE80211_IS_MULTICAST(wh->i_addr2)) { ++ /* frame must be directed */ ++ vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */ ++ return; ++ } ++ ++/* ++ * XR vap does not process probe requests. ++ */ ++#ifdef ATH_SUPERG_XR ++ if(vap->iv_flags & IEEE80211_F_XR ) ++ return; ++#endif ++ /* ++ * prreq frame format ++ * [tlv] ssid ++ * [tlv] supported rates ++ * [tlv] extended supported rates ++ * [tlv] Atheros Advanced Capabilities ++ */ ++ ssid = rates = xrates = ath = NULL; ++ while (frm < efrm) { ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_SSID: ++ ssid = frm; ++ break; ++ case IEEE80211_ELEMID_RATES: ++ rates = frm; ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ xrates = frm; ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ if (isatherosoui(frm)) ++ ath = frm; ++ /* XXX Atheros OUI support */ ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); ++ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); ++ IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); ++ if ((vap->iv_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "no ssid with ssid suppression enabled"); ++ vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/ ++ return; ++ } ++ if (ni == vap->iv_bss) { ++ if (vap->iv_opmode == IEEE80211_M_IBSS) { ++ /* ++ * XXX Cannot tell if the sender is operating ++ * in ibss mode. But we need a new node to ++ * send the response so blindly add them to the ++ * neighbor table. ++ */ ++ ni = ieee80211_fakeup_adhoc_node(vap, ++ wh->i_addr2); ++ } else { ++ ni = ieee80211_tmp_node(vap, wh->i_addr2); ++ } ++ if (ni == NULL) ++ return; ++ allocbs = 1; ++ } else ++ allocbs = 0; ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2, ++ "%s", "recv probe req"); ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ rate = ieee80211_setup_rates(ni, rates, xrates, ++ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ++ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); ++ if (rate & IEEE80211_RATE_BASIC) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_XRATE, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "recv'd rate set invalid"); ++ } else { ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); ++ } ++ if (allocbs && vap->iv_opmode != IEEE80211_M_IBSS) { ++ /* ++ * Temporary node created just to send a ++ * response, reclaim immediately ++ */ ++ ieee80211_free_node(ni); ++ } else if (ath != NULL) ++ ieee80211_saveath(ni, ath); ++ break; ++ ++ case IEEE80211_FC0_SUBTYPE_AUTH: { ++ u_int16_t algo, seq, status; ++ /* ++ * auth frame format ++ * [2] algorithm ++ * [2] sequence ++ * [2] status ++ * [tlv*] challenge ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); ++ algo = le16toh(*(__le16 *)frm); ++ seq = le16toh(*(__le16 *)(frm + 2)); ++ status = le16toh(*(__le16 *)(frm + 4)); ++#ifdef ATH_SUPERG_XR ++ if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) { ++ /* ++ * node roaming between XR and normal vaps. ++ * this can only happen in AP mode. disaccociate from ++ * previous vap first. ++ */ ++ if (vap->iv_xrvap) { ++ if (ni == vap->iv_bss) ++ ni = vap->iv_xrvap->iv_bss; ++ else { ++ ieee80211_node_leave(ni); ++ ieee80211_node_reset(ni, vap->iv_xrvap); ++ } ++ vap = vap->iv_xrvap; ++ } else { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH, ++ wh, "auth", "%s", "not to pier xr bssid"); ++ return; ++ } ++ } ++#endif ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr2, ++ "recv auth frame with algorithm %d seq %d", algo, seq); ++ /* ++ * Consult the ACL policy module if setup. ++ */ ++ if (vap->iv_acl != NULL && ++ !vap->iv_acl->iac_check(vap, wh->i_addr2)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL, ++ wh, "auth", "%s", "disallowed by ACL"); ++ vap->iv_stats.is_rx_acl++; ++ return; ++ } ++ if (vap->iv_flags & IEEE80211_F_COUNTERM) { ++ IEEE80211_DISCARD(vap, ++ IEEE80211_MSG_AUTH | IEEE80211_MSG_CRYPTO, ++ wh, "auth", "%s", "TKIP countermeasures enabled"); ++ vap->iv_stats.is_rx_auth_countermeasures++; ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_AUTH, ++ IEEE80211_REASON_MIC_FAILURE); ++ } ++ return; ++ } ++ if (algo == IEEE80211_AUTH_ALG_SHARED) ++ ieee80211_auth_shared(ni, wh, frm + 6, efrm, rssi, ++ rstamp, seq, status); ++ else if (algo == IEEE80211_AUTH_ALG_OPEN) ++ ieee80211_auth_open(ni, wh, rssi, rstamp, seq, status); ++ else { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "auth", "unsupported alg %d", algo); ++ vap->iv_stats.is_rx_auth_unsupported++; ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ /* XXX not right */ ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_AUTH, ++ (seq+1) | (IEEE80211_STATUS_ALG << 16)); ++ } ++ return; ++ } ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: { ++ u_int16_t capinfo, bintval; ++ struct ieee80211_rsnparms rsn_parm; ++ u_int8_t reason; ++ ++ if (vap->iv_opmode != IEEE80211_M_HOSTAP || ++ vap->iv_state != IEEE80211_S_RUN) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ ++ if (subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) { ++ reassoc = 1; ++ resp = IEEE80211_FC0_SUBTYPE_REASSOC_RESP; ++ } else { ++ reassoc = 0; ++ resp = IEEE80211_FC0_SUBTYPE_ASSOC_RESP; ++ } ++ ++ /* ++ * asreq frame format ++ * [2] capability information ++ * [2] listen interval ++ * [6*] current AP address (reassoc only) ++ * [tlv] ssid ++ * [tlv] supported rates ++ * [tlv] extended supported rates ++ * [tlv] wpa or RSN ++ * [tlv] WME ++ * [tlv] Atheros Advanced Capabilities ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, (reassoc ? 10 : 4)); ++ if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "wrong bssid"); ++ vap->iv_stats.is_rx_assoc_bss++; ++ return; ++ } ++ capinfo = le16toh(*(__le16 *)frm); ++ frm += 2; ++ bintval = le16toh(*(__le16 *)frm); ++ frm += 2; ++ if (reassoc) ++ frm += 6; /* ignore current AP info */ ++ ssid = rates = xrates = wpa = rsn = wme = ath = NULL; ++ while (frm < efrm) { ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_SSID: ++ ssid = frm; ++ break; ++ case IEEE80211_ELEMID_RATES: ++ rates = frm; ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ xrates = frm; ++ break; ++ /* XXX verify only one of RSN and WPA ie's? */ ++ case IEEE80211_ELEMID_RSN: ++ if (vap->iv_flags & IEEE80211_F_WPA2) ++ rsn = frm; ++ else ++ IEEE80211_DPRINTF(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ "[%s] ignoring RSN IE in association request\n", ++ ether_sprintf(wh->i_addr2)); ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ /* don't override RSN element ++ * XXX: actually the driver should report both WPA versions, ++ * so wpa_supplicant can choose and also detect downgrade attacks ++ */ ++ if (iswpaoui(frm) && !wpa) { ++ if (vap->iv_flags & IEEE80211_F_WPA1) ++ wpa = frm; ++ else ++ IEEE80211_DPRINTF(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ "[%s] ignoring WPA IE in association request\n", ++ ether_sprintf(wh->i_addr2)); ++ } else if (iswmeinfo(frm)) ++ wme = frm; ++ else if (isatherosoui(frm)) ++ ath = frm; ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); ++ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); ++ IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); ++ ++ if (ni == vap->iv_bss) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, ++ "deny %s request, sta not authenticated", ++ reassoc ? "reassoc" : "assoc"); ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_ASSOC_NOT_AUTHED); ++ vap->iv_stats.is_rx_assoc_notauth++; ++ return; ++ } ++ ++ /* Assert right associstion security credentials */ ++ /* XXX Divy. Incomplete */ ++ if (wpa == NULL && (ic->ic_flags & IEEE80211_F_WPA)) { ++ IEEE80211_DPRINTF(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ "[%s] no WPA/RSN IE in association request\n", ++ ether_sprintf(wh->i_addr2)); ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_RSN_REQUIRED); ++ ieee80211_node_leave(ni); ++ /* XXX distinguish WPA/RSN? */ ++ vap->iv_stats.is_rx_assoc_badwpaie++; ++ return; ++ } ++ ++ if (rsn != NULL) { ++ /* ++ * Parse WPA information element. Note that ++ * we initialize the param block from the node ++ * state so that information in the IE overrides ++ * our defaults. The resulting parameters are ++ * installed below after the association is assured. ++ */ ++ rsn_parm = ni->ni_rsn; ++ if (rsn[0] != IEEE80211_ELEMID_RSN) ++ reason = ieee80211_parse_wpa(vap, rsn, &rsn_parm, wh); ++ else ++ reason = ieee80211_parse_rsn(vap, rsn, &rsn_parm, wh); ++ if (reason != 0) { ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, reason); ++ ieee80211_node_leave(ni); ++ /* XXX distinguish WPA/RSN? */ ++ vap->iv_stats.is_rx_assoc_badwpaie++; ++ return; ++ } ++ IEEE80211_NOTE_MAC(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ wh->i_addr2, ++ "%s ie: mc %u/%u uc %u/%u key %u caps 0x%x", ++ rsn[0] != IEEE80211_ELEMID_RSN ? "WPA" : "RSN", ++ rsn_parm.rsn_mcastcipher, rsn_parm.rsn_mcastkeylen, ++ rsn_parm.rsn_ucastcipher, rsn_parm.rsn_ucastkeylen, ++ rsn_parm.rsn_keymgmt, rsn_parm.rsn_caps); ++ } ++ /* discard challenge after association */ ++ if (ni->ni_challenge != NULL) { ++ FREE(ni->ni_challenge, M_DEVBUF); ++ ni->ni_challenge = NULL; ++ } ++ /* 802.11 spec says to ignore station's privacy bit */ ++ if ((capinfo & IEEE80211_CAPINFO_ESS) == 0) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, ++ "deny %s request, capability mismatch 0x%x", ++ reassoc ? "reassoc" : "assoc", capinfo); ++ IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_CAPINFO); ++ ieee80211_node_leave(ni); ++ vap->iv_stats.is_rx_assoc_capmismatch++; ++ return; ++ } ++ rate = ieee80211_setup_rates(ni, rates, xrates, ++ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ++ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); ++ /* ++ * If constrained to 11g-only stations reject an ++ * 11b-only station. We cheat a bit here by looking ++ * at the max negotiated xmit rate and assuming anyone ++ * with a best rate <24Mb/s is an 11b station. ++ */ ++ if ((rate & IEEE80211_RATE_BASIC) || ++ ((vap->iv_flags & IEEE80211_F_PUREG) && rate < 48)) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, ++ "deny %s request, rate set mismatch", ++ reassoc ? "reassoc" : "assoc"); ++ IEEE80211_SEND_MGMT(ni, resp, ++ IEEE80211_STATUS_BASIC_RATE); ++ ieee80211_node_leave(ni); ++ vap->iv_stats.is_rx_assoc_norate++; ++ return; ++ } ++ ++ if (ni->ni_associd != 0 && ++ IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) { ++ if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) ++ != (capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, ++ wh->i_addr2, ++ "deny %s request, short slot time " ++ "capability mismatch 0x%x", ++ reassoc ? "reassoc" : "assoc", capinfo); ++ IEEE80211_SEND_MGMT(ni, resp, ++ IEEE80211_STATUS_CAPINFO); ++ ieee80211_node_leave(ni); ++ vap->iv_stats.is_rx_assoc_capmismatch++; ++ return; ++ } ++ } ++ ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ ni->ni_intval = IEEE80211_BINTVAL_SANITISE(bintval); ++ ni->ni_capinfo = capinfo; ++ ni->ni_chan = ic->ic_curchan; ++ ni->ni_fhdwell = vap->iv_bss->ni_fhdwell; ++ ni->ni_fhindex = vap->iv_bss->ni_fhindex; ++ if (wpa != NULL) { ++ /* ++ * Record WPA/RSN parameters for station, mark ++ * node as using WPA and record information element ++ * for applications that require it. ++ */ ++ ieee80211_saveie(&ni->ni_wpa_ie, wpa); ++ } else if (ni->ni_wpa_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_wpa_ie, M_DEVBUF); ++ ni->ni_wpa_ie = NULL; ++ } ++ if (rsn != NULL) { ++ /* ++ * Record WPA/RSN parameters for station, mark ++ * node as using WPA and record information element ++ * for applications that require it. ++ */ ++ ni->ni_rsn = rsn_parm; ++ ieee80211_saveie(&ni->ni_rsn_ie, rsn); ++ } else if (ni->ni_rsn_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_rsn_ie, M_DEVBUF); ++ ni->ni_rsn_ie = NULL; ++ } ++ if (wme != NULL) { ++ /* ++ * Record WME parameters for station, mark node ++ * as capable of QoS and record information ++ * element for applications that require it. ++ */ ++ ieee80211_saveie(&ni->ni_wme_ie, wme); ++ if (ieee80211_parse_wmeie(wme, wh, ni) > 0) ++ ni->ni_flags |= IEEE80211_NODE_QOS; ++ } else if (ni->ni_wme_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_wme_ie, M_DEVBUF); ++ ni->ni_wme_ie = NULL; ++ ni->ni_flags &= ~IEEE80211_NODE_QOS; ++ } ++ if (ath != NULL) ++ ieee80211_saveath(ni, ath); ++ else if (ni->ni_ath_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_ath_ie, M_DEVBUF); ++ ni->ni_ath_ie = NULL; ++ ni->ni_ath_flags = 0; ++ } ++ ++ /* Send TGf L2UF frame on behalf of newly associated station */ ++ ieee80211_deliver_l2uf(ni); ++ ieee80211_node_join(ni, resp); ++#ifdef ATH_SUPERG_XR ++ if (ni->ni_prev_vap && ++ ni->ni_vap != ni->ni_prev_vap && ++ ni->ni_vap->iv_ath_cap & IEEE80211_ATHC_XR) { ++ /* ++ * node moved between XR and normal vap. ++ * move the data between XR and normal vap. ++ */ ++ ic->ic_node_move_data(ni); ++ ni->ni_prev_vap = ni->ni_vap; ++ } ++#endif ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: { ++ u_int16_t capinfo, associd; ++ u_int16_t status; ++ ++ if (vap->iv_opmode != IEEE80211_M_STA || ++ vap->iv_state != IEEE80211_S_ASSOC) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ ++ /* ++ * asresp frame format ++ * [2] capability information ++ * [2] status ++ * [2] association ID ++ * [tlv] supported rates ++ * [tlv] extended supported rates ++ * [tlv] WME ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); ++ ni = vap->iv_bss; ++ capinfo = le16toh(*(__le16 *)frm); ++ frm += 2; ++ status = le16toh(*(__le16 *)frm); ++ frm += 2; ++ if (status != 0) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, ++ wh->i_addr2, ++ "%sassoc failed (reason %d)", ++ ISREASSOC(subtype) ? "re" : "", status); ++ vap->iv_stats.is_rx_auth_fail++; /* XXX */ ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, ++ IEEE80211_SCAN_FAIL_STATUS); ++ return; ++ } ++ associd = le16toh(*(__le16 *)frm); ++ frm += 2; ++ ++ rates = xrates = wme = NULL; ++ while (frm < efrm) { ++ /* ++ * Do not discard frames containing proprietary Agere ++ * elements 128 and 129, as the reported element length ++ * is often wrong. Skip rest of the frame, since we can ++ * not rely on the given element length making it impossible ++ * to know where the next element starts. ++ */ ++ if ((*frm == IEEE80211_ELEMID_AGERE1) || ++ (*frm == IEEE80211_ELEMID_AGERE2)) { ++ frm = efrm; ++ continue; ++ } ++ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_RATES: ++ rates = frm; ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ xrates = frm; ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ if (iswmeoui(frm)) ++ wme = frm; ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); ++ rate = ieee80211_setup_rates(ni, rates, xrates, ++ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ++ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); ++ if (rate & IEEE80211_RATE_BASIC) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, ++ wh->i_addr2, ++ "%sassoc failed (rate set mismatch)", ++ ISREASSOC(subtype) ? "re" : ""); ++ vap->iv_stats.is_rx_assoc_norate++; ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, ++ IEEE80211_SCAN_FAIL_STATUS); ++ return; ++ } ++ ++ ni->ni_capinfo = capinfo; ++ ni->ni_associd = associd; ++ if (wme != NULL && ++ ieee80211_parse_wmeparams(vap, wme, wh, &qosinfo) >= 0) { ++ ni->ni_flags |= IEEE80211_NODE_QOS; ++ ieee80211_wme_updateparams(vap); ++ } else ++ ni->ni_flags &= ~IEEE80211_NODE_QOS; ++ /* ++ * Configure state now that we are associated. ++ * ++ * XXX may need different/additional driver callbacks? ++ */ ++ if (IEEE80211_IS_CHAN_A(ic->ic_curchan) || ++ ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && ++ (ic->ic_caps & IEEE80211_C_SHPREAMBLE))) { ++ ic->ic_flags |= IEEE80211_F_SHPREAMBLE; ++ ic->ic_flags &= ~IEEE80211_F_USEBARKER; ++ } else { ++ ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; ++ ic->ic_flags |= IEEE80211_F_USEBARKER; ++ } ++ ieee80211_set_shortslottime(ic, ++ IEEE80211_IS_CHAN_A(ic->ic_curchan) || ++ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); ++ /* ++ * Honor ERP protection. ++ * ++ * NB: ni_erp should zero for non-11g operation ++ * but we check the channel characteristics ++ * just in case. ++ */ ++ if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) && ++ (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION)) ++ ic->ic_flags |= IEEE80211_F_USEPROT; ++ else ++ ic->ic_flags &= ~IEEE80211_F_USEPROT; ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, wh->i_addr2, ++ "%sassoc success: %s preamble, %s slot time%s%s%s%s%s%s%s", ++ ISREASSOC(subtype) ? "re" : "", ++ (ic->ic_flags&IEEE80211_F_SHPREAMBLE) && ++ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) ? "short" : "long", ++ ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", ++ ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", ++ ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? ++ ", turbo" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_COMP) ? ++ ", compression" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ++ ", fast-frames" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_XR) ? ++ ", XR" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_AR) ? ++ ", AR" : "" ++ ); ++ ieee80211_new_state(vap, IEEE80211_S_RUN, subtype); ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_DEAUTH: { ++ u_int16_t reason; ++ ++ if (vap->iv_state == IEEE80211_S_SCAN) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ /* ++ * deauth frame format ++ * [2] reason ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 2); ++ reason = le16toh(*(__le16 *)frm); ++ vap->iv_stats.is_rx_deauth++; ++ IEEE80211_NODE_STAT(ni, rx_deauth); ++ ++ IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni, ++ "recv deauthenticate (reason %d)", reason); ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ ieee80211_new_state(vap, IEEE80211_S_AUTH, ++ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); ++ break; ++ case IEEE80211_M_HOSTAP: ++ if (ni != vap->iv_bss) ++ ieee80211_node_leave(ni); ++ break; ++ default: ++ vap->iv_stats.is_rx_mgtdiscard++; ++ break; ++ } ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_DISASSOC: { ++ u_int16_t reason; ++ ++ if (vap->iv_state != IEEE80211_S_RUN && ++ vap->iv_state != IEEE80211_S_ASSOC && ++ vap->iv_state != IEEE80211_S_AUTH) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ /* ++ * disassoc frame format ++ * [2] reason ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 2); ++ reason = le16toh(*(__le16 *)frm); ++ vap->iv_stats.is_rx_disassoc++; ++ IEEE80211_NODE_STAT(ni, rx_disassoc); ++ ++ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, ++ "recv disassociate (reason %d)", reason); ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); ++ break; ++ case IEEE80211_M_HOSTAP: ++ if (ni != vap->iv_bss) ++ ieee80211_node_leave(ni); ++ break; ++ default: ++ vap->iv_stats.is_rx_mgtdiscard++; ++ break; ++ } ++ break; ++ } ++ default: ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "mgt", "subtype 0x%x not handled", subtype); ++ vap->iv_stats.is_rx_badsubtype++; ++ break; ++ } ++#undef ISREASSOC ++#undef ISPROBE ++} ++#undef IEEE80211_VERIFY_LENGTH ++#undef IEEE80211_VERIFY_ELEMENT ++ ++/* ++ * Process a received ps-poll frame. ++ */ ++static void ++ieee80211_recv_pspoll(struct ieee80211_node *ni, struct sk_buff *skb0) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211_frame_min *wh; ++ struct sk_buff *skb; ++ u_int16_t aid; ++ int qlen; ++ ++ wh = (struct ieee80211_frame_min *)skb0->data; ++ if (ni->ni_associd == 0) { ++ IEEE80211_DISCARD(vap, ++ IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, ++ (struct ieee80211_frame *) wh, "ps-poll", ++ "%s", "unassociated station"); ++ vap->iv_stats.is_ps_unassoc++; ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_NOT_ASSOCED); ++ return; ++ } ++ ++ aid = le16toh(wh->i_dur); ++ if (aid != ni->ni_associd) { ++ IEEE80211_DISCARD(vap, ++ IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, ++ (struct ieee80211_frame *) wh, "ps-poll", ++ "aid mismatch: sta aid 0x%x poll aid 0x%x", ++ ni->ni_associd, aid); ++ vap->iv_stats.is_ps_badaid++; ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_NOT_ASSOCED); ++ return; ++ } ++ ++ /* Okay, take the first queued packet and put it out... */ ++ IEEE80211_NODE_SAVEQ_LOCK(ni); ++ IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen); ++ IEEE80211_NODE_SAVEQ_UNLOCK(ni); ++ if (skb == NULL) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2, ++ "%s", "recv ps-poll, but queue empty"); ++ ieee80211_send_nulldata(ieee80211_ref_node(ni)); ++ vap->iv_stats.is_ps_qempty++; /* XXX node stat */ ++ if (vap->iv_set_tim != NULL) ++ vap->iv_set_tim(ni, 0); /* just in case */ ++ return; ++ } ++ /* ++ * If there are more packets, set the more packets bit ++ * in the packet dispatched to the station; otherwise ++ * turn off the TIM bit. ++ */ ++ if (qlen != 0) { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, ++ "recv ps-poll, send packet, %u still queued", qlen); ++ /* ++ * NB: More-data bit will be set during encap. ++ */ ++ } else { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, ++ "%s", "recv ps-poll, send packet, queue empty"); ++ if (vap->iv_set_tim != NULL) ++ vap->iv_set_tim(ni, 0); ++ } ++ M_PWR_SAV_SET(skb); /* ensure MORE_DATA bit is set correctly */ ++ ++ ieee80211_parent_queue_xmit(skb); /* Submit to parent device, including updating stats */ ++} ++ ++#ifdef ATH_SUPERG_FF ++static void ++athff_decap(struct sk_buff *skb) ++{ ++ struct ether_header eh_src, *eh_dst; ++ struct llc *llc; ++ ++ memcpy(&eh_src, skb->data, sizeof(struct ether_header)); ++ llc = (struct llc *) skb_pull(skb, sizeof(struct ether_header)); ++ eh_src.ether_type = llc->llc_un.type_snap.ether_type; ++ skb_pull(skb, LLC_SNAPFRAMELEN); ++ ++ eh_dst = (struct ether_header *) skb_push(skb, sizeof(struct ether_header)); ++ memcpy(eh_dst, &eh_src, sizeof(struct ether_header)); ++} ++#endif ++ ++#ifdef USE_HEADERLEN_RESV ++/* ++ * The kernel version of this function alters the skb in a manner ++ * inconsistent with dev->hard_header_len header reservation. This ++ * is a rewrite of the portion of eth_type_trans() that we need. ++ */ ++static __be16 ++ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct ethhdr *eth; ++ ++ skb_reset_mac_header(skb); ++ skb_pull(skb, ETH_HLEN); ++ /* ++ * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but ++ * since that's an inline and not a define there's ++ * no easy way to do this cleanly. ++ */ ++ eth = eth_hdr(skb); ++ ++ if (*eth->h_dest & 1) ++ if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) ++ skb->pkt_type = PACKET_BROADCAST; ++ else ++ skb->pkt_type = PACKET_MULTICAST; ++ else ++ if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) ++ skb->pkt_type = PACKET_OTHERHOST; ++ ++ return eth->h_proto; ++} ++#endif ++ ++#ifdef IEEE80211_DEBUG ++/* ++ * Debugging support. ++ */ ++ ++/* ++ * Return the bssid of a frame. ++ */ ++static const u_int8_t * ++ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh) ++{ ++ if (vap->iv_opmode == IEEE80211_M_STA) ++ return wh->i_addr2; ++ if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) != IEEE80211_FC1_DIR_NODS) ++ return wh->i_addr1; ++ if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL) ++ return wh->i_addr1; ++ return wh->i_addr3; ++} ++ ++void ++ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ ++ printk("%s: %s", vap->iv_dev->name, buf); /* NB: no \n */ ++} ++EXPORT_SYMBOL(ieee80211_note); ++ ++void ++ieee80211_note_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh, ++ const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ printk("%s: [%s] %s\n", vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); ++} ++EXPORT_SYMBOL(ieee80211_note_frame); ++ ++void ++ieee80211_note_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN], ++ const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ printk("%s: [%s] %s\n", vap->iv_dev->name, ether_sprintf(mac), buf); ++} ++EXPORT_SYMBOL(ieee80211_note_mac); ++ ++static void ++ieee80211_discard_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh, ++ const char *type, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ if (type != NULL) ++ printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf); ++ else ++ printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); ++} ++ ++static void ++ieee80211_discard_ie(struct ieee80211vap *vap, const struct ieee80211_frame *wh, ++ const char *type, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ if (type != NULL) ++ printk("[%s:%s] discard %s information element, %s\n", ++ vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf); ++ else ++ printk("[%s:%s] discard information element, %s\n", ++ vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); ++} ++ ++static void ++ieee80211_discard_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN], ++ const char *type, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ if (type != NULL) ++ printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(mac), type, buf); ++ else ++ printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(mac), buf); ++} ++#endif /* IEEE80211_DEBUG */ +diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c madwifi-0.9.3.1/net80211/ieee80211_monitor.c +--- madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c 2007-02-15 00:45:48.000000000 +0100 ++++ madwifi-0.9.3.1/net80211/ieee80211_monitor.c 2007-07-10 14:45:14.000000000 +0200 +@@ -373,7 +373,7 @@ + if (vap->iv_monitor_txf_len && tx) { + /* truncate transmit feedback packets */ + skb_trim(skb1, vap->iv_monitor_txf_len); +- skb1->nh.raw = skb1->data; ++ skb1->network_header = skb1->data; + } + switch (vap->iv_dev->type) { + case ARPHRD_IEEE80211: +@@ -555,7 +555,7 @@ + skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN); + } + skb1->dev = dev; /* NB: deliver to wlanX */ +- skb1->mac.raw = skb1->data; ++ skb_reset_mac_header(skb1); + skb1->ip_summed = CHECKSUM_NONE; + skb1->pkt_type = pkttype; + skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ From vmiklos at frugalware.org Tue Jul 10 16:21:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 16:24:06 2007 Subject: [Frugalware-git] kernel2622: cdemu-0.8-21-i686 Message-ID: <20070710142140.463DF16A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2622/.git;a=commitdiff;h=5cca7d303eb7c223455ad3aa7496b80dadce5244 commit 5cca7d303eb7c223455ad3aa7496b80dadce5244 Author: VMiklos Date: Tue Jul 10 16:21:28 2007 +0200 cdemu-0.8-21-i686 backported patch from svn for kernel2622 diff --git a/source/apps-extra/cdemu/FrugalBuild b/source/apps-extra/cdemu/FrugalBuild index b419583..68c02e5 100644 --- a/source/apps-extra/cdemu/FrugalBuild +++ b/source/apps-extra/cdemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cdemu pkgver=0.8 -pkgrel=20 +pkgrel=21 pkgdesc="A kernel module designed to simulate a CD drive with just simple cue/bin files." Finclude kernel-module depends=(${depends[@]} 'python') @@ -12,7 +12,9 @@ archs=('i686' 'x86_64') install=$pkgname.install _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('3a4e170232b74b1d62c73da78cf2abd58bf2daca') +source=($source $pkgname-$pkgver-svn_update.diff) +sha1sums=('3a4e170232b74b1d62c73da78cf2abd58bf2daca' \ + 'f72fba67deb7567bae5833d9710b73b340ffb4c4') build() { diff --git a/source/apps-extra/cdemu/cdemu-0.8-svn_update.diff b/source/apps-extra/cdemu/cdemu-0.8-svn_update.diff new file mode 100644 index 0000000..d032e37 --- /dev/null +++ b/source/apps-extra/cdemu/cdemu-0.8-svn_update.diff @@ -0,0 +1,1692 @@ +diff -Naur cdemu-0.8/cdemu cdemu-203/cdemu +--- cdemu-0.8/cdemu 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu 2007-01-06 18:04:36.000000000 +0100 +@@ -24,14 +24,13 @@ + Options: + -d, --device use the given device + -h, --help show this screen +- -s, --status shows the status of all virtual drives + -u, --unload unloads the given device + -v, --verbose be verbose + -V, --version show version and copyright notice + + CD image description files: + foobar.cue (CDRWin) +- foobar.iso (ISO9660) ++ foobar.iso (ISO-9660) + foobar.mds (Alchol 120%) + foobar.ccd (CloneCD) + foobar.nrg (Nero Burning ROM) +@@ -39,7 +38,6 @@ + Examples: + cdemu 0 foobar.cue load cd + cdemu -u 0 unload cd +- cdemu -s status + + Report bugs to + """ +@@ -47,6 +45,7 @@ + import getopt + import sys + import os ++import os.path + import re + import string + +@@ -92,9 +91,21 @@ + sys.exit() + if o in ["-s", "--status"]: + try: +- print open ("/proc/cdemu","r").read() ++ cde_devdir = "/sys/bus/virtual/devices" ++ print "reading status from: %s" % (cde_devdir) ++ print "device, loaded-status, image name, number of tracks." ++ devices = os.listdir(cde_devdir) ++ devices.sort() ++ for device in devices: ++ loaded = open(os.path.join(cde_devdir, device, "loaded")).read()[0] ++ if loaded != "0": ++ image = open(os.path.join(cde_devdir, device, "image")).read()[0] ++ else: ++ image = "(not loaded)" ++ tracks = open(os.path.join(cde_devdir, device, "tracks")).read()[0] ++ print "%s [%s]: %s (%s)" % (device, loaded, image, tracks) + except: +- print "cdemu: cdemu kernel module not loaded" ++ print "cdemu: Unavailable in this snapshot" + sys.exit(1) + if o in ["-u", "--unload"]: unload = 1 + if o in ["-v", "--verbose"]: libcdemu.verbose = 1 +diff -Naur cdemu-0.8/cdemu_core.c cdemu-203/cdemu_core.c +--- cdemu-0.8/cdemu_core.c 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_core.c 2007-01-11 22:50:46.000000000 +0100 +@@ -26,26 +26,56 @@ + #include "cdemu_kernel.h" + #include "cdemu.h" + ++static inline long cdemu_getoffset(struct cdemu_device *vc, int track, int lba); ++static inline void lba_to_msf(int lba, unsigned short *m, unsigned short *s, unsigned short *f); ++static inline int msf_to_lba(int m, int s, int f); ++static inline int cdemu_mode_2_sector_size(int mode); ++static void convert_track_mode(struct cdrom_tocentry *ep, int mode); ++static int cdemu_findtrack(struct cdemu_device *vc, int sector); ++static int read_toc_header(struct cdrom_tochdr *hp, struct cdemu_device *vc); ++static void get_toc_entry(struct cdrom_tocentry *ep, struct cdemu_device *vc); ++static int cdemu_read_actor_bio(read_descriptor_t *desc, struct page *page, ++ unsigned long offset, unsigned long size); ++static int cdemu_transfer_bio(struct cdemu_device *vc, struct bio *bio, sector_t sector); ++static int unload_cd(struct cdemu_device *vc); ++ + /* *********************************************************************** */ + /* helper functions (generic kernel) */ + /* *********************************************************************** */ + +-static inline int cdemu_msf_2_sector(int minute, int second, int frame) ++static inline long cdemu_getoffset(struct cdemu_device *vc, int track, int lba) + { +- return frame + (second + minute * 60 ) * 75; ++ return vc->tracks[track].start_offset + ++ (lba - vc->tracks[track].start_sector) * cdemu_mode_2_sector_size(vc->tracks[track].mode); ++} ++ ++static inline void lba_to_msf(int lba, unsigned short *m, unsigned short *s, unsigned short *f) ++{ ++ lba += CD_MSF_OFFSET; ++ lba &= 0xffffff; /* negative lbas use only 24 bits */ ++ *m = lba / (CD_SECS * CD_FRAMES); ++ lba %= (CD_SECS * CD_FRAMES); ++ *s = lba / CD_FRAMES; ++ *f = lba % CD_FRAMES; ++} ++ ++ ++static inline int msf_to_lba(int m, int s, int f) ++{ ++ return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET; + } + + static inline int cdemu_mode_2_sector_size(int mode) + { + switch (mode) { +- case AUDIO: return CD_FRAMESIZE_RAW; +- case AUDIO_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; +- case MODE1_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; ++ case AUDIO: return CD_FRAMESIZE_RAW; ++ case AUDIO_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; ++ case MODE1_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; + case MODE1_2352: return CD_FRAMESIZE_RAW; + case MODE1_2048: return CD_FRAMESIZE; + case MODE2_2352: return CD_FRAMESIZE_RAW; + case MODE2_2336: return CD_FRAMESIZE_RAW0; +- default: return 0; ++ default: return 0; + } + } + +@@ -118,20 +148,23 @@ + } + + static int cdemu_read_actor_bio(read_descriptor_t *desc, struct page *page, +- unsigned long offset, unsigned long size) { +- struct bio *bio = desc->arg.data; +- char *src_buf = kmap_atomic(page, KM_USER0) + offset; +- char *dst_buf = kmap_atomic(bio_page(bio), KM_USER1) + bio_offset(bio); +- +- if (size > desc->count) +- size = desc->count; +- +- memcpy(dst_buf, src_buf, size); +- +- kunmap_atomic(src_buf, KM_USER0); +- kunmap_atomic(dst_buf, KM_USER1); +- cond_resched(); +- return 0; ++ unsigned long offset, unsigned long size) ++{ ++ struct bio *bio = desc->arg.data; ++ char *src_buf = kmap_atomic(page, KM_USER0) + offset; ++ char *dst_buf = kmap_atomic(bio_page(bio), KM_USER1) + bio_offset(bio); ++ ++ if (size > desc->count - desc->written) ++ size = desc->count - desc->written; ++ ++ memcpy(dst_buf + desc->written, src_buf, size); ++ desc->written += size; ++ ++ kunmap_atomic(src_buf, KM_USER0); ++ kunmap_atomic(dst_buf, KM_USER1); ++ cond_resched(); ++ ++ return size; + } + + static int cdemu_transfer_bio(struct cdemu_device *vc, struct bio *bio, sector_t sector) +@@ -158,6 +191,12 @@ + case MODE1_2048: + offset = 0; + break; ++ case MODE2_2352: ++ offset = CD_SYNC_SIZE + CD_HEAD_SIZE + CD_SUBHEAD_SIZE; ++ break; ++ case MODE2_2336: ++ offset = CD_SUBHEAD_SIZE; ++ break; + default: + if (printk_ratelimit()) + printk_cdemu(KERN_WARNING, "Normal read not possible for track mode '%i'\n", vc->tracks[track].mode); +@@ -165,9 +204,7 @@ + } + + /* get the mode of the bin file part and calc the positon */ +- startposition = vc->tracks[track].start_offset + +- (sector - vc->tracks[track].start_sector) +- * cdemu_mode_2_sector_size(vc->tracks[track].mode); ++ startposition = cdemu_getoffset(vc, track, sector); + + /* we only support read, and we told the kernel that, + * so we won't check it here */ +@@ -176,7 +213,7 @@ + retval = vc->backing_file->f_op->sendfile(vc->backing_file, + &position, bio_iovec(bio)->bv_len, cdemu_read_actor_bio, bio); + if (retval < 0) { +- dprintk("cdemu_transfer: retval error %i\n", retval); ++ dprintk("cdemu_transfer: retval error %i\n", (int) retval); + return retval; + } else { + return 0; +@@ -196,7 +233,11 @@ + return -EACCES; + + /* just close the bin file */ ++ set_capacity(vc->gd, 0); + vc->loaded = 0; ++ vc->size = 0; ++ vc->num_tracks = 0; ++ strncpy(vc->comment, "", CDEMU_COMMENT_SIZE); + fput(vc->backing_file); + DOWN_MODULE_USE(); + +@@ -377,14 +418,24 @@ + return 0; + } + +-static int cdemu_reset(struct cdrom_device_info *cdi) ++static int cdemu_reset_helper(struct device *dev, void *ptr) + { +- int i; ++ struct cdemu_device *vc; ++ ++ vc = to_cdemu_device(dev); ++ if(!vc) ++ return -1; + ++ unload_cd(vc); ++ ++ return 0; ++} ++ ++static int cdemu_reset(struct cdrom_device_info *cdi) ++{ + dprintk("cdemu_reset: start\n"); + +- for (i = 0; i < cdemu_count; ++i) +- unload_cd(&cdemu_dev[i]); ++ device_for_each_child(&virtual_bus, NULL, &cdemu_reset_helper); + + return 0; + } +@@ -423,11 +474,89 @@ + } + } + +-/* RENE: no idea how I should implement that ... so just say we set it */ ++/* RENE: no idea how I should implement that ... so just print that command */ + static int cdemu_generic_packet(struct cdrom_device_info *cdi, +- struct packet_command *dummy) ++ struct packet_command *pc) + { +- dprintk("cdemu_generic_packet: start\n"); ++ int ret = -EIO; ++ int i; ++ dprintk("cdemu_generic_packet: start -"); ++ for (i = 0; i < CDROM_PACKET_SIZE; i++) ++ printk(" %.2x", pc->cmd[i]); ++ printk("\n"); ++ ++ if (pc->sense) { ++ dprintk("cdemu_generic_packet: sense unknown\n"); ++ pc->sense->sense_key = 0x05; ++ pc->sense->asc = 0x20; ++ pc->sense->ascq = 0x00; ++ } ++ ++ pc->stat = ret; ++ return ret; ++} ++ ++static int cdemu_read_data(struct cdrom_device_info *cdi, __u8 __user *ubuf, int lba, int nframes, int mode) ++{ ++ struct cdemu_device *vc = cdi->handle; ++ ssize_t delta = -1, retval = 0; ++ int t, frame_size; ++ size_t size; ++ loff_t off; ++ ++ t = cdemu_findtrack(vc, lba); ++ off = cdemu_getoffset(vc, t, lba); ++ frame_size = cdemu_mode_2_sector_size(mode); ++ size = nframes * frame_size; ++ ++ dprintk("cdemu_read_data: reading %d frame(s) starting at lba %d\n", nframes, lba); ++ ++ if (vc->tracks[t].mode == mode) ++ delta = 0; ++ else ++ { ++ switch (vc->tracks[t].mode) ++ { ++ case AUDIO_2448: ++ if (mode == AUDIO) ++ delta = CD_FRAMESIZE_SUB; ++ break; ++ case MODE1_2448: ++ if (mode == MODE1_2352) ++ delta = CD_FRAMESIZE_SUB; ++ break; ++ } ++ } ++ ++ ++ if (delta == 0) ++ retval = vc->backing_file->f_op->read(vc->backing_file, ubuf, size, &off); ++ else if (delta > 0) ++ { ++ dprintk("cdemu_read_data: scatter-gather %d frames\n", nframes); ++ ++ while (nframes-- > 0) ++ { ++ ssize_t read = vc->backing_file->f_op->read(vc->backing_file, ubuf, frame_size, &off); ++ ++ if (read != frame_size) ++ break; ++ ++ retval += read; ++ off += delta; ++ ubuf += frame_size; ++ } ++ } ++ else ++ dprintk("cdemu_read_data: source mode %d, but target mode %d!\n", vc->tracks[t].mode, mode); ++ ++ if (retval != size) ++ { ++ dprintk("cdemu_read_data: only %i bytes read\n", retval); ++ ++ return -EIO; ++ } ++ + return 0; + } + +@@ -438,10 +567,11 @@ + struct cdrom_msf msf; + struct cdemu_info cdemu_info; + +- loff_t position; +- int sector; +- int track; +- int tmp; ++ sector_t gd_sector; ++ loff_t position; ++ int sector; ++ int track; ++ int tmp; + + dprintk("cdemu_ioctl: start\n"); + +@@ -466,7 +596,7 @@ + if (copy_from_user(&msf, (void *) arg, sizeof(msf))) + return -EFAULT; + +- sector = cdemu_msf_2_sector(msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0); ++ sector = msf_to_lba(msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0); + track = cdemu_findtrack(vc, sector); + + /* get the mode of the bin file part and calc the positon */ +@@ -486,17 +616,52 @@ + } + + if (cmd == CDROMREADRAW) { +- tmp = generic_file_read(vc->backing_file, (void*)arg, CD_FRAMESIZE_RAW, &position); ++ struct iovec local_iov = { .iov_base = (void*)arg, .iov_len = CD_FRAMESIZE_RAW }; ++ struct kiocb kiocb; ++ ++ init_sync_kiocb(&kiocb, vc->backing_file); ++ tmp = generic_file_aio_read(&kiocb, &local_iov, 1, position); ++ if (-EIOCBQUEUED == tmp) ++ tmp = wait_on_sync_kiocb(&kiocb); ++ + if (tmp != CD_FRAMESIZE_RAW) +- dprintk("only read %i bytes\n",tmp); ++ dprintk("only read %i bytes\n",tmp); + } else { /*CDROMREADCOOKED*/ +- tmp = generic_file_read(vc->backing_file, (void*)arg, CD_FRAMESIZE, &position); ++ struct iovec local_iov = { .iov_base = (void*)arg, .iov_len = CD_FRAMESIZE }; ++ struct kiocb kiocb; ++ ++ init_sync_kiocb(&kiocb, vc->backing_file); ++ tmp = generic_file_aio_read(&kiocb, &local_iov, 1, position); ++ if (-EIOCBQUEUED == tmp) ++ tmp = wait_on_sync_kiocb(&kiocb); ++ + if (tmp != CD_FRAMESIZE) + dprintk("only read %i bytes\n",tmp); + } + + return 0; ++ case CDROMREADAUDIO: ++ { ++ struct cdrom_read_audio ra; ++ int lba; ++ ++ if (copy_from_user(&ra, (struct cdrom_read_audio *) arg, sizeof(ra))) ++ return -EFAULT; ++ ++ if (ra.addr_format == CDROM_MSF) ++ lba = msf_to_lba(ra.addr.msf.minute, ++ ra.addr.msf.second, ++ ra.addr.msf.frame); ++ else if (ra.addr_format == CDROM_LBA) ++ lba = ra.addr.lba; ++ else ++ return -EINVAL; ++ ++ if (lba < 0 || ra.nframes <= 0 || ra.nframes > CD_FRAMES) ++ return -EINVAL; + ++ return cdemu_read_data(cdi, ra.buf, lba, ra.nframes, AUDIO); ++ } + case CDROMSEEK: /* seek msf address - not supported */ + return 0; + +@@ -527,8 +692,22 @@ + printk_cdemu(KERN_INFO, "loaded %s cd (%i track[s]) on drive %s by uid %i\n", + vc->comment, vc->num_tracks, cdi->name, vc->uid); + +- /* hard coded to get the size of the first track */ +- vc->size = vc->tracks[1].start_sector * CD_FRAMESIZE; ++ for (tmp = 0; tmp <= vc->num_tracks; tmp++) ++ { ++ dprintk("cdemu_ioctl: track %d: %02d:%02d:%02d (%lu), offset %lu\n", (tmp == vc->num_tracks) ? CDROM_LEADOUT : tmp + 1, ++ vc->tracks[tmp].minute, ++ vc->tracks[tmp].second, ++ vc->tracks[tmp].frame, ++ vc->tracks[tmp].start_sector, ++ vc->tracks[tmp].start_offset); ++ } ++ ++ /* set size of device to image size */ ++ track = vc->num_tracks; ++ vc->size = vc->tracks[track].start_sector * CD_FRAMESIZE; ++ gd_sector = vc->size / KERNEL_SECTOR_SIZE; ++ set_capacity(vc->gd, gd_sector); ++ dprintk("cdemu_ioctl: loading ... size (2048 bytes/sector): %i, sectors (512 bytes/sector): %i\n", vc->size, (int) gd_sector); + + /* only inc use count if there was no cd in the drive */ + if (!vc->loaded) +@@ -554,10 +733,7 @@ + { + dprintk("cdemu_block_open: start\n"); + +- if (inode \ +- && inode->i_bdev \ +- && inode->i_bdev->bd_disk \ +- && inode->i_bdev->bd_disk->private_data) { ++ if (inode && inode->i_bdev && inode->i_bdev->bd_disk && inode->i_bdev->bd_disk->private_data) { + struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; + dprintk("cdemu_block_open: going into cdrom_open()\n"); + return cdrom_open(&vc->info, inode, file); +@@ -571,10 +747,7 @@ + { + dprintk("cdemu_block_release: start\n"); + +- if (inode \ +- && inode->i_bdev \ +- && inode->i_bdev->bd_disk \ +- && inode->i_bdev->bd_disk->private_data) { ++ if (inode && inode->i_bdev && inode->i_bdev->bd_disk && inode->i_bdev->bd_disk->private_data) { + struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; + return cdrom_release(&vc->info, file); + } +@@ -587,10 +760,7 @@ + { + dprintk("cdemu_block_ioctl: start\n"); + +- if (inode \ +- && inode->i_bdev \ +- && inode->i_bdev->bd_disk \ +- && inode->i_bdev->bd_disk->private_data) { ++ if (inode && inode->i_bdev && inode->i_bdev->bd_disk && inode->i_bdev->bd_disk->private_data) { + struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; + + int ret = cdemu_ioctl(&vc->info, cmd, arg); +diff -Naur cdemu-0.8/cdemu.h cdemu-203/cdemu.h +--- cdemu-0.8/cdemu.h 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu.h 2006-10-11 21:11:56.000000000 +0200 +@@ -45,11 +45,12 @@ + + #define CDEMU_COMMENT_SIZE 256 + #define CDEMU_MAX_TRACKS 47 ++ + struct cdemu_info { +- tTrack tracks[CDEMU_MAX_TRACKS]; +- unsigned int ffd; +- int num_tracks; +- char comment[CDEMU_COMMENT_SIZE]; ++ tTrack tracks[CDEMU_MAX_TRACKS]; ++ unsigned int ffd; ++ int num_tracks; ++ char comment[CDEMU_COMMENT_SIZE]; + }; + + #endif /* __CDEMU_H__ */ +diff -Naur cdemu-0.8/cdemu_kernel.h cdemu-203/cdemu_kernel.h +--- cdemu-0.8/cdemu_kernel.h 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_kernel.h 2006-10-11 21:11:56.000000000 +0200 +@@ -29,10 +29,13 @@ + + #define MAJOR_NR 0 + #define DEVICE_NR(device) MINOR(device) /* has no partition bits */ +-#define DEVICE_NAME "cdemu" /* name for messaging */ +-#define DEVICE_NO_RANDOM /* no entropy to contribute */ ++#define DEVICE_NAME "cdemu" /* name for messaging */ ++#define DEVICE_NO_RANDOM /* no entropy to contribute */ + #define DEVICE_REQUEST cdemu_request +-#define DEVICE_OFF(d) /* do-nothing */ ++#define DEVICE_OFF(d) /* do-nothing */ ++ ++#define DRIVER_NAME "cdemu" ++#define BUS_NAME "virtual" + + #include /* try_module_get,module_put */ + #include /* init/exit funcs */ +@@ -41,10 +44,11 @@ + #include /* the generic disk interface */ + #include /* cdrom declarations */ + #include /* fput */ ++#include /* device functions */ + #include /* kmap functions */ + #include /* access to the 'current' struct */ +-#include /* MODULE_AUTHOR,module_parm */ +-#include /* buffer operations */ ++#include /* MODULE_AUTHOR,module_parm */ ++#include /* buffer operations */ + #include + #include + +@@ -52,30 +56,40 @@ + #include + #endif + +-#include "cdemu_proc.h" + #include "cdemu.h" + #define CDEMU_MODULE_VERSION CDEMU_VERSION + + struct cdemu_device { +- int number; +- dev_t device; +- tTrack tracks[CDEMU_MAX_TRACKS]; +- int num_tracks; /* number of tracks on the cd */ +- struct file *backing_file; +- int loaded; +- int uid; /* user who mounted cd */ +- int media_changed; +- int locked; +- int pause; +- char comment[CDEMU_COMMENT_SIZE]; +- int size; +- spinlock_t lock; +- struct cdrom_device_info info; +- struct request_queue *queue; ++ int number; ++ dev_t device; ++ tTrack tracks[CDEMU_MAX_TRACKS]; ++ int num_tracks; /* number of tracks on the cd */ ++ struct file *backing_file; ++ int loaded; ++ int uid; /* user who mounted cd */ ++ int media_changed; ++ int locked; ++ int pause; ++ char comment[CDEMU_COMMENT_SIZE]; ++ int size; ++ spinlock_t lock; ++ struct cdrom_device_info info; ++ struct request_queue *queue; + struct gendisk *gd; +- struct block_device *bdev; ++ struct device dev; ++}; ++ ++#define to_cdemu_device(n) container_of(n, struct cdemu_device, dev) ++ ++struct cdemu_driver { ++ char *version; ++ int major; ++ int count; ++ struct device_driver drv; + }; + ++#define to_cdemu_driver(n) container_of(n, struct cdemu_driver, drv) ++ + #define CDEMU_DEBUG + #ifdef CDEMU_DEBUG + #define dprintk(msg, args...) \ +@@ -90,21 +104,24 @@ + printk(lvl "cdemu:%i: " msg, __LINE__, ## args); \ + } while(0) + +-#define AUDIO 0 +-#define MODE1 1 +-#define MODE2 2 +-#define AUDIO_2448 10 +-#define MODE1_2448 20 +-#define MODE1_2352 30 +-#define MODE1_2048 40 +-#define MODE2_2352 50 +-#define MODE2_2336 60 +- +-#define CDEMU_LOADCD 0x5400 /* load the virtual cd */ +-#define CDEMU_UNLOADCD 0x5401 /* unload the virtual cd*/ +- +-extern int cdemu_major, cdemu_count; +-extern struct cdemu_device *cdemu_dev; ++#define AUDIO 0 ++#define MODE1 1 ++#define MODE2 2 ++#define AUDIO_2448 10 ++#define MODE1_2448 20 ++#define MODE1_2352 30 ++#define MODE1_2048 40 ++#define MODE2_2352 50 ++#define MODE2_2336 60 ++ ++#define CDEMU_LOADCD 0x5400 /* load the virtual cd */ ++#define CDEMU_UNLOADCD 0x5401 /* unload the virtual cd*/ ++ ++#define KERNEL_SECTOR_SIZE 512 ++ ++extern struct cdemu_driver cdemu_drv; ++extern struct bus_type virtual_bus_type; ++extern struct device virtual_bus; + + #define UP_MODULE_USE() try_module_get(THIS_MODULE) + #define DOWN_MODULE_USE() module_put(THIS_MODULE) +diff -Naur cdemu-0.8/cdemu_mod.c cdemu-203/cdemu_mod.c +--- cdemu-0.8/cdemu_mod.c 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_mod.c 2006-10-22 20:35:25.000000000 +0200 +@@ -23,205 +23,458 @@ + * * + ***************************************************************************/ + +-/* +- * Version 0.7 - 2004-12-8 +- * works with current 2.6 kernels +- * +- * Version 0.6 - 2003-10-13 +- * add linux-2.6.x support and break up code to try to +- * blur the differences between 2.4.x and 2.6.x +- * +- * Version 0.5 - 2003-07-02 +- * rename to CDemu +- * rewrite of major parts to be 100% compatible to a cdrom +- * user space interface changed for new userspace program +- +- * Version 0.4 - 2003-04-08 +- * removed sys_call_table use +- * fixed bug with devfsd +- * some extra error handling for the userspace program +- +- * Version 0.3 - 2003-01-11 +- * added check if a "cd is loaded" +- * removed all warnings +- * code cleanup +- +- * Version 0.2 - 2003-01-12 +- * support for proc fs +- * changed the vclib.c so it can be used by gui programs +- +- * Version 0.1 - 2003-01-10 +- * first test release (data and raw mode work - but no checks, if you do +- * something wrong you'll kill the kernel ;-) +- * +- */ + + #include "cdemu_kernel.h" + #include "cdemu.h" + ++#define MIN_CDEMUS 1 /* Minimum number of block devices */ ++#define MAX_CDEMUS 255 /* 2.6 can have more than this but who would use it ? */ ++#define DEFAULT_CDEMUS 4 /* Default number of block devices */ ++ ++/* external stuff */ + extern struct cdrom_device_ops cdemu_dops; + extern struct block_device_operations cdemu_bdops; + extern void cdemu_request(request_queue_t*); + extern int cdemu_make_request(request_queue_t*, struct bio*); + +-int cdemu_major = MAJOR_NR; +-int cdemu_count = 8; +-struct cdemu_device *cdemu_dev; ++/* bus functions */ ++static int virtual_bus_remove(struct device *dev); ++static void virtual_bus_shutdown(struct device *dev); ++static void virtual_bus_release(struct device *bus); ++ ++/* driver functions */ ++static ssize_t show_driver_version(struct device_driver *drv, char *buf); ++static ssize_t show_driver_devices(struct device_driver *drv, char *buf); ++static ssize_t store_driver_devices(struct device_driver *drv, const char *buf, size_t count); ++static int store_driver_devices_helper(struct device *dev, void *ptr); ++ ++/* device functions */ ++static void cdemu_device_release(struct device *dev); ++static struct cdemu_device *add_cdemu_device(int i); ++static int remove_cdemu_device_helper(struct device *dev, void *ptr); ++ ++static ssize_t show_device_attr(struct device *dev, struct device_attribute *attr, char *buf); ++ ++/* global variables */ ++struct cdemu_driver cdemu_drv = { ++ .version = CDEMU_VERSION, ++ .major = MAJOR_NR, ++ .count = DEFAULT_CDEMUS, ++ .drv = { ++ .name = DRIVER_NAME, ++ .bus = &virtual_bus_type, ++ .owner = THIS_MODULE ++ } ++}; ++ ++struct bus_type virtual_bus_type = { ++ .name = BUS_NAME, ++ .remove = &virtual_bus_remove, ++ .shutdown = &virtual_bus_shutdown ++}; + +-static int __init cdemu_init(void) ++struct device virtual_bus = { ++ .bus_id = BUS_NAME, ++ .bus = NULL, ++ .parent = NULL, ++ .release = &virtual_bus_release ++}; ++ ++struct devices_vars { ++ int n; ++ int old, new; ++}; ++ ++static int driver_was_registered = 0; /* did the driver already exist? */ ++ ++static DRIVER_ATTR(version, 0444, show_driver_version, NULL); ++static DRIVER_ATTR(devices, 0664, show_driver_devices, store_driver_devices); ++ ++static DEVICE_ATTR(major, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(minor, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(loaded, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(image, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(tracks, 0444, show_device_attr, NULL); ++ ++ ++ ++static int virtual_bus_remove(struct device *dev) + { +-/* check if the kernelparmeter is correct and register the block devices */ +-#define MIN_CDEMUS 1 /* should be self explanatory ... */ +-#define MAX_CDEMUS 255 /* 2.6 can have more than this but who would use it ? */ ++ if(!dev) ++ return -1; + +- int i; +- struct cdemu_device *vc; ++ dprintk("%s: device %s\n", __FUNCTION__, dev->bus_id); ++ ++ return 0; ++} ++ ++static void virtual_bus_shutdown(struct device *dev) ++{ ++ if(!dev) ++ return; ++ ++ dprintk("%s: device %s\n", __FUNCTION__, dev->bus_id); ++} ++ ++static void virtual_bus_release(struct device *bus) ++{ ++ if(!bus) ++ return; ++ ++ dprintk("%s: bus %s\n", __FUNCTION__, bus->bus_id); ++} ++ ++static ssize_t show_driver_version(struct device_driver *drv, char *buf) ++{ ++ struct cdemu_driver *cdrv; ++ ++ cdrv = to_cdemu_driver(drv); ++ if(!drv || !buf || !cdrv) ++ return -1; ++ ++ return snprintf(buf, PAGE_SIZE, "%s\n", cdrv->version); ++} ++ ++static ssize_t show_driver_devices(struct device_driver *drv, char *buf) ++{ ++ struct cdemu_driver *cdrv; + +- dprintk("cdemu_init: start\n"); ++ cdrv = to_cdemu_driver(drv); ++ if(!drv || !buf || !cdrv) ++ return -1; + +- if ((cdemu_count < MIN_CDEMUS) || (cdemu_count > MAX_CDEMUS)) { +- printk_cdemu(KERN_WARNING, "invalid cdemu_count (must be between %i and %i), using default (%i)\n", +- MIN_CDEMUS, MAX_CDEMUS, MIN_CDEMUS); +- cdemu_count = 8; +- } +- +- i = +- register_blkdev(cdemu_major, DEVICE_NAME); +- if (i < 0) { +- printk_cdemu(KERN_ERR, "unable to register block device #%i for cdemu device\n", cdemu_major); +- return -EBUSY; +- } else if (i) +- cdemu_major = i; +- +- /* allocate cdemu_count entries in our struct */ +- cdemu_dev = kmalloc(cdemu_count * sizeof(struct cdemu_device), GFP_KERNEL); +- if (!cdemu_dev) { +- printk_cdemu(KERN_ERR, "could not kmalloc enough memory for %i cdemu devices\n", cdemu_count); +- goto out_nomem; ++ return snprintf(buf, PAGE_SIZE, "%i\n", cdrv->count); ++} ++ ++static int store_driver_devices_helper(struct device *dev, void *ptr) ++{ ++ struct devices_vars *dv; ++ ++ dv = (struct devices_vars *) ptr; ++ if(!dev || !ptr || !dv) ++ return -1; ++ ++ /* remove devices */ ++ if(dv->n >= dv->new) ++ remove_cdemu_device_helper(dev, NULL); ++ ++ dv->n++; ++ ++ return 0; ++} ++ ++static ssize_t store_driver_devices(struct device_driver *drv, const char *buf, size_t count) ++{ ++ char *endp; ++ struct devices_vars dv; ++ ++ if(!drv || !buf) ++ return -1; ++ ++ endp = (char *) buf + count - 1; ++ dv.old = cdemu_drv.count; ++ dv.new = simple_strtol(buf, &endp, 10); ++ ++ dprintk("%s: old device count: %i, new device count: %i.\n", __FUNCTION__, dv.old, dv.new); ++ ++ if((dv.new < MIN_CDEMUS) || (dv.new > MAX_CDEMUS) || (dv.new == dv.old)) ++ return (ssize_t) count; ++ ++ if(dv.new < dv.old) { ++ /* remove devices */ ++ dv.n = 0; ++ device_for_each_child(&virtual_bus, &dv, &store_driver_devices_helper); ++ } ++ else { ++ /* add devices */ ++ for(dv.n = dv.old; dv.n < dv.new; dv.n++) { ++ if(!add_cdemu_device(dv.n)) ++ return -1; ++ } + } + +-#if defined(CONFIG_DEVFS_FS) +- devfs_mk_dir("cdemu"); +-#endif ++ cdemu_drv.count = dv.new; ++ ++ return (ssize_t) count; ++} ++ ++static void cdemu_device_release(struct device *dev) ++{ ++ if(!dev) ++ return; ++ ++ dprintk("%s: device %s\n", __FUNCTION__, dev->bus_id); ++ ++ /* Do only LDM related releasing here */ ++} ++ ++static struct cdemu_device *add_cdemu_device(int i) ++{ ++ struct cdemu_device *vc; ++ ++ /* allocate device */ ++ vc = kmalloc(sizeof(struct cdemu_device), GFP_KERNEL); ++ if(!vc) ++ goto add_device_free; ++ memset(vc, 0, sizeof(struct cdemu_device)); ++ ++ /* init device fields */ ++ vc->number = i; ++ vc->loaded = 0; ++ vc->media_changed = 0; ++ vc->locked = 0; ++ vc->pause = 0; ++ vc->info.ops = &cdemu_dops; ++ vc->info.speed = 0; /* FIXME max_speed */ ++ vc->info.handle = vc; ++ vc->info.capacity = 1; ++ snprintf(vc->info.name, 20, "%s%i", DEVICE_NAME, i); ++ spin_lock_init(&vc->lock); ++ dprintk("%s: making cdrom #%i [%p]: %s\n", __FUNCTION__, vc->number, vc, vc->info.name); ++ ++ /* register with the linux device model */ ++ vc->dev.bus = &virtual_bus_type; ++ vc->dev.driver = &cdemu_drv.drv; /* driver binding; if set to NULL invokes match & probe */ ++ vc->dev.release = &cdemu_device_release; ++ vc->dev.parent = &virtual_bus; ++ strncpy(vc->dev.bus_id, vc->info.name, BUS_ID_SIZE); ++ if(device_register(&vc->dev)) ++ goto add_device_free; ++ if(device_create_file(&vc->dev, &dev_attr_major)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_minor)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_loaded)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_image)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_tracks)) ++ goto add_device_unregister; ++ ++ /* register with the uniform cdrom driver */ ++ vc->gd = alloc_disk(1); ++ if (!vc->gd) ++ goto add_device_out; ++ vc->gd->major = cdemu_drv.major; ++ vc->gd->first_minor = i; ++ snprintf(vc->gd->disk_name, 32, "%s%i", DEVICE_NAME, i); ++ vc->gd->fops = &cdemu_bdops; ++ vc->gd->private_data = vc; ++ vc->gd->flags = GENHD_FL_REMOVABLE | GENHD_FL_CD; ++ vc->gd->driverfs_dev = &vc->dev; ++ set_capacity(vc->gd, 0); ++ ++ if(register_cdrom(&vc->info)) ++ printk(KERN_WARNING "%s: cannot register cdrom\n", __FUNCTION__); ++ ++ vc->queue = blk_alloc_queue(GFP_KERNEL); ++ blk_queue_make_request(vc->queue, cdemu_make_request); ++ if (!vc->queue) ++ goto add_device_out; ++ vc->gd->queue = vc->queue; ++ add_disk(vc->gd); + +- for (i = 0; i < cdemu_count; ++i) { +- vc = &cdemu_dev[i]; +- memset(vc, 0, sizeof(struct cdemu_device)); +- vc->number = i; +- vc->loaded = 0; +- vc->media_changed = 0; +- vc->locked = 0; +- vc->pause = 0; +- vc->bdev = NULL; +- vc->info.ops = &cdemu_dops; +- vc->info.speed = 0; /* FIXME max_speed */ +- vc->info.capacity = 1; +- vc->info.handle = vc; +- sprintf(vc->info.name, "%s%i", DEVICE_NAME, i); +- spin_lock_init(&vc->lock); +- dprintk("cdemu_init: making cdrom #%i [%p]: %s\n", vc->number, vc, vc->info.name); +- +- /* register with the uniform cdrom driver */ +- vc->gd = alloc_disk(1); +- if (!vc->gd) +- goto out; +- vc->gd->major = cdemu_major; +- vc->gd->first_minor = i; +- sprintf(vc->gd->disk_name, "%s%i", DEVICE_NAME, i); +- vc->gd->fops = &cdemu_bdops; +- vc->gd->private_data = vc; +- vc->gd->flags = GENHD_FL_REMOVABLE | GENHD_FL_CD; +- set_capacity(vc->gd, 0); +- register_cdrom(&vc->info); +- vc->queue = blk_alloc_queue(GFP_KERNEL); +- blk_queue_make_request(vc->queue, cdemu_make_request); +- if (!vc->queue) +- goto out; +- vc->gd->queue = vc->queue; +- add_disk(vc->gd); + #ifdef CONFIG_DEVFS_FS +- devfs_mk_bdev(MKDEV(vc->gd->major, vc->gd->first_minor), +- S_IFBLK|S_IRUSR|S_IWUSR, +- "cdemu/%i", i); ++ devfs_mk_bdev(MKDEV(vc->gd->major, vc->gd->first_minor), ++ S_IFBLK|S_IRUSR|S_IWUSR, ++ "cdemu/%i", i); + #endif ++ ++ return vc; ++ ++add_device_out: ++ if (vc->gd) { ++ put_disk(vc->gd); ++ del_gendisk(vc->gd); ++ vc->gd = NULL; + } ++ if (vc->queue) { ++ blk_put_queue(vc->queue); ++ vc->queue = NULL; ++ } ++ ++ unregister_cdrom(&vc->info); ++ ++add_device_unregister: ++ device_unregister(&vc->dev); ++ ++add_device_free: ++ kfree(vc); ++ ++ return NULL; ++} + +- if (!cdemu_proc_make()) { +- dprintk("cdemu_init: Error registering /proc entry!\n"); +- goto out_freeall; ++static int remove_cdemu_device_helper(struct device *dev, void *ptr) ++{ ++ struct cdemu_device *vc; ++ ++ vc = to_cdemu_device(dev); ++ if (!dev || !vc) ++ return -1; ++ ++ dprintk("%s: removing cdrom #%i [%p]: %s\n", __FUNCTION__, vc->number, vc, vc->dev.bus_id); ++ ++ if (vc->gd) { ++ put_disk(vc->gd); ++ del_gendisk(vc->gd); ++ vc->gd = NULL; ++ } ++ if (vc->queue) { ++ blk_put_queue(vc->queue); ++ vc->queue = NULL; + } ++ ++ if (unregister_cdrom(&vc->info)) ++ printk(KERN_WARNING "%s: cannot unregister cdrom\n", __FUNCTION__); ++ ++#ifdef CONFIG_DEVFS_FS ++ dprintk("%s: removing devfs\n", __FUNCTION__); ++ devfs_remove("cdemu/%i", vc->number); ++#endif ++ ++ device_unregister(dev); ++ ++ kfree(vc); + +- /* all done report our success */ +- dprintk("cdemu_init: loaded (max %i devices)\n", cdemu_count); +- dprintk("cdemu_init: end\n"); +- printk_cdemu(KERN_INFO, "ver " CDEMU_MODULE_VERSION " loaded. Registered %i cdemus.\n", cdemu_count); + return 0; ++} + +-out: +- for (i = 0; i < cdemu_count; ++i) { +- vc = &cdemu_dev[i]; +- if (vc->queue) +- blk_put_queue(vc->queue); +- if (vc->gd) { +- put_disk(vc->gd); +- del_gendisk(vc->gd); +- } ++static ssize_t show_device_attr(struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ struct cdemu_device *vc; ++ ssize_t retval; ++ ++ vc = to_cdemu_device(dev); ++ retval = 0; ++ if(!dev || !attr || !buf || !vc) ++ return 0; ++ ++ dprintk("%s: device %s\n", __FUNCTION__,dev->bus_id); ++ ++ /* choose one of the device attributes */ ++ if (attr == &dev_attr_major) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->gd->major); ++ } ++ else if(attr == &dev_attr_minor) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->gd->first_minor); ++ } ++ else if(attr == &dev_attr_loaded) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->loaded); ++ } ++ else if(attr == &dev_attr_image) { ++ retval = snprintf(buf, PAGE_SIZE, "%s\n", vc->comment); ++ } ++ else if(attr == &dev_attr_tracks) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->num_tracks); + } +-out_freeall: +- kfree(cdemu_dev); +-out_nomem: +- if (unregister_blkdev(cdemu_major, DEVICE_NAME)) +- printk_cdemu(KERN_ERR, "unable to unregister block device\n"); + +- printk_cdemu(KERN_ERR, "cdemu_init: ran out of memory\n"); +- return -ENOMEM; ++ return retval; + } + +-static void __exit cdemu_exit(void) ++static int __init cdemu_init(void) + { +- int i; +- struct cdemu_device *vc; ++ int i, retval; + +- dprintk("cdemu_exit: start\n"); ++ dprintk("%s: start\n", __FUNCTION__); + +- /* get rid of the proc stuff */ +- cdemu_proc_remove(); ++ /* register bus */ ++ dprintk("%s: registering bus: %s\n", __FUNCTION__, virtual_bus_type.name); ++ if(bus_register(&virtual_bus_type)) ++ goto out; ++ if(device_register(&virtual_bus)) ++ goto out_bus_unregister; ++ ++ /* register driver */ ++ if(!driver_find(DRIVER_NAME, &virtual_bus_type)) { ++ dprintk("%s: registering driver: %s\n", __FUNCTION__, cdemu_drv.drv.name); ++ driver_was_registered = 0; ++ if(driver_register(&cdemu_drv.drv)) ++ goto out_bus_unregister; ++ if(driver_create_file(&cdemu_drv.drv, &driver_attr_version)) ++ goto out_driver_unregister; ++ if(driver_create_file(&cdemu_drv.drv, &driver_attr_devices)) ++ goto out_driver_unregister; ++ } ++ else { ++ driver_was_registered = 1; /* not possible? */ ++ } + +- for (i = 0; i < cdemu_count; ++i) { +- vc = &cdemu_dev[i]; +- dprintk("cdemu_exit: unregistering cdrom #%i [%p]: %s\n", vc->number, vc, vc->info.name); +-#ifdef CONFIG_DEVFS_FS +- devfs_remove("cdemu/%i", i); ++ /* check if the kernel parameter is correct and register the block devices */ ++ if ((cdemu_drv.count < MIN_CDEMUS) || (cdemu_drv.count > MAX_CDEMUS)) { ++ printk_cdemu(KERN_WARNING, "invalid cdemu_count (must be in range [%i, %i]), using default (%i)\n", ++ MIN_CDEMUS, MAX_CDEMUS, DEFAULT_CDEMUS); ++ cdemu_drv.count = DEFAULT_CDEMUS; ++ } ++ ++ retval = register_blkdev(cdemu_drv.major, DEVICE_NAME); ++ if (retval < 0) { ++ printk_cdemu(KERN_ERR, "unable to register block device #%i for cdemu device\n", cdemu_drv.major); ++ goto out_blkdev; ++ } else if (retval) ++ cdemu_drv.major = retval; ++ ++#if defined(CONFIG_DEVFS_FS) ++ devfs_mk_dir("cdemu"); + #endif +- if (vc->bdev) { +- dprintk("cdemu_exit: punting bdev\n"); +- invalidate_bdev(vc->bdev, 1); +- bdput(vc->bdev); +- } +- if (vc->gd) { +- dprintk("cdemu_exit: punting gendisk\n"); +- del_gendisk(vc->gd); +- put_disk(vc->gd); +- } +- if (vc->queue) { +- dprintk("cdemu_exit: punting queue\n"); +- blk_put_queue(vc->queue); +- } +- if (unregister_cdrom(&vc->info)) +- printk(KERN_WARNING "cdemu: cannot unregister cdrom\n"); ++ ++ for (i = 0; i < cdemu_drv.count; ++i) { ++ if(!add_cdemu_device(i)) ++ goto out_free_devices; + } + ++ /* all done report our success */ ++ dprintk("%s: loaded (%i devices)\n", __FUNCTION__, cdemu_drv.count); ++ dprintk("%s: end\n", __FUNCTION__); ++ printk_cdemu(KERN_INFO, "cdemu ver. " CDEMU_MODULE_VERSION " loaded. Registered %i cdemus.\n", cdemu_drv.count); ++ ++ return 0; ++ ++out_free_devices: ++ device_for_each_child(&virtual_bus, NULL, &remove_cdemu_device_helper); ++ ++out_blkdev: ++ if (unregister_blkdev(cdemu_drv.major, DEVICE_NAME)) ++ printk_cdemu(KERN_ERR, "unable to unregister block device\n"); ++ ++out_driver_unregister: ++ driver_unregister(&cdemu_drv.drv); ++ ++out_bus_unregister: ++ device_unregister(&virtual_bus); ++ bus_unregister(&virtual_bus_type); ++ ++out: ++ printk_cdemu(KERN_ERR, "cdemu_init: ran out of memory\n"); ++ ++ return -ENOMEM; ++} ++ ++static void __exit cdemu_exit(void) ++{ ++ dprintk("%s: start\n", __FUNCTION__); ++ ++ device_for_each_child(&virtual_bus, NULL, &remove_cdemu_device_helper); ++ + #if defined(CONFIG_DEVFS_FS) + devfs_remove("cdemu"); + #endif + +- if (unregister_blkdev(cdemu_major, DEVICE_NAME)) ++ if (unregister_blkdev(cdemu_drv.major, DEVICE_NAME)) + printk_cdemu(KERN_ERR, "unable to unregister block device\n"); + +- kfree(cdemu_dev); ++ /* unregister driver */ ++ if(!driver_was_registered) { ++ dprintk("%s: unregistering driver: %s\n", __FUNCTION__, cdemu_drv.drv.name); ++ driver_unregister(&cdemu_drv.drv); ++ } ++ ++ /* unregister bus */ ++ dprintk("%s: unregistering bus: %s\n", __FUNCTION__, virtual_bus_type.name); ++ device_unregister(&virtual_bus); ++ bus_unregister(&virtual_bus_type); + +- dprintk("cdemu_exit: end\n"); +- printk_cdemu(KERN_INFO, "ver " CDEMU_MODULE_VERSION " unloaded. Unregistered %i cdemus.\n", cdemu_count); ++ dprintk("%s: end\n", __FUNCTION__); ++ printk_cdemu(KERN_INFO, "cdemu ver. " CDEMU_MODULE_VERSION " unloaded. Unregistered %i cdemus.\n", cdemu_drv.count); + } + + module_init(cdemu_init); +@@ -230,7 +483,7 @@ + #if !defined(MODULE) + static int __init cdemu_count_setup(char *str) + { +- cdemu_count = simple_strtol(str, NULL, 0); ++ cdemu_drv.count = simple_strtol(str, NULL, 0); + return 1; + } + +@@ -238,8 +491,9 @@ + #endif + + MODULE_AUTHOR("Robert Penz , Mike Frysinger "); +-MODULE_DESCRIPTION("CD Emulator for bin/cue images ver " CDEMU_MODULE_VERSION); ++MODULE_DESCRIPTION("CD Emulator for CD images ver. " CDEMU_MODULE_VERSION); + MODULE_LICENSE("GPL"); +-module_param(cdemu_major, int, 0); +-module_param(cdemu_count, int, 0); +-MODULE_PARM_DESC(cdemu_count, "Maximum number of virtual cdroms (1-255)"); ++module_param_named(cdemu_major, cdemu_drv.major, int, 0444); ++module_param_named(cdemu_count, cdemu_drv.count, int, 0444); ++MODULE_PARM_DESC(cdemu_major, "Major number to use for devices."); ++MODULE_PARM_DESC(cdemu_count, "Number of virtual cdroms must be within the range [1, 255]."); +diff -Naur cdemu-0.8/cdemu_proc.c cdemu-203/cdemu_proc.c +--- cdemu-0.8/cdemu_proc.c 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_proc.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,67 +0,0 @@ +-/** +- * File: cdemu_proc.c +- * Authors: Robert Penz +- * Mike Frysinger +- * Copyright 2002-2005 +- */ +- +-/*************************************************************************** +- * * +- * 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., 675 Mass Ave, Cambridge, MA 02139, USA. * +- * * +- ***************************************************************************/ +- +-#include "cdemu_kernel.h" +-#include "cdemu.h" +- +-#ifdef CONFIG_PROC_FS +- +-#include +-static struct proc_dir_entry* proc_entry; +- +-int proc_read(char *buf, char **start, off_t offset, int count, int *eof, void *data) +-{ +- int len = 0; +- int i; +- len += snprintf(len+buf, 1024, "Drive Loaded Comment\n"); +- for (i=0; i < cdemu_count; i++) { +- if (cdemu_dev[i].loaded == 0) +- len += snprintf(len+buf, 1024, "%3i: %i NO_CD_LOADED\n", i, +- cdemu_dev[i].loaded); +- else +- len += snprintf(len+buf, 1024, "%3i: %i %s\n", i, +- cdemu_dev[i].loaded, cdemu_dev[i].comment); +- } +- *eof = 1; +- return len; +-} +- +-int cdemu_proc_make(void) +-{ +- proc_entry = create_proc_entry(DEVICE_NAME, 0444, NULL); +- if (proc_entry) +- proc_entry->read_proc = proc_read; +- else +- return 0; +- return 1; +-} +- +-void cdemu_proc_remove(void) +-{ +- if (proc_entry) +- remove_proc_entry("cdemu", NULL); +-} +- +-#endif +diff -Naur cdemu-0.8/cdemu_proc.h cdemu-203/cdemu_proc.h +--- cdemu-0.8/cdemu_proc.h 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_proc.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,37 +0,0 @@ +-/** +- * File: cdemu_proc.c +- * Authors: Robert Penz +- * Mike Frysinger +- * Copyright 2002-2005 +- */ +- +-/*************************************************************************** +- * * +- * 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., 675 Mass Ave, Cambridge, MA 02139, USA. * +- * * +- ***************************************************************************/ +- +-#ifdef CONFIG_PROC_FS +- +-#include +-int cdemu_proc_make(void); +-void cdemu_proc_remove(void); +- +-#else +- +-#define cdemu_proc_make() 1 +-#define cdemu_proc_remove() +- +-#endif +diff -Naur cdemu-0.8/ChangeLog cdemu-203/ChangeLog +--- cdemu-0.8/ChangeLog 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/ChangeLog 2006-09-14 23:57:44.000000000 +0200 +@@ -50,3 +50,40 @@ + 0.1.0 + * first test release (data and raw mode work - but no checks, if you do something + wrong you'll kill the kernel ;-) ++ ++--- ++ ++/* ++ * TODO: Merge this changelog from cdemu_mod.c properly. ++ * ++ * Version 0.7 - 2004-12-8 ++ * works with current 2.6 kernels ++ * ++ * Version 0.6 - 2003-10-13 ++ * add linux-2.6.x support and break up code to try to ++ * blur the differences between 2.4.x and 2.6.x ++ * ++ * Version 0.5 - 2003-07-02 ++ * rename to CDemu ++ * rewrite of major parts to be 100% compatible to a cdrom ++ * user space interface changed for new userspace program ++ ++ * Version 0.4 - 2003-04-08 ++ * removed sys_call_table use ++ * fixed bug with devfsd ++ * some extra error handling for the userspace program ++ ++ * Version 0.3 - 2003-01-11 ++ * added check if a "cd is loaded" ++ * removed all warnings ++ * code cleanup ++ ++ * Version 0.2 - 2003-01-12 ++ * support for proc fs ++ * changed the vclib.c so it can be used by gui programs ++ ++ * Version 0.1 - 2003-01-10 ++ * first test release (data and raw mode work - but no checks, if you do ++ * something wrong you'll kill the kernel ;-) ++ * ++ */ +diff -Naur cdemu-0.8/libcdemu.py cdemu-203/libcdemu.py +--- cdemu-0.8/libcdemu.py 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/libcdemu.py 2007-01-11 22:50:46.000000000 +0100 +@@ -146,6 +146,69 @@ + + return iso_filename, entries + ++def parse_mds_track(mds_content, track_offset): ++ mds_extrablock_size = 0x08 ++ mds_footer_size = 0x16 ++ ++ mode = read_binary("H", mds_content, track_offset+0x0000) ++ ++ flags = read_binary("B", mds_content, track_offset+0x0002) ++ ctrl = flags & 0xf ++ adr = (flags >> 4) & 0xf ++ ++ tno = read_binary("B", mds_content, track_offset+0x0003) ++ point = read_binary("B", mds_content, track_offset+0x0004) ++ min = read_binary("B", mds_content, track_offset+0x0005) ++ sec = read_binary("B", mds_content, track_offset+0x0006) ++ frac = read_binary("B", mds_content, track_offset+0x0007) ++ zero = read_binary("B", mds_content, track_offset+0x0008) ++ pmin = read_binary("B", mds_content, track_offset+0x0009) ++ psec = read_binary("B", mds_content, track_offset+0x000a) ++ pfrac = read_binary("B", mds_content, track_offset+0x000b) ++ extra_offset = read_binary("L", mds_content, track_offset+0x000c) ++ sectorsize = read_binary("H", mds_content, track_offset+0x0010) ++ lba = read_binary("L", mds_content, track_offset+0x0024) ++ offset = read_binary("Q", mds_content, track_offset+0x0028) ++ ++ if point <= 0x99: ++ pregap = read_binary("l", mds_content, extra_offset+0x0000) ++ sectors = read_binary("l", mds_content, extra_offset+0x0004) ++ else: ++ pregap = 0 ++ sectors = 0 ++ ++ if verbose: ++ print " point: %2x, mode: %3x, control: %x, adr: %i, MSF: %02i:%02i:%02i, P-MSF: %02i:%02i:%02i, sector size: %4i, lba: %i, sectors: %i, offset: %i" % \ ++ (point, mode, ctrl, adr, min, sec, frac, pmin, psec, pfrac, sectorsize, lba, sectors, offset) ++ ++ return [point, mode, sectorsize, lba, sectors, offset] ++ ++def parse_mds_session(mds_content, session_offset): ++ pregap_corr = read_binary("l", mds_content, session_offset + 0x0000) ++ num_sectors = read_binary("L", mds_content, session_offset + 0x0004) ++ num_tracks = read_binary("B", mds_content, session_offset + 0x000a) ++ num_leadins = read_binary("B", mds_content, session_offset + 0x000b) ++ first_track = read_binary("B", mds_content, session_offset + 0x000c) ++ last_track = read_binary("B", mds_content, session_offset + 0x000e) ++ tracks_offset = read_binary("L", mds_content, session_offset + 0x0014) ++ ++ if verbose: ++ print " pregap_corr: %i, num_sectors: %i, num_tracks: %i, num_leadins: %i, first_track: %i, last_track: %i, tracks_offset: %i" % \ ++ (pregap_corr, num_sectors, num_tracks, num_leadins, first_track, last_track, tracks_offset) ++ ++ track_struct_size = 0x50 ++ ++ session = [] ++ ++ # read datablocks and extrablocks ++ for i in range(0, num_tracks): ++ track = parse_mds_track(mds_content, tracks_offset + track_struct_size * i) ++ # writing data to entries ++ if track[0] < 0xa0: ++ session.append(track) ++ ++ return session ++ + def parse_mds(mds_filename): + "returns the supposable bin_filename and raw entries, if something went \ + wrong it throws an exception" +@@ -161,54 +224,27 @@ + if mds_content[0x0000:0x0010] != "MEDIA DESCRIPTOR": + raise CDEmu_Error, "Invalid data in <%s>. It is not an MDF/MDS file." % mds_filename + +- # get some data from header +- mds_header_size = 0x70 +- mds_datablock_size = 0x50 +- mds_extrablock_size = 0x08 +- mds_footer_size = 0x16 + mds_version = read_binary("B", mds_content, 0x0010) + mds_revision = read_binary("B", mds_content, 0x0011) +- mds_numsectors = read_binary("L", mds_content, 0x005c) +- mds_datablocks = read_binary("B", mds_content, 0x0062) +- mds_leadinblocks = read_binary("B", mds_content, 0x0063) +- mds_sessions = read_binary("B", mds_content, 0x0064) +- mds_tracks = read_binary("B", mds_content, 0x0066) +- mds_datablocks_offset = read_binary("L", mds_content, 0x006c) +- mds_extrablocks_offset = mds_datablocks_offset + mds_datablock_size * mds_datablocks ++ mds_sessions = read_binary("H", mds_content, 0x0014) ++ mds_sessions_offset = read_binary("L", mds_content, 0x0050) + if verbose: + print "MDS/MDF version: %i.%i" % (mds_version, mds_revision) +- print "datablocks: %i, lead-in blocks: %i, track blocks: %i, sessions?: %i" % (mds_datablocks, mds_leadinblocks, mds_tracks, mds_sessions) +- print "numsectors: %i, datablocks offset: %i, extrablocks offset: %i" % (mds_numsectors, mds_datablocks_offset, mds_extrablocks_offset) ++ print "sessions: %i" % (mds_sessions) + + # set name of binary cd-image + bin_filename = os.path.splitext(os.path.basename(mds_filename))[0] + ".mdf"; + if verbose: + print "binfile: %s" % bin_filename + +- # making sure table is empty ++ mds_session_size = 0x18 ++ + entries = [] + +- # read datablocks and extrablocks +- for datablock in range(0, mds_datablocks): +- datablock_offset = mds_datablocks_offset+mds_datablock_size*datablock; +- extrablock_offset = mds_extrablocks_offset+mds_extrablock_size*datablock; +- mode = read_binary("B", mds_content, datablock_offset+0x0000) +- flags = read_binary("H", mds_content, datablock_offset+0x0002) +- track = read_binary("B", mds_content, datablock_offset+0x0004) +- pmin = read_binary("B", mds_content, datablock_offset+0x0009) +- psec = read_binary("B", mds_content, datablock_offset+0x000a) +- pfrac = read_binary("B", mds_content, datablock_offset+0x000b) +- sectorsize = read_binary("H", mds_content, datablock_offset+0x0010) +- sector = read_binary("L", mds_content, datablock_offset+0x0024) +- offset = read_binary("Q", mds_content, datablock_offset+0x0028) +- pregap = read_binary("L", mds_content, extrablock_offset+0x0000); +- sectors = read_binary("L", mds_content, extrablock_offset+0x0004); +- if verbose: +- print "datablock: %3i, track: %2x, mode: %2x, flags: %x, sector size: %i, MSF: %02i:%02i.%02i, sector: %i, offset: %i, pregap: %i, sectors: %i" % \ +- (datablock, track, mode, flags, sectorsize, pmin, psec, pfrac, sector, offset, pregap, sectors) +- # writing data to entries +- if track < 0xa0: +- entries.append([track, mode, sectorsize, sector, sectors, offset]) ++ for session in range(0, mds_sessions): ++ print "session %i:" % (session) ++ entries = parse_mds_session(mds_content, mds_sessions_offset + mds_session_size * session) ++ break + + entries.sort() # python is sexy. + +@@ -542,10 +578,11 @@ + if mode == 1: return MODE1_2352 + if mode == 2: return MODE2_2352 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def get_mode_mds(mode, sectsize): + "converts the data to our internal mode consts" ++ mode &= 0xff + if mode == 0xa9: + if sectsize == 2448: return AUDIO_2448 + else: return AUDIO +@@ -559,7 +596,7 @@ + elif sectsize == 2336: return MODE2_2336 + else: return MODE2 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def get_mode_nrg(mode, sectsize): + "converts the data to our internal mode consts" +@@ -573,7 +610,7 @@ + elif sectsize == 2336: return MODE2_2336 + else: return MODE2 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def mode_2_sectorsize(mode): + if mode == AUDIO: return CD_FRAMESIZE_RAW +@@ -584,7 +621,7 @@ + if mode == MODE2_2352: return CD_FRAMESIZE_RAW + if mode == MODE2_2336: return CD_FRAMESIZE_RAW0 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def get_msf(s): + "converts 00:00:00 to 3 integers, take the 01 index if there is a choise - min, sec, frame" +@@ -599,10 +636,11 @@ + + def msf_2_sector(min, sec, frame): + "converts the msf to sector" +- return frame + (sec + min * 60 ) * 75; ++ return frame + (sec + min * 60 ) * 75 - CD_MSF_OFFSET; + + def sector_2_msf(sector): + "and the other way round - min,sec,frame" ++ sector += CD_MSF_OFFSET + sector, frame = divmod(sector, 75) + sector, sec = divmod(sector, 60) + return sector, sec, frame +@@ -618,10 +656,9 @@ + # mode / minute / second / frame + mode = get_mode_cue(raw_entries[i][CUE_MODE]) + min, sec, frame = get_msf(raw_entries[i][CUE_INDEXES]) +- # svcds need 2 sec offset, don't really know why .. its just so ;-) +- if mode == MODE2_2352: +- sec+=2 +- start_sector = msf_2_sector(min, sec, frame) ++ # CUE's MSF should be offset by 00:02:00 ++ start_sector = msf_2_sector(min, sec, frame) + CD_MSF_OFFSET ++ min, sec, frame = sector_2_msf(start_sector) + + if i == 0: + start_offset = 0 +diff -Naur cdemu-0.8/Makefile cdemu-203/Makefile +--- cdemu-0.8/Makefile 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/Makefile 2007-01-11 22:25:48.000000000 +0100 +@@ -2,7 +2,7 @@ + # $Header$ + + PREFIX = /usr +-SRCS = cdemu_core.c cdemu_mod.c cdemu_proc.c ++SRCS = cdemu_core.c cdemu_mod.c + OBJS = $(patsubst %.c,%.o, $(SRCS)) + + # +@@ -28,7 +28,7 @@ + KERN_INC = $(KERN_DIR)/include + + ifeq ($(KERN_SRC),no) +- $(error You'll need sources for your (at least 2.6.16) kernel) ++ $(error You'll need sources for your (at least 2.6) kernel) + endif + + +@@ -56,18 +56,17 @@ + # to keep this stuff readable + # + ifndef MK_INC +- MK_INC = $(PWD) ++ MK_INC = $(shell pwd) + endif + ifeq ($(KERN_MAJ),2.4) +- $(error You'll need at least 2.6.16 kernel) ++ $(error You'll need at least 2.6 kernel) + endif + ifeq ($(KERN_MAJ),2.6) + KERN_MICRO = $(shell echo $(KERN_VER) | sed 's/2\.6\.\([0123456789]*\).*/\1/') + ifeq ($(shell test "$(KERN_MICRO)" -lt "16" >& /dev/null && echo yes),yes) +- $(error You'll need at least 2.6.16 kernel) +- else +- MODVAR = M ++ $(warning Kernel 2.6.16 is the minimum recommended kernel version) + endif ++ MODVAR = M + include $(MK_INC)/mk/linux-2.6 + endif + +diff -Naur cdemu-0.8/TODO cdemu-203/TODO +--- cdemu-0.8/TODO 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/TODO 2006-10-15 15:40:15.000000000 +0200 +@@ -1,14 +1,12 @@ + USER: + +-- a GUI program to controll all (for KDE, Wolfgang Koller wrote ++- A GUI program to controll all (for KDE, Wolfgang Koller wrote + applet (http://www.suselinuxsupport.de/en/index.php?location=downloads#KCDemu) ++- Userspace library for cd-image access. (Rok) + + KERNEL: + + - Get someone to do SMP testing on a regular basis. +-- make nodes/devices/memory dynamic ... create gendisk's whenever a cd +- is loaded and delete them when cd is unloaded ... +-- Memory mapped IO (mmap). +-- Support for pregaps, postgaps and subchannels, ECC and reading cd-text. +-- SysFS/ProcFS. +-- Packet commands. ++- Memory mapped IO (mmap) and/or shared memory. ++- Support for pregaps, postgaps and subchannels, ECC and reading cd-text. (Pawel) ++- More ATAPI packet commands. From vmiklos at frugalware.org Tue Jul 10 18:27:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 18:27:41 2007 Subject: [Frugalware-git] fw-control-center: autogen.sh: translations moved to git Message-ID: <20070710162739.DCC6716A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=c7dc99d195c0c2612a6ea5c17059b22abe9c8449 commit c7dc99d195c0c2612a6ea5c17059b22abe9c8449 Author: VMiklos Date: Tue Jul 10 18:26:23 2007 +0200 autogen.sh: translations moved to git diff --git a/gnetconfig/autogen.sh b/gnetconfig/autogen.sh index 3520ea7..3581be8 100755 --- a/gnetconfig/autogen.sh +++ b/gnetconfig/autogen.sh @@ -13,7 +13,7 @@ gen_pot() import_pootle() { - po_dir=~/darcs/translations/po + po_dir=~/git/translations/po if [ -d $po_dir ]; then : > po/LINGUAS for i in $(/bin/ls $po_dir/fwcontrolcenter) From vmiklos at frugalware.org Tue Jul 10 20:36:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 20:36:14 2007 Subject: [Frugalware-git] homepage-ng: new git repo: fwlive Message-ID: <20070710183612.E3B8D13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=a5e21e1930f14d10b39c70085b6429918a57aa4e commit a5e21e1930f14d10b39c70085b6429918a57aa4e Author: VMiklos Date: Tue Jul 10 20:35:47 2007 +0200 new git repo: fwlive diff --git a/git/repos/fwlive b/git/repos/fwlive new file mode 120000 index 0000000..bac9b1b --- /dev/null +++ b/git/repos/fwlive @@ -0,0 +1 @@ +../../../fwlive \ No newline at end of file From vmiklos at frugalware.org Tue Jul 10 21:22:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:54 2007 Subject: [Frugalware-git] frugalware-current: kernel-2.6.22-1-i686 Message-ID: <20070710192240.BEEC313A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2beeace20810a8457fdc4cdd26b9522f58db99fd commit 2beeace20810a8457fdc4cdd26b9522f58db99fd Author: VMiklos Date: Mon Jul 9 19:26:40 2007 +0200 kernel-2.6.22-1-i686 version bump added two hotfix from lkml updated config drop already merged patches diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 6b7bc06..7a6d9de 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 11.74 SBU # Maintainer: VMiklos -_F_kernel_patches=(pppoe.patch) +_F_kernel_patches=(aacraid.diff pxa27x.diff) Finclude kernel diff --git a/source/base/kernel/aacraid.diff b/source/base/kernel/aacraid.diff new file mode 100644 index 0000000..05765df --- /dev/null +++ b/source/base/kernel/aacraid.diff @@ -0,0 +1,35 @@ +Are the shortlogs useful - yes .. they catch what appear to be mistakes + +Specifically: What happened to the aacraid ioctl security fix ? Did someone decide it +wasn't needed or did it get lost somewhere on the way ? + +While this looks scary the only obvious exploit cases are where the user can +open a device level file on an AACraid. Very few people put scanners or CD +devices on one so the actual impact is probably minimal. + +Alan + +-- + +Signed-off-by: Alan Cox + +--- a/drivers/scsi/aacraid/linit.c 2007-07-09 10:51:55.653223304 +0100 ++++ b/drivers/scsi/aacraid/linit.c 2007-07-09 10:51:55.653223304 +0100 +@@ -453,6 +453,8 @@ + static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg) + { + struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; ++ if (!capable(CAP_SYS_RAWIO)) ++ return -EPERM; + return aac_do_ioctl(dev, cmd, arg); + } + +@@ -645,6 +647,8 @@ + static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) + { + struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; ++ if (!capable(CAP_SYS_RAWIO)) ++ return -EPERM; + return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg); + } + diff --git a/source/base/kernel/config b/source/base/kernel/config index ca53585..1a2216d 100644 --- a/source/base/kernel/config +++ b/source/base/kernel/config @@ -1,5 +1,7 @@ # # Automatically generated make config: don't edit +# Linux kernel version: 2.6.22 +# Mon Jul 9 02:28:26 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -12,6 +14,7 @@ CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y CONFIG_ZONE_DMA=y +CONFIG_QUICKLIST=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y @@ -45,6 +48,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 CONFIG_CPUSETS=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -63,14 +67,20 @@ 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_SLAB=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 -# CONFIG_SLOB is not set # # Loadable module support @@ -122,11 +132,11 @@ CONFIG_X86_PC=y # CONFIG_X86_ES7000 is not set # CONFIG_PARAVIRT is not set # CONFIG_M386 is not set -CONFIG_M486=y +# CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set -# CONFIG_M686 is not set +CONFIG_M686=y # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set # CONFIG_MPENTIUMM is not set @@ -144,26 +154,31 @@ CONFIG_M486=y # 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_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_MODEL=4 CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y -# CONFIG_SCHED_MC is not set +CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -207,6 +222,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 +CONFIG_NR_QUICK=1 # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -257,8 +273,6 @@ CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_IBM_BAY=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set @@ -268,16 +282,11 @@ CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m - -# -# APM (Advanced Power Management) BIOS Support -# -CONFIG_APM=y +CONFIG_APM=m # CONFIG_APM_IGNORE_USER_SUSPEND is not set # CONFIG_APM_DO_ENABLE is not set # CONFIG_APM_CPU_IDLE is not set # CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_RTC_IS_GMT is not set # CONFIG_APM_ALLOW_INTS is not set CONFIG_APM_REAL_MODE_POWER_OFF=y @@ -331,15 +340,14 @@ CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_PCI=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y +CONFIG_PCI_GODIRECT=y +# CONFIG_PCI_GOANY is not set CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_HT_IRQ=y CONFIG_ISA_DMA_API=y @@ -380,15 +388,8 @@ CONFIG_I82365=m CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=m - -# -# PCI Hotplug Support -# CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -CONFIG_HOTPLUG_PCI_IBM=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set @@ -409,7 +410,6 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -462,6 +462,8 @@ CONFIG_TCP_CONG_VEGAS=m CONFIG_TCP_CONG_SCALABLE=m # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_CUBIC is not set # CONFIG_DEFAULT_HTCP is not set @@ -470,15 +472,12 @@ CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set - -# -# IP: Virtual Server Configuration -# # CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IPV6_ROUTE_INFO is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -506,8 +505,6 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK_ENABLED=m -CONFIG_NF_CONNTRACK_SUPPORT=y -# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set CONFIG_NF_CONNTRACK=m CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y @@ -654,25 +651,13 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m # CONFIG_BRIDGE_EBT_ULOG is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -710,9 +695,6 @@ CONFIG_WAN_ROUTER=m # CONFIG_NET_SCHED=y CONFIG_NET_SCH_FIFO=y -CONFIG_NET_SCH_CLK_JIFFIES=y -# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set -# CONFIG_NET_SCH_CLK_CPU is not set # # Queueing/Scheduling @@ -831,6 +813,7 @@ CONFIG_GIRBIL_DONGLE=m CONFIG_MCP2120_DONGLE=m CONFIG_OLD_BELKIN_DONGLE=m CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m # # Old SIR device drivers @@ -880,6 +863,20 @@ CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +# CONFIG_MAC80211_LEDS is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -887,8 +884,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y -CONFIG_FIB_RULES=y +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m # # Device Drivers @@ -906,10 +903,6 @@ CONFIG_FW_LOADER=y # Connector - unified userspace <-> kernelspace linker # CONFIG_CONNECTOR=m - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_CONCAT=m @@ -957,7 +950,6 @@ CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_ABSENT=m -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -1009,27 +1001,34 @@ CONFIG_MTD_DOCPROBE=m CONFIG_MTD_DOCECC=m # CONFIG_MTD_DOCPROBE_ADVANCED is not set CONFIG_MTD_DOCPROBE_ADDRESS=0 - -# -# NAND Flash Device Drivers -# CONFIG_MTD_NAND=m CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_CS553X=m CONFIG_MTD_NAND_NANDSIM=m - -# -# OneNAND Flash Device Drivers -# +CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OTP=y # +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set + +# # Parallel port support # CONFIG_PARPORT=m @@ -1092,8 +1091,8 @@ CONFIG_PARIDE_KBIC=m CONFIG_PARIDE_KTTI=m CONFIG_PARIDE_ON20=m CONFIG_PARIDE_ON26=m -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_BLK_CPQ_DA=y +CONFIG_BLK_CPQ_CISS_DA=y CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=y CONFIG_BLK_DEV_UMEM=m @@ -1116,16 +1115,17 @@ CONFIG_ATA_OVER_ETH=m # Misc devices # CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ASUS_LAPTOP=m CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m - -# -# ATA/ATAPI/MFM/RLL support -# +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y CONFIG_IDE=y CONFIG_BLK_DEV_IDE=y @@ -1144,6 +1144,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_BLK_DEV_IDEACPI is not set # CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes @@ -1154,6 +1155,7 @@ CONFIG_BLK_DEV_CMD640_ENHANCED=y CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_IDEPCI_PCIBUS_ORDER=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_OPTI621=y @@ -1233,7 +1235,8 @@ CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1260,7 +1263,6 @@ CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=y CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_PROBE_EISA_VL is not set # CONFIG_AIC7XXX_DEBUG_ENABLE is not set CONFIG_AIC7XXX_DEBUG_MASK=0 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set @@ -1268,7 +1270,6 @@ CONFIG_SCSI_AIC7XXX_OLD=m CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=4 CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_ENABLE_RD_STRM is not set # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set @@ -1323,7 +1324,6 @@ CONFIG_SCSI_NCR_Q720=m CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 CONFIG_SCSI_NCR53C8XX_SYNC=20 -# CONFIG_SCSI_NCR53C8XX_PROFILE is not set CONFIG_SCSI_PAS16=m CONFIG_SCSI_PSI240I=m CONFIG_SCSI_QLOGIC_FAS=m @@ -1333,7 +1333,6 @@ CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_SEAGATE=m CONFIG_SCSI_SIM710=m -CONFIG_53C700_IO_MAPPED=y CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -1355,12 +1354,9 @@ CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y CONFIG_SATA_AHCI=y CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=y @@ -1377,12 +1373,11 @@ CONFIG_SATA_ULI=y CONFIG_SATA_VIA=y CONFIG_SATA_VITESSE=y CONFIG_SATA_INIC162X=m -CONFIG_SATA_INTEL_COMBINED=y -CONFIG_SATA_ACPI=y CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m @@ -1453,6 +1448,7 @@ CONFIG_DM_CRYPT=m # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set # # Fusion MPT device support @@ -1468,27 +1464,29 @@ CONFIG_FUSION_LAN=m # # IEEE 1394 (FireWire) support # +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m CONFIG_IEEE1394=y # # Subsystem Options # # CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y # -# Device Drivers +# Controllers # CONFIG_IEEE1394_PCILYNX=m CONFIG_IEEE1394_OHCI1394=m # -# Protocol Drivers +# Protocols # CONFIG_IEEE1394_VIDEO1394=m CONFIG_IEEE1394_SBP2=m # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m @@ -1505,11 +1503,7 @@ CONFIG_I2O_BUS=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m - -# -# Macintosh device drivers -# -# CONFIG_MAC_EMUMOUSEBTN is not set +# CONFIG_MACINTOSH_DRIVERS is not set # # Network device support @@ -1521,10 +1515,6 @@ CONFIG_BONDING=m CONFIG_EQUALIZER=m CONFIG_TUN=m CONFIG_NET_SB1000=m - -# -# ARCnet devices -# CONFIG_ARCNET=m CONFIG_ARCNET_1201=m CONFIG_ARCNET_1051=m @@ -1536,10 +1526,6 @@ CONFIG_ARCNET_RIM_I=m CONFIG_ARCNET_COM20020=m CONFIG_ARCNET_COM20020_ISA=m CONFIG_ARCNET_COM20020_PCI=m - -# -# PHY device support -# CONFIG_PHYLIB=m # @@ -1611,7 +1597,7 @@ CONFIG_EEXPRESS=m CONFIG_EEXPRESS_PRO=m CONFIG_HPLAN_PLUS=m CONFIG_HPLAN=m -CONFIG_LP486E=m +# CONFIG_LP486E is not set CONFIG_ETH16I=m CONFIG_NE2000=m CONFIG_ZNET=m @@ -1659,10 +1645,7 @@ CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m - -# -# Ethernet (1000 Mbit) -# +CONFIG_NETDEV_1000=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m @@ -1684,10 +1667,7 @@ CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m - -# -# Ethernet (10000 Mbit) -# +CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y @@ -1698,10 +1678,8 @@ CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m - -# -# Token Ring devices -# +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -1716,28 +1694,16 @@ CONFIG_MADGEMC=m CONFIG_SMCTR=m # -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -CONFIG_NET_WIRELESS_RTNETLINK=y - -# -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_ARLAN=m CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m - -# -# Wireless 802.11b ISA/PCI cards support -# CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set @@ -1745,8 +1711,11 @@ CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y # CONFIG_IPW2200_RADIOTAP is not set # CONFIG_IPW2200_PROMISCUOUS is not set -# CONFIG_IPW2200_QOS is not set +CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1755,29 +1724,20 @@ CONFIG_NORTEL_HERMES=m CONFIG_PCI_HERMES=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE is not set CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m CONFIG_BCM43XX=m -# CONFIG_BCM43XX_DEBUG is not set +CONFIG_BCM43XX_DEBUG=y CONFIG_BCM43XX_DMA=y CONFIG_BCM43XX_PIO=y CONFIG_BCM43XX_DMA_AND_PIO_MODE=y @@ -1785,11 +1745,32 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y # CONFIG_BCM43XX_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set -CONFIG_NET_WIRELESS=y # -# PCMCIA network device support +# USB Network Adapters # +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_3C574=m @@ -1801,10 +1782,6 @@ CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m CONFIG_ARCNET_COM20020_CS=m CONFIG_PCMCIA_IBMTR=m - -# -# Wan interfaces -# CONFIG_WAN=y CONFIG_HOSTESS_SV11=m CONFIG_COSA=m @@ -1846,10 +1823,7 @@ CONFIG_LAPBETHER=m CONFIG_X25_ASY=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set - -# -# ATM drivers -# +CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m @@ -1903,7 +1877,6 @@ CONFIG_NET_FC=y CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y -CONFIG_NETPOLL_RX=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y @@ -1968,6 +1941,7 @@ CONFIG_PHONE_IXJ_PCMCIA=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1995,7 +1969,14 @@ CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_ATIXL=y CONFIG_MOUSE_LOGIBM=m @@ -2026,6 +2007,13 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m # CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2036,10 +2024,23 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m CONFIG_INPUT_UINPUT=m # @@ -2133,10 +2134,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m - -# -# Watchdog Cards -# CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2154,7 +2151,6 @@ CONFIG_IB700_WDT=m CONFIG_IBMASR=m CONFIG_WAFER_WDT=m CONFIG_I6300ESB_WDT=m -CONFIG_I8XX_TCO=m CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_SC1200_WDT=m @@ -2248,11 +2244,9 @@ CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m CONFIG_TELCLOCK=m - -# -# I2C support -# +CONFIG_DEVPORT=y CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m # @@ -2281,11 +2275,13 @@ CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m +CONFIG_I2C_SIMTEC=m CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m # CONFIG_I2C_STUB is not set +CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_VOODOO3=m @@ -2322,6 +2318,7 @@ CONFIG_SPI_BITBANG=m # SPI Protocol Masters # CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m # # Dallas's 1-wire bus @@ -2343,13 +2340,10 @@ CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -2365,6 +2359,7 @@ CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM70=m @@ -2378,6 +2373,7 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m @@ -2395,6 +2391,7 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2409,14 +2406,7 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# +CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TVAUDIO=m @@ -2426,6 +2416,9 @@ CONFIG_VIDEO_TDA9875=m CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m CONFIG_VIDEO_KS0127=m @@ -2436,10 +2429,14 @@ CONFIG_VIDEO_SAA7114=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_VIVI=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y @@ -2477,14 +2474,12 @@ CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_CAFE_CCIC=m - -# -# V4L USB devices -# +CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_29XXX is not set -# CONFIG_VIDEO_PVRUSB2_24XXX is not set +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y # CONFIG_VIDEO_PVRUSB2_SYSFS is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_USBVISION=m @@ -2503,10 +2498,8 @@ CONFIG_USB_STV680=m CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set - -# -# Radio Adapters -# +CONFIG_USB_ZR364XX=m +CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_CADET=m CONFIG_RADIO_RTRACK=m CONFIG_RADIO_RTRACK2=m @@ -2523,13 +2516,9 @@ CONFIG_RADIO_TYPHOON=m CONFIG_RADIO_TYPHOON_PROC_FS=y CONFIG_RADIO_ZOLTRIX=m CONFIG_USB_DSBR=m - -# -# Digital Video Broadcasting Devices -# -CONFIG_DVB=y CONFIG_DVB_CORE=m CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y # # Supported SAA7146 based PCI Adapters @@ -2563,6 +2552,7 @@ CONFIG_DVB_USB_GP8PSK=m CONFIG_DVB_USB_NOVA_T_USB2=m CONFIG_DVB_USB_TTUSB2=m CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_CINERGYT2=m @@ -2629,6 +2619,7 @@ CONFIG_DVB_DIB7000P=m # CONFIG_DVB_VES1820=m CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m CONFIG_DVB_STV0297=m # @@ -2645,9 +2636,9 @@ CONFIG_DVB_LGDT330X=m # CONFIG_DVB_PLL=m CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m CONFIG_DVB_TUNER_QT1010=m CONFIG_DVB_TUNER_MT2060=m -CONFIG_DVB_TUNER_LGH06XF=m # # Miscellaneous devices @@ -2663,6 +2654,7 @@ CONFIG_VIDEO_BUF_DVB=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_DAB=y CONFIG_USB_DABUSB=m # @@ -2672,12 +2664,28 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# +CONFIG_VGASTATE=m CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set CONFIG_FB_DDC=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y @@ -2695,6 +2703,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m CONFIG_FB_VESA=y +# CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -2702,6 +2711,8 @@ CONFIG_FB_VESA=y CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y # CONFIG_FB_I810_I2C is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m CONFIG_FB_INTEL=m # CONFIG_FB_INTEL_DEBUG is not set CONFIG_FB_INTEL_I2C=y @@ -2731,8 +2742,11 @@ CONFIG_FB_SIS_315=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set # CONFIG_FB_CYBLA is not set # CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set # CONFIG_FB_GEODE is not set CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set @@ -2758,10 +2772,6 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set - -# -# Logo configuration -# # CONFIG_LOGO is not set # @@ -2841,9 +2851,11 @@ CONFIG_SND_SB8=m CONFIG_SND_SB16=m CONFIG_SND_SBAWE=m CONFIG_SND_SB16_CSP=y +# CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL is not set CONFIG_SND_SGALAXY=m CONFIG_SND_SSCAPE=m CONFIG_SND_WAVEFRONT=m +# CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL is not set # # PCI devices @@ -2895,7 +2907,9 @@ CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_KORG1212=m +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MAESTRO3=m +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MIXART=m CONFIG_SND_NM256=m CONFIG_SND_PCXHR=m @@ -2909,6 +2923,7 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set CONFIG_SND_AC97_POWER_SAVE=y # @@ -2916,6 +2931,8 @@ CONFIG_SND_AC97_POWER_SAVE=y # CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +# CONFIG_SND_USB_CAIAQ_INPUT is not set # # PCMCIA devices @@ -2924,7 +2941,7 @@ CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # -# SoC audio support +# System on Chip audio support # # CONFIG_SND_SOC is not set @@ -2941,6 +2958,19 @@ CONFIG_HID=y # CONFIG_HID_DEBUG is not set # +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y + +# # USB support # CONFIG_USB_ARCH_HAS_HCD=y @@ -2953,6 +2983,7 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set @@ -3003,69 +3034,10 @@ CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_LIBUSUAL is not set # -# USB Input Devices -# -CONFIG_USB_HID=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -CONFIG_HID_FF=y -CONFIG_HID_PID=y -CONFIG_LOGITECH_FF=y -CONFIG_PANTHERLORD_FF=y -CONFIG_THRUSTMASTER_FF=y -CONFIG_ZEROPLUS_FF=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m -CONFIG_USB_POWERMATE=m -CONFIG_USB_TOUCHSCREEN=m -CONFIG_USB_TOUCHSCREEN_EGALAX=y -CONFIG_USB_TOUCHSCREEN_PANJIT=y -CONFIG_USB_TOUCHSCREEN_3M=y -CONFIG_USB_TOUCHSCREEN_ITM=y -CONFIG_USB_TOUCHSCREEN_ETURBO=y -CONFIG_USB_TOUCHSCREEN_GUNZE=y -CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y -CONFIG_USB_YEALINK=m -CONFIG_USB_XPAD=m -CONFIG_USB_ATI_REMOTE=m -CONFIG_USB_ATI_REMOTE2=m -CONFIG_USB_KEYSPAN_REMOTE=m -CONFIG_USB_APPLETOUCH=m -CONFIG_USB_GTCO=m - -# # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET_MII=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_MON is not set # @@ -3172,6 +3144,7 @@ CONFIG_USB_XUSBATM=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FSL_USB2 is not set CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set @@ -3189,13 +3162,18 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set # -# MMC/SD Card support +# MMC/SD Card Drivers # -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=m + +# +# MMC/SD Host Controller Drivers +# CONFIG_MMC_SDHCI=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -3224,6 +3202,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y @@ -3231,6 +3210,7 @@ CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -3265,30 +3245,44 @@ CONFIG_RTC_CLASS=m # # RTC interfaces # -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m # -# RTC drivers +# I2C RTC drivers # -CONFIG_RTC_DRV_CMOS=m -CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m + +# +# SPI RTC drivers +# CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_TEST=m CONFIG_RTC_DRV_MAX6902=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_V3020=m # +# on-CPU RTC drivers +# + +# # DMA Engine support # CONFIG_DMA_ENGINE=y @@ -3463,6 +3457,7 @@ CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3485,7 +3480,7 @@ CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_DEBUG is not set # CONFIG_9P_FS is not set # @@ -3509,6 +3504,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -3558,8 +3554,6 @@ CONFIG_NLS_UTF8=m # Distributed Lock Manager # CONFIG_DLM=m -CONFIG_DLM_TCP=y -# CONFIG_DLM_SCTP is not set # CONFIG_DLM_DEBUG is not set # @@ -3579,7 +3573,6 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 CONFIG_DEBUG_BUGVERBOSE=y CONFIG_EARLY_PRINTK=y CONFIG_X86_FIND_SMP_CONFIG=y @@ -3603,6 +3596,7 @@ CONFIG_SECURITY_ROOTPLUG=m # CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y @@ -3621,6 +3615,7 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_BLOWFISH=m @@ -3656,12 +3651,15 @@ CONFIG_CRYPTO_DEV_GEODE=m CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3669,6 +3667,7 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y diff --git a/source/base/kernel/pppoe.patch b/source/base/kernel/pppoe.patch deleted file mode 100644 index dfa4c10..0000000 --- a/source/base/kernel/pppoe.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Florian Zumbiehl -Date: Fri, 20 Apr 2007 23:58:14 +0000 (-0700) -Subject: [PPPOE]: memory leak when socket is release()d before PPPIOCGCHAN has been called ... -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=202a03acf9994076055df40ae093a5c5474ad0bd - -[PPPOE]: memory leak when socket is release()d before PPPIOCGCHAN has been called on it - -below you find a patch that fixes a memory leak when a PPPoE socket is -release()d after it has been connect()ed, but before the PPPIOCGCHAN ioctl -ever has been called on it. - -This is somewhat of a security problem, too, since PPPoE sockets can be -created by any user, so any user can easily allocate all the machine's -RAM to non-swappable address space and thus DoS the system. - -Is there any specific reason for PPPoE sockets being available to any -unprivileged process, BTW? After all, you need a packet socket for the -discovery stage anyway, so it's unlikely that any unprivileged process -will ever need to create a PPPoE socket, no? Allocating all session IDs -for a known AC is a kind of DoS, too, after all - with Juniper ERXes, -this is really easy, actually, since they don't ever assign session ids -above 8000 ... - -Signed-off-by: Florian Zumbiehl -Acked-by: Michal Ostrowski -Signed-off-by: David S. Miller ---- - -diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c -index 9315046..3f8115d 100644 ---- a/drivers/net/pppox.c -+++ b/drivers/net/pppox.c -@@ -58,7 +58,7 @@ void pppox_unbind_sock(struct sock *sk) - { - /* Clear connection to ppp device, if attached. */ - -- if (sk->sk_state & (PPPOX_BOUND | PPPOX_ZOMBIE)) { -+ if (sk->sk_state & (PPPOX_BOUND | PPPOX_CONNECTED | PPPOX_ZOMBIE)) { - ppp_unregister_channel(&pppox_sk(sk)->chan); - sk->sk_state = PPPOX_DEAD; - } diff --git a/source/base/kernel/pxa27x.diff b/source/base/kernel/pxa27x.diff new file mode 100644 index 0000000..a061352 --- /dev/null +++ b/source/base/kernel/pxa27x.diff @@ -0,0 +1,22 @@ +The PXA2xx keyboard driver does not compile with 2.6.22 +The following patch fixes it + +Signed-off-by: Mike Rapoport +Acked-by: Rodolfo Giometti + + drivers/input/keyboard/pxa27x_keyboard.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c +index f9e82c9..ebe5eac 100644 +--- a/drivers/input/keyboard/pxa27x_keyboard.c ++++ b/drivers/input/keyboard/pxa27x_keyboard.c +@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform_device *pdev) + KPREC = pdata->reg_kprec; + + /* Enable unit clock */ +- pxa_set_cken(CKEN19_KEYPAD, 1); ++ pxa_set_cken(CKEN_KEYPAD, 1); + } + + mutex_unlock(&input_dev->mutex); diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index cfab3a2..c3e0e77 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -15,6 +15,6 @@ # * _F_kernelver_rel: the kernel release # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### -_F_kernelver_ver=2.6.21 -_F_kernelver_rel=3 -_F_kernelver_stable=5 +_F_kernelver_ver=2.6.22 +_F_kernelver_rel=1 +#_F_kernelver_stable=1 From vmiklos at frugalware.org Tue Jul 10 21:22:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:55 2007 Subject: [Frugalware-git] frugalware-current: rlocate-0.5.5-12-i686 Message-ID: <20070710192241.191CB13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=001a81e38e3367ce88a1bf4b1dc7a6d8643027e7 commit 001a81e38e3367ce88a1bf4b1dc7a6d8643027e7 Author: VMiklos Date: Mon Jul 9 20:20:25 2007 +0200 rlocate-0.5.5-12-i686 rebuild in kernel2622 diff --git a/source/apps-extra/rlocate/FrugalBuild b/source/apps-extra/rlocate/FrugalBuild index 99ad716..b5cc85b 100644 --- a/source/apps-extra/rlocate/FrugalBuild +++ b/source/apps-extra/rlocate/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rlocate pkgver=0.5.5 -pkgrel=11 +pkgrel=12 pkgdesc="rlocate is an implementation of the locate command" Finclude kernel-module depends=(${depends[@]} 'glibc' 'util-linux' 'psmisc') From vmiklos at frugalware.org Tue Jul 10 21:22:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:55 2007 Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-4-i686 Message-ID: <20070710192241.43E8013A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ca1cb7a4cd1943dedaec7ca5e7cbbbd2bb9150ec commit ca1cb7a4cd1943dedaec7ca5e7cbbbd2bb9150ec Author: VMiklos Date: Mon Jul 9 21:02:31 2007 +0200 acerhk-0.5.35-4-i686 rebuild in kernel2622 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 496f63e..eeafb68 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=3 +pkgrel=4 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Tue Jul 10 21:22:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:55 2007 Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-10-i686 Message-ID: <20070710192241.7D6E413A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=487f01dab4a90f0a783aceb886370d98d6280278 commit 487f01dab4a90f0a783aceb886370d98d6280278 Author: VMiklos Date: Mon Jul 9 21:15:33 2007 +0200 kqemu-1.3.0pre11-10-i686 rebuild in kernel2622 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index 2a58558..e2c4fcf 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=9 +pkgrel=10 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') @@ -12,6 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep kqemu.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=($url/kqemu-$pkgver.tar.gz) +sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71') build() { @@ -22,4 +23,3 @@ build() echo 'KERNEL=="kqemu*", NAME="%k", GROUP="users", MODE="0660"' \ > $Fdestdir/etc/udev/rules.d/48-qemu.rules } -sha1sums=('780d48b99715e6b2671864ad5050f1c9506fcb71') From vmiklos at frugalware.org Tue Jul 10 21:22:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:56 2007 Subject: [Frugalware-git] frugalware-current: truecrypt-4.3-7-i686 Message-ID: <20070710192241.A219313A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b78713e4bbb1fc6096e73d64b95805edc751bec1 commit b78713e4bbb1fc6096e73d64b95805edc751bec1 Author: VMiklos Date: Mon Jul 9 21:29:23 2007 +0200 truecrypt-4.3-7-i686 rebuild in kernel2622 diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild index fb5fe54..c9b2aab 100644 --- a/source/apps-extra/truecrypt/FrugalBuild +++ b/source/apps-extra/truecrypt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=truecrypt pkgver=4.3 pkgextraver=a -pkgrel=6 +pkgrel=7 pkgdesc="A free open-source disk encryption software" url="http://www.truecrypt.org/" Finclude kernel-module From vmiklos at frugalware.org Tue Jul 10 21:22:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:56 2007 Subject: [Frugalware-git] frugalware-current: fglrx-8.38.6-2-i686 Message-ID: <20070710192241.BF9B513A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=599a65800158a984792d8dd28e32aa0e9dc65275 commit 599a65800158a984792d8dd28e32aa0e9dc65275 Author: VMiklos Date: Mon Jul 9 21:43:01 2007 +0200 fglrx-8.38.6-2-i686 rebuild in kernel2622 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 6ffc606..b0d857e 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=fglrx pkgver=8.38.6 -pkgrel=1 +pkgrel=2 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From vmiklos at frugalware.org Tue Jul 10 21:22:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:57 2007 Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-17-i686 Message-ID: <20070710192241.DD34F13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f398e93b96b653b61b804b1e5f7a229c5f5163f5 commit f398e93b96b653b61b804b1e5f7a229c5f5163f5 Author: VMiklos Date: Mon Jul 9 22:11:02 2007 +0200 qc-usb-0.6.6-17-i686 rebuild in kernel2622 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index a9c11af..c489890 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=16 +pkgrel=17 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Tue Jul 10 21:22:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:57 2007 Subject: [Frugalware-git] frugalware-current: ipw3945-1.2.1-4-i686 Message-ID: <20070710192242.0BDD513A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ce5e09f38767e790755680b98d155f4b53b996d3 commit ce5e09f38767e790755680b98d155f4b53b996d3 Author: VMiklos Date: Mon Jul 9 22:19:31 2007 +0200 ipw3945-1.2.1-4-i686 rebuild in kernel2622 diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild index 2b50dbb..18d681d 100644 --- a/source/network-extra/ipw3945/FrugalBuild +++ b/source/network-extra/ipw3945/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ipw3945 pkgver=1.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux" _F_sourceforge_ext=".tgz" Finclude sourceforge kernel-module From vmiklos at frugalware.org Tue Jul 10 21:22:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:57 2007 Subject: [Frugalware-git] frugalware-current: tools/fpm2db: don't do anything if the repo's name is not in a foo-bar format Message-ID: <20070710192240.D960516A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9e219cc2b818b793fbf814029f46fdde07129bce commit 9e219cc2b818b793fbf814029f46fdde07129bce Author: VMiklos Date: Mon Jul 9 20:00:24 2007 +0200 tools/fpm2db: don't do anything if the repo's name is not in a foo-bar format frugalware-current and frugalware- has such a format and we don't need fpm2db for other tmp repos diff --git a/tools/fpm2db b/tools/fpm2db index d45af40..082d350 100755 --- a/tools/fpm2db +++ b/tools/fpm2db @@ -32,7 +32,11 @@ class package: self.parent = self.pkgname self.pkgver = re.sub('.*-([^-]+-[^-]+)-[^-]+.fpm', r'\1', fpm) self.arch = os.getcwd().split('-')[-1] - self.fwver = os.getcwd().split('/')[-2].split('-')[1] + try: + self.fwver = os.getcwd().split('/')[-2].split('-')[1] + except IndexError: + # this is some not frugalware-foo repo, just skip it + sys.exit(0) self.uploader = os.environ['HOME'].split('/')[-1] try: From vmiklos at frugalware.org Tue Jul 10 21:22:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:58 2007 Subject: [Frugalware-git] frugalware-current: dazuko-2.3.3-6-i686 Message-ID: <20070710192242.6F3AD13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=aa61b9fec7b428b6786c1504ccb5dd6d3c39f95c commit aa61b9fec7b428b6786c1504ccb5dd6d3c39f95c Author: VMiklos Date: Mon Jul 9 22:52:37 2007 +0200 dazuko-2.3.3-6-i686 rebuild in kernel2622 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 7c69e2c..4e94420 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dazuko pkgver=2.3.3 -pkgrel=5 +pkgrel=6 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Tue Jul 10 21:22:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:58 2007 Subject: [Frugalware-git] frugalware-current: nvidia-100.14.09-3-i686 Message-ID: <20070710192242.9173E13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6f6abbd3add9002171e6116f8b72bc73700d4621 commit 6f6abbd3add9002171e6116f8b72bc73700d4621 Author: VMiklos Date: Mon Jul 9 23:04:31 2007 +0200 nvidia-100.14.09-3-i686 rebuild in kernel2622 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 734b63e..6cfced5 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=100.14.09 -pkgrel=2 +pkgrel=3 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From vmiklos at frugalware.org Tue Jul 10 21:22:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:59 2007 Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.18-5-i686 Message-ID: <20070710192242.B461F13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e1e8ede244e4780a181803d73079402222c5abf6 commit e1e8ede244e4780a181803d73079402222c5abf6 Author: VMiklos Date: Mon Jul 9 23:19:51 2007 +0200 gspcav1-1.00.18-5-i686 rebuild in kernel2622 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index 8faa4fc..954b248 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.18 -pkgrel=4 +pkgrel=5 pkgdate=20070508 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From vmiklos at frugalware.org Tue Jul 10 21:22:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:22:59 2007 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.47-3-i686 Message-ID: <20070710192242.DA37213A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e7d4ed3267c2e9f4c456f7af576cbb999a59212e commit e7d4ed3267c2e9f4c456f7af576cbb999a59212e Author: VMiklos Date: Mon Jul 9 23:25:35 2007 +0200 ndiswrapper-1.47-3-i686 rebuild in kernel2622 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 06c90af..7606289 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.47 -pkgrel=2 +pkgrel=3 pkgdesc="Wrapper for using Windows drivers for some wireless cards" Finclude kernel-module sourceforge unset install From vmiklos at frugalware.org Tue Jul 10 21:22:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:00 2007 Subject: [Frugalware-git] frugalware-current: nvidia-96xx-1.0_9639-3-i686 Message-ID: <20070710192243.0A5CD13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=46175a2a591b8b68e55d7c2e65e6fc3560aedb40 commit 46175a2a591b8b68e55d7c2e65e6fc3560aedb40 Author: VMiklos Date: Mon Jul 9 23:34:38 2007 +0200 nvidia-96xx-1.0_9639-3-i686 rebuild in kernel2622 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index 8b63bb2..a892d70 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=nvidia-96xx pkgver=1.0_9639 nvver=`echo $pkgver|sed 's/_/-/'` -pkgrel=2 +pkgrel=3 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From vmiklos at frugalware.org Tue Jul 10 21:22:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:00 2007 Subject: [Frugalware-git] frugalware-current: lirc-0.8.2-3-i686 Message-ID: <20070710192243.9054116A8092@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=00ed3c774cbc64d4370145d1863fc3c4efef9b97 commit 00ed3c774cbc64d4370145d1863fc3c4efef9b97 Author: VMiklos Date: Mon Jul 9 23:43:38 2007 +0200 lirc-0.8.2-3-i686 rebuild in kernel2622 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 10a28e8..0d68a7c 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Tue Jul 10 21:22:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:00 2007 Subject: [Frugalware-git] frugalware-current: ivtv-0.10.3-4-i686 Message-ID: <20070710192243.AB699186816A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e9dde7e83cdfa7dffcbe49af8181af8563381911 commit e9dde7e83cdfa7dffcbe49af8181af8563381911 Author: VMiklos Date: Tue Jul 10 00:03:21 2007 +0200 ivtv-0.10.3-4-i686 remove kernel module, it's already in kernel-2.6.22 diff --git a/source/multimedia-extra/ivtv/FrugalBuild b/source/multimedia-extra/ivtv/FrugalBuild index 41a0694..db480a0 100644 --- a/source/multimedia-extra/ivtv/FrugalBuild +++ b/source/multimedia-extra/ivtv/FrugalBuild @@ -5,10 +5,9 @@ pkgname=ivtv branch=0.10.x pkgver=0.10.3 -pkgrel=3 +pkgrel=4 pkgdesc="Linux module and a driver for X11 for hardware based on Conexant's codec chip." url="http://ivtvdriver.org/index.php/Main_Page" -Finclude kernel-module rodepends=("$pkgname-firmware") groups=('multimedia-extra') archs=('i686') @@ -31,7 +30,6 @@ build() do Fsed "-O2" "$CFLAGS" $crap done - KDIR=$_F_kernelmod_dir/build cd utils make || Fdie Fmakeinstall PREFIX=/usr @@ -44,11 +42,6 @@ build() done ## utils and the test tools Fsplit $pkgname-utils /usr - ## kernel mod - cd ../driver - Fsed '/sbin/depmod -a' '#/sbin/depmod -a' Makefile - make KDIR=$_F_kernelmod_dir/build || Fdie - Fmakeinstall KDIR=$_F_kernelmod_dir/build cd .. ## firmware Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware From vmiklos at frugalware.org Tue Jul 10 21:22:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:01 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-0.10.3-4-i686 Message-ID: <20070710192244.1937E186816A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2a44e77c04ffd3f0b6ebbaca53faf860b8fd8b93 commit 2a44e77c04ffd3f0b6ebbaca53faf860b8fd8b93 Author: VMiklos Date: Tue Jul 10 00:22:58 2007 +0200 ivtv-utils-0.10.3-4-i686 remove empty ivtv pkg ok crazy@ diff --git a/source/multimedia-extra/ivtv/FrugalBuild b/source/multimedia-extra/ivtv/FrugalBuild index db480a0..f1bee98 100644 --- a/source/multimedia-extra/ivtv/FrugalBuild +++ b/source/multimedia-extra/ivtv/FrugalBuild @@ -2,28 +2,30 @@ # Maintainer: crazy -pkgname=ivtv +pkgname=ivtv-utils branch=0.10.x pkgver=0.10.3 pkgrel=4 -pkgdesc="Linux module and a driver for X11 for hardware based on Conexant's codec chip." +pkgdesc="Tools for managing the hardware supported by ivtv driver" url="http://ivtvdriver.org/index.php/Main_Page" -rodepends=("$pkgname-firmware") -groups=('multimedia-extra') +depends=('libstdc++') +rodepends=('ivtv-firmware') +conflicts=('ivtv') +groups=('apps-extra') archs=('i686') up2date="lynx -dump http://ivtvdriver.org/index.php/Main_Page|grep -m1 'ivtv-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" -source=(http://dl.ivtvdriver.org/$pkgname/archive/$branch/$pkgname-$pkgver.tar.gz \ - http://dl.ivtvdriver.org/$pkgname/firmware/firmware.tar.gz) +source=(http://dl.ivtvdriver.org/ivtv/archive/$branch/ivtv-$pkgver.tar.gz \ + http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz) -subpkgs=("$pkgname-utils" "$pkgname-firmware") -subdescs=("Tools for managing the hardware supported by ivtv driver" "Firmware for Hauppauge PVR and Conexant based cards") -subdepends=('libstdc++' 'udev') -subgroups=('apps-extra' 'multimedia-extra') -subarchs=('i686' 'i686') +subpkgs=('ivtv-firmware') +subdescs=("Firmware for Hauppauge PVR and Conexant based cards") +subdepends=('udev') +subgroups=('multimedia-extra') +subarchs=('i686') build() { - Fcd + Fcd ivtv-$pkgver Fpatchall ## man some apps have such crappy and broken build tools ... for crap in `find . -name Makefile` @@ -40,12 +42,10 @@ build() do cp $tool $Fdestdir/usr/bin/ done - ## utils and the test tools - Fsplit $pkgname-utils /usr cd .. ## firmware Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware - Fsplit $pkgname-firmware lib/firmware + Fsplit ivtv-firmware lib/firmware ## docs Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver } From vmiklos at frugalware.org Tue Jul 10 21:22:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:01 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-0.10.3-4-i686 Message-ID: <20070710192244.E3FC718681CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a92089939a4cab15a8da6274d1ea83c38565993b commit a92089939a4cab15a8da6274d1ea83c38565993b Author: VMiklos Date: Tue Jul 10 00:24:27 2007 +0200 ivtv-utils-0.10.3-4-i686 brr, forgot to rename the dir diff --git a/source/multimedia-extra/ivtv-utils/FrugalBuild b/source/multimedia-extra/ivtv-utils/FrugalBuild new file mode 100644 index 0000000..f1bee98 --- /dev/null +++ b/source/multimedia-extra/ivtv-utils/FrugalBuild @@ -0,0 +1,55 @@ +# Compiling Time: 0.05 SBU +# Maintainer: crazy + + +pkgname=ivtv-utils +branch=0.10.x +pkgver=0.10.3 +pkgrel=4 +pkgdesc="Tools for managing the hardware supported by ivtv driver" +url="http://ivtvdriver.org/index.php/Main_Page" +depends=('libstdc++') +rodepends=('ivtv-firmware') +conflicts=('ivtv') +groups=('apps-extra') +archs=('i686') +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) + +subpkgs=('ivtv-firmware') +subdescs=("Firmware for Hauppauge PVR and Conexant based cards") +subdepends=('udev') +subgroups=('multimedia-extra') +subarchs=('i686') + +build() +{ + Fcd ivtv-$pkgver + Fpatchall + ## man some apps have such crappy and broken build tools ... + for crap in `find . -name Makefile` + do + Fsed "-O2" "$CFLAGS" $crap + done + cd utils + make || Fdie + Fmakeinstall PREFIX=/usr + cd ../test + make || Fdie + ## lalala this should be 'make install' :D + for tool in ivtv-pcm-tester vbi vbi-detect vbi-passthrough wss + do + cp $tool $Fdestdir/usr/bin/ + done + cd .. + ## firmware + Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware + Fsplit ivtv-firmware lib/firmware + ## docs + Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver +} + +sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ + '68fef52289fed191aac19ce4c0f84fb25740f028') +# optimization OK diff --git a/source/multimedia-extra/ivtv/FrugalBuild b/source/multimedia-extra/ivtv/FrugalBuild deleted file mode 100644 index f1bee98..0000000 --- a/source/multimedia-extra/ivtv/FrugalBuild +++ /dev/null @@ -1,55 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: crazy - - -pkgname=ivtv-utils -branch=0.10.x -pkgver=0.10.3 -pkgrel=4 -pkgdesc="Tools for managing the hardware supported by ivtv driver" -url="http://ivtvdriver.org/index.php/Main_Page" -depends=('libstdc++') -rodepends=('ivtv-firmware') -conflicts=('ivtv') -groups=('apps-extra') -archs=('i686') -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) - -subpkgs=('ivtv-firmware') -subdescs=("Firmware for Hauppauge PVR and Conexant based cards") -subdepends=('udev') -subgroups=('multimedia-extra') -subarchs=('i686') - -build() -{ - Fcd ivtv-$pkgver - Fpatchall - ## man some apps have such crappy and broken build tools ... - for crap in `find . -name Makefile` - do - Fsed "-O2" "$CFLAGS" $crap - done - cd utils - make || Fdie - Fmakeinstall PREFIX=/usr - cd ../test - make || Fdie - ## lalala this should be 'make install' :D - for tool in ivtv-pcm-tester vbi vbi-detect vbi-passthrough wss - do - cp $tool $Fdestdir/usr/bin/ - done - cd .. - ## firmware - Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware - Fsplit ivtv-firmware lib/firmware - ## docs - Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver -} - -sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ - '68fef52289fed191aac19ce4c0f84fb25740f028') -# optimization OK From vmiklos at frugalware.org Tue Jul 10 21:22:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:02 2007 Subject: [Frugalware-git] frugalware-current: virtualbox-1.4.0-3-i686 Message-ID: <20070710192245.6090E18681D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=45f0c4b333fa45b82ac262400491c6ee566237b6 commit 45f0c4b333fa45b82ac262400491c6ee566237b6 Author: VMiklos Date: Tue Jul 10 09:45:49 2007 +0200 virtualbox-1.4.0-3-i686 rebuild in kernel2622 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index e8088c3..863282a 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -4,7 +4,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" Finclude kernel-module From vmiklos at frugalware.org Tue Jul 10 21:22:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:02 2007 Subject: [Frugalware-git] frugalware-current: rtl8110-1.06-4-i686 Message-ID: <20070710192245.2407018681D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ad559f1d272bc615743d0f12a7acbbf21c1008bd commit ad559f1d272bc615743d0f12a7acbbf21c1008bd Author: VMiklos Date: Tue Jul 10 00:31:00 2007 +0200 rtl8110-1.06-4-i686 rebuild in kernel2622 diff --git a/source/network-extra/rtl8110/FrugalBuild b/source/network-extra/rtl8110/FrugalBuild index d2b5841..c289eab 100644 --- a/source/network-extra/rtl8110/FrugalBuild +++ b/source/network-extra/rtl8110/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rtl8110 pkgver=1.06 -pkgrel=3 +pkgrel=4 pkgdesc="Realtek driver(r1000) for RTL8169/8110 cards." url="http://www.realtek.com.tw" Finclude kernel-module From vmiklos at frugalware.org Tue Jul 10 21:22:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:03 2007 Subject: [Frugalware-git] frugalware-current: kernel-2.6.22-1-i686 Message-ID: <20070710192245.95E0B18681D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=18ff88deeb7c1377707e0aeefec3f59d7b32e5cc commit 18ff88deeb7c1377707e0aeefec3f59d7b32e5cc Author: VMiklos Date: Tue Jul 10 13:42:22 2007 +0200 kernel-2.6.22-1-i686 added jbd fix from lkml diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 7a6d9de..20db954 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 11.74 SBU # Maintainer: VMiklos -_F_kernel_patches=(aacraid.diff pxa27x.diff) +_F_kernel_patches=(aacraid.diff pxa27x.diff jbd.diff) Finclude kernel diff --git a/source/base/kernel/jbd.diff b/source/base/kernel/jbd.diff new file mode 100644 index 0000000..11901c5 --- /dev/null +++ b/source/base/kernel/jbd.diff @@ -0,0 +1,18 @@ +We have to check that also the second checkpoint list is non-empty before +dropping the transaction. + +Signed-off-by: Jan Kara + +diff -rupX /home/jack/.kerndiffexclude linux-2.6.16-rc1/fs/jbd/commit.c linux-2.6.16-rc1-1-checkpoint-fix/fs/jbd/commit.c +--- linux-2.6.16-rc1/fs/jbd/commit.c 2006-01-15 00:20:12.000000000 +0100 ++++ linux-2.6.16-rc1-1-checkpoint-fix/fs/jbd/commit.c 2006-01-17 23:35:19.000000000 +0100 +@@ -829,7 +829,8 @@ restart_loop: + journal->j_committing_transaction = NULL; + spin_unlock(&journal->j_state_lock); + +- if (commit_transaction->t_checkpoint_list == NULL) { ++ if (commit_transaction->t_checkpoint_list == NULL && ++ commit_transaction->t_checkpoint_io_list == NULL) { + __journal_drop_transaction(journal, commit_transaction); + } else { + if (journal->j_checkpoint_transactions == NULL) { From vmiklos at frugalware.org Tue Jul 10 21:22:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:04 2007 Subject: [Frugalware-git] frugalware-current: madwifi-0.9.3.1-4-i686 Message-ID: <20070710192247.7837118681E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fdbaf746932c46cfa1254e3f989e2e4af555b04d commit fdbaf746932c46cfa1254e3f989e2e4af555b04d Author: VMiklos Date: Tue Jul 10 14:50:56 2007 +0200 madwifi-0.9.3.1-4-i686 added -kernel2622.diff diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index b3bf7a3..963948a 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" Finclude kernel-module @@ -13,7 +13,10 @@ makedepends=(${makedepends[@]} 'sharutils') groups=('network') archs=('i686' 'x86_64') Finclude sourceforge -source=($source madwifi-0.9.3-cflags.diff) +source=($source madwifi-0.9.3-cflags.diff madwifi-0.9.3.1-kernel2622.diff) +sha1sums=('690543c825b8b49186e4613a286b39114fff3c11' \ + '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \ + '68f582befc69053f5961f1fa6c88d5695b1b1b81') # If the package needs testing, feel free to poke Benjamin Woods @@ -27,7 +30,5 @@ build() BINDIR=/usr/bin MANDIR=/usr/man } -sha1sums=('690543c825b8b49186e4613a286b39114fff3c11'\ - '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35') # optimization OK diff --git a/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff b/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff new file mode 100644 index 0000000..2087c3e --- /dev/null +++ b/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff @@ -0,0 +1,3960 @@ +diff -Naur madwifi-0.9.3.1.orig/Makefile.inc madwifi-0.9.3.1/Makefile.inc +--- madwifi-0.9.3.1.orig/Makefile.inc 2007-01-18 09:26:23.000000000 +0100 ++++ madwifi-0.9.3.1/Makefile.inc 2007-07-10 14:45:07.000000000 +0200 +@@ -146,7 +146,7 @@ + # + TOOLS= $(TOP)/tools + +-COPTS+= -Werror ++#COPTS+= -Werror + INCS= -include $(TOP)/include/compat.h -I$(TOP)/include + + # TARGET defines the target platform architecture. It must match one of +diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c madwifi-0.9.3.1/net80211/ieee80211_input.c +--- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c 2007-05-23 10:43:05.000000000 +0200 ++++ madwifi-0.9.3.1/net80211/ieee80211_input.c 2007-07-10 14:45:21.000000000 +0200 +@@ -1048,11 +1048,12 @@ + * incoming fragments + * XXX 4-address/QoS frames? + */ +- else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + +- hdrlen) { ++ else if (skb_end_pointer(skb) - skb->head < ++ ni->ni_vap->iv_dev->mtu + hdrlen) { + ni->ni_rxfrag = skb_copy_expand(skb, 0, + (ni->ni_vap->iv_dev->mtu + hdrlen) - +- (skb->end - skb->head), GFP_ATOMIC); ++ (skb_end_pointer(skb) - skb->head), ++ GFP_ATOMIC); + dev_kfree_skb(skb); + } + } +@@ -1136,8 +1137,8 @@ + } + if (skb1 != NULL) { + skb1->dev = dev; +- skb1->mac.raw = skb1->data; +- skb1->nh.raw = skb1->data + sizeof(struct ether_header); ++ skb_reset_mac_header(skb1); ++ skb1->network_header = skb1->data + sizeof(struct ether_header); + skb1->protocol = __constant_htons(ETH_P_802_2); + /* XXX insert vlan tag before queue it? */ + dev_queue_xmit(skb1); +@@ -2259,7 +2260,7 @@ + if (skb1 == NULL) + return; + skb1->dev = dev; +- skb1->mac.raw = skb1->data; ++ skb_reset_mac_header(skb1); + skb1->ip_summed = CHECKSUM_NONE; + skb1->pkt_type = PACKET_OTHERHOST; + skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ +@@ -2534,7 +2535,7 @@ + + skb->dev = dev; + skb->protocol = eth_type_trans(skb, dev); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + ieee80211_deliver_data(ni, skb); + return; + } +@@ -3712,15 +3713,15 @@ + ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) + { + struct ethhdr *eth; +- +- skb->mac.raw=skb->data; ++ ++ skb_reset_mac_header(skb); + skb_pull(skb, ETH_HLEN); + /* + * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but + * since that's an inline and not a define there's + * no easy way to do this cleanly. + */ +- eth = (struct ethhdr *)skb->mac.raw; ++ eth = eth_hdr(skb); + + if (*eth->h_dest & 1) + if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) +diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c.orig madwifi-0.9.3.1/net80211/ieee80211_input.c.orig +--- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ madwifi-0.9.3.1/net80211/ieee80211_input.c.orig 2007-07-10 14:45:14.000000000 +0200 +@@ -0,0 +1,3856 @@ ++/*- ++ * Copyright (c) 2001 Atsushi Onoe ++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote products ++ * derived from this software without specific prior written permission. ++ * ++ * Alternatively, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2 as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * $Id: ieee80211_input.c 2366 2007-05-23 08:43:05Z mrenzmann $ ++ */ ++#ifndef EXPORT_SYMTAB ++#define EXPORT_SYMTAB ++#endif ++ ++/* ++ * IEEE 802.11 input handling. ++ */ ++#ifndef AUTOCONF_INCLUDED ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* wireless_send_event(..) */ ++#include /* SIOCGIWTHRSPY */ ++#include /* ARPHRD_ETHER */ ++ ++#include "if_llc.h" ++#include "if_ethersubr.h" ++#include "if_media.h" ++#include "if_athproto.h" ++ ++#include ++ ++#ifdef IEEE80211_DEBUG ++/* ++ * Decide if a received management frame should be ++ * printed when debugging is enabled. This filters some ++ * of the less interesting frames that come frequently ++ * (e.g. beacons). ++ */ ++static __inline int ++doprint(struct ieee80211vap *vap, int subtype) ++{ ++ switch (subtype) { ++ case IEEE80211_FC0_SUBTYPE_BEACON: ++ return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN); ++ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ++ return (vap->iv_opmode == IEEE80211_M_IBSS); ++ } ++ return 1; ++} ++ ++/* ++ * Emit a debug message about discarding a frame or information ++ * element. One format is for extracting the mac address from ++ * the frame header; the other is for when a header is not ++ * available or otherwise appropriate. ++ */ ++#define IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) do { \ ++ if ((_vap)->iv_debug & (_m)) \ ++ ieee80211_discard_frame(_vap, _wh, _type, _fmt, __VA_ARGS__);\ ++} while (0) ++#define IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) do { \ ++ if ((_vap)->iv_debug & (_m)) \ ++ ieee80211_discard_ie(_vap, _wh, _type, _fmt, __VA_ARGS__);\ ++} while (0) ++#define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) do { \ ++ if ((_vap)->iv_debug & (_m)) \ ++ ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\ ++} while (0) ++ ++static const u_int8_t *ieee80211_getbssid(struct ieee80211vap *, ++ const struct ieee80211_frame *); ++static void ieee80211_discard_frame(struct ieee80211vap *, ++ const struct ieee80211_frame *, const char *, const char *, ...); ++static void ieee80211_discard_ie(struct ieee80211vap *, ++ const struct ieee80211_frame *, const char *, const char *, ...); ++static void ieee80211_discard_mac(struct ieee80211vap *, ++ const u_int8_t mac[IEEE80211_ADDR_LEN], const char *, ++ const char *, ...); ++#else ++#define IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) ++#define IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) ++#define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) ++#endif /* IEEE80211_DEBUG */ ++ ++static struct sk_buff *ieee80211_defrag(struct ieee80211_node *, ++ struct sk_buff *, int); ++static void ieee80211_deliver_data(struct ieee80211_node *, struct sk_buff *); ++static struct sk_buff *ieee80211_decap(struct ieee80211vap *, ++ struct sk_buff *, int); ++static void ieee80211_send_error(struct ieee80211_node *, const u_int8_t *, ++ int, int); ++static void ieee80211_recv_pspoll(struct ieee80211_node *, struct sk_buff *); ++static int accept_data_frame(struct ieee80211vap *, struct ieee80211_node *, ++ struct ieee80211_key *, struct sk_buff *, struct ether_header *); ++ ++ ++#ifdef ATH_SUPERG_FF ++static void athff_decap(struct sk_buff *); ++#endif ++#ifdef USE_HEADERLEN_RESV ++static __be16 ath_eth_type_trans(struct sk_buff *, struct net_device *); ++#endif ++ ++/* Enhanced iwspy support */ ++#if WIRELESS_EXT >= 16 ++ ++#ifndef IW_QUAL_QUAL_UPDATED ++#define IW_QUAL_QUAL_UPDATED 0x01 ++#define IW_QUAL_LEVEL_UPDATED 0x02 ++#define IW_QUAL_NOISE_UPDATED 0x04 ++#endif /* IW_QUAL_QUAL_UPDATED */ ++ ++/** ++ * This function is a clone of set_quality(..) in ieee80211_wireless.c ++ */ ++static void ++set_quality(struct iw_quality *iq, u_int rssi, int noise) ++{ ++ iq->qual = rssi; ++ ++ iq->noise = noise; ++ iq->level = iq->noise + iq->qual; ++ iq->updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | ++ IW_QUAL_NOISE_UPDATED; ++} ++ ++/** ++ * Given a node and the rssi value of a just received frame from the node, this ++ * function checks if to raise an iwspy event because we iwspy the node and rssi ++ * exceeds threshold (if active). ++ * ++ * @param vap: vap ++ * @param ni: sender node ++ * @param rssi: rssi value of received frame ++ */ ++static void ++iwspy_event(struct ieee80211vap *vap, struct ieee80211_node *ni, u_int rssi) ++{ ++ if (vap->iv_spy.thr_low && vap->iv_spy.num && ni && (rssi < ++ vap->iv_spy.thr_low || rssi > vap->iv_spy.thr_high)) { ++ int i; ++ for (i = 0; i < vap->iv_spy.num; i++) { ++ if (IEEE80211_ADDR_EQ(ni->ni_macaddr, ++ &(vap->iv_spy.mac[i * IEEE80211_ADDR_LEN]))) { ++ ++ union iwreq_data wrq; ++ struct iw_thrspy thr; ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DEBUG, ++ "%s: we spy %s, threshold is active " ++ "and rssi exceeds it -> raise an iwspy" ++ " event\n", __func__, ether_sprintf( ++ ni->ni_macaddr)); ++ memset(&wrq, 0, sizeof(wrq)); ++ wrq.data.length = 1; ++ memset(&thr, 0, sizeof(struct iw_thrspy)); ++ memcpy(thr.addr.sa_data, ni->ni_macaddr, ++ IEEE80211_ADDR_LEN); ++ thr.addr.sa_family = ARPHRD_ETHER; ++ set_quality(&thr.qual, rssi, vap->iv_ic->ic_channoise); ++ set_quality(&thr.low, vap->iv_spy.thr_low, vap->iv_ic->ic_channoise); ++ set_quality(&thr.high, vap->iv_spy.thr_high, vap->iv_ic->ic_channoise); ++ wireless_send_event(vap->iv_dev, ++ SIOCGIWTHRSPY, &wrq, (char*) &thr); ++ break; ++ } ++ } ++ } ++} ++ ++#else ++#define iwspy_event(_vap, _ni, _rssi) ++#endif /* WIRELESS_EXT >= 16 */ ++ ++/* ++ * Process a received frame. The node associated with the sender ++ * should be supplied. If nothing was found in the node table then ++ * the caller is assumed to supply a reference to ic_bss instead. ++ * The RSSI and a timestamp are also supplied. The RSSI data is used ++ * during AP scanning to select a AP to associate with; it can have ++ * any units so long as values have consistent units and higher values ++ * mean ``better signal''. The receive timestamp is currently not used ++ * by the 802.11 layer. ++ * ++ * Context: softIRQ (tasklet) ++ */ ++int ++ieee80211_input(struct ieee80211_node *ni, ++ struct sk_buff *skb, int rssi, u_int32_t rstamp) ++{ ++#define HAS_SEQ(type) ((type & 0x4) == 0) ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = vap->iv_ic; ++ struct net_device *dev = vap->iv_dev; ++ struct ieee80211_frame *wh; ++ struct ieee80211_key *key; ++ struct ether_header *eh; ++#ifdef ATH_SUPERG_FF ++ struct llc *llc; ++#endif ++ int hdrspace; ++ u_int8_t dir, type, subtype; ++ u_int8_t *bssid; ++ u_int16_t rxseq; ++ ++ KASSERT(ni != NULL, ("null node")); ++ ni->ni_inact = ni->ni_inact_reload; ++ ++ KASSERT(skb->len >= sizeof(struct ieee80211_frame_min), ++ ("frame length too short: %u", skb->len)); ++ ++ /* XXX adjust device in sk_buff? */ ++ ++ type = -1; /* undefined */ ++ /* ++ * In monitor mode, send everything directly to bpf. ++ * Also do not process frames w/o i_addr2 any further. ++ * XXX may want to include the CRC ++ */ ++ if (vap->iv_opmode == IEEE80211_M_MONITOR) ++ goto out; ++ ++ if (skb->len < sizeof(struct ieee80211_frame_min)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, ++ ni->ni_macaddr, NULL, ++ "too short (1): len %u", skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ /* ++ * Bit of a cheat here, we use a pointer for a 3-address ++ * frame format but don't reference fields past outside ++ * ieee80211_frame_min w/o first validating the data is ++ * present. ++ */ ++ wh = (struct ieee80211_frame *)skb->data; ++ ++ if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != ++ IEEE80211_FC0_VERSION_0) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, ++ ni->ni_macaddr, NULL, "wrong version %x", wh->i_fc[0]); ++ vap->iv_stats.is_rx_badversion++; ++ goto err; ++ } ++ ++ dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; ++ type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; ++ subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; ++ if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ bssid = wh->i_addr2; ++ if (!IEEE80211_ADDR_EQ(bssid, ni->ni_bssid)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ iwspy_event(vap, ni, rssi); ++ break; ++ case IEEE80211_M_IBSS: ++ case IEEE80211_M_AHDEMO: ++ if (dir != IEEE80211_FC1_DIR_NODS) ++ bssid = wh->i_addr1; ++ else if (type == IEEE80211_FC0_TYPE_CTL) ++ bssid = wh->i_addr1; ++ else { ++ if (skb->len < sizeof(struct ieee80211_frame)) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_ANY, ni->ni_macaddr, ++ NULL, "too short (2): len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ bssid = wh->i_addr3; ++ } ++ /* Do not try to find a node reference if the packet really did come from the BSS */ ++ if (type == IEEE80211_FC0_TYPE_DATA && ni == vap->iv_bss && ++ !IEEE80211_ADDR_EQ(vap->iv_bss->ni_macaddr, wh->i_addr2)) { ++ /* Try to find sender in local node table. */ ++ ni = ieee80211_find_node(vap->iv_bss->ni_table, wh->i_addr2); ++ if (ni == NULL) { ++ /* ++ * Fake up a node for this newly discovered ++ * member of the IBSS. This should probably ++ * done after an ACL check. ++ */ ++ ni = ieee80211_fakeup_adhoc_node(vap, ++ wh->i_addr2); ++ if (ni == NULL) { ++ /* NB: stat kept for alloc failure */ ++ goto err; ++ } ++ } ++ } ++ iwspy_event(vap, ni, rssi); ++ break; ++ case IEEE80211_M_HOSTAP: ++ if (dir != IEEE80211_FC1_DIR_NODS) ++ bssid = wh->i_addr1; ++ else if (type == IEEE80211_FC0_TYPE_CTL) ++ bssid = wh->i_addr1; ++ else { ++ if (skb->len < sizeof(struct ieee80211_frame)) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_ANY, ni->ni_macaddr, ++ NULL, "too short (2): len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ bssid = wh->i_addr3; ++ } ++ /* ++ * Validate the bssid. ++ */ ++#ifdef ATH_SUPERG_XR ++ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && ++ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { ++ /* ++ * allow MGT frames to vap->iv_xrvap. ++ * this will allow roaming between XR and normal vaps ++ * without station dis associating from previous vap. ++ */ ++ if (!(vap->iv_xrvap && ++ IEEE80211_ADDR_EQ(bssid, vap->iv_xrvap->iv_bss->ni_bssid) && ++ type == IEEE80211_FC0_TYPE_MGT && ++ ni != vap->iv_bss)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss or xrbss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ } ++#else ++ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && ++ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ ++#endif ++ break; ++ case IEEE80211_M_WDS: ++ if (skb->len < sizeof(struct ieee80211_frame_addr4)) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_ANY, ni->ni_macaddr, ++ NULL, "too short (3): len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++ bssid = wh->i_addr1; ++ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && ++ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, NULL, "%s", "not to bss"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ if (!IEEE80211_ADDR_EQ(wh->i_addr2, vap->wds_mac)) { ++ /* not interested in */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ wh->i_addr2, NULL, "%s", "not from DS"); ++ vap->iv_stats.is_rx_wrongbss++; ++ goto out; ++ } ++ break; ++ default: ++ /* XXX catch bad values */ ++ goto out; ++ } ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ if (HAS_SEQ(type)) { ++ u_int8_t tid; ++ if (IEEE80211_QOS_HAS_SEQ(wh)) { ++ tid = ((struct ieee80211_qosframe *)wh)-> ++ i_qos[0] & IEEE80211_QOS_TID; ++ if (TID_TO_WME_AC(tid) >= WME_AC_VI) ++ ic->ic_wme.wme_hipri_traffic++; ++ tid++; ++ } else ++ tid = 0; ++ rxseq = le16toh(*(__le16 *)wh->i_seq); ++ if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) && ++ IEEE80211_SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) { ++ /* duplicate, discard */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ bssid, "duplicate", ++ "seqno <%u,%u> fragno <%u,%u> tid %u", ++ rxseq >> IEEE80211_SEQ_SEQ_SHIFT, ++ ni->ni_rxseqs[tid] >> ++ IEEE80211_SEQ_SEQ_SHIFT, ++ rxseq & IEEE80211_SEQ_FRAG_MASK, ++ ni->ni_rxseqs[tid] & ++ IEEE80211_SEQ_FRAG_MASK, ++ tid); ++ vap->iv_stats.is_rx_dup++; ++ IEEE80211_NODE_STAT(ni, rx_dup); ++ goto out; ++ } ++ ni->ni_rxseqs[tid] = rxseq; ++ } ++ } ++ ++ switch (type) { ++ case IEEE80211_FC0_TYPE_DATA: ++ hdrspace = ieee80211_hdrspace(ic, wh); ++ if (skb->len < hdrspace) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "too short: len %u, expecting %u", ++ skb->len, hdrspace); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; /* XXX */ ++ } ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ if ((dir != IEEE80211_FC1_DIR_FROMDS) && ++ (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) && ++ (dir == IEEE80211_FC1_DIR_DSTODS)))) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ if ((dev->flags & IFF_MULTICAST) && ++ IEEE80211_IS_MULTICAST(wh->i_addr1)) { ++ if (IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_myaddr)) { ++ /* ++ * In IEEE802.11 network, multicast packet ++ * sent from me is broadcasted from AP. ++ * It should be silently discarded for ++ * SIMPLEX interface. ++ * ++ * NB: Linux has no IFF_ flag to indicate ++ * if an interface is SIMPLEX or not; ++ * so we always assume it to be true. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, NULL, "%s", "multicast echo"); ++ vap->iv_stats.is_rx_mcastecho++; ++ goto out; ++ } ++ /* ++ * if it is brodcasted by me on behalf of ++ * a station behind me, drop it. ++ */ ++ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) { ++ struct ieee80211_node_table *nt; ++ struct ieee80211_node *ni_wds; ++ nt = &ic->ic_sta; ++ ni_wds = ieee80211_find_wds_node(nt, wh->i_addr3); ++ if (ni_wds) { ++ ieee80211_free_node(ni_wds); /* Decr ref count */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, NULL, "%s", ++ "multicast echo originated from node behind me"); ++ vap->iv_stats.is_rx_mcastecho++; ++ goto out; ++ } ++ } ++ } ++ break; ++ case IEEE80211_M_IBSS: ++ case IEEE80211_M_AHDEMO: ++ if (dir != IEEE80211_FC1_DIR_NODS) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ /* XXX no power-save support */ ++ break; ++ case IEEE80211_M_HOSTAP: ++ if ((dir != IEEE80211_FC1_DIR_TODS) && ++ (dir != IEEE80211_FC1_DIR_DSTODS)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ /* check if source STA is associated */ ++ if (ni == vap->iv_bss) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "data", "%s", "unknown src"); ++ /* NB: caller deals with reference */ ++ if (vap->iv_state == IEEE80211_S_RUN) ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_NOT_AUTHED); ++ vap->iv_stats.is_rx_notassoc++; ++ goto err; ++ } ++ if (ni->ni_associd == 0) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "data", "%s", "unassoc src"); ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_DISASSOC, ++ IEEE80211_REASON_NOT_ASSOCED); ++ vap->iv_stats.is_rx_notassoc++; ++ goto err; ++ } ++ /* ++ * If we're a 4 address packet, make sure we have an entry in ++ * the node table for the packet source address (addr4). ++ * If not, add one. ++ */ ++ if (dir == IEEE80211_FC1_DIR_DSTODS) { ++ struct ieee80211_node_table *nt; ++ struct ieee80211_frame_addr4 *wh4; ++ struct ieee80211_node *ni_wds; ++ if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "data", "%s", "4 addr not allowed"); ++ goto err; ++ } ++ wh4 = (struct ieee80211_frame_addr4 *)skb->data; ++ nt = &ic->ic_sta; ++ ni_wds = ieee80211_find_wds_node(nt, wh4->i_addr4); ++ /* Last call increments ref count if !NULL */ ++ if ((ni_wds != NULL) && (ni_wds != ni)) { ++ /* ++ * node with source address (addr4) moved ++ * to another WDS capable station. remove the ++ * reference to the previous station and add ++ * reference to the new one ++ */ ++ (void) ieee80211_remove_wds_addr(nt, wh4->i_addr4); ++ ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0); ++ } ++ if (ni_wds == NULL) ++ ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0); ++ else ++ ieee80211_free_node(ni_wds); /* Decr ref count */ ++ } ++ ++ /* ++ * Check for power save state change. ++ */ ++ if (!(ni->ni_flags & IEEE80211_NODE_UAPSD)) { ++ if ((wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) ^ ++ (ni->ni_flags & IEEE80211_NODE_PWR_MGT)) ++ ieee80211_node_pwrsave(ni, wh->i_fc[1] & IEEE80211_FC1_PWR_MGT); ++ } else if (ni->ni_flags & IEEE80211_NODE_PS_CHANGED) { ++ int pwr_save_changed = 0; ++ IEEE80211_LOCK_IRQ(ic); ++ if ((*(__le16 *)(&wh->i_seq[0])) == ni->ni_pschangeseq) { ++ ni->ni_flags &= ~IEEE80211_NODE_PS_CHANGED; ++ pwr_save_changed = 1; ++ } ++ IEEE80211_UNLOCK_IRQ(ic); ++ if (pwr_save_changed) ++ ieee80211_node_pwrsave(ni, wh->i_fc[1] & IEEE80211_FC1_PWR_MGT); ++ } ++ break; ++ case IEEE80211_M_WDS: ++ if (dir != IEEE80211_FC1_DIR_DSTODS) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "data", "invalid dir 0x%x", dir); ++ vap->iv_stats.is_rx_wrongdir++; ++ goto out; ++ } ++ break; ++ default: ++ /* XXX here to keep compiler happy */ ++ goto out; ++ } ++ ++ /* ++ * Handle privacy requirements. Note that we ++ * must not be preempted from here until after ++ * we (potentially) call ieee80211_crypto_demic; ++ * otherwise we may violate assumptions in the ++ * crypto cipher modules used to do delayed update ++ * of replay sequence numbers. ++ */ ++ if (wh->i_fc[1] & IEEE80211_FC1_PROT) { ++ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { ++ /* ++ * Discard encrypted frames when privacy is off. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "WEP", "%s", "PRIVACY off"); ++ vap->iv_stats.is_rx_noprivacy++; ++ IEEE80211_NODE_STAT(ni, rx_noprivacy); ++ goto out; ++ } ++ key = ieee80211_crypto_decap(ni, skb, hdrspace); ++ if (key == NULL) { ++ /* NB: stats+msgs handled in crypto_decap */ ++ IEEE80211_NODE_STAT(ni, rx_wepfail); ++ goto out; ++ } ++ wh = (struct ieee80211_frame *)skb->data; ++ wh->i_fc[1] &= ~IEEE80211_FC1_PROT; ++ } else ++ key = NULL; ++ ++ /* ++ * Next up, any fragmentation. ++ */ ++ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { ++ skb = ieee80211_defrag(ni, skb, hdrspace); ++ if (skb == NULL) { ++ /* Fragment dropped or frame not complete yet */ ++ goto out; ++ } ++ } ++ wh = NULL; /* no longer valid, catch any uses */ ++ ++ /* ++ * Next strip any MSDU crypto bits. ++ */ ++ if (key != NULL && ++ !ieee80211_crypto_demic(vap, key, skb, hdrspace)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "demic error"); ++ IEEE80211_NODE_STAT(ni, rx_demicfail); ++ goto out; ++ } ++ ++ /* ++ * Finally, strip the 802.11 header. ++ */ ++ skb = ieee80211_decap(vap, skb, hdrspace); ++ if (skb == NULL) { ++ /* don't count Null data frames as errors */ ++ if (subtype == IEEE80211_FC0_SUBTYPE_NODATA) ++ goto out; ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "decap error"); ++ vap->iv_stats.is_rx_decap++; ++ IEEE80211_NODE_STAT(ni, rx_decap); ++ goto err; ++ } ++ eh = (struct ether_header *) skb->data; ++ ++ if (! accept_data_frame(vap, ni, key, skb, eh)) ++ goto out; ++ ++ vap->iv_devstats.rx_packets++; ++ vap->iv_devstats.rx_bytes += skb->len; ++ IEEE80211_NODE_STAT(ni, rx_data); ++ IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len); ++ ic->ic_lastdata = jiffies; ++ ++#ifdef ATH_SUPERG_FF ++ /* check for FF */ ++ llc = (struct llc *) (skb->data + sizeof(struct ether_header)); ++ if (ntohs(llc->llc_snap.ether_type) == (u_int16_t)ATH_ETH_TYPE) { ++ struct sk_buff *skb1 = NULL; ++ struct ether_header *eh_tmp; ++ struct athl2p_tunnel_hdr *ath_hdr; ++ int frame_len; ++ ++ /* NB: assumes linear (i.e., non-fragmented) skb */ ++ ++ /* check length > header */ ++ if (skb->len < sizeof(struct ether_header) + LLC_SNAPFRAMELEN ++ + roundup(sizeof(struct athl2p_tunnel_hdr) - 2, 4) + 2) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "decap error"); ++ vap->iv_stats.is_rx_decap++; ++ IEEE80211_NODE_STAT(ni, rx_decap); ++ goto err; ++ } ++ ++ /* get to the tunneled headers */ ++ ath_hdr = (struct athl2p_tunnel_hdr *) ++ skb_pull(skb, sizeof(struct ether_header) + LLC_SNAPFRAMELEN); ++ eh_tmp = (struct ether_header *) ++ skb_pull(skb, roundup(sizeof(struct athl2p_tunnel_hdr) - 2, 4) + 2); ++ /* sanity check for malformed 802.3 length */ ++ frame_len = ntohs(eh_tmp->ether_type); ++ if (skb->len < roundup(sizeof(struct ether_header) + frame_len, 4)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ ni->ni_macaddr, "data", "%s", "decap error"); ++ vap->iv_stats.is_rx_decap++; ++ IEEE80211_NODE_STAT(ni, rx_decap); ++ goto err; ++ } ++ ++ /* only implementing FF now. drop all others. */ ++ if (ath_hdr->proto != ATH_L2TUNNEL_PROTO_FF) { ++ IEEE80211_DISCARD_MAC(vap, ++ IEEE80211_MSG_SUPG | IEEE80211_MSG_INPUT, ++ eh->ether_shost, "fast-frame", ++ "bad atheros tunnel prot %u", ++ ath_hdr->proto); ++ vap->iv_stats.is_rx_badathtnl++; ++ goto err; ++ } ++ vap->iv_stats.is_rx_ffcnt++; ++ ++ skb1 = skb_clone(skb, GFP_ATOMIC); /* XXX: GFP_ATOMIC is overkill? */ ++ ++ /* we now have 802.3 MAC hdr followed by 802.2 LLC/SNAP. convert to DIX */ ++ athff_decap(skb); ++ ++ /* remove second frame from end of first */ ++ skb_trim(skb, sizeof(struct ether_header) + frame_len - LLC_SNAPFRAMELEN); ++ ++ /* prepare second tunneled frame */ ++ skb_pull(skb1, roundup(sizeof(struct ether_header) + frame_len, 4)); ++ athff_decap(skb1); ++ ++ /* deliver the frames */ ++ ieee80211_deliver_data(ni, skb); ++ ieee80211_deliver_data(ni, skb1); ++ } else { ++ /* assume non-atheros llc type */ ++ ieee80211_deliver_data(ni, skb); ++ } ++#else /* !ATH_SUPERG_FF */ ++ ieee80211_deliver_data(ni, skb); ++#endif ++ return IEEE80211_FC0_TYPE_DATA; ++ ++ case IEEE80211_FC0_TYPE_MGT: ++ /* ++ * WDS opmode do not support management frames ++ */ ++ if (vap->iv_opmode == IEEE80211_M_WDS) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ goto out; ++ } ++ IEEE80211_NODE_STAT(ni, rx_mgmt); ++ if (dir != IEEE80211_FC1_DIR_NODS) { ++ vap->iv_stats.is_rx_wrongdir++; ++ goto err; ++ } ++ if (skb->len < sizeof(struct ieee80211_frame)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, ++ ni->ni_macaddr, "mgt", "too short: len %u", ++ skb->len); ++ vap->iv_stats.is_rx_tooshort++; ++ goto out; ++ } ++#ifdef IEEE80211_DEBUG ++ if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) || ++ ieee80211_msg_dumppkts(vap)) { ++ ieee80211_note(vap, "received %s from %s rssi %d\n", ++ ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ ether_sprintf(wh->i_addr2), rssi); ++ } ++#endif ++ if (wh->i_fc[1] & IEEE80211_FC1_PROT) { ++ if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) { ++ /* ++ * Only shared key auth frames with a challenge ++ * should be encrypted, discard all others. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "WEP set but not permitted"); ++ vap->iv_stats.is_rx_mgtdiscard++; /* XXX */ ++ goto out; ++ } ++ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { ++ /* ++ * Discard encrypted frames when privacy is off. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, "mgt", "%s", "WEP set but PRIVACY off"); ++ vap->iv_stats.is_rx_noprivacy++; ++ goto out; ++ } ++ hdrspace = ieee80211_hdrspace(ic, wh); ++ key = ieee80211_crypto_decap(ni, skb, hdrspace); ++ if (key == NULL) { ++ /* NB: stats+msgs handled in crypto_decap */ ++ goto out; ++ } ++ wh = (struct ieee80211_frame *)skb->data; ++ wh->i_fc[1] &= ~IEEE80211_FC1_PROT; ++ } ++ ic->ic_recv_mgmt(ni, skb, subtype, rssi, rstamp); ++ goto out; ++ ++ case IEEE80211_FC0_TYPE_CTL: ++ IEEE80211_NODE_STAT(ni, rx_ctrl); ++ vap->iv_stats.is_rx_ctl++; ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) ++ if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) ++ ieee80211_recv_pspoll(ni, skb); ++ goto out; ++ ++ default: ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, NULL, "bad frame type 0x%x", type); ++ /* should not come here */ ++ break; ++ } ++err: ++ vap->iv_devstats.rx_errors++; ++out: ++ if (skb != NULL) ++ dev_kfree_skb(skb); ++ return type; ++#undef HAS_SEQ ++} ++EXPORT_SYMBOL(ieee80211_input); ++ ++ ++/* ++ * Determines whether a frame should be accepted, based on information ++ * about the frame's origin and encryption, and policy for this vap. ++ */ ++static int accept_data_frame(struct ieee80211vap *vap, ++ struct ieee80211_node *ni, struct ieee80211_key *key, ++ struct sk_buff *skb, struct ether_header *eh) ++{ ++#define IS_EAPOL(eh) ((eh)->ether_type == __constant_htons(ETHERTYPE_PAE)) ++#define PAIRWISE_SET(vap) ((vap)->iv_nw_keys[0].wk_cipher != &ieee80211_cipher_none) ++ if (IS_EAPOL(eh)) { ++ /* encrypted eapol is always OK */ ++ if (key) ++ return 1; ++ /* cleartext eapol is OK if we don't have pairwise keys yet */ ++ if (! PAIRWISE_SET(vap)) ++ return 1; ++ /* cleartext eapol is OK if configured to allow it */ ++ if (! IEEE80211_VAP_DROPUNENC_EAPOL(vap)) ++ return 1; ++ /* cleartext eapol is OK if other unencrypted is OK */ ++ if (! (vap->iv_flags & IEEE80211_F_DROPUNENC)) ++ return 1; ++ /* not OK */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ eh->ether_shost, "data", ++ "unauthorized port: ether type 0x%x len %u", ++ ntohs(eh->ether_type), skb->len); ++ vap->iv_stats.is_rx_unauth++; ++ vap->iv_devstats.rx_errors++; ++ IEEE80211_NODE_STAT(ni, rx_unauth); ++ return 0; ++ } ++ ++ if (!ieee80211_node_is_authorized(ni)) { ++ /* ++ * Deny any non-PAE frames received prior to ++ * authorization. For open/shared-key ++ * authentication the port is mark authorized ++ * after authentication completes. For 802.1x ++ * the port is not marked authorized by the ++ * authenticator until the handshake has completed. ++ */ ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ++ eh->ether_shost, "data", ++ "unauthorized port: ether type 0x%x len %u", ++ ntohs(eh->ether_type), skb->len); ++ vap->iv_stats.is_rx_unauth++; ++ vap->iv_devstats.rx_errors++; ++ IEEE80211_NODE_STAT(ni, rx_unauth); ++ return 0; ++ } else { ++ /* ++ * When denying unencrypted frames, discard ++ * any non-PAE frames received without encryption. ++ */ ++ if ((vap->iv_flags & IEEE80211_F_DROPUNENC) && key == NULL) { ++ IEEE80211_NODE_STAT(ni, rx_unencrypted); ++ return 0; ++ } ++ } ++ return 1; ++ ++#undef IS_EAPOL ++#undef PAIRWISE_SET ++} ++ ++ ++/* ++ * Context: softIRQ (tasklet) ++ */ ++int ++ieee80211_input_all(struct ieee80211com *ic, ++ struct sk_buff *skb, int rssi, u_int32_t rstamp) ++{ ++ struct ieee80211vap *vap; ++ int type = -1; ++ ++ /* XXX locking */ ++ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { ++ struct ieee80211_node *ni; ++ struct sk_buff *skb1; ++ ++ if (TAILQ_NEXT(vap, iv_next) != NULL) { ++ skb1 = skb_copy(skb, GFP_ATOMIC); ++ if (skb1 == NULL) { ++ /* XXX stat+msg */ ++ continue; ++ } ++ } else { ++ skb1 = skb; ++ skb = NULL; ++ } ++ ni = ieee80211_ref_node(vap->iv_bss); ++ type = ieee80211_input(ni, skb1, rssi, rstamp); ++ ieee80211_free_node(ni); ++ } ++ if (skb != NULL) /* no vaps, reclaim skb */ ++ dev_kfree_skb(skb); ++ return type; ++} ++EXPORT_SYMBOL(ieee80211_input_all); ++ ++/* ++ * This function reassemble fragments using the skb of the 1st fragment, ++ * if large enough. If not, a new skb is allocated to hold incoming ++ * fragments. ++ * ++ * Fragments are copied at the end of the previous fragment. A different ++ * strategy could have been used, where a non-linear skb is allocated and ++ * fragments attached to that skb. ++ */ ++static struct sk_buff * ++ieee80211_defrag(struct ieee80211_node *ni, struct sk_buff *skb, int hdrlen) ++{ ++ struct ieee80211_frame *wh = (struct ieee80211_frame *) skb->data; ++ u_int16_t rxseq, last_rxseq; ++ u_int8_t fragno, last_fragno; ++ u_int8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG; ++ ++ rxseq = le16_to_cpu(*(__le16 *)wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; ++ fragno = le16_to_cpu(*(__le16 *)wh->i_seq) & IEEE80211_SEQ_FRAG_MASK; ++ ++ /* Quick way out, if there's nothing to defragment */ ++ if (!more_frag && fragno == 0 && ni->ni_rxfrag == NULL) ++ return skb; ++ ++ /* ++ * Remove frag to ensure it doesn't get reaped by timer. ++ */ ++ if (ni->ni_table == NULL) { ++ /* ++ * Should never happen. If the node is orphaned (not in ++ * the table) then input packets should not reach here. ++ * Otherwise, a concurrent request that yanks the table ++ * should be blocked by other interlocking and/or by first ++ * shutting the driver down. Regardless, be defensive ++ * here and just bail ++ */ ++ /* XXX need msg+stat */ ++ dev_kfree_skb(skb); ++ return NULL; ++ } ++ ++ /* ++ * Use this lock to make sure ni->ni_rxfrag is ++ * not freed by the timer process while we use it. ++ * XXX bogus ++ */ ++ IEEE80211_NODE_LOCK_IRQ(ni->ni_table); ++ ++ /* ++ * Update the time stamp. As a side effect, it ++ * also makes sure that the timer will not change ++ * ni->ni_rxfrag for at least 1 second, or in ++ * other words, for the remaining of this function. ++ */ ++ ni->ni_rxfragstamp = jiffies; ++ ++ IEEE80211_NODE_UNLOCK_IRQ(ni->ni_table); ++ ++ /* ++ * Validate that fragment is in order and ++ * related to the previous ones. ++ */ ++ if (ni->ni_rxfrag) { ++ struct ieee80211_frame *lwh; ++ ++ lwh = (struct ieee80211_frame *) ni->ni_rxfrag->data; ++ last_rxseq = le16_to_cpu(*(__le16 *)lwh->i_seq) >> ++ IEEE80211_SEQ_SEQ_SHIFT; ++ last_fragno = le16_to_cpu(*(__le16 *)lwh->i_seq) & ++ IEEE80211_SEQ_FRAG_MASK; ++ if (rxseq != last_rxseq ++ || fragno != last_fragno + 1 ++ || (!IEEE80211_ADDR_EQ(wh->i_addr1, lwh->i_addr1)) ++ || (!IEEE80211_ADDR_EQ(wh->i_addr2, lwh->i_addr2)) ++ || (ni->ni_rxfrag->end - ni->ni_rxfrag->tail < ++ skb->len)) { ++ /* ++ * Unrelated fragment or no space for it, ++ * clear current fragments ++ */ ++ dev_kfree_skb(ni->ni_rxfrag); ++ ni->ni_rxfrag = NULL; ++ } ++ } ++ ++ /* If this is the first fragment */ ++ if (ni->ni_rxfrag == NULL && fragno == 0) { ++ ni->ni_rxfrag = skb; ++ /* If more frags are coming */ ++ if (more_frag) { ++ if (skb_is_nonlinear(skb)) { ++ /* ++ * We need a continous buffer to ++ * assemble fragments ++ */ ++ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); ++ dev_kfree_skb(skb); ++ } ++ /* ++ * Check that we have enough space to hold ++ * incoming fragments ++ * XXX 4-address/QoS frames? ++ */ ++ else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + ++ hdrlen) { ++ ni->ni_rxfrag = skb_copy_expand(skb, 0, ++ (ni->ni_vap->iv_dev->mtu + hdrlen) - ++ (skb->end - skb->head), GFP_ATOMIC); ++ dev_kfree_skb(skb); ++ } ++ } ++ } else { ++ if (ni->ni_rxfrag) { ++ struct ieee80211_frame *lwh = (struct ieee80211_frame *) ++ ni->ni_rxfrag->data; ++ ++ /* ++ * We know we have enough space to copy, ++ * we've verified that before ++ */ ++ /* Copy current fragment at end of previous one */ ++ memcpy(ni->ni_rxfrag->tail, ++ skb->data + hdrlen, skb->len - hdrlen); ++ /* Update tail and length */ ++ skb_put(ni->ni_rxfrag, skb->len - hdrlen); ++ /* Keep a copy of last sequence and fragno */ ++ *(__le16 *) lwh->i_seq = *(__le16 *) wh->i_seq; ++ } ++ /* we're done with the fragment */ ++ dev_kfree_skb(skb); ++ } ++ ++ if (more_frag) { ++ /* More to come */ ++ skb = NULL; ++ } else { ++ /* Last fragment received, we're done! */ ++ skb = ni->ni_rxfrag; ++ ni->ni_rxfrag = NULL; ++ } ++ return skb; ++} ++ ++static void ++ieee80211_deliver_data(struct ieee80211_node *ni, struct sk_buff *skb) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct net_device *dev = vap->iv_dev; ++ struct ether_header *eh = (struct ether_header *) skb->data; ++ ++#ifdef ATH_SUPERG_XR ++ /* ++ * if it is a XR vap, send the data to associated normal net ++ * device. XR vap has a net device which is not registered with ++ * OS. ++ */ ++ if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR) ++ dev = vap->iv_xrvap->iv_dev; ++#endif ++ ++ /* perform as a bridge within the vap */ ++ /* XXX intra-vap bridging only */ ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP && ++ (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) { ++ struct sk_buff *skb1 = NULL; ++ ++ if (ETHER_IS_MULTICAST(eh->ether_dhost)) ++ skb1 = skb_copy(skb, GFP_ATOMIC); ++ else { ++ /* ++ * Check if destination is associated with the ++ * same vap and authorized to receive traffic. ++ * Beware of traffic destined for the vap itself; ++ * sending it will not work; just let it be ++ * delivered normally. ++ */ ++ struct ieee80211_node *ni1 = ieee80211_find_node( ++ &vap->iv_ic->ic_sta, eh->ether_dhost); ++ if (ni1 != NULL) { ++ if (ni1->ni_vap == vap && ++ ieee80211_node_is_authorized(ni1) && ++ ni1 != vap->iv_bss) { ++ skb1 = skb; ++ skb = NULL; ++ } ++ /* XXX statistic? */ ++ ieee80211_free_node(ni1); ++ } ++ } ++ if (skb1 != NULL) { ++ skb1->dev = dev; ++ skb_reset_mac_header(skb1); ++ skb1->network_header = skb1->data + sizeof(struct ether_header); ++ skb1->protocol = __constant_htons(ETH_P_802_2); ++ /* XXX insert vlan tag before queue it? */ ++ dev_queue_xmit(skb1); ++ } ++ } ++ ++ if (skb != NULL) { ++ skb->dev = dev; ++ ++#ifdef USE_HEADERLEN_RESV ++ skb->protocol = ath_eth_type_trans(skb, dev); ++#else ++ skb->protocol = eth_type_trans(skb, dev); ++#endif ++ if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) { ++ /* attach vlan tag */ ++ vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan); ++ } else ++ netif_rx(skb); ++ dev->last_rx = jiffies; ++ } ++} ++ ++static struct sk_buff * ++ieee80211_decap(struct ieee80211vap *vap, struct sk_buff *skb, int hdrlen) ++{ ++ struct ieee80211_qosframe_addr4 wh; /* Max size address frames */ ++ struct ether_header *eh; ++ struct llc *llc; ++ __be16 ether_type = 0; ++ ++ memcpy(&wh, skb->data, hdrlen); /* Only copy hdrlen over */ ++ llc = (struct llc *) skb_pull(skb, hdrlen); ++ if (skb->len >= LLC_SNAPFRAMELEN && ++ llc->llc_dsap == LLC_SNAP_LSAP && llc->llc_ssap == LLC_SNAP_LSAP && ++ llc->llc_control == LLC_UI && llc->llc_snap.org_code[0] == 0 && ++ llc->llc_snap.org_code[1] == 0 && llc->llc_snap.org_code[2] == 0) { ++ ether_type = llc->llc_un.type_snap.ether_type; ++ skb_pull(skb, LLC_SNAPFRAMELEN); ++ llc = NULL; ++ } ++ eh = (struct ether_header *) skb_push(skb, sizeof(struct ether_header)); ++ switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) { ++ case IEEE80211_FC1_DIR_NODS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2); ++ break; ++ case IEEE80211_FC1_DIR_TODS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2); ++ break; ++ case IEEE80211_FC1_DIR_FROMDS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr3); ++ break; ++ case IEEE80211_FC1_DIR_DSTODS: ++ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3); ++ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr4); ++ break; ++ } ++ if (!ALIGNED_POINTER(skb->data + sizeof(*eh), u_int32_t)) { ++ struct sk_buff *n; ++ ++ /* XXX does this always work? */ ++ n = skb_copy(skb, GFP_ATOMIC); ++ dev_kfree_skb(skb); ++ if (n == NULL) ++ return NULL; ++ skb = n; ++ eh = (struct ether_header *) skb->data; ++ } ++ if (llc != NULL) ++ eh->ether_type = htons(skb->len - sizeof(*eh)); ++ else ++ eh->ether_type = ether_type; ++ return skb; ++} ++ ++/* ++ * Install received rate set information in the node's state block. ++ */ ++int ++ieee80211_setup_rates(struct ieee80211_node *ni, ++ const u_int8_t *rates, const u_int8_t *xrates, int flags) ++{ ++ struct ieee80211_rateset *rs = &ni->ni_rates; ++ ++ memset(rs, 0, sizeof(*rs)); ++ rs->rs_nrates = rates[1]; ++ memcpy(rs->rs_rates, rates + 2, rs->rs_nrates); ++ if (xrates != NULL) { ++ u_int8_t nxrates; ++ /* ++ * Tack on 11g extended supported rate element. ++ */ ++ nxrates = xrates[1]; ++ if (rs->rs_nrates + nxrates > IEEE80211_RATE_MAXSIZE) { ++ struct ieee80211vap *vap = ni->ni_vap; ++ ++ nxrates = IEEE80211_RATE_MAXSIZE - rs->rs_nrates; ++ IEEE80211_NOTE(vap, IEEE80211_MSG_XRATE, ni, ++ "extended rate set too large;" ++ " only using %u of %u rates", ++ nxrates, xrates[1]); ++ vap->iv_stats.is_rx_rstoobig++; ++ } ++ memcpy(rs->rs_rates + rs->rs_nrates, xrates+2, nxrates); ++ rs->rs_nrates += nxrates; ++ } ++ return ieee80211_fix_rate(ni, flags); ++} ++ ++static void ++ieee80211_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh, ++ int rssi, u_int32_t rstamp, u_int16_t seq, u_int16_t status) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ ++ if (ni->ni_authmode == IEEE80211_AUTH_SHARED) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "open auth", ++ "bad sta auth mode %u", ni->ni_authmode); ++ vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ /* XXX hack to workaround calling convention */ ++ ++ /* XXX To send the frame to the requesting STA, we have to ++ * create a node for the station that we're going to reject. ++ * The node will be freed automatically */ ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_dup_bss(vap, wh->i_addr2); ++ if (ni == NULL) ++ return; ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, ++ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), ++ ieee80211_node_refcnt(ni)); ++ } ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, ++ (seq + 1) | (IEEE80211_STATUS_ALG << 16)); ++ return; ++ } ++ } ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_IBSS: ++ if (vap->iv_state != IEEE80211_S_RUN || ++ seq != IEEE80211_AUTH_OPEN_REQUEST) { ++ vap->iv_stats.is_rx_bad_auth++; ++ return; ++ } ++ ieee80211_new_state(vap, IEEE80211_S_AUTH, ++ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); ++ break; ++ ++ case IEEE80211_M_AHDEMO: ++ case IEEE80211_M_WDS: ++ /* should not come here */ ++ break; ++ ++ case IEEE80211_M_HOSTAP: ++ if (vap->iv_state != IEEE80211_S_RUN || ++ seq != IEEE80211_AUTH_OPEN_REQUEST) { ++ vap->iv_stats.is_rx_bad_auth++; ++ return; ++ } ++ /* always accept open authentication requests */ ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_dup_bss(vap, wh->i_addr2); ++ if (ni == NULL) ++ return; ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, ++ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), ++ ieee80211_node_refcnt(ni)); ++ ++ } else if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0) ++ (void) ieee80211_ref_node(ni); ++ /* ++ * Mark the node as referenced to reflect that it's ++ * reference count has been bumped to ensure it remains ++ * after the transaction completes. ++ */ ++ ni->ni_flags |= IEEE80211_NODE_AREF; ++ ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); ++ IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ++ ni, "station authenticated (%s)", "open"); ++ /* ++ * When 802.1x is not in use mark the port ++ * authorized at this point so traffic can flow. ++ */ ++ if (ni->ni_authmode != IEEE80211_AUTH_8021X) ++ ieee80211_node_authorize(ni); ++ break; ++ ++ case IEEE80211_M_STA: ++ if (vap->iv_state != IEEE80211_S_AUTH || ++ seq != IEEE80211_AUTH_OPEN_RESPONSE) { ++ vap->iv_stats.is_rx_bad_auth++; ++ return; ++ } ++ if (status != 0) { ++ IEEE80211_NOTE(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "open auth failed (reason %d)", status); ++ vap->iv_stats.is_rx_auth_fail++; ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, ++ IEEE80211_SCAN_FAIL_STATUS); ++ } else ++ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); ++ break; ++ case IEEE80211_M_MONITOR: ++ break; ++ } ++} ++ ++/* ++ * Send a management frame error response to the specified ++ * station. If ni is associated with the station then use ++ * it; otherwise allocate a temporary node suitable for ++ * transmitting the frame and then free the reference so ++ * it will go away as soon as the frame has been transmitted. ++ */ ++static void ++ieee80211_send_error(struct ieee80211_node *ni, ++ const u_int8_t *mac, int subtype, int arg) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ int istmp; ++ ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_tmp_node(vap, mac); ++ if (ni == NULL) { ++ /* XXX msg */ ++ return; ++ } ++ istmp = 1; ++ } else ++ istmp = 0; ++ IEEE80211_SEND_MGMT(ni, subtype, arg); ++ if (istmp) ++ ieee80211_free_node(ni); ++} ++ ++static int ++alloc_challenge(struct ieee80211_node *ni) ++{ ++ if (ni->ni_challenge == NULL) ++ MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN, ++ M_DEVBUF, M_NOWAIT); ++ if (ni->ni_challenge == NULL) { ++ IEEE80211_NOTE(ni->ni_vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "%s", "shared key challenge alloc failed"); ++ /* XXX statistic */ ++ } ++ return (ni->ni_challenge != NULL); ++} ++ ++/* XXX TODO: add statistics */ ++static void ++ieee80211_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, ++ u_int8_t *frm, u_int8_t *efrm, int rssi, u_int32_t rstamp, ++ u_int16_t seq, u_int16_t status) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ u_int8_t *challenge; ++ int allocbs, estatus; ++ ++ /* ++ * NB: this can happen as we allow pre-shared key ++ * authentication to be enabled w/o wep being turned ++ * on so that configuration of these can be done ++ * in any order. It may be better to enforce the ++ * ordering in which case this check would just be ++ * for sanity/consistency. ++ */ ++ estatus = 0; /* NB: silence compiler */ ++ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "%s", " PRIVACY is disabled"); ++ estatus = IEEE80211_STATUS_ALG; ++ goto bad; ++ } ++ /* ++ * Pre-shared key authentication is evil; accept ++ * it only if explicitly configured (it is supported ++ * mainly for compatibility with clients like OS X). ++ */ ++ if (ni->ni_authmode != IEEE80211_AUTH_AUTO && ++ ni->ni_authmode != IEEE80211_AUTH_SHARED) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad sta auth mode %u", ni->ni_authmode); ++ vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ ++ estatus = IEEE80211_STATUS_ALG; ++ goto bad; ++ } ++ ++ challenge = NULL; ++ if (frm + 1 < efrm) { ++ if ((frm[1] + 2) > (efrm - frm)) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "ie %d/%d too long", ++ frm[0], (frm[1] + 2) - (efrm - frm)); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ if (*frm == IEEE80211_ELEMID_CHALLENGE) ++ challenge = frm; ++ frm += frm[1] + 2; ++ } ++ switch (seq) { ++ case IEEE80211_AUTH_SHARED_CHALLENGE: ++ case IEEE80211_AUTH_SHARED_RESPONSE: ++ if (challenge == NULL) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "%s", "no challenge"); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ if (challenge[1] != IEEE80211_CHALLENGE_LEN) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad challenge len %d", challenge[1]); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ default: ++ break; ++ } ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_MONITOR: ++ case IEEE80211_M_AHDEMO: ++ case IEEE80211_M_IBSS: ++ case IEEE80211_M_WDS: ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad operating mode %u", vap->iv_opmode); ++ return; ++ case IEEE80211_M_HOSTAP: ++ if (vap->iv_state != IEEE80211_S_RUN) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad state %u", vap->iv_state); ++ estatus = IEEE80211_STATUS_ALG; /* XXX */ ++ goto bad; ++ } ++ switch (seq) { ++ case IEEE80211_AUTH_SHARED_REQUEST: ++ if (ni == vap->iv_bss) { ++ ni = ieee80211_dup_bss(vap, wh->i_addr2); ++ if (ni == NULL) { ++ /* NB: no way to return an error */ ++ return; ++ } ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, ++ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), ++ ieee80211_node_refcnt(ni)); ++ ++ allocbs = 1; ++ } else { ++ if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0) ++ (void) ieee80211_ref_node(ni); ++ allocbs = 0; ++ } ++ /* ++ * Mark the node as referenced to reflect that it's ++ * reference count has been bumped to ensure it remains ++ * after the transaction completes. ++ */ ++ ni->ni_flags |= IEEE80211_NODE_AREF; ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ if (!alloc_challenge(ni)) { ++ /* NB: don't return error so they rexmit */ ++ return; ++ } ++ get_random_bytes(ni->ni_challenge, ++ IEEE80211_CHALLENGE_LEN); ++ IEEE80211_NOTE(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "shared key %sauth request", allocbs ? "" : "re"); ++ break; ++ case IEEE80211_AUTH_SHARED_RESPONSE: ++ if (ni == vap->iv_bss) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key response", ++ "%s", "unknown station"); ++ /* NB: don't send a response */ ++ return; ++ } ++ if (ni->ni_challenge == NULL) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key response", ++ "%s", "no challenge recorded"); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ if (memcmp(ni->ni_challenge, &challenge[2], ++ challenge[1]) != 0) { ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key response", ++ "%s", "challenge mismatch"); ++ vap->iv_stats.is_rx_auth_fail++; ++ estatus = IEEE80211_STATUS_CHALLENGE; ++ goto bad; ++ } ++ IEEE80211_NOTE(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, ++ "station authenticated (%s)", "shared key"); ++ ieee80211_node_authorize(ni); ++ break; ++ default: ++ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ++ ni->ni_macaddr, "shared key auth", ++ "bad seq %d", seq); ++ vap->iv_stats.is_rx_bad_auth++; ++ estatus = IEEE80211_STATUS_SEQUENCE; ++ goto bad; ++ } ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); ++ break; ++ ++ case IEEE80211_M_STA: ++ if (vap->iv_state != IEEE80211_S_AUTH) ++ return; ++ switch (seq) { ++ case IEEE80211_AUTH_SHARED_PASS: ++ if (ni->ni_challenge != NULL) { ++ FREE(ni->ni_challenge, M_DEVBUF); ++ ni->ni_challenge = NULL; ++ } ++ if (status != 0) { ++ IEEE80211_NOTE_MAC(vap, ++ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ++ ieee80211_getbssid(vap, wh), ++ "shared key auth failed (reason %d)", ++ status); ++ vap->iv_stats.is_rx_auth_fail++; ++ /* XXX IEEE80211_SCAN_FAIL_STATUS */ ++ goto bad; ++ } ++ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); ++ break; ++ case IEEE80211_AUTH_SHARED_CHALLENGE: ++ if (!alloc_challenge(ni)) ++ goto bad; ++ /* XXX could optimize by passing recvd challenge */ ++ memcpy(ni->ni_challenge, &challenge[2], challenge[1]); ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); ++ break; ++ default: ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH, ++ wh, "shared key auth", "bad seq %d", seq); ++ vap->iv_stats.is_rx_bad_auth++; ++ goto bad; ++ } ++ break; ++ } ++ return; ++bad: ++ /* ++ * Send an error response; but only when operating as an AP. ++ */ ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ /* XXX hack to workaround calling convention */ ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_AUTH, ++ (seq + 1) | (estatus<<16)); ++ } else if (vap->iv_opmode == IEEE80211_M_STA) { ++ /* ++ * Kick the state machine. This short-circuits ++ * using the mgt frame timeout to trigger the ++ * state transition. ++ */ ++ if (vap->iv_state == IEEE80211_S_AUTH) ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); ++ } ++} ++ ++/* Verify the existence and length of __elem or get out. */ ++#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do { \ ++ if ((__elem) == NULL) { \ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ ++ wh, ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ "%s", "no " #__elem ); \ ++ vap->iv_stats.is_rx_elem_missing++; \ ++ return; \ ++ } \ ++ if ((__elem)[1] > (__maxlen)) { \ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ ++ wh, ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ "bad " #__elem " len %d", (__elem)[1]); \ ++ vap->iv_stats.is_rx_elem_toobig++; \ ++ return; \ ++ } \ ++} while (0) ++ ++#define IEEE80211_VERIFY_LENGTH(_len, _minlen) do { \ ++ if ((_len) < (_minlen)) { \ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ ++ wh, ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ "%s", "ie too short"); \ ++ vap->iv_stats.is_rx_elem_toosmall++; \ ++ return; \ ++ } \ ++} while (0) ++ ++#ifdef IEEE80211_DEBUG ++static void ++ieee80211_ssid_mismatch(struct ieee80211vap *vap, const char *tag, ++ u_int8_t mac[IEEE80211_ADDR_LEN], u_int8_t *ssid) ++{ ++ printf("[%s] discard %s frame, ssid mismatch: ", ++ ether_sprintf(mac), tag); ++ ieee80211_print_essid(ssid + 2, ssid[1]); ++ printf("\n"); ++} ++ ++#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ ++ if ((_ssid)[1] != 0 && \ ++ ((_ssid)[1] != (_ni)->ni_esslen || \ ++ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ ++ if (ieee80211_msg_input(vap)) \ ++ ieee80211_ssid_mismatch(vap, \ ++ ieee80211_mgt_subtype_name[subtype >> \ ++ IEEE80211_FC0_SUBTYPE_SHIFT], \ ++ wh->i_addr2, _ssid); \ ++ vap->iv_stats.is_rx_ssidmismatch++; \ ++ return; \ ++ } \ ++} while (0) ++#else /* !IEEE80211_DEBUG */ ++#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ ++ if ((_ssid)[1] != 0 && \ ++ ((_ssid)[1] != (_ni)->ni_esslen || \ ++ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ ++ vap->iv_stats.is_rx_ssidmismatch++; \ ++ return; \ ++ } \ ++} while (0) ++#endif /* !IEEE80211_DEBUG */ ++ ++/* unaligned little endian access */ ++#define LE_READ_2(p) \ ++ ((u_int16_t) \ ++ ((((const u_int8_t *)(p))[0] ) | \ ++ (((const u_int8_t *)(p))[1] << 8))) ++#define LE_READ_4(p) \ ++ ((u_int32_t) \ ++ ((((const u_int8_t *)(p))[0] ) | \ ++ (((const u_int8_t *)(p))[1] << 8) | \ ++ (((const u_int8_t *)(p))[2] << 16) | \ ++ (((const u_int8_t *)(p))[3] << 24))) ++ ++static __inline int ++iswpaoui(const u_int8_t *frm) ++{ ++ return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI); ++} ++ ++static __inline int ++iswmeoui(const u_int8_t *frm) ++{ ++ return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI); ++} ++ ++static __inline int ++iswmeparam(const u_int8_t *frm) ++{ ++ return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && ++ frm[6] == WME_PARAM_OUI_SUBTYPE; ++} ++ ++static __inline int ++iswmeinfo(const u_int8_t *frm) ++{ ++ return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && ++ frm[6] == WME_INFO_OUI_SUBTYPE; ++} ++ ++static __inline int ++isatherosoui(const u_int8_t *frm) ++{ ++ return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI); ++} ++ ++/* ++ * Convert a WPA cipher selector OUI to an internal ++ * cipher algorithm. Where appropriate we also ++ * record any key length. ++ */ ++static int ++wpa_cipher(u_int8_t *sel, u_int8_t *keylen) ++{ ++#define WPA_SEL(x) (((x) << 24) | WPA_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case WPA_SEL(WPA_CSE_NULL): ++ return IEEE80211_CIPHER_NONE; ++ case WPA_SEL(WPA_CSE_WEP40): ++ if (keylen) ++ *keylen = 40 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case WPA_SEL(WPA_CSE_WEP104): ++ if (keylen) ++ *keylen = 104 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case WPA_SEL(WPA_CSE_TKIP): ++ return IEEE80211_CIPHER_TKIP; ++ case WPA_SEL(WPA_CSE_CCMP): ++ return IEEE80211_CIPHER_AES_CCM; ++ } ++ return 32; /* NB: so 1<< is discarded */ ++#undef WPA_SEL ++} ++ ++/* ++ * Convert a WPA key management/authentication algorithm ++ * to an internal code. ++ */ ++static int ++wpa_keymgmt(u_int8_t *sel) ++{ ++#define WPA_SEL(x) (((x)<<24)|WPA_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case WPA_SEL(WPA_ASE_8021X_UNSPEC): ++ return WPA_ASE_8021X_UNSPEC; ++ case WPA_SEL(WPA_ASE_8021X_PSK): ++ return WPA_ASE_8021X_PSK; ++ case WPA_SEL(WPA_ASE_NONE): ++ return WPA_ASE_NONE; ++ } ++ return 0; /* NB: so is discarded */ ++#undef WPA_SEL ++} ++ ++/* ++ * Parse a WPA information element to collect parameters ++ * and validate the parameters against what has been ++ * configured for the system. ++ */ ++static int ++ieee80211_parse_wpa(struct ieee80211vap *vap, u_int8_t *frm, ++ struct ieee80211_rsnparms *rsn_parm, const struct ieee80211_frame *wh) ++{ ++ u_int8_t len = frm[1]; ++ u_int32_t w; ++ int n; ++ ++ /* ++ * Check the length once for fixed parts: OUI, type, ++ * version, mcast cipher, and 2 selector counts. ++ * Other, variable-length data, must be checked separately. ++ */ ++ if (!(vap->iv_flags & IEEE80211_F_WPA1)) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "vap not WPA, flags 0x%x", vap->iv_flags); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ ++ if (len < 14) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "too short, len %u", len); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 6, len -= 4; /* NB: len is payload only */ ++ /* NB: iswapoui already validated the OUI and type */ ++ w = LE_READ_2(frm); ++ if (w != WPA_VERSION) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "bad version %u", w); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 2; ++ len -= 2; ++ ++ /* multicast/group cipher */ ++ w = wpa_cipher(frm, &rsn_parm->rsn_mcastkeylen); ++ if (w != rsn_parm->rsn_mcastcipher) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "mcast cipher mismatch; got %u, expected %u", ++ w, rsn_parm->rsn_mcastcipher); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 4; ++ len -= 4; ++ ++ /* unicast ciphers */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n*4+2) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "ucast cipher data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= 1 << wpa_cipher(frm, &rsn_parm->rsn_ucastkeylen); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_ucastcipherset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "%s", "ucast cipher set empty"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & (1 << IEEE80211_CIPHER_TKIP)) ++ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_TKIP; ++ else ++ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM; ++ ++ /* key management algorithms */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n * 4) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "key mgmt alg data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= wpa_keymgmt(frm); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_keymgmtset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "WPA", "%s", "no acceptable key mgmt alg"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & WPA_ASE_8021X_UNSPEC) ++ rsn_parm->rsn_keymgmt = WPA_ASE_8021X_UNSPEC; ++ else ++ rsn_parm->rsn_keymgmt = WPA_ASE_8021X_PSK; ++ ++ if (len > 2) /* optional capabilities */ ++ rsn_parm->rsn_caps = LE_READ_2(frm); ++ ++ return 0; ++} ++ ++/* ++ * Convert an RSN cipher selector OUI to an internal ++ * cipher algorithm. Where appropriate we also ++ * record any key length. ++ */ ++static int ++rsn_cipher(u_int8_t *sel, u_int8_t *keylen) ++{ ++#define RSN_SEL(x) (((x) << 24) | RSN_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case RSN_SEL(RSN_CSE_NULL): ++ return IEEE80211_CIPHER_NONE; ++ case RSN_SEL(RSN_CSE_WEP40): ++ if (keylen) ++ *keylen = 40 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case RSN_SEL(RSN_CSE_WEP104): ++ if (keylen) ++ *keylen = 104 / NBBY; ++ return IEEE80211_CIPHER_WEP; ++ case RSN_SEL(RSN_CSE_TKIP): ++ return IEEE80211_CIPHER_TKIP; ++ case RSN_SEL(RSN_CSE_CCMP): ++ return IEEE80211_CIPHER_AES_CCM; ++ case RSN_SEL(RSN_CSE_WRAP): ++ return IEEE80211_CIPHER_AES_OCB; ++ } ++ return 32; /* NB: so 1<< is discarded */ ++#undef RSN_SEL ++} ++ ++/* ++ * Convert an RSN key management/authentication algorithm ++ * to an internal code. ++ */ ++static int ++rsn_keymgmt(u_int8_t *sel) ++{ ++#define RSN_SEL(x) (((x) << 24) | RSN_OUI) ++ u_int32_t w = LE_READ_4(sel); ++ ++ switch (w) { ++ case RSN_SEL(RSN_ASE_8021X_UNSPEC): ++ return RSN_ASE_8021X_UNSPEC; ++ case RSN_SEL(RSN_ASE_8021X_PSK): ++ return RSN_ASE_8021X_PSK; ++ case RSN_SEL(RSN_ASE_NONE): ++ return RSN_ASE_NONE; ++ } ++ return 0; /* NB: so is discarded */ ++#undef RSN_SEL ++} ++ ++/* ++ * Parse a WPA/RSN information element to collect parameters ++ * and validate the parameters against what has been ++ * configured for the system. ++ */ ++static int ++ieee80211_parse_rsn(struct ieee80211vap *vap, u_int8_t *frm, ++ struct ieee80211_rsnparms *rsn_parm, const struct ieee80211_frame *wh) ++{ ++ u_int8_t len = frm[1]; ++ u_int32_t w; ++ int n; ++ ++ /* ++ * Check the length once for fixed parts: ++ * version, mcast cipher, and 2 selector counts. ++ * Other, variable-length data, must be checked separately. ++ */ ++ if (!(vap->iv_flags & IEEE80211_F_WPA2)) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "vap not RSN, flags 0x%x", vap->iv_flags); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ ++ if (len < 10) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "too short, len %u", len); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 2; ++ w = LE_READ_2(frm); ++ if (w != RSN_VERSION) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "bad version %u", w); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 2; ++ len -= 2; ++ ++ /* multicast/group cipher */ ++ w = rsn_cipher(frm, &rsn_parm->rsn_mcastkeylen); ++ if (w != rsn_parm->rsn_mcastcipher) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "mcast cipher mismatch; got %u, expected %u", ++ w, rsn_parm->rsn_mcastcipher); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ frm += 4; ++ len -= 4; ++ ++ /* unicast ciphers */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n * 4 + 2) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "ucast cipher data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= 1 << rsn_cipher(frm, &rsn_parm->rsn_ucastkeylen); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_ucastcipherset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "%s", "ucast cipher set empty"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & (1<rsn_ucastcipher = IEEE80211_CIPHER_TKIP; ++ else ++ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM; ++ ++ /* key management algorithms */ ++ n = LE_READ_2(frm); ++ frm += 2; ++ len -= 2; ++ if (len < n * 4) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "key mgmt alg data too short; len %u, n %u", ++ len, n); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ w = 0; ++ for (; n > 0; n--) { ++ w |= rsn_keymgmt(frm); ++ frm += 4; ++ len -= 4; ++ } ++ w &= rsn_parm->rsn_keymgmtset; ++ if (w == 0) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, ++ wh, "RSN", "%s", "no acceptable key mgmt alg"); ++ return IEEE80211_REASON_IE_INVALID; ++ } ++ if (w & RSN_ASE_8021X_UNSPEC) ++ rsn_parm->rsn_keymgmt = RSN_ASE_8021X_UNSPEC; ++ else ++ rsn_parm->rsn_keymgmt = RSN_ASE_8021X_PSK; ++ ++ /* optional RSN capabilities */ ++ if (len > 2) ++ rsn_parm->rsn_caps = LE_READ_2(frm); ++ /* XXXPMKID */ ++ ++ return 0; ++} ++ ++void ++ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie) ++{ ++ u_int ielen = ie[1] + 2; ++ /* ++ * Record information element for later use. ++ */ ++ if (*iep == NULL || (*iep)[1] != ie[1]) { ++ if (*iep != NULL) ++ FREE(*iep, M_DEVBUF); ++ MALLOC(*iep, void*, ielen, M_DEVBUF, M_NOWAIT); ++ } ++ if (*iep != NULL) ++ memcpy(*iep, ie, ielen); ++} ++EXPORT_SYMBOL(ieee80211_saveie); ++ ++static int ++ieee80211_parse_wmeie(u_int8_t *frm, const struct ieee80211_frame *wh, ++ struct ieee80211_node *ni) ++{ ++ u_int len = frm[1]; ++ ++ if (len != 7) { ++ IEEE80211_DISCARD_IE(ni->ni_vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, ++ wh, "WME IE", "too short, len %u", len); ++ return -1; ++ } ++ ni->ni_uapsd = frm[WME_CAPINFO_IE_OFFSET]; ++ if (ni->ni_uapsd) { ++ ni->ni_flags |= IEEE80211_NODE_UAPSD; ++ switch (WME_UAPSD_MAXSP(ni->ni_uapsd)) { ++ case 1: ++ ni->ni_uapsd_maxsp = 2; break; ++ case 2: ++ ni->ni_uapsd_maxsp = 4; break; ++ case 3: ++ ni->ni_uapsd_maxsp = 6; break; ++ default: ++ ni->ni_uapsd_maxsp = WME_UAPSD_NODE_MAXQDEPTH; ++ } ++ } ++ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_POWER, ni, ++ "UAPSD bit settings from STA: %02x", ni->ni_uapsd); ++ ++ return 1; ++} ++ ++static int ++ieee80211_parse_wmeparams(struct ieee80211vap *vap, u_int8_t *frm, ++ const struct ieee80211_frame *wh, u_int8_t *qosinfo) ++{ ++#define MS(_v, _f) (((_v) & _f) >> _f##_S) ++ struct ieee80211_wme_state *wme = &vap->iv_ic->ic_wme; ++ u_int len = frm[1], qosinfo_count; ++ int i; ++ ++ *qosinfo = 0; ++ ++ if (len < sizeof(struct ieee80211_wme_param)-2) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, ++ wh, "WME", "too short, len %u", len); ++ return -1; ++ } ++ *qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)]; ++ qosinfo_count = *qosinfo & WME_QOSINFO_COUNT; ++ /* XXX do proper check for wraparound */ ++ if (qosinfo_count == wme->wme_wmeChanParams.cap_info_count) ++ return 0; ++ frm += __offsetof(struct ieee80211_wme_param, params_acParams); ++ for (i = 0; i < WME_NUM_AC; i++) { ++ struct wmeParams *wmep = ++ &wme->wme_wmeChanParams.cap_wmeParams[i]; ++ /* NB: ACI not used */ ++ wmep->wmep_acm = MS(frm[0], WME_PARAM_ACM); ++ wmep->wmep_aifsn = MS(frm[0], WME_PARAM_AIFSN); ++ wmep->wmep_logcwmin = MS(frm[1], WME_PARAM_LOGCWMIN); ++ wmep->wmep_logcwmax = MS(frm[1], WME_PARAM_LOGCWMAX); ++ wmep->wmep_txopLimit = LE_READ_2(frm + 2); ++ frm += 4; ++ } ++ wme->wme_wmeChanParams.cap_info_count = qosinfo_count; ++ return 1; ++#undef MS ++} ++ ++static void ++ieee80211_parse_athParams(struct ieee80211_node *ni, u_int8_t *ie) ++{ ++#ifdef ATH_SUPERG_DYNTURBO ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = ni->ni_ic; ++#endif /* ATH_SUPERG_DYNTURBO */ ++ struct ieee80211_ie_athAdvCap *athIe = ++ (struct ieee80211_ie_athAdvCap *) ie; ++ ++ ni->ni_ath_flags = athIe->athAdvCap_capability; ++ if (ni->ni_ath_flags & IEEE80211_ATHC_COMP) ++ ni->ni_ath_defkeyindex = LE_READ_2(&athIe->athAdvCap_defKeyIndex); ++#if 0 ++ /* NB: too noisy */ ++ IEEE80211_NOTE(vap, IEEE80211_MSG_SUPG, ni, ++ "recv ath params: caps 0x%x flags 0x%x defkeyix %u", ++ athIe->athAdvCap_capability, ni->ni_ath_flags, ++ ni->ni_ath_defkeyindex); ++#endif ++#ifdef ATH_SUPERG_DYNTURBO ++ if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_ATHC_TURBOP)) { ++ u_int16_t curflags, newflags; ++ ++ /* ++ * Check for turbo mode switch. Calculate flags ++ * for the new mode and effect the switch. ++ */ ++ newflags = curflags = ic->ic_bsschan->ic_flags; ++ /* NB: ATHC_BOOST is not in ic_ath_cap, so get it from the ie */ ++ if (athIe->athAdvCap_capability & IEEE80211_ATHC_BOOST) ++ newflags |= IEEE80211_CHAN_TURBO; ++ else ++ newflags &= ~IEEE80211_CHAN_TURBO; ++ if (newflags != curflags) ++ ieee80211_dturbo_switch(ic, newflags); ++ } ++#endif /* ATH_SUPERG_DYNTURBO */ ++} ++ ++static void ++forward_mgmt_to_app(struct ieee80211vap *vap, int subtype, struct sk_buff *skb, ++ struct ieee80211_frame *wh) ++{ ++ struct net_device *dev = vap->iv_dev; ++ int filter_type = 0; ++ ++ switch (subtype) { ++ case IEEE80211_FC0_SUBTYPE_BEACON: ++ filter_type = IEEE80211_FILTER_TYPE_BEACON; ++ break; ++ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ++ filter_type = IEEE80211_FILTER_TYPE_PROBE_REQ; ++ break; ++ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: ++ filter_type = IEEE80211_FILTER_TYPE_PROBE_RESP; ++ break; ++ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: ++ filter_type = IEEE80211_FILTER_TYPE_ASSOC_REQ; ++ break; ++ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: ++ filter_type = IEEE80211_FILTER_TYPE_ASSOC_RESP; ++ break; ++ case IEEE80211_FC0_SUBTYPE_AUTH: ++ filter_type = IEEE80211_FILTER_TYPE_AUTH; ++ break; ++ case IEEE80211_FC0_SUBTYPE_DEAUTH: ++ filter_type = IEEE80211_FILTER_TYPE_DEAUTH; ++ break; ++ case IEEE80211_FC0_SUBTYPE_DISASSOC: ++ filter_type = IEEE80211_FILTER_TYPE_DISASSOC; ++ break; ++ default: ++ break; ++ } ++ ++ if (filter_type && ((vap->app_filter & filter_type) == filter_type)) { ++ struct sk_buff *skb1; ++ ++ skb1 = skb_copy(skb, GFP_ATOMIC); ++ if (skb1 == NULL) ++ return; ++ skb1->dev = dev; ++ skb_reset_mac_header(skb1); ++ skb1->ip_summed = CHECKSUM_NONE; ++ skb1->pkt_type = PACKET_OTHERHOST; ++ skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ ++ ++ netif_rx(skb1); ++ } ++} ++ ++void ++ieee80211_saveath(struct ieee80211_node *ni, u_int8_t *ie) ++{ ++ const struct ieee80211_ie_athAdvCap *athIe = ++ (const struct ieee80211_ie_athAdvCap *) ie; ++ ++ ni->ni_ath_flags = athIe->athAdvCap_capability; ++ if (ni->ni_ath_flags & IEEE80211_ATHC_COMP) ++ ni->ni_ath_defkeyindex = LE_READ_2(&athIe->athAdvCap_defKeyIndex); ++ ieee80211_saveie(&ni->ni_ath_ie, ie); ++} ++ ++struct ieee80211_channel * ++ieee80211_doth_findchan(struct ieee80211vap *vap, u_int8_t chan) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ struct ieee80211_channel *c; ++ int flags, freq; ++ ++ /* NB: try first to preserve turbo */ ++ flags = ic->ic_bsschan->ic_flags & IEEE80211_CHAN_ALL; ++ freq = ieee80211_ieee2mhz(chan, 0); ++ c = ieee80211_find_channel(ic, freq, flags); ++ if (c == NULL) ++ c = ieee80211_find_channel(ic, freq, 0); ++ return c; ++} ++ ++static void ++ieee80211_doth_cancel_cs(struct ieee80211vap *vap) ++{ ++ del_timer(&vap->iv_csa_timer); ++ if (vap->iv_csa_jiffies) ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "channel switch canceled (was: to %u in %u " ++ "tbtt, mode %u)\n", vap->iv_csa_chan->ic_ieee, ++ vap->iv_csa_count, vap->iv_csa_mode); ++ vap->iv_csa_jiffies = 0; ++} ++ ++static void ++ieee80211_doth_switch_channel(struct ieee80211vap *vap) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: Channel switch to %d NOW!\n", ++ __func__, vap->iv_csa_chan->ic_ieee); ++#if 0 ++ /* XXX does not belong here? */ ++ /* XXX doesn't stop management frames */ ++ /* XXX who restarts the queue? */ ++ /* NB: for now, error here is non-catastrophic. ++ * in the future we may need to ensure we ++ * stop xmit on this channel. ++ */ ++ netif_stop_queue(ic->ic_dev); ++#endif ++ ++ vap->iv_csa_jiffies = 0; /* supress "cancel" msg */ ++ ieee80211_doth_cancel_cs(vap); ++ ++ ic->ic_prevchan = ic->ic_curchan; ++ ic->ic_curchan = ic->ic_bsschan = vap->iv_csa_chan; ++ ic->ic_set_channel(ic); ++} ++ ++static void ++ieee80211_doth_switch_channel_tmr(unsigned long arg) ++{ ++ struct ieee80211vap *vap = (struct ieee80211vap *)arg; ++ ieee80211_doth_switch_channel(vap); ++} ++ ++static int ++ieee80211_parse_csaie(struct ieee80211_node *ni, u_int8_t *frm, ++ const struct ieee80211_frame *wh) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = vap->iv_ic; ++ struct ieee80211_channel *c; ++ struct ieee80211_ie_csa *csa_ie = (struct ieee80211_ie_csa *)frm; ++ ++ if (!frm) { ++ /* we had CS underway but now we got Beacon without CSA IE */ ++ /* XXX abuse? */ ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch is scheduled, but we got " ++ "Beacon without CSA IE!\n", __func__); ++ ++ ieee80211_doth_cancel_cs(vap); ++ return 0; ++ } ++ ++ if (csa_ie->csa_len != 3) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, ++ wh, "channel switch", "invalid length %u", ++ csa_ie->csa_len); ++ return -1; ++ } ++ ++ if (isclr(ic->ic_chan_avail, csa_ie->csa_chan)) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, ++ wh, "channel switch", "invalid channel %u", ++ csa_ie->csa_chan); ++ return -1; ++ } ++ ++ if ((c = ieee80211_doth_findchan(vap, csa_ie->csa_chan)) == NULL) { ++ /* XXX something wrong */ ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, ++ wh, "channel switch", ++ "channel %u lookup failed", csa_ie->csa_chan); ++ return -1; ++ } ++ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch to %u in %u tbtt (mode %u) announced\n", ++ __func__, csa_ie->csa_chan, csa_ie->csa_count, ++ csa_ie->csa_mode); ++ ++ if (vap->iv_csa_jiffies) { ++ /* CSA was received recently */ ++ if (c != vap->iv_csa_chan) { ++ /* XXX abuse? */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch channel " ++ "changed from %u to %u!\n", __func__, ++ vap->iv_csa_chan->ic_ieee, ++ csa_ie->csa_chan); ++ ++ if (vap->iv_csa_count > IEEE80211_CSA_PROTECTION_PERIOD) ++ ieee80211_doth_cancel_cs(vap); ++ return 0; ++ } ++ ++ if (csa_ie->csa_mode != vap->iv_csa_mode) { ++ /* Can be abused, but with no (to little) impact. */ ++ ++ /* CS mode change has no influence on our actions since ++ * we don't respect cs modes at all (yet). Complain and ++ * forget. */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch mode changed from " ++ "%u to %u!\n", __func__, ++ vap->iv_csa_mode, csa_ie->csa_mode); ++ } ++ ++ if (csa_ie->csa_count >= vap->iv_csa_count) { ++ /* XXX abuse? what for? */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: channel switch count didn't " ++ "decrease (%u -> %u)!\n", __func__, ++ vap->iv_csa_count, csa_ie->csa_count); ++ return 0; ++ } ++ ++ { ++ u_int32_t elapsed = IEEE80211_JIFFIES_TO_TU( ++ jiffies - vap->iv_csa_jiffies); ++ u_int32_t cnt_diff = vap->iv_csa_count - ++ csa_ie->csa_count; ++ u_int32_t expected = ni->ni_intval * cnt_diff; ++ int32_t delta = elapsed - expected; ++ if (delta < 0) ++ delta = -delta; ++ if (delta > IEEE80211_CSA_SANITY_THRESHOLD) { ++ /* XXX abuse? for now, it's safer to cancel CS ++ * than to follow it blindly */ ++ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, ++ "%s: %u.%02u bintvals elapsed, " ++ "but count dropped by %u (delta" ++ " = %u TUs)\n", __func__, ++ elapsed / ni->ni_intval, ++ elapsed * 100 / ni->ni_intval ++ % 100, cnt_diff, delta); ++ ++ ieee80211_doth_cancel_cs(vap); ++ return 0; ++ } ++ } ++ ++ vap->iv_csa_count = csa_ie->csa_count; ++ mod_timer(&vap->iv_csa_timer, jiffies + ++ IEEE80211_TU_TO_JIFFIES(vap->iv_csa_count ++ * ni->ni_intval + 10)); ++ } else { ++ /* CSA wasn't received recently, so this is the first one in ++ * the sequence. */ ++ ++ if (csa_ie->csa_count < IEEE80211_CSA_PROTECTION_PERIOD) { ++ /* XXX abuse? */ ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID | ++ IEEE80211_MSG_DOTH, ++ wh, "channel switch", ++ "initial announcement: channel switch" ++ " would occur too soon (in %u tbtt)", ++ csa_ie->csa_count); ++ return 0; ++ } ++ ++ vap->iv_csa_mode = csa_ie->csa_mode; ++ vap->iv_csa_count = csa_ie->csa_count; ++ vap->iv_csa_chan = c; ++ ++ vap->iv_csa_timer.function = ieee80211_doth_switch_channel_tmr; ++ vap->iv_csa_timer.data = (unsigned long)vap; ++ vap->iv_csa_timer.expires = jiffies + IEEE80211_TU_TO_JIFFIES( ++ vap->iv_csa_count * ni->ni_intval + 10); ++ add_timer(&vap->iv_csa_timer); ++ } ++ ++ vap->iv_csa_jiffies = jiffies; ++ ++ if (vap->iv_csa_count <= 1) ++ ieee80211_doth_switch_channel(vap); ++ ++ return 0; ++} ++ ++/* XXX. Not the right place for such a definition */ ++struct l2_update_frame { ++ struct ether_header eh; ++ u8 dsap; ++ u8 ssap; ++ u8 control; ++ u8 xid[3]; ++} __packed; ++ ++static void ++ieee80211_deliver_l2uf(struct ieee80211_node *ni) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct net_device *dev = vap->iv_dev; ++ struct sk_buff *skb; ++ struct l2_update_frame *l2uf; ++ struct ether_header *eh; ++ ++ skb = dev_alloc_skb(sizeof(*l2uf)); ++ if (!skb) { ++ printk("ieee80211_deliver_l2uf: no buf available\n"); ++ return; ++ } ++ skb_put(skb, sizeof(*l2uf)); ++ l2uf = (struct l2_update_frame *)(skb->data); ++ eh = &l2uf->eh; ++ /* dst: Broadcast address */ ++ IEEE80211_ADDR_COPY(eh->ether_dhost, dev->broadcast); ++ /* src: associated STA */ ++ IEEE80211_ADDR_COPY(eh->ether_shost, ni->ni_macaddr); ++ eh->ether_type = htons(skb->len - sizeof(*eh)); ++ ++ l2uf->dsap = 0; ++ l2uf->ssap = 0; ++ l2uf->control = 0xf5; ++ l2uf->xid[0] = 0x81; ++ l2uf->xid[1] = 0x80; ++ l2uf->xid[2] = 0x00; ++ ++ skb->dev = dev; ++ skb->protocol = eth_type_trans(skb, dev); ++ skb_reset_mac_header(skb); ++ ieee80211_deliver_data(ni, skb); ++ return; ++} ++ ++static __inline int ++contbgscan(struct ieee80211vap *vap) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ ++ return ((ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN) && ++ time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle)); ++} ++ ++static __inline int ++startbgscan(struct ieee80211vap *vap) ++{ ++ struct ieee80211com *ic = vap->iv_ic; ++ ++ return ((vap->iv_flags & IEEE80211_F_BGSCAN) && ++ !IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) && ++ time_after(jiffies, ic->ic_lastscan + vap->iv_bgscanintvl) && ++ time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle)); ++} ++ ++ ++/* ++ * Context: SoftIRQ ++ */ ++void ++ieee80211_recv_mgmt(struct ieee80211_node *ni, struct sk_buff *skb, ++ int subtype, int rssi, u_int32_t rstamp) ++{ ++#define ISPROBE(_st) ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) ++#define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211com *ic = vap->iv_ic; ++ struct ieee80211_frame *wh; ++ u_int8_t *frm, *efrm; ++ u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath; ++ u_int8_t rate; ++ int reassoc, resp, allocbs; ++ u_int8_t qosinfo; ++ ++ wh = (struct ieee80211_frame *) skb->data; ++ frm = (u_int8_t *)&wh[1]; ++ efrm = skb->data + skb->len; ++ ++ /* forward management frame to application */ ++ if (vap->iv_opmode != IEEE80211_M_MONITOR) ++ forward_mgmt_to_app(vap, subtype, skb, wh); ++ ++ switch (subtype) { ++ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: ++ case IEEE80211_FC0_SUBTYPE_BEACON: { ++ struct ieee80211_scanparams scan; ++ ++ /* ++ * We process beacon/probe response frames: ++ * o when scanning, or ++ * o station mode when associated (to collect state ++ * updates such as 802.11g slot time), or ++ * o adhoc mode (to discover neighbors) ++ * Frames otherwise received are discarded. ++ */ ++ if (!((ic->ic_flags & IEEE80211_F_SCAN) || ++ (vap->iv_opmode == IEEE80211_M_STA && ni->ni_associd) || ++ vap->iv_opmode == IEEE80211_M_IBSS)) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ /* ++ * beacon/probe response frame format ++ * [8] time stamp ++ * [2] beacon interval ++ * [2] capability information ++ * [tlv] ssid ++ * [tlv] supported rates ++ * [tlv] country information ++ * [tlv] parameter set (FH/DS) ++ * [tlv] erp information ++ * [tlv] extended supported rates ++ * [tlv] WME ++ * [tlv] WPA or RSN ++ * [tlv] Atheros Advanced Capabilities ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 12); ++ memset(&scan, 0, sizeof(scan)); ++ scan.tstamp = frm; ++ frm += 8; ++ scan.bintval = le16toh(*(__le16 *)frm); ++ frm += 2; ++ scan.capinfo = le16toh(*(__le16 *)frm); ++ frm += 2; ++ scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); ++ scan.chan = scan.bchan; ++ ++ while (frm < efrm) { ++ /* Agere element in beacon */ ++ if ((*frm == IEEE80211_ELEMID_AGERE1) || ++ (*frm == IEEE80211_ELEMID_AGERE2)) { ++ frm = efrm; ++ continue; ++ } ++ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_SSID: ++ scan.ssid = frm; ++ break; ++ case IEEE80211_ELEMID_RATES: ++ scan.rates = frm; ++ break; ++ case IEEE80211_ELEMID_COUNTRY: ++ scan.country = frm; ++ break; ++ case IEEE80211_ELEMID_FHPARMS: ++ if (ic->ic_phytype == IEEE80211_T_FH) { ++ scan.fhdwell = LE_READ_2(&frm[2]); ++ scan.chan = IEEE80211_FH_CHAN(frm[4], frm[5]); ++ scan.fhindex = frm[6]; ++ } ++ break; ++ case IEEE80211_ELEMID_DSPARMS: ++ /* ++ * XXX hack this since depending on phytype ++ * is problematic for multi-mode devices. ++ */ ++ if (ic->ic_phytype != IEEE80211_T_FH) ++ scan.chan = frm[2]; ++ break; ++ case IEEE80211_ELEMID_TIM: ++ /* XXX ATIM? */ ++ scan.tim = frm; ++ scan.timoff = frm - skb->data; ++ break; ++ case IEEE80211_ELEMID_IBSSPARMS: ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ scan.xrates = frm; ++ break; ++ case IEEE80211_ELEMID_ERP: ++ if (frm[1] != 1) { ++ IEEE80211_DISCARD_IE(vap, ++ IEEE80211_MSG_ELEMID, wh, "ERP", ++ "bad len %u", frm[1]); ++ vap->iv_stats.is_rx_elem_toobig++; ++ break; ++ } ++ scan.erp = frm[2]; ++ break; ++ case IEEE80211_ELEMID_RSN: ++ scan.rsn = frm; ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ if (iswpaoui(frm)) ++ scan.wpa = frm; ++ else if (iswmeparam(frm) || iswmeinfo(frm)) ++ scan.wme = frm; ++ else if (isatherosoui(frm)) ++ scan.ath = frm; ++ break; ++ case IEEE80211_ELEMID_CHANSWITCHANN: ++ if (ic->ic_flags & IEEE80211_F_DOTH) ++ scan.csa = frm; ++ break; ++ default: ++ IEEE80211_DISCARD_IE(vap, IEEE80211_MSG_ELEMID, ++ wh, "unhandled", ++ "id %u, len %u", *frm, frm[1]); ++ vap->iv_stats.is_rx_elem_unknown++; ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE); ++ IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN); ++#if IEEE80211_CHAN_MAX < 255 ++ if (scan.chan > IEEE80211_CHAN_MAX) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "invalid channel %u", scan.chan); ++ vap->iv_stats.is_rx_badchan++; ++ return; ++ } ++#endif ++ if (scan.chan != scan.bchan && ++ ic->ic_phytype != IEEE80211_T_FH) { ++ /* ++ * Frame was received on a channel different from the ++ * one indicated in the DS params element id; ++ * silently discard it. ++ * ++ * NB: this can happen due to signal leakage. ++ * But we should take it for FH phy because ++ * the rssi value should be correct even for ++ * different hop pattern in FH. ++ */ ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "for off-channel %u", scan.chan); ++ vap->iv_stats.is_rx_chanmismatch++; ++ return; ++ } ++ ++ /* IEEE802.11 does not specify the allowed range for ++ * beacon interval. We discard any beacons with a ++ * beacon interval outside of an arbitrary range in ++ * order to protect against attack. ++ */ ++ if (!(IEEE80211_BINTVAL_MIN <= scan.bintval && ++ scan.bintval <= IEEE80211_BINTVAL_MAX)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_SCAN, ++ wh, "beacon", "invalid beacon interval (%u)", ++ scan.bintval); ++ return; ++ } ++ ++ /* ++ * Count frame now that we know it's to be processed. ++ */ ++ if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) ++ IEEE80211_NODE_STAT(ni, rx_beacons); ++ else ++ IEEE80211_NODE_STAT(ni, rx_proberesp); ++ ++ /* ++ * When operating in station mode, check for state updates. ++ * Be careful to ignore beacons received while doing a ++ * background scan. We consider only 11g/WMM stuff right now. ++ */ ++ if (vap->iv_opmode == IEEE80211_M_STA && ++ ni->ni_associd != 0 && ++ IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid)) { ++ /* record tsf of last beacon */ ++ memcpy(ni->ni_tstamp.data, scan.tstamp, ++ sizeof(ni->ni_tstamp)); ++ if (ni->ni_erp != scan.erp) { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, ++ "erp change: was 0x%x, now 0x%x", ++ ni->ni_erp, scan.erp); ++ if (scan.erp & IEEE80211_ERP_USE_PROTECTION) ++ ic->ic_flags |= IEEE80211_F_USEPROT; ++ else ++ ic->ic_flags &= ~IEEE80211_F_USEPROT; ++ ni->ni_erp = scan.erp; ++ /* XXX statistic */ ++ } ++ if ((ni->ni_capinfo ^ scan.capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, ++ "capabilities change: was 0x%x, now 0x%x", ++ ni->ni_capinfo, scan.capinfo); ++ /* ++ * NB: we assume short preamble doesn't ++ * change dynamically ++ */ ++ ieee80211_set_shortslottime(ic, ++ IEEE80211_IS_CHAN_A(ic->ic_bsschan) || ++ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); ++ ni->ni_capinfo = scan.capinfo; ++ /* XXX statistic */ ++ } ++ if (scan.wme != NULL && ++ (ni->ni_flags & IEEE80211_NODE_QOS)) { ++ int _retval; ++ if ((_retval = ieee80211_parse_wmeparams(vap, scan.wme, wh, &qosinfo)) >= 0) { ++ if (qosinfo & WME_CAPINFO_UAPSD_EN) ++ ni->ni_flags |= IEEE80211_NODE_UAPSD; ++ if (_retval > 0) ++ ieee80211_wme_updateparams(vap); ++ } ++ } else ++ ni->ni_flags &= ~IEEE80211_NODE_UAPSD; ++ if (scan.ath != NULL) ++ ieee80211_parse_athParams(ni, scan.ath); ++ if (scan.csa != NULL || vap->iv_csa_jiffies) ++ ieee80211_parse_csaie(ni, scan.csa, wh); ++ if (scan.tim != NULL) { ++ /* ++ * Check the TIM. For now we drop out of ++ * power save mode for any reason. ++ */ ++ struct ieee80211_tim_ie *tim = ++ (struct ieee80211_tim_ie *) scan.tim; ++ int aid = IEEE80211_AID(ni->ni_associd); ++ int ix = aid / NBBY; ++ int min = tim->tim_bitctl &~ 1; ++ int max = tim->tim_len + min - 4; ++ if ((tim->tim_bitctl&1) || ++ (min <= ix && ix <= max && ++ isset(tim->tim_bitmap - min, aid))) ++ ieee80211_sta_pwrsave(vap, 0); ++ vap->iv_dtim_count = tim->tim_count; ++ } ++ ++ /* WDS/Repeater: re-schedule software beacon timer for STA */ ++ if (vap->iv_state == IEEE80211_S_RUN && ++ vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) { ++ mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period); ++ } ++ ++ /* ++ * If scanning, pass the info to the scan module. ++ * Otherwise, check if it's the right time to do ++ * a background scan. Background scanning must ++ * be enabled and we must not be operating in the ++ * turbo phase of dynamic turbo mode. Then, ++ * it's been a while since the last background ++ * scan and if no data frames have come through ++ * recently, kick off a scan. Note that this ++ * is the mechanism by which a background scan ++ * is started _and_ continued each time we ++ * return on-channel to receive a beacon from ++ * our ap. ++ */ ++ if (ic->ic_flags & IEEE80211_F_SCAN) ++ ieee80211_add_scan(vap, &scan, wh, ++ subtype, rssi, rstamp); ++ else if (contbgscan(vap) || startbgscan(vap)) ++ ieee80211_bg_scan(vap); ++ return; ++ } ++ /* ++ * If scanning, just pass information to the scan module. ++ */ ++ if (ic->ic_flags & IEEE80211_F_SCAN) { ++ ieee80211_add_scan(vap, &scan, wh, subtype, rssi, rstamp); ++ return; ++ } ++ if (scan.capinfo & IEEE80211_CAPINFO_IBSS) { ++ if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) { ++ /* Create a new entry in the neighbor table. */ ++ ni = ieee80211_add_neighbor(vap, wh, &scan); ++ } else { ++ /* ++ * Copy data from beacon to neighbor table. ++ * Some of this information might change after ++ * ieee80211_add_neighbor(), so we just copy ++ * everything over to be safe. ++ */ ++ ni->ni_esslen = scan.ssid[1]; ++ memcpy(ni->ni_essid, scan.ssid + 2, scan.ssid[1]); ++ IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3); ++ memcpy(ni->ni_tstamp.data, scan.tstamp, ++ sizeof(ni->ni_tstamp)); ++ ni->ni_intval = IEEE80211_BINTVAL_SANITISE(scan.bintval); ++ ni->ni_capinfo = scan.capinfo; ++ ni->ni_chan = ic->ic_curchan; ++ ni->ni_fhdwell = scan.fhdwell; ++ ni->ni_fhindex = scan.fhindex; ++ ni->ni_erp = scan.erp; ++ ni->ni_timoff = scan.timoff; ++ if (scan.wme != NULL) ++ ieee80211_saveie(&ni->ni_wme_ie, scan.wme); ++ if (scan.wpa != NULL) ++ ieee80211_saveie(&ni->ni_wpa_ie, scan.wpa); ++ if (scan.rsn != NULL) ++ ieee80211_saveie(&ni->ni_rsn_ie, scan.rsn); ++ if (scan.ath != NULL) ++ ieee80211_saveath(ni, scan.ath); ++ ++ /* NB: must be after ni_chan is setup */ ++ ieee80211_setup_rates(ni, scan.rates, ++ scan.xrates, IEEE80211_F_DOSORT); ++ } ++ if (ni != NULL) { ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ } ++ } ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ++ if (vap->iv_opmode == IEEE80211_M_STA || ++ vap->iv_opmode == IEEE80211_M_AHDEMO || ++ vap->iv_state != IEEE80211_S_RUN) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ if (IEEE80211_IS_MULTICAST(wh->i_addr2)) { ++ /* frame must be directed */ ++ vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */ ++ return; ++ } ++ ++/* ++ * XR vap does not process probe requests. ++ */ ++#ifdef ATH_SUPERG_XR ++ if(vap->iv_flags & IEEE80211_F_XR ) ++ return; ++#endif ++ /* ++ * prreq frame format ++ * [tlv] ssid ++ * [tlv] supported rates ++ * [tlv] extended supported rates ++ * [tlv] Atheros Advanced Capabilities ++ */ ++ ssid = rates = xrates = ath = NULL; ++ while (frm < efrm) { ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_SSID: ++ ssid = frm; ++ break; ++ case IEEE80211_ELEMID_RATES: ++ rates = frm; ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ xrates = frm; ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ if (isatherosoui(frm)) ++ ath = frm; ++ /* XXX Atheros OUI support */ ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); ++ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); ++ IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); ++ if ((vap->iv_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "no ssid with ssid suppression enabled"); ++ vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/ ++ return; ++ } ++ if (ni == vap->iv_bss) { ++ if (vap->iv_opmode == IEEE80211_M_IBSS) { ++ /* ++ * XXX Cannot tell if the sender is operating ++ * in ibss mode. But we need a new node to ++ * send the response so blindly add them to the ++ * neighbor table. ++ */ ++ ni = ieee80211_fakeup_adhoc_node(vap, ++ wh->i_addr2); ++ } else { ++ ni = ieee80211_tmp_node(vap, wh->i_addr2); ++ } ++ if (ni == NULL) ++ return; ++ allocbs = 1; ++ } else ++ allocbs = 0; ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2, ++ "%s", "recv probe req"); ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ rate = ieee80211_setup_rates(ni, rates, xrates, ++ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ++ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); ++ if (rate & IEEE80211_RATE_BASIC) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_XRATE, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "recv'd rate set invalid"); ++ } else { ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); ++ } ++ if (allocbs && vap->iv_opmode != IEEE80211_M_IBSS) { ++ /* ++ * Temporary node created just to send a ++ * response, reclaim immediately ++ */ ++ ieee80211_free_node(ni); ++ } else if (ath != NULL) ++ ieee80211_saveath(ni, ath); ++ break; ++ ++ case IEEE80211_FC0_SUBTYPE_AUTH: { ++ u_int16_t algo, seq, status; ++ /* ++ * auth frame format ++ * [2] algorithm ++ * [2] sequence ++ * [2] status ++ * [tlv*] challenge ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); ++ algo = le16toh(*(__le16 *)frm); ++ seq = le16toh(*(__le16 *)(frm + 2)); ++ status = le16toh(*(__le16 *)(frm + 4)); ++#ifdef ATH_SUPERG_XR ++ if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) { ++ /* ++ * node roaming between XR and normal vaps. ++ * this can only happen in AP mode. disaccociate from ++ * previous vap first. ++ */ ++ if (vap->iv_xrvap) { ++ if (ni == vap->iv_bss) ++ ni = vap->iv_xrvap->iv_bss; ++ else { ++ ieee80211_node_leave(ni); ++ ieee80211_node_reset(ni, vap->iv_xrvap); ++ } ++ vap = vap->iv_xrvap; ++ } else { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH, ++ wh, "auth", "%s", "not to pier xr bssid"); ++ return; ++ } ++ } ++#endif ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr2, ++ "recv auth frame with algorithm %d seq %d", algo, seq); ++ /* ++ * Consult the ACL policy module if setup. ++ */ ++ if (vap->iv_acl != NULL && ++ !vap->iv_acl->iac_check(vap, wh->i_addr2)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL, ++ wh, "auth", "%s", "disallowed by ACL"); ++ vap->iv_stats.is_rx_acl++; ++ return; ++ } ++ if (vap->iv_flags & IEEE80211_F_COUNTERM) { ++ IEEE80211_DISCARD(vap, ++ IEEE80211_MSG_AUTH | IEEE80211_MSG_CRYPTO, ++ wh, "auth", "%s", "TKIP countermeasures enabled"); ++ vap->iv_stats.is_rx_auth_countermeasures++; ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_AUTH, ++ IEEE80211_REASON_MIC_FAILURE); ++ } ++ return; ++ } ++ if (algo == IEEE80211_AUTH_ALG_SHARED) ++ ieee80211_auth_shared(ni, wh, frm + 6, efrm, rssi, ++ rstamp, seq, status); ++ else if (algo == IEEE80211_AUTH_ALG_OPEN) ++ ieee80211_auth_open(ni, wh, rssi, rstamp, seq, status); ++ else { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "auth", "unsupported alg %d", algo); ++ vap->iv_stats.is_rx_auth_unsupported++; ++ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { ++ /* XXX not right */ ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_AUTH, ++ (seq+1) | (IEEE80211_STATUS_ALG << 16)); ++ } ++ return; ++ } ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: { ++ u_int16_t capinfo, bintval; ++ struct ieee80211_rsnparms rsn_parm; ++ u_int8_t reason; ++ ++ if (vap->iv_opmode != IEEE80211_M_HOSTAP || ++ vap->iv_state != IEEE80211_S_RUN) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ ++ if (subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) { ++ reassoc = 1; ++ resp = IEEE80211_FC0_SUBTYPE_REASSOC_RESP; ++ } else { ++ reassoc = 0; ++ resp = IEEE80211_FC0_SUBTYPE_ASSOC_RESP; ++ } ++ ++ /* ++ * asreq frame format ++ * [2] capability information ++ * [2] listen interval ++ * [6*] current AP address (reassoc only) ++ * [tlv] ssid ++ * [tlv] supported rates ++ * [tlv] extended supported rates ++ * [tlv] wpa or RSN ++ * [tlv] WME ++ * [tlv] Atheros Advanced Capabilities ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, (reassoc ? 10 : 4)); ++ if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) { ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, ieee80211_mgt_subtype_name[subtype >> ++ IEEE80211_FC0_SUBTYPE_SHIFT], ++ "%s", "wrong bssid"); ++ vap->iv_stats.is_rx_assoc_bss++; ++ return; ++ } ++ capinfo = le16toh(*(__le16 *)frm); ++ frm += 2; ++ bintval = le16toh(*(__le16 *)frm); ++ frm += 2; ++ if (reassoc) ++ frm += 6; /* ignore current AP info */ ++ ssid = rates = xrates = wpa = rsn = wme = ath = NULL; ++ while (frm < efrm) { ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_SSID: ++ ssid = frm; ++ break; ++ case IEEE80211_ELEMID_RATES: ++ rates = frm; ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ xrates = frm; ++ break; ++ /* XXX verify only one of RSN and WPA ie's? */ ++ case IEEE80211_ELEMID_RSN: ++ if (vap->iv_flags & IEEE80211_F_WPA2) ++ rsn = frm; ++ else ++ IEEE80211_DPRINTF(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ "[%s] ignoring RSN IE in association request\n", ++ ether_sprintf(wh->i_addr2)); ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ /* don't override RSN element ++ * XXX: actually the driver should report both WPA versions, ++ * so wpa_supplicant can choose and also detect downgrade attacks ++ */ ++ if (iswpaoui(frm) && !wpa) { ++ if (vap->iv_flags & IEEE80211_F_WPA1) ++ wpa = frm; ++ else ++ IEEE80211_DPRINTF(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ "[%s] ignoring WPA IE in association request\n", ++ ether_sprintf(wh->i_addr2)); ++ } else if (iswmeinfo(frm)) ++ wme = frm; ++ else if (isatherosoui(frm)) ++ ath = frm; ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); ++ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); ++ IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); ++ ++ if (ni == vap->iv_bss) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, ++ "deny %s request, sta not authenticated", ++ reassoc ? "reassoc" : "assoc"); ++ ieee80211_send_error(ni, wh->i_addr2, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_ASSOC_NOT_AUTHED); ++ vap->iv_stats.is_rx_assoc_notauth++; ++ return; ++ } ++ ++ /* Assert right associstion security credentials */ ++ /* XXX Divy. Incomplete */ ++ if (wpa == NULL && (ic->ic_flags & IEEE80211_F_WPA)) { ++ IEEE80211_DPRINTF(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ "[%s] no WPA/RSN IE in association request\n", ++ ether_sprintf(wh->i_addr2)); ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_RSN_REQUIRED); ++ ieee80211_node_leave(ni); ++ /* XXX distinguish WPA/RSN? */ ++ vap->iv_stats.is_rx_assoc_badwpaie++; ++ return; ++ } ++ ++ if (rsn != NULL) { ++ /* ++ * Parse WPA information element. Note that ++ * we initialize the param block from the node ++ * state so that information in the IE overrides ++ * our defaults. The resulting parameters are ++ * installed below after the association is assured. ++ */ ++ rsn_parm = ni->ni_rsn; ++ if (rsn[0] != IEEE80211_ELEMID_RSN) ++ reason = ieee80211_parse_wpa(vap, rsn, &rsn_parm, wh); ++ else ++ reason = ieee80211_parse_rsn(vap, rsn, &rsn_parm, wh); ++ if (reason != 0) { ++ IEEE80211_SEND_MGMT(ni, ++ IEEE80211_FC0_SUBTYPE_DEAUTH, reason); ++ ieee80211_node_leave(ni); ++ /* XXX distinguish WPA/RSN? */ ++ vap->iv_stats.is_rx_assoc_badwpaie++; ++ return; ++ } ++ IEEE80211_NOTE_MAC(vap, ++ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, ++ wh->i_addr2, ++ "%s ie: mc %u/%u uc %u/%u key %u caps 0x%x", ++ rsn[0] != IEEE80211_ELEMID_RSN ? "WPA" : "RSN", ++ rsn_parm.rsn_mcastcipher, rsn_parm.rsn_mcastkeylen, ++ rsn_parm.rsn_ucastcipher, rsn_parm.rsn_ucastkeylen, ++ rsn_parm.rsn_keymgmt, rsn_parm.rsn_caps); ++ } ++ /* discard challenge after association */ ++ if (ni->ni_challenge != NULL) { ++ FREE(ni->ni_challenge, M_DEVBUF); ++ ni->ni_challenge = NULL; ++ } ++ /* 802.11 spec says to ignore station's privacy bit */ ++ if ((capinfo & IEEE80211_CAPINFO_ESS) == 0) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, ++ "deny %s request, capability mismatch 0x%x", ++ reassoc ? "reassoc" : "assoc", capinfo); ++ IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_CAPINFO); ++ ieee80211_node_leave(ni); ++ vap->iv_stats.is_rx_assoc_capmismatch++; ++ return; ++ } ++ rate = ieee80211_setup_rates(ni, rates, xrates, ++ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ++ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); ++ /* ++ * If constrained to 11g-only stations reject an ++ * 11b-only station. We cheat a bit here by looking ++ * at the max negotiated xmit rate and assuming anyone ++ * with a best rate <24Mb/s is an 11b station. ++ */ ++ if ((rate & IEEE80211_RATE_BASIC) || ++ ((vap->iv_flags & IEEE80211_F_PUREG) && rate < 48)) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, ++ "deny %s request, rate set mismatch", ++ reassoc ? "reassoc" : "assoc"); ++ IEEE80211_SEND_MGMT(ni, resp, ++ IEEE80211_STATUS_BASIC_RATE); ++ ieee80211_node_leave(ni); ++ vap->iv_stats.is_rx_assoc_norate++; ++ return; ++ } ++ ++ if (ni->ni_associd != 0 && ++ IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) { ++ if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) ++ != (capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, ++ wh->i_addr2, ++ "deny %s request, short slot time " ++ "capability mismatch 0x%x", ++ reassoc ? "reassoc" : "assoc", capinfo); ++ IEEE80211_SEND_MGMT(ni, resp, ++ IEEE80211_STATUS_CAPINFO); ++ ieee80211_node_leave(ni); ++ vap->iv_stats.is_rx_assoc_capmismatch++; ++ return; ++ } ++ } ++ ++ ni->ni_rssi = rssi; ++ ni->ni_rstamp = rstamp; ++ ni->ni_last_rx = jiffies; ++ ni->ni_intval = IEEE80211_BINTVAL_SANITISE(bintval); ++ ni->ni_capinfo = capinfo; ++ ni->ni_chan = ic->ic_curchan; ++ ni->ni_fhdwell = vap->iv_bss->ni_fhdwell; ++ ni->ni_fhindex = vap->iv_bss->ni_fhindex; ++ if (wpa != NULL) { ++ /* ++ * Record WPA/RSN parameters for station, mark ++ * node as using WPA and record information element ++ * for applications that require it. ++ */ ++ ieee80211_saveie(&ni->ni_wpa_ie, wpa); ++ } else if (ni->ni_wpa_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_wpa_ie, M_DEVBUF); ++ ni->ni_wpa_ie = NULL; ++ } ++ if (rsn != NULL) { ++ /* ++ * Record WPA/RSN parameters for station, mark ++ * node as using WPA and record information element ++ * for applications that require it. ++ */ ++ ni->ni_rsn = rsn_parm; ++ ieee80211_saveie(&ni->ni_rsn_ie, rsn); ++ } else if (ni->ni_rsn_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_rsn_ie, M_DEVBUF); ++ ni->ni_rsn_ie = NULL; ++ } ++ if (wme != NULL) { ++ /* ++ * Record WME parameters for station, mark node ++ * as capable of QoS and record information ++ * element for applications that require it. ++ */ ++ ieee80211_saveie(&ni->ni_wme_ie, wme); ++ if (ieee80211_parse_wmeie(wme, wh, ni) > 0) ++ ni->ni_flags |= IEEE80211_NODE_QOS; ++ } else if (ni->ni_wme_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_wme_ie, M_DEVBUF); ++ ni->ni_wme_ie = NULL; ++ ni->ni_flags &= ~IEEE80211_NODE_QOS; ++ } ++ if (ath != NULL) ++ ieee80211_saveath(ni, ath); ++ else if (ni->ni_ath_ie != NULL) { ++ /* ++ * Flush any state from a previous association. ++ */ ++ FREE(ni->ni_ath_ie, M_DEVBUF); ++ ni->ni_ath_ie = NULL; ++ ni->ni_ath_flags = 0; ++ } ++ ++ /* Send TGf L2UF frame on behalf of newly associated station */ ++ ieee80211_deliver_l2uf(ni); ++ ieee80211_node_join(ni, resp); ++#ifdef ATH_SUPERG_XR ++ if (ni->ni_prev_vap && ++ ni->ni_vap != ni->ni_prev_vap && ++ ni->ni_vap->iv_ath_cap & IEEE80211_ATHC_XR) { ++ /* ++ * node moved between XR and normal vap. ++ * move the data between XR and normal vap. ++ */ ++ ic->ic_node_move_data(ni); ++ ni->ni_prev_vap = ni->ni_vap; ++ } ++#endif ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: ++ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: { ++ u_int16_t capinfo, associd; ++ u_int16_t status; ++ ++ if (vap->iv_opmode != IEEE80211_M_STA || ++ vap->iv_state != IEEE80211_S_ASSOC) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ ++ /* ++ * asresp frame format ++ * [2] capability information ++ * [2] status ++ * [2] association ID ++ * [tlv] supported rates ++ * [tlv] extended supported rates ++ * [tlv] WME ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); ++ ni = vap->iv_bss; ++ capinfo = le16toh(*(__le16 *)frm); ++ frm += 2; ++ status = le16toh(*(__le16 *)frm); ++ frm += 2; ++ if (status != 0) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, ++ wh->i_addr2, ++ "%sassoc failed (reason %d)", ++ ISREASSOC(subtype) ? "re" : "", status); ++ vap->iv_stats.is_rx_auth_fail++; /* XXX */ ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, ++ IEEE80211_SCAN_FAIL_STATUS); ++ return; ++ } ++ associd = le16toh(*(__le16 *)frm); ++ frm += 2; ++ ++ rates = xrates = wme = NULL; ++ while (frm < efrm) { ++ /* ++ * Do not discard frames containing proprietary Agere ++ * elements 128 and 129, as the reported element length ++ * is often wrong. Skip rest of the frame, since we can ++ * not rely on the given element length making it impossible ++ * to know where the next element starts. ++ */ ++ if ((*frm == IEEE80211_ELEMID_AGERE1) || ++ (*frm == IEEE80211_ELEMID_AGERE2)) { ++ frm = efrm; ++ continue; ++ } ++ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); ++ switch (*frm) { ++ case IEEE80211_ELEMID_RATES: ++ rates = frm; ++ break; ++ case IEEE80211_ELEMID_XRATES: ++ xrates = frm; ++ break; ++ case IEEE80211_ELEMID_VENDOR: ++ if (iswmeoui(frm)) ++ wme = frm; ++ break; ++ } ++ frm += frm[1] + 2; ++ } ++ if (frm > efrm) ++ return; ++ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); ++ rate = ieee80211_setup_rates(ni, rates, xrates, ++ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ++ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); ++ if (rate & IEEE80211_RATE_BASIC) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, ++ wh->i_addr2, ++ "%sassoc failed (rate set mismatch)", ++ ISREASSOC(subtype) ? "re" : ""); ++ vap->iv_stats.is_rx_assoc_norate++; ++ ieee80211_new_state(vap, IEEE80211_S_SCAN, ++ IEEE80211_SCAN_FAIL_STATUS); ++ return; ++ } ++ ++ ni->ni_capinfo = capinfo; ++ ni->ni_associd = associd; ++ if (wme != NULL && ++ ieee80211_parse_wmeparams(vap, wme, wh, &qosinfo) >= 0) { ++ ni->ni_flags |= IEEE80211_NODE_QOS; ++ ieee80211_wme_updateparams(vap); ++ } else ++ ni->ni_flags &= ~IEEE80211_NODE_QOS; ++ /* ++ * Configure state now that we are associated. ++ * ++ * XXX may need different/additional driver callbacks? ++ */ ++ if (IEEE80211_IS_CHAN_A(ic->ic_curchan) || ++ ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && ++ (ic->ic_caps & IEEE80211_C_SHPREAMBLE))) { ++ ic->ic_flags |= IEEE80211_F_SHPREAMBLE; ++ ic->ic_flags &= ~IEEE80211_F_USEBARKER; ++ } else { ++ ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; ++ ic->ic_flags |= IEEE80211_F_USEBARKER; ++ } ++ ieee80211_set_shortslottime(ic, ++ IEEE80211_IS_CHAN_A(ic->ic_curchan) || ++ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); ++ /* ++ * Honor ERP protection. ++ * ++ * NB: ni_erp should zero for non-11g operation ++ * but we check the channel characteristics ++ * just in case. ++ */ ++ if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) && ++ (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION)) ++ ic->ic_flags |= IEEE80211_F_USEPROT; ++ else ++ ic->ic_flags &= ~IEEE80211_F_USEPROT; ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, wh->i_addr2, ++ "%sassoc success: %s preamble, %s slot time%s%s%s%s%s%s%s", ++ ISREASSOC(subtype) ? "re" : "", ++ (ic->ic_flags&IEEE80211_F_SHPREAMBLE) && ++ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) ? "short" : "long", ++ ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", ++ ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", ++ ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? ++ ", turbo" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_COMP) ? ++ ", compression" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ++ ", fast-frames" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_XR) ? ++ ", XR" : "", ++ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_AR) ? ++ ", AR" : "" ++ ); ++ ieee80211_new_state(vap, IEEE80211_S_RUN, subtype); ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_DEAUTH: { ++ u_int16_t reason; ++ ++ if (vap->iv_state == IEEE80211_S_SCAN) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ /* ++ * deauth frame format ++ * [2] reason ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 2); ++ reason = le16toh(*(__le16 *)frm); ++ vap->iv_stats.is_rx_deauth++; ++ IEEE80211_NODE_STAT(ni, rx_deauth); ++ ++ IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni, ++ "recv deauthenticate (reason %d)", reason); ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ ieee80211_new_state(vap, IEEE80211_S_AUTH, ++ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); ++ break; ++ case IEEE80211_M_HOSTAP: ++ if (ni != vap->iv_bss) ++ ieee80211_node_leave(ni); ++ break; ++ default: ++ vap->iv_stats.is_rx_mgtdiscard++; ++ break; ++ } ++ break; ++ } ++ ++ case IEEE80211_FC0_SUBTYPE_DISASSOC: { ++ u_int16_t reason; ++ ++ if (vap->iv_state != IEEE80211_S_RUN && ++ vap->iv_state != IEEE80211_S_ASSOC && ++ vap->iv_state != IEEE80211_S_AUTH) { ++ vap->iv_stats.is_rx_mgtdiscard++; ++ return; ++ } ++ /* ++ * disassoc frame format ++ * [2] reason ++ */ ++ IEEE80211_VERIFY_LENGTH(efrm - frm, 2); ++ reason = le16toh(*(__le16 *)frm); ++ vap->iv_stats.is_rx_disassoc++; ++ IEEE80211_NODE_STAT(ni, rx_disassoc); ++ ++ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, ++ "recv disassociate (reason %d)", reason); ++ switch (vap->iv_opmode) { ++ case IEEE80211_M_STA: ++ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); ++ break; ++ case IEEE80211_M_HOSTAP: ++ if (ni != vap->iv_bss) ++ ieee80211_node_leave(ni); ++ break; ++ default: ++ vap->iv_stats.is_rx_mgtdiscard++; ++ break; ++ } ++ break; ++ } ++ default: ++ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, ++ wh, "mgt", "subtype 0x%x not handled", subtype); ++ vap->iv_stats.is_rx_badsubtype++; ++ break; ++ } ++#undef ISREASSOC ++#undef ISPROBE ++} ++#undef IEEE80211_VERIFY_LENGTH ++#undef IEEE80211_VERIFY_ELEMENT ++ ++/* ++ * Process a received ps-poll frame. ++ */ ++static void ++ieee80211_recv_pspoll(struct ieee80211_node *ni, struct sk_buff *skb0) ++{ ++ struct ieee80211vap *vap = ni->ni_vap; ++ struct ieee80211_frame_min *wh; ++ struct sk_buff *skb; ++ u_int16_t aid; ++ int qlen; ++ ++ wh = (struct ieee80211_frame_min *)skb0->data; ++ if (ni->ni_associd == 0) { ++ IEEE80211_DISCARD(vap, ++ IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, ++ (struct ieee80211_frame *) wh, "ps-poll", ++ "%s", "unassociated station"); ++ vap->iv_stats.is_ps_unassoc++; ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_NOT_ASSOCED); ++ return; ++ } ++ ++ aid = le16toh(wh->i_dur); ++ if (aid != ni->ni_associd) { ++ IEEE80211_DISCARD(vap, ++ IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, ++ (struct ieee80211_frame *) wh, "ps-poll", ++ "aid mismatch: sta aid 0x%x poll aid 0x%x", ++ ni->ni_associd, aid); ++ vap->iv_stats.is_ps_badaid++; ++ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, ++ IEEE80211_REASON_NOT_ASSOCED); ++ return; ++ } ++ ++ /* Okay, take the first queued packet and put it out... */ ++ IEEE80211_NODE_SAVEQ_LOCK(ni); ++ IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen); ++ IEEE80211_NODE_SAVEQ_UNLOCK(ni); ++ if (skb == NULL) { ++ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2, ++ "%s", "recv ps-poll, but queue empty"); ++ ieee80211_send_nulldata(ieee80211_ref_node(ni)); ++ vap->iv_stats.is_ps_qempty++; /* XXX node stat */ ++ if (vap->iv_set_tim != NULL) ++ vap->iv_set_tim(ni, 0); /* just in case */ ++ return; ++ } ++ /* ++ * If there are more packets, set the more packets bit ++ * in the packet dispatched to the station; otherwise ++ * turn off the TIM bit. ++ */ ++ if (qlen != 0) { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, ++ "recv ps-poll, send packet, %u still queued", qlen); ++ /* ++ * NB: More-data bit will be set during encap. ++ */ ++ } else { ++ IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, ++ "%s", "recv ps-poll, send packet, queue empty"); ++ if (vap->iv_set_tim != NULL) ++ vap->iv_set_tim(ni, 0); ++ } ++ M_PWR_SAV_SET(skb); /* ensure MORE_DATA bit is set correctly */ ++ ++ ieee80211_parent_queue_xmit(skb); /* Submit to parent device, including updating stats */ ++} ++ ++#ifdef ATH_SUPERG_FF ++static void ++athff_decap(struct sk_buff *skb) ++{ ++ struct ether_header eh_src, *eh_dst; ++ struct llc *llc; ++ ++ memcpy(&eh_src, skb->data, sizeof(struct ether_header)); ++ llc = (struct llc *) skb_pull(skb, sizeof(struct ether_header)); ++ eh_src.ether_type = llc->llc_un.type_snap.ether_type; ++ skb_pull(skb, LLC_SNAPFRAMELEN); ++ ++ eh_dst = (struct ether_header *) skb_push(skb, sizeof(struct ether_header)); ++ memcpy(eh_dst, &eh_src, sizeof(struct ether_header)); ++} ++#endif ++ ++#ifdef USE_HEADERLEN_RESV ++/* ++ * The kernel version of this function alters the skb in a manner ++ * inconsistent with dev->hard_header_len header reservation. This ++ * is a rewrite of the portion of eth_type_trans() that we need. ++ */ ++static __be16 ++ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct ethhdr *eth; ++ ++ skb_reset_mac_header(skb); ++ skb_pull(skb, ETH_HLEN); ++ /* ++ * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but ++ * since that's an inline and not a define there's ++ * no easy way to do this cleanly. ++ */ ++ eth = eth_hdr(skb); ++ ++ if (*eth->h_dest & 1) ++ if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) ++ skb->pkt_type = PACKET_BROADCAST; ++ else ++ skb->pkt_type = PACKET_MULTICAST; ++ else ++ if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) ++ skb->pkt_type = PACKET_OTHERHOST; ++ ++ return eth->h_proto; ++} ++#endif ++ ++#ifdef IEEE80211_DEBUG ++/* ++ * Debugging support. ++ */ ++ ++/* ++ * Return the bssid of a frame. ++ */ ++static const u_int8_t * ++ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh) ++{ ++ if (vap->iv_opmode == IEEE80211_M_STA) ++ return wh->i_addr2; ++ if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) != IEEE80211_FC1_DIR_NODS) ++ return wh->i_addr1; ++ if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL) ++ return wh->i_addr1; ++ return wh->i_addr3; ++} ++ ++void ++ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ ++ printk("%s: %s", vap->iv_dev->name, buf); /* NB: no \n */ ++} ++EXPORT_SYMBOL(ieee80211_note); ++ ++void ++ieee80211_note_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh, ++ const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ printk("%s: [%s] %s\n", vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); ++} ++EXPORT_SYMBOL(ieee80211_note_frame); ++ ++void ++ieee80211_note_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN], ++ const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ printk("%s: [%s] %s\n", vap->iv_dev->name, ether_sprintf(mac), buf); ++} ++EXPORT_SYMBOL(ieee80211_note_mac); ++ ++static void ++ieee80211_discard_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh, ++ const char *type, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ if (type != NULL) ++ printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf); ++ else ++ printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); ++} ++ ++static void ++ieee80211_discard_ie(struct ieee80211vap *vap, const struct ieee80211_frame *wh, ++ const char *type, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ if (type != NULL) ++ printk("[%s:%s] discard %s information element, %s\n", ++ vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf); ++ else ++ printk("[%s:%s] discard information element, %s\n", ++ vap->iv_dev->name, ++ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); ++} ++ ++static void ++ieee80211_discard_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN], ++ const char *type, const char *fmt, ...) ++{ ++ char buf[128]; /* XXX */ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ if (type != NULL) ++ printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(mac), type, buf); ++ else ++ printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name, ++ ether_sprintf(mac), buf); ++} ++#endif /* IEEE80211_DEBUG */ +diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c madwifi-0.9.3.1/net80211/ieee80211_monitor.c +--- madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c 2007-02-15 00:45:48.000000000 +0100 ++++ madwifi-0.9.3.1/net80211/ieee80211_monitor.c 2007-07-10 14:45:14.000000000 +0200 +@@ -373,7 +373,7 @@ + if (vap->iv_monitor_txf_len && tx) { + /* truncate transmit feedback packets */ + skb_trim(skb1, vap->iv_monitor_txf_len); +- skb1->nh.raw = skb1->data; ++ skb1->network_header = skb1->data; + } + switch (vap->iv_dev->type) { + case ARPHRD_IEEE80211: +@@ -555,7 +555,7 @@ + skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN); + } + skb1->dev = dev; /* NB: deliver to wlanX */ +- skb1->mac.raw = skb1->data; ++ skb_reset_mac_header(skb1); + skb1->ip_summed = CHECKSUM_NONE; + skb1->pkt_type = pkttype; + skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ From vmiklos at frugalware.org Tue Jul 10 21:22:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:04 2007 Subject: [Frugalware-git] frugalware-current: acx100-0.3.36-11-i686 Message-ID: <20070710192246.652C618681DE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ceae36eb5fdecbd089d94c0e327c6b6696c7fd7f commit ceae36eb5fdecbd089d94c0e327c6b6696c7fd7f Author: VMiklos Date: Tue Jul 10 14:33:40 2007 +0200 acx100-0.3.36-11-i686 added -kernel2622.diff diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index a26e028..8c2e101 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 pkgver=0.3.36 pkgdate=20070101 -pkgrel=10 +pkgrel=11 pkgdesc="The ACX100/ACX111 wireless network driver." url="http://www.cmartin.tk/acx" Finclude kernel-module @@ -14,11 +14,13 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url |grep acx-2 |Flasttarbz2 |sed s/$pkgdate/$pkgver/" source=($url/acx-$pkgdate.tar.bz2 \ http://195.66.192.167/linux/acx_patches/fw.tar.bz2 \ - http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin) + http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin \ + acx100-0.3.36-kernel2622.diff) build() { # no Fcheckkernel, crosscompilation verified Fcd acx-$pkgdate + Fpatchall make -C $_F_kernelmod_dir/build M=`pwd` || Fdie Fmkdir $_F_kernelmod_dir/net Ffilerel $_F_kernelmod_dir/net/acx.ko @@ -34,6 +36,7 @@ build() { # optimalization OK - uses the kernel's option -sha1sums=('5c7259c09bc754529910aceead6087876177a143'\ - '5b5ef1a9d6441f5f8345e1957cd7686e730897f6'\ - '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4') +sha1sums=('5c7259c09bc754529910aceead6087876177a143' \ + '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ + '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \ + '2a385b78e656d6430bb730594cbb7724901e5d58') diff --git a/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff b/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff new file mode 100644 index 0000000..535bc89 --- /dev/null +++ b/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff @@ -0,0 +1,11 @@ +--- a/common.c ++++ b/common.c +@@ -2760,7 +2760,7 @@ acx_l_rxmonitor(acx_device_t *adev, cons + skb->dev = adev->ndev; + skb->dev->last_rx = jiffies; + +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); From vmiklos at frugalware.org Tue Jul 10 21:22:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:04 2007 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-3-i686 Message-ID: <20070710192248.00D4E18681E2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=713c50fe83309406ef29f2dae37584f1858add7f commit 713c50fe83309406ef29f2dae37584f1858add7f Author: VMiklos Date: Tue Jul 10 14:58:36 2007 +0200 wlan-ng-0.2.8-3-i686 added -kernel2622.diff diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index 073dbed..07af071 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -13,9 +13,10 @@ archs=('i686' 'x86_64') backup=(etc/wlan/wlan.conf) up2date="lynx -dump ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/|grep tar.bz2$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-//;$ p'" source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-$pkgname-$pkgver.tar.bz2 \ - rc.wlan) -sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de'\ - '3c50d5e942999a968437093a17e3864a4733e11e') + rc.wlan wlan-ng-0.2.8-kernel2622.diff) +sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de' \ + '3c50d5e942999a968437093a17e3864a4733e11e' \ + '0f44af63867c2d8494aefb9d0cf61742ba322222') build() { diff --git a/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2622.diff b/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2622.diff new file mode 100644 index 0000000..a0ce4d9 --- /dev/null +++ b/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2622.diff @@ -0,0 +1,48 @@ +diff -Naur linux-wlan-ng-0.2.8.orig/src/p80211/p80211conv.c linux-wlan-ng-0.2.8/src/p80211/p80211conv.c +--- linux-wlan-ng-0.2.8.orig/src/p80211/p80211conv.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-07-10 14:53:04.000000000 +0200 +@@ -498,7 +498,7 @@ + } + + skb->protocol = eth_type_trans(skb, netdev); +- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ ++ skb->mac_header = (unsigned char *) e_hdr; /* new MAC header */ + + /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ + /* jkriegl: only process signal/noise if requested by iwspy */ +diff -Naur linux-wlan-ng-0.2.8.orig/src/p80211/p80211netdev.c linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c +--- linux-wlan-ng-0.2.8.orig/src/p80211/p80211netdev.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-07-10 14:53:04.000000000 +0200 +@@ -389,7 +389,7 @@ + + /* set up various data fields */ + skb->dev = dev; +- skb->mac.raw = skb->data ; ++ skb_reset_mac_header(skb); + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); +diff -Naur linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c +--- linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-07-10 14:53:04.000000000 +0200 +@@ -3645,7 +3645,7 @@ + /* the prism2 cards don't return the FCS */ + datap = skb_put(skb, WLAN_CRC_LEN); + memset (datap, 0xff, WLAN_CRC_LEN); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); +diff -Naur linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c +--- linux-wlan-ng-0.2.8.orig/src/prism2/driver/hfa384x_usb.c 2007-03-19 16:37:00.000000000 +0100 ++++ linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-07-10 14:53:04.000000000 +0200 +@@ -4255,7 +4255,7 @@ + /* The prism2 series does not return the CRC */ + memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); + +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); From vmiklos at frugalware.org Tue Jul 10 21:22:49 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:05 2007 Subject: [Frugalware-git] frugalware-current: rt2500-1.1.0_b4-22-i686 Message-ID: <20070710192249.06DE316A8091@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5757ce3058467f765026747933ba75915e24b121 commit 5757ce3058467f765026747933ba75915e24b121 Author: VMiklos Date: Tue Jul 10 15:22:03 2007 +0200 rt2500-1.1.0_b4-22-i686 added -linux2622.patch diff --git a/source/network-extra/rt2500/FrugalBuild b/source/network-extra/rt2500/FrugalBuild index 8b263a0..a7a69d9 100644 --- a/source/network-extra/rt2500/FrugalBuild +++ b/source/network-extra/rt2500/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rt2500 pkgver=1.1.0_b4 -pkgrel=21 +pkgrel=22 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 and rt2500 chipsets." _F_sourceforge_dirname="rt2400" Finclude kernel-module sourceforge @@ -11,7 +11,10 @@ url="http://rt2x00.serialmonkey.com/wiki/index.php" groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/Downloads|grep 2500.*download$|sed 's/.*2500-\(.*\)\.t.*/\1/;s/-/_/'" -source=($source rt2500-1.1.0_b4-linux2620.patch) +source=($source rt2500-1.1.0_b4-linux26{20,22}.patch) +sha1sums=('dd9a747c819a6507ea3ef9e803d4fae1074d84df' \ + '32d014a546b6b4cda9b81f95e184a0e8f05c5698' \ + 'fb25d996030d6fb803d9ae0a41a6aceed5b57c43') build() { @@ -25,5 +28,3 @@ build() make KERNDIR=$_F_kernelmod_dir/build Ffilerel $_F_kernelmod_dir/kernel/drivers/net/wireless/rt2500.ko } -sha1sums=('dd9a747c819a6507ea3ef9e803d4fae1074d84df'\ - '32d014a546b6b4cda9b81f95e184a0e8f05c5698') diff --git a/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch b/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch new file mode 100644 index 0000000..249fe2f --- /dev/null +++ b/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch @@ -0,0 +1,11 @@ +--- Module/rtmp_data.c.orig 2007-07-10 15:16:31.000000000 +0200 ++++ Module/rtmp_data.c 2007-07-10 15:16:51.000000000 +0200 +@@ -1196,7 +1196,7 @@ + + skb->dev = pAdapter->net_dev; + memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_802_2); + skb->ip_summed = CHECKSUM_NONE; From vmiklos at frugalware.org Tue Jul 10 21:22:49 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:05 2007 Subject: [Frugalware-git] frugalware-current: rt2400-1.2.2_b3-4-i686 Message-ID: <20070710192249.6CA0218681DE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bc76f41965f21eeeccda7cd2a9a31ca87be867cb commit bc76f41965f21eeeccda7cd2a9a31ca87be867cb Author: VMiklos Date: Tue Jul 10 15:37:48 2007 +0200 rt2400-1.2.2_b3-4-i686 added -kernel2622.diff diff --git a/source/network-extra/rt2400/FrugalBuild b/source/network-extra/rt2400/FrugalBuild index ff624dd..f0722e7 100644 --- a/source/network-extra/rt2400/FrugalBuild +++ b/source/network-extra/rt2400/FrugalBuild @@ -3,16 +3,18 @@ pkgname=rt2400 pkgver=1.2.2_b3 -pkgrel=3 +pkgrel=4 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 chipsets." Finclude kernel-module sourceforge url="http://rt2x00.serialmonkey.com/wiki/index.php" groups=('network-extra') archs=('i686') up2date="lynx -dump $url/Downloads|grep 2400.*download$|sed 's/.*2400-\(.*\)\.t.*/\1/;s/-/_/;q'" -source=($source rt2400-1.2.2_b3-cvs_fixes.diff) -sha1sums=('b572d027c4433b964a7c613a31885a2e0853d92a'\ - 'e0435cc51fececdc38bb64d17d25ce727a2ee8e3') +source=($source rt2400-1.2.2_b3-cvs_fixes.diff \ +rt2400-1.2.2_b3-kernel2622.diff) +sha1sums=('b572d027c4433b964a7c613a31885a2e0853d92a' \ + 'e0435cc51fececdc38bb64d17d25ce727a2ee8e3' \ + '355f7e94ce5477b775b1d2183e7d7d720ab71201') build() { diff --git a/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff b/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff new file mode 100644 index 0000000..dd5dfc7 --- /dev/null +++ b/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff @@ -0,0 +1,11 @@ +--- Module/rtmp_data.c.orig 2007-07-10 15:33:35.000000000 +0200 ++++ Module/rtmp_data.c 2007-07-10 15:33:49.000000000 +0200 +@@ -110,7 +110,7 @@ + { + skb->dev = pAd->net_dev; + memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_802_2); + skb->ip_summed = CHECKSUM_NONE; From vmiklos at frugalware.org Tue Jul 10 21:22:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:06 2007 Subject: [Frugalware-git] frugalware-current: adm8211-20060111-23-i686 Message-ID: <20070710192250.0413D18681E7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=41c617d5bb6b87e18ecfa3868523652aac300bac commit 41c617d5bb6b87e18ecfa3868523652aac300bac Author: VMiklos Date: Tue Jul 10 15:47:44 2007 +0200 adm8211-20060111-23-i686 added -linux2622.patch diff --git a/source/network-extra/adm8211/FrugalBuild b/source/network-extra/adm8211/FrugalBuild index 1d5428b..3ef0086 100644 --- a/source/network-extra/adm8211/FrugalBuild +++ b/source/network-extra/adm8211/FrugalBuild @@ -3,14 +3,17 @@ pkgname=adm8211 pkgver=20060111 -pkgrel=22 +pkgrel=23 pkgdesc="IEEE 802.11 wireless LAN driver for adm8211 based cards" url="http://aluminum.sourmilk.net/adm8211/" Finclude kernel-module groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=($url/$pkgname-$pkgver.tar.bz2 adm8211-20060111-linux2620.patch) +source=($url/$pkgname-$pkgver.tar.bz2 adm8211-20060111-linux26{20,22}.patch) +sha1sums=('69658563c465c5c40d803d528ac3834d81d2cd0a' \ + '553e345e276a6981f21da4fd2d3ac5521bab370c' \ + '3cc4e06831cdd6deaf8af201dc8166a4f08daa9e') build() { @@ -24,5 +27,3 @@ build() Fmake Fmakeinstall } -sha1sums=('69658563c465c5c40d803d528ac3834d81d2cd0a'\ - '553e345e276a6981f21da4fd2d3ac5521bab370c') diff --git a/source/network-extra/adm8211/adm8211-20060111-linux2622.patch b/source/network-extra/adm8211/adm8211-20060111-linux2622.patch new file mode 100644 index 0000000..630a8b3 --- /dev/null +++ b/source/network-extra/adm8211/adm8211-20060111-linux2622.patch @@ -0,0 +1,29 @@ +--- adm8211/adm8211_hw.c.orig 2007-07-10 15:43:39.000000000 +0200 ++++ adm8211/adm8211_hw.c 2007-07-10 15:44:47.000000000 +0200 +@@ -516,7 +516,7 @@ + ieee->stats.rx_packets++; + + skb->pkt_type = PACKET_OTHERHOST; +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + netif_rx(skb); + dev->last_rx = jiffies; +@@ -734,7 +734,7 @@ + #endif + stat->rssi = rssi; + stat->rate = rate; +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->protocol = __constant_htons(ETH_P_802_2); + skb_queue_tail(&priv->rx_queue, skb); + tasklet_schedule(&priv->rx_tasklet); +@@ -2392,7 +2392,7 @@ + + int adm8211_80211_header_parse(struct sk_buff *skb, unsigned char *haddr) + { +- memcpy(haddr, skb->mac.raw + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ ++ memcpy(haddr, skb->mac_header + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ + return ETH_ALEN; + } + From vmiklos at frugalware.org Tue Jul 10 21:22:50 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:23:06 2007 Subject: [Frugalware-git] frugalware-current: cdemu-0.8-21-i686 Message-ID: <20070710192250.3FAF518681EA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5cca7d303eb7c223455ad3aa7496b80dadce5244 commit 5cca7d303eb7c223455ad3aa7496b80dadce5244 Author: VMiklos Date: Tue Jul 10 16:21:28 2007 +0200 cdemu-0.8-21-i686 backported patch from svn for kernel2622 diff --git a/source/apps-extra/cdemu/FrugalBuild b/source/apps-extra/cdemu/FrugalBuild index b419583..68c02e5 100644 --- a/source/apps-extra/cdemu/FrugalBuild +++ b/source/apps-extra/cdemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cdemu pkgver=0.8 -pkgrel=20 +pkgrel=21 pkgdesc="A kernel module designed to simulate a CD drive with just simple cue/bin files." Finclude kernel-module depends=(${depends[@]} 'python') @@ -12,7 +12,9 @@ archs=('i686' 'x86_64') install=$pkgname.install _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('3a4e170232b74b1d62c73da78cf2abd58bf2daca') +source=($source $pkgname-$pkgver-svn_update.diff) +sha1sums=('3a4e170232b74b1d62c73da78cf2abd58bf2daca' \ + 'f72fba67deb7567bae5833d9710b73b340ffb4c4') build() { diff --git a/source/apps-extra/cdemu/cdemu-0.8-svn_update.diff b/source/apps-extra/cdemu/cdemu-0.8-svn_update.diff new file mode 100644 index 0000000..d032e37 --- /dev/null +++ b/source/apps-extra/cdemu/cdemu-0.8-svn_update.diff @@ -0,0 +1,1692 @@ +diff -Naur cdemu-0.8/cdemu cdemu-203/cdemu +--- cdemu-0.8/cdemu 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu 2007-01-06 18:04:36.000000000 +0100 +@@ -24,14 +24,13 @@ + Options: + -d, --device use the given device + -h, --help show this screen +- -s, --status shows the status of all virtual drives + -u, --unload unloads the given device + -v, --verbose be verbose + -V, --version show version and copyright notice + + CD image description files: + foobar.cue (CDRWin) +- foobar.iso (ISO9660) ++ foobar.iso (ISO-9660) + foobar.mds (Alchol 120%) + foobar.ccd (CloneCD) + foobar.nrg (Nero Burning ROM) +@@ -39,7 +38,6 @@ + Examples: + cdemu 0 foobar.cue load cd + cdemu -u 0 unload cd +- cdemu -s status + + Report bugs to + """ +@@ -47,6 +45,7 @@ + import getopt + import sys + import os ++import os.path + import re + import string + +@@ -92,9 +91,21 @@ + sys.exit() + if o in ["-s", "--status"]: + try: +- print open ("/proc/cdemu","r").read() ++ cde_devdir = "/sys/bus/virtual/devices" ++ print "reading status from: %s" % (cde_devdir) ++ print "device, loaded-status, image name, number of tracks." ++ devices = os.listdir(cde_devdir) ++ devices.sort() ++ for device in devices: ++ loaded = open(os.path.join(cde_devdir, device, "loaded")).read()[0] ++ if loaded != "0": ++ image = open(os.path.join(cde_devdir, device, "image")).read()[0] ++ else: ++ image = "(not loaded)" ++ tracks = open(os.path.join(cde_devdir, device, "tracks")).read()[0] ++ print "%s [%s]: %s (%s)" % (device, loaded, image, tracks) + except: +- print "cdemu: cdemu kernel module not loaded" ++ print "cdemu: Unavailable in this snapshot" + sys.exit(1) + if o in ["-u", "--unload"]: unload = 1 + if o in ["-v", "--verbose"]: libcdemu.verbose = 1 +diff -Naur cdemu-0.8/cdemu_core.c cdemu-203/cdemu_core.c +--- cdemu-0.8/cdemu_core.c 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_core.c 2007-01-11 22:50:46.000000000 +0100 +@@ -26,26 +26,56 @@ + #include "cdemu_kernel.h" + #include "cdemu.h" + ++static inline long cdemu_getoffset(struct cdemu_device *vc, int track, int lba); ++static inline void lba_to_msf(int lba, unsigned short *m, unsigned short *s, unsigned short *f); ++static inline int msf_to_lba(int m, int s, int f); ++static inline int cdemu_mode_2_sector_size(int mode); ++static void convert_track_mode(struct cdrom_tocentry *ep, int mode); ++static int cdemu_findtrack(struct cdemu_device *vc, int sector); ++static int read_toc_header(struct cdrom_tochdr *hp, struct cdemu_device *vc); ++static void get_toc_entry(struct cdrom_tocentry *ep, struct cdemu_device *vc); ++static int cdemu_read_actor_bio(read_descriptor_t *desc, struct page *page, ++ unsigned long offset, unsigned long size); ++static int cdemu_transfer_bio(struct cdemu_device *vc, struct bio *bio, sector_t sector); ++static int unload_cd(struct cdemu_device *vc); ++ + /* *********************************************************************** */ + /* helper functions (generic kernel) */ + /* *********************************************************************** */ + +-static inline int cdemu_msf_2_sector(int minute, int second, int frame) ++static inline long cdemu_getoffset(struct cdemu_device *vc, int track, int lba) + { +- return frame + (second + minute * 60 ) * 75; ++ return vc->tracks[track].start_offset + ++ (lba - vc->tracks[track].start_sector) * cdemu_mode_2_sector_size(vc->tracks[track].mode); ++} ++ ++static inline void lba_to_msf(int lba, unsigned short *m, unsigned short *s, unsigned short *f) ++{ ++ lba += CD_MSF_OFFSET; ++ lba &= 0xffffff; /* negative lbas use only 24 bits */ ++ *m = lba / (CD_SECS * CD_FRAMES); ++ lba %= (CD_SECS * CD_FRAMES); ++ *s = lba / CD_FRAMES; ++ *f = lba % CD_FRAMES; ++} ++ ++ ++static inline int msf_to_lba(int m, int s, int f) ++{ ++ return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET; + } + + static inline int cdemu_mode_2_sector_size(int mode) + { + switch (mode) { +- case AUDIO: return CD_FRAMESIZE_RAW; +- case AUDIO_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; +- case MODE1_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; ++ case AUDIO: return CD_FRAMESIZE_RAW; ++ case AUDIO_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; ++ case MODE1_2448: return CD_FRAMESIZE_RAW+CD_FRAMESIZE_SUB; + case MODE1_2352: return CD_FRAMESIZE_RAW; + case MODE1_2048: return CD_FRAMESIZE; + case MODE2_2352: return CD_FRAMESIZE_RAW; + case MODE2_2336: return CD_FRAMESIZE_RAW0; +- default: return 0; ++ default: return 0; + } + } + +@@ -118,20 +148,23 @@ + } + + static int cdemu_read_actor_bio(read_descriptor_t *desc, struct page *page, +- unsigned long offset, unsigned long size) { +- struct bio *bio = desc->arg.data; +- char *src_buf = kmap_atomic(page, KM_USER0) + offset; +- char *dst_buf = kmap_atomic(bio_page(bio), KM_USER1) + bio_offset(bio); +- +- if (size > desc->count) +- size = desc->count; +- +- memcpy(dst_buf, src_buf, size); +- +- kunmap_atomic(src_buf, KM_USER0); +- kunmap_atomic(dst_buf, KM_USER1); +- cond_resched(); +- return 0; ++ unsigned long offset, unsigned long size) ++{ ++ struct bio *bio = desc->arg.data; ++ char *src_buf = kmap_atomic(page, KM_USER0) + offset; ++ char *dst_buf = kmap_atomic(bio_page(bio), KM_USER1) + bio_offset(bio); ++ ++ if (size > desc->count - desc->written) ++ size = desc->count - desc->written; ++ ++ memcpy(dst_buf + desc->written, src_buf, size); ++ desc->written += size; ++ ++ kunmap_atomic(src_buf, KM_USER0); ++ kunmap_atomic(dst_buf, KM_USER1); ++ cond_resched(); ++ ++ return size; + } + + static int cdemu_transfer_bio(struct cdemu_device *vc, struct bio *bio, sector_t sector) +@@ -158,6 +191,12 @@ + case MODE1_2048: + offset = 0; + break; ++ case MODE2_2352: ++ offset = CD_SYNC_SIZE + CD_HEAD_SIZE + CD_SUBHEAD_SIZE; ++ break; ++ case MODE2_2336: ++ offset = CD_SUBHEAD_SIZE; ++ break; + default: + if (printk_ratelimit()) + printk_cdemu(KERN_WARNING, "Normal read not possible for track mode '%i'\n", vc->tracks[track].mode); +@@ -165,9 +204,7 @@ + } + + /* get the mode of the bin file part and calc the positon */ +- startposition = vc->tracks[track].start_offset + +- (sector - vc->tracks[track].start_sector) +- * cdemu_mode_2_sector_size(vc->tracks[track].mode); ++ startposition = cdemu_getoffset(vc, track, sector); + + /* we only support read, and we told the kernel that, + * so we won't check it here */ +@@ -176,7 +213,7 @@ + retval = vc->backing_file->f_op->sendfile(vc->backing_file, + &position, bio_iovec(bio)->bv_len, cdemu_read_actor_bio, bio); + if (retval < 0) { +- dprintk("cdemu_transfer: retval error %i\n", retval); ++ dprintk("cdemu_transfer: retval error %i\n", (int) retval); + return retval; + } else { + return 0; +@@ -196,7 +233,11 @@ + return -EACCES; + + /* just close the bin file */ ++ set_capacity(vc->gd, 0); + vc->loaded = 0; ++ vc->size = 0; ++ vc->num_tracks = 0; ++ strncpy(vc->comment, "", CDEMU_COMMENT_SIZE); + fput(vc->backing_file); + DOWN_MODULE_USE(); + +@@ -377,14 +418,24 @@ + return 0; + } + +-static int cdemu_reset(struct cdrom_device_info *cdi) ++static int cdemu_reset_helper(struct device *dev, void *ptr) + { +- int i; ++ struct cdemu_device *vc; ++ ++ vc = to_cdemu_device(dev); ++ if(!vc) ++ return -1; + ++ unload_cd(vc); ++ ++ return 0; ++} ++ ++static int cdemu_reset(struct cdrom_device_info *cdi) ++{ + dprintk("cdemu_reset: start\n"); + +- for (i = 0; i < cdemu_count; ++i) +- unload_cd(&cdemu_dev[i]); ++ device_for_each_child(&virtual_bus, NULL, &cdemu_reset_helper); + + return 0; + } +@@ -423,11 +474,89 @@ + } + } + +-/* RENE: no idea how I should implement that ... so just say we set it */ ++/* RENE: no idea how I should implement that ... so just print that command */ + static int cdemu_generic_packet(struct cdrom_device_info *cdi, +- struct packet_command *dummy) ++ struct packet_command *pc) + { +- dprintk("cdemu_generic_packet: start\n"); ++ int ret = -EIO; ++ int i; ++ dprintk("cdemu_generic_packet: start -"); ++ for (i = 0; i < CDROM_PACKET_SIZE; i++) ++ printk(" %.2x", pc->cmd[i]); ++ printk("\n"); ++ ++ if (pc->sense) { ++ dprintk("cdemu_generic_packet: sense unknown\n"); ++ pc->sense->sense_key = 0x05; ++ pc->sense->asc = 0x20; ++ pc->sense->ascq = 0x00; ++ } ++ ++ pc->stat = ret; ++ return ret; ++} ++ ++static int cdemu_read_data(struct cdrom_device_info *cdi, __u8 __user *ubuf, int lba, int nframes, int mode) ++{ ++ struct cdemu_device *vc = cdi->handle; ++ ssize_t delta = -1, retval = 0; ++ int t, frame_size; ++ size_t size; ++ loff_t off; ++ ++ t = cdemu_findtrack(vc, lba); ++ off = cdemu_getoffset(vc, t, lba); ++ frame_size = cdemu_mode_2_sector_size(mode); ++ size = nframes * frame_size; ++ ++ dprintk("cdemu_read_data: reading %d frame(s) starting at lba %d\n", nframes, lba); ++ ++ if (vc->tracks[t].mode == mode) ++ delta = 0; ++ else ++ { ++ switch (vc->tracks[t].mode) ++ { ++ case AUDIO_2448: ++ if (mode == AUDIO) ++ delta = CD_FRAMESIZE_SUB; ++ break; ++ case MODE1_2448: ++ if (mode == MODE1_2352) ++ delta = CD_FRAMESIZE_SUB; ++ break; ++ } ++ } ++ ++ ++ if (delta == 0) ++ retval = vc->backing_file->f_op->read(vc->backing_file, ubuf, size, &off); ++ else if (delta > 0) ++ { ++ dprintk("cdemu_read_data: scatter-gather %d frames\n", nframes); ++ ++ while (nframes-- > 0) ++ { ++ ssize_t read = vc->backing_file->f_op->read(vc->backing_file, ubuf, frame_size, &off); ++ ++ if (read != frame_size) ++ break; ++ ++ retval += read; ++ off += delta; ++ ubuf += frame_size; ++ } ++ } ++ else ++ dprintk("cdemu_read_data: source mode %d, but target mode %d!\n", vc->tracks[t].mode, mode); ++ ++ if (retval != size) ++ { ++ dprintk("cdemu_read_data: only %i bytes read\n", retval); ++ ++ return -EIO; ++ } ++ + return 0; + } + +@@ -438,10 +567,11 @@ + struct cdrom_msf msf; + struct cdemu_info cdemu_info; + +- loff_t position; +- int sector; +- int track; +- int tmp; ++ sector_t gd_sector; ++ loff_t position; ++ int sector; ++ int track; ++ int tmp; + + dprintk("cdemu_ioctl: start\n"); + +@@ -466,7 +596,7 @@ + if (copy_from_user(&msf, (void *) arg, sizeof(msf))) + return -EFAULT; + +- sector = cdemu_msf_2_sector(msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0); ++ sector = msf_to_lba(msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0); + track = cdemu_findtrack(vc, sector); + + /* get the mode of the bin file part and calc the positon */ +@@ -486,17 +616,52 @@ + } + + if (cmd == CDROMREADRAW) { +- tmp = generic_file_read(vc->backing_file, (void*)arg, CD_FRAMESIZE_RAW, &position); ++ struct iovec local_iov = { .iov_base = (void*)arg, .iov_len = CD_FRAMESIZE_RAW }; ++ struct kiocb kiocb; ++ ++ init_sync_kiocb(&kiocb, vc->backing_file); ++ tmp = generic_file_aio_read(&kiocb, &local_iov, 1, position); ++ if (-EIOCBQUEUED == tmp) ++ tmp = wait_on_sync_kiocb(&kiocb); ++ + if (tmp != CD_FRAMESIZE_RAW) +- dprintk("only read %i bytes\n",tmp); ++ dprintk("only read %i bytes\n",tmp); + } else { /*CDROMREADCOOKED*/ +- tmp = generic_file_read(vc->backing_file, (void*)arg, CD_FRAMESIZE, &position); ++ struct iovec local_iov = { .iov_base = (void*)arg, .iov_len = CD_FRAMESIZE }; ++ struct kiocb kiocb; ++ ++ init_sync_kiocb(&kiocb, vc->backing_file); ++ tmp = generic_file_aio_read(&kiocb, &local_iov, 1, position); ++ if (-EIOCBQUEUED == tmp) ++ tmp = wait_on_sync_kiocb(&kiocb); ++ + if (tmp != CD_FRAMESIZE) + dprintk("only read %i bytes\n",tmp); + } + + return 0; ++ case CDROMREADAUDIO: ++ { ++ struct cdrom_read_audio ra; ++ int lba; ++ ++ if (copy_from_user(&ra, (struct cdrom_read_audio *) arg, sizeof(ra))) ++ return -EFAULT; ++ ++ if (ra.addr_format == CDROM_MSF) ++ lba = msf_to_lba(ra.addr.msf.minute, ++ ra.addr.msf.second, ++ ra.addr.msf.frame); ++ else if (ra.addr_format == CDROM_LBA) ++ lba = ra.addr.lba; ++ else ++ return -EINVAL; ++ ++ if (lba < 0 || ra.nframes <= 0 || ra.nframes > CD_FRAMES) ++ return -EINVAL; + ++ return cdemu_read_data(cdi, ra.buf, lba, ra.nframes, AUDIO); ++ } + case CDROMSEEK: /* seek msf address - not supported */ + return 0; + +@@ -527,8 +692,22 @@ + printk_cdemu(KERN_INFO, "loaded %s cd (%i track[s]) on drive %s by uid %i\n", + vc->comment, vc->num_tracks, cdi->name, vc->uid); + +- /* hard coded to get the size of the first track */ +- vc->size = vc->tracks[1].start_sector * CD_FRAMESIZE; ++ for (tmp = 0; tmp <= vc->num_tracks; tmp++) ++ { ++ dprintk("cdemu_ioctl: track %d: %02d:%02d:%02d (%lu), offset %lu\n", (tmp == vc->num_tracks) ? CDROM_LEADOUT : tmp + 1, ++ vc->tracks[tmp].minute, ++ vc->tracks[tmp].second, ++ vc->tracks[tmp].frame, ++ vc->tracks[tmp].start_sector, ++ vc->tracks[tmp].start_offset); ++ } ++ ++ /* set size of device to image size */ ++ track = vc->num_tracks; ++ vc->size = vc->tracks[track].start_sector * CD_FRAMESIZE; ++ gd_sector = vc->size / KERNEL_SECTOR_SIZE; ++ set_capacity(vc->gd, gd_sector); ++ dprintk("cdemu_ioctl: loading ... size (2048 bytes/sector): %i, sectors (512 bytes/sector): %i\n", vc->size, (int) gd_sector); + + /* only inc use count if there was no cd in the drive */ + if (!vc->loaded) +@@ -554,10 +733,7 @@ + { + dprintk("cdemu_block_open: start\n"); + +- if (inode \ +- && inode->i_bdev \ +- && inode->i_bdev->bd_disk \ +- && inode->i_bdev->bd_disk->private_data) { ++ if (inode && inode->i_bdev && inode->i_bdev->bd_disk && inode->i_bdev->bd_disk->private_data) { + struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; + dprintk("cdemu_block_open: going into cdrom_open()\n"); + return cdrom_open(&vc->info, inode, file); +@@ -571,10 +747,7 @@ + { + dprintk("cdemu_block_release: start\n"); + +- if (inode \ +- && inode->i_bdev \ +- && inode->i_bdev->bd_disk \ +- && inode->i_bdev->bd_disk->private_data) { ++ if (inode && inode->i_bdev && inode->i_bdev->bd_disk && inode->i_bdev->bd_disk->private_data) { + struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; + return cdrom_release(&vc->info, file); + } +@@ -587,10 +760,7 @@ + { + dprintk("cdemu_block_ioctl: start\n"); + +- if (inode \ +- && inode->i_bdev \ +- && inode->i_bdev->bd_disk \ +- && inode->i_bdev->bd_disk->private_data) { ++ if (inode && inode->i_bdev && inode->i_bdev->bd_disk && inode->i_bdev->bd_disk->private_data) { + struct cdemu_device *vc = (struct cdemu_device *)inode->i_bdev->bd_disk->private_data; + + int ret = cdemu_ioctl(&vc->info, cmd, arg); +diff -Naur cdemu-0.8/cdemu.h cdemu-203/cdemu.h +--- cdemu-0.8/cdemu.h 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu.h 2006-10-11 21:11:56.000000000 +0200 +@@ -45,11 +45,12 @@ + + #define CDEMU_COMMENT_SIZE 256 + #define CDEMU_MAX_TRACKS 47 ++ + struct cdemu_info { +- tTrack tracks[CDEMU_MAX_TRACKS]; +- unsigned int ffd; +- int num_tracks; +- char comment[CDEMU_COMMENT_SIZE]; ++ tTrack tracks[CDEMU_MAX_TRACKS]; ++ unsigned int ffd; ++ int num_tracks; ++ char comment[CDEMU_COMMENT_SIZE]; + }; + + #endif /* __CDEMU_H__ */ +diff -Naur cdemu-0.8/cdemu_kernel.h cdemu-203/cdemu_kernel.h +--- cdemu-0.8/cdemu_kernel.h 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_kernel.h 2006-10-11 21:11:56.000000000 +0200 +@@ -29,10 +29,13 @@ + + #define MAJOR_NR 0 + #define DEVICE_NR(device) MINOR(device) /* has no partition bits */ +-#define DEVICE_NAME "cdemu" /* name for messaging */ +-#define DEVICE_NO_RANDOM /* no entropy to contribute */ ++#define DEVICE_NAME "cdemu" /* name for messaging */ ++#define DEVICE_NO_RANDOM /* no entropy to contribute */ + #define DEVICE_REQUEST cdemu_request +-#define DEVICE_OFF(d) /* do-nothing */ ++#define DEVICE_OFF(d) /* do-nothing */ ++ ++#define DRIVER_NAME "cdemu" ++#define BUS_NAME "virtual" + + #include /* try_module_get,module_put */ + #include /* init/exit funcs */ +@@ -41,10 +44,11 @@ + #include /* the generic disk interface */ + #include /* cdrom declarations */ + #include /* fput */ ++#include /* device functions */ + #include /* kmap functions */ + #include /* access to the 'current' struct */ +-#include /* MODULE_AUTHOR,module_parm */ +-#include /* buffer operations */ ++#include /* MODULE_AUTHOR,module_parm */ ++#include /* buffer operations */ + #include + #include + +@@ -52,30 +56,40 @@ + #include + #endif + +-#include "cdemu_proc.h" + #include "cdemu.h" + #define CDEMU_MODULE_VERSION CDEMU_VERSION + + struct cdemu_device { +- int number; +- dev_t device; +- tTrack tracks[CDEMU_MAX_TRACKS]; +- int num_tracks; /* number of tracks on the cd */ +- struct file *backing_file; +- int loaded; +- int uid; /* user who mounted cd */ +- int media_changed; +- int locked; +- int pause; +- char comment[CDEMU_COMMENT_SIZE]; +- int size; +- spinlock_t lock; +- struct cdrom_device_info info; +- struct request_queue *queue; ++ int number; ++ dev_t device; ++ tTrack tracks[CDEMU_MAX_TRACKS]; ++ int num_tracks; /* number of tracks on the cd */ ++ struct file *backing_file; ++ int loaded; ++ int uid; /* user who mounted cd */ ++ int media_changed; ++ int locked; ++ int pause; ++ char comment[CDEMU_COMMENT_SIZE]; ++ int size; ++ spinlock_t lock; ++ struct cdrom_device_info info; ++ struct request_queue *queue; + struct gendisk *gd; +- struct block_device *bdev; ++ struct device dev; ++}; ++ ++#define to_cdemu_device(n) container_of(n, struct cdemu_device, dev) ++ ++struct cdemu_driver { ++ char *version; ++ int major; ++ int count; ++ struct device_driver drv; + }; + ++#define to_cdemu_driver(n) container_of(n, struct cdemu_driver, drv) ++ + #define CDEMU_DEBUG + #ifdef CDEMU_DEBUG + #define dprintk(msg, args...) \ +@@ -90,21 +104,24 @@ + printk(lvl "cdemu:%i: " msg, __LINE__, ## args); \ + } while(0) + +-#define AUDIO 0 +-#define MODE1 1 +-#define MODE2 2 +-#define AUDIO_2448 10 +-#define MODE1_2448 20 +-#define MODE1_2352 30 +-#define MODE1_2048 40 +-#define MODE2_2352 50 +-#define MODE2_2336 60 +- +-#define CDEMU_LOADCD 0x5400 /* load the virtual cd */ +-#define CDEMU_UNLOADCD 0x5401 /* unload the virtual cd*/ +- +-extern int cdemu_major, cdemu_count; +-extern struct cdemu_device *cdemu_dev; ++#define AUDIO 0 ++#define MODE1 1 ++#define MODE2 2 ++#define AUDIO_2448 10 ++#define MODE1_2448 20 ++#define MODE1_2352 30 ++#define MODE1_2048 40 ++#define MODE2_2352 50 ++#define MODE2_2336 60 ++ ++#define CDEMU_LOADCD 0x5400 /* load the virtual cd */ ++#define CDEMU_UNLOADCD 0x5401 /* unload the virtual cd*/ ++ ++#define KERNEL_SECTOR_SIZE 512 ++ ++extern struct cdemu_driver cdemu_drv; ++extern struct bus_type virtual_bus_type; ++extern struct device virtual_bus; + + #define UP_MODULE_USE() try_module_get(THIS_MODULE) + #define DOWN_MODULE_USE() module_put(THIS_MODULE) +diff -Naur cdemu-0.8/cdemu_mod.c cdemu-203/cdemu_mod.c +--- cdemu-0.8/cdemu_mod.c 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_mod.c 2006-10-22 20:35:25.000000000 +0200 +@@ -23,205 +23,458 @@ + * * + ***************************************************************************/ + +-/* +- * Version 0.7 - 2004-12-8 +- * works with current 2.6 kernels +- * +- * Version 0.6 - 2003-10-13 +- * add linux-2.6.x support and break up code to try to +- * blur the differences between 2.4.x and 2.6.x +- * +- * Version 0.5 - 2003-07-02 +- * rename to CDemu +- * rewrite of major parts to be 100% compatible to a cdrom +- * user space interface changed for new userspace program +- +- * Version 0.4 - 2003-04-08 +- * removed sys_call_table use +- * fixed bug with devfsd +- * some extra error handling for the userspace program +- +- * Version 0.3 - 2003-01-11 +- * added check if a "cd is loaded" +- * removed all warnings +- * code cleanup +- +- * Version 0.2 - 2003-01-12 +- * support for proc fs +- * changed the vclib.c so it can be used by gui programs +- +- * Version 0.1 - 2003-01-10 +- * first test release (data and raw mode work - but no checks, if you do +- * something wrong you'll kill the kernel ;-) +- * +- */ + + #include "cdemu_kernel.h" + #include "cdemu.h" + ++#define MIN_CDEMUS 1 /* Minimum number of block devices */ ++#define MAX_CDEMUS 255 /* 2.6 can have more than this but who would use it ? */ ++#define DEFAULT_CDEMUS 4 /* Default number of block devices */ ++ ++/* external stuff */ + extern struct cdrom_device_ops cdemu_dops; + extern struct block_device_operations cdemu_bdops; + extern void cdemu_request(request_queue_t*); + extern int cdemu_make_request(request_queue_t*, struct bio*); + +-int cdemu_major = MAJOR_NR; +-int cdemu_count = 8; +-struct cdemu_device *cdemu_dev; ++/* bus functions */ ++static int virtual_bus_remove(struct device *dev); ++static void virtual_bus_shutdown(struct device *dev); ++static void virtual_bus_release(struct device *bus); ++ ++/* driver functions */ ++static ssize_t show_driver_version(struct device_driver *drv, char *buf); ++static ssize_t show_driver_devices(struct device_driver *drv, char *buf); ++static ssize_t store_driver_devices(struct device_driver *drv, const char *buf, size_t count); ++static int store_driver_devices_helper(struct device *dev, void *ptr); ++ ++/* device functions */ ++static void cdemu_device_release(struct device *dev); ++static struct cdemu_device *add_cdemu_device(int i); ++static int remove_cdemu_device_helper(struct device *dev, void *ptr); ++ ++static ssize_t show_device_attr(struct device *dev, struct device_attribute *attr, char *buf); ++ ++/* global variables */ ++struct cdemu_driver cdemu_drv = { ++ .version = CDEMU_VERSION, ++ .major = MAJOR_NR, ++ .count = DEFAULT_CDEMUS, ++ .drv = { ++ .name = DRIVER_NAME, ++ .bus = &virtual_bus_type, ++ .owner = THIS_MODULE ++ } ++}; ++ ++struct bus_type virtual_bus_type = { ++ .name = BUS_NAME, ++ .remove = &virtual_bus_remove, ++ .shutdown = &virtual_bus_shutdown ++}; + +-static int __init cdemu_init(void) ++struct device virtual_bus = { ++ .bus_id = BUS_NAME, ++ .bus = NULL, ++ .parent = NULL, ++ .release = &virtual_bus_release ++}; ++ ++struct devices_vars { ++ int n; ++ int old, new; ++}; ++ ++static int driver_was_registered = 0; /* did the driver already exist? */ ++ ++static DRIVER_ATTR(version, 0444, show_driver_version, NULL); ++static DRIVER_ATTR(devices, 0664, show_driver_devices, store_driver_devices); ++ ++static DEVICE_ATTR(major, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(minor, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(loaded, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(image, 0444, show_device_attr, NULL); ++static DEVICE_ATTR(tracks, 0444, show_device_attr, NULL); ++ ++ ++ ++static int virtual_bus_remove(struct device *dev) + { +-/* check if the kernelparmeter is correct and register the block devices */ +-#define MIN_CDEMUS 1 /* should be self explanatory ... */ +-#define MAX_CDEMUS 255 /* 2.6 can have more than this but who would use it ? */ ++ if(!dev) ++ return -1; + +- int i; +- struct cdemu_device *vc; ++ dprintk("%s: device %s\n", __FUNCTION__, dev->bus_id); ++ ++ return 0; ++} ++ ++static void virtual_bus_shutdown(struct device *dev) ++{ ++ if(!dev) ++ return; ++ ++ dprintk("%s: device %s\n", __FUNCTION__, dev->bus_id); ++} ++ ++static void virtual_bus_release(struct device *bus) ++{ ++ if(!bus) ++ return; ++ ++ dprintk("%s: bus %s\n", __FUNCTION__, bus->bus_id); ++} ++ ++static ssize_t show_driver_version(struct device_driver *drv, char *buf) ++{ ++ struct cdemu_driver *cdrv; ++ ++ cdrv = to_cdemu_driver(drv); ++ if(!drv || !buf || !cdrv) ++ return -1; ++ ++ return snprintf(buf, PAGE_SIZE, "%s\n", cdrv->version); ++} ++ ++static ssize_t show_driver_devices(struct device_driver *drv, char *buf) ++{ ++ struct cdemu_driver *cdrv; + +- dprintk("cdemu_init: start\n"); ++ cdrv = to_cdemu_driver(drv); ++ if(!drv || !buf || !cdrv) ++ return -1; + +- if ((cdemu_count < MIN_CDEMUS) || (cdemu_count > MAX_CDEMUS)) { +- printk_cdemu(KERN_WARNING, "invalid cdemu_count (must be between %i and %i), using default (%i)\n", +- MIN_CDEMUS, MAX_CDEMUS, MIN_CDEMUS); +- cdemu_count = 8; +- } +- +- i = +- register_blkdev(cdemu_major, DEVICE_NAME); +- if (i < 0) { +- printk_cdemu(KERN_ERR, "unable to register block device #%i for cdemu device\n", cdemu_major); +- return -EBUSY; +- } else if (i) +- cdemu_major = i; +- +- /* allocate cdemu_count entries in our struct */ +- cdemu_dev = kmalloc(cdemu_count * sizeof(struct cdemu_device), GFP_KERNEL); +- if (!cdemu_dev) { +- printk_cdemu(KERN_ERR, "could not kmalloc enough memory for %i cdemu devices\n", cdemu_count); +- goto out_nomem; ++ return snprintf(buf, PAGE_SIZE, "%i\n", cdrv->count); ++} ++ ++static int store_driver_devices_helper(struct device *dev, void *ptr) ++{ ++ struct devices_vars *dv; ++ ++ dv = (struct devices_vars *) ptr; ++ if(!dev || !ptr || !dv) ++ return -1; ++ ++ /* remove devices */ ++ if(dv->n >= dv->new) ++ remove_cdemu_device_helper(dev, NULL); ++ ++ dv->n++; ++ ++ return 0; ++} ++ ++static ssize_t store_driver_devices(struct device_driver *drv, const char *buf, size_t count) ++{ ++ char *endp; ++ struct devices_vars dv; ++ ++ if(!drv || !buf) ++ return -1; ++ ++ endp = (char *) buf + count - 1; ++ dv.old = cdemu_drv.count; ++ dv.new = simple_strtol(buf, &endp, 10); ++ ++ dprintk("%s: old device count: %i, new device count: %i.\n", __FUNCTION__, dv.old, dv.new); ++ ++ if((dv.new < MIN_CDEMUS) || (dv.new > MAX_CDEMUS) || (dv.new == dv.old)) ++ return (ssize_t) count; ++ ++ if(dv.new < dv.old) { ++ /* remove devices */ ++ dv.n = 0; ++ device_for_each_child(&virtual_bus, &dv, &store_driver_devices_helper); ++ } ++ else { ++ /* add devices */ ++ for(dv.n = dv.old; dv.n < dv.new; dv.n++) { ++ if(!add_cdemu_device(dv.n)) ++ return -1; ++ } + } + +-#if defined(CONFIG_DEVFS_FS) +- devfs_mk_dir("cdemu"); +-#endif ++ cdemu_drv.count = dv.new; ++ ++ return (ssize_t) count; ++} ++ ++static void cdemu_device_release(struct device *dev) ++{ ++ if(!dev) ++ return; ++ ++ dprintk("%s: device %s\n", __FUNCTION__, dev->bus_id); ++ ++ /* Do only LDM related releasing here */ ++} ++ ++static struct cdemu_device *add_cdemu_device(int i) ++{ ++ struct cdemu_device *vc; ++ ++ /* allocate device */ ++ vc = kmalloc(sizeof(struct cdemu_device), GFP_KERNEL); ++ if(!vc) ++ goto add_device_free; ++ memset(vc, 0, sizeof(struct cdemu_device)); ++ ++ /* init device fields */ ++ vc->number = i; ++ vc->loaded = 0; ++ vc->media_changed = 0; ++ vc->locked = 0; ++ vc->pause = 0; ++ vc->info.ops = &cdemu_dops; ++ vc->info.speed = 0; /* FIXME max_speed */ ++ vc->info.handle = vc; ++ vc->info.capacity = 1; ++ snprintf(vc->info.name, 20, "%s%i", DEVICE_NAME, i); ++ spin_lock_init(&vc->lock); ++ dprintk("%s: making cdrom #%i [%p]: %s\n", __FUNCTION__, vc->number, vc, vc->info.name); ++ ++ /* register with the linux device model */ ++ vc->dev.bus = &virtual_bus_type; ++ vc->dev.driver = &cdemu_drv.drv; /* driver binding; if set to NULL invokes match & probe */ ++ vc->dev.release = &cdemu_device_release; ++ vc->dev.parent = &virtual_bus; ++ strncpy(vc->dev.bus_id, vc->info.name, BUS_ID_SIZE); ++ if(device_register(&vc->dev)) ++ goto add_device_free; ++ if(device_create_file(&vc->dev, &dev_attr_major)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_minor)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_loaded)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_image)) ++ goto add_device_unregister; ++ if(device_create_file(&vc->dev, &dev_attr_tracks)) ++ goto add_device_unregister; ++ ++ /* register with the uniform cdrom driver */ ++ vc->gd = alloc_disk(1); ++ if (!vc->gd) ++ goto add_device_out; ++ vc->gd->major = cdemu_drv.major; ++ vc->gd->first_minor = i; ++ snprintf(vc->gd->disk_name, 32, "%s%i", DEVICE_NAME, i); ++ vc->gd->fops = &cdemu_bdops; ++ vc->gd->private_data = vc; ++ vc->gd->flags = GENHD_FL_REMOVABLE | GENHD_FL_CD; ++ vc->gd->driverfs_dev = &vc->dev; ++ set_capacity(vc->gd, 0); ++ ++ if(register_cdrom(&vc->info)) ++ printk(KERN_WARNING "%s: cannot register cdrom\n", __FUNCTION__); ++ ++ vc->queue = blk_alloc_queue(GFP_KERNEL); ++ blk_queue_make_request(vc->queue, cdemu_make_request); ++ if (!vc->queue) ++ goto add_device_out; ++ vc->gd->queue = vc->queue; ++ add_disk(vc->gd); + +- for (i = 0; i < cdemu_count; ++i) { +- vc = &cdemu_dev[i]; +- memset(vc, 0, sizeof(struct cdemu_device)); +- vc->number = i; +- vc->loaded = 0; +- vc->media_changed = 0; +- vc->locked = 0; +- vc->pause = 0; +- vc->bdev = NULL; +- vc->info.ops = &cdemu_dops; +- vc->info.speed = 0; /* FIXME max_speed */ +- vc->info.capacity = 1; +- vc->info.handle = vc; +- sprintf(vc->info.name, "%s%i", DEVICE_NAME, i); +- spin_lock_init(&vc->lock); +- dprintk("cdemu_init: making cdrom #%i [%p]: %s\n", vc->number, vc, vc->info.name); +- +- /* register with the uniform cdrom driver */ +- vc->gd = alloc_disk(1); +- if (!vc->gd) +- goto out; +- vc->gd->major = cdemu_major; +- vc->gd->first_minor = i; +- sprintf(vc->gd->disk_name, "%s%i", DEVICE_NAME, i); +- vc->gd->fops = &cdemu_bdops; +- vc->gd->private_data = vc; +- vc->gd->flags = GENHD_FL_REMOVABLE | GENHD_FL_CD; +- set_capacity(vc->gd, 0); +- register_cdrom(&vc->info); +- vc->queue = blk_alloc_queue(GFP_KERNEL); +- blk_queue_make_request(vc->queue, cdemu_make_request); +- if (!vc->queue) +- goto out; +- vc->gd->queue = vc->queue; +- add_disk(vc->gd); + #ifdef CONFIG_DEVFS_FS +- devfs_mk_bdev(MKDEV(vc->gd->major, vc->gd->first_minor), +- S_IFBLK|S_IRUSR|S_IWUSR, +- "cdemu/%i", i); ++ devfs_mk_bdev(MKDEV(vc->gd->major, vc->gd->first_minor), ++ S_IFBLK|S_IRUSR|S_IWUSR, ++ "cdemu/%i", i); + #endif ++ ++ return vc; ++ ++add_device_out: ++ if (vc->gd) { ++ put_disk(vc->gd); ++ del_gendisk(vc->gd); ++ vc->gd = NULL; + } ++ if (vc->queue) { ++ blk_put_queue(vc->queue); ++ vc->queue = NULL; ++ } ++ ++ unregister_cdrom(&vc->info); ++ ++add_device_unregister: ++ device_unregister(&vc->dev); ++ ++add_device_free: ++ kfree(vc); ++ ++ return NULL; ++} + +- if (!cdemu_proc_make()) { +- dprintk("cdemu_init: Error registering /proc entry!\n"); +- goto out_freeall; ++static int remove_cdemu_device_helper(struct device *dev, void *ptr) ++{ ++ struct cdemu_device *vc; ++ ++ vc = to_cdemu_device(dev); ++ if (!dev || !vc) ++ return -1; ++ ++ dprintk("%s: removing cdrom #%i [%p]: %s\n", __FUNCTION__, vc->number, vc, vc->dev.bus_id); ++ ++ if (vc->gd) { ++ put_disk(vc->gd); ++ del_gendisk(vc->gd); ++ vc->gd = NULL; ++ } ++ if (vc->queue) { ++ blk_put_queue(vc->queue); ++ vc->queue = NULL; + } ++ ++ if (unregister_cdrom(&vc->info)) ++ printk(KERN_WARNING "%s: cannot unregister cdrom\n", __FUNCTION__); ++ ++#ifdef CONFIG_DEVFS_FS ++ dprintk("%s: removing devfs\n", __FUNCTION__); ++ devfs_remove("cdemu/%i", vc->number); ++#endif ++ ++ device_unregister(dev); ++ ++ kfree(vc); + +- /* all done report our success */ +- dprintk("cdemu_init: loaded (max %i devices)\n", cdemu_count); +- dprintk("cdemu_init: end\n"); +- printk_cdemu(KERN_INFO, "ver " CDEMU_MODULE_VERSION " loaded. Registered %i cdemus.\n", cdemu_count); + return 0; ++} + +-out: +- for (i = 0; i < cdemu_count; ++i) { +- vc = &cdemu_dev[i]; +- if (vc->queue) +- blk_put_queue(vc->queue); +- if (vc->gd) { +- put_disk(vc->gd); +- del_gendisk(vc->gd); +- } ++static ssize_t show_device_attr(struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ struct cdemu_device *vc; ++ ssize_t retval; ++ ++ vc = to_cdemu_device(dev); ++ retval = 0; ++ if(!dev || !attr || !buf || !vc) ++ return 0; ++ ++ dprintk("%s: device %s\n", __FUNCTION__,dev->bus_id); ++ ++ /* choose one of the device attributes */ ++ if (attr == &dev_attr_major) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->gd->major); ++ } ++ else if(attr == &dev_attr_minor) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->gd->first_minor); ++ } ++ else if(attr == &dev_attr_loaded) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->loaded); ++ } ++ else if(attr == &dev_attr_image) { ++ retval = snprintf(buf, PAGE_SIZE, "%s\n", vc->comment); ++ } ++ else if(attr == &dev_attr_tracks) { ++ retval = snprintf(buf, PAGE_SIZE, "%i\n", vc->num_tracks); + } +-out_freeall: +- kfree(cdemu_dev); +-out_nomem: +- if (unregister_blkdev(cdemu_major, DEVICE_NAME)) +- printk_cdemu(KERN_ERR, "unable to unregister block device\n"); + +- printk_cdemu(KERN_ERR, "cdemu_init: ran out of memory\n"); +- return -ENOMEM; ++ return retval; + } + +-static void __exit cdemu_exit(void) ++static int __init cdemu_init(void) + { +- int i; +- struct cdemu_device *vc; ++ int i, retval; + +- dprintk("cdemu_exit: start\n"); ++ dprintk("%s: start\n", __FUNCTION__); + +- /* get rid of the proc stuff */ +- cdemu_proc_remove(); ++ /* register bus */ ++ dprintk("%s: registering bus: %s\n", __FUNCTION__, virtual_bus_type.name); ++ if(bus_register(&virtual_bus_type)) ++ goto out; ++ if(device_register(&virtual_bus)) ++ goto out_bus_unregister; ++ ++ /* register driver */ ++ if(!driver_find(DRIVER_NAME, &virtual_bus_type)) { ++ dprintk("%s: registering driver: %s\n", __FUNCTION__, cdemu_drv.drv.name); ++ driver_was_registered = 0; ++ if(driver_register(&cdemu_drv.drv)) ++ goto out_bus_unregister; ++ if(driver_create_file(&cdemu_drv.drv, &driver_attr_version)) ++ goto out_driver_unregister; ++ if(driver_create_file(&cdemu_drv.drv, &driver_attr_devices)) ++ goto out_driver_unregister; ++ } ++ else { ++ driver_was_registered = 1; /* not possible? */ ++ } + +- for (i = 0; i < cdemu_count; ++i) { +- vc = &cdemu_dev[i]; +- dprintk("cdemu_exit: unregistering cdrom #%i [%p]: %s\n", vc->number, vc, vc->info.name); +-#ifdef CONFIG_DEVFS_FS +- devfs_remove("cdemu/%i", i); ++ /* check if the kernel parameter is correct and register the block devices */ ++ if ((cdemu_drv.count < MIN_CDEMUS) || (cdemu_drv.count > MAX_CDEMUS)) { ++ printk_cdemu(KERN_WARNING, "invalid cdemu_count (must be in range [%i, %i]), using default (%i)\n", ++ MIN_CDEMUS, MAX_CDEMUS, DEFAULT_CDEMUS); ++ cdemu_drv.count = DEFAULT_CDEMUS; ++ } ++ ++ retval = register_blkdev(cdemu_drv.major, DEVICE_NAME); ++ if (retval < 0) { ++ printk_cdemu(KERN_ERR, "unable to register block device #%i for cdemu device\n", cdemu_drv.major); ++ goto out_blkdev; ++ } else if (retval) ++ cdemu_drv.major = retval; ++ ++#if defined(CONFIG_DEVFS_FS) ++ devfs_mk_dir("cdemu"); + #endif +- if (vc->bdev) { +- dprintk("cdemu_exit: punting bdev\n"); +- invalidate_bdev(vc->bdev, 1); +- bdput(vc->bdev); +- } +- if (vc->gd) { +- dprintk("cdemu_exit: punting gendisk\n"); +- del_gendisk(vc->gd); +- put_disk(vc->gd); +- } +- if (vc->queue) { +- dprintk("cdemu_exit: punting queue\n"); +- blk_put_queue(vc->queue); +- } +- if (unregister_cdrom(&vc->info)) +- printk(KERN_WARNING "cdemu: cannot unregister cdrom\n"); ++ ++ for (i = 0; i < cdemu_drv.count; ++i) { ++ if(!add_cdemu_device(i)) ++ goto out_free_devices; + } + ++ /* all done report our success */ ++ dprintk("%s: loaded (%i devices)\n", __FUNCTION__, cdemu_drv.count); ++ dprintk("%s: end\n", __FUNCTION__); ++ printk_cdemu(KERN_INFO, "cdemu ver. " CDEMU_MODULE_VERSION " loaded. Registered %i cdemus.\n", cdemu_drv.count); ++ ++ return 0; ++ ++out_free_devices: ++ device_for_each_child(&virtual_bus, NULL, &remove_cdemu_device_helper); ++ ++out_blkdev: ++ if (unregister_blkdev(cdemu_drv.major, DEVICE_NAME)) ++ printk_cdemu(KERN_ERR, "unable to unregister block device\n"); ++ ++out_driver_unregister: ++ driver_unregister(&cdemu_drv.drv); ++ ++out_bus_unregister: ++ device_unregister(&virtual_bus); ++ bus_unregister(&virtual_bus_type); ++ ++out: ++ printk_cdemu(KERN_ERR, "cdemu_init: ran out of memory\n"); ++ ++ return -ENOMEM; ++} ++ ++static void __exit cdemu_exit(void) ++{ ++ dprintk("%s: start\n", __FUNCTION__); ++ ++ device_for_each_child(&virtual_bus, NULL, &remove_cdemu_device_helper); ++ + #if defined(CONFIG_DEVFS_FS) + devfs_remove("cdemu"); + #endif + +- if (unregister_blkdev(cdemu_major, DEVICE_NAME)) ++ if (unregister_blkdev(cdemu_drv.major, DEVICE_NAME)) + printk_cdemu(KERN_ERR, "unable to unregister block device\n"); + +- kfree(cdemu_dev); ++ /* unregister driver */ ++ if(!driver_was_registered) { ++ dprintk("%s: unregistering driver: %s\n", __FUNCTION__, cdemu_drv.drv.name); ++ driver_unregister(&cdemu_drv.drv); ++ } ++ ++ /* unregister bus */ ++ dprintk("%s: unregistering bus: %s\n", __FUNCTION__, virtual_bus_type.name); ++ device_unregister(&virtual_bus); ++ bus_unregister(&virtual_bus_type); + +- dprintk("cdemu_exit: end\n"); +- printk_cdemu(KERN_INFO, "ver " CDEMU_MODULE_VERSION " unloaded. Unregistered %i cdemus.\n", cdemu_count); ++ dprintk("%s: end\n", __FUNCTION__); ++ printk_cdemu(KERN_INFO, "cdemu ver. " CDEMU_MODULE_VERSION " unloaded. Unregistered %i cdemus.\n", cdemu_drv.count); + } + + module_init(cdemu_init); +@@ -230,7 +483,7 @@ + #if !defined(MODULE) + static int __init cdemu_count_setup(char *str) + { +- cdemu_count = simple_strtol(str, NULL, 0); ++ cdemu_drv.count = simple_strtol(str, NULL, 0); + return 1; + } + +@@ -238,8 +491,9 @@ + #endif + + MODULE_AUTHOR("Robert Penz , Mike Frysinger "); +-MODULE_DESCRIPTION("CD Emulator for bin/cue images ver " CDEMU_MODULE_VERSION); ++MODULE_DESCRIPTION("CD Emulator for CD images ver. " CDEMU_MODULE_VERSION); + MODULE_LICENSE("GPL"); +-module_param(cdemu_major, int, 0); +-module_param(cdemu_count, int, 0); +-MODULE_PARM_DESC(cdemu_count, "Maximum number of virtual cdroms (1-255)"); ++module_param_named(cdemu_major, cdemu_drv.major, int, 0444); ++module_param_named(cdemu_count, cdemu_drv.count, int, 0444); ++MODULE_PARM_DESC(cdemu_major, "Major number to use for devices."); ++MODULE_PARM_DESC(cdemu_count, "Number of virtual cdroms must be within the range [1, 255]."); +diff -Naur cdemu-0.8/cdemu_proc.c cdemu-203/cdemu_proc.c +--- cdemu-0.8/cdemu_proc.c 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_proc.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,67 +0,0 @@ +-/** +- * File: cdemu_proc.c +- * Authors: Robert Penz +- * Mike Frysinger +- * Copyright 2002-2005 +- */ +- +-/*************************************************************************** +- * * +- * 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., 675 Mass Ave, Cambridge, MA 02139, USA. * +- * * +- ***************************************************************************/ +- +-#include "cdemu_kernel.h" +-#include "cdemu.h" +- +-#ifdef CONFIG_PROC_FS +- +-#include +-static struct proc_dir_entry* proc_entry; +- +-int proc_read(char *buf, char **start, off_t offset, int count, int *eof, void *data) +-{ +- int len = 0; +- int i; +- len += snprintf(len+buf, 1024, "Drive Loaded Comment\n"); +- for (i=0; i < cdemu_count; i++) { +- if (cdemu_dev[i].loaded == 0) +- len += snprintf(len+buf, 1024, "%3i: %i NO_CD_LOADED\n", i, +- cdemu_dev[i].loaded); +- else +- len += snprintf(len+buf, 1024, "%3i: %i %s\n", i, +- cdemu_dev[i].loaded, cdemu_dev[i].comment); +- } +- *eof = 1; +- return len; +-} +- +-int cdemu_proc_make(void) +-{ +- proc_entry = create_proc_entry(DEVICE_NAME, 0444, NULL); +- if (proc_entry) +- proc_entry->read_proc = proc_read; +- else +- return 0; +- return 1; +-} +- +-void cdemu_proc_remove(void) +-{ +- if (proc_entry) +- remove_proc_entry("cdemu", NULL); +-} +- +-#endif +diff -Naur cdemu-0.8/cdemu_proc.h cdemu-203/cdemu_proc.h +--- cdemu-0.8/cdemu_proc.h 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/cdemu_proc.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,37 +0,0 @@ +-/** +- * File: cdemu_proc.c +- * Authors: Robert Penz +- * Mike Frysinger +- * Copyright 2002-2005 +- */ +- +-/*************************************************************************** +- * * +- * 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., 675 Mass Ave, Cambridge, MA 02139, USA. * +- * * +- ***************************************************************************/ +- +-#ifdef CONFIG_PROC_FS +- +-#include +-int cdemu_proc_make(void); +-void cdemu_proc_remove(void); +- +-#else +- +-#define cdemu_proc_make() 1 +-#define cdemu_proc_remove() +- +-#endif +diff -Naur cdemu-0.8/ChangeLog cdemu-203/ChangeLog +--- cdemu-0.8/ChangeLog 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/ChangeLog 2006-09-14 23:57:44.000000000 +0200 +@@ -50,3 +50,40 @@ + 0.1.0 + * first test release (data and raw mode work - but no checks, if you do something + wrong you'll kill the kernel ;-) ++ ++--- ++ ++/* ++ * TODO: Merge this changelog from cdemu_mod.c properly. ++ * ++ * Version 0.7 - 2004-12-8 ++ * works with current 2.6 kernels ++ * ++ * Version 0.6 - 2003-10-13 ++ * add linux-2.6.x support and break up code to try to ++ * blur the differences between 2.4.x and 2.6.x ++ * ++ * Version 0.5 - 2003-07-02 ++ * rename to CDemu ++ * rewrite of major parts to be 100% compatible to a cdrom ++ * user space interface changed for new userspace program ++ ++ * Version 0.4 - 2003-04-08 ++ * removed sys_call_table use ++ * fixed bug with devfsd ++ * some extra error handling for the userspace program ++ ++ * Version 0.3 - 2003-01-11 ++ * added check if a "cd is loaded" ++ * removed all warnings ++ * code cleanup ++ ++ * Version 0.2 - 2003-01-12 ++ * support for proc fs ++ * changed the vclib.c so it can be used by gui programs ++ ++ * Version 0.1 - 2003-01-10 ++ * first test release (data and raw mode work - but no checks, if you do ++ * something wrong you'll kill the kernel ;-) ++ * ++ */ +diff -Naur cdemu-0.8/libcdemu.py cdemu-203/libcdemu.py +--- cdemu-0.8/libcdemu.py 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/libcdemu.py 2007-01-11 22:50:46.000000000 +0100 +@@ -146,6 +146,69 @@ + + return iso_filename, entries + ++def parse_mds_track(mds_content, track_offset): ++ mds_extrablock_size = 0x08 ++ mds_footer_size = 0x16 ++ ++ mode = read_binary("H", mds_content, track_offset+0x0000) ++ ++ flags = read_binary("B", mds_content, track_offset+0x0002) ++ ctrl = flags & 0xf ++ adr = (flags >> 4) & 0xf ++ ++ tno = read_binary("B", mds_content, track_offset+0x0003) ++ point = read_binary("B", mds_content, track_offset+0x0004) ++ min = read_binary("B", mds_content, track_offset+0x0005) ++ sec = read_binary("B", mds_content, track_offset+0x0006) ++ frac = read_binary("B", mds_content, track_offset+0x0007) ++ zero = read_binary("B", mds_content, track_offset+0x0008) ++ pmin = read_binary("B", mds_content, track_offset+0x0009) ++ psec = read_binary("B", mds_content, track_offset+0x000a) ++ pfrac = read_binary("B", mds_content, track_offset+0x000b) ++ extra_offset = read_binary("L", mds_content, track_offset+0x000c) ++ sectorsize = read_binary("H", mds_content, track_offset+0x0010) ++ lba = read_binary("L", mds_content, track_offset+0x0024) ++ offset = read_binary("Q", mds_content, track_offset+0x0028) ++ ++ if point <= 0x99: ++ pregap = read_binary("l", mds_content, extra_offset+0x0000) ++ sectors = read_binary("l", mds_content, extra_offset+0x0004) ++ else: ++ pregap = 0 ++ sectors = 0 ++ ++ if verbose: ++ print " point: %2x, mode: %3x, control: %x, adr: %i, MSF: %02i:%02i:%02i, P-MSF: %02i:%02i:%02i, sector size: %4i, lba: %i, sectors: %i, offset: %i" % \ ++ (point, mode, ctrl, adr, min, sec, frac, pmin, psec, pfrac, sectorsize, lba, sectors, offset) ++ ++ return [point, mode, sectorsize, lba, sectors, offset] ++ ++def parse_mds_session(mds_content, session_offset): ++ pregap_corr = read_binary("l", mds_content, session_offset + 0x0000) ++ num_sectors = read_binary("L", mds_content, session_offset + 0x0004) ++ num_tracks = read_binary("B", mds_content, session_offset + 0x000a) ++ num_leadins = read_binary("B", mds_content, session_offset + 0x000b) ++ first_track = read_binary("B", mds_content, session_offset + 0x000c) ++ last_track = read_binary("B", mds_content, session_offset + 0x000e) ++ tracks_offset = read_binary("L", mds_content, session_offset + 0x0014) ++ ++ if verbose: ++ print " pregap_corr: %i, num_sectors: %i, num_tracks: %i, num_leadins: %i, first_track: %i, last_track: %i, tracks_offset: %i" % \ ++ (pregap_corr, num_sectors, num_tracks, num_leadins, first_track, last_track, tracks_offset) ++ ++ track_struct_size = 0x50 ++ ++ session = [] ++ ++ # read datablocks and extrablocks ++ for i in range(0, num_tracks): ++ track = parse_mds_track(mds_content, tracks_offset + track_struct_size * i) ++ # writing data to entries ++ if track[0] < 0xa0: ++ session.append(track) ++ ++ return session ++ + def parse_mds(mds_filename): + "returns the supposable bin_filename and raw entries, if something went \ + wrong it throws an exception" +@@ -161,54 +224,27 @@ + if mds_content[0x0000:0x0010] != "MEDIA DESCRIPTOR": + raise CDEmu_Error, "Invalid data in <%s>. It is not an MDF/MDS file." % mds_filename + +- # get some data from header +- mds_header_size = 0x70 +- mds_datablock_size = 0x50 +- mds_extrablock_size = 0x08 +- mds_footer_size = 0x16 + mds_version = read_binary("B", mds_content, 0x0010) + mds_revision = read_binary("B", mds_content, 0x0011) +- mds_numsectors = read_binary("L", mds_content, 0x005c) +- mds_datablocks = read_binary("B", mds_content, 0x0062) +- mds_leadinblocks = read_binary("B", mds_content, 0x0063) +- mds_sessions = read_binary("B", mds_content, 0x0064) +- mds_tracks = read_binary("B", mds_content, 0x0066) +- mds_datablocks_offset = read_binary("L", mds_content, 0x006c) +- mds_extrablocks_offset = mds_datablocks_offset + mds_datablock_size * mds_datablocks ++ mds_sessions = read_binary("H", mds_content, 0x0014) ++ mds_sessions_offset = read_binary("L", mds_content, 0x0050) + if verbose: + print "MDS/MDF version: %i.%i" % (mds_version, mds_revision) +- print "datablocks: %i, lead-in blocks: %i, track blocks: %i, sessions?: %i" % (mds_datablocks, mds_leadinblocks, mds_tracks, mds_sessions) +- print "numsectors: %i, datablocks offset: %i, extrablocks offset: %i" % (mds_numsectors, mds_datablocks_offset, mds_extrablocks_offset) ++ print "sessions: %i" % (mds_sessions) + + # set name of binary cd-image + bin_filename = os.path.splitext(os.path.basename(mds_filename))[0] + ".mdf"; + if verbose: + print "binfile: %s" % bin_filename + +- # making sure table is empty ++ mds_session_size = 0x18 ++ + entries = [] + +- # read datablocks and extrablocks +- for datablock in range(0, mds_datablocks): +- datablock_offset = mds_datablocks_offset+mds_datablock_size*datablock; +- extrablock_offset = mds_extrablocks_offset+mds_extrablock_size*datablock; +- mode = read_binary("B", mds_content, datablock_offset+0x0000) +- flags = read_binary("H", mds_content, datablock_offset+0x0002) +- track = read_binary("B", mds_content, datablock_offset+0x0004) +- pmin = read_binary("B", mds_content, datablock_offset+0x0009) +- psec = read_binary("B", mds_content, datablock_offset+0x000a) +- pfrac = read_binary("B", mds_content, datablock_offset+0x000b) +- sectorsize = read_binary("H", mds_content, datablock_offset+0x0010) +- sector = read_binary("L", mds_content, datablock_offset+0x0024) +- offset = read_binary("Q", mds_content, datablock_offset+0x0028) +- pregap = read_binary("L", mds_content, extrablock_offset+0x0000); +- sectors = read_binary("L", mds_content, extrablock_offset+0x0004); +- if verbose: +- print "datablock: %3i, track: %2x, mode: %2x, flags: %x, sector size: %i, MSF: %02i:%02i.%02i, sector: %i, offset: %i, pregap: %i, sectors: %i" % \ +- (datablock, track, mode, flags, sectorsize, pmin, psec, pfrac, sector, offset, pregap, sectors) +- # writing data to entries +- if track < 0xa0: +- entries.append([track, mode, sectorsize, sector, sectors, offset]) ++ for session in range(0, mds_sessions): ++ print "session %i:" % (session) ++ entries = parse_mds_session(mds_content, mds_sessions_offset + mds_session_size * session) ++ break + + entries.sort() # python is sexy. + +@@ -542,10 +578,11 @@ + if mode == 1: return MODE1_2352 + if mode == 2: return MODE2_2352 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def get_mode_mds(mode, sectsize): + "converts the data to our internal mode consts" ++ mode &= 0xff + if mode == 0xa9: + if sectsize == 2448: return AUDIO_2448 + else: return AUDIO +@@ -559,7 +596,7 @@ + elif sectsize == 2336: return MODE2_2336 + else: return MODE2 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def get_mode_nrg(mode, sectsize): + "converts the data to our internal mode consts" +@@ -573,7 +610,7 @@ + elif sectsize == 2336: return MODE2_2336 + else: return MODE2 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def mode_2_sectorsize(mode): + if mode == AUDIO: return CD_FRAMESIZE_RAW +@@ -584,7 +621,7 @@ + if mode == MODE2_2352: return CD_FRAMESIZE_RAW + if mode == MODE2_2336: return CD_FRAMESIZE_RAW0 + +- raise CDEmu_Error, "Unkown mode number:", mode ++ raise CDEmu_Error, "Unknown mode number: %i" % (mode) + + def get_msf(s): + "converts 00:00:00 to 3 integers, take the 01 index if there is a choise - min, sec, frame" +@@ -599,10 +636,11 @@ + + def msf_2_sector(min, sec, frame): + "converts the msf to sector" +- return frame + (sec + min * 60 ) * 75; ++ return frame + (sec + min * 60 ) * 75 - CD_MSF_OFFSET; + + def sector_2_msf(sector): + "and the other way round - min,sec,frame" ++ sector += CD_MSF_OFFSET + sector, frame = divmod(sector, 75) + sector, sec = divmod(sector, 60) + return sector, sec, frame +@@ -618,10 +656,9 @@ + # mode / minute / second / frame + mode = get_mode_cue(raw_entries[i][CUE_MODE]) + min, sec, frame = get_msf(raw_entries[i][CUE_INDEXES]) +- # svcds need 2 sec offset, don't really know why .. its just so ;-) +- if mode == MODE2_2352: +- sec+=2 +- start_sector = msf_2_sector(min, sec, frame) ++ # CUE's MSF should be offset by 00:02:00 ++ start_sector = msf_2_sector(min, sec, frame) + CD_MSF_OFFSET ++ min, sec, frame = sector_2_msf(start_sector) + + if i == 0: + start_offset = 0 +diff -Naur cdemu-0.8/Makefile cdemu-203/Makefile +--- cdemu-0.8/Makefile 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/Makefile 2007-01-11 22:25:48.000000000 +0100 +@@ -2,7 +2,7 @@ + # $Header$ + + PREFIX = /usr +-SRCS = cdemu_core.c cdemu_mod.c cdemu_proc.c ++SRCS = cdemu_core.c cdemu_mod.c + OBJS = $(patsubst %.c,%.o, $(SRCS)) + + # +@@ -28,7 +28,7 @@ + KERN_INC = $(KERN_DIR)/include + + ifeq ($(KERN_SRC),no) +- $(error You'll need sources for your (at least 2.6.16) kernel) ++ $(error You'll need sources for your (at least 2.6) kernel) + endif + + +@@ -56,18 +56,17 @@ + # to keep this stuff readable + # + ifndef MK_INC +- MK_INC = $(PWD) ++ MK_INC = $(shell pwd) + endif + ifeq ($(KERN_MAJ),2.4) +- $(error You'll need at least 2.6.16 kernel) ++ $(error You'll need at least 2.6 kernel) + endif + ifeq ($(KERN_MAJ),2.6) + KERN_MICRO = $(shell echo $(KERN_VER) | sed 's/2\.6\.\([0123456789]*\).*/\1/') + ifeq ($(shell test "$(KERN_MICRO)" -lt "16" >& /dev/null && echo yes),yes) +- $(error You'll need at least 2.6.16 kernel) +- else +- MODVAR = M ++ $(warning Kernel 2.6.16 is the minimum recommended kernel version) + endif ++ MODVAR = M + include $(MK_INC)/mk/linux-2.6 + endif + +diff -Naur cdemu-0.8/TODO cdemu-203/TODO +--- cdemu-0.8/TODO 2006-08-05 04:38:56.000000000 +0200 ++++ cdemu-203/TODO 2006-10-15 15:40:15.000000000 +0200 +@@ -1,14 +1,12 @@ + USER: + +-- a GUI program to controll all (for KDE, Wolfgang Koller wrote ++- A GUI program to controll all (for KDE, Wolfgang Koller wrote + applet (http://www.suselinuxsupport.de/en/index.php?location=downloads#KCDemu) ++- Userspace library for cd-image access. (Rok) + + KERNEL: + + - Get someone to do SMP testing on a regular basis. +-- make nodes/devices/memory dynamic ... create gendisk's whenever a cd +- is loaded and delete them when cd is unloaded ... +-- Memory mapped IO (mmap). +-- Support for pregaps, postgaps and subchannels, ECC and reading cd-text. +-- SysFS/ProcFS. +-- Packet commands. ++- Memory mapped IO (mmap) and/or shared memory. ++- Support for pregaps, postgaps and subchannels, ECC and reading cd-text. (Pawel) ++- More ATAPI packet commands. From vmiklos at frugalware.org Tue Jul 10 21:28:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 10 21:28:52 2007 Subject: [Frugalware-git] pacman-tools: repoman: new command: fpmmerge Message-ID: <20070710192828.D726316A8095@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=e755ac61be6d76ebce44f51a6d0b2ba176b05035 commit e755ac61be6d76ebce44f51a6d0b2ba176b05035 Author: VMiklos Date: Tue Jul 10 21:28:06 2007 +0200 repoman: new command: fpmmerge after testing, i'll update the manpage, too diff --git a/repoman b/repoman index c99bbf4..ee603c5 100755 --- a/repoman +++ b/repoman @@ -17,6 +17,7 @@ ls|list directory List a directory in FST. rec|record [parameters] Records a pacakge. up|upload source destination Upload a file to FST. push [record parameters] Pushes a pacakge. +fpmmerge repo Merges fpms from an other repo. Global options: -d|--dry-run Don't actually run the commands. @@ -144,6 +145,29 @@ upload() done } +fpmmerge() +{ + if [ -z "$1" ]; then + echo "fpmmerge needs a parameter! (a repo name to pull in fpms from)" + usage + exit 1 + fi + check_servers + sudouser=$(eval "echo \$${reponame}_sudo") + [ -n "$sudouser" ] && sudo="sudo -u $sudouser" + srcurl=$(eval "echo \$$1_servers") + if [ -z "$srcurl" ]; then + die "so such repo!" + fi + ssh $host "cd $path/frugalware-$arch && $sudo rsync -avP $srcurl/frugalware-$arch/*.fpm ./" + # now run repoman cl for each + for i in `$0 -t $1 ls /frugalware-$arch/ 2>/dev/null|sed 's/-[^-]\+-[^-]\+-[^-]\+$//'` + do + cd `git rev-parse --git-dir`/../source/*/$i 2>/dev/null || continue + $0 -t $reponame cl $i + done +} + list() { check_servers @@ -623,6 +647,10 @@ while [ "$1" != "" ]; do shift 1 merge $* ;; + fpmmerge) + shift 1 + fpmmerge $* + ;; up|upload) shift 1 upload $* From vmiklos at frugalware.org Wed Jul 11 00:45:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 00:45:35 2007 Subject: [Frugalware-git] frugalware-current: darcs-1.0.9-1-i686 Message-ID: <20070710224532.717D516A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=52928ff36515098b9ff59227ff382fef4aefb591 commit 52928ff36515098b9ff59227ff382fef4aefb591 Author: VMiklos Date: Wed Jul 11 00:43:47 2007 +0200 darcs-1.0.9-1-i686 move to extra diff --git a/source/devel-extra/darcs/FrugalBuild b/source/devel-extra/darcs/FrugalBuild new file mode 100644 index 0000000..bc16559 --- /dev/null +++ b/source/devel-extra/darcs/FrugalBuild @@ -0,0 +1,37 @@ +# Compiling Time: 3.13 SBU +# Maintainer: VMiklos + +pkgname=darcs +pkgver=1.0.9 +pkgrel=1 +pkgdesc="David's Advanced Revision Control System" +url="http://darcs.net" +depends=('gmp' 'curl>=7.16.0' 'readline' 'mta') +groups=('devel-extra') +archs=('i686' 'x86_64') +makedepends=('ghc>=6.6.1-2' 'latex2html' 'git') +up2date="lynx -dump $url|grep Stable|sed 's/.*(\(.*\)).*/\1/'" +source=(http://darcs.net/$pkgname-$pkgver.tar.gz \ + README.Frugalware) +sha1sums=('b2d2238c01d530796c29db4b46fd4fd9c21be9b6' \ + '85616be72dfaa945425ab9e9f5deca57fa5ccda9') +options=('scriptlet') + +build() +{ + Fcd + Fpatchall + if [ "$CARCH" == "x86_64" ]; then + Fconf --enable-git --with-git-core=/usr/lib \ + --with-git-includes=-I/usr/include/git --without-docs + else + Fconf --enable-git --with-git-core=/usr/lib \ + --with-git-includes=-I/usr/include/git + fi + make all || Fdie + Fmakeinstall + if [ "$CARCH" != "x86_64" ]; then + Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver + fi +} + diff --git a/source/devel-extra/darcs/README.Frugalware b/source/devel-extra/darcs/README.Frugalware new file mode 100644 index 0000000..0bd9f1d --- /dev/null +++ b/source/devel-extra/darcs/README.Frugalware @@ -0,0 +1,13 @@ +First, please not that `darcs` comes with a very good HTML documentation, which +is available under the `/usr/share/doc/darcs-1.0.9/manual` dir. That's the +place where everything is properly documented, not the manpage. Using `darcs +[subcommand] -h` is usable only as a reference, too. + +If you're completely new to `darcs`, then start at +`/usr/share/doc/darcs-1.0.8/manual/node4.html`. + +Please also note that in order for the `darcs send` command to work properly, +you must properly configure your mail transport agent to relay outgoing mail. +For example, if you are using postfix, you need to edit `/etc/postfix/main.cf`, +see the 'Using a relay host' part of the postfix package documentation for more +info. diff --git a/source/devel/darcs/FrugalBuild b/source/devel/darcs/FrugalBuild deleted file mode 100644 index c74d543..0000000 --- a/source/devel/darcs/FrugalBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Compiling Time: 3.13 SBU -# Maintainer: VMiklos - -pkgname=darcs -pkgver=1.0.9 -pkgrel=1 -pkgdesc="David's Advanced Revision Control System" -url="http://darcs.net" -depends=('gmp' 'curl>=7.16.0' 'readline' 'mta') -groups=('devel') -archs=('i686' 'x86_64') -makedepends=('ghc>=6.6.1-2' 'latex2html' 'git') -up2date="lynx -dump $url|grep Stable|sed 's/.*(\(.*\)).*/\1/'" -source=(http://darcs.net/$pkgname-$pkgver.tar.gz \ - README.Frugalware) -sha1sums=('b2d2238c01d530796c29db4b46fd4fd9c21be9b6' \ - '85616be72dfaa945425ab9e9f5deca57fa5ccda9') -options=('scriptlet') - -build() -{ - Fcd - Fpatchall - if [ "$CARCH" == "x86_64" ]; then - Fconf --enable-git --with-git-core=/usr/lib \ - --with-git-includes=-I/usr/include/git --without-docs - else - Fconf --enable-git --with-git-core=/usr/lib \ - --with-git-includes=-I/usr/include/git - fi - make all || Fdie - Fmakeinstall - if [ "$CARCH" != "x86_64" ]; then - Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver - fi -} - diff --git a/source/devel/darcs/README.Frugalware b/source/devel/darcs/README.Frugalware deleted file mode 100644 index 0bd9f1d..0000000 --- a/source/devel/darcs/README.Frugalware +++ /dev/null @@ -1,13 +0,0 @@ -First, please not that `darcs` comes with a very good HTML documentation, which -is available under the `/usr/share/doc/darcs-1.0.9/manual` dir. That's the -place where everything is properly documented, not the manpage. Using `darcs -[subcommand] -h` is usable only as a reference, too. - -If you're completely new to `darcs`, then start at -`/usr/share/doc/darcs-1.0.8/manual/node4.html`. - -Please also note that in order for the `darcs send` command to work properly, -you must properly configure your mail transport agent to relay outgoing mail. -For example, if you are using postfix, you need to edit `/etc/postfix/main.cf`, -see the 'Using a relay host' part of the postfix package documentation for more -info. From vmiklos at frugalware.org Wed Jul 11 00:45:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 00:45:35 2007 Subject: [Frugalware-git] frugalware-current: darcs-1.0.9-1-i686 Message-ID: <20070710224532.83EC616A8093@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6b7cb5b66cd5249c486e2fe7b0a10873faaf2a9d commit 6b7cb5b66cd5249c486e2fe7b0a10873faaf2a9d Author: VMiklos Date: Wed Jul 11 00:44:26 2007 +0200 darcs-1.0.9-1-i686 depends() and doc fix diff --git a/source/devel-extra/darcs/FrugalBuild b/source/devel-extra/darcs/FrugalBuild index bc16559..e82cec7 100644 --- a/source/devel-extra/darcs/FrugalBuild +++ b/source/devel-extra/darcs/FrugalBuild @@ -6,7 +6,7 @@ pkgver=1.0.9 pkgrel=1 pkgdesc="David's Advanced Revision Control System" url="http://darcs.net" -depends=('gmp' 'curl>=7.16.0' 'readline' 'mta') +depends=('gmp' 'curl>=7.16.0' 'readline') groups=('devel-extra') archs=('i686' 'x86_64') makedepends=('ghc>=6.6.1-2' 'latex2html' 'git') diff --git a/source/devel-extra/darcs/README.Frugalware b/source/devel-extra/darcs/README.Frugalware index 0bd9f1d..5e9d249 100644 --- a/source/devel-extra/darcs/README.Frugalware +++ b/source/devel-extra/darcs/README.Frugalware @@ -1,10 +1,10 @@ -First, please not that `darcs` comes with a very good HTML documentation, which +First, please note that `darcs` comes with a very good HTML documentation, which is available under the `/usr/share/doc/darcs-1.0.9/manual` dir. That's the place where everything is properly documented, not the manpage. Using `darcs [subcommand] -h` is usable only as a reference, too. If you're completely new to `darcs`, then start at -`/usr/share/doc/darcs-1.0.8/manual/node4.html`. +`/usr/share/doc/darcs-1.0.9/manual/node4.html`. Please also note that in order for the `darcs send` command to work properly, you must properly configure your mail transport agent to relay outgoing mail. From vmiklos at frugalware.org Wed Jul 11 09:10:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 09:10:35 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-0.10.3-4-i686 Message-ID: <20070711071030.1591E13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a00e8f7cfe624bdfa85f3605ca7837db0cdf2273 commit a00e8f7cfe624bdfa85f3605ca7837db0cdf2273 Author: VMiklos Date: Wed Jul 11 09:09:53 2007 +0200 ivtv-utils-0.10.3-4-i686 moved to the right directory diff --git a/source/apps-extra/ivtv-utils/FrugalBuild b/source/apps-extra/ivtv-utils/FrugalBuild new file mode 100644 index 0000000..f1bee98 --- /dev/null +++ b/source/apps-extra/ivtv-utils/FrugalBuild @@ -0,0 +1,55 @@ +# Compiling Time: 0.05 SBU +# Maintainer: crazy + + +pkgname=ivtv-utils +branch=0.10.x +pkgver=0.10.3 +pkgrel=4 +pkgdesc="Tools for managing the hardware supported by ivtv driver" +url="http://ivtvdriver.org/index.php/Main_Page" +depends=('libstdc++') +rodepends=('ivtv-firmware') +conflicts=('ivtv') +groups=('apps-extra') +archs=('i686') +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) + +subpkgs=('ivtv-firmware') +subdescs=("Firmware for Hauppauge PVR and Conexant based cards") +subdepends=('udev') +subgroups=('multimedia-extra') +subarchs=('i686') + +build() +{ + Fcd ivtv-$pkgver + Fpatchall + ## man some apps have such crappy and broken build tools ... + for crap in `find . -name Makefile` + do + Fsed "-O2" "$CFLAGS" $crap + done + cd utils + make || Fdie + Fmakeinstall PREFIX=/usr + cd ../test + make || Fdie + ## lalala this should be 'make install' :D + for tool in ivtv-pcm-tester vbi vbi-detect vbi-passthrough wss + do + cp $tool $Fdestdir/usr/bin/ + done + cd .. + ## firmware + Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware + Fsplit ivtv-firmware lib/firmware + ## docs + Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver +} + +sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ + '68fef52289fed191aac19ce4c0f84fb25740f028') +# optimization OK diff --git a/source/multimedia-extra/ivtv-utils/FrugalBuild b/source/multimedia-extra/ivtv-utils/FrugalBuild deleted file mode 100644 index f1bee98..0000000 --- a/source/multimedia-extra/ivtv-utils/FrugalBuild +++ /dev/null @@ -1,55 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: crazy - - -pkgname=ivtv-utils -branch=0.10.x -pkgver=0.10.3 -pkgrel=4 -pkgdesc="Tools for managing the hardware supported by ivtv driver" -url="http://ivtvdriver.org/index.php/Main_Page" -depends=('libstdc++') -rodepends=('ivtv-firmware') -conflicts=('ivtv') -groups=('apps-extra') -archs=('i686') -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) - -subpkgs=('ivtv-firmware') -subdescs=("Firmware for Hauppauge PVR and Conexant based cards") -subdepends=('udev') -subgroups=('multimedia-extra') -subarchs=('i686') - -build() -{ - Fcd ivtv-$pkgver - Fpatchall - ## man some apps have such crappy and broken build tools ... - for crap in `find . -name Makefile` - do - Fsed "-O2" "$CFLAGS" $crap - done - cd utils - make || Fdie - Fmakeinstall PREFIX=/usr - cd ../test - make || Fdie - ## lalala this should be 'make install' :D - for tool in ivtv-pcm-tester vbi vbi-detect vbi-passthrough wss - do - cp $tool $Fdestdir/usr/bin/ - done - cd .. - ## firmware - Ffilerel ../{*.fw,v4l-cx2341x-init.mpg} /lib/firmware - Fsplit ivtv-firmware lib/firmware - ## docs - Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver -} - -sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ - '68fef52289fed191aac19ce4c0f84fb25740f028') -# optimization OK From vmiklos at frugalware.org Wed Jul 11 09:23:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 09:23:16 2007 Subject: [Frugalware-git] frugalware-current: madwifi-0.9.3.1-4-i686 Message-ID: <20070711072305.5534213A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=510865a4654d3baa34c39bd46c24648591252f6b commit 510865a4654d3baa34c39bd46c24648591252f6b Author: VMiklos Date: Wed Jul 11 09:22:47 2007 +0200 madwifi-0.9.3.1-4-i686 cleanup in -kernel2622.diff diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 963948a..3582c77 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -16,7 +16,7 @@ Finclude sourceforge source=($source madwifi-0.9.3-cflags.diff madwifi-0.9.3.1-kernel2622.diff) sha1sums=('690543c825b8b49186e4613a286b39114fff3c11' \ '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \ - '68f582befc69053f5961f1fa6c88d5695b1b1b81') + 'b61d7e0bc2da632e399abbe6b6bef92f6a73d7cc') # If the package needs testing, feel free to poke Benjamin Woods diff --git a/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff b/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff index 2087c3e..eea54e8 100644 --- a/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff +++ b/source/network/madwifi/madwifi-0.9.3.1-kernel2622.diff @@ -77,3866 +77,6 @@ diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c madwifi-0.9.3.1/net80 if (*eth->h_dest & 1) if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) -diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c.orig madwifi-0.9.3.1/net80211/ieee80211_input.c.orig ---- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ madwifi-0.9.3.1/net80211/ieee80211_input.c.orig 2007-07-10 14:45:14.000000000 +0200 -@@ -0,0 +1,3856 @@ -+/*- -+ * Copyright (c) 2001 Atsushi Onoe -+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License ("GPL") version 2 as published by the Free -+ * Software Foundation. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * $Id: ieee80211_input.c 2366 2007-05-23 08:43:05Z mrenzmann $ -+ */ -+#ifndef EXPORT_SYMTAB -+#define EXPORT_SYMTAB -+#endif -+ -+/* -+ * IEEE 802.11 input handling. -+ */ -+#ifndef AUTOCONF_INCLUDED -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include /* wireless_send_event(..) */ -+#include /* SIOCGIWTHRSPY */ -+#include /* ARPHRD_ETHER */ -+ -+#include "if_llc.h" -+#include "if_ethersubr.h" -+#include "if_media.h" -+#include "if_athproto.h" -+ -+#include -+ -+#ifdef IEEE80211_DEBUG -+/* -+ * Decide if a received management frame should be -+ * printed when debugging is enabled. This filters some -+ * of the less interesting frames that come frequently -+ * (e.g. beacons). -+ */ -+static __inline int -+doprint(struct ieee80211vap *vap, int subtype) -+{ -+ switch (subtype) { -+ case IEEE80211_FC0_SUBTYPE_BEACON: -+ return (vap->iv_ic->ic_flags & IEEE80211_F_SCAN); -+ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: -+ return (vap->iv_opmode == IEEE80211_M_IBSS); -+ } -+ return 1; -+} -+ -+/* -+ * Emit a debug message about discarding a frame or information -+ * element. One format is for extracting the mac address from -+ * the frame header; the other is for when a header is not -+ * available or otherwise appropriate. -+ */ -+#define IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) do { \ -+ if ((_vap)->iv_debug & (_m)) \ -+ ieee80211_discard_frame(_vap, _wh, _type, _fmt, __VA_ARGS__);\ -+} while (0) -+#define IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) do { \ -+ if ((_vap)->iv_debug & (_m)) \ -+ ieee80211_discard_ie(_vap, _wh, _type, _fmt, __VA_ARGS__);\ -+} while (0) -+#define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) do { \ -+ if ((_vap)->iv_debug & (_m)) \ -+ ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\ -+} while (0) -+ -+static const u_int8_t *ieee80211_getbssid(struct ieee80211vap *, -+ const struct ieee80211_frame *); -+static void ieee80211_discard_frame(struct ieee80211vap *, -+ const struct ieee80211_frame *, const char *, const char *, ...); -+static void ieee80211_discard_ie(struct ieee80211vap *, -+ const struct ieee80211_frame *, const char *, const char *, ...); -+static void ieee80211_discard_mac(struct ieee80211vap *, -+ const u_int8_t mac[IEEE80211_ADDR_LEN], const char *, -+ const char *, ...); -+#else -+#define IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) -+#define IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) -+#define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) -+#endif /* IEEE80211_DEBUG */ -+ -+static struct sk_buff *ieee80211_defrag(struct ieee80211_node *, -+ struct sk_buff *, int); -+static void ieee80211_deliver_data(struct ieee80211_node *, struct sk_buff *); -+static struct sk_buff *ieee80211_decap(struct ieee80211vap *, -+ struct sk_buff *, int); -+static void ieee80211_send_error(struct ieee80211_node *, const u_int8_t *, -+ int, int); -+static void ieee80211_recv_pspoll(struct ieee80211_node *, struct sk_buff *); -+static int accept_data_frame(struct ieee80211vap *, struct ieee80211_node *, -+ struct ieee80211_key *, struct sk_buff *, struct ether_header *); -+ -+ -+#ifdef ATH_SUPERG_FF -+static void athff_decap(struct sk_buff *); -+#endif -+#ifdef USE_HEADERLEN_RESV -+static __be16 ath_eth_type_trans(struct sk_buff *, struct net_device *); -+#endif -+ -+/* Enhanced iwspy support */ -+#if WIRELESS_EXT >= 16 -+ -+#ifndef IW_QUAL_QUAL_UPDATED -+#define IW_QUAL_QUAL_UPDATED 0x01 -+#define IW_QUAL_LEVEL_UPDATED 0x02 -+#define IW_QUAL_NOISE_UPDATED 0x04 -+#endif /* IW_QUAL_QUAL_UPDATED */ -+ -+/** -+ * This function is a clone of set_quality(..) in ieee80211_wireless.c -+ */ -+static void -+set_quality(struct iw_quality *iq, u_int rssi, int noise) -+{ -+ iq->qual = rssi; -+ -+ iq->noise = noise; -+ iq->level = iq->noise + iq->qual; -+ iq->updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | -+ IW_QUAL_NOISE_UPDATED; -+} -+ -+/** -+ * Given a node and the rssi value of a just received frame from the node, this -+ * function checks if to raise an iwspy event because we iwspy the node and rssi -+ * exceeds threshold (if active). -+ * -+ * @param vap: vap -+ * @param ni: sender node -+ * @param rssi: rssi value of received frame -+ */ -+static void -+iwspy_event(struct ieee80211vap *vap, struct ieee80211_node *ni, u_int rssi) -+{ -+ if (vap->iv_spy.thr_low && vap->iv_spy.num && ni && (rssi < -+ vap->iv_spy.thr_low || rssi > vap->iv_spy.thr_high)) { -+ int i; -+ for (i = 0; i < vap->iv_spy.num; i++) { -+ if (IEEE80211_ADDR_EQ(ni->ni_macaddr, -+ &(vap->iv_spy.mac[i * IEEE80211_ADDR_LEN]))) { -+ -+ union iwreq_data wrq; -+ struct iw_thrspy thr; -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DEBUG, -+ "%s: we spy %s, threshold is active " -+ "and rssi exceeds it -> raise an iwspy" -+ " event\n", __func__, ether_sprintf( -+ ni->ni_macaddr)); -+ memset(&wrq, 0, sizeof(wrq)); -+ wrq.data.length = 1; -+ memset(&thr, 0, sizeof(struct iw_thrspy)); -+ memcpy(thr.addr.sa_data, ni->ni_macaddr, -+ IEEE80211_ADDR_LEN); -+ thr.addr.sa_family = ARPHRD_ETHER; -+ set_quality(&thr.qual, rssi, vap->iv_ic->ic_channoise); -+ set_quality(&thr.low, vap->iv_spy.thr_low, vap->iv_ic->ic_channoise); -+ set_quality(&thr.high, vap->iv_spy.thr_high, vap->iv_ic->ic_channoise); -+ wireless_send_event(vap->iv_dev, -+ SIOCGIWTHRSPY, &wrq, (char*) &thr); -+ break; -+ } -+ } -+ } -+} -+ -+#else -+#define iwspy_event(_vap, _ni, _rssi) -+#endif /* WIRELESS_EXT >= 16 */ -+ -+/* -+ * Process a received frame. The node associated with the sender -+ * should be supplied. If nothing was found in the node table then -+ * the caller is assumed to supply a reference to ic_bss instead. -+ * The RSSI and a timestamp are also supplied. The RSSI data is used -+ * during AP scanning to select a AP to associate with; it can have -+ * any units so long as values have consistent units and higher values -+ * mean ``better signal''. The receive timestamp is currently not used -+ * by the 802.11 layer. -+ * -+ * Context: softIRQ (tasklet) -+ */ -+int -+ieee80211_input(struct ieee80211_node *ni, -+ struct sk_buff *skb, int rssi, u_int32_t rstamp) -+{ -+#define HAS_SEQ(type) ((type & 0x4) == 0) -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct ieee80211com *ic = vap->iv_ic; -+ struct net_device *dev = vap->iv_dev; -+ struct ieee80211_frame *wh; -+ struct ieee80211_key *key; -+ struct ether_header *eh; -+#ifdef ATH_SUPERG_FF -+ struct llc *llc; -+#endif -+ int hdrspace; -+ u_int8_t dir, type, subtype; -+ u_int8_t *bssid; -+ u_int16_t rxseq; -+ -+ KASSERT(ni != NULL, ("null node")); -+ ni->ni_inact = ni->ni_inact_reload; -+ -+ KASSERT(skb->len >= sizeof(struct ieee80211_frame_min), -+ ("frame length too short: %u", skb->len)); -+ -+ /* XXX adjust device in sk_buff? */ -+ -+ type = -1; /* undefined */ -+ /* -+ * In monitor mode, send everything directly to bpf. -+ * Also do not process frames w/o i_addr2 any further. -+ * XXX may want to include the CRC -+ */ -+ if (vap->iv_opmode == IEEE80211_M_MONITOR) -+ goto out; -+ -+ if (skb->len < sizeof(struct ieee80211_frame_min)) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, -+ ni->ni_macaddr, NULL, -+ "too short (1): len %u", skb->len); -+ vap->iv_stats.is_rx_tooshort++; -+ goto out; -+ } -+ /* -+ * Bit of a cheat here, we use a pointer for a 3-address -+ * frame format but don't reference fields past outside -+ * ieee80211_frame_min w/o first validating the data is -+ * present. -+ */ -+ wh = (struct ieee80211_frame *)skb->data; -+ -+ if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != -+ IEEE80211_FC0_VERSION_0) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, -+ ni->ni_macaddr, NULL, "wrong version %x", wh->i_fc[0]); -+ vap->iv_stats.is_rx_badversion++; -+ goto err; -+ } -+ -+ dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; -+ type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; -+ subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; -+ if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { -+ switch (vap->iv_opmode) { -+ case IEEE80211_M_STA: -+ bssid = wh->i_addr2; -+ if (!IEEE80211_ADDR_EQ(bssid, ni->ni_bssid)) { -+ /* not interested in */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ bssid, NULL, "%s", "not to bss"); -+ vap->iv_stats.is_rx_wrongbss++; -+ goto out; -+ } -+ iwspy_event(vap, ni, rssi); -+ break; -+ case IEEE80211_M_IBSS: -+ case IEEE80211_M_AHDEMO: -+ if (dir != IEEE80211_FC1_DIR_NODS) -+ bssid = wh->i_addr1; -+ else if (type == IEEE80211_FC0_TYPE_CTL) -+ bssid = wh->i_addr1; -+ else { -+ if (skb->len < sizeof(struct ieee80211_frame)) { -+ IEEE80211_DISCARD_MAC(vap, -+ IEEE80211_MSG_ANY, ni->ni_macaddr, -+ NULL, "too short (2): len %u", -+ skb->len); -+ vap->iv_stats.is_rx_tooshort++; -+ goto out; -+ } -+ bssid = wh->i_addr3; -+ } -+ /* Do not try to find a node reference if the packet really did come from the BSS */ -+ if (type == IEEE80211_FC0_TYPE_DATA && ni == vap->iv_bss && -+ !IEEE80211_ADDR_EQ(vap->iv_bss->ni_macaddr, wh->i_addr2)) { -+ /* Try to find sender in local node table. */ -+ ni = ieee80211_find_node(vap->iv_bss->ni_table, wh->i_addr2); -+ if (ni == NULL) { -+ /* -+ * Fake up a node for this newly discovered -+ * member of the IBSS. This should probably -+ * done after an ACL check. -+ */ -+ ni = ieee80211_fakeup_adhoc_node(vap, -+ wh->i_addr2); -+ if (ni == NULL) { -+ /* NB: stat kept for alloc failure */ -+ goto err; -+ } -+ } -+ } -+ iwspy_event(vap, ni, rssi); -+ break; -+ case IEEE80211_M_HOSTAP: -+ if (dir != IEEE80211_FC1_DIR_NODS) -+ bssid = wh->i_addr1; -+ else if (type == IEEE80211_FC0_TYPE_CTL) -+ bssid = wh->i_addr1; -+ else { -+ if (skb->len < sizeof(struct ieee80211_frame)) { -+ IEEE80211_DISCARD_MAC(vap, -+ IEEE80211_MSG_ANY, ni->ni_macaddr, -+ NULL, "too short (2): len %u", -+ skb->len); -+ vap->iv_stats.is_rx_tooshort++; -+ goto out; -+ } -+ bssid = wh->i_addr3; -+ } -+ /* -+ * Validate the bssid. -+ */ -+#ifdef ATH_SUPERG_XR -+ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && -+ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { -+ /* -+ * allow MGT frames to vap->iv_xrvap. -+ * this will allow roaming between XR and normal vaps -+ * without station dis associating from previous vap. -+ */ -+ if (!(vap->iv_xrvap && -+ IEEE80211_ADDR_EQ(bssid, vap->iv_xrvap->iv_bss->ni_bssid) && -+ type == IEEE80211_FC0_TYPE_MGT && -+ ni != vap->iv_bss)) { -+ /* not interested in */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ bssid, NULL, "%s", "not to bss or xrbss"); -+ vap->iv_stats.is_rx_wrongbss++; -+ goto out; -+ } -+ } -+#else -+ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && -+ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { -+ /* not interested in */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ bssid, NULL, "%s", "not to bss"); -+ vap->iv_stats.is_rx_wrongbss++; -+ goto out; -+ } -+ -+#endif -+ break; -+ case IEEE80211_M_WDS: -+ if (skb->len < sizeof(struct ieee80211_frame_addr4)) { -+ IEEE80211_DISCARD_MAC(vap, -+ IEEE80211_MSG_ANY, ni->ni_macaddr, -+ NULL, "too short (3): len %u", -+ skb->len); -+ vap->iv_stats.is_rx_tooshort++; -+ goto out; -+ } -+ bssid = wh->i_addr1; -+ if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && -+ !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { -+ /* not interested in */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ bssid, NULL, "%s", "not to bss"); -+ vap->iv_stats.is_rx_wrongbss++; -+ goto out; -+ } -+ if (!IEEE80211_ADDR_EQ(wh->i_addr2, vap->wds_mac)) { -+ /* not interested in */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ wh->i_addr2, NULL, "%s", "not from DS"); -+ vap->iv_stats.is_rx_wrongbss++; -+ goto out; -+ } -+ break; -+ default: -+ /* XXX catch bad values */ -+ goto out; -+ } -+ ni->ni_rssi = rssi; -+ ni->ni_rstamp = rstamp; -+ ni->ni_last_rx = jiffies; -+ if (HAS_SEQ(type)) { -+ u_int8_t tid; -+ if (IEEE80211_QOS_HAS_SEQ(wh)) { -+ tid = ((struct ieee80211_qosframe *)wh)-> -+ i_qos[0] & IEEE80211_QOS_TID; -+ if (TID_TO_WME_AC(tid) >= WME_AC_VI) -+ ic->ic_wme.wme_hipri_traffic++; -+ tid++; -+ } else -+ tid = 0; -+ rxseq = le16toh(*(__le16 *)wh->i_seq); -+ if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) && -+ IEEE80211_SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) { -+ /* duplicate, discard */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ bssid, "duplicate", -+ "seqno <%u,%u> fragno <%u,%u> tid %u", -+ rxseq >> IEEE80211_SEQ_SEQ_SHIFT, -+ ni->ni_rxseqs[tid] >> -+ IEEE80211_SEQ_SEQ_SHIFT, -+ rxseq & IEEE80211_SEQ_FRAG_MASK, -+ ni->ni_rxseqs[tid] & -+ IEEE80211_SEQ_FRAG_MASK, -+ tid); -+ vap->iv_stats.is_rx_dup++; -+ IEEE80211_NODE_STAT(ni, rx_dup); -+ goto out; -+ } -+ ni->ni_rxseqs[tid] = rxseq; -+ } -+ } -+ -+ switch (type) { -+ case IEEE80211_FC0_TYPE_DATA: -+ hdrspace = ieee80211_hdrspace(ic, wh); -+ if (skb->len < hdrspace) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "data", "too short: len %u, expecting %u", -+ skb->len, hdrspace); -+ vap->iv_stats.is_rx_tooshort++; -+ goto out; /* XXX */ -+ } -+ switch (vap->iv_opmode) { -+ case IEEE80211_M_STA: -+ if ((dir != IEEE80211_FC1_DIR_FROMDS) && -+ (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) && -+ (dir == IEEE80211_FC1_DIR_DSTODS)))) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "data", "invalid dir 0x%x", dir); -+ vap->iv_stats.is_rx_wrongdir++; -+ goto out; -+ } -+ if ((dev->flags & IFF_MULTICAST) && -+ IEEE80211_IS_MULTICAST(wh->i_addr1)) { -+ if (IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_myaddr)) { -+ /* -+ * In IEEE802.11 network, multicast packet -+ * sent from me is broadcasted from AP. -+ * It should be silently discarded for -+ * SIMPLEX interface. -+ * -+ * NB: Linux has no IFF_ flag to indicate -+ * if an interface is SIMPLEX or not; -+ * so we always assume it to be true. -+ */ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, NULL, "%s", "multicast echo"); -+ vap->iv_stats.is_rx_mcastecho++; -+ goto out; -+ } -+ /* -+ * if it is brodcasted by me on behalf of -+ * a station behind me, drop it. -+ */ -+ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) { -+ struct ieee80211_node_table *nt; -+ struct ieee80211_node *ni_wds; -+ nt = &ic->ic_sta; -+ ni_wds = ieee80211_find_wds_node(nt, wh->i_addr3); -+ if (ni_wds) { -+ ieee80211_free_node(ni_wds); /* Decr ref count */ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, NULL, "%s", -+ "multicast echo originated from node behind me"); -+ vap->iv_stats.is_rx_mcastecho++; -+ goto out; -+ } -+ } -+ } -+ break; -+ case IEEE80211_M_IBSS: -+ case IEEE80211_M_AHDEMO: -+ if (dir != IEEE80211_FC1_DIR_NODS) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "data", "invalid dir 0x%x", dir); -+ vap->iv_stats.is_rx_wrongdir++; -+ goto out; -+ } -+ /* XXX no power-save support */ -+ break; -+ case IEEE80211_M_HOSTAP: -+ if ((dir != IEEE80211_FC1_DIR_TODS) && -+ (dir != IEEE80211_FC1_DIR_DSTODS)) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "data", "invalid dir 0x%x", dir); -+ vap->iv_stats.is_rx_wrongdir++; -+ goto out; -+ } -+ /* check if source STA is associated */ -+ if (ni == vap->iv_bss) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, "data", "%s", "unknown src"); -+ /* NB: caller deals with reference */ -+ if (vap->iv_state == IEEE80211_S_RUN) -+ ieee80211_send_error(ni, wh->i_addr2, -+ IEEE80211_FC0_SUBTYPE_DEAUTH, -+ IEEE80211_REASON_NOT_AUTHED); -+ vap->iv_stats.is_rx_notassoc++; -+ goto err; -+ } -+ if (ni->ni_associd == 0) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, "data", "%s", "unassoc src"); -+ IEEE80211_SEND_MGMT(ni, -+ IEEE80211_FC0_SUBTYPE_DISASSOC, -+ IEEE80211_REASON_NOT_ASSOCED); -+ vap->iv_stats.is_rx_notassoc++; -+ goto err; -+ } -+ /* -+ * If we're a 4 address packet, make sure we have an entry in -+ * the node table for the packet source address (addr4). -+ * If not, add one. -+ */ -+ if (dir == IEEE80211_FC1_DIR_DSTODS) { -+ struct ieee80211_node_table *nt; -+ struct ieee80211_frame_addr4 *wh4; -+ struct ieee80211_node *ni_wds; -+ if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS)) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, "data", "%s", "4 addr not allowed"); -+ goto err; -+ } -+ wh4 = (struct ieee80211_frame_addr4 *)skb->data; -+ nt = &ic->ic_sta; -+ ni_wds = ieee80211_find_wds_node(nt, wh4->i_addr4); -+ /* Last call increments ref count if !NULL */ -+ if ((ni_wds != NULL) && (ni_wds != ni)) { -+ /* -+ * node with source address (addr4) moved -+ * to another WDS capable station. remove the -+ * reference to the previous station and add -+ * reference to the new one -+ */ -+ (void) ieee80211_remove_wds_addr(nt, wh4->i_addr4); -+ ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0); -+ } -+ if (ni_wds == NULL) -+ ieee80211_add_wds_addr(nt, ni, wh4->i_addr4, 0); -+ else -+ ieee80211_free_node(ni_wds); /* Decr ref count */ -+ } -+ -+ /* -+ * Check for power save state change. -+ */ -+ if (!(ni->ni_flags & IEEE80211_NODE_UAPSD)) { -+ if ((wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) ^ -+ (ni->ni_flags & IEEE80211_NODE_PWR_MGT)) -+ ieee80211_node_pwrsave(ni, wh->i_fc[1] & IEEE80211_FC1_PWR_MGT); -+ } else if (ni->ni_flags & IEEE80211_NODE_PS_CHANGED) { -+ int pwr_save_changed = 0; -+ IEEE80211_LOCK_IRQ(ic); -+ if ((*(__le16 *)(&wh->i_seq[0])) == ni->ni_pschangeseq) { -+ ni->ni_flags &= ~IEEE80211_NODE_PS_CHANGED; -+ pwr_save_changed = 1; -+ } -+ IEEE80211_UNLOCK_IRQ(ic); -+ if (pwr_save_changed) -+ ieee80211_node_pwrsave(ni, wh->i_fc[1] & IEEE80211_FC1_PWR_MGT); -+ } -+ break; -+ case IEEE80211_M_WDS: -+ if (dir != IEEE80211_FC1_DIR_DSTODS) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "data", "invalid dir 0x%x", dir); -+ vap->iv_stats.is_rx_wrongdir++; -+ goto out; -+ } -+ break; -+ default: -+ /* XXX here to keep compiler happy */ -+ goto out; -+ } -+ -+ /* -+ * Handle privacy requirements. Note that we -+ * must not be preempted from here until after -+ * we (potentially) call ieee80211_crypto_demic; -+ * otherwise we may violate assumptions in the -+ * crypto cipher modules used to do delayed update -+ * of replay sequence numbers. -+ */ -+ if (wh->i_fc[1] & IEEE80211_FC1_PROT) { -+ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { -+ /* -+ * Discard encrypted frames when privacy is off. -+ */ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, "WEP", "%s", "PRIVACY off"); -+ vap->iv_stats.is_rx_noprivacy++; -+ IEEE80211_NODE_STAT(ni, rx_noprivacy); -+ goto out; -+ } -+ key = ieee80211_crypto_decap(ni, skb, hdrspace); -+ if (key == NULL) { -+ /* NB: stats+msgs handled in crypto_decap */ -+ IEEE80211_NODE_STAT(ni, rx_wepfail); -+ goto out; -+ } -+ wh = (struct ieee80211_frame *)skb->data; -+ wh->i_fc[1] &= ~IEEE80211_FC1_PROT; -+ } else -+ key = NULL; -+ -+ /* -+ * Next up, any fragmentation. -+ */ -+ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { -+ skb = ieee80211_defrag(ni, skb, hdrspace); -+ if (skb == NULL) { -+ /* Fragment dropped or frame not complete yet */ -+ goto out; -+ } -+ } -+ wh = NULL; /* no longer valid, catch any uses */ -+ -+ /* -+ * Next strip any MSDU crypto bits. -+ */ -+ if (key != NULL && -+ !ieee80211_crypto_demic(vap, key, skb, hdrspace)) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ ni->ni_macaddr, "data", "%s", "demic error"); -+ IEEE80211_NODE_STAT(ni, rx_demicfail); -+ goto out; -+ } -+ -+ /* -+ * Finally, strip the 802.11 header. -+ */ -+ skb = ieee80211_decap(vap, skb, hdrspace); -+ if (skb == NULL) { -+ /* don't count Null data frames as errors */ -+ if (subtype == IEEE80211_FC0_SUBTYPE_NODATA) -+ goto out; -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ ni->ni_macaddr, "data", "%s", "decap error"); -+ vap->iv_stats.is_rx_decap++; -+ IEEE80211_NODE_STAT(ni, rx_decap); -+ goto err; -+ } -+ eh = (struct ether_header *) skb->data; -+ -+ if (! accept_data_frame(vap, ni, key, skb, eh)) -+ goto out; -+ -+ vap->iv_devstats.rx_packets++; -+ vap->iv_devstats.rx_bytes += skb->len; -+ IEEE80211_NODE_STAT(ni, rx_data); -+ IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len); -+ ic->ic_lastdata = jiffies; -+ -+#ifdef ATH_SUPERG_FF -+ /* check for FF */ -+ llc = (struct llc *) (skb->data + sizeof(struct ether_header)); -+ if (ntohs(llc->llc_snap.ether_type) == (u_int16_t)ATH_ETH_TYPE) { -+ struct sk_buff *skb1 = NULL; -+ struct ether_header *eh_tmp; -+ struct athl2p_tunnel_hdr *ath_hdr; -+ int frame_len; -+ -+ /* NB: assumes linear (i.e., non-fragmented) skb */ -+ -+ /* check length > header */ -+ if (skb->len < sizeof(struct ether_header) + LLC_SNAPFRAMELEN -+ + roundup(sizeof(struct athl2p_tunnel_hdr) - 2, 4) + 2) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ ni->ni_macaddr, "data", "%s", "decap error"); -+ vap->iv_stats.is_rx_decap++; -+ IEEE80211_NODE_STAT(ni, rx_decap); -+ goto err; -+ } -+ -+ /* get to the tunneled headers */ -+ ath_hdr = (struct athl2p_tunnel_hdr *) -+ skb_pull(skb, sizeof(struct ether_header) + LLC_SNAPFRAMELEN); -+ eh_tmp = (struct ether_header *) -+ skb_pull(skb, roundup(sizeof(struct athl2p_tunnel_hdr) - 2, 4) + 2); -+ /* sanity check for malformed 802.3 length */ -+ frame_len = ntohs(eh_tmp->ether_type); -+ if (skb->len < roundup(sizeof(struct ether_header) + frame_len, 4)) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ ni->ni_macaddr, "data", "%s", "decap error"); -+ vap->iv_stats.is_rx_decap++; -+ IEEE80211_NODE_STAT(ni, rx_decap); -+ goto err; -+ } -+ -+ /* only implementing FF now. drop all others. */ -+ if (ath_hdr->proto != ATH_L2TUNNEL_PROTO_FF) { -+ IEEE80211_DISCARD_MAC(vap, -+ IEEE80211_MSG_SUPG | IEEE80211_MSG_INPUT, -+ eh->ether_shost, "fast-frame", -+ "bad atheros tunnel prot %u", -+ ath_hdr->proto); -+ vap->iv_stats.is_rx_badathtnl++; -+ goto err; -+ } -+ vap->iv_stats.is_rx_ffcnt++; -+ -+ skb1 = skb_clone(skb, GFP_ATOMIC); /* XXX: GFP_ATOMIC is overkill? */ -+ -+ /* we now have 802.3 MAC hdr followed by 802.2 LLC/SNAP. convert to DIX */ -+ athff_decap(skb); -+ -+ /* remove second frame from end of first */ -+ skb_trim(skb, sizeof(struct ether_header) + frame_len - LLC_SNAPFRAMELEN); -+ -+ /* prepare second tunneled frame */ -+ skb_pull(skb1, roundup(sizeof(struct ether_header) + frame_len, 4)); -+ athff_decap(skb1); -+ -+ /* deliver the frames */ -+ ieee80211_deliver_data(ni, skb); -+ ieee80211_deliver_data(ni, skb1); -+ } else { -+ /* assume non-atheros llc type */ -+ ieee80211_deliver_data(ni, skb); -+ } -+#else /* !ATH_SUPERG_FF */ -+ ieee80211_deliver_data(ni, skb); -+#endif -+ return IEEE80211_FC0_TYPE_DATA; -+ -+ case IEEE80211_FC0_TYPE_MGT: -+ /* -+ * WDS opmode do not support management frames -+ */ -+ if (vap->iv_opmode == IEEE80211_M_WDS) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ goto out; -+ } -+ IEEE80211_NODE_STAT(ni, rx_mgmt); -+ if (dir != IEEE80211_FC1_DIR_NODS) { -+ vap->iv_stats.is_rx_wrongdir++; -+ goto err; -+ } -+ if (skb->len < sizeof(struct ieee80211_frame)) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, -+ ni->ni_macaddr, "mgt", "too short: len %u", -+ skb->len); -+ vap->iv_stats.is_rx_tooshort++; -+ goto out; -+ } -+#ifdef IEEE80211_DEBUG -+ if ((ieee80211_msg_debug(vap) && doprint(vap, subtype)) || -+ ieee80211_msg_dumppkts(vap)) { -+ ieee80211_note(vap, "received %s from %s rssi %d\n", -+ ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ ether_sprintf(wh->i_addr2), rssi); -+ } -+#endif -+ if (wh->i_fc[1] & IEEE80211_FC1_PROT) { -+ if (subtype != IEEE80211_FC0_SUBTYPE_AUTH) { -+ /* -+ * Only shared key auth frames with a challenge -+ * should be encrypted, discard all others. -+ */ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ "%s", "WEP set but not permitted"); -+ vap->iv_stats.is_rx_mgtdiscard++; /* XXX */ -+ goto out; -+ } -+ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { -+ /* -+ * Discard encrypted frames when privacy is off. -+ */ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, "mgt", "%s", "WEP set but PRIVACY off"); -+ vap->iv_stats.is_rx_noprivacy++; -+ goto out; -+ } -+ hdrspace = ieee80211_hdrspace(ic, wh); -+ key = ieee80211_crypto_decap(ni, skb, hdrspace); -+ if (key == NULL) { -+ /* NB: stats+msgs handled in crypto_decap */ -+ goto out; -+ } -+ wh = (struct ieee80211_frame *)skb->data; -+ wh->i_fc[1] &= ~IEEE80211_FC1_PROT; -+ } -+ ic->ic_recv_mgmt(ni, skb, subtype, rssi, rstamp); -+ goto out; -+ -+ case IEEE80211_FC0_TYPE_CTL: -+ IEEE80211_NODE_STAT(ni, rx_ctrl); -+ vap->iv_stats.is_rx_ctl++; -+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) -+ if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) -+ ieee80211_recv_pspoll(ni, skb); -+ goto out; -+ -+ default: -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, NULL, "bad frame type 0x%x", type); -+ /* should not come here */ -+ break; -+ } -+err: -+ vap->iv_devstats.rx_errors++; -+out: -+ if (skb != NULL) -+ dev_kfree_skb(skb); -+ return type; -+#undef HAS_SEQ -+} -+EXPORT_SYMBOL(ieee80211_input); -+ -+ -+/* -+ * Determines whether a frame should be accepted, based on information -+ * about the frame's origin and encryption, and policy for this vap. -+ */ -+static int accept_data_frame(struct ieee80211vap *vap, -+ struct ieee80211_node *ni, struct ieee80211_key *key, -+ struct sk_buff *skb, struct ether_header *eh) -+{ -+#define IS_EAPOL(eh) ((eh)->ether_type == __constant_htons(ETHERTYPE_PAE)) -+#define PAIRWISE_SET(vap) ((vap)->iv_nw_keys[0].wk_cipher != &ieee80211_cipher_none) -+ if (IS_EAPOL(eh)) { -+ /* encrypted eapol is always OK */ -+ if (key) -+ return 1; -+ /* cleartext eapol is OK if we don't have pairwise keys yet */ -+ if (! PAIRWISE_SET(vap)) -+ return 1; -+ /* cleartext eapol is OK if configured to allow it */ -+ if (! IEEE80211_VAP_DROPUNENC_EAPOL(vap)) -+ return 1; -+ /* cleartext eapol is OK if other unencrypted is OK */ -+ if (! (vap->iv_flags & IEEE80211_F_DROPUNENC)) -+ return 1; -+ /* not OK */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ eh->ether_shost, "data", -+ "unauthorized port: ether type 0x%x len %u", -+ ntohs(eh->ether_type), skb->len); -+ vap->iv_stats.is_rx_unauth++; -+ vap->iv_devstats.rx_errors++; -+ IEEE80211_NODE_STAT(ni, rx_unauth); -+ return 0; -+ } -+ -+ if (!ieee80211_node_is_authorized(ni)) { -+ /* -+ * Deny any non-PAE frames received prior to -+ * authorization. For open/shared-key -+ * authentication the port is mark authorized -+ * after authentication completes. For 802.1x -+ * the port is not marked authorized by the -+ * authenticator until the handshake has completed. -+ */ -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, -+ eh->ether_shost, "data", -+ "unauthorized port: ether type 0x%x len %u", -+ ntohs(eh->ether_type), skb->len); -+ vap->iv_stats.is_rx_unauth++; -+ vap->iv_devstats.rx_errors++; -+ IEEE80211_NODE_STAT(ni, rx_unauth); -+ return 0; -+ } else { -+ /* -+ * When denying unencrypted frames, discard -+ * any non-PAE frames received without encryption. -+ */ -+ if ((vap->iv_flags & IEEE80211_F_DROPUNENC) && key == NULL) { -+ IEEE80211_NODE_STAT(ni, rx_unencrypted); -+ return 0; -+ } -+ } -+ return 1; -+ -+#undef IS_EAPOL -+#undef PAIRWISE_SET -+} -+ -+ -+/* -+ * Context: softIRQ (tasklet) -+ */ -+int -+ieee80211_input_all(struct ieee80211com *ic, -+ struct sk_buff *skb, int rssi, u_int32_t rstamp) -+{ -+ struct ieee80211vap *vap; -+ int type = -1; -+ -+ /* XXX locking */ -+ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { -+ struct ieee80211_node *ni; -+ struct sk_buff *skb1; -+ -+ if (TAILQ_NEXT(vap, iv_next) != NULL) { -+ skb1 = skb_copy(skb, GFP_ATOMIC); -+ if (skb1 == NULL) { -+ /* XXX stat+msg */ -+ continue; -+ } -+ } else { -+ skb1 = skb; -+ skb = NULL; -+ } -+ ni = ieee80211_ref_node(vap->iv_bss); -+ type = ieee80211_input(ni, skb1, rssi, rstamp); -+ ieee80211_free_node(ni); -+ } -+ if (skb != NULL) /* no vaps, reclaim skb */ -+ dev_kfree_skb(skb); -+ return type; -+} -+EXPORT_SYMBOL(ieee80211_input_all); -+ -+/* -+ * This function reassemble fragments using the skb of the 1st fragment, -+ * if large enough. If not, a new skb is allocated to hold incoming -+ * fragments. -+ * -+ * Fragments are copied at the end of the previous fragment. A different -+ * strategy could have been used, where a non-linear skb is allocated and -+ * fragments attached to that skb. -+ */ -+static struct sk_buff * -+ieee80211_defrag(struct ieee80211_node *ni, struct sk_buff *skb, int hdrlen) -+{ -+ struct ieee80211_frame *wh = (struct ieee80211_frame *) skb->data; -+ u_int16_t rxseq, last_rxseq; -+ u_int8_t fragno, last_fragno; -+ u_int8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG; -+ -+ rxseq = le16_to_cpu(*(__le16 *)wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; -+ fragno = le16_to_cpu(*(__le16 *)wh->i_seq) & IEEE80211_SEQ_FRAG_MASK; -+ -+ /* Quick way out, if there's nothing to defragment */ -+ if (!more_frag && fragno == 0 && ni->ni_rxfrag == NULL) -+ return skb; -+ -+ /* -+ * Remove frag to ensure it doesn't get reaped by timer. -+ */ -+ if (ni->ni_table == NULL) { -+ /* -+ * Should never happen. If the node is orphaned (not in -+ * the table) then input packets should not reach here. -+ * Otherwise, a concurrent request that yanks the table -+ * should be blocked by other interlocking and/or by first -+ * shutting the driver down. Regardless, be defensive -+ * here and just bail -+ */ -+ /* XXX need msg+stat */ -+ dev_kfree_skb(skb); -+ return NULL; -+ } -+ -+ /* -+ * Use this lock to make sure ni->ni_rxfrag is -+ * not freed by the timer process while we use it. -+ * XXX bogus -+ */ -+ IEEE80211_NODE_LOCK_IRQ(ni->ni_table); -+ -+ /* -+ * Update the time stamp. As a side effect, it -+ * also makes sure that the timer will not change -+ * ni->ni_rxfrag for at least 1 second, or in -+ * other words, for the remaining of this function. -+ */ -+ ni->ni_rxfragstamp = jiffies; -+ -+ IEEE80211_NODE_UNLOCK_IRQ(ni->ni_table); -+ -+ /* -+ * Validate that fragment is in order and -+ * related to the previous ones. -+ */ -+ if (ni->ni_rxfrag) { -+ struct ieee80211_frame *lwh; -+ -+ lwh = (struct ieee80211_frame *) ni->ni_rxfrag->data; -+ last_rxseq = le16_to_cpu(*(__le16 *)lwh->i_seq) >> -+ IEEE80211_SEQ_SEQ_SHIFT; -+ last_fragno = le16_to_cpu(*(__le16 *)lwh->i_seq) & -+ IEEE80211_SEQ_FRAG_MASK; -+ if (rxseq != last_rxseq -+ || fragno != last_fragno + 1 -+ || (!IEEE80211_ADDR_EQ(wh->i_addr1, lwh->i_addr1)) -+ || (!IEEE80211_ADDR_EQ(wh->i_addr2, lwh->i_addr2)) -+ || (ni->ni_rxfrag->end - ni->ni_rxfrag->tail < -+ skb->len)) { -+ /* -+ * Unrelated fragment or no space for it, -+ * clear current fragments -+ */ -+ dev_kfree_skb(ni->ni_rxfrag); -+ ni->ni_rxfrag = NULL; -+ } -+ } -+ -+ /* If this is the first fragment */ -+ if (ni->ni_rxfrag == NULL && fragno == 0) { -+ ni->ni_rxfrag = skb; -+ /* If more frags are coming */ -+ if (more_frag) { -+ if (skb_is_nonlinear(skb)) { -+ /* -+ * We need a continous buffer to -+ * assemble fragments -+ */ -+ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); -+ dev_kfree_skb(skb); -+ } -+ /* -+ * Check that we have enough space to hold -+ * incoming fragments -+ * XXX 4-address/QoS frames? -+ */ -+ else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + -+ hdrlen) { -+ ni->ni_rxfrag = skb_copy_expand(skb, 0, -+ (ni->ni_vap->iv_dev->mtu + hdrlen) - -+ (skb->end - skb->head), GFP_ATOMIC); -+ dev_kfree_skb(skb); -+ } -+ } -+ } else { -+ if (ni->ni_rxfrag) { -+ struct ieee80211_frame *lwh = (struct ieee80211_frame *) -+ ni->ni_rxfrag->data; -+ -+ /* -+ * We know we have enough space to copy, -+ * we've verified that before -+ */ -+ /* Copy current fragment at end of previous one */ -+ memcpy(ni->ni_rxfrag->tail, -+ skb->data + hdrlen, skb->len - hdrlen); -+ /* Update tail and length */ -+ skb_put(ni->ni_rxfrag, skb->len - hdrlen); -+ /* Keep a copy of last sequence and fragno */ -+ *(__le16 *) lwh->i_seq = *(__le16 *) wh->i_seq; -+ } -+ /* we're done with the fragment */ -+ dev_kfree_skb(skb); -+ } -+ -+ if (more_frag) { -+ /* More to come */ -+ skb = NULL; -+ } else { -+ /* Last fragment received, we're done! */ -+ skb = ni->ni_rxfrag; -+ ni->ni_rxfrag = NULL; -+ } -+ return skb; -+} -+ -+static void -+ieee80211_deliver_data(struct ieee80211_node *ni, struct sk_buff *skb) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct net_device *dev = vap->iv_dev; -+ struct ether_header *eh = (struct ether_header *) skb->data; -+ -+#ifdef ATH_SUPERG_XR -+ /* -+ * if it is a XR vap, send the data to associated normal net -+ * device. XR vap has a net device which is not registered with -+ * OS. -+ */ -+ if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR) -+ dev = vap->iv_xrvap->iv_dev; -+#endif -+ -+ /* perform as a bridge within the vap */ -+ /* XXX intra-vap bridging only */ -+ if (vap->iv_opmode == IEEE80211_M_HOSTAP && -+ (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) { -+ struct sk_buff *skb1 = NULL; -+ -+ if (ETHER_IS_MULTICAST(eh->ether_dhost)) -+ skb1 = skb_copy(skb, GFP_ATOMIC); -+ else { -+ /* -+ * Check if destination is associated with the -+ * same vap and authorized to receive traffic. -+ * Beware of traffic destined for the vap itself; -+ * sending it will not work; just let it be -+ * delivered normally. -+ */ -+ struct ieee80211_node *ni1 = ieee80211_find_node( -+ &vap->iv_ic->ic_sta, eh->ether_dhost); -+ if (ni1 != NULL) { -+ if (ni1->ni_vap == vap && -+ ieee80211_node_is_authorized(ni1) && -+ ni1 != vap->iv_bss) { -+ skb1 = skb; -+ skb = NULL; -+ } -+ /* XXX statistic? */ -+ ieee80211_free_node(ni1); -+ } -+ } -+ if (skb1 != NULL) { -+ skb1->dev = dev; -+ skb_reset_mac_header(skb1); -+ skb1->network_header = skb1->data + sizeof(struct ether_header); -+ skb1->protocol = __constant_htons(ETH_P_802_2); -+ /* XXX insert vlan tag before queue it? */ -+ dev_queue_xmit(skb1); -+ } -+ } -+ -+ if (skb != NULL) { -+ skb->dev = dev; -+ -+#ifdef USE_HEADERLEN_RESV -+ skb->protocol = ath_eth_type_trans(skb, dev); -+#else -+ skb->protocol = eth_type_trans(skb, dev); -+#endif -+ if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) { -+ /* attach vlan tag */ -+ vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan); -+ } else -+ netif_rx(skb); -+ dev->last_rx = jiffies; -+ } -+} -+ -+static struct sk_buff * -+ieee80211_decap(struct ieee80211vap *vap, struct sk_buff *skb, int hdrlen) -+{ -+ struct ieee80211_qosframe_addr4 wh; /* Max size address frames */ -+ struct ether_header *eh; -+ struct llc *llc; -+ __be16 ether_type = 0; -+ -+ memcpy(&wh, skb->data, hdrlen); /* Only copy hdrlen over */ -+ llc = (struct llc *) skb_pull(skb, hdrlen); -+ if (skb->len >= LLC_SNAPFRAMELEN && -+ llc->llc_dsap == LLC_SNAP_LSAP && llc->llc_ssap == LLC_SNAP_LSAP && -+ llc->llc_control == LLC_UI && llc->llc_snap.org_code[0] == 0 && -+ llc->llc_snap.org_code[1] == 0 && llc->llc_snap.org_code[2] == 0) { -+ ether_type = llc->llc_un.type_snap.ether_type; -+ skb_pull(skb, LLC_SNAPFRAMELEN); -+ llc = NULL; -+ } -+ eh = (struct ether_header *) skb_push(skb, sizeof(struct ether_header)); -+ switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) { -+ case IEEE80211_FC1_DIR_NODS: -+ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1); -+ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2); -+ break; -+ case IEEE80211_FC1_DIR_TODS: -+ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3); -+ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2); -+ break; -+ case IEEE80211_FC1_DIR_FROMDS: -+ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1); -+ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr3); -+ break; -+ case IEEE80211_FC1_DIR_DSTODS: -+ IEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3); -+ IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr4); -+ break; -+ } -+ if (!ALIGNED_POINTER(skb->data + sizeof(*eh), u_int32_t)) { -+ struct sk_buff *n; -+ -+ /* XXX does this always work? */ -+ n = skb_copy(skb, GFP_ATOMIC); -+ dev_kfree_skb(skb); -+ if (n == NULL) -+ return NULL; -+ skb = n; -+ eh = (struct ether_header *) skb->data; -+ } -+ if (llc != NULL) -+ eh->ether_type = htons(skb->len - sizeof(*eh)); -+ else -+ eh->ether_type = ether_type; -+ return skb; -+} -+ -+/* -+ * Install received rate set information in the node's state block. -+ */ -+int -+ieee80211_setup_rates(struct ieee80211_node *ni, -+ const u_int8_t *rates, const u_int8_t *xrates, int flags) -+{ -+ struct ieee80211_rateset *rs = &ni->ni_rates; -+ -+ memset(rs, 0, sizeof(*rs)); -+ rs->rs_nrates = rates[1]; -+ memcpy(rs->rs_rates, rates + 2, rs->rs_nrates); -+ if (xrates != NULL) { -+ u_int8_t nxrates; -+ /* -+ * Tack on 11g extended supported rate element. -+ */ -+ nxrates = xrates[1]; -+ if (rs->rs_nrates + nxrates > IEEE80211_RATE_MAXSIZE) { -+ struct ieee80211vap *vap = ni->ni_vap; -+ -+ nxrates = IEEE80211_RATE_MAXSIZE - rs->rs_nrates; -+ IEEE80211_NOTE(vap, IEEE80211_MSG_XRATE, ni, -+ "extended rate set too large;" -+ " only using %u of %u rates", -+ nxrates, xrates[1]); -+ vap->iv_stats.is_rx_rstoobig++; -+ } -+ memcpy(rs->rs_rates + rs->rs_nrates, xrates+2, nxrates); -+ rs->rs_nrates += nxrates; -+ } -+ return ieee80211_fix_rate(ni, flags); -+} -+ -+static void -+ieee80211_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh, -+ int rssi, u_int32_t rstamp, u_int16_t seq, u_int16_t status) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ -+ if (ni->ni_authmode == IEEE80211_AUTH_SHARED) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "open auth", -+ "bad sta auth mode %u", ni->ni_authmode); -+ vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ -+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { -+ /* XXX hack to workaround calling convention */ -+ -+ /* XXX To send the frame to the requesting STA, we have to -+ * create a node for the station that we're going to reject. -+ * The node will be freed automatically */ -+ if (ni == vap->iv_bss) { -+ ni = ieee80211_dup_bss(vap, wh->i_addr2); -+ if (ni == NULL) -+ return; -+ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, -+ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), -+ ieee80211_node_refcnt(ni)); -+ } -+ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, -+ (seq + 1) | (IEEE80211_STATUS_ALG << 16)); -+ return; -+ } -+ } -+ switch (vap->iv_opmode) { -+ case IEEE80211_M_IBSS: -+ if (vap->iv_state != IEEE80211_S_RUN || -+ seq != IEEE80211_AUTH_OPEN_REQUEST) { -+ vap->iv_stats.is_rx_bad_auth++; -+ return; -+ } -+ ieee80211_new_state(vap, IEEE80211_S_AUTH, -+ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); -+ break; -+ -+ case IEEE80211_M_AHDEMO: -+ case IEEE80211_M_WDS: -+ /* should not come here */ -+ break; -+ -+ case IEEE80211_M_HOSTAP: -+ if (vap->iv_state != IEEE80211_S_RUN || -+ seq != IEEE80211_AUTH_OPEN_REQUEST) { -+ vap->iv_stats.is_rx_bad_auth++; -+ return; -+ } -+ /* always accept open authentication requests */ -+ if (ni == vap->iv_bss) { -+ ni = ieee80211_dup_bss(vap, wh->i_addr2); -+ if (ni == NULL) -+ return; -+ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, -+ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), -+ ieee80211_node_refcnt(ni)); -+ -+ } else if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0) -+ (void) ieee80211_ref_node(ni); -+ /* -+ * Mark the node as referenced to reflect that it's -+ * reference count has been bumped to ensure it remains -+ * after the transaction completes. -+ */ -+ ni->ni_flags |= IEEE80211_NODE_AREF; -+ -+ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); -+ IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, -+ ni, "station authenticated (%s)", "open"); -+ /* -+ * When 802.1x is not in use mark the port -+ * authorized at this point so traffic can flow. -+ */ -+ if (ni->ni_authmode != IEEE80211_AUTH_8021X) -+ ieee80211_node_authorize(ni); -+ break; -+ -+ case IEEE80211_M_STA: -+ if (vap->iv_state != IEEE80211_S_AUTH || -+ seq != IEEE80211_AUTH_OPEN_RESPONSE) { -+ vap->iv_stats.is_rx_bad_auth++; -+ return; -+ } -+ if (status != 0) { -+ IEEE80211_NOTE(vap, -+ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, -+ "open auth failed (reason %d)", status); -+ vap->iv_stats.is_rx_auth_fail++; -+ ieee80211_new_state(vap, IEEE80211_S_SCAN, -+ IEEE80211_SCAN_FAIL_STATUS); -+ } else -+ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); -+ break; -+ case IEEE80211_M_MONITOR: -+ break; -+ } -+} -+ -+/* -+ * Send a management frame error response to the specified -+ * station. If ni is associated with the station then use -+ * it; otherwise allocate a temporary node suitable for -+ * transmitting the frame and then free the reference so -+ * it will go away as soon as the frame has been transmitted. -+ */ -+static void -+ieee80211_send_error(struct ieee80211_node *ni, -+ const u_int8_t *mac, int subtype, int arg) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ int istmp; -+ -+ if (ni == vap->iv_bss) { -+ ni = ieee80211_tmp_node(vap, mac); -+ if (ni == NULL) { -+ /* XXX msg */ -+ return; -+ } -+ istmp = 1; -+ } else -+ istmp = 0; -+ IEEE80211_SEND_MGMT(ni, subtype, arg); -+ if (istmp) -+ ieee80211_free_node(ni); -+} -+ -+static int -+alloc_challenge(struct ieee80211_node *ni) -+{ -+ if (ni->ni_challenge == NULL) -+ MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN, -+ M_DEVBUF, M_NOWAIT); -+ if (ni->ni_challenge == NULL) { -+ IEEE80211_NOTE(ni->ni_vap, -+ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, -+ "%s", "shared key challenge alloc failed"); -+ /* XXX statistic */ -+ } -+ return (ni->ni_challenge != NULL); -+} -+ -+/* XXX TODO: add statistics */ -+static void -+ieee80211_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, -+ u_int8_t *frm, u_int8_t *efrm, int rssi, u_int32_t rstamp, -+ u_int16_t seq, u_int16_t status) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ u_int8_t *challenge; -+ int allocbs, estatus; -+ -+ /* -+ * NB: this can happen as we allow pre-shared key -+ * authentication to be enabled w/o wep being turned -+ * on so that configuration of these can be done -+ * in any order. It may be better to enforce the -+ * ordering in which case this check would just be -+ * for sanity/consistency. -+ */ -+ estatus = 0; /* NB: silence compiler */ -+ if ((vap->iv_flags & IEEE80211_F_PRIVACY) == 0) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "%s", " PRIVACY is disabled"); -+ estatus = IEEE80211_STATUS_ALG; -+ goto bad; -+ } -+ /* -+ * Pre-shared key authentication is evil; accept -+ * it only if explicitly configured (it is supported -+ * mainly for compatibility with clients like OS X). -+ */ -+ if (ni->ni_authmode != IEEE80211_AUTH_AUTO && -+ ni->ni_authmode != IEEE80211_AUTH_SHARED) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "bad sta auth mode %u", ni->ni_authmode); -+ vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ -+ estatus = IEEE80211_STATUS_ALG; -+ goto bad; -+ } -+ -+ challenge = NULL; -+ if (frm + 1 < efrm) { -+ if ((frm[1] + 2) > (efrm - frm)) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "ie %d/%d too long", -+ frm[0], (frm[1] + 2) - (efrm - frm)); -+ vap->iv_stats.is_rx_bad_auth++; -+ estatus = IEEE80211_STATUS_CHALLENGE; -+ goto bad; -+ } -+ if (*frm == IEEE80211_ELEMID_CHALLENGE) -+ challenge = frm; -+ frm += frm[1] + 2; -+ } -+ switch (seq) { -+ case IEEE80211_AUTH_SHARED_CHALLENGE: -+ case IEEE80211_AUTH_SHARED_RESPONSE: -+ if (challenge == NULL) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "%s", "no challenge"); -+ vap->iv_stats.is_rx_bad_auth++; -+ estatus = IEEE80211_STATUS_CHALLENGE; -+ goto bad; -+ } -+ if (challenge[1] != IEEE80211_CHALLENGE_LEN) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "bad challenge len %d", challenge[1]); -+ vap->iv_stats.is_rx_bad_auth++; -+ estatus = IEEE80211_STATUS_CHALLENGE; -+ goto bad; -+ } -+ default: -+ break; -+ } -+ switch (vap->iv_opmode) { -+ case IEEE80211_M_MONITOR: -+ case IEEE80211_M_AHDEMO: -+ case IEEE80211_M_IBSS: -+ case IEEE80211_M_WDS: -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "bad operating mode %u", vap->iv_opmode); -+ return; -+ case IEEE80211_M_HOSTAP: -+ if (vap->iv_state != IEEE80211_S_RUN) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "bad state %u", vap->iv_state); -+ estatus = IEEE80211_STATUS_ALG; /* XXX */ -+ goto bad; -+ } -+ switch (seq) { -+ case IEEE80211_AUTH_SHARED_REQUEST: -+ if (ni == vap->iv_bss) { -+ ni = ieee80211_dup_bss(vap, wh->i_addr2); -+ if (ni == NULL) { -+ /* NB: no way to return an error */ -+ return; -+ } -+ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, -+ "%s: %p<%s> refcnt %d\n", __func__, ni, ether_sprintf(ni->ni_macaddr), -+ ieee80211_node_refcnt(ni)); -+ -+ allocbs = 1; -+ } else { -+ if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0) -+ (void) ieee80211_ref_node(ni); -+ allocbs = 0; -+ } -+ /* -+ * Mark the node as referenced to reflect that it's -+ * reference count has been bumped to ensure it remains -+ * after the transaction completes. -+ */ -+ ni->ni_flags |= IEEE80211_NODE_AREF; -+ ni->ni_rssi = rssi; -+ ni->ni_rstamp = rstamp; -+ ni->ni_last_rx = jiffies; -+ if (!alloc_challenge(ni)) { -+ /* NB: don't return error so they rexmit */ -+ return; -+ } -+ get_random_bytes(ni->ni_challenge, -+ IEEE80211_CHALLENGE_LEN); -+ IEEE80211_NOTE(vap, -+ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, -+ "shared key %sauth request", allocbs ? "" : "re"); -+ break; -+ case IEEE80211_AUTH_SHARED_RESPONSE: -+ if (ni == vap->iv_bss) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key response", -+ "%s", "unknown station"); -+ /* NB: don't send a response */ -+ return; -+ } -+ if (ni->ni_challenge == NULL) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key response", -+ "%s", "no challenge recorded"); -+ vap->iv_stats.is_rx_bad_auth++; -+ estatus = IEEE80211_STATUS_CHALLENGE; -+ goto bad; -+ } -+ if (memcmp(ni->ni_challenge, &challenge[2], -+ challenge[1]) != 0) { -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key response", -+ "%s", "challenge mismatch"); -+ vap->iv_stats.is_rx_auth_fail++; -+ estatus = IEEE80211_STATUS_CHALLENGE; -+ goto bad; -+ } -+ IEEE80211_NOTE(vap, -+ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, -+ "station authenticated (%s)", "shared key"); -+ ieee80211_node_authorize(ni); -+ break; -+ default: -+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, -+ ni->ni_macaddr, "shared key auth", -+ "bad seq %d", seq); -+ vap->iv_stats.is_rx_bad_auth++; -+ estatus = IEEE80211_STATUS_SEQUENCE; -+ goto bad; -+ } -+ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); -+ break; -+ -+ case IEEE80211_M_STA: -+ if (vap->iv_state != IEEE80211_S_AUTH) -+ return; -+ switch (seq) { -+ case IEEE80211_AUTH_SHARED_PASS: -+ if (ni->ni_challenge != NULL) { -+ FREE(ni->ni_challenge, M_DEVBUF); -+ ni->ni_challenge = NULL; -+ } -+ if (status != 0) { -+ IEEE80211_NOTE_MAC(vap, -+ IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, -+ ieee80211_getbssid(vap, wh), -+ "shared key auth failed (reason %d)", -+ status); -+ vap->iv_stats.is_rx_auth_fail++; -+ /* XXX IEEE80211_SCAN_FAIL_STATUS */ -+ goto bad; -+ } -+ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); -+ break; -+ case IEEE80211_AUTH_SHARED_CHALLENGE: -+ if (!alloc_challenge(ni)) -+ goto bad; -+ /* XXX could optimize by passing recvd challenge */ -+ memcpy(ni->ni_challenge, &challenge[2], challenge[1]); -+ IEEE80211_SEND_MGMT(ni, -+ IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); -+ break; -+ default: -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH, -+ wh, "shared key auth", "bad seq %d", seq); -+ vap->iv_stats.is_rx_bad_auth++; -+ goto bad; -+ } -+ break; -+ } -+ return; -+bad: -+ /* -+ * Send an error response; but only when operating as an AP. -+ */ -+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { -+ /* XXX hack to workaround calling convention */ -+ ieee80211_send_error(ni, wh->i_addr2, -+ IEEE80211_FC0_SUBTYPE_AUTH, -+ (seq + 1) | (estatus<<16)); -+ } else if (vap->iv_opmode == IEEE80211_M_STA) { -+ /* -+ * Kick the state machine. This short-circuits -+ * using the mgt frame timeout to trigger the -+ * state transition. -+ */ -+ if (vap->iv_state == IEEE80211_S_AUTH) -+ ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); -+ } -+} -+ -+/* Verify the existence and length of __elem or get out. */ -+#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do { \ -+ if ((__elem) == NULL) { \ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ -+ wh, ieee80211_mgt_subtype_name[subtype >> \ -+ IEEE80211_FC0_SUBTYPE_SHIFT], \ -+ "%s", "no " #__elem ); \ -+ vap->iv_stats.is_rx_elem_missing++; \ -+ return; \ -+ } \ -+ if ((__elem)[1] > (__maxlen)) { \ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ -+ wh, ieee80211_mgt_subtype_name[subtype >> \ -+ IEEE80211_FC0_SUBTYPE_SHIFT], \ -+ "bad " #__elem " len %d", (__elem)[1]); \ -+ vap->iv_stats.is_rx_elem_toobig++; \ -+ return; \ -+ } \ -+} while (0) -+ -+#define IEEE80211_VERIFY_LENGTH(_len, _minlen) do { \ -+ if ((_len) < (_minlen)) { \ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ -+ wh, ieee80211_mgt_subtype_name[subtype >> \ -+ IEEE80211_FC0_SUBTYPE_SHIFT], \ -+ "%s", "ie too short"); \ -+ vap->iv_stats.is_rx_elem_toosmall++; \ -+ return; \ -+ } \ -+} while (0) -+ -+#ifdef IEEE80211_DEBUG -+static void -+ieee80211_ssid_mismatch(struct ieee80211vap *vap, const char *tag, -+ u_int8_t mac[IEEE80211_ADDR_LEN], u_int8_t *ssid) -+{ -+ printf("[%s] discard %s frame, ssid mismatch: ", -+ ether_sprintf(mac), tag); -+ ieee80211_print_essid(ssid + 2, ssid[1]); -+ printf("\n"); -+} -+ -+#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ -+ if ((_ssid)[1] != 0 && \ -+ ((_ssid)[1] != (_ni)->ni_esslen || \ -+ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ -+ if (ieee80211_msg_input(vap)) \ -+ ieee80211_ssid_mismatch(vap, \ -+ ieee80211_mgt_subtype_name[subtype >> \ -+ IEEE80211_FC0_SUBTYPE_SHIFT], \ -+ wh->i_addr2, _ssid); \ -+ vap->iv_stats.is_rx_ssidmismatch++; \ -+ return; \ -+ } \ -+} while (0) -+#else /* !IEEE80211_DEBUG */ -+#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ -+ if ((_ssid)[1] != 0 && \ -+ ((_ssid)[1] != (_ni)->ni_esslen || \ -+ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ -+ vap->iv_stats.is_rx_ssidmismatch++; \ -+ return; \ -+ } \ -+} while (0) -+#endif /* !IEEE80211_DEBUG */ -+ -+/* unaligned little endian access */ -+#define LE_READ_2(p) \ -+ ((u_int16_t) \ -+ ((((const u_int8_t *)(p))[0] ) | \ -+ (((const u_int8_t *)(p))[1] << 8))) -+#define LE_READ_4(p) \ -+ ((u_int32_t) \ -+ ((((const u_int8_t *)(p))[0] ) | \ -+ (((const u_int8_t *)(p))[1] << 8) | \ -+ (((const u_int8_t *)(p))[2] << 16) | \ -+ (((const u_int8_t *)(p))[3] << 24))) -+ -+static __inline int -+iswpaoui(const u_int8_t *frm) -+{ -+ return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI); -+} -+ -+static __inline int -+iswmeoui(const u_int8_t *frm) -+{ -+ return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI); -+} -+ -+static __inline int -+iswmeparam(const u_int8_t *frm) -+{ -+ return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && -+ frm[6] == WME_PARAM_OUI_SUBTYPE; -+} -+ -+static __inline int -+iswmeinfo(const u_int8_t *frm) -+{ -+ return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && -+ frm[6] == WME_INFO_OUI_SUBTYPE; -+} -+ -+static __inline int -+isatherosoui(const u_int8_t *frm) -+{ -+ return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI); -+} -+ -+/* -+ * Convert a WPA cipher selector OUI to an internal -+ * cipher algorithm. Where appropriate we also -+ * record any key length. -+ */ -+static int -+wpa_cipher(u_int8_t *sel, u_int8_t *keylen) -+{ -+#define WPA_SEL(x) (((x) << 24) | WPA_OUI) -+ u_int32_t w = LE_READ_4(sel); -+ -+ switch (w) { -+ case WPA_SEL(WPA_CSE_NULL): -+ return IEEE80211_CIPHER_NONE; -+ case WPA_SEL(WPA_CSE_WEP40): -+ if (keylen) -+ *keylen = 40 / NBBY; -+ return IEEE80211_CIPHER_WEP; -+ case WPA_SEL(WPA_CSE_WEP104): -+ if (keylen) -+ *keylen = 104 / NBBY; -+ return IEEE80211_CIPHER_WEP; -+ case WPA_SEL(WPA_CSE_TKIP): -+ return IEEE80211_CIPHER_TKIP; -+ case WPA_SEL(WPA_CSE_CCMP): -+ return IEEE80211_CIPHER_AES_CCM; -+ } -+ return 32; /* NB: so 1<< is discarded */ -+#undef WPA_SEL -+} -+ -+/* -+ * Convert a WPA key management/authentication algorithm -+ * to an internal code. -+ */ -+static int -+wpa_keymgmt(u_int8_t *sel) -+{ -+#define WPA_SEL(x) (((x)<<24)|WPA_OUI) -+ u_int32_t w = LE_READ_4(sel); -+ -+ switch (w) { -+ case WPA_SEL(WPA_ASE_8021X_UNSPEC): -+ return WPA_ASE_8021X_UNSPEC; -+ case WPA_SEL(WPA_ASE_8021X_PSK): -+ return WPA_ASE_8021X_PSK; -+ case WPA_SEL(WPA_ASE_NONE): -+ return WPA_ASE_NONE; -+ } -+ return 0; /* NB: so is discarded */ -+#undef WPA_SEL -+} -+ -+/* -+ * Parse a WPA information element to collect parameters -+ * and validate the parameters against what has been -+ * configured for the system. -+ */ -+static int -+ieee80211_parse_wpa(struct ieee80211vap *vap, u_int8_t *frm, -+ struct ieee80211_rsnparms *rsn_parm, const struct ieee80211_frame *wh) -+{ -+ u_int8_t len = frm[1]; -+ u_int32_t w; -+ int n; -+ -+ /* -+ * Check the length once for fixed parts: OUI, type, -+ * version, mcast cipher, and 2 selector counts. -+ * Other, variable-length data, must be checked separately. -+ */ -+ if (!(vap->iv_flags & IEEE80211_F_WPA1)) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "vap not WPA, flags 0x%x", vap->iv_flags); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ -+ if (len < 14) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "too short, len %u", len); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ frm += 6, len -= 4; /* NB: len is payload only */ -+ /* NB: iswapoui already validated the OUI and type */ -+ w = LE_READ_2(frm); -+ if (w != WPA_VERSION) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "bad version %u", w); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ frm += 2; -+ len -= 2; -+ -+ /* multicast/group cipher */ -+ w = wpa_cipher(frm, &rsn_parm->rsn_mcastkeylen); -+ if (w != rsn_parm->rsn_mcastcipher) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "mcast cipher mismatch; got %u, expected %u", -+ w, rsn_parm->rsn_mcastcipher); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ frm += 4; -+ len -= 4; -+ -+ /* unicast ciphers */ -+ n = LE_READ_2(frm); -+ frm += 2; -+ len -= 2; -+ if (len < n*4+2) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "ucast cipher data too short; len %u, n %u", -+ len, n); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ w = 0; -+ for (; n > 0; n--) { -+ w |= 1 << wpa_cipher(frm, &rsn_parm->rsn_ucastkeylen); -+ frm += 4; -+ len -= 4; -+ } -+ w &= rsn_parm->rsn_ucastcipherset; -+ if (w == 0) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "%s", "ucast cipher set empty"); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ if (w & (1 << IEEE80211_CIPHER_TKIP)) -+ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_TKIP; -+ else -+ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM; -+ -+ /* key management algorithms */ -+ n = LE_READ_2(frm); -+ frm += 2; -+ len -= 2; -+ if (len < n * 4) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "key mgmt alg data too short; len %u, n %u", -+ len, n); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ w = 0; -+ for (; n > 0; n--) { -+ w |= wpa_keymgmt(frm); -+ frm += 4; -+ len -= 4; -+ } -+ w &= rsn_parm->rsn_keymgmtset; -+ if (w == 0) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "WPA", "%s", "no acceptable key mgmt alg"); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ if (w & WPA_ASE_8021X_UNSPEC) -+ rsn_parm->rsn_keymgmt = WPA_ASE_8021X_UNSPEC; -+ else -+ rsn_parm->rsn_keymgmt = WPA_ASE_8021X_PSK; -+ -+ if (len > 2) /* optional capabilities */ -+ rsn_parm->rsn_caps = LE_READ_2(frm); -+ -+ return 0; -+} -+ -+/* -+ * Convert an RSN cipher selector OUI to an internal -+ * cipher algorithm. Where appropriate we also -+ * record any key length. -+ */ -+static int -+rsn_cipher(u_int8_t *sel, u_int8_t *keylen) -+{ -+#define RSN_SEL(x) (((x) << 24) | RSN_OUI) -+ u_int32_t w = LE_READ_4(sel); -+ -+ switch (w) { -+ case RSN_SEL(RSN_CSE_NULL): -+ return IEEE80211_CIPHER_NONE; -+ case RSN_SEL(RSN_CSE_WEP40): -+ if (keylen) -+ *keylen = 40 / NBBY; -+ return IEEE80211_CIPHER_WEP; -+ case RSN_SEL(RSN_CSE_WEP104): -+ if (keylen) -+ *keylen = 104 / NBBY; -+ return IEEE80211_CIPHER_WEP; -+ case RSN_SEL(RSN_CSE_TKIP): -+ return IEEE80211_CIPHER_TKIP; -+ case RSN_SEL(RSN_CSE_CCMP): -+ return IEEE80211_CIPHER_AES_CCM; -+ case RSN_SEL(RSN_CSE_WRAP): -+ return IEEE80211_CIPHER_AES_OCB; -+ } -+ return 32; /* NB: so 1<< is discarded */ -+#undef RSN_SEL -+} -+ -+/* -+ * Convert an RSN key management/authentication algorithm -+ * to an internal code. -+ */ -+static int -+rsn_keymgmt(u_int8_t *sel) -+{ -+#define RSN_SEL(x) (((x) << 24) | RSN_OUI) -+ u_int32_t w = LE_READ_4(sel); -+ -+ switch (w) { -+ case RSN_SEL(RSN_ASE_8021X_UNSPEC): -+ return RSN_ASE_8021X_UNSPEC; -+ case RSN_SEL(RSN_ASE_8021X_PSK): -+ return RSN_ASE_8021X_PSK; -+ case RSN_SEL(RSN_ASE_NONE): -+ return RSN_ASE_NONE; -+ } -+ return 0; /* NB: so is discarded */ -+#undef RSN_SEL -+} -+ -+/* -+ * Parse a WPA/RSN information element to collect parameters -+ * and validate the parameters against what has been -+ * configured for the system. -+ */ -+static int -+ieee80211_parse_rsn(struct ieee80211vap *vap, u_int8_t *frm, -+ struct ieee80211_rsnparms *rsn_parm, const struct ieee80211_frame *wh) -+{ -+ u_int8_t len = frm[1]; -+ u_int32_t w; -+ int n; -+ -+ /* -+ * Check the length once for fixed parts: -+ * version, mcast cipher, and 2 selector counts. -+ * Other, variable-length data, must be checked separately. -+ */ -+ if (!(vap->iv_flags & IEEE80211_F_WPA2)) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "vap not RSN, flags 0x%x", vap->iv_flags); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ -+ if (len < 10) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "too short, len %u", len); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ frm += 2; -+ w = LE_READ_2(frm); -+ if (w != RSN_VERSION) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "bad version %u", w); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ frm += 2; -+ len -= 2; -+ -+ /* multicast/group cipher */ -+ w = rsn_cipher(frm, &rsn_parm->rsn_mcastkeylen); -+ if (w != rsn_parm->rsn_mcastcipher) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "mcast cipher mismatch; got %u, expected %u", -+ w, rsn_parm->rsn_mcastcipher); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ frm += 4; -+ len -= 4; -+ -+ /* unicast ciphers */ -+ n = LE_READ_2(frm); -+ frm += 2; -+ len -= 2; -+ if (len < n * 4 + 2) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "ucast cipher data too short; len %u, n %u", -+ len, n); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ w = 0; -+ for (; n > 0; n--) { -+ w |= 1 << rsn_cipher(frm, &rsn_parm->rsn_ucastkeylen); -+ frm += 4; -+ len -= 4; -+ } -+ w &= rsn_parm->rsn_ucastcipherset; -+ if (w == 0) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "%s", "ucast cipher set empty"); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ if (w & (1<rsn_ucastcipher = IEEE80211_CIPHER_TKIP; -+ else -+ rsn_parm->rsn_ucastcipher = IEEE80211_CIPHER_AES_CCM; -+ -+ /* key management algorithms */ -+ n = LE_READ_2(frm); -+ frm += 2; -+ len -= 2; -+ if (len < n * 4) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "key mgmt alg data too short; len %u, n %u", -+ len, n); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ w = 0; -+ for (; n > 0; n--) { -+ w |= rsn_keymgmt(frm); -+ frm += 4; -+ len -= 4; -+ } -+ w &= rsn_parm->rsn_keymgmtset; -+ if (w == 0) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, -+ wh, "RSN", "%s", "no acceptable key mgmt alg"); -+ return IEEE80211_REASON_IE_INVALID; -+ } -+ if (w & RSN_ASE_8021X_UNSPEC) -+ rsn_parm->rsn_keymgmt = RSN_ASE_8021X_UNSPEC; -+ else -+ rsn_parm->rsn_keymgmt = RSN_ASE_8021X_PSK; -+ -+ /* optional RSN capabilities */ -+ if (len > 2) -+ rsn_parm->rsn_caps = LE_READ_2(frm); -+ /* XXXPMKID */ -+ -+ return 0; -+} -+ -+void -+ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie) -+{ -+ u_int ielen = ie[1] + 2; -+ /* -+ * Record information element for later use. -+ */ -+ if (*iep == NULL || (*iep)[1] != ie[1]) { -+ if (*iep != NULL) -+ FREE(*iep, M_DEVBUF); -+ MALLOC(*iep, void*, ielen, M_DEVBUF, M_NOWAIT); -+ } -+ if (*iep != NULL) -+ memcpy(*iep, ie, ielen); -+} -+EXPORT_SYMBOL(ieee80211_saveie); -+ -+static int -+ieee80211_parse_wmeie(u_int8_t *frm, const struct ieee80211_frame *wh, -+ struct ieee80211_node *ni) -+{ -+ u_int len = frm[1]; -+ -+ if (len != 7) { -+ IEEE80211_DISCARD_IE(ni->ni_vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, -+ wh, "WME IE", "too short, len %u", len); -+ return -1; -+ } -+ ni->ni_uapsd = frm[WME_CAPINFO_IE_OFFSET]; -+ if (ni->ni_uapsd) { -+ ni->ni_flags |= IEEE80211_NODE_UAPSD; -+ switch (WME_UAPSD_MAXSP(ni->ni_uapsd)) { -+ case 1: -+ ni->ni_uapsd_maxsp = 2; break; -+ case 2: -+ ni->ni_uapsd_maxsp = 4; break; -+ case 3: -+ ni->ni_uapsd_maxsp = 6; break; -+ default: -+ ni->ni_uapsd_maxsp = WME_UAPSD_NODE_MAXQDEPTH; -+ } -+ } -+ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_POWER, ni, -+ "UAPSD bit settings from STA: %02x", ni->ni_uapsd); -+ -+ return 1; -+} -+ -+static int -+ieee80211_parse_wmeparams(struct ieee80211vap *vap, u_int8_t *frm, -+ const struct ieee80211_frame *wh, u_int8_t *qosinfo) -+{ -+#define MS(_v, _f) (((_v) & _f) >> _f##_S) -+ struct ieee80211_wme_state *wme = &vap->iv_ic->ic_wme; -+ u_int len = frm[1], qosinfo_count; -+ int i; -+ -+ *qosinfo = 0; -+ -+ if (len < sizeof(struct ieee80211_wme_param)-2) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, -+ wh, "WME", "too short, len %u", len); -+ return -1; -+ } -+ *qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)]; -+ qosinfo_count = *qosinfo & WME_QOSINFO_COUNT; -+ /* XXX do proper check for wraparound */ -+ if (qosinfo_count == wme->wme_wmeChanParams.cap_info_count) -+ return 0; -+ frm += __offsetof(struct ieee80211_wme_param, params_acParams); -+ for (i = 0; i < WME_NUM_AC; i++) { -+ struct wmeParams *wmep = -+ &wme->wme_wmeChanParams.cap_wmeParams[i]; -+ /* NB: ACI not used */ -+ wmep->wmep_acm = MS(frm[0], WME_PARAM_ACM); -+ wmep->wmep_aifsn = MS(frm[0], WME_PARAM_AIFSN); -+ wmep->wmep_logcwmin = MS(frm[1], WME_PARAM_LOGCWMIN); -+ wmep->wmep_logcwmax = MS(frm[1], WME_PARAM_LOGCWMAX); -+ wmep->wmep_txopLimit = LE_READ_2(frm + 2); -+ frm += 4; -+ } -+ wme->wme_wmeChanParams.cap_info_count = qosinfo_count; -+ return 1; -+#undef MS -+} -+ -+static void -+ieee80211_parse_athParams(struct ieee80211_node *ni, u_int8_t *ie) -+{ -+#ifdef ATH_SUPERG_DYNTURBO -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct ieee80211com *ic = ni->ni_ic; -+#endif /* ATH_SUPERG_DYNTURBO */ -+ struct ieee80211_ie_athAdvCap *athIe = -+ (struct ieee80211_ie_athAdvCap *) ie; -+ -+ ni->ni_ath_flags = athIe->athAdvCap_capability; -+ if (ni->ni_ath_flags & IEEE80211_ATHC_COMP) -+ ni->ni_ath_defkeyindex = LE_READ_2(&athIe->athAdvCap_defKeyIndex); -+#if 0 -+ /* NB: too noisy */ -+ IEEE80211_NOTE(vap, IEEE80211_MSG_SUPG, ni, -+ "recv ath params: caps 0x%x flags 0x%x defkeyix %u", -+ athIe->athAdvCap_capability, ni->ni_ath_flags, -+ ni->ni_ath_defkeyindex); -+#endif -+#ifdef ATH_SUPERG_DYNTURBO -+ if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_ATHC_TURBOP)) { -+ u_int16_t curflags, newflags; -+ -+ /* -+ * Check for turbo mode switch. Calculate flags -+ * for the new mode and effect the switch. -+ */ -+ newflags = curflags = ic->ic_bsschan->ic_flags; -+ /* NB: ATHC_BOOST is not in ic_ath_cap, so get it from the ie */ -+ if (athIe->athAdvCap_capability & IEEE80211_ATHC_BOOST) -+ newflags |= IEEE80211_CHAN_TURBO; -+ else -+ newflags &= ~IEEE80211_CHAN_TURBO; -+ if (newflags != curflags) -+ ieee80211_dturbo_switch(ic, newflags); -+ } -+#endif /* ATH_SUPERG_DYNTURBO */ -+} -+ -+static void -+forward_mgmt_to_app(struct ieee80211vap *vap, int subtype, struct sk_buff *skb, -+ struct ieee80211_frame *wh) -+{ -+ struct net_device *dev = vap->iv_dev; -+ int filter_type = 0; -+ -+ switch (subtype) { -+ case IEEE80211_FC0_SUBTYPE_BEACON: -+ filter_type = IEEE80211_FILTER_TYPE_BEACON; -+ break; -+ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: -+ filter_type = IEEE80211_FILTER_TYPE_PROBE_REQ; -+ break; -+ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: -+ filter_type = IEEE80211_FILTER_TYPE_PROBE_RESP; -+ break; -+ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: -+ case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: -+ filter_type = IEEE80211_FILTER_TYPE_ASSOC_REQ; -+ break; -+ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: -+ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: -+ filter_type = IEEE80211_FILTER_TYPE_ASSOC_RESP; -+ break; -+ case IEEE80211_FC0_SUBTYPE_AUTH: -+ filter_type = IEEE80211_FILTER_TYPE_AUTH; -+ break; -+ case IEEE80211_FC0_SUBTYPE_DEAUTH: -+ filter_type = IEEE80211_FILTER_TYPE_DEAUTH; -+ break; -+ case IEEE80211_FC0_SUBTYPE_DISASSOC: -+ filter_type = IEEE80211_FILTER_TYPE_DISASSOC; -+ break; -+ default: -+ break; -+ } -+ -+ if (filter_type && ((vap->app_filter & filter_type) == filter_type)) { -+ struct sk_buff *skb1; -+ -+ skb1 = skb_copy(skb, GFP_ATOMIC); -+ if (skb1 == NULL) -+ return; -+ skb1->dev = dev; -+ skb_reset_mac_header(skb1); -+ skb1->ip_summed = CHECKSUM_NONE; -+ skb1->pkt_type = PACKET_OTHERHOST; -+ skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ -+ -+ netif_rx(skb1); -+ } -+} -+ -+void -+ieee80211_saveath(struct ieee80211_node *ni, u_int8_t *ie) -+{ -+ const struct ieee80211_ie_athAdvCap *athIe = -+ (const struct ieee80211_ie_athAdvCap *) ie; -+ -+ ni->ni_ath_flags = athIe->athAdvCap_capability; -+ if (ni->ni_ath_flags & IEEE80211_ATHC_COMP) -+ ni->ni_ath_defkeyindex = LE_READ_2(&athIe->athAdvCap_defKeyIndex); -+ ieee80211_saveie(&ni->ni_ath_ie, ie); -+} -+ -+struct ieee80211_channel * -+ieee80211_doth_findchan(struct ieee80211vap *vap, u_int8_t chan) -+{ -+ struct ieee80211com *ic = vap->iv_ic; -+ struct ieee80211_channel *c; -+ int flags, freq; -+ -+ /* NB: try first to preserve turbo */ -+ flags = ic->ic_bsschan->ic_flags & IEEE80211_CHAN_ALL; -+ freq = ieee80211_ieee2mhz(chan, 0); -+ c = ieee80211_find_channel(ic, freq, flags); -+ if (c == NULL) -+ c = ieee80211_find_channel(ic, freq, 0); -+ return c; -+} -+ -+static void -+ieee80211_doth_cancel_cs(struct ieee80211vap *vap) -+{ -+ del_timer(&vap->iv_csa_timer); -+ if (vap->iv_csa_jiffies) -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "channel switch canceled (was: to %u in %u " -+ "tbtt, mode %u)\n", vap->iv_csa_chan->ic_ieee, -+ vap->iv_csa_count, vap->iv_csa_mode); -+ vap->iv_csa_jiffies = 0; -+} -+ -+static void -+ieee80211_doth_switch_channel(struct ieee80211vap *vap) -+{ -+ struct ieee80211com *ic = vap->iv_ic; -+ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: Channel switch to %d NOW!\n", -+ __func__, vap->iv_csa_chan->ic_ieee); -+#if 0 -+ /* XXX does not belong here? */ -+ /* XXX doesn't stop management frames */ -+ /* XXX who restarts the queue? */ -+ /* NB: for now, error here is non-catastrophic. -+ * in the future we may need to ensure we -+ * stop xmit on this channel. -+ */ -+ netif_stop_queue(ic->ic_dev); -+#endif -+ -+ vap->iv_csa_jiffies = 0; /* supress "cancel" msg */ -+ ieee80211_doth_cancel_cs(vap); -+ -+ ic->ic_prevchan = ic->ic_curchan; -+ ic->ic_curchan = ic->ic_bsschan = vap->iv_csa_chan; -+ ic->ic_set_channel(ic); -+} -+ -+static void -+ieee80211_doth_switch_channel_tmr(unsigned long arg) -+{ -+ struct ieee80211vap *vap = (struct ieee80211vap *)arg; -+ ieee80211_doth_switch_channel(vap); -+} -+ -+static int -+ieee80211_parse_csaie(struct ieee80211_node *ni, u_int8_t *frm, -+ const struct ieee80211_frame *wh) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct ieee80211com *ic = vap->iv_ic; -+ struct ieee80211_channel *c; -+ struct ieee80211_ie_csa *csa_ie = (struct ieee80211_ie_csa *)frm; -+ -+ if (!frm) { -+ /* we had CS underway but now we got Beacon without CSA IE */ -+ /* XXX abuse? */ -+ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: channel switch is scheduled, but we got " -+ "Beacon without CSA IE!\n", __func__); -+ -+ ieee80211_doth_cancel_cs(vap); -+ return 0; -+ } -+ -+ if (csa_ie->csa_len != 3) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, -+ wh, "channel switch", "invalid length %u", -+ csa_ie->csa_len); -+ return -1; -+ } -+ -+ if (isclr(ic->ic_chan_avail, csa_ie->csa_chan)) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, -+ wh, "channel switch", "invalid channel %u", -+ csa_ie->csa_chan); -+ return -1; -+ } -+ -+ if ((c = ieee80211_doth_findchan(vap, csa_ie->csa_chan)) == NULL) { -+ /* XXX something wrong */ -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | IEEE80211_MSG_DOTH, -+ wh, "channel switch", -+ "channel %u lookup failed", csa_ie->csa_chan); -+ return -1; -+ } -+ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: channel switch to %u in %u tbtt (mode %u) announced\n", -+ __func__, csa_ie->csa_chan, csa_ie->csa_count, -+ csa_ie->csa_mode); -+ -+ if (vap->iv_csa_jiffies) { -+ /* CSA was received recently */ -+ if (c != vap->iv_csa_chan) { -+ /* XXX abuse? */ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: channel switch channel " -+ "changed from %u to %u!\n", __func__, -+ vap->iv_csa_chan->ic_ieee, -+ csa_ie->csa_chan); -+ -+ if (vap->iv_csa_count > IEEE80211_CSA_PROTECTION_PERIOD) -+ ieee80211_doth_cancel_cs(vap); -+ return 0; -+ } -+ -+ if (csa_ie->csa_mode != vap->iv_csa_mode) { -+ /* Can be abused, but with no (to little) impact. */ -+ -+ /* CS mode change has no influence on our actions since -+ * we don't respect cs modes at all (yet). Complain and -+ * forget. */ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: channel switch mode changed from " -+ "%u to %u!\n", __func__, -+ vap->iv_csa_mode, csa_ie->csa_mode); -+ } -+ -+ if (csa_ie->csa_count >= vap->iv_csa_count) { -+ /* XXX abuse? what for? */ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: channel switch count didn't " -+ "decrease (%u -> %u)!\n", __func__, -+ vap->iv_csa_count, csa_ie->csa_count); -+ return 0; -+ } -+ -+ { -+ u_int32_t elapsed = IEEE80211_JIFFIES_TO_TU( -+ jiffies - vap->iv_csa_jiffies); -+ u_int32_t cnt_diff = vap->iv_csa_count - -+ csa_ie->csa_count; -+ u_int32_t expected = ni->ni_intval * cnt_diff; -+ int32_t delta = elapsed - expected; -+ if (delta < 0) -+ delta = -delta; -+ if (delta > IEEE80211_CSA_SANITY_THRESHOLD) { -+ /* XXX abuse? for now, it's safer to cancel CS -+ * than to follow it blindly */ -+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, -+ "%s: %u.%02u bintvals elapsed, " -+ "but count dropped by %u (delta" -+ " = %u TUs)\n", __func__, -+ elapsed / ni->ni_intval, -+ elapsed * 100 / ni->ni_intval -+ % 100, cnt_diff, delta); -+ -+ ieee80211_doth_cancel_cs(vap); -+ return 0; -+ } -+ } -+ -+ vap->iv_csa_count = csa_ie->csa_count; -+ mod_timer(&vap->iv_csa_timer, jiffies + -+ IEEE80211_TU_TO_JIFFIES(vap->iv_csa_count -+ * ni->ni_intval + 10)); -+ } else { -+ /* CSA wasn't received recently, so this is the first one in -+ * the sequence. */ -+ -+ if (csa_ie->csa_count < IEEE80211_CSA_PROTECTION_PERIOD) { -+ /* XXX abuse? */ -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID | -+ IEEE80211_MSG_DOTH, -+ wh, "channel switch", -+ "initial announcement: channel switch" -+ " would occur too soon (in %u tbtt)", -+ csa_ie->csa_count); -+ return 0; -+ } -+ -+ vap->iv_csa_mode = csa_ie->csa_mode; -+ vap->iv_csa_count = csa_ie->csa_count; -+ vap->iv_csa_chan = c; -+ -+ vap->iv_csa_timer.function = ieee80211_doth_switch_channel_tmr; -+ vap->iv_csa_timer.data = (unsigned long)vap; -+ vap->iv_csa_timer.expires = jiffies + IEEE80211_TU_TO_JIFFIES( -+ vap->iv_csa_count * ni->ni_intval + 10); -+ add_timer(&vap->iv_csa_timer); -+ } -+ -+ vap->iv_csa_jiffies = jiffies; -+ -+ if (vap->iv_csa_count <= 1) -+ ieee80211_doth_switch_channel(vap); -+ -+ return 0; -+} -+ -+/* XXX. Not the right place for such a definition */ -+struct l2_update_frame { -+ struct ether_header eh; -+ u8 dsap; -+ u8 ssap; -+ u8 control; -+ u8 xid[3]; -+} __packed; -+ -+static void -+ieee80211_deliver_l2uf(struct ieee80211_node *ni) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct net_device *dev = vap->iv_dev; -+ struct sk_buff *skb; -+ struct l2_update_frame *l2uf; -+ struct ether_header *eh; -+ -+ skb = dev_alloc_skb(sizeof(*l2uf)); -+ if (!skb) { -+ printk("ieee80211_deliver_l2uf: no buf available\n"); -+ return; -+ } -+ skb_put(skb, sizeof(*l2uf)); -+ l2uf = (struct l2_update_frame *)(skb->data); -+ eh = &l2uf->eh; -+ /* dst: Broadcast address */ -+ IEEE80211_ADDR_COPY(eh->ether_dhost, dev->broadcast); -+ /* src: associated STA */ -+ IEEE80211_ADDR_COPY(eh->ether_shost, ni->ni_macaddr); -+ eh->ether_type = htons(skb->len - sizeof(*eh)); -+ -+ l2uf->dsap = 0; -+ l2uf->ssap = 0; -+ l2uf->control = 0xf5; -+ l2uf->xid[0] = 0x81; -+ l2uf->xid[1] = 0x80; -+ l2uf->xid[2] = 0x00; -+ -+ skb->dev = dev; -+ skb->protocol = eth_type_trans(skb, dev); -+ skb_reset_mac_header(skb); -+ ieee80211_deliver_data(ni, skb); -+ return; -+} -+ -+static __inline int -+contbgscan(struct ieee80211vap *vap) -+{ -+ struct ieee80211com *ic = vap->iv_ic; -+ -+ return ((ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN) && -+ time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle)); -+} -+ -+static __inline int -+startbgscan(struct ieee80211vap *vap) -+{ -+ struct ieee80211com *ic = vap->iv_ic; -+ -+ return ((vap->iv_flags & IEEE80211_F_BGSCAN) && -+ !IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) && -+ time_after(jiffies, ic->ic_lastscan + vap->iv_bgscanintvl) && -+ time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle)); -+} -+ -+ -+/* -+ * Context: SoftIRQ -+ */ -+void -+ieee80211_recv_mgmt(struct ieee80211_node *ni, struct sk_buff *skb, -+ int subtype, int rssi, u_int32_t rstamp) -+{ -+#define ISPROBE(_st) ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) -+#define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct ieee80211com *ic = vap->iv_ic; -+ struct ieee80211_frame *wh; -+ u_int8_t *frm, *efrm; -+ u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath; -+ u_int8_t rate; -+ int reassoc, resp, allocbs; -+ u_int8_t qosinfo; -+ -+ wh = (struct ieee80211_frame *) skb->data; -+ frm = (u_int8_t *)&wh[1]; -+ efrm = skb->data + skb->len; -+ -+ /* forward management frame to application */ -+ if (vap->iv_opmode != IEEE80211_M_MONITOR) -+ forward_mgmt_to_app(vap, subtype, skb, wh); -+ -+ switch (subtype) { -+ case IEEE80211_FC0_SUBTYPE_PROBE_RESP: -+ case IEEE80211_FC0_SUBTYPE_BEACON: { -+ struct ieee80211_scanparams scan; -+ -+ /* -+ * We process beacon/probe response frames: -+ * o when scanning, or -+ * o station mode when associated (to collect state -+ * updates such as 802.11g slot time), or -+ * o adhoc mode (to discover neighbors) -+ * Frames otherwise received are discarded. -+ */ -+ if (!((ic->ic_flags & IEEE80211_F_SCAN) || -+ (vap->iv_opmode == IEEE80211_M_STA && ni->ni_associd) || -+ vap->iv_opmode == IEEE80211_M_IBSS)) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ return; -+ } -+ /* -+ * beacon/probe response frame format -+ * [8] time stamp -+ * [2] beacon interval -+ * [2] capability information -+ * [tlv] ssid -+ * [tlv] supported rates -+ * [tlv] country information -+ * [tlv] parameter set (FH/DS) -+ * [tlv] erp information -+ * [tlv] extended supported rates -+ * [tlv] WME -+ * [tlv] WPA or RSN -+ * [tlv] Atheros Advanced Capabilities -+ */ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, 12); -+ memset(&scan, 0, sizeof(scan)); -+ scan.tstamp = frm; -+ frm += 8; -+ scan.bintval = le16toh(*(__le16 *)frm); -+ frm += 2; -+ scan.capinfo = le16toh(*(__le16 *)frm); -+ frm += 2; -+ scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); -+ scan.chan = scan.bchan; -+ -+ while (frm < efrm) { -+ /* Agere element in beacon */ -+ if ((*frm == IEEE80211_ELEMID_AGERE1) || -+ (*frm == IEEE80211_ELEMID_AGERE2)) { -+ frm = efrm; -+ continue; -+ } -+ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); -+ switch (*frm) { -+ case IEEE80211_ELEMID_SSID: -+ scan.ssid = frm; -+ break; -+ case IEEE80211_ELEMID_RATES: -+ scan.rates = frm; -+ break; -+ case IEEE80211_ELEMID_COUNTRY: -+ scan.country = frm; -+ break; -+ case IEEE80211_ELEMID_FHPARMS: -+ if (ic->ic_phytype == IEEE80211_T_FH) { -+ scan.fhdwell = LE_READ_2(&frm[2]); -+ scan.chan = IEEE80211_FH_CHAN(frm[4], frm[5]); -+ scan.fhindex = frm[6]; -+ } -+ break; -+ case IEEE80211_ELEMID_DSPARMS: -+ /* -+ * XXX hack this since depending on phytype -+ * is problematic for multi-mode devices. -+ */ -+ if (ic->ic_phytype != IEEE80211_T_FH) -+ scan.chan = frm[2]; -+ break; -+ case IEEE80211_ELEMID_TIM: -+ /* XXX ATIM? */ -+ scan.tim = frm; -+ scan.timoff = frm - skb->data; -+ break; -+ case IEEE80211_ELEMID_IBSSPARMS: -+ break; -+ case IEEE80211_ELEMID_XRATES: -+ scan.xrates = frm; -+ break; -+ case IEEE80211_ELEMID_ERP: -+ if (frm[1] != 1) { -+ IEEE80211_DISCARD_IE(vap, -+ IEEE80211_MSG_ELEMID, wh, "ERP", -+ "bad len %u", frm[1]); -+ vap->iv_stats.is_rx_elem_toobig++; -+ break; -+ } -+ scan.erp = frm[2]; -+ break; -+ case IEEE80211_ELEMID_RSN: -+ scan.rsn = frm; -+ break; -+ case IEEE80211_ELEMID_VENDOR: -+ if (iswpaoui(frm)) -+ scan.wpa = frm; -+ else if (iswmeparam(frm) || iswmeinfo(frm)) -+ scan.wme = frm; -+ else if (isatherosoui(frm)) -+ scan.ath = frm; -+ break; -+ case IEEE80211_ELEMID_CHANSWITCHANN: -+ if (ic->ic_flags & IEEE80211_F_DOTH) -+ scan.csa = frm; -+ break; -+ default: -+ IEEE80211_DISCARD_IE(vap, IEEE80211_MSG_ELEMID, -+ wh, "unhandled", -+ "id %u, len %u", *frm, frm[1]); -+ vap->iv_stats.is_rx_elem_unknown++; -+ break; -+ } -+ frm += frm[1] + 2; -+ } -+ if (frm > efrm) -+ return; -+ IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE); -+ IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN); -+#if IEEE80211_CHAN_MAX < 255 -+ if (scan.chan > IEEE80211_CHAN_MAX) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, -+ wh, ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ "invalid channel %u", scan.chan); -+ vap->iv_stats.is_rx_badchan++; -+ return; -+ } -+#endif -+ if (scan.chan != scan.bchan && -+ ic->ic_phytype != IEEE80211_T_FH) { -+ /* -+ * Frame was received on a channel different from the -+ * one indicated in the DS params element id; -+ * silently discard it. -+ * -+ * NB: this can happen due to signal leakage. -+ * But we should take it for FH phy because -+ * the rssi value should be correct even for -+ * different hop pattern in FH. -+ */ -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, -+ wh, ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ "for off-channel %u", scan.chan); -+ vap->iv_stats.is_rx_chanmismatch++; -+ return; -+ } -+ -+ /* IEEE802.11 does not specify the allowed range for -+ * beacon interval. We discard any beacons with a -+ * beacon interval outside of an arbitrary range in -+ * order to protect against attack. -+ */ -+ if (!(IEEE80211_BINTVAL_MIN <= scan.bintval && -+ scan.bintval <= IEEE80211_BINTVAL_MAX)) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_SCAN, -+ wh, "beacon", "invalid beacon interval (%u)", -+ scan.bintval); -+ return; -+ } -+ -+ /* -+ * Count frame now that we know it's to be processed. -+ */ -+ if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) -+ IEEE80211_NODE_STAT(ni, rx_beacons); -+ else -+ IEEE80211_NODE_STAT(ni, rx_proberesp); -+ -+ /* -+ * When operating in station mode, check for state updates. -+ * Be careful to ignore beacons received while doing a -+ * background scan. We consider only 11g/WMM stuff right now. -+ */ -+ if (vap->iv_opmode == IEEE80211_M_STA && -+ ni->ni_associd != 0 && -+ IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid)) { -+ /* record tsf of last beacon */ -+ memcpy(ni->ni_tstamp.data, scan.tstamp, -+ sizeof(ni->ni_tstamp)); -+ if (ni->ni_erp != scan.erp) { -+ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, -+ "erp change: was 0x%x, now 0x%x", -+ ni->ni_erp, scan.erp); -+ if (scan.erp & IEEE80211_ERP_USE_PROTECTION) -+ ic->ic_flags |= IEEE80211_F_USEPROT; -+ else -+ ic->ic_flags &= ~IEEE80211_F_USEPROT; -+ ni->ni_erp = scan.erp; -+ /* XXX statistic */ -+ } -+ if ((ni->ni_capinfo ^ scan.capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) { -+ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, -+ "capabilities change: was 0x%x, now 0x%x", -+ ni->ni_capinfo, scan.capinfo); -+ /* -+ * NB: we assume short preamble doesn't -+ * change dynamically -+ */ -+ ieee80211_set_shortslottime(ic, -+ IEEE80211_IS_CHAN_A(ic->ic_bsschan) || -+ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); -+ ni->ni_capinfo = scan.capinfo; -+ /* XXX statistic */ -+ } -+ if (scan.wme != NULL && -+ (ni->ni_flags & IEEE80211_NODE_QOS)) { -+ int _retval; -+ if ((_retval = ieee80211_parse_wmeparams(vap, scan.wme, wh, &qosinfo)) >= 0) { -+ if (qosinfo & WME_CAPINFO_UAPSD_EN) -+ ni->ni_flags |= IEEE80211_NODE_UAPSD; -+ if (_retval > 0) -+ ieee80211_wme_updateparams(vap); -+ } -+ } else -+ ni->ni_flags &= ~IEEE80211_NODE_UAPSD; -+ if (scan.ath != NULL) -+ ieee80211_parse_athParams(ni, scan.ath); -+ if (scan.csa != NULL || vap->iv_csa_jiffies) -+ ieee80211_parse_csaie(ni, scan.csa, wh); -+ if (scan.tim != NULL) { -+ /* -+ * Check the TIM. For now we drop out of -+ * power save mode for any reason. -+ */ -+ struct ieee80211_tim_ie *tim = -+ (struct ieee80211_tim_ie *) scan.tim; -+ int aid = IEEE80211_AID(ni->ni_associd); -+ int ix = aid / NBBY; -+ int min = tim->tim_bitctl &~ 1; -+ int max = tim->tim_len + min - 4; -+ if ((tim->tim_bitctl&1) || -+ (min <= ix && ix <= max && -+ isset(tim->tim_bitmap - min, aid))) -+ ieee80211_sta_pwrsave(vap, 0); -+ vap->iv_dtim_count = tim->tim_count; -+ } -+ -+ /* WDS/Repeater: re-schedule software beacon timer for STA */ -+ if (vap->iv_state == IEEE80211_S_RUN && -+ vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) { -+ mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period); -+ } -+ -+ /* -+ * If scanning, pass the info to the scan module. -+ * Otherwise, check if it's the right time to do -+ * a background scan. Background scanning must -+ * be enabled and we must not be operating in the -+ * turbo phase of dynamic turbo mode. Then, -+ * it's been a while since the last background -+ * scan and if no data frames have come through -+ * recently, kick off a scan. Note that this -+ * is the mechanism by which a background scan -+ * is started _and_ continued each time we -+ * return on-channel to receive a beacon from -+ * our ap. -+ */ -+ if (ic->ic_flags & IEEE80211_F_SCAN) -+ ieee80211_add_scan(vap, &scan, wh, -+ subtype, rssi, rstamp); -+ else if (contbgscan(vap) || startbgscan(vap)) -+ ieee80211_bg_scan(vap); -+ return; -+ } -+ /* -+ * If scanning, just pass information to the scan module. -+ */ -+ if (ic->ic_flags & IEEE80211_F_SCAN) { -+ ieee80211_add_scan(vap, &scan, wh, subtype, rssi, rstamp); -+ return; -+ } -+ if (scan.capinfo & IEEE80211_CAPINFO_IBSS) { -+ if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) { -+ /* Create a new entry in the neighbor table. */ -+ ni = ieee80211_add_neighbor(vap, wh, &scan); -+ } else { -+ /* -+ * Copy data from beacon to neighbor table. -+ * Some of this information might change after -+ * ieee80211_add_neighbor(), so we just copy -+ * everything over to be safe. -+ */ -+ ni->ni_esslen = scan.ssid[1]; -+ memcpy(ni->ni_essid, scan.ssid + 2, scan.ssid[1]); -+ IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3); -+ memcpy(ni->ni_tstamp.data, scan.tstamp, -+ sizeof(ni->ni_tstamp)); -+ ni->ni_intval = IEEE80211_BINTVAL_SANITISE(scan.bintval); -+ ni->ni_capinfo = scan.capinfo; -+ ni->ni_chan = ic->ic_curchan; -+ ni->ni_fhdwell = scan.fhdwell; -+ ni->ni_fhindex = scan.fhindex; -+ ni->ni_erp = scan.erp; -+ ni->ni_timoff = scan.timoff; -+ if (scan.wme != NULL) -+ ieee80211_saveie(&ni->ni_wme_ie, scan.wme); -+ if (scan.wpa != NULL) -+ ieee80211_saveie(&ni->ni_wpa_ie, scan.wpa); -+ if (scan.rsn != NULL) -+ ieee80211_saveie(&ni->ni_rsn_ie, scan.rsn); -+ if (scan.ath != NULL) -+ ieee80211_saveath(ni, scan.ath); -+ -+ /* NB: must be after ni_chan is setup */ -+ ieee80211_setup_rates(ni, scan.rates, -+ scan.xrates, IEEE80211_F_DOSORT); -+ } -+ if (ni != NULL) { -+ ni->ni_rssi = rssi; -+ ni->ni_rstamp = rstamp; -+ ni->ni_last_rx = jiffies; -+ } -+ } -+ break; -+ } -+ -+ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: -+ if (vap->iv_opmode == IEEE80211_M_STA || -+ vap->iv_opmode == IEEE80211_M_AHDEMO || -+ vap->iv_state != IEEE80211_S_RUN) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ return; -+ } -+ if (IEEE80211_IS_MULTICAST(wh->i_addr2)) { -+ /* frame must be directed */ -+ vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */ -+ return; -+ } -+ -+/* -+ * XR vap does not process probe requests. -+ */ -+#ifdef ATH_SUPERG_XR -+ if(vap->iv_flags & IEEE80211_F_XR ) -+ return; -+#endif -+ /* -+ * prreq frame format -+ * [tlv] ssid -+ * [tlv] supported rates -+ * [tlv] extended supported rates -+ * [tlv] Atheros Advanced Capabilities -+ */ -+ ssid = rates = xrates = ath = NULL; -+ while (frm < efrm) { -+ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); -+ switch (*frm) { -+ case IEEE80211_ELEMID_SSID: -+ ssid = frm; -+ break; -+ case IEEE80211_ELEMID_RATES: -+ rates = frm; -+ break; -+ case IEEE80211_ELEMID_XRATES: -+ xrates = frm; -+ break; -+ case IEEE80211_ELEMID_VENDOR: -+ if (isatherosoui(frm)) -+ ath = frm; -+ /* XXX Atheros OUI support */ -+ break; -+ } -+ frm += frm[1] + 2; -+ } -+ if (frm > efrm) -+ return; -+ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); -+ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); -+ IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); -+ if ((vap->iv_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, -+ wh, ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ "%s", "no ssid with ssid suppression enabled"); -+ vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/ -+ return; -+ } -+ if (ni == vap->iv_bss) { -+ if (vap->iv_opmode == IEEE80211_M_IBSS) { -+ /* -+ * XXX Cannot tell if the sender is operating -+ * in ibss mode. But we need a new node to -+ * send the response so blindly add them to the -+ * neighbor table. -+ */ -+ ni = ieee80211_fakeup_adhoc_node(vap, -+ wh->i_addr2); -+ } else { -+ ni = ieee80211_tmp_node(vap, wh->i_addr2); -+ } -+ if (ni == NULL) -+ return; -+ allocbs = 1; -+ } else -+ allocbs = 0; -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2, -+ "%s", "recv probe req"); -+ ni->ni_rssi = rssi; -+ ni->ni_rstamp = rstamp; -+ ni->ni_last_rx = jiffies; -+ rate = ieee80211_setup_rates(ni, rates, xrates, -+ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | -+ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); -+ if (rate & IEEE80211_RATE_BASIC) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_XRATE, -+ wh, ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ "%s", "recv'd rate set invalid"); -+ } else { -+ IEEE80211_SEND_MGMT(ni, -+ IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); -+ } -+ if (allocbs && vap->iv_opmode != IEEE80211_M_IBSS) { -+ /* -+ * Temporary node created just to send a -+ * response, reclaim immediately -+ */ -+ ieee80211_free_node(ni); -+ } else if (ath != NULL) -+ ieee80211_saveath(ni, ath); -+ break; -+ -+ case IEEE80211_FC0_SUBTYPE_AUTH: { -+ u_int16_t algo, seq, status; -+ /* -+ * auth frame format -+ * [2] algorithm -+ * [2] sequence -+ * [2] status -+ * [tlv*] challenge -+ */ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); -+ algo = le16toh(*(__le16 *)frm); -+ seq = le16toh(*(__le16 *)(frm + 2)); -+ status = le16toh(*(__le16 *)(frm + 4)); -+#ifdef ATH_SUPERG_XR -+ if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) { -+ /* -+ * node roaming between XR and normal vaps. -+ * this can only happen in AP mode. disaccociate from -+ * previous vap first. -+ */ -+ if (vap->iv_xrvap) { -+ if (ni == vap->iv_bss) -+ ni = vap->iv_xrvap->iv_bss; -+ else { -+ ieee80211_node_leave(ni); -+ ieee80211_node_reset(ni, vap->iv_xrvap); -+ } -+ vap = vap->iv_xrvap; -+ } else { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_AUTH, -+ wh, "auth", "%s", "not to pier xr bssid"); -+ return; -+ } -+ } -+#endif -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr2, -+ "recv auth frame with algorithm %d seq %d", algo, seq); -+ /* -+ * Consult the ACL policy module if setup. -+ */ -+ if (vap->iv_acl != NULL && -+ !vap->iv_acl->iac_check(vap, wh->i_addr2)) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL, -+ wh, "auth", "%s", "disallowed by ACL"); -+ vap->iv_stats.is_rx_acl++; -+ return; -+ } -+ if (vap->iv_flags & IEEE80211_F_COUNTERM) { -+ IEEE80211_DISCARD(vap, -+ IEEE80211_MSG_AUTH | IEEE80211_MSG_CRYPTO, -+ wh, "auth", "%s", "TKIP countermeasures enabled"); -+ vap->iv_stats.is_rx_auth_countermeasures++; -+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { -+ ieee80211_send_error(ni, wh->i_addr2, -+ IEEE80211_FC0_SUBTYPE_AUTH, -+ IEEE80211_REASON_MIC_FAILURE); -+ } -+ return; -+ } -+ if (algo == IEEE80211_AUTH_ALG_SHARED) -+ ieee80211_auth_shared(ni, wh, frm + 6, efrm, rssi, -+ rstamp, seq, status); -+ else if (algo == IEEE80211_AUTH_ALG_OPEN) -+ ieee80211_auth_open(ni, wh, rssi, rstamp, seq, status); -+ else { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "auth", "unsupported alg %d", algo); -+ vap->iv_stats.is_rx_auth_unsupported++; -+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) { -+ /* XXX not right */ -+ ieee80211_send_error(ni, wh->i_addr2, -+ IEEE80211_FC0_SUBTYPE_AUTH, -+ (seq+1) | (IEEE80211_STATUS_ALG << 16)); -+ } -+ return; -+ } -+ break; -+ } -+ -+ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: -+ case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: { -+ u_int16_t capinfo, bintval; -+ struct ieee80211_rsnparms rsn_parm; -+ u_int8_t reason; -+ -+ if (vap->iv_opmode != IEEE80211_M_HOSTAP || -+ vap->iv_state != IEEE80211_S_RUN) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ return; -+ } -+ -+ if (subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) { -+ reassoc = 1; -+ resp = IEEE80211_FC0_SUBTYPE_REASSOC_RESP; -+ } else { -+ reassoc = 0; -+ resp = IEEE80211_FC0_SUBTYPE_ASSOC_RESP; -+ } -+ -+ /* -+ * asreq frame format -+ * [2] capability information -+ * [2] listen interval -+ * [6*] current AP address (reassoc only) -+ * [tlv] ssid -+ * [tlv] supported rates -+ * [tlv] extended supported rates -+ * [tlv] wpa or RSN -+ * [tlv] WME -+ * [tlv] Atheros Advanced Capabilities -+ */ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, (reassoc ? 10 : 4)); -+ if (!IEEE80211_ADDR_EQ(wh->i_addr3, vap->iv_bss->ni_bssid)) { -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, ieee80211_mgt_subtype_name[subtype >> -+ IEEE80211_FC0_SUBTYPE_SHIFT], -+ "%s", "wrong bssid"); -+ vap->iv_stats.is_rx_assoc_bss++; -+ return; -+ } -+ capinfo = le16toh(*(__le16 *)frm); -+ frm += 2; -+ bintval = le16toh(*(__le16 *)frm); -+ frm += 2; -+ if (reassoc) -+ frm += 6; /* ignore current AP info */ -+ ssid = rates = xrates = wpa = rsn = wme = ath = NULL; -+ while (frm < efrm) { -+ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); -+ switch (*frm) { -+ case IEEE80211_ELEMID_SSID: -+ ssid = frm; -+ break; -+ case IEEE80211_ELEMID_RATES: -+ rates = frm; -+ break; -+ case IEEE80211_ELEMID_XRATES: -+ xrates = frm; -+ break; -+ /* XXX verify only one of RSN and WPA ie's? */ -+ case IEEE80211_ELEMID_RSN: -+ if (vap->iv_flags & IEEE80211_F_WPA2) -+ rsn = frm; -+ else -+ IEEE80211_DPRINTF(vap, -+ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, -+ "[%s] ignoring RSN IE in association request\n", -+ ether_sprintf(wh->i_addr2)); -+ break; -+ case IEEE80211_ELEMID_VENDOR: -+ /* don't override RSN element -+ * XXX: actually the driver should report both WPA versions, -+ * so wpa_supplicant can choose and also detect downgrade attacks -+ */ -+ if (iswpaoui(frm) && !wpa) { -+ if (vap->iv_flags & IEEE80211_F_WPA1) -+ wpa = frm; -+ else -+ IEEE80211_DPRINTF(vap, -+ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, -+ "[%s] ignoring WPA IE in association request\n", -+ ether_sprintf(wh->i_addr2)); -+ } else if (iswmeinfo(frm)) -+ wme = frm; -+ else if (isatherosoui(frm)) -+ ath = frm; -+ break; -+ } -+ frm += frm[1] + 2; -+ } -+ if (frm > efrm) -+ return; -+ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); -+ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); -+ IEEE80211_VERIFY_SSID(vap->iv_bss, ssid); -+ -+ if (ni == vap->iv_bss) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, -+ "deny %s request, sta not authenticated", -+ reassoc ? "reassoc" : "assoc"); -+ ieee80211_send_error(ni, wh->i_addr2, -+ IEEE80211_FC0_SUBTYPE_DEAUTH, -+ IEEE80211_REASON_ASSOC_NOT_AUTHED); -+ vap->iv_stats.is_rx_assoc_notauth++; -+ return; -+ } -+ -+ /* Assert right associstion security credentials */ -+ /* XXX Divy. Incomplete */ -+ if (wpa == NULL && (ic->ic_flags & IEEE80211_F_WPA)) { -+ IEEE80211_DPRINTF(vap, -+ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, -+ "[%s] no WPA/RSN IE in association request\n", -+ ether_sprintf(wh->i_addr2)); -+ IEEE80211_SEND_MGMT(ni, -+ IEEE80211_FC0_SUBTYPE_DEAUTH, -+ IEEE80211_REASON_RSN_REQUIRED); -+ ieee80211_node_leave(ni); -+ /* XXX distinguish WPA/RSN? */ -+ vap->iv_stats.is_rx_assoc_badwpaie++; -+ return; -+ } -+ -+ if (rsn != NULL) { -+ /* -+ * Parse WPA information element. Note that -+ * we initialize the param block from the node -+ * state so that information in the IE overrides -+ * our defaults. The resulting parameters are -+ * installed below after the association is assured. -+ */ -+ rsn_parm = ni->ni_rsn; -+ if (rsn[0] != IEEE80211_ELEMID_RSN) -+ reason = ieee80211_parse_wpa(vap, rsn, &rsn_parm, wh); -+ else -+ reason = ieee80211_parse_rsn(vap, rsn, &rsn_parm, wh); -+ if (reason != 0) { -+ IEEE80211_SEND_MGMT(ni, -+ IEEE80211_FC0_SUBTYPE_DEAUTH, reason); -+ ieee80211_node_leave(ni); -+ /* XXX distinguish WPA/RSN? */ -+ vap->iv_stats.is_rx_assoc_badwpaie++; -+ return; -+ } -+ IEEE80211_NOTE_MAC(vap, -+ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, -+ wh->i_addr2, -+ "%s ie: mc %u/%u uc %u/%u key %u caps 0x%x", -+ rsn[0] != IEEE80211_ELEMID_RSN ? "WPA" : "RSN", -+ rsn_parm.rsn_mcastcipher, rsn_parm.rsn_mcastkeylen, -+ rsn_parm.rsn_ucastcipher, rsn_parm.rsn_ucastkeylen, -+ rsn_parm.rsn_keymgmt, rsn_parm.rsn_caps); -+ } -+ /* discard challenge after association */ -+ if (ni->ni_challenge != NULL) { -+ FREE(ni->ni_challenge, M_DEVBUF); -+ ni->ni_challenge = NULL; -+ } -+ /* 802.11 spec says to ignore station's privacy bit */ -+ if ((capinfo & IEEE80211_CAPINFO_ESS) == 0) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, -+ "deny %s request, capability mismatch 0x%x", -+ reassoc ? "reassoc" : "assoc", capinfo); -+ IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_CAPINFO); -+ ieee80211_node_leave(ni); -+ vap->iv_stats.is_rx_assoc_capmismatch++; -+ return; -+ } -+ rate = ieee80211_setup_rates(ni, rates, xrates, -+ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | -+ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); -+ /* -+ * If constrained to 11g-only stations reject an -+ * 11b-only station. We cheat a bit here by looking -+ * at the max negotiated xmit rate and assuming anyone -+ * with a best rate <24Mb/s is an 11b station. -+ */ -+ if ((rate & IEEE80211_RATE_BASIC) || -+ ((vap->iv_flags & IEEE80211_F_PUREG) && rate < 48)) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, wh->i_addr2, -+ "deny %s request, rate set mismatch", -+ reassoc ? "reassoc" : "assoc"); -+ IEEE80211_SEND_MGMT(ni, resp, -+ IEEE80211_STATUS_BASIC_RATE); -+ ieee80211_node_leave(ni); -+ vap->iv_stats.is_rx_assoc_norate++; -+ return; -+ } -+ -+ if (ni->ni_associd != 0 && -+ IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) { -+ if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) -+ != (capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, -+ wh->i_addr2, -+ "deny %s request, short slot time " -+ "capability mismatch 0x%x", -+ reassoc ? "reassoc" : "assoc", capinfo); -+ IEEE80211_SEND_MGMT(ni, resp, -+ IEEE80211_STATUS_CAPINFO); -+ ieee80211_node_leave(ni); -+ vap->iv_stats.is_rx_assoc_capmismatch++; -+ return; -+ } -+ } -+ -+ ni->ni_rssi = rssi; -+ ni->ni_rstamp = rstamp; -+ ni->ni_last_rx = jiffies; -+ ni->ni_intval = IEEE80211_BINTVAL_SANITISE(bintval); -+ ni->ni_capinfo = capinfo; -+ ni->ni_chan = ic->ic_curchan; -+ ni->ni_fhdwell = vap->iv_bss->ni_fhdwell; -+ ni->ni_fhindex = vap->iv_bss->ni_fhindex; -+ if (wpa != NULL) { -+ /* -+ * Record WPA/RSN parameters for station, mark -+ * node as using WPA and record information element -+ * for applications that require it. -+ */ -+ ieee80211_saveie(&ni->ni_wpa_ie, wpa); -+ } else if (ni->ni_wpa_ie != NULL) { -+ /* -+ * Flush any state from a previous association. -+ */ -+ FREE(ni->ni_wpa_ie, M_DEVBUF); -+ ni->ni_wpa_ie = NULL; -+ } -+ if (rsn != NULL) { -+ /* -+ * Record WPA/RSN parameters for station, mark -+ * node as using WPA and record information element -+ * for applications that require it. -+ */ -+ ni->ni_rsn = rsn_parm; -+ ieee80211_saveie(&ni->ni_rsn_ie, rsn); -+ } else if (ni->ni_rsn_ie != NULL) { -+ /* -+ * Flush any state from a previous association. -+ */ -+ FREE(ni->ni_rsn_ie, M_DEVBUF); -+ ni->ni_rsn_ie = NULL; -+ } -+ if (wme != NULL) { -+ /* -+ * Record WME parameters for station, mark node -+ * as capable of QoS and record information -+ * element for applications that require it. -+ */ -+ ieee80211_saveie(&ni->ni_wme_ie, wme); -+ if (ieee80211_parse_wmeie(wme, wh, ni) > 0) -+ ni->ni_flags |= IEEE80211_NODE_QOS; -+ } else if (ni->ni_wme_ie != NULL) { -+ /* -+ * Flush any state from a previous association. -+ */ -+ FREE(ni->ni_wme_ie, M_DEVBUF); -+ ni->ni_wme_ie = NULL; -+ ni->ni_flags &= ~IEEE80211_NODE_QOS; -+ } -+ if (ath != NULL) -+ ieee80211_saveath(ni, ath); -+ else if (ni->ni_ath_ie != NULL) { -+ /* -+ * Flush any state from a previous association. -+ */ -+ FREE(ni->ni_ath_ie, M_DEVBUF); -+ ni->ni_ath_ie = NULL; -+ ni->ni_ath_flags = 0; -+ } -+ -+ /* Send TGf L2UF frame on behalf of newly associated station */ -+ ieee80211_deliver_l2uf(ni); -+ ieee80211_node_join(ni, resp); -+#ifdef ATH_SUPERG_XR -+ if (ni->ni_prev_vap && -+ ni->ni_vap != ni->ni_prev_vap && -+ ni->ni_vap->iv_ath_cap & IEEE80211_ATHC_XR) { -+ /* -+ * node moved between XR and normal vap. -+ * move the data between XR and normal vap. -+ */ -+ ic->ic_node_move_data(ni); -+ ni->ni_prev_vap = ni->ni_vap; -+ } -+#endif -+ break; -+ } -+ -+ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: -+ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: { -+ u_int16_t capinfo, associd; -+ u_int16_t status; -+ -+ if (vap->iv_opmode != IEEE80211_M_STA || -+ vap->iv_state != IEEE80211_S_ASSOC) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ return; -+ } -+ -+ /* -+ * asresp frame format -+ * [2] capability information -+ * [2] status -+ * [2] association ID -+ * [tlv] supported rates -+ * [tlv] extended supported rates -+ * [tlv] WME -+ */ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, 6); -+ ni = vap->iv_bss; -+ capinfo = le16toh(*(__le16 *)frm); -+ frm += 2; -+ status = le16toh(*(__le16 *)frm); -+ frm += 2; -+ if (status != 0) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, -+ wh->i_addr2, -+ "%sassoc failed (reason %d)", -+ ISREASSOC(subtype) ? "re" : "", status); -+ vap->iv_stats.is_rx_auth_fail++; /* XXX */ -+ ieee80211_new_state(vap, IEEE80211_S_SCAN, -+ IEEE80211_SCAN_FAIL_STATUS); -+ return; -+ } -+ associd = le16toh(*(__le16 *)frm); -+ frm += 2; -+ -+ rates = xrates = wme = NULL; -+ while (frm < efrm) { -+ /* -+ * Do not discard frames containing proprietary Agere -+ * elements 128 and 129, as the reported element length -+ * is often wrong. Skip rest of the frame, since we can -+ * not rely on the given element length making it impossible -+ * to know where the next element starts. -+ */ -+ if ((*frm == IEEE80211_ELEMID_AGERE1) || -+ (*frm == IEEE80211_ELEMID_AGERE2)) { -+ frm = efrm; -+ continue; -+ } -+ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]); -+ switch (*frm) { -+ case IEEE80211_ELEMID_RATES: -+ rates = frm; -+ break; -+ case IEEE80211_ELEMID_XRATES: -+ xrates = frm; -+ break; -+ case IEEE80211_ELEMID_VENDOR: -+ if (iswmeoui(frm)) -+ wme = frm; -+ break; -+ } -+ frm += frm[1] + 2; -+ } -+ if (frm > efrm) -+ return; -+ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); -+ rate = ieee80211_setup_rates(ni, rates, xrates, -+ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | -+ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); -+ if (rate & IEEE80211_RATE_BASIC) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, -+ wh->i_addr2, -+ "%sassoc failed (rate set mismatch)", -+ ISREASSOC(subtype) ? "re" : ""); -+ vap->iv_stats.is_rx_assoc_norate++; -+ ieee80211_new_state(vap, IEEE80211_S_SCAN, -+ IEEE80211_SCAN_FAIL_STATUS); -+ return; -+ } -+ -+ ni->ni_capinfo = capinfo; -+ ni->ni_associd = associd; -+ if (wme != NULL && -+ ieee80211_parse_wmeparams(vap, wme, wh, &qosinfo) >= 0) { -+ ni->ni_flags |= IEEE80211_NODE_QOS; -+ ieee80211_wme_updateparams(vap); -+ } else -+ ni->ni_flags &= ~IEEE80211_NODE_QOS; -+ /* -+ * Configure state now that we are associated. -+ * -+ * XXX may need different/additional driver callbacks? -+ */ -+ if (IEEE80211_IS_CHAN_A(ic->ic_curchan) || -+ ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && -+ (ic->ic_caps & IEEE80211_C_SHPREAMBLE))) { -+ ic->ic_flags |= IEEE80211_F_SHPREAMBLE; -+ ic->ic_flags &= ~IEEE80211_F_USEBARKER; -+ } else { -+ ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; -+ ic->ic_flags |= IEEE80211_F_USEBARKER; -+ } -+ ieee80211_set_shortslottime(ic, -+ IEEE80211_IS_CHAN_A(ic->ic_curchan) || -+ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME)); -+ /* -+ * Honor ERP protection. -+ * -+ * NB: ni_erp should zero for non-11g operation -+ * but we check the channel characteristics -+ * just in case. -+ */ -+ if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) && -+ (ni->ni_erp & IEEE80211_ERP_USE_PROTECTION)) -+ ic->ic_flags |= IEEE80211_F_USEPROT; -+ else -+ ic->ic_flags &= ~IEEE80211_F_USEPROT; -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, wh->i_addr2, -+ "%sassoc success: %s preamble, %s slot time%s%s%s%s%s%s%s", -+ ISREASSOC(subtype) ? "re" : "", -+ (ic->ic_flags&IEEE80211_F_SHPREAMBLE) && -+ (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) ? "short" : "long", -+ ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", -+ ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", -+ ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", -+ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? -+ ", turbo" : "", -+ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_COMP) ? -+ ", compression" : "", -+ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? -+ ", fast-frames" : "", -+ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_XR) ? -+ ", XR" : "", -+ IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_AR) ? -+ ", AR" : "" -+ ); -+ ieee80211_new_state(vap, IEEE80211_S_RUN, subtype); -+ break; -+ } -+ -+ case IEEE80211_FC0_SUBTYPE_DEAUTH: { -+ u_int16_t reason; -+ -+ if (vap->iv_state == IEEE80211_S_SCAN) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ return; -+ } -+ /* -+ * deauth frame format -+ * [2] reason -+ */ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, 2); -+ reason = le16toh(*(__le16 *)frm); -+ vap->iv_stats.is_rx_deauth++; -+ IEEE80211_NODE_STAT(ni, rx_deauth); -+ -+ IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni, -+ "recv deauthenticate (reason %d)", reason); -+ switch (vap->iv_opmode) { -+ case IEEE80211_M_STA: -+ ieee80211_new_state(vap, IEEE80211_S_AUTH, -+ wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); -+ break; -+ case IEEE80211_M_HOSTAP: -+ if (ni != vap->iv_bss) -+ ieee80211_node_leave(ni); -+ break; -+ default: -+ vap->iv_stats.is_rx_mgtdiscard++; -+ break; -+ } -+ break; -+ } -+ -+ case IEEE80211_FC0_SUBTYPE_DISASSOC: { -+ u_int16_t reason; -+ -+ if (vap->iv_state != IEEE80211_S_RUN && -+ vap->iv_state != IEEE80211_S_ASSOC && -+ vap->iv_state != IEEE80211_S_AUTH) { -+ vap->iv_stats.is_rx_mgtdiscard++; -+ return; -+ } -+ /* -+ * disassoc frame format -+ * [2] reason -+ */ -+ IEEE80211_VERIFY_LENGTH(efrm - frm, 2); -+ reason = le16toh(*(__le16 *)frm); -+ vap->iv_stats.is_rx_disassoc++; -+ IEEE80211_NODE_STAT(ni, rx_disassoc); -+ -+ IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, -+ "recv disassociate (reason %d)", reason); -+ switch (vap->iv_opmode) { -+ case IEEE80211_M_STA: -+ ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); -+ break; -+ case IEEE80211_M_HOSTAP: -+ if (ni != vap->iv_bss) -+ ieee80211_node_leave(ni); -+ break; -+ default: -+ vap->iv_stats.is_rx_mgtdiscard++; -+ break; -+ } -+ break; -+ } -+ default: -+ IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, -+ wh, "mgt", "subtype 0x%x not handled", subtype); -+ vap->iv_stats.is_rx_badsubtype++; -+ break; -+ } -+#undef ISREASSOC -+#undef ISPROBE -+} -+#undef IEEE80211_VERIFY_LENGTH -+#undef IEEE80211_VERIFY_ELEMENT -+ -+/* -+ * Process a received ps-poll frame. -+ */ -+static void -+ieee80211_recv_pspoll(struct ieee80211_node *ni, struct sk_buff *skb0) -+{ -+ struct ieee80211vap *vap = ni->ni_vap; -+ struct ieee80211_frame_min *wh; -+ struct sk_buff *skb; -+ u_int16_t aid; -+ int qlen; -+ -+ wh = (struct ieee80211_frame_min *)skb0->data; -+ if (ni->ni_associd == 0) { -+ IEEE80211_DISCARD(vap, -+ IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, -+ (struct ieee80211_frame *) wh, "ps-poll", -+ "%s", "unassociated station"); -+ vap->iv_stats.is_ps_unassoc++; -+ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, -+ IEEE80211_REASON_NOT_ASSOCED); -+ return; -+ } -+ -+ aid = le16toh(wh->i_dur); -+ if (aid != ni->ni_associd) { -+ IEEE80211_DISCARD(vap, -+ IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, -+ (struct ieee80211_frame *) wh, "ps-poll", -+ "aid mismatch: sta aid 0x%x poll aid 0x%x", -+ ni->ni_associd, aid); -+ vap->iv_stats.is_ps_badaid++; -+ IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, -+ IEEE80211_REASON_NOT_ASSOCED); -+ return; -+ } -+ -+ /* Okay, take the first queued packet and put it out... */ -+ IEEE80211_NODE_SAVEQ_LOCK(ni); -+ IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen); -+ IEEE80211_NODE_SAVEQ_UNLOCK(ni); -+ if (skb == NULL) { -+ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2, -+ "%s", "recv ps-poll, but queue empty"); -+ ieee80211_send_nulldata(ieee80211_ref_node(ni)); -+ vap->iv_stats.is_ps_qempty++; /* XXX node stat */ -+ if (vap->iv_set_tim != NULL) -+ vap->iv_set_tim(ni, 0); /* just in case */ -+ return; -+ } -+ /* -+ * If there are more packets, set the more packets bit -+ * in the packet dispatched to the station; otherwise -+ * turn off the TIM bit. -+ */ -+ if (qlen != 0) { -+ IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, -+ "recv ps-poll, send packet, %u still queued", qlen); -+ /* -+ * NB: More-data bit will be set during encap. -+ */ -+ } else { -+ IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, -+ "%s", "recv ps-poll, send packet, queue empty"); -+ if (vap->iv_set_tim != NULL) -+ vap->iv_set_tim(ni, 0); -+ } -+ M_PWR_SAV_SET(skb); /* ensure MORE_DATA bit is set correctly */ -+ -+ ieee80211_parent_queue_xmit(skb); /* Submit to parent device, including updating stats */ -+} -+ -+#ifdef ATH_SUPERG_FF -+static void -+athff_decap(struct sk_buff *skb) -+{ -+ struct ether_header eh_src, *eh_dst; -+ struct llc *llc; -+ -+ memcpy(&eh_src, skb->data, sizeof(struct ether_header)); -+ llc = (struct llc *) skb_pull(skb, sizeof(struct ether_header)); -+ eh_src.ether_type = llc->llc_un.type_snap.ether_type; -+ skb_pull(skb, LLC_SNAPFRAMELEN); -+ -+ eh_dst = (struct ether_header *) skb_push(skb, sizeof(struct ether_header)); -+ memcpy(eh_dst, &eh_src, sizeof(struct ether_header)); -+} -+#endif -+ -+#ifdef USE_HEADERLEN_RESV -+/* -+ * The kernel version of this function alters the skb in a manner -+ * inconsistent with dev->hard_header_len header reservation. This -+ * is a rewrite of the portion of eth_type_trans() that we need. -+ */ -+static __be16 -+ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) -+{ -+ struct ethhdr *eth; -+ -+ skb_reset_mac_header(skb); -+ skb_pull(skb, ETH_HLEN); -+ /* -+ * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but -+ * since that's an inline and not a define there's -+ * no easy way to do this cleanly. -+ */ -+ eth = eth_hdr(skb); -+ -+ if (*eth->h_dest & 1) -+ if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) -+ skb->pkt_type = PACKET_BROADCAST; -+ else -+ skb->pkt_type = PACKET_MULTICAST; -+ else -+ if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) -+ skb->pkt_type = PACKET_OTHERHOST; -+ -+ return eth->h_proto; -+} -+#endif -+ -+#ifdef IEEE80211_DEBUG -+/* -+ * Debugging support. -+ */ -+ -+/* -+ * Return the bssid of a frame. -+ */ -+static const u_int8_t * -+ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh) -+{ -+ if (vap->iv_opmode == IEEE80211_M_STA) -+ return wh->i_addr2; -+ if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) != IEEE80211_FC1_DIR_NODS) -+ return wh->i_addr1; -+ if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL) -+ return wh->i_addr1; -+ return wh->i_addr3; -+} -+ -+void -+ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...) -+{ -+ char buf[128]; /* XXX */ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsnprintf(buf, sizeof(buf), fmt, ap); -+ va_end(ap); -+ -+ printk("%s: %s", vap->iv_dev->name, buf); /* NB: no \n */ -+} -+EXPORT_SYMBOL(ieee80211_note); -+ -+void -+ieee80211_note_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh, -+ const char *fmt, ...) -+{ -+ char buf[128]; /* XXX */ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsnprintf(buf, sizeof(buf), fmt, ap); -+ va_end(ap); -+ printk("%s: [%s] %s\n", vap->iv_dev->name, -+ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); -+} -+EXPORT_SYMBOL(ieee80211_note_frame); -+ -+void -+ieee80211_note_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN], -+ const char *fmt, ...) -+{ -+ char buf[128]; /* XXX */ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsnprintf(buf, sizeof(buf), fmt, ap); -+ va_end(ap); -+ printk("%s: [%s] %s\n", vap->iv_dev->name, ether_sprintf(mac), buf); -+} -+EXPORT_SYMBOL(ieee80211_note_mac); -+ -+static void -+ieee80211_discard_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh, -+ const char *type, const char *fmt, ...) -+{ -+ char buf[128]; /* XXX */ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsnprintf(buf, sizeof(buf), fmt, ap); -+ va_end(ap); -+ if (type != NULL) -+ printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name, -+ ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf); -+ else -+ printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name, -+ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); -+} -+ -+static void -+ieee80211_discard_ie(struct ieee80211vap *vap, const struct ieee80211_frame *wh, -+ const char *type, const char *fmt, ...) -+{ -+ char buf[128]; /* XXX */ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsnprintf(buf, sizeof(buf), fmt, ap); -+ va_end(ap); -+ if (type != NULL) -+ printk("[%s:%s] discard %s information element, %s\n", -+ vap->iv_dev->name, -+ ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf); -+ else -+ printk("[%s:%s] discard information element, %s\n", -+ vap->iv_dev->name, -+ ether_sprintf(ieee80211_getbssid(vap, wh)), buf); -+} -+ -+static void -+ieee80211_discard_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN], -+ const char *type, const char *fmt, ...) -+{ -+ char buf[128]; /* XXX */ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsnprintf(buf, sizeof(buf), fmt, ap); -+ va_end(ap); -+ if (type != NULL) -+ printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name, -+ ether_sprintf(mac), type, buf); -+ else -+ printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name, -+ ether_sprintf(mac), buf); -+} -+#endif /* IEEE80211_DEBUG */ diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c madwifi-0.9.3.1/net80211/ieee80211_monitor.c --- madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c 2007-02-15 00:45:48.000000000 +0100 +++ madwifi-0.9.3.1/net80211/ieee80211_monitor.c 2007-07-10 14:45:14.000000000 +0200 From vmiklos at frugalware.org Wed Jul 11 09:44:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 09:44:33 2007 Subject: [Frugalware-git] homepage-ng: rss feeds: darcs -> git Message-ID: <20070711074432.7B61816A8093@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=5845c929bfff70e46ccdba29abceef7c881e38ae commit 5845c929bfff70e46ccdba29abceef7c881e38ae Author: VMiklos Date: Wed Jul 11 09:44:18 2007 +0200 rss feeds: darcs -> git diff --git a/frugalware/rss.php b/frugalware/rss.php index 62fffa4..1e2bf02 100644 --- a/frugalware/rss.php +++ b/frugalware/rss.php @@ -153,9 +153,9 @@ switch($_GET['type']) } break; - case "darcs": + case "git": header('Content-Type: application/xml; charset=utf-8'); - print(file_get_contents("http://darcs.frugalware.org/genesis.darcsweb/darcsweb.cgi?r=frugalware-current;a=rss")); + print(file_get_contents("http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=rss;filter=nomerge")); die(); case "bugs": header('Content-Type: application/xml; charset=utf-8'); @@ -170,7 +170,7 @@ switch($_GET['type']) fwmiddlebox("RSS",'
  • ' . gettext('News') . '
  • ' . gettext('Stable releases') . '
    • -
  • ' . gettext('Darcs commits') . '
    • +
  • ' . gettext('Git commits') . '
  • ' . gettext('BTS entries') . '
  • ' . gettext('Package updates') . '
  • ' . gettext('Blog posts') . '
    • From vmiklos at frugalware.org Wed Jul 11 09:51:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 09:51:35 2007 Subject: [Frugalware-git] frugalware-current: m4-1.4.10-1-i686 Message-ID: <20070711075133.658F313A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a549fad266617938c62f52b56812b881760f02e4 commit a549fad266617938c62f52b56812b881760f02e4 Author: VMiklos Date: Wed Jul 11 09:51:23 2007 +0200 m4-1.4.10-1-i686 version bump diff --git a/source/devel/m4/FrugalBuild b/source/devel/m4/FrugalBuild index 02fa5e8..3f3eac0 100644 --- a/source/devel/m4/FrugalBuild +++ b/source/devel/m4/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=m4 -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 pkgdesc="An implementation of the traditional Unix macro processor" url="http://www.gnu.org/software/m4" From vmiklos at frugalware.org Wed Jul 11 10:03:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 10:03:55 2007 Subject: [Frugalware-git] frugalware-current: flashplugin-9.0.48.0-1-i686 Message-ID: <20070711080353.1759118681D4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d72130c6cf04aadcee238bd3df6d34c155bf9aaf commit d72130c6cf04aadcee238bd3df6d34c155bf9aaf Author: VMiklos Date: Wed Jul 11 10:01:12 2007 +0200 flashplugin-9.0.48.0-1-i686 version bump diff --git a/source/xlib/flashplugin/FrugalBuild b/source/xlib/flashplugin/FrugalBuild index 1e49292..8428c62 100644 --- a/source/xlib/flashplugin/FrugalBuild +++ b/source/xlib/flashplugin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=flashplugin -pkgver=9.0.31.0 +pkgver=9.0.48.0 pkgrel=1 pkgdesc="Macromedia flash plugin for Netscape/Mozilla (nonfree)" url="http://www.macromedia.com/" @@ -11,11 +11,10 @@ groups=('xlib') archs=('i686' '!x86_64') up2date="lynx -useragent='Mozilla (Linux) Firefox' -dump http://www.adobe.com/go/getflashplayer 2>/dev/null|grep Version|sed 's/.*Version: //;s/,/./g;q'" source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz) +sha1sums=('4bba0b81462394388b4509ecdc845f469c95d6ae') build() { Fcd install_flash_player_9_linux Fexerel /usr/lib/mozilla/plugins/libflashplayer.so } - -sha1sums=('ffe59c81d28d8108112b7e372f652328d362a35b') From vmiklos at frugalware.org Wed Jul 11 10:07:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 10:07:33 2007 Subject: [Frugalware-git] frugalware-current: flashplugin-9.0.48.0-1-i686 Message-ID: <20070711080732.7596016A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=27cca19704ba4a707f8f4666cc32bef93779de38 commit 27cca19704ba4a707f8f4666cc32bef93779de38 Author: VMiklos Date: Wed Jul 11 10:07:24 2007 +0200 flashplugin-9.0.48.0-1-i686 added a note about secbugs diff --git a/source/xlib/flashplugin/FrugalBuild b/source/xlib/flashplugin/FrugalBuild index 8428c62..7cf541a 100644 --- a/source/xlib/flashplugin/FrugalBuild +++ b/source/xlib/flashplugin/FrugalBuild @@ -13,6 +13,10 @@ up2date="lynx -useragent='Mozilla (Linux) Firefox' -dump http://www.adobe.com/go source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz) sha1sums=('4bba0b81462394388b4509ecdc845f469c95d6ae') +# NOTE: always check the upstream changelog: +# http://www.adobe.com/support/documentation/en/flashplayer/9/releasenotes.html +# if it contains security fixes, don't forget to open a [SEC] task! + build() { Fcd install_flash_player_9_linux From vmiklos at frugalware.org Wed Jul 11 11:05:49 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 11:05:52 2007 Subject: [Frugalware-git] frugalware-current: pootle-1.0.2-1-i686 Message-ID: <20070711090549.7CE8916A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8a3885077ac2ffaaf433230b660e14b2fd281b3f commit 8a3885077ac2ffaaf433230b660e14b2fd281b3f Author: VMiklos Date: Wed Jul 11 11:05:31 2007 +0200 pootle-1.0.2-1-i686 version bump diff --git a/source/network-extra/pootle/FrugalBuild b/source/network-extra/pootle/FrugalBuild index a048f2a..fbef78d 100644 --- a/source/network-extra/pootle/FrugalBuild +++ b/source/network-extra/pootle/FrugalBuild @@ -2,21 +2,21 @@ # Maintainer: VMiklos pkgname=pootle -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Web tool for software translation and translation management." _F_sourceforge_dirname="translate" _F_sourceforge_name="Pootle" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge python -depends=("translate-toolkit>=$pkgver" 'jtoolkit>=0.7.8' 'elementtree' 'zip') +depends=("translate-toolkit>=1.0.1" 'jtoolkit>=0.7.8' 'elementtree' 'zip') backup=($_F_python_libdir/Pootle/{pootle,users}.prefs) groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=91920&package_id=144807'|grep tar.bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=($source rc.pootle README.Frugalware) -sha1sums=('95e2db572e633ff38c52999c3fd4df6c9cd44bbb'\ - 'fa53b0b5ef34da67467a45730c0aed829e426212'\ +sha1sums=('a2f1dccae6e95a0562b0f5cf7cbc81df5e07849e' \ + 'fa53b0b5ef34da67467a45730c0aed829e426212' \ '225c32aa6555b1939e5fd6866d041ba745ea1f3a') options=('nodocs') From vmiklos at frugalware.org Wed Jul 11 11:55:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 11:55:27 2007 Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.40.1-1-i686 Message-ID: <20070711095524.3497816A8094@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=44af4ed9eb61668dbb0969a928696d8994101f59 commit 44af4ed9eb61668dbb0969a928696d8994101f59 Author: VMiklos Date: Wed Jul 11 11:55:11 2007 +0200 e2fsprogs-1.40.1-1-i686 version bump diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index fc06471..90a0136 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=e2fsprogs -pkgver=1.40 +pkgver=1.40.1 pkgrel=1 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" url="http://e2fsprogs.sourceforge.net/" @@ -24,6 +24,6 @@ build() } # optimization OK -sha1sums=('9a8c0d76313f2061228dbc6ee51d4bc054efcd2a'\ - 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f'\ +sha1sums=('86e4d29accdd2a5d439940bd5c0551cfcbe875b7' \ + 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ '7d5e3eecbea952aa1f72808fb810892d82a35461') From vmiklos at frugalware.org Wed Jul 11 13:24:02 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 13:24:04 2007 Subject: [Frugalware-git] frugalware-current: gimp-2.2.16-1-i686 Message-ID: <20070711112402.20F9816A8093@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=846fd94a3440be4113491b7f1f6ce62954f2f5ed commit 846fd94a3440be4113491b7f1f6ce62954f2f5ed Author: VMiklos Date: Wed Jul 11 13:23:47 2007 +0200 gimp-2.2.16-1-i686 version bump closes #2237 diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 0533e15..3d67097 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,7 +3,7 @@ # Modified by: Laszlo Dvornik pkgname=gimp -pkgver=2.2.15 +pkgver=2.2.16 pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed 's/.*-\(.*\)\.t.*/\1/'" source=(ftp://ftp.gimp.org/pub/gimp/v2.2/$pkgname-$pkgver.tar.bz2) -sha1sums=('ce2357139179e67f361e3ce1b1fb82d1dd5c08e4') +sha1sums=('0e25426507e1eda50b0b3cb11b348e563557bbae') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet From vmiklos at frugalware.org Wed Jul 11 18:57:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 18:57:09 2007 Subject: [Frugalware-git] frugalware-current: fuseiso-20070708-1-i686 Message-ID: <20070711165707.2151316A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d92a2097d6730ff679b10ac2d7b8d3568fd650ea commit d92a2097d6730ff679b10ac2d7b8d3568fd650ea Author: VMiklos Date: Wed Jul 11 18:56:56 2007 +0200 fuseiso-20070708-1-i686 version bump diff --git a/source/apps-extra/fuseiso/FrugalBuild b/source/apps-extra/fuseiso/FrugalBuild index 4fb7cbe..0460fb2 100644 --- a/source/apps-extra/fuseiso/FrugalBuild +++ b/source/apps-extra/fuseiso/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=fuseiso -pkgver=20061017 +pkgver=20070708 pkgrel=1 pkgdesc="Mount ISO filesystem images as a non-root user" url="http://fuse.sourceforge.net/wiki/index.php/FuseIso" @@ -11,7 +11,5 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(http://ubiz.ru/dm/fuseiso-$pkgver.tar.bz2) - +sha1sums=('fe142556ad35dd7e5dc31a16183232a6e2da7692') # optimization OK - -sha1sums=('f626518031b34bd15c97f982b577a72400357e0a') From vmiklos at frugalware.org Wed Jul 11 19:03:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 19:03:48 2007 Subject: [Frugalware-git] frugalware-current: live-2007.07.10-1-i686 Message-ID: <20070711170346.624FC13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cd7dcb0e9808ed9e39b9cbc8ae9cffb5a88a2651 commit cd7dcb0e9808ed9e39b9cbc8ae9cffb5a88a2651 Author: VMiklos Date: Wed Jul 11 19:03:37 2007 +0200 live-2007.07.10-1-i686 version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index 8524f76..38f6c81 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=live -pkgver=2007.07.01 +pkgver=2007.07.10 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=('e5484b865c4dc5d56378db83356be6786f63447f') +sha1sums=('add00efa0bbb137e7d3248742521053360c4068b') build() { From vmiklos at frugalware.org Wed Jul 11 22:31:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 22:31:44 2007 Subject: [Frugalware-git] frugalware-current: gsoap-2.7.9-9-i686 Message-ID: <20070711203141.B6C1816A8084@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2f1b84d583d2509288620a1331e01d5287972c88 commit 2f1b84d583d2509288620a1331e01d5287972c88 Author: VMiklos Date: Wed Jul 11 22:31:27 2007 +0200 gsoap-2.7.9-9-i686 bump to patchlevel 'i' diff --git a/source/devel-extra/gsoap/FrugalBuild b/source/devel-extra/gsoap/FrugalBuild index 748517c..704c140 100644 --- a/source/devel-extra/gsoap/FrugalBuild +++ b/source/devel-extra/gsoap/FrugalBuild @@ -3,8 +3,8 @@ pkgname=gsoap pkgver=2.7.9 -extrapkgver=h -pkgrel=8 +extrapkgver=i +pkgrel=9 pkgdesc="A cross-platform development environment for C and C++ SOAP/XML Web services." depends=('libstdc++') groups=('devel-extra') @@ -13,7 +13,7 @@ _F_sourceforge_dirname="gsoap2" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=52781|grep stable |sed 's/.*P \([^ ]*\) .*/\1/;s/$extrapkgver//;q'" source=(${source%gs*}/${pkgname}_$pkgver$extrapkgver.tar.gz gsoap-2.7.9-gcc41.diff) -sha1sums=('1ccb93fb1d9525982c82d141d7c38026f0ae8153'\ +sha1sums=('8da3e7996966a88975c20b0ff39f896d479082f5' \ 'dbd2c19a10fce1f2d4ebf5e060e32540ba27c9c5') build() From vmiklos at frugalware.org Wed Jul 11 22:46:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 22:46:48 2007 Subject: [Frugalware-git] frugalware-current: kshutdown-1.0.1-1-i686 Message-ID: <20070711204646.860DA13A4107@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=706204e15f5cf161c582052300ce57ed29cddaae commit 706204e15f5cf161c582052300ce57ed29cddaae Author: VMiklos Date: Wed Jul 11 22:46:36 2007 +0200 kshutdown-1.0.1-1-i686 version bump diff --git a/source/kde-extra/kshutdown/FrugalBuild b/source/kde-extra/kshutdown/FrugalBuild index da3aa32..87ebc5a 100644 --- a/source/kde-extra/kshutdown/FrugalBuild +++ b/source/kde-extra/kshutdown/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=kshutdown -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="KShutDown is an advanced shut down utility for KDE." depends=('kdelibs') @@ -12,5 +12,5 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 _F_kde_defaults=0 Finclude sourceforge kde -sha1sums=('9ae3a0111d98f559262df6e1d19b6e2b41a983ba') +sha1sums=('e3ca858614a68ab91aa72963e0d5915257dfa0bb') # optimization OK From vmiklos at frugalware.org Wed Jul 11 23:11:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 11 23:11:56 2007 Subject: [Frugalware-git] frugalware-current: linuxdcpp-20070711-1-i686 Message-ID: <20070711211141.C011616A8093@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1cf696893a31ff9795744c4b86a6fd5ae7f2c2bb commit 1cf696893a31ff9795744c4b86a6fd5ae7f2c2bb Author: VMiklos Date: Wed Jul 11 23:11:27 2007 +0200 linuxdcpp-20070711-1-i686 bump to newer snapshot diff --git a/source/xapps-extra/linuxdcpp/FrugalBuild b/source/xapps-extra/linuxdcpp/FrugalBuild index 55af289..4d7b202 100644 --- a/source/xapps-extra/linuxdcpp/FrugalBuild +++ b/source/xapps-extra/linuxdcpp/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Korpenkraxar pkgname=linuxdcpp -pkgver=20061206 +pkgver=20070711 pkgrel=1 pkgdesc="A port the DC++ direct connect client to Linux" url="http://linuxdcpp.berlios.de/" @@ -13,12 +13,13 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://ftp.frugalware.org/pub/other/sources/$pkgname/?C=M;O=D'|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('6680dd98c6db0018a6b8a9b503f88d6e47d8beef') +sha1sums=('358dfeb07bb08f3b4ffa544619dd34a65adf54f3') build() { Fcd linuxdcpp + scons PREFIX=/usr LIBDIR=/usr/share || return 1 scons PREFIX=/usr LIBDIR=/usr/share install FAKE_ROOT=$Fdestdir || return 1 Fmkdir usr/share/pixmaps Fcpr linuxdcpp/pixmaps/linuxdcpp.png usr/share/pixmaps/linuxdcpp.png From priyank at frugalware.org Thu Jul 12 07:20:55 2007 From: priyank at frugalware.org (Priyank) Date: Thu Jul 12 07:20:58 2007 Subject: [Frugalware-git] frugalware-current: brasero-0.6.0-1-i686 Message-ID: <20070712052055.54AF118681E6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b4fad99f53e36e6fac6a9ebcfbc574e6476b4075 commit b4fad99f53e36e6fac6a9ebcfbc574e6476b4075 Author: Priyank Date: Thu Jul 12 10:49:31 2007 +0530 brasero-0.6.0-1-i686 * Version bump diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index d104608..e7cd9bc 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.26 SBU +# Compiling Time: 0.21 SBU # Maintainer: Priyank Gosalia pkgname=brasero -pkgver=0.5.90 +pkgver=0.6.0 pkgrel=1 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" @@ -22,7 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-search --enable-playlist --enable-preview --enable-inotify --enable-libnotify --disable-schemas-install --enable-caches=no" -sha1sums=('4e210488bf657178a9a7d4b940885c0a80f14095') +sha1sums=('f5d641fd76335a6f182c3d0b3cb62f3c09d2ff4b') # optimization OK From priyank at frugalware.org Thu Jul 12 07:43:52 2007 From: priyank at frugalware.org (Priyank) Date: Thu Jul 12 07:43:55 2007 Subject: [Frugalware-git] frugalware-current: libzip-0.8-1-i686 Message-ID: <20070712054352.E91BF16A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9902aeb30a1e6dc929368a5e37b9dee7df111ebe commit 9902aeb30a1e6dc929368a5e37b9dee7df111ebe Author: Priyank Date: Thu Jul 12 11:12:09 2007 +0530 libzip-0.8-1-i686 * New package / Added as a dependency for tea-17.0.1 diff --git a/source/lib-extra/libzip/FrugalBuild b/source/lib-extra/libzip/FrugalBuild new file mode 100644 index 0000000..52b5ded --- /dev/null +++ b/source/lib-extra/libzip/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.08 SBU +# Maintainer: Priyank Gosalia + +pkgname=libzip +pkgver=0.8 +pkgrel=1 +pkgdesc="libzip is a C library for reading, creating, and modifying zip archives." +url="http://www.nih.at/libzip/" +depends=() +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | grep Current | sed 's/.*n: \(.*\) re.*/\1/'" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('a24bd9b3085774e2c30eda095fea1e494d1c2d9f') + +# optimization OK From priyank at frugalware.org Thu Jul 12 07:50:50 2007 From: priyank at frugalware.org (Priyank) Date: Thu Jul 12 07:50:52 2007 Subject: [Frugalware-git] frugalware-current: tea-17.0.1-1-i686 Message-ID: <20070712055050.EAD2916A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=45878e3834cbec1c0d84ad03e46c70a716a52767 commit 45878e3834cbec1c0d84ad03e46c70a716a52767 Author: Priyank Date: Thu Jul 12 11:19:00 2007 +0530 tea-17.0.1-1-i686 * Version bump * Added libzip to depends() diff --git a/source/gnome-extra/tea/FrugalBuild b/source/gnome-extra/tea/FrugalBuild index 92b0133..abb237a 100644 --- a/source/gnome-extra/tea/FrugalBuild +++ b/source/gnome-extra/tea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tea -pkgver=17.0.0 +pkgver=17.0.1 pkgrel=1 pkgdesc="TEA is a GTK2-based text editor for Linux and *BSD." _F_sourceforge_name=tea-editor @@ -10,7 +10,7 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://tea-editor.sourceforge.net/" license="GPL" -depends=('gtk+2' 'gtksourceview' 'gnome-vfs' 'gconf' 'aspell') +depends=('gtk+2' 'gtksourceview' 'gnome-vfs' 'gconf' 'aspell' 'libzip') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads.html | grep -m1 source | sed 's/.*A \(.*\) s.*/\1/'" @@ -19,7 +19,7 @@ _F_desktop_name=Tea _F_desktop_icon=tea.png _F_desktop_categories="Utility;Editor;" _F_cd_path="$pkgname-$pkgver" -sha1sums=('8b8712e603b9401532853e368c7429588361bebe') +sha1sums=('29f36d116372c6d50bec6118f3a4bdaa03fe3b06') build() { From vmiklos at frugalware.org Thu Jul 12 09:53:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 09:53:17 2007 Subject: [Frugalware-git] pacman-tools: portpkg: permission fix Message-ID: <20070712075315.E24E016A80A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=2dc3f438fe04984ca678fc75c13dc0651d1235cd commit 2dc3f438fe04984ca678fc75c13dc0651d1235cd Author: VMiklos Date: Thu Jul 12 09:53:10 2007 +0200 portpkg: permission fix diff --git a/portpkg b/portpkg old mode 100644 new mode 100755 From vmiklos at frugalware.org Thu Jul 12 10:17:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 10:17:40 2007 Subject: [Frugalware-git] frugalware-current: perl-carp-clan-5.9-1-x86_64 Message-ID: <20070712081738.AA35416A80A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2f36c42fed854911d53ebcc3bd78c0db222d2daf commit 2f36c42fed854911d53ebcc3bd78c0db222d2daf Author: VMiklos Date: Thu Jul 12 10:17:25 2007 +0200 perl-carp-clan-5.9-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-carp-clan/FrugalBuild b/source/devel-extra/perl-carp-clan/FrugalBuild index e0c618f..f766dd1 100644 --- a/source/devel-extra/perl-carp-clan/FrugalBuild +++ b/source/devel-extra/perl-carp-clan/FrugalBuild @@ -4,7 +4,9 @@ _F_perl_name=Carp-Clan _F_perl_author=J/JJ/JJORE pkgver=5.9 -pkgdesc="Report errors from perspective of caller of a "clan" of modules" -depends=('') +pkgdesc="Report errors from perspective of caller of a 'clan' of modules" +# don't install additional modules just for the testsuite +_F_conf_perl_pipefrom="echo no" Finclude perl sha1sums=('d6058647c8ee80cb978a2c11896d04faede6c33d') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Thu Jul 12 10:20:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 10:20:52 2007 Subject: [Frugalware-git] frugalware-current: perl-bit-vector-6.4-1-x86_64 Message-ID: <20070712082048.9A5DA16A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=dfa20e0bf57bf51729e3582fd0239b9e8b5d357a commit dfa20e0bf57bf51729e3582fd0239b9e8b5d357a Author: VMiklos Date: Thu Jul 12 10:20:45 2007 +0200 perl-bit-vector-6.4-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-bit-vector/FrugalBuild b/source/devel-extra/perl-bit-vector/FrugalBuild index 7848f41..59fd1f1 100644 --- a/source/devel-extra/perl-bit-vector/FrugalBuild +++ b/source/devel-extra/perl-bit-vector/FrugalBuild @@ -10,3 +10,4 @@ Finclude perl sha1sums=('f6ce6d7f791c24dc6195a241ec6183cbf335cb03') # optimization OK +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Thu Jul 12 10:22:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 10:22:38 2007 Subject: [Frugalware-git] frugalware-current: perl-date-calc-5.4-1-x86_64 Message-ID: <20070712082237.CFAE616A80A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1eaa4d8aa7c024a8b2408e854431c42da46e65f6 commit 1eaa4d8aa7c024a8b2408e854431c42da46e65f6 Author: VMiklos Date: Thu Jul 12 10:22:32 2007 +0200 perl-date-calc-5.4-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-date-calc/FrugalBuild b/source/devel-extra/perl-date-calc/FrugalBuild index 493c25d..d95c159 100644 --- a/source/devel-extra/perl-date-calc/FrugalBuild +++ b/source/devel-extra/perl-date-calc/FrugalBuild @@ -10,3 +10,4 @@ Finclude perl sha1sums=('630dfca054aaebd4535e2251c2c5c20d625f3f94') # optimization OK +archs=(${archs[@]} 'x86_64') From voroskoi at frugalware.org Thu Jul 12 12:39:38 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Jul 12 12:39:41 2007 Subject: [Frugalware-git] homepage-ng: FSA218-kernel Message-ID: <20070712103938.DD92616A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=2d353eeb12f309b4ed7b3424c25cc6b3d91ce460 commit 2d353eeb12f309b4ed7b3424c25cc6b3d91ce460 Author: voroskoi Date: Thu Jul 12 12:37:00 2007 +0200 FSA218-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index e68a7e4..24894c9 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 218 + 2007-07-12 + voroskoi + kernel + 2.6.20-5terminus6 + 2.6.20-5terminus7 + http://bugs.frugalware.org/task/2211 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3104 + A vulnerability has been reported in the Linux Kernel, which can be exploited by malicious, local users to cause a Denial of Service (DoS). + The vulnerability is caused due to a NULL pointer dereference within the function "sysfs_readdir()" when handling pointers to inodes. This can be exploited to crash a vulnerable system. + + 217 2007-07-09 voroskoi From vmiklos at frugalware.org Thu Jul 12 21:27:54 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 21:27:56 2007 Subject: [Frugalware-git] frugalware-current: tools/genpkgdbs: generate the changelog from the latest stable tag.. Message-ID: <20070712192754.C9E1516A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8caa434cddb1a8627bac59d038c7b1817823af82 commit 8caa434cddb1a8627bac59d038c7b1817823af82 Author: VMiklos Date: Thu Jul 12 21:27:11 2007 +0200 tools/genpkgdbs: generate the changelog from the latest stable tag.. including the tag itself, just like in darcs diff --git a/tools/genpkgdbs b/tools/genpkgdbs index 1d31ad3..2fbd5ec 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -17,7 +17,7 @@ cd `dirname $0`/.. # Changelog echo -n "generating ChangeLog.txt..." -git log --no-merges 0.6.. | iconv -c -f iso8859-2 -t utf8 >ChangeLog.txt +git log --no-merges 0.6^.. | iconv -c -f iso8859-2 -t utf8 >ChangeLog.txt echo " done" # AUTHORS From vmiklos at frugalware.org Thu Jul 12 21:32:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 21:32:29 2007 Subject: [Frugalware-git] homepage-ng: new converted git repo: bmf Message-ID: <20070712193228.1889416A80A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=b584e8059d4395fd4456196a894bf4d56076000e commit b584e8059d4395fd4456196a894bf4d56076000e Author: VMiklos Date: Thu Jul 12 21:32:02 2007 +0200 new converted git repo: bmf diff --git a/git/repos/bmf b/git/repos/bmf new file mode 120000 index 0000000..0f185b9 --- /dev/null +++ b/git/repos/bmf @@ -0,0 +1 @@ +../../../people/vmiklos/bmf \ No newline at end of file From vmiklos at frugalware.org Thu Jul 12 21:38:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 21:38:40 2007 Subject: [Frugalware-git] frugalware-current: genpkgdbs: fix for unset LANG vs mailx Message-ID: <20070712193839.B533E16A80A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=53384b4f66d9f27995694892e9663122bf8d996a commit 53384b4f66d9f27995694892e9663122bf8d996a Author: VMiklos Date: Thu Jul 12 21:37:54 2007 +0200 genpkgdbs: fix for unset LANG vs mailx hopefully :) diff --git a/tools/genpkgdbs b/tools/genpkgdbs index 2fbd5ec..1a2051e 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -7,7 +7,10 @@ # this script is invoked by cron daily -unset LANG LC_ALL +unset LC_ALL +# unsetting LANG breaks accents, but this is fine, keeping the possible +# localized outputs avoided +export LANG=en_US . /usr/lib/frugalware/fwmakepkg From vmiklos at frugalware.org Thu Jul 12 21:45:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 21:45:01 2007 Subject: [Frugalware-git] frugalware-current: libsynaptics-0.14.6c-1-i686 Message-ID: <20070712194500.2BF9016A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=034f3492a216fc99980cfecee8b6cee9ea123065 commit 034f3492a216fc99980cfecee8b6cee9ea123065 Author: VMiklos Date: Thu Jul 12 21:44:51 2007 +0200 libsynaptics-0.14.6c-1-i686 up2date fix diff --git a/source/xlib-extra/libsynaptics/FrugalBuild b/source/xlib-extra/libsynaptics/FrugalBuild index e17c033..0c5d793 100644 --- a/source/xlib-extra/libsynaptics/FrugalBuild +++ b/source/xlib-extra/libsynaptics/FrugalBuild @@ -9,7 +9,7 @@ url="http://qsynaptics.sourceforge.net/" depends=('synaptics' 'libstdc++') groups=('xlib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url/dl.html|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" +up2date="lynx -dump $url/dl.html|grep $pkgname.*bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=($url/$pkgname-$pkgver.tar.gz) sha1sums=('ee39436dc8b9dd44a85d0c67e580a4c7d5fb921d') # optimization OK From vmiklos at frugalware.org Thu Jul 12 21:51:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 12 21:51:48 2007 Subject: [Frugalware-git] bmf: git2cl-1.2-1-i686 Message-ID: <20070712195147.949E216A80A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf/.git;a=commitdiff;h=de00bc5056220c484eb3227c50e19c4f8180dc82 commit de00bc5056220c484eb3227c50e19c4f8180dc82 Author: VMiklos Date: Thu Jul 12 21:51:27 2007 +0200 git2cl-1.2-1-i686 new package broken, author mailed diff --git a/source/devel-extra/git2cl/FrugalBuild b/source/devel-extra/git2cl/FrugalBuild new file mode 100644 index 0000000..1101701 --- /dev/null +++ b/source/devel-extra/git2cl/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0 SBU +# Maintainer: VMiklos + +pkgname=git2cl +pkgver=1.2 +pkgrel=1 +pkgdesc="A tool used to generate GNU ChangeLogs based on git repository logs." +url="http://josefsson.org/git2cl/" +rodepends=('git' 'perl-date-perse') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="lynx -source -dump http://repo.or.cz/w/git2cl.git|grep tags|sed 's/.*tags\/git2cl-\([^>]*\).>.*/\1/;q'" +source=(http://josefsson.org/git2cl/git2cl http://josefsson.org/git2cl/README) +sha1sums=('ff907f827caf525cb922c768e1561e7add14965c' \ + '18d05026314f814366942c2e67119b0b8c9c3da0') + +build() +{ + Fexe /usr/bin/git2cl +} From priyank at frugalware.org Fri Jul 13 07:51:42 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 13 07:51:44 2007 Subject: [Frugalware-git] frugalware-current: libpri-1.4.1-1-i686 Message-ID: <20070713055142.9687413A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b126fd647d58d0b9a62877fe956633724505eac7 commit b126fd647d58d0b9a62877fe956633724505eac7 Author: Priyank Date: Fri Jul 13 11:13:34 2007 +0530 libpri-1.4.1-1-i686 * Version bump diff --git a/source/lib-extra/libpri/FrugalBuild b/source/lib-extra/libpri/FrugalBuild index 1dc09ee..1c97172 100644 --- a/source/lib-extra/libpri/FrugalBuild +++ b/source/lib-extra/libpri/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Balint Kovacs pkgname=libpri -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="Primary Rate ISDN specification library" url="http://www.asterisk.org/" @@ -13,6 +13,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads | grep -m1 'libpri-.*.tar.gz' | sed 's/.*pri-\(.*\).t.*/\1/'" source=(http://ftp.digium.com/pub/$pkgname/$pkgname-$pkgver.tar.gz \ $pkgname-makefile.patch) -sha1sums=('910bcada76e1fa8229fdf48abb8d6aa30d0d42d3' 'af2c0d53ca4f219f2e8ac99fa7f65c276169c04b') +sha1sums=('76284bcb68b57d972396115ba29d1e9d3aa88507' \ + 'af2c0d53ca4f219f2e8ac99fa7f65c276169c04b') # optimization ok From krics at linuxforum.hu Fri Jul 13 08:44:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 13 08:45:01 2007 Subject: [Frugalware-git] frugalware-current: cairomm-1.4.0-1-i686 Message-ID: <20070713064458.55EF513A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=17fd58782daf2c3141eb7aac65df67cdfbcae85e commit 17fd58782daf2c3141eb7aac65df67cdfbcae85e Author: Christian Hamar alias krix Date: Fri Jul 13 08:44:16 2007 +0200 cairomm-1.4.0-1-i686 * Version bump diff --git a/source/xlib/cairomm/FrugalBuild b/source/xlib/cairomm/FrugalBuild index 0420c5e..41e334d 100644 --- a/source/xlib/cairomm/FrugalBuild +++ b/source/xlib/cairomm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cairomm -pkgver=1.2.4 +pkgver=1.4.0 pkgrel=1 pkgdesc="C++ bindings for cairo" url="http://cairographics.org" @@ -14,4 +14,4 @@ up2date="lynx -dump $url/releases/ |grep ]LATEST-cairomm|sed 's/.*mm-\([^ ]*\) . source=($url/releases/$pkgname-$pkgver.tar.gz) # optimization OK -sha1sums=('dca12f7d4f90812a9cc1c85dcc5652ec24c5eeef') +sha1sums=('289e8397621c44db81bea67c0b4f40dcbd00769f') From krics at linuxforum.hu Fri Jul 13 09:36:15 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 13 09:36:18 2007 Subject: [Frugalware-git] frugalware-current: gtk+2-engines-2.11.3-1-i686 Message-ID: <20070713073615.F068813A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0bdd5f0c2af13019916f5ff0354a8342c238f120 commit 0bdd5f0c2af13019916f5ff0354a8342c238f120 Author: Christian Hamar alias krix Date: Fri Jul 13 09:35:36 2007 +0200 gtk+2-engines-2.11.3-1-i686 * Version bump diff --git a/source/gnome/gtk+2-engines/FrugalBuild b/source/gnome/gtk+2-engines/FrugalBuild index 6cabe63..9e1d736 100644 --- a/source/gnome/gtk+2-engines/FrugalBuild +++ b/source/gnome/gtk+2-engines/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gtk+2-engines _F_gnome_name=gtk-engines -pkgver=2.11.2 +pkgver=2.11.3 pkgrel=1 pkgdesc="Theme engines for GTK+2" url="http://www.gnome.org/" @@ -17,6 +17,6 @@ _F_gnome_devel=y Finclude gnome _F_cd_path="gtk-engines-$pkgver" Fconfopts="$Fconfopts --enable-animation" -sha1sums=('7d9719a1b20f56b9abaf8c3e2e88c58f1a288545') +sha1sums=('8ab5ecae4877ffebef83addb18dc3894d40fa865') # optimization OK From krics at linuxforum.hu Fri Jul 13 11:51:24 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 13 11:51:27 2007 Subject: [Frugalware-git] frugalware-current: gcalctool-5.19.5-1-i686 Message-ID: <20070713095124.F34C013A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c87579fbc4a0797b4afa2a88b4585f5596621a0e commit c87579fbc4a0797b4afa2a88b4585f5596621a0e Author: Christian Hamar alias krix Date: Fri Jul 13 11:50:52 2007 +0200 gcalctool-5.19.5-1-i686 * Version bump diff --git a/source/gnome/gcalctool/FrugalBuild b/source/gnome/gcalctool/FrugalBuild index db8bee6..178bae8 100644 --- a/source/gnome/gcalctool/FrugalBuild +++ b/source/gnome/gcalctool/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gcalctool -pkgver=5.19.4 +pkgver=5.19.5 pkgrel=1 pkgdesc="A scientific calculator for GNOME" url="http://www.gnome.org/" @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet -sha1sums=('b69b83d8ade5bdc03f1893c559cde3501a71fcd0') +sha1sums=('5b4bcb34f21bdb37b1d740d494ff4380bd9f94cb') # optimization OK From krics at linuxforum.hu Fri Jul 13 12:06:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 13 12:06:59 2007 Subject: [Frugalware-git] frugalware-current: libglademm-2.6.4-2-i686 Message-ID: <20070713100649.4009013A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7a4522d8f7703be85d17f297cee1fcc0d5696410 commit 7a4522d8f7703be85d17f297cee1fcc0d5696410 Author: Christian Hamar alias krix Date: Fri Jul 13 12:06:24 2007 +0200 libglademm-2.6.4-2-i686 * Release bump with new cairomm diff --git a/source/gnome-extra/libglademm/FrugalBuild b/source/gnome-extra/libglademm/FrugalBuild index 915d803..2dfae8c 100644 --- a/source/gnome-extra/libglademm/FrugalBuild +++ b/source/gnome-extra/libglademm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libglademm pkgver=2.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="C++ interface for Libglade" url="http://www.gnome.org/" -depends=('gtkmm' 'libglade' 'cairomm=1.2.4') +depends=('gtkmm' 'libglade' 'cairomm=1.4.0') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome From krics at linuxforum.hu Fri Jul 13 12:51:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 13 12:51:02 2007 Subject: [Frugalware-git] frugalware-current: liferea-1.2.20-1-i686 Message-ID: <20070713105100.3807C18681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5f83c01188192159dda32ccd8e27888d543dc626 commit 5f83c01188192159dda32ccd8e27888d543dc626 Author: Christian Hamar alias krix Date: Fri Jul 13 12:50:27 2007 +0200 liferea-1.2.20-1-i686 * Version bump diff --git a/source/gnome-extra/liferea/FrugalBuild b/source/gnome-extra/liferea/FrugalBuild index e0ad5d7..0c384c0 100644 --- a/source/gnome-extra/liferea/FrugalBuild +++ b/source/gnome-extra/liferea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=liferea -pkgver=1.2.19 +pkgver=1.2.20 pkgrel=1 pkgdesc="Liferea is a news aggregator for online news feeds." license="GPL2" @@ -16,10 +16,10 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet up2date="lynx -dump http://liferea.sourceforge.net|grep -m1 'Stable'|sed 's/.*]\(.*\) .*/\1/'" -sha1sums=('1d6b6f612904849bd1f49ddd3427b3db644b5672') +sha1sums=('dca906bc59eee569b50034d09d4ead86abf0e6fb') build() { - Fcd $pkgname-1.2.19 + Fcd $pkgname-1.2.20 Fsed '' '&\n ' opml/*.opml Fmake Fmakeinstall From vmiklos at frugalware.org Fri Jul 13 14:09:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 14:09:49 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.4-1-i686 Message-ID: <20070713120947.636F218681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=04e2dc21bd3fc1ab52e55c3193be78653b8ce283 commit 04e2dc21bd3fc1ab52e55c3193be78653b8ce283 Author: VMiklos Date: Fri Jul 13 14:09:08 2007 +0200 git-1.5.2.4-1-i686 version bump diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index be88047..a4e05f6 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=git -pkgver=1.5.2.3 -pkgrel=2 +pkgver=1.5.2.4 +pkgrel=1 pkgdesc="the stupid content tracker" url="http://www.kernel.org/pub/software/scm/git/" depends=('curl>=7.16.0' 'openssl') From vmiklos at frugalware.org Fri Jul 13 14:23:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 14:23:28 2007 Subject: [Frugalware-git] frugalware-current: sbcl-bin-1.0.7-1-i686 Message-ID: <20070713122326.5D4DB18681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=63f20ebeeebb3a13a06f29dccf11b4dc9b34cdb9 commit 63f20ebeeebb3a13a06f29dccf11b4dc9b34cdb9 Author: VMiklos Date: Fri Jul 13 14:22:37 2007 +0200 sbcl-bin-1.0.7-1-i686 version bump diff --git a/source/devel-extra/sbcl-bin/FrugalBuild b/source/devel-extra/sbcl-bin/FrugalBuild index 947f779..67a7ec5 100644 --- a/source/devel-extra/sbcl-bin/FrugalBuild +++ b/source/devel-extra/sbcl-bin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=sbcl-bin -pkgver=0.9.15 +pkgver=1.0.7 pkgrel=1 pkgdesc="Steel Bank Common Lisp (Binary version)" depends=('glibc') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') conflicts=('sbcl') if [ "$CARCH" == "i686" ]; then targetarch="x86" - sha1sums=('520c22c6b8bd530ea111adab61ef9a1683233ca7') + sha1sums=('e25881951c7f5bceaadda2b8dc77bf5f6432b32a') elif [ "$CARCH" == "x86_64" ]; then targetarch="x86-64" sha1sums=('5da74da86dc69fc18b0c75e3cb55fc57085dc3b6') @@ -19,9 +19,8 @@ fi _F_sourceforge_name=sbcl _F_sourceforge_ext="-$targetarch-linux-binary.tar.bz2" Finclude sourceforge -sha1sums=(${sha1sums[@]} '9357b6f2d69801cccfa5070706c16ffc9dc821bc' \ - '91e6b6af8b96c634d0325bac13f972a3a99e9142') -source=($source sbcl.sh sbcl-fix-missing-doc.patch) +sha1sums=(${sha1sums[@]} '9357b6f2d69801cccfa5070706c16ffc9dc821bc') +source=($source sbcl.sh) options=('nobuild') build() { @@ -32,5 +31,4 @@ build() { sh install.sh || Fdie Fexe /etc/profile.d/sbcl.sh Fmv /usr/share/doc/sbcl /usr/share/doc/$pkgname-$pkgver - Frm /usr/share/doc/$pkgname-$pkgver/html } From vmiklos at frugalware.org Fri Jul 13 14:23:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 14:23:29 2007 Subject: [Frugalware-git] frugalware-current: sbcl-bin-1.0.7-1-i686 Message-ID: <20070713122326.872C118681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5189113f2d86c1999156f61d2686f59b8363f2ee commit 5189113f2d86c1999156f61d2686f59b8363f2ee Author: VMiklos Date: Fri Jul 13 14:23:11 2007 +0200 sbcl-bin-1.0.7-1-i686 forgot to remove unused patch diff --git a/source/devel-extra/sbcl-bin/sbcl-fix-missing-doc.patch b/source/devel-extra/sbcl-bin/sbcl-fix-missing-doc.patch deleted file mode 100644 index bb99335..0000000 --- a/source/devel-extra/sbcl-bin/sbcl-fix-missing-doc.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur sbcl-0.9.15-x86-linux.orig/install.sh sbcl-0.9.15-x86-linux/install.sh ---- sbcl-0.9.15-x86-linux.orig/install.sh 2006-08-23 08:59:44.000000000 +0200 -+++ sbcl-0.9.15-x86-linux/install.sh 2006-08-23 09:00:03.000000000 +0200 -@@ -108,28 +108,28 @@ - cp doc/sbcl.1 $BUILD_ROOT$MAN_DIR/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1" - - # info --for info in doc/manual/*.info doc/manual/*.info-* --do -- cp $info $BUILD_ROOT$INFO_DIR/ \ -- && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir" \ -- && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir > /dev/null 2>&1 \ -- || echo -n " (could not add to system catalog)" ) \ -- && echo --done -+#for info in doc/manual/*.info doc/manual/*.info-* -+#do -+# cp $info $BUILD_ROOT$INFO_DIR/ \ -+# && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir" \ -+# && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir > /dev/null 2>&1 \ -+# || echo -n " (could not add to system catalog)" ) \ -+# && echo -+#done - - # pdf --for pdf in doc/manual/*.pdf --do -- cp $pdf $BUILD_ROOT$DOC_DIR/ \ -- && echo " pdf $BUILD_ROOT$DOC_DIR/`basename $pdf`" --done -+#for pdf in doc/manual/*.pdf -+#do -+# cp $pdf $BUILD_ROOT$DOC_DIR/ \ -+# && echo " pdf $BUILD_ROOT$DOC_DIR/`basename $pdf`" -+#done - - # html --for html in doc/manual/sbcl doc/manual/asdf --do -- test -d $html && cp -R -L $html $BUILD_ROOT$DOC_DIR/html \ -- && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html" --done -+#for html in doc/manual/sbcl doc/manual/asdf -+#do -+# test -d $html && cp -R -L $html $BUILD_ROOT$DOC_DIR/html \ -+# && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html" -+#done - - for f in BUGS SUPPORT CREDITS COPYING NEWS - do From priyank at frugalware.org Fri Jul 13 15:09:40 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 13 15:09:42 2007 Subject: [Frugalware-git] frugalware-current: fbpanel-4.10-1-i686 Message-ID: <20070713130940.7EECF18681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bf2019485199a3be771693d35b9e3fb0168008e6 commit bf2019485199a3be771693d35b9e3fb0168008e6 Author: Priyank Date: Fri Jul 13 18:37:20 2007 +0530 fbpanel-4.10-1-i686 * Version bump diff --git a/source/x11-extra/fbpanel/FrugalBuild b/source/x11-extra/fbpanel/FrugalBuild index 61db198..78cff6d 100644 --- a/source/x11-extra/fbpanel/FrugalBuild +++ b/source/x11-extra/fbpanel/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: BMH1980 pkgname=fbpanel -pkgver=4.9 +pkgver=4.10 pkgrel=1 pkgdesc="fbpanel is a lightweight, NETWM compliant desktop panel." _F_sourceforge_ext=".tgz" @@ -13,7 +13,7 @@ license="GPL" depends=('gtk+2' 'libxpm') groups=('x11-extra') archs=('i686' 'x86_64') -sha1sums=('e051d0cd419773c807f632a242b6ee490ba7d54f') +sha1sums=('5381f43321d6326f056df444bc7c54a6db07a052') build() { From priyank at frugalware.org Fri Jul 13 15:18:59 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 13 15:19:02 2007 Subject: [Frugalware-git] frugalware-current: perl-anyevent-2.53-1-i686 Message-ID: <20070713131859.8C4E718681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5a89765cc4ad4d3a35d33ed2b4379902b1e6e1f8 commit 5a89765cc4ad4d3a35d33ed2b4379902b1e6e1f8 Author: Priyank Date: Fri Jul 13 18:47:16 2007 +0530 perl-anyevent-2.53-1-i686 * Version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index 1738c9e..510b1e9 100644 --- a/source/devel-extra/perl-anyevent/FrugalBuild +++ b/source/devel-extra/perl-anyevent/FrugalBuild @@ -4,9 +4,9 @@ _F_perl_name=AnyEvent _F_perl_author=M/ML/MLEHMANN -pkgver=2.52 +pkgver=2.53 pkgdesc="Perl framework for multiple event loops." depends=('perl-event') Finclude perl archs=('i686' 'x86_64') -sha1sums=('83a30b5e6337e3050a6111d77d041c2870ceba94') +sha1sums=('a999d5f9c8260ffd1805313acdff85ef5ccc804e') From priyank at frugalware.org Fri Jul 13 15:28:57 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 13 15:28:59 2007 Subject: [Frugalware-git] frugalware-current: lrzip-0.18-1-i686 Message-ID: <20070713132857.3923818681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9808524c051c0663b1cf77ed5f6f01461f963ca6 commit 9808524c051c0663b1cf77ed5f6f01461f963ca6 Author: Priyank Date: Fri Jul 13 18:57:18 2007 +0530 lrzip-0.18-1-i686 * New package / Initial Import * Req. by crazy diff --git a/source/apps-extra/lrzip/FrugalBuild b/source/apps-extra/lrzip/FrugalBuild new file mode 100644 index 0000000..e69de29 From priyank at frugalware.org Fri Jul 13 15:38:16 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 13 15:38:18 2007 Subject: [Frugalware-git] frugalware-current: lrzip-0.18-1-i686: fix mtr line. Message-ID: <20070713133816.2861018681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2978853af64b5a455d1eaafe2937980917dc0001 commit 2978853af64b5a455d1eaafe2937980917dc0001 Author: Priyank Date: Fri Jul 13 19:06:46 2007 +0530 lrzip-0.18-1-i686: fix mtr line. diff --git a/source/apps-extra/lrzip/FrugalBuild b/source/apps-extra/lrzip/FrugalBuild index e69de29..5e50c06 100644 --- a/source/apps-extra/lrzip/FrugalBuild +++ b/source/apps-extra/lrzip/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Priyank Gosalia + +pkgname=lrzip +pkgver=0.18 +pkgrel=1 +pkgdesc="A compression program optimized for large files." +url="http://ck.kolivas.org/apps/lrzip/" +depends=('lzo') +groups=('apps-extra') +archs=('i686') +up2date="lynx -dump $url | grep $pkgname | Flasttarbz2" +source=($url/$pkgname-$pkgver.tar.bz2) +sha1sums=('93a86b9616660ed1205c4779972f1aefe866e29b') + +# optimization OK From vmiklos at frugalware.org Fri Jul 13 22:39:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 22:39:10 2007 Subject: [Frugalware-git] frugalware-current: sbcl-1.0.7-1-i686 Message-ID: <20070713203903.0F5FC18681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e3b8f63dda0a176886f499e98cd472b1cc1f1395 commit e3b8f63dda0a176886f499e98cd472b1cc1f1395 Author: VMiklos Date: Fri Jul 13 22:38:44 2007 +0200 sbcl-1.0.7-1-i686 version bump disabled sb-bsd-sockets,sb-simple-streams,asdf-install modules in contrib/ for now as they broke the build diff --git a/source/devel-extra/sbcl/FrugalBuild b/source/devel-extra/sbcl/FrugalBuild index 117cd4a..7945408 100644 --- a/source/devel-extra/sbcl/FrugalBuild +++ b/source/devel-extra/sbcl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=sbcl -pkgver=1.0.1 +pkgver=1.0.7 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://sbcl.sourceforge.net/" @@ -13,6 +13,8 @@ archs=('i686' 'x86_64') _F_sourceforge_ext="-source.tar.bz2" Finclude sourceforge source=($source $pkgname.sh) +sha1sums=('82658d80cf7da2bb4c45cc552b92477dba816561' \ + '9357b6f2d69801cccfa5070706c16ffc9dc821bc') build() { @@ -20,7 +22,8 @@ build() export INSTALL_ROOT=$Fdestdir/usr Fmkdir /usr/share/man/man1 Fsed '\(CFLAGS =\) -g -Wall -O3' "\1 $CFLAGS" src/runtime/GNUmakefile - . /etc/profile.d/sbcl.sh + # remove broken modules + rm -rf contrib/{sb-bsd-sockets,sb-simple-streams,asdf-install} sh make.sh || Fdie @@ -31,6 +34,3 @@ build() } # optimization OK - -sha1sums=('ddd1a7595ea83ed1655c716fc7c967ee8ff13878' \ - '9357b6f2d69801cccfa5070706c16ffc9dc821bc') From vmiklos at frugalware.org Fri Jul 13 23:24:06 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:24:08 2007 Subject: [Frugalware-git] frugalware-current: freshmeat-submit-1.6-1-x86_64 Message-ID: <20070713212406.B6EAD18681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4eaba7e6715121be1ac83f63bee11a154dadc2d5 commit 4eaba7e6715121be1ac83f63bee11a154dadc2d5 Author: VMiklos Date: Fri Jul 13 23:23:50 2007 +0200 freshmeat-submit-1.6-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/freshmeat-submit/FrugalBuild b/source/devel-extra/freshmeat-submit/FrugalBuild index 8dcdd00..ec0b8ac 100644 --- a/source/devel-extra/freshmeat-submit/FrugalBuild +++ b/source/devel-extra/freshmeat-submit/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A utility for submitting version updates to freshmeat.net." url="http://www.catb.org/~esr/freshmeat-submit/" depends=('python') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url |Flasttar" source=($url/$pkgname-$pkgver.tar.gz) From vmiklos at frugalware.org Fri Jul 13 23:26:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:26:38 2007 Subject: [Frugalware-git] frugalware-current: perl-file-find-closures-1.06-1-x86_64 Message-ID: <20070713212636.7C05918681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0d900aa2384559ea96afcbcdc15c6099bad823cd commit 0d900aa2384559ea96afcbcdc15c6099bad823cd Author: VMiklos Date: Fri Jul 13 23:26:26 2007 +0200 perl-file-find-closures-1.06-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-file-find-closures/FrugalBuild b/source/devel-extra/perl-file-find-closures/FrugalBuild index 605bfca..b452d9e 100644 --- a/source/devel-extra/perl-file-find-closures/FrugalBuild +++ b/source/devel-extra/perl-file-find-closures/FrugalBuild @@ -5,6 +5,6 @@ _F_perl_name=File-Find-Closures _F_perl_author=B/BD/BDFOY pkgver=1.06 pkgdesc="functions you can use with File::Find" -depends=('') Finclude perl sha1sums=('c94ab2aee13e2ee68d9ae6b2dd34ad410648e97a') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Fri Jul 13 23:28:14 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:28:18 2007 Subject: [Frugalware-git] frugalware-current: perl-number-compare-0.01-1-x86_64 Message-ID: <20070713212814.EFDE418681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bbf099d4c7c0da1d97ebbe61969433cc4f366936 commit bbf099d4c7c0da1d97ebbe61969433cc4f366936 Author: VMiklos Date: Fri Jul 13 23:28:05 2007 +0200 perl-number-compare-0.01-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-number-compare/FrugalBuild b/source/devel-extra/perl-number-compare/FrugalBuild index 999cb2d..37d1449 100644 --- a/source/devel-extra/perl-number-compare/FrugalBuild +++ b/source/devel-extra/perl-number-compare/FrugalBuild @@ -5,6 +5,6 @@ _F_perl_name=Number-Compare _F_perl_author=R/RC/RCLAMP pkgver=0.01 pkgdesc="numeric comparisons" -depends=('') Finclude perl sha1sums=('d768ceab714b50fe1fa8e7d9133de736f58fb7b7') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Fri Jul 13 23:31:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:31:59 2007 Subject: [Frugalware-git] frugalware-current: perl-text-glob-0.08-1-x86_64 Message-ID: <20070713213157.CC21618681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2d5a40ab4eb292bd4a8d88f99b715618603bfff5 commit 2d5a40ab4eb292bd4a8d88f99b715618603bfff5 Author: VMiklos Date: Fri Jul 13 23:31:44 2007 +0200 perl-text-glob-0.08-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-text-glob/FrugalBuild b/source/devel-extra/perl-text-glob/FrugalBuild index 237d31a..e454b10 100644 --- a/source/devel-extra/perl-text-glob/FrugalBuild +++ b/source/devel-extra/perl-text-glob/FrugalBuild @@ -5,6 +5,6 @@ _F_perl_name=Text-Glob _F_perl_author=R/RC/RCLAMP pkgver=0.08 pkgdesc="match globbing patterns against text" -depends=('') Finclude perl sha1sums=('86b6a5e4cff2589d733975277b6f101b949ee975') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Fri Jul 13 23:32:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:32:41 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.4-1-i686 Message-ID: <20070713213240.0EEEB18681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c80349dc0957738761c9937d3e35067a773d6b5e commit c80349dc0957738761c9937d3e35067a773d6b5e Author: VMiklos Date: Fri Jul 13 23:32:33 2007 +0200 git-1.5.2.4-1-i686 gitconfig: /usr/etc -> /etc thx crazy for pointing out this bug diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index a4e05f6..1794516 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -28,6 +28,8 @@ build() Fsed '^\(CFLAGS =\) .*' "\1 $CFLAGS" Makefile # fix path, we do not put the contrib dir to the documentation folder Fsed 'doc/' '' templates/hooks--post-receive + # fix default gitconfig + Fsed '\(ETC_GITCONFIG =\) .*' '\1 /etc/gitconfig' Makefile make configure || return 1 Fmkdir /usr/bin Fpatchall From vmiklos at frugalware.org Fri Jul 13 23:34:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:34:37 2007 Subject: [Frugalware-git] frugalware-current: perl-file-find-rule-0.30-1-x86_64 Message-ID: <20070713213435.DCC8D13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=dfa51814c14bf3264c298b67042b4236504d8fdc commit dfa51814c14bf3264c298b67042b4236504d8fdc Author: VMiklos Date: Fri Jul 13 23:34:21 2007 +0200 perl-file-find-rule-0.30-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-file-find-rule/FrugalBuild b/source/devel-extra/perl-file-find-rule/FrugalBuild index c4a0515..4cfcac4 100644 --- a/source/devel-extra/perl-file-find-rule/FrugalBuild +++ b/source/devel-extra/perl-file-find-rule/FrugalBuild @@ -8,3 +8,4 @@ pkgdesc="Alternative interface to File::Find" depends=('perl-text-glob' 'perl-number-compare') Finclude perl sha1sums=('cd160432a028cf076988fa77ace3a8c3738dfa98') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Fri Jul 13 23:37:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:37:50 2007 Subject: [Frugalware-git] frugalware-current: include/scm.sh: cogito -> git Message-ID: <20070713213748.B560C18681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2ced339a2db722093caed5f3764f3dadd680f6f5 commit 2ced339a2db722093caed5f3764f3dadd680f6f5 Author: VMiklos Date: Fri Jul 13 23:37:33 2007 +0200 include/scm.sh: cogito -> git as of git-1.5, cogito is no longer maintained diff --git a/source/include/scm.sh b/source/include/scm.sh index 1dab921..38fff4d 100644 --- a/source/include/scm.sh +++ b/source/include/scm.sh @@ -90,7 +90,7 @@ elif [ "$_F_scm_type" == "subversion" ]; then makedepends=(${makedepends[@]} 'subversion') elif [ "$_F_scm_type" == "git" ]; then up2date="date +%Y%m%d%H%M%S --date '`curl -I $_F_scm_url/HEAD 2>&1|sed -n '/^Last-Modified/s/^[^:]*: //p'`'" - makedepends=(${makedepends[@]} 'cogito') + makedepends=(${makedepends[@]} 'git') elif [ "$_F_scm_type" == "mercurial" ]; then # it seems that _every_ repo url has the same web interface which has a nice rss up2date="date +%Y%m%d%H%M%S --date '`lynx -dump $_F_scm_url/?style=rss|grep pubDate|sed 's/.*>\(.*\)<.*/\1/;q'`'" @@ -131,7 +131,7 @@ Funpack_scm() svn co $_F_scm_url $_F_scm_module || Fdie Fcd $_F_scm_module elif [ "$_F_scm_type" == "git" ]; then - cg-clone $_F_scm_url || Fdie + git clone $_F_scm_url || Fdie Fcd `echo $_F_scm_url |sed 's|.*/\(.*\)\..*|\1|'` elif [ "$_F_scm_type" == "mercurial" ]; then hg clone $_F_scm_url || Fdie From vmiklos at frugalware.org Fri Jul 13 23:40:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:40:14 2007 Subject: [Frugalware-git] frugalware-current: gnome-device-manager-0.1-1-x86_64 Message-ID: <20070713214010.136EA18681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a38126f34dfd05aad460057a906175d5a7f2ebc6 commit a38126f34dfd05aad460057a906175d5a7f2ebc6 Author: VMiklos Date: Fri Jul 13 23:39:57 2007 +0200 gnome-device-manager-0.1-1-x86_64 added x86_64 to archs() diff --git a/source/gnome/gnome-device-manager/FrugalBuild b/source/gnome/gnome-device-manager/FrugalBuild index afbebfc..07349fa 100644 --- a/source/gnome/gnome-device-manager/FrugalBuild +++ b/source/gnome/gnome-device-manager/FrugalBuild @@ -9,7 +9,7 @@ url="http://people.freedesktop.org/~david/" depends=('hal>=0.5.9' 'libgnomeui>=2.18.0' 'libgnome>=2.18.0') makedepends=('perl-xml' 'intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-core') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://people.freedesktop.org/~david/dist/ | grep $pkgname | Flasttarbz2" source=(http://people.freedesktop.org/~david/dist/$pkgname-$pkgver.tar.bz2) sha1sums=('e2a727fa5068b343aa68b4279fe65462e951891f') From vmiklos at frugalware.org Fri Jul 13 23:46:18 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 13 23:46:20 2007 Subject: [Frugalware-git] frugalware-current: libasyncns-0.3-1-x86_64 Message-ID: <20070713214618.C4DA418681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=84f40217dccc1ad2529a2b5d49a794967fcdad1c commit 84f40217dccc1ad2529a2b5d49a794967fcdad1c Author: VMiklos Date: Fri Jul 13 23:46:10 2007 +0200 libasyncns-0.3-1-x86_64 added x86_64 to archs() diff --git a/source/lib/libasyncns/FrugalBuild b/source/lib/libasyncns/FrugalBuild index 6ab3a0b..243ff0f 100644 --- a/source/lib/libasyncns/FrugalBuild +++ b/source/lib/libasyncns/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="libasyncns is a C library for Linux/Unix for executing name service que url="http://0pointer.de/lennart/projects/libasyncns/" depends=('glibc') groups=('lib') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://0pointer.de/lennart/projects/libasyncns/ | grep -i 'current release' | sed 's/.*[0-9]\]//'" source=(http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.gz) sha1sums=('e8100382a14c57af69633f3bd1b4b4a52fc90bb1') From vmiklos at frugalware.org Sat Jul 14 00:10:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 00:10:32 2007 Subject: [Frugalware-git] bmf: git-1.5.3.rc1.4.gaf83-1-i686 Message-ID: <20070713221029.3907418681F7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf/.git;a=commitdiff;h=6223f56f4fe97375734a1f82e810a071106ddcf0 commit 6223f56f4fe97375734a1f82e810a071106ddcf0 Author: VMiklos Date: Sat Jul 14 00:09:58 2007 +0200 git-1.5.3.rc1.4.gaf83-1-i686 added missing sha1sums diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 002aec9..c2242aa 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -12,6 +12,9 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$url/?C=M;O=D'|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(gitweb.modules.d gitweb.conf README.Frugalware) +sha1sums=('c60be6e086241b85b1f0d89db22c24fc21dc6432' \ + '58698ef6cf0dad734e1a1ee5689c0c4d83bf27b5' \ + 'a0aa4b43cfd81b74c28343495bf6c8a2f50adcaa') options=('scriptlet') _F_scm_type="git" _F_scm_url="git://git.kernel.org/pub/scm/git/git.git" @@ -61,5 +64,4 @@ build() Fsplit gitk usr/bin/gitk } - # optimization OK From vmiklos at frugalware.org Sat Jul 14 00:10:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 00:10:32 2007 Subject: [Frugalware-git] bmf: git-1.5.3.rc1.4.gaf83-1-i686 Message-ID: <20070713221029.0C66F18681F6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf/.git;a=commitdiff;h=a16cbda7c18fa2173df9040e8673c8fdb03d5140 commit a16cbda7c18fa2173df9040e8673c8fdb03d5140 Author: VMiklos Date: Sat Jul 14 00:08:56 2007 +0200 git-1.5.3.rc1.4.gaf83-1-i686 new package, based on git's "master" branch diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild new file mode 100644 index 0000000..002aec9 --- /dev/null +++ b/source/devel-extra/git/FrugalBuild @@ -0,0 +1,65 @@ +# Compiling Time: 0.36 SBU +# Maintainer: VMiklos + +pkgname=git +pkgver=1.5.3.rc1.4.gaf83 +pkgrel=1 +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') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump '$url/?C=M;O=D'|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" +source=(gitweb.modules.d gitweb.conf README.Frugalware) +options=('scriptlet') +_F_scm_type="git" +_F_scm_url="git://git.kernel.org/pub/scm/git/git.git" +Finclude scm + +subpkgs=('gitweb' 'gitk') +subdescs=('Web interface for Git.' 'Tk based git repository browser') +subdepends=("git=$pkgver" "git=$pkgver tk") +subbackup=('etc/gitweb.conf etc/httpd/conf/modules.d/gitweb.conf' '') +subgroups=('network-extra' 'xapps-extra') +subarchs=('i686 x86_64' 'i686 x86_64') + +build() +{ + Funpack_scm + Fsed '^\(CFLAGS =\) .*' "\1 $CFLAGS" Makefile + # fix path, we do not put the contrib dir to the documentation folder + Fsed 'doc/' '' templates/hooks--post-receive + # fix default gitconfig + Fsed '\(ETC_GITCONFIG =\) .*' '\1 /etc/gitconfig' Makefile + make configure || return 1 + Fmkdir /usr/bin + Fpatchall + Fconf + make ASCIIDOC8=YesPlease all doc || return 1 + Fmakeinstall install-doc + make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver/html install-webdoc || return 1 + Fdocrel Documentation/SubmittingPatches + Fdocrel Documentation/technical + + # libgit + Ffilerel /usr/lib/libgit.a + Ffilerel *.h /usr/include/git/ + + # contrib dir + Fcprrel contrib /usr/share/git-core/ + + # gitweb + Fmkdir /var/www/gitweb + cp gitweb/git* $Fdestdir/var/www/gitweb + Ffile gitweb.modules.d /etc/httpd/conf/modules.d/gitweb.conf + Ffile /etc/gitweb.conf + Fsplit gitweb /etc /var + Fdoc README.Frugalware + + # gitk + Fsplit gitk usr/bin/gitk +} + + +# optimization OK diff --git a/source/devel-extra/git/README.Frugalware b/source/devel-extra/git/README.Frugalware new file mode 100644 index 0000000..1cc505f --- /dev/null +++ b/source/devel-extra/git/README.Frugalware @@ -0,0 +1,8 @@ +=== gitweb + +If you want to set up a web interface for your git repositories, then: + +* install the `gitweb` package +* edit edit `/etc/gitweb.conf` so that `$projectroot` will point to the + repository directory +* restart `apache` so that the `gitweb` configuration will be included. diff --git a/source/devel-extra/git/gitweb.conf b/source/devel-extra/git/gitweb.conf new file mode 100644 index 0000000..f5fc71c --- /dev/null +++ b/source/devel-extra/git/gitweb.conf @@ -0,0 +1,62 @@ +# +# gitweb.conf +# +# Configuration file for the web interface to GIT. +# +# This file is a Perl script that is executed by the gitweb interface +# after the defaults are set. To override a setting, just uncomment +# it here and set it to the appropriate value. +# + +# Core git executable to use. +# This can just be "git" if your webserver has a sensible PATH. +#our $GIT = "/path/to/git"; + +# Absolute fs-path which will be prepended to the project path. +# This is where your GIT repositories live in. +#our $projectroot = "/pub/scm"; + +# Target of the home link on top of all pages. +#our $home_link = $my_uri || "/"; + +# String of the home link on top of all pages. +#our $home_link_str = "projects"; + +# Name of your site or organization to appear in page titles. +# Replace this with something more descriptive for clearer bookmarks. +#our $site_name = "" + +# Filename of HTML text to include at top of each page. +# Must be an absolute filename (i.e., not relative to htdocs). +#our $site_header = ""; +# HTML text to include at home page. +# Must be an absolute filename (i.e., not relative to htdocs). +#our $home_text = "/gitweb/indextext.html"; +# Filename of HTML text to include at bottom of each page. +# Must be an absolute filename (i.e., not relative to htdocs). +#our $site_footer = ""; + +# URI of the stylesheet to use. +#our $stylesheet = "/gitweb/gitweb.css"; +# URI of GIT logo (72x27 size). +#our $logo = "/gitweb/git-logo.png"; +# URI of GIT favicon, assumed to be image/png type. +#our $favicon = "/gitweb/git-favicon.png"; + +# URI and label (title) of GIT logo link. +#our $logo_url = "http://git.or.cz/"; +#our $logo_label = "git homepage"; + +# Source of projects list. +#our $projects_list = ""; + +# Show repository only if this file exists. +# Only effective if this variable evaluates to true. +#our $export_ok = ""; + +# Only allow viewing of repositories also shown on the overview page. +#our $strict_export = ""; + +# List of git base URLs used for URL to where fetch project from, +# i.e. full URL is "$git_base_url/$project" +#our @git_base_url_list = grep { $_ ne '' } ("/some/url"); diff --git a/source/devel-extra/git/gitweb.modules.d b/source/devel-extra/git/gitweb.modules.d new file mode 100644 index 0000000..33a35e7 --- /dev/null +++ b/source/devel-extra/git/gitweb.modules.d @@ -0,0 +1,15 @@ + + Alias /gitweb/ /var/www/gitweb/ + + + + AllowOverride All + Options ExecCGI + SetEnv GITWEB_CONFIG /etc/gitweb.conf + DirectoryIndex gitweb.cgi + AddHandler cgi-script .cgi + + Order allow,deny + Allow from all + + From priyank at frugalware.org Sat Jul 14 10:32:37 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 14 10:32:39 2007 Subject: [Frugalware-git] frugalware-current: tea-17.0.2-1-i686 Message-ID: <20070714083237.2B9981868203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9f63297f97d1523144873a356ffade87c06edd86 commit 9f63297f97d1523144873a356ffade87c06edd86 Author: Priyank Date: Sat Jul 14 14:00:21 2007 +0530 tea-17.0.2-1-i686 * Version bump diff --git a/source/gnome-extra/tea/FrugalBuild b/source/gnome-extra/tea/FrugalBuild index abb237a..b3454e6 100644 --- a/source/gnome-extra/tea/FrugalBuild +++ b/source/gnome-extra/tea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tea -pkgver=17.0.1 +pkgver=17.0.2 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=('29f36d116372c6d50bec6118f3a4bdaa03fe3b06') +sha1sums=('7fcb0771877db2aa5fdd30ff40b6ef1f3b6355ca') build() { From janny at frugalware.org Sat Jul 14 12:11:57 2007 From: janny at frugalware.org (janny) Date: Sat Jul 14 12:11:59 2007 Subject: [Frugalware-git] frugalware-current: clamav-0.91-1-i686 Message-ID: <20070714101157.21B4F18681F8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=49e245dc6870a1a3c3482efac1e59c17f0c74a15 commit 49e245dc6870a1a3c3482efac1e59c17f0c74a15 Author: janny Date: Sat Jul 14 12:11:17 2007 +0200 clamav-0.91-1-i686 version bump diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index 3b0e0da..a206d28 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=clamav -pkgver=0.91rc2 +pkgver=0.91 pkgrel=1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp' 'bzip2' 'curl>=7.16.0') @@ -12,8 +12,8 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=($source rc.clamav rc.clamav-hu.po) -sha1sums=('d45f720d8d87e3e37c221d6b14b3987596607449'\ - '90b22c99927b56992ac05042029d2702db79a8b0'\ +sha1sums=('995e054d19250777597c504552310490a59d8f76' \ + '90b22c99927b56992ac05042029d2702db79a8b0' \ '57d36966c45adfd6b3ebd10b91874194924ab2c3') build() From vmiklos at frugalware.org Sat Jul 14 13:42:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 13:42:39 2007 Subject: [Frugalware-git] frugalware-current: libgnomecanvasmm-2.16.0-4-i686 Message-ID: <20070714114236.70E7E1868207@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c9ef1a544df4a8371e7c6bab89c8aab32859e3ca commit c9ef1a544df4a8371e7c6bab89c8aab32859e3ca Author: VMiklos Date: Sat Jul 14 13:42:17 2007 +0200 libgnomecanvasmm-2.16.0-4-i686 rebuilt with cairomm=1.4.0 diff --git a/source/gnome-extra/libgnomecanvasmm/FrugalBuild b/source/gnome-extra/libgnomecanvasmm/FrugalBuild index 29fc497..c55ca8d 100644 --- a/source/gnome-extra/libgnomecanvasmm/FrugalBuild +++ b/source/gnome-extra/libgnomecanvasmm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libgnomecanvasmm pkgver=2.16.0 -pkgrel=3 +pkgrel=4 pkgdesc="C++ interface for libgnomecanvas" url="http://www.gtkmm.org" -depends=('gtkmm' 'libgnomecanvas' 'cairomm=1.2.4') +depends=('gtkmm' 'libgnomecanvas' 'cairomm=1.4.0') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome From vmiklos at frugalware.org Sat Jul 14 14:06:52 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:06:57 2007 Subject: [Frugalware-git] pacman-tools: fblint: check for valid options() Message-ID: <20070714120652.8259213A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=ac46e7894a0ccbd83750d363549be6b76b3eb8f1 commit ac46e7894a0ccbd83750d363549be6b76b3eb8f1 Author: VMiklos Date: Sat Jul 14 14:06:09 2007 +0200 fblint: check for valid options() closes #2161 diff --git a/fblint b/fblint index 4b7d2bb..6587cb0 100644 --- a/fblint +++ b/fblint @@ -128,6 +128,7 @@ check "pkgdesc" "[ ! -z \"$pkgdesc\" ]" check "url" "[ ! -z \"$url\" ]" check "groups" "[ ! -z \"$groups\" ]" check "valid first group" "! echo $groups |grep -q -- - || echo $groups|grep -q -- -extra$" +check "valid options()" "[ -z \"$(echo ${options[@]}|tr ' ' '\n' |grep -v '\(nodocs\|nostrip\|force\|nobuild\|nofakeroot\|scriptlet\|stick\)')\" ]" check "archs" "[ ! -z \"$archs\" ]" check "up2date" "[ ! -z \"`echo $up2date|sed 's/\$(/\\\\\$(/g'`\" ]" check "md5sums/sha1sums/signatures" "[ ${#md5sums[@]} -gt 0 -o ${#sha1sums[@]} -gt 0 -o ${#signatures[@]} -gt 0 ]" From vmiklos at frugalware.org Sat Jul 14 14:19:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:19:38 2007 Subject: [Frugalware-git] pacman-tools: updates for 0.9.6 Message-ID: <20070714121937.66D9B13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=f8a96dfa17524aaddd9d44ef4d229fbfe92fca36 commit f8a96dfa17524aaddd9d44ef4d229fbfe92fca36 Author: VMiklos Date: Sat Jul 14 14:18:41 2007 +0200 updates for 0.9.6 diff --git a/Makefile b/Makefile index def96e9..0788b46 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.9.5 +VERSION = 0.9.6 LANGS = hu pl diff --git a/NEWS b/NEWS index dfa8b46..912cc47 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +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 + - darcs-git: handle commit names containing ' or " + - repoman: new experimental fpmmerge subcommand, needs more + testing 0.9.5 - mkpkghtml: new script - repoman cl no longer requires an existing fdb - repoman push fixed on x86_64 From vmiklos at frugalware.org Sat Jul 14 14:23:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:23:49 2007 Subject: [Frugalware-git] pacman-tools: Makefile: filter merges and add tags to changelog Message-ID: <20070714122348.306A81868203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=7f1d863a1ce2536812028579b20f23123aaccc59 commit 7f1d863a1ce2536812028579b20f23123aaccc59 Author: VMiklos Date: Sat Jul 14 14:22:59 2007 +0200 Makefile: filter merges and add tags to changelog diff --git a/Makefile b/Makefile index 0788b46..6499eaf 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ clean: dist: git-archive --format=tar --prefix=pacman-tools-$(VERSION)/ HEAD > pacman-tools-$(VERSION).tar mkdir -p pacman-tools-$(VERSION) - git log > pacman-tools-$(VERSION)/Changelog + git log --no-merges |git name-rev --tags --stdin > pacman-tools-$(VERSION)/Changelog tar rf pacman-tools-$(VERSION).tar pacman-tools-$(VERSION)/Changelog rm -rf pacman-tools-$(VERSION) gzip -f -9 pacman-tools-$(VERSION).tar From vmiklos at frugalware.org Sat Jul 14 14:28:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:28:41 2007 Subject: [Frugalware-git] frugalware-current: mysql-5.0.45-1-i686 Message-ID: <20070714122839.28E111868207@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=597be6f7f2bdd59700e7afe5831f0fef037e949a commit 597be6f7f2bdd59700e7afe5831f0fef037e949a Author: VMiklos Date: Sat Jul 14 14:27:18 2007 +0200 mysql-5.0.45-1-i686 version bump changed mirror diff --git a/source/apps-extra/mysql/FrugalBuild b/source/apps-extra/mysql/FrugalBuild index b453d05..45a6c35 100644 --- a/source/apps-extra/mysql/FrugalBuild +++ b/source/apps-extra/mysql/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=mysql -pkgver=5.0.41 -pkgrel=2 +pkgver=5.0.45 +pkgrel=1 extrapkgver= pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -14,10 +14,9 @@ makedepends=('procps' 'openssl' 'zlib') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://dev.mysql.com/|grep 'Generally Available'|sed 's/.* \([0-9.]*\) .*/\1/;s/$extrapkgver//;q'" -mirror="http://mysql.sote.hu/" -source=($mirror/Downloads/MySQL-5.0/$pkgname-$pkgver$extrapkgver.tar.gz rc.mysqld my.cnf \ - CVE-2007-2691.patch) -signatures=("${source[0]}.asc" '' '' '') +mirror="http://mysql.mirrors.crysys.hit.bme.hu/" +source=($mirror/Downloads/MySQL-5.0/$pkgname-$pkgver$extrapkgver.tar.gz rc.mysqld my.cnf) +signatures=("${source[0]}.asc" '' '') subpkgs=('libmysqlclient') subdescs=('MySQL client library.') From vmiklos at frugalware.org Sat Jul 14 14:28:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:28:41 2007 Subject: [Frugalware-git] frugalware-current: mysql-5.0.45-1-i686 Message-ID: <20070714122839.55CCF1868207@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7926c93efdaec7a36f4f541dfd6985b607762172 commit 7926c93efdaec7a36f4f541dfd6985b607762172 Author: VMiklos Date: Sat Jul 14 14:28:23 2007 +0200 mysql-5.0.45-1-i686 drop CVE-2007-2691.patch diff --git a/source/apps-extra/mysql/CVE-2007-2691.patch b/source/apps-extra/mysql/CVE-2007-2691.patch deleted file mode 100644 index ae02f49..0000000 --- a/source/apps-extra/mysql/CVE-2007-2691.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/sql_parse.cc 2007-04-24 14:08:07 +05:00 -+++ sql/sql_parse.cc 2007-04-24 14:08:07 +05:00 -@@ -3263,7 +3263,7 @@ end_with_restore_list: - */ - old_list= table[0]; - new_list= table->next_local[0]; -- if (check_grant(thd, ALTER_ACL, &old_list, 0, 1, 0) || -+ if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, 1, 0) || - (!test_all_bits(table->next_local->grant.privilege, - INSERT_ACL | CREATE_ACL) && - check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0, 1, 0))) - From vmiklos at frugalware.org Sat Jul 14 14:37:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:37:56 2007 Subject: [Frugalware-git] frugalware-current: pacman-tools-0.9.6-1-i686 Message-ID: <20070714123753.E504C1868214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=df5e550f04a1a30bf61604f1ffa91086b3445a4b commit df5e550f04a1a30bf61604f1ffa91086b3445a4b Author: VMiklos Date: Sat Jul 14 14:37:05 2007 +0200 pacman-tools-0.9.6-1-i686 version bump diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index a6c3678..2003fc7 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.5 +pkgver=0.9.6 pkgrel=1 pkgdesc="Tools for developers for managing packages" url="http://ftp.frugalware.org/pub/other/pacman-tools" From vmiklos at frugalware.org Sat Jul 14 14:43:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 14:43:12 2007 Subject: [Frugalware-git] frugalware-current: tools/genpkgdbs: log the time it took to execute dg optimize, too Message-ID: <20070714124309.738FC1868207@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6601fbb98447f3383ce1d172b37a21823b7b5ce8 commit 6601fbb98447f3383ce1d172b37a21823b7b5ce8 Author: VMiklos Date: Sat Jul 14 14:43:05 2007 +0200 tools/genpkgdbs: log the time it took to execute dg optimize, too diff --git a/tools/genpkgdbs b/tools/genpkgdbs index 1a2051e..8780fc2 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -81,5 +81,5 @@ sh mailer.sh cd .. if date |grep -q ^Fri; then - time dg optimize &>tools/git-gc.log + sh -c 'time dg optimize' &>tools/git-gc.log fi From vmiklos at frugalware.org Sat Jul 14 17:13:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 17:13:03 2007 Subject: [Frugalware-git] frugalware-current: vde2-2.1.6-1-i686 Message-ID: <20070714151300.F07A11868216@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=abcc13524df51bf7987743ba964b69dedcb4594c commit abcc13524df51bf7987743ba964b69dedcb4594c Author: VMiklos Date: Sat Jul 14 17:12:51 2007 +0200 vde2-2.1.6-1-i686 new package closes #1733 diff --git a/source/network-extra/vde/FrugalBuild b/source/network-extra/vde/FrugalBuild new file mode 100644 index 0000000..a2dc72d --- /dev/null +++ b/source/network-extra/vde/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling time: 0.19 SBU +# Contributor: free-zombie +# Maintainer: VMiklos + +pkgname=vde2 +pkgver=2.1.6 +pkgrel=1 +pkgdesc="Wmulates ethernet switches over existing connections." +url="http://vde.sourceforge.net/" +depends=('glibc') +groups=('network-extra') +archs=('i686' 'x86_64') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname="vde" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +sha1sums=('4eb7966e03490b5f9367e7fb08fbfbd7ada98e6e') +# optimization OK From vmiklos at frugalware.org Sat Jul 14 17:14:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 17:14:09 2007 Subject: [Frugalware-git] frugalware-current: vde2-2.1.6-1-i686 Message-ID: <20070714151407.82B101868214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c54025c0c9101a3296e15ef8a242fc064411348f commit c54025c0c9101a3296e15ef8a242fc064411348f Author: VMiklos Date: Sat Jul 14 17:14:01 2007 +0200 vde2-2.1.6-1-i686 wrong directory diff --git a/source/network-extra/vde/FrugalBuild b/source/network-extra/vde/FrugalBuild deleted file mode 100644 index a2dc72d..0000000 --- a/source/network-extra/vde/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling time: 0.19 SBU -# Contributor: free-zombie -# Maintainer: VMiklos - -pkgname=vde2 -pkgver=2.1.6 -pkgrel=1 -pkgdesc="Wmulates ethernet switches over existing connections." -url="http://vde.sourceforge.net/" -depends=('glibc') -groups=('network-extra') -archs=('i686' 'x86_64') -_F_sourceforge_ext=".tar.bz2" -_F_sourceforge_dirname="vde" -_F_sourceforge_broken_up2date=1 -Finclude sourceforge -sha1sums=('4eb7966e03490b5f9367e7fb08fbfbd7ada98e6e') -# optimization OK diff --git a/source/network-extra/vde2/FrugalBuild b/source/network-extra/vde2/FrugalBuild new file mode 100644 index 0000000..a2dc72d --- /dev/null +++ b/source/network-extra/vde2/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling time: 0.19 SBU +# Contributor: free-zombie +# Maintainer: VMiklos + +pkgname=vde2 +pkgver=2.1.6 +pkgrel=1 +pkgdesc="Wmulates ethernet switches over existing connections." +url="http://vde.sourceforge.net/" +depends=('glibc') +groups=('network-extra') +archs=('i686' 'x86_64') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname="vde" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +sha1sums=('4eb7966e03490b5f9367e7fb08fbfbd7ada98e6e') +# optimization OK From vmiklos at frugalware.org Sat Jul 14 17:29:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 17:29:34 2007 Subject: [Frugalware-git] frugalware-current: module-init-tools-3.2.2-9-i686 Message-ID: <20070714152932.F32E01868214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e4fc62d00ba533e4fb392c6ee803b3546515413f commit e4fc62d00ba533e4fb392c6ee803b3546515413f Author: VMiklos Date: Sat Jul 14 17:28:38 2007 +0200 module-init-tools-3.2.2-9-i686 rc.modules remove the ''s completly and read every line in modules as it is closes #2174 diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index f83a2d5..b0d0f7c 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -4,7 +4,7 @@ pkgname=module-init-tools pkgver=3.2.2 -pkgrel=8 +pkgrel=9 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/" depends=('glibc') @@ -14,8 +14,8 @@ archs=('i686' 'x86_64' 'ppc') backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') up2date="lynx -dump '$url/?C=M&O=D' |grep module-init-tools-[0-9\.]*.tar.bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=($url/$pkgname-$pkgver.tar.bz2 rc.modules modules) -sha1sums=('b51e8ac170be23a1f2e301a1dddd47a47ec2186a'\ - '4f7bc2f856416736a1c971f31a727897fc194530'\ +sha1sums=('b51e8ac170be23a1f2e301a1dddd47a47ec2186a' \ + '4eea32f43b0adafc380ee88d70dc8f03a0b4b062' \ 'b8a99f9a6d8758a9c384f67c4e0d8a9b6c923515') build() diff --git a/source/base/module-init-tools/rc.modules b/source/base/module-init-tools/rc.modules index 32eef8d..7d1f783 100644 --- a/source/base/module-init-tools/rc.modules +++ b/source/base/module-init-tools/rc.modules @@ -62,18 +62,8 @@ if [ "$1" = "start" ]; then ## Removing bad lines if [ "$module" != "" -a "$(echo $module | grep -v '#')" ];then - - ## Then check if module has an argument - if echo $module | grep '"' > /dev/null; then - ## If yes: - arg=$(echo $module | cut -f2 -d '"') - module=$(echo $module | cut -f1 -d '"') - $MODPROBEBIN $module $arg - else - ## If not simply modprobe it $MODPROBEBIN $module fi - fi done < $MODCONFFILE From vmiklos at frugalware.org Sat Jul 14 18:52:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 18:52:34 2007 Subject: [Frugalware-git] frugalware-current: qemu-0.9.0-2-i686 Message-ID: <20070714165232.6F1A51868214@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3f71099f98803291db53a01ae5d421ec6f8f6697 commit 3f71099f98803291db53a01ae5d421ec6f8f6697 Author: VMiklos Date: Sat Jul 14 18:52:18 2007 +0200 qemu-0.9.0-2-i686 added security.patch closes #2011 unset CFLAGS, it would break the build diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 59dc92e..c324d95 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qemu pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="QEMU is a FAST! processor emulator" url="http://fabrice.bellard.free.fr/qemu/" depends=('sdl' 'zlib' 'alsa-lib') @@ -13,25 +13,21 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz rc.qemu rc.qemu-hu.po \ rc.qemu-system qemu-system - README.Frugalware) + README.Frugalware \ + security.patch) sha1sums=('1e57e48a06eb8729913d92601000466eecef06cb' \ '60639d14ee193cc0a9911f7948719ab3fbc9737a' \ 'ce31601e5712057938227923d4a9adf16eeb36e7' \ '2ba7e84a4bc38907202340ba1323a224dbd5f597' \ 'b1c2b53ef74d1461bbd4f83b8a4f1180187f6a30' \ - '17454e4d54872d32071d478774f96cbab8bb0902') + '17454e4d54872d32071d478774f96cbab8bb0902' \ + '768b6b025b01489c7b51c3ca9cbe33753b5e357c') build() { Fsed 'sdl_static=yes' 'sdl_static=no' configure - # optimize build - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target tests/Makefile + unset CFLAGS Fconfopts="$Fconfopts --enable-alsa" - if [ "$CARCH" == "x86_64" ]; then - # gcc 3.3 doesn't support -march=k8 - export CFLAGS="-O2 -pipe" - fi Fmake make prefix=$Fdestdir$Fprefix bindir=$Fdestdir$Fprefix/bin \ datadir=$Fdestdir$Fprefix/share/qemu \ diff --git a/source/xapps-extra/qemu/security.patch b/source/xapps-extra/qemu/security.patch new file mode 100644 index 0000000..b38a45a --- /dev/null +++ b/source/xapps-extra/qemu/security.patch @@ -0,0 +1,385 @@ +Index: qemu-0.8.2/hw/cirrus_vga.c +=================================================================== +--- qemu-0.8.2.orig/hw/cirrus_vga.c 2007-04-20 06:05:59.000000000 +0300 ++++ qemu-0.8.2/hw/cirrus_vga.c 2007-04-20 06:05:59.000000000 +0300 +@@ -217,6 +217,20 @@ + #define CIRRUS_HOOK_NOT_HANDLED 0 + #define CIRRUS_HOOK_HANDLED 1 + ++#define BLTUNSAFE(s) \ ++ ( \ ++ ( /* check dst is within bounds */ \ ++ (s)->cirrus_blt_height * (s)->cirrus_blt_dstpitch \ ++ + ((s)->cirrus_blt_dstaddr & (s)->cirrus_addr_mask) > \ ++ (s)->vram_size \ ++ ) || \ ++ ( /* check src is within bounds */ \ ++ (s)->cirrus_blt_height * (s)->cirrus_blt_srcpitch \ ++ + ((s)->cirrus_blt_srcaddr & (s)->cirrus_addr_mask) > \ ++ (s)->vram_size \ ++ ) \ ++ ) ++ + struct CirrusVGAState; + typedef void (*cirrus_bitblt_rop_t) (struct CirrusVGAState *s, + uint8_t * dst, const uint8_t * src, +@@ -589,7 +603,7 @@ static void cirrus_invalidate_region(Cir + + for (y = 0; y < lines; y++) { + off_cur = off_begin; +- off_cur_end = off_cur + bytesperline; ++ off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask; + off_cur &= TARGET_PAGE_MASK; + while (off_cur < off_cur_end) { + cpu_physical_memory_set_dirty(s->vram_offset + off_cur); +@@ -604,7 +618,11 @@ static int cirrus_bitblt_common_patternc + { + uint8_t *dst; + +- dst = s->vram_ptr + s->cirrus_blt_dstaddr; ++ dst = s->vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask); ++ ++ if (BLTUNSAFE(s)) ++ return 0; ++ + (*s->cirrus_rop) (s, dst, src, + s->cirrus_blt_dstpitch, 0, + s->cirrus_blt_width, s->cirrus_blt_height); +@@ -620,8 +638,11 @@ static int cirrus_bitblt_solidfill(Cirru + { + cirrus_fill_t rop_func; + ++ if (BLTUNSAFE(s)) ++ return 0; ++ + rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1]; +- rop_func(s, s->vram_ptr + s->cirrus_blt_dstaddr, ++ rop_func(s, s->vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), + s->cirrus_blt_dstpitch, + s->cirrus_blt_width, s->cirrus_blt_height); + cirrus_invalidate_region(s, s->cirrus_blt_dstaddr, +@@ -640,8 +661,8 @@ static int cirrus_bitblt_solidfill(Cirru + static int cirrus_bitblt_videotovideo_patterncopy(CirrusVGAState * s) + { + return cirrus_bitblt_common_patterncopy(s, +- s->vram_ptr + +- (s->cirrus_blt_srcaddr & ~7)); ++ s->vram_ptr + ((s->cirrus_blt_srcaddr & ~7) & ++ s->cirrus_addr_mask)); + } + + static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) +@@ -691,8 +712,10 @@ static void cirrus_do_copy(CirrusVGAStat + if (notify) + video_hw_update(); + +- (*s->cirrus_rop) (s, s->vram_ptr + s->cirrus_blt_dstaddr, +- s->vram_ptr + s->cirrus_blt_srcaddr, ++ (*s->cirrus_rop) (s, s->vram_ptr + ++ (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), ++ s->vram_ptr + ++ (s->cirrus_blt_srcaddr & s->cirrus_addr_mask), + s->cirrus_blt_dstpitch, s->cirrus_blt_srcpitch, + s->cirrus_blt_width, s->cirrus_blt_height); + +@@ -718,8 +741,14 @@ static int cirrus_bitblt_videotovideo_co + s->cirrus_blt_srcaddr - s->start_addr, + s->cirrus_blt_width, s->cirrus_blt_height); + } else { +- (*s->cirrus_rop) (s, s->vram_ptr + s->cirrus_blt_dstaddr, +- s->vram_ptr + s->cirrus_blt_srcaddr, ++ ++ if (BLTUNSAFE(s)) ++ return 0; ++ ++ (*s->cirrus_rop) (s, s->vram_ptr + ++ (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), ++ s->vram_ptr + ++ (s->cirrus_blt_srcaddr & s->cirrus_addr_mask), + s->cirrus_blt_dstpitch, s->cirrus_blt_srcpitch, + s->cirrus_blt_width, s->cirrus_blt_height); + +@@ -751,8 +780,9 @@ static void cirrus_bitblt_cputovideo_nex + } else { + /* at least one scan line */ + do { +- (*s->cirrus_rop)(s, s->vram_ptr + s->cirrus_blt_dstaddr, +- s->cirrus_bltbuf, 0, 0, s->cirrus_blt_width, 1); ++ (*s->cirrus_rop)(s, s->vram_ptr + ++ (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), ++ s->cirrus_bltbuf, 0, 0, s->cirrus_blt_width, 1); + cirrus_invalidate_region(s, s->cirrus_blt_dstaddr, 0, + s->cirrus_blt_width, 1); + s->cirrus_blt_dstaddr += s->cirrus_blt_dstpitch; +@@ -1852,7 +1882,7 @@ static void cirrus_mem_writeb_mode4and5_ + unsigned val = mem_value; + uint8_t *dst; + +- dst = s->vram_ptr + offset; ++ dst = s->vram_ptr + (offset &= s->cirrus_addr_mask); + for (x = 0; x < 8; x++) { + if (val & 0x80) { + *dst = s->cirrus_shadow_gr1; +@@ -1875,7 +1905,7 @@ static void cirrus_mem_writeb_mode4and5_ + unsigned val = mem_value; + uint8_t *dst; + +- dst = s->vram_ptr + offset; ++ dst = s->vram_ptr + (offset &= s->cirrus_addr_mask); + for (x = 0; x < 8; x++) { + if (val & 0x80) { + *dst = s->cirrus_shadow_gr1; +Index: qemu-0.8.2/hw/cirrus_vga_rop.h +=================================================================== +--- qemu-0.8.2.orig/hw/cirrus_vga_rop.h 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/hw/cirrus_vga_rop.h 2007-04-20 06:05:59.000000000 +0300 +@@ -31,6 +31,12 @@ glue(cirrus_bitblt_rop_fwd_, ROP_NAME)(C + int x,y; + dstpitch -= bltwidth; + srcpitch -= bltwidth; ++ ++ if (dstpitch < 0 || srcpitch < 0) { ++ /* is 0 valid? srcpitch == 0 could be useful */ ++ return; ++ } ++ + for (y = 0; y < bltheight; y++) { + for (x = 0; x < bltwidth; x++) { + ROP_OP(*dst, *src); +Index: qemu-0.8.2/hw/dma.c +=================================================================== +--- qemu-0.8.2.orig/hw/dma.c 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/hw/dma.c 2007-04-20 06:05:59.000000000 +0300 +@@ -340,9 +340,11 @@ static void channel_run (int ncont, int + #endif + + r = dma_controllers[ncont].regs + ichan; +- n = r->transfer_handler (r->opaque, ichan + (ncont << 2), +- r->now[COUNT], (r->base[COUNT] + 1) << ncont); +- r->now[COUNT] = n; ++ if (r->transfer_handler) { ++ n = r->transfer_handler (r->opaque, ichan + (ncont << 2), ++ r->now[COUNT], (r->base[COUNT] + 1) << ncont); ++ r->now[COUNT] = n; ++ } + ldebug ("dma_pos %d size %d\n", n, (r->base[COUNT] + 1) << ncont); + } + +Index: qemu-0.8.2/hw/fdc.c +=================================================================== +--- qemu-0.8.2.orig/hw/fdc.c 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/hw/fdc.c 2007-04-20 06:05:59.000000000 +0300 +@@ -1110,8 +1110,13 @@ static uint32_t fdctrl_read_data (fdctrl + len = fdctrl->data_len - fdctrl->data_pos; + if (len > FD_SECTOR_LEN) + len = FD_SECTOR_LEN; +- bdrv_read(cur_drv->bs, fd_sector(cur_drv), +- fdctrl->fifo, len); ++ if (cur_drv->bs) { ++ bdrv_read(cur_drv->bs, fd_sector(cur_drv), ++ fdctrl->fifo, len); ++ } else { ++ FLOPPY_ERROR("can't read data from drive\n"); ++ return 0; ++ } + } + } + retval = fdctrl->fifo[pos]; +Index: qemu-0.8.2/hw/i8259.c +=================================================================== +--- qemu-0.8.2.orig/hw/i8259.c 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/hw/i8259.c 2007-04-20 06:05:59.000000000 +0300 +@@ -292,9 +292,11 @@ static void pic_ioport_write(void *opaqu + s->init_state = 1; + s->init4 = val & 1; + if (val & 0x02) +- hw_error("single mode not supported"); ++ /* hw_error("single mode not supported"); */ ++ return; + if (val & 0x08) +- hw_error("level sensitive irq not supported"); ++ /* hw_error("level sensitive irq not supported"); */ ++ return; + } else if (val & 0x08) { + if (val & 0x04) + s->poll = 1; +Index: qemu-0.8.2/hw/ne2000.c +=================================================================== +--- qemu-0.8.2.orig/hw/ne2000.c 2007-04-20 06:05:59.000000000 +0300 ++++ qemu-0.8.2/hw/ne2000.c 2007-04-20 06:05:59.000000000 +0300 +@@ -230,7 +230,7 @@ static void ne2000_receive(void *opaque, + { + NE2000State *s = opaque; + uint8_t *p; +- int total_len, next, avail, len, index, mcast_idx; ++ unsigned int total_len, next, avail, len, index, mcast_idx; + uint8_t buf1[60]; + static const uint8_t broadcast_macaddr[6] = + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +@@ -299,7 +299,11 @@ static void ne2000_receive(void *opaque, + + /* write packet data */ + while (size > 0) { +- avail = s->stop - index; ++ /* taviso: this can wrap, so check its okay. */ ++ if (index <= s->stop) ++ avail = s->stop - index; ++ else ++ avail = 0; + len = size; + if (len > avail) + len = avail; +Index: qemu-0.8.2/hw/pc.c +=================================================================== +--- qemu-0.8.2.orig/hw/pc.c 2007-04-20 06:05:58.000000000 +0300 ++++ qemu-0.8.2/hw/pc.c 2007-04-20 06:05:59.000000000 +0300 +@@ -312,7 +312,8 @@ void bochs_bios_write(void *opaque, uint + case 0x400: + case 0x401: + fprintf(stderr, "BIOS panic at rombios.c, line %d\n", val); +- exit(1); ++ /* according to documentation, these can be safely ignored */ ++ break; + case 0x402: + case 0x403: + #ifdef DEBUG_BIOS +@@ -335,8 +336,9 @@ void bochs_bios_write(void *opaque, uint + /* LGPL'ed VGA BIOS messages */ + case 0x501: + case 0x502: ++ /* according to documentation, these can be safely ignored */ + fprintf(stderr, "VGA BIOS panic, line %d\n", val); +- exit(1); ++ break; + case 0x500: + case 0x503: + #ifdef DEBUG_BIOS +Index: qemu-0.8.2/hw/sb16.c +=================================================================== +--- qemu-0.8.2.orig/hw/sb16.c 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/hw/sb16.c 2007-04-20 06:05:59.000000000 +0300 +@@ -1235,8 +1235,10 @@ static int SB_read_DMA (void *opaque, in + s->block_size); + #endif + +- while (s->left_till_irq <= 0) { +- s->left_till_irq = s->block_size + s->left_till_irq; ++ if (s->block_size) { ++ while (s->left_till_irq <= 0) { ++ s->left_till_irq = s->block_size + s->left_till_irq; ++ } + } + + return dma_pos; +Index: qemu-0.8.2/slirp/slirp.c +=================================================================== +--- qemu-0.8.2.orig/slirp/slirp.c 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/slirp/slirp.c 2007-04-20 06:05:59.000000000 +0300 +@@ -611,6 +611,10 @@ void slirp_input(const uint8_t *pkt, int + if (!m) + return; + /* Note: we add to align the IP header */ ++ /* taviso: large values in ne2k TCNT register may exceed msize on transmit */ ++ if (M_FREEROOM(m) < pkt_len + 2) { ++ m_inc(m, pkt_len + 2); ++ } + m->m_len = pkt_len + 2; + memcpy(m->m_data + 2, pkt, pkt_len); + +Index: qemu-0.8.2/target-i386/translate.c +=================================================================== +--- qemu-0.8.2.orig/target-i386/translate.c 2006-07-22 20:23:34.000000000 +0300 ++++ qemu-0.8.2/target-i386/translate.c 2007-04-20 06:05:59.000000000 +0300 +@@ -5244,7 +5244,12 @@ static target_ulong disas_insn(DisasCont + if (CODE64(s)) + goto illegal_op; + val = ldub_code(s->pc++); +- gen_op_aam(val); ++ /* taviso: operand can be zero */ ++ if (val) { ++ gen_op_aam(val); ++ } else { ++ gen_exception(s, EXCP00_DIVZ, s->pc - s->cs_base); ++ } + s->cc_op = CC_OP_LOGICB; + break; + case 0xd5: /* aad */ +@@ -5292,6 +5297,7 @@ static target_ulong disas_insn(DisasCont + gen_jmp_im(pc_start - s->cs_base); + gen_op_into(s->pc - pc_start); + break; ++#ifdef WANT_ICEBP + case 0xf1: /* icebp (undocumented, exits to external debugger) */ + #if 1 + gen_debug(s, pc_start - s->cs_base); +@@ -5301,6 +5307,7 @@ static target_ulong disas_insn(DisasCont + cpu_set_log(CPU_LOG_INT | CPU_LOG_TB_IN_ASM); + #endif + break; ++#endif /* icebp */ + case 0xfa: /* cli */ + if (!s->vm86) { + if (s->cpl <= s->iopl) { +Index: qemu-0.8.2/vl.c +=================================================================== +--- qemu-0.8.2.orig/vl.c 2007-04-20 06:05:59.000000000 +0300 ++++ qemu-0.8.2/vl.c 2007-04-20 06:05:59.000000000 +0300 +@@ -3139,8 +3139,8 @@ typedef struct NetSocketState { + VLANClientState *vc; + int fd; + int state; /* 0 = getting length, 1 = getting data */ +- int index; +- int packet_len; ++ unsigned int index; ++ unsigned int packet_len; + uint8_t buf[4096]; + struct sockaddr_in dgram_dst; /* contains inet host and port destination iff connectionless (SOCK_DGRAM) */ + } NetSocketState; +@@ -3171,7 +3171,8 @@ static void net_socket_receive_dgram(voi + static void net_socket_send(void *opaque) + { + NetSocketState *s = opaque; +- int l, size, err; ++ int size, err; ++ unsigned l; + uint8_t buf1[4096]; + const uint8_t *buf; + +@@ -3210,7 +3211,15 @@ static void net_socket_send(void *opaque + l = s->packet_len - s->index; + if (l > size) + l = size; +- memcpy(s->buf + s->index, buf, l); ++ if (s->index + l <= sizeof(s->buf)) { ++ memcpy(s->buf + s->index, buf, l); ++ } else { ++ fprintf(stderr, "serious error: oversized packet received," ++ "connection terminated.\n"); ++ s->state = 0; ++ goto eoc; ++ } ++ + s->index += l; + buf += l; + size -= l; +Index: qemu-0.8.2/block.c +=================================================================== +--- qemu-0.8.2.orig/block.c 2007-04-20 06:06:21.000000000 +0300 ++++ qemu-0.8.2/block.c 2007-04-20 06:01:38.000000000 +0300 +@@ -539,9 +539,16 @@ + return -ENOMEDIUM; + if (bs->read_only) + return -EACCES; ++ if (sector_num < 0) ++ return -1; + if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) { + memcpy(bs->boot_sector_data, buf, 512); + } ++ { ++ unsigned int ns = sector_num * 512; ++ if (ns < 0) ++ return -1; ++ } + if (drv->bdrv_pwrite) { + int ret, len; + len = nb_sectors * 512; From krics at linuxforum.hu Sat Jul 14 19:53:36 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 19:53:38 2007 Subject: [Frugalware-git] frugalware-current: gtkmm-2.10.10-2-x86_64 Message-ID: <20070714175336.6A2B81868232@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=39f65da2c42ffc30057d867cc17f6ea927584893 commit 39f65da2c42ffc30057d867cc17f6ea927584893 Author: Christian Hamar alias krix Date: Sat Jul 14 19:53:18 2007 +0200 gtkmm-2.10.10-2-x86_64 * Version bump diff --git a/source/gnome/gtkmm/FrugalBuild b/source/gnome/gtkmm/FrugalBuild index b720834..95b8154 100644 --- a/source/gnome/gtkmm/FrugalBuild +++ b/source/gnome/gtkmm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gtkmm pkgver=2.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="C++ interface for GTK+2" url="http://www.gnome.org/" -depends=('glibmm>=2.13.1' 'gtk+2' 'cairomm>=1.2.2') +depends=('glibmm>=2.13.1' 'gtk+2' 'cairomm>=1.4.0') groups=('gnome') archs=('i686' 'x86_64') Finclude gnome From krics at linuxforum.hu Sat Jul 14 20:05:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 20:05:52 2007 Subject: [Frugalware-git] frugalware-current: swfdec-0.5.0-1-x86_64 Message-ID: <20070714180550.032581868232@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=76ff51b1c9b2de7c76b8ff8a265d65062412e7ad commit 76ff51b1c9b2de7c76b8ff8a265d65062412e7ad Author: Christian Hamar alias krix Date: Sat Jul 14 20:05:29 2007 +0200 swfdec-0.5.0-1-x86_64 * Version bump * Fixed up2date * Removed old patch from GIT * Removed x86_64 fbuild hack (now 0.5 works) diff --git a/source/xlib/swfdec/FrugalBuild b/source/xlib/swfdec/FrugalBuild index da9438a..92cd1e5 100644 --- a/source/xlib/swfdec/FrugalBuild +++ b/source/xlib/swfdec/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=swfdec -pkgver=0.4.5 +pkgver=0.5.0 pkgrel=1 pkgdesc="Swfdec is a decoder/renderer library for Macromedia Flash animations.." url="http://swfdec.freedesktop.org/" @@ -11,24 +11,9 @@ depends=('libmad' 'gtk+2' 'liboil' 'ffmpeg>=20070422' 'alsa-lib' 'faad2' 'gstrea options=('scriptlet') groups=('xlib') archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep -m1 'Swfdec [0-9]' | sed 's/.*Swfdec \(.*\) is released.*/\1/'" -source=($url/download/$pkgname/0.4/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump $url | grep -m1 'Swfdec [0-9]' | sed 's/.*Swfdec \(.*\) is.*/\1/'" +source=($url/download/$pkgname/0.5/$pkgname-$pkgver.tar.gz) Fconfopts="${Fconfopts[@]} --enable-gnome-vfs=no" -sha1sums=('86ecc5881c7951e09f6bcf4c978764c42f098bd7') - -if [ "$CARCH" == "x86_64" ] ; then -# Well. Somehow on x86_64 and in chroot jscpucfg did not create jsautocfg.h automatically. -# If i try this hack below, then it works and swfdec compiles :S strange :S -build() { - Fcd - Fconf - cd $Fsrcdir/$pkgname-$pkgver/libswfdec/js || Fdie - make jscpucfg || Fdie - make jsautocfg.h || Fdie - cd $Fsrcdir/$pkgname-$pkgver || Fdie - make || Fdie - Fmakeinstall -} -fi +sha1sums=('cf9a2b5e25c81cd4be4e962a510ac326a651937e') # optimization OK From krics at linuxforum.hu Sat Jul 14 20:09:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 20:09:21 2007 Subject: [Frugalware-git] frugalware-current: swfdec-mozilla-0.5.0-1-x86_64 Message-ID: <20070714180918.39DC01868232@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7b480df44cdeb8857c096b7a2666cfd2b8e8891a commit 7b480df44cdeb8857c096b7a2666cfd2b8e8891a Author: Christian Hamar alias krix Date: Sat Jul 14 20:09:04 2007 +0200 swfdec-mozilla-0.5.0-1-x86_64 * Version bump * Fixed up2date diff --git a/source/xlib-extra/swfdec-mozilla/FrugalBuild b/source/xlib-extra/swfdec-mozilla/FrugalBuild index 19aa201..203bcde 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.4.5 +pkgver=0.5.0 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.4.5' 'firefox') +depends=('swfdec=0.5.0' 'firefox') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep -m1 'Swfdec [0-9]' | sed 's/.*Swfdec \(.*\) is released.*/\1/'" -source=($url/download/$pkgname/0.4/$pkgname-$pkgver.tar.gz) -sha1sums=('92948284ff7ea45d6864def84428ba800c775e5a') +up2date="lynx -dump $url | grep -m1 'Swfdec [0-9]' | sed 's/.*Swfdec \(.*\) is.*/\1/'" +source=($url/download/$pkgname/0.5/$pkgname-$pkgver.tar.gz) +sha1sums=('9b912440774bf017703736da293b60c5b49f5cdc') # optimization OK From krics at linuxforum.hu Sat Jul 14 20:16:10 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 20:16:13 2007 Subject: [Frugalware-git] frugalware-current: pygtk-2.10.6-1-x86_64 Message-ID: <20070714181610.077BE1868232@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=efff939fc79d7695929f0885d9737343e83fee83 commit efff939fc79d7695929f0885d9737343e83fee83 Author: Christian Hamar alias krix Date: Sat Jul 14 20:15:55 2007 +0200 pygtk-2.10.6-1-x86_64 * Version bump diff --git a/source/gnome/pygtk/FrugalBuild b/source/gnome/pygtk/FrugalBuild index f142be1..3378d79 100644 --- a/source/gnome/pygtk/FrugalBuild +++ b/source/gnome/pygtk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pygtk -pkgver=2.10.5 +pkgver=2.10.6 pkgrel=1 pkgdesc="Python bindings for GTK+2" url="http://www.daa.com.au/~james/pygtk/" @@ -11,5 +11,5 @@ groups=('gnome' 'gnome-core') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('f58aa66b72efe650d48afdcc03d44740077ba4bc') +sha1sums=('aaa22fce4cf4f1d22f0586975dced4cc6bc4881a') # optimization OK From krics at linuxforum.hu Sat Jul 14 20:22:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 20:22:29 2007 Subject: [Frugalware-git] frugalware-current: gwenhywfar-2.6.1-1-x86_64 Message-ID: <20070714182226.C8AE21868232@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8c0257d6be2ba75db1eb464d965bcd89948b121b commit 8c0257d6be2ba75db1eb464d965bcd89948b121b Author: Christian Hamar alias krix Date: Sat Jul 14 20:22:10 2007 +0200 gwenhywfar-2.6.1-1-x86_64 * Version bump diff --git a/source/lib-extra/gwenhywfar/FrugalBuild b/source/lib-extra/gwenhywfar/FrugalBuild index cde67d4..c9fba34 100644 --- a/source/lib-extra/gwenhywfar/FrugalBuild +++ b/source/lib-extra/gwenhywfar/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gwenhywfar -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="a multi-platform helper library for networking and security applications and libraries." depends=('openssl' 'libxml2') @@ -17,5 +17,5 @@ build() { Fbuild --enable-release=yes } -sha1sums=('a45bcd5252ca5f1feb5ce08cb026b92187356221') +sha1sums=('6fd20e998946ea6d7b3d154d34090021d86adcf8') # optimization OK From krics at linuxforum.hu Sat Jul 14 20:33:44 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 20:33:47 2007 Subject: [Frugalware-git] frugalware-current: aqbanking-2.3.2-1-x86_64 Message-ID: <20070714183344.0A1DD1868236@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7b9e7f160627d7a115158c09055ac79563df8c55 commit 7b9e7f160627d7a115158c09055ac79563df8c55 Author: Christian Hamar alias krix Date: Sat Jul 14 20:33:21 2007 +0200 aqbanking-2.3.2-1-x86_64 * Version bump diff --git a/source/lib-extra/aqbanking/FrugalBuild b/source/lib-extra/aqbanking/FrugalBuild index d43897f..7a24076 100644 --- a/source/lib-extra/aqbanking/FrugalBuild +++ b/source/lib-extra/aqbanking/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=aqbanking -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="AqBanking is a library for online banking and financial applications." url="http://http://www.aquamaniac.de/aqbanking/" -depends=('gwenhywfar>=2.6.0' 'libofx' 'libchipcard3') +depends=('gwenhywfar>=2.6.1' 'libofx' 'libchipcard3') makedepends=('qt' 'gtk+2' 'libglade') groups=('lib-extra') archs=('i686' 'x86_64') @@ -24,4 +24,4 @@ build() { } # optimization OK -sha1sums=('bef7b2e84a60b15bbb034f50349f4cc9f17bb324') +sha1sums=('e7814a486b404c58adabad1ba45c97d0724ce33d') From krics at linuxforum.hu Sat Jul 14 20:56:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 20:56:56 2007 Subject: [Frugalware-git] frugalware-current: openbabel-2.1.1-1-x86_64 Message-ID: <20070714185653.1EA011868236@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=50a962c66347c1dcd1b164e4cf2824e1c093bf79 commit 50a962c66347c1dcd1b164e4cf2824e1c093bf79 Author: Christian Hamar alias krix Date: Sat Jul 14 20:56:37 2007 +0200 openbabel-2.1.1-1-x86_64 * Version bump diff --git a/source/lib-extra/openbabel/FrugalBuild b/source/lib-extra/openbabel/FrugalBuild index 9f4c7c1..080b086 100644 --- a/source/lib-extra/openbabel/FrugalBuild +++ b/source/lib-extra/openbabel/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=openbabel -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="a free, open-source version of the Babel chemistry file translation program." depends=('libxml2' 'libstdc++') @@ -12,5 +12,5 @@ archs=('i686' 'x86_64') _F_sourceforge_broken_up2date=1 Finclude sourceforge -sha1sums=('5f2614442091cbe791a43dd967885935749a3406') +sha1sums=('57146b146cf163a184f6470d7af1453dcb39a89a') # optimization OK From krics at linuxforum.hu Sat Jul 14 21:24:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 21:24:16 2007 Subject: [Frugalware-git] frugalware-current: gnucash-2.2.0-1-x86_64 Message-ID: <20070714192413.B60AE17680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0c227b502dd03df796f755739a88144088258b95 commit 0c227b502dd03df796f755739a88144088258b95 Author: Christian Hamar alias krix Date: Sat Jul 14 21:23:57 2007 +0200 gnucash-2.2.0-1-x86_64 * Version bump * Removed ! from i686 and x86_64 (this release compiles fine) diff --git a/source/gnome-extra/gnucash/FrugalBuild b/source/gnome-extra/gnucash/FrugalBuild index a35855e..c7014de 100644 --- a/source/gnome-extra/gnucash/FrugalBuild +++ b/source/gnome-extra/gnucash/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=gnucash -pkgver=2.0.5 +pkgver=2.2.0 pkgrel=1 pkgdesc="GnuCash is an application to keep track of your finances." url="http://www.gnucash.org/" depends=('yelp' 'libgnomeprintui' 'g-wrap' 'libofx' 'libgsf-gnome' \ - 'aqbanking>=2.2.4' 'slib>=3a3-2' 'gtkhtml' 'goffice' 'dbus-glib' \ + 'aqbanking>=2.3.2' 'slib>=3a3-2' 'gtkhtml' 'goffice' 'dbus-glib' \ 'libgnomeprint' 'libgnomeprintui') makedepends=('intltool' 'postgresql') groups=('gnome-extra') -archs=('!i686' '!x86_64') +archs=('i686' 'x86_64') license=('GPL-2') _F_gnome_schemas=('/etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas' \ '/etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas' \ @@ -31,9 +31,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet up2date=("lynx -dump http://www.gnucash.org/pub/gnucash/sources/stable/ | grep gnucash | grep -v gnucash-docs| Flasttar") -source=(http://www.gnucash.org/pub/gnucash/sources/stable/$pkgname-$pkgver.tar.gz \ - gnucash-2.0.5-gtk_html_print.diff) +source=(http://www.gnucash.org/pub/gnucash/sources/stable/$pkgname-$pkgver.tar.gz) -sha1sums=('d292c4f2a8e0362086b87c745f6f21ccc77481d3'\ - '9459acdf05fc7d37075178fedbdb87675d2275ed') +sha1sums=('5857b863a6f9b40c8280442ee69ca14a69289a3f') # optimization OK From krics at linuxforum.hu Sat Jul 14 21:43:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 21:43:55 2007 Subject: [Frugalware-git] frugalware-current: gnome-speech-0.4.15-1-x86_64 Message-ID: <20070714194350.EFEEB17680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=52dbeed81061280926dfe18e98c462a4b6447e92 commit 52dbeed81061280926dfe18e98c462a4b6447e92 Author: Christian Hamar alias krix Date: Sat Jul 14 21:43:30 2007 +0200 gnome-speech-0.4.15-1-x86_64 * Version bump diff --git a/source/gnome-extra/gnome-speech/FrugalBuild b/source/gnome-extra/gnome-speech/FrugalBuild index 117fd27..0a5e5ce 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.14 +pkgver=0.4.15 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=('c4838689500acebd9d2df54cc8e50c0a625a6fab') +sha1sums=('6d386e3c32a14ed31581b2126c228741399aa91b') # optimization OK From krics at linuxforum.hu Sat Jul 14 21:53:10 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 14 21:53:12 2007 Subject: [Frugalware-git] frugalware-current: evolution-exchange-2.10.3-1-x86_64 Message-ID: <20070714195310.1D22917680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7bedd3a9d79c077fe03604cd8d8437f561102f43 commit 7bedd3a9d79c077fe03604cd8d8437f561102f43 Author: Christian Hamar alias krix Date: Sat Jul 14 21:52:47 2007 +0200 evolution-exchange-2.10.3-1-x86_64 * Version bump diff --git a/source/gnome/evolution-exchange/FrugalBuild b/source/gnome/evolution-exchange/FrugalBuild index b925bd6..9148e21 100644 --- a/source/gnome/evolution-exchange/FrugalBuild +++ b/source/gnome/evolution-exchange/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix pkgname=evolution-exchange -pkgver=2.10.2 +pkgver=2.10.3 pkgrel=1 pkgdesc="Ximian Connector for Microsoft Exchange, which adds support for Microsoft Exchange 2000 and 2003 to Evolution." url="http://www.gnome.org/projects/evolution/" -depends=('gtkhtml>=3.14.2' 'evolution-data-server>=1.10.2' 'evolution>=1.10.2' 'libsoup>=2.2.100' \ - 'evolution-data-server-ldap>=1.10.2') +depends=('gtkhtml>=3.14.2' 'evolution-data-server>=1.10.3' 'evolution>=1.10.3' 'libsoup>=2.2.100' \ + 'evolution-data-server-ldap>=1.10.3') makedepends=('gtk-doc' 'perl-xml' 'openldap') groups=('gnome') archs=('i686' 'x86_64') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('5dcb8298f9fd19b022f36d4c88a5a7cec16e00d7') +sha1sums=('844e1aa1d67f45039f98f09679fb77b745cf0474') # optimization OK From priyank at frugalware.org Sat Jul 14 21:55:22 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 14 21:55:23 2007 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.7.1-1-i686 Message-ID: <20070714195522.356E317680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2ef48723516948b56eb8a72b3436c5d15ab4e694 commit 2ef48723516948b56eb8a72b3436c5d15ab4e694 Author: Priyank Date: Sun Jul 15 01:19:56 2007 +0530 asterisk-1.4.7.1-1-i686 * Version bump diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index eca2cd3..7bc1127 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -1,23 +1,23 @@ -# Compiling Time: 1.02 SBU +# Compiling Time: 0.61 SBU # Maintainer: Priyank Gosalia # Contributor: Balint Kovacs pkgname=asterisk -pkgver=1.4.5 +pkgver=1.4.7.1 pkgrel=1 pkgdesc="Open Source Private Branch Exchange (PBX)." url="http://asterisk.org/" backup=(etc/asterisk/*) makedepends=('bison' 'make') depends=('asterisk-sounds' 'curl>=7.16.0' 'glibc' 'libidn' 'ncurses' 'newt' 'popt' \ - 'libpqxx' 'libpri' 'speex' 'sqlite2' 'openssl' 'unixodbc' 'zlib' \ + 'libpqxx' 'libpri>=1.4.1' 'speex' 'sqlite2' 'openssl' 'unixodbc' 'zlib' \ 'mpg321' 'sudo') groups=('apps-extra') archs=('i686') up2date="lynx -dump http://ftp.digium.com/pub/asterisk/|grep asterisk-[0-9\.]*tar.gz$|Flasttar" source=(http://ftp.digium.com/pub/$pkgname/$pkgname-$pkgver.tar.gz \ rc.asterisk) -sha1sums=('e60389aa7b421d56a8ed9e986ae4ad80bb822e01'\ +sha1sums=('7fa1ab65a92b91c45334fe7930730d4207c83a6c' \ '1c18155cdece83d556e2295b54508636ff74f307') build() From vmiklos at frugalware.org Sat Jul 14 23:49:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 14 23:49:13 2007 Subject: [Frugalware-git] homepage-ng: /rss/bugs: fix wrapper Message-ID: <20070714214910.E3A8B17680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=277de5c553078c72d7b027b0997a853cacd89062 commit 277de5c553078c72d7b027b0997a853cacd89062 Author: VMiklos Date: Sat Jul 14 23:48:25 2007 +0200 /rss/bugs: fix wrapper diff --git a/frugalware/rss.php b/frugalware/rss.php index 1e2bf02..e9d220a 100644 --- a/frugalware/rss.php +++ b/frugalware/rss.php @@ -159,7 +159,7 @@ switch($_GET['type']) die(); case "bugs": header('Content-Type: application/xml; charset=utf-8'); - print(str_replace("?do=details&task_id=", "", file_get_contents("http://bugs.frugalware.org/feed.php?feed_type=rss2&project=0"))); + print(str_replace("index.php?do=details&task_id=", "", file_get_contents("http://bugs.frugalware.org/feed.php?feed_type=rss2&project=0"))); die(); case "blogs": header('Content-Type: application/xml; charset=utf-8'); From iron at frugalware.org Sat Jul 14 23:54:23 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jul 14 23:54:25 2007 Subject: [Frugalware-git] homepage-ng: /rss/releases: corrected link tag url Message-ID: <20070714215423.5C36517680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=43e87f8b87968d54470863d149e15c5e1295213f commit 43e87f8b87968d54470863d149e15c5e1295213f Author: Krisztian VASAS Date: Sat Jul 14 23:53:59 2007 +0200 /rss/releases: corrected link tag url diff --git a/frugalware/rss.php b/frugalware/rss.php index e9d220a..6e67ea8 100644 --- a/frugalware/rss.php +++ b/frugalware/rss.php @@ -54,7 +54,7 @@ switch($_GET['type']) $handle['items'][] = array( "title" => 'frugalware-' . $releases[$i]->version[0]->tagData, - "link" => 'http://www2.frugalware.org/news/' . $releases[$i]->newsid[0]->tagData, + "link" => 'http://www.frugalware.org/news/' . $releases[$i]->newsid[0]->tagData, "desc" => '', "pubDate" => date(DATE_RFC2822, strtotime($releases[$i]->date[0]->tagData)), ); From vmiklos at frugalware.org Sun Jul 15 00:30:06 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 00:30:09 2007 Subject: [Frugalware-git] homepage-ng: new git repo: setup Message-ID: <20070714223006.424DE17680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=7aa31a08e3ae5e03c0b645ab558c88593921acaa commit 7aa31a08e3ae5e03c0b645ab558c88593921acaa Author: VMiklos Date: Sun Jul 15 00:29:20 2007 +0200 new git repo: setup diff --git a/git/repos/setup b/git/repos/setup new file mode 120000 index 0000000..a08c291 --- /dev/null +++ b/git/repos/setup @@ -0,0 +1 @@ +../../../setup/setup \ No newline at end of file From krics at linuxforum.hu Sun Jul 15 00:46:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jul 15 00:46:19 2007 Subject: [Frugalware-git] frugalware-current: cairomm-1.4.2-1-x86_64 Message-ID: <20070714224612.1ECB117680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b4922e61387824b74000ad6ce4e8344e153d7d88 commit b4922e61387824b74000ad6ce4e8344e153d7d88 Author: Christian Hamar alias krix Date: Sun Jul 15 00:45:53 2007 +0200 cairomm-1.4.2-1-x86_64 * Version bump . :.. diff --git a/source/xlib/cairomm/FrugalBuild b/source/xlib/cairomm/FrugalBuild index 41e334d..e4e1bbe 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.0 +pkgver=1.4.2 pkgrel=1 pkgdesc="C++ bindings for cairo" url="http://cairographics.org" @@ -14,4 +14,4 @@ up2date="lynx -dump $url/releases/ |grep ]LATEST-cairomm|sed 's/.*mm-\([^ ]*\) . source=($url/releases/$pkgname-$pkgver.tar.gz) # optimization OK -sha1sums=('289e8397621c44db81bea67c0b4f40dcbd00769f') +sha1sums=('35fe91777ded82332f731a4d933c9f3eeb575707') From krics at linuxforum.hu Sun Jul 15 00:57:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jul 15 00:57:02 2007 Subject: [Frugalware-git] frugalware-current: gtkmm-2.10.10-3-x86_64 Message-ID: <20070714225700.EB34117680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=30e87783d162f1b9a1c50f435b4e21a9ab4de0cd commit 30e87783d162f1b9a1c50f435b4e21a9ab4de0cd Author: Christian Hamar alias krix Date: Sun Jul 15 00:56:46 2007 +0200 gtkmm-2.10.10-3-x86_64 * Release bump 'cause of cairomm :P diff --git a/source/gnome/gtkmm/FrugalBuild b/source/gnome/gtkmm/FrugalBuild index 95b8154..3e8a82d 100644 --- a/source/gnome/gtkmm/FrugalBuild +++ b/source/gnome/gtkmm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=gtkmm pkgver=2.10.10 -pkgrel=2 +pkgrel=3 pkgdesc="C++ interface for GTK+2" url="http://www.gnome.org/" -depends=('glibmm>=2.13.1' 'gtk+2' 'cairomm>=1.4.0') +depends=('glibmm>=2.13.1' 'gtk+2' 'cairomm>=1.4.2') groups=('gnome') archs=('i686' 'x86_64') Finclude gnome From vmiklos at frugalware.org Sun Jul 15 01:03:04 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 01:03:07 2007 Subject: [Frugalware-git] setup: update prepare, dist and release targets for git Message-ID: <20070714230304.8588C17680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=0909947134e91570870579b9379149b3ecfcae74 commit 0909947134e91570870579b9379149b3ecfcae74 Author: VMiklos Date: Sun Jul 15 01:02:18 2007 +0200 update prepare, dist and release targets for git diff --git a/Makefile b/Makefile index dbc7ed0..de055de 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,6 @@ compile: check ccache $(packages) misc prepare: rm -rf config.mak - chmod 755 configure make -C po pos clean: @@ -101,9 +100,14 @@ distclean: clean rm -rf config.mak dist: - darcs changes >_darcs/$(DIR)/ChangeLog - darcs dist -d fwsetup-$(VERSION) - rm _darcs/$(DIR)/ChangeLog + git-archive --format=tar --prefix=fwsetup-$(VERSION)/ HEAD > fwsetup-$(VERSION).tar + mkdir -p fwsetup-$(VERSION)/po + make -C po pos + mv po/*.{gm,p}o fwsetup-$(VERSION)/po + git log --no-merges |git name-rev --tags --stdin > fwsetup-$(VERSION)/Changelog + tar rf fwsetup-$(VERSION).tar fwsetup-$(VERSION)/po/*.{gm,p}o + rm -rf fwsetup-$(VERSION) + gzip -f -9 fwsetup-$(VERSION).tar ifeq ($(GPG),true) gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" -ba -u 20F55619 fwsetup-$(VERSION).tar.gz mv fwsetup-$(VERSION).tar.gz.asc ../releases @@ -111,7 +115,7 @@ ifeq ($(GPG),true) endif release: - darcs tag --checkpoint $(VERSION) + tag tag $(VERSION) $(MAKE) dist ccache: From krics at linuxforum.hu Sun Jul 15 01:03:30 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jul 15 01:03:31 2007 Subject: [Frugalware-git] frugalware-current: libglademm-2.6.4-3-x86_64 Message-ID: <20070714230330.534F117680E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b14c142675364a433b5d20c743f2d6274a6b06e0 commit b14c142675364a433b5d20c743f2d6274a6b06e0 Author: Christian Hamar alias krix Date: Sun Jul 15 01:03:15 2007 +0200 libglademm-2.6.4-3-x86_64 * Release bump due cairomm diff --git a/source/gnome-extra/libglademm/FrugalBuild b/source/gnome-extra/libglademm/FrugalBuild index 2dfae8c..48bfe45 100644 --- a/source/gnome-extra/libglademm/FrugalBuild +++ b/source/gnome-extra/libglademm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libglademm pkgver=2.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="C++ interface for Libglade" url="http://www.gnome.org/" -depends=('gtkmm' 'libglade' 'cairomm=1.4.0') +depends=('gtkmm>=2.10.10-3' 'libglade' 'cairomm=1.4.2') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome From janny at frugalware.org Sun Jul 15 09:31:33 2007 From: janny at frugalware.org (janny) Date: Sun Jul 15 09:31:38 2007 Subject: [Frugalware-git] frugalware-current: kernel-fwlive-2.6.22-1-i686 Message-ID: <20070715073133.C7E83176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d92a699110a3deba14b79ff45be65f759bf12295 commit d92a699110a3deba14b79ff45be65f759bf12295 Author: janny Date: Sun Jul 15 09:31:00 2007 +0200 kernel-fwlive-2.6.22-1-i686 version bump diff --git a/source/base-extra/kernel-fwlive/FrugalBuild b/source/base-extra/kernel-fwlive/FrugalBuild index 16ff8ea..4ecf16d 100644 --- a/source/base-extra/kernel-fwlive/FrugalBuild +++ b/source/base-extra/kernel-fwlive/FrugalBuild @@ -1,13 +1,18 @@ # Compiling Time: 11.74 SBU # Maintainer: Janny -pkgver=2.6.21 +pkgver=2.6.22 _F_kernel_stable=1 pkgrel=1 _F_kernel_name="-fwlive" _F_kernel_uname="-fw$pkgrel" -_F_kernel_patches=(http://ftp.frugalware.org/pub/other/sources/kernel/linux-2.6.21-squashfs3.2-patch.bz2 \ - ksize.patch lhash.patch sqlzma2k-3.2-r2.patch) +_F_kernel_patches=(http://frugalware.org/~janny/patchs/kernel/$pkgver/aacraid.diff \ + http://frugalware.org/~janny/patchs/kernel/$pkgver/pxa27x.diff \ + http://frugalware.org/~janny/patchs/kernel/$pkgver/jbd.diff \ + http://frugalware.org/~janny/patchs/kernel/$pkgver/squashfs3.2-patch \ + http://frugalware.org/~janny/patchs/kernel/$pkgver/ksize.patch \ + http://frugalware.org/~janny/patchs/kernel/$pkgver/lhash.diff \ + http://frugalware.org/~janny/patchs/kernel/$pkgver/sqlzma2k-3.2-r2.patch) Finclude kernel source=(config ${source[@]}) signatures=('' "${signatures[@]}") diff --git a/source/base-extra/kernel-fwlive/config b/source/base-extra/kernel-fwlive/config index 6a264cc..e549bb6 100644 --- a/source/base-extra/kernel-fwlive/config +++ b/source/base-extra/kernel-fwlive/config @@ -3,11 +3,15 @@ # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y +CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y @@ -31,6 +35,7 @@ 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 is not set @@ -41,8 +46,9 @@ CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_CPUSETS=y -CONFIG_SYSFS_DEPRECATED=y -# CONFIG_RELAY is not set +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y @@ -82,7 +88,7 @@ CONFIG_STOP_MACHINE=y # CONFIG_BLOCK=y CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_BLK_DEV_IO_TRACE=y CONFIG_LSF=y # @@ -92,15 +98,18 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_DEFAULT_IOSCHED="cfq" # # Processor type and features # +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set @@ -137,7 +146,6 @@ CONFIG_M486=y # CONFIG_MVIAC3_2 is not set CONFIG_X86_GENERIC=y CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set @@ -198,6 +206,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -235,19 +244,21 @@ CONFIG_SUSPEND_SMP=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_SLEEP_PROC_FS=y -# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set +CONFIG_ACPI_SLEEP_PROC_SLEEP=y +CONFIG_ACPI_PROCFS=y CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_HOTKEY=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_IBM_BAY=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set @@ -305,6 +316,7 @@ CONFIG_X86_P4_CLOCKMOD=m CONFIG_X86_CPUFREQ_NFORCE2=m CONFIG_X86_LONGRUN=m CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m # # shared options @@ -340,8 +352,7 @@ CONFIG_EISA_NAMES=y CONFIG_MCA=y CONFIG_MCA_LEGACY=y CONFIG_MCA_PROC_FS=y -CONFIG_SCx200=m -CONFIG_SCx200HR_TIMER=m +# CONFIG_SCx200 is not set CONFIG_K8_NB=y # @@ -382,7 +393,6 @@ CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m -# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set # # Executable file formats @@ -406,7 +416,9 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=y # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -417,7 +429,10 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y @@ -459,36 +474,7 @@ CONFIG_DEFAULT_TCP_CONG="bic" # # IP: Virtual Server Configuration # -CONFIG_IP_VS=m -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m +# CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y @@ -535,6 +521,7 @@ CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m @@ -547,6 +534,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m @@ -591,7 +579,6 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -630,6 +617,7 @@ CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_LOG=m @@ -984,7 +972,6 @@ CONFIG_MTD_SC520CDP=m CONFIG_MTD_NETSC520=m CONFIG_MTD_TS5500=m CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_AMD76XROM=m CONFIG_MTD_ICHXROM=m CONFIG_MTD_ESB2ROM=m @@ -1066,7 +1053,8 @@ CONFIG_PNP=y # Protocols # CONFIG_ISAPNP=y -# CONFIG_PNPBIOS is not set +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y CONFIG_PNPACPI=y # @@ -1075,7 +1063,6 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_XD=m CONFIG_PARIDE=m -CONFIG_PARIDE_PARPORT=m # # Parallel IDE high-level drivers @@ -1120,7 +1107,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_WCACHE=y @@ -1133,7 +1119,9 @@ CONFIG_IBM_ASM=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m +CONFIG_ASUS_LAPTOP=m CONFIG_MSI_LAPTOP=m +CONFIG_SONY_LAPTOP=m # # ATA/ATAPI/MFM/RLL support @@ -1149,10 +1137,12 @@ CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_BLK_DEV_IDEACPI is not set # CONFIG_IDE_TASK_IOCTL is not set # @@ -1170,7 +1160,6 @@ CONFIG_BLK_DEV_OPTI621=y CONFIG_BLK_DEV_RZ1000=y CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set CONFIG_BLK_DEV_AEC62XX=y CONFIG_BLK_DEV_ALI15X3=y @@ -1189,7 +1178,8 @@ CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_JMICRON=y CONFIG_BLK_DEV_SC1200=y CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IT821X=m +CONFIG_BLK_DEV_IT8213=y +CONFIG_BLK_DEV_IT821X=y CONFIG_BLK_DEV_NS87415=m CONFIG_BLK_DEV_PDC202XX_OLD=y CONFIG_PDC202XX_BURST=y @@ -1200,6 +1190,7 @@ CONFIG_BLK_DEV_SIS5513=y CONFIG_BLK_DEV_SLC90E66=y CONFIG_BLK_DEV_TRM290=y CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_TC86C001=y # CONFIG_IDE_ARM is not set CONFIG_IDE_CHIPSETS=y @@ -1214,7 +1205,6 @@ CONFIG_BLK_DEV_QD65XX=m CONFIG_BLK_DEV_UMC8672=m CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y # CONFIG_BLK_DEV_HD is not set # @@ -1241,9 +1231,9 @@ CONFIG_CHR_DEV_SCH=m # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set # # SCSI Transports @@ -1320,7 +1310,7 @@ CONFIG_SCSI_IMM=m # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_NCR53C406A=m CONFIG_SCSI_NCR_D700=m -CONFIG_SCSI_STEX=m +CONFIG_SCSI_STEX=y CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 @@ -1374,7 +1364,7 @@ CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=y -# CONFIG_SATA_MV is not set +CONFIG_SATA_MV=m CONFIG_SATA_NV=y CONFIG_PDC_ADMA=m CONFIG_SATA_QSTOR=m @@ -1386,7 +1376,9 @@ CONFIG_SATA_SIS=y CONFIG_SATA_ULI=y CONFIG_SATA_VIA=y CONFIG_SATA_VITESSE=y +CONFIG_SATA_INIC162X=m CONFIG_SATA_INTEL_COMBINED=y +CONFIG_SATA_ACPI=y CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m CONFIG_PATA_ARTOP=m @@ -1395,15 +1387,16 @@ CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m CONFIG_PATA_CS5535=m -# CONFIG_PATA_CYPRESS is not set +CONFIG_PATA_CYPRESS=m CONFIG_PATA_EFAR=m CONFIG_ATA_GENERIC=m CONFIG_PATA_HPT366=m -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m CONFIG_PATA_HPT3X3=m -# CONFIG_PATA_ISAPNP is not set +CONFIG_PATA_ISAPNP=m CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m CONFIG_PATA_JMICRON=y CONFIG_PATA_LEGACY=m CONFIG_PATA_TRIFLEX=m @@ -1412,18 +1405,18 @@ CONFIG_PATA_MPIIX=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_NETCELL=m CONFIG_PATA_NS87410=m -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_OPTIDMA is not set +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m CONFIG_PATA_PCMCIA=m -# CONFIG_PATA_PDC_OLD is not set +CONFIG_PATA_PDC_OLD=m CONFIG_PATA_QDI=m -# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RADISYS=m CONFIG_PATA_RZ1000=m CONFIG_PATA_SC1200=m CONFIG_PATA_SERVERWORKS=m CONFIG_PATA_PDC2027X=m CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m +CONFIG_PATA_SIS=y CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m CONFIG_PATA_WINBOND_VLB=m @@ -1481,10 +1474,8 @@ CONFIG_IEEE1394=y # Subsystem Options # # CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_OUI_DB is not set CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -# CONFIG_IEEE1394_EXPORT_FULL_API is not set # # Device Drivers @@ -1516,6 +1507,11 @@ CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m # +# Macintosh device drivers +# +# CONFIG_MAC_EMUMOUSEBTN is not set + +# # Network device support # CONFIG_NETDEVICES=y @@ -1658,6 +1654,7 @@ CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y # CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m @@ -1686,6 +1683,7 @@ CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m +CONFIG_ATL1=m # # Ethernet (10000 Mbit) @@ -1693,6 +1691,7 @@ CONFIG_QLA3XXX=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m @@ -1830,6 +1829,7 @@ CONFIG_PC300_MLPPP=y # # Refer to the file README.mlppp, provided by PC300 package. # +CONFIG_PC300TOO=m CONFIG_N2=m CONFIG_C101=m CONFIG_FARSYNC=m @@ -1837,7 +1837,6 @@ CONFIG_DSCC4=m # CONFIG_DSCC4_PCISYNC is not set # CONFIG_DSCC4_PCI_RST is not set CONFIG_DLCI=m -CONFIG_DLCI_COUNT=24 CONFIG_DLCI_MAX=8 CONFIG_SDLA=m CONFIG_WAN_ROUTER_DRIVERS=m @@ -1879,6 +1878,7 @@ CONFIG_ATM_HE=m # CONFIG_ATM_HE_USE_SUNI is not set CONFIG_FDDI=y CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set CONFIG_SKFP=m CONFIG_HIPPI=y CONFIG_ROADRUNNER=m @@ -1922,6 +1922,7 @@ CONFIG_ISDN=m # CONFIG_ISDN_CAPI=m CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +# CONFIG_CAPI_TRACE is not set CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y @@ -2038,6 +2039,7 @@ CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_UINPUT=m # @@ -2156,7 +2158,6 @@ CONFIG_I8XX_TCO=m CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m CONFIG_PC87413_WDT=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m @@ -2229,7 +2230,6 @@ CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m CONFIG_CS5535_GPIO=m @@ -2281,9 +2281,6 @@ CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m -CONFIG_SCx200_I2C=m -CONFIG_SCx200_I2C_SCL=12 -CONFIG_SCx200_I2C_SDA=13 CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m @@ -2324,6 +2321,7 @@ CONFIG_SPI_BITBANG=m # # SPI Protocol Masters # +CONFIG_SPI_AT25=m # # Dallas's 1-wire bus @@ -2355,6 +2353,7 @@ CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_K8TEMP=m @@ -2399,6 +2398,11 @@ CONFIG_SENSORS_HDAPS=m # CONFIG_HWMON_DEBUG_CHIP is not set # +# Multifunction device drivers +# +CONFIG_MFD_SM501=m + +# # Multimedia devices # CONFIG_VIDEO_DEV=m @@ -2549,6 +2553,9 @@ CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_USB_DIB0700=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_VP7045=m CONFIG_DVB_USB_VP702X=m @@ -2638,6 +2645,7 @@ CONFIG_DVB_LGDT330X=m # CONFIG_DVB_PLL=m CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUNER_QT1010=m CONFIG_DVB_TUNER_MT2060=m CONFIG_DVB_TUNER_LGH06XF=m @@ -2649,7 +2657,6 @@ CONFIG_DVB_ISL6421=m CONFIG_DVB_TUA6100=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_VIDEOBUF=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m CONFIG_VIDEO_BUF_DVB=m @@ -2661,16 +2668,25 @@ CONFIG_USB_DABUSB=m # # Graphics support # -# CONFIG_FIRMWARE_EDID is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_BACKLIGHT_PROGEAR=m CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_DDC=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set -# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set @@ -2698,11 +2714,15 @@ CONFIG_FB_MATROX_MAVEN=m CONFIG_FB_MATROX_MULTIHEAD=y CONFIG_FB_RADEON=m CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y # CONFIG_FB_RADEON_DEBUG is not set CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m # CONFIG_FB_ATY_CT is not set # CONFIG_FB_ATY_GX is not set +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m # CONFIG_FB_SAVAGE is not set CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y @@ -2714,6 +2734,7 @@ CONFIG_FB_SIS_315=y # CONFIG_FB_CYBLA is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_GEODE is not set +CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set # @@ -2742,11 +2763,6 @@ CONFIG_FONT_8x16=y # Logo configuration # # CONFIG_LOGO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=m -CONFIG_BACKLIGHT_DEVICE=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y # # Sound @@ -2790,6 +2806,7 @@ CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m # # ISA devices @@ -2892,7 +2909,7 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_AC97_POWER_SAVE=y # # USB devices @@ -2907,6 +2924,11 @@ CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# # Open Sound System # # CONFIG_SOUND_PRIME is not set @@ -2916,6 +2938,7 @@ CONFIG_AC97_BUS=m # HID Devices # CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # # USB support @@ -2930,7 +2953,6 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set @@ -2942,9 +2964,11 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_ISP116X_HCD=m CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_BIG_ENDIAN is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m @@ -2975,7 +2999,7 @@ CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_ALAUDA=y -# CONFIG_USB_STORAGE_KARMA is not set +CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_LIBUSUAL is not set # @@ -2986,8 +3010,9 @@ CONFIG_USB_HID=y CONFIG_HID_FF=y CONFIG_HID_PID=y CONFIG_LOGITECH_FF=y +CONFIG_PANTHERLORD_FF=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_ZEROPLUS_FF is not set +CONFIG_ZEROPLUS_FF=y CONFIG_USB_HIDDEV=y CONFIG_USB_AIPTEK=m CONFIG_USB_WACOM=m @@ -3008,6 +3033,7 @@ CONFIG_USB_ATI_REMOTE=m CONFIG_USB_ATI_REMOTE2=m CONFIG_USB_KEYSPAN_REMOTE=m CONFIG_USB_APPLETOUCH=m +CONFIG_USB_GTCO=m # # USB Imaging devices @@ -3026,6 +3052,7 @@ CONFIG_USB_USBNET_MII=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -3037,6 +3064,7 @@ CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y # CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_MON is not set @@ -3111,6 +3139,7 @@ CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m @@ -3125,6 +3154,7 @@ CONFIG_USB_SISUSBVGA=m # CONFIG_USB_SISUSBVGA_CON is not set CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m # @@ -3179,8 +3209,6 @@ CONFIG_LEDS_CLASS=m # # LED drivers # -CONFIG_LEDS_NET48XX=m -CONFIG_LEDS_WRAP=m # # LED Triggers @@ -3201,7 +3229,10 @@ CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_SRP=m @@ -3237,11 +3268,12 @@ CONFIG_RTC_CLASS=m CONFIG_RTC_INTF_SYSFS=m CONFIG_RTC_INTF_PROC=m CONFIG_RTC_INTF_DEV=m -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +CONFIG_RTC_INTF_DEV_UIE_EMUL=y # # RTC drivers # +CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1553=m @@ -3249,7 +3281,6 @@ CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_M48T86=m @@ -3273,6 +3304,15 @@ CONFIG_NET_DMA=y CONFIG_INTEL_IOATDMA=m # +# Auxiliary Display support +# +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 + +# # Virtualization # CONFIG_KVM=m @@ -3341,7 +3381,6 @@ CONFIG_FUSE_FS=m CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=m CONFIG_UDF_FS=m CONFIG_UDF_NLS=y @@ -3537,7 +3576,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set CONFIG_UNUSED_SYMBOLS=y -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=15 @@ -3580,8 +3619,10 @@ CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m @@ -3598,6 +3639,7 @@ CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m # @@ -3619,12 +3661,14 @@ CONFIG_LIBCRC32C=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y diff --git a/source/base-extra/kernel-fwlive/ksize.patch b/source/base-extra/kernel-fwlive/ksize.patch deleted file mode 100644 index 2b92800..0000000 --- a/source/base-extra/kernel-fwlive/ksize.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- mm/slab.c 9 Apr 2006 01:09:51 -0000 1.1 -+++ mm/slab.c 9 Apr 2006 01:10:33 -0000 1.2 -@@ -3861,3 +3861,4 @@ unsigned int ksize(const void *objp) - - return obj_size(virt_to_cache(objp)); - } -+EXPORT_SYMBOL(ksize); diff --git a/source/base-extra/kernel-fwlive/lhash.patch b/source/base-extra/kernel-fwlive/lhash.patch deleted file mode 100644 index ddcd872..0000000 --- a/source/base-extra/kernel-fwlive/lhash.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: fs/namei.c -=================================================================== -RCS file: linux-2.6.19/fs/namei.c,v -retrieving revision 1.1 -retrieving revision 1.3 -diff -u -p -r1.1 -r1.3 ---- fs/namei.c 1 Dec 2006 11:38:24 -0000 1.1 -+++ fs/namei.c 8 Dec 2006 07:47:33 -0000 1.3 -@@ -1251,7 +1251,7 @@ int __user_path_lookup_open(const char _ - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, struct nameidata *nd) -+struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, struct nameidata *nd) - { - struct dentry * dentry; - struct inode *inode; -@@ -2761,6 +2761,7 @@ EXPORT_SYMBOL(follow_up); - EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ - EXPORT_SYMBOL(getname); - EXPORT_SYMBOL(lock_rename); -+EXPORT_SYMBOL(__lookup_hash); - EXPORT_SYMBOL(lookup_one_len); - EXPORT_SYMBOL(page_follow_link_light); - EXPORT_SYMBOL(page_put_link); -Index: include/linux/namei.h -=================================================================== -RCS file: linux-2.6.19/include/linux/namei.h,v -retrieving revision 1.1 -retrieving revision 1.3 -diff -u -p -r1.1 -r1.3 ---- include/linux/namei.h 1 Dec 2006 11:38:24 -0000 1.1 -+++ include/linux/namei.h 8 Dec 2006 07:47:33 -0000 1.3 -@@ -76,6 +76,7 @@ extern struct file *lookup_instantiate_f - extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); - extern void release_open_intent(struct nameidata *); - -+struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, struct nameidata *nd); - extern struct dentry * lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down(struct vfsmount **, struct dentry **); diff --git a/source/base-extra/kernel-fwlive/sqlzma2k-3.2-r2.patch b/source/base-extra/kernel-fwlive/sqlzma2k-3.2-r2.patch deleted file mode 100644 index 9754202..0000000 --- a/source/base-extra/kernel-fwlive/sqlzma2k-3.2-r2.patch +++ /dev/null @@ -1,533 +0,0 @@ -Index: linux-2.6.20/fs/squashfs/inode.c -=================================================================== -RCS file: linux-2.6.20/fs/squashfs/inode.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.20/fs/squashfs/inode.c 16 Jan 2007 03:30:24 -0000 1.1 -+++ linux-2.6.20/fs/squashfs/inode.c 16 Jan 2007 05:08:17 -0000 1.2 -@@ -33,6 +33,25 @@ - #include - - #include "squashfs.h" -+#include "sqlzma.h" -+#include "sqmagic.h" -+ -+#define KeepPreemptive -+#undef KeepPreemptive -+struct sqlzma { -+#ifdef KeepPreemptive -+ struct mutex mtx; -+#endif -+ unsigned char read_data[SQUASHFS_FILE_MAX_SIZE]; -+ struct sqlzma_un un; -+}; -+static DEFINE_PER_CPU(struct sqlzma *, sqlzma); -+ -+#define dpri(fmt, args...) /* printk("%s:%d: " fmt, __func__, __LINE__, ##args) */ -+#define dpri_un(un) dpri("un{%d, {%d %p}, {%d %p}, {%d %p}}\n", \ -+ (un)->un_lzma, (un)->un_a[0].sz, (un)->un_a[0].buf, \ -+ (un)->un_a[1].sz, (un)->un_a[1].buf, \ -+ (un)->un_a[2].sz, (un)->un_a[2].buf) - - static void vfs_read_inode(struct inode *i); - static struct dentry *squashfs_get_parent(struct dentry *child); -@@ -238,66 +257,74 @@ SQSH_EXTERN unsigned int squashfs_read_d - } - - if (compressed) { -- int zlib_err = 0; -+ int zlib_err = Z_STREAM_END; -+ int rest, start; -+ enum {Src, Dst}; -+ struct sized_buf sbuf[2]; -+ struct sqlzma *percpu; - - /* - * uncompress block - */ -- -- mutex_lock(&msblk->read_data_mutex); -- -- msblk->stream.next_out = buffer; -- msblk->stream.avail_out = srclength; -- -- for (bytes = 0; k < b; k++) { -- avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ? -- msblk->devblksize - offset : -- c_byte - bytes; -+ for (k = 0; k < b; k++) { - wait_on_buffer(bh[k]); - if (!buffer_uptodate(bh[k])) -- goto release_mutex; -- -- msblk->stream.next_in = bh[k]->b_data + offset; -- msblk->stream.avail_in = avail_bytes; -- -- if (k == 0) { -- zlib_err = zlib_inflateInit(&msblk->stream); -- if (zlib_err != Z_OK) { -- ERROR("zlib_inflateInit returned unexpected result 0x%x, srclength %d\n", -- zlib_err, srclength); -- goto release_mutex; -- } -- -- if (avail_bytes == 0) { -- offset = 0; -- brelse(bh[k]); -- continue; -- } -- } -- -- zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH); -- if (zlib_err != Z_OK && zlib_err != Z_STREAM_END) { -- ERROR("zlib_inflate returned unexpected result 0x%x, srclength %d, avail_in %d, avail_out %d\n", -- zlib_err, srclength, msblk->stream.avail_in, msblk->stream.avail_out); -- goto release_mutex; -- } -+ goto block_release; -+ } - -- bytes += avail_bytes; -+ avail_bytes = 0; -+ for (k = 0; !avail_bytes && k < b; k++) { -+ avail_bytes = msblk->devblksize - offset; -+ if (c_byte < avail_bytes) -+ avail_bytes = c_byte; -+ if (avail_bytes) -+ break; - offset = 0; - brelse(bh[k]); - } -+ bytes = 0; -+ if (!avail_bytes) -+ goto block_release; // nothing to be process - -- if (zlib_err != Z_STREAM_END) -- goto release_mutex; -- -- zlib_err = zlib_inflateEnd(&msblk->stream); -- if (zlib_err != Z_OK) { -- ERROR("zlib_inflateEnd returned unexpected result 0x%x, srclength %d\n", -- zlib_err, srclength); -+ start = k; -+ /* it disables preemption */ -+ percpu = get_cpu_var(sqlzma); -+#ifdef KeepPreemptive -+ put_cpu_var(sqlzma); -+ mutex_lock(&percpu->mtx); -+#endif -+ -+ for (; k < b; k++) { -+ memcpy(percpu->read_data + bytes, bh[k]->b_data + offset, -+ avail_bytes); -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ avail_bytes = msblk->devblksize - offset; -+ rest = c_byte - bytes; -+ if (rest < avail_bytes) -+ avail_bytes = rest; -+ } -+ -+ sbuf[Src].buf = percpu->read_data; -+ sbuf[Src].sz = bytes; -+ sbuf[Dst].buf = buffer; -+ sbuf[Dst].sz = srclength; -+ dpri_un(&percpu->un); -+ dpri("src %d %p, dst %d %p\n", sbuf[Src].sz, sbuf[Src].buf, -+ sbuf[Dst].sz, sbuf[Dst].buf); -+ zlib_err = sqlzma_un(&percpu->un, sbuf + Src, sbuf + Dst); -+ bytes = percpu->un.un_reslen; -+ -+#ifdef KeepPreemptive -+ mutex_unlock(&percpu->mtx); -+#else -+ put_cpu_var(sqlzma); -+#endif -+ if (unlikely(zlib_err)) { -+ dpri("zlib_err %d\n", zlib_err); - goto release_mutex; - } -- bytes = msblk->stream.total_out; -- mutex_unlock(&msblk->read_data_mutex); - } else { - int i; - -@@ -325,7 +352,7 @@ SQSH_EXTERN unsigned int squashfs_read_d - return bytes; - - release_mutex: -- mutex_unlock(&msblk->read_data_mutex); -+ //mutex_unlock(&msblk->read_data_mutex); - - block_release: - for (; k < b; k++) -@@ -1106,29 +1133,28 @@ static int squashfs_fill_super(struct su - { - struct squashfs_sb_info *msblk; - struct squashfs_super_block *sblk; -- int i; -+ int i, err; - char b[BDEVNAME_SIZE]; - struct inode *root; -+ void *label; - - TRACE("Entered squashfs_read_superblock\n"); - -+ err = -ENOMEM; - if (!(s->s_fs_info = kmalloc(sizeof(struct squashfs_sb_info), - GFP_KERNEL))) { - ERROR("Failed to allocate superblock\n"); - goto failure; - } -+ label = &&out_fsinfo; - memset(s->s_fs_info, 0, sizeof(struct squashfs_sb_info)); - msblk = s->s_fs_info; -- if (!(msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize()))) { -- ERROR("Failed to allocate zlib workspace\n"); -- goto failure; -- } - sblk = &msblk->sblk; - - msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE); - msblk->devblksize_log2 = ffz(~msblk->devblksize); - -- mutex_init(&msblk->read_data_mutex); -+ //mutex_init(&msblk->read_data_mutex); - mutex_init(&msblk->read_page_mutex); - mutex_init(&msblk->block_cache_mutex); - mutex_init(&msblk->fragment_mutex); -@@ -1137,45 +1163,60 @@ static int squashfs_fill_super(struct su - init_waitqueue_head(&msblk->waitq); - init_waitqueue_head(&msblk->fragment_wait_queue); - -+ err = -EINVAL; - sblk->bytes_used = sizeof(struct squashfs_super_block); - if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START, - sizeof(struct squashfs_super_block) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, sizeof(struct squashfs_super_block))) { - SERROR("unable to read superblock\n"); -- goto failed_mount; -+ goto *label; - } - - /* Check it is a SQUASHFS superblock */ -+ s->s_magic = sblk->s_magic; - msblk->swap = 0; -- if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) { -- if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) { -- struct squashfs_super_block ssblk; -- -- WARNING("Mounting a different endian SQUASHFS " -- "filesystem on %s\n", bdevname(s->s_bdev, b)); -- -- SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -- memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -- msblk->swap = 1; -- } else { -- SERROR("Can't find a SQUASHFS superblock on %s\n", -- bdevname(s->s_bdev, b)); -- goto failed_mount; -- } -+ dpri("magic 0x%x\n", sblk->s_magic); -+ switch (sblk->s_magic) { -+ struct squashfs_super_block ssblk; -+ -+ case SQUASHFS_MAGIC_SWAP: -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC_LZMA_SWAP: -+ WARNING("Mounting a different endian SQUASHFS " -+ "filesystem on %s\n", bdevname(s->s_bdev, b)); -+ -+ SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -+ memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -+ msblk->swap = 1; -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC: -+ case SQUASHFS_MAGIC_LZMA: -+ break; -+ default: -+ SERROR("Can't find a SQUASHFS superblock on %s\n", -+ bdevname(s->s_bdev, b)); -+ goto *label; -+ } -+ -+ { -+ struct sqlzma *p; -+ dpri("block_size %d\n", sblk->block_size); -+ BUG_ON(sblk->block_size > sizeof(p->read_data)); - } - - /* Check the MAJOR & MINOR versions */ -+ err = -EINVAL; - if(!supported_squashfs_filesystem(msblk, silent)) -- goto failed_mount; -+ goto *label; - - /* Check the filesystem does not extend beyond the end of the - block device */ - if(sblk->bytes_used < 0 || sblk->bytes_used > i_size_read(s->s_bdev->bd_inode)) -- goto failed_mount; -+ goto *label; - - /* Check the root inode for sanity */ - if (SQUASHFS_INODE_OFFSET(sblk->root_inode) > SQUASHFS_METADATA_SIZE) -- goto failed_mount; -+ goto *label; - - TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b)); - TRACE("Inodes are %scompressed\n", -@@ -1205,11 +1246,13 @@ static int squashfs_fill_super(struct su - s->s_op = &squashfs_super_ops; - - /* Init inode_table block pointer array */ -+ err = -ENOMEM; - if (!(msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) * - SQUASHFS_CACHED_BLKS, GFP_KERNEL))) { - ERROR("Failed to allocate block cache\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_block_cache; - - for (i = 0; i < SQUASHFS_CACHED_BLKS; i++) - msblk->block_cache[i].block = SQUASHFS_INVALID_BLK; -@@ -1219,17 +1262,21 @@ static int squashfs_fill_super(struct su - /* Allocate read_page block */ - if (!(msblk->read_page = kmalloc(sblk->block_size, GFP_KERNEL))) { - ERROR("Failed to allocate read_page block\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_read_page; - - /* Allocate uid and gid tables */ - if (!(msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) * - sizeof(unsigned int), GFP_KERNEL))) { - ERROR("Failed to allocate uid/gid table\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_uid; - msblk->guid = msblk->uid + sblk->no_uids; - -+ dpri("swap %d\n", msblk->swap); -+ err = -EINVAL; - if (msblk->swap) { - unsigned int suid[sblk->no_uids + sblk->no_guids]; - -@@ -1238,7 +1285,7 @@ static int squashfs_fill_super(struct su - sizeof(unsigned int)) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { - ERROR("unable to read uid/gid table\n"); -- goto failed_mount; -+ goto *label; - } - - SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids + -@@ -1249,18 +1296,20 @@ static int squashfs_fill_super(struct su - sizeof(unsigned int)) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { - ERROR("unable to read uid/gid table\n"); -- goto failed_mount; -+ goto *label; - } - - - if (sblk->s_major == 1 && squashfs_1_0_supported(msblk)) - goto allocate_root; - -+ err = -ENOMEM; - if (!(msblk->fragment = kmalloc(sizeof(struct squashfs_fragment_cache) * - SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL))) { - ERROR("Failed to allocate fragment block cache\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_fragment; - - for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) { - msblk->fragment[i].locked = 0; -@@ -1272,7 +1321,7 @@ static int squashfs_fill_super(struct su - - /* Allocate and read fragment index table */ - if (msblk->read_fragment_index_table(s) == 0) -- goto failed_mount; -+ goto *label; - - if(sblk->s_major < 3 || sblk->lookup_table_start == SQUASHFS_INVALID_BLK) - goto allocate_root; -@@ -1285,9 +1334,12 @@ static int squashfs_fill_super(struct su - s->s_export_op = &squashfs_export_ops; - - allocate_root: -+ dpri("alloate_root\n"); - root = new_inode(s); -- if ((msblk->read_inode)(root, sblk->root_inode) == 0) -+ if ((msblk->read_inode)(root, sblk->root_inode) == 0) { -+ iput(root); - goto failed_mount; -+ } - insert_inode_hash(root); - - if ((s->s_root = d_alloc_root(root)) == NULL) { -@@ -1302,18 +1354,20 @@ allocate_root: - failed_mount: - kfree(msblk->inode_lookup_table); - kfree(msblk->fragment_index); -+ kfree(msblk->fragment_index_2); -+ out_fragment: - kfree(msblk->fragment); -+ out_uid: - kfree(msblk->uid); -+ out_read_page: - kfree(msblk->read_page); -+ out_block_cache: - kfree(msblk->block_cache); -- kfree(msblk->fragment_index_2); -- vfree(msblk->stream.workspace); -+ out_fsinfo: - kfree(s->s_fs_info); - s->s_fs_info = NULL; -- return -EINVAL; -- --failure: -- return -ENOMEM; -+ failure: -+ return err; - } - - -@@ -1324,7 +1378,7 @@ static int squashfs_statfs(struct dentry - - TRACE("Entered squashfs_statfs\n"); - -- buf->f_type = SQUASHFS_MAGIC; -+ buf->f_type = sblk->s_magic; - buf->f_bsize = sblk->block_size; - buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1; - buf->f_bfree = buf->f_bavail = 0; -@@ -2235,7 +2289,6 @@ static void squashfs_put_super(struct su - kfree(sbi->fragment_index); - kfree(sbi->fragment_index_2); - kfree(sbi->meta_index); -- vfree(sbi->stream.workspace); - kfree(s->s_fs_info); - s->s_fs_info = NULL; - } -@@ -2251,17 +2304,62 @@ static int squashfs_get_sb(struct file_s - } - - -+static void free_sqlzma(void) -+{ -+ int cpu; -+ struct sqlzma *p; -+ -+ for_each_online_cpu(cpu) { -+ p = per_cpu(sqlzma, cpu); -+ if (p) { -+#ifdef KeepPreemptive -+ mutex_destroy(&p->mtx); -+#endif -+ sqlzma_fin(&p->un); -+ kfree(p); -+ } -+ } -+} -+ - static int __init init_squashfs_fs(void) - { -+ struct sqlzma *p; -+ int cpu; - int err = init_inodecache(); - if (err) - goto out; - -+ for_each_online_cpu(cpu) { -+ dpri("%d: %p\n", cpu, per_cpu(sqlzma, cpu)); -+ err = -ENOMEM; -+ p = kmalloc(sizeof(struct sqlzma), GFP_KERNEL); -+ if (p) { -+#ifdef KeepPreemptive -+ mutex_init(&p->mtx); -+#endif -+ err = sqlzma_init(&p->un, 1, 0); -+ if (unlikely(err)) { -+ ERROR("Failed to intialize uncompress workspace\n"); -+ break; -+ } -+ per_cpu(sqlzma, cpu) = p; -+ err = 0; -+ } else -+ break; -+ } -+ if (unlikely(err)) { -+ free_sqlzma(); -+ goto out; -+ } -+ - printk(KERN_INFO "squashfs: version 3.2-r2 (2007/01/15) " -- "Phillip Lougher\n"); -+ "Phillip Lougher\n" -+ "squashfs: LZMA suppport for slax.org by jro\n"); - -- if ((err = register_filesystem(&squashfs_fs_type))) -+ if ((err = register_filesystem(&squashfs_fs_type))) { -+ free_sqlzma(); - destroy_inodecache(); -+ } - - out: - return err; -@@ -2271,6 +2369,7 @@ out: - static void __exit exit_squashfs_fs(void) - { - unregister_filesystem(&squashfs_fs_type); -+ free_sqlzma(); - destroy_inodecache(); - } - -@@ -2324,6 +2423,6 @@ static void destroy_inodecache(void) - - module_init(init_squashfs_fs); - module_exit(exit_squashfs_fs); --MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem"); --MODULE_AUTHOR("Phillip Lougher "); -+MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem, and LZMA suppport for slax.org"); -+MODULE_AUTHOR("Phillip Lougher , and LZMA suppport for slax.org by jro"); - MODULE_LICENSE("GPL"); -Index: linux-2.6.20/include/linux/squashfs_fs_sb.h -=================================================================== -RCS file: linux-2.6.20/include/linux/squashfs_fs_sb.h,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.20/include/linux/squashfs_fs_sb.h 16 Jan 2007 03:30:24 -0000 1.1 -+++ linux-2.6.20/include/linux/squashfs_fs_sb.h 16 Jan 2007 05:08:17 -0000 1.2 -@@ -24,6 +24,7 @@ - */ - - #include -+#include "sqlzma.h" - - struct squashfs_cache { - long long block; -@@ -54,7 +55,7 @@ struct squashfs_sb_info { - long long *fragment_index; - unsigned int *fragment_index_2; - char *read_page; -- struct mutex read_data_mutex; -+ //struct mutex read_data_mutex; - struct mutex read_page_mutex; - struct mutex block_cache_mutex; - struct mutex fragment_mutex; -@@ -62,7 +63,6 @@ struct squashfs_sb_info { - wait_queue_head_t waitq; - wait_queue_head_t fragment_wait_queue; - struct meta_index *meta_index; -- z_stream stream; - long long *inode_lookup_table; - int (*read_inode)(struct inode *i, squashfs_inode_t \ - inode); From vmiklos at frugalware.org Sun Jul 15 13:00:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:00:05 2007 Subject: [Frugalware-git] setup: updates for 0.7.6 Message-ID: <20070715110003.1FB37176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=faf79cc58b22559342edd3ef5ea9a1f221b753c6 commit faf79cc58b22559342edd3ef5ea9a1f221b753c6 Author: VMiklos Date: Sun Jul 15 01:05:28 2007 +0200 updates for 0.7.6 diff --git a/NEWS b/NEWS index 94eff06..524931e 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.7.6 - you can now cherry-pick preferred mirrors + - language-specific default keyboard + - do not allow mount points to be used twice + - do not allow to mount swap partitions + - other random fixes 0.7.5 - x86_64 build fixes - depedency errors now are detailed on tty4 - new Italian translation diff --git a/configure b/configure index fa49476..fc58f8f 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ packages = ['bash', 'kernel', 'busybox', 'dhcpcd', 'dialog', 'e2fsprogs', 'device-mapper', 'lvm2'] # when releasing a new setup, please update this :) -version = "0.7.5" +version = "0.7.6" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From vmiklos at frugalware.org Sun Jul 15 13:03:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:39 2007 Subject: [Frugalware-git] setup: LOG(): change it to be printf-like Message-ID: <20070715110335.CC9AF176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=326fbbd5c0e6f1a87849167d281c2486ea1aff4e commit 326fbbd5c0e6f1a87849167d281c2486ea1aff4e Author: VMiklos Date: Sun Jul 15 02:17:05 2007 +0200 LOG(): change it to be printf-like diff --git a/src/util.c b/src/util.c index ee1950a..79fabd3 100644 --- a/src/util.c +++ b/src/util.c @@ -1,7 +1,7 @@ /* * util.c for Frugalware setup * - * Copyright (c) 2005 by Miklos Vajna + * Copyright (c) 2005-2007 by Miklos Vajna * Copyright (c) 2006 by Alex Smith * * This program is free software; you can redistribute it and/or modify @@ -31,6 +31,7 @@ #include #include #include +#include #ifdef DIALOG #include #endif @@ -652,9 +653,15 @@ void show_menu(GList *plugin_list, int *state) free(items); } -int setup_log(char *file, int line, char *str) +int setup_log(char *file, int line, char *fmt, ...) { FILE *fp; + va_list args; + char str[PATH_MAX]; + + va_start(args, fmt); + vsnprintf(str, PATH_MAX, fmt, args); + va_end(args); fp = fopen(LOGDEV, "w"); if(!fp) diff --git a/src/util.h b/src/util.h index a271468..74bd0b4 100644 --- a/src/util.h +++ b/src/util.h @@ -1,7 +1,7 @@ /* * util.h for Frugalware setup * - * Copyright (c) 2005 by Miklos Vajna + * Copyright (c) 2005-2007 by Miklos Vajna * * 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 @@ -73,6 +73,6 @@ int plugin_next(); void signal_handler(int signum); void show_menu(GList *plugin_list, int *state); -int setup_log(char *file, int line, char *str); -#define LOG(str) setup_log(__FILE__, __LINE__, (str)) +int setup_log(char *file, int line, char *fmt, ...); +#define LOG(fmt, args...) setup_log(__FILE__, __LINE__, fmt, ##args) void cb_log(unsigned short level, char *msg); From vmiklos at frugalware.org Sun Jul 15 13:03:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:40 2007 Subject: [Frugalware-git] setup: use the new LOG() and get rid of g_strdup_printfs Message-ID: <20070715110338.A6B1F18682C7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=5b38a43686652dd7b0902d5ef180af6ab97fe2ac commit 5b38a43686652dd7b0902d5ef180af6ab97fe2ac Author: VMiklos Date: Sun Jul 15 02:26:13 2007 +0200 use the new LOG() and get rid of g_strdup_printfs diff --git a/src/plugins/select.c b/src/plugins/select.c index 3db5c8c..a6b95f4 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -404,7 +404,6 @@ int fw_select(GList **config, int selpkgc, GList *syncs) int i, j; GList *cats=NULL; GList *allpkgs=NULL; - char *ptr2; PM_LIST *x; dialog_vars.backtitle=gen_backtitle(_("Selecting packages")); @@ -455,20 +454,16 @@ int fw_select(GList **config, int selpkgc, GList *syncs) dialog_msgbox(_("Please wait"), _("Searching for missing dependencies..."), 0, 0, 0); if(pacman_trans_prepare(&junk) == -1) { - ptr2 = g_strdup_printf("pacman-g2 error: %s", pacman_strerror(pm_errno)); - LOG(ptr2); - free(ptr2); + LOG("pacman-g2 error: %s", pacman_strerror(pm_errno)); /* Well well well, LOG pacman deps error at tty4 */ for(x = pacman_list_first(junk); x; x = pacman_list_next(x)) { PM_DEPMISS *miss = pacman_list_getdata(x); - ptr2 = g_strdup_printf(":: %s: %s %s", + LOG(":: %s: %s %s", (char*)pacman_dep_getinfo(miss, PM_DEP_TARGET), (long)pacman_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? "requires" : "is required by", (char*)pacman_dep_getinfo(miss, PM_DEP_NAME)); - LOG(ptr2); - free(ptr2); } pacman_list_free(junk); pacman_trans_release(); diff --git a/src/util.c b/src/util.c index 79fabd3..baf8d27 100644 --- a/src/util.c +++ b/src/util.c @@ -673,8 +673,5 @@ int setup_log(char *file, int line, char *fmt, ...) void cb_log(unsigned short level, char *msg) { - char str[PATH_MAX]; - - snprintf(str, PATH_MAX, "[libpacman] %s", msg); - LOG(str); + LOG("[libpacman, level %d] %s", level, msg); } From vmiklos at frugalware.org Sun Jul 15 13:03:38 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:43 2007 Subject: [Frugalware-git] setup: src: rename finel target to current Message-ID: <20070715110338.E147E176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=26727c1bf724a960daf57e91e0067ddb1cded8be commit 26727c1bf724a960daf57e91e0067ddb1cded8be Author: VMiklos Date: Sun Jul 15 02:29:32 2007 +0200 src: rename finel target to current diff --git a/src/Makefile b/src/Makefile index fb91c4d..e42856f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,7 +52,7 @@ all: setup setup: $(objs) $(CC) $(CFLAGS) -o $@ $(objs) $(LDFLAGS) -final: +current: $(MAKE) FINAL="-DFINAL" UI="$(UI)" stable: From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:44 2007 Subject: [Frugalware-git] setup: src: get rid of the FINAL define Message-ID: <20070715110339.117F7176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=205edfc5c6ac58baf1313e5fbc1c7eb7d4b5b4b7 commit 205edfc5c6ac58baf1313e5fbc1c7eb7d4b5b4b7 Author: VMiklos Date: Sun Jul 15 02:32:08 2007 +0200 src: get rid of the FINAL define the recommended way is to test setup in an emulator for a long time diff --git a/src/Makefile b/src/Makefile index e42856f..f2ebfc3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,7 +22,7 @@ CFLAGS ?= -Wall -Werror -O2 -pipe else CFLAGS ?= -g -Wall -Werror endif -CFLAGS += $(FINAL) $(STABLE) -DARCH="\"$(shell arch)\"" +CFLAGS += $(STABLE) -DARCH="\"$(shell arch)\"" LDFLAGS += -ldl -rdynamic CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) @@ -47,16 +47,16 @@ objs = setup.o util.o gtk.o endif all: setup - $(MAKE) -C plugins FINAL="$(FINAL)" UI="$(UI)" + $(MAKE) -C plugins UI="$(UI)" setup: $(objs) $(CC) $(CFLAGS) -o $@ $(objs) $(LDFLAGS) current: - $(MAKE) FINAL="-DFINAL" UI="$(UI)" + $(MAKE) UI="$(UI)" stable: - $(MAKE) FINAL="-DFINAL" STABLE="-DSTABLE" UI="$(UI)" + $(MAKE) STABLE="-DSTABLE" UI="$(UI)" clean: rm -f setup *.o diff --git a/src/plugins/Makefile b/src/plugins/Makefile index d2f52d5..c3893be 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -22,7 +22,7 @@ CFLAGS ?= -Wall -Werror -O2 -pipe else CFLAGS ?= -g -Wall -Werror endif -CFLAGS += -I.. $(FINAL) -DARCH="\"$(shell arch)\"" +CFLAGS += -I.. -DARCH="\"$(shell arch)\"" LDFLAGS += -lparted -ldl -lpacman ifeq ($(shell arch),x86_64) CFLAGS += -fPIC diff --git a/src/plugins/select.c b/src/plugins/select.c index a6b95f4..db91614 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -311,9 +311,7 @@ int prepare_pkgdb(char *repo, GList **config, GList **syncs) struct stat sbuf; int ret; PM_DB *i; -#ifdef FINAL FILE *fp; -#endif pacbindir = g_strdup_printf("%s/frugalware-%s", SOURCEDIR, ARCH); @@ -330,7 +328,6 @@ int prepare_pkgdb(char *repo, GList **config, GList **syncs) makepath(pkgdb); // TODO: use libarchive for this system(g_strdup_printf("tar xjf %s/%s.fdb -C %s", pacbindir, repo, pkgdb)); -#ifdef FINAL if ((fp = fopen("/etc/pacman.conf", "w")) == NULL) { perror(_("Could not open output file for writing")); @@ -339,7 +336,6 @@ int prepare_pkgdb(char *repo, GList **config, GList **syncs) fprintf(fp, "[%s]\n", repo); fprintf(fp, "Server = file://%s\n\n", pacbindir); fclose(fp); -#endif } else { diff --git a/src/setup.h b/src/setup.h index 2f96a14..7a1c769 100644 --- a/src/setup.h +++ b/src/setup.h @@ -35,21 +35,12 @@ #define MKSWAP "/sbin/mkswap" #define SWAPON "/sbin/swapon" -#ifdef FINAL #define PLUGDIR "/lib/plugins" #define HOTPLUGSCRIPT "/etc/rc.d/rc.hotplug" #define NETCONFIGSCRIPT "netconfig -f" #define RAIDCONFIGSCRIPT "raidconfig" #define INTERFACESSCRIPT "netconfig start" #define PACCONFPATH "/etc/pacman.d/" -#else -#define PLUGDIR "plugins" -#define HOTPLUGSCRIPT "echo /etc/rc.d/rc.hotplug" -#define NETCONFIGSCRIPT "echo netconfig -f >/dev/tty4" -#define RAIDCONFIGSCRIPT "echo raidconfig >/dev/tty4" -#define INTERFACESSCRIPT "echo netconfig start" -#define PACCONFPATH "plugins" -#endif #ifndef STABLE #define PACCONF "frugalware-current" diff --git a/src/util.c b/src/util.c index baf8d27..917b0f2 100644 --- a/src/util.c +++ b/src/util.c @@ -196,11 +196,7 @@ int exit_perform(void) end_dialog(); #endif -#ifdef FINAL system(g_strdup_printf("/sbin/reboot >%s 2>%s", LOGDEV, LOGDEV)); -#else - printf("/sbin/reboot\n"); -#endif exit(1); } @@ -330,11 +326,7 @@ int umount_if_needed(char *sourcedir) int fw_system(char* cmd) { char *ptr; -#ifdef FINAL ptr = g_strdup_printf("%s >%s 2>%s", cmd, LOGDEV, LOGDEV); -#else - ptr = g_strdup_printf("echo %s >%s 2>%s", cmd, LOGDEV, LOGDEV); -#endif int ret = system(ptr); free(ptr); return (ret); From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:44 2007 Subject: [Frugalware-git] setup: 2 more final -> current Message-ID: <20070715110339.2DC25176813D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=c56431beb4568e5b0099eba0678fc71e3a9346fd commit c56431beb4568e5b0099eba0678fc71e3a9346fd Author: VMiklos Date: Sun Jul 15 02:33:14 2007 +0200 2 more final -> current diff --git a/Makefile b/Makefile index de055de..4c006c8 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ ccache: setup: ifeq ($(STABLE),false) - $(MAKE) -C src final + $(MAKE) -C src current else $(MAKE) -C src stable endif @@ -179,7 +179,11 @@ initrd_gz: clean config.mak devices initrd update: darcs pull -a -v $(MAKE) -C src clean - $(MAKE) -C src final +ifeq ($(STABLE),false) + $(MAKE) -C src current +else + $(MAKE) -C src stable +endif sudo rm -rf merge initrd* sudo $(MAKE) initrd From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:45 2007 Subject: [Frugalware-git] setup: asklang: get rid of LOGDEV, use LOG() Message-ID: <20070715110339.4F867176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=f830ac0996d0cfb4564af735a0c74173e8451bda commit f830ac0996d0cfb4564af735a0c74173e8451bda Author: VMiklos Date: Sun Jul 15 02:54:45 2007 +0200 asklang: get rid of LOGDEV, use LOG() diff --git a/src/plugins/asklang.c b/src/plugins/asklang.c index 20b0f54..819580c 100644 --- a/src/plugins/asklang.c +++ b/src/plugins/asklang.c @@ -72,10 +72,15 @@ char *desc() int setcharset(char *name, GList **config) { + char *ptr; + //TODO: maybe there is a proper system call for this? + LOG("setting font '%s'", name); + ptr = g_strdup_printf("setfont %s 2>&1", name); fw_end_dialog(); - system(g_strdup_printf("setfont %s >%s 2>%s", name, LOGDEV, LOGDEV)); + system(ptr); fw_init_dialog(); + FREE(ptr); // save the font for later usage data_put(config, "font", strdup(name)); bind_textdomain_codeset("setup", g_ascii_strup(name, strlen(name)-1)); From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:45 2007 Subject: [Frugalware-git] setup: hotplug: use LOG(), don't use LOGDEV Message-ID: <20070715110339.6C476176813D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=10777ea8d469cc02991097c4e3c51499136276e6 commit 10777ea8d469cc02991097c4e3c51499136276e6 Author: VMiklos Date: Sun Jul 15 03:04:11 2007 +0200 hotplug: use LOG(), don't use LOGDEV diff --git a/src/plugins/hotplug.c b/src/plugins/hotplug.c index a8c182a..2801454 100644 --- a/src/plugins/hotplug.c +++ b/src/plugins/hotplug.c @@ -56,10 +56,10 @@ int run(GList **config) dialog_vars.backtitle=gen_backtitle(_("Detecting hardware")); dlg_put_backtitle(); dlg_clear(); + LOG("detecting hardware using '%s'", HOTPLUGSCRIPT); dialog_msgbox(_("Please wait"), _("Scanning for SCSI and PCI cards"), 0, 0, 0); - system(g_strdup_printf("%s >%s 2>%s", HOTPLUGSCRIPT, - LOGDEV, LOGDEV)); + system(HOTPLUGSCRIPT); return(0); } From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:46 2007 Subject: [Frugalware-git] setup: asklang: one more LOG() Message-ID: <20070715110339.8DF07176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=81f61aeb01144285c9ad46db7eae4c6ad79f19e7 commit 81f61aeb01144285c9ad46db7eae4c6ad79f19e7 Author: VMiklos Date: Sun Jul 15 03:09:16 2007 +0200 asklang: one more LOG() diff --git a/src/plugins/asklang.c b/src/plugins/asklang.c index 819580c..d81f7c1 100644 --- a/src/plugins/asklang.c +++ b/src/plugins/asklang.c @@ -106,6 +106,7 @@ int run(GList **config) 0, 0, 0, LANGSNUM, langs) == -1) return(-1); + LOG("selected language: '%s'", dialog_vars.input_result); setenv("LC_ALL", dialog_vars.input_result, 1); setenv("LANG", dialog_vars.input_result, 1); setlocale(LC_ALL, dialog_vars.input_result); From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:47 2007 Subject: [Frugalware-git] setup: layout: use LOG(), don't use LOGDEV Message-ID: <20070715110339.AC3A9176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=87c3f3be9fcdd28be39cbb20ccaec7a7ef766f9a commit 87c3f3be9fcdd28be39cbb20ccaec7a7ef766f9a Author: VMiklos Date: Sun Jul 15 03:16:41 2007 +0200 layout: use LOG(), don't use LOGDEV diff --git a/src/plugins/layout.c b/src/plugins/layout.c index 25becd7..bde317e 100644 --- a/src/plugins/layout.c +++ b/src/plugins/layout.c @@ -97,7 +97,7 @@ int find(char *dirname) int run(GList **config) { char **array; - char *fn, *ptr; + char *fn, *ptr, *layout; FILE* fp; int ret = 0; @@ -121,15 +121,18 @@ int run(GList **config) FREE(dialog_vars.default_item); if(ret == -1) return(ret); - ptr=strdup(dialog_vars.input_result); + layout=strdup(dialog_vars.input_result); FREE(array); // drop .map.gz - if(strlen(ptr) >= 7) - ptr[strlen(ptr)-7]='\0'; + if(strlen(layout) >= 7) + layout[strlen(layout)-7]='\0'; //TODO: maybe there is a proper system call for this? - system(g_strdup_printf("loadkeys /usr/share/kbd/keymaps/i386/%s.map.gz >%s 2>%s", ptr, LOGDEV, LOGDEV)); + LOG("loading keymap '%s'", layout); + ptr = g_strdup_printf("loadkeys /usr/share/kbd/keymaps/i386/%s.map.gz 2>/dev/null", layout); + system(ptr); + FREE(ptr); fn = strdup("/tmp/setup_XXXXXX"); mkstemp(fn); @@ -141,9 +144,9 @@ int run(GList **config) fprintf(fp, "# /etc/sysconfig/keymap\n\n" "# specify the keyboard map, maps are in " "/usr/share/kbd/keymaps\n\n"); - if(strstr(ptr, "/")) - fprintf(fp, "keymap=%s\n", strstr(ptr, "/")+1); - FREE(ptr); + if(strstr(layout, "/")) + fprintf(fp, "keymap=%s\n", strstr(layout, "/")+1); + FREE(layout); fclose(fp); data_put(config, "keymap", fn); From vmiklos at frugalware.org Sun Jul 15 13:03:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:47 2007 Subject: [Frugalware-git] setup: fw_system(): log the output using LOG() Message-ID: <20070715110339.CA068176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=1d430df3a01409ebe92ce608700670b9bb695ff0 commit 1d430df3a01409ebe92ce608700670b9bb695ff0 Author: VMiklos Date: Sun Jul 15 03:27:36 2007 +0200 fw_system(): log the output using LOG() diff --git a/src/util.c b/src/util.c index 917b0f2..e22222f 100644 --- a/src/util.c +++ b/src/util.c @@ -325,10 +325,26 @@ int umount_if_needed(char *sourcedir) int fw_system(char* cmd) { - char *ptr; - ptr = g_strdup_printf("%s >%s 2>%s", cmd, LOGDEV, LOGDEV); - int ret = system(ptr); - free(ptr); + char *ptr, line[PATH_MAX]; + FILE *pp; + LOG("running external command: '%s'", cmd); + ptr = g_strdup_printf("%s 2>&1", cmd); + pp = popen(ptr, "r"); + if(!pp) + { + LOG("call to popen falied (%s)", strerror(errno)); + return(-1); + } + while(!feof(pp)) + { + if(fgets(line, PATH_MAX, pp) == NULL) + break; + line[strlen(line)-1]='\0'; + LOG("> %s", line); + } + int ret = pclose(pp); + FREE(ptr); + LOG("external command returned with exit code '%d'", ret); return (ret); } From vmiklos at frugalware.org Sun Jul 15 13:03:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:48 2007 Subject: [Frugalware-git] setup: layout system() -> fw_system() Message-ID: <20070715110341.0D28E18682CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=4430f4d9bf8abcb19e5718efae3c215d5a2a8d7a commit 4430f4d9bf8abcb19e5718efae3c215d5a2a8d7a Author: VMiklos Date: Sun Jul 15 03:27:53 2007 +0200 layout system() -> fw_system() diff --git a/src/plugins/layout.c b/src/plugins/layout.c index bde317e..05aef90 100644 --- a/src/plugins/layout.c +++ b/src/plugins/layout.c @@ -130,8 +130,8 @@ int run(GList **config) //TODO: maybe there is a proper system call for this? LOG("loading keymap '%s'", layout); - ptr = g_strdup_printf("loadkeys /usr/share/kbd/keymaps/i386/%s.map.gz 2>/dev/null", layout); - system(ptr); + ptr = g_strdup_printf("loadkeys /usr/share/kbd/keymaps/i386/%s.map.gz", layout); + fw_system(ptr); FREE(ptr); fn = strdup("/tmp/setup_XXXXXX"); From vmiklos at frugalware.org Sun Jul 15 13:03:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:49 2007 Subject: [Frugalware-git] setup: loadsource: system() -> fw_system() Message-ID: <20070715110341.4B09F18682CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=178f03cf30311f3e925945581112233ee663e289 commit 178f03cf30311f3e925945581112233ee663e289 Author: VMiklos Date: Sun Jul 15 03:31:02 2007 +0200 loadsource: system() -> fw_system() diff --git a/src/plugins/loadsource.c b/src/plugins/loadsource.c index 7db57d4..28bba11 100644 --- a/src/plugins/loadsource.c +++ b/src/plugins/loadsource.c @@ -110,6 +110,7 @@ int run(GList **config) GList *drives=NULL; int i; int found = 0; + char *ptr; umount_if_needed(SOURCEDIR); @@ -122,7 +123,8 @@ int run(GList **config) drives = grep_drives("/proc/sys/dev/cdrom/info"); for (i=0; i%s 2>%s", (char*)g_list_nth_data(drives, i), SOURCEDIR, LOGDEV, LOGDEV))) + ptr = g_strdup_printf("mount -o ro -t iso9660 /dev/%s %s", (char*)g_list_nth_data(drives, i), SOURCEDIR); + if (!fw_system(ptr)) { data_put(config, "srcdev", (char*)g_list_nth_data(drives, i)); dlg_put_backtitle(); @@ -132,6 +134,7 @@ int run(GList **config) found = 1; break; } + FREE(ptr); } if(!found) data_put(config, "netinstall", ""); From vmiklos at frugalware.org Sun Jul 15 13:03:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:49 2007 Subject: [Frugalware-git] setup: use fw_system() everywhere for non-interactive external programs Message-ID: <20070715110341.94C5818682CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=2835d7166d3f32d2d9858a60209a22dfcc974d0f commit 2835d7166d3f32d2d9858a60209a22dfcc974d0f Author: VMiklos Date: Sun Jul 15 03:39:20 2007 +0200 use fw_system() everywhere for non-interactive external programs diff --git a/src/plugins/asklang.c b/src/plugins/asklang.c index d81f7c1..d9e5ada 100644 --- a/src/plugins/asklang.c +++ b/src/plugins/asklang.c @@ -75,10 +75,9 @@ int setcharset(char *name, GList **config) char *ptr; //TODO: maybe there is a proper system call for this? - LOG("setting font '%s'", name); - ptr = g_strdup_printf("setfont %s 2>&1", name); + ptr = g_strdup_printf("setfont %s", name); fw_end_dialog(); - system(ptr); + fw_system(ptr); fw_init_dialog(); FREE(ptr); // save the font for later usage diff --git a/src/plugins/hotplug.c b/src/plugins/hotplug.c index 2801454..2e22837 100644 --- a/src/plugins/hotplug.c +++ b/src/plugins/hotplug.c @@ -56,10 +56,9 @@ int run(GList **config) dialog_vars.backtitle=gen_backtitle(_("Detecting hardware")); dlg_put_backtitle(); dlg_clear(); - LOG("detecting hardware using '%s'", HOTPLUGSCRIPT); dialog_msgbox(_("Please wait"), _("Scanning for SCSI and PCI cards"), 0, 0, 0); - system(HOTPLUGSCRIPT); + fw_system(HOTPLUGSCRIPT); return(0); } diff --git a/src/plugins/layout.c b/src/plugins/layout.c index 05aef90..e2cd06f 100644 --- a/src/plugins/layout.c +++ b/src/plugins/layout.c @@ -129,7 +129,7 @@ int run(GList **config) layout[strlen(layout)-7]='\0'; //TODO: maybe there is a proper system call for this? - LOG("loading keymap '%s'", layout); + LOG("selected layout '%s'", layout); ptr = g_strdup_printf("loadkeys /usr/share/kbd/keymaps/i386/%s.map.gz", layout); fw_system(ptr); FREE(ptr); diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index f6691a6..b8b52c0 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -197,7 +197,7 @@ int run(GList **config) return(-1); strcpy(partsw, ptr); fw_end_dialog(); - system(g_strdup_printf("%s %s", partsw, path)); + fw_system(g_strdup_printf("%s %s", partsw, path)); fw_init_dialog(); } else if (ret == DLG_EXIT_EXTRA) diff --git a/src/plugins/select.c b/src/plugins/select.c index db91614..a81f48f 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -327,7 +327,7 @@ int prepare_pkgdb(char *repo, GList **config, GList **syncs) { makepath(pkgdb); // TODO: use libarchive for this - system(g_strdup_printf("tar xjf %s/%s.fdb -C %s", pacbindir, repo, pkgdb)); + fw_system(g_strdup_printf("tar xjf %s/%s.fdb -C %s", pacbindir, repo, pkgdb)); if ((fp = fopen("/etc/pacman.conf", "w")) == NULL) { perror(_("Could not open output file for writing")); From vmiklos at frugalware.org Sun Jul 15 13:03:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:50 2007 Subject: [Frugalware-git] setup: more logging in loadsource Message-ID: <20070715110342.021DD18682CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=240beff58c3bb72cafff824b2e1e2786af6998b6 commit 240beff58c3bb72cafff824b2e1e2786af6998b6 Author: VMiklos Date: Sun Jul 15 03:43:47 2007 +0200 more logging in loadsource diff --git a/src/plugins/loadsource.c b/src/plugins/loadsource.c index 28bba11..c0ae889 100644 --- a/src/plugins/loadsource.c +++ b/src/plugins/loadsource.c @@ -137,7 +137,10 @@ int run(GList **config) FREE(ptr); } if(!found) + { + LOG("no package database found, performing a network installation"); data_put(config, "netinstall", ""); + } // disable caching for cds if((char*)data_get(*config, "netinstall")==NULL) { @@ -145,11 +148,9 @@ int run(GList **config) disable_cache(pacbindir); FREE(pacbindir); } - /* comment this out for now, as requested at http://forums.frugalware.org/index.php?t=rview&goto=3479#msg_3479 if(data_get(*config, "srcdev")==NULL) { - dialog_msgbox(_("CD/DVD drive not found"), _("Sorry, no Frugalware install disc was found in any of your drives. Press ENTER to reboot."), 0, 0, 1); - return(-1); - }*/ + LOG("no cd/dvd drive found, this is normal if you are running setup from a pendrive or in an emulator"); + } return(0); } From vmiklos at frugalware.org Sun Jul 15 13:03:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:03:51 2007 Subject: [Frugalware-git] setup: new dirs: var/log and var/run Message-ID: <20070715110342.400EA18682CC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=2e35a4992f53416a031d392870777bf55450fba0 commit 2e35a4992f53416a031d392870777bf55450fba0 Author: VMiklos Date: Sun Jul 15 03:47:07 2007 +0200 new dirs: var/log and var/run for further logging and var/run for dhcpcd pidfiles diff --git a/Makefile b/Makefile index 4c006c8..d7d546b 100644 --- a/Makefile +++ b/Makefile @@ -252,7 +252,7 @@ dhcpcd: frugalware: $(CLEANUP) - mkdir -p frugalware/{var/lib/frugalware/messages/,etc} + mkdir -p frugalware/{var/lib/frugalware/messages/,var/log,var/run,etc} $(UNPACK) cp -a $(BDIR)/var/lib/frugalware/messages/rc.messages \ frugalware/var/lib/frugalware/messages/ From vmiklos at frugalware.org Sun Jul 15 13:35:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:35:47 2007 Subject: [Frugalware-git] pacman-tools: dg: chdir to project root before git commit Message-ID: <20070715113544.E58A613A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=40af7bc4fd69049089afda52817d8d77bb7c026f commit 40af7bc4fd69049089afda52817d8d77bb7c026f Author: VMiklos Date: Sun Jul 15 13:34:41 2007 +0200 dg: chdir to project root before git commit diff --git a/darcs-git.py b/darcs-git.py index 29edc16..bc2d640 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -291,6 +291,9 @@ Options: if ret == "q": sys.exit(0) print "Invalid response, try again!" + root = os.path.split(get_root())[0] + if len(root): + os.chdir(root) # in darcs, it was possible to simply rm a file and then record a # patch. support this os.system("git ls-files -z --deleted | git update-index -z --remove --stdin") From vmiklos at frugalware.org Sun Jul 15 13:36:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 13:36:28 2007 Subject: [Frugalware-git] setup: LOG(): record messages to /var/log/setup.log, not only to tty4 Message-ID: <20070715113626.5DB1313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=bd5797e762c33a28308cbc14c1a81b15610def23 commit bd5797e762c33a28308cbc14c1a81b15610def23 Author: VMiklos Date: Sun Jul 15 13:35:23 2007 +0200 LOG(): record messages to /var/log/setup.log, not only to tty4 diff --git a/src/setup.h b/src/setup.h index 7a1c769..d41d18c 100644 --- a/src/setup.h +++ b/src/setup.h @@ -29,6 +29,7 @@ #define _(text) gettext(text) #define LOGDEV "/dev/tty4" +#define LOGFILE "/var/log/setup.log" #define SOURCEDIR "/mnt/source" #define TARGETDIR "/mnt/target" diff --git a/src/util.c b/src/util.c index e22222f..93492b1 100644 --- a/src/util.c +++ b/src/util.c @@ -663,7 +663,7 @@ void show_menu(GList *plugin_list, int *state) int setup_log(char *file, int line, char *fmt, ...) { - FILE *fp; + static FILE *ldp = NULL, *lfp = NULL; va_list args; char str[PATH_MAX]; @@ -671,11 +671,22 @@ int setup_log(char *file, int line, char *fmt, ...) vsnprintf(str, PATH_MAX, fmt, args); va_end(args); - fp = fopen(LOGDEV, "w"); - if(!fp) - return(-1); - fprintf(fp, "%s:%d: %s\n", file, line, str); - fclose(fp); + if(!ldp) + { + ldp = fopen(LOGDEV, "w"); + if(!ldp) + return(-1); + } + if(!lfp) + { + lfp = fopen(LOGFILE, "w"); + if(!lfp) + return(-1); + } + fprintf(ldp, "%s:%d: %s\n", file, line, str); + fflush(ldp); + fprintf(lfp, "%s:%d: %s\n", file, line, str); + fflush(lfp); return(0); } From janny at frugalware.org Sun Jul 15 13:50:05 2007 From: janny at frugalware.org (janny) Date: Sun Jul 15 13:50:07 2007 Subject: [Frugalware-git] frugalware-current: aufs-cvs20070715-1-i686 Message-ID: <20070715115005.385ED13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=282a052b6c0314d8d27db98028c7fcfd12fcd5a6 commit 282a052b6c0314d8d27db98028c7fcfd12fcd5a6 Author: janny Date: Sun Jul 15 13:49:32 2007 +0200 aufs-cvs20070715-1-i686 version bump (with new kernel) diff --git a/source/apps-extra/aufs/FrugalBuild b/source/apps-extra/aufs/FrugalBuild index 9aa8d56..a20fb44 100644 --- a/source/apps-extra/aufs/FrugalBuild +++ b/source/apps-extra/aufs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Janny pkgname=aufs -pkgver=cvs20070430 -kver=2.6.21-1 +pkgver=cvs20070715 +kver=2.6.22-1 pkgrel=1 pkgdesc="Aufs -- Another Unionfs" depends=('zlib' "kernel-fwlive=$kver") @@ -15,7 +15,7 @@ Finclude sourceforge up2date=$pkgver source=(http://ftp.frugalware.org/pub/other/sources/aufs/$pkgname-$pkgver.tar.bz2) options=('force' 'scriptlet') -sha1sums=('3de68f0827727a23ca330cbedd57f521b671bc7f') +sha1sums=('ce84034584a3a966a0041bf4cc6add7d0aaeac55') build() { From vmiklos at frugalware.org Sun Jul 15 14:11:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:12:00 2007 Subject: [Frugalware-git] frugalware-current: gimp-2.2.17-1-i686 Message-ID: <20070715121159.0F55713A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d94868e2cf153dce5cfe809c5f77e9455a57ce2f commit d94868e2cf153dce5cfe809c5f77e9455a57ce2f Author: VMiklos Date: Sun Jul 15 14:11:44 2007 +0200 gimp-2.2.17-1-i686 version bump diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 3d67097..50b3666 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,7 +3,7 @@ # Modified by: Laszlo Dvornik pkgname=gimp -pkgver=2.2.16 +pkgver=2.2.17 pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed 's/.*-\(.*\)\.t.*/\1/'" source=(ftp://ftp.gimp.org/pub/gimp/v2.2/$pkgname-$pkgver.tar.bz2) -sha1sums=('0e25426507e1eda50b0b3cb11b348e563557bbae') +sha1sums=('e7bbfe5fd685f625f023af7f8fe5774feed26116') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet From vmiklos at frugalware.org Sun Jul 15 14:16:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:16:29 2007 Subject: [Frugalware-git] setup: warning fixes Message-ID: <20070715121627.3EEA613A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=b5ef4806d2b6997cd5bfc5c00dfd4bbf77d5abfc commit b5ef4806d2b6997cd5bfc5c00dfd4bbf77d5abfc Author: VMiklos Date: Sun Jul 15 13:47:17 2007 +0200 warning fixes diff --git a/src/plugins/formatdisk.c b/src/plugins/formatdisk.c index fe9bce9..a708ae4 100644 --- a/src/plugins/formatdisk.c +++ b/src/plugins/formatdisk.c @@ -53,6 +53,7 @@ char *desc() GList *parts=NULL; GList *partschk=NULL; char *findmount(char *dev, int mode); +int detect_parts(int noswap); int partdetails(PedPartition *part, int noswap) { @@ -507,6 +508,7 @@ int detect_parts(int noswap) // software raids detect_raids(); + return(0); } int run(GList **config) From vmiklos at frugalware.org Sun Jul 15 14:16:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:16:30 2007 Subject: [Frugalware-git] setup: save the logfile to the target system Message-ID: <20070715121627.5F462176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=cb063b4f4de65f6b70884e10e41b2b24efe66985 commit cb063b4f4de65f6b70884e10e41b2b24efe66985 Author: VMiklos Date: Sun Jul 15 13:48:25 2007 +0200 save the logfile to the target system diff --git a/src/plugins/formatdisk.c b/src/plugins/formatdisk.c index a708ae4..77b01dd 100644 --- a/src/plugins/formatdisk.c +++ b/src/plugins/formatdisk.c @@ -561,6 +561,14 @@ int run(GList **config) chmod (np, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); FREE(np); + makepath(g_strdup_printf("%s/%s", TARGETDIR, "/var/log")); + np = g_strdup_printf("%s/%s", TARGETDIR, LOGFILE); + copyfile(LOGFILE, np); + unlink(LOGFILE); + symlink(np, LOGFILE); + chmod (np, S_IRUSR|S_IWUSR); + FREE(np); + // disable caching for cds // this is needed here since when the cds is loaded we had no // formatted root partition diff --git a/src/util.c b/src/util.c index 93492b1..fc08b04 100644 --- a/src/util.c +++ b/src/util.c @@ -666,6 +666,7 @@ int setup_log(char *file, int line, char *fmt, ...) static FILE *ldp = NULL, *lfp = NULL; va_list args; char str[PATH_MAX]; + struct stat buf; va_start(args, fmt); vsnprintf(str, PATH_MAX, fmt, args); @@ -677,9 +678,9 @@ int setup_log(char *file, int line, char *fmt, ...) if(!ldp) return(-1); } - if(!lfp) + if(stat(LOGFILE, &buf) || !lfp) { - lfp = fopen(LOGFILE, "w"); + lfp = fopen(LOGFILE, "a"); if(!lfp) return(-1); } From vmiklos at frugalware.org Sun Jul 15 14:16:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:16:31 2007 Subject: [Frugalware-git] setup: don't use fw_system() for interactive cfdisk Message-ID: <20070715121627.6DBF4176813D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=81008d3bb7f3bd84676ff565924bf4215afc768a commit 81008d3bb7f3bd84676ff565924bf4215afc768a Author: VMiklos Date: Sun Jul 15 13:55:17 2007 +0200 don't use fw_system() for interactive cfdisk diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index b8b52c0..f6691a6 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -197,7 +197,7 @@ int run(GList **config) return(-1); strcpy(partsw, ptr); fw_end_dialog(); - fw_system(g_strdup_printf("%s %s", partsw, path)); + system(g_strdup_printf("%s %s", partsw, path)); fw_init_dialog(); } else if (ret == DLG_EXIT_EXTRA) From vmiklos at frugalware.org Sun Jul 15 14:16:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:16:31 2007 Subject: [Frugalware-git] setup: setup_log(): try to log to the target partition if possible Message-ID: <20070715121627.84E2F1868203@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=79febb9a1b29d9a2dce1897772ba2edc02656b07 commit 79febb9a1b29d9a2dce1897772ba2edc02656b07 Author: VMiklos Date: Sun Jul 15 14:15:29 2007 +0200 setup_log(): try to log to the target partition if possible diff --git a/src/plugins/formatdisk.c b/src/plugins/formatdisk.c index 77b01dd..8a40bc9 100644 --- a/src/plugins/formatdisk.c +++ b/src/plugins/formatdisk.c @@ -565,7 +565,6 @@ int run(GList **config) np = g_strdup_printf("%s/%s", TARGETDIR, LOGFILE); copyfile(LOGFILE, np); unlink(LOGFILE); - symlink(np, LOGFILE); chmod (np, S_IRUSR|S_IWUSR); FREE(np); diff --git a/src/util.c b/src/util.c index fc08b04..6455356 100644 --- a/src/util.c +++ b/src/util.c @@ -665,7 +665,7 @@ int setup_log(char *file, int line, char *fmt, ...) { static FILE *ldp = NULL, *lfp = NULL; va_list args; - char str[PATH_MAX]; + char str[PATH_MAX], *ptr; struct stat buf; va_start(args, fmt); @@ -678,9 +678,20 @@ int setup_log(char *file, int line, char *fmt, ...) if(!ldp) return(-1); } - if(stat(LOGFILE, &buf) || !lfp) + ptr = g_strdup_printf("%s/%s", TARGETDIR, LOGFILE); + if(stat(LOGFILE, &buf) && !stat(ptr, &buf)) { - lfp = fopen(LOGFILE, "a"); + fclose(lfp); + lfp = NULL; + } + else + { + FREE(ptr); + ptr = strdup(LOGFILE); + } + if(!lfp) + { + lfp = fopen(ptr, "a"); if(!lfp) return(-1); } From vmiklos at frugalware.org Sun Jul 15 14:26:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:26:43 2007 Subject: [Frugalware-git] pacman-tools: dg: filter for files only when reading the diff, not when doing a commit Message-ID: <20070715122642.0F86313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=532abd590e95c5c65348964dedc32c5b3c9c1751 commit 532abd590e95c5c65348964dedc32c5b3c9c1751 Author: VMiklos Date: Sun Jul 15 14:25:52 2007 +0200 dg: filter for files only when reading the diff, not when doing a commit diff --git a/darcs-git.py b/darcs-git.py index bc2d640..d6f04f6 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -324,8 +324,8 @@ Options: os.system("git add %s" % diff2filename(lines[0])) for i in newlist: os.system("git reset HEAD %s" % i) - os.system("""git commit -m "%s" %s %s""" % - (options.name.replace('"', r'\"'), options.edit, options.files)) + os.system("""git commit -m "%s" %s""" % + (options.name.replace('"', r'\"'), options.edit)) # readd the uncommitted new files for i in newlist: os.system("git add %s" % i) From vmiklos at frugalware.org Sun Jul 15 14:35:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:35:01 2007 Subject: [Frugalware-git] setup: new fw_system_interactive() function Message-ID: <20070715123500.9091F13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=fa8f91bfa1d1b3970b750d70c5c98ca061075a7a commit fa8f91bfa1d1b3970b750d70c5c98ca061075a7a Author: VMiklos Date: Sun Jul 15 14:19:01 2007 +0200 new fw_system_interactive() function if one call this, then the command (path + args) and the return code will be logged only, ie the output is not. ideal for interactive commands diff --git a/src/util.c b/src/util.c index 6455356..a28f52e 100644 --- a/src/util.c +++ b/src/util.c @@ -348,6 +348,19 @@ int fw_system(char* cmd) return (ret); } +int fw_system_interactive(char* cmd) +{ + char *ptr, line[PATH_MAX]; + FILE *pp; + int ret; + + LOG("running external command: '%s'", cmd); + ptr = g_strdup_printf("%s 2>&1", cmd); + ret = system(ptr); + FREE(ptr); + LOG("external command returned with exit code '%d'", ret); + return (ret); +} char *drop_version(char *str) { char *ptr; diff --git a/src/util.h b/src/util.h index 74bd0b4..ec1b129 100644 --- a/src/util.h +++ b/src/util.h @@ -43,6 +43,7 @@ int exit_confirm(void); int exit_perform(void); char **glist4dialog(GList *list, char *blank); int fw_system(char* cmd); +int fw_system_interactive(char* cmd); int makepath(char *path); int rmrf(char *path); int umount_if_needed(char *sourcedir); From vmiklos at frugalware.org Sun Jul 15 14:35:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:35:01 2007 Subject: [Frugalware-git] setup: configsource: warning fix Message-ID: <20070715123500.A1E5A176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=9c215b552993d4c6180cff8a275a43b8e7e9d73e commit 9c215b552993d4c6180cff8a275a43b8e7e9d73e Author: VMiklos Date: Sun Jul 15 14:25:23 2007 +0200 configsource: warning fix diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 2e14ae9..45c107e 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -117,7 +117,7 @@ GList *mirrorconf(void) { short i,j; GList *mirrorlist=NULL, *newmirrorlist=NULL; - char *fn, *mirror; + char *fn; char **arraychk; fn = g_strdup_printf("%s/%s", PACCONFPATH, PACCONF); From vmiklos at frugalware.org Sun Jul 15 14:35:00 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:35:02 2007 Subject: [Frugalware-git] setup: configsource: use fw_system_interactive() Message-ID: <20070715123500.D4DEF13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=f8371c46369e7164572f438bb14056c2a4f1773a commit f8371c46369e7164572f438bb14056c2a4f1773a Author: VMiklos Date: Sun Jul 15 14:28:42 2007 +0200 configsource: use fw_system_interactive() diff --git a/HACKING b/HACKING index 8825348..1d3aae5 100644 --- a/HACKING +++ b/HACKING @@ -31,3 +31,13 @@ $ make qemu - boots the brand new initrd or $ make uml - boots the brand new initrd + +External commands +================= + +Don't use system(). There are two wrapper functions: + +fw_system() is for non-interactive commands, their output is logged. +fw_system_interactive() is for interactive commands, their path+args and return +code are logged, but not their output. Ideally git-grep '[^_]system(' should +return almost nothing. diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 45c107e..f86f11e 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -182,7 +182,7 @@ int run(GList **config) fw_end_dialog(); while(1) { - system(NETCONFIGSCRIPT); + fw_system_interactive(NETCONFIGSCRIPT); fw_init_dialog(); dlg_put_backtitle(); dialog_msgbox(_("Please wait"), _("Configuring the network " diff --git a/src/util.c b/src/util.c index a28f52e..290b524 100644 --- a/src/util.c +++ b/src/util.c @@ -196,7 +196,7 @@ int exit_perform(void) end_dialog(); #endif - system(g_strdup_printf("/sbin/reboot >%s 2>%s", LOGDEV, LOGDEV)); + fw_system_interactive("/sbin/reboot"); exit(1); } @@ -350,15 +350,14 @@ int fw_system(char* cmd) int fw_system_interactive(char* cmd) { - char *ptr, line[PATH_MAX]; - FILE *pp; + char *ptr; int ret; - LOG("running external command: '%s'", cmd); + LOG("running interactive external command: '%s'", cmd); ptr = g_strdup_printf("%s 2>&1", cmd); ret = system(ptr); FREE(ptr); - LOG("external command returned with exit code '%d'", ret); + LOG("interactive external command returned with exit code '%d'", ret); return (ret); } char *drop_version(char *str) From vmiklos at frugalware.org Sun Jul 15 14:35:01 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:35:05 2007 Subject: [Frugalware-git] setup: install: use fw_system_interactive() Message-ID: <20070715123501.0F5DA13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=6a5e42abcbe9ff269de450e7bca3255906383e95 commit 6a5e42abcbe9ff269de450e7bca3255906383e95 Author: VMiklos Date: Sun Jul 15 14:29:29 2007 +0200 install: use fw_system_interactive() diff --git a/src/plugins/install.c b/src/plugins/install.c index 4bfb020..5c566d7 100644 --- a/src/plugins/install.c +++ b/src/plugins/install.c @@ -64,7 +64,7 @@ int installpkgs_forreal(GList *pkgs, int fast) cmd = g_strdup_printf("pacman-g2 -S -r ./ --noconfirm -f --nointegrity %s", ptr); else cmd = g_strdup_printf("pacman-g2 -S -r ./ --noconfirm %s", ptr); - if (system(cmd) != 0) + if (fw_system_interactive(cmd) != 0) { printf(_("Errors occured while installing " "selected packages.\n" From vmiklos at frugalware.org Sun Jul 15 14:35:02 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:35:06 2007 Subject: [Frugalware-git] setup: partdisk: use fw_system_interactive() Message-ID: <20070715123502.2A88D176813C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=1634dda91f6ecdd0ea22eff6fa3a5874b0a81f59 commit 1634dda91f6ecdd0ea22eff6fa3a5874b0a81f59 Author: VMiklos Date: Sun Jul 15 14:30:28 2007 +0200 partdisk: use fw_system_interactive() diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index f6691a6..0e0e64f 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -197,13 +197,13 @@ int run(GList **config) return(-1); strcpy(partsw, ptr); fw_end_dialog(); - system(g_strdup_printf("%s %s", partsw, path)); + fw_system_interactive(g_strdup_printf("%s %s", partsw, path)); fw_init_dialog(); } else if (ret == DLG_EXIT_EXTRA) { fw_end_dialog(); - system(RAIDCONFIGSCRIPT); + fw_system_interactive(RAIDCONFIGSCRIPT); fw_init_dialog(); } else From vmiklos at frugalware.org Sun Jul 15 14:35:02 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:35:06 2007 Subject: [Frugalware-git] setup: postconf: use fw_system_interactive() Message-ID: <20070715123502.87EBE1768144@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=cdc6f87e51d4443c774f83a4be0168d06a7927c1 commit cdc6f87e51d4443c774f83a4be0168d06a7927c1 Author: VMiklos Date: Sun Jul 15 14:32:04 2007 +0200 postconf: use fw_system_interactive() diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 9cbda83..d67c50e 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -150,7 +150,7 @@ int run(GList **config) fw_system(g_strdup_printf("umount %s/proc", TARGETDIR)); fw_end_dialog(); - system("chroot ./ /sbin/grubconfig"); + fw_system_interactive("chroot ./ /sbin/grubconfig"); fw_init_dialog(); dlg_put_backtitle(); @@ -161,37 +161,37 @@ int run(GList **config) // newer shadow requires /dev/stdin :/ ptr = g_strdup_printf("mount /dev -o bind %s/dev", TARGETDIR); - system(ptr); + fw_system(ptr); free(ptr); while(!has_rootpw("etc/shadow") && confirm_rootpw()) { fw_end_dialog(); - system("chroot ./ /usr/bin/passwd root"); + fw_system_interactive("chroot ./ /usr/bin/passwd root"); fw_init_dialog(); } while(!has_user("etc/passwd") && confirm_user()) { fw_end_dialog(); - system("chroot ./ /usr/sbin/adduser"); + fw_system_interactive("chroot ./ /usr/sbin/adduser"); fw_init_dialog(); } ptr = g_strdup_printf("umount %s/dev", TARGETDIR); - system(ptr); + fw_system(ptr); free(ptr); if((ptr = (char*)data_get(*config, "font"))) append_font("etc/sysconfig/font", ptr); fw_end_dialog(); - system("chroot ./ /sbin/netconfig"); - system("chroot ./ /sbin/timeconfig"); - system("chroot ./ /sbin/mouseconfig"); + fw_system_interactive("chroot ./ /sbin/netconfig"); + fw_system_interactive("chroot ./ /sbin/timeconfig"); + fw_system_interactive("chroot ./ /sbin/mouseconfig"); if(!stat("usr/bin/X", &buf)) { - system("chroot ./ su -c /sbin/xconfig"); - system("chroot ./ /sbin/xwmconfig --silent"); + fw_system_interactive("chroot ./ su -c /sbin/xconfig"); + fw_system_interactive("chroot ./ /sbin/xwmconfig --silent"); } fw_init_dialog(); From krics at linuxforum.hu Sun Jul 15 14:39:35 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jul 15 14:39:36 2007 Subject: [Frugalware-git] frugalware-current: libarchive-2.2.5-1-x86_64 Message-ID: <20070715123935.66D5113A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=571cd4b36557ffe70e58c2ff9c6f51c5f3968e51 commit 571cd4b36557ffe70e58c2ff9c6f51c5f3968e51 Author: Christian Hamar alias krix Date: Sun Jul 15 14:39:16 2007 +0200 libarchive-2.2.5-1-x86_64 * Version bump diff --git a/source/lib/libarchive/FrugalBuild b/source/lib/libarchive/FrugalBuild index 0d7125d..c4f743e 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.3 +pkgver=2.2.5 pkgrel=1 pkgdesc="Library to create and read several different archive formats" groups=('lib' 'chroot-core') @@ -11,6 +11,6 @@ url="http://people.freebsd.org/~kientzle/libarchive/" depends=('bzip2' 'zlib') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) -sha1sums=('05f1b6096315c5cabc9cda833285dd5d430e721a') +sha1sums=('fd04f17397c7af6c8964bde02146eda391413bf4') # optimization OK From vmiklos at frugalware.org Sun Jul 15 14:40:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:40:40 2007 Subject: [Frugalware-git] frugalware-current: neon-0.26.4-1-i686 Message-ID: <20070715124037.C328118682DF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b1caa647d0067b803229c6c2e4b8db9f721c597e commit b1caa647d0067b803229c6c2e4b8db9f721c597e Author: VMiklos Date: Sun Jul 15 14:40:27 2007 +0200 neon-0.26.4-1-i686 version bump diff --git a/source/network/neon/FrugalBuild b/source/network/neon/FrugalBuild index 4161fdd..df766ca 100644 --- a/source/network/neon/FrugalBuild +++ b/source/network/neon/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=neon -pkgver=0.26.3 -pkgrel=2 +pkgver=0.26.4 +pkgrel=1 pkgdesc="An HTTP and WebDAV client library, with a C interface." url="http://www.webdav.org/neon/" depends=('heimdal>=0.8' 'expat' 'zlib') @@ -13,7 +13,5 @@ up2date="lynx -dump $url |grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz) options=('force') Fconfopts="$Fconfopts --disable-debug --with-expat --with-ssl --enable-shared" - +sha1sums=('0c005fe73573253888b0c6e839b18d24c52582a4') # optimization OK - -sha1sums=('8f3191cc6fe0aee5323dac58b03362cddc5d80d0') From vmiklos at frugalware.org Sun Jul 15 14:57:11 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:57:17 2007 Subject: [Frugalware-git] setup: configsource: more LOG() calls Message-ID: <20070715125711.13BC213A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=ff5700b293015ddfb269838f1f74abb586c199c5 commit ff5700b293015ddfb269838f1f74abb586c199c5 Author: VMiklos Date: Sun Jul 15 14:41:34 2007 +0200 configsource: more LOG() calls diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index f86f11e..e4851f7 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -137,6 +137,8 @@ GList *mirrorconf(void) g_list_length(mirrorlist)/3, arraychk, FLAG_CHECK); + for (i=0; i Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=1eea399825783c26e160a009079b6d1fc80236f3 commit 1eea399825783c26e160a009079b6d1fc80236f3 Author: VMiklos Date: Sun Jul 15 14:52:14 2007 +0200 partdisk: more LOG() calls diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index 0e0e64f..1226160 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -137,9 +137,15 @@ int raid_confirm(void) "partitioning?"), 0, 0); dialog_vars.defaultno=0; if(ret==DLG_EXIT_OK) + { + LOG("selected 'enable' for raid support"); return(1); + } else + { + LOG("selected 'disable' for raid support"); return(0); + } #endif } From vmiklos at frugalware.org Sun Jul 15 14:57:11 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 14:57:18 2007 Subject: [Frugalware-git] setup: configsource: disable adding a custom mirror by default Message-ID: <20070715125711.53074176813D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=a348cbec2d8b5512fd875c26da1b974911ee2238 commit a348cbec2d8b5512fd875c26da1b974911ee2238 Author: VMiklos Date: Sun Jul 15 14:52:27 2007 +0200 configsource: disable adding a custom mirror by default diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index e4851f7..dc97d32 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -161,6 +161,7 @@ GList *mirrorconf(void) } // merges the selected and remain mirrors newmirrorlist = g_list_concat(newmirrorlist, mirrorlist); + dialog_vars.defaultno=1; if(fw_inputbox(_("Custom mirror"), _("You may now specify " "a custom mirror (eg. LAN) " "so you can download packages " @@ -173,6 +174,7 @@ GList *mirrorconf(void) newmirrorlist = g_list_insert(newmirrorlist, strdup("CUSTOM"), 1); } } + dialog_vars.defaultno=0; updateconfig(fn, newmirrorlist); return(newmirrorlist); } From krics at linuxforum.hu Sun Jul 15 15:19:15 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jul 15 15:19:18 2007 Subject: [Frugalware-git] frugalware-current: inkscape-0.45.1-4-x86_64 Message-ID: <20070715131915.E8FD413A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=428160540ae5a4f789b782d8670d9c6ca2e372a5 commit 428160540ae5a4f789b782d8670d9c6ca2e372a5 Author: Christian Hamar alias krix Date: Sun Jul 15 15:18:51 2007 +0200 inkscape-0.45.1-4-x86_64 * Release bump due cairomm diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild index 4c638b9..58e58ee 100644 --- a/source/xapps-extra/inkscape/FrugalBuild +++ b/source/xapps-extra/inkscape/FrugalBuild @@ -4,11 +4,11 @@ pkgname=inkscape pkgver=0.45.1 -pkgrel=3 +pkgrel=4 pkgdesc="A vector illustrator program for GNOME" url="http://www.inkscape.org/" makedepends=('intltool' 'perl-xml') -depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.1' 'glibmm' 'freetype2' 'libxcb' \ +depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm' 'freetype2' 'libxcb' \ 'pango>=1.14.3' 'libgc>=6.4' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.5' 'perl' 'boost>=1.34.0-4') rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt') groups=('xapps-extra') From vmiklos at frugalware.org Sun Jul 15 15:40:11 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 15:40:13 2007 Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.40.2-1-i686 Message-ID: <20070715134011.752F113A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cdb341c1487d958bd52747973ed00ca5f1034fa9 commit cdb341c1487d958bd52747973ed00ca5f1034fa9 Author: VMiklos Date: Sun Jul 15 15:39:58 2007 +0200 e2fsprogs-1.40.2-1-i686 version bump diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 90a0136..06a5cf8 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=e2fsprogs -pkgver=1.40.1 +pkgver=1.40.2 pkgrel=1 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" url="http://e2fsprogs.sourceforge.net/" @@ -12,6 +12,9 @@ groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge source=(${source[@]} rc.fsck rc.random) +sha1sums=('65519d66bd15550d0bcd32ec72481ff0dbe737e2' \ + 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ + '7d5e3eecbea952aa1f72808fb810892d82a35461') build() { @@ -24,6 +27,3 @@ build() } # optimization OK -sha1sums=('86e4d29accdd2a5d439940bd5c0551cfcbe875b7' \ - 'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \ - '7d5e3eecbea952aa1f72808fb810892d82a35461') From vmiklos at frugalware.org Sun Jul 15 16:21:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 16:21:29 2007 Subject: [Frugalware-git] frugalware-current: links-2.1pre29-1-i686 Message-ID: <20070715142127.BC1CB13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c52b792b99d22b069495bb036cbae2b925d8734f commit c52b792b99d22b069495bb036cbae2b925d8734f Author: VMiklos Date: Sun Jul 15 16:21:19 2007 +0200 links-2.1pre29-1-i686 version bump diff --git a/source/network-extra/links/FrugalBuild b/source/network-extra/links/FrugalBuild index 0a3d1f3..131a5d0 100644 --- a/source/network-extra/links/FrugalBuild +++ b/source/network-extra/links/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=links -pkgver=2.1pre28 +pkgver=2.1pre29 pkgrel=1 pkgdesc="A web browser running in both graphics and text mode." url="http://links.twibright.com/" @@ -13,6 +13,6 @@ up2date="lynx -dump $url/download.php|grep Current|sed 's/.* \(.*\)\..*/\1/'" source=($url/download/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --enable-javascript --enable-graphics --without-x" -sha1sums=('c5bda09ca6eeed8304d85e7b14d3a64266c1fd3d') +sha1sums=('9af68ec6bd9ce995b08016334263f79afe1b6e0c') # optimization OK From voroskoi at frugalware.org Sun Jul 15 17:58:43 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 17:58:45 2007 Subject: [Frugalware-git] frugalware-current: device-mapper-1.02.21-1-i686 Message-ID: <20070715155843.BD77113A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3e82423fac67abe7cc36c807e1eb288fb17ef506 commit 3e82423fac67abe7cc36c807e1eb288fb17ef506 Author: voroskoi Date: Sun Jul 15 17:55:11 2007 +0200 device-mapper-1.02.21-1-i686 version bump diff --git a/source/lib/device-mapper/FrugalBuild b/source/lib/device-mapper/FrugalBuild index 68b7eb6..5dd245c 100644 --- a/source/lib/device-mapper/FrugalBuild +++ b/source/lib/device-mapper/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=device-mapper -pkgver=1.02.20 -pkgrel=2 +pkgver=1.02.21 +pkgrel=1 pkgdesc="Device mapper ioctl library." url="http://sources.redhat.com/dm/" groups=('lib') From voroskoi at frugalware.org Sun Jul 15 18:11:14 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 18:11:18 2007 Subject: [Frugalware-git] frugalware-current: iproute2-070710-1-i686 Message-ID: <20070715161114.4589413A411E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f44681f95181b3a4d2855f5a5e4b7d61d988ad48 commit f44681f95181b3a4d2855f5a5e4b7d61d988ad48 Author: voroskoi Date: Sun Jul 15 18:07:54 2007 +0200 iproute2-070710-1-i686 version bump removed manpage removes diff --git a/source/network/iproute2/FrugalBuild b/source/network/iproute2/FrugalBuild index 3c9a14e..233831f 100644 --- a/source/network/iproute2/FrugalBuild +++ b/source/network/iproute2/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=iproute2 -pkgver=070313 -_F_kernelmod_pkgver=2.6.20 +pkgver=070710 +_F_kernelmod_pkgver=2.6.22 pkgrel=1 pkgdesc="kernel routing and traffic control utilities" url="http://linux-net.osdl.org/index.php/Iproute2" @@ -16,15 +16,13 @@ up2date="lynx -dump 'http://developer.osdl.org/dev/iproute2/download/?C=M;O=D'|g source=(http://developer.osdl.org/dev/iproute2/download/$pkgname-$_F_kernelmod_pkgver-$pkgver.tar.gz \ iproute-socket_h-fix.patch) signatures=("$source.sign" '') +_F_cd_path="." build() { - Fcd iproute-$_F_kernelmod_pkgver-$pkgver Fsed "DOCDIR=/usr/share/doc/iproute2" \ "DOCDIR=/usr/share/doc/iproute2-$pkgver" Makefile Fsed "CFLAGS =" "CFLAGS +=" Makefile Fbuild - Frm /usr/share/man/man8/tc-bfifo.8 - Frm /usr/share/man/man8/tc-pfifo.o } # optimization OK From voroskoi at frugalware.org Sun Jul 15 18:13:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 18:13:33 2007 Subject: [Frugalware-git] frugalware-current: mailx-12.3-1-i686 Message-ID: <20070715161330.7F51A13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=01085af911f841a86567d9f89dff1853d7827693 commit 01085af911f841a86567d9f89dff1853d7827693 Author: voroskoi Date: Sun Jul 15 18:09:36 2007 +0200 mailx-12.3-1-i686 version bump diff --git a/source/network/mailx/FrugalBuild b/source/network/mailx/FrugalBuild index 99fab8d..b3bc599 100644 --- a/source/network/mailx/FrugalBuild +++ b/source/network/mailx/FrugalBuild @@ -4,8 +4,8 @@ # Maintainer: voroskoi pkgname=mailx -pkgver=12.2 -pkgrel=2 +pkgver=12.3 +pkgrel=1 pkgdesc="A MUA derived from Berkeley Mail 8.1 and contains builtin support for MIME messages and IPv6" _F_sourceforge_dirname="heirloom" _F_sourceforge_ext=".tar.bz2" @@ -28,6 +28,6 @@ build() Fln $pkgname /usr/bin/mail Fln $pkgname.1.gz /usr/share/man/man1/mail.1.gz } -sha1sums=('8ccc9633a156e9137097855e56ca2011cdcd8ec5') +sha1sums=('5d5c17a7c4557953b2cf7796fc28974511e8fe59') # optimization OK From voroskoi at frugalware.org Sun Jul 15 18:48:32 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 18:49:03 2007 Subject: [Frugalware-git] frugalware-current: curl-7.16.4-1-i686 Message-ID: <20070715164832.F37AE13A411E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=df97a1fb595f37cdc512d05da267c11f19df969e commit df97a1fb595f37cdc512d05da267c11f19df969e Author: voroskoi Date: Sun Jul 15 18:44:25 2007 +0200 curl-7.16.4-1-i686 version bump diff --git a/source/network/curl/FrugalBuild b/source/network/curl/FrugalBuild index 3fdb4a7..f05bf64 100644 --- a/source/network/curl/FrugalBuild +++ b/source/network/curl/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=curl -pkgver=7.16.3 +pkgver=7.16.4 pkgrel=1 pkgdesc="A command line tool for transferring data specified with URL syntax." url="http://curl.haxx.se" From voroskoi at frugalware.org Sun Jul 15 18:56:49 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 18:56:52 2007 Subject: [Frugalware-git] frugalware-current: clearsilver-0.10.5-1-i686 Message-ID: <20070715165649.F108D13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=953e1624be83dbdbe28f38c353e4eccad1a869bc commit 953e1624be83dbdbe28f38c353e4eccad1a869bc Author: voroskoi Date: Sun Jul 15 18:53:32 2007 +0200 clearsilver-0.10.5-1-i686 version bump diff --git a/source/network-extra/clearsilver/FrugalBuild b/source/network-extra/clearsilver/FrugalBuild index 709514d..c45f3de 100644 --- a/source/network-extra/clearsilver/FrugalBuild +++ b/source/network-extra/clearsilver/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=clearsilver -pkgver=0.10.4 +pkgver=0.10.5 pkgrel=1 pkgdesc="Clearsilver is a fast, powerful, and language-neutral HTML template system." url="http://www.clearsilver.net" @@ -12,7 +12,7 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.clearsilver.net/downloads/ |grep tar |sed -ne 's/.*-\(.*\).ta.*/\1/;1p'" source=(http://www.clearsilver.net/downloads/clearsilver-$pkgver.tar.gz) -sha1sums=('f1f303983a4f43e2f31be7302e7ecbde8010569f') +sha1sums=('138865dc91e27328fe29fcaaac1bc6558f19dd75') build() { From janny at frugalware.org Sun Jul 15 19:01:33 2007 From: janny at frugalware.org (janny) Date: Sun Jul 15 19:01:35 2007 Subject: [Frugalware-git] frugalware-current: squashfs up Message-ID: <20070715170133.E163F13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d521fe0293947a06a2a993ede3ef276ced2b9bb0 commit d521fe0293947a06a2a993ede3ef276ced2b9bb0 Author: janny Date: Sun Jul 15 19:00:59 2007 +0200 squashfs up diff --git a/source/apps-extra/squashfs/FrugalBuild b/source/apps-extra/squashfs/FrugalBuild index b5b915b..947b24d 100644 --- a/source/apps-extra/squashfs/FrugalBuild +++ b/source/apps-extra/squashfs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=squashfs pkgver=3.2_r2 -kver=2.6.21-1 +kver=2.6.22-1 kdir=/lib/modules/${kver/-/-fw}/kernel/fs/squashfs pkgrel=4 pkgdesc="A highly compressed read-only filesystem for Linux." @@ -16,7 +16,7 @@ Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=63835|grep squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'" source=(${source/squashfs-/squashfs} \ http://$_F_sourceforge_mirror.dl.sourceforge.net/sevenzip/lzma443.tar.bz2 \ - ftp://ftp.slax.org/source/slax/kernel/2.6.20/src-core/patches/squashfs/sqlzma.tar.bz2 \ + ftp://ftp.slax.org/source/slax/kernel/2.6.21.5/src-core/patches/squashfs/sqlzma.tar.bz2 \ mksquashfs.quiet.patch) options=('scriptlet') @@ -29,16 +29,16 @@ build() patch -p0 Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6d05bfe5c9a92e84e9230579a31fc615e828e5f8 commit 6d05bfe5c9a92e84e9230579a31fc615e828e5f8 Author: voroskoi Date: Sun Jul 15 19:02:43 2007 +0200 mediawiki-1.10.1-1-i686 version bump diff --git a/source/network-extra/mediawiki/FrugalBuild b/source/network-extra/mediawiki/FrugalBuild index 2d2698e..8d08dd4 100644 --- a/source/network-extra/mediawiki/FrugalBuild +++ b/source/network-extra/mediawiki/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=mediawiki -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=1 pkgdesc="The collaborative editing software that runs Wikipedia" _F_sourceforge_dirname="wikipedia" @@ -25,6 +25,6 @@ build() Fexe /usr/bin/mediawikisetup } # php code, no need of optimalization -sha1sums=('b6755aa7187ee8db1b52302797dc23f2df3b7c1e'\ - '2c70930c46b8a5d87e830f64dc2761c5506ce967'\ +sha1sums=('16429c3a611dec82c0cfd998180190544982a5ee' \ + '2c70930c46b8a5d87e830f64dc2761c5506ce967' \ 'b9810ea6531b4f61e41778b76f7601f2c4f9b0e2') From voroskoi at frugalware.org Sun Jul 15 19:07:53 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 19:07:54 2007 Subject: [Frugalware-git] frugalware-current: imap-2006j2-1-i686 Message-ID: <20070715170753.4700413A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0370d7e9d29a8708013ab39a59a581b21f21f547 commit 0370d7e9d29a8708013ab39a59a581b21f21f547 Author: voroskoi Date: Sun Jul 15 19:04:50 2007 +0200 imap-2006j2-1-i686 version bump diff --git a/source/network-extra/imap/FrugalBuild b/source/network-extra/imap/FrugalBuild index e1eb534..64d6f65 100644 --- a/source/network-extra/imap/FrugalBuild +++ b/source/network-extra/imap/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=imap -pkgver=2006j1 +pkgver=2006j2 pkgrel=1 extrapkgver= pkgdesc="An IMAP/POP server" @@ -12,7 +12,7 @@ groups=('network-extra') archs=('i686' 'x86_64') depends=('openssl') up2date="lynx -dump 'http://ftp.ntua.gr/pub/net/mail/imap/?M=D'|grep imap-[0-9a-z\.]*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$extrapkgver//;1 p'" -source=(ftp://ftp.cac.washington.edu/imap/$pkgname-$pkgver$extrapkgver.tar.Z $pkgname-$pkgver-big.patch) +source=(ftp://ftp.cac.washington.edu/imap/$pkgname-$pkgver$extrapkgver.tar.Z $pkgname-2006j1-big.patch) build() { Fcd imap-2006j @@ -63,7 +63,7 @@ EOF umask 022 done } -sha1sums=('2ccac428950914a0855898ce175e37e47e467460' \ +sha1sums=('41fc3f8cf11f1931a9c046240bc04ceb9f1416c0' \ 'c38171e2295e9ddba15f5e91b7327020ae191fcf') # optimization OK From voroskoi at frugalware.org Sun Jul 15 20:03:14 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 20:03:16 2007 Subject: [Frugalware-git] frugalware-current: kshowmail-3.2.1-1-i686 Message-ID: <20070715180314.6BC1B13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=384305177b3a50cf73c94a7b4e6a3d405c3ad159 commit 384305177b3a50cf73c94a7b4e6a3d405c3ad159 Author: voroskoi Date: Sun Jul 15 20:00:18 2007 +0200 kshowmail-3.2.1-1-i686 version bump diff --git a/source/kde-extra/kshowmail/FrugalBuild b/source/kde-extra/kshowmail/FrugalBuild index 9d169e2..696e7b7 100644 --- a/source/kde-extra/kshowmail/FrugalBuild +++ b/source/kde-extra/kshowmail/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=kshowmail -pkgver=3.1.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="KShowmail is a POP3 mail checker for the KDE." _F_kde_defaults=0 @@ -14,11 +14,4 @@ groups=('kde-extra') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=45904 |grep kshowmail-3.*t |sed -n 's/.*l-\(.*\)\.t.*/\1/;1 p'" -source=($source admin.patch) -sha1sums=('a85d30f0ec147feb7cd7d42464a6cceb69bd1222'\ - 'd71df047b2da0186f9da6342d858c96ebd94df94') - - - - -# optimization OK +sha1sums=('d5be5a9d839506212fb7545b1a2e7aba3101cbbb') From priyank at frugalware.org Sun Jul 15 20:07:34 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 15 20:07:37 2007 Subject: [Frugalware-git] frugalware-current: fbpanel-4.11-1-i686 Message-ID: <20070715180734.604FB13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=98c6bafc93ed2ff1e22f14c6de2db93b59ef89fb commit 98c6bafc93ed2ff1e22f14c6de2db93b59ef89fb Author: Priyank Date: Sun Jul 15 23:33:11 2007 +0530 fbpanel-4.11-1-i686 * Version bump diff --git a/source/x11-extra/fbpanel/FrugalBuild b/source/x11-extra/fbpanel/FrugalBuild index 78cff6d..1ad503e 100644 --- a/source/x11-extra/fbpanel/FrugalBuild +++ b/source/x11-extra/fbpanel/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.05 SBU +# Compiling Time: 0.04 SBU # Maintainer: Priyank Gosalia # Old Maintainer: BMH1980 pkgname=fbpanel -pkgver=4.10 +pkgver=4.11 pkgrel=1 pkgdesc="fbpanel is a lightweight, NETWM compliant desktop panel." _F_sourceforge_ext=".tgz" @@ -13,7 +13,7 @@ license="GPL" depends=('gtk+2' 'libxpm') groups=('x11-extra') archs=('i686' 'x86_64') -sha1sums=('5381f43321d6326f056df444bc7c54a6db07a052') +sha1sums=('7c79c7a3ad913bedec522c33b1b9e1e2b3571242') build() { From voroskoi at frugalware.org Sun Jul 15 21:14:58 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 15 21:15:00 2007 Subject: [Frugalware-git] frugalware-current: smb4k-0.8.4-1-i686 Message-ID: <20070715191458.3019013A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=01aa24ad3eabe820a3f59b00e9a53a789099c216 commit 01aa24ad3eabe820a3f59b00e9a53a789099c216 Author: voroskoi Date: Sun Jul 15 21:11:29 2007 +0200 smb4k-0.8.4-1-i686 version bump diff --git a/source/kde-extra/smb4k/FrugalBuild b/source/kde-extra/smb4k/FrugalBuild index a9b3d0e..50ff7cf 100644 --- a/source/kde-extra/smb4k/FrugalBuild +++ b/source/kde-extra/smb4k/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=smb4k -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=1 pkgdesc="Smb4K is a SMB/CIFS share browser for KDE." _F_berlios_ext=".tar.bz2" @@ -13,6 +13,6 @@ depends=('kdebase') rodepends=('samba-client') groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') -sha1sums=('22d9b2b43e9c5cad992ecedf146f18e5422226fb') +sha1sums=('eb04a9f09bf47d0c5b952416454d0255b4c776d5') # optimization OK From vmiklos at frugalware.org Sun Jul 15 21:33:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 21:33:15 2007 Subject: [Frugalware-git] frugalware-current: codeville-0.8.0-1-i686 Message-ID: <20070715193312.1F00F13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7b400af67962ce35bf96d1375a7365bd292893e0 commit 7b400af67962ce35bf96d1375a7365bd292893e0 Author: VMiklos Date: Sun Jul 15 21:28:46 2007 +0200 codeville-0.8.0-1-i686 version bump diff --git a/source/devel-extra/codeville/FrugalBuild b/source/devel-extra/codeville/FrugalBuild index f673473..6ddb713 100644 --- a/source/devel-extra/codeville/FrugalBuild +++ b/source/devel-extra/codeville/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=codeville -pkgver=0.1.16 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 pkgdesc="A distributed version control system." url="http://codeville.org/" depends=('python') @@ -11,7 +11,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.php|grep gz$|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/download/Codeville-$pkgver.tar.gz) -sha1sums=('ebde62d9a14afe03b206f8b11f88b801bc17c32e') +sha1sums=('5f3bbbf80dd07d34ad0f95c0f7f1aea44d21e257') build() { From vmiklos at frugalware.org Sun Jul 15 21:44:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 21:44:49 2007 Subject: [Frugalware-git] frugalware-current: xmms-infopipe-1.3-2-i686 Message-ID: <20070715194448.26FB313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=11187d7757fa92f10e1da9e30abf73b18e452de4 commit 11187d7757fa92f10e1da9e30abf73b18e452de4 Author: VMiklos Date: Sun Jul 15 21:44:41 2007 +0200 xmms-infopipe-1.3-2-i686 rebuild + spelling fix diff --git a/source/xlib-extra/xmms-infopipe/FrugalBuild b/source/xlib-extra/xmms-infopipe/FrugalBuild index 82c2006..2516ee5 100644 --- a/source/xlib-extra/xmms-infopipe/FrugalBuild +++ b/source/xlib-extra/xmms-infopipe/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xmms-infopipe pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="XMMS infopipe plugin " url="http://www.beastwithin.org/users/wwwwolf/code/xmms/infopipe.html" depends=('xmms') @@ -13,5 +13,4 @@ up2date="lynx -dump http://www.beastwithin.org/users/wwwwolf/code/xmms/infopipe. source=(http://www.beastwithin.org/users/wwwwolf/code/xmms/$pkgname-$pkgver.tar.gz) license="GPL2" sha1sums=('c9887d6ba262c7e580285b34232418acdf7cde88') - -# optimalization OK +# optimization OK From vmiklos at frugalware.org Sun Jul 15 22:27:01 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 22:27:03 2007 Subject: [Frugalware-git] frugalware-current: xchat-systray-integration-2.4.5-4-x86_64 Message-ID: <20070715202701.ADF3913A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=55ea2e34c3f0b677ee9d277a708576b6368248bd commit 55ea2e34c3f0b677ee9d277a708576b6368248bd Author: VMiklos Date: Sun Jul 15 22:26:12 2007 +0200 xchat-systray-integration-2.4.5-4-x86_64 rebuild (oldies list) diff --git a/source/xapps-extra/xchat-systray-integration/FrugalBuild b/source/xapps-extra/xchat-systray-integration/FrugalBuild index 92db7d8..cb2bdf2 100644 --- a/source/xapps-extra/xchat-systray-integration/FrugalBuild +++ b/source/xapps-extra/xchat-systray-integration/FrugalBuild @@ -4,7 +4,7 @@ pkgname=xchat-systray-integration pkgver=2.4.5 -pkgrel=3 +pkgrel=4 pkgdesc="Systray integration for xchat" _F_sourceforge_dirname="xchat2-plugins" _F_sourceforge_ext="-src.tar.gz" @@ -26,4 +26,4 @@ build() chmod -x $Fdestdir/usr/lib/xchat/plugins/{GTKTray,Menu,Win32Tray}/* } -# optimalization OK +# optimization OK From vmiklos at frugalware.org Sun Jul 15 22:55:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 22:56:00 2007 Subject: [Frugalware-git] frugalware-current: wnews-0.8-1-x86_64 Message-ID: <20070715205558.554A313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1c3e1fab11ea8120d35b981f82cc0fca6978c6f8 commit 1c3e1fab11ea8120d35b981f82cc0fca6978c6f8 Author: VMiklos Date: Sun Jul 15 22:54:50 2007 +0200 wnews-0.8-1-x86_64 version bump moved to extra diff --git a/source/network-extra/wnews/FrugalBuild b/source/network-extra/wnews/FrugalBuild new file mode 100644 index 0000000..ad6a507 --- /dev/null +++ b/source/network-extra/wnews/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.03 SBU +# Maintainer: VMiklos + +pkgname=wnews +pkgver=0.8 +pkgrel=1 +pkgdesc="A console-based RSS news reader for UNIX platforms." +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/'" +source=(http://www.kerneled.org/projects/wnews/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('32a20771a79a6c8d4b7d52f68098c859b10cb779') + +build() +{ + Fmake + Fmkdir /usr/bin /usr/share/man/man1 + make PREFIX=$Fdestdir/usr INSDIR=$Fdestdir/usr/share/man/man1 install +} + +# optimization OK diff --git a/source/network/wnews/FrugalBuild b/source/network/wnews/FrugalBuild deleted file mode 100644 index 6d07bb4..0000000 --- a/source/network/wnews/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.03 SBU -# Maintainer: VMiklos - -pkgname=wnews -pkgver=0.7 -pkgrel=1 -pkgdesc="A console-based RSS news reader for UNIX platforms." -url="http://www.kerneled.org/projects/wnews/" -depends=('ncurses') -groups=('network') -archs=('i686' 'x86_64') -up2date="lynx -dump $url/releases|grep [0-9].tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'" -source=(http://www.kerneled.org/projects/wnews/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('537f71646e02ffc9e4cdf6d320d79518803a2e69') - -build() -{ - Fmake || return 1 - Fmkdir /usr/bin /usr/man/man1 - make PREFIX=$Fdestdir/$Fprefix INSDIR=$Fdestdir/$Fprefix/man/man1 \ - install -} - - -# optimization OK From vmiklos at frugalware.org Sun Jul 15 23:55:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 23:55:37 2007 Subject: [Frugalware-git] frugalware-current: cfv-1.18.1-1-x86_64 Message-ID: <20070715215535.4080313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=99aae5dd3380ecdbe409ee2a2eae1539fc6f8091 commit 99aae5dd3380ecdbe409ee2a2eae1539fc6f8091 Author: VMiklos Date: Sun Jul 15 23:55:29 2007 +0200 cfv-1.18.1-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/cfv/FrugalBuild b/source/apps-extra/cfv/FrugalBuild index 800970d..9a68344 100644 --- a/source/apps-extra/cfv/FrugalBuild +++ b/source/apps-extra/cfv/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="A utility to both test and create .sfv, .csv, .crc, and other files." depends=('python') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') Finclude sourceforge sha1sums=('435f155235ee1c62baadde2d7d0bbcfc4245bc12') _F_makepkg_chkdep="python" From vmiklos at frugalware.org Sun Jul 15 23:58:04 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 15 23:58:06 2007 Subject: [Frugalware-git] frugalware-current: stgit-0.12.1-1-x86_64 Message-ID: <20070715215804.1105B13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6eca3c3d6e6cffb3ae3b9f35611b2747e903a04d commit 6eca3c3d6e6cffb3ae3b9f35611b2747e903a04d Author: VMiklos Date: Sun Jul 15 23:58:00 2007 +0200 stgit-0.12.1-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/stgit/FrugalBuild b/source/devel-extra/stgit/FrugalBuild index 9eb1e95..b5f2238 100644 --- a/source/devel-extra/stgit/FrugalBuild +++ b/source/devel-extra/stgit/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Provides similar functionality to Quilt on top of GIT." url="http://www.procode.org/stgit/" depends=('python' 'git') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url|Flasttar" source=(http://homepage.ntlworld.com/cmarinas/stgit/stgit-$pkgver.tar.gz) sha1sums=('6832ed2a83425896202eee9efda2aa9e26a961d2') From vmiklos at frugalware.org Mon Jul 16 00:32:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:32:57 2007 Subject: [Frugalware-git] frugalware-current: autoconf-archive-2007_06_27-1-x86_64 Message-ID: <20070715223255.32C6313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f28c7abcc74390fc1eafb7f8459b96fa160332b6 commit f28c7abcc74390fc1eafb7f8459b96fa160332b6 Author: VMiklos Date: Mon Jul 16 00:32:50 2007 +0200 autoconf-archive-2007_06_27-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/autoconf-archive/FrugalBuild b/source/devel-extra/autoconf-archive/FrugalBuild index 0a4e602..78ef16d 100644 --- a/source/devel-extra/autoconf-archive/FrugalBuild +++ b/source/devel-extra/autoconf-archive/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Aims to provide a collection of reusable Autoconf macros." url="http://autoconf-archive.cryp.to/" depends=('autoconf') groups=('devel-extra') -archs=('i686') +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') From vmiklos at frugalware.org Mon Jul 16 00:36:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:36:12 2007 Subject: [Frugalware-git] frugalware-current: xmltv-0.5.45-1-x86_64 Message-ID: <20070715223610.522DF13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a0f3f11424ca2c635d24c4cd3369e0ab563264ad commit a0f3f11424ca2c635d24c4cd3369e0ab563264ad Author: VMiklos Date: Mon Jul 16 00:36:06 2007 +0200 xmltv-0.5.45-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/xmltv/FrugalBuild b/source/apps-extra/xmltv/FrugalBuild index 31c5428..11c38ba 100644 --- a/source/apps-extra/xmltv/FrugalBuild +++ b/source/apps-extra/xmltv/FrugalBuild @@ -12,7 +12,7 @@ depends=('perl-xml' 'perl-xml-twig' 'perl-libwww' 'perl-archive-zip' 'perl-cgi' 'perl-html-parser' 'perl-datemanip' 'perl-xml-libxml' 'perl-term-progressbar' 'perl-html-tree' \ 'perl-xml-writer' 'perl-unicode-string') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('ac63d247a8b8fb4b50355b3eefebd1b5cccb23bb') build() { From vmiklos at frugalware.org Mon Jul 16 00:37:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:37:48 2007 Subject: [Frugalware-git] frugalware-current: lrzip-0.18-1-x86_64 Message-ID: <20070715223747.4716513A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=591edb15c873779fb60fd9def4303d6f7d196e25 commit 591edb15c873779fb60fd9def4303d6f7d196e25 Author: VMiklos Date: Mon Jul 16 00:37:43 2007 +0200 lrzip-0.18-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/lrzip/FrugalBuild b/source/apps-extra/lrzip/FrugalBuild index 5e50c06..48a682a 100644 --- a/source/apps-extra/lrzip/FrugalBuild +++ b/source/apps-extra/lrzip/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A compression program optimized for large files." url="http://ck.kolivas.org/apps/lrzip/" depends=('lzo') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url | grep $pkgname | Flasttarbz2" source=($url/$pkgname-$pkgver.tar.bz2) sha1sums=('93a86b9616660ed1205c4779972f1aefe866e29b') From vmiklos at frugalware.org Mon Jul 16 00:41:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:41:57 2007 Subject: [Frugalware-git] frugalware-current: gpsbabel-1.3.3-1-x86_64 Message-ID: <20070715224153.E380113A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7890544e6f59a6af644516fa52c0571ef9bdefed commit 7890544e6f59a6af644516fa52c0571ef9bdefed Author: VMiklos Date: Mon Jul 16 00:41:49 2007 +0200 gpsbabel-1.3.3-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/gpsbabel/FrugalBuild b/source/apps-extra/gpsbabel/FrugalBuild index 9896454..26058e8 100644 --- a/source/apps-extra/gpsbabel/FrugalBuild +++ b/source/apps-extra/gpsbabel/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="converts GPS waypoints, tracks, and routes from one format to another" depends=() groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.gz" _F_sourceforge_broken_up2date=1 Finclude sourceforge From vmiklos at frugalware.org Mon Jul 16 00:43:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:43:20 2007 Subject: [Frugalware-git] frugalware-current: kernel-fwlive-2.6.22-1-i686 Message-ID: <20070715224315.D630E13A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=521faf395bd183de376ea918602fb4922a3fc0c9 commit 521faf395bd183de376ea918602fb4922a3fc0c9 Author: VMiklos Date: Mon Jul 16 00:42:54 2007 +0200 kernel-fwlive-2.6.22-1-i686 add patch from http://www.slax.org/forum/viewtopic.php?t=18442 to fix squashfs build diff --git a/source/base-extra/kernel-fwlive/FrugalBuild b/source/base-extra/kernel-fwlive/FrugalBuild index 4ecf16d..b5f7b82 100644 --- a/source/base-extra/kernel-fwlive/FrugalBuild +++ b/source/base-extra/kernel-fwlive/FrugalBuild @@ -12,7 +12,8 @@ _F_kernel_patches=(http://frugalware.org/~janny/patchs/kernel/$pkgver/aacraid.di http://frugalware.org/~janny/patchs/kernel/$pkgver/squashfs3.2-patch \ http://frugalware.org/~janny/patchs/kernel/$pkgver/ksize.patch \ http://frugalware.org/~janny/patchs/kernel/$pkgver/lhash.diff \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/sqlzma2k-3.2-r2.patch) + http://frugalware.org/~janny/patchs/kernel/$pkgver/sqlzma2k-3.2-r2.patch \ + http://ftp.frugalware.org/pub/other/sources/kernel/linux-2.6.22-squashfs_fixup.patch) Finclude kernel source=(config ${source[@]}) signatures=('' "${signatures[@]}") From vmiklos at frugalware.org Mon Jul 16 00:43:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:44:03 2007 Subject: [Frugalware-git] frugalware-current: convmv-1.10-1-x86_64 Message-ID: <20070715224344.06AD3186820C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=289528d791d8d37d84b9de64bb351c2e5c05ea8f commit 289528d791d8d37d84b9de64bb351c2e5c05ea8f Author: VMiklos Date: Mon Jul 16 00:43:39 2007 +0200 convmv-1.10-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/convmv/FrugalBuild b/source/apps-extra/convmv/FrugalBuild index 4a4de15..4e61b01 100644 --- a/source/apps-extra/convmv/FrugalBuild +++ b/source/apps-extra/convmv/FrugalBuild @@ -6,7 +6,7 @@ pkgver=1.10 pkgrel=1 pkgdesc="A version of 'mv' which is capable of converting the charset of file names." url="http://j3e.de/linux/convmv" -archs=('i686') +archs=('i686' 'x86_64') groups=('apps-extra') depends=('perl') up2date="lynx -dump $url | Flasttar" From vmiklos at frugalware.org Mon Jul 16 00:46:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:46:58 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-0.10.3-4-x86_64 Message-ID: <20070715224657.6AE4313A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a8b3f1f1f895be51afac68fe659b41524a1964ee commit a8b3f1f1f895be51afac68fe659b41524a1964ee Author: VMiklos Date: Mon Jul 16 00:46:54 2007 +0200 ivtv-utils-0.10.3-4-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/ivtv-utils/FrugalBuild b/source/apps-extra/ivtv-utils/FrugalBuild index f1bee98..06b71e0 100644 --- a/source/apps-extra/ivtv-utils/FrugalBuild +++ b/source/apps-extra/ivtv-utils/FrugalBuild @@ -12,7 +12,7 @@ depends=('libstdc++') rodepends=('ivtv-firmware') conflicts=('ivtv') groups=('apps-extra') -archs=('i686') +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) From vmiklos at frugalware.org Mon Jul 16 00:54:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 00:54:13 2007 Subject: [Frugalware-git] frugalware-current: squashfs-3.2_r2-5-i686 Message-ID: <20070715225410.BECA713A411B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c1853e8df25fe0585f0a3954c4049b58954a53ac commit c1853e8df25fe0585f0a3954c4049b58954a53ac Author: VMiklos Date: Mon Jul 16 00:53:35 2007 +0200 squashfs-3.2_r2-5-i686 rebuild with kernel-fwlive-2.6.22-1 diff --git a/source/apps-extra/squashfs/FrugalBuild b/source/apps-extra/squashfs/FrugalBuild index 947b24d..7e82bd9 100644 --- a/source/apps-extra/squashfs/FrugalBuild +++ b/source/apps-extra/squashfs/FrugalBuild @@ -5,7 +5,7 @@ pkgname=squashfs pkgver=3.2_r2 kver=2.6.22-1 kdir=/lib/modules/${kver/-/-fw}/kernel/fs/squashfs -pkgrel=4 +pkgrel=5 pkgdesc="A highly compressed read-only filesystem for Linux." depends=('zlib' "kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") From krics at linuxforum.hu Mon Jul 16 08:05:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 08:05:48 2007 Subject: [Frugalware-git] frugalware-current: xchat-2.8.4-2-i686 Message-ID: <20070716060541.99EDF1868212@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e44f617d5de531b3acdb508382e4a0ba125bc04a commit e44f617d5de531b3acdb508382e4a0ba125bc04a Author: Christian Hamar alias krix Date: Mon Jul 16 08:04:51 2007 +0200 xchat-2.8.4-2-i686 * Release bump * Fixed up2date * Added upstream patch for scrollback dir fix diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild index 99b3107..b9758a0 100644 --- a/source/xapps/xchat/FrugalBuild +++ b/source/xapps/xchat/FrugalBuild @@ -4,17 +4,18 @@ pkgname=xchat pkgver=2.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+2 based IRC client" url="http://www.xchat.org/" depends=('gtk+2>=2.10.7' 'openssl' 'glib2' 'gdk-pixbuf' 'libsexy' 'dbus-glib') makedepends=('python' 'perl' 'tcl') groups=('xapps') archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep Source | grep -v Fedora |sed 's/.* \([0-9\.]*\)$/\1/'" +up2date="lynx -dump $url|grep Source: | sed 's/.* \([0-9\.]*\)$/\1/'" source=(http://www.xchat.org/files/source/`echo $pkgver|sed 's/\([0-9].[0-9]\).[0-9]/\1/'`/$pkgname-$pkgver.tar.bz2 \ README.Frugalware \ - xchat-2.6.1-fw.diff) + xchat-2.6.1-fw.diff \ + http://www.xchat.org/files/source/2.8/patches/xc284-scrollbmkdir.diff) #_F_gnome_schemas=('etc/gconf/schemas/apps_xchat_url_handler.schemas') _F_gnome_desktop="y" options=('scriptlet') @@ -41,5 +42,6 @@ build() { sha1sums=('6ac509624c241edfac5d53d9d4ece63d917613d6' \ 'd3042890e443739f4637ccd289d4a04b7d5b879b' \ - 'f05f3ffc59e0dc9241d31d4786a4cca893592e99') + 'f05f3ffc59e0dc9241d31d4786a4cca893592e99' \ + '1f6c5071ffc16f9012c82f3f84739083806285f0') # optimization OK From vmiklos at frugalware.org Mon Jul 16 10:14:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 10:14:12 2007 Subject: [Frugalware-git] fwlive: live-base: add empty dirs compile-time Message-ID: <20070716081409.8DACB18681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive/.git;a=commitdiff;h=8c481519b24c0ecebbed62d9b51fa3c936b68d93 commit 8c481519b24c0ecebbed62d9b51fa3c936b68d93 Author: VMiklos Date: Mon Jul 16 10:14:01 2007 +0200 live-base: add empty dirs compile-time as git deletes dirs when you delete the last file from the dir diff --git a/Makefile b/Makefile index 91d7e71..ce8fb8c 100644 --- a/Makefile +++ b/Makefile @@ -197,6 +197,7 @@ create-users: checkroot live-base: checkroot cp -a live-base ${CHROOTDIR}/${TREE}/tmp/ + mkdir -p ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/boot/grub ${CHROOTDIR}/${TREE}/tmp/live-base/initrd/rootfs/{lib,bin,etc} ln -sf configsave ${CHROOTDIR}/${TREE}/usr/local/bin/configrestore cp ${CHROOTDIR}/${TREE}/tmp/live-base/tools/* ${CHROOTDIR}/${TREE}/usr/local/bin/ cp ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/linux/make_iso.sh ${CHROOTDIR}/${TREE}/usr/local/bin/ From vmiklos at frugalware.org Mon Jul 16 10:39:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 10:39:43 2007 Subject: [Frugalware-git] fwlive: README: updated for git Message-ID: <20070716083941.3013D18681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive/.git;a=commitdiff;h=8682054e73d2b98093e4483cdefd274c2af3ee41 commit 8682054e73d2b98093e4483cdefd274c2af3ee41 Author: VMiklos Date: Mon Jul 16 10:39:35 2007 +0200 README: updated for git diff --git a/README b/README index 94fbc49..3e056ec 100644 --- a/README +++ b/README @@ -5,15 +5,15 @@ Building To build the livecd: - # make + $ sudo make To clean up compiled code in the source dir: - # make clean + $ sudo make clean To remove the building chroot: - # make distclean + $ sudo make distclean >From scratch ------------ @@ -21,13 +21,11 @@ From scratch If you never compiled the FWLive, you need the following steps: cd ~ -mkdir darcs -cd darcs -darcs get --partial http://darcs.frugalware.org/repos/fwlive -darcs get --partial http://darcs.frugalware.org/repos/translations -su - -ln -s ~user/darcs ./ -cd darcs/fwlive +mkdir -p git +cd git +git clone http://git.frugalware.org/repos/fwlive/.git +git clone http://git.frugalware.org/repos/translations/.git +cd fwlive Check if all referenced repos are configured. Check the TREE variable in the file 'config': for example if it contains 'current' then check if current is From vmiklos at frugalware.org Mon Jul 16 10:40:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 10:40:37 2007 Subject: [Frugalware-git] fwlive: NEWS: updates for 0.7.2 Message-ID: <20070716084035.15CA418681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive/.git;a=commitdiff;h=83c895571cc02cee6328231db7d0febf0ae9155c commit 83c895571cc02cee6328231db7d0febf0ae9155c Author: VMiklos Date: Mon Jul 16 10:40:24 2007 +0200 NEWS: updates for 0.7.2 diff --git a/NEWS b/NEWS index 2eb9e7c..c3d5d9d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.7.2 - output cleanups (hermier) + - spelling fixes (boobaa) + - support for kernel-2.6.22 (janny) + - converted to git, some git-related fixes (vmiklos) 0.7.1 - gettext support, can be translated via pootle (vmiklos) - now using ntfs-3g for ntfs partitions (janny) - the iso now contains a netinstall, too (vmiklos) From krics at linuxforum.hu Mon Jul 16 13:07:43 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 13:07:46 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-intel-2.1.0-1-i686 Message-ID: <20070716110743.28A551868213@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=62cc738b947f22e7bb9cae9b7a6edd1dc6ed568c commit 62cc738b947f22e7bb9cae9b7a6edd1dc6ed568c Author: Christian Hamar alias krix Date: Mon Jul 16 13:06:43 2007 +0200 xf86-video-intel-2.1.0-1-i686 * New package / Initial import - NOTE: It compiles with 1.2.0 xorg too, just not using new modeline stuff - Need testing. - Conlicts with xf86-video-i810 diff --git a/source/x11/xf86-video-intel/FrugalBuild b/source/x11/xf86-video-intel/FrugalBuild new file mode 100644 index 0000000..e5308fc --- /dev/null +++ b/source/x11/xf86-video-intel/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.24 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xf86-video-intel +pkgver=2.1.0 +pkgrel=1 +pkgdesc="X.Org driver for Intel cards (opensource)" +groups=('x11' 'xorg-core' 'xorg-drivers') +archs=('i686' 'x86_64') +depends=('xorg-server>=1.2.0-3' 'libxvmc') +makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ + 'xf86dgaproto' 'glproto' 'xineramaproto') +Finclude xorg +conflicts=('xf86-video-i810') +up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/driver/|grep $pkgname|Flasttarbz2" +source=(http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 \ + README.Frugalware) +_F_cd_path="$pkgname-$pkgver" +Fconfopts="$Fconfopts --enable-dri" + +# Later we can add pciaccess to depends (if at last released) +# Compiles with xorg 1.2.0 too, just not using the new modelines stuff + +sha1sums=('007412d72428e2dbc067a5d6fa00fbcfcc9c99c4' \ + '2ef0ded43b506bf2366c23ceec97a81f85b8e0c8') +# optimization OK diff --git a/source/x11/xf86-video-intel/README.Frugalware b/source/x11/xf86-video-intel/README.Frugalware new file mode 100644 index 0000000..58d4c2e --- /dev/null +++ b/source/x11/xf86-video-intel/README.Frugalware @@ -0,0 +1,8 @@ +New generation of Intel driver, replaces xf86-video-i810 + +You need to reconf xorg and replace Driver "i810" to Driver "intel" + +Thats all. + +Regards +-krix- From krics at linuxforum.hu Mon Jul 16 13:14:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 13:14:23 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-i810-1.7.4-3-i686 Message-ID: <20070716111421.DFE8C18681E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=690aa115b09837708aa590eeae7a192ac320bd17 commit 690aa115b09837708aa590eeae7a192ac320bd17 Author: Christian Hamar alias krix Date: Mon Jul 16 13:13:56 2007 +0200 xf86-video-i810-1.7.4-3-i686 * Release bump * Added conflicts=('x86-video-intel') because now we got -intel drv diff --git a/source/x11/xf86-video-i810/FrugalBuild b/source/x11/xf86-video-i810/FrugalBuild index 32914c0..4693730 100644 --- a/source/x11/xf86-video-i810/FrugalBuild +++ b/source/x11/xf86-video-i810/FrugalBuild @@ -3,13 +3,14 @@ pkgname=xf86-video-i810 pkgver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org driver for i810 cards" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') depends=('xorg-server>=1.2.0-3' 'libxvmc') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ 'xf86dgaproto' 'glproto' 'xineramaproto') +conflicts=('xf86-video-intel') Finclude xorg # to be removed on next 'stable not mixed bump' up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/driver/|grep $pkgname|Flasttarbz2" From vmiklos at frugalware.org Mon Jul 16 13:27:04 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 13:27:06 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-intel-2.1.0-1-i686 Message-ID: <20070716112704.4C82718681E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2749ccdf7413c0c56229fda212fa564070382a9e commit 2749ccdf7413c0c56229fda212fa564070382a9e Author: VMiklos Date: Mon Jul 16 13:26:56 2007 +0200 xf86-video-intel-2.1.0-1-i686 moved to extra because it conflicts with i810 diff --git a/source/x11-extra/xf86-video-intel/FrugalBuild b/source/x11-extra/xf86-video-intel/FrugalBuild new file mode 100644 index 0000000..e5308fc --- /dev/null +++ b/source/x11-extra/xf86-video-intel/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.24 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xf86-video-intel +pkgver=2.1.0 +pkgrel=1 +pkgdesc="X.Org driver for Intel cards (opensource)" +groups=('x11' 'xorg-core' 'xorg-drivers') +archs=('i686' 'x86_64') +depends=('xorg-server>=1.2.0-3' 'libxvmc') +makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ + 'xf86dgaproto' 'glproto' 'xineramaproto') +Finclude xorg +conflicts=('xf86-video-i810') +up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/driver/|grep $pkgname|Flasttarbz2" +source=(http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 \ + README.Frugalware) +_F_cd_path="$pkgname-$pkgver" +Fconfopts="$Fconfopts --enable-dri" + +# Later we can add pciaccess to depends (if at last released) +# Compiles with xorg 1.2.0 too, just not using the new modelines stuff + +sha1sums=('007412d72428e2dbc067a5d6fa00fbcfcc9c99c4' \ + '2ef0ded43b506bf2366c23ceec97a81f85b8e0c8') +# optimization OK diff --git a/source/x11-extra/xf86-video-intel/README.Frugalware b/source/x11-extra/xf86-video-intel/README.Frugalware new file mode 100644 index 0000000..58d4c2e --- /dev/null +++ b/source/x11-extra/xf86-video-intel/README.Frugalware @@ -0,0 +1,8 @@ +New generation of Intel driver, replaces xf86-video-i810 + +You need to reconf xorg and replace Driver "i810" to Driver "intel" + +Thats all. + +Regards +-krix- diff --git a/source/x11/xf86-video-intel/FrugalBuild b/source/x11/xf86-video-intel/FrugalBuild deleted file mode 100644 index e5308fc..0000000 --- a/source/x11/xf86-video-intel/FrugalBuild +++ /dev/null @@ -1,26 +0,0 @@ -# Compiling Time: 0.24 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=xf86-video-intel -pkgver=2.1.0 -pkgrel=1 -pkgdesc="X.Org driver for Intel cards (opensource)" -groups=('x11' 'xorg-core' 'xorg-drivers') -archs=('i686' 'x86_64') -depends=('xorg-server>=1.2.0-3' 'libxvmc') -makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ - 'xf86dgaproto' 'glproto' 'xineramaproto') -Finclude xorg -conflicts=('xf86-video-i810') -up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/driver/|grep $pkgname|Flasttarbz2" -source=(http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 \ - README.Frugalware) -_F_cd_path="$pkgname-$pkgver" -Fconfopts="$Fconfopts --enable-dri" - -# Later we can add pciaccess to depends (if at last released) -# Compiles with xorg 1.2.0 too, just not using the new modelines stuff - -sha1sums=('007412d72428e2dbc067a5d6fa00fbcfcc9c99c4' \ - '2ef0ded43b506bf2366c23ceec97a81f85b8e0c8') -# optimization OK diff --git a/source/x11/xf86-video-intel/README.Frugalware b/source/x11/xf86-video-intel/README.Frugalware deleted file mode 100644 index 58d4c2e..0000000 --- a/source/x11/xf86-video-intel/README.Frugalware +++ /dev/null @@ -1,8 +0,0 @@ -New generation of Intel driver, replaces xf86-video-i810 - -You need to reconf xorg and replace Driver "i810" to Driver "intel" - -Thats all. - -Regards --krix- From krics at linuxforum.hu Mon Jul 16 13:57:34 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 13:57:36 2007 Subject: [Frugalware-git] frugalware-current: xkeyboard-config-1.0-1-i686 Message-ID: <20070716115734.3A98118681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=dc5565d3b62ec54d5e9e606028953c1f41fd2e04 commit dc5565d3b62ec54d5e9e606028953c1f41fd2e04 Author: Christian Hamar alias krix Date: Mon Jul 16 13:57:01 2007 +0200 xkeyboard-config-1.0-1-i686 * Version bump * Back to original up2date and source, because 1.0 out - NOTE: Need test that this really works, it need to work, becuse we used a 0.9+someCVS version, so in 1.0 the someCVS stuff need to be included. * Symlink dir switch happens. /usr/share/X11/xkb was a symlink to /usr/lib/ X11/xkb. Now this is reverse. lib/X11/xkb is a symlink to share/...* diff --git a/source/x11/xkeyboard-config/FrugalBuild b/source/x11/xkeyboard-config/FrugalBuild index 4c0d929..96d1cf8 100644 --- a/source/x11/xkeyboard-config/FrugalBuild +++ b/source/x11/xkeyboard-config/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xkeyboard-config -pkgver=0.9_20061207 +pkgver=1.0 pkgrel=1 pkgdesc="X.org XML-based XKB configuration registry" url="http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig" @@ -14,17 +14,17 @@ conflicts=('xkbdata') archs=('i686' 'x86_64') makedepends=('pkgconfig' 'perl-xml' 'util-macros' 'intltool') up2date=("lynx -dump 'http://xlibs.freedesktop.org/xkbdesc/?C=M;O=A' | grep $pkgname | Flasttar") -#source=(http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2) -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-20061207.tar.bz2) -sha1sums=('54d661f76751c3564e6a3798db7cfd43b51e6537') +source=(http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2) +#source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-20061207.tar.bz2) +sha1sums=('bc99e0d13d4400d8fc7d353e485a7ca88f3582bb') build() { - Fcd $pkgname-20061207 - intltoolize || Fdie - autoreconf -v --install || Fdie + Fcd Fmake --enable-xkbcomp-symlink --enable-compat-rules \ --with-xkb-rules-symlink=xorg,xfree86 Fmakeinstall - Fmkdir /usr/share/X11 - Fln /usr/lib/X11/xkb /usr/share/X11/xkb + Fmkdir /usr/lib/X11 + Fln /usr/share/X11/xkb /usr/lib/X11/xkb + # We still need this ? Somebody figure out pls. thx :P :) -krix- + Fln /var/lib/xkb /usr/share/X11/xkb/compiled } From vmiklos at frugalware.org Mon Jul 16 14:10:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 14:10:28 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-intel-2.1.0-1-i686 Message-ID: <20070716121024.317B518681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8e530302fdb1e4f32f4eb1274443ef52a77a10ab commit 8e530302fdb1e4f32f4eb1274443ef52a77a10ab Author: VMiklos Date: Mon Jul 16 14:10:05 2007 +0200 xf86-video-intel-2.1.0-1-i686 brr forgot to fix groups() diff --git a/source/x11-extra/xf86-video-intel/FrugalBuild b/source/x11-extra/xf86-video-intel/FrugalBuild index e5308fc..d945228 100644 --- a/source/x11-extra/xf86-video-intel/FrugalBuild +++ b/source/x11-extra/xf86-video-intel/FrugalBuild @@ -5,7 +5,7 @@ pkgname=xf86-video-intel pkgver=2.1.0 pkgrel=1 pkgdesc="X.Org driver for Intel cards (opensource)" -groups=('x11' 'xorg-core' 'xorg-drivers') +groups=('x11-extra' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') depends=('xorg-server>=1.2.0-3' 'libxvmc') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ From krics at linuxforum.hu Mon Jul 16 14:41:36 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 14:41:37 2007 Subject: [Frugalware-git] frugalware-current: libexif-gtk-0.3.5-3-i686 Message-ID: <20070716124136.3B32D18681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=709704ea310825c22874cce6e617093f2638d783 commit 709704ea310825c22874cce6e617093f2638d783 Author: Christian Hamar alias krix Date: Mon Jul 16 14:41:02 2007 +0200 libexif-gtk-0.3.5-3-i686 * Release bump * Added fix from CVS to compile now * Closes / Fixes #2164 diff --git a/source/gnome/libexif-gtk/FrugalBuild b/source/gnome/libexif-gtk/FrugalBuild index aadced2..4fe99c2 100644 --- a/source/gnome/libexif-gtk/FrugalBuild +++ b/source/gnome/libexif-gtk/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libexif-gtk pkgver=0.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="GTK Widgets for libexif" _F_sourceforge_dirname="libexif" _F_sourceforge_ext=".tar.bz2" @@ -15,6 +15,8 @@ depends=('gtk+2' 'libexif') groups=('gnome') archs=('x86_64' 'i686') license=('GPL2') -sha1sums=('76eb91b635c6097fe541ec8a2b14b3a9d844993d') +source=(${source[@]} some_cvs_backport.patch) +sha1sums=('76eb91b635c6097fe541ec8a2b14b3a9d844993d' \ + '779e1bfc9c7f1dde8791abfd311605b385363a51') # optimization OK diff --git a/source/gnome/libexif-gtk/some_cvs_backport.patch b/source/gnome/libexif-gtk/some_cvs_backport.patch new file mode 100644 index 0000000..c47eff5 --- /dev/null +++ b/source/gnome/libexif-gtk/some_cvs_backport.patch @@ -0,0 +1,48 @@ +diff -Naur libexif-gtk-0.3.5.orig/libexif-gtk/gtk-exif-content-list.c libexif-gtk-0.3.5/libexif-gtk/gtk-exif-content-list.c +--- libexif-gtk-0.3.5.orig/libexif-gtk/gtk-exif-content-list.c 2007-07-16 14:35:31.000000000 +0200 ++++ libexif-gtk-0.3.5/libexif-gtk/gtk-exif-content-list.c 2004-10-17 15:54:23.000000000 +0200 +@@ -405,12 +405,7 @@ + if (!gtk_exif_content_list_get_iter (list, e, &iter)) return; + gtk_list_store_set (list->priv->store, &iter, + VALUE_COLUMN, +-#ifdef HAVE_EXIF_0_6_12 +- exif_entry_get_value (e, s, sizeof (s)), +-#else +- exif_entry_get_value (e), +-#endif +- -1); ++ exif_entry_get_value (e, s, sizeof (s)), -1); + } + + void +@@ -436,13 +431,8 @@ + gtk_list_store_append (list->priv->store, &iter); + gtk_list_store_set (GTK_LIST_STORE (list->priv->store), &iter, + NAME_COLUMN, exif_tag_get_name (e->tag), +- VALUE_COLUMN, +-#ifdef HAVE_EXIF_0_6_12 +- exif_entry_get_value (e, s, sizeof (s)), +-#else +- exif_entry_get_value (e), +-#endif +- ENTRY_COLUMN, e, -1); ++ VALUE_COLUMN, exif_entry_get_value (e, s, sizeof (s)), ++ ENTRY_COLUMN, e, -1); + g_signal_emit (list, signals[ENTRY_ADDED], 0, e); + } + +diff -Naur libexif-gtk-0.3.5.orig/libexif-gtk/gtk-exif-entry-generic.c libexif-gtk-0.3.5/libexif-gtk/gtk-exif-entry-generic.c +--- libexif-gtk-0.3.5.orig/libexif-gtk/gtk-exif-entry-generic.c 2007-07-16 14:35:31.000000000 +0200 ++++ libexif-gtk-0.3.5/libexif-gtk/gtk-exif-entry-generic.c 2004-10-17 15:54:23.000000000 +0200 +@@ -136,11 +136,7 @@ + label = gtk_label_new ("Value:"); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, 0, 0, 0, 0); +-#ifdef HAVE_EXIF_0_6_12 + label = gtk_label_new (exif_entry_get_value (e, s, sizeof (s))); +-#else +- label = gtk_label_new (exif_entry_get_value (e)); +-#endif + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 1, 2, 3, 4, 0, 0, 0, 0); + From krics at linuxforum.hu Mon Jul 16 16:41:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 16:41:59 2007 Subject: [Frugalware-git] frugalware-current: goffice-0.4.1-1-x86_64 Message-ID: <20070716144158.0E53D18681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=345e7c6fa1231b8c7ad65f4a5e4ba26235fede19 commit 345e7c6fa1231b8c7ad65f4a5e4ba26235fede19 Author: Christian Hamar alias krix Date: Mon Jul 16 16:41:40 2007 +0200 goffice-0.4.1-1-x86_64 * Verison idontcare bump .. diff --git a/source/gnome-extra/goffice/FrugalBuild b/source/gnome-extra/goffice/FrugalBuild index 5b70881..f38b6fc 100644 --- a/source/gnome-extra/goffice/FrugalBuild +++ b/source/gnome-extra/goffice/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=goffice -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="A glib/gtk set of document centric objects and utilities" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('x86_64' 'i686') _F_gnome_scrollkeeper="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet -sha1sums=('b499e2a738631958f2738268b757cc5a843c399c') +sha1sums=('42eac905437cbbcf8c2b714665ee8ad351beb296') # optimization OK From krics at linuxforum.hu Mon Jul 16 16:57:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 16:57:41 2007 Subject: [Frugalware-git] frugalware-current: bzflag-2.0.8-2-x86_64 Message-ID: <20070716145738.C80AE18681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f2a5fcf525e3bed20a019cd54472caab39dc1f96 commit f2a5fcf525e3bed20a019cd54472caab39dc1f96 Author: Christian Hamar alias krix Date: Mon Jul 16 16:57:23 2007 +0200 bzflag-2.0.8-2-x86_64 * Release bump * Fixes / Closes #2170 diff --git a/source/games-extra/bzflag/FrugalBuild b/source/games-extra/bzflag/FrugalBuild index 0dcef0d..5982171 100644 --- a/source/games-extra/bzflag/FrugalBuild +++ b/source/games-extra/bzflag/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bzflag pkgver=2.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="BZFlag is a free multiplayer multiplatform 3D tank battle game." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 From crazy at frugalware.org Mon Jul 16 17:08:48 2007 From: crazy at frugalware.org (crazy) Date: Mon Jul 16 17:08:51 2007 Subject: [Frugalware-git] frugalware-current: tastymenu-0.8.2-1-i686 Message-ID: <20070716150848.F022818681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=347989130961eb6e51cb15ae7dd5c1891beaf454 commit 347989130961eb6e51cb15ae7dd5c1891beaf454 Author: crazy Date: Mon Jul 16 17:07:53 2007 +0200 tastymenu-0.8.2-1-i686 * Version bump diff --git a/source/kde-extra/tastymenu/FrugalBuild b/source/kde-extra/tastymenu/FrugalBuild index f3cd2dd..f6a99b4 100644 --- a/source/kde-extra/tastymenu/FrugalBuild +++ b/source/kde-extra/tastymenu/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: crazy pkgname=tastymenu -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="Tasty Menu is a KMenu replacement." -depends=('kdelibs>=3.5.6') +depends=('kdelibs>=3.5.7') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_id="41866" Finclude kde source=(http://www.notmart.org/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('ab25ea8edf7e47afeffa520d9803f6fd19500876') +sha1sums=('03b3a9b3708676ffefeea8d58711b8860d68e13e') # optimization OK From crazy at frugalware.org Mon Jul 16 17:17:28 2007 From: crazy at frugalware.org (crazy) Date: Mon Jul 16 17:17:30 2007 Subject: [Frugalware-git] frugalware-current: kscope-1.6.0-1-i686 Message-ID: <20070716151728.ED2CD18681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0d531dc700b5a9ee44b51bfea4341d89cd6e5d44 commit 0d531dc700b5a9ee44b51bfea4341d89cd6e5d44 Author: crazy Date: Mon Jul 16 17:16:32 2007 +0200 kscope-1.6.0-1-i686 * Version bump diff --git a/source/kde-extra/kscope/FrugalBuild b/source/kde-extra/kscope/FrugalBuild index 1291d61..6a9c174 100644 --- a/source/kde-extra/kscope/FrugalBuild +++ b/source/kde-extra/kscope/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: crazy pkgname=kscope -pkgver=1.5.2 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc="KScope is a KDE front-end to Cscope." -depends=('kdebase>=3.5.6') +depends=('kdebase>=3.5.7') backup=(usr/share/config/kscoperc) rodepends=('cscope' 'graphviz' 'ctags>=5.6-2') groups=('kde-extra') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') _F_kde_defaults=0 Finclude sourceforge kde source=($source kscoperc) -sha1sums=('932f64f0b47b99095c6b8c819c1a3d7ca6744b9f'\ +sha1sums=('72e342243f475e69ccb46b40a28594c5ef0ea1ab' \ 'd1d2b4232a390e6bb99c76f33d535112a2e3c4c4') build() From crazy at frugalware.org Mon Jul 16 17:18:38 2007 From: crazy at frugalware.org (crazy) Date: Mon Jul 16 17:18:46 2007 Subject: [Frugalware-git] frugalware-current: recordmydesktop-0.3.5-1-i686 Message-ID: <20070716151838.274F518681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e3f450273bd0a1a02af3a4120033c00d477ceca8 commit e3f450273bd0a1a02af3a4120033c00d477ceca8 Author: crazy Date: Mon Jul 16 17:17:38 2007 +0200 recordmydesktop-0.3.5-1-i686 * Version bump diff --git a/source/xapps-extra/recordmydesktop/FrugalBuild b/source/xapps-extra/recordmydesktop/FrugalBuild index 8db2d11..b95b250 100644 --- a/source/xapps-extra/recordmydesktop/FrugalBuild +++ b/source/xapps-extra/recordmydesktop/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=recordmydesktop -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="recordMyDesktop is a program that captures audio-video data of a linux desktop session." depends=('libsm' 'libxext' 'libice' 'libxdamage' 'libvorbis' 'libtheora' 'zlib' 'alsa-lib' 'libx11' 'libxfixes' 'libpng') @@ -10,5 +10,5 @@ groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('9c0642cb3c560f90fb904645a00802f0a7e61608') +sha1sums=('053a0835efdbb11be82376829ee558793b9cf078') # optimization OK From crazy at frugalware.org Mon Jul 16 17:24:13 2007 From: crazy at frugalware.org (crazy) Date: Mon Jul 16 17:24:16 2007 Subject: [Frugalware-git] frugalware-current: gtk-recordmydesktop-0.3.5-1-i686 Message-ID: <20070716152414.05AB318681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7231b25ad813dc79b0dc0f48ae7d490afb14e49f commit 7231b25ad813dc79b0dc0f48ae7d490afb14e49f Author: crazy Date: Mon Jul 16 17:23:15 2007 +0200 gtk-recordmydesktop-0.3.5-1-i686 * Version bump diff --git a/source/xapps-extra/gtk-recordmydesktop/FrugalBuild b/source/xapps-extra/gtk-recordmydesktop/FrugalBuild index fa86b44..536570a 100644 --- a/source/xapps-extra/gtk-recordmydesktop/FrugalBuild +++ b/source/xapps-extra/gtk-recordmydesktop/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: crazy pkgname=gtk-recordmydesktop -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="A pyGtk frontend for recordMyDesktop." depends=('pygtk' 'gtk+2>=2.10.6' 'python>=2.5-2') -rodepends=('recordmydesktop>=0.3.4') +rodepends=('recordmydesktop>=0.3.5') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') @@ -15,5 +15,5 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://recordmydesktop.sourceforge.net/" -sha1sums=('7762a6f37e608396467913d9b5f0aa58c8e31275') +sha1sums=('4e991b6059a03e60187ab30c5cb4e15bb435caa9') # optimization OK From krics at linuxforum.hu Mon Jul 16 17:51:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 17:51:32 2007 Subject: [Frugalware-git] frugalware-current: ntfs-3g-1.710-1-x86_64 Message-ID: <20070716155131.3646618681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7c0223710dca66cd013605988a168600821aa06f commit 7c0223710dca66cd013605988a168600821aa06f Author: Christian Hamar alias krix Date: Mon Jul 16 17:50:52 2007 +0200 ntfs-3g-1.710-1-x86_64 * Version bump * Fixed up2date ... Time to write a mail to author ... diff --git a/source/apps-extra/ntfs-3g/FrugalBuild b/source/apps-extra/ntfs-3g/FrugalBuild index 40e7116..c218a7c 100644 --- a/source/apps-extra/ntfs-3g/FrugalBuild +++ b/source/apps-extra/ntfs-3g/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=ntfs-3g -pkgver=1.616 +pkgver=1.710 pkgrel=1 pkgdesc="Third generation Linux NTFS driver with full read-write access." url="http://www.ntfs-3g.org/" depends=('fuse') groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep 'The latest stable release is'|grep -om1 'ntfs-3g-\(.*\).tgz'|sed 's/.*3g-\(.*\).t.*/\1/'" +up2date="lynx -dump $url|grep 'stable version is'|sed 's/.*is \(.*\).*/\1/' | sed 's/,.*//'" source=($url/$pkgname-$pkgver.tgz) Fconfopts="$Fconfopts --disable-ldconfig" -sha1sums=('abf89d14aaeb6dbe27630c3ef275fabc02f940b0') +sha1sums=('d30ed61c895c5bc6f5459165f0dd23d1b938d8e9') # optimization OK From krics at linuxforum.hu Mon Jul 16 18:29:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 18:29:03 2007 Subject: [Frugalware-git] frugalware-current: sonata-1.2-1-x86_64 Message-ID: <20070716162900.CAB5818681D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=02d477d124e2ee5179f30c02f342e65589a9f41f commit 02d477d124e2ee5179f30c02f342e65589a9f41f Author: Christian Hamar alias krix Date: Mon Jul 16 18:28:32 2007 +0200 sonata-1.2-1-x86_64 * Version bump diff --git a/source/xapps-extra/sonata/FrugalBuild b/source/xapps-extra/sonata/FrugalBuild index c68ae4c..463d28e 100644 --- a/source/xapps-extra/sonata/FrugalBuild +++ b/source/xapps-extra/sonata/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Finn (nickname: detto) pkgname=sonata -pkgver=1.1.1 +pkgver=1.2 pkgrel=1 pkgdesc="Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD)." _F_berlios_ext=".tar.bz2" @@ -14,5 +14,5 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('278ef615018be65fc6ea9d0c345be8b8b6f2c5f6') +sha1sums=('199772cf97ab14602bb0e13dced54a7bf36d7e8d') # optimization OK From vmiklos at frugalware.org Mon Jul 16 20:19:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 20:19:45 2007 Subject: [Frugalware-git] setup: updates for 0.7.7 Message-ID: <20070716181943.71FCA13A4105@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=4e672437425617d8c85605328419c9a2724ed126 commit 4e672437425617d8c85605328419c9a2724ed126 Author: VMiklos Date: Mon Jul 16 20:14:39 2007 +0200 updates for 0.7.7 diff --git a/NEWS b/NEWS index 524931e..31d4d7a 100644 --- a/NEWS +++ b/NEWS @@ -1,17 +1,22 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.7.7 - create /var/log/setup.log on the target system. most user + answers and external command calls (including the output of + non-interactive commands) are logged. all logged lines are + present at tty4, too + - most user an 0.7.6 - you can now cherry-pick preferred mirrors - language-specific default keyboard - do not allow mount points to be used twice - do not allow to mount swap partitions - other random fixes 0.7.5 - x86_64 build fixes - - depedency errors now are detailed on tty4 + - dependency errors now are detailed on tty4 - new Italian translation 0.7.4 - scp is now working - sort the keyboard layouts - built using newer libpacman (which pulls in bugfixes) -0.7.3 - small sppedup hacks +0.7.3 - small speedup hacks - new translations (ro, sk, sv) - spelling fixes 0.7.2 - switch to libpacman diff --git a/configure b/configure index fc58f8f..f82ce9d 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ packages = ['bash', 'kernel', 'busybox', 'dhcpcd', 'dialog', 'e2fsprogs', 'device-mapper', 'lvm2'] # when releasing a new setup, please update this :) -version = "0.7.6" +version = "0.7.7" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From krics at linuxforum.hu Mon Jul 16 20:29:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 16 20:29:51 2007 Subject: [Frugalware-git] frugalware-current: ntfs-3g-1.710-1-x86_64 Message-ID: <20070716182949.C17D613A4105@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a44c999a6529eaeff02cbc251124b0dd67f95f24 commit a44c999a6529eaeff02cbc251124b0dd67f95f24 Author: Christian Hamar alias krix Date: Mon Jul 16 20:29:31 2007 +0200 ntfs-3g-1.710-1-x86_64 * Better fix for up2date (from upstream author :) thx Szaka :) ) diff --git a/source/apps-extra/ntfs-3g/FrugalBuild b/source/apps-extra/ntfs-3g/FrugalBuild index c218a7c..9449ddd 100644 --- a/source/apps-extra/ntfs-3g/FrugalBuild +++ b/source/apps-extra/ntfs-3g/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.ntfs-3g.org/" depends=('fuse') groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep 'stable version is'|sed 's/.*is \(.*\).*/\1/' | sed 's/,.*//'" +up2date="lynx -dump $url| grep -m 1 'ntfs-3g-[[:digit:]]\+\.[[:digit:]]\+\.tgz' | sed 's/.*3g-\(.*\)\.tgz.*/\1/'" source=($url/$pkgname-$pkgver.tgz) Fconfopts="$Fconfopts --disable-ldconfig" From vmiklos at frugalware.org Mon Jul 16 20:37:52 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 20:38:15 2007 Subject: [Frugalware-git] frugalware-current: fwsetup-0.7.7-1-i686 Message-ID: <20070716183752.5F02D186816B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2aabfc96f0ae090db24b5259fdadc7ecf12df4c2 commit 2aabfc96f0ae090db24b5259fdadc7ecf12df4c2 Author: VMiklos Date: Mon Jul 16 20:37:40 2007 +0200 fwsetup-0.7.7-1-i686 version bump diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 5043bfa..a4048f4 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=fwsetup -pkgver=0.7.5 +pkgver=0.7.7 pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" From vmiklos at frugalware.org Mon Jul 16 21:24:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 21:25:00 2007 Subject: [Frugalware-git] frugalware-current: scm.sh: git support for _F_scm_tag Message-ID: <20070716192457.6889013A4105@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d481b40f162736717cbbe39b8ab414ce0873902d commit d481b40f162736717cbbe39b8ab414ce0873902d Author: VMiklos Date: Mon Jul 16 21:24:48 2007 +0200 scm.sh: git support for _F_scm_tag diff --git a/source/include/scm.sh b/source/include/scm.sh index 38fff4d..ad99ebd 100644 --- a/source/include/scm.sh +++ b/source/include/scm.sh @@ -67,7 +67,7 @@ # * _F_scm_url: url of the repo - required # * _F_scm_password: password of the repo - required for cvs # * _F_scm_module: name of the module to check out - required for cvs and subversion -# * _F_scm_tag: name of the tag/branch to use - implemented for darcs/cvs +# * _F_scm_tag: name of the tag/branch to use - implemented for darcs/cvs/git ### # slice the / suffix if there is any @@ -131,8 +131,16 @@ Funpack_scm() svn co $_F_scm_url $_F_scm_module || Fdie Fcd $_F_scm_module elif [ "$_F_scm_type" == "git" ]; then - git clone $_F_scm_url || Fdie - Fcd `echo $_F_scm_url |sed 's|.*/\(.*\)\..*|\1|'` + if [ -d $pkgname ]; then + cd $pkgname + git pull + else + git clone $_F_scm_url $pkgname || Fdie + cd $pkgname + fi + if [ -n "$_F_scm_tag" ]; then + git checkout $_F_scm_tag || Fdie + fi elif [ "$_F_scm_type" == "mercurial" ]; then hg clone $_F_scm_url || Fdie Fcd ${_F_scm_url##*/} From vmiklos at frugalware.org Mon Jul 16 22:14:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 16 22:14:06 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-0.10.3-4-x86_64 Message-ID: <20070716201403.AB6FC13A4105@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b94bd4ec6968e3770e0d542efdaf3d3fc6cbfd85 commit b94bd4ec6968e3770e0d542efdaf3d3fc6cbfd85 Author: VMiklos Date: Mon Jul 16 22:13:50 2007 +0200 ivtv-utils-0.10.3-4-x86_64 forgot to add x86_64 to subarchs(), my bad diff --git a/source/apps-extra/ivtv-utils/FrugalBuild b/source/apps-extra/ivtv-utils/FrugalBuild index 06b71e0..e225528 100644 --- a/source/apps-extra/ivtv-utils/FrugalBuild +++ b/source/apps-extra/ivtv-utils/FrugalBuild @@ -21,7 +21,7 @@ subpkgs=('ivtv-firmware') subdescs=("Firmware for Hauppauge PVR and Conexant based cards") subdepends=('udev') subgroups=('multimedia-extra') -subarchs=('i686') +subarchs=('i686 x86_64') build() { From krics at linuxforum.hu Tue Jul 17 07:30:54 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 07:30:57 2007 Subject: [Frugalware-git] frugalware-current: glib2-2.12.13-1-i686 Message-ID: <20070717053054.DA37513A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6aa6b7131800f79becc9ab0c954041a4d01fa48a commit 6aa6b7131800f79becc9ab0c954041a4d01fa48a Author: Christian Hamar alias krix Date: Tue Jul 17 07:30:09 2007 +0200 glib2-2.12.13-1-i686 * Version bump diff --git a/source/lib/glib2/FrugalBuild b/source/lib/glib2/FrugalBuild index 18664c5..8afc529 100644 --- a/source/lib/glib2/FrugalBuild +++ b/source/lib/glib2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=glib2 -pkgver=2.12.12 +pkgver=2.12.13 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" @@ -16,6 +16,6 @@ _F_gnome_devel="n" Finclude gnome _F_cd_path="glib-$pkgver" Fconfopts="$Fconfopts --enable-gtk-doc --enable-static" -sha1sums=('527bced2e6d38169c08c8712d5e3b6ebb0dc46b5') +sha1sums=('81ce0e53f5583be970623d12523c785a392647bf') # optimization OK From krics at linuxforum.hu Tue Jul 17 08:47:05 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 08:47:08 2007 Subject: [Frugalware-git] frugalware-current: gtk+2-2.10.14-1-i686 Message-ID: <20070717064705.D772E13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fcf914fb8d87dc21820767a57a65aea15ef443bf commit fcf914fb8d87dc21820767a57a65aea15ef443bf Author: Christian Hamar alias krix Date: Tue Jul 17 08:46:28 2007 +0200 gtk+2-2.10.14-1-i686 * Version bump diff --git a/source/gnome/gtk+2/FrugalBuild b/source/gnome/gtk+2/FrugalBuild index b3e269e..96c6207 100644 --- a/source/gnome/gtk+2/FrugalBuild +++ b/source/gnome/gtk+2/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.10.13 +pkgver=2.10.14 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" url="http://www.gtk.org/" depends=('libtiff' 'atk>=1.18.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.16.1' 'cairo>=1.4.0' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.12.11') + 'pango>=1.16.1' 'cairo>=1.4.0' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.12.13') rodepends=('gnome-icon-theme') groups=('gnome' 'gnome-core') makedepends=('gtk-doc' 'cups') @@ -23,5 +23,5 @@ build() { echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie } -sha1sums=('8d00b928a8788ff86d97197c20c18d41f9a1b1cd') +sha1sums=('78b819814d52caa66739ab64611e41f35e5b48c3') # optimization OK From vmiklos at frugalware.org Tue Jul 17 09:43:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 09:43:40 2007 Subject: [Frugalware-git] frugalware-current: star-1.5a83-1-i686 Message-ID: <20070717074336.72FAD13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=61bd0e289fb73a296617d4bdae76138e0057dc0e commit 61bd0e289fb73a296617d4bdae76138e0057dc0e Author: VMiklos Date: Tue Jul 17 09:43:25 2007 +0200 star-1.5a83-1-i686 version bump diff --git a/source/apps-extra/star/FrugalBuild b/source/apps-extra/star/FrugalBuild index 243b86e..3523721 100644 --- a/source/apps-extra/star/FrugalBuild +++ b/source/apps-extra/star/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Michael Surette pkgname=star -pkgver=1.5a82 +pkgver=1.5a83 pkgrel=1 pkgdesc="very fast and Posix 1003.1 compliant tar" url="http://cdrecord.berlios.de/old/private/star.html" @@ -13,6 +13,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="elinks -dump ftp://ftp.berlios.de/pub/star/alpha |grep [0-9].tar.bz2|tail -n1|sed -e 's/.*star-//' -e 's/.tar.bz2//'" source=("ftp://ftp.berlios.de/pub/$pkgname/alpha/$pkgname-$pkgver.tar.bz2") +sha1sums=('81789ba02bbb5dc668a2e9f47246958c9ee6725b') build() { @@ -23,5 +24,3 @@ build() Frm usr/lib/lib{deflt,schily}.a Frm usr/bin/tar } - -sha1sums=('1183276a03c1fcf3b2193b9a7d37a976099d3746') From vmiklos at frugalware.org Tue Jul 17 09:44:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 09:45:03 2007 Subject: [Frugalware-git] frugalware-current: man-pages-fr-2.40.0-1-x86_64 Message-ID: <20070717074459.2757113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=87be5b528d06672fb2a4183d330afad782061244 commit 87be5b528d06672fb2a4183d330afad782061244 Author: VMiklos Date: Tue Jul 17 09:44:56 2007 +0200 man-pages-fr-2.40.0-1-x86_64 added x86_64 to archs() diff --git a/source/locale-extra/man-pages-fr/FrugalBuild b/source/locale-extra/man-pages-fr/FrugalBuild index eaee603..ad14df3 100644 --- a/source/locale-extra/man-pages-fr/FrugalBuild +++ b/source/locale-extra/man-pages-fr/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" depends=('man') groups=('locale-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://manpagesfr.free.fr/|grep pages-fr.*tar.bz2$|Flasttarbz2" source=(http://manpagesfr.free.fr/download/man-pages-fr-$pkgver.tar.bz2) signatures=($source.asc) From vmiklos at frugalware.org Tue Jul 17 09:45:52 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 09:45:53 2007 Subject: [Frugalware-git] frugalware-current: man-pages-extras-fr-0.7.2-1-x86_64 Message-ID: <20070717074552.E867B13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2e6f5270f0f227ef1365b6c791da64e3a3c093a2 commit 2e6f5270f0f227ef1365b6c791da64e3a3c093a2 Author: VMiklos Date: Tue Jul 17 09:45:51 2007 +0200 man-pages-extras-fr-0.7.2-1-x86_64 added x86_64 to archs() diff --git a/source/locale-extra/man-pages-extras-fr/FrugalBuild b/source/locale-extra/man-pages-extras-fr/FrugalBuild index 5c8224e..6c62ff9 100644 --- a/source/locale-extra/man-pages-extras-fr/FrugalBuild +++ b/source/locale-extra/man-pages-extras-fr/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" depends=('man') groups=('locale-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://manpagesfr.free.fr/|grep pages-extras-fr.*tar.bz2$|Flasttarbz2" source=(http://manpagesfr.free.fr/download/man-pages-extras-fr-$pkgver.tar.bz2) signatures=($source.asc) From vmiklos at frugalware.org Tue Jul 17 09:55:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 09:55:43 2007 Subject: [Frugalware-git] frugalware-current: koctave-0.70-1-x86_64 Message-ID: <20070717075541.864A613A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=34304a59e1f4e1383fd8d9de64447c6d8cfc28ca commit 34304a59e1f4e1383fd8d9de64447c6d8cfc28ca Author: VMiklos Date: Tue Jul 17 09:55:37 2007 +0200 koctave-0.70-1-x86_64 added x86_64 to archs() diff --git a/source/kde-extra/koctave/FrugalBuild b/source/kde-extra/koctave/FrugalBuild index 450abbd..c4db8c1 100644 --- a/source/kde-extra/koctave/FrugalBuild +++ b/source/kde-extra/koctave/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="koctave is a KDE GUI for octave" depends=('kdelibs>=3.5.5' 'octave') groups=('kde-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_kde_defaults=0 Finclude sourceforge kde sha1sums=('05c62a0e0e33c373e8c39a783521e6a74d529fcd') From vmiklos at frugalware.org Tue Jul 17 09:57:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 09:57:26 2007 Subject: [Frugalware-git] frugalware-current: koctave-0.70-1-x86_64 Message-ID: <20070717075724.BCD9713A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7dd4bac3506ccf16f7a2b698b3ece627b0d17576 commit 7dd4bac3506ccf16f7a2b698b3ece627b0d17576 Author: VMiklos Date: Tue Jul 17 09:57:18 2007 +0200 koctave-0.70-1-x86_64 added _F_gnome_iconcache to supress a warning from makepkg diff --git a/source/kde-extra/koctave/FrugalBuild b/source/kde-extra/koctave/FrugalBuild index c4db8c1..2655b4b 100644 --- a/source/kde-extra/koctave/FrugalBuild +++ b/source/kde-extra/koctave/FrugalBuild @@ -9,7 +9,8 @@ depends=('kdelibs>=3.5.5' 'octave') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_defaults=0 -Finclude sourceforge kde +_F_gnome_iconcache=y +Finclude sourceforge kde gnome-scriptlet sha1sums=('05c62a0e0e33c373e8c39a783521e6a74d529fcd') From vmiklos at frugalware.org Tue Jul 17 09:59:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 09:59:37 2007 Subject: [Frugalware-git] pacman-tools: portpkg: new --silentpush parameter Message-ID: <20070717075936.6845513A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=4b7d04f4d3b62e8d486785164c6db8d30b33976e commit 4b7d04f4d3b62e8d486785164c6db8d30b33976e Author: VMiklos Date: Tue Jul 17 09:59:31 2007 +0200 portpkg: new --silentpush parameter diff --git a/portpkg b/portpkg index fb4f78b..b3f44ab 100755 --- a/portpkg +++ b/portpkg @@ -25,9 +25,14 @@ if ! ls *fpm &>/dev/null; then sudo makepkg -cuk || die "build failed" fi -if [ "$1" == "--push" ]; then +if [ "$1" == "--push" -o "$1" == "--silentpush" ]; then repoman rec "added `uname -m` to archs()" || die "failed to record the patch" - repoman -k push + if [ "$1" == "--push" ]; then + repoman -k push + else + git pull + git push + fi else die "now run '$0 --push' to record and push your changes" fi From vmiklos at frugalware.org Tue Jul 17 10:02:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 10:02:12 2007 Subject: [Frugalware-git] frugalware-current: rasqal-0.9.14-1-x86_64 Message-ID: <20070717080210.DBD0413A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c004d7578dc69de818f695505e53aab82cb6cf6f commit c004d7578dc69de818f695505e53aab82cb6cf6f Author: VMiklos Date: Tue Jul 17 10:02:06 2007 +0200 rasqal-0.9.14-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/rasqal/FrugalBuild b/source/lib-extra/rasqal/FrugalBuild index fb7aefc..47a776a 100644 --- a/source/lib-extra/rasqal/FrugalBuild +++ b/source/lib-extra/rasqal/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="RDF query parsing and execution library" url="http://librdf.org/rasqal/" depends=('raptor>=1.4.14' 'libxml2') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url|grep -m1 '.tar.gz'|Flasttar" source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz) sha1sums=('80f4051b1dde928b1f071475c7941cd6ae9ce46b') From krics at linuxforum.hu Tue Jul 17 10:13:48 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 10:13:50 2007 Subject: [Frugalware-git] frugalware-current: foo2zjs-2007_07_15-1-i686 Message-ID: <20070717081348.39EDB13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=161c42aa6b0bbb995e0dea2dbd0299fc3409af86 commit 161c42aa6b0bbb995e0dea2dbd0299fc3409af86 Author: Christian Hamar alias krix Date: Tue Jul 17 10:13:14 2007 +0200 foo2zjs-2007_07_15-1-i686 * Version bump diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild index a0bb1c3..25ebeba 100644 --- a/source/apps-extra/foo2zjs/FrugalBuild +++ b/source/apps-extra/foo2zjs/FrugalBuild @@ -3,7 +3,7 @@ # Orig Maintainer: pete (pete [at] teamlupus.hu) pkgname=foo2zjs -pkgver=2007_05_08 +pkgver=2007_07_15 pkgrel=1 pkgdesc="A linux printer driver for ZjStream protocol" url="http://foo2zjs.rkkda.com/" @@ -38,6 +38,6 @@ build() { Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } -sha1sums=('21e82a2056554235c725f363c9ce9aefdecb3b96'\ +sha1sums=('e0a3156c8536f566f544f21ff5ee96e197cec215' \ '7b89eae53167a7ebef0cd9f7f405f2a787e3d13c') # optimization OK From vmiklos at frugalware.org Tue Jul 17 10:14:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 10:14:28 2007 Subject: [Frugalware-git] frugalware-current: alsa-tools-1.0.14-1-x86_64 Message-ID: <20070717081426.D2C8913A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1a872450668b294e613d121fe26929b139cef5b0 commit 1a872450668b294e613d121fe26929b139cef5b0 Author: VMiklos Date: Tue Jul 17 10:14:20 2007 +0200 alsa-tools-1.0.14-1-x86_64 added x86_64 to archs() diff --git a/source/multimedia/alsa-tools/FrugalBuild b/source/multimedia/alsa-tools/FrugalBuild index 3f46549..22af5c4 100644 --- a/source/multimedia/alsa-tools/FrugalBuild +++ b/source/multimedia/alsa-tools/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.alsa-project.org" depends=('alsa-lib' 'libstdc++') makedepends=('qt' 'gtk+2' 'fltk') groups=('multimedia') -archs=('i686') +archs=('i686' 'x86_64') source=(ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2) up2date="lynx -dump $url |grep -om1 'alsa-tools-\(.*\)tar.bz2'|sed 's/.*tools-\(.*\).t.*/\1/'" options=('scriptlet') From vmiklos at frugalware.org Tue Jul 17 10:15:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 10:15:58 2007 Subject: [Frugalware-git] frugalware-current: gpsman-6.3.2-1-x86_64 Message-ID: <20070717081547.B234C13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cb8a6888a14ae0f77a58f6d62a177ed56c4b5075 commit cb8a6888a14ae0f77a58f6d62a177ed56c4b5075 Author: VMiklos Date: Tue Jul 17 10:15:45 2007 +0200 gpsman-6.3.2-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/gpsman/FrugalBuild b/source/xapps-extra/gpsman/FrugalBuild index 426bb8f..905e383 100644 --- a/source/xapps-extra/gpsman/FrugalBuild +++ b/source/xapps-extra/gpsman/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="GPSMan is a graphical manager of GPS data." url="http://www.ncc.up.pt/gpsman/" depends=('tcl' 'tk') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url | grep New | sed 's/.*se \(.*\) on.*/\1/'" source=($url/gpsmanhtml/$pkgname-$pkgver.tgz) sha1sums=('d84827679dd84007ccd4495208b7106a3cd93e8b') From vmiklos at frugalware.org Tue Jul 17 10:18:16 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 10:18:18 2007 Subject: [Frugalware-git] frugalware-current: gbindadmin-0.1.5-1-x86_64 Message-ID: <20070717081816.124B113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d0e7f171021cbde95f2082b5c054c5f2bd2f269e commit d0e7f171021cbde95f2082b5c054c5f2bd2f269e Author: VMiklos Date: Tue Jul 17 10:18:11 2007 +0200 gbindadmin-0.1.5-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/gbindadmin/FrugalBuild b/source/xapps-extra/gbindadmin/FrugalBuild index 49f64cc..c65a0d2 100644 --- a/source/xapps-extra/gbindadmin/FrugalBuild +++ b/source/xapps-extra/gbindadmin/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.gadmintools.org/" depends=('gtk+2' 'freetype2' 'libxcb' 'glib2' 'bind') options=('scriptlet') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://mange.dynalias.org/linux/gbindadmin/|Flasttar" source=(http://mange.dynalias.org/linux/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.desktop $pkgname.desktop.kde) From crazy at frugalware.org Tue Jul 17 14:04:23 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 14:04:25 2007 Subject: [Frugalware-git] frugalware-current: xmltv-0.5.46-1-i686 Message-ID: <20070717120423.0A0ED13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a1748bed36795012cb027dfc50d900d9d57b671f commit a1748bed36795012cb027dfc50d900d9d57b671f Author: crazy Date: Tue Jul 17 14:03:16 2007 +0200 xmltv-0.5.46-1-i686 * Version bump diff --git a/source/apps-extra/xmltv/FrugalBuild b/source/apps-extra/xmltv/FrugalBuild index 11c38ba..401dd42 100644 --- a/source/apps-extra/xmltv/FrugalBuild +++ b/source/apps-extra/xmltv/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=xmltv -pkgver=0.5.45 +pkgver=0.5.46 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=('ac63d247a8b8fb4b50355b3eefebd1b5cccb23bb') +sha1sums=('3e4b70a7d927486ba8d1365d630b338b47178af6') build() { Fcd From crazy at frugalware.org Tue Jul 17 14:08:20 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 14:08:23 2007 Subject: [Frugalware-git] frugalware-current: tasks-0.9-1-i686 Message-ID: <20070717120820.E1AE713A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=37a9955c1c7ba2dadc7933aa02181ec234a1b0ee commit 37a9955c1c7ba2dadc7933aa02181ec234a1b0ee Author: crazy Date: Tue Jul 17 14:07:11 2007 +0200 tasks-0.9-1-i686 * Version bump diff --git a/source/gnome-extra/tasks/FrugalBuild b/source/gnome-extra/tasks/FrugalBuild index da94a7c..2a28a00 100644 --- a/source/gnome-extra/tasks/FrugalBuild +++ b/source/gnome-extra/tasks/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=tasks -pkgver=0.8 +pkgver=0.9 pkgrel=1 pkgdesc="Tasks is a simple ToDo list application" url="http://www.pimlico-project.org/tasks.html" @@ -15,6 +15,6 @@ _F_gnome_iconcache=y Finclude gnome-scriptlet up2date="lynx -dump http://pimlico-project.org/sources/tasks/ | Flasttar" source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) -sha1sums=('b76023ea86342234e998a4ac1747b0ec049581a7') +sha1sums=('dbf79dc36edcf0982f3879c618e363f3b241380b') # optimization OK From crazy at frugalware.org Tue Jul 17 14:21:23 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 14:21:26 2007 Subject: [Frugalware-git] frugalware-current: xvidcap-1.1.6-1-i686 Message-ID: <20070717122123.EC7D013A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e84d85ef14a0358cc1a0d05900a880e6febed0fb commit e84d85ef14a0358cc1a0d05900a880e6febed0fb Author: crazy Date: Tue Jul 17 14:20:13 2007 +0200 xvidcap-1.1.6-1-i686 * Version bump diff --git a/source/xapps-extra/xvidcap/FrugalBuild b/source/xapps-extra/xvidcap/FrugalBuild index 5c3f596..0f950bd 100644 --- a/source/xapps-extra/xvidcap/FrugalBuild +++ b/source/xapps-extra/xvidcap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=xvidcap -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=1 pkgdesc="A program to capture a video of your X session" url="http://xvidcap.sourceforge.net" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') options=('scriptlet' 'force') _F_gnome_scrollkeeper=y Finclude sourceforge gnome-scriptlet -sha1sums=('acf62059b3850d98c7501412cc96f7409221425f') +sha1sums=('64a179c301a9b3d06fe47f596721033be9a1a305') # optimization OK From crazy at frugalware.org Tue Jul 17 14:22:54 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 14:23:02 2007 Subject: [Frugalware-git] frugalware-current: libdaemon-0.12-1-i686 Message-ID: <20070717122254.4368413A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=afdba43bdb717949ad8eff70452de0f8c770843e commit afdba43bdb717949ad8eff70452de0f8c770843e Author: crazy Date: Tue Jul 17 14:21:46 2007 +0200 libdaemon-0.12-1-i686 * Version bump * s/build/Fconfopts/ diff --git a/source/lib/libdaemon/FrugalBuild b/source/lib/libdaemon/FrugalBuild index ec1d5a5..161592e 100644 --- a/source/lib/libdaemon/FrugalBuild +++ b/source/lib/libdaemon/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=libdaemon -pkgver=0.11 +pkgver=0.12 pkgrel=1 pkgdesc="libdaemon is a lightweight C library that eases the writing of UNIX daemons." url="http://0pointer.de/lennart/projects/libdaemon/" @@ -11,10 +11,7 @@ groups=('lib') archs=('i686' 'x86_64') up2date="lynx -dump http://0pointer.de/lennart/projects/libdaemon | grep 'libdaemon [0-9]' | sed 's/ //g' | sed 's/libdaemon//'" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('b20c048f6d36f6f72e320e2660d80df7c21ff48e') - -build() { - Fbuild --disable-doxygen --disable-lynx -} +Fconfopts="$Fconfopts --disable-doxygen --disable-lynx" +sha1sums=('2b45ab37df853afd25f7985ed699b799e0464413') # optimization OK From crazy at frugalware.org Tue Jul 17 14:33:31 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 14:33:35 2007 Subject: [Frugalware-git] frugalware-current: avahi-0.6.20-2-i686 Message-ID: <20070717123331.B940513A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6b147beb2d65eee4e248bc069871cba9acac1bde commit 6b147beb2d65eee4e248bc069871cba9acac1bde Author: crazy Date: Tue Jul 17 14:32:18 2007 +0200 avahi-0.6.20-2-i686 * rebuild with libdaemon diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index cf525a9..2a4f29c 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -3,12 +3,12 @@ pkgname=avahi pkgver=0.6.20 -pkgrel=1 +pkgrel=2 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64') url="http://www.avahi.org" groups=('network') -depends=('dbus-python>=0.80.2' 'libcap' 'nss-mdns' 'gdbm' 'libdaemon>=0.11' 'shadow>=4.0.18.1-4' 'libssp') +depends=('dbus-python>=0.80.2' 'libcap' 'nss-mdns' 'gdbm' 'libdaemon>=0.12' 'shadow>=4.0.18.1-4' 'libssp') makedepends=('mono' 'pygtk' 'qt' 'qt4' 'gtk2-sharp') backup=(etc/avahi/avahi-daemon.conf) conflicts=('mdnsresponder') From crazy at frugalware.org Tue Jul 17 14:37:34 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 14:37:37 2007 Subject: [Frugalware-git] frugalware-current: libvncserver-0.9.1-1-i686 Message-ID: <20070717123735.03F1113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=158012186d027b4c7588b4c431206249c824d114 commit 158012186d027b4c7588b4c431206249c824d114 Author: crazy Date: Tue Jul 17 14:36:13 2007 +0200 libvncserver-0.9.1-1-i686 * Version bump diff --git a/source/xlib-extra/libvncserver/FrugalBuild b/source/xlib-extra/libvncserver/FrugalBuild index d6b1d62..f9ceb75 100644 --- a/source/xlib-extra/libvncserver/FrugalBuild +++ b/source/xlib-extra/libvncserver/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=libvncserver -pkgver=0.9 +pkgver=0.9.1 pkgrel=1 pkgdesc="Library to create custom VNC servers" url="http://libvncserver.sourceforge.net" @@ -11,7 +11,7 @@ groups=('xlib-extra') archs=('i686' 'x86_64') Finclude sourceforge source=(${source/libvncserver-/LibVNCServer-}) -sha1sums=('d0c444edfe6b5e22dabaef575313d7732b059c33') +sha1sums=('8044885868a973fe64a8b048b6f76074aec56488') _F_cd_path="LibVNCServer-$pkgver" build() From crazy at frugalware.org Tue Jul 17 15:07:30 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 15:07:32 2007 Subject: [Frugalware-git] frugalware-current: dhcpcd-3.0.19-1-i686 Message-ID: <20070717130730.B501D13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0a06e7e1344aef800727607c28a7d896011c1024 commit 0a06e7e1344aef800727607c28a7d896011c1024 Author: crazy Date: Tue Jul 17 15:06:21 2007 +0200 dhcpcd-3.0.19-1-i686 * Version bump diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index cf91f0c..487b4d1 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=dhcpcd -pkgver=3.0.18 +pkgver=3.0.19 pkgrel=1 pkgdesc="A DHCP client daemon" url="http://dhcpcd.berlios.de" @@ -14,7 +14,7 @@ _F_berlios_ext=".tar.bz2" Finclude berlios source=(${source[@]} dhcpcd-3.0.17-service-paths.patch \ dhcpcd-3.0.2-dont-log-to-stdout.patch) -sha1sums=('621c25c95bce582240e1bc1c4d0ea58433c250e9' \ +sha1sums=('4f2d7b08e68b0edf55a39e259b828f8376bd6f7d' \ '752de460cde7a903b75bcd9198701eb224460b7e' \ '171e1b8bffe2b9c12744029cb516d7c245c8770b') From crazy at frugalware.org Tue Jul 17 15:17:32 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 15:17:34 2007 Subject: [Frugalware-git] frugalware-current: guile-1.8.2-1-i686 Message-ID: <20070717131732.5746213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=679996bcd5c60caef98fb6f140053f0faf6ce1c0 commit 679996bcd5c60caef98fb6f140053f0faf6ce1c0 Author: crazy Date: Tue Jul 17 15:16:25 2007 +0200 guile-1.8.2-1-i686 * Version bump diff --git a/source/devel/guile/FrugalBuild b/source/devel/guile/FrugalBuild index a5d16ff..5024284 100644 --- a/source/devel/guile/FrugalBuild +++ b/source/devel/guile/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=guile -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" @@ -14,7 +14,7 @@ up2date="wget --passive-ftp -O - -q ftp://ftp.gnu.org/pub/gnu/$pkgname/|sed -n ' source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz guile-1.8.0-slib.patch guile-1.8.0-deplibs-x86-64.patch) Fconfopts="$Fconfopts --disable-networking --with-threads" -sha1sums=('184555def153fdbc322045b1fdd90a7b23a84fbd' \ +sha1sums=('b5c624b152a45f302e185e20a468a02f2eb73e38' \ '8961ca12a62dfce33f4bde9a1eab985bd51cad77' \ 'e201dfab1f6d6f8a5574572e7da5f91a530215a0') From crazy at frugalware.org Tue Jul 17 15:46:15 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 15:46:17 2007 Subject: [Frugalware-git] frugalware-current: anjuta-2.2.0-1-i686 Message-ID: <20070717134615.5277E13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fa8700f1b93d1ac42b6d277f688830a23f8d6e1a commit fa8700f1b93d1ac42b6d277f688830a23f8d6e1a Author: crazy Date: Tue Jul 17 15:45:01 2007 +0200 anjuta-2.2.0-1-i686 * Version bump * aded missing scriptlet option diff --git a/source/gnome-extra/anjuta/FrugalBuild b/source/gnome-extra/anjuta/FrugalBuild index 831a37b..2fa40fd 100644 --- a/source/gnome-extra/anjuta/FrugalBuild +++ b/source/gnome-extra/anjuta/FrugalBuild @@ -2,11 +2,10 @@ # Maintainer: AlexExtreme pkgname=anjuta -pkgver=2.1.3 +pkgver=2.2.0 pkgrel=1 pkgdesc="Anjuta is a versatile IDE for C and C++, written for GTK/GNOME." -url="http://anjuta.sourceforge.net/" -depends=('gdl' 'gnome-build' 'guile' 'autogen' 'glade3' 'devhelp' 'graphviz' 'libgnomeprintui' 'vte' 'subversion' 'gtksourceview') +depends=('gdl' 'gnome-build' 'guile>=1.8.2' 'autogen' 'glade3' 'devhelp' 'graphviz' 'libgnomeprintui' 'vte' 'subversion' 'gtksourceview') makedepends=('perl-xml' 'intltool' 'gnome-doc-utils') _F_gnome_desktop="y" _F_gnome_iconcache="y" @@ -14,9 +13,10 @@ _F_gnome_scrollkeeper="y" _F_gnome_schemas=('/etc/gconf/schemas/anjuta-valgrind.schemas') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge gnome-scriptlet +options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('c4d633d904405c18eca6678ba1ba7e672dce29a2') +sha1sums=('0054dd0c28fb1c4fcb4957c56605ad13ed2f58b5') build() { Fcd From crazy at frugalware.org Tue Jul 17 15:49:47 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 15:49:50 2007 Subject: [Frugalware-git] frugalware-current: dbus-python-0.82.1-1-i686 Message-ID: <20070717134947.A200313A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=62d84cd00791d8ce3a3d608f068c85780d365e93 commit 62d84cd00791d8ce3a3d608f068c85780d365e93 Author: crazy Date: Tue Jul 17 15:48:37 2007 +0200 dbus-python-0.82.1-1-i686 * Version bump diff --git a/source/apps/dbus-python/FrugalBuild b/source/apps/dbus-python/FrugalBuild index f284a49..5dc8f2f 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.0 +pkgver=0.82.1 pkgrel=1 pkgdesc="Python bindings for D-BUS" url="http://www.freedesktop.org/wiki/Software_2fDBusBindings" From crazy at frugalware.org Tue Jul 17 15:57:41 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 15:57:43 2007 Subject: [Frugalware-git] frugalware-current: libwpd-0.8.10-1-i686 Message-ID: <20070717135741.CE3D213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=160fc022eb8e39095e6dbd4eb92e31821ca2ca0b commit 160fc022eb8e39095e6dbd4eb92e31821ca2ca0b Author: crazy Date: Tue Jul 17 15:56:32 2007 +0200 libwpd-0.8.10-1-i686 * Version bump diff --git a/source/xlib/libwpd/FrugalBuild b/source/xlib/libwpd/FrugalBuild index dada39a..a47e5eb 100644 --- a/source/xlib/libwpd/FrugalBuild +++ b/source/xlib/libwpd/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: crazy pkgname=libwpd -pkgver=0.8.9 +pkgver=0.8.10 pkgrel=1 pkgdesc="libwpd is a C++ library designed to help process WordPerfect documents." url="http://libwpd.sourceforge.net/" depends=('libgsf>=1.14.2-2' 'libstdc++') +makedepends=('doxygen') _F_sourceforge_prefix='libwpd-' Finclude sourceforge groups=('xlib') archs=('i686' 'x86_64') +sha1sums=('3c68e293b260459ef4b5935f3db6a2dc82b7a285') -sha1sums=('f5751f76dca619618659f480f32b35b9b7d88737') # optimization OK From crazy at frugalware.org Tue Jul 17 15:58:56 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 15:58:57 2007 Subject: [Frugalware-git] frugalware-current: perl-berkeleydb-0.32-1-i686 Message-ID: <20070717135856.52D1113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=814d32676ab69690294d7697412dff00f1ffd4dc commit 814d32676ab69690294d7697412dff00f1ffd4dc Author: crazy Date: Tue Jul 17 15:57:39 2007 +0200 perl-berkeleydb-0.32-1-i686 * Version bump diff --git a/source/devel-extra/perl-berkeleydb/FrugalBuild b/source/devel-extra/perl-berkeleydb/FrugalBuild index 1d9f708..676b9be 100644 --- a/source/devel-extra/perl-berkeleydb/FrugalBuild +++ b/source/devel-extra/perl-berkeleydb/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=BerkeleyDB _F_perl_author=P/PM/PMQS -pkgver=0.31 +pkgver=0.32 pkgrel=1 pkgdesc="Perl extension for Berkeley DB version 2, 3 or 4" url="http://cpan.org/" @@ -14,6 +14,6 @@ replaces=('perl-bdb') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('17a221e4e9e36dd76bc0ba3053044d73b516088c') +sha1sums=('49a7a8e4a5e03e1b00e8d32544fc52a34854d786') # optimization OK From crazy at frugalware.org Tue Jul 17 16:06:04 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:06:07 2007 Subject: [Frugalware-git] frugalware-current: 7zip-4.49-1-i686 Message-ID: <20070717140604.5032813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ad876c95c1ca776cc796beccd66cd1b47ee134e7 commit ad876c95c1ca776cc796beccd66cd1b47ee134e7 Author: crazy Date: Tue Jul 17 16:04:51 2007 +0200 7zip-4.49-1-i686 * Version bump diff --git a/source/apps-extra/7zip/FrugalBuild b/source/apps-extra/7zip/FrugalBuild index ec43b36..ff643f5 100644 --- a/source/apps-extra/7zip/FrugalBuild +++ b/source/apps-extra/7zip/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=7zip -pkgver=4.48 +pkgver=4.49 pkgrel=1 pkgdesc="7-Zip is a file archiver with high compression ratio." _F_sourceforge_name="p7zip" @@ -36,5 +36,5 @@ build() } -sha1sums=('d800f3e7abaffc62d91fd0320eb588a53dafd17c') +sha1sums=('0049df96c9b35e904393afea52b8670bb1bee22a') # optimization OK From crazy at frugalware.org Tue Jul 17 16:10:54 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:10:56 2007 Subject: [Frugalware-git] frugalware-current: aria2-0.11.1+1-1-i686 Message-ID: <20070717141054.862B113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=45d2c8613974ce0c7d21ce7cdc650611c85ebfc2 commit 45d2c8613974ce0c7d21ce7cdc650611c85ebfc2 Author: crazy Date: Tue Jul 17 16:09:43 2007 +0200 aria2-0.11.1+1-1-i686 * Version bump diff --git a/source/network-extra/aria2/FrugalBuild b/source/network-extra/aria2/FrugalBuild index e19b449..1a5b661 100644 --- a/source/network-extra/aria2/FrugalBuild +++ b/source/network-extra/aria2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=aria2 -pkgver=0.11.0 +pkgver=0.11.1+1 pkgrel=1 pkgdesc="aria2 is an utility for downloading files." url="http://aria2.sourceforge.net/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_sourceforge_prefix="$pkgname-" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('43618f050b0f753d39df333cc5e818d1ffbbe9d3') +sha1sums=('e605585170a3bd575caf56cb27613e6399efed6f') # optimization OK From crazy at frugalware.org Tue Jul 17 16:22:02 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:22:04 2007 Subject: [Frugalware-git] frugalware-current: libotf-0.9.6-1-i686 Message-ID: <20070717142202.7E49313A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d2a0112401676b8b58226b24d9ad6769a653cd5e commit d2a0112401676b8b58226b24d9ad6769a653cd5e Author: crazy Date: Tue Jul 17 16:20:53 2007 +0200 libotf-0.9.6-1-i686 * Version bump diff --git a/source/xlib-extra/libotf/FrugalBuild b/source/xlib-extra/libotf/FrugalBuild index e3a7dd7..a683f79 100644 --- a/source/xlib-extra/libotf/FrugalBuild +++ b/source/xlib-extra/libotf/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libotf -pkgver=0.9.5 +pkgver=0.9.6 pkgrel=1 pkgdesc="Library for handling OpenType fonts (OTF)." url="http://www.m17n.org/libotf/" @@ -11,7 +11,7 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep -m1 '.tar.gz$'|sed 's/.*-\(.*\).t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('401da5edd006d2651280197b6c6800936a4d5811') +sha1sums=('3dcb2d1f66f6584f6d222e04ab34710f869e22f3') build() { From crazy at frugalware.org Tue Jul 17 16:23:59 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:24:01 2007 Subject: [Frugalware-git] frugalware-current: libhangul-0.0.6-1-i686 Message-ID: <20070717142359.0936013A4147@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c18a02f6628f7bfcbc3ba04f9f6442486723dc68 commit c18a02f6628f7bfcbc3ba04f9f6442486723dc68 Author: crazy Date: Tue Jul 17 16:22:42 2007 +0200 libhangul-0.0.6-1-i686 * Version bump diff --git a/source/lib-extra/libhangul/FrugalBuild b/source/lib-extra/libhangul/FrugalBuild index 8d019b5..4821dc6 100644 --- a/source/lib-extra/libhangul/FrugalBuild +++ b/source/lib-extra/libhangul/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: crazy pkgname=libhangul -pkgver=0.0.4 +pkgver=0.0.6 pkgrel=1 pkgdesc="Hangul hanja input support." url="http://kldp.net/projects/hangul/" -depends=('glibc') +depends=() groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://kldp.net/frs/?group_id=362&release_id=1990'|grep -m1 'libhangul-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" -source=(http://kldp.net/frs/download.php/3733/$pkgname-$pkgver.tar.gz) -sha1sums=('e060011a849830eb014ceee67f4c54986ded60c4') +source=(http://kldp.net/frs/download.php/3973/$pkgname-$pkgver.tar.gz) +sha1sums=('a0d5a0934cc13059e0f6c1d82670454467f47071') # optimization OK From crazy at frugalware.org Tue Jul 17 16:29:34 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:29:36 2007 Subject: [Frugalware-git] frugalware-current: m17n-db-1.4.0-1-i686 Message-ID: <20070717142934.40D9D13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=dc5964e9630894b5b024b9beff7e6cb73ddad192 commit dc5964e9630894b5b024b9beff7e6cb73ddad192 Author: crazy Date: Tue Jul 17 16:28:25 2007 +0200 m17n-db-1.4.0-1-i686 * Version bump diff --git a/source/lib-extra/m17n-db/FrugalBuild b/source/lib-extra/m17n-db/FrugalBuild index b782ede..03128aa 100644 --- a/source/lib-extra/m17n-db/FrugalBuild +++ b/source/lib-extra/m17n-db/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=m17n-db -pkgver=1.3.4 +pkgver=1.4.0 pkgrel=1 pkgdesc="A multilingual processing database." url="http://www.m17n.org/" @@ -12,6 +12,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.m17n.org/m17n-lib-en/download.html|grep -m1 'm17n-db-'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz) -sha1sums=('b873c79f8467ef86e692969148e898d41d674c9c') +sha1sums=('bba72b0774d769a5d7bc4c48d08f1b4e85c36313') From crazy at frugalware.org Tue Jul 17 16:38:06 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:38:08 2007 Subject: [Frugalware-git] frugalware-current: m17n-lib-1.4.0-1-i686 Message-ID: <20070717143806.5CF7F13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c37478d8c6dd9f5e1cf6db3d33896dfb38e07110 commit c37478d8c6dd9f5e1cf6db3d33896dfb38e07110 Author: crazy Date: Tue Jul 17 16:36:57 2007 +0200 m17n-lib-1.4.0-1-i686 * Version bump diff --git a/source/xlib-extra/m17n-lib/FrugalBuild b/source/xlib-extra/m17n-lib/FrugalBuild index c53ee38..cbd45f8 100644 --- a/source/xlib-extra/m17n-lib/FrugalBuild +++ b/source/xlib-extra/m17n-lib/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: crazy pkgname=m17n-lib -pkgver=1.3.4 +pkgver=1.4.0 pkgrel=1 pkgdesc="A multilingual text processing library." url="http://www.m17n.org/" -depends=('anthy' 'libxaw' 'fribidi' 'gd' 'libotf' 'libxft' 'fontconfig' 'm17n-db>=1.3.4') +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/'" source=(http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz) -sha1sums=('7b264cbe5f4b7b8a6b90f2e12edf447d13cfeff4') +sha1sums=('b01a53ae45228fc94285d19935c25ef6d8816068') +unset MAKEFLAGS # optimization OK From crazy at frugalware.org Tue Jul 17 16:42:07 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:42:09 2007 Subject: [Frugalware-git] frugalware-current: libstatgrab-0.15-1-i686 Message-ID: <20070717144207.9642213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e1b5ff952e52cb25a117791a034eca1690650b44 commit e1b5ff952e52cb25a117791a034eca1690650b44 Author: crazy Date: Tue Jul 17 16:40:59 2007 +0200 libstatgrab-0.15-1-i686 * Version bump diff --git a/source/xlib-extra/libstatgrab/FrugalBuild b/source/xlib-extra/libstatgrab/FrugalBuild index 909561f..658c67b 100644 --- a/source/xlib-extra/libstatgrab/FrugalBuild +++ b/source/xlib-extra/libstatgrab/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=libstatgrab -pkgver=0.14 +pkgver=0.15 pkgrel=1 pkgdesc="Library providing access to statistics about the system on which it's run." url="http://www.i-scream.org/libstatgrab/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://freshmeat.net/projects/libstatgrab/ | grep '.tar.gz' | sed -ne 's/.*-//;s/\.tar\.gz//;1 p'" source=(http://freshmeat.net/redir/libstatgrab/39879/url_mirror/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --disable-deprecated" -sha1sums=('795723214002bb894085117e8d5c27dc7921c0c7') - +sha1sums=('9b038954f82be024eeb6a94b90e4dd4aae490343') +unset MAKEFLAGS # optimization OK From crazy at frugalware.org Tue Jul 17 16:45:12 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:45:15 2007 Subject: [Frugalware-git] frugalware-current: pystatgrab-0.5-1-i686 Message-ID: <20070717144512.9D81F13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d4c0ddfc38ef0f3ee84f2b23cb4fbb9b61421900 commit d4c0ddfc38ef0f3ee84f2b23cb4fbb9b61421900 Author: crazy Date: Tue Jul 17 16:43:47 2007 +0200 pystatgrab-0.5-1-i686 * Version bump diff --git a/source/xlib-extra/pystatgrab/FrugalBuild b/source/xlib-extra/pystatgrab/FrugalBuild index 33ec3c7..8183df0 100644 --- a/source/xlib-extra/pystatgrab/FrugalBuild +++ b/source/xlib-extra/pystatgrab/FrugalBuild @@ -3,16 +3,16 @@ # Contributor: Tuxbubling pkgname=pystatgrab -pkgver=0.4 -pkgrel=2 +pkgver=0.5 +pkgrel=1 pkgdesc="Pystatgrab is a set of Python bindings for the libstatgrab library." url="http://www.i-scream.org/pystatgrab/" -depends=('libstatgrab' 'python') +depends=('libstatgrab>=0.15' 'python') groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://freshmeat.net/projects/pystatgrab/ | grep '.tar.gz' | sed -ne 's/.*-//;s/\.tar\.gz//;1 p'" source=(http://freshmeat.net/redir/pystatgrab/48819/url_mirror/$pkgname-$pkgver.tar.gz) -sha1sums=('290e3155bdf3987f99bac4b79ce6a5557d127eb3') +sha1sums=('e886963ab5036850e987fbea5411a543e2939531') -# vim: ft=sh -# optimalization no-arch + +# optimization OK From crazy at frugalware.org Tue Jul 17 16:54:06 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 16:54:08 2007 Subject: [Frugalware-git] frugalware-current: fltk2-r5917-1-i686 Message-ID: <20070717145406.A803213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a50c9a67fa68e4177ffeb23c2ae71ff56c000ad2 commit a50c9a67fa68e4177ffeb23c2ae71ff56c000ad2 Author: crazy Date: Tue Jul 17 16:52:56 2007 +0200 fltk2-r5917-1-i686 * Version bump * fixed source location diff --git a/source/xlib-extra/fltk2/FrugalBuild b/source/xlib-extra/fltk2/FrugalBuild index 2900af9..7046942 100644 --- a/source/xlib-extra/fltk2/FrugalBuild +++ b/source/xlib-extra/fltk2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=fltk2 -pkgver=r5905 +pkgver=r5917 origname=fltk-2.0.x-${pkgver} pkgrel=1 pkgdesc="FLTK2 is a cross-platform C++ GUI toolkit for X." @@ -13,9 +13,9 @@ options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.fltk.org/|grep -m1 'FLTK 2.0.x Weekly Snapshot'|sed 's/.*, \(.*\)/\1/'" -source=(ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/$origname.tar.bz2 \ +source=(http://ftp.easysw.com/pub/fltk/snapshots/$origname.tar.bz2 \ disable_crappy_test.patch) -sha1sums=('0ca0bdb89c68121d643b1cd0adcdbfd75539d90d'\ +sha1sums=('970b93416a220d424696a572cf51a9ab7b32bb62' \ '007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74') build() From crazy at frugalware.org Tue Jul 17 17:21:17 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 17:21:20 2007 Subject: [Frugalware-git] frugalware-current: kdegames-3.5.7-2-i686 Message-ID: <20070717152117.3957413A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=65d1ccfcb7f86bd65efe483a83b16eca5c07b2ef commit 65d1ccfcb7f86bd65efe483a83b16eca5c07b2ef Author: crazy Date: Tue Jul 17 17:20:05 2007 +0200 kdegames-3.5.7-2-i686 * relbump * added libssp to depends() * reported to be broken without by 'liber' on IRC diff --git a/source/kde/kdegames/FrugalBuild b/source/kde/kdegames/FrugalBuild index 316b2dc..9ba580c 100644 --- a/source/kde/kdegames/FrugalBuild +++ b/source/kde/kdegames/FrugalBuild @@ -3,11 +3,11 @@ pkgname=kdegames pkgver=3.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="Games for KDE." groups=('kde') archs=('i686' 'x86_64') -depends=('kdebase>=3.5.7' 'dbus>=0.93') +depends=('kdebase>=3.5.7' 'dbus>=0.93' 'libssp') makedepends=('doxygen' 'qt-docs') Finclude kde sha1sums=('8bc3d74ad3bdf02142974bc86ed39a560bb69e54') From crazy at frugalware.org Tue Jul 17 17:27:47 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 17:27:51 2007 Subject: [Frugalware-git] frugalware-current: fish-1.22.3-1-i686 Message-ID: <20070717152747.E546A13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=edd394b5146c00cb1a5bc5c6070161a4b8dec38f commit edd394b5146c00cb1a5bc5c6070161a4b8dec38f Author: crazy Date: Tue Jul 17 17:25:54 2007 +0200 fish-1.22.3-1-i686 * url fix * /usr/man -> /usr/share/man in build() diff --git a/source/apps-extra/fish/FrugalBuild b/source/apps-extra/fish/FrugalBuild index cef0b54..2f9367d 100644 --- a/source/apps-extra/fish/FrugalBuild +++ b/source/apps-extra/fish/FrugalBuild @@ -6,7 +6,7 @@ pkgname=fish pkgver=1.22.3 pkgrel=1 pkgdesc="fish is a user friendly command line shell for UNIX-like operating systems." -url="http://roo.no-ip.org/fish/" +url="http://fishshell.org/" depends=('ncurses') makedepends=('doxygen' 'groff') groups=('apps-extra') @@ -17,8 +17,12 @@ source=($url/files/$pkgver/$pkgname-$pkgver.tar.bz2) build() { - Fbuild docdir=/usr/share/doc/$pkgname-$pkgver --without-xsel \ - --prefix=/ --mandir=/usr/man --datadir=/usr/share + Fbuild \ + docdir=/usr/share/doc/$pkgname-$pkgver \ + --without-xsel \ + --prefix=/ \ + --mandir=/usr/share/man \ + --datadir=/usr/share } sha1sums=('4b7d705b8d7736253713021e1791c0dd5dcbc80b') From krics at linuxforum.hu Tue Jul 17 17:40:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 17:40:40 2007 Subject: [Frugalware-git] frugalware-current: xscreensaver-5.03-1-x86_64 Message-ID: <20070717154038.1AC2F13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=96869c957059f644ea5190201a414efd4e20b977 commit 96869c957059f644ea5190201a414efd4e20b977 Author: Christian Hamar alias krix Date: Tue Jul 17 17:39:36 2007 +0200 xscreensaver-5.03-1-x86_64 * Version bump diff --git a/source/xlib/xscreensaver/FrugalBuild b/source/xlib/xscreensaver/FrugalBuild index acf152e..dfff29b 100644 --- a/source/xlib/xscreensaver/FrugalBuild +++ b/source/xlib/xscreensaver/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: VMiklos pkgname=xscreensaver -pkgver=5.02 +pkgver=5.03 pkgrel=1 pkgdesc="A screen saver and locker for the X Window System." url="http://www.jwz.org/xscreensaver" @@ -35,6 +35,6 @@ build() Fsplit xscreensaver-data /usr/share/xscreensaver/config } -sha1sums=('3e02f516efc25755f1a89f5af3983423f639f82b'\ +sha1sums=('e283a52faf6148273a82a9e5c9ed70c5722cdcb8' \ 'aff9f153023249c8c82bfaf35f1552610747de78') # optimization OK From crazy at frugalware.org Tue Jul 17 17:53:05 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 17:53:06 2007 Subject: [Frugalware-git] frugalware-current: wine-0.9.41-1-i686 Message-ID: <20070717155305.34ECA13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=acc2462c4b99f2b0e00dbd9ac58c6ef4af55e0e8 commit acc2462c4b99f2b0e00dbd9ac58c6ef4af55e0e8 Author: crazy Date: Tue Jul 17 17:51:47 2007 +0200 wine-0.9.41-1-i686 * Version bump diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild index 88e4826..a3b0993 100644 --- a/source/xapps/wine/FrugalBuild +++ b/source/xapps/wine/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=wine -pkgver=0.9.40 +pkgver=0.9.41 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=('e4b6b04e135d11b1158a82a27a5c3dc540f6302c' \ +sha1sums=('afe78726e9dbc50bc1161dcb59587c22954ffc39' \ 'a9c70a49cef90cf60c2e90e63753858387f7117a' \ 'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \ '8b0f7b52885c8d78ba3096a16e9caff60ffe624f') From crazy at frugalware.org Tue Jul 17 18:04:21 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 18:04:22 2007 Subject: [Frugalware-git] frugalware-current: exiv2-0.15-1-i686 Message-ID: <20070717160421.46D2213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=149251f1bbe2c9bd578a5f4b32488677c9152e59 commit 149251f1bbe2c9bd578a5f4b32488677c9152e59 Author: crazy Date: Tue Jul 17 18:03:11 2007 +0200 exiv2-0.15-1-i686 * Version bump diff --git a/source/lib-extra/exiv2/FrugalBuild b/source/lib-extra/exiv2/FrugalBuild index 1b3a3c9..8e084c0 100644 --- a/source/lib-extra/exiv2/FrugalBuild +++ b/source/lib-extra/exiv2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=exiv2 -pkgver=0.14 +pkgver=0.15 pkgrel=1 pkgdesc="Exiv2 is a C++ library and a command line utility to access image metadata." url="http://www.exiv2.org/" @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.exiv2.org/download.html|grep -m1 '.tar.gz'|sed 's/.*v2-\(.*\).t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --with-zlib=/usr" +sha1sums=('db5b0da39c5d2a736cecf4800f83639f841af5cc') -sha1sums=('de27db776e8cb03f5bfff6e144b1fa1c4f073fc8') # optimization OK From krics at linuxforum.hu Tue Jul 17 18:09:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 18:09:15 2007 Subject: [Frugalware-git] frugalware-current: libgsf-1.14.5-1-x86_64 Message-ID: <20070717160912.D87EC13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=55f6d16f1b205731e774d3215b9aaffbb4d19a76 commit 55f6d16f1b205731e774d3215b9aaffbb4d19a76 Author: Christian Hamar alias krix Date: Tue Jul 17 18:08:52 2007 +0200 libgsf-1.14.5-1-x86_64 * Version bump * cp .schemas to right dir because in .5 it does not got installed somehow :S diff --git a/source/lib/libgsf/FrugalBuild b/source/lib/libgsf/FrugalBuild index a534cd3..06dd986 100644 --- a/source/lib/libgsf/FrugalBuild +++ b/source/lib/libgsf/FrugalBuild @@ -3,29 +3,33 @@ # Contributor: Miklos Nemeth pkgname=libgsf -pkgver=1.14.4 +pkgver=1.14.5 pkgrel=1 pkgdesc="A library for reading and writing structured files (eg MS OLE and Zip)" url="http://www.gnome.org/" depends=('libxml2' 'glib2' 'bzip2') -makedepends=('gtk-doc' 'perl-xml' 'pygtk' 'gnome-vfs>=2.16.2' 'libbonobo') +makedepends=('gtk-doc' 'perl-xml' 'pygtk' 'gnome-vfs>=2.16.2' 'libbonobo' 'gconf') groups=('lib') archs=('i686' 'x86_64') Finclude gnome python -sha1sums=('684d89c8fb9a7fe33c83d810e45401889c794fe2') +sha1sums=('92b2f1f5e2d9a5b940b9a387928785f1e93220a4') subpkgs=('libgsf-gnome') subdescs=('GNOME specific extensions to libgsf') -subdepends=("gnome-vfs>=2.16.2 libbonobo $pkgname=$pkgver-$pkgrel") +subdepends=("gconf gnome-vfs>=2.16.2 libbonobo $pkgname=$pkgver-$pkgrel") subgroups=('gnome') subarchs=('i686 x86_64') subinstall=('libgsf-gnome.install') build() { Fcd + # Needed because gconf detection fails :S + autoreconf || Fdie Fmake --enable-gtk-doc --with-bz2 --with-gnome --with-zlib --with-python \ --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 + # Damn. Somehow it isn't installed ... + cp $Fsrcdir/$pkgname-$pkgver/thumbnailer/*.schemas $Fdestdir/etc/gconf/schemas/ || Fdie Fsplit libgsf-gnome etc/gconf/schemas/ Fsplit libgsf-gnome usr/include/libgsf-1/gsf-gnome Fsplit libgsf-gnome usr/lib/pkgconfig/libgsf-gnome-1.pc From crazy at frugalware.org Tue Jul 17 18:13:11 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 18:13:14 2007 Subject: [Frugalware-git] frugalware-current: libkexiv2-0.1.5-2-i686 Message-ID: <20070717161311.6C2B713A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=74affb595504e133f07594566a4befb9814a8d68 commit 74affb595504e133f07594566a4befb9814a8d68 Author: crazy Date: Tue Jul 17 18:11:53 2007 +0200 libkexiv2-0.1.5-2-i686 * rebuild diff --git a/source/kde-extra/libkexiv2/FrugalBuild b/source/kde-extra/libkexiv2/FrugalBuild index c1f6f14..fd9d76a 100644 --- a/source/kde-extra/libkexiv2/FrugalBuild +++ b/source/kde-extra/libkexiv2/FrugalBuild @@ -3,9 +3,9 @@ pkgname=libkexiv2 pkgver=0.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDE wrapper library for Exiv2 library with some extras" -depends=('kdelibs>=3.5.6' 'exiv2>=0.14' 'libxinerama' 'libxfixes' 'libart_lgpl' 'libxcb' 'libice' 'libxcursor' 'libxrender' \ +depends=('kdelibs>=3.5.7' 'exiv2>=0.15' 'libxinerama' 'libxfixes' 'libart_lgpl' 'libxcb' 'libice' 'libxcursor' 'libxrender' \ 'libxi' 'libidn' 'libxmu' 'libxft' 'libgcc' 'libpng') groups=('kde-extra') archs=('i686' 'x86_64') From krics at linuxforum.hu Tue Jul 17 18:19:07 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 18:19:08 2007 Subject: [Frugalware-git] frugalware-current: man-pages-2.62-1-x86_64 Message-ID: <20070717161907.0B9C113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2956e6a49acfbbeb691d7f403ac2769c810320ee commit 2956e6a49acfbbeb691d7f403ac2769c810320ee Author: Christian Hamar alias krix Date: Tue Jul 17 18:17:13 2007 +0200 man-pages-2.62-1-x86_64 * Version bump - OK with boobaaa diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index ac3ece3..48c9cc7 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Former m8r: VMiklos pkgname=man-pages -pkgver=2.61 +pkgver=2.62 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } # optimization OK - noarch -sha1sums=('f1278be0bad139ed623e48731f0ad6a31ef208a6') +sha1sums=('1e3178ccc8ce2b6f986965ecde3e955d809a3b4c') From krics at linuxforum.hu Tue Jul 17 18:24:25 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 18:24:28 2007 Subject: [Frugalware-git] frugalware-current: mksh-R29g-1-x86_64 Message-ID: <20070717162425.A37D213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=690159cf259874d1fbdb8f9e0502182adb4864bb commit 690159cf259874d1fbdb8f9e0502182adb4864bb Author: Christian Hamar alias krix Date: Tue Jul 17 18:24:01 2007 +0200 mksh-R29g-1-x86_64 * Version bump * Fixed up2date * Added nroff to makedepends() * Removed uneccessary cd $Fsrcdir/... stuff diff --git a/source/apps-extra/mksh/FrugalBuild b/source/apps-extra/mksh/FrugalBuild index 4997388..2503a68 100644 --- a/source/apps-extra/mksh/FrugalBuild +++ b/source/apps-extra/mksh/FrugalBuild @@ -2,20 +2,19 @@ # Maintainer: DNAku pkgname=mksh -pkgver=R29 +pkgver=R29g pkgrel=1 pkgdesc="The MirOS KornShell" url="http://mirbsd.de/mksh" depends=() -makedepends=('cpio') +makedepends=('cpio' 'groff') archs=('i686' 'x86_64') -up2date="lynx -dump http://mirbsd.de/mksh |grep -m1 mksh |sed 's/.*1..//g'" +up2date="lynx -dump http://mirbsd.de/mksh |grep -m1 'current version of mksh' |sed -n -e 's/.*mksh is mksh \(.*\) from.*/\1/' -e '1 p'" groups=('apps-extra') source=(http://www.mirbsd.org/MirOS/dist/mir/$pkgname/$pkgname-$pkgver.cpio.gz) options=('scriptlet') build() { - cd $startdir/src Fcd $pkgname Fsed '/bin/ed' '/usr/bin/ed' histrap.c chmod +x Build.sh || Fdie @@ -27,5 +26,5 @@ build() { Ffilerel mksh.1 /usr/man/man1/mksh.1 } -sha1sums=('314868ec2e5e9fd0f16d478e6d91a23a47bd5e7c') +sha1sums=('e4c01e53ede31e560fe164842d0a44bf516dc074') # optimization OK From krics at linuxforum.hu Tue Jul 17 18:35:45 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 18:35:51 2007 Subject: [Frugalware-git] frugalware-current: jwm-2.0.1-1-x86_64 Message-ID: <20070717163545.130B713A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=10989e7bda05f9a679bf9c0c863d43f6f3f8b274 commit 10989e7bda05f9a679bf9c0c863d43f6f3f8b274 Author: Christian Hamar alias krix Date: Tue Jul 17 18:35:18 2007 +0200 jwm-2.0.1-1-x86_64 * Version bump * Better up2date line * Rewrite xinitrc.jwm to drop X11R6 paths diff --git a/source/x11-extra/jwm/FrugalBuild b/source/x11-extra/jwm/FrugalBuild index 9ab448d..3cdb46a 100644 --- a/source/x11-extra/jwm/FrugalBuild +++ b/source/x11-extra/jwm/FrugalBuild @@ -2,20 +2,20 @@ # Maintainer: DNAku pkgname=jwm -pkgver=1.8 +pkgver=2.0.1 pkgrel=1 url="http://joewing.net/programs/jwm" pkgdesc="JWM is a window manager for the X11 Window System" -depends=('libxft' 'libxpm' 'libpng' 'libxinerama' 'expat') +depends=('libxft' 'libxpm' 'libpng' 'libxinerama' 'expat' 'libjpeg' 'libxext') backup=(etc/system.jwmrc) archs=('i686' 'x86_64') groups=('x11-extra') -up2date="lynx -dump http://joewing.net/programs/jwm/index.shtml |grep tar|sed 's/.tar.*//g'|sed 's/.*wm-//g'" -source=(http://www.joewing.net/programs/jwm/jwm-$pkgver.tar.bz2 \ +up2date="lynx -dump 'http://www.joewing.net/programs/jwm/releases/?C=M;O=A' | Flasttarbz2" +source=(http://www.joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2 \ jwm.desktop xinitrc.jwm) -sha1sums=('71852287b1478d24ee6bb08afcbbf45b74709fa5' \ - '475e836f4cd9b14f6ef9436f1e367cac1c3b9ed7' \ - 'e218ad2d0bd22120a403a277833c76ca89dc1eb6') +sha1sums=('209bc5e8c41f6a827d38a9b365405a2dc9bef082' \ + '475e836f4cd9b14f6ef9436f1e367cac1c3b9ed7' \ + '60eaab2b954aadc29afb1372d864f5574ca68936') build() { diff --git a/source/x11-extra/jwm/xinitrc.jwm b/source/x11-extra/jwm/xinitrc.jwm index e883670..9a2ab9c 100644 --- a/source/x11-extra/jwm/xinitrc.jwm +++ b/source/x11-extra/jwm/xinitrc.jwm @@ -3,8 +3,8 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap +sysresources=/usr/lib/X11/xinit/.Xresources +sysmodmap=/usr/lib/X11/xinit/.Xmodmap # merge in defaults and keymaps From crazy at frugalware.org Tue Jul 17 18:59:49 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 18:59:50 2007 Subject: [Frugalware-git] frugalware-current: kipi-plugins-0.1.4-1-i686 Message-ID: <20070717165949.0B65913A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a99a9cc67f66b6ed624ec4221c8b2b24db83f03c commit a99a9cc67f66b6ed624ec4221c8b2b24db83f03c Author: crazy Date: Tue Jul 17 18:58:31 2007 +0200 kipi-plugins-0.1.4-1-i686 * rebuild with exiv2-0.15 * Fcd fix diff --git a/source/kde-extra/kipi-plugins/FrugalBuild b/source/kde-extra/kipi-plugins/FrugalBuild index 1d553ec..4211f6f 100644 --- a/source/kde-extra/kipi-plugins/FrugalBuild +++ b/source/kde-extra/kipi-plugins/FrugalBuild @@ -6,10 +6,9 @@ pkgver=0.1.4 pkgrel=1 pkgdesc="kipi-plugins is based in part on the work of the Independent JPEG Group." license="GPL" -depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.14' 'libkexiv2' 'libkdcraw') +depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.15' 'libkexiv2>=0.1.5-2' 'libkdcraw') archs=('i686' 'x86_64') groups=('kde-extra') -_F_cd_path="$pkgname-$origver" _F_sourceforge_dirname="kipi" _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 From krics at linuxforum.hu Tue Jul 17 19:06:02 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 19:06:05 2007 Subject: [Frugalware-git] frugalware-current: xawtv-3.95-5-x86_64 Message-ID: <20070717170602.C95BB13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7c55b24b7a15f24bca8697cbd79941091ba77737 commit 7c55b24b7a15f24bca8697cbd79941091ba77737 Author: Christian Hamar alias krix Date: Tue Jul 17 19:05:40 2007 +0200 xawtv-3.95-5-x86_64 * Release bump * Remove hardcoded stuff from /usr/X11R6* * Config bydefault is /etc/X11/xawtvrc now (not /usr/X11R6foobar..) * Added 'tons' of patch. Half from gentoo, half made by me. * Added libquicktime as depends, added patches for libquicktime * Modified FB now optim* OK appears * Enabled mmx on i686 diff --git a/source/xapps-extra/xawtv/030_all_autocolor.patch b/source/xapps-extra/xawtv/030_all_autocolor.patch new file mode 100644 index 0000000..56e3456 --- /dev/null +++ b/source/xapps-extra/xawtv/030_all_autocolor.patch @@ -0,0 +1,27 @@ +Make sure the xv colorkey is autopaint, so that xawtv does not conflict with +other programs using xv output. + +Index: xawtv-3.95/x11/xv.c +=================================================================== +--- xawtv-3.95.orig/x11/xv.c ++++ xawtv-3.95/x11/xv.c +@@ -315,6 +315,7 @@ void xv_video_init(unsigned int port, in + struct STRTAB *inputs = NULL; + char *h; + int n, i, vi_port = -1, vi_adaptor = -1; ++ Atom xv_atom; + + if (Success != XvQueryExtension(dpy,&ver,&rel,&req,&ev,&err)) { + if (debug) +@@ -424,6 +425,11 @@ void xv_video_init(unsigned int port, in + handle->xv_encoding = XV_ENCODING; + if (0 == strcmp("XV_FREQ",at[i].name)) + handle->xv_freq = XV_FREQ; ++ if (0 == strcmp("XV_AUTOPAINT_COLORKEY",at[i].name)) ++ { ++ xv_atom = XInternAtom(dpy,"XV_AUTOPAINT_COLORKEY",False); ++ XvSetPortAttribute(dpy,vi_port,xv_atom,1); ++ } + #if 0 + if (0 == strcmp("XV_COLORKEY",at[i].name)) + handle->xv_colorkey = XV_COLORKEY; diff --git a/source/xapps-extra/xawtv/FrugalBuild b/source/xapps-extra/xawtv/FrugalBuild index 1e09b97..a772687 100644 --- a/source/xapps-extra/xawtv/FrugalBuild +++ b/source/xapps-extra/xawtv/FrugalBuild @@ -3,24 +3,42 @@ pkgname=xawtv pkgver=3.95 -pkgrel=4 +pkgrel=5 pkgdesc="A TV application for the bttv driver." url="http://linux.bytesex.org/xawtv" license="GPL" depends=('tv-fonts' 'libdv' 'alsa-lib' 'libjpeg' 'libfs' 'aalib' 'libxrandr' 'libxv' 'libxinerama' 'zvbi' 'libxaw' \ - 'openmotif' 'libxxf86dga' 'mesa' 'libfs') + 'openmotif' 'libxxf86dga' 'mesa' 'libfs' 'libquicktime') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://dl.bytesex.org/releases/xawtv/|grep $pkgname-[0-9\.]*\.tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://dl.bytesex.org/releases/xawtv/$pkgname-$pkgver.tar.gz gcc4.patch Xlib.patch) +source=(http://dl.bytesex.org/releases/xawtv/$pkgname-$pkgver.tar.gz \ + gcc4.patch Xlib.patch \ + xawtv-3.95-pagemask-fix.patch0 xawtv-3.95-libquicktime-compat.patch \ + 030_all_autocolor.patch quicktime-path-fix.patch xawtvrc_conf_to_etc.patch) sha1sums=('0b0743fc06aae4f1a03c8572bcf2baa9b869ff52' \ '6cc7968b28806e4e1210e804de822669a41b9b86' \ - 'acf407998cd0cf33340395c1d93d6f1f585a6faa') -build () + 'acf407998cd0cf33340395c1d93d6f1f585a6faa' \ + '7983bc9977a1b3cdb7a6b68f390175ef82d26c00' \ + '91d3c1824d7810389f56c89e33e2bc4340d52faf' \ + '1d20f60a7118804c3e06fa52abea5601b8189f43' \ + 'cec592284efa3723e8caed14f9e529159e1fe262' \ + 'e418802504ae1f4a254a88bb0e8374bc313acc81') +build() { export CFLAGS="$CFLAGS -I/usr/include/X11/fonts" + Fpatchall # build xawtv - Fbuild + if [ "$CARCH" != "x86_64" ] ; then + Fconf --enable-mmx + fi + if [ "$CARCH" == "x86_64" ] ; then + Fconf + fi + # Do this way because cflags not hidden. + make verbose=yes || Fdie + # resdir needed because if not then it installs everything to /usr/X11R6.. + Fmakeinstall resdir=$Fdestdir/usr/lib/X11 # install desktop file Fdesktop "$pkgname" "$pkgname.xpm" "Qt;Gtk;AudioVideo;" @@ -29,3 +47,5 @@ build () Ffilerel contrib/*.xpm usr/share/pixmaps/xawtv/ Fln xawtv/xawtv48x48.xpm usr/share/pixmaps/$pkgname.xpm } + +# optimization OK diff --git a/source/xapps-extra/xawtv/quicktime-path-fix.patch b/source/xapps-extra/xawtv/quicktime-path-fix.patch new file mode 100644 index 0000000..94df70a --- /dev/null +++ b/source/xapps-extra/xawtv/quicktime-path-fix.patch @@ -0,0 +1,32 @@ +diff -Naur xawtv-3.95.orig/libng/plugins/read-qt.c xawtv-3.95/libng/plugins/read-qt.c +--- xawtv-3.95.orig/libng/plugins/read-qt.c 2007-07-17 18:47:21.000000000 +0200 ++++ xawtv-3.95/libng/plugins/read-qt.c 2007-07-17 18:48:10.000000000 +0200 +@@ -4,9 +4,9 @@ + #include + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + + #include "grab-ng.h" + +diff -Naur xawtv-3.95.orig/libng/plugins/write-qt.c xawtv-3.95/libng/plugins/write-qt.c +--- xawtv-3.95.orig/libng/plugins/write-qt.c 2007-07-17 18:47:21.000000000 +0200 ++++ xawtv-3.95/libng/plugins/write-qt.c 2007-07-17 18:48:38.000000000 +0200 +@@ -4,9 +4,9 @@ + #include + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + + #include "grab-ng.h" + diff --git a/source/xapps-extra/xawtv/xawtv-3.95-libquicktime-compat.patch b/source/xapps-extra/xawtv/xawtv-3.95-libquicktime-compat.patch new file mode 100644 index 0000000..a86c48d --- /dev/null +++ b/source/xapps-extra/xawtv/xawtv-3.95-libquicktime-compat.patch @@ -0,0 +1,27 @@ +--- xawtv-3.95/libng/plugins/write-qt.c.old 2006-10-16 20:50:45.000000000 +0200 ++++ xawtv-3.95/libng/plugins/write-qt.c 2006-10-17 19:36:09.000000000 +0200 +@@ -348,10 +348,10 @@ + info[i]->name,info[i]->long_name); + for (j = 0; j < info[i]->num_fourccs; j++) + fprintf(stderr," fcc : %s\n",info[i]->fourccs[j]); +- for (j = 0; j < info[i]->num_encoding_colormodels; j++) ++ for (j = 0; j < lqt_num_colormodels(); j++) + fprintf(stderr," cmodel: %d [%s]\n", +- info[i]->encoding_colormodels[j], +- lqt_get_colormodel_string(info[i]->encoding_colormodels[j])); ++ lqt_get_colormodel(j), ++ lqt_get_colormodel_string(j)); + } + + /* sanity checks */ +@@ -378,8 +378,8 @@ + /* pick colormodel */ + fmtid = VIDEO_NONE; + cmodel = 0; +- for (j = 0; j < info[i]->num_encoding_colormodels; j++) { +- cmodel = info[i]->encoding_colormodels[j]; ++ for (j = 0; j < lqt_num_colormodels(); j++) { ++ cmodel = lqt_get_colormodel(j); + if (cmodel>= sizeof(cmodels)/sizeof(int)) + continue; + if (!cmodels[cmodel]) diff --git a/source/xapps-extra/xawtv/xawtv-3.95-pagemask-fix.patch0 b/source/xapps-extra/xawtv/xawtv-3.95-pagemask-fix.patch0 new file mode 100644 index 0000000..ab635f7 --- /dev/null +++ b/source/xapps-extra/xawtv/xawtv-3.95-pagemask-fix.patch0 @@ -0,0 +1,44 @@ +Patch from Andreas Jochens +http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html + +diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c +--- ../tmp-orig/xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000 ++++ ./console/fbtools.c 2006-08-23 10:57:40.000000000 +0000 +@@ -21,8 +21,6 @@ + #include + #include + +-#include +- + #include "fbtools.h" + + /* -------------------------------------------------------------------- */ +@@ -424,7 +422,7 @@ + goto err; + } + #endif +- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); ++ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1); + fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, + PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); + if (-1L == (long)fb_mem) { +diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c +--- ../tmp-orig/xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000 ++++ ./console/matrox.c 2006-08-23 11:09:51.000000000 +0000 +@@ -9,7 +9,6 @@ + #include + #include + +-#include /* PAGE_SIZE */ + #include + + #include "byteswap.h" +@@ -226,7 +225,7 @@ + return -1; + } + off = (unsigned long)fb_fix.mmio_start - +- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); ++ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1)); + bmmio += off; + mmio = (uint32_t*)bmmio; + return 0; diff --git a/source/xapps-extra/xawtv/xawtvrc_conf_to_etc.patch b/source/xapps-extra/xawtv/xawtvrc_conf_to_etc.patch new file mode 100644 index 0000000..cc245b3 --- /dev/null +++ b/source/xapps-extra/xawtv/xawtvrc_conf_to_etc.patch @@ -0,0 +1,15 @@ +diff -Naur xawtv-3.95.orig/configure xawtv-3.95/configure +--- xawtv-3.95.orig/configure 2007-07-17 19:00:44.000000000 +0200 ++++ xawtv-3.95/configure 2007-07-17 19:02:21.000000000 +0200 +@@ -6812,10 +6812,7 @@ + + echo "$as_me:$LINENO: checking for X11 config directory" >&5 + echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6 +-x11conf=/usr/X11R6/lib/X11 +-if test -d /etc/X11; then +- x11conf=/etc/X11 +-fi ++x11conf=/etc/X11 + echo "$as_me:$LINENO: result: $x11conf" >&5 + echo "${ECHO_T}$x11conf" >&6 + From krics at linuxforum.hu Tue Jul 17 19:17:03 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 19:17:11 2007 Subject: [Frugalware-git] frugalware-current: naim-0.11.8.3.1-1-x86_64 Message-ID: <20070717171703.EED7B13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a17376c5080e96beeefacc2c4fbad743cff86cbd commit a17376c5080e96beeefacc2c4fbad743cff86cbd Author: Christian Hamar alias krix Date: Tue Jul 17 19:16:47 2007 +0200 naim-0.11.8.3.1-1-x86_64 * Version bump * Fixed source URI * Fixup for docs. naim -> naim-$pkgver diff --git a/source/apps-extra/naim/FrugalBuild b/source/apps-extra/naim/FrugalBuild index df86cb3..e0701bc 100644 --- a/source/apps-extra/naim/FrugalBuild +++ b/source/apps-extra/naim/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DNAku pkgname=naim -pkgver=0.11.8.2.1 +pkgver=0.11.8.3.1 pkgrel=1 pkgdesc="naim is a console client for AIM, ICQ and Lily CMC" url="http://naim.n.ml.org/" @@ -10,7 +10,14 @@ depends=('ncurses') archs=('i686' 'x86_64') groups=('apps-extra') up2date="lynx -dump http://naim.n.ml.org/download | grep -m1 released |sed 's/.rel.*//g'|sed 's/.*aim.//g'" -source=(http://shell.n.ml.org/n/naim/naim-$pkgver.tar.bz2) -sha1sums=('820f8f92b1dc26a69f7af0a4646cc83fdcdabf94') +source=(http://naim.googlecode.com/files/naim-$pkgver.tar.bz2) +sha1sums=('b3ecc917d2f6e41097635a48438585c79e14db88') +unset MAKEFLAGS + +build() { + Fbuild + # Fixup for docs + Fmv usr/share/doc/$pkgname usr/share/doc/$pkgname-$pkgver +} # optimization OK From krics at linuxforum.hu Tue Jul 17 19:19:57 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 19:19:59 2007 Subject: [Frugalware-git] frugalware-current: libgnomecanvasmm-2.16.0-5-x86_64 Message-ID: <20070717171957.CC31713A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ee304f3f8897e4be4a718cd5e90495648b27aaf4 commit ee304f3f8897e4be4a718cd5e90495648b27aaf4 Author: Christian Hamar alias krix Date: Tue Jul 17 19:19:38 2007 +0200 libgnomecanvasmm-2.16.0-5-x86_64 * Release bump due cairomm (thx detto) diff --git a/source/gnome-extra/libgnomecanvasmm/FrugalBuild b/source/gnome-extra/libgnomecanvasmm/FrugalBuild index c55ca8d..0ff3fad 100644 --- a/source/gnome-extra/libgnomecanvasmm/FrugalBuild +++ b/source/gnome-extra/libgnomecanvasmm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libgnomecanvasmm pkgver=2.16.0 -pkgrel=4 +pkgrel=5 pkgdesc="C++ interface for libgnomecanvas" url="http://www.gtkmm.org" -depends=('gtkmm' 'libgnomecanvas' 'cairomm=1.4.0') +depends=('gtkmm' 'libgnomecanvas' 'cairomm>=1.4.2') groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome From crazy at frugalware.org Tue Jul 17 19:26:14 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 19:26:17 2007 Subject: [Frugalware-git] frugalware-current: kipi-plugins-0.1.4-2-i686 Message-ID: <20070717172614.6009613A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7e2dc70885fef3313bdb9e375d5df53c88573f5e commit 7e2dc70885fef3313bdb9e375d5df53c88573f5e Author: crazy Date: Tue Jul 17 19:24:46 2007 +0200 kipi-plugins-0.1.4-2-i686 * relbump for real now diff --git a/source/kde-extra/kipi-plugins/FrugalBuild b/source/kde-extra/kipi-plugins/FrugalBuild index 4211f6f..8e783a1 100644 --- a/source/kde-extra/kipi-plugins/FrugalBuild +++ b/source/kde-extra/kipi-plugins/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kipi-plugins pkgver=0.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="kipi-plugins is based in part on the work of the Independent JPEG Group." license="GPL" depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.15' 'libkexiv2>=0.1.5-2' 'libkdcraw') From krics at linuxforum.hu Tue Jul 17 19:36:32 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 19:36:34 2007 Subject: [Frugalware-git] frugalware-current: foomatic-filters-ppds-20070717-1-x86_64 Message-ID: <20070717173632.6B39F13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e605b09d38cd95922bd457a3e12737f6303c88d5 commit e605b09d38cd95922bd457a3e12737f6303c88d5 Author: Christian Hamar alias krix Date: Tue Jul 17 19:36:15 2007 +0200 foomatic-filters-ppds-20070717-1-x86_64 * Version bump diff --git a/source/apps/foomatic-filters-ppds/FrugalBuild b/source/apps/foomatic-filters-ppds/FrugalBuild index 7f22675..c402efa 100644 --- a/source/apps/foomatic-filters-ppds/FrugalBuild +++ b/source/apps/foomatic-filters-ppds/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: Bence Nagy pkgname=foomatic-filters-ppds -pkgver=20070706 +pkgver=20070717 pkgrel=1 pkgdesc="Foomatic is a system for using free software printer drivers with common spoolers on Unix" url="http://www.linuxprinting.org/foomatic.html" @@ -26,4 +26,4 @@ build() { Frm /usr/share/ppd Fln cups/model /usr/share/ppd } -sha1sums=('a85bd238cacd05772ff84bf6b3709666212da259') +sha1sums=('9815574a408982c3ef0f5dc380e17a03a1fa697d') From crazy at frugalware.org Tue Jul 17 19:46:17 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 19:46:19 2007 Subject: [Frugalware-git] frugalware-current: kphotoalbum-3.0.2-2-i686 Message-ID: <20070717174617.0DF9E13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cd5bcb4e1862539e99b08b9ad199190616c8a0e1 commit cd5bcb4e1862539e99b08b9ad199190616c8a0e1 Author: crazy Date: Tue Jul 17 19:44:55 2007 +0200 kphotoalbum-3.0.2-2-i686 * rebuild with exiv2-0.15 diff --git a/source/kde-extra/kphotoalbum/FrugalBuild b/source/kde-extra/kphotoalbum/FrugalBuild index 61d9272..b0a1583 100644 --- a/source/kde-extra/kphotoalbum/FrugalBuild +++ b/source/kde-extra/kphotoalbum/FrugalBuild @@ -3,10 +3,10 @@ pkgname=kphotoalbum pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Image Database (KPhotoAlbum) is a tool for indexing, searching, and viewing images." license="GPL-2" -depends=('libxi' 'libstdc++' 'libxmu' 'libkipi' 'exiv2>=0.14') +depends=('libxi' 'libstdc++' 'libxmu' 'libkipi' 'exiv2>=0.15') archs=('i686' 'x86_64') groups=('kde-extra') Finclude kde From crazy at frugalware.org Tue Jul 17 20:05:04 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 20:05:05 2007 Subject: [Frugalware-git] frugalware-current: gwenview-1.4.1-5-i686 Message-ID: <20070717180504.00F9613A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=362a059ea11032a4235a4fd2059dfefd8c50e196 commit 362a059ea11032a4235a4fd2059dfefd8c50e196 Author: crazy Date: Tue Jul 17 20:03:52 2007 +0200 gwenview-1.4.1-5-i686 * rebuild with exiv2-0.15 diff --git a/source/kde-extra/gwenview/FrugalBuild b/source/kde-extra/gwenview/FrugalBuild index 922a979..dd7a5ff 100644 --- a/source/kde-extra/gwenview/FrugalBuild +++ b/source/kde-extra/gwenview/FrugalBuild @@ -3,9 +3,9 @@ pkgname=gwenview pkgver=1.4.1 -pkgrel=4 +pkgrel=5 pkgdesc="Gwenview is an image viewer for KDE." -depends=('kdelibs>=3.5.6' 'libkipi' 'exiv2>=0.14') +depends=('kdelibs>=3.5.7' 'libkipi' 'exiv2>=0.15') groups=('kde-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" From crazy at frugalware.org Tue Jul 17 20:16:01 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 20:16:04 2007 Subject: [Frugalware-git] frugalware-current: digikamimageplugins Message-ID: <20070717181601.A932B13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9a39eed38b057a2897f924f58c010749868611a5 commit 9a39eed38b057a2897f924f58c010749868611a5 Author: crazy Date: Tue Jul 17 20:13:18 2007 +0200 digikamimageplugins * removed diff --git a/source/kde-extra/digikamimageplugins/FrugalBuild b/source/kde-extra/digikamimageplugins/FrugalBuild deleted file mode 100644 index eb39350..0000000 --- a/source/kde-extra/digikamimageplugins/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling time: 2.82 SBU -# Maintainer: crazy -# Contributor: Bence Nagy - -pkgname=digikamimageplugins -pkgver=0.9.1 -pkgrel=1 -pkgdesc="Image plugins for digikam" -depends=('digikam>=0.9.1') -groups=('kde-extra' 'kde-apps') -archs=('i686' 'x86_64') -_F_sourceforge_dirname="digikam" -_F_sourceforge_ext=".tar.bz2" -_F_sourceforge_broken_up2date=1 -Finclude kde sourceforge -url="http://digikam.sourceforge.net" - -sha1sums=('610d717f73c3b25dcf98d1504975684e3a6f34e6') -# optimization OK From priyank at frugalware.org Tue Jul 17 20:23:25 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 17 20:23:29 2007 Subject: [Frugalware-git] frugalware-current: directfb-1.0.0-1-i686 Message-ID: <20070717182325.753AD13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=78ab72eb42312670ba9bee1e4583712fc0960e32 commit 78ab72eb42312670ba9bee1e4583712fc0960e32 Author: Priyank Date: Tue Jul 17 23:49:48 2007 +0530 directfb-1.0.0-1-i686 * Version bump * Splitted graphics and input drivers into respective subpackages (24 in all) diff --git a/source/xlib/directfb/FrugalBuild b/source/xlib/directfb/FrugalBuild index a743216..4e5d49c 100644 --- a/source/xlib/directfb/FrugalBuild +++ b/source/xlib/directfb/FrugalBuild @@ -1,33 +1,102 @@ -# Compiling Time: 1.28 SBU +# Compiling Time: 0.75 SBU # Maintainer: Priyank Gosalia pkgname=directfb -pkgver=0.9.25.1 -pkgrel=5 +pkgver=1.0.0 +_pkgver=1.0-0 +pkgrel=1 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device." url="http://www.directfb.org" license="LGPL" -depends=('sdl' 'sysfsutils' 'freetype2' 'libpng' 'libjpeg' 'libmpeg3' 'zlib' - 'xf86-input-joystick' 'xf86-input-keyboard' 'xf86-input-mouse' \ - 'xf86-video-i810' 'xf86-video-mga' 'xf86-video-nv' 'xf86-video-savage' \ - 'xf86-video-sis' 'xf86-video-neomagic' 'xf86-video-ati') +depends=('sdl' 'sysfsutils' 'freetype2' 'libpng' 'libjpeg' 'libmpeg3' 'zlib') groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://directfb.org/index.php?path=Main%2FDownloads | grep -m1 tar.gz | sed 's/.*B-\(.*\).t.*/\1/'" source=(http://www.directfb.org/downloads/Core/DirectFB-$pkgver.tar.gz \ directfb-0.9.25.1-x86_64.diff directfb-0.9.25.1-sysfs.diff) -sha1sums=('40654da2fde2fd5539f5a0c5cdac50e1a8a52bb4' \ - '09524cdd69787e3a464cbc605f654ebab6b681b0' \ - 'edcd80bcc94f4e0370b2e39c12335f5eb5d8869d') +sha1sums=('8ac354cabd9c279e8bd3cf352daddf1b19f2007f' \ + '09524cdd69787e3a464cbc605f654ebab6b681b0' \ + 'edcd80bcc94f4e0370b2e39c12335f5eb5d8869d') + +subpkgs=("$pkgname-video-i810" "$pkgname-video-i830" "$pkgname-video-mga" "$pkgname-video-nv" "$pkgname-video-savage" \ + "$pkgname-video-sis" "$pkgname-video-neomagic" "$pkgname-video-ati" "$pkgname-video-nsc" \ + "$pkgname-video-tdfx" "$pkgname-video-unichrome" "$pkgname-video-radeon" "$pkgname-input-joystick" \ + "$pkgname-input-keyboard" "$pkgname-input-ps2mouse" "$pkgname-input-serialmouse" \ + "$pkgname-input-linuxinput" "$pkgname-input-lirc" "$pkgname-input-mutouch" "$pkgname-input-penmount" \ + "$pkgname-input-sonypi" "$pkgname-input-wm97xx") +subdescs=('DirectFB video driver for Intel i810 cards' \ + 'DirectFB video driver for Intel i830 cards' \ + 'DirectFB video driver for Matrox cards' \ + 'DirectFB video driver for NVidia cards' \ + 'DirectFB video driver for S3 Savage cards' \ + 'DirectFB video driver for SiS cards' \ + 'DirectFB video driver for NeoMagic cards' \ + 'DirectFB video driver for ATI cards' \ + 'DirectFB video driver for nsc cards' \ + 'DirectFB video driver for 3dfx Voodoo cards' \ + 'DirectFB video driver for Unichrome cards' \ + 'DirectFB video driver for ATI Radeon cards' \ + 'DirectFB driver for joystick input devices' \ + 'DirectFB driver for keyboard input devices' \ + 'DirectFB driver for PS/2 mouse input devices' \ + 'DirectFB driver for serial mouse input devices' \ + 'DirectFB driver for linux input devices' \ + 'DirectFB driver for lirc input devices' \ + 'DirectFB driver for mutouch input devices' \ + 'DirectFB driver for penmount input devices' \ + 'DirectFB driver for sonypi input devices' \ + 'DirectFB driver for wm97xx_ts input devices') +subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver") +subgroups=('xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' \ + 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' \ + 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' \ + 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' \ + 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' 'xlib directfb-drivers' \ + 'xlib directfb-drivers' 'xlib directfb-drivers') +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' 'i686 x86_64') build() { Fcd DirectFB-$pkgver sed -i '/-O3/d' configure || return 1 Fbuild --enable-x11 --enable-zlib --enable-sdl --enable-mmx --enable-sse \ --enable-jpeg --enable-png --enable-freetype --enable-sysfs --enable-static \ - --enable-debug --disable-vnc --enable-fbdev \ + --enable-debug --disable-vnc --enable-fbdev --enable-fbcon \ --with-input-drivers=keyboard,joystick,ps2mouse,serialmouse,linuxinput \ --with-gfx-drivers=i810,i830,matrox,nvidia,sis315,neomagic,savage,ati128 + + # Graphics drivers + Fsplit $pkgname-video-i810 usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_i810.{a,la,o,so} + Fsplit $pkgname-video-i830 usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_i830.{a,la,o,so} + Fsplit $pkgname-video-mga usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_matrox.{a,la,o,so} + Fsplit $pkgname-video-nv usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_nvidia.{a,la,o,so} + Fsplit $pkgname-video-savage usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_savage.{a,la,o,so} + Fsplit $pkgname-video-sis usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_sis315.{a,la,o,so} + Fsplit $pkgname-video-neomagic usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_neomagic.{a,la,o,so} + Fsplit $pkgname-video-ati usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_ati128.{a,la,o,so} + Fsplit $pkgname-video-nsc usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_nsc.{a,la,o,so} + Fsplit $pkgname-video-tdfx usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_tdfx.{a,la,o,so} + Fsplit $pkgname-video-unichrome usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_unichrome.{a,la,o,so} + Fsplit $pkgname-video-radeon usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_radeon.{a,la,o,so} + + # Input drivers + Fsplit $pkgname-input-joystick usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_joystick.{a,la,o,so} + Fsplit $pkgname-input-keyboard usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_keyboard.{a,la,o,so} + Fsplit $pkgname-input-serialmouse usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_serialmouse.{a,la,o,so} + Fsplit $pkgname-input-ps2mouse usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_ps2mouse.{a,la,o,so} + Fsplit $pkgname-input-linuxinput usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_linux_input.{a,la,o,so} + Fsplit $pkgname-input-lirc usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_lirc.{a,la,o,so} + Fsplit $pkgname-input-mutouch usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_mutouch.{a,la,o,so} + Fsplit $pkgname-input-penmount usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_penmount.{a,la,o,so} + Fsplit $pkgname-input-sonypi usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_sonypi.{a,la,o,so} + Fsplit $pkgname-input-wm97xx usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_wm97xx_ts.{a,la,o,so} } # optimization OK From priyank at frugalware.org Tue Jul 17 20:35:46 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 17 20:35:47 2007 Subject: [Frugalware-git] frugalware-current: dcraw-8.76-1-i686 Message-ID: <20070717183546.46B0613A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7f6841c8ac10a762171294be6ec405fbdccaf8af commit 7f6841c8ac10a762171294be6ec405fbdccaf8af Author: Priyank Date: Wed Jul 18 00:03:44 2007 +0530 dcraw-8.76-1-i686 * Fix SHA1SUMS diff --git a/source/apps-extra/dcraw/FrugalBuild b/source/apps-extra/dcraw/FrugalBuild index 0cdbb70..25dba6a 100644 --- a/source/apps-extra/dcraw/FrugalBuild +++ b/source/apps-extra/dcraw/FrugalBuild @@ -12,8 +12,8 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.cybercom.net/~dcoffin/dcraw/dcraw.c | grep -m1 VERSION | sed 's/.*N \"\(.*\).\"*/\1/'" source=($url/$pkgname.{c,1}) -sha1sums=('bc89126aed8a01358b8d26d8815155b31ab4670a'\ - 'd6a696cec4a058babe50bcb1c3ad134375ab7e70') +sha1sums=('c5ef12e557db3c774227c37f0c9722f8aa47c1fd' \ + '9f27957f857164fb4e87ad24e376472d19a3a9cc') build() { From krics at linuxforum.hu Tue Jul 17 20:36:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 20:36:20 2007 Subject: [Frugalware-git] frugalware-current: xine-lib-1.1.7-1-x86_64 Message-ID: <20070717183617.1B4C313A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b61b236b365bf578939fe8bf0aaf08f39ca0f637 commit b61b236b365bf578939fe8bf0aaf08f39ca0f637 Author: Christian Hamar alias krix Date: Tue Jul 17 20:35:10 2007 +0200 xine-lib-1.1.7-1-x86_64 * Removed patch from GIT (vidixx64) * Removed Fpatchall and autoreconf for x86_64 in FB * Compiled and upload diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild index 9f3232c..fca56ef 100644 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@ -19,12 +19,9 @@ options=('scriptlet') makedepends=('arts' 'esd' 'sdl') groups=('xlib') archs=('i686' 'x86_64') -source=($source vidix64-x86_64.patch) build() { - Fpatchall - [ "$CARCH" == "x86_64" ] && autoconf export CFLAGS="$CFLAGS -UHAVE_MMX" Fconf \ --enable-ipv6 \ @@ -49,7 +46,5 @@ build() make DESTDIR=$Fdestdir install || Fdie } -sha1sums=('acbd545b818f0eb120be60e1116152000544020f'\ - 'e55c1ec2c286f877fd0f462fab120cffdc2d7f29') +sha1sums=('acbd545b818f0eb120be60e1116152000544020f') # optimization OK - From krics at linuxforum.hu Tue Jul 17 20:49:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 20:49:14 2007 Subject: [Frugalware-git] frugalware-current: ash-0.4.0-5-x86_64 Message-ID: <20070717184912.E615813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=be72e6f3ce4919a85eb66a4774fd3eb9c48f7c95 commit be72e6f3ce4919a85eb66a4774fd3eb9c48f7c95 Author: Christian Hamar alias krix Date: Tue Jul 17 20:48:55 2007 +0200 ash-0.4.0-5-x86_64 * Added unset MAKEFLAGS (fix for compile) diff --git a/source/apps/ash/FrugalBuild b/source/apps/ash/FrugalBuild index a1204ee..ab82068 100644 --- a/source/apps/ash/FrugalBuild +++ b/source/apps/ash/FrugalBuild @@ -16,6 +16,7 @@ source=(ftp://ftp.slackware.com/pub/slackware/slackware-current/source/ap/$pkgna sha1sums=('9a1695c84734a82b4682237385f7cd6f39a7bd51' \ '964d796a695a2053107593c1c7b44acee6c36d6d' \ 'b6de42cd42dae5a1fbf1d036a3e97d22c845c5fa') +unset MAKEFLAGS build() { Fpatchall From priyank at frugalware.org Tue Jul 17 20:52:19 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 17 20:52:20 2007 Subject: [Frugalware-git] frugalware-current: phex-3.2.0.102-1-i686 Message-ID: <20070717185219.1D8F413A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6769f8483b11b3ce68219c0a1a82df5b4a14b3a1 commit 6769f8483b11b3ce68219c0a1a82df5b4a14b3a1 Author: Priyank Date: Wed Jul 18 00:19:31 2007 +0530 phex-3.2.0.102-1-i686 * Version bump diff --git a/source/xapps-extra/phex/FrugalBuild b/source/xapps-extra/phex/FrugalBuild index 54c564d..360dbf9 100644 --- a/source/xapps-extra/phex/FrugalBuild +++ b/source/xapps-extra/phex/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=phex -pkgver=3.0.2.100 +pkgver=3.2.0.102 pkgrel=1 pkgdesc="Phex is a p2p filesharing program running on gnutella network." license="GPL" @@ -17,7 +17,7 @@ source=(${source/$pkgname-/${pkgname}_} phex.png) _F_desktop_name="Phex filesharing client" _F_desktop_categories="Network;" _F_desktop_icon="phex.png" -sha1sums=('e6c42dd4c85ba21b075f5a8c0aac276a62d1fe16'\ +sha1sums=('cf9a8d3edc09640ad757c5ab8b58b068ddb4bf63' \ 'c57651f5ebf9be53638f7bb76a5bccb24dcd8b09') build() From krics at linuxforum.hu Tue Jul 17 20:55:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 20:55:24 2007 Subject: [Frugalware-git] frugalware-current: aide-0.13.1-1-x86_64 Message-ID: <20070717185522.B512813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e0cd8d73e5447d05a12d97083092fd328696a29e commit e0cd8d73e5447d05a12d97083092fd328696a29e Author: Christian Hamar alias krix Date: Tue Jul 17 20:55:01 2007 +0200 aide-0.13.1-1-x86_64 * Added x86_64 to archs() * Corrected archs=(i686) :) (missing '') diff --git a/source/apps-extra/aide/FrugalBuild b/source/apps-extra/aide/FrugalBuild index 2b2f795..6abd334 100644 --- a/source/apps-extra/aide/FrugalBuild +++ b/source/apps-extra/aide/FrugalBuild @@ -10,11 +10,11 @@ Finclude sourceforge url="http://aide.sourceforge.org/" makedepends=(mhash zlib) groups=("apps-extra") -archs=(i686) +archs=('i686' 'x86_64') backup=("etc/aide/aide.conf") sha1sums=("0112ee0a974020b99f09d1f2a9fb05433a7b9681") -build () +build() { Fbuild --with-mhash Fmkdir /etc/aide From krics at linuxforum.hu Tue Jul 17 20:58:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 20:58:26 2007 Subject: [Frugalware-git] frugalware-current: asterisk-sounds-1.2.1-4-x86_64 Message-ID: <20070717185822.9775513A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=86b267b800ed66972bb0e2ea46a75bb011cd1bca commit 86b267b800ed66972bb0e2ea46a75bb011cd1bca Author: Christian Hamar alias krix Date: Tue Jul 17 20:58:03 2007 +0200 asterisk-sounds-1.2.1-4-x86_64 * Added x86_64 to archs() diff --git a/source/apps-extra/asterisk-sounds/FrugalBuild b/source/apps-extra/asterisk-sounds/FrugalBuild index cda434f..0270508 100644 --- a/source/apps-extra/asterisk-sounds/FrugalBuild +++ b/source/apps-extra/asterisk-sounds/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=4 pkgdesc="Sound files for Asterisk." url="http://asterisk.org/" groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads | grep 'Sounds' | sed 's/.*s \(.*\).*/\1/' | tail -n1" source=(http://ftp.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz) sha1sums=('219dd5412d4bbaeeef798a49bfd0f1a591fcc177') @@ -32,4 +32,3 @@ build() Frm /var/lib/asterisk/sounds/seconds.gsm Frm /var/lib/asterisk/sounds/silence/{1,2,3,4,5,6,7,8,9,10}.gsm } - From crazy at frugalware.org Tue Jul 17 21:01:25 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 21:01:43 2007 Subject: [Frugalware-git] frugalware-current: digikam-0.9.2-1-i686 Message-ID: <20070717190125.845EC13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c56bc33f1fabf5d1e89c0c8e01c7cb28b49edc30 commit c56bc33f1fabf5d1e89c0c8e01c7cb28b49edc30 Author: crazy Date: Tue Jul 17 21:00:00 2007 +0200 digikam-0.9.2-1-i686 * Version bump * this version replaces the *plugins packages all-in-one now * added conflicts,replaces,provides * some FB cleanups * depends fix diff --git a/source/kde-extra/digikam/FrugalBuild b/source/kde-extra/digikam/FrugalBuild index 375796c..f8131a1 100644 --- a/source/kde-extra/digikam/FrugalBuild +++ b/source/kde-extra/digikam/FrugalBuild @@ -3,21 +3,21 @@ # Contributor: Bence Nagy pkgname=digikam -pkgver=0.9.1 -pkgrel=4 +pkgver=0.9.2 +pkgrel=1 pkgdesc="Digital photo management application for kde" -depends=('libkipi>=0.1.5' 'libgphoto2' 'imlib2' 'sqlite3' 'kdelibs>=3.5.6' \ - 'exiv2>=0.14' 'lcms' 'libdrm' 'libxcb' 'libice' 'libxt' 'libkexiv2>=0.1.5') +depends=('libkipi>=0.1.5' 'libgphoto2' 'imlib2' 'sqlite3' 'kdelibs>=3.5.7' \ + 'exiv2>=0.15' 'lcms' 'libdrm' 'libxcb' 'libice' 'libxt' \ + 'libkexiv2>=0.1.5-2' 'libkdcraw') makedepends=('doxygen') groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') options=('scriptlet') -#_F_sourceforge_prefix="$pkgname-" +conflicts=('digikamimageplugins') +replaces=('digikamimageplugins') +provides=('digikamimageplugins') _F_sourceforge_ext=".tar.bz2" -_F_sourceforge_mirror="mesh" _F_kde_defaults=0 Finclude sourceforge kde -source=($source exiv2-0.14.patch) -sha1sums=('92c9c9a943ad5a806be900758dbdc02ad94b8061'\ - '7367f471fd32244eebe44a55cae032af8f51d68c') +sha1sums=('8344355c3a9e4b8648d2e1a853cdf54e90918d91') # optimization OK From krics at linuxforum.hu Tue Jul 17 21:03:25 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 21:03:27 2007 Subject: [Frugalware-git] frugalware-current: memtest86+-1.70-1-x86_64 Message-ID: <20070717190325.B19E813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3c7ea0e33c8a916da54f082bd702fe34a747b9e4 commit 3c7ea0e33c8a916da54f082bd702fe34a747b9e4 Author: Christian Hamar alias krix Date: Tue Jul 17 21:03:06 2007 +0200 memtest86+-1.70-1-x86_64 * Added !x86_64 to archs() diff --git a/source/apps/memtest86+/FrugalBuild b/source/apps/memtest86+/FrugalBuild index 617c91a..8bb9e11 100644 --- a/source/apps/memtest86+/FrugalBuild +++ b/source/apps/memtest86+/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="An advanced memory diagnostic tool" url="http://www.memtest.org/" depends=() groups=('apps') -archs=('i686') +archs=('i686' '!x86_64') up2date="lynx -dump $url|grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/download/$pkgver/$pkgname-$pkgver.tar.gz \ memtest86+-1.70-cflags.diff) From krics at linuxforum.hu Tue Jul 17 21:07:37 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 21:07:40 2007 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.7.1-1-x86_64 Message-ID: <20070717190737.1AF8813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=22e746ffefeaa847d88f5fb2fe07d54c6c095f5e commit 22e746ffefeaa847d88f5fb2fe07d54c6c095f5e Author: Christian Hamar alias krix Date: Tue Jul 17 21:07:05 2007 +0200 asterisk-1.4.7.1-1-x86_64 * Added x86_64 to archs() diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index 7bc1127..e109d68 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -13,7 +13,7 @@ depends=('asterisk-sounds' 'curl>=7.16.0' 'glibc' 'libidn' 'ncurses' 'newt' 'pop 'libpqxx' 'libpri>=1.4.1' 'speex' 'sqlite2' 'openssl' 'unixodbc' 'zlib' \ 'mpg321' 'sudo') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.digium.com/pub/asterisk/|grep asterisk-[0-9\.]*tar.gz$|Flasttar" source=(http://ftp.digium.com/pub/$pkgname/$pkgname-$pkgver.tar.gz \ rc.asterisk) From crazy at frugalware.org Tue Jul 17 21:07:56 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 21:07:58 2007 Subject: [Frugalware-git] frugalware-current: ivtv-utils-1.0.0-1-i686 Message-ID: <20070717190756.5FAE513A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=72ae2f595f31060d841592cbab5b255d4d370c85 commit 72ae2f595f31060d841592cbab5b255d4d370c85 Author: crazy Date: Tue Jul 17 21:06:32 2007 +0200 ivtv-utils-1.0.0-1-i686 * Version bump diff --git a/source/apps-extra/ivtv-utils/FrugalBuild b/source/apps-extra/ivtv-utils/FrugalBuild index e225528..0f2647d 100644 --- a/source/apps-extra/ivtv-utils/FrugalBuild +++ b/source/apps-extra/ivtv-utils/FrugalBuild @@ -3,9 +3,9 @@ pkgname=ivtv-utils -branch=0.10.x -pkgver=0.10.3 -pkgrel=4 +branch=1.0.x +pkgver=1.0.0 +pkgrel=1 pkgdesc="Tools for managing the hardware supported by ivtv driver" url="http://ivtvdriver.org/index.php/Main_Page" depends=('libstdc++') @@ -16,6 +16,8 @@ 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' \ + '68fef52289fed191aac19ce4c0f84fb25740f028') subpkgs=('ivtv-firmware') subdescs=("Firmware for Hauppauge PVR and Conexant based cards") @@ -50,6 +52,4 @@ build() Ffilerel doc/* /usr/share/doc/$pkgname-$pkgver } -sha1sums=('49d016b779539bb17c08882e230edcfd17d1cba1'\ - '68fef52289fed191aac19ce4c0f84fb25740f028') # optimization OK From krics at linuxforum.hu Tue Jul 17 21:13:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 21:13:33 2007 Subject: [Frugalware-git] frugalware-current: asterisk-addons-1.4.2-1-x86_64 Message-ID: <20070717191331.0EB7D13A412E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fc8d89ff0ba8be4adfe849b0cec95b1e0491c359 commit fc8d89ff0ba8be4adfe849b0cec95b1e0491c359 Author: Christian Hamar alias krix Date: Tue Jul 17 21:13:05 2007 +0200 asterisk-addons-1.4.2-1-x86_64 * Added x86_64 to archs() diff --git a/source/apps-extra/asterisk-addons/FrugalBuild b/source/apps-extra/asterisk-addons/FrugalBuild index 304774e..b2da5e0 100644 --- a/source/apps-extra/asterisk-addons/FrugalBuild +++ b/source/apps-extra/asterisk-addons/FrugalBuild @@ -10,7 +10,7 @@ url="http://www.asterisk.org/" backup=(etc/asterisk/*) depends=('asterisk-sounds' 'asterisk>=1.4.5' 'mysql' 'libpqxx' 'openssl') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads | grep -m1 Addons | sed 's/.*s \(.*\).*/\1/'" source=(http://ftp.digium.com/pub/asterisk/$pkgname-$pkgver.tar.gz) sha1sums=('f6506e927f8b3884a2cdf43a303ae1b2ea453a8a') From crazy at frugalware.org Tue Jul 17 21:16:45 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 21:16:47 2007 Subject: [Frugalware-git] frugalware-current: kiwi-1.9.16-1-i686 Message-ID: <20070717191645.32FE213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3ea180469f184ddc6d39db852b732f1e1cd11f2b commit 3ea180469f184ddc6d39db852b732f1e1cd11f2b Author: crazy Date: Tue Jul 17 21:15:14 2007 +0200 kiwi-1.9.16-1-i686 * Version bump diff --git a/source/xlib-extra/kiwi/FrugalBuild b/source/xlib-extra/kiwi/FrugalBuild index 8f5638d..dbe107e 100644 --- a/source/xlib-extra/kiwi/FrugalBuild +++ b/source/xlib-extra/kiwi/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=kiwi -pkgver=1.9.15 +pkgver=1.9.16 pkgrel=1 pkgdesc="A framework for Python applications with graphical user interfaces" url="http://www.async.com.br/projects/kiwi/" @@ -13,4 +13,4 @@ up2date="lynx -dump http://www.async.com.br/projects/kiwi/getit.html|grep -m1 'k groups=('xlib-extra') archs=('i686' 'x86_64') depends=('pygtk') -sha1sums=('81dbfe2a47642093d9a948abe3212cc706f50c0e') +sha1sums=('74eef37ce58267e1006da573004984df540f5bd6') From krics at linuxforum.hu Tue Jul 17 21:17:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 21:17:54 2007 Subject: [Frugalware-git] frugalware-current: pstocanonbj-3.3-1-x86_64 Message-ID: <20070717191753.0691E13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0bb527cc5b7fa8ef7ff9d850eae6132c767a63ac commit 0bb527cc5b7fa8ef7ff9d850eae6132c767a63ac Author: Christian Hamar alias krix Date: Tue Jul 17 21:17:22 2007 +0200 pstocanonbj-3.3-1-x86_64 * Added x86_64 to archs() diff --git a/source/apps-extra/pstocanonbj/FrugalBuild b/source/apps-extra/pstocanonbj/FrugalBuild index 7a38ace..8b56b61 100644 --- a/source/apps-extra/pstocanonbj/FrugalBuild +++ b/source/apps-extra/pstocanonbj/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Cups filter for Canon Pixus printers." url="http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/" depends=('glibc' 'cups' 'zlib') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/ |grep ps.*orig.t |sed -ne 's/.*_\(.*\).orig.*/\1/;$ p'" source=(http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/pstocanonbj_$pkgver.orig.tar.gz) sha1sums=('8de09ecedd3e418de7b5e2ed2d17e9fae9387bc0') From krics at linuxforum.hu Tue Jul 17 21:22:01 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 21:22:03 2007 Subject: [Frugalware-git] frugalware-current: radeontool-1.5-2-x86_64 Message-ID: <20070717192201.BC93113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7f5f1e133e77c4eb02f89e7a8b3eb50193a86ddb commit 7f5f1e133e77c4eb02f89e7a8b3eb50193a86ddb Author: Christian Hamar alias krix Date: Tue Jul 17 21:21:45 2007 +0200 radeontool-1.5-2-x86_64 * Added x86_64 to archs() diff --git a/source/apps-extra/radeontool/FrugalBuild b/source/apps-extra/radeontool/FrugalBuild index 3f0a940..2e5b065 100644 --- a/source/apps-extra/radeontool/FrugalBuild +++ b/source/apps-extra/radeontool/FrugalBuild @@ -9,7 +9,7 @@ url="http://fdd.com/software/radeon" depends=() rodepends=('pciutils') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://fdd.com/software/radeon |grep tool- |Flasttar" source=(http://fdd.com/software/radeon/radeontool-$pkgver.tar.gz http://fdd.com/software/radeon/lightwatch2.pl) From krics at linuxforum.hu Tue Jul 17 21:23:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 21:23:55 2007 Subject: [Frugalware-git] frugalware-current: sleepd-1.3.10-1-x86_64 Message-ID: <20070717192353.3FD6D13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=11047bd1463bf0e9eac2820bd71a19fc1e342d38 commit 11047bd1463bf0e9eac2820bd71a19fc1e342d38 Author: Christian Hamar alias krix Date: Tue Jul 17 21:23:23 2007 +0200 sleepd-1.3.10-1-x86_64 * Added x86_64 to archs() diff --git a/source/apps-extra/sleepd/FrugalBuild b/source/apps-extra/sleepd/FrugalBuild index 0946834..9a2f47f 100644 --- a/source/apps-extra/sleepd/FrugalBuild +++ b/source/apps-extra/sleepd/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A daemon to put a laptop to sleep if it is not being used or if the bat url="http://kitenet.net/~joey/code/sleepd.html" depends=('apmd') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') backup=('etc/sleepd.conf') up2date="lynx -dump -nolist http://ftp.debian.org/debian/pool/main/s/sleepd/?M=D | grep -m1 tar.gz | sed 's/.*d_\(.*\).t.*/\1/'" source=(http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_$pkgver.tar.gz \ From voroskoi at frugalware.org Tue Jul 17 22:21:18 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Jul 17 22:21:24 2007 Subject: [Frugalware-git] frugalware-current: nginx-0.5.28-1-i686 Message-ID: <20070717202118.A7E2013A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8ecda3d8e355acf26a1091c3e00904bb31a9fe77 commit 8ecda3d8e355acf26a1091c3e00904bb31a9fe77 Author: voroskoi Date: Tue Jul 17 22:16:44 2007 +0200 nginx-0.5.28-1-i686 version bump diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild index 3f730bd..e9ac641 100644 --- a/source/network-extra/nginx/FrugalBuild +++ b/source/network-extra/nginx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=nginx -pkgver=0.5.27 +pkgver=0.5.28 pkgrel=1 pkgdesc="[engine x] is a HTTP server and mail proxy server." url="http://nginx.net/" @@ -49,7 +49,7 @@ build() { Fmv $Fsysconfdir/$pkgname/html $Flocalstatedir/www/$pkgname Fln $Flocalstatedir/www/$pkgname $Fsysconfdir/$pkgname/html } -sha1sums=('e51c0f2b29d88a664ecf196b6c77badcfcc695e2' \ +sha1sums=('6aa6ab7c3ee231757a5f50f1eb1fc8d375fd074f' \ 'e8cc09710ba365eb932d1710f4aac629e49452ff' \ 'da58d8a74dbb081c3dfb69317999e10f1ebf991e' \ '3a4cc4564ce610400e012d7c391107f33a258f1e') From krics at linuxforum.hu Tue Jul 17 22:26:20 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 22:26:23 2007 Subject: [Frugalware-git] frugalware-current: memtest86+-1.70-1-x86_64 Message-ID: <20070717202620.96EE4186816C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=035925d01e3bef1655da606ebbe54aecb79b8930 commit 035925d01e3bef1655da606ebbe54aecb79b8930 Author: Christian Hamar alias krix Date: Tue Jul 17 22:25:54 2007 +0200 memtest86+-1.70-1-x86_64 * Readded x86_64 * Added a patch to compile on amd64 too (-D__x86_64__ needed at compile time) diff --git a/source/apps/memtest86+/FrugalBuild b/source/apps/memtest86+/FrugalBuild index 8bb9e11..44ad0d9 100644 --- a/source/apps/memtest86+/FrugalBuild +++ b/source/apps/memtest86+/FrugalBuild @@ -8,19 +8,27 @@ pkgdesc="An advanced memory diagnostic tool" url="http://www.memtest.org/" depends=() groups=('apps') -archs=('i686' '!x86_64') +archs=('i686' 'x86_64') up2date="lynx -dump $url|grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/download/$pkgver/$pkgname-$pkgver.tar.gz \ - memtest86+-1.70-cflags.diff) + memtest86+-1.70-cflags.diff \ + memtest86+-1.70-cflags-amd64.diff) build() { - Fpatchall + if [ "$CARCH" == "x86_64" ] ; then + Fpatch memtest86+-1.70-cflags-amd64.diff + fi + if [ "$CARCH" != "x86_64" ] ; then + Fpatch memtest86+-1.70-cflags.diff + fi + make memtest.bin || return 1 Ffilerel /boot/memtest.bin } sha1sums=('d090699df558fc7f48604955c91fba1d06754661' \ - 'bb04610aa060f0187a954311c9fbc48fc7ec859a') + 'bb04610aa060f0187a954311c9fbc48fc7ec859a' \ + '7305bd8f896ce553fa584513c965f03ec73826e2') # optimization OK diff --git a/source/apps/memtest86+/memtest86+-1.70-cflags-amd64.diff b/source/apps/memtest86+/memtest86+-1.70-cflags-amd64.diff new file mode 100644 index 0000000..a5a3d55 --- /dev/null +++ b/source/apps/memtest86+/memtest86+-1.70-cflags-amd64.diff @@ -0,0 +1,21 @@ +diff -Naur memtest86+-1.70.orig/Makefile memtest86+-1.70/Makefile +--- memtest86+-1.70.orig/Makefile 2007-07-17 22:24:07.000000000 +0200 ++++ memtest86+-1.70/Makefile 2007-07-17 22:24:21.000000000 +0200 +@@ -12,7 +12,7 @@ + # + # gcc compiler options, these settings should suffice + # +-CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding ++CCFLAGS=-Wall -m32 -march=i486 -Os -D__x86_64__ -fomit-frame-pointer -fno-builtin -ffreestanding + + AS=as -32 + +@@ -21,7 +21,7 @@ + all: memtest.bin memtest + + reloc.o: reloc.c +- $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c ++ $(CC) -c -m32 -march=i486 -D__x86_64__ -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c + + test.o: test.c test.h defs.h config.h + $(CC) -c $(CCFLAGS) test.c From krics at linuxforum.hu Tue Jul 17 22:31:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 17 22:31:53 2007 Subject: [Frugalware-git] frugalware-current: vobject-0.4.8-1-x86_64 Message-ID: <20070717203131.BE03013A4141@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=464aac18a9ff46afc693b7866d538126f5db442c commit 464aac18a9ff46afc693b7866d538126f5db442c Author: Christian Hamar alias krix Date: Tue Jul 17 22:31:11 2007 +0200 vobject-0.4.8-1-x86_64 * added x86_64 to archs() diff --git a/source/devel-extra/vobject/FrugalBuild b/source/devel-extra/vobject/FrugalBuild index 98eb8c7..b31cb57 100644 --- a/source/devel-extra/vobject/FrugalBuild +++ b/source/devel-extra/vobject/FrugalBuild @@ -9,7 +9,7 @@ url="http://vobject.skyhouseconsulting.com/" depends=('python>=2.5') makedepends=('setuptools') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://vobject.skyhouseconsulting.com/history.html | grep -m1 'vobject.*released' | sed 's/.*vobject //' | sed 's/ released.*//'" source=(http://vobject.skyhouseconsulting.com/$pkgname-$pkgver.tar.gz) sha1sums=('b13cf9215e8b9f4a46b3437a5a7a7fa89933ae70') From crazy at frugalware.org Tue Jul 17 22:54:06 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 22:54:09 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-bad-0.10.5-2-i686 Message-ID: <20070717205406.453E713A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e5381690a9cb4620d4fe7115d3b14cca02fe1f55 commit e5381690a9cb4620d4fe7115d3b14cca02fe1f55 Author: crazy Date: Tue Jul 17 22:52:41 2007 +0200 gst-plugins-bad-0.10.5-2-i686 * bump stuff and don't rebuild everything right ? god and all this mess for something *IS* broken diff --git a/source/xmultimedia/gst-plugins-bad/FrugalBuild b/source/xmultimedia/gst-plugins-bad/FrugalBuild index e8cdfad..5c2596e 100644 --- a/source/xmultimedia/gst-plugins-bad/FrugalBuild +++ b/source/xmultimedia/gst-plugins-bad/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gst-plugins-bad pkgver=0.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for GStreamer (Bad)" url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base>=0.10.13' 'libstdc++' 'zlib') -makedepends=('soundtouch' 'directfb' 'gstreamer>=>=0.10.13' 'xvidcore' 'wavpack' 'libmpcdec' 'faac' 'neon>=0.26.1' \ +makedepends=('soundtouch' 'directfb>=1.0.0' 'gstreamer>=>=0.10.13' 'xvidcore' 'wavpack' 'libmpcdec' 'faac' 'neon>=0.26.1' \ 'libmusicbrainz' 'cairo' 'bzip2' 'libdca>=0.0.5' 'liboil>=0.3.10' 'libmms' 'faad2' 'libcdaudio' 'alsa-lib' \ 'jack' 'ladspa_sdk' 'libtimidity' 'wildmidi' 'nas' 'x264' 'libsndfile' 'libsm' 'libice' 'libx11' 'libgl' \ 'libxcb' 'libxau' 'libxdmcp' 'libxext' 'libxxf86vm' 'libxdamage' 'libxfixes' 'libdrm') @@ -17,7 +17,7 @@ archs=('i686' 'x86_64') replaces=("$pkgname-swfdec") source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2 libdca.patch) up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" -sha1sums=('ad339ad401052e25e2dc2825c87b954857e53800'\ +sha1sums=('ad339ad401052e25e2dc2825c87b954857e53800' \ '0ba6da39adfc21499544a7904d1db3644fc5463b') subpkgs=("$pkgname-bzip2" "$pkgname-dts" "$pkgname-faac" "$pkgname-faad2" "$pkgname-mms" "$pkgname-neon" \ @@ -33,7 +33,7 @@ subdescs=('GStreamer bzip2 plugin (Bad).' 'GStreamer dts plugin (Bad).' 'GStre 'GStreamer nas plugin (Bad).' 'GStreamer x264 plugin (Bad).' 'GStreamer libsndfile plugin (Bad).') subdepends=("bzip2 $pkgname=$pkgver" "libdca>=0.0.5 $pkgname=$pkgver liboil>=0.3.10" "faac $pkgname=$pkgver" \ "faad2 $pkgname=$pkgver" "libmms $pkgname=$pkgver" "neon>=0.26.1 $pkgname=$pkgver" \ - "sdl $pkgname=$pkgver" "directfb $pkgname=$pkgver liboil>=0.3.10" "xvidcore $pkgname=$pkgver" \ + "sdl $pkgname=$pkgver" "directfb>=1.0.0 $pkgname=$pkgver liboil>=0.3.10" "xvidcore $pkgname=$pkgver" \ "$pkgname=$pkgver libsm libice libx11 libgl libxcb libxau libxdmcp libxext libxxf86vm libxdamage libxfixes libdrm" \ "libmpcdec $pkgname=$pkgver" "soundtouch $pkgname=$pkgver" "libmusicbrainz $pkgname=$pkgver libstdc++" "$pkgname=$pkgver jack" \ "$pkgname=$pkgver libcdaudio" "$pkgname=$pkgver alsa-lib" "$pkgname=$pkgver libtimidity" "$pkgname=$pkgver wildmidi" \ From vmiklos at frugalware.org Tue Jul 17 23:20:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 17 23:20:30 2007 Subject: [Frugalware-git] pacman-tools: repoman: silence a warning on pushing new packages Message-ID: <20070717212027.8DDB813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=cea5d179fc3d367b65b0812a2248f7e69b7e40cc commit cea5d179fc3d367b65b0812a2248f7e69b7e40cc Author: VMiklos Date: Tue Jul 17 23:19:59 2007 +0200 repoman: silence a warning on pushing new packages diff --git a/repoman b/repoman index ee603c5..f43378f 100755 --- a/repoman +++ b/repoman @@ -329,7 +329,7 @@ srcdel() srclocal=(${srclocal[@]} ${signatures[@]}) if [ "$F_makepkg_scm" = "git" ]; then check_servers - for i in $(ssh $host "cd $path/$mydir; git clean -n -x ."|sed 's/.* remove //') + for i in $(ssh $host "[ -d $path/$mydir ] && cd $path/$mydir && git clean -n -x ."|sed 's/.* remove //') do if ! echo ${srclocal[@]} |grep -q $i && ! _is_log $i && [ "$i" != "Changelog" ]; then dry_run delete $mydir/$i From crazy at frugalware.org Tue Jul 17 23:40:19 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 23:40:21 2007 Subject: [Frugalware-git] frugalware-current: cmake-2.4.7-1-i686 Message-ID: <20070717214019.B0AAB13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fd7e42fdf9c869330f78d01aa4f62986fe42af72 commit fd7e42fdf9c869330f78d01aa4f62986fe42af72 Author: crazy Date: Tue Jul 17 23:39:00 2007 +0200 cmake-2.4.7-1-i686 * Version bump diff --git a/source/devel-extra/cmake/FrugalBuild b/source/devel-extra/cmake/FrugalBuild index 84b3c54..60f26ea 100644 --- a/source/devel-extra/cmake/FrugalBuild +++ b/source/devel-extra/cmake/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Priyank Gosalia pkgname=cmake -pkgver=2.4.6 +pkgver=2.4.7 pkgrel=1 pkgdesc="Cross platform make" url="http://www.cmake.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://cmake.org/HTML/Download.html | grep -m1 Latest | sed 's/.* \(.*\).*/\1/g' | sed 's/(\|)//g'" source=(http://www.cmake.org/files/v2.4/$pkgname-$pkgver.tar.gz) -sha1sums=('5290aaf949413ee7f77275ba68e73cec1546364b') +sha1sums=('72308fdd131d5a5ad1c617769c16a417ebec0004') build() { Fcd From crazy at frugalware.org Tue Jul 17 23:48:45 2007 From: crazy at frugalware.org (crazy) Date: Tue Jul 17 23:48:47 2007 Subject: [Frugalware-git] frugalware-current: paco-2.0.3-1-i686 Message-ID: <20070717214845.35F6113A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=87c5615f75cfe45774aa5d52fd59269c5b399b64 commit 87c5615f75cfe45774aa5d52fd59269c5b399b64 Author: crazy Date: Tue Jul 17 23:47:29 2007 +0200 paco-2.0.3-1-i686 * Version bump diff --git a/source/apps-extra/paco/FrugalBuild b/source/apps-extra/paco/FrugalBuild index 0f1f47b..1d6b618 100644 --- a/source/apps-extra/paco/FrugalBuild +++ b/source/apps-extra/paco/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=paco -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="A source code package management system." license="GPL2" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') makedepends=('gtk+2' 'gtkmm') depends=() options=('scriptlet') -sha1sums=('0d9bd2ad534a1d6cbbe32b853a61bce3d59d6021') +sha1sums=('b7d87c8bc3355965ad87870d0a1346fdbed01c42') subpkgs=('gpaco') subdescs=("Gtk+2 frontend for paco") From crazy at frugalware.org Wed Jul 18 00:11:36 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:11:39 2007 Subject: [Frugalware-git] frugalware-current: scim-1.4.7-1-i686 Message-ID: <20070717221136.E29BB13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=845117e01f1aa8e0cbf055bd4c94e703ed8e3e57 commit 845117e01f1aa8e0cbf055bd4c94e703ed8e3e57 Author: crazy Date: Wed Jul 18 00:10:20 2007 +0200 scim-1.4.7-1-i686 * Version bump diff --git a/source/xapps-extra/scim/FrugalBuild b/source/xapps-extra/scim/FrugalBuild index cb4deb3..6793d7c 100644 --- a/source/xapps-extra/scim/FrugalBuild +++ b/source/xapps-extra/scim/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=scim -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="Input methods covering more than 30 languages." url="http://www.scim-im.org/" @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=(${source[@]} scim.sh) -sha1sums=('3b8d26ff5a4ebab1ca90928d0363d2d2b0028ccf'\ +sha1sums=('54ab2ab0ef28a84c24fbc32d37e996ecae416d50' \ '254c11c8f8cca9f9e95feb40cd55017adab7a6d3') From crazy at frugalware.org Wed Jul 18 00:25:30 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:25:33 2007 Subject: [Frugalware-git] frugalware-current: scim-bridge-0.4.13-1-i686 Message-ID: <20070717222530.DD02413A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bee14d9ed79d3a8a38ad3ab0aeaf727912b29c37 commit bee14d9ed79d3a8a38ad3ab0aeaf727912b29c37 Author: crazy Date: Wed Jul 18 00:24:12 2007 +0200 scim-bridge-0.4.13-1-i686 * Version bump diff --git a/source/xapps-extra/scim-bridge/FrugalBuild b/source/xapps-extra/scim-bridge/FrugalBuild index 56865e2..544068b 100644 --- a/source/xapps-extra/scim-bridge/FrugalBuild +++ b/source/xapps-extra/scim-bridge/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: crazy pkgname=scim-bridge -pkgver=0.4.12 +pkgver=0.4.13 pkgrel=1 pkgdesc="Bridge input method for SCIM." _F_sourceforge_dirname="scim" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.scim-im.org/" -depends=('scim>=1.4.6') +depends=('scim>=1.4.7') makedepends=('qt' 'doxygen') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -Fconfopts="$Fconfopts --disable-qt3-immodule" +Fconfopts="$Fconfopts --disable-qt3-immodule --disable-qt4-immodule" -sha1sums=('eeb3e62d749bb6c6b177e7524e5ad70513f45f59') +sha1sums=('6ec2fad73e790bf57446262661879d83d1414f21') # optimization OK From crazy at frugalware.org Wed Jul 18 00:37:07 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:37:09 2007 Subject: [Frugalware-git] frugalware-current: skim-1.4.5-2-i686 Message-ID: <20070717223707.2D12F13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=55de59317e29839fa0a46c099fe8551d23ca5a20 commit 55de59317e29839fa0a46c099fe8551d23ca5a20 Author: crazy Date: Wed Jul 18 00:35:52 2007 +0200 skim-1.4.5-2-i686 * rebuild diff --git a/source/kde-extra/skim/FrugalBuild b/source/kde-extra/skim/FrugalBuild index e1c1244..9724149 100644 --- a/source/kde-extra/skim/FrugalBuild +++ b/source/kde-extra/skim/FrugalBuild @@ -4,14 +4,14 @@ pkgname=skim pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="SKIM is an SCIM input method platform for *NIX systems optimized for KDE." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" purl="http://sourceforge.net/project/showfiles.php?group_id=108454" -depends=('scim>=1.4.4' 'kdelibs>=3.5.2') +depends=('scim>=1.4.7' 'kdelibs>=3.5.7') makedepends=('scons') options=('scriptlet') groups=('kde-extra') From crazy at frugalware.org Wed Jul 18 00:39:29 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:39:45 2007 Subject: [Frugalware-git] frugalware-current: scim-m17n-0.2.2-2-i686 Message-ID: <20070717223929.F0D6E13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cb867a858f218bbfc58390949238dd70db2d4cd4 commit cb867a858f218bbfc58390949238dd70db2d4cd4 Author: crazy Date: Wed Jul 18 00:38:15 2007 +0200 scim-m17n-0.2.2-2-i686 * rebuild diff --git a/source/xapps-extra/scim-m17n/FrugalBuild b/source/xapps-extra/scim-m17n/FrugalBuild index cadb776..ed1919f 100644 --- a/source/xapps-extra/scim-m17n/FrugalBuild +++ b/source/xapps-extra/scim-m17n/FrugalBuild @@ -3,13 +3,13 @@ pkgname=scim-m17n pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="M17N input method for SCIM." _F_sourceforge_dirname="scim" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.scim-im.org/" -depends=('scim>=1.4.4' 'm17n-lib>=1.3.3') +depends=('scim>=1.4.7' 'm17n-lib>=1.4.0') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Wed Jul 18 00:44:22 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:44:26 2007 Subject: [Frugalware-git] frugalware-current: scim-hangul-0.3.1-2-i686 Message-ID: <20070717224422.3BC6D13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d76cde7d16382a28d21dc957d3f1eec433c43404 commit d76cde7d16382a28d21dc957d3f1eec433c43404 Author: crazy Date: Wed Jul 18 00:43:08 2007 +0200 scim-hangul-0.3.1-2-i686 * rebuild diff --git a/source/xapps-extra/scim-hangul/FrugalBuild b/source/xapps-extra/scim-hangul/FrugalBuild index 716f8f4..3b83bc8 100644 --- a/source/xapps-extra/scim-hangul/FrugalBuild +++ b/source/xapps-extra/scim-hangul/FrugalBuild @@ -3,13 +3,13 @@ pkgname=scim-hangul pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Korean (hangul) input method for SCIM." _F_sourceforge_broken_up2date=1 _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" -depends=('scim>=1.4.4' 'libhangul>=0.0.4') +depends=('scim>=1.4.7' 'libhangul>=0.0.6') #makedepends=('skim>=1.1.4') options=('scriptlet') groups=('xapps-extra') From crazy at frugalware.org Wed Jul 18 00:48:23 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:48:25 2007 Subject: [Frugalware-git] frugalware-current: scim-pinyin-0.5.91-2-i686 Message-ID: <20070717224823.5B05B13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=338d1263b027b051442529b6d8eff87e8c0546ec commit 338d1263b027b051442529b6d8eff87e8c0546ec Author: crazy Date: Wed Jul 18 00:47:09 2007 +0200 scim-pinyin-0.5.91-2-i686 * rebuild diff --git a/source/xapps-extra/scim-pinyin/FrugalBuild b/source/xapps-extra/scim-pinyin/FrugalBuild index 62ac009..0ff8909 100644 --- a/source/xapps-extra/scim-pinyin/FrugalBuild +++ b/source/xapps-extra/scim-pinyin/FrugalBuild @@ -3,13 +3,13 @@ pkgname=scim-pinyin pkgver=0.5.91 -pkgrel=1 +pkgrel=2 pkgdesc="Chinese (PinYin) input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" purl="http://sourceforge.net/project/showfiles.php?group_id=108454" -depends=('scim>=1.4.4') +depends=('scim>=1.4.7') ## skim too for the plugin as subpkg() but is broken now options=('scriptlet') groups=('xapps-extra') From crazy at frugalware.org Wed Jul 18 00:51:14 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:51:18 2007 Subject: [Frugalware-git] frugalware-current: scim-chewing-0.3.1-2-i686 Message-ID: <20070717225114.76DC113A412F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f1b40eb38d76a06ebed227a34f899492bd60b5e4 commit f1b40eb38d76a06ebed227a34f899492bd60b5e4 Author: crazy Date: Wed Jul 18 00:49:50 2007 +0200 scim-chewing-0.3.1-2-i686 * rebuild diff --git a/source/xapps-extra/scim-chewing/FrugalBuild b/source/xapps-extra/scim-chewing/FrugalBuild index 4058f3e..408e6bc 100644 --- a/source/xapps-extra/scim-chewing/FrugalBuild +++ b/source/xapps-extra/scim-chewing/FrugalBuild @@ -3,10 +3,10 @@ pkgname=scim-chewing pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="CHEWING input method for SCIM." url="http://chewing.csie.net/" -depends=('scim>=1.4.4' "libchewing>=0.3.0" 'perl-xml') +depends=('scim>=1.4.7' "libchewing>=0.3.0" 'perl-xml') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') From crazy at frugalware.org Wed Jul 18 00:57:55 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 00:57:57 2007 Subject: [Frugalware-git] frugalware-current: scim-tables-0.5.7-2-i686 Message-ID: <20070717225755.B9F5F13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1135720cfd94d37c154749ee3a92b90adea49cc6 commit 1135720cfd94d37c154749ee3a92b90adea49cc6 Author: crazy Date: Wed Jul 18 00:56:41 2007 +0200 scim-tables-0.5.7-2-i686 * rebuild diff --git a/source/xapps-extra/scim-tables/FrugalBuild b/source/xapps-extra/scim-tables/FrugalBuild index cae6a2a..fddc05a 100644 --- a/source/xapps-extra/scim-tables/FrugalBuild +++ b/source/xapps-extra/scim-tables/FrugalBuild @@ -3,19 +3,19 @@ pkgname=scim-tables pkgver=0.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="Multi language input method engine for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" purl="http://sourceforge.net/project/showfiles.php?group_id=108454" -depends=('scim>=1.4.4') +depends=('scim>=1.4.7') ## skim too as subpkg() but is broken now options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$purl'|grep -m1 '$pkgname-'|sed 's/.*-\(.*\).tar.gz .*/\1/'" Fconfopts="$Fconfopts --disable-skim-support" -sha1sums=('1e5385bc6808eb797c3897b041db83648123a35a') +sha1sums=('0764724368eab3975138a69b2f50ad1b753c35f7') # optimization OK From crazy at frugalware.org Wed Jul 18 01:01:45 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 01:02:21 2007 Subject: [Frugalware-git] frugalware-current: scim-uim-0.2.0-2-i686 Message-ID: <20070717230145.AFCDA13A4149@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5ed320d76687b971fef88327f30d81e0b41b40c7 commit 5ed320d76687b971fef88327f30d81e0b41b40c7 Author: crazy Date: Wed Jul 18 01:00:25 2007 +0200 scim-uim-0.2.0-2-i686 * rebuild diff --git a/source/xapps-extra/scim-uim/FrugalBuild b/source/xapps-extra/scim-uim/FrugalBuild index d648bc5..f463294 100644 --- a/source/xapps-extra/scim-uim/FrugalBuild +++ b/source/xapps-extra/scim-uim/FrugalBuild @@ -3,13 +3,13 @@ pkgname=scim-uim pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="UIM input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" purl="http://sourceforge.net/project/showfiles.php?group_id=108454" -depends=('scim>=1.4.6' 'uim') +depends=('scim>=1.4.7' 'uim') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Wed Jul 18 01:11:55 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 01:11:57 2007 Subject: [Frugalware-git] frugalware-current: scim-ccinput-0.3.1-2-i686 Message-ID: <20070717231155.995D813A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=31a01a580b686707d393b80435a24607627441a8 commit 31a01a580b686707d393b80435a24607627441a8 Author: crazy Date: Wed Jul 18 01:10:33 2007 +0200 scim-ccinput-0.3.1-2-i686 * rebuild diff --git a/source/xapps-extra/scim-ccinput/FrugalBuild b/source/xapps-extra/scim-ccinput/FrugalBuild index 7243d8f..b585cd3 100644 --- a/source/xapps-extra/scim-ccinput/FrugalBuild +++ b/source/xapps-extra/scim-ccinput/FrugalBuild @@ -3,15 +3,15 @@ pkgname=scim-ccinput pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Chinese input method for SCIM." _F_sourceforge_dirname="scim" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.scim-im.org/" purl="http://sourceforge.net/project/showfiles.php?group_id=108454" -depends=('scim>=1.4.4') -makedepends=('skim>=1.1.4') +depends=('scim>=1.4.7') +makedepends=('skim>=1.4.5-2') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') @@ -20,7 +20,7 @@ sha1sums=('7c6842e85bf2c2b4c9a2a69d54069c71e09d6250') subpkgs=("skim-$pkgname") subdescs=('Chinese input method for SKIM.') -subdepends=('skim>=1.4.4') +subdepends=('skim>=1.4.5-2') subgroups=('kde-extra') subarchs=('i686 x86_64') From crazy at frugalware.org Wed Jul 18 01:16:50 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 01:17:03 2007 Subject: [Frugalware-git] frugalware-current: scim-anthy-1.2.4-2-i686 Message-ID: <20070717231650.ED5FC13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=33fd7569bd7ee1d1c0d64d8292eea74b0d0d8748 commit 33fd7569bd7ee1d1c0d64d8292eea74b0d0d8748 Author: crazy Date: Wed Jul 18 01:15:35 2007 +0200 scim-anthy-1.2.4-2-i686 * rebuild diff --git a/source/xapps-extra/scim-anthy/FrugalBuild b/source/xapps-extra/scim-anthy/FrugalBuild index 06880f5..f111f0f 100644 --- a/source/xapps-extra/scim-anthy/FrugalBuild +++ b/source/xapps-extra/scim-anthy/FrugalBuild @@ -3,11 +3,11 @@ pkgname=scim-anthy pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Anthy input method for SCIM." url="http://sourceforge.jp/projects/scim-imengine/" purl="http://sourceforge.jp/projects/scim-imengine/files/?release_id=19544#19544" -depends=('scim>=1.4.6' 'anthy') +depends=('scim>=1.4.7' 'anthy') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Wed Jul 18 01:20:12 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 01:20:14 2007 Subject: [Frugalware-git] frugalware-current: Revert "snes9x-1.51-1-i686" Message-ID: <20070717232012.7542D13A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6375d165d0f0458d0d8c413386a87077c4bdcd2c commit 6375d165d0f0458d0d8c413386a87077c4bdcd2c Author: crazy Date: Wed Jul 18 01:18:51 2007 +0200 Revert "snes9x-1.51-1-i686" * reverting commit f62924a7a765dcfcb8be95f370f256018f4feb81 it was not meant to do that :) diff --git a/source/devel-extra/perl-date-manip/FrugalBuild b/source/devel-extra/perl-date-manip/FrugalBuild index 9e08fdb..4d996d9 100644 --- a/source/devel-extra/perl-date-manip/FrugalBuild +++ b/source/devel-extra/perl-date-manip/FrugalBuild @@ -4,7 +4,7 @@ pkgname=perl-date-manip _F_perl_name=DateManip _F_perl_author=S/SB/SBECK -pkgver=5.46 +pkgver=5.44 pkgrel=1 pkgdesc="Routines for parsing/manipulating dates and time." depends=('perl') @@ -12,4 +12,4 @@ groups=('devel-extra') Finclude perl up2date="lynx -dump http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/|grep DateManip|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" archs=('i686' 'x86_64') -sha1sums=('63ddd269859fec7641ae24516a4853b55751890c') +sha1sums=('18938e48e2c2ba43f8c706acf1c2720d9dc98a83') diff --git a/source/xapps-extra/pympd/FrugalBuild b/source/xapps-extra/pympd/FrugalBuild index 54c1090..e7213fe 100644 --- a/source/xapps-extra/pympd/FrugalBuild +++ b/source/xapps-extra/pympd/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0 SBU # Maintainer: detto pkgname=pympd @@ -12,6 +12,6 @@ depends=('mpd' 'pygtk') sha1sums=('b266af61e83a350af097f3a789465e9939159a01') build () { - Fcd - make PREFIX=$Fprefix DESTDIR=$Fdestdir install || Fdie + Fsed PREFIX=/usr/local PREFIX=/usr Makefile + Fbuild } diff --git a/source/xapps-extra/teamspeak-client/FrugalBuild b/source/xapps-extra/teamspeak-client/FrugalBuild index fafc17c..a419a5b 100644 --- a/source/xapps-extra/teamspeak-client/FrugalBuild +++ b/source/xapps-extra/teamspeak-client/FrugalBuild @@ -6,7 +6,7 @@ pkgver=2.0.32.60 realver=rc2_2032 pkgrel=1 pkgdesc="The Teamspeak Voice Communication Client" -url="http://www.goteamspeak.com" +url="http://www.goteamspeak.com/" if [ "$CARCH" == "x86_64" ]; then depends=('libice-emul' 'libxext-emul' 'libjpeg-emul' 'libx11-emul' 'libsm-emul' 'libgcc-emul') _root="/usr/lib/chroot32/" @@ -17,13 +17,10 @@ else groups=('xapps-extra') fi archs=('i686' 'x86_64') -up2date="lynx -dump $url/index.php?page=downloads|grep -2 Client|grep '[0-9]\+\.'|sed -n 's/.* \([0-9]\+\.[0-9]\+\.[^ ]*\) .*/\1/;$ p'" +up2date="lynx -dump http://www.goteamspeak.com/index.php?page=downloads|grep -2 Client|grep '[0-9]\+\.'|sed -n 's/.* \([0-9]\+\.[0-9]\+\.[^ ]*\) .*/\1/;$ p'" source=(ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/ts2_client_$realver.tar.bz2) options=('nobuild') sha1sums=('d54c9c19a2e70cee11f9a04a3523c71da802ee8d') -_F_desktop_exec=/usr/bin/teamspeak -_F_desktop_icon=teamspeak.xpm -_F_desktop_categories=AudioVideo; build() { @@ -33,6 +30,6 @@ build() cp -a . $Fdestdir/$_root/usr/lib/teamspeak Fln /usr/lib/teamspeak/TeamSpeak $_root/usr/bin/teamspeak Ffilerel icon.xpm /usr/share/pixmaps/teamspeak.xpm - Fdesktop2 + Fdesktop "/usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;" [ "$CARCH" == "x86_64" ] && unset _root } From crazy at frugalware.org Wed Jul 18 01:31:20 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 01:31:23 2007 Subject: [Frugalware-git] frugalware-current: scim-kmfl-0.9.2-2-i686 Message-ID: <20070717233120.9C7D213A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=da314b340c5d60259fa486352d3ac53554d3ba9f commit da314b340c5d60259fa486352d3ac53554d3ba9f Author: crazy Date: Wed Jul 18 01:30:05 2007 +0200 scim-kmfl-0.9.2-2-i686 * rebuild diff --git a/source/xapps-extra/scim-kmfl/FrugalBuild b/source/xapps-extra/scim-kmfl/FrugalBuild index 1eb3a7e..6083d79 100644 --- a/source/xapps-extra/scim-kmfl/FrugalBuild +++ b/source/xapps-extra/scim-kmfl/FrugalBuild @@ -4,12 +4,12 @@ pkgname=scim-kmfl origname=scim_kmfl_imengine pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A input method engine for SCIM." _F_sourceforge_name="kmfl" Finclude sourceforge url="http://kmfl.sourceforge.net/" -depends=('libkmfl>=0.9.2' 'libxkbfile' 'scim>=1.4.4') +depends=('libkmfl>=0.9.2' 'libxkbfile' 'scim>=1.4.7') makedepends=('perl-xml') options=('scriptlet') groups=('xapps-extra') From crazy at frugalware.org Wed Jul 18 01:56:29 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 01:56:31 2007 Subject: [Frugalware-git] frugalware-current: perl-clone-0.24-1-i686 Message-ID: <20070717235629.D455313A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=02d79f2a75ac2547f3e1d935d07f5652caea5e3e commit 02d79f2a75ac2547f3e1d935d07f5652caea5e3e Author: crazy Date: Wed Jul 18 01:55:14 2007 +0200 perl-clone-0.24-1-i686 * Version bump diff --git a/source/devel-extra/perl-clone/FrugalBuild b/source/devel-extra/perl-clone/FrugalBuild index f0cc4f1..dacc9bf 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.23 +pkgver=0.24 pkgrel=1 pkgdesc="recursively copy Perl datatypes" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('69952a1da03e3c27362926dc0c921b7accb7e3d0') +sha1sums=('7a6a158d601ea7741d40d0b431b85c501e41de0e') From crazy at frugalware.org Wed Jul 18 02:07:10 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 18 02:07:12 2007 Subject: [Frugalware-git] frugalware-current: perl-class-autouse-1.28-1-i686 Message-ID: <20070718000710.6F24413A412D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3e55eee3e0787affbec159703babe14b2ff51f41 commit 3e55eee3e0787affbec159703babe14b2ff51f41 Author: crazy Date: Wed Jul 18 02:05:54 2007 +0200 perl-class-autouse-1.28-1-i686 * Version bump diff --git a/source/devel-extra/perl-class-autouse/FrugalBuild b/source/devel-extra/perl-class-autouse/FrugalBuild index 9d3750a..78b1f82 100644 --- a/source/devel-extra/perl-class-autouse/FrugalBuild +++ b/source/devel-extra/perl-class-autouse/FrugalBuild @@ -4,9 +4,9 @@ pkgname=perl-class-autouse _F_perl_name=Class-Autouse _F_perl_author=A/AD/ADAMK -pkgver=1.27 +pkgver=1.28 pkgrel=1 pkgdesc="Run-time load a class the first time you call a method in it." Finclude perl archs=('i686' 'x86_64') -sha1sums=('3150524488690b163b1622725743c4deff83e435') +sha1sums=('3782e4538c3fe60c75382e4994597e55aa8856af') From vmiklos at frugalware.org Wed Jul 18 09:55:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 18 09:56:01 2007 Subject: [Frugalware-git] frugalware-current: bzr-0.18-1-i686 Message-ID: <20070718075559.6ACF813A417F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2c82dd651273b90116de442515d04ea184d178f1 commit 2c82dd651273b90116de442515d04ea184d178f1 Author: VMiklos Date: Wed Jul 18 09:55:44 2007 +0200 bzr-0.18-1-i686 version bump diff --git a/source/devel-extra/bzr/FrugalBuild b/source/devel-extra/bzr/FrugalBuild index d201a27..d1c781b 100644 --- a/source/devel-extra/bzr/FrugalBuild +++ b/source/devel-extra/bzr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bzr -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="Next generation distributed version control" url="http://bazaar-vcs.org" From krics at linuxforum.hu Wed Jul 18 17:07:33 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 18 17:07:40 2007 Subject: [Frugalware-git] frugalware-current: subtitleripper-0.3_4-1-x86_64 Message-ID: <20070718150733.D059613A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fe4710d06021568e0ba36c3f6674d38439980093 commit fe4710d06021568e0ba36c3f6674d38439980093 Author: Christian Hamar alias krix Date: Wed Jul 18 17:07:12 2007 +0200 subtitleripper-0.3_4-1-x86_64 * Added x86_64 to archs() diff --git a/source/xmultimedia-extra/subtitleripper/FrugalBuild b/source/xmultimedia-extra/subtitleripper/FrugalBuild index c3084e0..d4efe1b 100644 --- a/source/xmultimedia-extra/subtitleripper/FrugalBuild +++ b/source/xmultimedia-extra/subtitleripper/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Converter for DVD subtitles into the popular srt or VobSub file format used by many avi players." depends=('transcode' 'gocr') groups=('xmultimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_ext=".tgz" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=48235|grep subtitleripper-|sed 's/.*subtitleripper-\([^ ]*\) .*/\1/;s/-/_/;q'" From krics at linuxforum.hu Wed Jul 18 17:11:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 18 17:11:53 2007 Subject: [Frugalware-git] frugalware-current: dvdshrink-2.6.1_10-1-x86_64 Message-ID: <20070718151150.EE7ED13A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8ac15a1559046aa7c1eb3f50f63627e536bcd8d9 commit 8ac15a1559046aa7c1eb3f50f63627e536bcd8d9 Author: Christian Hamar alias krix Date: Wed Jul 18 17:11:31 2007 +0200 dvdshrink-2.6.1_10-1-x86_64 * Added x86_64 to archs() diff --git a/source/xmultimedia-extra/dvdshrink/FrugalBuild b/source/xmultimedia-extra/dvdshrink/FrugalBuild index 36d42bc..a7a6588 100644 --- a/source/xmultimedia-extra/dvdshrink/FrugalBuild +++ b/source/xmultimedia-extra/dvdshrink/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Allows you to create fair-use archival copies of DVD content on single-layer writable DVDs." depends=('transcode' 'subtitleripper' 'cdrtools' 'dvdauthor' 'dvd+rw-tools' 'perl-gtk2') groups=('xmultimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_prefix="Version " Finclude sourceforge source=(${source/.tar/mdk.tar} dvdshrink-{destdir,nointeractive}.diff) From priyank at frugalware.org Wed Jul 18 17:27:48 2007 From: priyank at frugalware.org (Priyank) Date: Wed Jul 18 17:27:51 2007 Subject: [Frugalware-git] frugalware-current: deluge-0.5.2-1-i686 Message-ID: <20070718152748.E5C5B13A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f96859eba499d3d16f12ca9948740043e7ece382 commit f96859eba499d3d16f12ca9948740043e7ece382 Author: Priyank Date: Wed Jul 18 20:53:33 2007 +0530 deluge-0.5.2-1-i686 * Version bump * Reworked boost_mt patch to work with the latest version * Fix SBU diff --git a/source/gnome-extra/deluge/FrugalBuild b/source/gnome-extra/deluge/FrugalBuild index 98d3faf..55a28dd 100644 --- a/source/gnome-extra/deluge/FrugalBuild +++ b/source/gnome-extra/deluge/FrugalBuild @@ -1,19 +1,29 @@ -# Compiling Time: 0.97 SBU +# Compiling Time: 0.91 SBU # Maintainer: Priyank Gosalia # Contributor: Artur Grunau pkgname=deluge -pkgver=0.5.0 -pkgrel=3 +pkgver=0.5.2 +pkgrel=1 pkgdesc="BitTorrent client written in Python and GTK+." url="http://deluge-torrent.org/" -depends=('python-libtorrent>=0.4.0-2' 'pygtk' 'pyxdg' 'notify-python' 'notification-daemon') +depends=('pygtk' 'pyxdg' 'boost' 'notify-python' 'notification-daemon') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://dev.deluge-torrent.org/wiki/Downloads | grep '$pkgname' | Flasttar" -source=(http://deluge-torrent.org/downloads/$pkgname-$pkgver.tar.gz \ - deluge-0.5.0-boost_mt.patch) -sha1sums=('4fad22dac6928b655669aae232415ca1c7fd4508'\ - 'fe311d62844fc61fd9721b5d77144fe6c5fabd46') +up2date="lynx -dump http://download.deluge-torrent.org/stable/ | grep '$pkgname' | Flasttar" +source=(http://download.deluge-torrent.org/stable/$pkgname-$pkgver.tar.gz \ + deluge-$pkgver-boostmt.diff) +sha1sums=('cfb5b8be4e8bb18b43611042bd1c67713e5489d1' \ + '4e3106e3fa18ac7821e30ff8102c99b2d194ae65') + +build() +{ + Fcd + Fpatchall + Fsed 'PREFIX = /usr/local' 'PREFIX = /usr' Makefile + Fsed '--prefix=$(PREFIX)' '--prefix=$(PREFIX) --root=$(DESTDIR)' Makefile + make || Fdie + make DESTDIR=$Fdestdir install +} # optimization OK From priyank at frugalware.org Wed Jul 18 17:35:13 2007 From: priyank at frugalware.org (Priyank) Date: Wed Jul 18 17:35:20 2007 Subject: [Frugalware-git] frugalware-current: deluge-0.5.2-1-i686 Message-ID: <20070718153513.D7E6F13A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=16111a228aa0233f4ef02108a20872ca00bd6fad commit 16111a228aa0233f4ef02108a20872ca00bd6fad Author: Priyank Date: Wed Jul 18 21:03:07 2007 +0530 deluge-0.5.2-1-i686 * Forgot to add deluge-0.5.2-boostmt.patch diff --git a/source/gnome-extra/deluge/deluge-0.5.2-boostmt.diff b/source/gnome-extra/deluge/deluge-0.5.2-boostmt.diff new file mode 100644 index 0000000..02409b5 --- /dev/null +++ b/source/gnome-extra/deluge/deluge-0.5.2-boostmt.diff @@ -0,0 +1,24 @@ +diff -Naur deluge-0.5.2/setup.py deluge-0.5.2.new/setup.py +--- deluge-0.5.2/setup.py 2007-07-06 06:40:19.000000000 +0530 ++++ deluge-0.5.2.new/setup.py 2007-07-08 22:00:17.000000000 +0530 +@@ -108,7 +108,7 @@ + '/usr/include/python' + python_version] + + if OS == "linux": +- if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7" /etc/issue')) == 0: ++ if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7|Frugalware" /etc/issue')) == 0: + boosttype = 'nomt' + else: + boosttype = 'mt' +@@ -155,8 +155,9 @@ + 'boost_thread', 'z', 'pthread', 'ssl'] + print 'Libraries nomt' + elif boosttype == "mt": +- librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', +- 'boost_thread-mt', 'z', 'pthread', 'ssl'] ++ librariestype = ['boost_filesystem-gcc42-mt', ++ 'boost_date_time-gcc42-mt', ++ 'boost_thread-gcc42-mt', 'z', 'pthread', 'ssl'] + print 'Libraries mt' + + def fetchCpp(): From priyank at frugalware.org Wed Jul 18 17:46:02 2007 From: priyank at frugalware.org (Priyank) Date: Wed Jul 18 17:46:04 2007 Subject: [Frugalware-git] frugalware-current: * Removed (now provided with deluge) Message-ID: <20070718154602.4370413A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=03857133ec6ca9961fb61c5aa51986e3b16f1fa4 commit 03857133ec6ca9961fb61c5aa51986e3b16f1fa4 Author: Priyank Date: Wed Jul 18 21:14:50 2007 +0530 * Removed (now provided with deluge) diff --git a/source/lib-extra/python-libtorrent/FrugalBuild b/source/lib-extra/python-libtorrent/FrugalBuild deleted file mode 100644 index 9a15aae..0000000 --- a/source/lib-extra/python-libtorrent/FrugalBuild +++ /dev/null @@ -1,21 +0,0 @@ -# Compiling Time: 1.41 SBU -# Maintainer: Priyank Gosalia -# Contributor: Artur Grunau - -pkgname=python-libtorrent -pkgver=0.4.0 -pkgrel=2 -pkgdesc="Python wrapper for the C++ libtorrent library." -url="http://deluge-torrent.org/" -depends=('python' 'boost>=1.34.0') -groups=('lib-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url/wiki/Downloads | grep '$pkgname' | sed -n 's/.*http.*//;s/.*$pkgname\_//;s/\.tar\.gz.*//p'" -#source=(http://deluge-torrent.org/downloads/$pkgname\_$pkgver.tar.gz \ -source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/lib-extra/python-libtorrent/python-libtorrent_0.4.0.tar.gz \ - fix-boost-lib-link.patch) -_F_cd_path="$pkgname" -sha1sums=('61d89637b09745e8dd1a6fdfceaf3983c2ded8ea'\ - 'cf76384b7330b7aa59b09fbddfddfa0e4a7a221f') - -# optimization OK diff --git a/source/lib-extra/python-libtorrent/fix-boost-lib-link.patch b/source/lib-extra/python-libtorrent/fix-boost-lib-link.patch deleted file mode 100644 index 9011c5f..0000000 --- a/source/lib-extra/python-libtorrent/fix-boost-lib-link.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- python-libtorrent/setup.py.orig 2007-01-18 16:16:31.000000000 +0100 -+++ python-libtorrent/setup.py 2007-01-18 16:18:13.000000000 +0100 -@@ -21,9 +21,9 @@ - module1 = Extension('torrent', - include_dirs = ['./include', './include/libtorrent', - '/usr/include/python' + pythonVersion], -- libraries = ['boost_filesystem', 'boost_date_time', -- 'boost_program_options', 'boost_regex', -- 'boost_serialization', 'boost_thread', 'z', 'pthread'], -+ libraries = ['boost_filesystem-gcc42-mt', 'boost_date_time-gcc42-mt', -+ 'boost_program_options-gcc42-mt', 'boost_regex-gcc42-mt', -+ 'boost_serialization-gcc42-mt', 'boost_thread-gcc42-mt', 'z', 'pthread'], - sources = ['alert.cpp', - 'allocate_resources.cpp', - 'bt_peer_connection.cpp', From vmiklos at frugalware.org Wed Jul 18 19:46:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 18 19:46:49 2007 Subject: [Frugalware-git] frugalware-current: firefox-2.0.0.5-1-i686 Message-ID: <20070718174644.D1B6613A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e9259920cab2bc1ae0724cbd0a37626339d79d81 commit e9259920cab2bc1ae0724cbd0a37626339d79d81 Author: VMiklos Date: Wed Jul 18 19:46:24 2007 +0200 firefox-2.0.0.5-1-i686 version bump diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 2b0f59d..6abe638 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -4,7 +4,7 @@ # Contributor: VMiklos pkgname=firefox -pkgver=2.0.0.4 +pkgver=2.0.0.5 pkgrel=1 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/" From vmiklos at frugalware.org Wed Jul 18 20:14:41 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 18 20:14:44 2007 Subject: [Frugalware-git] frugalware-current: monodevelop-0.14-2-i686 Message-ID: <20070718181441.C55A713A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=910f5274ef6b8079b39dcb52e22b1514181d22b9 commit 910f5274ef6b8079b39dcb52e22b1514181d22b9 Author: VMiklos Date: Wed Jul 18 20:14:31 2007 +0200 monodevelop-0.14-2-i686 rebuilt with newer firefox diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index b23e86e..5f7326f 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -3,10 +3,10 @@ pkgname=monodevelop pkgver=0.14 -pkgrel=1 +pkgrel=2 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.4' 'ikvm' 'boo' 'gnome-sharp') +depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' 'mono-tools' 'firefox=2.0.0.5' 'ikvm' 'boo' 'gnome-sharp') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') From krics at linuxforum.hu Wed Jul 18 21:23:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 18 21:23:19 2007 Subject: [Frugalware-git] frugalware-current: xterm-227-2-x86_64 Message-ID: <20070718192317.BFC6B13A4183@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=516dcb39223fbb580c8380b0f5e2cae20c7420a8 commit 516dcb39223fbb580c8380b0f5e2cae20c7420a8 Author: Christian Hamar alias krix Date: Wed Jul 18 21:22:58 2007 +0200 xterm-227-2-x86_64 * Release bump * Added desktop-file-utils as rodepends() diff --git a/source/x11/xterm/FrugalBuild b/source/x11/xterm/FrugalBuild index 8c6017f..564740b 100644 --- a/source/x11/xterm/FrugalBuild +++ b/source/x11/xterm/FrugalBuild @@ -3,13 +3,14 @@ pkgname=xterm pkgver=227 -pkgrel=1 +pkgrel=2 pkgdesc="X terminal emulator" url="http://dickey.his.com/xterm/" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64') depends=('libx11>=1.0.99.1' 'libxt>=1.0.3' 'libxrender>=0.9.2' 'libxmu' \ 'libxkbfile>=1.0.4' 'libxft>=2.1.11' 'libxaw') +rodepends=('desktop-file-utils') makedepends=('groff' 'imake') _F_gnome_desktop="y" Finclude gnome-scriptlet From vmiklos at frugalware.org Thu Jul 19 00:50:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 00:50:08 2007 Subject: [Frugalware-git] frugalware-current: tools/getall.py: new script to clone/update all the git repos Message-ID: <20070718225005.6F9D713A4187@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=24005aca92f13a3eb05df05d319486563fada59c commit 24005aca92f13a3eb05df05d319486563fada59c Author: VMiklos Date: Thu Jul 19 00:49:00 2007 +0200 tools/getall.py: new script to clone/update all the git repos diff --git a/tools/getall.py b/tools/getall.py new file mode 100755 index 0000000..25d9d1e --- /dev/null +++ b/tools/getall.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python + +"""Updates existing and clones new Frugalware repos. + +Usage: getall.py [options] + +Options: + -l ..., --login=... developer login, defaults to $LOGNAME + -r ..., --root=... root directory for the git repos, defaults to ~/git + +All parameters are optional. +""" + +__author__ = "Miklos Vajna " +__version__ = "0.1.0" +__date__ = "Thu, 19 Jul 2007 00:47:10 +0200" +__copyright__ = "Copyright (c) 2007 Miklos Vajna" +__license__ = "GPL" + +import os, pwd, getopt, sys + +server = "git.frugalware.org" +repodir = "/home/ftp/pub/other/homepage-ng/git/repos" + +class Options: + def __init__(self): + self.login = pwd.getpwuid(os.getuid())[0] + self.root = os.path.join(os.environ['HOME'], "git") + +def update(options): + os.chdir(options.root) + sock = os.popen("ssh %s@%s ls -l %s" % (options.login, server, repodir)) + buf = sock.readlines() + sock.close() + buf.pop(0) + for i in buf: + path = os.path.abspath(os.path.join(repodir, i.strip().split(" ")[-1])) + repo = os.path.split(path)[-1] + url = "%s@%s:%s" % (options.login, server, path) + print "Updating '%s':" % repo + try: + old = os.getcwd() + os.chdir(repo) + os.system("git pull") + os.chdir(old) + except OSError: + os.system("git clone %s" % url) + +def usage(ret): + print __doc__ + sys.exit(ret) + +def main(): + options = Options() + try: + opts, args = getopt.getopt(sys.argv[1:], "hl:r:v", ["help", "login=", "root=", "version"]) + except getopt.GetoptError: + usage(1) + for opt, arg in opts: + if opt in ("-h", "--help"): + usage(0) + if opt in ("-l", "--login"): + options.login = arg + if opt in ("-r", "--root"): + option.root = arg + if opt in ("-v", "--version"): + print "getall %s" % __version__ + sys.exit(0) + update(options) + +if __name__ == "__main__": + main() From krics at linuxforum.hu Thu Jul 19 07:35:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 07:35:42 2007 Subject: [Frugalware-git] frugalware-current: libao-0.8.8-1-i686 Message-ID: <20070719053538.6098E1868217@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4701b4e6e68f740028c8ce198bcf77d143926d9b commit 4701b4e6e68f740028c8ce198bcf77d143926d9b Author: Christian Hamar alias krix Date: Thu Jul 19 07:34:58 2007 +0200 libao-0.8.8-1-i686 * Version bump diff --git a/source/multimedia/libao/FrugalBuild b/source/multimedia/libao/FrugalBuild index 7897a4d..33cf546 100644 --- a/source/multimedia/libao/FrugalBuild +++ b/source/multimedia/libao/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=libao -pkgver=0.8.6 -pkgrel=3 +pkgver=0.8.8 +pkgrel=1 pkgdesc="A cross-platform audio library" url="http://www.xiph.org/ao" depends=('alsa-lib') @@ -13,10 +13,7 @@ makedepends=('esd') archs=('i686' 'x86_64') up2date="lynx -dump http://www.xiph.org/ao/|grep Release|sed -n 's/.*e \(.*\) -.*/\1/;1 p'" source=(http://downloads.xiph.org/releases/ao/$pkgname-$pkgver.tar.gz) -sha1sums=('2050e008ffcfd6803e2c2c03c7d5f469b6d8379e') - -build() { - Fbuild --disable-arts -} +sha1sums=('d6e867bbfc4361346db8e505c51271e4162ae7c4') +Fconfopts="$Fconfopts --disable-arts" # optimization OK From krics at linuxforum.hu Thu Jul 19 09:11:56 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 09:11:58 2007 Subject: [Frugalware-git] frugalware-current: libmng-1.0.9-3-i686 Message-ID: <20070719071156.442841868217@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3244a8324cb95d3826c03831dd1299777ad1fe94 commit 3244a8324cb95d3826c03831dd1299777ad1fe94 Author: Christian Hamar alias krix Date: Thu Jul 19 09:11:09 2007 +0200 libmng-1.0.9-3-i686 * Fixed up2date diff --git a/source/lib/libmng/FrugalBuild b/source/lib/libmng/FrugalBuild index 210f46b..ee2856e 100644 --- a/source/lib/libmng/FrugalBuild +++ b/source/lib/libmng/FrugalBuild @@ -10,6 +10,7 @@ groups=('lib') archs=('i686' 'x86_64' 'ppc') depends=('lcms') _F_sourceforge_prefix="$pkgname-" +_F_sourceforge_broken_up2date=1 Finclude sourceforge sha1sums=('d32e939ec95caff7839c6c9a5896e4d575c77d35') From vmiklos at frugalware.org Thu Jul 19 09:25:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 09:25:46 2007 Subject: [Frugalware-git] frugalware-current: quota-tools-3.15-1-i686 Message-ID: <20070719072544.2DEB51868217@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b81fef399e76475b973114518194cf84b343184b commit b81fef399e76475b973114518194cf84b343184b Author: VMiklos Date: Thu Jul 19 09:25:21 2007 +0200 quota-tools-3.15-1-i686 version bump diff --git a/source/apps/quota-tools/FrugalBuild b/source/apps/quota-tools/FrugalBuild index b620fbc..8509b43 100644 --- a/source/apps/quota-tools/FrugalBuild +++ b/source/apps/quota-tools/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=quota-tools -pkgver=3.14 -pkgrel=2 +pkgver=3.15 +pkgrel=1 pkgdesc="Linux disk quota utilities" url="http://sourceforge.net/projects/linuxquota/" depends=('e2fsprogs') @@ -12,8 +12,8 @@ archs=('i686' 'x86_64') _F_sourceforge_name=linuxquota Finclude sourceforge source=(${source/linuxquota-/quota-} rc.quota) -sha1sums=('46f862737a7530e84bb7c86cf7f1f82c010a7ccd' \ - 'bfd62292fe953bf00d2f19a9a2496d085d151aac') +sha1sums=('3a1ea8d48910ef760950e2c2e236e9c2e44dea3a' \ + 'bfd62292fe953bf00d2f19a9a2496d085d151aac') build() { From voroskoi at frugalware.org Thu Jul 19 14:00:34 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Jul 19 14:00:37 2007 Subject: [Frugalware-git] frugalware-current: cups-1.2.12-1-i686 Message-ID: <20070719120034.330E613A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e41eacc1cbe5c69d3f4495f56af97f25cb5952de commit e41eacc1cbe5c69d3f4495f56af97f25cb5952de Author: voroskoi Date: Thu Jul 19 13:56:41 2007 +0200 cups-1.2.12-1-i686 version bump str2408.patch removed diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index 87bd2c8..9f96d67 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=cups -pkgver=1.2.11 -pkgrel=3 +pkgver=1.2.12 +pkgrel=1 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" depends=('libtiff' 'libpng' 'libjpeg') @@ -13,8 +13,8 @@ groups=('apps') archs=('i686' 'x86_64') backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs}) up2date="lynx -dump $url |grep Stable |sed -e 's/.*v\(.*\)/\1/'" -source=(ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \ - rc.cups rc.cups-{hu,de}.po str2408.patch) +source=(ftp://ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \ + rc.cups rc.cups-{hu,de}.po) subpkgs=('libcups') subdescs=('Main library of the CUPS printing system.') @@ -49,10 +49,9 @@ build() { Fsplit libcups usr/lib/libcups.so* } -sha1sums=('4635dc423e3fc061df10d6af5ba60aaceb03d34b'\ - 'ad90c43de181d362f6c507f366904472d01ae585'\ - 'f19bb889e3535e1284d0b93606da48aa61089c8a'\ - '03197abb98eff18d3ede3000a61c7783b8c1ad92'\ - '1f6f12423c3e5c81fdead20ecfa4c7bd9f7367ec') +sha1sums=('11a540f76a1d3164b6636bf8ba47928803ad9356' \ + 'ad90c43de181d362f6c507f366904472d01ae585' \ + 'f19bb889e3535e1284d0b93606da48aa61089c8a' \ + '03197abb98eff18d3ede3000a61c7783b8c1ad92') # optimization OK From priyank at frugalware.org Thu Jul 19 14:09:43 2007 From: priyank at frugalware.org (Priyank) Date: Thu Jul 19 14:09:45 2007 Subject: [Frugalware-git] frugalware-current: motion-3.2.8-1-i686 Message-ID: <20070719120943.9538F13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d58b2fccf7034fca9b4f5b3e38a3a9cc09a194ff commit d58b2fccf7034fca9b4f5b3e38a3a9cc09a194ff Author: Priyank Date: Thu Jul 19 17:30:55 2007 +0530 motion-3.2.8-1-i686 * Version bump diff --git a/source/xmultimedia-extra/motion/FrugalBuild b/source/xmultimedia-extra/motion/FrugalBuild index 1de3794..70429ff 100644 --- a/source/xmultimedia-extra/motion/FrugalBuild +++ b/source/xmultimedia-extra/motion/FrugalBuild @@ -1,10 +1,10 @@ -# Compiling time: 0.09 SBU +# Compiling Time: 0.10 SBU # Maintainer: Priyank Gosalia # Contributor: enda pkgname=motion -pkgver=3.2.7 -pkgrel=2 +pkgver=3.2.8 +pkgrel=1 pkgdesc="Motion is a program that monitors the video signal from one or more cameras and is able to detect if a significant part of the picture has changed. Or in other words, it can detect motion." Finclude sourceforge url="http://www.lavrsen.dk/twiki/bin/view/Motion/" @@ -14,12 +14,13 @@ install="motion.install" archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.lavrsen.dk/twiki/bin/view/Motion/DownloadFiles' |grep 'Current version is'| sed 's/.*Current version is \(.*\).*/\1/'" source=($source rc.motion README.Frugalware) -sha1sums=('b0ed252e05f1ff2051df3875dd1a8d0445be45ff'\ - '1d85dce27289f756bdf9c96c78c9587d258190cf'\ +sha1sums=('5b01f10f812cc8bb7878f398ca0f510a737e74da' \ + '1d85dce27289f756bdf9c96c78c9587d258190cf' \ 'b0598b9068e3e136d4a4864f5fc66749c787d7f6') Fconfopts="$Fconfopts --without-mysql --without-pgsql" -build() { +build() +{ Fcd # DO NOT REMOVE THIS!! Fmake --without-optimizecpu From voroskoi at frugalware.org Thu Jul 19 14:41:47 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Jul 19 14:41:50 2007 Subject: [Frugalware-git] frugalware-current: heimdal-1.0-1-i686 Message-ID: <20070719124147.DDF1F13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=df048655ff30edf3622d7f45002298ed924597c5 commit df048655ff30edf3622d7f45002298ed924597c5 Author: voroskoi Date: Thu Jul 19 14:38:32 2007 +0200 heimdal-1.0-1-i686 version bump updated depends() diff --git a/source/lib/heimdal/FrugalBuild b/source/lib/heimdal/FrugalBuild index d415b8e..09bdaf3 100644 --- a/source/lib/heimdal/FrugalBuild +++ b/source/lib/heimdal/FrugalBuild @@ -3,22 +3,24 @@ # Maintainer: voroskoi pkgname=heimdal -pkgver=0.8.1 +pkgver=1.0 pkgrel=1 pkgdesc="Heimdal Kerberos V5 libraries" url="http://www.pdc.kth.se/heimdal/" groups=('lib') archs=('i686' 'x86_64') -depends=('db>=4.5.20' 'openssl' 'e2fsprogs' 'texinfo' 'termcap') +depends=('e2fsprogs' 'openssl' 'termcap' 'db') up2date="lynx -dump $url |grep current|sed 's/.*e \(.*\) and.*/\1/'" source=(http://ftp.pdc.kth.se/pub/heimdal/src/$pkgname-$pkgver.tar.gz) -[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --with-pic --with-gnu-ld" +[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --with-pic" signatures=("$source.asc") Finclude texinfo build() { - Fbuild --enable-shared=yes --enable-static=no --without-x --enable-pthread-support --libexecdir=/usr/sbin + Fbuild --enable-shared=yes --enable-static=no \ + --without-x --enable-pthread-support \ + --libexecdir=/usr/sbin --with-gnu-ld for i in ftp login mk_cmds rcp rsh su telnet; do Fmv usr/bin/$i usr/bin/k$i [ -e $Fdestdir/usr/share/man/man1/$i.1 ] && Fmv usr/share/man/man1/$i.1 usr/share/man/man1/k$i.1 From voroskoi at frugalware.org Thu Jul 19 14:45:48 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Jul 19 14:45:51 2007 Subject: [Frugalware-git] frugalware-current: cupsddk-1.2.0-1-i686 Message-ID: <20070719124548.7710313A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=16a4327b197f9813f3070749d75f87f2d5008adc commit 16a4327b197f9813f3070749d75f87f2d5008adc Author: voroskoi Date: Thu Jul 19 14:42:53 2007 +0200 cupsddk-1.2.0-1-i686 version bump diff --git a/source/apps-extra/cupsddk/FrugalBuild b/source/apps-extra/cupsddk/FrugalBuild index bf26c47..4517d44 100644 --- a/source/apps-extra/cupsddk/FrugalBuild +++ b/source/apps-extra/cupsddk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=cupsddk -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="The CUPS Driver Development Kit provides a suite of utilities that can be used to develop printer drivers." url="http://www.cups.org/ddk/" @@ -11,12 +11,12 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Stable |sed 's/.*v\(.*\)/\1/'" Fconfopts="$Fconfopts --exec_prefix=$Fprefix --includedir=$Fprefix/include" -source=(ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2) +source=(ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2) +sha1sums=('41999fd24f13afe6915ab6beb3235136909697b0') build() { Fmake Fmakeinstall BUILDROOT=$Fdestdir } -sha1sums=('3166338b1bc8a311c4ee204f6c148036b024b1fd') # optimization OK From voroskoi at frugalware.org Thu Jul 19 14:55:39 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Jul 19 14:55:41 2007 Subject: [Frugalware-git] frugalware-current: tor-0.1.2.15-1-i686 Message-ID: <20070719125539.232F713A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=aab51511d4617be294b0ffd47c6003cee8ebdf9d commit aab51511d4617be294b0ffd47c6003cee8ebdf9d Author: voroskoi Date: Thu Jul 19 14:52:40 2007 +0200 tor-0.1.2.15-1-i686 version bump diff --git a/source/network-extra/tor/FrugalBuild b/source/network-extra/tor/FrugalBuild index e0a6708..95b27a2 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.14 +pkgver=0.1.2.15 pkgrel=1 pkgdesc="An anonymous Internet communication system" url="http://tor.eff.org" From vmiklos at frugalware.org Thu Jul 19 15:49:25 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 15:49:28 2007 Subject: [Frugalware-git] frugalware-current: quota-tools-3.15-2-i686 Message-ID: <20070719134925.C1AB213A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=34790ba3f1f9f18b660c91c92193c58b0113c5fa commit 34790ba3f1f9f18b660c91c92193c58b0113c5fa Author: VMiklos Date: Thu Jul 19 15:48:54 2007 +0200 quota-tools-3.15-2-i686 fix manpage removal thx boobaa diff --git a/source/apps/quota-tools/FrugalBuild b/source/apps/quota-tools/FrugalBuild index 8509b43..b1ec5e4 100644 --- a/source/apps/quota-tools/FrugalBuild +++ b/source/apps/quota-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=quota-tools pkgver=3.15 -pkgrel=1 +pkgrel=2 pkgdesc="Linux disk quota utilities" url="http://sourceforge.net/projects/linuxquota/" depends=('e2fsprogs') @@ -23,7 +23,7 @@ build() Frcd quota # remove conflicts: glibc and nfs-utils Frm /usr/include/rpcsvc/rquota.{h,x} - Frm /usr/man/man{2/quotactl.2,8/rquotad.8} + Frm /usr/share/man/man{2/quotactl.2,8/rquotad.8} Frm /usr/sbin/rpc.rquotad } From voroskoi at frugalware.org Thu Jul 19 16:10:33 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Jul 19 16:10:36 2007 Subject: [Frugalware-git] frugalware-current: xfe-1.00-1-i686 Message-ID: <20070719141033.AB07A13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8843fb396c96824d6135505772d2f69fd1a29d94 commit 8843fb396c96824d6135505772d2f69fd1a29d94 Author: voroskoi Date: Thu Jul 19 16:07:25 2007 +0200 xfe-1.00-1-i686 version bump diff --git a/source/xapps-extra/xfe/FrugalBuild b/source/xapps-extra/xfe/FrugalBuild index 8df7a22..8f9f42d 100644 --- a/source/xapps-extra/xfe/FrugalBuild +++ b/source/xapps-extra/xfe/FrugalBuild @@ -2,14 +2,15 @@ # Maintainer: voroskoi pkgname=xfe -pkgver=0.99 +pkgver=1.00 pkgrel=1 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X." url="http://roland65.free.fr/xfe/" -depends=('fontconfig' 'freetype2' 'fox') +depends=('fox') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge +sha1sums=('864dc02f7e8c4bed410d61872f71833636fc33e1') build() { Fconf @@ -17,6 +18,5 @@ build() { make || Fdie Fmakeinstall } -sha1sums=('60707a6751e3d3290d307e184b82e1079a9a0174') # optimization OK From krics at linuxforum.hu Thu Jul 19 18:58:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 18:58:12 2007 Subject: [Frugalware-git] frugalware-current: libx11-1.1.2-1-x86_64 Message-ID: <20070719165809.3AEC013A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f6804ee87dba0c79068b30ff0b7a6c0a24601572 commit f6804ee87dba0c79068b30ff0b7a6c0a24601572 Author: Christian Hamar alias krix Date: Thu Jul 19 18:57:47 2007 +0200 libx11-1.1.2-1-x86_64 * Version bump to devel 1.1.2 * Fixes / Closes #2222 diff --git a/source/x11/libx11/FrugalBuild b/source/x11/libx11/FrugalBuild index abfd826..b6066d7 100644 --- a/source/x11/libx11/FrugalBuild +++ b/source/x11/libx11/FrugalBuild @@ -3,21 +3,19 @@ pkgname=libx11 _F_xorg_name=libX11 -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="X.Org X11 library" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-libs') archs=('i686' 'x86_64') -depends=('xproto' 'libxdmcp' 'xtrans>=1.0.2' 'kbproto' 'libxau' 'libxcb>=1.0') +depends=('xproto' 'libxdmcp' 'xtrans' 'kbproto' 'libxau' 'libxcb') makedepends=('pkgconfig' 'xf86bigfontproto' 'bigreqsproto' \ - 'xextproto' 'xcmiscproto' 'inputproto>=1.3.2' 'util-macros>=1.1.3') -_F_xorg_nr=2 + 'xextproto' 'xcmiscproto' 'inputproto' 'util-macros') +#_F_xorg_nr=2 Finclude xorg -source=($source \ - http://xorg.freedesktop.org/archive/X11R7.2/patches/xorg-libX11-1.1.1-xinitimage.diff) +up2date="lynx -dump '${_F_xorg_url}?C=M;O=A' | grep '$_F_xorg_name-\(.*\).tar.bz2' | Flasttarbz2" Fconfopts="$Fconfopts --enable-ipv6 --enable-xlocaledir --enable-xlocale --with-xcb=yes" -sha1sums=('5eb0771b67746e81b320195f36ef3c9777c6fc17'\ - 'a0f904115ad9dc441bebcf2f8267f9751322b727') +sha1sums=('7190d36389eb7903831cd9541d919f55ac5098e9') # optimization OK From krics at linuxforum.hu Thu Jul 19 19:04:39 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 19:04:41 2007 Subject: [Frugalware-git] frugalware-current: libxi-1.1.1-1-x86_64 Message-ID: <20070719170439.0FA7613A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1243bca5cc2774650e096aae4960d74a85f877cf commit 1243bca5cc2774650e096aae4960d74a85f877cf Author: Christian Hamar alias krix Date: Thu Jul 19 19:04:18 2007 +0200 libxi-1.1.1-1-x86_64 * Version bump ˙* Depends on libx11>=1.1.2 diff --git a/source/x11/libxi/FrugalBuild b/source/x11/libxi/FrugalBuild index 3bdf3a2..b3f013e 100644 --- a/source/x11/libxi/FrugalBuild +++ b/source/x11/libxi/FrugalBuild @@ -3,13 +3,13 @@ pkgname=libxi _F_xorg_name=libXi -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X input extension library" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-libs') archs=('i686' 'x86_64') -depends=('libx11>=1.1.0' 'libxext' 'inputproto>=1.4') +depends=('libx11>=1.1.2' 'libxext' 'inputproto') makedepends=('pkgconfig' 'xproto') Finclude xorg # to be removed on next 'stable not mixed bump' @@ -17,5 +17,5 @@ up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/lib/|grep $_ source="http://xorg.freedesktop.org/releases/individual/lib/$_F_xorg_name-$pkgver.tar.bz2" _F_cd_path="$_F_xorg_name-$pkgver" -sha1sums=('8dc380408dfea6357ea68ee375d0c5368d56066f') +sha1sums=('74e546ac1db4382d964edda9d539844085035250') # optimization OK From krics at linuxforum.hu Thu Jul 19 19:18:40 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 19:18:42 2007 Subject: [Frugalware-git] frugalware-current: xorg-server-1.2.0-6-x86_64 Message-ID: <20070719171840.782E213A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1fd26d6cdb5e55bb33fdb87bbe73eeda8beade7c commit 1fd26d6cdb5e55bb33fdb87bbe73eeda8beade7c Author: Christian Hamar alias krix Date: Thu Jul 19 19:18:12 2007 +0200 xorg-server-1.2.0-6-x86_64 * Release bump * Recompiled with libxi 1.1.1 and libx11 1.1.2 * Cleaned up unneccessary >= pkg depends diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 6569b9b..84c4aa7 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -3,23 +3,23 @@ pkgname=xorg-server pkgver=1.2.0 -pkgrel=5 +pkgrel=6 mesaver=7.0 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64') -depends=('libxfont>=1.2.7-2' 'libx11>=1.1.1-2' 'xtrans>=1.0.3' 'libxau>=1.0.3' \ - 'libxext>=1.0.2' 'libxkbfile>=1.0.4' 'libxdmcp' 'libxmu' 'libxrender>=0.9.2' \ - 'libxi>=1.1.0' 'freetype2>=2.3.1' 'mesa>=7.0' 'font-cursor-misc' 'font-misc-misc' \ - 'xbitmaps' 'xkeyboard-config' 'iceauth' 'rgb' 'xauth>=1.0.2' 'xinit>=1.0.3' 'libxaw' \ - 'libxpm>=3.5.6' 'libxxf86misc' 'libxxf86vm' 'libxkbui' 'liblbxutil' \ - 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb>=1.0') -makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto' 'xextproto' 'xproto>=7.0.10' \ +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' \ + 'xbitmaps' 'xkeyboard-config' 'iceauth' 'rgb' 'xauth' 'xinit' 'libxaw' \ + 'libxpm' 'libxxf86misc' 'libxxf86vm' 'libxkbui' 'liblbxutil' \ + 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb') +makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto' 'xextproto' 'xproto' \ 'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \ 'compositeproto' 'recordproto' 'resourceproto' 'videoproto' 'scrnsaverproto' 'evieext' \ 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' 'bigreqsproto' 'xcmiscproto' \ - 'glproto' 'xf86driproto' 'libdrm>=2.3.0-2' 'printproto' 'mkfontdir' 'mkfontscale>=1.0.3' \ - 'fontcacheproto' 'xorg-sgml-doctools' 'util-macros>=1.1.5') + 'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' \ + 'fontcacheproto' 'xorg-sgml-doctools' 'util-macros') rodepends=('xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vga' 'xf86-video-vesa' 'libglx') provides=('xorg-compat') replaces=('xorg-compat') From vmiklos at frugalware.org Thu Jul 19 19:19:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 19:19:05 2007 Subject: [Frugalware-git] frugalware-current: neon-0.26.4-2-i686 Message-ID: <20070719171903.E856613A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0f21a2a3e91f7687fcbf1852c302675c5ef8ac77 commit 0f21a2a3e91f7687fcbf1852c302675c5ef8ac77 Author: VMiklos Date: Thu Jul 19 19:18:53 2007 +0200 neon-0.26.4-2-i686 rebuilt with heimdal-1.0 diff --git a/source/network/neon/FrugalBuild b/source/network/neon/FrugalBuild index df766ca..637c7d3 100644 --- a/source/network/neon/FrugalBuild +++ b/source/network/neon/FrugalBuild @@ -3,10 +3,10 @@ pkgname=neon pkgver=0.26.4 -pkgrel=1 +pkgrel=2 pkgdesc="An HTTP and WebDAV client library, with a C interface." url="http://www.webdav.org/neon/" -depends=('heimdal>=0.8' 'expat' 'zlib') +depends=('heimdal>=1.0' 'expat' 'zlib') groups=('network') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" From vmiklos at frugalware.org Thu Jul 19 19:48:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 19:48:33 2007 Subject: [Frugalware-git] frugalware-current: subversion-1.4.4-3-i686 Message-ID: <20070719174831.4B84313A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=16cdb60e7da9f3f76e4b792af610ca7119847795 commit 16cdb60e7da9f3f76e4b792af610ca7119847795 Author: VMiklos Date: Thu Jul 19 19:48:21 2007 +0200 subversion-1.4.4-3-i686 rebuilt with heimdal-1.0 diff --git a/source/devel-extra/subversion/FrugalBuild b/source/devel-extra/subversion/FrugalBuild index afed06c..1283ef0 100644 --- a/source/devel-extra/subversion/FrugalBuild +++ b/source/devel-extra/subversion/FrugalBuild @@ -3,10 +3,10 @@ pkgname=subversion pkgver=1.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="A version control system that is a compelling replacement for CVS." url="http://subversion.tigris.org/" -depends=('neon>=0.26.1' 'apr-util>=1.2.8-2' 'apr>=1.2.9') +depends=('neon>=0.26.4-2' 'apr-util>=1.2.8-2' 'apr>=1.2.9') makedepends=('apache>=2.2.4-3' 'swig' 'ruby') groups=('devel-extra') archs=('i686' 'x86_64') From krics at linuxforum.hu Thu Jul 19 19:57:23 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 19:57:26 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-intel-2.1.0-1-x86_64 Message-ID: <20070719175723.60E8D13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fe170676ce5a57f8ecb07cdcabd4e997921e5fd2 commit fe170676ce5a57f8ecb07cdcabd4e997921e5fd2 Author: Christian Hamar alias krix Date: Thu Jul 19 19:57:02 2007 +0200 xf86-video-intel-2.1.0-1-x86_64 * Added nobuild=1 diff --git a/source/x11-extra/xf86-video-intel/FrugalBuild b/source/x11-extra/xf86-video-intel/FrugalBuild index d945228..3e4dbac 100644 --- a/source/x11-extra/xf86-video-intel/FrugalBuild +++ b/source/x11-extra/xf86-video-intel/FrugalBuild @@ -11,6 +11,7 @@ depends=('xorg-server>=1.2.0-3' 'libxvmc') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ 'xf86dgaproto' 'glproto' 'xineramaproto') Finclude xorg +nobuild=1 conflicts=('xf86-video-i810') up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/driver/|grep $pkgname|Flasttarbz2" source=(http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 \ From krics at linuxforum.hu Thu Jul 19 19:59:32 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jul 19 19:59:35 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-intel-2.1.0-1-x86_64 Message-ID: <20070719175933.0FE2213A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1cbb6f6ba025eb1134bac91440781b883dc8806a commit 1cbb6f6ba025eb1134bac91440781b883dc8806a Author: Christian Hamar alias krix Date: Thu Jul 19 19:59:15 2007 +0200 xf86-video-intel-2.1.0-1-x86_64 * Replaced nobuild=1 with options=('nobuild') diff --git a/source/x11-extra/xf86-video-intel/FrugalBuild b/source/x11-extra/xf86-video-intel/FrugalBuild index 3e4dbac..d508bcc 100644 --- a/source/x11-extra/xf86-video-intel/FrugalBuild +++ b/source/x11-extra/xf86-video-intel/FrugalBuild @@ -11,7 +11,7 @@ depends=('xorg-server>=1.2.0-3' 'libxvmc') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ 'xf86dgaproto' 'glproto' 'xineramaproto') Finclude xorg -nobuild=1 +options=('nobuild') conflicts=('xf86-video-i810') up2date="lynx -dump http://xorg.freedesktop.org/releases/individual/driver/|grep $pkgname|Flasttarbz2" source=(http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 \ From vmiklos at frugalware.org Thu Jul 19 20:40:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 20:40:30 2007 Subject: [Frugalware-git] frugalware-current: cyrus-sasl-2.1.22-10-i686 Message-ID: <20070719184027.5E2C413A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e15391b455626c4ea3bb0220b3a4e46ba12ca003 commit e15391b455626c4ea3bb0220b3a4e46ba12ca003 Author: VMiklos Date: Thu Jul 19 20:40:01 2007 +0200 cyrus-sasl-2.1.22-10-i686 rebuilt with heimdal-1.0 diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 6bdd37c..9f41d76 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -3,11 +3,11 @@ pkgname=cyrus-sasl pkgver=2.1.22 -pkgrel=9 +pkgrel=10 pkgdesc="SASL Authentication mechanism" url="http://ftp.andrew.cmu.edu/pub/cyrus-mail/" depends=('openssl' 'gdbm') -makedepends=('mysql' 'postgresql>=8.2' 'heimdal>=0.8' 'db>=4.5.20') +makedepends=('mysql' 'postgresql>=8.2' 'heimdal>=1.0' 'db>=4.5.20') groups=('network') archs=('i686' 'x86_64') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$pkgver.tar.gz \ From boobaa at frugalware.org Thu Jul 19 21:09:58 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jul 19 21:10:03 2007 Subject: [Frugalware-git] frugalware-current: wireshark-0.99.6-2-i686 Message-ID: <20070719190958.2A2DA13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=11faa912191bfcf5582533ad6981245adb0f14c1 commit 11faa912191bfcf5582533ad6981245adb0f14c1 Author: CSÉCSY László Date: Thu Jul 19 21:09:45 2007 +0200 wireshark-0.99.6-2-i686 rebuilt with heimdal-1.0 SBU fix diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 3b36c90..703addf 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: ~3.18 SBU +# Compiling Time: ~5.97 SBU # Maintainer: CSÉCSY László pkgname=wireshark pkgver=0.99.6 -pkgrel=1 +pkgrel=2 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" depends=('heimdal>=0.8' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=1.6.3') From boobaa at frugalware.org Thu Jul 19 21:39:38 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jul 19 21:39:40 2007 Subject: [Frugalware-git] frugalware-current: wireshark-0.99.6-2-i686 Message-ID: <20070719193938.5A8DC13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=361ceace1d7f1ec1826f25ed58febe823389b364 commit 361ceace1d7f1ec1826f25ed58febe823389b364 Author: CSÉCSY László Date: Thu Jul 19 21:39:32 2007 +0200 wireshark-0.99.6-2-i686 doh, forgot to s/0.8/1.0/ diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 703addf..dc81f78 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.99.6 pkgrel=2 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" -depends=('heimdal>=0.8' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=1.6.3') +depends=('heimdal>=1.0' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=1.6.3') replaces=('ethereal') groups=('xapps-extra') archs=('i686' 'x86_64') From boobaa at frugalware.org Thu Jul 19 21:53:38 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jul 19 21:53:40 2007 Subject: [Frugalware-git] frugalware-current: rpm-4.4.6-6-i686 Message-ID: <20070719195338.63B7F13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=85bfbbea32709e96422cef9bfe434109c7507389 commit 85bfbbea32709e96422cef9bfe434109c7507389 Author: CSÉCSY László Date: Thu Jul 19 21:53:28 2007 +0200 rpm-4.4.6-6-i686 rebuilt with heimdal-1.0 diff --git a/source/apps/rpm/FrugalBuild b/source/apps/rpm/FrugalBuild index f69e0d7..0af8d5c 100644 --- a/source/apps/rpm/FrugalBuild +++ b/source/apps/rpm/FrugalBuild @@ -4,10 +4,10 @@ pkgname=rpm pkgver=4.4.6 -pkgrel=5 +pkgrel=6 pkgdesc="Red Hat Package Manager" url="http://www.rpm.org/" -depends=('bzip2' 'libgcc' 'sqlite3' 'popt' 'neon>=0.26.1' 'db>=4.5.20' 'heimdal>=0.8') +depends=('bzip2' 'libgcc' 'sqlite3' 'popt' 'neon>=0.26.1' 'db>=4.5.20' 'heimdal>=1.0') groups=('apps') archs=('i686' 'x86_64') makedepends=('beecrypt') From boobaa at frugalware.org Thu Jul 19 22:41:01 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jul 19 22:41:03 2007 Subject: [Frugalware-git] frugalware-current: wireshark-0.99.6-3-i686 Message-ID: <20070719204101.51C0C13A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bdc83cd08f5d6ea8ed7c1980f48cba0730b52330 commit bdc83cd08f5d6ea8ed7c1980f48cba0730b52330 Author: CSÉCSY László Date: Thu Jul 19 22:40:52 2007 +0200 wireshark-0.99.6-3-i686 relbump again, to fix those damned depends diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index dc81f78..e3dfa99 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wireshark pkgver=0.99.6 -pkgrel=2 +pkgrel=3 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" depends=('heimdal>=1.0' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=1.6.3') From vmiklos at frugalware.org Thu Jul 19 23:54:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 19 23:54:57 2007 Subject: [Frugalware-git] frugalware-current: include/util.sh: fix Frcd() Message-ID: <20070719215443.BCC4913A4188@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=25e4a61fd051532aa39fdd256e7e0e5213254709 commit 25e4a61fd051532aa39fdd256e7e0e5213254709 Author: VMiklos Date: Thu Jul 19 23:54:01 2007 +0200 include/util.sh: fix Frcd() diff --git a/source/include/util.sh b/source/include/util.sh index c21bc8e..cdf251f 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -618,6 +618,10 @@ Frcd() { Fexe /etc/rc.d/rc.$1 Ffile ../messages/* /etc/rc.d/rc.messages/ else + # rc script + if [ -z "$_F_rcd_name" ]; then + _F_rcd_name=$pkgname + fi Frcd "$_F_rcd_name" fi } From vmiklos at frugalware.org Fri Jul 20 00:02:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 00:02:23 2007 Subject: [Frugalware-git] frugalware-current: squid-2.6.STABLE14-1-x86_64 Message-ID: <20070719220220.D742A13A418C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1c11f208303bb8fa234293bd3df3ec80e2e1705c commit 1c11f208303bb8fa234293bd3df3ec80e2e1705c Author: VMiklos Date: Fri Jul 20 00:02:13 2007 +0200 squid-2.6.STABLE14-1-x86_64 version bump diff --git a/source/network-extra/squid/FrugalBuild b/source/network-extra/squid/FrugalBuild index a7a65f6..4cbb7ab 100644 --- a/source/network-extra/squid/FrugalBuild +++ b/source/network-extra/squid/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=squid -pkgver=2.6.STABLE13 +pkgver=2.6.STABLE14 pkgrel=1 pkgdesc="Squid Web Proxy Cache" url="http://www.squid-cache.org/" @@ -15,6 +15,12 @@ up2date="lynx -dump $url/Versions/v2/2.6/|grep -1 Current|sed -n 's/.*-\([^ ]*\) source=(http://www.squid-cache.org/Versions/v2/2.6/$pkgname-$pkgver.tar.bz2 \ $pkgname-2.6.STABLE3-dirs.diff $pkgname-2.6.STABLE3-samba.diff \ $pkgname-2.6.STABLE3-username.diff rc.squid squid) +sha1sums=('ff4801955707ff8a6bba69275951071d6ce55d33' \ + 'a1482482406661090951fa4c4304ca6604db2d14' \ + '8eacf8bd974c461162aaba72b5bc4109cc1104c7' \ + '7dbae27eeee7b62e685f6758a06d984b0b62668e' \ + '0fd7d10edfda7e9851bf4a63b82552492a823174' \ + '53042dd86e482d4a6eff9e34ecb01352439c5026') build() { @@ -46,11 +52,5 @@ build() Fsed 'allow manager localhost' 'allow localhost' $Fdestdir/etc/squid/squid.conf } -sha1sums=('e7e3cc93dadbfe2bdfa4d711a40259d45e360bd1'\ - 'a1482482406661090951fa4c4304ca6604db2d14'\ - '8eacf8bd974c461162aaba72b5bc4109cc1104c7'\ - '7dbae27eeee7b62e685f6758a06d984b0b62668e'\ - '0fd7d10edfda7e9851bf4a63b82552492a823174'\ - '53042dd86e482d4a6eff9e34ecb01352439c5026') # optimization OK From vmiklos at frugalware.org Fri Jul 20 00:24:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 00:25:01 2007 Subject: [Frugalware-git] frugalware-current: kdelibs-3.5.7-2-i686 Message-ID: <20070719222457.72A6C13A418C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c26ca0f6bd5f0c1b1aab1cc4c74f276b7be4f7fe commit c26ca0f6bd5f0c1b1aab1cc4c74f276b7be4f7fe Author: VMiklos Date: Fri Jul 20 00:24:34 2007 +0200 kdelibs-3.5.7-2-i686 rebuilt with heimdal-1.0 diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild index aa15677..a4cf20f 100644 --- a/source/kde/kdelibs/FrugalBuild +++ b/source/kde/kdelibs/FrugalBuild @@ -4,11 +4,11 @@ pkgname=kdelibs pkgver=3.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries." depends=('arts>=1.5.7' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif' 'openssl' 'libart_lgpl' 'gamin' 'bzip2' \ 'xfsprogs-acl' 'openexr>=1.4.0a-2' 'libidn' 'aspell' 'jasper>=1.900.1-2' 'avahi-qt3>=0.6.14-2' \ - 'avahi-compat>=0.6.14-2' 'heimdal>=0.8' 'rgb' 'qt>=3.3.8-3' 'libdrm' 'libxrender' 'libxcb') + 'avahi-compat>=0.6.14-2' 'heimdal>=1.0' 'rgb' 'qt>=3.3.8-3' 'libdrm' 'libxrender' 'libxcb') makedepends=('cups>=1.2.3' 'openldap' 'sane-backends' 'hspell' 'flex' 'opensp' \ 'openjade' 'doxygen' 'qt-docs>=3.3.8-2' 'graphviz') rodepends=('dejavu-ttf' 'corefonts' 'aspell6-en') From krics at linuxforum.hu Fri Jul 20 08:13:39 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 08:13:41 2007 Subject: [Frugalware-git] frugalware-current: xfsprogs-2.8.20_1-1-i686 Message-ID: <20070720061339.4DD181868207@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=26b6aec36c67118075a42817e985552c6c9a0cea commit 26b6aec36c67118075a42817e985552c6c9a0cea Author: Christian Hamar alias krix Date: Fri Jul 20 08:12:47 2007 +0200 xfsprogs-2.8.20_1-1-i686 * Version bump * Fixup for .so in /lib (chmod a+x for all *.so* in /lib ) diff --git a/source/base/xfsprogs/FrugalBuild b/source/base/xfsprogs/FrugalBuild index 75a28cf..6f1af22 100644 --- a/source/base/xfsprogs/FrugalBuild +++ b/source/base/xfsprogs/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: VMiklos pkgname=xfsprogs -pkgver=2.8.16_1 +pkgver=2.8.20_1 pkgrel=1 pkgdesc="XFS filesystem-specific static libraries and headers." url="http://oss.sgi.com/projects/xfs/" @@ -15,12 +15,12 @@ replaces=('xfsprogs-base') up2date="lynx -dump ftp://oss.sgi.com/projects/xfs/cmd_tars/|grep -m1 'xfsprogs_'|sed 's/.*_\(.*\).t.*/\1/' | sed 's/-/_/'" source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}_`echo ${pkgver} | sed -e 's/_/-/g'`.tar.gz \ xfsprogs-sharedlibs.patch.gz) -sha1sums=('fa387c594bcc1a244556d589eff53c7794fcac27'\ +sha1sums=('1b6a6bfa749127d22e9516b8a88d4264e9a7398e' \ 'd0db69f8de7a769272ae6584b5438a323628ab67') build() { unset MAKEFLAGS - Fcd $pkgname-2.8.16 + Fcd $pkgname-2.8.20 Fpatchall DEBUG="-DNDEBUG" OPTIMIZER="${CFLAGS}" @@ -46,7 +46,8 @@ build() { /* GNU ld script */ GROUP ( /lib/libhandle.so ) END_LDSCRIPT - chmod a+x $Fdestdir/usr/lib/libhandle.so + chmod a+x $Fdestdir/usr/lib/libhandle.so || Fdie + chmod a+x $Fdestdir/lib/*.so* || Fdie } # optimization OK From krics at linuxforum.hu Fri Jul 20 08:28:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 08:28:49 2007 Subject: [Frugalware-git] frugalware-current: lmsensors-2.10.4-1-i686 Message-ID: <20070720062847.5AEC31868207@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=14937ea29d53b44c26c02d9d736e87b0e47b446e commit 14937ea29d53b44c26c02d9d736e87b0e47b446e Author: Christian Hamar alias krix Date: Fri Jul 20 08:28:02 2007 +0200 lmsensors-2.10.4-1-i686 * Version bump diff --git a/source/apps/lmsensors/FrugalBuild b/source/apps/lmsensors/FrugalBuild index 09ed40c..f99228a 100644 --- a/source/apps/lmsensors/FrugalBuild +++ b/source/apps/lmsensors/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Zsolt Szalai pkgname=lmsensors -pkgver=2.10.3 +pkgver=2.10.4 pkgrel=1 pkgdesc="Linux System Hardware Monitor" url="http://www.lm-sensors.org/" @@ -24,7 +24,7 @@ build() { Fdoc README.Frugalware } -sha1sums=('04ec7e4e8a0506808046ab97fa7fcf390b0671cf'\ - 'f91892076a106c4aaee29f9611b9f004ddb392ab'\ - '429aadc6dfe22c59306dd8c8d663554f7cf2767a') +sha1sums=('f3a741900971d8748d63acfc4df191a36690738c' \ + 'f91892076a106c4aaee29f9611b9f004ddb392ab' \ + '62f12385b257170a95fbac89afc10523e152f216') # optimization OK From boobaa at frugalware.org Fri Jul 20 09:01:50 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 09:01:55 2007 Subject: [Frugalware-git] frugalware-current: samba-3.0.25-4-i686 Message-ID: <20070720070150.9B473186823F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9828123b386156566521fcd97e5f11245d164a96 commit 9828123b386156566521fcd97e5f11245d164a96 Author: CSÉCSY László Date: Fri Jul 20 09:01:43 2007 +0200 samba-3.0.25-4-i686 rebuilt with heimdal-1.0 diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index fdef112..769c4ae 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -5,7 +5,7 @@ pkgname=samba pkgver=3.0.25 pkgextraver=b -pkgrel=3 +pkgrel=4 pkgdesc="SMB file and print server." url="http://www.samba.org" backup=(etc/logrotate.d/samba) @@ -19,7 +19,7 @@ source=(http://ftp.samba.org/samba/ftp/stable/$pkgname-$pkgver$pkgextraver.tar.g subpkgs=('libsmbclient' 'samba-client' 'samba-swat') subdescs=('SMB client library.' 'SMB client tools.' 'Swat config tool for samba.') -subdepends=('libldap' 'heimdal>=0.8 db readline popt' '') +subdepends=('libldap' 'heimdal>=1.0 db readline popt' '') subrodepends=('' "libsmbclient=$pkgver" 'samba') subgroups=('lib' 'network' 'network') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') From boobaa at frugalware.org Fri Jul 20 09:07:03 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 09:07:08 2007 Subject: [Frugalware-git] frugalware-current: mailx-12.3-2-i686 Message-ID: <20070720070703.C0792186824F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=adcd9d89cc55acda7042d5b99f3bdddbee42cc4a commit adcd9d89cc55acda7042d5b99f3bdddbee42cc4a Author: CSÉCSY László Date: Fri Jul 20 09:06:36 2007 +0200 mailx-12.3-2-i686 rebuilt with heimdal-1.0 diff --git a/source/network/mailx/FrugalBuild b/source/network/mailx/FrugalBuild index b3bc599..b4c0286 100644 --- a/source/network/mailx/FrugalBuild +++ b/source/network/mailx/FrugalBuild @@ -5,14 +5,14 @@ pkgname=mailx pkgver=12.3 -pkgrel=1 +pkgrel=2 pkgdesc="A MUA derived from Berkeley Mail 8.1 and contains builtin support for MIME messages and IPv6" _F_sourceforge_dirname="heirloom" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://heirloom.sourceforge.net/mailx.html" backup=('etc/nail.rc') -depends=('heimdal>=0.8') +depends=('heimdal>=1.0') groups=('network') archs=('i686' 'x86_64') replaces=('nail') From boobaa at frugalware.org Fri Jul 20 09:11:53 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 09:11:55 2007 Subject: [Frugalware-git] frugalware-current: dillo-unicode-0.8.6_20060709-3-i686 Message-ID: <20070720071153.1246513A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bfd7692ca344599c66b99f68424e97493304c2bf commit bfd7692ca344599c66b99f68424e97493304c2bf Author: CSÉCSY László Date: Fri Jul 20 09:11:45 2007 +0200 dillo-unicode-0.8.6_20060709-3-i686 rebuilt with heimdal-1.0 diff --git a/source/xapps-extra/dillo-unicode/FrugalBuild b/source/xapps-extra/dillo-unicode/FrugalBuild index c983f28..be5df53 100644 --- a/source/xapps-extra/dillo-unicode/FrugalBuild +++ b/source/xapps-extra/dillo-unicode/FrugalBuild @@ -3,10 +3,10 @@ pkgname=dillo-unicode pkgver=0.8.6_20060709 -pkgrel=2 +pkgrel=3 pkgdesc="Dillo aims to be a multi-platform browser alternative that's small, stable, developer-friendly, usable, fast, and extensible." url="http://teki.jpn.ph/pc/software/" -depends=('heimdal>=0.8' 'libjpeg' 'gtk+' 'libpng' 'libxft' 'fltk') +depends=('heimdal>=1.0' 'libjpeg' 'gtk+' 'libpng' 'libxft' 'fltk') groups=('xapps-extra') archs=('i686' 'x86_64') conflicts=('dillo') From vmiklos at frugalware.org Fri Jul 20 09:19:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 09:19:17 2007 Subject: [Frugalware-git] frugalware-current: cyrus-sasl-2.1.22-10-i686 Message-ID: <20070720071915.9124113A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c5dc386bafd84b81ee4026f050dcfc35a435d3e2 commit c5dc386bafd84b81ee4026f050dcfc35a435d3e2 Author: VMiklos Date: Fri Jul 20 09:18:58 2007 +0200 cyrus-sasl-2.1.22-10-i686 subdepends() fix diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 9f41d76..84c80e6 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -24,7 +24,7 @@ sha1sums=('d23454ab12054714ab97d229c86cb934ce63fbb1' \ subpkgs=("$pkgname-sql" "$pkgname-gssapiv2" "saslauthd") subdescs=("$pkgname mysql, postgresql and sqlite plugin." "$pkgname gssapiv2 plugin." \ "sasl authentication server") -subdepends=("$pkgname=$pkgver libmysqlclient libpq>=8.2" "$pkgname=$pkgver db>=4.5.20 heimdal>=0.8" \ +subdepends=("$pkgname=$pkgver libmysqlclient libpq>=8.2" "$pkgname=$pkgver db>=4.5.20 heimdal>=1.0" \ "$pkgname=$pkgver $pkgname-gssapiv2") subgroups=('network' 'network' 'network') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') From boobaa at frugalware.org Fri Jul 20 09:28:37 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 09:28:39 2007 Subject: [Frugalware-git] frugalware-current: evolution-data-server-1.10.3.1-2-i686 Message-ID: <20070720072837.A10C5186824F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=654120994b3c454bab7b43309fe0b289bcb36615 commit 654120994b3c454bab7b43309fe0b289bcb36615 Author: CSÉCSY László Date: Fri Jul 20 09:27:36 2007 +0200 evolution-data-server-1.10.3.1-2-i686 rebuilt with heimdal-1.0 diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index b927017..ef80315 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -3,10 +3,10 @@ pkgname=evolution-data-server pkgver=1.10.3.1 -pkgrel=1 +pkgrel=2 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>=0.8' 'gnome-keyring>=0.8' \ +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') makedepends=('intltool' 'gtk-doc' 'openldap>=2.3.24') groups=('gnome' 'gnome-core') From krics at linuxforum.hu Fri Jul 20 09:38:46 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 09:38:48 2007 Subject: [Frugalware-git] frugalware-current: ed-0.7-1-i686 Message-ID: <20070720073846.56DAF13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3cf53485a5c25daa0352e2c26b94867c8ce2e15e commit 3cf53485a5c25daa0352e2c26b94867c8ce2e15e Author: Christian Hamar alias krix Date: Fri Jul 20 09:37:41 2007 +0200 ed-0.7-1-i686 * Version bump diff --git a/source/base/ed/FrugalBuild b/source/base/ed/FrugalBuild index 9368068..6907ec2 100644 --- a/source/base/ed/FrugalBuild +++ b/source/base/ed/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=ed -pkgver=0.6 +pkgver=0.7 pkgrel=1 pkgdesc="A POSIX-compliant line editor" url="http://www.gnu.org/software/ed/ed.html" From boobaa at frugalware.org Fri Jul 20 09:40:40 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 09:40:48 2007 Subject: [Frugalware-git] frugalware-current: gnome-vfs-2.18.1-4-i686 Message-ID: <20070720074041.0465D13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7e59b4a9d4be89f297be3f849c50367ed31caf1f commit 7e59b4a9d4be89f297be3f849c50367ed31caf1f Author: CSÉCSY László Date: Fri Jul 20 09:39:42 2007 +0200 gnome-vfs-2.18.1-4-i686 rebuilt with heimdal-1.0 diff --git a/source/gnome/gnome-vfs/FrugalBuild b/source/gnome/gnome-vfs/FrugalBuild index 0e9b010..2fdb0a5 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=3 +pkgrel=4 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>=0.8' 'db>=4.5.20') + 'avahi-glib>=0.6.17' 'xfsprogs-acl' 'heimdal>=1.0' 'db>=4.5.20') makedepends=('intltool' 'gtk-doc' 'samba') rodepends=('gnome-mount>=0.6') groups=('gnome' 'gnome-core') From boobaa at frugalware.org Fri Jul 20 09:55:47 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 09:55:50 2007 Subject: [Frugalware-git] frugalware-current: control-center-2.18.1-3-i686 Message-ID: <20070720075547.B03D313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4c6e55b10bc0d411b6fd8cdad2e4d138f60d8384 commit 4c6e55b10bc0d411b6fd8cdad2e4d138f60d8384 Author: CSÉCSY László Date: Fri Jul 20 09:55:36 2007 +0200 control-center-2.18.1-3-i686 rebuilt with heimdal-1.0 diff --git a/source/gnome/control-center/FrugalBuild b/source/gnome/control-center/FrugalBuild index ad0b3b5..607f546 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=2 +pkgrel=3 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>=0.8.1') + 'gnome-vfs>=2.18.1' 'gnome-panel>=2.18.1' 'heimdal>=1.0') 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 Fri Jul 20 12:37:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 12:37:25 2007 Subject: [Frugalware-git] homepage-ng: forgot to remove the link to changelog Message-ID: <20070720103722.146F913A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=5f61b27d9cdc62f8255c7192c7b7a3477e342a9f commit 5f61b27d9cdc62f8255c7192c7b7a3477e342a9f Author: VMiklos Date: Fri Jul 20 12:37:12 2007 +0200 forgot to remove the link to changelog thanks phayz diff --git a/frugalware/config.inc.php b/frugalware/config.inc.php index ddf76c6..6ea3296 100644 --- a/frugalware/config.inc.php +++ b/frugalware/config.inc.php @@ -74,7 +74,6 @@ $menucontent .= ' ' . gettext('Darcs repo $menucontent .= ' ' . gettext('Git repository') . "\n"; $menucontent .= ' ' . gettext('Bug Tracker') . "\n"; $menucontent .= ' ' . gettext('Translation portal') . "\n"; -$menucontent .= ' ' . gettext('ChangeLog') . "\n"; $menucontent .= ' ' . gettext('Blogs') . "\n"; $menucontent .= ' ' . gettext('Donations') . "\n"; $menucontent .= ' ' . gettext('Developers') . "\n"; From boobaa at frugalware.org Fri Jul 20 15:21:16 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 15:21:18 2007 Subject: [Frugalware-git] frugalware-current: evolution-2.10.3-2-i686 Message-ID: <20070720132116.C75E913A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=11b27f562fd4a644921c0513aa8cafe014997df5 commit 11b27f562fd4a644921c0513aa8cafe014997df5 Author: CSÉCSY László Date: Fri Jul 20 15:21:09 2007 +0200 evolution-2.10.3-2-i686 rebuilt with heimdal-1.0 diff --git a/source/gnome/evolution/FrugalBuild b/source/gnome/evolution/FrugalBuild index b481afc..bb3612a 100644 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@ -3,11 +3,11 @@ pkgname=evolution pkgver=2.10.3 -pkgrel=1 +pkgrel=2 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' \ - 'gnome-spell>=1.0.7-3' 'scrollkeeper' 'heimdal>=0.8' \ + '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') makedepends=('intltool' 'gnome-doc-utils>=0.10.3' 'openldap') From krics at linuxforum.hu Fri Jul 20 15:28:04 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 15:28:07 2007 Subject: [Frugalware-git] frugalware-current: nvidia-100.14.11-1-x86_64 Message-ID: <20070720132804.7F45613A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=176c357fc268c64e9de891c1a173c912f4c3e023 commit 176c357fc268c64e9de891c1a173c912f4c3e023 Author: Christian Hamar alias krix Date: Fri Jul 20 15:27:42 2007 +0200 nvidia-100.14.11-1-x86_64 * Version bump diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 6cfced5..fd3dd74 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: AlexExtreme pkgname=nvidia -pkgver=100.14.09 -pkgrel=3 +pkgver=100.14.11 +pkgrel=1 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') @@ -11,7 +11,7 @@ provides=('libgl' 'libglx') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" -[ "$CARCH" == "x86_64" ] && jarch=x86_64 && sha1=001bce9cba1c8ba31b0e942e85b429a5533ca72c && pkgnum=2 +[ "$CARCH" == "x86_64" ] && jarch=x86_64 && sha1=d542b702fdf7835f5dc7ec767789b2c1ada60908 && pkgnum=2 echo "$CARCH" | grep -q 'i.86' && jarch=x86 && sha1=b70794343d8f10d335564944130685b90a9c7f63 && pkgnum=1 source=(http://us.download.nvidia.com/XFree86/Linux-$jarch/$pkgver/NVIDIA-Linux-$jarch-$pkgver-pkg$pkgnum.run) sha1sums=($sha1) From boobaa at frugalware.org Fri Jul 20 15:32:45 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 15:32:47 2007 Subject: [Frugalware-git] frugalware-current: nvidia-100.14.11-1-i686 Message-ID: <20070720133245.EB0D413A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cc323d9fa6bb2698f90fbf5d339aae1a9f791e0d commit cc323d9fa6bb2698f90fbf5d339aae1a9f791e0d Author: CSÉCSY László Date: Fri Jul 20 15:32:39 2007 +0200 nvidia-100.14.11-1-i686 i686 sha1 fix diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index fd3dd74..3e24f15 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -12,7 +12,7 @@ groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 'Latest Version:'|sed 's/.*]//;s/-/_/'" [ "$CARCH" == "x86_64" ] && jarch=x86_64 && sha1=d542b702fdf7835f5dc7ec767789b2c1ada60908 && pkgnum=2 -echo "$CARCH" | grep -q 'i.86' && jarch=x86 && sha1=b70794343d8f10d335564944130685b90a9c7f63 && pkgnum=1 +echo "$CARCH" | grep -q 'i.86' && jarch=x86 && sha1=1427c18afd1cae198bee5d321f0a023994619926 && pkgnum=1 source=(http://us.download.nvidia.com/XFree86/Linux-$jarch/$pkgver/NVIDIA-Linux-$jarch-$pkgver-pkg$pkgnum.run) sha1sums=($sha1) options=('nostrip' 'force') From krics at linuxforum.hu Fri Jul 20 15:37:10 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 15:37:12 2007 Subject: [Frugalware-git] frugalware-current: directfb-1.0.0-1-x86_64 Message-ID: <20070720133710.7DE5213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b336a9774987dcf300fdcc3ea3378de610ec0306 commit b336a9774987dcf300fdcc3ea3378de610ec0306 Author: Christian Hamar alias krix Date: Fri Jul 20 15:36:39 2007 +0200 directfb-1.0.0-1-x86_64 * Removed x86_64 releated patch (in upstream) diff --git a/source/xlib/directfb/FrugalBuild b/source/xlib/directfb/FrugalBuild index 4e5d49c..bdf362a 100644 --- a/source/xlib/directfb/FrugalBuild +++ b/source/xlib/directfb/FrugalBuild @@ -13,9 +13,8 @@ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://directfb.org/index.php?path=Main%2FDownloads | grep -m1 tar.gz | sed 's/.*B-\(.*\).t.*/\1/'" source=(http://www.directfb.org/downloads/Core/DirectFB-$pkgver.tar.gz \ - directfb-0.9.25.1-x86_64.diff directfb-0.9.25.1-sysfs.diff) + directfb-0.9.25.1-sysfs.diff) sha1sums=('8ac354cabd9c279e8bd3cf352daddf1b19f2007f' \ - '09524cdd69787e3a464cbc605f654ebab6b681b0' \ 'edcd80bcc94f4e0370b2e39c12335f5eb5d8869d') subpkgs=("$pkgname-video-i810" "$pkgname-video-i830" "$pkgname-video-mga" "$pkgname-video-nv" "$pkgname-video-savage" \ From krics at linuxforum.hu Fri Jul 20 15:53:30 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 15:53:32 2007 Subject: [Frugalware-git] frugalware-current: sylpheed-2.4.4-1-x86_64 Message-ID: <20070720135330.E437413A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8fc54452694256cfbc0f7a00ec4f6dca43d0eb55 commit 8fc54452694256cfbc0f7a00ec4f6dca43d0eb55 Author: Christian Hamar alias krix Date: Fri Jul 20 15:53:12 2007 +0200 sylpheed-2.4.4-1-x86_64 * Version bump diff --git a/source/xapps-extra/sylpheed/FrugalBuild b/source/xapps-extra/sylpheed/FrugalBuild index 918e6a1..5a5db8f 100644 --- a/source/xapps-extra/sylpheed/FrugalBuild +++ b/source/xapps-extra/sylpheed/FrugalBuild @@ -3,7 +3,7 @@ # Old Maintainer: Bence Nagy pkgname=sylpheed -pkgver=2.4.3 +pkgver=2.4.4 branch=2.4 pkgrel=1 pkgdesc="A GTK+ based, lightweight, and fast email client" @@ -22,5 +22,5 @@ build() { Ffilerel /usr/share/applications/sylpheed.desktop } -sha1sums=('39eda7df5fe597ae0e4864424f95b29e9138fa0f') +sha1sums=('acc22aa00235f41548f3571dfa1e4b7ddb79bf4f') # optimization OK From vmiklos at frugalware.org Fri Jul 20 16:09:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 16:10:00 2007 Subject: [Frugalware-git] frugalware-current: gcc-4.2.1-1-i686 Message-ID: <20070720140957.D0D9F13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=de6cd8f2ebfd1ce6c931194dcae8bb4b82ec3653 commit de6cd8f2ebfd1ce6c931194dcae8bb4b82ec3653 Author: VMiklos Date: Fri Jul 20 16:09:37 2007 +0200 gcc-4.2.1-1-i686 version bump removed no longer necessary patches manpages are still from 4.2.0 diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 921cdb4..8d0f788 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=gcc -pkgver=4.2.0 -pkgrel=4 +pkgver=4.2.1 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" depends=('binutils' 'libstdc++') @@ -14,10 +14,9 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump $url|grep Current|sed 's/.*GCC \(.*\) (.*/\1/'" source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-$pkgver.tar.bz2 \ - http://ftp.frugalware.org/pub/other/sources/gcc/gcc-4.2.0-125227.diff.bz2 \ + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.0.tar.bz2 \ README.Frugalware) -signatures=("$source.sig" '' '' '') +signatures=("$source.sig" '' '') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ @@ -113,7 +112,7 @@ build() Fdoc README.Frugalware Fmkdir /usr/man/man3 # Note: man snapshots are called man.$snapshot and released tarballs are man-$the_version - cp $Fsrcdir/man-$pkgver/man3/* $Fdestdir/usr/man/man3/ + cp $Fsrcdir/man-4.2.0/man3/* $Fdestdir/usr/man/man3/ # split the pkg # libgcc From krics at linuxforum.hu Fri Jul 20 16:17:19 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:17:21 2007 Subject: [Frugalware-git] frugalware-current: libxcb-emul-1.0_3-1-x86_64 Message-ID: <20070720141719.3529613A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9e8f8be454112adc621ce29af645e2815c8b36d3 commit 9e8f8be454112adc621ce29af645e2815c8b36d3 Author: Christian Hamar alias krix Date: Fri Jul 20 16:17:05 2007 +0200 libxcb-emul-1.0_3-1-x86_64 version bump diff --git a/source/emul-extra/libxcb-emul/FrugalBuild b/source/emul-extra/libxcb-emul/FrugalBuild index f72cf1d..ed2b1f4 100644 --- a/source/emul-extra/libxcb-emul/FrugalBuild +++ b/source/emul-extra/libxcb-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=libxcb-emul -pkgver=1.0_2 +pkgver=1.0_3 pkgrel=1 pkgdesc="X.org X-protocol C Binding for emulation of i686 on x86_64" url="http://xcb.freedesktop.org" depends=('xcb-proto-emul' 'libxml2-emul' 'libxau-emul' 'libxdmcp-emul') Finclude emul -sha1sums=('1b553fe363627fcf5e3d09513e4df1826e464b78') +sha1sums=('075458e60ce60ba6289626676a0ffa120af9b28f') From krics at linuxforum.hu Fri Jul 20 16:19:57 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:20:00 2007 Subject: [Frugalware-git] frugalware-current: libmng-emul-1.0.9_3-1-x86_64 Message-ID: <20070720141957.46B1D13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b1deff1d7812bbf5d941c49e3eac6f7c57aaa14f commit b1deff1d7812bbf5d941c49e3eac6f7c57aaa14f Author: Christian Hamar alias krix Date: Fri Jul 20 16:19:42 2007 +0200 libmng-emul-1.0.9_3-1-x86_64 version bump diff --git a/source/emul-extra/libmng-emul/FrugalBuild b/source/emul-extra/libmng-emul/FrugalBuild index 165375d..74b6b1f 100644 --- a/source/emul-extra/libmng-emul/FrugalBuild +++ b/source/emul-extra/libmng-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libmng-emul -pkgver=1.0.9_2 +pkgver=1.0.9_3 pkgrel=1 pkgdesc="MNG libraries for emulation of i686 on x86_64" url="http://www.gnu.org/software/tar/tar.html" @@ -10,4 +10,4 @@ depends=('lcms-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('03ac5f353687394f3edcceaf69dabc70c75f0c9d') +sha1sums=('fcada235d01db86a81d8217ee9d30c4dc316c19f') From krics at linuxforum.hu Fri Jul 20 16:21:34 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:21:36 2007 Subject: [Frugalware-git] frugalware-current: x264-emul-20070421_1-1-x86_64 Message-ID: <20070720142134.6207213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=283ae3ab2ec2e9c97a69c981ddf31036b64a12d7 commit 283ae3ab2ec2e9c97a69c981ddf31036b64a12d7 Author: Christian Hamar alias krix Date: Fri Jul 20 16:21:21 2007 +0200 x264-emul-20070421_1-1-x86_64 version bump diff --git a/source/emul-extra/x264-emul/FrugalBuild b/source/emul-extra/x264-emul/FrugalBuild index b313c22..b8b11a3 100644 --- a/source/emul-extra/x264-emul/FrugalBuild +++ b/source/emul-extra/x264-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=x264-emul -pkgver=20060903_2 +pkgver=20070421_1 pkgrel=1 pkgdesc="A free h264/avc encoder for emulation of i686 on x86_64" url="http://developers.videolan.org/x264.html" depends=('glibc-emul' 'libx11-emul') Finclude emul -sha1sums=('6a755ee6475f2c42b1e2310290168df549313b2f') +sha1sums=('5ef875482326eff0039fe553cdbd7c43512b8d85') From krics at linuxforum.hu Fri Jul 20 16:23:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:23:20 2007 Subject: [Frugalware-git] frugalware-current: glib2-emul-2.12.13_1-1-x86_64 Message-ID: <20070720142318.630CE13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=938f4216acc1543c7d9bb7da8455b77c4b36c28f commit 938f4216acc1543c7d9bb7da8455b77c4b36c28f Author: Christian Hamar alias krix Date: Fri Jul 20 16:23:05 2007 +0200 glib2-emul-2.12.13_1-1-x86_64 version bump diff --git a/source/emul-extra/glib2-emul/FrugalBuild b/source/emul-extra/glib2-emul/FrugalBuild index e1751be..d78ddd7 100644 --- a/source/emul-extra/glib2-emul/FrugalBuild +++ b/source/emul-extra/glib2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=glib2-emul -pkgver=2.12.11_1 +pkgver=2.12.13_1 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('fd8be84d2e9c80c73beecd917b091ea2f4658653') +sha1sums=('7d635e2bac627d3a926a1dd3e13b1b62daf7029a') From krics at linuxforum.hu Fri Jul 20 16:25:04 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:25:06 2007 Subject: [Frugalware-git] frugalware-current: libxml2-emul-2.6.29_1-1-x86_64 Message-ID: <20070720142504.6AB1213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=72f063c8e4cc38611b219fb0ddf3ffb292259940 commit 72f063c8e4cc38611b219fb0ddf3ffb292259940 Author: Christian Hamar alias krix Date: Fri Jul 20 16:24:51 2007 +0200 libxml2-emul-2.6.29_1-1-x86_64 version bump diff --git a/source/emul-extra/libxml2-emul/FrugalBuild b/source/emul-extra/libxml2-emul/FrugalBuild index 4470ea4..30156d1 100644 --- a/source/emul-extra/libxml2-emul/FrugalBuild +++ b/source/emul-extra/libxml2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libxml2-emul -pkgver=2.6.27_1 +pkgver=2.6.29_1 pkgrel=1 pkgdesc="libxml2 for emulation of i686 on x86_64" url="http://www.xmlsoft.org" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'zlib-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('74d154da65a2b958a43f4ee31f28764f9f130796') +sha1sums=('44462d16d6278fa9047df564ca307afe26e6802b') From krics at linuxforum.hu Fri Jul 20 16:26:43 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:26:44 2007 Subject: [Frugalware-git] frugalware-current: ncurses-emul-5.6_2-1-x86_64 Message-ID: <20070720142643.179EC13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fff5763096a07c69d6833cdf0d3ccce60453cbf3 commit fff5763096a07c69d6833cdf0d3ccce60453cbf3 Author: Christian Hamar alias krix Date: Fri Jul 20 16:26:30 2007 +0200 ncurses-emul-5.6_2-1-x86_64 version bump diff --git a/source/emul-extra/ncurses-emul/FrugalBuild b/source/emul-extra/ncurses-emul/FrugalBuild index 70d2454..9223740 100644 --- a/source/emul-extra/ncurses-emul/FrugalBuild +++ b/source/emul-extra/ncurses-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=ncurses-emul -pkgver=5.6_1 +pkgver=5.6_2 pkgrel=1 pkgdesc="A System V Release 4.0 curses emulation library for emulation of i686 on x86_64" url="http://www.gnu.org/software/ncurses/ncurses.html" @@ -12,4 +12,4 @@ archs=('!i686' 'x86_64') Finclude emul # optimalization ok -sha1sums=('1a14855f4832771bac65e4b8d111932bb1fc7cf4') +sha1sums=('3b97487a893a90c1285c4dea1f3c6dd40f566650') From krics at linuxforum.hu Fri Jul 20 16:28:05 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:28:07 2007 Subject: [Frugalware-git] frugalware-current: libpng-emul-1.2.18_1-1-x86_64 Message-ID: <20070720142805.8A23213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6933e22978a8112ff615608c9b46fedd2fca5979 commit 6933e22978a8112ff615608c9b46fedd2fca5979 Author: Christian Hamar alias krix Date: Fri Jul 20 16:27:52 2007 +0200 libpng-emul-1.2.18_1-1-x86_64 version bump diff --git a/source/emul-extra/libpng-emul/FrugalBuild b/source/emul-extra/libpng-emul/FrugalBuild index 69b7e09..92c2b73 100644 --- a/source/emul-extra/libpng-emul/FrugalBuild +++ b/source/emul-extra/libpng-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libpng-emul -pkgver=1.2.16_1 +pkgver=1.2.18_1 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files for emulation of i686 on x86_64" url="http://www.libpng.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'zlib-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('0e055f661d882010840e969d347b98aa17a835ac') +sha1sums=('e3ae90430e6fa20815e798b5dc96acca322a2640') From krics at linuxforum.hu Fri Jul 20 16:29:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:29:15 2007 Subject: [Frugalware-git] frugalware-current: alsa-lib-emul-1.0.14_2-1-x86_64 Message-ID: <20070720142913.2C07213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2452dd4980079b4751c046ce197da463d7c2f727 commit 2452dd4980079b4751c046ce197da463d7c2f727 Author: Christian Hamar alias krix Date: Fri Jul 20 16:29:00 2007 +0200 alsa-lib-emul-1.0.14_2-1-x86_64 version bump diff --git a/source/emul-extra/alsa-lib-emul/FrugalBuild b/source/emul-extra/alsa-lib-emul/FrugalBuild index bde5333..6c193d4 100644 --- a/source/emul-extra/alsa-lib-emul/FrugalBuild +++ b/source/emul-extra/alsa-lib-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=alsa-lib-emul -pkgver=1.0.13_1 +pkgver=1.0.14_2 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support (32bit emul)" url="http://www.alsa-project.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('96280b21d73b14d67088e0ba369b455533df308f') +sha1sums=('14d69185f3c2a680ba7a219e1e522c04dc56a844') From krics at linuxforum.hu Fri Jul 20 16:32:19 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:32:22 2007 Subject: [Frugalware-git] frugalware-current: pango-emul-1.16.4_1-1-x86_64 Message-ID: <20070720143219.C30AD13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6217e1cd291f8de60655d9f5b0be0d0f06f18b04 commit 6217e1cd291f8de60655d9f5b0be0d0f06f18b04 Author: Christian Hamar alias krix Date: Fri Jul 20 16:32:04 2007 +0200 pango-emul-1.16.4_1-1-x86_64 version bump diff --git a/source/emul-extra/pango-emul/FrugalBuild b/source/emul-extra/pango-emul/FrugalBuild index 982c1fa..e8f0bab 100644 --- a/source/emul-extra/pango-emul/FrugalBuild +++ b/source/emul-extra/pango-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pango-emul -pkgver=1.16.1_1 +pkgver=1.16.4_1 pkgrel=1 pkgdesc="A library for layout and rendering of text (32bit emul)" url="http://www.gtk.org" @@ -10,4 +10,4 @@ depends=('cairo-emul' 'libxft-emul' 'glib2-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('adb59d96921bac65dedadf185b0ddb61a64795e8') +sha1sums=('42a56cd175599c0ac5c4e0be440343e80ce5b22f') From krics at linuxforum.hu Fri Jul 20 16:34:46 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:34:48 2007 Subject: [Frugalware-git] frugalware-current: cairo-emul-1.4.10_1-1-x86_64 Message-ID: <20070720143446.6C70113A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=317a802fcf3b2f4d7fb111d6511f3a665b3d052d commit 317a802fcf3b2f4d7fb111d6511f3a665b3d052d Author: Christian Hamar alias krix Date: Fri Jul 20 16:34:33 2007 +0200 cairo-emul-1.4.10_1-1-x86_64 version bump diff --git a/source/emul-extra/cairo-emul/FrugalBuild b/source/emul-extra/cairo-emul/FrugalBuild index e7417c0..80df8a6 100644 --- a/source/emul-extra/cairo-emul/FrugalBuild +++ b/source/emul-extra/cairo-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cairo-emul -pkgver=1.4.0_1 +pkgver=1.4.10_1 pkgrel=1 pkgdesc="A vector graphics library with cross-device output support (32bit emul)" url="http://cairographics.org" @@ -10,4 +10,4 @@ depends=('glitz-emul' 'libxrender-emul' 'fontconfig-emul' 'libpng-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('0ec032386254817ce33107cd65424792ddd09b16') +sha1sums=('7bd84996d6494ed73dd43ffa1acd5bc7973a9b30') From krics at linuxforum.hu Fri Jul 20 16:36:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:36:23 2007 Subject: [Frugalware-git] frugalware-current: nspr-emul-4.6.7_1-1-x86_64 Message-ID: <20070720143621.9914C13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5a1ab0f736b57159778540daab84c521290a6a34 commit 5a1ab0f736b57159778540daab84c521290a6a34 Author: Christian Hamar alias krix Date: Fri Jul 20 16:36:08 2007 +0200 nspr-emul-4.6.7_1-1-x86_64 version bump diff --git a/source/emul-extra/nspr-emul/FrugalBuild b/source/emul-extra/nspr-emul/FrugalBuild index de714ba..66f58f7 100644 --- a/source/emul-extra/nspr-emul/FrugalBuild +++ b/source/emul-extra/nspr-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=nspr-emul -pkgver=4.6.5_1 +pkgver=4.6.7_1 pkgrel=1 pkgdesc="Xorg DRM libraries for emulation of i686 on x86_64" url="http://xorg.freedesktop.org" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('3a27b7885ec46bf6f54de8f076ec4bde54ffffc6') +sha1sums=('826e43662b93d23e1eb5e8c186e3b637cb4d6d9e') From krics at linuxforum.hu Fri Jul 20 16:37:20 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:37:23 2007 Subject: [Frugalware-git] frugalware-current: pcre-emul-7.2_1-1-x86_64 Message-ID: <20070720143720.16A3E13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bfa281817a2d225d057ffee1743b4e5782aa572c commit bfa281817a2d225d057ffee1743b4e5782aa572c Author: Christian Hamar alias krix Date: Fri Jul 20 16:37:03 2007 +0200 pcre-emul-7.2_1-1-x86_64 version bump diff --git a/source/emul-extra/pcre-emul/FrugalBuild b/source/emul-extra/pcre-emul/FrugalBuild index fce8818..916417a 100644 --- a/source/emul-extra/pcre-emul/FrugalBuild +++ b/source/emul-extra/pcre-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pcre-emul -pkgver=7.0_1 +pkgver=7.2_1 pkgrel=1 pkgdesc="Perl-compatible regular expression library (32bit emul)" url="http://pcre.sourceforge.net" @@ -10,4 +10,4 @@ depends=('libstdc++-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('0c6a04696a860022ed2085c9c7a0391f56055a65') +sha1sums=('62a700c46bba90e1546a950c3bd377bbfaa86ae8') From krics at linuxforum.hu Fri Jul 20 16:39:27 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:39:30 2007 Subject: [Frugalware-git] frugalware-current: mesa-emul-7.0_1-1-x86_64 Message-ID: <20070720143927.1D8AF13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b190b1f623523ea21a23ade0133795c16fa18e75 commit b190b1f623523ea21a23ade0133795c16fa18e75 Author: Christian Hamar alias krix Date: Fri Jul 20 16:39:13 2007 +0200 mesa-emul-7.0_1-1-x86_64 version bump diff --git a/source/emul-extra/mesa-emul/FrugalBuild b/source/emul-extra/mesa-emul/FrugalBuild index 961ff4f..6fbe675 100644 --- a/source/emul-extra/mesa-emul/FrugalBuild +++ b/source/emul-extra/mesa-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=mesa-emul -pkgver=6.5.2_3 +pkgver=7.0_1 pkgrel=1 pkgdesc="MESA libraries for emulation of i686 on x86_64" url="http://mesa3d.sf.net" @@ -11,4 +11,4 @@ depends=('libx11-emul' 'libxext-emul' 'expat-emul' 'libxxf86vm-emul' \ groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('570bbcf42e431eff2467eec857a612065f93a526') +sha1sums=('c776ae5992bd666fc55b827145f7d54013e78c0c') From krics at linuxforum.hu Fri Jul 20 16:45:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:45:30 2007 Subject: [Frugalware-git] frugalware-current: libxi-emul-1.1.1_1-1-x86_64 Message-ID: <20070720144517.D237D13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7656a14fe0745e90467d0f816e076e04f176f0f9 commit 7656a14fe0745e90467d0f816e076e04f176f0f9 Author: Christian Hamar alias krix Date: Fri Jul 20 16:45:02 2007 +0200 libxi-emul-1.1.1_1-1-x86_64 version bump diff --git a/source/emul-extra/libxi-emul/FrugalBuild b/source/emul-extra/libxi-emul/FrugalBuild index a254a90..f322f75 100644 --- a/source/emul-extra/libxi-emul/FrugalBuild +++ b/source/emul-extra/libxi-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libxi-emul -pkgver=1.1.0_1 +pkgver=1.1.1_1 pkgrel=1 pkgdesc="Xorg XI libraries for emulation of i686 on x86_64" url="http://xorg.freedesktop.org" @@ -10,4 +10,4 @@ depends=('libx11-emul' 'libxext-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('5f88ab9b9a21842a4948a6f4a20e7a2919a39702') +sha1sums=('051b8d8ea28236ab5e9af5855a5f42a077a6699e') From krics at linuxforum.hu Fri Jul 20 16:46:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:46:41 2007 Subject: [Frugalware-git] frugalware-current: binutils-emul-2.17.50.0.16-1-x86_64 Message-ID: <20070720144612.CC07313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4abf4dcd638e9ef2d5271ee2f989108741b0bdfc commit 4abf4dcd638e9ef2d5271ee2f989108741b0bdfc Author: Christian Hamar alias krix Date: Fri Jul 20 16:45:57 2007 +0200 binutils-emul-2.17.50.0.16-1-x86_64 version bump diff --git a/source/emul-extra/binutils-emul/FrugalBuild b/source/emul-extra/binutils-emul/FrugalBuild index 77d546a..93069f5 100644 --- a/source/emul-extra/binutils-emul/FrugalBuild +++ b/source/emul-extra/binutils-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=binutils-emul -pkgver=2.17.50.0.6_1 +pkgver=2.17.50.0.16 pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files for emulation of i686 on x86_64" url="http://sources.redhat.com/binutils" From krics at linuxforum.hu Fri Jul 20 16:48:51 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:48:53 2007 Subject: [Frugalware-git] frugalware-current: glibc-emul-2.6_3-1-x86_64 Message-ID: <20070720144851.1C9A513A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=53fc56ff7bf3d1b71188413e41a90ae2f72cae43 commit 53fc56ff7bf3d1b71188413e41a90ae2f72cae43 Author: Christian Hamar alias krix Date: Fri Jul 20 16:48:37 2007 +0200 glibc-emul-2.6_3-1-x86_64 version bump diff --git a/source/emul-extra/glibc-emul/FrugalBuild b/source/emul-extra/glibc-emul/FrugalBuild index a277745..a697fac 100644 --- a/source/emul-extra/glibc-emul/FrugalBuild +++ b/source/emul-extra/glibc-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=glibc-emul -pkgver=2.5_1 +pkgver=2.6_3 pkgrel=1 pkgdesc="GNU C Library for emulation of i686 on x86_64" url="http://www.gnu.org/software/libc/libc.html" @@ -10,4 +10,4 @@ depends=('glibc') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('3ee3f0a8ab4e1370bcc8230e585bc055c46e4ea7') +sha1sums=('e907655f7007b57921fed8dcacf609be320156c1') From vmiklos at frugalware.org Fri Jul 20 16:49:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 16:49:07 2007 Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.72-4-i686 Message-ID: <20070720144905.C9BB313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3426d3fa9c614ac675f423fb36fa406f5098efaa commit 3426d3fa9c614ac675f423fb36fa406f5098efaa Author: VMiklos Date: Fri Jul 20 16:48:41 2007 +0200 java-gcj-compat-1.0.72-4-i686 rebuilt with gcc-4.2.1 diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index bd9982b..ab84a2b 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -3,8 +3,8 @@ pkgname=java-gcj-compat pkgver=1.0.72 -pkgrel=3 -gccver=4.2.0 +pkgrel=4 +gccver=4.2.1 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" From krics at linuxforum.hu Fri Jul 20 16:58:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 16:58:24 2007 Subject: [Frugalware-git] frugalware-current: nvidia-emul-100.14.11_1-1-x86_64 Message-ID: <20070720145821.3BD2213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=59ef66192a7872867bdac3d6f867a9b69f764eba commit 59ef66192a7872867bdac3d6f867a9b69f764eba Author: Christian Hamar alias krix Date: Fri Jul 20 16:58:02 2007 +0200 nvidia-emul-100.14.11_1-1-x86_64 version bump diff --git a/source/emul-extra/nvidia-emul/FrugalBuild b/source/emul-extra/nvidia-emul/FrugalBuild index 78f74b8..0ef18d0 100644 --- a/source/emul-extra/nvidia-emul/FrugalBuild +++ b/source/emul-extra/nvidia-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=nvidia-emul -pkgver=1.0_9746_7 +pkgver=100.14.11_1 pkgrel=1 pkgdesc="3d accelerated display driver for Nvidia cards (32bit emul)" url="http://www.nvidia.com" @@ -12,4 +12,4 @@ provides=('libgl-emul' 'libglx-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('77407e79c6927a39504bbc6b3af94f8696d38ffa') +sha1sums=('5ac43e3435ade6d5f5005cc3b5fa55b062400f93') From krics at linuxforum.hu Fri Jul 20 17:04:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:04:11 2007 Subject: [Frugalware-git] frugalware-current: gtk+2-emul-2.10.14_1-1-x86_64 Message-ID: <20070720150409.3E6C913A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6a12ae46f55d96bcbbe4b4e2fd8f9f5c48fe0b83 commit 6a12ae46f55d96bcbbe4b4e2fd8f9f5c48fe0b83 Author: Christian Hamar alias krix Date: Fri Jul 20 17:03:53 2007 +0200 gtk+2-emul-2.10.14_1-1-x86_64 version bump diff --git a/source/emul-extra/gtk+2-emul/FrugalBuild b/source/emul-extra/gtk+2-emul/FrugalBuild index 4caa76c..a83d755 100644 --- a/source/emul-extra/gtk+2-emul/FrugalBuild +++ b/source/emul-extra/gtk+2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gtk+2-emul -pkgver=2.10.11_1 +pkgver=2.10.14_1 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series) (32bit emul)" url="http://www.gtk.org/" @@ -12,4 +12,4 @@ depends=('libtiff-emul' 'atk-emul' 'libxi-emul' 'libxinerama-emul' 'fontconfig-e groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('010036f1fcfcd06166a64bd33a261eed912b55ad') +sha1sums=('e4c52a0d8979d06a94cb57087e43778890db69b1') From krics at linuxforum.hu Fri Jul 20 17:08:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:08:43 2007 Subject: [Frugalware-git] frugalware-current: tar-emul-1.18_1-1-x86_64 Message-ID: <20070720150841.4D06D13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=008a1212cbd9d8a7244514464f92e405cf4e710b commit 008a1212cbd9d8a7244514464f92e405cf4e710b Author: Christian Hamar alias krix Date: Fri Jul 20 17:08:24 2007 +0200 tar-emul-1.18_1-1-x86_64 version bump diff --git a/source/emul-extra/tar-emul/FrugalBuild b/source/emul-extra/tar-emul/FrugalBuild index 45600b0..db4decd 100644 --- a/source/emul-extra/tar-emul/FrugalBuild +++ b/source/emul-extra/tar-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=tar-emul -pkgver=1.16.1_1 +pkgver=1.18_1 pkgrel=1 pkgdesc="Utility used to store, backup, and transport files for emulation of i686 on x86_64" url="http://www.gnu.org/software/tar/tar.html" @@ -10,4 +10,4 @@ depends=('bash-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('12ade5716a086051df2710eade5b9cc40c566015') +sha1sums=('fdc80f158925c57d7caa9437df9d93557c2a0241') From krics at linuxforum.hu Fri Jul 20 17:11:37 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:11:39 2007 Subject: [Frugalware-git] frugalware-current: qt-emul-3.3.8_3-1-x86_64 Message-ID: <20070720151137.8F54B13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7d4f7e81b248480a8f280a4db15b281367230b74 commit 7d4f7e81b248480a8f280a4db15b281367230b74 Author: Christian Hamar alias krix Date: Fri Jul 20 17:11:23 2007 +0200 qt-emul-3.3.8_3-1-x86_64 version bump diff --git a/source/emul-extra/qt-emul/FrugalBuild b/source/emul-extra/qt-emul/FrugalBuild index e5af2e7..456f02e 100644 --- a/source/emul-extra/qt-emul/FrugalBuild +++ b/source/emul-extra/qt-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=qt-emul -pkgver=3.3.7_4 +pkgver=3.3.8_3 pkgrel=1 pkgdesc="The QT GUI toolkit for emulation of i686 on x86_64" url="http://www.trolltech.com/products/qt" @@ -12,4 +12,4 @@ depends=('libpng-emul' 'libjpeg-emul' 'libsm-emul' 'libmng-emul' 'mesa-emul' \ groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('55a49132feb679cae9472a1d78bd478ea3203aab') +sha1sums=('c5dfd1471976509ccc30cb2e6729b6bcef78d6fe') From krics at linuxforum.hu Fri Jul 20 17:16:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:16:11 2007 Subject: [Frugalware-git] frugalware-current: gtk+2-engines-emul-2.11.3_1-1-x86_64 Message-ID: <20070720151609.0D71213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=af7e0befa8296cae5d752e4e56d6704706390381 commit af7e0befa8296cae5d752e4e56d6704706390381 Author: Christian Hamar alias krix Date: Fri Jul 20 17:15:55 2007 +0200 gtk+2-engines-emul-2.11.3_1-1-x86_64 version bump diff --git a/source/emul-extra/gtk+2-engines-emul/FrugalBuild b/source/emul-extra/gtk+2-engines-emul/FrugalBuild index 04ce62e..3981015 100644 --- a/source/emul-extra/gtk+2-engines-emul/FrugalBuild +++ b/source/emul-extra/gtk+2-engines-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gtk+2-engines-emul -pkgver=2.10.0_1 +pkgver=2.11.3_1 pkgrel=1 pkgdesc="Theme engines for GTK+2 (32bit emul)" url="http://www.gnome.org/" @@ -10,4 +10,4 @@ depends=('gtk+2-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('3ac96c5a7db49eff56dcf031932de11505112ef0') +sha1sums=('e7446126397f3716e7d60810422fb4c907029b58') From krics at linuxforum.hu Fri Jul 20 17:17:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:17:43 2007 Subject: [Frugalware-git] frugalware-current: freetype2-emul-2.3.5_1-1-x86_64 Message-ID: <20070720151738.70EC513A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=1d9c8bc282793be6758c49f908c9f458eb6f7e5c commit 1d9c8bc282793be6758c49f908c9f458eb6f7e5c Author: Christian Hamar alias krix Date: Fri Jul 20 17:17:09 2007 +0200 freetype2-emul-2.3.5_1-1-x86_64 version bump diff --git a/source/emul-extra/freetype2-emul/FrugalBuild b/source/emul-extra/freetype2-emul/FrugalBuild index 12d521a..9402c45 100644 --- a/source/emul-extra/freetype2-emul/FrugalBuild +++ b/source/emul-extra/freetype2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=freetype2-emul -pkgver=2.3.2_1 +pkgver=2.3.5_1 pkgrel=1 pkgdesc="TrueType font rendering library - 2.0 series for emulation of i686 on x86_64" url="http://freetype.sourceforge.net" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'zlib-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('4e24461d7c04a4590868459206aedb689749d95a') +sha1sums=('3bc1e8ce83947d4b3c5ff049122487a1ecdd3c0b') From krics at linuxforum.hu Fri Jul 20 17:19:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:19:24 2007 Subject: [Frugalware-git] frugalware-current: openal-emul-0.0.8_4-1-x86_64 Message-ID: <20070720151921.EA4C313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0f6bee2d4c96bed4ee4d6ec2cbe8223e7c2712dd commit 0f6bee2d4c96bed4ee4d6ec2cbe8223e7c2712dd Author: Christian Hamar alias krix Date: Fri Jul 20 17:19:08 2007 +0200 openal-emul-0.0.8_4-1-x86_64 version bump diff --git a/source/emul-extra/openal-emul/FrugalBuild b/source/emul-extra/openal-emul/FrugalBuild index 5ef4a1e..0552c89 100644 --- a/source/emul-extra/openal-emul/FrugalBuild +++ b/source/emul-extra/openal-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=openal-emul -pkgver=0.0.8_3 +pkgver=0.0.8_4 pkgrel=1 pkgdesc="A cross-platform 3D audio API appropriate for use with gaming for emulation of i686 on x86_64" url="http://www.openal.org/" depends=('glibc-emul' 'sdl-emul' 'alsa-lib-emul') Finclude emul -sha1sums=('474a86b9be039344817e3d962529054fff29572f') +sha1sums=('13bdec16453a057b5830f3c17107ccb3e4051211') From krics at linuxforum.hu Fri Jul 20 17:20:52 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:20:55 2007 Subject: [Frugalware-git] frugalware-current: libglx-emul-1.2.0_6-1-x86_64 Message-ID: <20070720152052.D335713A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9707c666a57cd3be8bd0b97c59c9c320a9106c5f commit 9707c666a57cd3be8bd0b97c59c9c320a9106c5f Author: Christian Hamar alias krix Date: Fri Jul 20 17:20:38 2007 +0200 libglx-emul-1.2.0_6-1-x86_64 version bump diff --git a/source/emul-extra/libglx-emul/FrugalBuild b/source/emul-extra/libglx-emul/FrugalBuild index d86f07d..25d207a 100644 --- a/source/emul-extra/libglx-emul/FrugalBuild +++ b/source/emul-extra/libglx-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libglx-emul -pkgver=1.2.0_1 +pkgver=1.2.0_6 pkgrel=1 pkgdesc="GLX library from X.org (32bit emul)" url="http://xorg.freedesktop.org" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('475a891f5b6d87ba31e6f2b812dd42bc243d2aa9') +sha1sums=('b9a835c1c29f5885ff2684e3387214e38f8e3a68') From krics at linuxforum.hu Fri Jul 20 17:23:37 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:23:39 2007 Subject: [Frugalware-git] frugalware-current: procps-emul-3.2.7_4-1-x86_64 Message-ID: <20070720152337.041B713A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fff8c7bb0891bb3c30a5bc0f1b63efd31823df35 commit fff8c7bb0891bb3c30a5bc0f1b63efd31823df35 Author: Christian Hamar alias krix Date: Fri Jul 20 17:23:20 2007 +0200 procps-emul-3.2.7_4-1-x86_64 version bump diff --git a/source/emul-extra/procps-emul/FrugalBuild b/source/emul-extra/procps-emul/FrugalBuild index ab78f57..351b2b2 100644 --- a/source/emul-extra/procps-emul/FrugalBuild +++ b/source/emul-extra/procps-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=procps-emul -pkgver=3.2.7_3 +pkgver=3.2.7_4 pkgrel=1 pkgdesc="utilities for displaying process information (32bit emul)" url="http://procps.sourceforge.net" @@ -10,4 +10,4 @@ depends=('ncurses-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('feeac8a09768bdfcf813cec683c3577c3a5b5dce') +sha1sums=('7ec938f51c7095d162a765b426658021cc9a8471') From krics at linuxforum.hu Fri Jul 20 17:25:05 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:25:07 2007 Subject: [Frugalware-git] frugalware-current: nss-emul-3.11.7_1-1-x86_64 Message-ID: <20070720152505.6ABA313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3355ff87dafc417f5f289b12b41daf8e04debe71 commit 3355ff87dafc417f5f289b12b41daf8e04debe71 Author: Christian Hamar alias krix Date: Fri Jul 20 17:24:48 2007 +0200 nss-emul-3.11.7_1-1-x86_64 version bump diff --git a/source/emul-extra/nss-emul/FrugalBuild b/source/emul-extra/nss-emul/FrugalBuild index 13a890a..e07e78c 100644 --- a/source/emul-extra/nss-emul/FrugalBuild +++ b/source/emul-extra/nss-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=nss-emul -pkgver=3.11.4_2 +pkgver=3.11.7_1 pkgrel=1 pkgdesc="NSS library from mozilla.org for 32bit chroot" url="http://www.mozilla.org/projects/security/pki/nss/" @@ -10,4 +10,4 @@ depends=('nspr-emul>=4.6.3_1-1') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('ddef50feb83a9d5010f4242621d2c30bacf876b0') +sha1sums=('b369ad33247183b4ac1a3f290a5364879ed4778d') From krics at linuxforum.hu Fri Jul 20 17:28:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:28:15 2007 Subject: [Frugalware-git] frugalware-current: libdrm-emul-2.3.0_2-1-x86_64 Message-ID: <20070720152813.B80AE13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5992018c6a385416da8edbb03819eaf0f6b0a02b commit 5992018c6a385416da8edbb03819eaf0f6b0a02b Author: Christian Hamar alias krix Date: Fri Jul 20 17:27:59 2007 +0200 libdrm-emul-2.3.0_2-1-x86_64 version bump diff --git a/source/emul-extra/libdrm-emul/FrugalBuild b/source/emul-extra/libdrm-emul/FrugalBuild index c6e21d6..3714b14 100644 --- a/source/emul-extra/libdrm-emul/FrugalBuild +++ b/source/emul-extra/libdrm-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libdrm-emul -pkgver=2.3.0_1 +pkgver=2.3.0_2 pkgrel=1 pkgdesc="Xorg DRM libraries for emulation of i686 on x86_64" url="http://xorg.freedesktop.org" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('746b6d90e3f814ebd3a22e599e1d4e8b8c6d33bf') +sha1sums=('6ce07666895f5f27963140d1e6c766ebfc068dbb') From krics at linuxforum.hu Fri Jul 20 17:31:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:31:20 2007 Subject: [Frugalware-git] frugalware-current: firefox-emul-2.0.0.5_1-1-x86_64 Message-ID: <20070720153117.822DA13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=aaa68b3c90ef16da60b858813d8fbc480fed0873 commit aaa68b3c90ef16da60b858813d8fbc480fed0873 Author: Christian Hamar alias krix Date: Fri Jul 20 17:31:02 2007 +0200 firefox-emul-2.0.0.5_1-1-x86_64 version bump diff --git a/source/emul-extra/firefox-emul/FrugalBuild b/source/emul-extra/firefox-emul/FrugalBuild index 7a219db..f676b1b 100644 --- a/source/emul-extra/firefox-emul/FrugalBuild +++ b/source/emul-extra/firefox-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=firefox-emul -pkgver=2.0.0.2_1 +pkgver=2.0.0.5_1 pkgrel=1 pkgdesc="Mozilla Firefox web browser (32bit emul)" url="http://www.mozilla.org/products/firefox/" @@ -11,4 +11,4 @@ depends=('gtk+2-emul' 'libidl-emul' 'nss-emul' 'libxml2-emul' 'libstdc++-emul' ' groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('ab12673d6490e1bd6892d76a1d39ecdc4fc7eb8b') +sha1sums=('1344bb177fc295974551dc833c25f15cdf6d8df4') From krics at linuxforum.hu Fri Jul 20 17:36:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:36:55 2007 Subject: [Frugalware-git] frugalware-current: lzo-emul-2.02_2-1-x86_64 Message-ID: <20070720153653.4555313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fc73be85ec5a057a9807e7fb3d5917800fda071a commit fc73be85ec5a057a9807e7fb3d5917800fda071a Author: Christian Hamar alias krix Date: Fri Jul 20 17:36:39 2007 +0200 lzo-emul-2.02_2-1-x86_64 version bump diff --git a/source/emul-extra/lzo-emul/FrugalBuild b/source/emul-extra/lzo-emul/FrugalBuild index 1a96f99..0feda37 100644 --- a/source/emul-extra/lzo-emul/FrugalBuild +++ b/source/emul-extra/lzo-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=lzo-emul -pkgver=2.02_1 +pkgver=2.02_2 pkgrel=1 pkgdesc="A real-time data compression library for emulation of i686 on x86_64" url="http://www.oberhumer.com/opensource/lzo/" depends=('glibc-emul') Finclude emul -sha1sums=('404f127209c3af73e28454eee866efba904fe69b') +sha1sums=('46b8861bd4fdb5861fadf05062ea76d95e488478') From krics at linuxforum.hu Fri Jul 20 17:38:07 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:38:24 2007 Subject: [Frugalware-git] frugalware-current: libjpeg-emul-6b_6-1-x86_64 Message-ID: <20070720153808.3F26313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9820dd57b33059ee6882d67ddc16a1f48306f991 commit 9820dd57b33059ee6882d67ddc16a1f48306f991 Author: Christian Hamar alias krix Date: Fri Jul 20 17:37:52 2007 +0200 libjpeg-emul-6b_6-1-x86_64 version bump diff --git a/source/emul-extra/libjpeg-emul/FrugalBuild b/source/emul-extra/libjpeg-emul/FrugalBuild index e0a7448..e328aa1 100644 --- a/source/emul-extra/libjpeg-emul/FrugalBuild +++ b/source/emul-extra/libjpeg-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libjpeg-emul -pkgver=6b_5 +pkgver=6b_6 pkgrel=1 pkgdesc="Library of JPEG support functions for emulation of i686 on x86_64" url="ftp://ftp.uu.net/graphics/jpeg/" @@ -11,4 +11,4 @@ groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('3b46d295d7c3c7afe34eb4014fc34716d201516f') +sha1sums=('b0bd53cfb0ef462f0096301953fc17945be490c0') From krics at linuxforum.hu Fri Jul 20 17:39:56 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:39:59 2007 Subject: [Frugalware-git] frugalware-current: libgl-emul-7.0_1-1-x86_64 Message-ID: <20070720153956.39BDC13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e3ba3a514cf6b770064fd09f13b321d14e6e2c9b commit e3ba3a514cf6b770064fd09f13b321d14e6e2c9b Author: Christian Hamar alias krix Date: Fri Jul 20 17:39:39 2007 +0200 libgl-emul-7.0_1-1-x86_64 version bump diff --git a/source/emul-extra/libgl-emul/FrugalBuild b/source/emul-extra/libgl-emul/FrugalBuild index e603559..e3f4046 100644 --- a/source/emul-extra/libgl-emul/FrugalBuild +++ b/source/emul-extra/libgl-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libgl-emul -pkgver=6.5.2_3 +pkgver=7.0_1 pkgrel=1 pkgdesc="GL (Mesa) libraries for emulation of i686 on x86_64" url="http://mesa3d.sf.net" @@ -10,4 +10,4 @@ depends=('mesa-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('6bba426c9b1e7b97cc4f21fd2015b4eaddcaaa2e') +sha1sums=('1545087349437cbe39620bd450e4cebadd089aba') From krics at linuxforum.hu Fri Jul 20 17:41:11 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:41:13 2007 Subject: [Frugalware-git] frugalware-current: expat-emul-2.0.1_1-1-x86_64 Message-ID: <20070720154111.AB13613A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=24efc15c0ac52fdc2e3768e69985ab2f3e994cd6 commit 24efc15c0ac52fdc2e3768e69985ab2f3e994cd6 Author: Christian Hamar alias krix Date: Fri Jul 20 17:40:58 2007 +0200 expat-emul-2.0.1_1-1-x86_64 version bump diff --git a/source/emul-extra/expat-emul/FrugalBuild b/source/emul-extra/expat-emul/FrugalBuild index c5832df..a62edc5 100644 --- a/source/emul-extra/expat-emul/FrugalBuild +++ b/source/emul-extra/expat-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=expat-emul -pkgver=2.0.0_5 +pkgver=2.0.1_1 pkgrel=1 pkgdesc="An XML Parser library written in C for emulation of i686 on x86_64" url="http://expat.sf.net" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('194a653f29520845d7659cbb4127139875a997ba') +sha1sums=('a0d54d753dfc01d4e7a16f1a989018c2cf948243') From krics at linuxforum.hu Fri Jul 20 17:42:36 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:42:37 2007 Subject: [Frugalware-git] frugalware-current: coreutils-emul-6.9_5-1-x86_64 Message-ID: <20070720154236.3B53413A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=fa614f26bd25df70ad574e51dbe13b282a006ad0 commit fa614f26bd25df70ad574e51dbe13b282a006ad0 Author: Christian Hamar alias krix Date: Fri Jul 20 17:42:17 2007 +0200 coreutils-emul-6.9_5-1-x86_64 version bump diff --git a/source/emul-extra/coreutils-emul/FrugalBuild b/source/emul-extra/coreutils-emul/FrugalBuild index ab8abb5..70788cb 100644 --- a/source/emul-extra/coreutils-emul/FrugalBuild +++ b/source/emul-extra/coreutils-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=coreutils-emul -pkgver=6.7_1 +pkgver=6.9_5 pkgrel=1 pkgdesc="These are the GNU core utilities, the basic command line programs for emulation of i686 on x86_64" url="http://www.gnu.org/software/coreutils" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('9e198c731239f847b3b9eb2707570d5f2875a10f') +sha1sums=('0c1a7aeff7bc0aebb4a049de75abf7fd183a8ca3') From krics at linuxforum.hu Fri Jul 20 17:44:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:44:21 2007 Subject: [Frugalware-git] frugalware-current: libstdc++5-emul-3.3.6_3-1-x86_64 Message-ID: <20070720154419.05E9E13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5e4b74006a64bc9ebc18ca7fdd85505bd26bcbcf commit 5e4b74006a64bc9ebc18ca7fdd85505bd26bcbcf Author: Christian Hamar alias krix Date: Fri Jul 20 17:44:05 2007 +0200 libstdc++5-emul-3.3.6_3-1-x86_64 version bump diff --git a/source/emul-extra/libstdc++5-emul/FrugalBuild b/source/emul-extra/libstdc++5-emul/FrugalBuild index 386d555..fe842f8 100644 --- a/source/emul-extra/libstdc++5-emul/FrugalBuild +++ b/source/emul-extra/libstdc++5-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libstdc++5-emul -pkgver=3.3.6_2 +pkgver=3.3.6_3 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -11,4 +11,4 @@ groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('2bb11e6ff0b2eea4cbcc9e4cdee6a17f62e7588f') +sha1sums=('ae7638a0a57b4df3fcaf70789625b4d89ec9611a') From krics at linuxforum.hu Fri Jul 20 17:45:42 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:45:43 2007 Subject: [Frugalware-git] frugalware-current: xvidcore-emul-1.1.3_1-1-x86_64 Message-ID: <20070720154542.C951113A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=05761c6a469b7e79edf17ad77066e948378b4453 commit 05761c6a469b7e79edf17ad77066e948378b4453 Author: Christian Hamar alias krix Date: Fri Jul 20 17:45:21 2007 +0200 xvidcore-emul-1.1.3_1-1-x86_64 version bump diff --git a/source/emul-extra/xvidcore-emul/FrugalBuild b/source/emul-extra/xvidcore-emul/FrugalBuild index e2f30d4..d0251fb 100644 --- a/source/emul-extra/xvidcore-emul/FrugalBuild +++ b/source/emul-extra/xvidcore-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=xvidcore-emul -pkgver=1.1.2_1 +pkgver=1.1.3_1 pkgrel=1 pkgdesc="XviD is an open source MPEG-4 video codec for emulation of i686 on x86_64" url="http://www.xvid.org" depends=('glibc-emul') Finclude emul -sha1sums=('e311189a2ad5ca22a3382383307611932137c631') +sha1sums=('ac2c8bd6f9b997f1661218a1bb5f1798fcb05a6a') From krics at linuxforum.hu Fri Jul 20 17:47:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:47:27 2007 Subject: [Frugalware-git] frugalware-current: which-emul-2.16_3-1-x86_64 Message-ID: <20070720154713.569E613A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=6c8ab2ca25907084a9576083e564fd8634174f94 commit 6c8ab2ca25907084a9576083e564fd8634174f94 Author: Christian Hamar alias krix Date: Fri Jul 20 17:46:59 2007 +0200 which-emul-2.16_3-1-x86_64 version bump diff --git a/source/emul-extra/which-emul/FrugalBuild b/source/emul-extra/which-emul/FrugalBuild index 2617652..dd03b32 100644 --- a/source/emul-extra/which-emul/FrugalBuild +++ b/source/emul-extra/which-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=which-emul -pkgver=2.16_2 +pkgver=2.16_3 pkgrel=1 pkgdesc="A utility to show the full path of commands (32bit emul)" url="http://www.xs4all.nl/~carlo17/which" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('5637ae57a0da2e1e5f7e37f285a6246e7c93d701') +sha1sums=('91c7e45a7f271a0e3d259777cb002cf28794cbc8') From krics at linuxforum.hu Fri Jul 20 17:48:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:48:05 2007 Subject: [Frugalware-git] frugalware-current: bash-emul-3.2_017_1-1-x86_64 Message-ID: <20070720154800.A1AAF13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=69a7334152d103b325869304bb05212158f478a4 commit 69a7334152d103b325869304bb05212158f478a4 Author: Christian Hamar alias krix Date: Fri Jul 20 17:47:46 2007 +0200 bash-emul-3.2_017_1-1-x86_64 version bump diff --git a/source/emul-extra/bash-emul/FrugalBuild b/source/emul-extra/bash-emul/FrugalBuild index 71e20aa..9d0e080 100644 --- a/source/emul-extra/bash-emul/FrugalBuild +++ b/source/emul-extra/bash-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=bash-emul -pkgver=3.2_010_1 +pkgver=3.2_017_1 pkgrel=1 pkgdesc="The GNU Bourne Again shell for emulation of i686 on x86_64" url="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" @@ -10,4 +10,4 @@ rodepends=('glibc-emul' 'readline-emul') groups=('emul-extra') Finclude emul archs=('!i686' 'x86_64') -sha1sums=('7366004a5786c145e454b4a441da5659697efbbb') +sha1sums=('db7183d3506c957f0e988a8074a5e7c8a4ef1d62') From krics at linuxforum.hu Fri Jul 20 17:49:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:49:28 2007 Subject: [Frugalware-git] frugalware-current: libx11-emul-1.1.2_1-1-x86_64 Message-ID: <20070720154926.EE29713A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=eb360044587dde1077a562eaf1e9e526d68449f4 commit eb360044587dde1077a562eaf1e9e526d68449f4 Author: Christian Hamar alias krix Date: Fri Jul 20 17:49:13 2007 +0200 libx11-emul-1.1.2_1-1-x86_64 version bump diff --git a/source/emul-extra/libx11-emul/FrugalBuild b/source/emul-extra/libx11-emul/FrugalBuild index a4b5e00..e632039 100644 --- a/source/emul-extra/libx11-emul/FrugalBuild +++ b/source/emul-extra/libx11-emul/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=libx11-emul -pkgver=1.1.1_1 -pkgrel=2 +pkgver=1.1.2_1 +pkgrel=1 pkgdesc="Xorg X11 libraries for emulation of i686 on x86_64" url="http://www.gnu.org/software/tar/tar.html" depends=('libxau-emul' 'libxdmcp-emul' 'libxcb-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('99642ef40fefe6275b5326f7e30669e509254565') +sha1sums=('45bc04427cff1de8d482d2f4bc9b70d7a5a0a095') From krics at linuxforum.hu Fri Jul 20 17:51:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:51:10 2007 Subject: [Frugalware-git] frugalware-current: libogg-emul-1.1.3_2-1-x86_64 Message-ID: <20070720155109.35DA013A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f46b6831cc4da93769bee8d76631f7153b9098ca commit f46b6831cc4da93769bee8d76631f7153b9098ca Author: Christian Hamar alias krix Date: Fri Jul 20 17:50:55 2007 +0200 libogg-emul-1.1.3_2-1-x86_64 version bump diff --git a/source/emul-extra/libogg-emul/FrugalBuild b/source/emul-extra/libogg-emul/FrugalBuild index af8438b..5796961 100644 --- a/source/emul-extra/libogg-emul/FrugalBuild +++ b/source/emul-extra/libogg-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=libogg-emul -pkgver=1.1.3_1 +pkgver=1.1.3_2 pkgrel=1 pkgdesc="Ogg bitstream and framing library for emulation of i686 on x86_64" url="http://www.vorbis.com/" depends=('glibc-emul') Finclude emul -sha1sums=('7556392dc09130deb73b6d59028343bae46e8e9e') +sha1sums=('a3ae413bb24f112c45780942eee27c9906dead40') From krics at linuxforum.hu Fri Jul 20 17:52:04 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:52:05 2007 Subject: [Frugalware-git] frugalware-current: frugalware-emul-0.7pre1_1-1-x86_64 Message-ID: <20070720155204.55A2513A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2a49b98d70037ccc56ca32521f42273049d6ed1f commit 2a49b98d70037ccc56ca32521f42273049d6ed1f Author: Christian Hamar alias krix Date: Fri Jul 20 17:51:50 2007 +0200 frugalware-emul-0.7pre1_1-1-x86_64 version bump diff --git a/source/emul-extra/frugalware-emul/FrugalBuild b/source/emul-extra/frugalware-emul/FrugalBuild index 90cb026..ce9c7a4 100644 --- a/source/emul-extra/frugalware-emul/FrugalBuild +++ b/source/emul-extra/frugalware-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=frugalware-emul -pkgver=0.6rc2_1 +pkgver=0.7pre1_1 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package (32 emulation)" url="http://frugalware.org" @@ -22,4 +22,4 @@ build() { ln -s . $Fdestdir/usr/lib/chroot32/usr/X11R6 || Fdie Fmkdir /usr/lib/chroot32/usr/lib/X11/fonts } -sha1sums=('99c1710e71ecca73cb82d16c176886175bcc059c') +sha1sums=('282c5f4515007e2551e07bc068eb5f17dc265939') From krics at linuxforum.hu Fri Jul 20 17:53:24 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:53:26 2007 Subject: [Frugalware-git] frugalware-current: libstdc++-emul-4.2.1_1-1-x86_64 Message-ID: <20070720155324.6A0B413A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c76f093494bb3c4e69c64ef47daaf6a13750c120 commit c76f093494bb3c4e69c64ef47daaf6a13750c120 Author: Christian Hamar alias krix Date: Fri Jul 20 17:52:59 2007 +0200 libstdc++-emul-4.2.1_1-1-x86_64 version bump diff --git a/source/emul-extra/libstdc++-emul/FrugalBuild b/source/emul-extra/libstdc++-emul/FrugalBuild index dd878d1..6d112f3 100644 --- a/source/emul-extra/libstdc++-emul/FrugalBuild +++ b/source/emul-extra/libstdc++-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libstdc++-emul -pkgver=4.1.2_1 +pkgver=4.2.1_1 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'libgcc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('b6d222faca513a4395ddbb7cdc04df950080e84c') +sha1sums=('e6b3383345d857f9352825f9d3d3de4bf03a30ba') From krics at linuxforum.hu Fri Jul 20 17:55:01 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:55:08 2007 Subject: [Frugalware-git] frugalware-current: alsa-oss-emul-1.0.14_1-1-x86_64 Message-ID: <20070720155501.5A4F913A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a8937a045044287c8a7352933502f68d5c2aa6c0 commit a8937a045044287c8a7352933502f68d5c2aa6c0 Author: Christian Hamar alias krix Date: Fri Jul 20 17:54:47 2007 +0200 alsa-oss-emul-1.0.14_1-1-x86_64 version bump diff --git a/source/emul-extra/alsa-oss-emul/FrugalBuild b/source/emul-extra/alsa-oss-emul/FrugalBuild index 51f20d4..a37c75f 100644 --- a/source/emul-extra/alsa-oss-emul/FrugalBuild +++ b/source/emul-extra/alsa-oss-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=alsa-oss-emul -pkgver=1.0.12_1 +pkgver=1.0.14_1 pkgrel=1 pkgdesc="OSS compatibility library (32bit emul)" url="http://www.alsa-project.org/" @@ -10,4 +10,4 @@ depends=('alsa-lib-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('a23b85dad9fc50caf0cecdd6bcaf5b6bb6f91902') +sha1sums=('b489fc111f790492392d8c456826de18310a7266') From krics at linuxforum.hu Fri Jul 20 17:56:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 17:56:11 2007 Subject: [Frugalware-git] frugalware-current: libgcc-emul-4.2.1_1-1-x86_64 Message-ID: <20070720155609.8336A13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=75569b2fd76fa7b41a9e86d91e531664b4210a9b commit 75569b2fd76fa7b41a9e86d91e531664b4210a9b Author: Christian Hamar alias krix Date: Fri Jul 20 17:55:54 2007 +0200 libgcc-emul-4.2.1_1-1-x86_64 version bump diff --git a/source/emul-extra/libgcc-emul/FrugalBuild b/source/emul-extra/libgcc-emul/FrugalBuild index 1369fbd..641e555 100644 --- a/source/emul-extra/libgcc-emul/FrugalBuild +++ b/source/emul-extra/libgcc-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libgcc-emul -pkgver=4.1.2_1 +pkgver=4.2.1_1 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -12,4 +12,4 @@ provides=('gcc-lib-emul') replaces=('gcc-lib-emul') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('7bb226e7ebdc811a6932ae380bf1caf246e369bf') +sha1sums=('6eb93df46be3a1b2d2e1874469d7e7481ceef529') From vmiklos at frugalware.org Fri Jul 20 18:50:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 18:50:50 2007 Subject: [Frugalware-git] frugalware-current: lvm2-2.02.27-1-x86_64 Message-ID: <20070720165047.F192C13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=63c0e67122fe3ec5a03e29b5af57e24473921bd6 commit 63c0e67122fe3ec5a03e29b5af57e24473921bd6 Author: VMiklos Date: Fri Jul 20 18:50:35 2007 +0200 lvm2-2.02.27-1-x86_64 version bump a bit more docs diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild index ac2e5e8..58afd5c 100644 --- a/source/apps/lvm2/FrugalBuild +++ b/source/apps/lvm2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=lvm2 -pkgver=2.02.26 +pkgver=2.02.27 pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/" @@ -14,6 +14,9 @@ up2date="lynx -dump ftp://sources.redhat.com/pub/lvm2/|grep tgz$|sed -n 's/.*LVM source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$pkgver.tgz rc.lvm README.Frugalware) signatures=($source.asc '' '') +# always check if there is a device-mapper release before bumping lvm2. they +# usually come togother + build() { Fcd LVM2.$pkgver From vmiklos at frugalware.org Fri Jul 20 19:02:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 19:02:36 2007 Subject: [Frugalware-git] frugalware-current: bashburn-2.1.1-1-x86_64 Message-ID: <20070720170232.B5AC213A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3a17f7dcb438f6cb571fb556c312ab3690d64676 commit 3a17f7dcb438f6cb571fb556c312ab3690d64676 Author: VMiklos Date: Fri Jul 20 19:02:24 2007 +0200 bashburn-2.1.1-1-x86_64 version bump diff --git a/source/multimedia/bashburn/FrugalBuild b/source/multimedia/bashburn/FrugalBuild index a592328..e3a7a0e 100644 --- a/source/multimedia/bashburn/FrugalBuild +++ b/source/multimedia/bashburn/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bashburn -pkgver=2.1 +pkgver=2.1.1 pkgrel=1 pkgdesc="A CD burning shell script." rodepends=('bash' 'cdrtools' 'cdrdao' 'mpg321' 'lame' 'vorbis-tools' 'flac' \ @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="bashburn" _F_sourceforge_name="BashBurn" Finclude sourceforge -sha1sums=('e99ce0b4d49539a4271c78068f2581682851ab99') +sha1sums=('50f0da8cd15168a7c6bfa30b0cd262be453cf236') build() { From vmiklos at frugalware.org Fri Jul 20 19:27:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 19:27:40 2007 Subject: [Frugalware-git] frugalware-current: perl-libwww-5.806-1-x86_64 Message-ID: <20070720172737.AC81D13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=954f0db75044003e4ca6679db6773719a0cd2fcb commit 954f0db75044003e4ca6679db6773719a0cd2fcb Author: VMiklos Date: Fri Jul 20 19:27:14 2007 +0200 perl-libwww-5.806-1-x86_64 version bump some cleanup diff --git a/source/devel/perl-libwww/FrugalBuild b/source/devel/perl-libwww/FrugalBuild index 9b0d7fc..8680c69 100644 --- a/source/devel/perl-libwww/FrugalBuild +++ b/source/devel/perl-libwww/FrugalBuild @@ -3,9 +3,9 @@ # Maintainer: Zsolt Szalai pkgname=perl-libwww -pkgver=5.805 +pkgver=5.806 perlver=5.8.8 -pkgrel=2 +pkgrel=1 pkgdesc="A set of Perl modules which provides a simple and consistent API to the WWW." url="http://search.cpan.org/~gaas/libwww-perl" depends=('perl-uri' 'perl-html-parser') @@ -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=('346da983824b5862034a8f33de51ddb05ec0685f') +sha1sums=('b19603bfa6ba4819b9e7392f1f48d3e43c58ab5f') build() { cd $startdir/src/libwww-perl-$pkgver @@ -27,5 +27,3 @@ build() { find $startdir/pkg/usr/lib/perl5/ -name perllocal.pod -exec rm {} \; find $startdir/pkg/usr/lib/perl5/site_perl/current/ -name .packlist -exec rm {} \; } - -# vim: ft=sh From krics at linuxforum.hu Fri Jul 20 19:43:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 19:43:48 2007 Subject: [Frugalware-git] frugalware-current: gnome-games-extra-data-2.18.0-1-x86_64 Message-ID: <20070720174347.0D0B713A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=07d9d04ca9709233f45e522b73c20f86282aa320 commit 07d9d04ca9709233f45e522b73c20f86282aa320 Author: Christian Hamar alias krix Date: Fri Jul 20 19:43:30 2007 +0200 gnome-games-extra-data-2.18.0-1-x86_64 * Switch back to -stable diff --git a/source/gnome-extra/gnome-games-extra-data/FrugalBuild b/source/gnome-extra/gnome-games-extra-data/FrugalBuild index 596cc71..b51b111 100644 --- a/source/gnome-extra/gnome-games-extra-data/FrugalBuild +++ b/source/gnome-extra/gnome-games-extra-data/FrugalBuild @@ -9,7 +9,6 @@ url="http://www.gnome.org/" depends=('gnome-games>=2.17.91') groups=('gnome-extra') archs=('i686' 'x86_64') -_F_gnome_devel="y" Finclude gnome sha1sums=('9ba55f5353cb4f66a8f15d0a6dcaf2aaa76b862a') From vmiklos at frugalware.org Fri Jul 20 19:51:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 19:51:59 2007 Subject: [Frugalware-git] frugalware-current: perl-clone-0.25-1-x86_64 Message-ID: <20070720175158.2019E13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=61e020fb8826872f71e37c61a64dddca81e55348 commit 61e020fb8826872f71e37c61a64dddca81e55348 Author: VMiklos Date: Fri Jul 20 19:51:00 2007 +0200 perl-clone-0.25-1-x86_64 version bump diff --git a/source/devel-extra/perl-clone/FrugalBuild b/source/devel-extra/perl-clone/FrugalBuild index dacc9bf..d11e441 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.24 +pkgver=0.25 pkgrel=1 pkgdesc="recursively copy Perl datatypes" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('7a6a158d601ea7741d40d0b431b85c501e41de0e') +sha1sums=('d857f061e785d5c171644d65a0426be8b1c3a7c5') From krics at linuxforum.hu Fri Jul 20 20:00:51 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 20:00:53 2007 Subject: [Frugalware-git] frugalware-current: man-pages-2.63-1-x86_64 Message-ID: <20070720180051.E3AA313A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=4011018a2729bc51e09047a1ffd084880aaad761 commit 4011018a2729bc51e09047a1ffd084880aaad761 Author: Christian Hamar alias krix Date: Fri Jul 20 20:00:29 2007 +0200 man-pages-2.63-1-x86_64 * Version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index 48c9cc7..32c9114 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Former m8r: VMiklos pkgname=man-pages -pkgver=2.62 +pkgver=2.63 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } # optimization OK - noarch -sha1sums=('1e3178ccc8ce2b6f986965ecde3e955d809a3b4c') +sha1sums=('e7bba588b308621d0ba5b693973ead01b84878e5') From krics at linuxforum.hu Fri Jul 20 20:13:07 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 20:13:09 2007 Subject: [Frugalware-git] frugalware-current: less-406-1-x86_64 Message-ID: <20070720181307.157DC13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8d87e9257d48bc6efcd3560043632fd99818cffe commit 8d87e9257d48bc6efcd3560043632fd99818cffe Author: Christian Hamar alias krix Date: Fri Jul 20 20:12:41 2007 +0200 less-406-1-x86_64 * Version bump * Fixed up2date diff --git a/source/base/less/FrugalBuild b/source/base/less/FrugalBuild index ef08a30..77a5254 100644 --- a/source/base/less/FrugalBuild +++ b/source/base/less/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: VMiklos pkgname=less -pkgver=394 +pkgver=406 pkgrel=1 pkgdesc="A paginator similar to more" url="http://www.greenwoodsoftware.com/less" depends=('ncurses' 'bash' 'file') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $url |grep Current|sed 's/.* \(.*\))/\1/'" +up2date="lynx -dump http://www.greenwoodsoftware.com/less/download.html |grep -m 1 .tar.gz | Flasttar" source=($url/$pkgname-$pkgver.tar.gz lesspipe.sh) -sha1sums=('fa0d9aa30ec461866786c4080bb594fc3337bb02' \ - '3e7e305a7eec7d3a52fd994f93c6065a71319086') +sha1sums=('7aeab848682c3ac7cd9ba54e4c96199f9fdf25e5' \ + '3e7e305a7eec7d3a52fd994f93c6065a71319086') build() { From priyank at frugalware.org Fri Jul 20 20:18:49 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 20 20:18:55 2007 Subject: [Frugalware-git] frugalware-current: deluge-0.5.2-1-i686 Message-ID: <20070720181849.B80D413A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ed01cfaba3dafed7b179e8ab211436294d9a5de8 commit ed01cfaba3dafed7b179e8ab211436294d9a5de8 Author: Priyank Date: Fri Jul 20 23:47:08 2007 +0530 deluge-0.5.2-1-i686 * Removed old patch diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild index 926ded3..33ef605 100644 --- a/source/games-extra/tuxpaint/FrugalBuild +++ b/source/games-extra/tuxpaint/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tuxpaint -pkgver=0.9.16 +pkgver=0.9.17 pkgrel=1 pkgdesc="A drawing program for young children." _F_sourceforge_broken_up2date=1 @@ -13,14 +13,10 @@ groups=('games-extra') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet -source=(${source[@]} $pkgname-fix.patch) -sha1sums=('7c09582abe69d0fc6f0e1077c839b8931899fbe7' \ - '41bd3adc853fa53f48f8fe7a3d5b97f99ff52a92') - +sha1sums=('88e42d19339bb1faa03bce45a28d3fe11fbe05b4') build() { Fcd - Fpatchall make ENABLE_GETTEXT=1 || Fdie make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install Fbuild_gnome_scriptlet diff --git a/source/games-extra/tuxpaint/tuxpaint-fix.patch b/source/games-extra/tuxpaint/tuxpaint-fix.patch index dd06cdc..22fcbb8 100644 --- a/source/games-extra/tuxpaint/tuxpaint-fix.patch +++ b/source/games-extra/tuxpaint/tuxpaint-fix.patch @@ -1,16 +1,16 @@ -diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile ---- tuxpaint-0.9.16/Makefile 2006-10-19 02:41:49.000000000 -0500 -+++ tuxpaint-0.9.16-patched/Makefile 2006-12-11 23:22:55.000000000 -0500 +diff -Naur tuxpaint-0.9.17/Makefile tuxpaint-0.9.17.new/Makefile +--- tuxpaint-0.9.17/Makefile 2007-07-01 20:35:57.000000000 +0530 ++++ tuxpaint-0.9.17.new/Makefile 2007-07-19 00:11:05.000000000 +0530 @@ -18,7 +18,7 @@ # Where to install things: -PREFIX=/usr/local -+PREFIX=/usr ++PREFIX=/usr/ # Root directory to place files when creating packages. -@@ -62,13 +62,15 @@ +@@ -62,9 +62,9 @@ ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps @@ -20,127 +20,17 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile +GNOME_PREFIX= +KDE_PREFIX= +KDE_ICON_PREFIX= -+DESKTOP_ICON_PREFIX=$(PREFIX)/share/icons - # Locale files - -+ENABLE_GETTEXT=0 - LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale - # LOCALE_PREFIX=/usr/share/locale - -@@ -97,7 +99,7 @@ + # Built with sound by default (override with "make nosound") +@@ -116,8 +116,8 @@ # The entire set of CFLAGS: #-ffast-math --CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \ -+CFLAGS += -W -Wall -fno-common -ffloat-store \ +-OPTFLAGS=-O2 +-CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ ++OPTFLAGS= ++CFLAGS+=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ -Waggregate-return \ -@@ -118,7 +120,10 @@ - - # "make" with no arguments builds the program and man page from sources: - --all: tuxpaint translations -+all: tuxpaint -+ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \ -+ make translations; \ -+ fi - @echo - @echo "--------------------------------------------------------------" - @echo -@@ -220,10 +225,13 @@ - # to do this as superuser ("root")) - - install: install-bin install-data install-man install-doc \ -- install-icon install-gettext install-importscript \ -+ install-icon install-importscript \ - install-default-config install-example-stamps \ - install-example-starters \ -- install-gnome install-kde install-kde-icons -+ install-desktop-data -+ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \ -+ make install-gettext; \ -+ fi - @echo - @echo "--------------------------------------------------------------" - @echo -@@ -497,16 +505,49 @@ - - # Install a launcher icon in the Gnome menu, under "Graphics" - --install-gnome: -+install-desktop-data: - @echo -- @echo "...Installing launcher icon into GNOME..." -- @if [ "x$(GNOME_PREFIX)" != "x" ]; then \ -- install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \ -- cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \ -- chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \ -- install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \ -- cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \ -- chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \ -+ @echo "...Installing launcher entry..." -+ @if [ "x$(PREFIX)" != "x" ]; then \ -+ install -d $(PKG_ROOT)$(PREFIX)/share/applications; \ -+ cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \ -+ chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \ -+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \ -+ cp data/images/tuxpaint-icon.svg \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \ -+ cp data/images/icon192x192.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \ -+ cp data/images/icon128x128.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \ -+ cp data/images/icon96x96.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \ -+ cp data/images/icon64x64.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \ -+ cp data/images/icon48x48.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \ -+ cp data/images/icon32x32.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \ -+ cp data/images/icon22x22.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \ -+ cp data/images/icon16x16.png \ -+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \ -+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \ - fi - - -@@ -590,9 +631,6 @@ - @install -d $(ICON_PREFIX) - @cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png - @chmod 644 $(ICON_PREFIX)/tuxpaint.png -- @install -d $(X11_ICON_PREFIX) -- @cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm -- @chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm - - - # Install the program: -@@ -1034,7 +1072,7 @@ - $^ \ - $(HQXX_O) \ - $(SDL_LIBS) \ -- -lm $(ARCH_LINKS) -+ -lm -lpng12 $(ARCH_LINKS) - @$(RSRC_CMD) - @$(MIMESET_CMD) - diff --git a/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch b/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch deleted file mode 100644 index 8badc7c..0000000 --- a/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur deluge-0.5.0/setup.py deluge-0.5.0.new/setup.py ---- deluge-0.5.0/setup.py 2007-03-18 22:09:56.000000000 +0530 -+++ deluge-0.5.0.new/setup.py 2007-04-29 14:08:16.000000000 +0530 -@@ -85,9 +85,9 @@ - include_dirs = ['./libtorrent', './libtorrent/include', - './libtorrent/include/libtorrent', - '/usr/include/python' + pythonVersion], -- libraries = ['boost_filesystem', 'boost_date_time', -- 'boost_program_options', 'boost_regex', -- 'boost_serialization', 'boost_thread', -+ libraries = ['boost_filesystem-gcc42-mt', 'boost_date_time-gcc42-mt', -+ 'boost_program_options-gcc42-mt', 'boost_regex-gcc42-mt', -+ 'boost_serialization-gcc42-mt', 'boost_thread-gcc42-mt', - 'z', 'pthread'], - extra_compile_args = ["-Wno-missing-braces"], - sources = ['src/deluge_core.cpp', From krics at linuxforum.hu Fri Jul 20 20:22:14 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 20:22:16 2007 Subject: [Frugalware-git] frugalware-current: sdl-1.2.12-1-x86_64 Message-ID: <20070720182214.2A43C13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2061592ef86bdddf8becf9b4a443298dee36b1a0 commit 2061592ef86bdddf8becf9b4a443298dee36b1a0 Author: Christian Hamar alias krix Date: Fri Jul 20 20:21:48 2007 +0200 sdl-1.2.12-1-x86_64 * Version bump diff --git a/source/xlib/sdl/FrugalBuild b/source/xlib/sdl/FrugalBuild index d03bc12..8b91ffb 100644 --- a/source/xlib/sdl/FrugalBuild +++ b/source/xlib/sdl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=sdl -pkgver=1.2.11 +pkgver=1.2.12 pkgrel=1 pkgdesc="Simple DirectMedia Layer library" url="http://www.libsdl.org" @@ -14,6 +14,6 @@ up2date="lynx -dump http://www.libsdl.org/release/|grep 'SDL-[0-9\.]*tar.gz$'|se source=(http://www.libsdl.org/release/SDL-$pkgver.tar.gz) _F_cd_path="SDL-$pkgver" Fconfopts="$Fconfopts --disable-nasm --enable-endian --enable-aalib" -sha1sums=('6f9ef73c9b5705a5ddd5dd367423bc9c7cebc959') +sha1sums=('2c37ff1683368369c0f555d4a742f0544153610d') # optimization OK From priyank at frugalware.org Fri Jul 20 20:34:16 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 20 20:34:20 2007 Subject: [Frugalware-git] frugalware-current: Revert "deluge-0.5.2-1-i686" Message-ID: <20070720183416.69FFD13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=85a6133de7280eeef320f05f6c953c6cc36616ae commit 85a6133de7280eeef320f05f6c953c6cc36616ae Author: Priyank Date: Fri Jul 20 23:57:44 2007 +0530 Revert "deluge-0.5.2-1-i686" * Revert as this touches tuxpaint too. This reverts commit ed01cfaba3dafed7b179e8ab211436294d9a5de8. diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild index 33ef605..926ded3 100644 --- a/source/games-extra/tuxpaint/FrugalBuild +++ b/source/games-extra/tuxpaint/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tuxpaint -pkgver=0.9.17 +pkgver=0.9.16 pkgrel=1 pkgdesc="A drawing program for young children." _F_sourceforge_broken_up2date=1 @@ -13,10 +13,14 @@ groups=('games-extra') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet -sha1sums=('88e42d19339bb1faa03bce45a28d3fe11fbe05b4') +source=(${source[@]} $pkgname-fix.patch) +sha1sums=('7c09582abe69d0fc6f0e1077c839b8931899fbe7' \ + '41bd3adc853fa53f48f8fe7a3d5b97f99ff52a92') + build() { Fcd + Fpatchall make ENABLE_GETTEXT=1 || Fdie make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install Fbuild_gnome_scriptlet diff --git a/source/games-extra/tuxpaint/tuxpaint-fix.patch b/source/games-extra/tuxpaint/tuxpaint-fix.patch index 22fcbb8..dd06cdc 100644 --- a/source/games-extra/tuxpaint/tuxpaint-fix.patch +++ b/source/games-extra/tuxpaint/tuxpaint-fix.patch @@ -1,16 +1,16 @@ -diff -Naur tuxpaint-0.9.17/Makefile tuxpaint-0.9.17.new/Makefile ---- tuxpaint-0.9.17/Makefile 2007-07-01 20:35:57.000000000 +0530 -+++ tuxpaint-0.9.17.new/Makefile 2007-07-19 00:11:05.000000000 +0530 +diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile +--- tuxpaint-0.9.16/Makefile 2006-10-19 02:41:49.000000000 -0500 ++++ tuxpaint-0.9.16-patched/Makefile 2006-12-11 23:22:55.000000000 -0500 @@ -18,7 +18,7 @@ # Where to install things: -PREFIX=/usr/local -+PREFIX=/usr/ ++PREFIX=/usr # Root directory to place files when creating packages. -@@ -62,9 +62,9 @@ +@@ -62,13 +62,15 @@ ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps @@ -20,17 +20,127 @@ diff -Naur tuxpaint-0.9.17/Makefile tuxpaint-0.9.17.new/Makefile +GNOME_PREFIX= +KDE_PREFIX= +KDE_ICON_PREFIX= ++DESKTOP_ICON_PREFIX=$(PREFIX)/share/icons - # Built with sound by default (override with "make nosound") -@@ -116,8 +116,8 @@ + # Locale files + ++ENABLE_GETTEXT=0 + LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale + # LOCALE_PREFIX=/usr/share/locale + +@@ -97,7 +99,7 @@ # The entire set of CFLAGS: #-ffast-math --OPTFLAGS=-O2 --CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ -+OPTFLAGS= -+CFLAGS+=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ +-CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \ ++CFLAGS += -W -Wall -fno-common -ffloat-store \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ -Waggregate-return \ +@@ -118,7 +120,10 @@ + + # "make" with no arguments builds the program and man page from sources: + +-all: tuxpaint translations ++all: tuxpaint ++ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \ ++ make translations; \ ++ fi + @echo + @echo "--------------------------------------------------------------" + @echo +@@ -220,10 +225,13 @@ + # to do this as superuser ("root")) + + install: install-bin install-data install-man install-doc \ +- install-icon install-gettext install-importscript \ ++ install-icon install-importscript \ + install-default-config install-example-stamps \ + install-example-starters \ +- install-gnome install-kde install-kde-icons ++ install-desktop-data ++ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \ ++ make install-gettext; \ ++ fi + @echo + @echo "--------------------------------------------------------------" + @echo +@@ -497,16 +505,49 @@ + + # Install a launcher icon in the Gnome menu, under "Graphics" + +-install-gnome: ++install-desktop-data: + @echo +- @echo "...Installing launcher icon into GNOME..." +- @if [ "x$(GNOME_PREFIX)" != "x" ]; then \ +- install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \ +- cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \ +- chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \ +- install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \ +- cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \ +- chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \ ++ @echo "...Installing launcher entry..." ++ @if [ "x$(PREFIX)" != "x" ]; then \ ++ install -d $(PKG_ROOT)$(PREFIX)/share/applications; \ ++ cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \ ++ chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \ ++ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \ ++ cp data/images/tuxpaint-icon.svg \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \ ++ cp data/images/icon192x192.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \ ++ cp data/images/icon128x128.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \ ++ cp data/images/icon96x96.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \ ++ cp data/images/icon64x64.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \ ++ cp data/images/icon48x48.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \ ++ cp data/images/icon32x32.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \ ++ cp data/images/icon22x22.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \ ++ cp data/images/icon16x16.png \ ++ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \ ++ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \ + fi + + +@@ -590,9 +631,6 @@ + @install -d $(ICON_PREFIX) + @cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png + @chmod 644 $(ICON_PREFIX)/tuxpaint.png +- @install -d $(X11_ICON_PREFIX) +- @cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm +- @chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm + + + # Install the program: +@@ -1034,7 +1072,7 @@ + $^ \ + $(HQXX_O) \ + $(SDL_LIBS) \ +- -lm $(ARCH_LINKS) ++ -lm -lpng12 $(ARCH_LINKS) + @$(RSRC_CMD) + @$(MIMESET_CMD) + diff --git a/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch b/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch new file mode 100644 index 0000000..8badc7c --- /dev/null +++ b/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch @@ -0,0 +1,16 @@ +diff -Naur deluge-0.5.0/setup.py deluge-0.5.0.new/setup.py +--- deluge-0.5.0/setup.py 2007-03-18 22:09:56.000000000 +0530 ++++ deluge-0.5.0.new/setup.py 2007-04-29 14:08:16.000000000 +0530 +@@ -85,9 +85,9 @@ + include_dirs = ['./libtorrent', './libtorrent/include', + './libtorrent/include/libtorrent', + '/usr/include/python' + pythonVersion], +- libraries = ['boost_filesystem', 'boost_date_time', +- 'boost_program_options', 'boost_regex', +- 'boost_serialization', 'boost_thread', ++ libraries = ['boost_filesystem-gcc42-mt', 'boost_date_time-gcc42-mt', ++ 'boost_program_options-gcc42-mt', 'boost_regex-gcc42-mt', ++ 'boost_serialization-gcc42-mt', 'boost_thread-gcc42-mt', + 'z', 'pthread'], + extra_compile_args = ["-Wno-missing-braces"], + sources = ['src/deluge_core.cpp', From crazy at frugalware.org Fri Jul 20 20:46:17 2007 From: crazy at frugalware.org (crazy) Date: Fri Jul 20 20:46:19 2007 Subject: [Frugalware-git] frugalware-current: deluge-0.5.2-1-i686 Message-ID: <20070720184617.3452F13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8a9b930f9e8c5e98bf7f16b6aff68a7088eea595 commit 8a9b930f9e8c5e98bf7f16b6aff68a7088eea595 Author: crazy Date: Fri Jul 20 20:43:53 2007 +0200 deluge-0.5.2-1-i686 * removed this patch finally diff --git a/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch b/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch deleted file mode 100644 index 8badc7c..0000000 --- a/source/gnome-extra/deluge/deluge-0.5.0-boost_mt.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur deluge-0.5.0/setup.py deluge-0.5.0.new/setup.py ---- deluge-0.5.0/setup.py 2007-03-18 22:09:56.000000000 +0530 -+++ deluge-0.5.0.new/setup.py 2007-04-29 14:08:16.000000000 +0530 -@@ -85,9 +85,9 @@ - include_dirs = ['./libtorrent', './libtorrent/include', - './libtorrent/include/libtorrent', - '/usr/include/python' + pythonVersion], -- libraries = ['boost_filesystem', 'boost_date_time', -- 'boost_program_options', 'boost_regex', -- 'boost_serialization', 'boost_thread', -+ libraries = ['boost_filesystem-gcc42-mt', 'boost_date_time-gcc42-mt', -+ 'boost_program_options-gcc42-mt', 'boost_regex-gcc42-mt', -+ 'boost_serialization-gcc42-mt', 'boost_thread-gcc42-mt', - 'z', 'pthread'], - extra_compile_args = ["-Wno-missing-braces"], - sources = ['src/deluge_core.cpp', From vmiklos at frugalware.org Fri Jul 20 21:05:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 21:05:35 2007 Subject: [Frugalware-git] frugalware-current: libmng-1.0.10-1-x86_64 Message-ID: <20070720190532.4D63E13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=985055e4a7071e76d2b8d79510cfae468137f746 commit 985055e4a7071e76d2b8d79510cfae468137f746 Author: VMiklos Date: Fri Jul 20 21:04:51 2007 +0200 libmng-1.0.10-1-x86_64 version bump diff --git a/source/lib/libmng/FrugalBuild b/source/lib/libmng/FrugalBuild index ee2856e..962f7d3 100644 --- a/source/lib/libmng/FrugalBuild +++ b/source/lib/libmng/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Zsolt Szalai pkgname=libmng -pkgver=1.0.9 -pkgrel=3 +pkgver=1.0.10 +pkgrel=1 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" url="http://www.libmng.com/" groups=('lib') @@ -12,7 +12,7 @@ depends=('lcms') _F_sourceforge_prefix="$pkgname-" _F_sourceforge_broken_up2date=1 Finclude sourceforge -sha1sums=('d32e939ec95caff7839c6c9a5896e4d575c77d35') +sha1sums=('78ad516a1de79d00de720bf2a7c9afea2c896b09') build() { From krics at linuxforum.hu Fri Jul 20 21:47:56 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 21:47:58 2007 Subject: [Frugalware-git] frugalware-current: enemy-territory-2.60b-1-x86_64 Message-ID: <20070720194756.E981C13A418D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=891892b8a72adfbbabccab964d2f7297ea6b8052 commit 891892b8a72adfbbabccab964d2f7297ea6b8052 Author: Christian Hamar alias krix Date: Fri Jul 20 21:47:31 2007 +0200 enemy-territory-2.60b-1-x86_64 * New package / Initial import (nobuild) * Implements / Cloese #1596 diff --git a/source/games-extra/enemy-territory/FrugalBuild b/source/games-extra/enemy-territory/FrugalBuild new file mode 100644 index 0000000..128c65c --- /dev/null +++ b/source/games-extra/enemy-territory/FrugalBuild @@ -0,0 +1,56 @@ +# Compiling Time: 0.16 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=enemy-territory +pkgver=2.60b +pkgrel=1 +pkgdesc="Wolfenstein: Enemy Territory is a freeware first-person shooter (FPS) computer game, and a standalone sequel to Return to Castle Wolfenstein, created by Splash Damage." +url="http://www.splashdamage.com" +archs=('i686' '!x86_64') +groups=('games-extra') +depends=('libglx' 'libxext' 'sdl' 'openal') +up2date=$pkgver +source=(http://enemy-territory.hu/ANONYMOUS/et-linux-2.60.x86.run \ + http://enemy-territory.hu/ANONYMOUS/et2.60blinux.zip \ + et.launcher etded.launcher) +sha1sums=('9a66247affcdf804a7341c7630e5610d1ae5d39f' \ + '5b77fe52b171d37dbcc243d13f3cee28b3a0697f' \ + 'bba2eb74777c8b86f329953d7ebcd0c859a83251' \ + 'b8b33bef11f06e9615c13dca3310e2369c7a5a8e') +_F_desktop_name="Enemy Territory" +_F_desktop_icon="ET.png" +_F_desktop_categories="Game;" +options=('nobuild') + +build() { + # prepare src and pkg dirs + mkdir enemy-territory || Fdie + mv "Enemy Territory 2.60b" "et260b" || Fdie + Fmkdir usr/share/games/enemy-territory/ + + # extract official pk3's and ioquak3 executables & libs + chmod +x et-linux-2.60.x86.run || Fdie + ./et-linux-2.60.x86.run --tar xf -C enemy-territory || Fdie + + # create some dir :P + Fmkdir usr/share/games/enemy-territory/etmain/ + Fmkdir usr/share/games/enemy-territory/pb/ + + # copy it + Fcpr enemy-territory/etmain/ usr/share/games/enemy-territory/ + Fcpr enemy-territory/pb/ usr/share/games/enemy-territory/ + + # punkbuster support + Fdirschown usr/share/games/enemy-territory/pb root root + Ffileschown usr/share/games/enemy-territory/pb root root + + # executables + # and patch to 2.60b + Fexe et260b/linux/{et,etded}.x86 usr/share/games/enemy-territory/ + Fexe et.launcher usr/bin/et + Fexe etded.launcher usr/bin/etded + + # menu entry + Ficon enemy-territory/ET.xpm + Fdesktop2 +} diff --git a/source/games-extra/enemy-territory/et.launcher b/source/games-extra/enemy-territory/et.launcher new file mode 100644 index 0000000..e32212d --- /dev/null +++ b/source/games-extra/enemy-territory/et.launcher @@ -0,0 +1,4 @@ +#!/bin/sh +cd "/usr/share/games/enemy-territory" +./et.x86 $* +exit $? diff --git a/source/games-extra/enemy-territory/etded.launcher b/source/games-extra/enemy-territory/etded.launcher new file mode 100644 index 0000000..625eb93 --- /dev/null +++ b/source/games-extra/enemy-territory/etded.launcher @@ -0,0 +1,4 @@ +#!/bin/sh +cd "/usr/share/games/enemy-territory" +./etded.x86 $* +exit $? From boobaa at frugalware.org Fri Jul 20 22:05:36 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 22:05:38 2007 Subject: [Frugalware-git] frugalware-current: lilypond-2.10.25-1-i686 Message-ID: <20070720200536.3CA4413A4195@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=19c4d73dea93d235b835dd09c17ac4d6066d768a commit 19c4d73dea93d235b835dd09c17ac4d6066d768a Author: CSÉCSY László Date: Fri Jul 20 22:05:27 2007 +0200 lilypond-2.10.25-1-i686 -k -c diff --git a/source/xapps-extra/lilypond/FrugalBuild b/source/xapps-extra/lilypond/FrugalBuild index 4968ce1..56a3acb 100644 --- a/source/xapps-extra/lilypond/FrugalBuild +++ b/source/xapps-extra/lilypond/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=lilypond -pkgver=2.10.20 +pkgver=2.10.25 pkgrel=1 pkgdesc="music notation for everyone" url="http://lilypond.org/web/" @@ -11,7 +11,7 @@ makedepends=('netpbm' 'imagemagick' 'rsync') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://lilypond.org/web/' | grep 'Stable.*Docum' | sed 's/.* \([0-9\.]\+\) .*/\1/'" -source=(http://download.linuxaudio.org/lilypond/sources/v2.10/$pkgname-$pkgver.tar.gz hack.patch) +source=(http://download.linuxaudio.org/lilypond/sources/v2.10/$pkgname-$pkgver.tar.gz hack.patch fontforge.patch) options=('scriptlet') docpkg=lilypond-doc @@ -33,5 +33,6 @@ build() } # optimization OK -sha1sums=('34c77823bde4d6c88fdacb230522f8b5cda18e1e'\ - 'da35df783510eb8ee06cff9da77f3faad6a2b101') +sha1sums=('f2726f808d98477c37ed31fd47ca76d111bdd335'\ + 'da35df783510eb8ee06cff9da77f3faad6a2b101'\ + '6081efccff797af34dd77f994b0b622511e617ca') From boobaa at frugalware.org Fri Jul 20 22:09:01 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 20 22:09:04 2007 Subject: [Frugalware-git] frugalware-current: lilypond-2.10.25-1-i686 Message-ID: <20070720200901.43E0D13A4195@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0bd70359944e3aa882234f3dbaef66c31fb32c7f commit 0bd70359944e3aa882234f3dbaef66c31fb32c7f Author: CSÉCSY László Date: Fri Jul 20 22:08:51 2007 +0200 lilypond-2.10.25-1-i686 now the patch goes up diff --git a/source/xapps-extra/lilypond/fontforge.patch b/source/xapps-extra/lilypond/fontforge.patch new file mode 100644 index 0000000..4014b23 --- /dev/null +++ b/source/xapps-extra/lilypond/fontforge.patch @@ -0,0 +1,12 @@ +diff -Naur lilypond-2.10.25-orig/buildscripts/pfx2ttf.fontforge lilypond-2.10.25/buildscripts/pfx2ttf.fontforge +--- lilypond-2.10.25-orig/buildscripts/pfx2ttf.fontforge 2007-05-19 16:49:52.000000000 +0200 ++++ lilypond-2.10.25/buildscripts/pfx2ttf.fontforge 2007-07-20 19:56:02.000000000 +0200 +@@ -21,7 +21,7 @@ + "afii61352", "afii61352", \ + "ij", "ij", \ + "IJ", "IJ"); +-RemoveATT("Ligature", "*", "*"); ++RemovePosSub("*"); + + Generate($3 + $fontname + ".otf"); + From vmiklos at frugalware.org Fri Jul 20 22:15:35 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 22:15:37 2007 Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.5_2-1-x86_64 Message-ID: <20070720201535.3340D13A4195@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=508a267bf2c41b0c2600567b4002caf7cea3bb2e commit 508a267bf2c41b0c2600567b4002caf7cea3bb2e Author: VMiklos Date: Fri Jul 20 22:14:54 2007 +0200 imagemagick-6.3.5_2-1-x86_64 version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index ba0ebca..2fa0e40 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=imagemagick -pkgver=6.3.5_0 +pkgver=6.3.5_2 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files" url="http://www.imagemagick.org" @@ -15,6 +15,8 @@ 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' \ + 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { Fcd ImageMagick-`echo $pkgver | sed "s/\(.*\)_.*/\1/"` @@ -29,7 +31,5 @@ build() { Frm /usr/lib/perl5/?.?.?/ Frm /usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi/auto/Image/Magick/.packlist } -sha1sums=('69ee277635fc7caf5506d92c8ca7986e0f5a5573' \ - 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') # optimization OK From krics at linuxforum.hu Fri Jul 20 22:15:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Jul 20 22:15:53 2007 Subject: [Frugalware-git] frugalware-current: enemy-territory-2.60b-1-x86_64 Message-ID: <20070720201547.5EC4F13A4195@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d3af522c4848389e82cccf3299257066591e5352 commit d3af522c4848389e82cccf3299257066591e5352 Author: Christian Hamar alias krix Date: Fri Jul 20 22:15:18 2007 +0200 enemy-territory-2.60b-1-x86_64 * Added pbweb punkbuster update wrapper * Added README.Frugalware to inform about disconnects diff --git a/source/games-extra/enemy-territory/FrugalBuild b/source/games-extra/enemy-territory/FrugalBuild index 128c65c..7ca93a3 100644 --- a/source/games-extra/enemy-territory/FrugalBuild +++ b/source/games-extra/enemy-territory/FrugalBuild @@ -12,11 +12,13 @@ depends=('libglx' 'libxext' 'sdl' 'openal') up2date=$pkgver source=(http://enemy-territory.hu/ANONYMOUS/et-linux-2.60.x86.run \ http://enemy-territory.hu/ANONYMOUS/et2.60blinux.zip \ - et.launcher etded.launcher) + et.launcher etded.launcher pbweb.launcher README.Frugalware) sha1sums=('9a66247affcdf804a7341c7630e5610d1ae5d39f' \ '5b77fe52b171d37dbcc243d13f3cee28b3a0697f' \ 'bba2eb74777c8b86f329953d7ebcd0c859a83251' \ - 'b8b33bef11f06e9615c13dca3310e2369c7a5a8e') + 'b8b33bef11f06e9615c13dca3310e2369c7a5a8e' \ + '966a18ae712b8d056dd0408ee1a2b740e076770a' \ + 'e565216af51e03f139c3c480f8c2af487f3c027c') _F_desktop_name="Enemy Territory" _F_desktop_icon="ET.png" _F_desktop_categories="Game;" @@ -49,6 +51,7 @@ build() { Fexe et260b/linux/{et,etded}.x86 usr/share/games/enemy-territory/ Fexe et.launcher usr/bin/et Fexe etded.launcher usr/bin/etded + Fexe pbweb.launcher usr/bin/pbweb # menu entry Ficon enemy-territory/ET.xpm diff --git a/source/games-extra/enemy-territory/README.Frugalware b/source/games-extra/enemy-territory/README.Frugalware new file mode 100644 index 0000000..3641f6c --- /dev/null +++ b/source/games-extra/enemy-territory/README.Frugalware @@ -0,0 +1,6 @@ +If you got disconnected from servers and getting some #20004 errors, then +run as pbweb AS ROOT!!! + +Then try again :) + +Regards diff --git a/source/games-extra/enemy-territory/pbweb.launcher b/source/games-extra/enemy-territory/pbweb.launcher new file mode 100644 index 0000000..48788ad --- /dev/null +++ b/source/games-extra/enemy-territory/pbweb.launcher @@ -0,0 +1,4 @@ +#!/bin/sh +cd "/usr/share/games/enemy-territory/pb/" +./pbweb.x86 $* +exit $? From vmiklos at frugalware.org Fri Jul 20 22:30:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 22:31:01 2007 Subject: [Frugalware-git] frugalware-current: tools/getall.py: create options.root dir if necessary Message-ID: <20070720203059.820F31868075@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b61f4cae8efe379d58338032b76be5527714b295 commit b61f4cae8efe379d58338032b76be5527714b295 Author: VMiklos Date: Fri Jul 20 22:26:40 2007 +0200 tools/getall.py: create options.root dir if necessary also strip the frugalware- prefix, ie check out frugalware-current to current diff --git a/tools/getall.py b/tools/getall.py index 25d9d1e..d261c69 100755 --- a/tools/getall.py +++ b/tools/getall.py @@ -28,6 +28,7 @@ class Options: self.root = os.path.join(os.environ['HOME'], "git") def update(options): + os.makedirs(options.root) os.chdir(options.root) sock = os.popen("ssh %s@%s ls -l %s" % (options.login, server, repodir)) buf = sock.readlines() @@ -36,15 +37,19 @@ def update(options): for i in buf: path = os.path.abspath(os.path.join(repodir, i.strip().split(" ")[-1])) repo = os.path.split(path)[-1] + if repo.startswith("frugalware-"): + local = repo[len("frugalware-"):] + else: + local = repo url = "%s@%s:%s" % (options.login, server, path) print "Updating '%s':" % repo try: old = os.getcwd() - os.chdir(repo) + os.chdir(local) os.system("git pull") os.chdir(old) except OSError: - os.system("git clone %s" % url) + os.system("git clone %s %s" % (url, repo)) def usage(ret): print __doc__ From vmiklos at frugalware.org Fri Jul 20 22:30:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 22:31:03 2007 Subject: [Frugalware-git] frugalware-current: tools/getall.py: create options.root only if necessary Message-ID: <20070720203059.9D1341868076@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2339ee2733566d281ce204e7976e761edc5eb1c6 commit 2339ee2733566d281ce204e7976e761edc5eb1c6 Author: VMiklos Date: Fri Jul 20 22:28:17 2007 +0200 tools/getall.py: create options.root only if necessary diff --git a/tools/getall.py b/tools/getall.py index d261c69..94e983e 100755 --- a/tools/getall.py +++ b/tools/getall.py @@ -28,8 +28,10 @@ class Options: self.root = os.path.join(os.environ['HOME'], "git") def update(options): - os.makedirs(options.root) - os.chdir(options.root) + try: + os.chdir(options.root) + except OSError: + os.makedirs(options.root) sock = os.popen("ssh %s@%s ls -l %s" % (options.login, server, repodir)) buf = sock.readlines() sock.close() From vmiklos at frugalware.org Fri Jul 20 23:09:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 20 23:09:15 2007 Subject: [Frugalware-git] frugalware-current: tools/getall.py: typo fix in option parsing Message-ID: <20070720210912.949FE1868075@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=14cc0add21d05f7e95331f31b15ab3ca15730143 commit 14cc0add21d05f7e95331f31b15ab3ca15730143 Author: VMiklos Date: Fri Jul 20 23:07:49 2007 +0200 tools/getall.py: typo fix in option parsing thx hermier diff --git a/tools/getall.py b/tools/getall.py index 94e983e..550e90f 100755 --- a/tools/getall.py +++ b/tools/getall.py @@ -69,7 +69,7 @@ def main(): if opt in ("-l", "--login"): options.login = arg if opt in ("-r", "--root"): - option.root = arg + options.root = arg if opt in ("-v", "--version"): print "getall %s" % __version__ sys.exit(0) From vmiklos at frugalware.org Sat Jul 21 00:22:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 00:23:01 2007 Subject: [Frugalware-git] frugalware-current: j2sdk-6-4-x86_64 Message-ID: <20070720222255.297331868075@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e2e0c0405db97aee4df3f01d72081f3b4d45b4a9 commit e2e0c0405db97aee4df3f01d72081f3b4d45b4a9 Author: VMiklos Date: Sat Jul 21 00:22:26 2007 +0200 j2sdk-6-4-x86_64 bump to update '2' j2re is now a subpkg closes #2254 diff --git a/source/devel-extra/j2sdk/FrugalBuild b/source/devel-extra/j2sdk/FrugalBuild index cfabb7a..2fe6275 100644 --- a/source/devel-extra/j2sdk/FrugalBuild +++ b/source/devel-extra/j2sdk/FrugalBuild @@ -4,40 +4,53 @@ pkgname=j2sdk pkgver=6 pkgver=6 -update=1 +update=2 realver=${pkgver}u$update -pkgrel=2 +pkgrel=4 pkgdesc="Sun's java development kit" url="http://java.sun.com/j2se/downloads.html" -depends=('j2re') +rodepends=('j2re') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="elinks -dump https://jdk-distros.dev.java.net/developer.html|grep 'jdk-[0-9].*sh$'|sed 's/.*jdk-\(.*\)-dlj-linux.*/\1/;s/u$update//;q'" +up2date="elinks -dump https://jdk-distros.dev.java.net/developer.html|grep 'jdk-[0-9].*bin$'|sed 's/.*jdk-\(.*\)-dlj-linux.*/\1/;s/u$update//;q'" if [ "$CARCH" == "i686" ]; then _arch="i586" - sha1sums=('1f35c785e810d3c0ff012c79c7ffa509eb01dae5') + sha1sums=('d3e58749ffb457ea338facb86bd800d084e98fe1') elif [ "$CARCH" == "x86_64" ]; then _arch="amd64" - sha1sums=('e2656303a3b0eef237f2cd233a3bd28185c65f12') + sha1sums=('ad7b4356025d5af917d232f87d8efe9fa0726eb8') fi -source=(http://download.java.net/dlj/binaries/jdk-$realver-dlj-linux-$_arch.sh \ +source=(http://dlc.sun.com/dlj/binaries/jdk-$realver-dlj-linux-$_arch.bin \ https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh \ - j2sdk.sh) + j2re.sh j2sdk.sh) sha1sums=(${sha1sums[@]} '966b9c8229ef3dfb588c108124f367cc993cb581' \ + 'e5f35c95e9f93e90746e666f0f42daac019bb9e5' \ '3f30113053667f54e0c0df190aaf3a6e2122497e') -# TODO: maybe package j2re as a subpkg of j2sdk? +subpkgs=('j2re') +subdescs=("Sun's java runtime environment") +subdepends=('unixodbc libice libxp libxi libsm libxtst libxt alsa-lib') +subconflicts=('openjre') +subgroups=('xapps') +subarchs=('i686 x86_64') build() { - Fmkdir /usr/lib + Fmkdir /usr/lib/mozilla/plugins mkdir $pkgname cd $pkgname - sh ../jdk-$realver-dlj-linux-$_arch.sh --accept-license + sh ../jdk-$realver-dlj-linux-$_arch.bin --accept-license cd .. sh construct.sh $pkgname linux-jdk linux-jre - rm -rf linux-jdk/{jre,src.zip} + rm -rf linux-jdk/src.zip mv linux-jdk $Fdestdir/usr/lib/java + Fexe /etc/profile.d/j2re.sh Fexe /etc/profile.d/$pkgname.sh + Fsplit j2re usr/lib/java/jre etc/profile.d/j2re.sh + if [ "$CARCH" == "i686" ]; then + Fln /usr/lib/java/jre/plugin/i386/ns7/libjavaplugin_oji.so \ + /usr/lib/mozilla/plugins/libjavaplugin_oji.so + Fsplit j2re usr/lib/mozilla + fi } # optimization ok diff --git a/source/devel-extra/j2sdk/j2re.sh b/source/devel-extra/j2sdk/j2re.sh new file mode 100644 index 0000000..5ccaba2 --- /dev/null +++ b/source/devel-extra/j2sdk/j2re.sh @@ -0,0 +1,15 @@ +export J2REDIR=/usr/lib/java/jre +export MANPATH=$MANPATH:$J2REDIR/man +export CLASSPATH=$CLASSPATH:$J2REDIR/lib + +# if you put "java=foo" (where foo != j2sdk) to /etc/sysconfig/java, +# then this script won't touch the JAVA_HOME variable +[ -e /etc/sysconfig/java ] && source /etc/sysconfig/java +if [ -z "$java" -o "$java" = "j2sdk" ]; then + if [ ! -f /etc/profile.d/j2sdk.sh ]; then + export JAVA_HOME=$J2REDIR + fi + export PATH=$J2REDIR/bin:$PATH +else + export PATH=$PATH:$J2REDIR/bin +fi From vmiklos at frugalware.org Sat Jul 21 00:27:08 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 00:27:10 2007 Subject: [Frugalware-git] frugalware-current: j2re-6-3-x86_64 Message-ID: <20070720222708.148261868075@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0d5a4c2da5426d51cbaa781322dd0b95d6143d1c commit 0d5a4c2da5426d51cbaa781322dd0b95d6143d1c Author: VMiklos Date: Sat Jul 21 00:27:02 2007 +0200 j2re-6-3-x86_64 bin, it's now a subpkg of j2sdk diff --git a/source/xapps/j2re/FrugalBuild b/source/xapps/j2re/FrugalBuild deleted file mode 100644 index 62cb447..0000000 --- a/source/xapps/j2re/FrugalBuild +++ /dev/null @@ -1,44 +0,0 @@ -# Compiling Time: 0.06 SBU -# Maintainer: VMiklos - -pkgname=j2re -pkgver=6 -update=1 -realver=${pkgver}u$update -pkgrel=3 -pkgdesc="Sun's java runtime environment" -url="http://java.sun.com" -depends=('unixodbc' 'libxcb' 'libstdc++5' 'libxp' 'libxi' 'libxtst' 'libgcc' 'alsa-lib') -groups=('xapps') -archs=('i686' 'x86_64') -up2date="elinks -dump https://jdk-distros.dev.java.net/developer.html|grep 'jdk-[0-9].*sh$'|sed 's/.*jdk-\(.*\)-dlj-linux.*/\1/;s/u$update//;q'" -if [ "$CARCH" == "i686" ]; then - _arch="i586" - sha1sums=('1f35c785e810d3c0ff012c79c7ffa509eb01dae5') -elif [ "$CARCH" == "x86_64" ]; then - _arch="amd64" - sha1sums=('e2656303a3b0eef237f2cd233a3bd28185c65f12') -fi -source=(http://download.java.net/dlj/binaries/jdk-$realver-dlj-linux-$_arch.sh \ - https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh \ - j2re.sh) -sha1sums=(${sha1sums[@]} '966b9c8229ef3dfb588c108124f367cc993cb581' \ - 'e5f35c95e9f93e90746e666f0f42daac019bb9e5') - -build() { - Fmkdir /usr/lib/{java,mozilla/plugins} - mkdir $pkgname - cd $pkgname - sh ../jdk-$realver-dlj-linux-$_arch.sh --accept-license - cd .. - sh construct.sh $pkgname linux-jdk linux-jre - Fmkdir /usr/lib/java - mv linux-jdk/jre $Fdestdir/usr/lib/java - Fexe /etc/profile.d/$pkgname.sh - if [ "$CARCH" == "i686" ]; then - Fln /usr/lib/java/jre/plugin/i386/ns7/libjavaplugin_oji.so \ - /usr/lib/mozilla/plugins/libjavaplugin_oji.so - fi -} - -# optimization OK diff --git a/source/xapps/j2re/j2re.sh b/source/xapps/j2re/j2re.sh deleted file mode 100644 index 5ccaba2..0000000 --- a/source/xapps/j2re/j2re.sh +++ /dev/null @@ -1,15 +0,0 @@ -export J2REDIR=/usr/lib/java/jre -export MANPATH=$MANPATH:$J2REDIR/man -export CLASSPATH=$CLASSPATH:$J2REDIR/lib - -# if you put "java=foo" (where foo != j2sdk) to /etc/sysconfig/java, -# then this script won't touch the JAVA_HOME variable -[ -e /etc/sysconfig/java ] && source /etc/sysconfig/java -if [ -z "$java" -o "$java" = "j2sdk" ]; then - if [ ! -f /etc/profile.d/j2sdk.sh ]; then - export JAVA_HOME=$J2REDIR - fi - export PATH=$J2REDIR/bin:$PATH -else - export PATH=$PATH:$J2REDIR/bin -fi From vmiklos at frugalware.org Sat Jul 21 00:44:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 00:44:22 2007 Subject: [Frugalware-git] frugalware-current: tools/getall.py: and another typo.. ; ) Message-ID: <20070720224420.E80F913A4195@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=23984a846cb63ca804a8ad2b4f234b5b35686c69 commit 23984a846cb63ca804a8ad2b4f234b5b35686c69 Author: VMiklos Date: Sat Jul 21 00:40:40 2007 +0200 tools/getall.py: and another typo.. ;) diff --git a/tools/getall.py b/tools/getall.py index 550e90f..defdd8d 100755 --- a/tools/getall.py +++ b/tools/getall.py @@ -51,7 +51,7 @@ def update(options): os.system("git pull") os.chdir(old) except OSError: - os.system("git clone %s %s" % (url, repo)) + os.system("git clone %s %s" % (url, local)) def usage(ret): print __doc__ From priyank at frugalware.org Sat Jul 21 10:08:19 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 10:08:21 2007 Subject: [Frugalware-git] gfpm: gfpm-packagelist.c: new function gfpm_package_list_is_empty() to check for empty package lists. Message-ID: <20070721080819.EF53913A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=67151714175f97f16f2a2c2948247b8c3649f242 commit 67151714175f97f16f2a2c2948247b8c3649f242 Author: Priyank Date: Sat Jul 21 13:36:31 2007 +0530 gfpm-packagelist.c: new function gfpm_package_list_is_empty() to check for empty package lists. diff --git a/src/gfpm-packagelist.c b/src/gfpm-packagelist.c index 27b06da..5545e6b 100644 --- a/src/gfpm-packagelist.c +++ b/src/gfpm-packagelist.c @@ -138,6 +138,42 @@ gfpm_package_list_free (GfpmListType type) return; } +/* checks whether a list is empty + * returns 0 if empty + * returns 1 if not empty + * returns -1 on error + */ +int +gfpm_package_list_is_empty (GfpmListType type) +{ + if ((type != GFPM_INSTALL_LIST) && (type != GFPM_REMOVE_LIST)) + return -1; + switch (type) + { + case GFPM_INSTALL_LIST: + { + if (install_list == NULL) + return 0; + else if (g_list_length(install_list)==0) + return 0; + else + return 1; + break; + } + case GFPM_REMOVE_LIST: + { + if (remove_list == NULL) + return 0; + else if (g_list_length(remove_list)==0) + return 0; + else + return 1; + break; + } + default: return -1; + } +} + void gfpm_package_list_print (GfpmListType type) { diff --git a/src/gfpm-packagelist.h b/src/gfpm-packagelist.h index e18f845..04d1e76 100644 --- a/src/gfpm-packagelist.h +++ b/src/gfpm-packagelist.h @@ -20,9 +20,6 @@ typedef enum _gfpmlisttype GFPM_REMOVE_LIST } GfpmListType; -/* Print contents of a GfpmList */ -void gfpm_package_list_print (GfpmListType); - /* Inserts a new item into a GfpmList */ void gfpm_package_list_add (GfpmListType, const gchar *); @@ -32,4 +29,11 @@ void gfpm_package_list_del (GfpmListType, const gchar *); /* Free memory used by a GfpmList */ void gfpm_package_list_free (GfpmListType); +/* Print contents of a GfpmList */ +/* temporary function, to be removed after testing */ +void gfpm_package_list_print (GfpmListType); + +/* Check whether a list is empty */ +int gfpm_package_list_is_empty (GfpmListType); + #endif From priyank at frugalware.org Sat Jul 21 10:24:26 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 10:24:28 2007 Subject: [Frugalware-git] gfpm: gfpm.glade: added new menu item - Options Message-ID: <20070721082426.9D12113A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=62cb88161f12ce3ca2244d8ec6a3e2521b37cb7c commit 62cb88161f12ce3ca2244d8ec6a3e2521b37cb7c Author: Priyank Date: Sat Jul 21 13:52:40 2007 +0530 gfpm.glade: added new menu item - Options diff --git a/glade/gfpm.glade b/glade/gfpm.glade index 554f936..ebae6ef 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -41,6 +41,34 @@ + + 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 @@ -76,7 +104,7 @@ True GTK_TOOLBAR_BOTH - + True Apply Changes gtk-apply From priyank at frugalware.org Sat Jul 21 11:08:18 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 11:08:21 2007 Subject: [Frugalware-git] gfpm: Added a new dialog to clear old/all packages from cache. Message-ID: <20070721090818.CDF3313A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c09fda91222335fd43ba6adc6b6d9e502914bdb8 commit c09fda91222335fd43ba6adc6b6d9e502914bdb8 Author: Priyank Date: Sat Jul 21 14:36:29 2007 +0530 Added a new dialog to clear old/all packages from cache. diff --git a/glade/gfpm.glade b/glade/gfpm.glade index ebae6ef..761630f 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -57,6 +57,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Clear package cache True + gtk-clear @@ -579,4 +580,97 @@ Installed packages + + 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 + + + + + diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index ddba061..ef371a8 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -49,12 +49,16 @@ static GtkWidget *gfpm_groups_tvw; static GtkWidget *gfpm_pkgs_tvw; static GtkWidget *gfpm_info_tvw; static GtkWidget *gfpm_files_txtvw; +static GtkWidget *gfpm_clrall_opt; +static GtkWidget *gfpm_clrold_opt; static void cb_gfpm_repos_combo_changed (GtkComboBox *combo, gpointer data); static void cb_gfpm_groups_tvw_selected (GtkTreeSelection *selection, gpointer data); static void cb_gfpm_pkgs_tvw_selected (GtkTreeSelection *selection, gpointer data); static void cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data); static void cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); +static void cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data); +static void cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data); void gfpm_interface_init (void) @@ -72,6 +76,8 @@ gfpm_interface_init (void) gfpm_pkgs_tvw = glade_xml_get_widget (xml, "pkgstreeview"); gfpm_info_tvw = glade_xml_get_widget (xml, "infotreeview"); gfpm_files_txtvw= glade_xml_get_widget (xml, "filestextview"); + gfpm_clrold_opt = glade_xml_get_widget (xml, "rem_old_opt"); + gfpm_clrall_opt = glade_xml_get_widget (xml, "rem_all_opt"); /* Setup repository combobox */ widget = glade_xml_get_widget (xml, "combobox_repos"); @@ -142,12 +148,18 @@ gfpm_interface_init (void) /* 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); /* refresh db */ //g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_refresh_button_clicked), NULL); /* initialize progressbar */ //gfpm_progress_init (); + + /* 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); /* Disable Apply, Refresh and File buttons if user is not root */ if ( geteuid() != 0 ) @@ -779,3 +791,49 @@ cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, g return; } + +static void +cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data) +{ + int ret; + gchar *errstr = NULL; + + if (gtk_toggle_button_get_active(gfpm_clrold_opt) == TRUE) + { + if (gfpm_question(_("Are you sure you want to remove old packages from cache ?")) == GTK_RESPONSE_YES) + { + while (gtk_events_pending()) + gtk_main_iteration (); + ret = pacman_sync_cleancache (0); + if (!ret) + gfpm_message (_("Finished clearing the cache")); + else + { + errstr = g_strdup_printf (_("Failed to clean the cache (%s)"), pacman_strerror(pm_errno)); + gfpm_message (errstr); + g_free (errstr); + } + } + return; + } + else if (gtk_toggle_button_get_active(gfpm_clrall_opt) == TRUE) + { + if (gfpm_question(_("Are you sure you want to remove all packages from cache ?")) == GTK_RESPONSE_YES) + { + while (gtk_events_pending()) + gtk_main_iteration (); + ret = pacman_sync_cleancache (1); + if (!ret) + gfpm_message (_("Finished clearing the cache")); + else + { + errstr = g_strdup_printf (_("Failed to clean the cache (%s)"), pacman_strerror(pm_errno)); + gfpm_message (errstr); + g_free (errstr); + } + } + return; + } + return; +} + From boobaa at frugalware.org Sat Jul 21 11:14:42 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:14:44 2007 Subject: [Frugalware-git] frugalware-current: hunspell-1.1.8_2-1-i686 Message-ID: <20070721091442.2105C13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=7097d4d453f2e3d4943173598f479c0a1dbd8ffb commit 7097d4d453f2e3d4943173598f479c0a1dbd8ffb Author: CSÉCSY László Date: Sat Jul 21 11:14:25 2007 +0200 hunspell-1.1.8_2-1-i686 version bump (grr, OOo still doesn't find it) diff --git a/source/apps-extra/hunspell/FrugalBuild b/source/apps-extra/hunspell/FrugalBuild index d499472..1c60456 100644 --- a/source/apps-extra/hunspell/FrugalBuild +++ b/source/apps-extra/hunspell/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=hunspell -pkgver=1.1.7 +pkgver=1.1.8_2 pkgrel=1 pkgdesc="An interactive Hungarian spell checker" url="http://hunspell.sourceforge.net/" @@ -16,15 +16,15 @@ up2date="lynx -dump http://hunspell.sourceforge.net/ | grep -m1 'http.*tar\.gz' source=(${source[@]} \ http://forditas.fsf.hu/scripts/huspell \ http://forditas.fsf.hu/scripts/huspell-po) -sha1sums=('764344fb9fe960b266ac619c8c0288aa63d64d8f' \ +sha1sums=('fbfe4eb392ad2143f96d3ab8846970b1b5d100fd' \ '8beb23bebd6901d64901190f18ce996d5a9e6d4b' \ '69ccc901cb15fbc3d02ce752d74037e1b48ce077') [ "$CARCH" == "x86_64" ] && CXXFLAGS="$CXXFLAGS -fPIC" build() { - pkgver=${pkgver//_*/} - Fcd + myver=${pkgver//_*/} + Fcd $pkgname-$myver Fbuild --with-ui --with-readline Fsed "-d hu_HU_u8 " "" $Fsrcdir/huspell Finstall 755 huspell{,-po} /usr/bin/ From boobaa at frugalware.org Sat Jul 21 11:18:55 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:19:02 2007 Subject: [Frugalware-git] frugalware-current: phpmyadmin-2.10.3-1-i686 Message-ID: <20070721091855.72C2F13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9975d61ac24749367242cb0b4b0f9ee6f98e604e commit 9975d61ac24749367242cb0b4b0f9ee6f98e604e Author: CSÉCSY László Date: Sat Jul 21 11:18:50 2007 +0200 phpmyadmin-2.10.3-1-i686 version bump diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index 6d106b3..323dc6d 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=phpmyadmin -pkgver=2.10.2 +pkgver=2.10.3 pkgrel=1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -30,4 +30,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('b213ecd9605ed248f37a7c19bc41282f7d92a233') +sha1sums=('06adfc18a81e621e928ac089e278f2c39d2ab10e') From boobaa at frugalware.org Sat Jul 21 11:23:19 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:23:23 2007 Subject: [Frugalware-git] frugalware-current: hunspell-en-20061130-1-i686 Message-ID: <20070721092319.87B3D13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=268be9772d79fae2362deb1f4892761acd6eaae1 commit 268be9772d79fae2362deb1f4892761acd6eaae1 Author: CSÉCSY László Date: Sat Jul 21 11:23:13 2007 +0200 hunspell-en-20061130-1-i686 version bump updated source diff --git a/source/locale-extra/hunspell-en/FrugalBuild b/source/locale-extra/hunspell-en/FrugalBuild index bb71568..1cd94cb 100644 --- a/source/locale-extra/hunspell-en/FrugalBuild +++ b/source/locale-extra/hunspell-en/FrugalBuild @@ -3,8 +3,8 @@ lang=en_GB pkgname=hunspell-en -pkgver=20050613 -pkgrel=2 +pkgver=20061130 +pkgrel=1 pkgdesc="English (United Kingdom) dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" rodepends=('hunspell>=1.0.8') @@ -12,7 +12,7 @@ provides=('hunspell-dict') groups=('locale-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 'English (United Kingdom)' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" -source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) +source=(http://en-gb.pyxidium.co.uk/dictionary/$lang.zip) install=$pkgname.install build() { @@ -21,4 +21,4 @@ build() { } # optimization OK - noarch -sha1sums=('fc969d2109e19b8da3ca68c73657872b50f2ef8e') +sha1sums=('40404b44584e6c7eec30072dfbb30043b7777be7') From boobaa at frugalware.org Sat Jul 21 11:31:04 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:31:07 2007 Subject: [Frugalware-git] frugalware-current: hunspell-de-20051213-1-i686 Message-ID: <20070721093104.64F1213A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=155bf237cf392c91bab5c46b9acd01af136e2484 commit 155bf237cf392c91bab5c46b9acd01af136e2484 Author: CSÉCSY László Date: Sat Jul 21 11:30:55 2007 +0200 hunspell-de-20051213-1-i686 version bump updated up2date, source diff --git a/source/locale-extra/hunspell-de/FrugalBuild b/source/locale-extra/hunspell-de/FrugalBuild index 6b72410..ffdcd9c 100644 --- a/source/locale-extra/hunspell-de/FrugalBuild +++ b/source/locale-extra/hunspell-de/FrugalBuild @@ -3,18 +3,18 @@ lang=de_DE pkgname=hunspell-de -pkgver=20030617 -pkgrel=2 +pkgver=20051213 +pkgrel=1 pkgdesc="German dictionary for Hunspell" -url="http://lingucomponent.openoffice.org/spell_dic.html" +url="http://www.j3e.de/hunspell/" rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') archs=('i686' 'x86_64') -up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep 'German.*default' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" -source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) +up2date="lynx -dump $url | grep -m1 de_DE | sed 's/.*-\(.*\)\.z.*/\1/'" +source=(http://www.j3e.de/hunspell/$lang.zip) install=$pkgname.install -sha1sums=('02cd38165e6644e58301a266f228e3cfff9809a5') +sha1sums=('09beb35f8fd3753125535a920a1a001ce5b28fa8') build() { Fmkdir usr/share/myspell From boobaa at frugalware.org Sat Jul 21 11:41:10 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:41:16 2007 Subject: [Frugalware-git] frugalware-current: hunspell-de_CH-20051213-1-i686 Message-ID: <20070721094110.4EC1F13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d4aa9b573c0b4eabdf84897f8afdb48497f25d0a commit d4aa9b573c0b4eabdf84897f8afdb48497f25d0a Author: CSÉCSY László Date: Sat Jul 21 11:41:01 2007 +0200 hunspell-de_CH-20051213-1-i686 version bump updated up2date, source diff --git a/source/locale-extra/hunspell-de_CH/FrugalBuild b/source/locale-extra/hunspell-de_CH/FrugalBuild index bf6ffd9..69fb2a1 100644 --- a/source/locale-extra/hunspell-de_CH/FrugalBuild +++ b/source/locale-extra/hunspell-de_CH/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: CSÉCSY László lang=de_CH -pkgname=hunspell-$lang -pkgver=20030228 -pkgrel=2 +pkgname=hunspell-de_CH +pkgver=20051213 +pkgrel=1 pkgdesc="German (Switzerland) dictionary for Hunspell" -url="http://lingucomponent.openoffice.org/spell_dic.html" +url="http://www.j3e.de/hunspell/" rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') archs=('i686' 'x86_64') -up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep 'German (Switzerland)' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" -source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) +up2date="lynx -dump $url | grep -m1 de_CH | sed 's/.*-\(.*\)\.z.*/\1/'" +source=(http://www.j3e.de/hunspell/$lang.zip) install=$pkgname.install -sha1sums=('d39ad2549b003544111464ab928b6778b061cc8d') +sha1sums=('de75be0efe486a69a24f13ec33be5bb0357dc599') build() { Fmkdir usr/share/myspell From boobaa at frugalware.org Sat Jul 21 11:52:56 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:52:57 2007 Subject: [Frugalware-git] frugalware-current: hunspell-sk-20050911-1-i686 Message-ID: <20070721095256.3880C13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=416030e8e47a4830f3f0924b7eb63ee9551639ef commit 416030e8e47a4830f3f0924b7eb63ee9551639ef Author: CSÉCSY László Date: Sat Jul 21 11:51:35 2007 +0200 hunspell-sk-20050911-1-i686 version bump updated url, up2date diff --git a/source/locale-extra/hunspell-sk/FrugalBuild b/source/locale-extra/hunspell-sk/FrugalBuild index 910223b..5e112ce 100644 --- a/source/locale-extra/hunspell-sk/FrugalBuild +++ b/source/locale-extra/hunspell-sk/FrugalBuild @@ -3,18 +3,18 @@ lang=sk_SK pkgname=hunspell-sk -pkgver=20050228 -pkgrel=2 +pkgver=20050911 +pkgrel=1 pkgdesc="Slovak dictionary for Hunspell" -url="http://lingucomponent.openoffice.org/spell_dic.html" +url="http://wiki.services.openoffice.org/wiki/Dictionaries" rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') archs=('i686' 'x86_64') -up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep Slovak | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" +up2date="lynx -dump http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ | grep ']sk_SK.zip' | sed 's/Jan/01/;s/Feb/02/;s/Mar/03/;s/Apr/04/;s/May/05/;s/Jun/06/;s/Jul/07/;s/Aug/08/;s/Sep/09/;s/Oct/10/;s/Nov/11/;s/Dec/12/;s/.* \([0-9]\{2\}\)-\([0-9]\{2\}\)-\([0-9]\{4\}\).*/\3\2\1/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('38ff3e892eacbbb675cc8d833a8ddf18bdef62a8') +sha1sums=('a5a703b2da40a16db166718372a2a6842f6671e2') build() { Fmkdir usr/share/myspell From boobaa at frugalware.org Sat Jul 21 11:58:08 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 11:58:10 2007 Subject: [Frugalware-git] frugalware-current: hunspell-hu-20070517-1-i686 Message-ID: <20070721095808.0398313A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0774f926ecf49474516b2e5a4dbf8dce61abc185 commit 0774f926ecf49474516b2e5a4dbf8dce61abc185 Author: CSÉCSY László Date: Sat Jul 21 11:58:04 2007 +0200 hunspell-hu-20070517-1-i686 version bump updated up2date diff --git a/source/locale-extra/hunspell-hu/FrugalBuild b/source/locale-extra/hunspell-hu/FrugalBuild index 176e434..b742a88 100644 --- a/source/locale-extra/hunspell-hu/FrugalBuild +++ b/source/locale-extra/hunspell-hu/FrugalBuild @@ -3,18 +3,18 @@ lang=hu_HU pkgname=hunspell-hu -pkgver=20060727 -pkgrel=2 +pkgver=20070517 +pkgrel=1 pkgdesc="Hungarian dictionary for Hunspell" url="http://wiki.services.openoffice.org/wiki/Dictionaries" rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') archs=('i686' 'x86_64') -up2date="elinks -dump $url | grep 3]Hungarian | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" +up2date="lynx -dump http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ | grep ']hu_HU.zip' | sed 's/Jan/01/;s/Feb/02/;s/Mar/03/;s/Apr/04/;s/May/05/;s/Jun/06/;s/Jul/07/;s/Aug/08/;s/Sep/09/;s/Oct/10/;s/Nov/11/;s/Dec/12/;s/.* \([0-9]\{2\}\)-\([0-9]\{2\}\)-\([0-9]\{4\}\).*/\3\2\1/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('f5b41f34ea1819ec18a19a84a7dbc8b43949f139') +sha1sums=('75047e8dc8998ea16f77dd58da0a26c30a388c5e') build() { Fmkdir usr/share/myspell From boobaa at frugalware.org Sat Jul 21 12:00:42 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 12:00:43 2007 Subject: [Frugalware-git] frugalware-current: hunspell-it-20061130-1-i686 Message-ID: <20070721100042.448D113A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=952b94875df60818a1193701b60d43bf720c2ef5 commit 952b94875df60818a1193701b60d43bf720c2ef5 Author: CSÉCSY László Date: Sat Jul 21 12:00:36 2007 +0200 hunspell-it-20061130-1-i686 version bump updated url, up2date diff --git a/source/locale-extra/hunspell-it/FrugalBuild b/source/locale-extra/hunspell-it/FrugalBuild index a00ba46..04eab05 100644 --- a/source/locale-extra/hunspell-it/FrugalBuild +++ b/source/locale-extra/hunspell-it/FrugalBuild @@ -3,18 +3,18 @@ lang=it_IT pkgname=hunspell-it -pkgver=20050118 -pkgrel=2 +pkgver=20061130 +pkgrel=1 pkgdesc="Italian dictionary for Hunspell" -url="http://lingucomponent.openoffice.org/spell_dic.html" +url="http://wiki.services.openoffice.org/wiki/Dictionaries" rodepends=('hunspell>=1.0.8') provides=('hunspell-dict') groups=('locale-extra') archs=('i686' 'x86_64') -up2date="elinks -dump http://lingucomponent.openoffice.org/spell_dic.html | grep Italian | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" +up2date="lynx -dump $url | grep -m1 'English (United Kingdom)' | sed 's/.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1\2\3/'" source=(http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/$lang.zip) install=$pkgname.install -sha1sums=('f92d7c81eda231e6615bffcc82372eb0f19c328f') +sha1sums=('6c27ad97400e6be0981bab403961794fc68eccb4') build() { Fmkdir usr/share/myspell From boobaa at frugalware.org Sat Jul 21 12:10:23 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 12:10:24 2007 Subject: [Frugalware-git] frugalware-current: sword-gerlut-1.2-2-i686 Message-ID: <20070721101023.0C47013A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=29469473227c44c1896b21c08a7b82efbd4b0680 commit 29469473227c44c1896b21c08a7b82efbd4b0680 Author: CSÉCSY László Date: Sat Jul 21 12:10:06 2007 +0200 sword-gerlut-1.2-2-i686 changed to GerLut1545, as there is no GerLut module anymore diff --git a/source/locale-extra/sword-gerlut/FrugalBuild b/source/locale-extra/sword-gerlut/FrugalBuild index 12820c7..810663f 100644 --- a/source/locale-extra/sword-gerlut/FrugalBuild +++ b/source/locale-extra/sword-gerlut/FrugalBuild @@ -3,16 +3,16 @@ pkgname=sword-gerlut pkgver=1.2 -pkgrel=1 -pkgdesc="German Luther Bibel (1912) module for Sword" +pkgrel=2 +pkgdesc="German Unrevidierte Luther Uebersetzung von 1545 module for Sword" url='http://www.crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut' depends=('sword') makedepends=('unzip') groups=('locale-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut | grep 'Module Version' | sed 's/.*Module Version *\([0-9\.]*\).*/\1/'" -source=(http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLut.zip) -sha1sums=('70a29be5250e6b8eb30c4634fdb20ada6c3ca558') +up2date="lynx -dump http://www.crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut1545 | grep 'Module Version' | sed 's/.*Module Version *\([0-9\.]*\).*/\1/'" +source=(http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLut1545.zip) +sha1sums=('7c81da0bcd35a2941098510a4105b1c4393e0f05') build() { From boobaa at frugalware.org Sat Jul 21 12:46:12 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jul 21 12:46:29 2007 Subject: [Frugalware-git] frugalware-current: opera-9.22-1-i686 Message-ID: <20070721104612.BD3CE13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c6d9e01523da13e1f2140d03ab6985e668c673c7 commit c6d9e01523da13e1f2140d03ab6985e668c673c7 Author: CSÉCSY László Date: Sat Jul 21 12:46:06 2007 +0200 opera-9.22-1-i686 version bump closes #2266 in -current diff --git a/source/xapps-extra/opera/FrugalBuild b/source/xapps-extra/opera/FrugalBuild index 8d325ac..5e26e09 100644 --- a/source/xapps-extra/opera/FrugalBuild +++ b/source/xapps-extra/opera/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=opera -pkgver=9.21 -pkgextraver=20070510.1-static-qt.i386-en +pkgver=9.22 +pkgextraver=20070716.1-static-qt.i386-en pkgrel=1 pkgdesc="Opera web browser." url="http://www.opera.com/linux/" @@ -12,7 +12,7 @@ depends=('libxcb' 'libice' 'libxext' 'libx11' 'libsm' 'libxt' 'zlib') groups=('xapps-extra') archs=('i686') up2date="lynx -dump ftp://ftp.opera.com/pub/opera/linux/ |grep -wo opera.*[0-9][0-9][0-9] |sort -r | sed -ne 's|.*x/\(.*\)|\1|;s/\([0-9]\)/\1./;1 p'" -source=(ftp://ftp.opera.com/pub/opera/linux/921/final/en/i386/static/opera-$pkgver-$pkgextraver.tar.bz2) +source=(ftp://ftp.opera.com/pub/opera/linux/${pkgver//./}/final/en/i386/static/opera-$pkgver-$pkgextraver.tar.bz2) options=('nobuild' 'nodocs') _F_desktop_name=Opera _F_desktop_desc="Opera Internet Web Suite" @@ -20,10 +20,10 @@ _F_desktop_icon=/usr/share/opera/images/opera_48x48.png build() { - Fcd $pkgname-$pkgver-$pkgextraver-641 + Fcd $pkgname-$pkgver-$pkgextraver-655 ./install.sh --prefix=/usr --DESTDIR=$Fdestdir || Fdie _F_desktop_categories="Network;" Fdesktop2 echo "StartUpNotify=false" >> $Fdestdir$Fmenudir/$pkgname.desktop || Fdie } -sha1sums=('d8679765141483165da05e558930090fa0f6a311') +sha1sums=('bdcbdd5e8303f42e5af254f9b074fb19c3e90436') From crazy at frugalware.org Sat Jul 21 12:58:12 2007 From: crazy at frugalware.org (crazy) Date: Sat Jul 21 12:58:15 2007 Subject: [Frugalware-git] frugalware-current: thunderbird-2.0.0.5-1-i686 Message-ID: <20070721105812.8B5FF13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=9a055b1e3d57e731844a12925086f8ca83f0d935 commit 9a055b1e3d57e731844a12925086f8ca83f0d935 Author: crazy Date: Sat Jul 21 12:55:46 2007 +0200 thunderbird-2.0.0.5-1-i686 * Version bump * closes #2264 in -current diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index 12cc277..de5349b 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Krisztian VASAS pkgname=thunderbird -pkgver=2.0.0.4 +pkgver=2.0.0.5 pkgrel=1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" From vmiklos at frugalware.org Sat Jul 21 13:07:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:07:35 2007 Subject: [Frugalware-git] setup: updates for 0.7.8 Message-ID: <20070721110732.B6F9F13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=e5978b76c52e6e7bc2d3b3e569f49d65ca564b90 commit e5978b76c52e6e7bc2d3b3e569f49d65ca564b90 Author: VMiklos Date: Sat Jul 21 13:06:12 2007 +0200 updates for 0.7.8 diff --git a/NEWS b/NEWS index 31d4d7a..a9cfd30 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.7.8 - fix Italian translation for 0.7pre2 0.7.7 - create /var/log/setup.log on the target system. most user answers and external command calls (including the output of non-interactive commands) are logged. all logged lines are diff --git a/configure b/configure index f82ce9d..820a660 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ packages = ['bash', 'kernel', 'busybox', 'dhcpcd', 'dialog', 'e2fsprogs', 'device-mapper', 'lvm2'] # when releasing a new setup, please update this :) -version = "0.7.7" +version = "0.7.8" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From crazy at frugalware.org Sat Jul 21 13:13:04 2007 From: crazy at frugalware.org (crazy) Date: Sat Jul 21 13:13:05 2007 Subject: [Frugalware-git] frugalware-current: tcpdump-3.9.6-2-i686 Message-ID: <20070721111304.5F45B13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=8fc7d149bd5c4dbd58f94370cb1f4665b0943edf commit 8fc7d149bd5c4dbd58f94370cb1f4665b0943edf Author: crazy Date: Sat Jul 21 13:10:52 2007 +0200 tcpdump-3.9.6-2-i686 * [SEC] relbump * added CVE-2007-3798.patch * closes #2270 in -current diff --git a/source/network/tcpdump/CVE-2007-3798.patch b/source/network/tcpdump/CVE-2007-3798.patch new file mode 100644 index 0000000..fd4c2c3 --- /dev/null +++ b/source/network/tcpdump/CVE-2007-3798.patch @@ -0,0 +1,98 @@ +=================================================================== +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; + diff --git a/source/network/tcpdump/FrugalBuild b/source/network/tcpdump/FrugalBuild index 502929f..f950081 100644 --- a/source/network/tcpdump/FrugalBuild +++ b/source/network/tcpdump/FrugalBuild @@ -4,15 +4,16 @@ pkgname=tcpdump pkgver=3.9.6 -pkgrel=1 +pkgrel=2 pkgdesc="Tcpdump is for dumping traffic on a network" url="http://www.tcpdump.org" depends=('openssl' 'libpcap>=0.9.6') groups=('network') archs=('i686' 'x86_64') -source=($url/release/$pkgname-$pkgver.tar.gz CVE-2007-1218.patch) +source=($url/release/$pkgname-$pkgver.tar.gz CVE-2007-1218.patch CVE-2007-3798.patch) up2date="lynx -dump $url/release/|grep 'tcpdump-\(.*\).tar.gz'|Flasttar" Fconfopts="$Fconfopts --enable-ipv6" -sha1sums=('a07907268c200f90a8b7c5dbc6a1427917cc1058'\ - '329385e248a9e28793095caa618fbd7826cd937f') +sha1sums=('a07907268c200f90a8b7c5dbc6a1427917cc1058' \ + '329385e248a9e28793095caa618fbd7826cd937f' \ + 'e347e948bf47994c770d35d3a5d1753e723b51e3') # optimization OK From vmiklos at frugalware.org Sat Jul 21 13:14:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:14:30 2007 Subject: [Frugalware-git] frugalware: updates for 0.7pre2 Message-ID: <20070721111419.DDA2713A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware/.git;a=commitdiff;h=992035aec948e7de4a42d1d0b46e0b4ed64e0331 commit 992035aec948e7de4a42d1d0b46e0b4ed64e0331 Author: VMiklos Date: Sat Jul 21 13:11:09 2007 +0200 updates for 0.7pre2 diff --git a/Makefile b/Makefile index 0a7dff5..042c86c 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.7pre1 +VERSION = 0.7pre2 CODENAME = Sayshell FRUGALWARE_LANGS = de hu it From vmiklos at frugalware.org Sat Jul 21 13:14:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:14:31 2007 Subject: [Frugalware-git] frugalware: Makefile: filter merges and add tags to changelog Message-ID: <20070721111420.3A5FF13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware/.git;a=commitdiff;h=f6d0884d8098ab7f25709fded52ac994a159d81b commit f6d0884d8098ab7f25709fded52ac994a159d81b Author: VMiklos Date: Sat Jul 21 13:13:02 2007 +0200 Makefile: filter merges and add tags to changelog diff --git a/Makefile b/Makefile index 042c86c..c13f7f1 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ endif dist: git-archive --format=tar --prefix=frugalware-$(VERSION)/ HEAD > frugalware-$(VERSION).tar mkdir -p frugalware-$(VERSION) - git log > frugalware-$(VERSION)/Changelog + git log --no-merges |git name-rev --tags --stdin > frugalware-$(VERSION)/Changelog tar rf frugalware-$(VERSION).tar frugalware-$(VERSION)/Changelog rm -rf frugalware-$(VERSION) gzip -f -9 frugalware-$(VERSION).tar From vmiklos at frugalware.org Sat Jul 21 13:16:43 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:16:45 2007 Subject: [Frugalware-git] frugalware-current: frugalware-0.7pre2-1-x86_64 Message-ID: <20070721111643.CEABB13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=ea785abc4fc6f3f1f72e1b43b4a177ad3cf28e33 commit ea785abc4fc6f3f1f72e1b43b4a177ad3cf28e33 Author: VMiklos Date: Sat Jul 21 13:16:30 2007 +0200 frugalware-0.7pre2-1-x86_64 version bump diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 8774e04..843eb98 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=frugalware -pkgver=0.7pre1 +pkgver=0.7pre2 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" From crazy at frugalware.org Sat Jul 21 13:29:57 2007 From: crazy at frugalware.org (crazy) Date: Sat Jul 21 13:30:00 2007 Subject: [Frugalware-git] frugalware-current: lighttpd-1.4.15-2-i686 Message-ID: <20070721112957.4BC6713A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=53dbd139f259f68cb8a8e8d9d110f4ec96454ec5 commit 53dbd139f259f68cb8a8e8d9d110f4ec96454ec5 Author: crazy Date: Sat Jul 21 13:27:37 2007 +0200 lighttpd-1.4.15-2-i686 * [SEC] relbump * added SA26130.patch * closes #2271 in -current diff --git a/source/network-extra/lighttpd/FrugalBuild b/source/network-extra/lighttpd/FrugalBuild index 056318a..e79df26 100644 --- a/source/network-extra/lighttpd/FrugalBuild +++ b/source/network-extra/lighttpd/FrugalBuild @@ -4,18 +4,26 @@ pkgname=lighttpd pkgver=1.4.15 -pkgrel=1 +pkgrel=2 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) + $pkgname.conf rc.$pkgname index.html \ + http://frugalware.org/images/frugalware.png \ + SA26130.patch) 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' \ + '1a1d742bba61f24b42a4aea99623ceabbd345d3e' \ + 'f30cb68ad73467a43317afabe0f4a90472df222e' \ + 'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \ + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \ + '6af229f0b0699fb64769f269f40b534c6e1fbbeb') build() { @@ -37,9 +45,5 @@ build() Ffile frugalware.png /var/www/htdocs/frugalware.png } -sha1sums=('742b567eca011fa5ef2cc506038389a4959eab56'\ - '1a1d742bba61f24b42a4aea99623ceabbd345d3e'\ - 'f30cb68ad73467a43317afabe0f4a90472df222e'\ - 'd6c2577965670f3e116d9358551cdc2f4b10b4b4'\ - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') + # optimization OK diff --git a/source/network-extra/lighttpd/SA26130.patch b/source/network-extra/lighttpd/SA26130.patch new file mode 100644 index 0000000..c242f9c --- /dev/null +++ b/source/network-extra/lighttpd/SA26130.patch @@ -0,0 +1,483 @@ +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 priyank at frugalware.org Sat Jul 21 13:31:44 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 13:31:48 2007 Subject: [Frugalware-git] gfpm: Installing packages now displays a progressbar Message-ID: <20070721113144.19D2C13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=244e431fc6dc6cb814f5012f263f2fadce3cb9cf commit 244e431fc6dc6cb814f5012f263f2fadce3cb9cf Author: Priyank Date: Sat Jul 21 16:59:44 2007 +0530 Installing packages now displays a progressbar * gfpm-progress: added event and progress callbacks * gfpm-progress: other minor fixes (NOTE: This is still very unstable) diff --git a/src/Makefile.am b/src/Makefile.am index 8d7582d..964b818 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,6 +8,7 @@ bin_PROGRAMS=gfpm gfpm_SOURCES= \ gfpm-db.c \ gfpm-packagelist.c \ + gfpm-progress.c \ gfpm-interface.c \ gfpm-messages.c \ gfpm-about.c \ diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index ef371a8..0d85a93 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -33,12 +33,15 @@ #include "gfpm-interface.h" #include "gfpm-messages.h" #include "gfpm-packagelist.h" +#include "gfpm-progress.h" #include "gfpm-about.h" #include "gfpm-db.h" extern GladeXML *xml; extern PM_DB *sync_db; extern PM_DB *local_db; +extern GfpmList *install_list; +extern GfpmList *remove_list; extern char *repo; /* The GFPM main window */ @@ -173,6 +176,7 @@ gfpm_interface_init (void) /* initialize dbs */ gfpm_db_init (); + gfpm_progress_init (); /* load default repo */ gfpm_load_groups_tvw ("frugalware-current"); @@ -185,6 +189,39 @@ gfpm_interface_init (void) return; } +static void +cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) +{ + if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) + g_print ("failed to init transaction (%s) \n", pacman_strerror(pm_errno)); + gfpm_progress_show (TRUE); + /* process remove list first */ + if (gfpm_package_list_is_empty(GFPM_REMOVE_LIST)) + { + g_print ("remove list is empty"); + } + if (gfpm_package_list_is_empty(GFPM_INSTALL_LIST)) + { + g_print ("performing install list"); + GList *i = NULL; + PM_LIST *data, *pkgs; + for (i = install_list; i; i = i->next) + { + char *target = i->data; + pacman_trans_addtarget (target); + } + if (pacman_trans_prepare(&data) == -1) + 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"); + if (pacman_trans_commit(&data) == -1) + g_print ("failed to commit transaction (%s)\n", pacman_strerror(pm_errno)); + pacman_trans_release (); + } + +} + + void gfpm_update_status (const gchar *message) { diff --git a/src/gfpm-packagelist.c b/src/gfpm-packagelist.c index 5545e6b..f0cd567 100644 --- a/src/gfpm-packagelist.c +++ b/src/gfpm-packagelist.c @@ -26,8 +26,8 @@ #include "gfpm-packagelist.h" -static GfpmList *install_list = NULL; -static GfpmList *remove_list = NULL; +GfpmList *install_list = NULL; +GfpmList *remove_list = NULL; void gfpm_package_list_add (GfpmListType type, const gchar *item) diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 6c9fae7..ec73718 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -22,6 +22,7 @@ #define _GNU_SOURCE #include +#include "gfpm.h" #include "gfpm-progress.h" #ifdef HAVE_CONFIG_H @@ -78,14 +79,74 @@ gfpm_progress_update (netbuf *ctl, int xferred, void *arg) size = *(int*)arg; per = ((float)(xferred+offset) / size) * 100; sprintf (text, "%d %%", per); + while (gtk_events_pending ()) + gtk_main_iteration (); gtk_progress_bar_set_text (progressbar, text); gtk_progress_bar_set_fraction (progressbar, (float)per/100); gfpm_progress_set_sub_text (reponame); + return 1; +} + +void +gfpm_progress_install (unsigned char event, char *pkgname, int percent, int howmany, int remain) +{ + char *main_text = NULL; + char *sub_text = NULL; + + if (!pkgname) + return; + if (percent > 100) + return; while (gtk_events_pending ()) gtk_main_iteration (); + switch (event) + { + case PM_TRANS_PROGRESS_ADD_START: + main_text = g_strdup (_("Installing package")); + break; + case PM_TRANS_PROGRESS_UPGRADE_START: + main_text = g_strdup (_("Upgrading package")); + break; + case PM_TRANS_PROGRESS_REMOVE_START: + main_text = g_strdup (_("Removing package")); + break; + case PM_TRANS_PROGRESS_CONFLICTS_START: + main_text = g_strdup (_("Checking package for file conflicts")); + break; + } + gfpm_progress_set_main_text (main_text); + sub_text = g_strdup_printf ("(%d/%d) %s", remain, howmany, pkgname); + gfpm_progress_set_sub_text (sub_text); + gtk_progress_bar_set_fraction (progressbar, (float)percent/100); + g_free (main_text); + g_free (sub_text); - return 1; + return; +} + +void +gfpm_progress_event (unsigned char event, void *data1, void *data2) +{ + char *str = NULL; + while (gtk_events_pending ()) + gtk_main_iteration (); + switch (event) + { + case PM_TRANS_EVT_CHECKDEPS_START: str = g_strdup(_("Checking dependencies")); + break; + case PM_TRANS_EVT_FILECONFLICTS_START: str = g_strdup (_("Checking for file conflicts")); + break; + case PM_TRANS_EVT_RESOLVEDEPS_START: str = g_strdup (_("Resolving dependencies")); + break; + case PM_TRANS_EVT_INTERCONFLICTS_START: str = g_strdup (_("Looking for inter-conflicts")); + break; + } + gfpm_progress_set_main_text (str); + gfpm_progress_set_sub_text (_("Please wait...")); + g_free (str); + + return; } void diff --git a/src/gfpm-progress.h b/src/gfpm-progress.h index accd17b..d4a4fee 100644 --- a/src/gfpm-progress.h +++ b/src/gfpm-progress.h @@ -14,8 +14,12 @@ typedef void* netbuf; void gfpm_progress_init (void); +void gfpm_progress_event (unsigned char, void *, void *); + 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_set_main_text (const char *msg); From vmiklos at frugalware.org Sat Jul 21 13:42:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:42:05 2007 Subject: [Frugalware-git] setup: Makefile: update darcs references Message-ID: <20070721114203.E832413A419F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=2204c773a20fba894fb236751b9daee805d62e95 commit 2204c773a20fba894fb236751b9daee805d62e95 Author: VMiklos Date: Sat Jul 21 13:38:13 2007 +0200 Makefile: update darcs references diff --git a/Makefile b/Makefile index c2c4e2f..66a9de1 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ ifeq ($(DEBUG),) endif VERSION=$(shell grep ^version configure |sed 's/.*"\(.*\)"/\1/') -DIR=$(shell [ -d _darcs/pristine ] && echo pristine || echo current) GPG=$(shell [ -d ../releases ] && echo true || echo false) QEMU_OPTS ?= -hda ~/documents/qemu/hda.img UML_OPTS ?= ubd0=~/documents/uml/root_fs eth0=tuntap,,,192.168.0.254 mem=128MB @@ -177,7 +176,7 @@ initrd_gz: clean config.mak devices initrd gzip -9 -c initrd-$(CARCH).img > initrd-$(CARCH).img.gz update: - darcs pull -a -v + git pull $(MAKE) -C src clean ifeq ($(STABLE),false) $(MAKE) -C src current From vmiklos at frugalware.org Sat Jul 21 13:42:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:42:06 2007 Subject: [Frugalware-git] setup: HACKING: updated patch sending part for git Message-ID: <20070721114203.CEAA713A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=2d9dd59fbe10c845f358fd96c57df5667c2c9133 commit 2d9dd59fbe10c845f358fd96c57df5667c2c9133 Author: VMiklos Date: Sat Jul 21 13:28:53 2007 +0200 HACKING: updated patch sending part for git diff --git a/HACKING b/HACKING index 1d3aae5..cb9ffd1 100644 --- a/HACKING +++ b/HACKING @@ -2,12 +2,22 @@ Patches ======= If you have made changes to the source and would like to send these changes -to us, you can use darcs to send the changes. +to us, you can use git format-patch to create patches: -darcs send --to=frugalware-devel@frugalware.org --from=your@email.addr.ess \ - --subject="My setup patch" +1) Run git log to get the patch hash of the latest patch you do _not_ want to +send: -You need to make sure that Postfix or another Mail Transport Agent is running. +$ git log --pretty=oneline +ff5700b293015ddfb269838f1f74abb586c199c5 configsource: more LOG() calls +cdc6f87e51d4443c774f83a4be0168d06a7927c1 postconf: use fw_system_interactive() +1634dda91f6ecdd0ea22eff6fa3a5874b0a81f59 partdisk: use fw_system_interactive() + +If you want to send the first, two, then run: + +$ git format-patch 1634dda91f6ecdd0ea22eff6fa3a5874b0a81f59.. + +And just subscribe to the frugalware-devel@frugalware.org mailing list and send +the created patches to us. Testing changes =============== From vmiklos at frugalware.org Sat Jul 21 13:42:04 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:42:07 2007 Subject: [Frugalware-git] setup: README: updated darcs references Message-ID: <20070721114204.217E213A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=2d6c890e1181ee18be56aead88c94f9646c04cfc commit 2d6c890e1181ee18be56aead88c94f9646c04cfc Author: VMiklos Date: Sat Jul 21 13:39:51 2007 +0200 README: updated darcs references diff --git a/README b/README index c89a359..a217309 100644 --- a/README +++ b/README @@ -19,13 +19,13 @@ From scratch If you never compiled the setup, you need the following steps: cd ~ -mkdir darcs -cd darcs -darcs get --partial http://darcs.frugalware.org/repos/setup -darcs get --partial http://darcs.frugalware.org/repos/translations +mkdir git +cd git +git clone http://git.frugalware.org/repos/setup/.git +git clone http://git.frugalware.org/repos/translations/.git su - -ln -s ~user/darcs ./ -cd darcs/setup +ln -s ~user/git ./ +cd git/setup then read the section titled "Building". @@ -37,7 +37,7 @@ Cleaning up If you have built the initrd in the past and you don't want to start from scratch, just run 'make distclean' as root. If you are using setup from the -darcs repo, you should run 'darcs pull', too. +git repo, you should run 'git pull', too. Adding new translations ----------------------- From vmiklos at frugalware.org Sat Jul 21 13:56:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:56:35 2007 Subject: [Frugalware-git] frugalware-current: fwsetup-0.7.8-1-x86_64 Message-ID: <20070721115633.8E22013A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3050b7e137361c07cc7a4aa5c33fb181e00c4472 commit 3050b7e137361c07cc7a4aa5c33fb181e00c4472 Author: VMiklos Date: Sat Jul 21 13:22:49 2007 +0200 fwsetup-0.7.8-1-x86_64 version bump depends on frugalware>=0.7pre2 diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index a4048f4..ee93379 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: VMiklos pkgname=fwsetup -pkgver=0.7.7 +pkgver=0.7.8 pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() -makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools') +makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.7pre2') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/releases/ |Flasttar" From vmiklos at frugalware.org Sat Jul 21 13:56:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 13:56:36 2007 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.5.9-2-x86_64 Message-ID: <20070721115633.AC19813A419F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0f3596492ea6ab3b1a883f128d983484a50530c3 commit 0f3596492ea6ab3b1a883f128d983484a50530c3 Author: VMiklos Date: Sat Jul 21 13:56:16 2007 +0200 pacman-g2-3.5.9-2-x86_64 added patch from darcs to fix the '-Ss' bug diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 607da6c..46ee6e2 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pacman-g2 pkgver=3.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current}) @@ -13,6 +13,7 @@ Finclude mono groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/releases/ |Flasttar" -source=($url/releases/$pkgname-$pkgver.tar.gz) -signatures=("$source.asc") +source=($url/releases/$pkgname-$pkgver.tar.gz \ +http://darcs.frugalware.org/patches/pacman-g2/20070721114532-e2957-654719e4f6aeadfcb1bd4520b5ce2ce272a0baf6.patch) +signatures=("$source.asc" '') # optimization OK From vmiklos at frugalware.org Sat Jul 21 14:23:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 14:23:59 2007 Subject: [Frugalware-git] setup: README: added an internals section Message-ID: <20070721122356.A62FF13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=177fb0c91edf70e07e4b8dd8ace0ba1280f73d55 commit 177fb0c91edf70e07e4b8dd8ace0ba1280f73d55 Author: VMiklos Date: Sat Jul 21 14:22:40 2007 +0200 README: added an internals section diff --git a/README b/README index a217309..b3eeb34 100644 --- a/README +++ b/README @@ -1,5 +1,13 @@ This is the source of the Frugalware Linux installer. +Internals +--------- + +The whole setup code is kept in the memory during the installation, so we try +to keep the it small. This means that all the programs we include in the initrd +is written in C or is a shellscript. No C++ or Python or anything else. For +detailed developer information, see the HACKING file. + Building -------- From priyank at frugalware.org Sat Jul 21 14:32:45 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 14:32:48 2007 Subject: [Frugalware-git] gfpm: gfpm.glade: new dialog for installing packages from an existing .fpm file. Message-ID: <20070721123245.1B26813A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=57581044b7640f1a27cba5729bbe2e16860392c5 commit 57581044b7640f1a27cba5729bbe2e16860392c5 Author: Priyank Date: Sat Jul 21 17:31:13 2007 +0530 gfpm.glade: new dialog for installing packages from an existing .fpm file. diff --git a/glade/gfpm.glade b/glade/gfpm.glade index 761630f..c1c4407 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -133,6 +133,7 @@ Install from File True gtk-go-down + False @@ -673,4 +674,93 @@ Installed packages + + 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 + 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 + + + + + From vmiklos at frugalware.org Sat Jul 21 14:47:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 14:47:42 2007 Subject: [Frugalware-git] homepage-ng: new git repo: frugalwareutils Message-ID: <20070721124740.870D9186812A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=ec8cc5754fa3b84d28ab77763e039a5c9e044732 commit ec8cc5754fa3b84d28ab77763e039a5c9e044732 Author: VMiklos Date: Sat Jul 21 14:46:14 2007 +0200 new git repo: frugalwareutils diff --git a/git/repos/frugalwareutils b/git/repos/frugalwareutils new file mode 120000 index 0000000..df85d8d --- /dev/null +++ b/git/repos/frugalwareutils @@ -0,0 +1 @@ +../../../frugalwareutils/frugalwareutils \ No newline at end of file From vmiklos at frugalware.org Sat Jul 21 15:00:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 15:00:49 2007 Subject: [Frugalware-git] frugalwareutils: updates for 0.7.4 Message-ID: <20070721130048.98C7713A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils/.git;a=commitdiff;h=9edd0ff0d8a54f3ed9ad9e4ecda7c8ef527224cf commit 9edd0ff0d8a54f3ed9ad9e4ecda7c8ef527224cf Author: VMiklos Date: Sat Jul 21 14:59:25 2007 +0200 updates for 0.7.4 diff --git a/Makefile.inc b/Makefile.inc index 5516075..d40f083 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.7.3 +VERSION = 0.7.4 MAJORVER = 0 DO_RECURSIVE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done diff --git a/NEWS b/NEWS index 1c2be6a..a5056bb 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.7.4 - grubconfig, libfrugalwareutils: spelling fixes + - added Italian translation + - converted to git 0.7.3 - netconfig: tons of minos bugfixes and improvements - grubconfig: support for kernel parameters containing double dots From vmiklos at frugalware.org Sat Jul 21 15:04:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 15:04:24 2007 Subject: [Frugalware-git] setup: README: typo fix Message-ID: <20070721130423.C126D13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=c74c85a64cadf0ef9c55faa72dac916713bf6d45 commit c74c85a64cadf0ef9c55faa72dac916713bf6d45 Author: VMiklos Date: Sat Jul 21 15:03:07 2007 +0200 README: typo fix thx crazy :) diff --git a/README b/README index b3eeb34..1279725 100644 --- a/README +++ b/README @@ -4,8 +4,8 @@ Internals --------- The whole setup code is kept in the memory during the installation, so we try -to keep the it small. This means that all the programs we include in the initrd -is written in C or is a shellscript. No C++ or Python or anything else. For +to keep it small. This means that all the programs we include in the initrd is +written in C or is a shellscript. No C++ or Python or anything else. For detailed developer information, see the HACKING file. Building From priyank at frugalware.org Sat Jul 21 15:07:07 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 15:07:10 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: init separate transactions for sync and remove. Message-ID: <20070721130707.46DBC13A419F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=162a5a20e69070e6464f9d6f7984d02065c55f5a commit 162a5a20e69070e6464f9d6f7984d02065c55f5a Author: Priyank Date: Sat Jul 21 18:34:47 2007 +0530 gfpm-interface: init separate transactions for sync and remove. diff --git a/glade/gfpm.glade b/glade/gfpm.glade index c1c4407..fca1648 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -169,9 +169,26 @@ True - + 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 + + diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 0d85a93..2850b96 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -192,17 +192,39 @@ gfpm_interface_init (void) static void cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) { - if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) - g_print ("failed to init transaction (%s) \n", pacman_strerror(pm_errno)); + GString *errorstr = g_string_new (""); + gfpm_progress_show (TRUE); /* process remove list first */ if (gfpm_package_list_is_empty(GFPM_REMOVE_LIST)) { - g_print ("remove list is empty"); + if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) + { + gchar *str; + str = g_strdup_printf (_("Failed to init transaction (%s)\n"), pacman_strerror(pm_errno)); + errorstr = g_string_append (errorstr, str); + if (pm_errno == PM_ERR_HANDLE_LOCK) + errorstr = g_string_append (errorstr, + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + gfpm_error (errorstr->str); + return; + } } if (gfpm_package_list_is_empty(GFPM_INSTALL_LIST)) { - g_print ("performing install list"); + /* create transaction */ + if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) + { + gchar *str; + str = g_strdup_printf (_("Failed to init transaction (%s)\n"), pacman_strerror(pm_errno)); + errorstr = g_string_append (errorstr, str); + if (pm_errno == PM_ERR_HANDLE_LOCK) + errorstr = g_string_append (errorstr, + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + gfpm_error (errorstr->str); + return; + } + GList *i = NULL; PM_LIST *data, *pkgs; for (i = install_list; i; i = i->next) @@ -210,14 +232,19 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) char *target = i->data; pacman_trans_addtarget (target); } - if (pacman_trans_prepare(&data) == -1) - 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"); - if (pacman_trans_commit(&data) == -1) - g_print ("failed to commit transaction (%s)\n", pacman_strerror(pm_errno)); - pacman_trans_release (); + if (pacman_trans_prepare(&data) == -1) + 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) + g_print ("failed to commit transaction (%s)\n", pacman_strerror(pm_errno)); + else + gfpm_progress_set_sub_text (_("Done")); + } + pacman_trans_release (); } diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index ec73718..c73251f 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -103,16 +103,28 @@ gfpm_progress_install (unsigned char event, char *pkgname, int percent, int howm switch (event) { case PM_TRANS_PROGRESS_ADD_START: - main_text = g_strdup (_("Installing package")); + if (howmany > 1) + main_text = g_strdup (_("Installing packages")); + else + main_text = g_strdup (_("Installing package")); break; case PM_TRANS_PROGRESS_UPGRADE_START: - main_text = g_strdup (_("Upgrading package")); + if (howmany > 1) + main_text = g_strdup (_("Upgrading packages")); + else + main_text = g_strdup (_("Upgrading package")); break; case PM_TRANS_PROGRESS_REMOVE_START: - main_text = g_strdup (_("Removing package")); + if (howmany > 1) + main_text = g_strdup (_("Removing packages")); + else + main_text = g_strdup (_("Removing package")); break; case PM_TRANS_PROGRESS_CONFLICTS_START: - main_text = g_strdup (_("Checking package for file conflicts")); + if (howmany > 1) + main_text = g_strdup (_("Checking packages for file conflicts")); + else + main_text = g_strdup (_("Checking package for file conflicts")); break; } gfpm_progress_set_main_text (main_text); From vmiklos at frugalware.org Sat Jul 21 15:07:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 15:07:16 2007 Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.7.4-1-x86_64 Message-ID: <20070721130713.5E57C13A41A3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c6c9e707ce815859fa5947615c2c8562511d5ac2 commit c6c9e707ce815859fa5947615c2c8562511d5ac2 Author: VMiklos Date: Sat Jul 21 15:06:19 2007 +0200 frugalwareutils-0.7.4-1-x86_64 version bump diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 9df71e6..a762f38 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=frugalwareutils -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" From vmiklos at frugalware.org Sat Jul 21 15:08:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 15:08:44 2007 Subject: [Frugalware-git] frugalware-current: ignore .log and .bin files Message-ID: <20070721130829.F3801186821D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=41afb3853fe6746caeff505db6873b67747a36cc commit 41afb3853fe6746caeff505db6873b67747a36cc Author: VMiklos Date: Sat Jul 21 15:08:21 2007 +0200 ignore .log and .bin files diff --git a/.gitignore b/.gitignore index f677804..bbc41ce 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ Changelog *.jpg *.sign *.fpm +*.log +*.bin From priyank at frugalware.org Sat Jul 21 15:14:41 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 15:14:43 2007 Subject: [Frugalware-git] setup: README: grammar fix Message-ID: <20070721131441.18CD113A419F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=226d7cf1647ca81826e2a9352c932cddaf6a40f0 commit 226d7cf1647ca81826e2a9352c932cddaf6a40f0 Author: Priyank Date: Sat Jul 21 18:42:50 2007 +0530 README: grammar fix diff --git a/README b/README index 1279725..67c9159 100644 --- a/README +++ b/README @@ -4,8 +4,8 @@ Internals --------- The whole setup code is kept in the memory during the installation, so we try -to keep it small. This means that all the programs we include in the initrd is -written in C or is a shellscript. No C++ or Python or anything else. For +to keep it small. This means that all the programs we include in the initrd are +written in C or is a shell script. No C++ or Python or anything else. For detailed developer information, see the HACKING file. Building From vmiklos at frugalware.org Sat Jul 21 15:50:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 15:50:23 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: updated autogen.sh for git Message-ID: <20070721135019.0889013A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=602c08598df88094b498b8e066fb0043cd6d8f32 commit 602c08598df88094b498b8e066fb0043cd6d8f32 Author: VMiklos Date: Sat Jul 21 15:48:58 2007 +0200 gnetconfig: updated autogen.sh for git diff --git a/gnetconfig/autogen.sh b/gnetconfig/autogen.sh index 3581be8..50f4b09 100755 --- a/gnetconfig/autogen.sh +++ b/gnetconfig/autogen.sh @@ -40,12 +40,16 @@ fi if [ "$1" == "--dist" ]; then ver=`grep AC_INIT configure.ac|sed 's/.*, \([0-9\.]*\), .*/\1/'` - darcs changes >../_darcs/pristine/ChangeLog - darcs dist -d gnetconfig-$ver - rm ../_darcs/pristine/ChangeLog + git-archive --format=tar --prefix=gnetconfig-$ver/ HEAD | tar xf - + git log --no-merges |git name-rev --tags --stdin > gnetconfig-$ver/ChangeLog + cd gnetconfig-$ver + ./autogen.sh --git + cd .. + tar czf gnetconfig-$ver.tar.gz gnetconfig-$ver + rm -rf gnetconfig-$ver gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ - -ba -u 20F55619 ../gnetconfig-$ver.tar.gz - #mv ../gnetconfig-$ver.tar.gz.asc ../.. + -ba -u 20F55619 gnetconfig-$ver.tar.gz + #mv gnetconfig-$ver.tar.gz.asc ../.. exit 0 fi @@ -62,7 +66,7 @@ cp -f $(dirname $(which automake))/../share/automake/mkinstalldirs ./ cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./ automake -a -c --gnu --foreign -if [ "$1" == "--darcs" ]; then +if [ "$1" == "--git" ]; then rm -rf autom4te.cache fi From priyank at frugalware.org Sat Jul 21 16:01:42 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 16:01:44 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: many misc fixes Message-ID: <20070721140142.21D55186812A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=44095b3b032b45a4a3a556ab2e95000a344677fb commit 44095b3b032b45a4a3a556ab2e95000a344677fb Author: Priyank Date: Sat Jul 21 19:29:39 2007 +0530 gfpm-interface: many misc fixes * Do not show progressbar before the transaction has initted * Added callback for refreshing package databases * Minor fixes in progressbar functions diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 2850b96..86240f7 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -62,6 +62,7 @@ static void cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpoi static void cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data); static void cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data); +static void cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data); void gfpm_interface_init (void) @@ -156,7 +157,7 @@ gfpm_interface_init (void) g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_apply")), "clicked", G_CALLBACK(cb_gfpm_apply_btn_clicked), NULL); /* refresh db */ - //g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_refresh_button_clicked), NULL); + g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_gfpm_refresh_button_clicked), NULL); /* initialize progressbar */ //gfpm_progress_init (); @@ -194,7 +195,6 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) { GString *errorstr = g_string_new (""); - gfpm_progress_show (TRUE); /* process remove list first */ if (gfpm_package_list_is_empty(GFPM_REMOVE_LIST)) { @@ -224,7 +224,8 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_error (errorstr->str); return; } - + + gfpm_progress_show (TRUE); GList *i = NULL; PM_LIST *data, *pkgs; for (i = install_list; i; i = i->next) @@ -623,6 +624,17 @@ gfpm_load_files_txtvw (const char *pkg_name, gboolean inst) /* CALLBACKS */ static void +cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) +{ + gint ret; + gfpm_progress_set_main_text (_("Synchronizing package databases")); + gfpm_progress_show (TRUE); + ret = pacman_db_update (1, sync_db); + + return; +} + +static void cb_gfpm_repos_combo_changed (GtkComboBox *combo, gpointer data) { gint index; diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index c73251f..3072be7 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -153,6 +153,14 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) break; case PM_TRANS_EVT_INTERCONFLICTS_START: str = g_strdup (_("Looking for inter-conflicts")); break; + case PM_TRANS_EVT_REMOVE_START: str = g_strdup (_("Removing package")); + break; + case PM_TRANS_EVT_INTEGRITY_START: str = g_strdup (_("Checking package integrity")); + break; + case PM_TRANS_EVT_SCRIPTLET_START: str = g_strdup ((char*)data1); + break; + case PM_TRANS_EVT_RETRIEVE_START: str = g_strdup_printf (_("Retrieving packages from %s"), (char*)data1); + break; } gfpm_progress_set_main_text (str); gfpm_progress_set_sub_text (_("Please wait...")); From priyank at frugalware.org Sat Jul 21 16:25:47 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 16:25:49 2007 Subject: [Frugalware-git] gfpm: gfpm: allow packages to be removed Message-ID: <20070721142547.1AE5013A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=fd11201d87d5e36c2c1cf91ffa061aa86faa4fee commit fd11201d87d5e36c2c1cf91ffa061aa86faa4fee Author: Priyank Date: Sat Jul 21 19:54:06 2007 +0530 gfpm: allow packages to be removed * gfpm-progress: display detailed event info at every stage of operation in a substr. * gfpm-interface: implement basic package removal function. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 86240f7..56c2c7f 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -209,6 +209,23 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_error (errorstr->str); return; } + + gfpm_progress_show (TRUE); + GList *i = NULL; + PM_LIST *data, *pkgs; + for (i = remove_list; i; i = i->next) + { + char *target = i->data; + pacman_trans_addtarget (target); + } + if (pacman_trans_prepare(&data) == -1) + 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) + g_print ("failed to commit transaction (%s)\n", pacman_strerror(pm_errno)); } if (gfpm_package_list_is_empty(GFPM_INSTALL_LIST)) { @@ -241,12 +258,10 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) /* commit transaction */ if (pacman_trans_commit(&data) == -1) g_print ("failed to commit transaction (%s)\n", pacman_strerror(pm_errno)); - else - gfpm_progress_set_sub_text (_("Done")); - } pacman_trans_release (); + return; } diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 3072be7..a7f6acd 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -141,30 +141,44 @@ void gfpm_progress_event (unsigned char event, void *data1, void *data2) { char *str = NULL; + char *substr = NULL; while (gtk_events_pending ()) gtk_main_iteration (); switch (event) { - case PM_TRANS_EVT_CHECKDEPS_START: str = g_strdup(_("Checking dependencies")); + case PM_TRANS_EVT_CHECKDEPS_START: substr = g_strdup(_("Checking dependencies")); break; - case PM_TRANS_EVT_FILECONFLICTS_START: str = g_strdup (_("Checking for file conflicts")); + case PM_TRANS_EVT_FILECONFLICTS_START: substr = g_strdup (_("Checking for file conflicts")); break; - case PM_TRANS_EVT_RESOLVEDEPS_START: str = g_strdup (_("Resolving dependencies")); + case PM_TRANS_EVT_RESOLVEDEPS_START: substr = g_strdup (_("Resolving dependencies")); break; - case PM_TRANS_EVT_INTERCONFLICTS_START: str = g_strdup (_("Looking for inter-conflicts")); + case PM_TRANS_EVT_INTERCONFLICTS_START: substr = g_strdup (_("Looking for inter-conflicts")); break; - case PM_TRANS_EVT_REMOVE_START: str = g_strdup (_("Removing package")); + 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_DONE: substr = g_strdup (_("Done")); + 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: str = g_strdup (_("Checking package integrity")); + 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_START: substr = g_strdup ((char*)data1); break; - case PM_TRANS_EVT_SCRIPTLET_START: str = g_strdup ((char*)data1); + case PM_TRANS_EVT_SCRIPTLET_DONE: substr = g_strdup (_("Done")); break; - case PM_TRANS_EVT_RETRIEVE_START: str = g_strdup_printf (_("Retrieving packages from %s"), (char*)data1); + case PM_TRANS_EVT_RETRIEVE_START: substr = g_strdup_printf (_("Retrieving packages from %s"), (char*)data1); break; } - gfpm_progress_set_main_text (str); - gfpm_progress_set_sub_text (_("Please wait...")); - g_free (str); + //gfpm_progress_set_main_text (str); + gfpm_progress_set_sub_text (substr); + //g_free (str); + g_free (substr); return; } From priyank at frugalware.org Sat Jul 21 16:34:03 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 16:34:05 2007 Subject: [Frugalware-git] gfpm: gfpm-progress: display the name of the package being installed (for ADD operations) Message-ID: <20070721143403.AC49A13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=47f5ab3385b5a6db29b71301b001e3fff2f17633 commit 47f5ab3385b5a6db29b71301b001e3fff2f17633 Author: Priyank Date: Sat Jul 21 20:02:23 2007 +0530 gfpm-progress: display the name of the package being installed (for ADD operations) diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index a7f6acd..725087a 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -140,7 +140,6 @@ gfpm_progress_install (unsigned char event, char *pkgname, int percent, int howm void gfpm_progress_event (unsigned char event, void *data1, void *data2) { - char *str = NULL; char *substr = NULL; while (gtk_events_pending ()) gtk_main_iteration (); @@ -158,7 +157,9 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) case PM_TRANS_EVT_RESOLVEDEPS_DONE: case PM_TRANS_EVT_INTERCONFLICTS_DONE: substr = g_strdup (_("Done")); break; - case PM_TRANS_EVT_ADD_DONE: substr = g_strdup (_("Done")); + 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_REMOVE_START: substr = g_strdup (_("Removing package")); break; @@ -175,9 +176,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); break; } - //gfpm_progress_set_main_text (str); gfpm_progress_set_sub_text (substr); - //g_free (str); g_free (substr); return; From priyank at frugalware.org Sat Jul 21 17:14:13 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 21 17:14:15 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: check for a new version of pacman-g2 on sync and ask the user if he wants to update it or no. Message-ID: <20070721151413.8245513A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=a7348caabbe6804cbd9ddcd888f4c31944830aa3 commit a7348caabbe6804cbd9ddcd888f4c31944830aa3 Author: Priyank Date: Sat Jul 21 20:42:06 2007 +0530 gfpm-interface: check for a new version of pacman-g2 on sync and ask the user if he wants to update it or no. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 56c2c7f..ec7a3a9 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -195,6 +195,8 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) { GString *errorstr = g_string_new (""); + gfpm_package_list_print (GFPM_INSTALL_LIST); + gfpm_package_list_print (GFPM_REMOVE_LIST); /* process remove list first */ if (gfpm_package_list_is_empty(GFPM_REMOVE_LIST)) { @@ -642,9 +644,30 @@ static void cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) { gint ret; + PM_PKG *pm_lpkg, *pm_spkg; + 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 ?"); + gfpm_progress_set_main_text (_("Synchronizing package databases")); gfpm_progress_show (TRUE); ret = pacman_db_update (1, sync_db); + + /* check for a pacman-g2 update */ + pm_lpkg = pacman_db_readpkg (local_db, "pacman-g2"); + pm_spkg = pacman_db_readpkg (sync_db, "pacman-g2"); + if (strcmp((char*)pacman_pkg_getinfo(pm_lpkg, PM_PKG_VERSION), + (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); + } + } + pacman_pkg_free (pm_lpkg); + pacman_pkg_free (pm_spkg); return; } diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 725087a..753c4cb 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -161,6 +161,13 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) 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")); From vmiklos at frugalware.org Sat Jul 21 17:27:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 17:27:21 2007 Subject: [Frugalware-git] frugalware-current: fglrx-8.38.6-2-x86_64 Message-ID: <20070721152719.6BF74186812A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5452ce8a3ed0326bb233e9e683d2ca685e95832f commit 5452ce8a3ed0326bb233e9e683d2ca685e95832f Author: VMiklos Date: Sat Jul 21 17:27:11 2007 +0200 fglrx-8.38.6-2-x86_64 added 2.6.22.patch to fix build diff --git a/source/x11-extra/fglrx/2.6.22.patch b/source/x11-extra/fglrx/2.6.22.patch new file mode 100644 index 0000000..850607e --- /dev/null +++ b/source/x11-extra/fglrx/2.6.22.patch @@ -0,0 +1,17 @@ +--- firegl_public.c-orig 2007-05-16 14:52:12.000000000 -0500 ++++ firegl_public.c 2007-05-16 14:52:48.000000000 -0500 +@@ -144,12 +144,14 @@ + #define EXPORT_NO_SYMBOLS + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + #ifdef __x86_64__ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) + #include "linux/ioctl32.h" + #else + #include "asm/ioctl32.h" + #endif ++#endif + + #ifdef __x86_64__ + #include "asm/compat.h" diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index b0d857e..1ffcb0b 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -26,11 +26,12 @@ archs=('i686' 'x86_64') install=$pkgname.install up2date=$pkgver source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run \ - README.Frugalware libGL.la) + README.Frugalware libGL.la 2.6.22.patch) options=(${options[@]} 'nodocs') -sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67'\ - 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b'\ - '650973d708466f5c4c21e70c1f1f6c118b27e614') +sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67' \ + 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \ + '650973d708466f5c4c21e70c1f1f6c118b27e614' \ + 'e862660a7af445f3d0ac07c360bd786b909f426e') Xversion=x710 @@ -50,8 +51,7 @@ build() { if [ "$CARCH" == "x86_64" ]; then Fcd /lib/modules/fglrx/build_mod - #patch -p0 < $Fsrcdir/ati-drivers-8.22.5-intermodule.patch || Fdie - #patch -p0 < $Fsrcdir/ati-drivers-8.23.7-noiommu.patch || Fdie + patch -p0 < $Fsrcdir/2.6.22.patch || Fdie fi # building kernel module From krics at linuxforum.hu Sat Jul 21 17:46:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 17:46:24 2007 Subject: [Frugalware-git] frugalware-current: teamspeak-client-2.0.32.60-1-x86_64 Message-ID: <20070721154622.6C0F413A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=24e5d2079ba03ced14792f3f3032164b65248d17 commit 24e5d2079ba03ced14792f3f3032164b65248d17 Author: Christian Hamar alias krix Date: Sat Jul 21 17:45:45 2007 +0200 teamspeak-client-2.0.32.60-1-x86_64 * Fixing groups (moving below :P ) diff --git a/source/xapps-extra/teamspeak-client/FrugalBuild b/source/xapps-extra/teamspeak-client/FrugalBuild index a419a5b..f16f9fe 100644 --- a/source/xapps-extra/teamspeak-client/FrugalBuild +++ b/source/xapps-extra/teamspeak-client/FrugalBuild @@ -14,8 +14,8 @@ if [ "$CARCH" == "x86_64" ]; then NOSTRIP=1 else depends=('libice' 'libxext' 'libjpeg' 'libx11' 'libsm') - groups=('xapps-extra') fi +groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.goteamspeak.com/index.php?page=downloads|grep -2 Client|grep '[0-9]\+\.'|sed -n 's/.* \([0-9]\+\.[0-9]\+\.[^ ]*\) .*/\1/;$ p'" source=(ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/ts2_client_$realver.tar.bz2) From vmiklos at frugalware.org Sat Jul 21 17:49:21 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 21 17:49:22 2007 Subject: [Frugalware-git] homepage-ng: new git repo: emul32-tools Message-ID: <20070721154921.180A213A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=6fb81a843b7dee988a86904fb64e6891f47095fa commit 6fb81a843b7dee988a86904fb64e6891f47095fa Author: VMiklos Date: Sat Jul 21 17:48:03 2007 +0200 new git repo: emul32-tools diff --git a/git/index.html b/git/index.html index e4d3aae..6813fd4 100644 --- a/git/index.html +++ b/git/index.html @@ -1,3 +1,4 @@ - +< +html> diff --git a/git/repos/emul32-tools b/git/repos/emul32-tools new file mode 120000 index 0000000..d8608a6 --- /dev/null +++ b/git/repos/emul32-tools @@ -0,0 +1 @@ +../../../emul32-tools/emul32-tools \ No newline at end of file From krics at linuxforum.hu Sat Jul 21 17:52:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 17:53:00 2007 Subject: [Frugalware-git] emul32-tools: emul32-tools added readme.frugalware Message-ID: <20070721155249.569BE13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=f9d23b7394b644309888d2512c126be037cc6d2d commit f9d23b7394b644309888d2512c126be037cc6d2d Author: Christian Hamar alias krix Date: Sat Jul 21 17:51:38 2007 +0200 emul32-tools added readme.frugalware * Adding README.Frugalware (now empty) diff --git a/README.Frugalware b/README.Frugalware new file mode 100644 index 0000000..148c89c --- /dev/null +++ b/README.Frugalware @@ -0,0 +1 @@ +init :P From krics at linuxforum.hu Sat Jul 21 17:53:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 17:53:29 2007 Subject: [Frugalware-git] frugalware-current: flashplugin-emul-9.0.48.0_1-1-x86_64 Message-ID: <20070721155328.4741313A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d7c878fdb00b00de6e01ffb9def93293c264be2a commit d7c878fdb00b00de6e01ffb9def93293c264be2a Author: Christian Hamar alias krix Date: Sat Jul 21 17:53:09 2007 +0200 flashplugin-emul-9.0.48.0_1-1-x86_64 * New package for emul diff --git a/source/emul-extra/flashplugin-emul/FrugalBuild b/source/emul-extra/flashplugin-emul/FrugalBuild new file mode 100644 index 0000000..3cb51cd --- /dev/null +++ b/source/emul-extra/flashplugin-emul/FrugalBuild @@ -0,0 +1,13 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=flashplugin-emul +pkgver=9.0.48.0_1 +pkgrel=1 +pkgdesc="Macromedia flash plugin for Netscape/Mozilla (nonfree) (32bit emul)" +url="http://cairographics.org" +depends=('cairo-emul' 'gtk+2-emul' 'atk-emul' 'libxt-emul' 'freetype2-emul' 'libice-emul' 'pango-emul') +groups=('emul-extra') +archs=('!i686' 'x86_64') +Finclude emul +sha1sums=('198fde18ff3002fd845c382f856c5b95d2c5544e') From krics at linuxforum.hu Sat Jul 21 18:12:52 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:12:56 2007 Subject: [Frugalware-git] frugalware-current: libmng-emul-1.0.10_1-1-x86_64 Message-ID: <20070721161253.09DC21868217@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=bc124ec30c911cb4e481134a196221b8525a2115 commit bc124ec30c911cb4e481134a196221b8525a2115 Author: Christian Hamar alias krix Date: Sat Jul 21 18:12:35 2007 +0200 libmng-emul-1.0.10_1-1-x86_64 version bump diff --git a/source/emul-extra/libmng-emul/FrugalBuild b/source/emul-extra/libmng-emul/FrugalBuild index 74b6b1f..b04137e 100644 --- a/source/emul-extra/libmng-emul/FrugalBuild +++ b/source/emul-extra/libmng-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libmng-emul -pkgver=1.0.9_3 +pkgver=1.0.10_1 pkgrel=1 pkgdesc="MNG libraries for emulation of i686 on x86_64" url="http://www.gnu.org/software/tar/tar.html" @@ -10,4 +10,4 @@ depends=('lcms-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('fcada235d01db86a81d8217ee9d30c4dc316c19f') +sha1sums=('7c8191b5434bb3b5c8b5f70b272415269c916606') From krics at linuxforum.hu Sat Jul 21 18:16:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:16:52 2007 Subject: [Frugalware-git] frugalware-current: sdl-emul-1.2.12_1-1-x86_64 Message-ID: <20070721161649.C65FA13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=661000a20fe794448deff1ea7828f33028bb6a77 commit 661000a20fe794448deff1ea7828f33028bb6a77 Author: Christian Hamar alias krix Date: Sat Jul 21 18:16:32 2007 +0200 sdl-emul-1.2.12_1-1-x86_64 version bump diff --git a/source/emul-extra/sdl-emul/FrugalBuild b/source/emul-extra/sdl-emul/FrugalBuild index e63af26..aef267f 100644 --- a/source/emul-extra/sdl-emul/FrugalBuild +++ b/source/emul-extra/sdl-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=sdl-emul -pkgver=1.2.11_1 +pkgver=1.2.12_1 pkgrel=1 pkgdesc="Simple DirectMedia Layer library for emulation of i686 on x86_64" url="http://www.libsdl.org" depends=('libxext-emul' 'libstdc++-emul' 'esd-emul' 'alsa-lib-emul' 'aalib-emul') Finclude emul -sha1sums=('da0326258f5e6708b77f45bd3c49130220b11dea') +sha1sums=('00a89a07d868cffcdda8a5120e563421ae6cd00c') From krics at linuxforum.hu Sat Jul 21 18:19:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:19:23 2007 Subject: [Frugalware-git] frugalware-current: frugalware-emul-0.7pre2_1-1-x86_64 Message-ID: <20070721161921.EEA1C13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=0175161254599993d9f366ee0a2d38fce1d3ab60 commit 0175161254599993d9f366ee0a2d38fce1d3ab60 Author: Christian Hamar alias krix Date: Sat Jul 21 18:19:06 2007 +0200 frugalware-emul-0.7pre2_1-1-x86_64 version bump diff --git a/source/emul-extra/frugalware-emul/FrugalBuild b/source/emul-extra/frugalware-emul/FrugalBuild index ce9c7a4..846a085 100644 --- a/source/emul-extra/frugalware-emul/FrugalBuild +++ b/source/emul-extra/frugalware-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=frugalware-emul -pkgver=0.7pre1_1 +pkgver=0.7pre2_1 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package (32 emulation)" url="http://frugalware.org" @@ -22,4 +22,4 @@ build() { ln -s . $Fdestdir/usr/lib/chroot32/usr/X11R6 || Fdie Fmkdir /usr/lib/chroot32/usr/lib/X11/fonts } -sha1sums=('282c5f4515007e2551e07bc068eb5f17dc265939') +sha1sums=('00107b01d1a47e66b82d9fc3cf10740409d41572') From krics at linuxforum.hu Sat Jul 21 18:32:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:32:03 2007 Subject: [Frugalware-git] emul32-tools: adding Common directory and other changes Message-ID: <20070721163200.F142313A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=ade4a85491bcb4c448157439fee59e6ab0474b0d commit ade4a85491bcb4c448157439fee59e6ab0474b0d Author: Christian Hamar alias krix Date: Sat Jul 21 18:31:42 2007 +0200 adding Common directory and other changes * Create a /home/$USER/Common dir on both side (host and guest) * This will allow the user that what he do on the 32bit emul guest then he can save files or anything else to Common and then he can see that from host 64bit too (because Common is mount -o bind'ed) diff --git a/emul32 b/emul32 index b799e39..e86848c 100644 --- a/emul32 +++ b/emul32 @@ -38,7 +38,18 @@ else exit 1 fi -echo "if [ ! -d /home/$USER ]; then mkdir /home/$USER; chown $USER:users /home/$USER; fi; \ +if [ ! -d /home/$USER/Common ]; then + mkdir /home/$USER/Common + chown $USER.users /home/$USER/Common +fi + +if [ -d /home/$USER/Common ]; then + sudo mount -o bind /home/$USER/Common /usr/lib/chroot32/home/$USER/Common +fi + +echo "if [ ! -d /home/$USER/Common ]; then mkdir -p /home/$USER/Common; chown -R $USER:users /home/$USER; fi; \ /bin/su - $USER -c \"$cmd\"" |sudo linux32 /usr/sbin/chroot /usr/lib/chroot32/ +sudo umount /home/$USER/Common + xhost -local:localhost >/dev/null From krics at linuxforum.hu Sat Jul 21 18:38:01 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:38:03 2007 Subject: [Frugalware-git] frugalware-current: teamspeak-client-2.0.32.60-1-x86_64 Message-ID: <20070721163801.D81FD13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e5642bf258ccaaddfb5fcdbe4c17e933112733b1 commit e5642bf258ccaaddfb5fcdbe4c17e933112733b1 Author: Christian Hamar alias krix Date: Sat Jul 21 18:37:41 2007 +0200 teamspeak-client-2.0.32.60-1-x86_64 * Fixing menu entry on x86_64 (added emul32 /usr/bin/teamspeak to menu) diff --git a/source/xapps-extra/teamspeak-client/FrugalBuild b/source/xapps-extra/teamspeak-client/FrugalBuild index f16f9fe..a9e5567 100644 --- a/source/xapps-extra/teamspeak-client/FrugalBuild +++ b/source/xapps-extra/teamspeak-client/FrugalBuild @@ -30,6 +30,10 @@ build() cp -a . $Fdestdir/$_root/usr/lib/teamspeak Fln /usr/lib/teamspeak/TeamSpeak $_root/usr/bin/teamspeak Ffilerel icon.xpm /usr/share/pixmaps/teamspeak.xpm - Fdesktop "/usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;" + if [ "$CARCH" == "x86_64" ]; then + Fdesktop "emul32 /usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;" + else + Fdesktop "/usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;" + fi [ "$CARCH" == "x86_64" ] && unset _root } From krics at linuxforum.hu Sat Jul 21 18:39:42 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:39:44 2007 Subject: [Frugalware-git] emul32-tools: Added TODO Message-ID: <20070721163942.E68C213A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=dcc1acafe947f8b0ef1f26e1a1a79985e6d32f6c commit dcc1acafe947f8b0ef1f26e1a1a79985e6d32f6c Author: Christian Hamar alias krix Date: Sat Jul 21 18:39:26 2007 +0200 Added TODO diff --git a/TODO b/TODO new file mode 100644 index 0000000..6b943bd --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +* Create some PID or something else for mount / umount Common dir + because now if you start 2 app, then if one of them exit its umount + Common and then you cant see anymore from app1 if app2 ends :P From krics at linuxforum.hu Sat Jul 21 18:56:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:56:34 2007 Subject: [Frugalware-git] emul32-tools: README.Frugalware extended :P Message-ID: <20070721165631.4BCDA13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=e889a37d53cc140a6fc43b5db28f644716f2906f commit e889a37d53cc140a6fc43b5db28f644716f2906f Author: Christian Hamar alias krix Date: Sat Jul 21 18:56:13 2007 +0200 README.Frugalware extended :P * Added a working guide :) diff --git a/README.Frugalware b/README.Frugalware index 148c89c..fc79839 100644 --- a/README.Frugalware +++ b/README.Frugalware @@ -1 +1,69 @@ -init :P +emul32-tools +============= + +1. Whats this and whats good for +2. What you need to do for proper working and how to use +3. Footnotes :P + +1. Whats this and whats good for +================================= + +emul32-tools contains small scripts to do 32bit chroot emulation easly on a +64bit machine. It got two major script emul32 and rc.32bitchroot. +rc.32bitchroot is an initscript which sets everything on start. Sets the directory +paths, does mounts for 32bit chroot dirs and copy neccessary files like passwd +shadow and other small stuff to 32bit chroot from 64bit host OS. This need to +be done. + +emul32 is a wrapper for linux32 chroot /usr/lib/chroot32 foobarbaz . It does +much stuff automatically, like creating a 'Common' directory between host and guest +. This wrapper calls the application inside the 32bit chroot. Ofcourse first it +chroots into it and creates home directories and other small stuffs. + + +2. What you need to do for proper working and how to use +========================================================= + +First, you need to install emul-core (TODO!) via pacman-g2. + +pacman-g2 -S emul-core + +This will pulls all neccessary -emul packages to the chroot32 directory. + +Second, you need to add your user into sudoers file. See an example: + +/etc/sudoers: +krics ALL=(ALL) NOPASSWD: /usr/bin/emul32 + +This will cause if you run emul32 as user krics then inside emul32 sudo request +does not ask for your password. So when you type 'emul32 something' then you +wont be asked for password. + +What else need to be done ? When you want to use the 32bitchroot stuff then you +need to START rc.32bitchroot . You can set up that start automatically or you can +start it via hand like: service 32bitchroot start (TODO!) + +Once this done and you want to use example TeamSpeak then you do a + +repoman merge teamspeak then install the FPM with pacman-g2 then you can start +the app via 'emul32 teamspeak' or via the menu entry you find in your fav. WM. + + +3. Footnotes :P +================ + +If you want to run or install something else what we not packaged, then you can +do that example: foobar.bin + +Copy foobar.bin to your user's Common directory on host (64bit) . + +Then start run it somehow like this: + +emul32 /home/YOURUSERNAME/Common/foobar.bin + +Thats all. + + +If you got any problem or trouble ask help on IRC or in BTS + +Christian Hamar alias krix From krics at linuxforum.hu Sat Jul 21 18:57:25 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 18:57:26 2007 Subject: [Frugalware-git] emul32-tools: Added TODO entry for 32bitchroot initscript Message-ID: <20070721165725.A6CA913A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=05e77e42e1ae6bd9055ad8ae9f47c7f13367554f commit 05e77e42e1ae6bd9055ad8ae9f47c7f13367554f Author: Christian Hamar alias krix Date: Sat Jul 21 18:57:10 2007 +0200 Added TODO entry for 32bitchroot initscript diff --git a/TODO b/TODO index 6b943bd..a28ec7b 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ * Create some PID or something else for mount / umount Common dir because now if you start 2 app, then if one of them exit its umount Common and then you cant see anymore from app1 if app2 ends :P +* Rework rc.32bitchroot to fit our initscript style From krics at linuxforum.hu Sat Jul 21 19:00:40 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jul 21 19:00:42 2007 Subject: [Frugalware-git] frugalware-current: gdb-emul-6.6_1-1-x86_64 Message-ID: <20070721170041.00FBA13A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d4eaccababa3f39288ffba44ed1c6d858c40f8ce commit d4eaccababa3f39288ffba44ed1c6d858c40f8ce Author: Christian Hamar alias krix Date: Sat Jul 21 19:00:17 2007 +0200 gdb-emul-6.6_1-1-x86_64 * New package for emul diff --git a/source/emul-extra/gdb-emul/FrugalBuild b/source/emul-extra/gdb-emul/FrugalBuild new file mode 100644 index 0000000..357c30e --- /dev/null +++ b/source/emul-extra/gdb-emul/FrugalBuild @@ -0,0 +1,11 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=gdb-emul +pkgver=6.6_1 +pkgrel=1 +pkgdesc="Gnu Project Debugger for emulation of i686 on x86_64" +url="http://www.gnu.org/software/gdb/download/" +rodepends=('readline-emul' 'mpfr-emul') +Finclude emul +sha1sums=('8b2b211308c8eab99f0f74f9679baec243f0c32f') From vmiklos at frugalware.org Sun Jul 22 00:54:11 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 00:54:13 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.2.4-1-i686 Message-ID: <20070721225411.B583913A419E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5685a20c83a437cb42600b171063777169ee798f commit 5685a20c83a437cb42600b171063777169ee798f Author: VMiklos Date: Sun Jul 22 00:47:05 2007 +0200 git-1.5.2.4-1-i686 split gitk manpage, too diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 1794516..cd2d90d 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -57,7 +57,7 @@ build() # gitk Fsplit gitk usr/bin/gitk + Fsplit gitk usr/share/man/man1/gitk.1 } - # optimization OK From priyank at frugalware.org Sun Jul 22 07:53:03 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 07:53:06 2007 Subject: [Frugalware-git] gfpm: gfpm: don't print install and remove lists on apply. Message-ID: <20070722055303.562761868238@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=8d5f7b066dca299a3a5b3b9b2a5110dca4616ff4 commit 8d5f7b066dca299a3a5b3b9b2a5110dca4616ff4 Author: Priyank Date: Sun Jul 22 11:21:16 2007 +0530 gfpm: don't print install and remove lists on apply. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 77e4dfe..4356656 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -224,8 +224,6 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) { GString *errorstr = g_string_new (""); - gfpm_package_list_print (GFPM_INSTALL_LIST); - gfpm_package_list_print (GFPM_REMOVE_LIST); /* process remove list first */ if (gfpm_package_list_is_empty(GFPM_REMOVE_LIST)) { From priyank at frugalware.org Sun Jul 22 07:53:03 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 07:53:07 2007 Subject: [Frugalware-git] gfpm: gfpm: reordered columns code Message-ID: <20070722055303.38B9D13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=85884f1ef4a70753de196463006721f42142f0d3 commit 85884f1ef4a70753de196463006721f42142f0d3 Author: Priyank Date: Sun Jul 22 11:20:55 2007 +0530 gfpm: reordered columns code diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index ec7a3a9..77e4dfe 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -109,25 +109,57 @@ gfpm_interface_init (void) G_TYPE_STRING, /* Latest version */ G_TYPE_STRING); /* Package Description */ + GtkTreeViewColumn *column; renderer = gtk_cell_renderer_toggle_new (); g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gfpm_pkg_selection_toggled), store); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_pkgs_tvw), -1, _("S"), renderer, "active", 0, NULL); + column = gtk_tree_view_column_new_with_attributes (_("S"), + renderer, + "active", 0, + NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column); renderer = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_pkgs_tvw), -1, _("Status"), renderer, "pixbuf", 1, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Status"), + renderer, + "pixbuf", 1, + NULL); + 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 (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_pkgs_tvw), -1, _("Package Name"), renderer, "text", 2, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Package Name"), + renderer, + "text", 2, + NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_column_set_min_width (column, 140); + gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column); renderer = gtk_cell_renderer_text_new (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_pkgs_tvw), -1, _("Installed Version"), renderer, "text", 3, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Installed Version"), + renderer, + "text", 3, + NULL); + 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 (); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(gfpm_pkgs_tvw), -1, _("Latest Version"), renderer, "text", 4, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Latest Version"), + renderer, + "text", 4, + NULL); + 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 (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_pkgs_tvw), -1, _("Description"), renderer, "text", 5, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Description"), + renderer, + "text", 5, + 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)); @@ -159,9 +191,6 @@ gfpm_interface_init (void) /* refresh db */ g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_gfpm_refresh_button_clicked), NULL); - /* initialize progressbar */ - //gfpm_progress_init (); - /* 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); From priyank at frugalware.org Sun Jul 22 08:04:58 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 08:05:01 2007 Subject: [Frugalware-git] gfpm: gfpm-interfac: refresh gui while loading pkgs treeview. Message-ID: <20070722060458.EF2C813A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=9a0b7376edbdeb62b9ea35cb857066fd7379f80b commit 9a0b7376edbdeb62b9ea35cb857066fd7379f80b Author: Priyank Date: Sun Jul 22 11:31:39 2007 +0530 gfpm-interfac: refresh gui while loading pkgs treeview. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 4356656..f7b5d4f 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -370,6 +370,8 @@ gfpm_load_pkgs_tvw (const char *group_name) } gfpm_update_status (_("Loading package list ...")); + while (gtk_events_pending()) + gtk_main_iteration (); pm_group = pacman_db_readgrp (pm_db, (char*)group_name); l = pacman_grp_getinfo (pm_group, PM_GRP_PKGNAMES); model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_pkgs_tvw)); From priyank at frugalware.org Sun Jul 22 08:04:59 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 08:05:02 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: fixed a random crash when loading package list for some groups. Message-ID: <20070722060459.60F3313A41A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=66cbd6f8cb19896cdd98d9c7312a5cdb0f10889a commit 66cbd6f8cb19896cdd98d9c7312a5cdb0f10889a Author: Priyank Date: Sun Jul 22 11:33:19 2007 +0530 gfpm-interface: fixed a random crash when loading package list for some groups. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index f7b5d4f..98f09d5 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -415,10 +415,10 @@ gfpm_load_pkgs_tvw (const char *group_name) gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, check, 1, (up==TRUE)?icon_up:(check==TRUE)?icon_yes:icon_no, - 2, (char*)pacman_list_getdata (i), + 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, (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) @@ -426,18 +426,20 @@ gfpm_load_pkgs_tvw (const char *group_name) gboolean up = FALSE; pm_pkg = pacman_db_readpkg (sync_db, pacman_list_getdata(i)); pm_lpkg = pacman_db_readpkg (local_db, pacman_list_getdata(i)); - if (!strcmp((char*)pacman_pkg_getinfo(pm_pkg,PM_PKG_VERSION), - (char*)pacman_pkg_getinfo(pm_lpkg,PM_PKG_VERSION))) - up = FALSE; + 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)) + up = FALSE; else up = TRUE; gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, TRUE, 1, (up==TRUE)?icon_up:icon_yes, - 2, (char*)pacman_list_getdata (i), + 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, (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 priyank at frugalware.org Sun Jul 22 08:17:46 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 08:17:48 2007 Subject: [Frugalware-git] gfpm: gfpm-progress: set proper progress status while retrieving packages. Message-ID: <20070722061746.D656013A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=12dc6bd5630010554d44647ecff2f73038167352 commit 12dc6bd5630010554d44647ecff2f73038167352 Author: Priyank Date: Sun Jul 22 11:46:06 2007 +0530 gfpm-progress: set proper progress status while retrieving packages. diff --git a/glade/gfpm.glade b/glade/gfpm.glade index fca1648..1737a7d 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -502,7 +502,7 @@ Installed packages True 0 - Main Progress Info + Please wait... False @@ -514,7 +514,7 @@ Installed packages True 0.10000000149011612 - Sub Progress Info + False @@ -531,6 +531,7 @@ Installed packages True + True 0.10000000149 diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c index 753c4cb..a71a898 100644 --- a/src/gfpm-progress.c +++ b/src/gfpm-progress.c @@ -141,6 +141,7 @@ void gfpm_progress_event (unsigned char event, void *data1, void *data2) { char *substr = NULL; + int main = 0; while (gtk_events_pending ()) gtk_main_iteration (); switch (event) @@ -181,9 +182,16 @@ gfpm_progress_event (unsigned char event, void *data1, void *data2) 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); + main = 1; break; } - gfpm_progress_set_sub_text (substr); + if (main == 1) + { + gfpm_progress_set_main_text (substr); + main = 0; + } + else + gfpm_progress_set_sub_text (substr); g_free (substr); return; From priyank at frugalware.org Sun Jul 22 09:56:59 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 09:57:01 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: hide the progressbar after sync is over. Message-ID: <20070722075659.A78DF13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=03451c06391c5200f476c9c45f55844ef34302f3 commit 03451c06391c5200f476c9c45f55844ef34302f3 Author: Priyank Date: Sun Jul 22 13:25:12 2007 +0530 gfpm-interface: hide the progressbar after sync is over. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 98f09d5..97fcc4f 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -684,7 +684,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); - + gfpm_progress_show (FALSE); /* check for a pacman-g2 update */ pm_lpkg = pacman_db_readpkg (local_db, "pacman-g2"); pm_spkg = pacman_db_readpkg (sync_db, "pacman-g2"); From priyank at frugalware.org Sun Jul 22 10:12:04 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 10:12:04 2007 Subject: [Frugalware-git] gfpm: gfpm-messages: new function gfpm_plist_question() Message-ID: <20070722081204.27A3813A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=96c19ff7fa0074181cec880e3e6fcfde4a7f60d8 commit 96c19ff7fa0074181cec880e3e6fcfde4a7f60d8 Author: Priyank Date: Sun Jul 22 13:40:17 2007 +0530 gfpm-messages: new function gfpm_plist_question() diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 31f1a92..0f26443 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -74,7 +74,57 @@ gfpm_question (const char *message_str) GTK_BUTTONS_YES_NO, "%s", message_str); - gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE), + gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); + ret = gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_widget_destroy (dialog); + + return ret; +} + +gint +gfpm_plist_question (const char *main_msg, PM_LIST *packages) +{ + GtkWidget *dialog; + GtkListStore *store; + GtkScrolledWindow *swindow; + GtkCellRenderer *r; + GtkTreeIter iter; + GtkWidget *tvw; + GtkWidget *lbl; + gint ret; + PM_LIST *l; + + dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "%s", + main_msg); + swindow = 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_container_add (GTK_CONTAINER(swindow), tvw); + store = gtk_list_store_new (1, G_TYPE_STRING); + r = gtk_cell_renderer_text_new (); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); + for (l=pacman_list_first(packages);l;l=pacman_list_next(l)) + { + char *pkgname, *pkgver; + PM_SYNCPKG *sync = pacman_list_getdata (l); + 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); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, g_strdup_printf("%s%s", pkgname, pkgver)); + } + gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); + gtk_widget_set_size_request (tvw, 230, 120); + gtk_widget_show (tvw); + gtk_box_pack_start (GTK_DIALOG(dialog)->vbox, swindow, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); + gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); ret = gtk_dialog_run (GTK_DIALOG(dialog)); gtk_widget_destroy (dialog); diff --git a/src/gfpm-messages.h b/src/gfpm-messages.h index 33228cc..50bf1b5 100644 --- a/src/gfpm-messages.h +++ b/src/gfpm-messages.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "gfpm.h" void gfpm_error (const char *); @@ -16,6 +17,8 @@ void gfpm_message (const char *); gint gfpm_question (const char *); +gint gfpm_plist_question (const char *, PM_LIST *); + char * gfpm_input (const char *, const char *, int *); #endif From priyank at frugalware.org Sun Jul 22 10:17:47 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 10:17:49 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: perform a sysupgrade when user clicks the refresh button Message-ID: <20070722081747.37FC113A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=3d49dc3b0dd517a9dd82fbdf67d7ac61066a561c commit 3d49dc3b0dd517a9dd82fbdf67d7ac61066a561c Author: Priyank Date: Sun Jul 22 13:46:04 2007 +0530 gfpm-interface: perform a sysupgrade when user clicks the refresh button * After the sync, display a list of packages to be updated and ask user for a confirmation. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 97fcc4f..1b230f5 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -676,6 +676,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) { gint ret; PM_PKG *pm_lpkg, *pm_spkg; + PM_LIST *packages; 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. " @@ -697,6 +698,30 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) cb_gfpm_apply_btn_clicked (NULL, NULL); } } + else + { + if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) + { + gchar *str; + GString *errorstr = g_string_new (""); + str = g_strdup_printf (_("Failed to init transaction (%s)\n"), pacman_strerror(pm_errno)); + errorstr = g_string_append (errorstr, str); + if (pm_errno == PM_ERR_HANDLE_LOCK) + errorstr = g_string_append (errorstr, + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + gfpm_error (errorstr->str); + return; + } + if (pacman_trans_sysupgrade()==-1) + { + 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 ?", packages) == GTK_RESPONSE_YES) + { + cb_gfpm_apply_btn_clicked (NULL, NULL); + } + } pacman_pkg_free (pm_lpkg); pacman_pkg_free (pm_spkg); From priyank at frugalware.org Sun Jul 22 10:29:22 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 10:29:24 2007 Subject: [Frugalware-git] frugalware-current: sdlimage-1.2.6-1-i686 Message-ID: <20070722082922.4292913A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5affb70fa4a8f0d7a007617c69f70b80dd6adda7 commit 5affb70fa4a8f0d7a007617c69f70b80dd6adda7 Author: Priyank Date: Sun Jul 22 13:56:57 2007 +0530 sdlimage-1.2.6-1-i686 * Version bump * SBU fix diff --git a/source/xlib/sdlimage/FrugalBuild b/source/xlib/sdlimage/FrugalBuild index 30ab5bc..05d7437 100644 --- a/source/xlib/sdlimage/FrugalBuild +++ b/source/xlib/sdlimage/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.09 SBU +# Compiling Time: 0.05 SBU # Maintainer: Priyank Gosalia pkgname=sdlimage -pkgver=1.2.5 -pkgrel=3 +pkgver=1.2.6 +pkgrel=1 pkgdesc="Image loading library for Simple DirectMedia Layer 1.2" url="http://www.libsdl.org/" depends=('sdl' 'libjpeg' 'libpng' 'libtiff') @@ -11,7 +11,7 @@ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://www.libsdl.org/projects/SDL_image/ | grep -m1 tar.gz | sed 's/.*e-\(.*\).t.*/\1/'" source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) -sha1sums=('2cd7d825953de64bf903ad711be5613f79259422') +sha1sums=('5045df31e4db29d8890110fd18024c9d08efca30') _F_cd_path="SDL_image-$pkgver" Fconfopts="$Fconfopts --enable-jpeg" From priyank at frugalware.org Sun Jul 22 10:45:15 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 10:45:22 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: show update icon for packages that need to be updated (in installed packages) Message-ID: <20070722084515.C2EFB13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=b350ea82ce9b4061af2aafe455d467cd2a40334d commit b350ea82ce9b4061af2aafe455d467cd2a40334d Author: Priyank Date: Sun Jul 22 14:13:27 2007 +0530 gfpm-interface: show update icon for packages that need to be updated (in installed packages) diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 1b230f5..10c7f91 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -797,6 +797,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) GtkListStore *store; GdkPixbuf *icon_yes; GdkPixbuf *icon_no; + GdkPixbuf *icon_up; GtkTreeModel *model; GtkTreeIter iter; PM_PKG *pm_pkg; @@ -838,24 +839,38 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) GTK_STOCK_NO, GTK_ICON_SIZE_SMALL_TOOLBAR, NULL); + icon_up = gtk_widget_render_icon (gfpm_pkgs_tvw, + GTK_STOCK_GO_UP, + GTK_ICON_SIZE_SMALL_TOOLBAR, + NULL); gfpm_update_status (_("Searching for packages ...")); if (r == 0) { PM_PKG *pm_spkg; + PM_PKG *pm_lpkg; + gboolean up = FALSE; + for (i=l;i;i=pacman_list_next(i)) { - pm_pkg = pacman_db_readpkg (local_db, pacman_list_getdata(i)); + pm_lpkg = pacman_db_readpkg (local_db, pacman_list_getdata(i)); pm_spkg = pacman_db_readpkg (sync_db, pacman_list_getdata(i)); + char *v1 = (char*)pacman_pkg_getinfo (pm_spkg, PM_PKG_VERSION); + char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); + if (v1!=NULL && v2!=NULL) + if (!strcmp(v1,v2)) + up = FALSE; + else + up = TRUE; gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, TRUE, - 1, icon_yes, - 2, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_NAME), - 3, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_VERSION), + 1, (up==FALSE)?icon_yes:icon_up, + 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_pkg, PM_PKG_DESC), + 5, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_DESC), -1); - pacman_pkg_free (pm_pkg); + pacman_pkg_free (pm_lpkg); pacman_pkg_free (pm_spkg); } } From priyank at frugalware.org Sun Jul 22 10:50:44 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 10:50:45 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: show update icon for searched packages that need update (in all packages) Message-ID: <20070722085044.43F3113A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=54c51a158ab7d2846976572b29d2f6ce94685ef7 commit 54c51a158ab7d2846976572b29d2f6ce94685ef7 Author: Priyank Date: Sun Jul 22 14:18:57 2007 +0530 gfpm-interface: show update icon for searched packages that need update (in all packages) diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 10c7f91..5406d8b 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -879,15 +879,23 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) { PM_PKG *pm_lpkg; gboolean inst = FALSE; + gboolean up = FALSE; for (i=l;i;i=pacman_list_next(i)) { 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; - else - inst = FALSE; - + { + inst = TRUE; + 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)) + up = FALSE; + else up = TRUE; + } + else + inst = FALSE; gtk_list_store_append (store, &iter); if (inst == TRUE) gtk_list_store_set (store, &iter, 3, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION), -1); @@ -896,7 +904,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) gtk_list_store_set (store, &iter, 0, inst, - 1, (inst==TRUE)?icon_yes:icon_no, + 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), From priyank at frugalware.org Sun Jul 22 10:52:13 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 22 10:52:14 2007 Subject: [Frugalware-git] gfpm: gfpm: fixed a leak Message-ID: <20070722085213.D6B5813A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=1282319b01dbc43915fd5903e76cebda9825129a commit 1282319b01dbc43915fd5903e76cebda9825129a Author: Priyank Date: Sun Jul 22 14:20:27 2007 +0530 gfpm: fixed a leak diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 5406d8b..32b6ce3 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -918,6 +918,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) g_object_unref (icon_yes); g_object_unref (icon_no); + g_object_unref (icon_up); return; } From voroskoi at frugalware.org Sun Jul 22 12:14:23 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 22 12:14:26 2007 Subject: [Frugalware-git] frugalware-current: asciidoc-8.2.2-1-i686 Message-ID: <20070722101423.8E38B13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e05ba095d9fc4265ab09499697654ec373cba43a commit e05ba095d9fc4265ab09499697654ec373cba43a Author: voroskoi Date: Sun Jul 22 12:09:20 2007 +0200 asciidoc-8.2.2-1-i686 version bump diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index a96a6f0..cb003b4 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=asciidoc -pkgver=8.2.1 -pkgrel=4 +pkgver=8.2.2 +pkgrel=1 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" depends=() @@ -29,4 +29,4 @@ build() { convert $i ${i%%.png}.jpg || return 1 done } -sha1sums=('428834497f37f4fa7786ce173a4b653fa18b7b94') +sha1sums=('ffd0de7b45474a88ab3b895f5c440024a954540a') From vmiklos at frugalware.org Sun Jul 22 13:53:06 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 13:53:08 2007 Subject: [Frugalware-git] homepage-ng: FSA219-avahi Message-ID: <20070722115306.F390F13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=a997cc74184483ca21a9201c796335701ba608ca commit a997cc74184483ca21a9201c796335701ba608ca Author: VMiklos Date: Sun Jul 22 13:51:41 2007 +0200 FSA219-avahi diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 24894c9..28749f0 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 219 + 2007-07-22 + vmiklos + avahi + 0.6.17-2 + 0.6.17-3terminus1 + http://bugs.frugalware.org/task/2209 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3372 + Emanuele Aina has reported a security issue in Avahi, which can be exploited by malicious, local users to cause a DoS (Denial of Service). + The security issue is caused due to an "assert()" error when receiving empty TXT data over D-Bus for registration. This can be exploited to terminate the Avahi daemon by sending empty TXT data. + + 218 2007-07-12 voroskoi From vmiklos at frugalware.org Sun Jul 22 14:02:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:02:32 2007 Subject: [Frugalware-git] homepage-ng: FSA220-wireshark Message-ID: <20070722120231.497B213A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=91c43dc5c1afd53f7557e0146489f60743f0cc5b commit 91c43dc5c1afd53f7557e0146489f60743f0cc5b Author: VMiklos Date: Sun Jul 22 14:00:55 2007 +0200 FSA220-wireshark diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 28749f0..918e71a 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,22 @@ + 220 + 2007-07-22 + vmiklos + wireshark + 0.99.5-1 + 0.99.6-1terminus1 + http://bugs.frugalware.org/task/2218 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3389 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3390 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3391 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3392 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3393 + Some vulnerabilities have been reported in Wireshark, which can be exploited by malicious people to cause a DoS (Denial of Service). + Errors exist within the DHCP/BOOTP dissector or when processing HTTP chunked responses, iSeries capture files, or DCP ETSI, SSL, or MMS packets. These can be exploited to cause a crash, excessive loops, or consume large amounts of memory when parsing a specially crafted packet that is either captured off the wire or loaded via a capture file. + + 219 2007-07-22 vmiklos From vmiklos at frugalware.org Sun Jul 22 14:29:25 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:29:26 2007 Subject: [Frugalware-git] homepage-ng: FSA221-flashplugin Message-ID: <20070722122925.5187113A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=5a0c1b4f8d325d434abfbc5ec158481c8235a537 commit 5a0c1b4f8d325d434abfbc5ec158481c8235a537 Author: VMiklos Date: Sun Jul 22 14:27:55 2007 +0200 FSA221-flashplugin diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 918e71a..7fa25e5 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 221 + 2007-07-22 + vmiklos + flashplugin + 9.0.31.0-1 + 9.0.48.0-1terminus1 + http://bugs.frugalware.org/task/2240 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3456 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3457 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2022 + Critical vulnerabilities have been identified in Adobe Flash Player that could allow an attacker who successfully exploits these potential vulnerabilities to take control of the affected system. A malicious SWF must be loaded in Flash Player by the user for an attacker to exploit these potential vulnerabilities. + + 220 2007-07-22 vmiklos From vmiklos at frugalware.org Sun Jul 22 14:52:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:25 2007 Subject: [Frugalware-git] emul32-tools: rc.emul32-tools: import Message-ID: <20070722125219.E58FF13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=a3f9aa6e6d78c6549b0a1097a0d664ecb9da9ab4 commit a3f9aa6e6d78c6549b0a1097a0d664ecb9da9ab4 Author: VMiklos Date: Sun Jul 22 01:19:06 2007 +0200 rc.emul32-tools: import a rewrite of the previous implementation, using the "new" initscript functions diff --git a/rc.emul32-tools b/rc.emul32-tools new file mode 100644 index 0000000..8a0d2b0 --- /dev/null +++ b/rc.emul32-tools @@ -0,0 +1,53 @@ +#!/bin/bash + +# (c) 2007 Miklos Vajna +# rc.emul32-tools for Frugalware +# distributed under GPL License + +# chkconfig: 2345 99 01 +# description: Mounts / umounts dirs required for 32bit emulation. + +source /lib/initscripts/functions +TEXTDOMAIN=emul32-tools +TEXTDOMAINDIR=/lib/initscripts/messages + +chroot=/usr/lib/chroot32 +dirs=(/dev/pts /dev/shm /dev /proc/bus/usb /proc /sys /tmp /usr/lib/X11/fonts) +configs=(profile resolv.conf passwd shadow group gshadow hosts sysconfig/{keymap,font,lang.sh} pango gtk-2.0 localtime) + +actions=(restart status start stop) +pid="grep -q '$chroot ' /proc/mounts" + +rc_start() +{ + msg $"Mounting dirs required for 32bit emulation" + if ! eval $pid; then + for i in ${dirs[@]} + do + mount $i -o bind $chroot/$i + done + for i in ${configs[@]} + do + [ -f /etc/$i ] && cp -a /etc/$i $chroot/etc/`dirname $i` + done + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + msg $"Mounting dirs required for 32bit emulation" + if eval $pid; then + for i in ${dirs[@]} + do + umount $chroot/$i + done + ok $? + else + ok 999 + fi +} + +rc_exec $1 From vmiklos at frugalware.org Sun Jul 22 14:52:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:26 2007 Subject: [Frugalware-git] emul32-tools: README: converted to asciidoc Message-ID: <20070722125220.2ECDE13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=5d12a873f828d48ca8fa2843a9a481cc7ee1615a commit 5d12a873f828d48ca8fa2843a9a481cc7ee1615a Author: VMiklos Date: Sun Jul 22 01:22:28 2007 +0200 README: converted to asciidoc diff --git a/README.Frugalware b/README.Frugalware index 442358d..539e724 100644 --- a/README.Frugalware +++ b/README.Frugalware @@ -1,12 +1,4 @@ -emul32-tools -============= - -1. Whats this and whats good for -2. What you need to do for proper working and how to use -3. Footnotes :P - -1. Whats this and whats good for -================================= +=== Whats this and whats good for emul32-tools contains small scripts to do 32bit chroot emulation easly on a 64bit machine. It got two major script emul32 and rc.emul32-tools. @@ -21,8 +13,7 @@ much stuff automatically, like creating a 'Common' directory between host and gu chroots into it and creates home directories and other small stuffs. -2. What you need to do for proper working and how to use -========================================================= +=== What you need to do for proper working and how to use First, you need to install emul-core (TODO!) via pacman-g2. @@ -49,8 +40,7 @@ repoman merge teamspeak then install the FPM with pacman-g2 then you can start the app via 'emul32 teamspeak' or via the menu entry you find in your fav. WM. -3. Footnotes :P -================ +=== Footnotes :P If you want to run or install something else what we not packaged, then you can do that example: foobar.bin From vmiklos at frugalware.org Sun Jul 22 14:52:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:27 2007 Subject: [Frugalware-git] emul32-tools: README: update for rc.emul32-tools Message-ID: <20070722125220.0BC1E13A41A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=29dd4f2abfd8f4483e720c4c1a04282e03f10566 commit 29dd4f2abfd8f4483e720c4c1a04282e03f10566 Author: VMiklos Date: Sun Jul 22 01:19:48 2007 +0200 README: update for rc.emul32-tools diff --git a/README.Frugalware b/README.Frugalware index fc79839..442358d 100644 --- a/README.Frugalware +++ b/README.Frugalware @@ -9,8 +9,8 @@ emul32-tools ================================= emul32-tools contains small scripts to do 32bit chroot emulation easly on a -64bit machine. It got two major script emul32 and rc.32bitchroot. -rc.32bitchroot is an initscript which sets everything on start. Sets the directory +64bit machine. It got two major script emul32 and rc.emul32-tools. +rc.emul32-tools is an initscript which sets everything on start. Sets the directory paths, does mounts for 32bit chroot dirs and copy neccessary files like passwd shadow and other small stuff to 32bit chroot from 64bit host OS. This need to be done. @@ -40,7 +40,7 @@ does not ask for your password. So when you type 'emul32 something' then you wont be asked for password. What else need to be done ? When you want to use the 32bitchroot stuff then you -need to START rc.32bitchroot . You can set up that start automatically or you can +need to START rc.emul32-tools. You can set up that start automatically or you can start it via hand like: service 32bitchroot start (TODO!) Once this done and you want to use example TeamSpeak then you do a From vmiklos at frugalware.org Sun Jul 22 14:52:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:28 2007 Subject: [Frugalware-git] emul32-tools: README: spellcheck, asciidoc syntax fixes Message-ID: <20070722125220.5CE3F13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=5ba42d8784df11a8c656ef602eabc65d3fadd0bf commit 5ba42d8784df11a8c656ef602eabc65d3fadd0bf Author: VMiklos Date: Sun Jul 22 01:38:39 2007 +0200 README: spellcheck, asciidoc syntax fixes diff --git a/README.Frugalware b/README.Frugalware index 539e724..cbc8305 100644 --- a/README.Frugalware +++ b/README.Frugalware @@ -1,59 +1,81 @@ -=== Whats this and whats good for +=== Overview -emul32-tools contains small scripts to do 32bit chroot emulation easly on a -64bit machine. It got two major script emul32 and rc.emul32-tools. -rc.emul32-tools is an initscript which sets everything on start. Sets the directory -paths, does mounts for 32bit chroot dirs and copy neccessary files like passwd -shadow and other small stuff to 32bit chroot from 64bit host OS. This need to -be done. +`emul32-tools` contains small scripts to do 32bit chroot emulation easily on a +64bit machine. It got two major script `emul32` and `rc.emul32-tools`. -emul32 is a wrapper for linux32 chroot /usr/lib/chroot32 foobarbaz . It does -much stuff automatically, like creating a 'Common' directory between host and guest -. This wrapper calls the application inside the 32bit chroot. Ofcourse first it -chroots into it and creates home directories and other small stuffs. +`rc.emul32-tools` is an initscript which sets everything on start. Sets the +directory paths, does mounts for 32bit chroot directories and copy necessary +files like `passwd`, `shadow` and other small stuff to 32bit chroot from 64bit +host OS. This need to be done. +`emul32` is a wrapper for + +---- +# linux32 chroot /usr/lib/chroot32 +---- + +It does much stuff automatically, like creating a 'Common' directory between +host and guest . This wrapper calls the application inside the 32bit chroot. Of +course first it chroots into it and creates home directories and other small +stuffs. === What you need to do for proper working and how to use -First, you need to install emul-core (TODO!) via pacman-g2. +First, you need to install `emul32-tools` (TODO!) via `pacman-g2`. -pacman-g2 -S emul-core +---- +# pacman-g2 -S emul32-tools +---- -This will pulls all neccessary -emul packages to the chroot32 directory. +This will pulls all necessary `-emul` packages to the `/usr/lib/chroot32` +directory. -Second, you need to add your user into sudoers file. See an example: +Second, you need to add your user to the `/etc/sudoers` file. See an example: -/etc/sudoers: +// FIXME: we need sudo for mount/linux32/umount currently, right? +// we could add --mount/--linux32/--umount options to emul32 to limit secholes + +---- krics ALL=(ALL) NOPASSWD: /usr/bin/emul32 +---- + +This way you won't be asked for a password when `emul32` runs itself as root. -This will cause if you run emul32 as user krics then inside emul32 sudo request -does not ask for your password. So when you type 'emul32 something' then you -wont be asked for password. +What else need to be done? When you want to use the `emul32-tools` then you +need to start `rc.emul32-tools`. You can set up that start automatically or you can +start it via hand like: service emul32-tools start (TODO!) -What else need to be done ? When you want to use the 32bitchroot stuff then you -need to START rc.emul32-tools. You can set up that start automatically or you can -start it via hand like: service 32bitchroot start (TODO!) +Once this is done, if you want to use for example `TeamSpeak`, then you have to: -Once this done and you want to use example TeamSpeak then you do a +---- +# repoman merge teamspeak +---- -repoman merge teamspeak then install the FPM with pacman-g2 then you can start -the app via 'emul32 teamspeak' or via the menu entry you find in your fav. WM. +then you can start +the application via +---- +$ emul32 teamspeak +---- -=== Footnotes :P +or via the menu entry you find in your favourite window manager. + + +=== Footnotes If you want to run or install something else what we not packaged, then you can -do that example: foobar.bin +do that example: `foobar.bin` -Copy foobar.bin to your user's Common directory on host (64bit) . +Copy `foobar.bin` to your user's Common directory on host (64bit) . Then start run it somehow like this: -emul32 /home/YOURUSERNAME/Common/foobar.bin +`emul32 /home//Common/foobar.bin` -Thats all. +That's all. - -If you got any problem or trouble ask help on IRC or in BTS +If you got any problem or trouble ask help on `IRC` or in `BTS`. Christian Hamar alias krix + +// vim: ft=asciidoc From vmiklos at frugalware.org Sun Jul 22 14:52:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:29 2007 Subject: [Frugalware-git] emul32-tools: emul32: new --mount, --umount and --linux32 switches Message-ID: <20070722125220.8B8AD13A41A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=adad55e98017d118d6c4dea55a572df7d26b92bc commit adad55e98017d118d6c4dea55a572df7d26b92bc Author: VMiklos Date: Sun Jul 22 01:44:23 2007 +0200 emul32: new --mount, --umount and --linux32 switches this way no need to grant permission to execute linux32 and others as root (which would be equal to grant permission to execute bash as root) diff --git a/README.Frugalware b/README.Frugalware index cbc8305..5fc782e 100644 --- a/README.Frugalware +++ b/README.Frugalware @@ -32,9 +32,6 @@ directory. Second, you need to add your user to the `/etc/sudoers` file. See an example: -// FIXME: we need sudo for mount/linux32/umount currently, right? -// we could add --mount/--linux32/--umount options to emul32 to limit secholes - ---- krics ALL=(ALL) NOPASSWD: /usr/bin/emul32 ---- diff --git a/emul32 b/emul32 index e86848c..280e3a4 100644 --- a/emul32 +++ b/emul32 @@ -20,6 +20,17 @@ # USA. # +if [ "$1" = "--mount" ]; then + mount -o bind /home/$USER/Common /usr/lib/chroot32/home/$USER/Common + exit $? +elif [ "$1" = "--umount" ]; then + umount /home/$USER/Common + exit $? +elif [ "$1" = "--linux32" ]; then + linux32 /usr/sbin/chroot /usr/lib/chroot32/ + exit $? +fi + if [ ! "`type -p linux32`" ]; then echo "Cannot find the linux32 binary! Is linux32 installed?" exit 1 @@ -44,12 +55,12 @@ if [ ! -d /home/$USER/Common ]; then fi if [ -d /home/$USER/Common ]; then - sudo mount -o bind /home/$USER/Common /usr/lib/chroot32/home/$USER/Common + sudo $0 --mount fi echo "if [ ! -d /home/$USER/Common ]; then mkdir -p /home/$USER/Common; chown -R $USER:users /home/$USER; fi; \ -/bin/su - $USER -c \"$cmd\"" |sudo linux32 /usr/sbin/chroot /usr/lib/chroot32/ +/bin/su - $USER -c \"$cmd\"" |sudo $0 --linux32 -sudo umount /home/$USER/Common +sudo $0 --umount xhost -local:localhost >/dev/null From vmiklos at frugalware.org Sun Jul 22 14:52:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:30 2007 Subject: [Frugalware-git] emul32-tools: emul32: more secfixes Message-ID: <20070722125220.B4D2213A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=98a5f79ffb1fd487dfa68b2d750ec5afffa3edb0 commit 98a5f79ffb1fd487dfa68b2d750ec5afffa3edb0 Author: VMiklos Date: Sun Jul 22 01:53:05 2007 +0200 emul32: more secfixes the previous version still allowed one to get a root shell in the chroot, this one does not ah and a bugfix: create the Common dir before the mount, not after diff --git a/emul32 b/emul32 index 280e3a4..e214cb3 100644 --- a/emul32 +++ b/emul32 @@ -21,13 +21,18 @@ # if [ "$1" = "--mount" ]; then - mount -o bind /home/$USER/Common /usr/lib/chroot32/home/$USER/Common + if [ ! -d /usr/lib/chroot32/home/$SUDO_USER/Common ]; then + mkdir -p /usr/lib/chroot32/home/$SUDO_USER/Common + chown -R $SUDO_USER:users /home/$SUDO_USER + fi + mount -o bind /home/$SUDO_USER/Common /usr/lib/chroot32/home/$SUDO_USER/Common exit $? elif [ "$1" = "--umount" ]; then - umount /home/$USER/Common + umount /home/$SUDO_USER/Common exit $? elif [ "$1" = "--linux32" ]; then - linux32 /usr/sbin/chroot /usr/lib/chroot32/ + shift + echo "/bin/su - $SUDO_USER -c \"$@\"" |linux32 /usr/sbin/chroot /usr/lib/chroot32/ exit $? fi @@ -58,8 +63,7 @@ if [ -d /home/$USER/Common ]; then sudo $0 --mount fi -echo "if [ ! -d /home/$USER/Common ]; then mkdir -p /home/$USER/Common; chown -R $USER:users /home/$USER; fi; \ -/bin/su - $USER -c \"$cmd\"" |sudo $0 --linux32 +sudo $0 --linux32 $cmd sudo $0 --umount From vmiklos at frugalware.org Sun Jul 22 14:52:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:32 2007 Subject: [Frugalware-git] emul32-tools: remove old rc.32bitchroot script Message-ID: <20070722125220.E1D3D13A41A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=d399123a5c3129e2566fbe7ac12d55478955f176 commit d399123a5c3129e2566fbe7ac12d55478955f176 Author: VMiklos Date: Sun Jul 22 01:54:51 2007 +0200 remove old rc.32bitchroot script diff --git a/rc.32bitchroot b/rc.32bitchroot deleted file mode 100644 index 7988642..0000000 --- a/rc.32bitchroot +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -. /etc/rc.d/rc.functions - -CHROOT_LOCATION=${CHROOT_LOCATION:-/usr/lib/chroot32} - -if [ "$1" = "stop" ]; then - echo -n "Umounting 32bits chroot dirs..." - for loc in /dev/pts /dev/shm /dev /proc/bus/usb /proc /sys /tmp /usr/lib/X11/fonts; do - umount -f ${CHROOT_LOCATION}${loc} >/dev/null - done - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 2 - "$0" start -else - echo -n "Mounting 32bits chroot dirs to ${CHROOT_LOCATION} ..." - for loc in /dev /dev/pts /dev/shm /proc /proc/bus/usb /sys /tmp /usr/lib/X11/fonts; do - mount -o bind ${loc} ${CHROOT_LOCATION}${loc} >/dev/null - done - echo -e "done." - echo -n "Copying 32bits chroot files ..." - for conffile in profile resolv.conf passwd shadow group gshadow hosts ; do - [[ -f /etc/${conffile} ]] && cp -pf /etc/${conffile} ${CHROOT_LOCATION}/etc >/dev/null & - done - [[ -f /etc/sysconfig/keymap ]] && cp -pf /etc/sysconfig/keymap ${CHROOT_LOCATION}/etc/sysconfig >/dev/null & - [[ -f /etc/sysconfig/font ]] && cp -pf /etc/sysconfig/font ${CHROOT_LOCATION}/etc/sysconfig >/dev/null & - [[ -f /etc/profile.d/lang.sh ]] && cp -pf /etc/profile.d/lang.sh ${CHROOT_LOCATION}/etc/profile.d >/dev/null & - cp -pf /etc/pango/* ${CHROOT_LOCATION}/etc/pango/ >/dev/null & - cp -pf /etc/gtk-2.0/* ${CHROOT_LOCATION}/etc/gtk-2.0/ >/dev/null & - cp -Ppf /etc/localtime ${CHROOT_LOCATION}/etc >/dev/null & - ok $? -fi From vmiklos at frugalware.org Sun Jul 22 14:52:21 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 14:52:33 2007 Subject: [Frugalware-git] emul32-tools: moved items from README.Frugalware to TODO Message-ID: <20070722125221.206B513A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=emul32-tools/.git;a=commitdiff;h=08fb4fd515be94576d68a720ee1f0cb9025c34ac commit 08fb4fd515be94576d68a720ee1f0cb9025c34ac Author: VMiklos Date: Sun Jul 22 01:59:00 2007 +0200 moved items from README.Frugalware to TODO diff --git a/README.Frugalware b/README.Frugalware index 5fc782e..4cf3ba4 100644 --- a/README.Frugalware +++ b/README.Frugalware @@ -21,7 +21,7 @@ stuffs. === What you need to do for proper working and how to use -First, you need to install `emul32-tools` (TODO!) via `pacman-g2`. +First, you need to install `emul32-tools` via `pacman-g2`. ---- # pacman-g2 -S emul32-tools @@ -40,7 +40,11 @@ This way you won't be asked for a password when `emul32` runs itself as root. What else need to be done? When you want to use the `emul32-tools` then you need to start `rc.emul32-tools`. You can set up that start automatically or you can -start it via hand like: service emul32-tools start (TODO!) +start it via hand like: + +---- +# service emul32-tools start +---- Once this is done, if you want to use for example `TeamSpeak`, then you have to: diff --git a/TODO b/TODO index a28ec7b..65a6e91 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,5 @@ * Create some PID or something else for mount / umount Common dir because now if you start 2 app, then if one of them exit its umount Common and then you cant see anymore from app1 if app2 ends :P -* Rework rc.32bitchroot to fit our initscript style +* Figure out what deps are needed for the emul32-tools pkg, like shadow-emul + (should depend on glibc-emul and frugalware-emul). From voroskoi at frugalware.org Sun Jul 22 18:58:57 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jul 22 18:58:59 2007 Subject: [Frugalware-git] frugalware-current: seamonkey-1.1.3-1-i686 Message-ID: <20070722165857.A365313A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3ac9de30b8a0acc3492292c963ee740cf49f4159 commit 3ac9de30b8a0acc3492292c963ee740cf49f4159 Author: voroskoi Date: Sun Jul 22 18:55:10 2007 +0200 seamonkey-1.1.3-1-i686 version bump diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild index 81f540a..7f2f633 100644 --- a/source/xapps-extra/seamonkey/FrugalBuild +++ b/source/xapps-extra/seamonkey/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=seamonkey -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="Seamonkey all-in-one internet application suite" url="http://www.mozilla.org/projects/seamonkey/" @@ -48,8 +48,8 @@ build() { # Install menu file. Ffile /usr/share/applications/$pkgname.desktop } -sha1sums=('d0aa219b54a54cd75e690a458280b0d12bcf9607'\ - '0dd4777e87d70eba6834d56813f6a415fe991007'\ +sha1sums=('3f7136c8b746d8c789e41839e99465ad4baa1ccb' \ + '0dd4777e87d70eba6834d56813f6a415fe991007' \ 'b0e0bdd676758e19cac4a0429257a92183328f0e') # optimization OK From vmiklos at frugalware.org Sun Jul 22 19:32:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 19:32:29 2007 Subject: [Frugalware-git] frugalware-current: tools/gitpull: don't hide some repos during pull Message-ID: <20070722173226.DB9FB13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a0fc01ee25787c2d4eec395906cee20f7f780b23 commit a0fc01ee25787c2d4eec395906cee20f7f780b23 Author: VMiklos Date: Sun Jul 22 19:30:33 2007 +0200 tools/gitpull: don't hide some repos during pull diff --git a/tools/gitpull b/tools/gitpull index a10fcc1..50f6577 100755 --- a/tools/gitpull +++ b/tools/gitpull @@ -3,7 +3,7 @@ server="rsync://rsync.frugalware.org/pub/other/homepage-ng/git/repos/" cd `dirname $0`/../repos -: > projects.list +: > projects.list.new for i in `rsync $server|sed 's/.* \([^ ]\)/\1/;1 d'` do if [ -d $i ]; then @@ -24,5 +24,6 @@ do else owner="Unknown" fi - echo "$i%2F.git $owner" >> projects.list + echo "$i%2F.git $owner" >> projects.list.new done +mv -f projects.list.new projects.list From vmiklos at frugalware.org Sun Jul 22 19:52:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 19:53:00 2007 Subject: [Frugalware-git] pacman-g2: autogen.sh: updated for git Message-ID: <20070722175258.17D5113A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=8659c4ad2e0e6ec142e444f93a268e79b314b371 commit 8659c4ad2e0e6ec142e444f93a268e79b314b371 Author: VMiklos Date: Sun Jul 22 19:35:10 2007 +0200 autogen.sh: updated for git diff --git a/autogen.sh b/autogen.sh index fca8074..6d0827f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -52,9 +52,13 @@ if [ "$1" == "--dist" ]; then if [ ! "$release" ]; then ver="${ver}_`date +%Y%m%d`" fi - darcs changes >_darcs/current/ChangeLog - darcs dist -d pacman-g2-$ver - rm _darcs/current/ChangeLog + git-archive --format=tar --prefix=pacman-g2-$ver/ HEAD | tar xf - + git log --no-merges |git name-rev --tags --stdin > pacman-g2-$ver/ChangeLog + cd pacman-g2-$ver + ./autogen.sh --git + cd .. + tar czf pacman-g2-$ver.tar.gz pacman-g2-$ver + rm -rf pacman-g2-$ver if [ "$release" ]; then dest="../releases" gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ @@ -130,6 +134,6 @@ cp -f $(dirname $(which automake))/../share/automake-$(automake --version|sed 's cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./ automake -a -c --gnu --foreign -if [ "$1" == "--darcs" ]; then +if [ "$1" == "--git" ]; then rm -rf autom4te.cache fi From vmiklos at frugalware.org Sun Jul 22 19:52:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 19:53:01 2007 Subject: [Frugalware-git] pacman-g2: exclude hu, ig, yo empty translations from the release tarball Message-ID: <20070722175258.281E413A41A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=2b9586fd29d196bac6002ed4cbe98221c8762a40 commit 2b9586fd29d196bac6002ed4cbe98221c8762a40 Author: VMiklos Date: Sun Jul 22 19:42:13 2007 +0200 exclude hu, ig, yo empty translations from the release tarball diff --git a/autogen.sh b/autogen.sh index 6d0827f..2cb5275 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,7 +10,7 @@ import_pootle() : > src/pacman-g2/po/LINGUAS for i in $(/bin/ls $po_dir/pacman) do - [ "$i" = "sk" ] && continue + [ "$i" = "sk" -o "$i" = "ha" -o "$i" = "ig" -o "$i" = "yo" ] && continue cp $po_dir/pacman/$i/libpacman.po lib/libpacman/po/$i.po if msgfmt -c --statistics -o lib/libpacman/po/$i.gmo lib/libpacman/po/$i.po; then echo $i >> lib/libpacman/po/LINGUAS From vmiklos at frugalware.org Sun Jul 22 20:05:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 20:06:14 2007 Subject: [Frugalware-git] pacman-g2: updates for 3.6.0 Message-ID: <20070722180557.323EC13A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=a4f07d79b05efc42e80f9eb68c04661c2a16af21 commit a4f07d79b05efc42e80f9eb68c04661c2a16af21 Author: VMiklos Date: Sun Jul 22 20:04:27 2007 +0200 updates for 3.6.0 diff --git a/NEWS b/NEWS index 1b68f41..9ea8db2 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +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 + - fix for -Sp when sometimes the arch part of the filename was + missing 3.5.9 - pacman_db_search(): flush the list of needles automatically - makepkg: do not delete the binary package if -c is used and the name of the pkg starts with "pkg" diff --git a/configure.ac b/configure.ac index 30f57d4..6493444 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([pacman-g2 package manager], 3.5.9, [frugalware-devel@frugalware.org], pacman-g2) +AC_INIT([pacman-g2 package manager], 3.6.0, [frugalware-devel@frugalware.org], pacman-g2) AC_LANG(C) AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM @@ -20,8 +20,8 @@ esac dnl Define here the libpacman version number PM_MAJOR_VERSION=0 PM_MINOR_VERSION=3 -PM_MICRO_VERSION=5 -PM_MICRO_VERSION_SUFFIX=.9 +PM_MICRO_VERSION=6 +PM_MICRO_VERSION_SUFFIX=.0 PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION$PM_MICRO_VERSION_SUFFIX dnl Needed for libtool to create proper shared lib version PM_VERSION_INFO=`expr $PM_MAJOR_VERSION + $PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION From vmiklos at frugalware.org Sun Jul 22 20:12:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 20:12:30 2007 Subject: [Frugalware-git] frugalware-current: openoffice.org-2.2.1-2-i686 Message-ID: <20070722181228.448F613A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=748b303accec282eb8826667bc0b5aa0b200bd1c commit 748b303accec282eb8826667bc0b5aa0b200bd1c Author: VMiklos Date: Sat Jul 21 22:50:33 2007 +0200 openoffice.org-2.2.1-2-i686 added fix-invisible-text.diff closes #2224 diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 5c22483..1aa69ce 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -11,7 +11,7 @@ if [ ! "`check_option DEVEL`" ]; then tree=oof680 milestone=18 pkgver=$upstream - pkgrel=1 + pkgrel=2 snapshot=20070628 else upstream=2.2.0 @@ -37,8 +37,9 @@ archs=('i686' 'x86_64') if [ ! "`check_option DEVEL`" ]; then up2date="lynx -dump $url |grep version:|sed 's/.*: //'" source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$branch-$snapshot.tar.bz2 \ - http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2) - signatures=($source.asc '') + http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2 \ + fix-invisible-text.diff) + signatures=($source.asc '' '') else up2date="lynx -dump http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/configure.in|grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/${pkgver%%oo*}\1_\2/'" source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2 \ @@ -109,7 +110,7 @@ build() { cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1 # Remove our patches so that incremental build will be possible. - #rm -f patches/src680/disable-regcomp-python.diff + rm -f patches/src680/fix-invisible-text.diff Fpatchall # Defined $CARCH config diff --git a/source/xapps/openoffice.org/fix-invisible-text.diff b/source/xapps/openoffice.org/fix-invisible-text.diff new file mode 100644 index 0000000..eb2c0b5 --- /dev/null +++ b/source/xapps/openoffice.org/fix-invisible-text.diff @@ -0,0 +1,25 @@ +diff -Naur ooo-build-2-2.orig/patches/src680/apply ooo-build-2-2/patches/src680/apply +--- ooo-build-2-2.orig/patches/src680/apply 2007-07-21 22:40:29.000000000 +0200 ++++ ooo-build-2-2/patches/src680/apply 2007-07-21 22:46:46.000000000 +0200 +@@ -781,6 +781,7 @@ + gcc401-stlport45-include.diff, gghibo + # needed by CXXHelpLinker + system-db-4.3-java-library-path.diff ++fix-invisible-text.diff + + + # ( mmp@oo.o deals with defaults apparently ) +diff -Naur ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff ooo-build-2-2/patches/src680/fix-invisible-text.diff +--- ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff 1970-01-01 01:00:00.000000000 +0100 ++++ ooo-build-2-2/patches/src680/fix-invisible-text.diff 2007-07-21 22:46:23.000000000 +0200 +@@ -0,0 +1,10 @@ ++--- sw/source/core/bastyp/swregion.cxx +++++ sw/source/core/bastyp/swregion.cxx ++@@ -79,6 +79,7 @@ ++ { ++ if( rDel ) ++ { +++ pData = (SwRect*) pData; ++ *(pData+nPos) = rRect; ++ rDel = FALSE; ++ } From vmiklos at frugalware.org Sun Jul 22 20:12:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 20:12:31 2007 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.0-1-i686 Message-ID: <20070722181228.6183013A41A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=40bf5be3fddc9ad2b3c0b26ba8ac8d1326134b85 commit 40bf5be3fddc9ad2b3c0b26ba8ac8d1326134b85 Author: VMiklos Date: Sun Jul 22 20:12:12 2007 +0200 pacman-g2-3.6.0-1-i686 version bump diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 46ee6e2..f638885 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=pacman-g2 -pkgver=3.5.9 -pkgrel=2 +pkgver=3.6.0 +pkgrel=1 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current}) @@ -13,7 +13,6 @@ Finclude mono groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/releases/ |Flasttar" -source=($url/releases/$pkgname-$pkgver.tar.gz \ -http://darcs.frugalware.org/patches/pacman-g2/20070721114532-e2957-654719e4f6aeadfcb1bd4520b5ce2ce272a0baf6.patch) -signatures=("$source.asc" '') +source=($url/releases/$pkgname-$pkgver.tar.gz) +signatures=("$source.asc") # optimization OK From vmiklos at frugalware.org Sun Jul 22 21:08:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 21:08:29 2007 Subject: [Frugalware-git] homepage-ng: FSA222-qemu Message-ID: <20070722190822.5EBF313A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=2d65a880da389fc3b2df91ea895e310d9ff9c50b commit 2d65a880da389fc3b2df91ea895e310d9ff9c50b Author: VMiklos Date: Sun Jul 22 21:06:50 2007 +0200 FSA222-qemu diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 7fa25e5..e6c3cc2 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,27 @@ + 222 + 2007-07-22 + vmiklos + qemu + 0.9.0-1 + 0.9.0-2terminus1 + http://bugs.frugalware.org/task/2011 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1320 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1321 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1322 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1323 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1366 + Tavis Ormandy has reported some vulnerabilities in QEMU, which can be exploited by malicious uses to bypass certain security restrictions or cause a DoS (Denial of Service). + 1) A boundary error exists within the "cirrus_invalidate_region()" function of the Cirrus video driver, which can be exploited to cause a heap-based buffer overflow. + 2) The size of ethernet frames is not correctly checked against the "MTU" before being copied into the registers of the NE2000 network driver. This can be exploited to cause a heap-based buffer overflow. + 3) An integer signedness error when processing data in the NE2000 device registers can be exploited to cause a heap-based buffer overflow. + Successful exploitation of 1) through 3) may allow the execution of arbitrary code. + 4) Errors when handling the "icebp" instruction can be exploited to cause a DoS by terminating the emulation session. + 5) An error within the handling of the "aam" instruction can result in a division by zero, which can be exploited to cause a DoS. + + 221 2007-07-22 vmiklos From vmiklos at frugalware.org Sun Jul 22 22:19:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 22 22:19:34 2007 Subject: [Frugalware-git] frugalware-current: openoffice.org-2.2.1-2-i686 Message-ID: <20070722201929.B1DB913A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a6a18ffb6704d86731e462af91167a878b62ef16 commit a6a18ffb6704d86731e462af91167a878b62ef16 Author: VMiklos Date: Sat Jul 21 22:50:33 2007 +0200 openoffice.org-2.2.1-2-i686 added fix-invisible-text.diff closes #2224 diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 5c22483..1aa69ce 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -11,7 +11,7 @@ if [ ! "`check_option DEVEL`" ]; then tree=oof680 milestone=18 pkgver=$upstream - pkgrel=1 + pkgrel=2 snapshot=20070628 else upstream=2.2.0 @@ -37,8 +37,9 @@ archs=('i686' 'x86_64') if [ ! "`check_option DEVEL`" ]; then up2date="lynx -dump $url |grep version:|sed 's/.*: //'" source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$branch-$snapshot.tar.bz2 \ - http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2) - signatures=($source.asc '') + http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2 \ + fix-invisible-text.diff) + signatures=($source.asc '' '') else up2date="lynx -dump http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/configure.in|grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/${pkgver%%oo*}\1_\2/'" source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2 \ @@ -109,7 +110,7 @@ build() { cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1 # Remove our patches so that incremental build will be possible. - #rm -f patches/src680/disable-regcomp-python.diff + rm -f patches/src680/fix-invisible-text.diff Fpatchall # Defined $CARCH config diff --git a/source/xapps/openoffice.org/fix-invisible-text.diff b/source/xapps/openoffice.org/fix-invisible-text.diff new file mode 100644 index 0000000..eb2c0b5 --- /dev/null +++ b/source/xapps/openoffice.org/fix-invisible-text.diff @@ -0,0 +1,25 @@ +diff -Naur ooo-build-2-2.orig/patches/src680/apply ooo-build-2-2/patches/src680/apply +--- ooo-build-2-2.orig/patches/src680/apply 2007-07-21 22:40:29.000000000 +0200 ++++ ooo-build-2-2/patches/src680/apply 2007-07-21 22:46:46.000000000 +0200 +@@ -781,6 +781,7 @@ + gcc401-stlport45-include.diff, gghibo + # needed by CXXHelpLinker + system-db-4.3-java-library-path.diff ++fix-invisible-text.diff + + + # ( mmp@oo.o deals with defaults apparently ) +diff -Naur ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff ooo-build-2-2/patches/src680/fix-invisible-text.diff +--- ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff 1970-01-01 01:00:00.000000000 +0100 ++++ ooo-build-2-2/patches/src680/fix-invisible-text.diff 2007-07-21 22:46:23.000000000 +0200 +@@ -0,0 +1,10 @@ ++--- sw/source/core/bastyp/swregion.cxx +++++ sw/source/core/bastyp/swregion.cxx ++@@ -79,6 +79,7 @@ ++ { ++ if( rDel ) ++ { +++ pData = (SwRect*) pData; ++ *(pData+nPos) = rRect; ++ rDel = FALSE; ++ } From vmiklos at frugalware.org Mon Jul 23 00:51:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 00:51:39 2007 Subject: [Frugalware-git] frugalware-current: gdesklets-0.35.4-2-x86_64 Message-ID: <20070722225136.A623413A41A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=27a395a69b82e90f2015b673e1a819ffd148e656 commit 27a395a69b82e90f2015b673e1a819ffd148e656 Author: VMiklos Date: Mon Jul 23 00:51:22 2007 +0200 gdesklets-0.35.4-2-x86_64 rebuild and fix depends closes #2263 diff --git a/source/gnome-extra/gdesklets/FrugalBuild b/source/gnome-extra/gdesklets/FrugalBuild index 86490ec..25a4c61 100644 --- a/source/gnome-extra/gdesklets/FrugalBuild +++ b/source/gnome-extra/gdesklets/FrugalBuild @@ -4,10 +4,10 @@ pkgname=gdesklets pkgver=0.35.4 -pkgrel=1 +pkgrel=2 pkgdesc="gdesklets provides an advanced architecture for your desktop applets" url="http://gdesklets.org/" -depends=('python' 'pygtk' 'libgtop' 'librsvg' 'gconf' 'gnome-python' 'libgnomeui') +depends=('python>=2.5' 'pygtk' 'libgtop' 'librsvg' 'gconf' 'gnome-python' 'libgnomeui') makedepends=('perl-xml') rodepends=('shared-mime-info') groups=('gnome-extra') From krics at linuxforum.hu Mon Jul 23 07:54:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 23 07:55:00 2007 Subject: [Frugalware-git] frugalware-current: xterm-228-1-i686 Message-ID: <20070723055458.18734186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c54a98ebb182be1e3d509e32a19901c45e628be1 commit c54a98ebb182be1e3d509e32a19901c45e628be1 Author: Christian Hamar alias krix Date: Mon Jul 23 07:54:12 2007 +0200 xterm-228-1-i686 * Version bump diff --git a/source/x11/xterm/FrugalBuild b/source/x11/xterm/FrugalBuild index 564740b..d685130 100644 --- a/source/x11/xterm/FrugalBuild +++ b/source/x11/xterm/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=xterm -pkgver=227 -pkgrel=2 +pkgver=228 +pkgrel=1 pkgdesc="X terminal emulator" url="http://dickey.his.com/xterm/" groups=('x11' 'xorg-core' 'xorg-apps') @@ -42,5 +42,5 @@ build() { Fbuild_gnome_scriptlet } -sha1sums=('301c2fd6bed42dd2cb8ebbde861e91e77b63f745') +sha1sums=('dcb0cd8adb43cd532027adb249040a389e3635ba') # optimization OK From krics at linuxforum.hu Mon Jul 23 08:44:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 23 08:44:49 2007 Subject: [Frugalware-git] frugalware-current: gnomebaker-0.6.1-1-i686 Message-ID: <20070723064447.6D428186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=e7afe88da88893b6b76c59ef4dcf05b6368eefec commit e7afe88da88893b6b76c59ef4dcf05b6368eefec Author: Christian Hamar alias krix Date: Mon Jul 23 08:44:06 2007 +0200 gnomebaker-0.6.1-1-i686 * Fixed up2date * Replaced "" with '' :S :) /me slaps priyank :) - Dont use stuff like this: up2date="lynx -dump "http://foo" | grep .." diff --git a/source/gnome-extra/gnomebaker/FrugalBuild b/source/gnome-extra/gnomebaker/FrugalBuild index 879bd09..e0ade46 100644 --- a/source/gnome-extra/gnomebaker/FrugalBuild +++ b/source/gnome-extra/gnomebaker/FrugalBuild @@ -14,7 +14,7 @@ depends=('libgnomeui>=2.18.1' 'gtk+2' 'libglade' 'libnotify' 'cdrtools' 'mpg321' 'vorbis-tools' 'sox' 'dvd+rw-tools' 'perl-xml' 'gstreamer') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="lynx -dump "http://sourceforge.net/project/showfiles.php?group_id=127397" | grep -m1 -A1 Package | tail -n1 | sed 's/.*2]\(.*\) O.*/\1/'" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=127397' | grep -m1 -A1 Package | tail -n1 | sed 's/.*]\(.*\) O.*/\1/'" Fconfopts="${Fconfopts[@]} --enable-libnotify" sha1sums=('27be843a1d5a33848bb37cd549984ea9b7ecfd52') From vmiklos at frugalware.org Mon Jul 23 11:16:17 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 11:16:20 2007 Subject: [Frugalware-git] frugalware-current: irssistats-0.73-2-i686 Message-ID: <20070723091617.48EEE186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5fc4a30df3afd34fdb46afb6a0ad5b85f0176d88 commit 5fc4a30df3afd34fdb46afb6a0ad5b85f0176d88 Author: VMiklos Date: Mon Jul 23 11:15:55 2007 +0200 irssistats-0.73-2-i686 added -extra_modes.diff some cleanup diff --git a/source/network-extra/irssistats/FrugalBuild b/source/network-extra/irssistats/FrugalBuild index 32ba9a5..bcd1c16 100644 --- a/source/network-extra/irssistats/FrugalBuild +++ b/source/network-extra/irssistats/FrugalBuild @@ -3,16 +3,17 @@ pkgname=irssistats pkgver=0.73 -pkgrel=1 +pkgrel=2 pkgdesc="Generates HTML IRC stats based on irssi logs." url="http://royale.zerezo.com/irssistats/" depends=('glibc') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($url/$pkgname-$pkgver.tar.gz $pkgname-0.72-cflags.diff) -sha1sums=('503f280e3d7b8d768d6033a9388addc3711f3a3a'\ - '1339a01328a61436d780773319aa2c594375f9ef') +source=($url/$pkgname-$pkgver.tar.gz $pkgname-0.72-cflags.diff $pkgname-0.72-extra_modes.diff) +sha1sums=('503f280e3d7b8d768d6033a9388addc3711f3a3a' \ + '1339a01328a61436d780773319aa2c594375f9ef' \ + '96f81ad3907d2fc4fb31eb16daaad94b05101917') build() { @@ -22,6 +23,4 @@ build() install } -# optimalization ok - # optimization OK diff --git a/source/network-extra/irssistats/irssistats-0.72-extra_modes.diff b/source/network-extra/irssistats/irssistats-0.72-extra_modes.diff new file mode 100644 index 0000000..d7965e9 --- /dev/null +++ b/source/network-extra/irssistats/irssistats-0.72-extra_modes.diff @@ -0,0 +1,11 @@ +--- irssistats-0.73/irssistats.c.orig 2007-07-23 11:11:14.000000000 +0200 ++++ irssistats-0.73/irssistats.c 2007-07-23 11:12:32.000000000 +0200 +@@ -1097,6 +1097,8 @@ + case '@': + case '%': + case '+': ++ case '&': ++ case '~': + case ' ': + nickstart = timelen+2; + break; From priyank at frugalware.org Mon Jul 23 15:08:13 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 15:08:17 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: don't cancel the sync if user doesn't want to update pacman-g2. Message-ID: <20070723130813.A2D29186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=971d7789d6fa9b8c1387be1f8312a6dc6a91eb2b commit 971d7789d6fa9b8c1387be1f8312a6dc6a91eb2b Author: Priyank Date: Mon Jul 23 18:35:42 2007 +0530 gfpm-interface: don't cancel the sync if user doesn't want to update pacman-g2. * Continue updating of other packages if user doesn't want to update pacman-g2, instead of just exiting. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 32b6ce3..d481f50 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -696,32 +696,33 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) { gfpm_package_list_add (GFPM_INSTALL_LIST, "pacman-g2"); cb_gfpm_apply_btn_clicked (NULL, NULL); + goto cleanup; } } - else + + if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) { - if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) - { - gchar *str; - GString *errorstr = g_string_new (""); - str = g_strdup_printf (_("Failed to init transaction (%s)\n"), pacman_strerror(pm_errno)); - errorstr = g_string_append (errorstr, str); - if (pm_errno == PM_ERR_HANDLE_LOCK) - errorstr = g_string_append (errorstr, - _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); - gfpm_error (errorstr->str); - return; - } - if (pacman_trans_sysupgrade()==-1) - { - 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 ?", packages) == GTK_RESPONSE_YES) - { - cb_gfpm_apply_btn_clicked (NULL, NULL); - } + gchar *str; + GString *errorstr = g_string_new (""); + str = g_strdup_printf (_("Failed to init transaction (%s)\n"), pacman_strerror(pm_errno)); + errorstr = g_string_append (errorstr, str); + if (pm_errno == PM_ERR_HANDLE_LOCK) + errorstr = g_string_append (errorstr, + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + gfpm_error (errorstr->str); + return; + } + if (pacman_trans_sysupgrade()==-1) + { + 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 ?", packages) == GTK_RESPONSE_YES) + { + cb_gfpm_apply_btn_clicked (NULL, NULL); + } + +cleanup: pacman_pkg_free (pm_lpkg); pacman_pkg_free (pm_spkg); From priyank at frugalware.org Mon Jul 23 16:15:53 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 16:15:56 2007 Subject: [Frugalware-git] gfpm: gfpm: new source file gfpm-util.c,h Message-ID: <20070723141553.8F525186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=b6736ca199dd64497eea28078c3d25653e004348 commit b6736ca199dd64497eea28078c3d25653e004348 Author: Priyank Date: Mon Jul 23 19:43:09 2007 +0530 gfpm: new source file gfpm-util.c,h * contains utility functions like gfpm_bold which returns bold text (markup'ed) diff --git a/src/gfpm-util.c b/src/gfpm-util.c new file mode 100644 index 0000000..d760ef3 --- /dev/null +++ b/src/gfpm-util.c @@ -0,0 +1,29 @@ +/* + * gfpm-util.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. + */ + +#include "gfpm-util.h" + +char * +gfpm_bold (const char *text) +{ + if (text == NULL) + return NULL; + return ((char*)g_markup_printf_escaped("%s",text)); +} diff --git a/src/gfpm-util.h b/src/gfpm-util.h new file mode 100644 index 0000000..99171bc --- /dev/null +++ b/src/gfpm-util.h @@ -0,0 +1,15 @@ +#ifndef __GFPM_UTIL_H__ +#define __GFPM_UTIL_H__ + +#include +#include +#include +#include +#include +#include +#include +#include "gfpm.h" + +char * gfpm_bold (const char *); + +#endif From priyank at frugalware.org Mon Jul 23 16:17:20 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 16:17:22 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: use bold text in info tvw. Message-ID: <20070723141720.2CD43186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=9b9a619928ccb381f5dd0fdbc3c0d1cd80ccc99a commit 9b9a619928ccb381f5dd0fdbc3c0d1cd80ccc99a Author: Priyank Date: Mon Jul 23 19:45:27 2007 +0530 gfpm-interface: use bold text in info tvw. diff --git a/src/Makefile.am b/src/Makefile.am index 964b818..ab5937f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,7 @@ bin_PROGRAMS=gfpm ## Gfpm gfpm_SOURCES= \ + gfpm-util.c \ gfpm-db.c \ gfpm-packagelist.c \ gfpm-progress.c \ diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index d481f50..fb4be4f 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -170,7 +170,7 @@ gfpm_interface_init (void) store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_info_tvw), -1, "Info", renderer, "text", 0, NULL); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(gfpm_info_tvw), -1, "Info", renderer, "markup", 0, NULL); renderer = gtk_cell_renderer_text_new (); g_object_set (renderer, "wrap-width", 300, NULL); @@ -466,7 +466,7 @@ gfpm_load_info_tvw (const char *pkg_name) gboolean inst = FALSE; GString *str; float size; - char *st = NULL; + char *st, *tmp = NULL; if (!pkg_name) return; @@ -494,21 +494,27 @@ gfpm_load_info_tvw (const char *pkg_name) model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_info_tvw)); gtk_list_store_clear (GTK_LIST_STORE(model)); - gtk_list_store_append (GTK_LIST_STORE(model), &iter); + gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Name:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Name:"), + 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_NAME), -1); + g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Version:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Version:"), + 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); + st = gfpm_bold (_("Description:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Description:"), + 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC), -1); + g_free (st); /* populate depends */ temp = pacman_pkg_getinfo (pm_pkg, PM_PKG_DEPENDS); @@ -519,10 +525,12 @@ gfpm_load_info_tvw (const char *pkg_name) str = g_string_append (str, " "); } gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Depends:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Depends:"), + 0, st, 1, (char*)str->str, -1); + g_free (st); g_string_free (str, TRUE); /* populate provides */ @@ -536,10 +544,12 @@ gfpm_load_info_tvw (const char *pkg_name) if (str->len) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Provides:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Provides:"), + 0, st, 1, (char*)str->str, -1); + g_free (st); } g_string_free (str, TRUE); @@ -554,65 +564,81 @@ gfpm_load_info_tvw (const char *pkg_name) if (str->len) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Conflicts:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Conflicts:"), + 0, st, 1, (char*)str->str, -1); + g_free (st); } g_string_free (str, TRUE); if (inst == TRUE) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("URL:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("URL:"), + 0, st, 1, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_URL), -1); + g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Packager:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Packager:"), + 0, st, 1, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_PACKAGER), -1); + g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Install Date:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Install Date:"), + 0, st, 1, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_INSTALLDATE), -1); + g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_USIZE)/1024)/1024, - asprintf (&st, "%0.2f MB", size); + size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_USIZE)/1024)/1024; + asprintf (&tmp, "%0.2f MB", size); + st = gfpm_bold (_("Size:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Size:"), - 1, (char*)st, + 0, st, + 1, (char*)tmp, -1); g_free (st); + g_free (tmp); } if (inst == FALSE) { - size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_SIZE)/1024)/1024, - asprintf (&st, "%0.2f MB", size); + size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_SIZE)/1024)/1024; + asprintf (&tmp, "%0.2f MB", size); gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Size (Compressed):")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Size (compressed):"), - 1, (char*)st, + 0, st, + 1, (char*)tmp, -1); g_free (st); + g_free (tmp); size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_USIZE)/1024)/1024, - asprintf (&st, "%0.2f MB", size); + asprintf (&tmp, "%0.2f MB", size); gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Size (Uncompressed):")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Size (Uncompressed):"), - 1, (char*)st, + 0, st, + 1, (char*)tmp, -1); g_free (st); + g_free (tmp); } if (r == 1) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("SHA1SUM:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("SHA1SUM:"), + 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_SHA1SUM), -1); + g_free (st); } if (inst == TRUE) { @@ -626,10 +652,12 @@ gfpm_load_info_tvw (const char *pkg_name) if (str->len) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); + st = gfpm_bold (_("Required By:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, - 0, _("Required By:"), + 0, st, 1, (char*)str->str, -1); + g_free (st); } g_string_free (str, TRUE); } @@ -834,7 +862,7 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) } icon_yes = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_YES, - GTK_ICON_SIZE_SMALL_TOOLBAR, + GTK_ICON_SIZE_MENU, NULL); icon_no = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_NO, From vmiklos at frugalware.org Mon Jul 23 18:16:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 18:16:29 2007 Subject: [Frugalware-git] homepage-ng: FSA223-joomla Message-ID: <20070723161626.CFB64186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=c27ced59bdc03fd29b142588204ebec2e4b39c4c commit c27ced59bdc03fd29b142588204ebec2e4b39c4c Author: VMiklos Date: Mon Jul 23 18:14:44 2007 +0200 FSA223-joomla diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index e6c3cc2..2836915 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 223 + 2007-07-23 + vmiklos + joomla + 1.0.12-1 + -1.0.12-2terminus1 + http://bugs.frugalware.org/task/2216 + There is no CVE for this issue, see http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=5654 + Cindy Chee has discovered a vulnerability in Joomla!, which can be exploited by malicious people to conduct cross-site scripting attacks. + Input passed to the "Title" and "Section Name" form fields when creating new sections in Section Manager is not properly sanitised before being stored. This can be exploited to insert arbitrary HTML and script code, which is executed in a user's browser session in context of an affected site when the data is viewed. + Successful exploitation requires that the target user has valid administrator credentials. + + 222 2007-07-22 vmiklos From vmiklos at frugalware.org Mon Jul 23 19:29:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 19:29:52 2007 Subject: [Frugalware-git] frugalware-current: csup-20060318-1-i686 Message-ID: <20070723172946.A2BB7186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=87f2d4484e43556f100071e531b528e4ad493045 commit 87f2d4484e43556f100071e531b528e4ad493045 Author: VMiklos Date: Mon Jul 23 19:29:26 2007 +0200 csup-20060318-1-i686 new package replaces cvsup closes #2165 diff --git a/source/devel-extra/csup/FrugalBuild b/source/devel-extra/csup/FrugalBuild new file mode 100644 index 0000000..4524e3f --- /dev/null +++ b/source/devel-extra/csup/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0 SBU +# Maintainer: VMiklos + +pkgname=csup +pkgver=20060318 +pkgrel=1 +pkgdesc="A solid CVSup replacement for checkout-only functionality." +url="http://www.mu.org/~mux/csup.html" +depends=('openssl' 'zlib' 'glibc') +# can be removed after Frugalware-0.7 is out +replaces=('cvsup') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump $url |Flasttgz" +source=(http://mu.org/~mux/csup-snap-$pkgver.tgz) +sha1sums=('209c53137245e3e5e2cea98151115043d993ce35') + +build() +{ + Fcd $pkgname + # don't try to strip the manpage + Fsed 'install -s' 'install' GNUmakefile + Fmake + Fmkdir /usr/{bin,share/man/man1} + Fmakeinstall PREFIX=$Fdestdir/usr +} + +# optimization OK From vmiklos at frugalware.org Mon Jul 23 19:50:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 19:50:33 2007 Subject: [Frugalware-git] frugalware-current: cvsup-16.1h-1-i686 Message-ID: <20070723175031.8C8F2186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=732b8af4ce1ffa75932b0859a1914862a3be39eb commit 732b8af4ce1ffa75932b0859a1914862a3be39eb Author: VMiklos Date: Mon Jul 23 19:50:05 2007 +0200 cvsup-16.1h-1-i686 bin, replaced by csup diff --git a/source/network/cvsup/FrugalBuild b/source/network/cvsup/FrugalBuild deleted file mode 100644 index 5a66d0c..0000000 --- a/source/network/cvsup/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=cvsup -pkgver=16.1h -pkgrel=1 -pkgdesc="The CVS-Optimized General-Purpose Network File Distribution System" -url="http://www.cvsup.org/" -depends=('zlib') -makedepends=('ezm3') -groups=('network') -archs=('i686' '!x86_64') -up2date="lynx -dump ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/sources/ |grep tar.gz$ |sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/sources/$pkgname-snap-$pkgver.tar.gz) -sha1sums=('976439eb09c9e929d3bb2837b5e4db14719393b2') - -build() -{ - Fcd $pkgname-snap-$pkgver - make M3FLAGS="-DNOGUI" PREFIX="$Fdestdir/usr" || return 1 - Fmkdir /usr/bin /usr/man/man1 - make M3FLAGS="-DNOGUI" PREFIX="$Fdestdir/usr" install -} - From vmiklos at frugalware.org Mon Jul 23 19:58:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 19:58:08 2007 Subject: [Frugalware-git] frugalware-current: ezm3-1.2-1-i686 Message-ID: <20070723175805.E25CE186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a559b5b77754c9e07e7bbd0b9894e38cf362ac02 commit a559b5b77754c9e07e7bbd0b9894e38cf362ac02 Author: VMiklos Date: Mon Jul 23 19:57:42 2007 +0200 ezm3-1.2-1-i686 remove package, it was only a makedepend for cvsup diff --git a/source/devel-extra/ezm3/FrugalBuild b/source/devel-extra/ezm3/FrugalBuild deleted file mode 100644 index 8c5c5fb..0000000 --- a/source/devel-extra/ezm3/FrugalBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=ezm3 -target=LINUXLIBC6 -pkgver=1.2 -pkgrel=1 -pkgdesc="Stripped down m3 compiler for building cvsup" -url="ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/" -depends=('glibc') -groups=('devel-extra') -archs=('i686' '!x86_64') -up2date="lynx -dump $url |grep src.tar.bz2$ |sed -n 's/.*-\(.*\)-.*/\1/;$ p'" -source=($url/$pkgname-$pkgver-src.tar.bz2 \ - $url/$pkgname-$pkgver-$target-boot.tar.bz2) -sha1sums=('2a284baac3be18a17e1fa49ab3b0b346f1a5dd68' \ - 'de6080f0e3e2bf6c2ac8a26f975b1cfe6789f483') - -# will NOT build on amd64: x86 and ppc only - -build() -{ - Fsed '^#!/bin/sh' '#!/bin/bash' \ - language/modula3/m3compiler/m3cc/gcc/configure - Fsed '/usr/local' "/usr" m3config/src/$target - echo "M3CC_MAKE = [\"make\", \"BISON=yacc\"]" >> m3config/src/$target - Fsed '/usr/local' '/usr' m3config/src/COMMON - Fsed 'touch' 'ranlib' m3config/src/COMMON - # higher optimizations would cause issues - CFLAGS=`echo $CFLAGS|sed 's/-O./-O/'` - - make exportall || return 1 - - cp -a binaries/$target/usr $Fdestdir/ -} - -# optimalization ok From priyank at frugalware.org Mon Jul 23 20:08:13 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 20:08:16 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: gnetconfig.glade: added new 'activate profile' button Message-ID: <20070723180813.B75C8186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=affc0118adac2fa44c9ed9b221011c9f018de1ac commit affc0118adac2fa44c9ed9b221011c9f018de1ac Author: Priyank Date: Mon Jul 23 23:37:23 2007 +0530 gnetconfig: gnetconfig.glade: added new 'activate profile' button diff --git a/gnetconfig/glade/gnetconfig.glade b/gnetconfig/glade/gnetconfig.glade index 27a7be7..42bd468 100644 --- a/gnetconfig/glade/gnetconfig.glade +++ b/gnetconfig/glade/gnetconfig.glade @@ -1,6 +1,6 @@ - + 500 @@ -175,7 +175,24 @@ Graphical network configuration tool for Frugalware linux. - + + 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 + gtk-apply + + + + + False + 2 + @@ -804,60 +821,60 @@ If you don't have a name server on your network, just leave this blank. 2 10 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 + 0 + <b>Interface: </b> True - 1 - 2 + GTK_FILL + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - DHCP -Static IP -lo - + 0 + <b>Connection Type: </b> + True - 1 - 2 1 2 + GTK_FILL + GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Connection Type: </b> - True + DHCP +Static IP +lo + + 1 + 2 1 2 - GTK_FILL - GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 0 - <b>Interface: </b> True - GTK_FILL - + 1 + 2 @@ -875,52 +892,36 @@ lo 2 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Ad-Hoc -Managed -Master -Monitor -Repeater -Secondary -Auto - + 0 + 0 + <b>Key:</b> + True + PANGO_ELLIPSIZE_START - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>ESSID:</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 2 - 3 - GTK_FILL + @@ -938,36 +939,52 @@ Auto - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>ESSID:</b> - True + 1 + 2 1 2 GTK_FILL - + GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Key:</b> - True - PANGO_ELLIPSIZE_START + Ad-Hoc +Managed +Master +Monitor +Repeater +Secondary +Auto + - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL @@ -984,49 +1001,33 @@ Auto 2 6 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Gateway address: </b> - True + 15 - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Subnet mask :</b> - True + 15 + 1 + 2 1 2 GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>IP Address: </b> - True - - - GTK_FILL - + GTK_FILL @@ -1045,33 +1046,49 @@ Auto - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>IP Address: </b> + True + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>Subnet mask :</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL + - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>Gateway address: </b> + True - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + @@ -1089,32 +1106,14 @@ Auto 2 5 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dhcpcd (default) -dhclient - - - 1 - 2 - 1 - 2 - GTK_FILL - 4 - - - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Client: </b> + <b>DHCP Hostname:</b> True - 1 - 2 GTK_FILL GTK_FILL @@ -1153,18 +1152,36 @@ dhclient - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Hostname:</b> + <b>DHCP Client: </b> True + 1 + 2 GTK_FILL GTK_FILL + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dhcpcd (default) +dhclient + + + 1 + 2 + 1 + 2 + GTK_FILL + 4 + + False @@ -1197,46 +1214,28 @@ dhclient 2 4 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Confirm password:</b> - True - 2 - 3 - GTK_FILL - GTK_FILL + 1 + 2 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE password:</b> - True + False + 1 + 2 1 2 - GTK_FILL - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE username:</b> - True - - - GTK_FILL - GTK_FILL @@ -1254,28 +1253,46 @@ dhclient - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + 0 + <b>PPPoE username:</b> + True + + + GTK_FILL + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>PPPoE password:</b> + True - 1 - 2 1 2 + GTK_FILL + GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Confirm password:</b> + True - 1 - 2 + 2 + 3 + GTK_FILL + GTK_FILL @@ -1870,49 +1887,33 @@ lo 2 6 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Gateway address: </b> - True + 15 - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Subnet mask :</b> - True + 15 + 1 + 2 1 2 GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>IP Address: </b> - True - - - GTK_FILL - + GTK_FILL @@ -1931,33 +1932,49 @@ lo - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>IP Address: </b> + True + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>Subnet mask :</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL + - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>Gateway address: </b> + True - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + @@ -1973,16 +1990,34 @@ lo 2 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Hostname:</b> + <b>DHCP Client: </b> True + 1 + 2 GTK_FILL - + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dhcpcd (default) +dhclient + + + 1 + 2 + 1 + 2 + GTK_FILL + 4 @@ -2021,34 +2056,16 @@ lo - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dhcpcd (default) -dhclient - - - 1 - 2 - 1 - 2 - GTK_FILL - 4 - - - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Client: </b> + <b>DHCP Hostname:</b> True - 1 - 2 GTK_FILL - GTK_FILL + @@ -2063,50 +2080,38 @@ dhclient 2 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Key:</b> - True - PANGO_ELLIPSIZE_START + Ad-Hoc +Managed +Master +Monitor +Repeater +Secondary +Auto + - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>ESSID:</b> - True + 1 + 2 1 2 GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Mode:</b> - True - - - GTK_FILL - + GTK_FILL @@ -2124,38 +2129,50 @@ dhclient - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>Mode:</b> + True + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>ESSID:</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Ad-Hoc -Managed -Master -Monitor -Repeater -Secondary -Auto - + 0 + 0 + <b>Key:</b> + True + PANGO_ELLIPSIZE_START - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + @@ -2190,85 +2207,85 @@ Auto 2 4 - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Confirm password:</b> + True - 1 - 2 + 2 + 3 + GTK_FILL + GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + 0 + <b>PPPoE password:</b> + True - 1 - 2 1 2 + GTK_FILL + GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + 0 + <b>PPPoE username:</b> + True - 1 - 2 - 2 - 3 + GTK_FILL + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE username:</b> - True + False - GTK_FILL - GTK_FILL + 1 + 2 + 2 + 3 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE password:</b> - True + False + 1 + 2 1 2 - GTK_FILL - GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Confirm password:</b> - True - 2 - 3 - GTK_FILL - GTK_FILL + 1 + 2 From priyank at frugalware.org Mon Jul 23 20:09:17 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 20:09:19 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: it is now possible to switch profiles by clicking on the activate button. Message-ID: <20070723180917.A140E186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=4b40c9cd82be0c62787dc729714b7c2fa4f7d36d commit 4b40c9cd82be0c62787dc729714b7c2fa4f7d36d Author: Priyank Date: Mon Jul 23 23:38:36 2007 +0530 gnetconfig: it is now possible to switch profiles by clicking on the activate button. diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c index 7068245..1dae04f 100644 --- a/gnetconfig/src/gnetconfig-interface.c +++ b/gnetconfig/src/gnetconfig-interface.c @@ -102,6 +102,7 @@ static void cb_gn_interface_add (GtkButton *button, gpointer data); static void cb_gn_interface_edited (GtkButton *button, gpointer data); static void cb_gn_interface_selected (GtkTreeSelection *selection, gpointer data); static void cb_gn_interface_delete (GtkButton *button, gpointer data); +static void cb_gn_activate_profile_clicked (GtkButton *button, gpointer data); static void cb_gn_delete_dns_clicked (GtkButton *button, gpointer data); static void cb_gn_delete_profile_clicked (GtkButton *button, gpointer data); static void cb_gn_profile_desc_save_clicked (GtkButton *button, gpointer data); @@ -273,6 +274,11 @@ gnetconfig_interface_init (void) "clicked", G_CALLBACK(cb_gn_delete_profile_clicked), NULL); + widget = glade_xml_get_widget (xml, "fwn_activate_profile"); + g_signal_connect (G_OBJECT(widget), + "clicked", + G_CALLBACK(cb_gn_activate_profile_clicked), + NULL); widget = glade_xml_get_widget (xml, "fwn_if_start"); g_signal_connect (G_OBJECT(widget), "clicked", @@ -613,6 +619,62 @@ cb_gn_profile_changed (GtkComboBox *combo, gpointer data) } static void +cb_gn_activate_profile_clicked (GtkButton *button, gpointer data) +{ + GtkTreeModel *model = NULL; + GtkTreeIter iter; + gchar *path = NULL; + gchar *profile = NULL; + gint i; + + gtk_combo_box_get_active_iter (GTK_COMBO_BOX(gn_profile_combo), &iter); + model = gtk_combo_box_get_model (GTK_COMBO_BOX(gn_profile_combo)); + gtk_tree_model_get (model, &iter, 1, &profile, -1); + if (strcmp(profile, fwnet_lastprofile())) + { + switch ( gn_question (_("Are you sure you want to activate this profile ?")) ) + { + case GTK_RESPONSE_YES: + path = g_strdup_printf ("/etc/sysconfig/network/%s", profile); + /* unload the old profile */ + fwnet_profile_t *oldprofile = fwnet_parseprofile (fwnet_lastprofile()); + while (gtk_events_pending()) + gtk_main_iteration (); + if (oldprofile != NULL) + { + for (i=0;iinterfaces);i++) + { + fwnet_interface_t *ift = g_list_nth_data (oldprofile->interfaces, i); + fwnet_ifdown (ift, oldprofile); + } + } + /* load the new profile */ + for (i=0;iinterfaces);i++) + { + fwnet_interface_t *ift = g_list_nth_data (active_profile->interfaces, i); + fwnet_ifup (ift, active_profile); + } + fwnet_setdns (active_profile); + int x = fwnet_setlastprofile (profile); + g_print ("NUMBER: %d\n", x); + gn_message (_("Profile activated successfully")); + g_free (path); + gnetconfig_populate_profile_list (); + break; + + case GTK_RESPONSE_NO: + case GTK_RESPONSE_DELETE_EVENT: + break; + } + } + else + { + gn_error (_("The profile is already activated.")); + g_free (profile); + } +} + +static void cb_gn_delete_profile_clicked (GtkButton *button, gpointer data) { GtkTreeModel *model = NULL; From priyank at frugalware.org Mon Jul 23 20:10:55 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 20:10:56 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: removed a debug string. Message-ID: <20070723181055.13466186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=11a2b2b756889ff0be20ded862986abca4213cc1 commit 11a2b2b756889ff0be20ded862986abca4213cc1 Author: Priyank Date: Mon Jul 23 23:40:16 2007 +0530 gnetconfig: removed a debug string. diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c index 1dae04f..9f4d743 100644 --- a/gnetconfig/src/gnetconfig-interface.c +++ b/gnetconfig/src/gnetconfig-interface.c @@ -655,8 +655,7 @@ cb_gn_activate_profile_clicked (GtkButton *button, gpointer data) fwnet_ifup (ift, active_profile); } fwnet_setdns (active_profile); - int x = fwnet_setlastprofile (profile); - g_print ("NUMBER: %d\n", x); + fwnet_setlastprofile (profile); gn_message (_("Profile activated successfully")); g_free (path); gnetconfig_populate_profile_list (); From priyank at frugalware.org Mon Jul 23 20:54:20 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 20:54:22 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: fixed a couple of memory leaks Message-ID: <20070723185420.1FDFE186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=854578f85d33a13785b41e68cd879d1919f5f633 commit 854578f85d33a13785b41e68cd879d1919f5f633 Author: Priyank Date: Mon Jul 23 23:47:33 2007 +0530 gnetconfig: fixed a couple of memory leaks diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c index 9f4d743..af55392 100644 --- a/gnetconfig/src/gnetconfig-interface.c +++ b/gnetconfig/src/gnetconfig-interface.c @@ -646,6 +646,7 @@ cb_gn_activate_profile_clicked (GtkButton *button, gpointer data) { fwnet_interface_t *ift = g_list_nth_data (oldprofile->interfaces, i); fwnet_ifdown (ift, oldprofile); + gnetconfig_profile_free (oldprofile); } } /* load the new profile */ @@ -659,6 +660,7 @@ cb_gn_activate_profile_clicked (GtkButton *button, gpointer data) gn_message (_("Profile activated successfully")); g_free (path); gnetconfig_populate_profile_list (); + goto cleanup; break; case GTK_RESPONSE_NO: @@ -667,10 +669,10 @@ cb_gn_activate_profile_clicked (GtkButton *button, gpointer data) } } else - { gn_error (_("The profile is already activated.")); - g_free (profile); - } + + cleanup:g_free (profile); + return; } static void From priyank at frugalware.org Mon Jul 23 20:58:51 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 20:58:53 2007 Subject: [Frugalware-git] fw-control-center: updates for 0.1.1 Message-ID: <20070723185851.6D554186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=07a671f63e8d9aeeb7c609691aeb1b5f7525d792 commit 07a671f63e8d9aeeb7c609691aeb1b5f7525d792 Author: Priyank Date: Tue Jul 24 00:28:06 2007 +0530 updates for 0.1.1 diff --git a/gnetconfig/NEWS b/gnetconfig/NEWS index b25b135..7a87b35 100644 --- a/gnetconfig/NEWS +++ b/gnetconfig/NEWS @@ -1,3 +1,19 @@ VERSION DESCRIPTION ---------------------------------------------------------------- +--------------------------------------------------------------------------------------------------------- +0.1.1 - Many small bugfixes + - New default icons + - Added gnetconfig.desktop for GNOME/XFCE + - Translations related fixes in autogen.sh + - Updated autogen.sh for git and fixed other bugs (vmiklos) + - Fixed improper window size (krix) + - pot generation and other translation related fixes (krix) + - Many fixups in various dialogs (krix) + - BUGFIX: Don't allow blank interface name when saving a new interface + - BUGFIX: Don't allow active interfaces to be deleted + - BUGFIX: Don't allow interfaces of inactive profiles to be activated/deactivated + - Use interface specific icons (depending on connection type) + - Use better icons to indicate status of interface + - Do not allow adding of duplicate interfaces + - Interface list now also shows type of connection + - Added support for switching profiles 0.1 - Initial Import diff --git a/gnetconfig/configure.ac b/gnetconfig/configure.ac index de86bcf..1ab00c0 100644 --- a/gnetconfig/configure.ac +++ b/gnetconfig/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([gnetconfig], 0.1, [priyankmg@gmail.com], gnetconfig) +AC_INIT([gnetconfig], 0.1.1, [priyankmg@gmail.com], gnetconfig) AC_CONFIG_SRCDIR([src/gnetconfig.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) From priyank at frugalware.org Mon Jul 23 21:04:25 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 21:04:28 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: updated version in README Message-ID: <20070723190425.C0CAF186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=9fa5f1f9bdd548db0cceda26a6d5066b411bcc92 commit 9fa5f1f9bdd548db0cceda26a6d5066b411bcc92 Author: Priyank Date: Tue Jul 24 00:31:23 2007 +0530 gnetconfig: updated version in README diff --git a/gnetconfig/README b/gnetconfig/README index d571678..e50b599 100644 --- a/gnetconfig/README +++ b/gnetconfig/README @@ -1,4 +1,4 @@ -Gnetconfig 0.1 +Gnetconfig 0.1.1 Gnetconfig is a graphical network configuration tool for Frugalware Linux. Gnetconfig uses the libfwnetconfig library to perform network From boobaa at frugalware.org Mon Jul 23 21:27:58 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Jul 23 21:28:01 2007 Subject: [Frugalware-git] frugalware-current: k3b-1.0.3-1-i686 Message-ID: <20070723192758.CA761186824B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2eebb52b1b80e4c5b9bc769c40c53cda76aa2d9f commit 2eebb52b1b80e4c5b9bc769c40c53cda76aa2d9f Author: CSÉCSY László Date: Mon Jul 23 21:27:52 2007 +0200 k3b-1.0.3-1-i686 version bump diff --git a/source/kde/k3b/FrugalBuild b/source/kde/k3b/FrugalBuild index d979213..7cc202d 100644 --- a/source/kde/k3b/FrugalBuild +++ b/source/kde/k3b/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=k3b -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="The CD Kreator" url="http://www.k3b.org/" @@ -20,5 +20,5 @@ options=('scriptlet') Fconfopts="$Fconfopts --enable-mt" # optimization OK -sha1sums=('ea236194bdc0bbcedaaad32829d6ebf31abc5de2'\ +sha1sums=('cf9eee45eebd280a069c7f94924237bdec6bbd06'\ '8704ffb71684abde5b8288054ae25fda386244cc') From priyank at frugalware.org Mon Jul 23 21:39:43 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 21:39:45 2007 Subject: [Frugalware-git] frugalware-current: gnetconfig-0.1.1-1-i686 Message-ID: <20070723193943.EDC8313A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=f727548ec8825c3162fb17625c7ef9b33743d3ee commit f727548ec8825c3162fb17625c7ef9b33743d3ee Author: Priyank Date: Tue Jul 24 01:07:48 2007 +0530 gnetconfig-0.1.1-1-i686 * Version bump diff --git a/source/xapps/gnetconfig/FrugalBuild b/source/xapps/gnetconfig/FrugalBuild index e0a45de..3924e03 100644 --- a/source/xapps/gnetconfig/FrugalBuild +++ b/source/xapps/gnetconfig/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=gnetconfig -pkgver=0.1 +pkgver=0.1.1 pkgrel=1 pkgdesc="A graphical network configuration tool for Frugalware Linux." url="http://ftp.frugalware.org/pub/other/fw-control-center" @@ -10,9 +10,8 @@ depends=('glib2' 'gtk+2' 'libglade' 'frugalwareutils>=0.7.3') makedepends=('pkgconfig' 'intltool') groups=('xapps') archs=('i686' 'x86_64') -up2date="lynx -dump $url|Flasttar" +up2date="lynx -dump $url | Flasttar" source=($url/$pkgname-$pkgver.tar.gz) signatures=(${source[0]}.asc) -_F_cd_path="$pkgname-$pkgver/$pkgname" # optimization OK From boobaa at frugalware.org Mon Jul 23 21:42:37 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Jul 23 21:43:09 2007 Subject: [Frugalware-git] frugalware-current: k3b-i18n-1.0.3-1-i686 Message-ID: <20070723194237.3172313A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=c37c349eb976587e651885aad37e2aa7eedea270 commit c37c349eb976587e651885aad37e2aa7eedea270 Author: CSÉCSY László Date: Mon Jul 23 21:42:23 2007 +0200 k3b-i18n-1.0.3-1-i686 version bump diff --git a/source/locale-extra/k3b-i18n/FrugalBuild b/source/locale-extra/k3b-i18n/FrugalBuild index edd08e8..70241b6 100644 --- a/source/locale-extra/k3b-i18n/FrugalBuild +++ b/source/locale-extra/k3b-i18n/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=k3b-i18n -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="Localization for k3b, the cd kreator" url="http://www.k3b.org/" @@ -13,4 +13,4 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="k3b" Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=26138'|grep -m1 'k3b-i18n-'|sed 's/.*i18n-\(.*\).t.* .*/\1/'" -sha1sums=('721c8a90a62cf17f59cb8a3e011b6338ce7b6f56') +sha1sums=('7904774f0944aa2f388392e4623079a7082157bc') From priyank at frugalware.org Mon Jul 23 21:45:26 2007 From: priyank at frugalware.org (Priyank) Date: Mon Jul 23 21:45:29 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: AUTHORS: Adder names of translators. Message-ID: <20070723194526.9314613A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=0cbef2ba84d8773a7f6d3cbfbbad344256f1da77 commit 0cbef2ba84d8773a7f6d3cbfbbad344256f1da77 Author: Priyank Date: Tue Jul 24 01:14:35 2007 +0530 gnetconfig: AUTHORS: Adder names of translators. diff --git a/gnetconfig/AUTHORS b/gnetconfig/AUTHORS index b20a835..02290de 100644 --- a/gnetconfig/AUTHORS +++ b/gnetconfig/AUTHORS @@ -1,2 +1,8 @@ +Developers: Priyank Gosalia Christian Hamar alias krix + +Translators: +Finn (de) +Michel Hermier (fr) +Vajna Miklos (hu) From vmiklos at frugalware.org Mon Jul 23 21:49:30 2007 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jul 23 21:49:31 2007 Subject: [Frugalware-git] pacman-g2: pactest: s/i686/os.uname()[-1]/ Message-ID: <20070723194930.6698D13A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=cdf12b2886d7b3ff6ef85fc6c0fce6f33e26cffc commit cdf12b2886d7b3ff6ef85fc6c0fce6f33e26cffc Author: VMiklos Date: Mon Jul 23 21:47:55 2007 +0200 pactest: s/i686/os.uname()[-1]/ diff --git a/pactest/pmpkg.py b/pactest/pmpkg.py index 102d123..012d3c2 100644 --- a/pactest/pmpkg.py +++ b/pactest/pmpkg.py @@ -32,7 +32,7 @@ class pmpkg: Object holding data from a pacman-g2 package. """ - def __init__(self, name, version = "1.0-1", arch = 'i686'): + def __init__(self, name, version = "1.0-1", arch = os.uname()[-1]): # desc self.name = name self.version = version From boobaa at frugalware.org Mon Jul 23 21:52:08 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Jul 23 21:52:10 2007 Subject: [Frugalware-git] frugalware-current: postgrey-1.29-1-i686 Message-ID: <20070723195208.D09A613A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=a6ef4733dfb79655c9178b403a08896637554f3d commit a6ef4733dfb79655c9178b403a08896637554f3d Author: CSÉCSY László Date: Mon Jul 23 21:51:53 2007 +0200 postgrey-1.29-1-i686 version bump diff --git a/source/network-extra/postgrey/FrugalBuild b/source/network-extra/postgrey/FrugalBuild index a15f340..bbedd60 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.28 +pkgver=1.29 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=('25878a7b560dda2b126100be93d8d8bd5aedb090'\ +sha1sums=('648be42d92bd182db0cab5c4b308a8466f9371e6'\ '74b36884ccc3935dc84e662500e72efbe0748d81'\ 'b078a79443d0807456483f33f64c2ee86bf7367a'\ '3d5691e5021265ac1667b2254558ca0388e61d9d'\ From krics at linuxforum.hu Mon Jul 23 22:01:43 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Jul 23 22:01:45 2007 Subject: [Frugalware-git] pacman-g2: Another progress bar implement Message-ID: <20070723200143.CB6C113A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=8e0cc0073d47678e8afaa33203669c8acd19c7b1 commit 8e0cc0073d47678e8afaa33203669c8acd19c7b1 Author: Christian Hamar alias krix Date: Mon Jul 23 22:01:21 2007 +0200 Another progress bar implement * Added progressbar for inter-conflicts check (maybe works good :P) * Tested make check runs fine on i686 vmiklos said ok. * Actually it uses the simple PROGRESS_CONFLICTS printout diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 759093f..0c26ed4 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -223,7 +223,7 @@ int _pacman_add_prepare(pmtrans_t *trans, pmdb_t *db, pmlist_t **data) /* no unsatisfied deps, so look for conflicts */ _pacman_log(PM_LOG_FLOW1, _("looking for conflicts")); - lp = _pacman_checkconflicts(db, trans->packages); + lp = _pacman_checkconflicts(trans, db, trans->packages); if(lp != NULL) { if(data) { *data = lp; diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c index bc58465..f352873 100644 --- a/lib/libpacman/conflict.c +++ b/lib/libpacman/conflict.c @@ -46,12 +46,13 @@ * * conflicts are always name only */ -pmlist_t *_pacman_checkconflicts(pmdb_t *db, pmlist_t *packages) +pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmdb_t *db, pmlist_t *packages) { pmpkg_t *info = NULL; pmlist_t *i, *j, *k; pmlist_t *baddeps = NULL; pmdepmissing_t *miss = NULL; + double percent; if(db == NULL) { return(NULL); @@ -59,10 +60,15 @@ pmlist_t *_pacman_checkconflicts(pmdb_t *db, pmlist_t *packages) for(i = packages; i; i = i->next) { pmpkg_t *tp = i->data; + percent = (double)(_pacman_list_count(packages) - _pacman_list_count(i) + 1) / _pacman_list_count(packages); if(tp == NULL) { continue; } + PROGRESS(trans, PM_TRANS_PROGRESS_INTERCONFLICTS_START, "", + (percent * 100), _pacman_list_count(packages), + (_pacman_list_count(packages) - _pacman_list_count(i) +1)); + for(j = _pacman_pkg_getinfo(tp, PM_PKG_CONFLICTS); j; j = j->next) { if(!strcmp(tp->name, j->data)) { /* a package cannot conflict with itself -- that's just not nice */ diff --git a/lib/libpacman/conflict.h b/lib/libpacman/conflict.h index c5c29bc..cab8b68 100644 --- a/lib/libpacman/conflict.h +++ b/lib/libpacman/conflict.h @@ -32,7 +32,7 @@ typedef struct __pmconflict_t { char ctarget[PKG_NAME_LEN]; } pmconflict_t; -pmlist_t *_pacman_checkconflicts(pmdb_t *db, pmlist_t *packages); +pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmdb_t *db, pmlist_t *packages); pmlist_t *_pacman_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, pmlist_t **skip_list); #endif /* _PACMAN_CONFLICT_H */ diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 5376cb2..1d28668 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -317,7 +317,8 @@ enum { PM_TRANS_PROGRESS_ADD_START, PM_TRANS_PROGRESS_UPGRADE_START, PM_TRANS_PROGRESS_REMOVE_START, - PM_TRANS_PROGRESS_CONFLICTS_START + PM_TRANS_PROGRESS_CONFLICTS_START, + PM_TRANS_PROGRESS_INTERCONFLICTS_START }; /* Transaction Event callback */ diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index fabb008..9adc5f7 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -496,7 +496,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); _pacman_log(PM_LOG_FLOW1, _("looking for conflicts")); - deps = _pacman_checkconflicts(db_local, list); + deps = _pacman_checkconflicts(trans, db_local, list); if(deps) { int errorout = 0; diff --git a/src/pacman-g2/trans.c b/src/pacman-g2/trans.c index 3b42f91..370331f 100644 --- a/src/pacman-g2/trans.c +++ b/src/pacman-g2/trans.c @@ -66,7 +66,9 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) pm_fprintf(stderr, NL, _("resolving dependencies... ")); break; case PM_TRANS_EVT_INTERCONFLICTS_START: - pm_fprintf(stderr, NL, _("looking for inter-conflicts... ")); + if(config->noprogressbar) { + MSG(NL, _("looking for inter-conflicts... ")); + } break; case PM_TRANS_EVT_FILECONFLICTS_DONE: if(config->noprogressbar) { @@ -78,7 +80,11 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) case PM_TRANS_EVT_CHECKDEPS_DONE: case PM_TRANS_EVT_RESOLVEDEPS_DONE: case PM_TRANS_EVT_INTERCONFLICTS_DONE: - pm_fprintf(stderr, CL, _("done.\n")); + if(config->noprogressbar) { + MSG(CL, _("done.\n")); + } else { + MSG(NL, ""); + } break; case PM_TRANS_EVT_EXTRACT_DONE: if(!config->noprogressbar) { @@ -291,11 +297,12 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm { int i, hash; unsigned int maxpkglen, progresslen = maxcols - 57; - char *addstr, *upgstr, *removestr, *conflictstr, *ptr; + char *addstr, *upgstr, *removestr, *conflictstr, *interconflictstr, *ptr; addstr = strdup(_("installing")); upgstr = strdup(_("upgrading")); removestr = strdup(_("removing")); conflictstr = strdup(_("checking for file conflicts")); + interconflictstr = strdup(_("looking for inter-conflicts")); if(config->noprogressbar) { return; @@ -322,6 +329,10 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm ptr = removestr; break; + case PM_TRANS_PROGRESS_INTERCONFLICTS_START: + ptr = interconflictstr; + break; + case PM_TRANS_PROGRESS_CONFLICTS_START: ptr = conflictstr; break; @@ -346,6 +357,7 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm putchar(' '); break; + case PM_TRANS_PROGRESS_INTERCONFLICTS_START: case PM_TRANS_PROGRESS_CONFLICTS_START: printf("%s (", ptr); for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) From boobaa at frugalware.org Mon Jul 23 22:13:20 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Jul 23 22:13:22 2007 Subject: [Frugalware-git] frugalware-current: clucene-0.9.19-1-i686 Message-ID: <20070723201320.7E07613A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=64bbfb9bed3fc09146f68f6f302cfbd6f07bf119 commit 64bbfb9bed3fc09146f68f6f302cfbd6f07bf119 Author: CSÉCSY László Date: Mon Jul 23 22:13:15 2007 +0200 clucene-0.9.19-1-i686 version bump SBU fix diff --git a/source/lib-extra/clucene/FrugalBuild b/source/lib-extra/clucene/FrugalBuild index 60c80ce..007f9a3 100644 --- a/source/lib-extra/clucene/FrugalBuild +++ b/source/lib-extra/clucene/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: ~0.01 SBU +# Compiling Time: ~1.02 SBU # Maintainer: CSÉCSY László pkgname=clucene -pkgver=0.9.16a +pkgver=0.9.19 pkgrel=1 pkgdesc="a C++ port of Lucene: the high-performance, full-featured text search engine" depends=('libstdc++') @@ -14,7 +14,7 @@ _F_sourceforge_name="$pkgname-core" _F_sourceforge_broken_up2date=1 Finclude sourceforge _F_cd_path="$pkgname-core-$pkgver" -sha1sums=('1d95576f941d5bc519087e52416af77ac29c88bf') +sha1sums=('f6506455b7705fe62d06ea5c946f623c839fda5c') # optimization OK From boobaa at frugalware.org Mon Jul 23 22:22:14 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Jul 23 22:22:16 2007 Subject: [Frugalware-git] frugalware-current: bibletime-1.6.3b-2-i686 Message-ID: <20070723202214.ABD0C13A41AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=725801b9bf2a42a7d5ca18634d2c1831e7443c34 commit 725801b9bf2a42a7d5ca18634d2c1831e7443c34 Author: CSÉCSY László Date: Mon Jul 23 22:22:08 2007 +0200 bibletime-1.6.3b-2-i686 rebuilt with new clucene diff --git a/source/kde-extra/bibletime/FrugalBuild b/source/kde-extra/bibletime/FrugalBuild index 0f9837c..bcb1e36 100644 --- a/source/kde-extra/bibletime/FrugalBuild +++ b/source/kde-extra/bibletime/FrugalBuild @@ -1,10 +1,10 @@ -# Compiling time: 0.01 SBU +# Compiling time: 1.18 SBU # Maintainer: CSÉCSY László # Contributor: Bence Nagy pkgname=bibletime pkgver=1.6.3b -pkgrel=1 +pkgrel=2 pkgdesc="Bible study software for KDE" depends=('libxi' 'libxmu' 'sword' 'qt' 'kdelibs' 'clucene') groups=('kde-extra') From krics at linuxforum.hu Tue Jul 24 08:42:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 24 08:43:00 2007 Subject: [Frugalware-git] frugalware-current: docbook-xsl-1.73.0-1-i686 Message-ID: <20070724064258.870FA1868272@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=583ca37422c48053c469fa3e5d66792afc6a2690 commit 583ca37422c48053c469fa3e5d66792afc6a2690 Author: Christian Hamar alias krix Date: Tue Jul 24 08:42:08 2007 +0200 docbook-xsl-1.73.0-1-i686 * Version bump diff --git a/source/apps/docbook-xsl/FrugalBuild b/source/apps/docbook-xsl/FrugalBuild index 6059096..9668fe5 100644 --- a/source/apps/docbook-xsl/FrugalBuild +++ b/source/apps/docbook-xsl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=docbook-xsl -pkgver=1.72.0 +pkgver=1.73.0 pkgrel=1 pkgdesc="XML stylesheets for Docbook-xml transformations." depends=('libxml2' 'libxslt') @@ -22,5 +22,5 @@ build() { Fmkdir etc/xml } -sha1sums=('492c471c2e8e7f11d70612b00321b27a62172d81') +sha1sums=('508872e782c4ada3929d43fe10bab73d2e969866') # optimization OK From priyank at frugalware.org Tue Jul 24 13:08:01 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 24 13:08:03 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig-about: added names of translators to the about dialog. Message-ID: <20070724110801.388D91868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=a54367cadd17360a6e643804a1fc3f387a541e3e commit a54367cadd17360a6e643804a1fc3f387a541e3e Author: Priyank Date: Tue Jul 24 16:36:54 2007 +0530 gnetconfig-about: added names of translators to the about dialog. diff --git a/gnetconfig/src/gnetconfig-about.c b/gnetconfig/src/gnetconfig-about.c index 89365d7..485956a 100644 --- a/gnetconfig/src/gnetconfig-about.c +++ b/gnetconfig/src/gnetconfig-about.c @@ -42,10 +42,13 @@ static gchar *license = "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, " "MA 02110-1301 USA"); -static gchar *authors[] = { "Priyank M. Gosalia ", +static const gchar *authors[] = { "Priyank M. Gosalia ", "Christian Hamar alias krix ", NULL }; -static gchar *translators[] = { NULL }; -static gchar *artists[] = { "gnetconfig uses icons from the GNOME and Tango projects.", +static const gchar translators[] = \ + "Finn (de)\n" + "Michel Hermier (fr)\n" + "Vajna Miklos (hu)"; +static const gchar *artists[] = { "gnetconfig uses icons from the GNOME and Tango projects.", NULL }; GdkPixbuf *about_pixbuf = NULL; From priyank at frugalware.org Tue Jul 24 13:09:23 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 24 13:09:25 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: post release version bump Message-ID: <20070724110923.C7D471868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center/.git;a=commitdiff;h=d15f8985e0d128b00cf1701920f16e756a61549f commit d15f8985e0d128b00cf1701920f16e756a61549f Author: Priyank Date: Tue Jul 24 16:38:21 2007 +0530 gnetconfig: post release version bump diff --git a/gnetconfig/configure.ac b/gnetconfig/configure.ac index 1ab00c0..3a70aab 100644 --- a/gnetconfig/configure.ac +++ b/gnetconfig/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([gnetconfig], 0.1.1, [priyankmg@gmail.com], gnetconfig) +AC_INIT([gnetconfig], 0.1.2, [priyankmg@gmail.com], gnetconfig) AC_CONFIG_SRCDIR([src/gnetconfig.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) From vmiklos at frugalware.org Tue Jul 24 13:14:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 24 13:15:00 2007 Subject: [Frugalware-git] frugalware-current: t/xorg: blacklist xbacklight for now Message-ID: <20070724111459.1DA901868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cb5178103d4911b33a48a639e36d5bc54b79ef77 commit cb5178103d4911b33a48a639e36d5bc54b79ef77 Author: VMiklos Date: Tue Jul 24 13:14:43 2007 +0200 t/xorg: blacklist xbacklight for now diff --git a/t/xorg b/t/xorg index b651fc5..18e5e34 100755 --- a/t/xorg +++ b/t/xorg @@ -28,6 +28,7 @@ ls source/x11|sed 's|/$||' >$fw # xf86-video-intel: requires xorg-server >= 1.2.99.0 # xf86-video-glide: makedepends on xfree86.. # grandr: requires xrandr >= 1.2. initial FB @ http://yugo.frugalware.org/~vmiklos/grandr/FrugalBuild +# xbacklight: xorg-1.3-only diff -u $upstream $fw|grep ^-[^-] |grep -v \ -'\(xf86-video-impact\|compiz\|xf86-video-wsfb\|mkcfm\|xkbdata\|xf86-video-vermilion\|xf86-video-intel\|xf86-video-glide\|grandr\)'|sed 's/^-//' +'\(xf86-video-impact\|compiz\|xf86-video-wsfb\|mkcfm\|xkbdata\|xf86-video-vermilion\|xf86-video-intel\|xf86-video-glide\|grandr\|xbacklight\)'|sed 's/^-//' rm -f $upstream $fw From priyank at frugalware.org Tue Jul 24 15:15:06 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 24 15:15:08 2007 Subject: [Frugalware-git] frugalware-current: dcraw-8.77-1-i686 Message-ID: <20070724131506.9ED581868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=eddfd9b70fab1f53d39c86a0fe5606b9862156cd commit eddfd9b70fab1f53d39c86a0fe5606b9862156cd Author: Priyank Date: Tue Jul 24 16:48:09 2007 +0530 dcraw-8.77-1-i686 * Version bump diff --git a/source/apps-extra/dcraw/FrugalBuild b/source/apps-extra/dcraw/FrugalBuild index 25dba6a..f2c4097 100644 --- a/source/apps-extra/dcraw/FrugalBuild +++ b/source/apps-extra/dcraw/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=dcraw -pkgver=8.76 +pkgver=8.77 pkgrel=1 pkgdesc="A command line based converter for raw digital photos." url="http://www.cybercom.net/~dcoffin/dcraw/" @@ -12,8 +12,8 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.cybercom.net/~dcoffin/dcraw/dcraw.c | grep -m1 VERSION | sed 's/.*N \"\(.*\).\"*/\1/'" source=($url/$pkgname.{c,1}) -sha1sums=('c5ef12e557db3c774227c37f0c9722f8aa47c1fd' \ - '9f27957f857164fb4e87ad24e376472d19a3a9cc') +sha1sums=('f8fc479af6a1cfd13fc239f3a6f35849c6cb3576' \ + '8d5177c206f7751750ff1e4b7a7ed9c0df6e1b05') build() { From krics at linuxforum.hu Tue Jul 24 17:55:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 24 17:55:50 2007 Subject: [Frugalware-git] pacman-g2: Adding package-counter to download part too \o/ Message-ID: <20070724155547.AFBA61868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=d0bb9d33ca4b7638920e02328418a8549a496118 commit d0bb9d33ca4b7638920e02328418a8549a496118 Author: Christian Hamar alias krix Date: Tue Jul 24 17:55:21 2007 +0200 Adding package-counter to download part too \o/ * Nah here we go, i added package-counter to download part too. Like ( 1/21) ...blabla * Modified libftp, made a second callbackarg void* to submit over ftpcallback that how many files we need to download. Modified functions in server.c to use the new method * Added download.c the counter part. (!!! Need to 'backport' log10 stuff from trans.c in pacman-g2) * make check all test passed. I tested it worked. diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c index cbe3d70..db5e943 100644 --- a/lib/libftp/ftplib.c +++ b/lib/libftp/ftplib.c @@ -82,6 +82,7 @@ struct NetBuf { struct timeval idletime; FtpCallback idlecb; void *idlearg; + void *idlearg2; int xfered; int cbbytes; int xfered1; @@ -170,7 +171,7 @@ static int socket_wait(netbuf *ctl) break; } } - while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg))); + while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg, ctl->idlearg2))); return rv; } @@ -474,6 +475,7 @@ GLOBALDEF int FtpConnect(const char *host, netbuf **nControl) ctrl->idlecb = NULL; ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; + ctrl->idlearg2 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; @@ -520,6 +522,10 @@ GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl) rv = 1; nControl->idlearg = (void *) val; break; + case FTPLIB_CALLBACKARG2: + rv = 1; + nControl->idlearg2 = (void *) val; + break; case FTPLIB_CALLBACKBYTES: rv = 1; nControl->cbbytes = (int) val; @@ -710,6 +716,7 @@ static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir) ctrl->dir = dir; ctrl->idletime = nControl->idletime; ctrl->idlearg = nControl->idlearg; + ctrl->idlearg2 = nControl->idlearg2; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = nControl->cbbytes; @@ -890,7 +897,7 @@ GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - if (nData->idlecb(nData, nData->xfered, nData->idlearg) == 0) + if (nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2) == 0) return 0; nData->xfered1 = 0; } @@ -921,7 +928,7 @@ GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - nData->idlecb(nData, nData->xfered, nData->idlearg); + nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2); nData->xfered1 = 0; } } @@ -1397,6 +1404,7 @@ GLOBALREF int HttpConnect(const char *host, unsigned short port, netbuf **nContr ctrl->idlecb = NULL; ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; + ctrl->idlearg2 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; diff --git a/lib/libftp/ftplib.h b/lib/libftp/ftplib.h index f82ed9e..efbe56f 100644 --- a/lib/libftp/ftplib.h +++ b/lib/libftp/ftplib.h @@ -58,13 +58,14 @@ #define FTPLIB_IDLETIME 3 #define FTPLIB_CALLBACKARG 4 #define FTPLIB_CALLBACKBYTES 5 +#define FTPLIB_CALLBACKARG2 6 #ifdef __cplusplus extern "C" { #endif typedef struct NetBuf netbuf; -typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg); +typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg, void *arg2); /* v1 compatibility stuff */ #if !defined(_FTPLIB_NO_COMPAT) diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index ce86737..10af0d4 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -158,7 +158,7 @@ int _pacman_downloadfiles(pmlist_t *servers, const char *localpath, pmlist_t *fi int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, pmlist_t *files, const char *mtime1, char *mtime2) { - int fsz; + int fsz, howmany; netbuf *control = NULL; pmlist_t *lp; int done = 0; @@ -168,6 +168,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, if(files == NULL) { return(0); } + howmany = _pacman_list_count(files); pm_errno = 0; @@ -226,6 +227,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, } FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); + FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -418,6 +420,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, } FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); + FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -493,7 +496,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, if(!strcmp(server->protocol, "file")) { EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm, server->path); } else if(pm_dlcb) { - pm_dlcb(control, fsz-*pm_dloffset, &fsz); + pm_dlcb(control, fsz-*pm_dloffset, &fsz, &howmany); } complete = _pacman_list_add(complete, fn); /* rename "output.part" file to "output" file */ diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index 4df1294..34e35f0 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -45,15 +45,17 @@ struct timeval t0, t; float rate; int xfered1; unsigned int eta_h, eta_m, eta_s; +static int remain = 1; /* pacman options */ extern config_t *config; extern unsigned int maxcols; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg) +int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) { int fsz = *(int*)arg; + int howmany = *(int*)arg2; int pct = ((float)(xfered+offset) / fsz) * 100; static int lastpct=0; unsigned int i, cur; @@ -103,9 +105,14 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg) eta_s -= eta_m * 60; } - printf(" %s [", sync_fnm); - cur = (int)((maxcols-64)*pct/100); - for(i = 0; i < maxcols-64; i++) { + /* Need fixup :S i cant backport it from trans.c :S */ + putchar('('); + for(i = 0; i<(int)log10(howmany)-(int)log10(remain); i++) + putchar(' '); + + printf("%d/%d) %s [", remain, howmany, sync_fnm); + cur = (int)((maxcols-68)*pct/100); + for(i = 0; i < maxcols-68; i++) { if(chomp) { if(i < cur) { printf("-"); @@ -140,6 +147,7 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg) } if(lastpct != 100 && pct == 100) { printf("\n"); + remain = remain + 1; } lastcur = cur; lastpct = pct; diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h index b1d777d..9667767 100644 --- a/src/pacman-g2/download.h +++ b/src/pacman-g2/download.h @@ -21,6 +21,8 @@ #ifndef _PM_DOWNLOAD_H #define _PM_DOWNLOAD_H +#include + extern char sync_fnm[PM_DLFNM_LEN+1]; extern int offset; extern struct timeval t0, t; @@ -28,7 +30,7 @@ extern float rate; extern int xfered1; extern unsigned int eta_h, eta_m, eta_s; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg); +int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2); #endif /* _PM_DOWNLOAD_H */ From priyank at frugalware.org Tue Jul 24 18:04:11 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 24 18:04:14 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: refresh the ui while loading groups Message-ID: <20070724160411.613BB1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=a47b1b478ead48238d6a49b3569c433beb126777 commit a47b1b478ead48238d6a49b3569c433beb126777 Author: Priyank Date: Tue Jul 24 21:33:18 2007 +0530 gfpm-interface: refresh the ui while loading groups diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index fb4be4f..650c0b5 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -326,11 +326,11 @@ gfpm_load_groups_tvw (const char *repo_name) model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_groups_tvw)); gtk_list_store_clear (GTK_LIST_STORE(model)); - while (gtk_events_pending()) - gtk_main_iteration (); for (l=pacman_db_getgrpcache(db); l; l=pacman_list_next(l)) { + while (gtk_events_pending()) + gtk_main_iteration (); asprintf (&temp, _("Loading groups ... [%s]"), (char*)pacman_list_getdata(l)); gfpm_update_status (temp); while (gtk_events_pending()) From priyank at frugalware.org Tue Jul 24 18:09:56 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 24 18:09:59 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: reduced the status icons size to GTK_ICON_SIZE_MENU to make it look a little less stretched. Message-ID: <20070724160956.7F48C1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=6c6705756ce71248040d80e86fea5f55f795cc18 commit 6c6705756ce71248040d80e86fea5f55f795cc18 Author: Priyank Date: Tue Jul 24 21:39:09 2007 +0530 gfpm-interface: reduced the status icons size to GTK_ICON_SIZE_MENU to make it look a little less stretched. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 650c0b5..ce369cc 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -379,15 +379,15 @@ gfpm_load_pkgs_tvw (const char *group_name) icon_yes = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_YES, - GTK_ICON_SIZE_SMALL_TOOLBAR, + GTK_ICON_SIZE_MENU, NULL); icon_no = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_NO, - GTK_ICON_SIZE_SMALL_TOOLBAR, + GTK_ICON_SIZE_MENU, NULL); icon_up = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_GO_UP, - GTK_ICON_SIZE_SMALL_TOOLBAR, + GTK_ICON_SIZE_MENU, NULL); // display status @@ -866,11 +866,11 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) NULL); icon_no = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_NO, - GTK_ICON_SIZE_SMALL_TOOLBAR, + GTK_ICON_SIZE_MENU, NULL); icon_up = gtk_widget_render_icon (gfpm_pkgs_tvw, GTK_STOCK_GO_UP, - GTK_ICON_SIZE_SMALL_TOOLBAR, + GTK_ICON_SIZE_MENU, NULL); gfpm_update_status (_("Searching for packages ...")); if (r == 0) From priyank at frugalware.org Tue Jul 24 18:13:03 2007 From: priyank at frugalware.org (Priyank) Date: Tue Jul 24 18:13:05 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: refresh the ui while searching packages. Message-ID: <20070724161303.6A43F1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=6475628f3cb3e3f5806ec8e5035b7cecd69ff207 commit 6475628f3cb3e3f5806ec8e5035b7cecd69ff207 Author: Priyank Date: Tue Jul 24 21:42:14 2007 +0530 gfpm-interface: refresh the ui while searching packages. diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index ce369cc..90d4561 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -879,6 +879,8 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) PM_PKG *pm_lpkg; gboolean up = FALSE; + while (gtk_events_pending()) + gtk_main_iteration (); for (i=l;i;i=pacman_list_next(i)) { pm_lpkg = pacman_db_readpkg (local_db, pacman_list_getdata(i)); From krics at linuxforum.hu Tue Jul 24 19:01:29 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 24 19:01:31 2007 Subject: [Frugalware-git] pacman-g2: Small fixup (well another way to 'gain' remaining pkgs Message-ID: <20070724170129.448341868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=7b38029cf4c8fbcdb8361b50732c50bf97c79192 commit 7b38029cf4c8fbcdb8361b50732c50bf97c79192 Author: Christian Hamar alias krix Date: Tue Jul 24 19:00:48 2007 +0200 Small fixup (well another way to 'gain' remaining pkgs * Not computing (computing bah .. remain++ ...) inside download.c * Use idlearg3 and remain in server.c and compute remaining packs like we does in add.c diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c index db5e943..282037e 100644 --- a/lib/libftp/ftplib.c +++ b/lib/libftp/ftplib.c @@ -83,6 +83,7 @@ struct NetBuf { FtpCallback idlecb; void *idlearg; void *idlearg2; + void *idlearg3; int xfered; int cbbytes; int xfered1; @@ -171,7 +172,7 @@ static int socket_wait(netbuf *ctl) break; } } - while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg, ctl->idlearg2))); + while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg, ctl->idlearg2, ctl->idlearg3))); return rv; } @@ -476,6 +477,7 @@ GLOBALDEF int FtpConnect(const char *host, netbuf **nControl) ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; ctrl->idlearg2 = NULL; + ctrl->idlearg3 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; @@ -526,6 +528,10 @@ GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl) rv = 1; nControl->idlearg2 = (void *) val; break; + case FTPLIB_CALLBACKARG3: + rv = 1; + nControl->idlearg3 = (void *) val; + break; case FTPLIB_CALLBACKBYTES: rv = 1; nControl->cbbytes = (int) val; @@ -717,6 +723,7 @@ static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir) ctrl->idletime = nControl->idletime; ctrl->idlearg = nControl->idlearg; ctrl->idlearg2 = nControl->idlearg2; + ctrl->idlearg3 = nControl->idlearg3; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = nControl->cbbytes; @@ -897,7 +904,7 @@ GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - if (nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2) == 0) + if (nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2, nData->idlearg3) == 0) return 0; nData->xfered1 = 0; } @@ -928,7 +935,7 @@ GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2); + nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2, nData->idlearg3); nData->xfered1 = 0; } } @@ -1405,6 +1412,7 @@ GLOBALREF int HttpConnect(const char *host, unsigned short port, netbuf **nContr ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; ctrl->idlearg2 = NULL; + ctrl->idlearg3 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; diff --git a/lib/libftp/ftplib.h b/lib/libftp/ftplib.h index efbe56f..3776619 100644 --- a/lib/libftp/ftplib.h +++ b/lib/libftp/ftplib.h @@ -59,13 +59,14 @@ #define FTPLIB_CALLBACKARG 4 #define FTPLIB_CALLBACKBYTES 5 #define FTPLIB_CALLBACKARG2 6 +#define FTPLIB_CALLBACKARG3 7 #ifdef __cplusplus extern "C" { #endif typedef struct NetBuf netbuf; -typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg, void *arg2); +typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg, void *arg2, void *arg3); /* v1 compatibility stuff */ #if !defined(_FTPLIB_NO_COMPAT) diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index 10af0d4..a7c9fce 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -158,7 +158,7 @@ int _pacman_downloadfiles(pmlist_t *servers, const char *localpath, pmlist_t *fi int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, pmlist_t *files, const char *mtime1, char *mtime2) { - int fsz, howmany; + int fsz, howmany, remain; netbuf *control = NULL; pmlist_t *lp; int done = 0; @@ -228,6 +228,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); + FtpOptions(FTPLIB_CALLBACKARG3, 0, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -235,6 +236,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, /* get each file in the list */ for(lp = files; lp; lp = lp->next) { char *fn = (char *)lp->data; + remain = howmany - _pacman_list_count(lp) + 1; if(_pacman_list_is_strin(fn, complete)) { continue; @@ -421,6 +423,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); + FtpOptions(FTPLIB_CALLBACKARG3, (long)&remain, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -496,7 +499,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, if(!strcmp(server->protocol, "file")) { EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm, server->path); } else if(pm_dlcb) { - pm_dlcb(control, fsz-*pm_dloffset, &fsz, &howmany); + pm_dlcb(control, fsz-*pm_dloffset, &fsz, &howmany, &remain); } complete = _pacman_list_add(complete, fn); /* rename "output.part" file to "output" file */ diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index 34e35f0..5a8b4c3 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -45,17 +45,17 @@ struct timeval t0, t; float rate; int xfered1; unsigned int eta_h, eta_m, eta_s; -static int remain = 1; /* pacman options */ extern config_t *config; extern unsigned int maxcols; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) +int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2, void *arg3) { int fsz = *(int*)arg; int howmany = *(int*)arg2; + int remain = *(int*)arg3; int pct = ((float)(xfered+offset) / fsz) * 100; static int lastpct=0; unsigned int i, cur; @@ -109,7 +109,6 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) putchar('('); for(i = 0; i<(int)log10(howmany)-(int)log10(remain); i++) putchar(' '); - printf("%d/%d) %s [", remain, howmany, sync_fnm); cur = (int)((maxcols-68)*pct/100); for(i = 0; i < maxcols-68; i++) { @@ -147,7 +146,6 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) } if(lastpct != 100 && pct == 100) { printf("\n"); - remain = remain + 1; } lastcur = cur; lastpct = pct; diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h index 9667767..e0f3417 100644 --- a/src/pacman-g2/download.h +++ b/src/pacman-g2/download.h @@ -30,7 +30,7 @@ extern float rate; extern int xfered1; extern unsigned int eta_h, eta_m, eta_s; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2); +int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2, void *arg3); #endif /* _PM_DOWNLOAD_H */ From janny at frugalware.org Tue Jul 24 19:48:56 2007 From: janny at frugalware.org (janny) Date: Tue Jul 24 19:48:58 2007 Subject: [Frugalware-git] frugalware-current: grass-6.2.2-1-i686 Message-ID: <20070724174856.1DCDE1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=831ff4ba55fd9645b89a7d6c58bbd9fdf8a9937d commit 831ff4ba55fd9645b89a7d6c58bbd9fdf8a9937d Author: janny Date: Tue Jul 24 19:47:28 2007 +0200 grass-6.2.2-1-i686 version bump diff --git a/source/xapps-extra/grass/FrugalBuild b/source/xapps-extra/grass/FrugalBuild index 443f0d6..2e21a06 100644 --- a/source/xapps-extra/grass/FrugalBuild +++ b/source/xapps-extra/grass/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Janny pkgname=grass -pkgver=6.2.1 -pkgrel=2 +pkgver=6.2.2 +pkgrel=1 pkgdesc="GRASS - Geographic Resources Analysis Support System" url="http://grass.itc.it" license="GPL" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') groups=('xapps-extra') up2date="lynx -dump $url/download/ |grep $pkgname-[0-9\.]*\.*.tar.gz$ |sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/grass62/source/$pkgname-$pkgver.tar.gz) -sha1sums=('bbd179b9145d735873a13f40a25784b64762387b') +sha1sums=('0b6d30e3ee5c9f0e62357c62961225b7614099d9') build() { unset MAKEFLAGS From krics at linuxforum.hu Tue Jul 24 22:04:14 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 24 22:04:16 2007 Subject: [Frugalware-git] pacman-g2: Revert "Small fixup (well another way to 'gain' remaining pkgs" Message-ID: <20070724200414.6EFA81868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=74be699dd7522f998970020df2ab560a3227accd commit 74be699dd7522f998970020df2ab560a3227accd Author: Christian Hamar alias krix Date: Tue Jul 24 22:02:15 2007 +0200 Revert "Small fixup (well another way to 'gain' remaining pkgs" * UNDO, API break This reverts commit 7b38029cf4c8fbcdb8361b50732c50bf97c79192. diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c index 282037e..db5e943 100644 --- a/lib/libftp/ftplib.c +++ b/lib/libftp/ftplib.c @@ -83,7 +83,6 @@ struct NetBuf { FtpCallback idlecb; void *idlearg; void *idlearg2; - void *idlearg3; int xfered; int cbbytes; int xfered1; @@ -172,7 +171,7 @@ static int socket_wait(netbuf *ctl) break; } } - while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg, ctl->idlearg2, ctl->idlearg3))); + while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg, ctl->idlearg2))); return rv; } @@ -477,7 +476,6 @@ GLOBALDEF int FtpConnect(const char *host, netbuf **nControl) ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; ctrl->idlearg2 = NULL; - ctrl->idlearg3 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; @@ -528,10 +526,6 @@ GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl) rv = 1; nControl->idlearg2 = (void *) val; break; - case FTPLIB_CALLBACKARG3: - rv = 1; - nControl->idlearg3 = (void *) val; - break; case FTPLIB_CALLBACKBYTES: rv = 1; nControl->cbbytes = (int) val; @@ -723,7 +717,6 @@ static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir) ctrl->idletime = nControl->idletime; ctrl->idlearg = nControl->idlearg; ctrl->idlearg2 = nControl->idlearg2; - ctrl->idlearg3 = nControl->idlearg3; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = nControl->cbbytes; @@ -904,7 +897,7 @@ GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - if (nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2, nData->idlearg3) == 0) + if (nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2) == 0) return 0; nData->xfered1 = 0; } @@ -935,7 +928,7 @@ GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2, nData->idlearg3); + nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2); nData->xfered1 = 0; } } @@ -1412,7 +1405,6 @@ GLOBALREF int HttpConnect(const char *host, unsigned short port, netbuf **nContr ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; ctrl->idlearg2 = NULL; - ctrl->idlearg3 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; diff --git a/lib/libftp/ftplib.h b/lib/libftp/ftplib.h index 3776619..efbe56f 100644 --- a/lib/libftp/ftplib.h +++ b/lib/libftp/ftplib.h @@ -59,14 +59,13 @@ #define FTPLIB_CALLBACKARG 4 #define FTPLIB_CALLBACKBYTES 5 #define FTPLIB_CALLBACKARG2 6 -#define FTPLIB_CALLBACKARG3 7 #ifdef __cplusplus extern "C" { #endif typedef struct NetBuf netbuf; -typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg, void *arg2, void *arg3); +typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg, void *arg2); /* v1 compatibility stuff */ #if !defined(_FTPLIB_NO_COMPAT) diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index a7c9fce..10af0d4 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -158,7 +158,7 @@ int _pacman_downloadfiles(pmlist_t *servers, const char *localpath, pmlist_t *fi int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, pmlist_t *files, const char *mtime1, char *mtime2) { - int fsz, howmany, remain; + int fsz, howmany; netbuf *control = NULL; pmlist_t *lp; int done = 0; @@ -228,7 +228,6 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); - FtpOptions(FTPLIB_CALLBACKARG3, 0, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -236,7 +235,6 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, /* get each file in the list */ for(lp = files; lp; lp = lp->next) { char *fn = (char *)lp->data; - remain = howmany - _pacman_list_count(lp) + 1; if(_pacman_list_is_strin(fn, complete)) { continue; @@ -423,7 +421,6 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); - FtpOptions(FTPLIB_CALLBACKARG3, (long)&remain, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -499,7 +496,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, if(!strcmp(server->protocol, "file")) { EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm, server->path); } else if(pm_dlcb) { - pm_dlcb(control, fsz-*pm_dloffset, &fsz, &howmany, &remain); + pm_dlcb(control, fsz-*pm_dloffset, &fsz, &howmany); } complete = _pacman_list_add(complete, fn); /* rename "output.part" file to "output" file */ diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index 5a8b4c3..34e35f0 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -45,17 +45,17 @@ struct timeval t0, t; float rate; int xfered1; unsigned int eta_h, eta_m, eta_s; +static int remain = 1; /* pacman options */ extern config_t *config; extern unsigned int maxcols; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2, void *arg3) +int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) { int fsz = *(int*)arg; int howmany = *(int*)arg2; - int remain = *(int*)arg3; int pct = ((float)(xfered+offset) / fsz) * 100; static int lastpct=0; unsigned int i, cur; @@ -109,6 +109,7 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2, void *arg3) putchar('('); for(i = 0; i<(int)log10(howmany)-(int)log10(remain); i++) putchar(' '); + printf("%d/%d) %s [", remain, howmany, sync_fnm); cur = (int)((maxcols-68)*pct/100); for(i = 0; i < maxcols-68; i++) { @@ -146,6 +147,7 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2, void *arg3) } if(lastpct != 100 && pct == 100) { printf("\n"); + remain = remain + 1; } lastcur = cur; lastpct = pct; diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h index e0f3417..9667767 100644 --- a/src/pacman-g2/download.h +++ b/src/pacman-g2/download.h @@ -30,7 +30,7 @@ extern float rate; extern int xfered1; extern unsigned int eta_h, eta_m, eta_s; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2, void *arg3); +int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2); #endif /* _PM_DOWNLOAD_H */ From krics at linuxforum.hu Tue Jul 24 22:04:14 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jul 24 22:04:17 2007 Subject: [Frugalware-git] pacman-g2: Revert "Adding package-counter to download part too \o/" Message-ID: <20070724200414.986841868276@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=37da12542e80c7449893a2e2c7be6cc3cf15d7e3 commit 37da12542e80c7449893a2e2c7be6cc3cf15d7e3 Author: Christian Hamar alias krix Date: Tue Jul 24 22:02:38 2007 +0200 Revert "Adding package-counter to download part too \o/" * UNDO PART II This reverts commit d0bb9d33ca4b7638920e02328418a8549a496118. diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c index db5e943..cbe3d70 100644 --- a/lib/libftp/ftplib.c +++ b/lib/libftp/ftplib.c @@ -82,7 +82,6 @@ struct NetBuf { struct timeval idletime; FtpCallback idlecb; void *idlearg; - void *idlearg2; int xfered; int cbbytes; int xfered1; @@ -171,7 +170,7 @@ static int socket_wait(netbuf *ctl) break; } } - while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg, ctl->idlearg2))); + while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg))); return rv; } @@ -475,7 +474,6 @@ GLOBALDEF int FtpConnect(const char *host, netbuf **nControl) ctrl->idlecb = NULL; ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; - ctrl->idlearg2 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; @@ -522,10 +520,6 @@ GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl) rv = 1; nControl->idlearg = (void *) val; break; - case FTPLIB_CALLBACKARG2: - rv = 1; - nControl->idlearg2 = (void *) val; - break; case FTPLIB_CALLBACKBYTES: rv = 1; nControl->cbbytes = (int) val; @@ -716,7 +710,6 @@ static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir) ctrl->dir = dir; ctrl->idletime = nControl->idletime; ctrl->idlearg = nControl->idlearg; - ctrl->idlearg2 = nControl->idlearg2; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = nControl->cbbytes; @@ -897,7 +890,7 @@ GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - if (nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2) == 0) + if (nData->idlecb(nData, nData->xfered, nData->idlearg) == 0) return 0; nData->xfered1 = 0; } @@ -928,7 +921,7 @@ GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData) nData->xfered1 += i; if (nData->xfered1 > nData->cbbytes) { - nData->idlecb(nData, nData->xfered, nData->idlearg, nData->idlearg2); + nData->idlecb(nData, nData->xfered, nData->idlearg); nData->xfered1 = 0; } } @@ -1404,7 +1397,6 @@ GLOBALREF int HttpConnect(const char *host, unsigned short port, netbuf **nContr ctrl->idlecb = NULL; ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; - ctrl->idlearg2 = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; diff --git a/lib/libftp/ftplib.h b/lib/libftp/ftplib.h index efbe56f..f82ed9e 100644 --- a/lib/libftp/ftplib.h +++ b/lib/libftp/ftplib.h @@ -58,14 +58,13 @@ #define FTPLIB_IDLETIME 3 #define FTPLIB_CALLBACKARG 4 #define FTPLIB_CALLBACKBYTES 5 -#define FTPLIB_CALLBACKARG2 6 #ifdef __cplusplus extern "C" { #endif typedef struct NetBuf netbuf; -typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg, void *arg2); +typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg); /* v1 compatibility stuff */ #if !defined(_FTPLIB_NO_COMPAT) diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index 10af0d4..ce86737 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -158,7 +158,7 @@ int _pacman_downloadfiles(pmlist_t *servers, const char *localpath, pmlist_t *fi int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, pmlist_t *files, const char *mtime1, char *mtime2) { - int fsz, howmany; + int fsz; netbuf *control = NULL; pmlist_t *lp; int done = 0; @@ -168,7 +168,6 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, if(files == NULL) { return(0); } - howmany = _pacman_list_count(files); pm_errno = 0; @@ -227,7 +226,6 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, } FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); - FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -420,7 +418,6 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, } FtpOptions(FTPLIB_IDLETIME, (long)1000, control); FtpOptions(FTPLIB_CALLBACKARG, (long)&fsz, control); - FtpOptions(FTPLIB_CALLBACKARG2, (long)&howmany, control); FtpOptions(FTPLIB_CALLBACKBYTES, (10*1024), control); } } @@ -496,7 +493,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, if(!strcmp(server->protocol, "file")) { EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm, server->path); } else if(pm_dlcb) { - pm_dlcb(control, fsz-*pm_dloffset, &fsz, &howmany); + pm_dlcb(control, fsz-*pm_dloffset, &fsz); } complete = _pacman_list_add(complete, fn); /* rename "output.part" file to "output" file */ diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index 34e35f0..4df1294 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -45,17 +45,15 @@ struct timeval t0, t; float rate; int xfered1; unsigned int eta_h, eta_m, eta_s; -static int remain = 1; /* pacman options */ extern config_t *config; extern unsigned int maxcols; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) +int log_progress(PM_NETBUF *ctl, int xfered, void *arg) { int fsz = *(int*)arg; - int howmany = *(int*)arg2; int pct = ((float)(xfered+offset) / fsz) * 100; static int lastpct=0; unsigned int i, cur; @@ -105,14 +103,9 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) eta_s -= eta_m * 60; } - /* Need fixup :S i cant backport it from trans.c :S */ - putchar('('); - for(i = 0; i<(int)log10(howmany)-(int)log10(remain); i++) - putchar(' '); - - printf("%d/%d) %s [", remain, howmany, sync_fnm); - cur = (int)((maxcols-68)*pct/100); - for(i = 0; i < maxcols-68; i++) { + printf(" %s [", sync_fnm); + cur = (int)((maxcols-64)*pct/100); + for(i = 0; i < maxcols-64; i++) { if(chomp) { if(i < cur) { printf("-"); @@ -147,7 +140,6 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2) } if(lastpct != 100 && pct == 100) { printf("\n"); - remain = remain + 1; } lastcur = cur; lastpct = pct; diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h index 9667767..b1d777d 100644 --- a/src/pacman-g2/download.h +++ b/src/pacman-g2/download.h @@ -21,8 +21,6 @@ #ifndef _PM_DOWNLOAD_H #define _PM_DOWNLOAD_H -#include - extern char sync_fnm[PM_DLFNM_LEN+1]; extern int offset; extern struct timeval t0, t; @@ -30,7 +28,7 @@ extern float rate; extern int xfered1; extern unsigned int eta_h, eta_m, eta_s; -int log_progress(PM_NETBUF *ctl, int xfered, void *arg, void *arg2); +int log_progress(PM_NETBUF *ctl, int xfered, void *arg); #endif /* _PM_DOWNLOAD_H */ From vmiklos at frugalware.org Tue Jul 24 22:45:04 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 24 22:45:06 2007 Subject: [Frugalware-git] frugalware-current: fontconfig-2.4.0-3-i686 Message-ID: <20070724204504.02D571868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=81e34e51fb75a8b5da5b020805e271bf85ce8b69 commit 81e34e51fb75a8b5da5b020805e271bf85ce8b69 Author: VMiklos Date: Tue Jul 24 22:44:46 2007 +0200 fontconfig-2.4.0-3-i686 rebuild. it seems this fixes some weird segfault issues diff --git a/source/lib/fontconfig/FrugalBuild b/source/lib/fontconfig/FrugalBuild index 93697e1..0f6d4dd 100644 --- a/source/lib/fontconfig/FrugalBuild +++ b/source/lib/fontconfig/FrugalBuild @@ -4,7 +4,7 @@ pkgname=fontconfig pkgver=2.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A library for configuring and customizing font access" url="http://fontconfig.org/" depends=('libxml2' 'freetype2>=2.3.1' 'frugalware') From vmiklos at frugalware.org Tue Jul 24 23:32:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 24 23:32:34 2007 Subject: [Frugalware-git] frugalware-current: gammu-1.11.92-2-i686 Message-ID: <20070724213220.1077B1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=06d7a40b84f64f237b96ce25165efd33e9b736fa commit 06d7a40b84f64f237b96ce25165efd33e9b736fa Author: VMiklos Date: Tue Jul 24 23:32:03 2007 +0200 gammu-1.11.92-2-i686 added a README.Frugalware diff --git a/source/apps-extra/gammu/FrugalBuild b/source/apps-extra/gammu/FrugalBuild index a8d4b97..ddf187c 100644 --- a/source/apps-extra/gammu/FrugalBuild +++ b/source/apps-extra/gammu/FrugalBuild @@ -13,7 +13,7 @@ groups=('apps-extra') archs=('x86_64' 'i686') up2date="lynx -dump http://dl.cihar.com/gammu/releases/|Flasttarbz2" source=(http://dl.cihar.com/gammu/releases/$pkgname-$pkgver.tar.bz2 \ - gammurc-path-fix.patch) + gammurc-path-fix.patch README.Frugalware) # NOTE: check new releases about cmake bug in gammu. # dont use make install DESTDIR=** things. Use the right cmake way if they fixed @@ -55,9 +55,11 @@ build() Fmkdir etc/gammu cp -a $Fdestdir/usr/share/doc/$pkgname-$pkgver/examples/config/gammurc \ $Fdestdir/etc/gammu/ + Fdoc README.Frugalware } -sha1sums=('0d00ac580e0479061c7e4760f129000b3e9ff299'\ - '68632cf0b015118b7a9c97d9b905fe47bcd927d4') +sha1sums=('0d00ac580e0479061c7e4760f129000b3e9ff299' \ + '68632cf0b015118b7a9c97d9b905fe47bcd927d4' \ + 'e088552929d1226052723ec9a6f692da56f5c106') # optimization OK diff --git a/source/apps-extra/gammu/README.Frugalware b/source/apps-extra/gammu/README.Frugalware new file mode 100644 index 0000000..49bade0 --- /dev/null +++ b/source/apps-extra/gammu/README.Frugalware @@ -0,0 +1,41 @@ +=== Configuring + +You need to create your ~/.gammurc: + +---- +[gammu] +port = /dev/ttyUSB0 +connection = fbus +---- + +Replace `/dev/ttyUSB0` with your serial port device and `fbus` with the +appropriate protocol name if you are not a Nokia user. Check if you have write +access to the device, you need to be a member of the `uucp` group. + +Once you think you're done, check your setup: + +---- +$ gnokii --identify +---- + +It should print your `IMEI` number so that you'll be able to check if `gammu` +really found your phone or there is a problem. + +=== Creating a backup + +You probably you gammu to make a backup of your phone. This involves two steps: backing up your SMSes and the rest of your phone. Here we go: + +---- +$ gammu --backupsms backupsms.txt +$ gammu --backup backup.txt +---- + +You may find an alternative format more human-readable for SMSes: + +---- +$ gammu --geteachsms > eachsms.txt +---- + +See the manual page for more tricks! + +// vim: ft=asciidoc From vmiklos at frugalware.org Tue Jul 24 23:44:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Tue Jul 24 23:44:40 2007 Subject: [Frugalware-git] pacman-tools: repoman: help upgraders Message-ID: <20070724214439.7E1551868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=62715e761e866e93832b3a51d265d111a19b6297 commit 62715e761e866e93832b3a51d265d111a19b6297 Author: VMiklos Date: Tue Jul 24 23:43:01 2007 +0200 repoman: help upgraders closes #2275 diff --git a/repoman b/repoman index f43378f..d75338b 100755 --- a/repoman +++ b/repoman @@ -462,9 +462,13 @@ update() for j in ${servers[@]} do echo "warning: this operation can take minutes, please be patient" + # support upgraders + if [ -d $fst_root/$i -a ! -d $fst_root/$i/.git ]; then + rm -rf $fst_root/$i + fi # check for scm if rsync -q $j/.git 2>/dev/null; then - if [ -d $fst_root/$i ]; then + if [ -d $fst_root/$i/.git ]; then cmd="cd $i && git pull" else cmd="git clone $j/.git $i" From krics at linuxforum.hu Wed Jul 25 00:06:24 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 25 00:06:25 2007 Subject: [Frugalware-git] pacman-g2: Fix for #2147 Message-ID: <20070724220624.993FA1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=dcecfb537d2c8990c1800b30ef8f5b351db7591f commit dcecfb537d2c8990c1800b30ef8f5b351db7591f Author: Christian Hamar alias krix Date: Wed Jul 25 00:04:00 2007 +0200 Fix for #2147 * Implements BTS #2147 * Fixes logging problem and seems its cosmetics, the real part of this patch is already in git tree, but thx for the patch author! diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index 9309160..443c9ae 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -392,7 +392,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, pmdb_t *db, unsigned char op, pmli } } if(!found) { - _pacman_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), (char *)j->data, tp->name); + _pacman_log(PM_LOG_DEBUG, _("checkdeps: found %s which requires %s"), (char *)j->data, tp->name); miss = _pacman_depmiss_new(tp->name, PM_DEP_TYPE_REQUIRED, PM_DEP_MOD_ANY, j->data, NULL); if(!_pacman_depmiss_isin(miss, baddeps)) { baddeps = _pacman_list_add(baddeps, miss); diff --git a/src/pacman-g2/sync.c b/src/pacman-g2/sync.c index 826006f..114cbb3 100644 --- a/src/pacman-g2/sync.c +++ b/src/pacman-g2/sync.c @@ -434,7 +434,7 @@ int syncpkg(list_t *targets) for(lp = pacman_list_first(data); lp; lp = pacman_list_next(lp)) { PM_DEPMISS *miss = pacman_list_getdata(lp); MSG(NL, ":: %s: %s %s", pacman_dep_getinfo(miss, PM_DEP_TARGET), - (long)pacman_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? _("is required by") : _("requires"), + (long)pacman_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? _("requires") : _("is required by"), pacman_dep_getinfo(miss, PM_DEP_NAME)); switch((long)pacman_dep_getinfo(miss, PM_DEP_MOD)) { case PM_DEP_MOD_EQ: MSG(CL, "=%s", pacman_dep_getinfo(miss, PM_DEP_VERSION)); break; From vmiklos at frugalware.org Wed Jul 25 00:29:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 00:29:48 2007 Subject: [Frugalware-git] pacman-g2: libpacman: new PM_OPT_DLREMAIN and PM_OPT_DLHOWMANY options Message-ID: <20070724222947.047DF1868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=66292c5716a9d02037cf999e7fe79238793902a2 commit 66292c5716a9d02037cf999e7fe79238793902a2 Author: VMiklos Date: Wed Jul 25 00:23:01 2007 +0200 libpacman: new PM_OPT_DLREMAIN and PM_OPT_DLHOWMANY options diff --git a/lib/libpacman/handle.c b/lib/libpacman/handle.c index a4ceac0..750e5a6 100644 --- a/lib/libpacman/handle.c +++ b/lib/libpacman/handle.c @@ -259,6 +259,12 @@ int _pacman_handle_set_option(pmhandle_t *handle, unsigned char val, unsigned lo case PM_OPT_DLETA_S: pm_dleta_s = (unsigned char *)data; break; + case PM_OPT_DLREMAIN: + handle->dlremain = (int *)data; + break; + case PM_OPT_DLHOWMANY: + handle->dlhowmany = (int *)data; + break; case PM_OPT_UPGRADEDELAY: handle->upgradedelay = data; break; @@ -354,6 +360,8 @@ int _pacman_handle_get_option(pmhandle_t *handle, unsigned char val, long *data) case PM_OPT_DLETA_H: *data = (long)pm_dleta_h; break; case PM_OPT_DLETA_M: *data = (long)pm_dleta_m; break; case PM_OPT_DLETA_S: *data = (long)pm_dleta_s; break; + case PM_OPT_DLREMAIN: *data = (long)handle->dlremain; break; + case PM_OPT_DLHOWMANY: *data = (long)handle->dlhowmany; break; case PM_OPT_PROXYHOST: *data = (long)handle->proxyhost; break; case PM_OPT_PROXYPORT: *data = handle->proxyport; break; case PM_OPT_XFERCOMMAND: *data = (long)handle->xfercommand; break; diff --git a/lib/libpacman/handle.h b/lib/libpacman/handle.h index 1c5d162..19759e1 100644 --- a/lib/libpacman/handle.h +++ b/lib/libpacman/handle.h @@ -60,6 +60,8 @@ typedef struct __pmhandle_t { unsigned short maxtries; /* for downloading */ pmlist_t *needles; /* for searching */ char *language; + int *dlremain; + int *dlhowmany; } pmhandle_t; extern pmhandle_t *handle; diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 1d28668..2b7801c 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -117,7 +117,9 @@ enum { PM_OPT_CHOMP, PM_OPT_NEEDLES, PM_OPT_MAXTRIES, - PM_OPT_OLDDELAY + PM_OPT_OLDDELAY, + PM_OPT_DLREMAIN, + PM_OPT_DLHOWMANY }; int pacman_set_option(unsigned char parm, unsigned long data); diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index 4df1294..ea27df8 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -29,6 +29,7 @@ #include #include #include +#include #include /* pacman-g2 */ @@ -44,7 +45,7 @@ int offset; struct timeval t0, t; float rate; int xfered1; -unsigned int eta_h, eta_m, eta_s; +unsigned int eta_h, eta_m, eta_s, remain = 1, howmany = 10; /* pacman options */ extern config_t *config; @@ -65,6 +66,7 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg) int chomp; static unsigned short mouth; static unsigned int lastcur = 0; + unsigned int maxpkglen; /* we don't need that parameter */ ctl=NULL; @@ -103,7 +105,18 @@ int log_progress(PM_NETBUF *ctl, int xfered, void *arg) eta_s -= eta_m * 60; } - printf(" %s [", sync_fnm); + // if the package name is too long, then slice the ending + maxpkglen=PM_DLFNM_LEN-(3+2*(int)log10(howmany)); + if(strlen(sync_fnm)>maxpkglen) + sync_fnm[maxpkglen-1]='\0'; + + putchar('('); + for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) + putchar(' '); + printf("%d/%d) %s [", remain, howmany, sync_fnm); + if (strlen(sync_fnm)0; i--) + putchar(' '); cur = (int)((maxcols-64)*pct/100); for(i = 0; i < maxcols-64; i++) { if(chomp) { From vmiklos at frugalware.org Wed Jul 25 00:29:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 00:29:49 2007 Subject: [Frugalware-git] pacman-g2: pacman-g2: use the new PM_OPT_DLREMAIN and PM_OPT_DLHOWMANY options Message-ID: <20070724222947.3BF8B1868276@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=7569bed4c83e9f23ba1f91f43bffbfb1fabde755 commit 7569bed4c83e9f23ba1f91f43bffbfb1fabde755 Author: VMiklos Date: Wed Jul 25 00:27:53 2007 +0200 pacman-g2: use the new PM_OPT_DLREMAIN and PM_OPT_DLHOWMANY options diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c index ea27df8..8713943 100644 --- a/src/pacman-g2/download.c +++ b/src/pacman-g2/download.c @@ -45,7 +45,7 @@ int offset; struct timeval t0, t; float rate; int xfered1; -unsigned int eta_h, eta_m, eta_s, remain = 1, howmany = 10; +unsigned int eta_h, eta_m, eta_s, remain, howmany; /* pacman options */ extern config_t *config; diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h index b1d777d..25a6c19 100644 --- a/src/pacman-g2/download.h +++ b/src/pacman-g2/download.h @@ -26,7 +26,7 @@ extern int offset; extern struct timeval t0, t; extern float rate; extern int xfered1; -extern unsigned int eta_h, eta_m, eta_s; +extern unsigned int eta_h, eta_m, eta_s, remain, howmany; int log_progress(PM_NETBUF *ctl, int xfered, void *arg); diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c index 6c824f3..768481a 100644 --- a/src/pacman-g2/pacman-g2.c +++ b/src/pacman-g2/pacman-g2.c @@ -574,6 +574,14 @@ int main(int argc, char *argv[]) ERR(NL, _("failed to set option DLETA_S (%s)\n"), pacman_strerror(pm_errno)); cleanup(1); } + if(pacman_set_option(PM_OPT_DLREMAIN, (long)&remain) == -1) { + ERR(NL, _("failed to set option DLREMAIN (%s)\n"), pacman_strerror(pm_errno)); + cleanup(1); + } + if(pacman_set_option(PM_OPT_DLHOWMANY, (long)&howmany) == -1) { + ERR(NL, _("failed to set option DLHOWMANY (%s)\n"), pacman_strerror(pm_errno)); + cleanup(1); + } FREE(config->cachedir); pacman_get_option(PM_OPT_CACHEDIR, (long *)&config->cachedir); From vmiklos at frugalware.org Wed Jul 25 00:29:47 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 00:29:50 2007 Subject: [Frugalware-git] pacman-g2: libpacman: if PM_OPT_DLREMAIN and/or PM_OPT_DLHOWMANY is set, make use of them Message-ID: <20070724222947.2F7A61868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=2baea21e99cbc582cff9b969002b07ba1743ce1b commit 2baea21e99cbc582cff9b969002b07ba1743ce1b Author: VMiklos Date: Wed Jul 25 00:23:42 2007 +0200 libpacman: if PM_OPT_DLREMAIN and/or PM_OPT_DLHOWMANY is set, make use of them diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index ce86737..066c994 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -164,12 +164,19 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, int done = 0; pmlist_t *complete = NULL; pmlist_t *i; + int *remain = handle->dlremain, *howmany = handle->dlhowmany; if(files == NULL) { return(0); } pm_errno = 0; + if(howmany) { + *howmany = _pacman_list_count(files); + } + if(remain) { + *remain = 0; + } _pacman_log(PM_LOG_DEBUG, _("server check, %d\n"),servers); for(i = servers; i && !done; i = i->next) { @@ -238,6 +245,10 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath, continue; } + if(remain) { + *remain += 1; + } + if(handle->xfercommand && strcmp(server->protocol, "file")) { int ret; int usepart = 0; From vmiklos at frugalware.org Wed Jul 25 00:39:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 00:39:46 2007 Subject: [Frugalware-git] pacman-g2: added .gitignore files Message-ID: <20070724223945.F28D81868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=b18e45253a206d52aa05dbc9ab0e8cf688e0f4b4 commit b18e45253a206d52aa05dbc9ab0e8cf688e0f4b4 Author: VMiklos Date: Wed Jul 25 00:36:51 2007 +0200 added .gitignore files diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77f4a46 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +*.o +*.gmo +*.po~ +*.po +*.pot +*.pyc +*.lo +*.la +.deps +.libs +*.conf +*.tar.gz +config.* +Makefile.in +Makefile +stamp-* +missing +aclocal.m4 +autom4te.cache +configure +depcomp +install-sh +mkinstalldirs +LINGUAS +POTFILES +libtool +ltmain.sh diff --git a/dist/.gitignore b/dist/.gitignore new file mode 100644 index 0000000..edabb9c --- /dev/null +++ b/dist/.gitignore @@ -0,0 +1 @@ +FrugalBuild diff --git a/etc/pacman.d/.gitignore b/etc/pacman.d/.gitignore new file mode 100644 index 0000000..d611e36 --- /dev/null +++ b/etc/pacman.d/.gitignore @@ -0,0 +1,2 @@ +frugalware +frugalware-current diff --git a/pactest/.gitignore b/pactest/.gitignore new file mode 100644 index 0000000..d8649da --- /dev/null +++ b/pactest/.gitignore @@ -0,0 +1 @@ +root diff --git a/src/pacman-g2/.gitignore b/src/pacman-g2/.gitignore new file mode 100644 index 0000000..e3eb8e6 --- /dev/null +++ b/src/pacman-g2/.gitignore @@ -0,0 +1,2 @@ +pacman-g2 +pacman-g2.static diff --git a/src/vercmp/.gitignore b/src/vercmp/.gitignore new file mode 100644 index 0000000..14817a2 --- /dev/null +++ b/src/vercmp/.gitignore @@ -0,0 +1 @@ +vercmp From vmiklos at frugalware.org Wed Jul 25 00:39:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 00:39:48 2007 Subject: [Frugalware-git] pacman-g2: autoclean.sh: just use git clean Message-ID: <20070724223946.24D581868276@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=11c444f9c074d14f5e4a7c6850f9a857d0386799 commit 11c444f9c074d14f5e4a7c6850f9a857d0386799 Author: VMiklos Date: Wed Jul 25 00:38:08 2007 +0200 autoclean.sh: just use git clean diff --git a/autoclean.sh b/autoclean.sh index b21545b..345ef66 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -1,63 +1,3 @@ #!/bin/sh -xu -[ -f Makefile ] && make distclean -rm -rf autom4te.cache -rm -rf Makefile -rm -rf Makefile.in -rm -rf configure -rm -rf config.* -rm -rf stamp* -rm -rf depcomp -rm -rf install-sh -rm -rf missing -rm -rf src/pacman-g2/Makefile -rm -rf src/pacman-g2/Makefile.in -rm -rf src/vercmp/Makefile -rm -rf src/vercmp/Makefile.in -rm -rf lib/libftp/Makefile -rm -rf lib/libftp/Makefile.in -rm -rf lib/libpacman/Makefile.in -rm -rf lib/libpacman/Makefile -rm -rf aclocal.m4 -rm -rf ltmain.sh -rm -rf doc/Makefile -rm -rf doc/Makefile.in -rm -rf doc/hu/Makefile -rm -rf doc/hu/Makefile.in -rm -rf doc/hu/*.8 -rm -rf doc/html/*.html -rm -rf doc/man3/*.3 -rm -rf compile -rm -rf libtool -rm -rf mkinstalldirs -rm -rf config.rpath -rm -rf scripts/.deps/ -rm -rf scripts/Makefile.in -rm -rf etc/Makefile.in -rm -rf etc/Makefile -rm -rf etc/pacman.d/Makefile.in -rm -rf etc/pacman.d/Makefile -rm -rf etc/pacman.d/frugalware -rm -rf etc/pacman.d/frugalware-current -rm -f dist/Changelog -rm -f dist/FrugalBuild -rm -f dist/pacman-g2-*.tar.gz -rm -f dist/pacman-g2-*.fpm - -rm -rf src/pacman-g2/po/Makefile -rm -rf src/pacman-g2/po/Makefile.in -rm -rf src/pacman-g2/po/{POTFILES,LINGUAS} -rm -rf src/pacman-g2/po/stamp-po -rm -rf src/pacman-g2/po/*.{gmo,pot,po} - -rm -rf lib/libpacman/po/Makefile -rm -rf lib/libpacman/po/Makefile.in -rm -rf lib/libpacman/po/{POTFILES,LINGUAS} -rm -rf lib/libpacman/po/stamp-po -rm -rf lib/libpacman/po/*.{gmo,pot,po} - -rm -f bindings/*/*.i -rm -f bindings/*/*.so -rm -f bindings/*/*.o - -rm -rf pactest/root +git clean -x -d From crazy at frugalware.org Wed Jul 25 02:55:58 2007 From: crazy at frugalware.org (crazy) Date: Wed Jul 25 02:56:00 2007 Subject: [Frugalware-git] frugalware-current: freetype2-2.3.5-2-i686 Message-ID: <20070725005558.13EF91868275@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3c7a98f8e2fdf7a3773c204bc1fa19bbd5cdff54 commit 3c7a98f8e2fdf7a3773c204bc1fa19bbd5cdff54 Author: crazy Date: Wed Jul 25 02:46:21 2007 +0200 freetype2-2.3.5-2-i686 * relbump ( ok from vmiklos ) * aded an patch to revert an commit triggered an * segfault with some bitmap fonts * ( for pre2 I don't have any other quick solution , sorry ) * aded comments to FB which point the commit and the * bug report I've made about so voroskoi knows what is going on diff --git a/source/lib/freetype2/FrugalBuild b/source/lib/freetype2/FrugalBuild index cf95fe6..10311a4 100644 --- a/source/lib/freetype2/FrugalBuild +++ b/source/lib/freetype2/FrugalBuild @@ -4,7 +4,7 @@ pkgname=freetype2 pkgver=2.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="TrueType font rendering library - 2.0 series (with bytecode interpreter)" url="http://freetype.sourceforge.net" groups=('lib') @@ -13,10 +13,15 @@ depends=('zlib') _F_cd_path="freetype-$pkgver" up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3157&package_id=3121'|grep 'freetype-' |sed -e 's/.*type-\(.*\).tar.bz2.*/\1/;q'" source=(http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2 \ - freetype-2.2.1-memcpy-fix.patch) -signatures=("$source.sig" '') + freetype-2.2.1-memcpy-fix.patch revert_v.1.188.patch) +# NOTE: added patch to *TEMP* revert : http://cvs.savannah.nongnu.org/viewvc/freetype2/src/truetype/ttgload.c?root=freetype&r1=1.187&r2=1.188 +# with that patch we segfault at TT_Load_Simple_Glyph() and looks like the bug(s) are triggered by some bitmap fonts +# BUG REPORT : https://savannah.nongnu.org/bugs/index.php?20581 -- crazy -- +signatures=("$source.sig" '' '') -build() { +build() +{ + Fsed '^/\* \(#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER\) \*/' '\1' include/freetype/config/ftoption.h Fbuild } diff --git a/source/lib/freetype2/revert_v.1.188.patch b/source/lib/freetype2/revert_v.1.188.patch new file mode 100644 index 0000000..5a6306e --- /dev/null +++ b/source/lib/freetype2/revert_v.1.188.patch @@ -0,0 +1,32 @@ +diff -Naur freetype-2.3.5/src/truetype/ttgload.c freetype-2.3.5-p/src/truetype/ttgload.c +--- freetype-2.3.5/src/truetype/ttgload.c 2007-07-01 14:24:23.000000000 +0200 ++++ freetype-2.3.5-p/src/truetype/ttgload.c 2007-07-25 01:38:19.000000000 +0200 +@@ -250,7 +250,7 @@ + FT_Byte c, count; + FT_Vector *vec, *vec_limit; + FT_Pos x; +- FT_Short *cont, *cont_limit, prev_cont; ++ FT_Short *cont, *cont_limit; + FT_Int xy_size = 0; + + +@@ -267,18 +267,8 @@ + if ( n_contours >= 0xFFF || p + ( n_contours + 1 ) * 2 > limit ) + goto Invalid_Outline; + +- cont[0] = prev_cont = FT_NEXT_USHORT( p ); +- for ( cont++; cont < cont_limit; cont++ ) +- { ++ for ( ; cont < cont_limit; cont++ ) + cont[0] = FT_NEXT_USHORT( p ); +- if ( cont[0] <= prev_cont ) +- { +- /* unordered contours: this is invalid */ +- error = FT_Err_Invalid_Table; +- goto Fail; +- } +- prev_cont = cont[0]; +- } + + n_points = 0; + if ( n_contours > 0 ) From vmiklos at frugalware.org Wed Jul 25 08:48:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 08:48:30 2007 Subject: [Frugalware-git] frugalware-current: openoffice.org-2.2.1-2-x86_64 Message-ID: <20070725064828.CFFA318682AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cf2cde4ba8ea24725e077218f1d0541c8bd2cf36 commit cf2cde4ba8ea24725e077218f1d0541c8bd2cf36 Author: VMiklos Date: Wed Jul 25 08:47:33 2007 +0200 openoffice.org-2.2.1-2-x86_64 erm, this was me :) diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index e2c3904..ce9455d 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -185,7 +185,10 @@ build() { Fsplit $pkgname-kde usr/lib/openoffice.org/program/$kde done ## Split GNOME stuff - for gnome in gnome-open-ur* fps_gnome.uno.so gnome-set-default-* libvclplug_gtk*.so libeggtray* libqstart_gtk* ucpgvfs1.uno.so gconfbe* libevoab*.so; do + for gnome in gnome-open-ur* fps_gnome.uno.so gnome-set-default-* \ + libvclplug_gtk*.so libeggtray* libqstart_gtk* ucpgvfs1.uno.so \ + gconfbe* libevoab*.so + do Fsplit $pkgname-gnome usr/lib/openoffice.org/program/$gnome done From vmiklos at frugalware.org Wed Jul 25 11:09:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 11:09:45 2007 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-4-x86_64 Message-ID: <20070725090942.EF7B418682AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=2734a7be3f308516bc1859f0273c632e615d1716 commit 2734a7be3f308516bc1859f0273c632e615d1716 Author: VMiklos Date: Wed Jul 25 11:09:26 2007 +0200 wlan-ng-0.2.8-4-x86_64 forgot to pkgrel++ :) diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index 07af071..80bf492 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.8 -pkgrel=3 +pkgrel=4 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From vmiklos at frugalware.org Wed Jul 25 11:26:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 11:26:12 2007 Subject: [Frugalware-git] frugalware-current: bind-9.4.1-2-i686 Message-ID: <20070725092609.0445318682AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=5c8f84eb51c3db789d986057a502c22965e97a78 commit 5c8f84eb51c3db789d986057a502c22965e97a78 Author: VMiklos Date: Wed Jul 25 11:12:24 2007 +0200 bind-9.4.1-2-i686 update to patchlevel '-P1' diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild index 5baa0c6..0e86f1e 100644 --- a/source/network/bind/FrugalBuild +++ b/source/network/bind/FrugalBuild @@ -3,8 +3,8 @@ pkgname=bind pkgver=9.4.1 -pkgextraver= -pkgrel=1 +pkgextraver=-P1 +pkgrel=2 pkgdesc="DNS server and utilities" url="http://www.isc.org/index.pl?/sw/bind/" backup=(etc/named.conf etc/logrotate.d/named) From iron at frugalware.org Wed Jul 25 12:12:32 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Wed Jul 25 12:12:34 2007 Subject: [Frugalware-git] homepage-ng: fwng: updated pre2 release date (according to -devel list) Message-ID: <20070725101232.5CA7113A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=4069f135ee297346101403684e75c32036ae18d5 commit 4069f135ee297346101403684e75c32036ae18d5 Author: Krisztian VASAS Date: Wed Jul 25 12:12:13 2007 +0200 fwng: updated pre2 release date (according to -devel list) diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml index b3f9e22..2b8ebd0 100644 --- a/frugalware/xml/roadmap.xml +++ b/frugalware/xml/roadmap.xml @@ -40,7 +40,7 @@ pre2 - Jul 25, 2007 + Jul 30, 2007 0 From krics at linuxforum.hu Wed Jul 25 12:56:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 25 12:56:51 2007 Subject: [Frugalware-git] pacman-g2: Fix for pacman -R progressbar error sometimes Message-ID: <20070725105649.DA64613A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=f7d21a5fbf39fefe45168b8bd9b8a6a2ea6d6384 commit f7d21a5fbf39fefe45168b8bd9b8a6a2ea6d6384 Author: Christian Hamar alias krix Date: Wed Jul 25 12:54:44 2007 +0200 Fix for pacman -R progressbar error sometimes * First try to fix progressbar on -R (tested with adodb) * Well, using (int)(percent * 100) instead of (double) ... :P diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index 4de6813..5f41575 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -259,7 +259,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmdb_t *db) } else { _pacman_log(PM_LOG_FLOW2, _("unlinking %s"), file); /* Need at here because we count only real unlinked files ? */ - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (double)(percent * 100), _pacman_list_count(trans->packages), (_pacman_list_count(trans->packages) - _pacman_list_count(targ) +1)); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (int)(percent * 100), _pacman_list_count(trans->packages), (_pacman_list_count(trans->packages) - _pacman_list_count(targ) +1)); position++; if(unlink(line)) { _pacman_log(PM_LOG_ERROR, _("cannot remove file %s"), file); From krics at linuxforum.hu Wed Jul 25 12:58:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 25 12:58:23 2007 Subject: [Frugalware-git] pacman-g2: New TODO entry to G2 Message-ID: <20070725105821.3756213A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=37b0f3e6e0da085213f458c0726fa97b30a8a0da commit 37b0f3e6e0da085213f458c0726fa97b30a8a0da Author: Christian Hamar alias krix Date: Wed Jul 25 12:57:33 2007 +0200 New TODO entry to G2 diff --git a/TODO b/TODO index d1e1961..92b67d9 100644 --- a/TODO +++ b/TODO @@ -27,6 +27,11 @@ G2 TODO - untouched dirs from pacman: - pamcan.conf, pacman.d - /var/lib/pacman, /var/cache/pacman +- Review that where PROGRESSBAR is used, then how to count packages + - In remove.c there is two progressbar entry and we use twice the + _pacman_list_count function() We can bring a variable in and put + list_count values to there. + autoconf/automake ================= From vmiklos at frugalware.org Wed Jul 25 13:26:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Jul 25 13:27:06 2007 Subject: [Frugalware-git] pacman-tools: repoman.1: added missing .nf/.fi block Message-ID: <20070725112656.A79DA13A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools/.git;a=commitdiff;h=d1b87c6f4c3a83c9219606bc63f63841857dd5a0 commit d1b87c6f4c3a83c9219606bc63f63841857dd5a0 Author: VMiklos Date: Wed Jul 25 13:26:39 2007 +0200 repoman.1: added missing .nf/.fi block diff --git a/repoman.1 b/repoman.1 index c0810b6..110ce30 100644 --- a/repoman.1 +++ b/repoman.1 @@ -60,12 +60,12 @@ current git clone foo@git.frugalware.org:/home/ftp/pub/other/pacman-tools/pacman-tools ) +.nf cd current - git config user.name yourname git config user.email email@addr.ess - git config remote.origin.receivepack "sudo -u foo git-receive-pack" +.fi Here you should substitute foo with the nick of the repo owner, currently vmiklos. From krics at linuxforum.hu Wed Jul 25 14:18:02 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 25 14:18:04 2007 Subject: [Frugalware-git] pacman-g2: use howmany / remain instead of doing listcount Message-ID: <20070725121802.35E9613A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=3db10b699c30887c4729f30ca15d599726943310 commit 3db10b699c30887c4729f30ca15d599726943310 Author: Christian Hamar alias krix Date: Wed Jul 25 14:17:11 2007 +0200 use howmany / remain instead of doing listcount * Use int howmany, remain; stuffs where it possible at PROGRESSbar, because now we dont got listcount run duplicates. * Replaced at add.c conflict, interconflict, and remove * make check passed progressbar seems was ok. diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 0c26ed4..6c1d801 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -294,6 +294,7 @@ int _pacman_add_prepare(pmtrans_t *trans, pmdb_t *db, pmlist_t **data) int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db) { int i, ret = 0, errors = 0, needdisp = 0; + int remain, howmany; double percent; register struct archive *archive; struct archive_entry *entry; @@ -315,6 +316,8 @@ int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db) pmpkg_t *info = (pmpkg_t *)targ->data; pmpkg_t *oldpkg = NULL; errors = 0; + remain = _pacman_list_count(targ); + howmany = _pacman_list_count(trans->packages); if(handle->trans->state == STATE_INTERRUPTED) { break; @@ -443,7 +446,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db) if (info->size != 0) percent = (double)archive_position_uncompressed(archive) / info->size; if (needdisp == 0) { - PROGRESS(trans, cb_state, what, (int)(percent * 100), _pacman_list_count(trans->packages), (_pacman_list_count(trans->packages) - _pacman_list_count(targ) +1)); + PROGRESS(trans, cb_state, what, (int)(percent * 100), howmany, (howmany - remain +1)); } if(!strcmp(pathname, ".PKGINFO") || !strcmp(pathname, ".FILELIST")) { @@ -717,7 +720,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmdb_t *db) pacman_logaction(_("errors occurred while %s %s"), (pmo_upgrade ? _("upgrading") : _("installing")), info->name); } else { - PROGRESS(trans, cb_state, what, 100, _pacman_list_count(trans->packages), (_pacman_list_count(trans->packages) - _pacman_list_count(targ) +1)); + PROGRESS(trans, cb_state, what, 100, howmany, howmany - remain + 1); } } diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c index f352873..3c2062e 100644 --- a/lib/libpacman/conflict.c +++ b/lib/libpacman/conflict.c @@ -52,22 +52,26 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmdb_t *db, pmlist_t *package pmlist_t *i, *j, *k; pmlist_t *baddeps = NULL; pmdepmissing_t *miss = NULL; + int howmany, remain; double percent; if(db == NULL) { return(NULL); } + howmany = _pacman_list_count(packages); + for(i = packages; i; i = i->next) { pmpkg_t *tp = i->data; - percent = (double)(_pacman_list_count(packages) - _pacman_list_count(i) + 1) / _pacman_list_count(packages); if(tp == NULL) { continue; } + remain = _pacman_list_count(i); + percent = (double)(howmany - remain + 1) / howmany; PROGRESS(trans, PM_TRANS_PROGRESS_INTERCONFLICTS_START, "", - (percent * 100), _pacman_list_count(packages), - (_pacman_list_count(packages) - _pacman_list_count(i) +1)); + (percent * 100), howmany, + howmany - remain + 1); for(j = _pacman_pkg_getinfo(tp, PM_PKG_CONFLICTS); j; j = j->next) { if(!strcmp(tp->name, j->data)) { @@ -217,15 +221,19 @@ pmlist_t *_pacman_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, pm pmlist_t *conflicts = NULL; pmlist_t *targets = trans->packages; double percent; + int howmany, remain; if(db == NULL || targets == NULL || root == NULL) { return(NULL); } + howmany = _pacman_list_count(targets); + /* CHECK 1: check every target against every target */ for(i = targets; i; i = i->next) { pmpkg_t *p1 = (pmpkg_t*)i->data; - percent = (double)(_pacman_list_count(targets) - _pacman_list_count(i) + 1) / _pacman_list_count(targets); - PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), _pacman_list_count(targets), (_pacman_list_count(targets) - _pacman_list_count(i) +1)); + remain = _pacman_list_count(i); + percent = (double)(howmany - remain + 1) / howmany; + PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), howmany, howmany - remain + 1); for(j = i; j; j = j->next) { pmpkg_t *p2 = (pmpkg_t*)j->data; if(strcmp(p1->name, p2->name)) { diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index 5f41575..afd695b 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -161,10 +161,13 @@ int _pacman_remove_commit(pmtrans_t *trans, pmdb_t *db) struct stat buf; pmlist_t *targ, *lp; char line[PATH_MAX+1]; + int howmany, remain; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); + howmany = _pacman_list_count(trans->packages); + for(targ = trans->packages; targ; targ = targ->next) { int position = 0; char pm_install[PATH_MAX]; @@ -174,6 +177,8 @@ int _pacman_remove_commit(pmtrans_t *trans, pmdb_t *db) break; } + remain = _pacman_list_count(targ); + if(trans->type != PM_TRANS_TYPE_UPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); _pacman_log(PM_LOG_FLOW1, _("removing package %s-%s"), info->name, info->version); @@ -259,7 +264,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmdb_t *db) } else { _pacman_log(PM_LOG_FLOW2, _("unlinking %s"), file); /* Need at here because we count only real unlinked files ? */ - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (int)(percent * 100), _pacman_list_count(trans->packages), (_pacman_list_count(trans->packages) - _pacman_list_count(targ) +1)); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (int)(percent * 100), howmany, howmany - remain + 1); position++; if(unlink(line)) { _pacman_log(PM_LOG_ERROR, _("cannot remove file %s"), file); @@ -270,7 +275,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmdb_t *db) } } - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 100, _pacman_list_count(trans->packages), (_pacman_list_count(trans->packages) - _pacman_list_count(targ) +1)); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 100, howmany, howmany - remain + 1); if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* run the post-remove script if it exists */ if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { From krics at linuxforum.hu Wed Jul 25 14:22:30 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jul 25 14:22:32 2007 Subject: [Frugalware-git] pacman-g2: - one TODO entry Message-ID: <20070725122230.E6ABC13A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2/.git;a=commitdiff;h=0205bea4650ff6b6eb3042c64c962796f4d3e4ca commit 0205bea4650ff6b6eb3042c64c962796f4d3e4ca Author: Christian Hamar alias krix Date: Wed Jul 25 14:21:42 2007 +0200 - one TODO entry diff --git a/TODO b/TODO index 92b67d9..1b5cd50 100644 --- a/TODO +++ b/TODO @@ -27,10 +27,6 @@ G2 TODO - untouched dirs from pacman: - pamcan.conf, pacman.d - /var/lib/pacman, /var/cache/pacman -- Review that where PROGRESSBAR is used, then how to count packages - - In remove.c there is two progressbar entry and we use twice the - _pacman_list_count function() We can bring a variable in and put - list_count values to there. autoconf/automake From janny at frugalware.org Wed Jul 25 20:41:57 2007 From: janny at frugalware.org (janny) Date: Wed Jul 25 20:41:59 2007 Subject: [Frugalware-git] frugalware-current: clamav-0.91.1-1-i686 Message-ID: <20070725184157.9053713A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=d6a508aa06883927960bd2a34d670cc7f40fa823 commit d6a508aa06883927960bd2a34d670cc7f40fa823 Author: janny Date: Wed Jul 25 20:41:25 2007 +0200 clamav-0.91.1-1-i686 version bump diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index a206d28..0da7520 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=clamav -pkgver=0.91 +pkgver=0.91.1 pkgrel=1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp' 'bzip2' 'curl>=7.16.0') @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=($source rc.clamav rc.clamav-hu.po) -sha1sums=('995e054d19250777597c504552310490a59d8f76' \ +sha1sums=('51ff98325b5ffd49dfc0f0cbf92134c0d872cd21' \ '90b22c99927b56992ac05042029d2702db79a8b0' \ '57d36966c45adfd6b3ebd10b91874194924ab2c3') From janny at frugalware.org Wed Jul 25 21:21:11 2007 From: janny at frugalware.org (janny) Date: Wed Jul 25 21:21:13 2007 Subject: [Frugalware-git] frugalware-current: klamav-0.41.1-1-i686 Message-ID: <20070725192111.7DE7413A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=105caaf4a423ca4615e8751bc3785bf37dbaa413 commit 105caaf4a423ca4615e8751bc3785bf37dbaa413 Author: janny Date: Wed Jul 25 21:20:56 2007 +0200 klamav-0.41.1-1-i686 version bump diff --git a/source/kde-extra/klamav/FrugalBuild b/source/kde-extra/klamav/FrugalBuild index b975dcc..978acc6 100644 --- a/source/kde-extra/klamav/FrugalBuild +++ b/source/kde-extra/klamav/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=klamav -pkgver=0.41 +pkgver=0.41.1 pkgrel=1 pkgdesc="KlamAV brings ClamAV functionality to the KDE desktop user." license="GPL" @@ -16,5 +16,5 @@ _F_kde_defaults=0 Finclude sourceforge kde Fconfopts="$Fconfopts --disable-debug --without-debug" -sha1sums=('cf8d9d9f008057ab66b36e497cda375c95cba7f3') +sha1sums=('1cd14dbfb9a5e5bb0a24a04d0a421154476dceab') # optimization OK From janny at frugalware.org Wed Jul 25 22:04:57 2007 From: janny at frugalware.org (janny) Date: Wed Jul 25 22:04:58 2007 Subject: [Frugalware-git] frugalware-current: krusader-1.80.0-1-i686 Message-ID: <20070725200457.0163D13A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=77320605f22dd94a8c0ab691c668aa4753dec87f commit 77320605f22dd94a8c0ab691c668aa4753dec87f Author: janny Date: Wed Jul 25 22:04:42 2007 +0200 krusader-1.80.0-1-i686 version bump diff --git a/source/kde/krusader/FrugalBuild b/source/kde/krusader/FrugalBuild index a23359d..4453c03 100644 --- a/source/kde/krusader/FrugalBuild +++ b/source/kde/krusader/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=krusader -pkgver=1.70.1 +pkgver=1.80.0 pkgrel=1 pkgdesc="Twin Panel File Manager For Your Desktop" Finclude sourceforge @@ -13,6 +13,6 @@ groups=('kde' 'kde-apps') archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads.php|grep '^version'|sed 's/.* \(.*\)/\1/;q'" options=('scriptlet') -sha1sums=('67979a745a3c637db0b72dc6cb3de3c8fb2f7dbf') +sha1sums=('8e9ef3798be6fdb245db79664c1753f0b4e5d184') # optimization ok From vmiklos at frugalware.org Thu Jul 26 00:34:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 00:34:57 2007 Subject: [Frugalware-git] homepage-ng: FSA224-kernel Message-ID: <20070725223455.20E9513A41AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=a1b0b5110bbd092a42b8a4196231ccbd4ee0c8ba commit a1b0b5110bbd092a42b8a4196231ccbd4ee0c8ba Author: VMiklos Date: Thu Jul 26 00:33:15 2007 +0200 FSA224-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 2836915..1e11cc4 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,12 +27,27 @@ + 224 + 2007-07-26 + vmiklos + kernel + 2.6.20-5terminus7 + 2.6.20-5terminus8 + http://bugs.frugalware.org/task/2235 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3513 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3107 + Security issues have been reported in the Linux Kernel, which can be exploited by malicious, local users to cause a DoS (Denial of Service). + 1) The USBLCD driver does not limit the memory consumption during writes to the device. This can be exploited to cause an out-of-memory condition by writing a large amount of data to an affected device. + Successful exploitation requires write access to a device using the driver. + 2) A vulnerability is caused due to an error within the "decode_choice()" function in net/netfilter/bf_conntrack_h323_asn1.c when handling choices that are still encoded in the fixed-size bitfield. This can be exploited to cause access to undefined types, resulting in a crash. + + 223 2007-07-23 vmiklos joomla 1.0.12-1 - -1.0.12-2terminus1 + 1.0.12-2terminus1 http://bugs.frugalware.org/task/2216 There is no CVE for this issue, see http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=5654 Cindy Chee has discovered a vulnerability in Joomla!, which can be exploited by malicious people to conduct cross-site scripting attacks. From vmiklos at frugalware.org Thu Jul 26 10:27:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 10:27:34 2007 Subject: [Frugalware-git] homepage-ng: FSA225-j2re Message-ID: <20070726082731.DCA2F13A41C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=9b61a44839f6211ae2a1480a8bf3b8a14122e0a6 commit 9b61a44839f6211ae2a1480a8bf3b8a14122e0a6 Author: VMiklos Date: Thu Jul 26 10:27:13 2007 +0200 FSA225-j2re diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 1e11cc4..65970cc 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,20 @@ + 225 + 2007-07-26 + vmiklos + j2re + 6-2 + 6-3terminus1 + http://bugs.frugalware.org/task/2254 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3655 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3716 + A vulnerability has been reported in Sun Java Web Start, which can be exploited by malicious people to compromise a user's system. + The vulnerability is caused due to a boundary error within the Java Web Start component (javaws.exe) when processing JNLP files. This can be exploited to cause a stack-based buffer overflow via a specially crafted JNLP file with an overly long codebase attribute. + Successful exploitation allows execution of arbitrary code e.g. when a user visits a malicious website. + + 224 2007-07-26 vmiklos From vmiklos at frugalware.org Thu Jul 26 10:31:46 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 10:31:47 2007 Subject: [Frugalware-git] homepage-ng: FSA226-j2sdk Message-ID: <20070726083146.4F60113A41C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=434c91d179e57179571d9dbedd04b3da1872cb77 commit 434c91d179e57179571d9dbedd04b3da1872cb77 Author: VMiklos Date: Thu Jul 26 10:30:56 2007 +0200 FSA226-j2sdk diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 65970cc..5827e9e 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 226 + 2007-07-26 + vmiklos + j2sdk + 6-1 + 6-2terminus1 + http://bugs.frugalware.org/task/2255 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3716 + Brad Hill has reported a vulnerability in Sun JDK and JRE, which can be exploited by malicious people to compromise a vulnerable system. + The vulnerability is caused due to an error when processing XSLT stylesheets contained in XSLT Transforms in XML signatures. This can be exploited to execute arbitrary code when an application processes a specially crafted XML signature. + + 225 2007-07-26 vmiklos From vmiklos at frugalware.org Thu Jul 26 18:30:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 18:30:22 2007 Subject: [Frugalware-git] ooodev: update FB from -current Message-ID: <20070726163019.5CACA13A41C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ooodev/.git;a=commitdiff;h=33ac731edbf4830fc0bf51449e612d19db6d332d commit 33ac731edbf4830fc0bf51449e612d19db6d332d Author: VMiklos Date: Wed Jul 25 11:43:19 2007 +0200 update FB from -current diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 49d1c41..ce9455d 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -4,12 +4,15 @@ pkgname=openoffice.org # uncomment this to get a -devel build -options=('devel') +#options=('devel') if [ ! "`check_option DEVEL`" ]; then - upstream=2.1.0 + upstream=2.2.1 + branch=2-2 + tree=oof680 + milestone=18 pkgver=$upstream - pkgrel=6 - snapshot=20070109 + pkgrel=2 + snapshot=20070628 else upstream=2.2.0 tree=oof680 @@ -32,11 +35,11 @@ makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'firefox' 'apache-ant' 'gcc- groups=('xapps') archs=('i686' 'x86_64') if [ ! "`check_option DEVEL`" ]; then - up2date="lynx -source -dump http://www.openoffice.org/|grep download|sed -n 's|.*/\(.*\)/index.html.*|\1|;$ p'" - source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-${pkgver//./-}-$snapshot.tar.bz2 \ - http://hu.openoffice.org/source/browse/*checkout*/hu/src/$upstream/SDF/hu.sdf.bz2 \ - hyperlinks-quotes.diff starcalc-file-format-parser-2.2.diff use_system_libwpd.diff) - signatures=($source.asc '' '' '' '') + up2date="lynx -dump $url |grep version:|sed 's/.*: //'" + source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$branch-$snapshot.tar.bz2 \ + http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2 \ + fix-invisible-text.diff) + signatures=($source.asc '' '') else up2date="lynx -dump http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/configure.in|grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/${pkgver%%oo*}\1_\2/'" source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2 \ @@ -45,7 +48,7 @@ else fi options=(${options[@]} 'scriptlet') _F_gnome_desktop="y" -Finclude gnome-scriptlet +Finclude gnome-scriptlet mono unset install subpkgs=("$pkgname-kde" "$pkgname-gnome") @@ -59,8 +62,8 @@ subinstall=("" "$_F_gnome_scriptlet") ooosubpkgs=('de' 'es' 'fr' 'hu') ooosubdescs=('German' 'Spanish' 'French' 'Hungarian') if [ ! "`check_option DEVEL`" ]; then - ooosubpkgs=(${ooosubpkgs[@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD' 'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi' 'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv' 'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw' 'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn' 'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN' 'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN') - ooosubdescs=(${ooosubdescs[@]} 'Afrikaans' 'Arabic' 'Belarusian' 'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton' 'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English (South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)' 'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South' 'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)' 'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic' 'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)' 'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam' 'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu') + ooosubpkgs=(${ooosubpkgs[@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD' 'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi' 'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv' 'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw' 'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn' 'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN' 'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz') + ooosubdescs=(${ooosubdescs[@]} 'Afrikaans' 'Arabic' 'Belarusian' 'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton' 'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English (South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)' 'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South' 'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)' 'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic' 'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)' 'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam' 'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha') fi if [ ${#ooosubpkgs[@]} -ne ${#ooosubdescs[@]} ]; then @@ -95,11 +98,10 @@ done # You can find a few random notes about building OOo here: # http://wiki.frugalware.org/OOo_building -# TODO for 2.2.0: new logo, remove hack - build() { + Fmonoexport if [ ! "`check_option DEVEL`" ]; then - Fcd ooo-build-$upstream + Fcd ooo-build-${branch//-/.} else Fcd ooo-build fi @@ -108,7 +110,7 @@ build() { cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1 # Remove our patches so that incremental build will be possible. - #rm -f patches/src680/disable-regcomp-python.diff + rm -f patches/src680/fix-invisible-text.diff Fpatchall # Defined $CARCH config @@ -126,6 +128,7 @@ build() { # Other options. Fconfopts="$Fconfopts \ + --with-tag=$tree-m$milestone \ --with-gcc-speedup=ccache \ --with-openclipart=/usr/share/openclipart \ --enable-gtk \ @@ -140,20 +143,15 @@ build() { Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in autoconf || return 1 - ## Ffix env C{XX}FLAGS also Fkill 'mtune' ( don't _use_ -0[1-9] here ) O or Os nothing else... Fthx - ## Fand Fwhy Fthey Fare Fdoing Fsomething Fcrappy Flike Fthis ? ;) - #export ARCH_FLAGS="`echo $CFLAGS|sed 's/-O[0-9]/-Os/g'` -fno-strict-aliasing" + # Optimize build. export ARCH_FLAGS="$CFLAGS" if [ "`check_option DEVEL`" ]; then - Fconf --with-lang="en-US de es fr hu" --with-tag=$tree-m$milestone + Fconf --with-lang="en-US de es fr hu" else Fconf --with-lang=ALL fi - # hack - (cd src; wget http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/x11/dejavu-ttf/dejavu-ttf-2.15.tar.bz2) - ./download || return 1 make || return 1 @@ -167,26 +165,30 @@ build() { for i in "${ooosubpkgs[@]}" do spkg=`echo $i|tr [A-Z] [a-z]` - Fsplit openoffice.org-i18n-$spkg usr/lib/$pkgname/share/registry/res/$i/ - Fsplit openoffice.org-i18n-$spkg usr/lib/$pkgname/share/template/$i/ - if [ -d $Fdestdir/usr/lib/$pkgname/help/$i ]; then - Fsplit openoffice.org-i18n-$spkg usr/lib/$pkgname/help/$i/ - fi - Fsplit openoffice.org-i18n-$spkg usr/lib/$pkgname/program/resource/*680$i.res + for j in usr/lib/$pkgname/share/registry/res/$i/ usr/lib/$pkgname/share/template/$i/ \ + usr/lib/$pkgname/help/$i/ usr/lib/$pkgname/program/resource/*680$i.res \ + usr/lib/openoffice.org/licenses/LICENSE_$i* usr/lib/openoffice.org/presets/config/*_$i.* \ + usr/lib/openoffice.org/readmes/README_$i* usr/lib/openoffice.org/share/autocorr/acor_$i*.dat \ + usr/lib/openoffice.org/share/autotext/$i/ usr/lib/openoffice.org/share/readme/LICENSE_$i* \ + usr/lib/openoffice.org/share/readme/README_$i* sr/lib/openoffice.org/share/samples/$i/ \ + usr/lib/openoffice.org/share/registry/modules/org/openoffice/Setup/Langpack-$i.xcu \ + usr/lib/openoffice.org/share/template/wizard/letter/$i/ usr/lib/openoffice.org/share/wordbook/$i/ + do + if ls $Fdestdir/$j &>/dev/null; then + Fsplit openoffice.org-i18n-$spkg $j + fi + done done ## Split KDE stuff - if [ "`check_option DEVEL`" ]; then - for kde in fps_kde.uno.so kdebe*.uno.so kdefilepicker kde-open-url libvclplug_kde*.so; do - Fsplit $pkgname-kde usr/lib/openoffice.org/program/$kde - done - else - for kde in libfps_kde.so libvclplug_kde*.so libkab*.so kdebe*.so kdefilepicker; do - Fsplit $pkgname-kde usr/lib/openoffice.org/program/$kde - done - fi + for kde in fps_kde.uno.so kdebe*.uno.so kdefilepicker kde-open-url libvclplug_kde*.so; do + Fsplit $pkgname-kde usr/lib/openoffice.org/program/$kde + done ## Split GNOME stuff - for gnome in gnome-open-ur* fps_gnome.uno.so gnome-set-default-* libvclplug_gtk*.so libeggtray* libqstart_gtk* ucpgvfs1.uno.so gconfbe* libevoab*.so; do + for gnome in gnome-open-ur* fps_gnome.uno.so gnome-set-default-* \ + libvclplug_gtk*.so libeggtray* libqstart_gtk* ucpgvfs1.uno.so \ + gconfbe* libevoab*.so + do Fsplit $pkgname-gnome usr/lib/openoffice.org/program/$gnome done @@ -198,6 +200,7 @@ build() { Fmessage "Unsplitted languages: $misslangs" return 1 fi + Fmonocleanup } # optimization OK diff --git a/source/xapps/openoffice.org/fix-invisible-text.diff b/source/xapps/openoffice.org/fix-invisible-text.diff new file mode 100644 index 0000000..eb2c0b5 --- /dev/null +++ b/source/xapps/openoffice.org/fix-invisible-text.diff @@ -0,0 +1,25 @@ +diff -Naur ooo-build-2-2.orig/patches/src680/apply ooo-build-2-2/patches/src680/apply +--- ooo-build-2-2.orig/patches/src680/apply 2007-07-21 22:40:29.000000000 +0200 ++++ ooo-build-2-2/patches/src680/apply 2007-07-21 22:46:46.000000000 +0200 +@@ -781,6 +781,7 @@ + gcc401-stlport45-include.diff, gghibo + # needed by CXXHelpLinker + system-db-4.3-java-library-path.diff ++fix-invisible-text.diff + + + # ( mmp@oo.o deals with defaults apparently ) +diff -Naur ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff ooo-build-2-2/patches/src680/fix-invisible-text.diff +--- ooo-build-2-2.orig/patches/src680/fix-invisible-text.diff 1970-01-01 01:00:00.000000000 +0100 ++++ ooo-build-2-2/patches/src680/fix-invisible-text.diff 2007-07-21 22:46:23.000000000 +0200 +@@ -0,0 +1,10 @@ ++--- sw/source/core/bastyp/swregion.cxx +++++ sw/source/core/bastyp/swregion.cxx ++@@ -79,6 +79,7 @@ ++ { ++ if( rDel ) ++ { +++ pData = (SwRect*) pData; ++ *(pData+nPos) = rRect; ++ rDel = FALSE; ++ } From vmiklos at frugalware.org Thu Jul 26 18:30:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 18:30:23 2007 Subject: [Frugalware-git] ooodev: openoffice.org-2.3src680_m221-1-i686 Message-ID: <20070726163019.7783113A41C2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ooodev/.git;a=commitdiff;h=b5c7625e13e955d2e746367cf7ccee960d365f22 commit b5c7625e13e955d2e746367cf7ccee960d365f22 Author: VMiklos Date: Wed Jul 25 11:58:36 2007 +0200 openoffice.org-2.3src680_m221-1-i686 update to newer milestone diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index ce9455d..5baede9 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -4,7 +4,7 @@ pkgname=openoffice.org # uncomment this to get a -devel build -#options=('devel') +options=('devel') if [ ! "`check_option DEVEL`" ]; then upstream=2.2.1 branch=2-2 @@ -14,12 +14,12 @@ if [ ! "`check_option DEVEL`" ]; then pkgrel=2 snapshot=20070628 else - upstream=2.2.0 - tree=oof680 - milestone=14 + upstream=2.3 + tree=src680 + milestone=221 pkgver=$upstream${tree}_m$milestone pkgrel=1 - snapshot=20070329 + snapshot=20070725 fi pkgdesc="OpenOffice.org, a full office productivity suite." url="http://www.openoffice.org/" @@ -41,9 +41,9 @@ if [ ! "`check_option DEVEL`" ]; then fix-invisible-text.diff) signatures=($source.asc '' '') else - up2date="lynx -dump http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/configure.in|grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/${pkgver%%oo*}\1_\2/'" + up2date="lynx -dump http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'" source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2 \ - http://hu.openoffice.org/source/browse/*checkout*/hu/src/$upstream/SDF/hu.sdf.bz2) + http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2) signatures=($source.asc '') fi options=(${options[@]} 'scriptlet') @@ -147,7 +147,7 @@ build() { export ARCH_FLAGS="$CFLAGS" if [ "`check_option DEVEL`" ]; then - Fconf --with-lang="en-US de es fr hu" + Fconf --with-lang="en-US de es fr hu" --enable-separate-helpcontent else Fconf --with-lang=ALL fi From vmiklos at frugalware.org Thu Jul 26 18:30:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 18:30:25 2007 Subject: [Frugalware-git] ooodev: openoffice.org-2.3src680_m222-1-i686 Message-ID: <20070726163019.9CC2E13A41C4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ooodev/.git;a=commitdiff;h=9674488cac712527088298eddc3f6f0849e8312e commit 9674488cac712527088298eddc3f6f0849e8312e Author: VMiklos Date: Thu Jul 26 18:29:10 2007 +0200 openoffice.org-2.3src680_m222-1-i686 new makedepend diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index de536b9..caf622c 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -31,7 +31,7 @@ rodepends=('flac') makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'firefox' 'apache-ant' 'gcc-gcj' 'kdelibs>=3.5.5' \ 'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \ 'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base' 'gnome-vfs' \ - 'libbonobo' 'procps' 'openldap' 'mono') + 'libbonobo' 'procps' 'openldap' 'mono' 'gperf') groups=('xapps') archs=('i686' 'x86_64') if [ ! "`check_option DEVEL`" ]; then From vmiklos at frugalware.org Thu Jul 26 18:30:19 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jul 26 18:30:26 2007 Subject: [Frugalware-git] ooodev: openoffice.org-2.3src680_m222-1-i686 Message-ID: <20070726163019.8FB5213A41C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ooodev/.git;a=commitdiff;h=117177ec9d1273c66ebb3c42fdf99029e6ddda1c commit 117177ec9d1273c66ebb3c42fdf99029e6ddda1c Author: VMiklos Date: Thu Jul 26 18:29:01 2007 +0200 openoffice.org-2.3src680_m222-1-i686 update to newer milestone diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 5baede9..de536b9 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -16,7 +16,7 @@ if [ ! "`check_option DEVEL`" ]; then else upstream=2.3 tree=src680 - milestone=221 + milestone=222 pkgver=$upstream${tree}_m$milestone pkgrel=1 snapshot=20070725 From boobaa at frugalware.org Fri Jul 27 11:20:32 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 27 11:20:34 2007 Subject: [Frugalware-git] boobaa: pdftk-1.41-2-i686 Message-ID: <20070727092032.0900018682FF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=f622afa9ad051dc9658670ac78ef6de404d2ac8b commit f622afa9ad051dc9658670ac78ef6de404d2ac8b Author: CSÉCSY László Date: Fri Jul 27 11:19:47 2007 +0200 pdftk-1.41-2-i686 rebuilt with new libgcj diff --git a/source/apps-extra/pdftk/FrugalBuild b/source/apps-extra/pdftk/FrugalBuild index 9e6eed1..a88d26f 100644 --- a/source/apps-extra/pdftk/FrugalBuild +++ b/source/apps-extra/pdftk/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pdftk pkgver=1.41 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for manipulating PDF documents" url="http://www.accesspdf.com/pdftk" depends=('libstdc++' 'libgcj') From boobaa at frugalware.org Fri Jul 27 13:55:41 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 27 13:55:44 2007 Subject: [Frugalware-git] boobaa: hunspell-1.1.9-1-i686 Message-ID: <20070727115541.369B518682FF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=423e898aebf5afdff6ec1e15333254ca5d0ff0c3 commit 423e898aebf5afdff6ec1e15333254ca5d0ff0c3 Author: CSÉCSY László Date: Fri Jul 27 13:55:22 2007 +0200 hunspell-1.1.9-1-i686 version bump diff --git a/source/apps-extra/hunspell/FrugalBuild b/source/apps-extra/hunspell/FrugalBuild index 1c60456..af0ce9b 100644 --- a/source/apps-extra/hunspell/FrugalBuild +++ b/source/apps-extra/hunspell/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=hunspell -pkgver=1.1.8_2 +pkgver=1.1.9 pkgrel=1 pkgdesc="An interactive Hungarian spell checker" url="http://hunspell.sourceforge.net/" @@ -16,7 +16,7 @@ up2date="lynx -dump http://hunspell.sourceforge.net/ | grep -m1 'http.*tar\.gz' source=(${source[@]} \ http://forditas.fsf.hu/scripts/huspell \ http://forditas.fsf.hu/scripts/huspell-po) -sha1sums=('fbfe4eb392ad2143f96d3ab8846970b1b5d100fd' \ +sha1sums=('a881d9bc8bc6257c956c70c863e872514f8c44d4' \ '8beb23bebd6901d64901190f18ce996d5a9e6d4b' \ '69ccc901cb15fbc3d02ce752d74037e1b48ce077') From boobaa at frugalware.org Fri Jul 27 14:15:37 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jul 27 14:15:41 2007 Subject: [Frugalware-git] boobaa: iso-codes-1.3-1-i686 Message-ID: <20070727121537.A7A3718682FF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa/.git;a=commitdiff;h=a6b51c1b19286d602e7a33bc02f6dfc96b3e04d6 commit a6b51c1b19286d602e7a33bc02f6dfc96b3e04d6 Author: CSÉCSY László Date: Fri Jul 27 14:14:21 2007 +0200 iso-codes-1.3-1-i686 version bump diff --git a/source/devel/iso-codes/FrugalBuild b/source/devel/iso-codes/FrugalBuild index 13d139f..4363918 100644 --- a/source/devel/iso-codes/FrugalBuild +++ b/source/devel/iso-codes/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=iso-codes -pkgver=1.2 +pkgver=1.3 pkgrel=1 debrel=1 pkgdesc="Provides the list of country and language names" @@ -17,5 +17,5 @@ source=(ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/$pkgname-$pkgver.t iso-codes-0.52-pkgconfig-fixes.patch) # optimization OK -sha1sums=('c901e6a5161d80ff61a53873db93a3d536799550' \ +sha1sums=('4bc94542299baecfed76c58745fcc7a78ca99d7e' \ '44841e6019eea610bdba5ddfe52b8c393ba878ca') From vmiklos at frugalware.org Fri Jul 27 17:51:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 27 17:51:40 2007 Subject: [Frugalware-git] ooodev: openoffice.org-2.3src680_m222-2-i686 Message-ID: <20070727155137.89EC9186831D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ooodev/.git;a=commitdiff;h=f4ee8e3020bef48f65be57dac6040a591a9d537a commit f4ee8e3020bef48f65be57dac6040a591a9d537a Author: VMiklos Date: Fri Jul 27 17:51:21 2007 +0200 openoffice.org-2.3src680_m222-2-i686 update to newer snapshot, drop size-sal-textenc.diff diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index caf622c..55211bf 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -18,8 +18,8 @@ else tree=src680 milestone=222 pkgver=$upstream${tree}_m$milestone - pkgrel=1 - snapshot=20070725 + pkgrel=2 + snapshot=20070726 fi pkgdesc="OpenOffice.org, a full office productivity suite." url="http://www.openoffice.org/" @@ -102,6 +102,7 @@ build() { Fmonoexport if [ ! "`check_option DEVEL`" ]; then Fcd ooo-build-${branch//-/.} + rm -f patches/src680/fix-invisible-text.diff else Fcd ooo-build fi @@ -110,7 +111,7 @@ build() { cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1 # Remove our patches so that incremental build will be possible. - rm -f patches/src680/fix-invisible-text.diff + sed -i '/size-sal-textenc.diff/d' patches/src680/apply Fpatchall # Defined $CARCH config From vmiklos at frugalware.org Fri Jul 27 20:00:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 27 20:00:22 2007 Subject: [Frugalware-git] frugalware-current: shadow-4.0.18.1-7-i686 Message-ID: <20070727180020.353AC13A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b0e4e85d3be06318519198f44f03293a0cf99ee0 commit b0e4e85d3be06318519198f44f03293a0cf99ee0 Author: VMiklos Date: Fri Jul 27 20:00:09 2007 +0200 shadow-4.0.18.1-7-i686 added a workaround to adduser this makes it possible to change the root pass in the setup again diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index 1793d42..8bca550 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -3,7 +3,7 @@ pkgname=shadow pkgver=4.0.18.1 -pkgrel=6 +pkgrel=7 pkgdesc="Shadow password file utilities" url="http://shadow.pld.org.pl" backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits) @@ -33,13 +33,13 @@ build() Ffile /etc/adduser.conf } -sha1sums=('1a30458e9db05560bfc82529048bd5d60b45cf9b'\ - 'afaded563be31ae8621dbe95e5476644b10caa2f'\ - 'fcdfccf5e6741d2f310e18c2bfa26b205832240a'\ - 'e1554d118f582a978b4b14c348c155af957a1368'\ - 'a70e741ccea2d2f81b25b8b608a5fc3d3ab83ebe'\ - 'a3bcae5d8a4cf64c13599d047d963801962b6f4e'\ - '2edf92c64691c775f8b5962ae6092aa8352ae627'\ - 'c13cf8b5c566e129d4fc62ad3ac08b6c856c992e'\ +sha1sums=('1a30458e9db05560bfc82529048bd5d60b45cf9b' \ + 'fa57c052143beaac183d6b500f78790e3616363e' \ + 'fcdfccf5e6741d2f310e18c2bfa26b205832240a' \ + 'e1554d118f582a978b4b14c348c155af957a1368' \ + 'a70e741ccea2d2f81b25b8b608a5fc3d3ab83ebe' \ + 'a3bcae5d8a4cf64c13599d047d963801962b6f4e' \ + '2edf92c64691c775f8b5962ae6092aa8352ae627' \ + 'c13cf8b5c566e129d4fc62ad3ac08b6c856c992e' \ 'c98ebbc593fc21da9727724b92efc4352b6534f4') # optimization OK diff --git a/source/base/shadow/adduser b/source/base/shadow/adduser index 30c7d7f..320811f 100644 --- a/source/base/shadow/adduser +++ b/source/base/shadow/adduser @@ -433,18 +433,26 @@ if [ ! -z "${CHOWNHOMEDIR}" ]; then fi # Set the finger information +if [ -z "$2" ]; then $chfn "$LOGIN" if [ $? -gt 0 ]; then echo "- Warning: an error occurred while setting finger information" fi +else +$chfn -f "$2" +fi # Set a password +if [ -z "$3" ]; then $passwd "$LOGIN" if [ $? -gt 0 ]; then echo "* WARNING: An error occured while setting the password for" echo " this account. Please manually investigate this *" exit 1 fi +else +echo "$LOGIN:$3" |chpasswd +fi # If it was created (it should have been!), set the permissions for that user's dir HME="$(echo "$HME" | awk '{print $2}')" # We have to remove the -g prefix From priyank at frugalware.org Fri Jul 27 21:45:20 2007 From: priyank at frugalware.org (Priyank) Date: Fri Jul 27 21:45:23 2007 Subject: [Frugalware-git] gfpm: gfpm.glade: fixed a typo in widget name Message-ID: <20070727194520.12A9C13A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=88f7e9226cef62bed400b7ad80d770a7d93b9072 commit 88f7e9226cef62bed400b7ad80d770a7d93b9072 Author: Priyank Date: Sat Jul 28 01:14:42 2007 +0530 gfpm.glade: fixed a typo in widget name * also renamed a couple of widgets to friendly names diff --git a/glade/gfpm.glade b/glade/gfpm.glade index 1737a7d..dd87133 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -514,7 +514,6 @@ Installed packages True 0.10000000149011612 - False @@ -706,7 +705,7 @@ Installed packages 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 @@ -721,7 +720,7 @@ Installed packages GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_BUTTONBOX_EDGE - + True True True @@ -758,7 +757,7 @@ Installed packages - + True True True From vmiklos at frugalware.org Fri Jul 27 22:56:52 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 27 22:57:04 2007 Subject: [Frugalware-git] setup: postconf: change_rootpw() new function to avoid calling passwd Message-ID: <20070727205652.2544C13A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=b0eb048a8031182bed0bee39371ee4d034c006e2 commit b0eb048a8031182bed0bee39371ee4d034c006e2 Author: VMiklos Date: Fri Jul 27 22:27:03 2007 +0200 postconf: change_rootpw() new function to avoid calling passwd replaced it with a nice dialog interface diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index d67c50e..60f8009 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -90,6 +90,33 @@ int confirm_rootpw() return(0); } +int change_rootpw() +{ + char *pass1, *pass2, *ptr; + int ret; + + while(1) + { + if(fw_inputbox(_("Password"), _("Please enter a root password"), 0, 0, "", 1) == -1) + continue; + else + pass1 = strdup(dialog_vars.input_result); + if(fw_inputbox(_("Password"), _("Please re-enter your root password"), 0, 0, "", 1) == -1) + continue; + else + pass2 = strdup(dialog_vars.input_result); + if(!strcmp(pass1, pass2)) + break; + if(dialog_yesno(_("Passwords don't match"), + _("Sorry, the passwords do not match. Try again?"), 0, 0) != DLG_EXIT_OK) + return(-1); + } + ptr = g_strdup_printf("echo root:%s |chroot ./ /usr/sbin/chpasswd", pass1); + ret = fw_system(ptr); + FREE(ptr); + return(ret); +} + int has_user(char *fn) { FILE *fp; @@ -165,9 +192,7 @@ int run(GList **config) free(ptr); while(!has_rootpw("etc/shadow") && confirm_rootpw()) { - fw_end_dialog(); - fw_system_interactive("chroot ./ /usr/bin/passwd root"); - fw_init_dialog(); + change_rootpw(); } while(!has_user("etc/passwd") && confirm_user()) From vmiklos at frugalware.org Fri Jul 27 23:09:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 27 23:09:15 2007 Subject: [Frugalware-git] frugalware-current: fwsetup-0.7.8-2-i686 Message-ID: <20070727210912.9573513A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=afa461a0e02f226d5fbbe56bf88a87764280037b commit afa461a0e02f226d5fbbe56bf88a87764280037b Author: VMiklos Date: Fri Jul 27 23:09:02 2007 +0200 fwsetup-0.7.8-2-i686 backport a fix from git hopefully last code change before pre2 diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index ee93379..de2fc32 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -3,7 +3,7 @@ pkgname=fwsetup pkgver=0.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() @@ -11,8 +11,9 @@ makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalwar groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/releases/ |Flasttar" -source=($url/releases/$pkgname-$pkgver.tar.gz) -signatures=("$source.asc") +source=($url/releases/$pkgname-$pkgver.tar.gz \ +http://git.frugalware.org/patches/setup/b0eb048a8031182bed0bee39371ee4d034c006e2.patch) +signatures=("$source.asc" '') options=('nofakeroot') unset MAKEFLAGS # optimization OK From vmiklos at frugalware.org Fri Jul 27 23:09:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jul 27 23:10:31 2007 Subject: [Frugalware-git] setup: postconf/change_rootpw(): memleak fix Message-ID: <20070727210956.96CDE1868330@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=24ca9ef6037d6ad9bce2832de0c887d1db315507 commit 24ca9ef6037d6ad9bce2832de0c887d1db315507 Author: VMiklos Date: Fri Jul 27 23:08:06 2007 +0200 postconf/change_rootpw(): memleak fix thx hermier for noticing it diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 60f8009..1adfa16 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -92,7 +92,7 @@ int confirm_rootpw() int change_rootpw() { - char *pass1, *pass2, *ptr; + char *pass1=NULL, *pass2=NULL, *ptr; int ret; while(1) @@ -105,7 +105,10 @@ int change_rootpw() continue; else pass2 = strdup(dialog_vars.input_result); - if(!strcmp(pass1, pass2)) + ret = strcmp(pass1, pass2); + FREE(pass1); + FREE(pass1); + if(!ret) break; if(dialog_yesno(_("Passwords don't match"), _("Sorry, the passwords do not match. Try again?"), 0, 0) != DLG_EXIT_OK) From vmiklos at frugalware.org Sat Jul 28 00:09:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 28 00:09:28 2007 Subject: [Frugalware-git] setup: Revert "postconf/change_rootpw(): memleak fix" Message-ID: <20070727220927.4CBF413A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=a8685eff635ed7e6689020c838ee849b24e9510e commit a8685eff635ed7e6689020c838ee849b24e9510e Author: VMiklos Date: Sat Jul 28 00:09:22 2007 +0200 Revert "postconf/change_rootpw(): memleak fix" This reverts commit 24ca9ef. Hermier has a better fix which will be pushed when he'll be ready with it. diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 1adfa16..60f8009 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -92,7 +92,7 @@ int confirm_rootpw() int change_rootpw() { - char *pass1=NULL, *pass2=NULL, *ptr; + char *pass1, *pass2, *ptr; int ret; while(1) @@ -105,10 +105,7 @@ int change_rootpw() continue; else pass2 = strdup(dialog_vars.input_result); - ret = strcmp(pass1, pass2); - FREE(pass1); - FREE(pass1); - if(!ret) + if(!strcmp(pass1, pass2)) break; if(dialog_yesno(_("Passwords don't match"), _("Sorry, the passwords do not match. Try again?"), 0, 0) != DLG_EXIT_OK) From vmiklos at frugalware.org Sat Jul 28 00:53:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 28 00:53:29 2007 Subject: [Frugalware-git] setup: postconf: mem- and usability fix Message-ID: <20070727225327.0F03413A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=8893e2f34019aad8b9522df37021829cf2649d74 commit 8893e2f34019aad8b9522df37021829cf2649d74 Author: VMiklos Date: Sat Jul 28 00:51:18 2007 +0200 postconf: mem- and usability fix from hermier diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 60f8009..013c7c3 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -92,29 +92,41 @@ int confirm_rootpw() int change_rootpw() { - char *pass1, *pass2, *ptr; + char *pass=NULL, *ptr; int ret; while(1) { - if(fw_inputbox(_("Password"), _("Please enter a root password"), 0, 0, "", 1) == -1) - continue; - else - pass1 = strdup(dialog_vars.input_result); - if(fw_inputbox(_("Password"), _("Please re-enter your root password"), 0, 0, "", 1) == -1) - continue; - else - pass2 = strdup(dialog_vars.input_result); - if(!strcmp(pass1, pass2)) - break; - if(dialog_yesno(_("Passwords don't match"), - _("Sorry, the passwords do not match. Try again?"), 0, 0) != DLG_EXIT_OK) + if(fw_inputbox(_("Password"), _("Please enter a root password"), 0, 0, "", 1) != -1) + { + pass = strdup(dialog_vars.input_result); + if(fw_inputbox(_("Password"), _("Please re-enter your root password"), 0, 0, "", 1) != -1) + { + if(strcmp(pass, dialog_vars.input_result)) + { + FREE(pass); + if(dialog_yesno(_("Passwords don't match"), + _("Sorry, the passwords do not match. Try again?"), 0, 0) != DLG_EXIT_OK) + return(-1); + else + continue; + } + else + { + ptr = g_strdup_printf("echo root:%s |chroot ./ /usr/sbin/chpasswd", pass); + ret = fw_system(ptr); + FREE(ptr); + FREE(pass); + return(ret); + } + } + } + + FREE(pass) + if(dialog_yesno(_("Ignore setting password"), + _("Are you sure you want to skip setting the root password?"), 0, 0) != DLG_EXIT_OK) return(-1); } - ptr = g_strdup_printf("echo root:%s |chroot ./ /usr/sbin/chpasswd", pass1); - ret = fw_system(ptr); - FREE(ptr); - return(ret); } int has_user(char *fn) From vmiklos at frugalware.org Sat Jul 28 01:18:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 28 01:19:13 2007 Subject: [Frugalware-git] setup: postconf: change_rootpw() -> change_pw() Message-ID: <20070727231854.0A24113A41EC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=9381e8a38a26ccda50cb0f8f8310582b9873fa57 commit 9381e8a38a26ccda50cb0f8f8310582b9873fa57 Author: VMiklos Date: Sat Jul 28 01:16:15 2007 +0200 postconf: change_rootpw() -> change_pw() extend functionality: now it can change the pass of any user or just ask but not set the pass diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 013c7c3..016a4be 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -90,17 +90,23 @@ int confirm_rootpw() return(0); } -int change_rootpw() +int change_pw(char *user, char **passbuf) { char *pass=NULL, *ptr; int ret; while(1) { - if(fw_inputbox(_("Password"), _("Please enter a root password"), 0, 0, "", 1) != -1) + ptr = g_strdup_printf(_("Please enter a password for %s"), user); + ret = fw_inputbox(_("Password"), ptr, 0, 0, "", 1); + FREE(ptr); + if(ret != -1) { pass = strdup(dialog_vars.input_result); - if(fw_inputbox(_("Password"), _("Please re-enter your root password"), 0, 0, "", 1) != -1) + ptr = g_strdup_printf(_("Please re-enter your password for %s"), user); + ret = fw_inputbox(_("Password"), ptr, 0, 0, "", 1); + FREE(ptr); + if(ret != -1) { if(strcmp(pass, dialog_vars.input_result)) { @@ -113,18 +119,27 @@ int change_rootpw() } else { - ptr = g_strdup_printf("echo root:%s |chroot ./ /usr/sbin/chpasswd", pass); - ret = fw_system(ptr); - FREE(ptr); - FREE(pass); - return(ret); + if(!passbuf) + { + ptr = g_strdup_printf("echo %s:%s |chroot ./ /usr/sbin/chpasswd", user, pass); + ret = fw_system(ptr); + FREE(ptr); + FREE(pass); + return(ret); + } + else + { + *passbuf = pass; + return(0); + } } } } - FREE(pass) - if(dialog_yesno(_("Ignore setting password"), - _("Are you sure you want to skip setting the root password?"), 0, 0) != DLG_EXIT_OK) + FREE(pass); + ptr = g_strdup_printf(_("Are you sure you want to skip setting the password for %s?"), user); + ret = dialog_yesno(_("Ignore setting password"), ptr, 0, 0); + if(ret != DLG_EXIT_OK) return(-1); } } @@ -204,7 +219,7 @@ int run(GList **config) free(ptr); while(!has_rootpw("etc/shadow") && confirm_rootpw()) { - change_rootpw(); + change_pw("root", NULL); } while(!has_user("etc/passwd") && confirm_user()) From vmiklos at frugalware.org Sat Jul 28 02:37:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 28 02:37:30 2007 Subject: [Frugalware-git] setup: postconf: add a new add_user() function Message-ID: <20070728003728.5B30313A4014@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=131d43bd6869725510e57e51ccfcc802b20d689f commit 131d43bd6869725510e57e51ccfcc802b20d689f Author: VMiklos Date: Sat Jul 28 02:35:35 2007 +0200 postconf: add a new add_user() function to have a dialog interface for creating a regular user, too diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 016a4be..399fdce 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -144,6 +144,35 @@ int change_pw(char *user, char **passbuf) } } +int add_user() +{ + char *login, *fn, *pass, *ptr; + int ret; + + if(fw_inputbox(_("Enter login"), _("Please enter the login name you should like to create:"), 0, 0, "", 0) == -1) + return(-1); + login = strdup(dialog_vars.input_result); + if(fw_inputbox(_("Enter full name"), _("Please enter the full name of the user you would like to create:"), 0, 0, "", 0) == -1) + { + FREE(login); + return(-1); + } + fn = strdup(dialog_vars.input_result); + if(change_pw(login, &pass) == -1) + { + FREE(login); + FREE(fn); + return(-1); + } + ptr = g_strdup_printf("yes \"\"|chroot ./ /usr/sbin/adduser %s \"%s\" %s", login, fn, pass); + ret = fw_system(ptr); + FREE(ptr); + FREE(login); + FREE(fn); + FREE(pass); + return(ret); +} + int has_user(char *fn) { FILE *fp; @@ -224,9 +253,7 @@ int run(GList **config) while(!has_user("etc/passwd") && confirm_user()) { - fw_end_dialog(); - fw_system_interactive("chroot ./ /usr/sbin/adduser"); - fw_init_dialog(); + add_user(); } ptr = g_strdup_printf("umount %s/dev", TARGETDIR); fw_system(ptr); From priyank at frugalware.org Sat Jul 28 14:35:03 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 14:35:06 2007 Subject: [Frugalware-git] setup: postconf.c: fix filename in title Message-ID: <20070728123503.A471213A427E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup/.git;a=commitdiff;h=2a9fd8d2f66e780af4ca167ee2a63794725a624d commit 2a9fd8d2f66e780af4ca167ee2a63794725a624d Author: Priyank Date: Sat Jul 28 18:04:33 2007 +0530 postconf.c: fix filename in title diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 399fdce..1db0087 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -1,5 +1,5 @@ /* - * skel.c for Frugalware setup + * postconf.c for Frugalware setup * * Copyright (c) 2005 by Miklos Vajna * From priyank at frugalware.org Sat Jul 28 15:10:44 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 15:10:47 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: packages can now be installed from a file (.fpm ofcoufse :P) Message-ID: <20070728131044.BE68D13A42B2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=2edef9e2b36d07eb051f71b77a1a199306532d0d commit 2edef9e2b36d07eb051f71b77a1a199306532d0d Author: Priyank Date: Sat Jul 28 18:40:20 2007 +0530 gfpm-interface: packages can now be installed from a file (.fpm ofcoufse :P) diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 90d4561..2e52cea 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -54,6 +54,8 @@ static GtkWidget *gfpm_info_tvw; static GtkWidget *gfpm_files_txtvw; static GtkWidget *gfpm_clrall_opt; static GtkWidget *gfpm_clrold_opt; +static GtkWidget *gfpm_inst_from_file_dlg; +static GtkWidget *gfpm_inst_filechooser; static void cb_gfpm_repos_combo_changed (GtkComboBox *combo, gpointer data); static void cb_gfpm_groups_tvw_selected (GtkTreeSelection *selection, gpointer data); @@ -61,6 +63,7 @@ static void cb_gfpm_pkgs_tvw_selected (GtkTreeSelection *selection, gpointer dat static void cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data); static void cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data); +static void cb_gfpm_install_file_clicked (GtkButton *button, gpointer data); static void cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data); static void cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data); @@ -82,6 +85,8 @@ gfpm_interface_init (void) gfpm_files_txtvw= glade_xml_get_widget (xml, "filestextview"); gfpm_clrold_opt = glade_xml_get_widget (xml, "rem_old_opt"); gfpm_clrall_opt = glade_xml_get_widget (xml, "rem_all_opt"); + gfpm_inst_from_file_dlg = glade_xml_get_widget (xml, "inst_from_file_dlg"); + gfpm_inst_filechooser = glade_xml_get_widget (xml, "gfpm_inst_filechooser"); /* Setup repository combobox */ widget = glade_xml_get_widget (xml, "combobox_repos"); @@ -193,6 +198,10 @@ 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), (gpointer)gfpm_inst_filechooser); + /* Disable Apply, Refresh and File buttons if user is not root */ if ( geteuid() != 0 ) @@ -234,7 +243,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) errorstr = g_string_append (errorstr, str); if (pm_errno == PM_ERR_HANDLE_LOCK) errorstr = g_string_append (errorstr, - _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); gfpm_error (errorstr->str); return; } @@ -266,7 +275,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) errorstr = g_string_append (errorstr, str); if (pm_errno == PM_ERR_HANDLE_LOCK) errorstr = g_string_append (errorstr, - _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); gfpm_error (errorstr->str); return; } @@ -736,7 +745,7 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data) errorstr = g_string_append (errorstr, str); if (pm_errno == PM_ERR_HANDLE_LOCK) errorstr = g_string_append (errorstr, - _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); gfpm_error (errorstr->str); return; } @@ -1062,3 +1071,59 @@ cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data) return; } +static void +cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) +{ + const gchar *fpm = NULL; + gchar *str = NULL; + GString *errorstr = g_string_new (""); + + fpm = gtk_file_chooser_get_filename (gfpm_inst_filechooser); + if (fpm == NULL) + { + gfpm_error (_("No package selected for install. Please select a package to install.")); + return; + } + if (gfpm_question(_("Are you sure you want to install this package ?")) != GTK_RESPONSE_YES) + return; + if (pacman_trans_init(PM_TRANS_TYPE_ADD, 0, gfpm_progress_event, NULL, gfpm_progress_install) == -1) + { + str = g_strdup_printf (_("Failed to init transaction (%s)\n"), pacman_strerror(pm_errno)); + errorstr = g_string_append (errorstr, str); + if (pm_errno == PM_ERR_HANDLE_LOCK) + { errorstr = g_string_append (errorstr, + _("If you're sure a package manager is not already running, you can delete /tmp/pacman-g2.lck")); + gfpm_error (errorstr->str); + } + return; + } + gfpm_progress_show (TRUE); + /* add the target */ + pacman_trans_addtarget (fpm); + if (pacman_trans_prepare(&data) == -1) + { + str = g_strdup_printf (_("Failed to prepare transaction (%s)\n"), pacman_strerror (pm_errno)); + gfpm_error (str); + g_free (str); + goto cleanup; + } + if (pacman_trans_commit(&data) == -1) + { + str = g_strdup_printf (_("Failed to commit transaction (%s)\n"), pacman_strerror (pm_errno)); + gfpm_error (str); + g_free (str); + goto cleanup; + } + else + { + gfpm_message (_("Package successfully installed")); + } + + cleanup: + g_string_free (errorstr, FALSE); + pacman_trans_release (); + gtk_widget_hide (gfpm_inst_from_file_dlg); + gfpm_progress_show (FALSE); + return; +} + From priyank at frugalware.org Sat Jul 28 15:27:32 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 15:27:35 2007 Subject: [Frugalware-git] gfpm: gfpm-messages: new function gfpm_plist_message() Message-ID: <20070728132732.809771A680CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=b61331c562303c5df8949546c7174e1648243ab7 commit b61331c562303c5df8949546c7174e1648243ab7 Author: Priyank Date: Sat Jul 28 18:57:07 2007 +0530 gfpm-messages: new function gfpm_plist_message() * Fixed a runtime warning in gfpm_plist_question() * Fixed a big memory leak in gfpm_plist_question() diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 0f26443..4684af1 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -84,15 +84,68 @@ gfpm_question (const char *message_str) gint gfpm_plist_question (const char *main_msg, PM_LIST *packages) { - GtkWidget *dialog; - GtkListStore *store; - GtkScrolledWindow *swindow; - GtkCellRenderer *r; - GtkTreeIter iter; - GtkWidget *tvw; - GtkWidget *lbl; - gint ret; - PM_LIST *l; + GtkWidget *dialog; + GtkListStore *store; + GtkScrolledWindow *swindow; + GtkCellRenderer *r; + GtkTreeIter iter; + GtkWidget *tvw; + GtkWidget *lbl; + gint ret; + PM_LIST *l; + + dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "%s", + main_msg); + swindow = 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_container_add (GTK_CONTAINER(swindow), tvw); + store = gtk_list_store_new (1, G_TYPE_STRING); + r = gtk_cell_renderer_text_new (); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); + for (l=pacman_list_first(packages);l;l=pacman_list_next(l)) + { + char *pkgname, *pkgver; + char *pkgstring; + PM_SYNCPKG *sync = pacman_list_getdata (l); + 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); + 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_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); + gtk_widget_set_size_request (tvw, 230, 120); + gtk_widget_show (tvw); + gtk_box_pack_start (GTK_DIALOG(dialog)->vbox, swindow, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); + gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); + ret = gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_widget_destroy (dialog); + + return ret; +} + +gint +gfpm_plist_message (const char *main_msg, PM_LIST *packages) +{ + GtkWidget *dialog; + GtkListStore *store; + GtkScrolledWindow *swindow; + GtkCellRenderer *r; + GtkTreeIter iter; + GtkWidget *tvw; + GtkWidget *lbl; + gint ret; + PM_LIST *l; dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -111,13 +164,16 @@ gfpm_plist_question (const char *main_msg, PM_LIST *packages) for (l=pacman_list_first(packages);l;l=pacman_list_next(l)) { char *pkgname, *pkgver; + char *pkgstring; PM_SYNCPKG *sync = pacman_list_getdata (l); 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); gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, 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); } gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); gtk_widget_set_size_request (tvw, 230, 120); From vmiklos at frugalware.org Sat Jul 28 15:30:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jul 28 15:30:37 2007 Subject: [Frugalware-git] homepage-ng: FSA227-lighttpd Message-ID: <20070728133036.699E01A680CE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng/.git;a=commitdiff;h=ce5bac465e1fae2e208665485677c3f6f4de5fd2 commit ce5bac465e1fae2e208665485677c3f6f4de5fd2 Author: VMiklos Date: Sat Jul 28 15:28:39 2007 +0200 FSA227-lighttpd diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 5827e9e..423a592 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,30 @@ + 227 + 2007-07-28 + vmiklos + lighttpd + 1.4.13-3terminus1 + 1.4.16-1terminus1 + http://bugs.frugalware.org/task/2271 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3946 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3947 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3948 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3949 + ttp://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3950 + Some vulnerabilities have been reported in lighttpd, which can be exploited by malicious people to bypass certain security restrictions, cause a DoS (Denial of Service), or potentially to compromise a vulnerable system. + 1) An error in the processing of HTTP headers can be exploited to cause a DoS by sending duplicate HTTP headers with a trailing whitespace character. + 2) An error in mod_auth can be exploited to cause a DoS by sending requests with the algorithm set to "MD5-sess" and without a cnonce. + 3) An error when parsing Auth-Digest headers in mod_auth can potentially be exploited to cause a DoS by sending multiple whitespace characters. + 4) An error exists in the mechanism that limits the number of active connections. This can be exploited to cause a DoS. + 5) An error exists in the processing of HTTP requests. This can be exploited to access restricted files by adding a "/" to an URL. + 6) An error exists in mod_scgi. This can be exploited to cause a DoS by sending a SCGI request and closing the connection while lighttpd processes the request. + 7) The return value of "base64_decode" in mod_auth was not checked properly when parsing the credentials for basic authentication, which could lead to accessing uninitialized memory. + 8) An error in the header parsing code can lead to access of memory outside of the original boundaries and can cause a memory corruption. + Successful exploitation of this vulnerability can potentially be exploited to execute arbitrary code. + + 226 2007-07-26 vmiklos From priyank at frugalware.org Sat Jul 28 15:51:55 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 15:51:57 2007 Subject: [Frugalware-git] gfpm: gfpm-util: new function gfpm_pmlist_to_glist() - converts a PM_LIST* to GList* Message-ID: <20070728135155.E598E1A680DA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=77c832586a76480e4ed63d088019e85dfa67927b commit 77c832586a76480e4ed63d088019e85dfa67927b Author: Priyank Date: Sat Jul 28 19:21:22 2007 +0530 gfpm-util: new function gfpm_pmlist_to_glist() - converts a PM_LIST* to GList* diff --git a/src/gfpm-util.c b/src/gfpm-util.c index d760ef3..2103a3f 100644 --- a/src/gfpm-util.c +++ b/src/gfpm-util.c @@ -27,3 +27,18 @@ gfpm_bold (const char *text) return NULL; return ((char*)g_markup_printf_escaped("%s",text)); } + +GList * +gfpm_pmlist_to_glist (PM_LIST *list) +{ + GList *ret = NULL; + PM_LIST *i = NULL; + + if (list == NULL) + return ret; + for (i=pacman_list_first(list);i;i=pacman_list_next(i)) + ret = g_list_append (ret, (char*)pacman_list_getdata(i)); + + return ret; +} + diff --git a/src/gfpm-util.h b/src/gfpm-util.h index 99171bc..1891998 100644 --- a/src/gfpm-util.h +++ b/src/gfpm-util.h @@ -8,8 +8,11 @@ #include #include #include +#include #include "gfpm.h" char * gfpm_bold (const char *); +GList *gfpm_pmlist_to_glist (PM_LIST *); + #endif From priyank at frugalware.org Sat Jul 28 15:53:51 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 15:53:53 2007 Subject: [Frugalware-git] gfpm: gfpm-messages: gfpm_plist_question: use a GList to populate the list of packages. Message-ID: <20070728135351.DEEC31A680DA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=bf1d7effb469f8256dd620c318e9a8f551d6c6b7 commit bf1d7effb469f8256dd620c318e9a8f551d6c6b7 Author: Priyank Date: Sat Jul 28 19:23:33 2007 +0530 gfpm-messages: gfpm_plist_question: use a GList to populate the list of packages. diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 4684af1..1695f8b 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -82,7 +82,7 @@ gfpm_question (const char *message_str) } gint -gfpm_plist_question (const char *main_msg, PM_LIST *packages) +gfpm_plist_question (const char *main_msg, GList *packages) { GtkWidget *dialog; GtkListStore *store; @@ -92,7 +92,7 @@ gfpm_plist_question (const char *main_msg, PM_LIST *packages) GtkWidget *tvw; GtkWidget *lbl; gint ret; - PM_LIST *l; + GList *l; dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -108,11 +108,11 @@ gfpm_plist_question (const char *main_msg, PM_LIST *packages) store = gtk_list_store_new (1, G_TYPE_STRING); r = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); - for (l=pacman_list_first(packages);l;l=pacman_list_next(l)) + for (l=g_list_first(packages);l;l=g_list_next(l)) { char *pkgname, *pkgver; char *pkgstring; - PM_SYNCPKG *sync = pacman_list_getdata (l); + PM_SYNCPKG *sync = l->data; PM_PKG *pkg = pacman_sync_getinfo (sync, PM_SYNC_PKG); pkgname = pacman_pkg_getinfo (pkg, PM_PKG_NAME); diff --git a/src/gfpm-messages.h b/src/gfpm-messages.h index 50bf1b5..d85c135 100644 --- a/src/gfpm-messages.h +++ b/src/gfpm-messages.h @@ -8,7 +8,6 @@ #include #include #include -#include #include "gfpm.h" void gfpm_error (const char *); @@ -17,7 +16,7 @@ void gfpm_message (const char *); gint gfpm_question (const char *); -gint gfpm_plist_question (const char *, PM_LIST *); +gint gfpm_plist_question (const char *, GList *); char * gfpm_input (const char *, const char *, int *); From priyank at frugalware.org Sat Jul 28 16:15:13 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 16:15:16 2007 Subject: [Frugalware-git] gfpm: gfpm-messages: fixes in gfpm_plist_message() Message-ID: <20070728141513.958421A680E2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=028dea6e774ebdda405a548260e8d5958c52f633 commit 028dea6e774ebdda405a548260e8d5958c52f633 Author: Priyank Date: Sat Jul 28 19:44:42 2007 +0530 gfpm-messages: fixes in gfpm_plist_message() * changed return type to void * populate package list from a GList instead of PM_LIST diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 1695f8b..d1ccd40 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -135,7 +135,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) } gint -gfpm_plist_message (const char *main_msg, PM_LIST *packages) +gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) { GtkWidget *dialog; GtkListStore *store; @@ -144,13 +144,12 @@ gfpm_plist_message (const char *main_msg, PM_LIST *packages) GtkTreeIter iter; GtkWidget *tvw; GtkWidget *lbl; - gint ret; PM_LIST *l; dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, + type, + GTK_BUTTONS_CLOSE, "%s", main_msg); swindow = gtk_scrolled_window_new (NULL, NULL); @@ -161,11 +160,11 @@ gfpm_plist_message (const char *main_msg, PM_LIST *packages) store = gtk_list_store_new (1, G_TYPE_STRING); r = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); - for (l=pacman_list_first(packages);l;l=pacman_list_next(l)) + for (l=g_list_first(packages);l;l=g_list_next(l)) { char *pkgname, *pkgver; char *pkgstring; - PM_SYNCPKG *sync = pacman_list_getdata (l); + PM_SYNCPKG *sync = g_list_getdata (l); PM_PKG *pkg = pacman_sync_getinfo (sync, PM_SYNC_PKG); pkgname = pacman_pkg_getinfo (pkg, PM_PKG_NAME); @@ -181,10 +180,10 @@ gfpm_plist_message (const char *main_msg, PM_LIST *packages) gtk_box_pack_start (GTK_DIALOG(dialog)->vbox, swindow, FALSE, FALSE, 0); gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); - ret = gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_dialog_run (GTK_DIALOG(dialog)); gtk_widget_destroy (dialog); - return ret; + return; } char * diff --git a/src/gfpm-messages.h b/src/gfpm-messages.h index d85c135..95fa6a0 100644 --- a/src/gfpm-messages.h +++ b/src/gfpm-messages.h @@ -18,6 +18,8 @@ gint gfpm_question (const char *); gint gfpm_plist_question (const char *, GList *); +void gfpm_plist_message (const char *, GtkMessageType, GList *); + char * gfpm_input (const char *, const char *, int *); #endif From priyank at frugalware.org Sat Jul 28 17:30:19 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 17:30:41 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: display missing dependencies (if any) when installing from file Message-ID: <20070728153019.21B661E68610@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=5702264ade5f55759cb78ea81ffe5bbbdd192966 commit 5702264ade5f55759cb78ea81ffe5bbbdd192966 Author: Priyank Date: Sat Jul 28 20:59:43 2007 +0530 gfpm-interface: display missing dependencies (if any) when installing from file * major bugfixes in gfpm_plist_message() diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 2e52cea..7a00e61 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -1102,9 +1102,45 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) pacman_trans_addtarget (fpm); if (pacman_trans_prepare(&data) == -1) { + PM_LIST *i; + GList *pkgs = NULL; + str = g_strdup_printf (_("Failed to prepare transaction (%s)\n"), pacman_strerror (pm_errno)); gfpm_error (str); g_free (str); + switch ((long)pm_errno) + { + case PM_ERR_UNSATISFIED_DEPS: + for (i=pacman_list_first(data);i;i=pacman_list_next(i)) + { + 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)) + { + gchar *val = NULL; + case PM_DEP_MOD_EQ: + val = g_strdup_printf ("=%s", (char*)pacman_dep_getinfo(m,PM_DEP_VERSION)); + depstring = g_string_append (depstring, val); + break; + case PM_DEP_MOD_GE: + val = g_strdup_printf (">=%s", (char*)pacman_dep_getinfo(m,PM_DEP_VERSION)); + depstring = g_string_append (depstring, val); + break; + case PM_DEP_MOD_LE: + val = g_strdup_printf ("<=%s", (char*)pacman_dep_getinfo(m,PM_DEP_VERSION)); + depstring = g_string_append (depstring, val); + break; + default: break; + } + pkgs = g_list_append (pkgs, (char*)g_strdup(depstring->str)); + g_string_free (depstring, FALSE); + } + pacman_list_free (data); + gfpm_plist_message (_("Following dependencies were not met. Please install these packages first."), GTK_MESSAGE_WARNING, pkgs); + break; + } + goto cleanup; } if (pacman_trans_commit(&data) == -1) diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index d1ccd40..4f9b225 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -134,7 +134,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) return ret; } -gint +void gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) { GtkWidget *dialog; @@ -144,8 +144,10 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) GtkTreeIter iter; GtkWidget *tvw; GtkWidget *lbl; - PM_LIST *l; - + GList *l; + + if (packages == NULL) + return; dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), GTK_DIALOG_DESTROY_WITH_PARENT, type, @@ -162,20 +164,13 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); for (l=g_list_first(packages);l;l=g_list_next(l)) { - char *pkgname, *pkgver; - char *pkgstring; - PM_SYNCPKG *sync = g_list_getdata (l); - 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); + char *pkgstring = (char*)l->data; 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_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); - gtk_widget_set_size_request (tvw, 230, 120); + gtk_widget_set_size_request (tvw, 230, 80); gtk_widget_show (tvw); gtk_box_pack_start (GTK_DIALOG(dialog)->vbox, swindow, FALSE, FALSE, 0); gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); From priyank at frugalware.org Sat Jul 28 17:35:12 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 17:35:18 2007 Subject: [Frugalware-git] gfpm: gfpm-messages: silenced numerous compiletime warnings. Message-ID: <20070728153512.C49C61E68589@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=002c7d3145f11f7f4d42bcc0b2b6a44add5358f9 commit 002c7d3145f11f7f4d42bcc0b2b6a44add5358f9 Author: Priyank Date: Sat Jul 28 21:04:45 2007 +0530 gfpm-messages: silenced numerous compiletime warnings. diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c index 4f9b225..d14e916 100644 --- a/src/gfpm-messages.c +++ b/src/gfpm-messages.c @@ -90,7 +90,6 @@ gfpm_plist_question (const char *main_msg, GList *packages) GtkCellRenderer *r; GtkTreeIter iter; GtkWidget *tvw; - GtkWidget *lbl; gint ret; GList *l; @@ -100,7 +99,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) GTK_BUTTONS_YES_NO, "%s", main_msg); - swindow = gtk_scrolled_window_new (NULL, NULL); + 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); @@ -125,7 +124,7 @@ gfpm_plist_question (const char *main_msg, GList *packages) gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); gtk_widget_set_size_request (tvw, 230, 120); gtk_widget_show (tvw); - gtk_box_pack_start (GTK_DIALOG(dialog)->vbox, swindow, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(swindow), FALSE, FALSE, 0); gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); ret = gtk_dialog_run (GTK_DIALOG(dialog)); @@ -143,7 +142,6 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) GtkCellRenderer *r; GtkTreeIter iter; GtkWidget *tvw; - GtkWidget *lbl; GList *l; if (packages == NULL) @@ -154,7 +152,7 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) GTK_BUTTONS_CLOSE, "%s", main_msg); - swindow = gtk_scrolled_window_new (NULL, NULL); + 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); @@ -172,7 +170,7 @@ gfpm_plist_message (const char *main_msg, GtkMessageType type, GList *packages) gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); gtk_widget_set_size_request (tvw, 230, 80); gtk_widget_show (tvw); - gtk_box_pack_start (GTK_DIALOG(dialog)->vbox, swindow, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(swindow), FALSE, FALSE, 0); gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); gtk_dialog_run (GTK_DIALOG(dialog)); From priyank at frugalware.org Sat Jul 28 17:47:24 2007 From: priyank at frugalware.org (Priyank) Date: Sat Jul 28 17:47:28 2007 Subject: [Frugalware-git] gfpm: gfpm-interface: silenced LOTS of compile-time warnings Message-ID: <20070728154724.C460B1E68589@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=d3e8db858d0ca05a7a4f83a64f4fe14cc0527c7f commit d3e8db858d0ca05a7a4f83a64f4fe14cc0527c7f Author: Priyank Date: Sat Jul 28 21:17:01 2007 +0530 gfpm-interface: silenced LOTS of compile-time warnings diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 7a00e61..914ec42 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-util.h" #include "gfpm-about.h" #include "gfpm-db.h" @@ -251,7 +252,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_progress_show (TRUE); GList *i = NULL; PM_LIST *data, *pkgs; - for (i = remove_list; i; i = i->next) + for (i = (GList*)remove_list; i; i = i->next) { char *target = i->data; pacman_trans_addtarget (target); @@ -283,7 +284,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data) gfpm_progress_show (TRUE); GList *i = NULL; PM_LIST *data, *pkgs; - for (i = install_list; i; i = i->next) + for (i = (GList*)install_list; i; i = i->next) { char *target = i->data; pacman_trans_addtarget (target); @@ -438,10 +439,13 @@ 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)) + { if (!strcmp(v1,v2)) up = FALSE; + } else + { up = TRUE; + } gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, TRUE, 1, (up==TRUE)?icon_up:icon_yes, @@ -504,21 +508,21 @@ gfpm_load_info_tvw (const char *pkg_name) gtk_list_store_clear (GTK_LIST_STORE(model)); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Name:")); + st = (char*)gfpm_bold (_("Name:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_NAME), -1); g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Version:")); + 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); - st = gfpm_bold (_("Description:")); + st = (char*)gfpm_bold (_("Description:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_DESC), @@ -534,7 +538,7 @@ gfpm_load_info_tvw (const char *pkg_name) str = g_string_append (str, " "); } gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Depends:")); + st = (char*)gfpm_bold (_("Depends:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)str->str, @@ -553,7 +557,7 @@ gfpm_load_info_tvw (const char *pkg_name) if (str->len) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Provides:")); + st = (char*)gfpm_bold (_("Provides:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)str->str, @@ -573,7 +577,7 @@ gfpm_load_info_tvw (const char *pkg_name) if (str->len) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Conflicts:")); + st = (char*)gfpm_bold (_("Conflicts:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)str->str, @@ -585,21 +589,21 @@ gfpm_load_info_tvw (const char *pkg_name) if (inst == TRUE) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("URL:")); + st = (char*)gfpm_bold (_("URL:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_URL), -1); g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Packager:")); + st = (char*)gfpm_bold (_("Packager:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_PACKAGER), -1); g_free (st); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Install Date:")); + st = (char*)gfpm_bold (_("Install Date:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_INSTALLDATE), @@ -608,7 +612,7 @@ gfpm_load_info_tvw (const char *pkg_name) gtk_list_store_append (GTK_LIST_STORE(model), &iter); size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_USIZE)/1024)/1024; asprintf (&tmp, "%0.2f MB", size); - st = gfpm_bold (_("Size:")); + st = (char*)gfpm_bold (_("Size:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)tmp, @@ -621,7 +625,7 @@ gfpm_load_info_tvw (const char *pkg_name) size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_SIZE)/1024)/1024; asprintf (&tmp, "%0.2f MB", size); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Size (Compressed):")); + st = (char*)gfpm_bold (_("Size (Compressed):")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)tmp, @@ -631,7 +635,7 @@ gfpm_load_info_tvw (const char *pkg_name) size = (float)((long)pacman_pkg_getinfo (pm_pkg, PM_PKG_USIZE)/1024)/1024, asprintf (&tmp, "%0.2f MB", size); gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Size (Uncompressed):")); + st = (char*)gfpm_bold (_("Size (Uncompressed):")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)tmp, @@ -642,7 +646,7 @@ gfpm_load_info_tvw (const char *pkg_name) if (r == 1) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("SHA1SUM:")); + st = (char*)gfpm_bold (_("SHA1SUM:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)pacman_pkg_getinfo (pm_pkg, PM_PKG_SHA1SUM), @@ -661,7 +665,7 @@ gfpm_load_info_tvw (const char *pkg_name) if (str->len) { gtk_list_store_append (GTK_LIST_STORE(model), &iter); - st = gfpm_bold (_("Required By:")); + st = (char*)gfpm_bold (_("Required By:")); gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, st, 1, (char*)str->str, @@ -754,7 +758,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 ?", 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) { cb_gfpm_apply_btn_clicked (NULL, NULL); } @@ -839,13 +843,14 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) GtkTreeModel *model; GtkTreeIter iter; PM_PKG *pm_pkg; - PM_LIST *l, *i; + PM_LIST *l = NULL; + PM_LIST *i = NULL; gchar *search_str; gint r = 0; if (event->keyval != GDK_Return) return; - search_str = gtk_entry_get_text (GTK_ENTRY(widget)); + search_str = (gchar*)gtk_entry_get_text (GTK_ENTRY(widget)); if (search_str == NULL) return; @@ -897,10 +902,14 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) char *v1 = (char*)pacman_pkg_getinfo (pm_spkg, PM_PKG_VERSION); char *v2 = (char*)pacman_pkg_getinfo (pm_lpkg, PM_PKG_VERSION); if (v1!=NULL && v2!=NULL) + { if (!strcmp(v1,v2)) up = FALSE; + } else + { up = TRUE; + } gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, TRUE, @@ -930,9 +939,11 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data) 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)) up = FALSE; else up = TRUE; + } } else inst = FALSE; @@ -1032,7 +1043,7 @@ cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data) int ret; gchar *errstr = NULL; - if (gtk_toggle_button_get_active(gfpm_clrold_opt) == TRUE) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfpm_clrold_opt)) == TRUE) { if (gfpm_question(_("Are you sure you want to remove old packages from cache ?")) == GTK_RESPONSE_YES) { @@ -1050,7 +1061,7 @@ cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data) } return; } - else if (gtk_toggle_button_get_active(gfpm_clrall_opt) == TRUE) + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfpm_clrall_opt)) == TRUE) { if (gfpm_question(_("Are you sure you want to remove all packages from cache ?")) == GTK_RESPONSE_YES) { @@ -1074,11 +1085,12 @@ cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data) static void cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) { - const gchar *fpm = NULL; + const char *fpm = NULL; gchar *str = NULL; GString *errorstr = g_string_new (""); + PM_LIST *trans_data = NULL; - fpm = gtk_file_chooser_get_filename (gfpm_inst_filechooser); + 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.")); @@ -1099,8 +1111,8 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) } gfpm_progress_show (TRUE); /* add the target */ - pacman_trans_addtarget (fpm); - if (pacman_trans_prepare(&data) == -1) + pacman_trans_addtarget ((char*)fpm); + if (pacman_trans_prepare(&trans_data) == -1) { PM_LIST *i; GList *pkgs = NULL; @@ -1111,7 +1123,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) switch ((long)pm_errno) { case PM_ERR_UNSATISFIED_DEPS: - for (i=pacman_list_first(data);i;i=pacman_list_next(i)) + for (i=pacman_list_first(trans_data);i;i=pacman_list_next(i)) { GString *depstring = g_string_new (""); PM_DEPMISS *m = pacman_list_getdata (i); @@ -1136,14 +1148,14 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer data) pkgs = g_list_append (pkgs, (char*)g_strdup(depstring->str)); g_string_free (depstring, FALSE); } - pacman_list_free (data); + pacman_list_free (trans_data); gfpm_plist_message (_("Following dependencies were not met. Please install these packages first."), GTK_MESSAGE_WARNING, pkgs); break; } goto cleanup; } - if (pacman_trans_commit(&data) == -1) + if (pacman_trans_commit(&trans_data) == -1) { str = g_strdup_printf (_("Failed to commit transaction (%s)\n"), pacman_strerror (pm_errno)); gfpm_error (str); diff --git a/src/gfpm-util.h b/src/gfpm-util.h index 1891998..1d49cd7 100644 --- a/src/gfpm-util.h +++ b/src/gfpm-util.h @@ -13,6 +13,6 @@ char * gfpm_bold (const char *); -GList *gfpm_pmlist_to_glist (PM_LIST *); +GList * gfpm_pmlist_to_glist (PM_LIST *); #endif From vmiklos at frugalware.org Sun Jul 29 02:06:45 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 29 02:06:47 2007 Subject: [Frugalware-git] frugalware-current: updates for 0.7pre2 Message-ID: <20070729000645.8CA731E6860E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=11ccfe6cbbfd303a8859bbd38a8813bb7d242c8a commit 11ccfe6cbbfd303a8859bbd38a8813bb7d242c8a Author: VMiklos Date: Sun Jul 29 02:06:36 2007 +0200 updates for 0.7pre2 diff --git a/NEWS b/NEWS index 4a9bda3..312ab33 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,29 @@ Frugalware (0.7) - pre1: pending + pre2: pending + + * Package updates: + * Linux kernel 2.6.22 + * GCC-4.2.1, with several bugfixes and usable java browser plug-in for + systems where the binary is not available, like x86_64. + * OpenOffice.org 2.2.1 + * New features: + * New graphical configuration tool: Gnetconfig to tweak your network + settings. + * The setup now puts the installer log to the target system, so that it + is not lost. + * New packages: + * vim spell-check dictionaries for various languages + * More than 100 new packages: qmpdclient, gpsdrive, emovix, gpodder, + horde-webmail and much more! + * Homepage: + * It is now possible to browse HTML documentation for a package + on the homepage. + * According to the SCM we use, replaced darcsweb with gitweb, which + should be much more faster generally. + + pre1: May 24, 2007 * Renamed our package management library to libpacman as it isn't specific to any distribution From vmiklos at frugalware.org Sun Jul 29 02:13:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jul 29 02:13:06 2007 Subject: [Frugalware-git] frugalware-current: NEWS: added two missing items Message-ID: <20070729001305.286381E6860E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=cec7c7ed84bfa3920aa53ce5406e4d994b222f47 commit cec7c7ed84bfa3920aa53ce5406e4d994b222f47 Author: VMiklos Date: Sun Jul 29 02:12:58 2007 +0200 NEWS: added two missing items diff --git a/NEWS b/NEWS index 312ab33..d9a13cf 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Frugalware (0.7) settings. * The setup now puts the installer log to the target system, so that it is not lost. + * The default timezone and keyboard layout is now language-dependent. + * New Italian translation in the installer. * New packages: * vim spell-check dictionaries for various languages * More than 100 new packages: qmpdclient, gpsdrive, emovix, gpodder, From priyank at frugalware.org Sun Jul 29 10:32:28 2007 From: priyank at frugalware.org (Priyank) Date: Sun Jul 29 10:32:36 2007 Subject: [Frugalware-git] gfpm: gfpm.glade: new pre-apply dialog that displays a list of packages that wil be installed or removed or both Message-ID: <20070729083228.63BA41E6864F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=46e5b1281cbd1c226b4ab785fd76ff54d3232f2e commit 46e5b1281cbd1c226b4ab785fd76ff54d3232f2e Author: Priyank Date: Sun Jul 29 14:01:58 2007 +0530 gfpm.glade: new pre-apply dialog that displays a list of packages that wil be installed or removed or both diff --git a/glade/gfpm.glade b/glade/gfpm.glade index dd87133..aa60812 100644 --- a/glade/gfpm.glade +++ b/glade/gfpm.glade @@ -780,4 +780,191 @@ Installed packages + + 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 + 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 + + + + + 1 + + + + + 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 + + + + + 2 + + + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELE