From voroskoi at frugalware.org  Mon Oct  1 09:43:22 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct  1 09:43:24 2007
Subject: [Frugalware-git] homepage-ng: FSA281-sylpheed
Message-ID: <20071001074322.14E4513A406A@genesis.frugalware.org>

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

commit 024d5435cc85b2826dc460ce70c7a2a91ce20668
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 1 09:32:04 2007 +0200

FSA281-sylpheed

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 1003107..e64976e 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,19 @@

<fsas>
<fsa>
+		<id>281</id>
+		<date>2007-10-01</date>
+		<author>voroskoi</author>
+		<package>sylpheed</package>
+		<vulnerable>2.3.1-1</vulnerable>
+		<unaffected>2.3.1-2terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2378</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2958</cve>
+		<desc>Secunia Research has discovered a vulnerability in Sylpheed, which can be exploited by malicious people to compromise a vulnerable system.
+			A format string error in the "inc_put_error()" function in src/inc.c when displaying a POP3 server's error response can be exploited via specially crafted POP3 server replies containing format specifiers.
+			Successful exploitation may allow execution of arbitrary code, but requires that the user is tricked into connecting to a malicious POP3 server.</desc>
+	</fsa>
+	<fsa>
<id>280</id>
<date>2007-09-24</date>
<author>vmiklos</author>
From voroskoi at frugalware.org  Mon Oct  1 09:48:19 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct  1 09:48:22 2007
Subject: [Frugalware-git] homepage-ng: FSA282-claws-mail
Message-ID: <20071001074819.B68CB13A406A@genesis.frugalware.org>

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

commit 20da034040a725775bc287760baadbb34248316a
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 1 09:37:02 2007 +0200

FSA282-claws-mail

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index e64976e..bc35a13 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,19 @@

<fsas>
<fsa>
+		<id>282</id>
+		<date>2007-10-01</date>
+		<author>voroskoi</author>
+		<package>claws-mail</package>
+		<vulnerable>2.8.1-1</vulnerable>
+		<unaffected>2.8.1-2terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2378</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2958</cve>
+		<desc>Secunia Research has discovered a vulnerability in Sylpheed-Claws (Claws Mail), which can be exploited by malicious people to compromise a vulnerable system.
+			A format string error in the "inc_put_error()" function in src/inc.c when displaying a POP3 server's error response can be exploited via specially crafted POP3 server replies containing format specifiers.
+			Successful exploitation may allow execution of arbitrary code, but requires that the user is tricked into connecting to a malicious POP3 server.</desc>
+	</fsa>
+	<fsa>
<id>281</id>
<date>2007-10-01</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Mon Oct  1 09:59:57 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct  1 09:59:59 2007
Subject: [Frugalware-git] homepage-ng: FSA283-qt4
Message-ID: <20071001075957.7B18113A406A@genesis.frugalware.org>

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

commit aa7128b9a73932cf863c2e673a3fbad94b125c5f
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 1 09:48:37 2007 +0200

FSA283-qt4

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index bc35a13..fd2079b 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,18 @@

<fsas>
<fsa>
+		<id>283</id>
+		<date>2007-10-01</date>
+		<author>voroskoi</author>
+		<package>qt4</package>
+		<vulnerable>4.2.3-2terminus1</vulnerable>
+		<unaffected>4.2.3-2terminus2</unaffected>
+		<bts>http://bugs.frugalware.org/task/2422</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4137</cve>
+		<desc>A vulnerability has been reported in Qt, which can potentially be exploited by malicious people to cause a DoS (Denial of Service) or to compromise an application using the library.
+			The vulnerability is caused due to an off-by-one error within the "QUtf8Decoder::toUnicode()" function ("QUtf8Codec::convertToUnicode()" in Qt 4.x) in codecs/qutfcodec.cpp. This can be exploited to cause a one-byte heap-based buffer overflow via a specially crafted unicode string.</desc>
+	</fsa>
+	<fsa>
<id>282</id>
<date>2007-10-01</date>
<author>voroskoi</author>
From crazy at frugalware.org  Mon Oct  1 10:35:43 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct  1 10:35:46 2007
Subject: [Frugalware-git] bf07: util-linux-ng-2.13-2-i686
Message-ID: <20071001083543.AE18513A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bf07.git;a=commitdiff;h=3294e61e4afaf97c252608320e6c3befed373e24

commit 3294e61e4afaf97c252608320e6c3befed373e24
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 1 10:32:23 2007 +0200

util-linux-ng-2.13-2-i686
* relbump
* added patches from git to fix some strange bugs

diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild
index 5d7a93a..eb2ac3f 100644
--- a/source/base/util-linux-ng/FrugalBuild
+++ b/source/base/util-linux-ng/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=util-linux-ng
pkgver=2.13
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux"
backup=('etc/sysconfig/console' 'etc/sysconfig/numlock')
@@ -18,8 +18,13 @@ source=(http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v$pkgver/util-linux-
frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \
rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \
rc.swap-{de,hu}.po rc.time-{de,hu}.po \
-	README.Frugalware)
-signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+	README.Frugalware \
+	login_dont-segfault-on-EOF.patch \
+	mount_pointer-after-free.patch \
+	mount_privileges.patch \
+	namei_fifo.patch \
+	rtc_fix-rtc-option.patch)
+signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')

build() {
Fbuild --enable-arch --enable-raw --with-fsprobe=blkid --enable-elvtune \
diff --git a/source/base/util-linux-ng/login_dont-segfault-on-EOF.patch b/source/base/util-linux-ng/login_dont-segfault-on-EOF.patch
new file mode 100644
index 0000000..d9a049a
--- /dev/null
+++ b/source/base/util-linux-ng/login_dont-segfault-on-EOF.patch
@@ -0,0 +1,36 @@
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 20 Sep 2007 22:34:30 +0000 (+0200)
+Subject: login: login segfaults on EOF (rh#298461)
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=e797d83232802cf439b2ed893e784d3636357349
+
+login: login segfaults on EOF (rh#298461)
+
+Stupid bug in audit code:
+
+  $ login
+  login: ^D
+  login: ^D
+  Segmentation fault
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/login-utils/login.c b/login-utils/login.c
+index e582779..1af8792 100644
+--- a/login-utils/login.c
++++ b/login-utils/login.c
+@@ -330,12 +330,12 @@ logaudit(const char *tty, const char *username, const char *hostname,
+ 	audit_fd = audit_open();
+ 	if (audit_fd == -1)
+ 		return;
+-	if (!pwd)
++	if (!pwd && username)
+ 		pwd = getpwnam(username);
+ 	if (pwd)
+ 		snprintf(buf, sizeof(buf), "uid=%d", pwd->pw_uid);
+ 	else
+-		snprintf(buf, sizeof(buf), "acct=%s", username);
++		snprintf(buf, sizeof(buf), "acct=%s", username ? username : "(unknown)");
+
+ 	audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
+ 		buf, hostname, NULL, tty, status);
diff --git a/source/base/util-linux-ng/mount_pointer-after-free.patch b/source/base/util-linux-ng/mount_pointer-after-free.patch
new file mode 100644
index 0000000..a1d2d27
--- /dev/null
+++ b/source/base/util-linux-ng/mount_pointer-after-free.patch
@@ -0,0 +1,42 @@
+From: Norbert Buchmuller <norbi@nix.hu>
+Date: Sun, 2 Sep 2007 20:08:53 +0000 (-0600)
+Subject: mount: chain of symlinks to fstab causes use of pointer after free
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=a9d6150d12b368820a98cb26ec0d9f76fa4f0905
+
+mount: chain of symlinks to fstab causes use of pointer after free
+
+Looking at the source in 'mount/realpath.c' we find that when dealing with
+the second or later symlink in the chain, a memory block was free()d before
+copying its contents to a newly allocated block.
+---
+
+diff --git a/mount/realpath.c b/mount/realpath.c
+index 9dc517e..d659685 100644
+--- a/mount/realpath.c
++++ b/mount/realpath.c
+@@ -97,6 +97,7 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
+ 		} else {
+ #ifdef resolve_symlinks		/* Richard Gooch dislikes sl resolution */
+ 			int m;
++			char *newbuf;
+
+ 			/* Note: readlink doesn't add the null byte. */
+ 			link_path[n] = '\0';
+@@ -110,12 +111,12 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
+
+ 			/* Insert symlink contents into path. */
+ 			m = strlen(path);
++			newbuf = xmalloc(m + n + 1);
++			memcpy(newbuf, link_path, n);
++			memcpy(newbuf + n, path, m + 1);
+ 			if (buf)
+ 				free(buf);
+-			buf = xmalloc(m + n + 1);
+-			memcpy(buf, link_path, n);
+-			memcpy(buf + n, path, m + 1);
+-			path = buf;
++			path = buf = newbuf;
+ #endif
+ 		}
+ 		*npath++ = '/';
+
diff --git a/source/base/util-linux-ng/mount_privileges.patch b/source/base/util-linux-ng/mount_privileges.patch
new file mode 100644
index 0000000..a3758dd
--- /dev/null
+++ b/source/base/util-linux-ng/mount_privileges.patch
@@ -0,0 +1,52 @@
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Thu, 20 Sep 2007 12:57:20 +0000 (+0200)
+Subject: mount: doesn't drop privileges properly when calling helpers
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=ebbeb2c7ac1b00b6083905957837a271e80b187e
+
+mount: doesn't drop privileges properly when calling helpers
+
+{,u}mount calls setuid() and setgid() in the wrong order and doesn't checking
+the return value of set{u,g}id(() when running helpers like mount.nfs.
+
+Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/mount/mount.c b/mount/mount.c
+index 40699f3..5bc2b30 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -634,8 +634,12 @@ check_special_mountprog(const char *spec, const char *node, const char *type, in
+ 		 char *oo, *mountargs[10];
+ 		 int i = 0;
+
+-		 setuid(getuid());
+-		 setgid(getgid());
++		 if(setgid(getgid()) < 0)
++			 die(EX_FAIL, _("mount: cannot set group id: %s"), strerror(errno));
++
++		 if(setuid(getuid()) < 0)
++			 die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno));
++
+ 		 oo = fix_opts_string (flags, extra_opts, NULL);
+ 		 mountargs[i++] = mountprog;				/* 1 */
+ 		 mountargs[i++] = (char *) spec;			/* 2 */
+diff --git a/mount/umount.c b/mount/umount.c
+index b3100c9..3221619 100644
+--- a/mount/umount.c
++++ b/mount/umount.c
+@@ -102,8 +102,12 @@ check_special_umountprog(const char *spec, const char *node,
+ 				char *umountargs[8];
+ 				int i = 0;
+
+-				setuid(getuid());
+-				setgid(getgid());
++				if(setgid(getgid()) < 0)
++					die(EX_FAIL, _("umount: cannot set group id: %s"), strerror(errno));
++
++				if(setuid(getuid()) < 0)
++					die(EX_FAIL, _("umount: cannot set user id: %s"), strerror(errno));
++
+ 				umountargs[i++] = umountprog;
+ 				umountargs[i++] = xstrdup(node);
+ 				if (nomtab)
diff --git a/source/base/util-linux-ng/namei_fifo.patch b/source/base/util-linux-ng/namei_fifo.patch
new file mode 100644
index 0000000..cedc193
--- /dev/null
+++ b/source/base/util-linux-ng/namei_fifo.patch
@@ -0,0 +1,60 @@
+From: Li Zefan <lizf@cn.fujitsu.com>
+Date: Mon, 10 Sep 2007 08:20:48 +0000 (+0800)
+Subject: namei: add to identify FIFO (named pipe) and update manpage
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=f062c8a69a4ebae1f3b24da6fb2be1cc51a69f7c
+
+namei: add to identify FIFO (named pipe) and update manpage
+
+namei can't identify FIFO, and it will complain that it's an unknown type.
+
+Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
+---
+
+diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
+index ad37574..394eb6d 100644
+--- a/misc-utils/namei.1
++++ b/misc-utils/namei.1
+@@ -33,6 +33,7 @@ outputs a the following characters to identify the file types found:
+     s = socket
+     b = block device
+     c = character device
++    p = FIFO (named pipe)
+     - = regular file
+     ? = an error of some kind
+ .fi
+diff --git a/misc-utils/namei.c b/misc-utils/namei.c
+index b0c33e8..9480675 100644
+--- a/misc-utils/namei.c
++++ b/misc-utils/namei.c
+@@ -30,6 +30,7 @@ For each line output, the program puts a file type first:
+     s = socket
+     b = block device
+     c = character device
++    p = FIFO (named pipe)
+     - = regular file
+     ? = an error of some kind
+
+@@ -46,6 +47,9 @@ chdir to /,  or if it encounters an unknown file type.
+ - fixed logic; don't follow the path if a component is not directory
+ - fixed infinite loop of symbolic links; stack size is very limited
+
++2007-09-10 Li Zefan <lizf@cn.fujitsu.com>
++- added to identify FIFO
++
+ -------------------------------------------------------------*/
+
+ #include <stdio.h>
+@@ -306,6 +310,13 @@ namei(char *file, int lev, mode_t *lastmode) {
+ 		    (void)printf(" s %s\n", buf);
+ 		break;
+
++		case S_IFIFO:
++		if (mflag)
++			printf(" p%s %s\n", pperm(stb.st_mode), buf);
++		else
++			printf(" p %s\n", buf);
++		break;
++
+ 	    case S_IFREG:
+ 		if(mflag)
+ 		    (void)printf(" -%s %s\n", pperm(stb.st_mode), buf);
diff --git a/source/base/util-linux-ng/rtc_fix-rtc-option.patch b/source/base/util-linux-ng/rtc_fix-rtc-option.patch
new file mode 100644
index 0000000..b06b48b
--- /dev/null
+++ b/source/base/util-linux-ng/rtc_fix-rtc-option.patch
@@ -0,0 +1,71 @@
+From: Matthias Koenig <mkoenig@suse.de>
+Date: Thu, 20 Sep 2007 09:11:18 +0000 (+0200)
+Subject: hwclock: fix --rtc option
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=5d1f6bae3b298809ecd63b3e55f6ab30caaa4dbf
+
+hwclock: fix --rtc option
+
+The --rtc option does not set the name of the device correctly.
+It still uses /dev/rtc even if the --rtc option is given.
+
+Testcase:
+$ mv /dev/rtc /dev/foo
+$ hwclock --show --debug --rtc=/dev/foo
+hwclock from util-linux-2.13-rc2
+Using /dev interface to clock.
+Last drift adjustment done at 1190198135 seconds after 1969
+Last calibration done at 1190198135 seconds after 1969
+Hardware clock is on local time
+Assuming hardware clock is kept in local time.
+Waiting for clock tick...
+hwclock: open() of /dev/rtc failed, errno=2: No such file or directory.
+...got clock tick
+
+Co-Author: Karel Zak <kzak@redhat.com>
+Signed-off-by: Matthias Koenig <mkoenig@suse.de>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/hwclock/rtc.c b/hwclock/rtc.c
+index f8e626e..724daf9 100644
+--- a/hwclock/rtc.c
++++ b/hwclock/rtc.c
+@@ -104,24 +104,21 @@ open_rtc(void) {
+ 		"/dev/misc/rtc",
+ 		NULL
+ 	};
+-	char **p = fls;
+-	char *fname = rtc_dev_name ? : *p;
+-
+-	do {
+-		int fd = open(fname, O_RDONLY);
+-
+-		if (fd < 0 && errno == ENOENT) {
+-			if (fname == rtc_dev_name)
+-				break;
+-			fname = *++p;
+-		} else {
+-			rtc_dev_name = *p;
+-			return fd;
+-		}
+-	} while(fname);
+-
+-	if (!rtc_dev_name)
+-		rtc_dev_name = *fls;
++	char **p;
++
++	/* --rtc option has been given */
++	if (rtc_dev_name)
++		return open(rtc_dev_name, O_RDONLY);
++
++	for (p=fls; *p; ++p) {
++		int fd = open(*p, O_RDONLY);
++
++		if (fd < 0 && errno == ENOENT)
++			continue;
++		rtc_dev_name = *p;
++		return fd;
++	}
++	rtc_dev_name = *fls;	/* default */
+ 	return -1;
+ }
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:46 2007
Subject: [Frugalware-git] pacman-tools: fwmakepkg manpage is now moved to
	fst/source/include
Message-ID: <20071001113331.4A0C213A406A@genesis.frugalware.org>

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

commit f02b759d4c50a4cf97140450b3338b3356b686de
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:26:38 2007 +0200

fwmakepkg manpage is now moved to fst/source/include

diff --git a/Makefile b/Makefile
index 16c1e03..1f79296 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ FINCDIR = $(shell source /usr/lib/frugalware/fwmakepkg; echo $$Fincdir)
XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2
DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt)

-compile: genauthors apidocs fwmakepkg.3 docs
+compile: genauthors apidocs docs
$(MAKE) -C mkiso
$(MAKE) -C repoman.d
help2man -n "mirrors Frugalware archives" -S Frugalware -N ./fwmirror |sed 's/\\(co/(c)/' >fwmirror.1
@@ -89,11 +89,10 @@ install:
$(INSTALL) -m644 mkiso/mkiso.8 $(DESTDIR)$(man8dir)
$(INSTALL) -m644 mkiso/volumes.xml $(DESTDIR)$(docdir)/volumes.xml
$(INSTALL) -m644 apidocs/*.3 $(DESTDIR)$(man3dir)
-	$(INSTALL) -m644 fwmakepkg.3 $(DESTDIR)$(man3dir)
make -C syncpkgd DESTDIR=$(DESTDIR) install

clean:
-	rm -rf genauthors apidocs fwmakepkg.3 *.1
+	rm -rf genauthors apidocs *.1
$(MAKE) -C mkiso clean

dist:
@@ -115,10 +114,6 @@ apidocs:
cp -a $(FINCDIR) apidocs
make -C apidocs

-fwmakepkg.3: apidocs fwmakepkg.3.in
-	cat fwmakepkg.3.in > fwmakepkg.3
-	ls apidocs/*.sh|sed 's|apidocs/||;$$!s/\(.*\)$$/.BR \1 (3),/;$$s/\(.*\)$$/.BR \1 (3)/' >> fwmakepkg.3
-
%.html: %.txt
asciidoc $^

diff --git a/fwmakepkg.3.in b/fwmakepkg.3.in
deleted file mode 100644
index 4fef29b..0000000
--- a/fwmakepkg.3.in
+++ /dev/null
@@ -1,8 +0,0 @@
-.TH fwmakepkg 3 "26 May 2007" "Frugalware 0.7" ""
-.SH NAME
-fwmakepkg \- Collection of macros used in Frugalware buildscripts
-.SH SYNOPSIS
-This manpage refers to all schemas which can be Fincluded in a FrugalBuild.
-.SH "REPORTING BUGS"
-Please report bugs to the <http://bugs.frugalware.org/> bug tracking system.
-.SH "SEE ALSO"
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:46 2007
Subject: [Frugalware-git] pacman-tools: fwmirror: us Farchs
Message-ID: <20071001113331.9340613A4073@genesis.frugalware.org>

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

commit 5e220dbfc1e2f3e26f1598b3e85dfb30cf095f7e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:42:04 2007 +0200

fwmirror: us Farchs

diff --git a/fwmirror b/fwmirror
index 6457c83..f58b67e 100755
--- a/fwmirror
+++ b/fwmirror
@@ -1,7 +1,6 @@
#!/bin/bash

myver="0.7.9"
-archs=('i686' 'x86_64' 'ppc')

usage()
{
@@ -117,7 +116,7 @@ rsync_opts="$*"
[ "`type -p rsync`" ] || die "Can't find rsync! Please install it with 'pacman -S rsync'!"

# exclude the non-requested archs
-for i in "${archs[@]}"
+for i in "${Farchs[@]}"
do
if ! in_array $i ${myarchs[@]}; then
rsync_opts="$rsync_opts --exclude /frugalware-$i/"
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:46 2007
Subject: [Frugalware-git] pacman-tools: fwmakepkg: move it to its own dir:
	it's a library, not an executable
Message-ID: <20071001113331.7F22B13A4072@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2b7f64a52a462c162512224e7be3352be20376f2

commit 2b7f64a52a462c162512224e7be3352be20376f2
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:37:44 2007 +0200

fwmakepkg: move it to its own dir: it's a library, not an executable

diff --git a/Makefile b/Makefile
index 23417d6..67a21e4 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ install: compile
$(INSTALL) -m644 repoman.conf $(DESTDIR)$(sysconfdir)
$(INSTALL) -m644 repoman.d/current $(DESTDIR)$(sysconfdir)/repoman.d/current
$(INSTALL) -m644 repoman.d/stable $(DESTDIR)$(sysconfdir)/repoman.d/stable
-	$(INSTALL) fwmakepkg $(DESTDIR)$(libdir)
+	$(INSTALL) lib/fwmakepkg $(DESTDIR)$(libdir)
$(INSTALL) etcconfig.py $(DESTDIR)$(sbindir)/etcconfig
$(INSTALL) rpm2fpm $(DESTDIR)$(bindir)/rpm2fpm
$(INSTALL) fwcpan $(DESTDIR)$(bindir)/fwcpan
diff --git a/fwmakepkg b/fwmakepkg
deleted file mode 100644
index 2507287..0000000
--- a/fwmakepkg
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2005-2006 Miklos Vajna <vmiklos@frugalware.org>
-# fwmakepkg for Frugalware
-# distributed under GPL License
-
-if [ -e /etc/repoman.conf ]; then
-	. /etc/repoman.conf
-else
-	echo "Can't find /etc/repoman.conf!"
-	exit 1
-fi
-[ -z "$startdir" ] && startdir=`pwd`
-
-### Include a scheme. They are in $fst_root/source/include/, and they have a \
- # .sh suffix. After including them, you can of course overwrite the \
- # initialized values, using only a part of the scheme.
- # @param scheme(s) to include (_without_ the .sh suffix)
- ##
-Finclude ()
-{
-	if [ "$startdir" = `pwd` ]; then
-		local i
-		i=`git rev-parse --git-dir 2>/dev/null`
-		if [ "`type -p git`" -a -n "$i" ]; then
-			i=`dirname $i`
-			F_makepkg_scm=git
-		else
-		i=`pwd`
-		while true
-		do
-			if [ -e "$i/_darcs" ]; then
-				break
-			elif [ "$i" == "" ]; then
-				break
-			fi
-			i=${i%/*}
-		done
-		F_makepkg_scm=darcs
-		fi
-		if [ "$i" -a -d "$i"/source/include ]; then
-			Fincdir=$i/source/include
-		elif [ -d /var/tmp/fst/include ]; then
-			Fincdir=/var/tmp/fst/include
-		elif [ -d $fst_root/$repos/source/include ]; then
-			Fincdir=$fst_root/$repos/source/include
-		fi
-		if [ ! -z "$Fincdir" ]; then
-			for i in "$@"
-			do
-				source $Fincdir/$i.sh || Fdie
-			done
-		else
-			echo "Could not find the scheme dir! (\$fst/source/include)"
-			echo "Please edit your /etc/repoman.conf or ~/.repoman.conf."
-			exit 2
-		fi
-	fi
-}
-
-Finclude util
diff --git a/lib/fwmakepkg b/lib/fwmakepkg
new file mode 100644
index 0000000..2507287
--- /dev/null
+++ b/lib/fwmakepkg
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Copyright (C) 2005-2006 Miklos Vajna <vmiklos@frugalware.org>
+# fwmakepkg for Frugalware
+# distributed under GPL License
+
+if [ -e /etc/repoman.conf ]; then
+	. /etc/repoman.conf
+else
+	echo "Can't find /etc/repoman.conf!"
+	exit 1
+fi
+[ -z "$startdir" ] && startdir=`pwd`
+
+### Include a scheme. They are in $fst_root/source/include/, and they have a \
+ # .sh suffix. After including them, you can of course overwrite the \
+ # initialized values, using only a part of the scheme.
+ # @param scheme(s) to include (_without_ the .sh suffix)
+ ##
+Finclude ()
+{
+	if [ "$startdir" = `pwd` ]; then
+		local i
+		i=`git rev-parse --git-dir 2>/dev/null`
+		if [ "`type -p git`" -a -n "$i" ]; then
+			i=`dirname $i`
+			F_makepkg_scm=git
+		else
+		i=`pwd`
+		while true
+		do
+			if [ -e "$i/_darcs" ]; then
+				break
+			elif [ "$i" == "" ]; then
+				break
+			fi
+			i=${i%/*}
+		done
+		F_makepkg_scm=darcs
+		fi
+		if [ "$i" -a -d "$i"/source/include ]; then
+			Fincdir=$i/source/include
+		elif [ -d /var/tmp/fst/include ]; then
+			Fincdir=/var/tmp/fst/include
+		elif [ -d $fst_root/$repos/source/include ]; then
+			Fincdir=$fst_root/$repos/source/include
+		fi
+		if [ ! -z "$Fincdir" ]; then
+			for i in "$@"
+			do
+				source $Fincdir/$i.sh || Fdie
+			done
+		else
+			echo "Could not find the scheme dir! (\$fst/source/include)"
+			echo "Please edit your /etc/repoman.conf or ~/.repoman.conf."
+			exit 2
+		fi
+	fi
+}
+
+Finclude util
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: dependency fix for the install target
Message-ID: <20071001113331.5EC2A13A406B@genesis.frugalware.org>

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

commit ef464437d0aa9116e126a13320dd4bdf256e90d0
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:34:54 2007 +0200

dependency fix for the install target

diff --git a/Makefile b/Makefile
index 1f79296..23417d6 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ compile: genauthors apidocs docs

docs: $(subst .txt,.1,$(DOCS))

-install:
+install: compile
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(sbindir)
$(INSTALL) -d $(DESTDIR)$(libdir)
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: added fwmirror manpage
Message-ID: <20071001113331.A624D13A4074@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=3007e564e37af88f345e8619722624f8047e389c

commit 3007e564e37af88f345e8619722624f8047e389c
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:48:23 2007 +0200

added fwmirror manpage

diff --git a/fwmirror b/fwmirror
index f58b67e..f188cb2 100755
--- a/fwmirror
+++ b/fwmirror
@@ -4,28 +4,7 @@ myver="0.7.9"

usage()
{
-	echo "Usage: $0 [options] -- [rsync options]"
-	echo
-	echo "Options:"
-	echo "  -a <archs>       Coma separated list of architectures you want
-	to mirror. If you want to mirror the sources, too then use the special
-	'source' arch."
-	echo "  -d <directory>   Destination directory."
-	echo "  --help      This help."
-	echo "  -s <server>      The mirror server you want to use"
-	echo "  -v <versions>    Coma separated list of versions you want to
-	mirror. You can use explicit versions and aliases
-	(current,testing,stable), too."
-	echo "  --version        fwmirror version."
-	echo
-	echo "About rsync options:"
-	echo "If you run fwmirror from cron, then probably you'll want to add"
-	echo "'-q', if you're running it interactively, then most users need"
-	echo "'-vP'."
-	echo
-	echo "A real example:"
-	echo "fwmirror -s rsync://rsync.frugalware.org/pub/frugalware/ \\"
-	echo "-v current -a i686,source -d /home/ftp/pub/frugalware/ -- -vP"
+	man fwmirror
}

die()
diff --git a/fwmirror.txt b/fwmirror.txt
new file mode 100644
index 0000000..5a9d0d0
--- /dev/null
+++ b/fwmirror.txt
@@ -0,0 +1,42 @@
+= fwmirror(1)
+
+== NAME
+
+fwmirror - mirrors Frugalware archives
+
+== SYNOPSIS
+
+fwmirror [options] -- [rsync options]
+
+== OPTIONS
+
+-a <archs>::
+	Coma separated list of architectures you want to mirror. If you want to
+	mirror the sources, too then use the special 'source' arch.
+
+-d <directory>::
+	Destination directory.
+
+--help::
+	This help.
+
+-s <server>::
+	The mirror server you want to use.
+
+-v <versions>::
+	Coma separated list of versions you want to mirror. You can use
+	explicit versions and aliases (current,testing,stable), too.
+
+--version::
+	'fwmirror' version.
+
+== DESCRIPTION
+
+About rsync options: If you run 'fwmirror' from 'crond', then probably you'll want to add '-q', if you're running it interactively, then most users need '-vP'.
+
+Example:
+
+----
+$ fwmirror -s rsync://rsync.frugalware.org/pub/frugalware/ \
+	-v current -a i686,source -d /home/ftp/pub/frugalware/ -- -vP
+----
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: make clean: remove generated
	manpages from the subdirs, too
Message-ID: <20071001113331.C584813A4075@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=32c8e87e35aa119e00b02c3f0fe587d1468ae9ad

commit 32c8e87e35aa119e00b02c3f0fe587d1468ae9ad
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:50:34 2007 +0200

make clean: remove generated manpages from the subdirs, too

diff --git a/Makefile b/Makefile
index 67a21e4..3cf03ef 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ install: compile
make -C syncpkgd DESTDIR=$(DESTDIR) install

clean:
-	rm -rf genauthors apidocs *.1
+	rm -rf genauthors apidocs $(subst .txt,.1,$(DOCS))
$(MAKE) -C mkiso clean

dist:
diff --git a/mkiso/Makefile b/mkiso/Makefile
index 4ae04ec..5c0cec7 100644
--- a/mkiso/Makefile
+++ b/mkiso/Makefile
@@ -5,7 +5,9 @@ LDFLAGS += $(shell pkg-config --libs glib-2.0)
CFLAGS += $(shell pkg-config --cflags libxml-2.0)
LDFLAGS += $(shell pkg-config --libs libxml-2.0)

-mkiso: mkiso.o xml.o boot.o menu.o
+OBJECTS = mkiso.o xml.o boot.o menu.o
+
+mkiso: $(OBJECTS)

clean:
-	rm -f *.o mkiso
+	rm -f $(OBJECTS) mkiso
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: pear-makefb: added a manpage
Message-ID: <20071001113331.DF67B13A4077@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=0952822270e35d7bbe1454b5ad0ca42f40d2991b

commit 0952822270e35d7bbe1454b5ad0ca42f40d2991b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:05:17 2007 +0200

pear-makefb: added a manpage

diff --git a/Makefile b/Makefile
index 331e3a0..6b75f51 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,6 @@ DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt)
compile: genauthors apidocs docs
$(MAKE) -C mkiso
$(MAKE) -C repoman.d
-	help2man -n "Writes FrugalBuild scripts for PHP PEAR/PECL packages" -S Frugalware -N ./pear-makefb \
-		|sed 's/\\(co/(c)/' >pear-makefb.1
help2man -n "Converts a README.Frugalware to HTML" -S Frugalware -N ./mkpkghtml |sed 's/\\(co/(c)/' >mkpkghtml.1

docs: $(subst .txt,.1,$(DOCS))
diff --git a/pear-makefb b/pear-makefb
index 1c9b64c..f0905fc 100755
--- a/pear-makefb
+++ b/pear-makefb
@@ -11,7 +11,7 @@ from xml.dom import minidom
from email.Utils import formatdate

def usage():
-	print "Usage: %s packagename [--pecl]" % sys.argv[0]
+	os.system("man pear-makefb")

if len(sys.argv) < 2:
usage()
diff --git a/pear-makefb.txt b/pear-makefb.txt
new file mode 100644
index 0000000..4d31457
--- /dev/null
+++ b/pear-makefb.txt
@@ -0,0 +1,20 @@
+= pear-makefb(1)
+
+== NAME
+
+pear-makefb - Writes FrugalBuild scripts for PHP PEAR/PECL packages
+
+== SYNOPSIS
+
+pear-makefb [<packagename>] [<options>]
+
+== OPTIONS
+
+--help::
+	Display this manpage.
+
+--pecl::
+	Use this option when <packagename> is a PECL package, not a PEAR one.
+
+--version::
+	Display the package version.
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: mkpkghtml: convert help2man's
	manpage to an asciidoc one
Message-ID: <20071001113331.E8D5E13A4078@genesis.frugalware.org>

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

commit f1c0f889805fd6e59ed7e6bb5ea409c0cd6c4726
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:11:09 2007 +0200

mkpkghtml: convert help2man's manpage to an asciidoc one

diff --git a/Makefile b/Makefile
index 6b75f51..f1099fe 100644
--- a/Makefile
+++ b/Makefile
@@ -37,20 +37,20 @@ docdir = /usr/share/doc/pacman-tools-$(VERSION)
FINCDIR = $(shell source /usr/lib/frugalware/fwmakepkg; echo $$Fincdir)
XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2
DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt)
+MANS = $(subst .txt,.1,$(DOCS))

compile: genauthors apidocs docs
$(MAKE) -C mkiso
$(MAKE) -C repoman.d
-	help2man -n "Converts a README.Frugalware to HTML" -S Frugalware -N ./mkpkghtml |sed 's/\\(co/(c)/' >mkpkghtml.1

-docs: $(subst .txt,.1,$(DOCS))
+docs: $(MANS)

install: compile
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(sbindir)
$(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(man1dir)
-	$(INSTALL) -m644 $(subst .txt,.1,$(DOCS)) $(DESTDIR)$(man1dir)
+	$(INSTALL) -m644 $(MANS) $(DESTDIR)$(man1dir)
$(INSTALL) -d $(DESTDIR)$(man3dir)
$(INSTALL) -d $(DESTDIR)$(man8dir)
$(INSTALL) -d $(DESTDIR)$(sysconfdir)
@@ -61,12 +61,10 @@ install: compile
$(INSTALL) chkworld $(DESTDIR)$(bindir)/chkworld
$(INSTALL) chkdep $(DESTDIR)$(bindir)/chkdep
$(INSTALL) mkpkghtml $(DESTDIR)$(bindir)/mkpkghtml
-	$(INSTALL) -m644 mkpkghtml.1 $(DESTDIR)$(man1dir)
$(INSTALL) genchangelog $(DESTDIR)$(bindir)
$(INSTALL) darcs-git.py $(DESTDIR)$(bindir)/darcs-git
ln -s darcs-git $(DESTDIR)$(bindir)/dg
$(INSTALL) repoman $(DESTDIR)$(bindir)
-	$(INSTALL) -m644 repoman.1 $(DESTDIR)$(man1dir)
$(INSTALL) -m644 repoman.conf $(DESTDIR)$(sysconfdir)
$(INSTALL) -m644 repoman.d/current $(DESTDIR)$(sysconfdir)/repoman.d/current
$(INSTALL) -m644 repoman.d/stable $(DESTDIR)$(sysconfdir)/repoman.d/stable
@@ -79,17 +77,14 @@ install: compile
$(INSTALL) pootle-update $(DESTDIR)$(bindir)/pootle-update
$(INSTALL) mkiso/mkiso $(DESTDIR)$(bindir)/mkiso
$(INSTALL) fwmirror $(DESTDIR)$(bindir)/fwmirror
-	$(INSTALL) -m644 fwmirror.1 $(DESTDIR)$(man1dir)
$(INSTALL) pear-makefb $(DESTDIR)$(bindir)/pear-makefb
-	$(INSTALL) -m644 pear-makefb.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
$(INSTALL) -m644 apidocs/*.3 $(DESTDIR)$(man3dir)
make -C syncpkgd DESTDIR=$(DESTDIR) install

clean:
-	rm -rf genauthors apidocs $(subst .txt,.1,$(DOCS))
+	rm -rf genauthors apidocs $(MANS)
$(MAKE) -C mkiso clean

dist:
diff --git a/mkpkghtml b/mkpkghtml
index 8fecc20..5b4b8b0 100755
--- a/mkpkghtml
+++ b/mkpkghtml
@@ -9,9 +9,7 @@ die()
myver="0.9.5"

if [ "$1" == "--help" ]; then
-	echo "mkpkghtml is a small script to generate pkgname.html from a"
-	echo "README.Frugalware. It's handy to check for syntax errors and see the result"
-	echo "before you push a README.Frugalware."
+	man mkpkghtml
exit 0
elif [ "$1" == "--version" ]; then
echo "mkpkghtml (pacman-tools) $myver"
diff --git a/mkpkghtml.txt b/mkpkghtml.txt
new file mode 100644
index 0000000..575c098
--- /dev/null
+++ b/mkpkghtml.txt
@@ -0,0 +1,23 @@
+= mkpkghtml(1)
+
+== NAME
+
+mkpkghtml - Converts a README.Frugalware to HTML
+
+== SYNOPSIS
+
+mkpkghtml [options]
+
+== OPTIONS
+
+--help::
+	Display this manpage.
+
+--version::
+	Display the package version.
+
+== DESCRIPTION
+
+'mkpkghtml' is a small script to generate pkgname.html from a
+README.Frugalware. It's handy to check for syntax errors and see the result
+before you push such a document.
From vmiklos at frugalware.org  Mon Oct  1 13:33:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: no longer used help2man for fwmirror
	manpage
Message-ID: <20071001113331.CFD5113A4076@genesis.frugalware.org>

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

commit f0009977793053d531c9d946585f83c0f59e133d
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:52:02 2007 +0200

no longer used help2man for fwmirror manpage

diff --git a/Makefile b/Makefile
index 3cf03ef..331e3a0 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt)
compile: genauthors apidocs docs
$(MAKE) -C mkiso
$(MAKE) -C repoman.d
-	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 "Converts a README.Frugalware to HTML" -S Frugalware -N ./mkpkghtml |sed 's/\\(co/(c)/' >mkpkghtml.1
From vmiklos at frugalware.org  Mon Oct  1 13:33:32 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: remove an unused variable
Message-ID: <20071001113332.5AA8A13A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=7729fbb40d4bead5f60789b0a1aad03d955c414f

commit 7729fbb40d4bead5f60789b0a1aad03d955c414f
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:14:59 2007 +0200

remove an unused variable

diff --git a/Makefile b/Makefile
index f1099fe..f771dfd 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,6 @@

VERSION = 1.0.0

-LANGS = hu pl
-
CFLAGS ?= -Wall -Werror -g -O2 -pipe
CFLAGS += $(shell pkg-config --cflags libxml-2.0)
LDFLAGS += $(shell pkg-config --libs libxml-2.0)
From vmiklos at frugalware.org  Mon Oct  1 13:33:32 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: rf: bin, obsolete
Message-ID: <20071001113332.D136013A406A@genesis.frugalware.org>

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

commit 6b6bad78b8d9028c298587904a0f6521c8e7e670
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:16:39 2007 +0200

rf: bin, obsolete

diff --git a/rf b/rf
deleted file mode 100644
index beecc53..0000000
--- a/rf
+++ /dev/null
@@ -1,752 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-    rf - RepomanFrontend
-
-=head1 DESCRIPTION
-
-rf operates with actions, namely, Record, Cleanup, Push, Upload, cL.
-If you don't specify non of these actioons, with the marked switch
-(eg. for repoman cl it is -L), -RCPUL will be used.
-it is trying to guess as many data as needed for the specified
-actions, or you can pass them with non capital swithes.
-Usually -f and -s are enough to do a whole upgrade.
-Run it from the packages darcs directory.
-
-=head1 OPTIONS
-
-=over 1
-
-=head2 ACTIONS
-
-=item B<-H>
-
-    runs a FrugalBuild checking, before recording.
-    Can be overridden, with actions -RCPUL
-
-=item B<-R>
-
-    darcs record your patch
-
-=item B<-C>
-
-    Cleanup on the server
-
-=item B<-P>
-
-    darcs push your patch
-
-=item B<-U>
-
-    Upload the given source and package files
-
-=item B<-L>
-
-    repoman cl aka generate the Changelog file
-
-=item B<-W>
-
-    A warning message before doing anything
-
-=item B<-h>
-
-    Help
-
-=item B<-r>
-
-    Specify the repository eg. extra
-    if not given, default will be used.
-
-=item B<-a>
-
-    Architecture, default is i686.
-
-=item B<-o>
-
-    The directory of the repo, where the fpms are.
-    Default is frugalware-$arch.
-
-=item B<-p>
-
-    Serverprefix, eg.
-    ftp://ftp.frugalware.org/pub/frugalware/frugalware-current/
-    also this is the default.
-
-=item B<-g>
-
-    Group of the package, meaning the physical group, eg. the
-    /extra/devel/adevelpkg has devel group.
-
-=item B<-m>
-
-    Don't run fblint.
-
-=item B<-n>
-
-    Name of the package
-
-=item B<-t>
-
-    Version if the package
-
-=item B<-l>
-
-    Release of the package
-
-=item B<-s>
-
-    New sourcefile
-
-=item B<-f>
-
-    New packagefile
-
-=item B<-q>
-
-    Do not look for old source and package.
-    Useful when you contribute a new package.
-
-=item B<-v>
-
-    Version of the distribution, default is current.
-
-=item B<-d>
-
-    Delete the files given in -s and -f
-
-=item B<-c>
-
-    Try to delete the sources, too.
-
-=item B<-k>
-
-    Answer yes to all questions.
-
-=head1 CHANGES
-
-=head2 0.6
-
-    Release as stable
-    darcs and -k bugfix
-    new getopts method - but still not good enough!
-    fblint check
-    nobuild option handling
-    use of 'repoman ls'
-    more little bugfixes
-
-=head2 0.5
-
-    Release as stable
-    pkgver and pkgrel gathering bugfix
-    New 'a' keyselection
-    More options in man page
-
-=head2 0.4
-
-    Action driven usage
-    $arch fixes
-
-=head2 0.3
-
-    Sourcefile must contain 'tar'.
-    Inform of use of -d
-    asking done with readkey - no more enter hit
-
-=head1 BUGS
-
-    Report bugs, patches, comments, patches and
-    funny quotes in your signature to
-    <frugalware-devel@frugalware.org>
-
-=head1 AUTHOR
-
-    Zsolt Szalai <xbit@frugalware.org>
-
-=head1 COPYRIGHT
-
-    rf may be copied and modified under the terms of the
-    GNU General Public License v2
-
-=cut
-
-
-package Getopts;
-require 5.000;
-require Exporter;
-
-=head1 NAME
-
-getopt, getopts - Process single-character switches with switch clustering
-
-=head1 SYNOPSIS
-
-    use Getopts;
-
-    getopt('oDI');    # -o, -D & -I take arg.  Sets $opt_* as a side effect.
-    getopt('oDI', \%opts);    # -o, -D & -I take arg.  Values in %opts
-    getopts('oif:');  # -o & -i are boolean flags, -f takes an argument
-		      # Sets $opt_* as a side effect.
-    getopts('oif:', \%opts);  # options as above. Values in %opts
-
-=head1 DESCRIPTION
-
-The getopt() function processes single-character switches with switch
-clustering.  Pass one argument which is a string containing all switches
-that take an argument.  For each switch found, sets $opt_x (where x is the
-switch name) to the value of the argument if an argument is expected,
-or 1 otherwise.  Switches which take an argument don't care whether
-there is a space between the switch and the argument.
-
-The getopts() function is similar, but you should pass to it the list of all
-switches to be recognized.  If unspecified switches are found on the
-command-line, the user will be warned that an unknown option was given.
-
-Note that, if your code is running under the recommended C<use strict
-'vars'> pragma, you will need to declare these package variables
-with "our":
-
-    our($opt_x, $opt_y);
-
-For those of you who don't like additional global variables being created, getopt()
-and getopts() will also accept a hash reference as an optional second argument.
-Hash keys will be x (where x is the switch name) with key values the value of
-the argument or 1 if no argument is specified.
-
-To allow programs to process arguments that look like switches, but aren't,
-both functions will stop processing switches when they see the argument
-C<-->.  The C<--> will be removed from @ARGV.
-
-=head1 C<--help> and C<--version>
-
-If C<-> is not a recognized switch letter, getopts() supports arguments
-C<--help> and C<--version>.  If C<main::HELP_MESSAGE()> and/or
-C<main::VERSION_MESSAGE()> are defined, they are called; the arguments are
-the output file handle, the name of option-processing package, its version,
-and the switches string.  If the subroutines are not defined, an attempt is
-made to generate intelligent messages; for best results, define $main::VERSION.
-
-If embedded documentation (in pod format, see L<perlpod>) is detected
-in the script, C<--help> will also show how to access the documentation.
-
-Note that due to excessive paranoia, if $Getopt::Std::STANDARD_HELP_VERSION
-isn't true (the default is false), then the messages are printed on STDERR,
-and the processing continues after the messages are printed.  This being
-the opposite of the standard-conforming behaviour, it is strongly recommended
-to set $Getopt::Std::STANDARD_HELP_VERSION to true.
-
-One can change the output file handle of the messages by setting
-$Getopt::Std::OUTPUT_HELP_VERSION.  One can print the messages of C<--help>
-(without the C<Usage:> line) and C<--version> by calling functions help_mess()
-and version_mess() with the switches string as an argument.
-
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(getopt getopts);
-$VERSION = '1.05';
-# uncomment the next line to disable 1.03-backward compatibility paranoia
-# $STANDARD_HELP_VERSION = 1;
-
-# Process single-character switches with switch clustering.  Pass one argument
-# which is a string containing all switches that take an argument.  For each
-# switch found, sets $opt_x (where x is the switch name) to the value of the
-# argument, or 1 if no argument.  Switches which take an argument don't care
-# whether there is a space between the switch and the argument.
-
-# Usage:
-#	getopt('oDI');  # -o, -D & -I take arg.  Sets opt_* as a side effect.
-
-sub getopt (;$$) {
-    my ($argumentative, $hash) = @_;
-    $argumentative = '' if !defined $argumentative;
-    my ($first,$rest);
-    local $_;
-    local @EXPORT;
-
-    while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
-	($first,$rest) = ($1,$2);
-	if (/^--$/) {	# early exit if --
-	    shift @ARGV;
-	    last;
-	}
-	if (index($argumentative,$first) >= 0) {
-	    if ($rest ne '') {
-		shift(@ARGV);
-	    }
-	    else {
-		shift(@ARGV);
-		$rest = shift(@ARGV);
-	    }
-	    if (ref $hash) {
-	        $$hash{$first} = $rest;
-	    }
-	    else {
-	        ${"opt_$first"} = $rest;
-	        push( @EXPORT, "\$opt_$first" );
-	    }
-	}
-	else {
-	    if (ref $hash) {
-	        $$hash{$first} = 1;
-	    }
-	    else {
-	        ${"opt_$first"} = 1;
-	        push( @EXPORT, "\$opt_$first" );
-	    }
-	    if ($rest ne '') {
-		$ARGV[0] = "-$rest";
-	    }
-	    else {
-		shift(@ARGV);
-	    }
-	}
-    }
-    unless (ref $hash) {
-	local $Exporter::ExportLevel = 1;
-	import Getopts;
-    }
-}
-
-sub output_h () {
-  return $OUTPUT_HELP_VERSION if defined $OUTPUT_HELP_VERSION;
-  return \*STDOUT if $STANDARD_HELP_VERSION;
-  return \*STDERR;
-}
-
-sub try_exit () {
-    exit 0 if $STANDARD_HELP_VERSION;
-    my $p = __PACKAGE__;
-    print {output_h()} <<EOM;
-  [Now continuing due to backward compatibility and excessive paranoia.
-   See ``perldoc $p'' about \$$p\::STANDARD_HELP_VERSION.]
-EOM
-}
-
-sub version_mess ($;$) {
-    my $args = shift;
-    my $h = output_h;
-    if (@_ and defined &main::VERSION_MESSAGE) {
-	main::VERSION_MESSAGE($h, __PACKAGE__, $VERSION, $args);
-    } else {
-	my $v = $main::VERSION;
-	$v = '[unknown]' unless defined $v;
-	my $myv = $VERSION;
-	$myv .= ' [paranoid]' unless $STANDARD_HELP_VERSION;
-	my $perlv = $];
-	$perlv = sprintf "%vd", $^V if $] >= 5.006;
-	print $h <<EOH;
-$0 version $v calling Getopt::Std::getopts (version $myv),
-running under Perl version $perlv.
-EOH
-    }
-}
-
-sub help_mess ($;$) {
-    my $args = shift;
-    my $h = output_h;
-    if (@_ and defined &main::HELP_MESSAGE) {
-	main::HELP_MESSAGE($h, __PACKAGE__, $VERSION, $args);
-    } else {
-	my (@witharg) = ($args =~ /(\S)\s*:/g);
-	my (@rest) = ($args =~ /([^\s:])(?!\s*:)/g);
-	my ($help, $arg) = ('', '');
-	if (@witharg) {
-	    $help .= "\n\tWith arguments: -" . join " -", @witharg;
-	    $arg = "\nSpace is not required between options and their arguments.";
-	}
-	if (@rest) {
-	    $help .= "\n\tBoolean (without arguments): -" . join " -", @rest;
-	}
-	my ($scr) = ($0 =~ m,([^/\\]+)$,);
-	print $h <<EOH if @_;			# Let the script override this
-
-Usage: $scr [-OPTIONS [-MORE_OPTIONS]] [--] [PROGRAM_ARG1 ...]
-EOH
-	print $h <<EOH;
-
-The following single-character options are accepted:$help
-
-Options may be merged together.  -- stops processing of options.$arg
-EOH
-	my $has_pod;
-	if ( defined $0 and $0 ne '-e' and -f $0 and -r $0
-	     and open my $script, '<', $0 ) {
-	    while (<$script>) {
-		$has_pod = 1, last if /^=(pod|head1)/;
-	    }
-	}
-	print $h <<EOH if $has_pod;
-
-For more details run
-	perldoc -F $0
-EOH
-    }
-}
-
-# Usage:
-#   getopts('a:bc');	# -a takes arg. -b & -c not. Sets opt_* as a
-#			#  side effect.
-
-sub getopts ($;$) {
-    my ($argumentative, $hash) = @_;
-    my (@args,$first,$rest,$exit,$next);
-    my $errs = 0;
-    local $_;
-    local @EXPORT;
-
-    @args = split( / */, $argumentative );
-    while(@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/s) {
-	($first,$rest) = ($1,$2);
-	if (/^--$/) {	# early exit if --
-	    shift @ARGV;
-	    last;
-	}
-	my $pos = index($argumentative,$first);
-	if ($pos >= 0) {
-	    if (defined($args[$pos+1]) and ($args[$pos+1] eq ':')) {
-		shift(@ARGV);
-		if ($rest eq '') {
-		    ++$errs unless @ARGV;
-#		    $rest = shift(@ARGV);
-		    while (@ARGV && ($next = shift(@ARGV)) !~ /^(-.)/) {$rest .= $next . ' ';}
-		    chop $rest;
-		    unshift @ARGV, $next;
-		}
-		if (ref $hash) {
-		    $$hash{$first} = $rest;
-		}
-		else {
-		    ${"opt_$first"} = $rest;
-		    push( @EXPORT, "\$opt_$first" );
-		}
-	    }
-	    else {
-		if (ref $hash) {
-		    $$hash{$first} = 1;
-		}
-		else {
-		    ${"opt_$first"} = 1;
-		    push( @EXPORT, "\$opt_$first" );
-		}
-		if ($rest eq '') {
-		    shift(@ARGV);
-		}
-		else {
-		    $ARGV[0] = "-$rest";
-		}
-	    }
-	}
-	else {
-	    if ($first eq '-' and $rest eq 'help') {
-		version_mess($argumentative, 'main');
-		help_mess($argumentative, 'main');
-		try_exit();
-		shift(@ARGV);
-		next;
-	    } elsif ($first eq '-' and $rest eq 'version') {
-		version_mess($argumentative, 'main');
-		try_exit();
-		shift(@ARGV);
-		next;
-	    }
-	    warn "Unknown option: $first\n";
-	    ++$errs;
-	    if ($rest ne '') {
-		$ARGV[0] = "-$rest";
-	    }
-	    else {
-		shift(@ARGV);
-	    }
-	}
-    }
-    unless (ref $hash) {
-	local $Exporter::ExportLevel = 1;
-	import Getopts;
-    }
-    $errs == 0;
-}
-
-package main;
-
-use strict;
-no warnings qw(uninitialized);
-
-use Data::Dumper;
-use LWP::Simple;
-use Cwd;
-#use Getopts;
-use Term::ReadLine;
-use IO::File;
-eval {require Term::ReadLine::Gnu}; die 'Please install perl-term-readline-gnu!' if $@;
-eval {require Term::ReadKey}; die 'Please install perl-term-readkey!' if $@;
-import Term::ReadKey;
-
-#$Getopt::Std::STANDARD_HELP_VERSION = 1;
-our $VERSION = "0.6";
-
-sub HELP_MESSAGE(){
-  print <<END
-	rf [-RCPULH] [-s source1 source2 ...] [-f package1 package2] [-d] [-q] [-k] [-n name]
-END
-}
-
-sub contents {
-    my $name = shift;
-    unless (-e $name || -r $name) {
-      die "No $name found, or don't have the rights. Are you in a package's directory?";
-    }
-    my $sfh = IO::File->new( "< $name" );
-    local $/ = undef;
-    my $cont = $sfh->getline;
-    $sfh->close;
-    return $cont;
-}
-
-my $chkonce = 0;
-my %opts;
-Getopts::getopts('chmr:a:o:p:g:n:s:f:v:dqkt:l:WRCPULHF', \%opts);
-
-HELP_MESSAGE && die if $opts{h};
-
-$opts{R}=$opts{C}=$opts{P}=$opts{U}=$opts{L}=$opts{H}=$opts{F} = 1 unless $opts{R}|| $opts{C}||$opts{P}||$opts{U}||$opts{L}||$opts{H}||$opts{F};
-$chkonce = 1 if $opts{m};
-
-my ($distrib,$version,$repo,$arch, $repodir, $serverprefix, $group, $pkgname, $noask) =
-    ('frugalware',$opts{v},undef,$opts{a}, $opts{o}, $opts{p}, $opts{g}, $opts{n}, $opts{k});
-
-my @sourcefiles = split ' ', $opts{'s'};
-my @pkgfiles = split ' ', $opts{'f'};
-my ($pkgver, $pkgrel);
-
-sub msystem{
-    system @_;
-    warn 'Failed to execute!' if $? == -1;
-    return $?>>8;
-}
-
-sub getcommand{
-    my $str = shift;
-    my $term = new Term::ReadLine 'getcommand';
-    return $term->readline('>',$str)
-}
-
-sub ask{
-    my $str = shift;
-    return 'y' if $noask;
-    print "$str ";
-    my $key;
-    ReadMode(4);
-    $key = ReadKey();
-    ReadMode(0);
-    print "$key\n";
-    return $key;
-}
-
-sub apply{
-    my $comm = shift;
-    my $exitcode;
- APP:
-    if ((my $an = ask "$comm\n Is this ok? [yagq?]") =~ /^y|^$/i){
-	$exitcode = msystem $comm;
-    } elsif ($an =~ /^a/i){
-	$noask = 1;
-	$exitcode = msystem $comm;
-    } elsif ($an =~ /^g/i){
-	$exitcode = msystem getcommand($comm);
-    } elsif ($an =~ /^q/i){
-	exit;
-    } elsif ($an =~ /^\?/){
-	print "y apply command\na: yes to all further question\ng: give a new command\nq: quit\n\n";
-	undef $an;
-	goto APP;
-  }
-    print "\n";
-    return $exitcode;
-}
-
-$repo = '' || $opts{r};
-$repo = 'extra' if getcwd =~ m!/extra/!;
-
-$version = 'current' unless $version; #no need :)
-$arch = qx/arch/ and chomp $arch unless $arch;
-
-$repodir = "$distrib-$arch" unless $repodir;
-$serverprefix = "ftp://ftp.$distrib.org/pub/$distrib/$distrib-$version/";
-
-unless ( ($group) = getcwd =~ m!.*/(.*?)/[^/]*\Z! ){
-    $group = $opts{g};
-}
-HELP_MESSAGE && die 'No physical group given!' unless $group;
-
-($pkgname) = getcwd =~ m!/([^/]*)\Z! unless $pkgname;
-
-#unless ($pkgname) {($pkgname)= $pkgfiles[0] =~ /^(.*)-.*?-.*?-.*?fpm\Z/{
-
-HELP_MESSAGE && die 'Can not determine pkgname!' unless $pkgname;
-
-my $buildscript = contents 'FrugalBuild';
-
-$opts{L} = 0 if $buildscript =~ /^nobuild=|^options.*?nobuild/m;
-
-$buildscript = contents 'FrugalBuild';
-($pkgver) = qx'source /usr/lib/frugalware/fwmakepkg;source ./FrugalBuild; echo -n $pkgver';
-($pkgrel) = qx'source /usr/lib/frugalware/fwmakepkg;source ./FrugalBuild; echo -n $pkgrel';
-
-($pkgver,$pkgrel) = $pkgfiles[0] =~ /^.*-(.*?)-(.*?)-.*?fpm\Z/ unless $pkgver || $pkgrel;
-
-$pkgver = $opts{t} if $opts{t};
-$pkgrel = $opts{l} if $opts{l};
-
-my $subg = 0;
-if ($buildscript =~ /subgroup.*?-extra/m) {$subg++;}
-
-my $oldfpm;
-
-sub getoldsource{
-#OBSOLETE
-    my ($url,$sourcefile)= @_;
-    my ($sn) = $sourcefile =~ /(.*)-/;
-    if (get($url) =~ /(\Q$sn\E.*?tar.*?)\s/) {
-	return $1;
-    }
-    return 0;
-}
-
-sub getoldfpm{
-    my ($url,$pkgname)= @_;
-    if (qx"repoman -t $version ls $repo/$repodir" =~ /^(\Q$pkgname\E-[^-]*?-[^-]*?-[^-]*?fpm)\s/sm) {
-	return $1;
-    }
-    return 0;
-}
-
-sub ChkFB {
- return 0 if $chkonce;
- $chkonce = 1 unless $chkonce;	# dont want to see suck a thing!
- print "Checking FrugalBuild... ";
- my @fblint = grep {/\.\.\. failed./} qx/fblint/;
- do { print "\n", @fblint; return 1; } if @fblint;
- print "Ok\n"; return 0;
-}
-
-sub Record{
-  die if ChkFB;
-  print "Recording your improvements\n";
-  HELP_MESSAGE && die 'Can not determine pkgver!' unless $pkgver;
-  HELP_MESSAGE && die 'Can not determine pkgrel!' unless $pkgrel;
-  my $ec = apply "darcs record --edit-long-comment -m '$pkgname-$pkgver-$pkgrel-$arch'" . ($noask? ' -a' : '').' .';
-  die "Recording FAILED!\n" if $ec == 1;
-}
-
-sub Push{
-  print "Pushing the patch\n";
-  my $modpkgname = $pkgname;
-  $modpkgname =~ s/\+/\\\+/g;
-  my $ec = apply "darcs push --match 'name $modpkgname'" . ($noask? ' -a' : '');
-  die "Pushing FAILED!\n" if $ec == 1;
-}
-
-sub UploadFPM{
-    my ($ec,$ev);
-
-	print "Getting old FPM...\n";
-        if (@pkgfiles){
-            for my $pkgfile (@pkgfiles){
-                $pkgfile =~ /^(.*)-.*?-.*?-.*?fpm\Z/;
-                print "Something nasty with $pkgfile, is it a package file?" unless $1;
-                if( $oldfpm = getoldfpm("$serverprefix/$repo/$repodir/",$1) ){
-                    print "Ok\n";
-                } else { print "Failed! Don`t forget to modify the delete command!\n"; }
-            }
-        } else {   # at least try to notice old fpm
-            if( $oldfpm = getoldfpm("$serverprefix/$repo/$repodir/",$pkgname) ){
-                print "Ok\n";
-            } else { print "Can't see the old package file!\n"; }
-        }
-
-    print "Uploading binary package\n";
-    print "Nothing to do, that's fine!\n\n" unless @pkgfiles;
-    for my $pkgfile (@pkgfiles){
-        #my $repo_ = "extra" if(qx/LANG= LC_ALL= pacman -Qi -p $pkgfile/ =~ /Groups.*-extr$
-        $ev = apply "repoman -t $version up $pkgfile /$repodir/" if $pkgfile;
-  }
-    die "Uploading FAILED!" if $ev;
-}
-
-sub UploadSRC{
-    my ($ec,$ev);
-    print "Uploading source package\n";
-    print "Nothing to do, that's fine!\n\n" unless @sourcefiles;
-    for my $sourcefile (@sourcefiles){
-	$ec = apply "repoman -t $version up $sourcefile $repo/source/$group/$pkgname/" if $sourcefile;
-    }
-    die "Uploading FAILED!" if $ec;
-}
-
-sub cL{
-  print "Generating ChangeLog\n";
-  $repo.='/' if $repo;
-  my $ec = apply "arch=$arch repoman -t $version cl $repo$group/$pkgname";
-  die "Changelog not generated!" if $ec;
-}
-
-sub Cleanup{
-    my ($ec,$ev,$ir);
-    unless ($opts{'q'}){
-	if ($opts{'c'}){
-	    print "Cleanup on server\n";
-	    my $repo_=$repo . '/' if $repo;
-	    #    print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles;
-	    #    if (@sourcefiles){
-	    my (@indarcs) = qx"repoman -t $version ls _darcs/current/$repo_/source/$group/$pkgname/ 2>&1";
-	    my (@inrepo) = qx"repoman -t $version ls $repo_/source/$group/$pkgname/ 2>&1";
-	    if ($inrepo[1] =~ 'No such file or') {
-		print "Probably it is a new package, passing by...\n";
-		return;
-	    }
-	    splice(@inrepo,0,1);
-	    @inrepo = grep $_ ne "Changelog\n",@inrepo;
-	    foreach $ir (@inrepo){
-		unless(scalar grep(/\Q$ir\E/, @indarcs)){
-		    $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir";
-		}
-	    }
-	}
-
-        $ev = apply "repoman -t $version del $repo/$repodir/$oldfpm";
-    }
-    die "Cleaning up FAILED!" if $ec||$ev;
-}
-
-
-sub Warning {
-    print "What have you been hacking today?\n";
-    unless ((my $what = qx"darcs what -s .") =~ /\QNo changes!\E/){
-	print $what;
-	exit unless (my $an = ask 'Have you checked your package? Everything is ok with it?') =~ /^y|^$/i;
-    } else {print "Nothing!\n"}
-}
-
-Warning if $opts{W};
-do { die if ChkFB } if $opts{H};
-Record if $opts{R};
-UploadFPM if $opts{F};
-Cleanup if $opts{C};
-Push if $opts{P};
-UploadSRC if $opts{U};
-cL if $opts{L};
-
-if ($opts{d}){ #delete source & fpm        doesnt ask it, -d is not default!
-    for my $sourcefile (@sourcefiles){
-	print "Deleting source file $sourcefile\n";
-	unlink $sourcefile if $sourcefile;
-    }
-    for my $pkgfile (@pkgfiles){
-      print "Deleting package $pkgfile\n";
-      unlink $pkgfile if $pkgfile;
-    }
-}
-
-
-__END__
From vmiklos at frugalware.org  Mon Oct  1 13:33:33 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:47 2007
Subject: [Frugalware-git] pacman-tools: order: bin, obsolete
Message-ID: <20071001113333.0BA6113A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=02ab26da285cc1e27376862fa96989a1f1487d0a

commit 02ab26da285cc1e27376862fa96989a1f1487d0a
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:18:28 2007 +0200

order: bin, obsolete
libpacman provides this feature (you can create a transaction, prepare and then
query the targets)

diff --git a/order b/order
deleted file mode 100644
index d3dd693..0000000
--- a/order
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# must be run as root
-OWNTMPDIR=`mktemp -d /tmp/order.XXXXXX` || exit 1
-echo -n | pacman -r $OWNTMPDIR -Sy $* | grep -- '-[0-9\.]\+' | sed 's/^Targets: //;s/\(-[0-9]\+\) \([a-z]\)/\1\n\2/g;s/^ \+\(.*\)/\1/' | sed 's/-[^-]\+-[^-]\+$//'
-rm -rf $OWNTMPDIR
From vmiklos at frugalware.org  Mon Oct  1 13:33:33 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:48 2007
Subject: [Frugalware-git] pacman-tools: move mirrors.py to its own dir,
	it'll be never installed
Message-ID: <20071001113333.396F413A406B@genesis.frugalware.org>

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

commit e5b43e76a96c35265f1f278e144f7cb116d2d470
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:22:34 2007 +0200

move mirrors.py to its own dir, it'll be never installed

diff --git a/mirrors.py b/mirrors.py
deleted file mode 100644
index 2576761..0000000
--- a/mirrors.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from xml.dom import minidom
-import sys
-
-class Mirror (object):
-	def __init__(self):
-		self.types = []
-	def dumpattr(self, what, dest):
-		dest.write("# ")
-		for i in range(len(what)+4):
-			dest.write("-")
-		dest.write("\n")
-		dest.write("# - %s -\n" % what.upper())
-		dest.write("# ")
-		for i in range(len(self.country)+4):
-			dest.write("-")
-		dest.write("\n")
-
-mirrors = {}
-try:
-	ver = sys.argv[1]
-	repo = sys.argv[2]
-	input = sys.argv[3]
-	out = sys.argv[4]
-except IndexError:
-	raise Exception("usage example: python %s frugalware-stable frugalware input.xml output" % sys.argv[0])
-
-xmldoc = minidom.parse(input)
-for i in xmldoc.getElementsByTagName('mirror'):
-	if not i.getElementsByTagName('id'):
-		continue
-	m = Mirror()
-	for j in i.getElementsByTagName('type'):
-		m.types.append(j.firstChild.toxml())
-	for j in ['id', 'path', 'rsync_path', 'country', 'supplier', 'bandwidth']:
-		if i.getElementsByTagName(j) and i.getElementsByTagName(j)[0].firstChild:
-			m.__setattr__(j, i.getElementsByTagName(j)[0].firstChild.toxml())
-	try:
-		mirrors[m.country]
-	except KeyError:
-		mirrors[m.country] = []
-	mirrors[m.country].append(m)
-countries = mirrors.keys()
-countries.sort()
-sock = open(out, "w")
-sock.write("""#
-# %s repository
-#
-
-repos=(${repos[@]} '%s')
-
-%s_servers=(
-""" % (ver, out, out))
-for i in countries:
-	dumped = False
-	for j in mirrors[i]:
-		if "rsync" in j.types:
-			try:
-				j.path = j.rsync_path
-			except AttributeError:
-				pass
-		else:
-			continue
-		if not dumped:
-			mirrors[i][0].dumpattr(mirrors[i][0].country, sock)
-			dumped = True
-		sock.write("# %s (%s)\n" % (j.supplier, j.bandwidth))
-		sock.write('"rsync://rsync%s.frugalware.org/%s/%s"\n' %
-				(j.id, j.path, ver))
-sock.write(""")
-
-# the rest is only for developers who upload packages
-# if the server requires sudo usage, the name of the user to execute the commands as
-%s_sudo="vmiklos"
-# name of the package database
-%s_fdb="%s.fdb"
-""" % (out, out, repo))
-sock.close()
diff --git a/repoman.d/Makefile b/repoman.d/Makefile
index 386c12c..650f9a3 100644
--- a/repoman.d/Makefile
+++ b/repoman.d/Makefile
@@ -1,7 +1,7 @@
all: current stable

current:
-	python ../mirrors.py frugalware-current frugalware-current ~/darcs/homepage-ng/frugalware/xml/mirrors2.xml current
+	python ../tools/mirrors.py frugalware-current frugalware-current ~/git/homepage-ng/frugalware/xml/mirrors2.xml current

stable:
-	python ../mirrors.py frugalware-stable frugalware ~/darcs/homepage-ng/frugalware/xml/mirrors2.xml stable
+	python ../tools/mirrors.py frugalware-stable frugalware ~/git/homepage-ng/frugalware/xml/mirrors2.xml stable
diff --git a/tools/mirrors.py b/tools/mirrors.py
new file mode 100644
index 0000000..2576761
--- /dev/null
+++ b/tools/mirrors.py
@@ -0,0 +1,77 @@
+from xml.dom import minidom
+import sys
+
+class Mirror (object):
+	def __init__(self):
+		self.types = []
+	def dumpattr(self, what, dest):
+		dest.write("# ")
+		for i in range(len(what)+4):
+			dest.write("-")
+		dest.write("\n")
+		dest.write("# - %s -\n" % what.upper())
+		dest.write("# ")
+		for i in range(len(self.country)+4):
+			dest.write("-")
+		dest.write("\n")
+
+mirrors = {}
+try:
+	ver = sys.argv[1]
+	repo = sys.argv[2]
+	input = sys.argv[3]
+	out = sys.argv[4]
+except IndexError:
+	raise Exception("usage example: python %s frugalware-stable frugalware input.xml output" % sys.argv[0])
+
+xmldoc = minidom.parse(input)
+for i in xmldoc.getElementsByTagName('mirror'):
+	if not i.getElementsByTagName('id'):
+		continue
+	m = Mirror()
+	for j in i.getElementsByTagName('type'):
+		m.types.append(j.firstChild.toxml())
+	for j in ['id', 'path', 'rsync_path', 'country', 'supplier', 'bandwidth']:
+		if i.getElementsByTagName(j) and i.getElementsByTagName(j)[0].firstChild:
+			m.__setattr__(j, i.getElementsByTagName(j)[0].firstChild.toxml())
+	try:
+		mirrors[m.country]
+	except KeyError:
+		mirrors[m.country] = []
+	mirrors[m.country].append(m)
+countries = mirrors.keys()
+countries.sort()
+sock = open(out, "w")
+sock.write("""#
+# %s repository
+#
+
+repos=(${repos[@]} '%s')
+
+%s_servers=(
+""" % (ver, out, out))
+for i in countries:
+	dumped = False
+	for j in mirrors[i]:
+		if "rsync" in j.types:
+			try:
+				j.path = j.rsync_path
+			except AttributeError:
+				pass
+		else:
+			continue
+		if not dumped:
+			mirrors[i][0].dumpattr(mirrors[i][0].country, sock)
+			dumped = True
+		sock.write("# %s (%s)\n" % (j.supplier, j.bandwidth))
+		sock.write('"rsync://rsync%s.frugalware.org/%s/%s"\n' %
+				(j.id, j.path, ver))
+sock.write(""")
+
+# the rest is only for developers who upload packages
+# if the server requires sudo usage, the name of the user to execute the commands as
+%s_sudo="vmiklos"
+# name of the package database
+%s_fdb="%s.fdb"
+""" % (out, out, repo))
+sock.close()
From vmiklos at frugalware.org  Mon Oct  1 13:33:33 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:48 2007
Subject: [Frugalware-git] pacman-tools: mpdep: bin, broken
Message-ID: <20071001113333.70B1613A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=36b06978cdcaadc52c21b9d23ef44603be801dc5

commit 36b06978cdcaadc52c21b9d23ef44603be801dc5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:34:40 2007 +0200

mpdep: bin, broken
it was an initial attemp to add proper depends() support to fwcpan, but it's
broken

diff --git a/fwcpan b/fwcpan
index 143e7cd..760b8f5 100644
--- a/fwcpan
+++ b/fwcpan
@@ -20,43 +20,6 @@
#   USA.
#

-get_deps()
-{
-	local indep i name ver
-	echo -n "depends=("
-	indep=0
-	cat $1|while IFS= read i
-	do
-		if [ $indep = 1 ]; then
-			echo "$i"|grep -q '},' && break
-			echo "$i"
-		else
-			echo "$i"|grep -q PREREQ_PM && indep=1
-		fi
-	done |sed 's/\W*\W*\([^\W]*\)\W*#.*/\1/'|while read name junk ver
-	do
-		[ -z "$name" ] && continue
-		name="perl-`echo $name|sed "s/::/-/g;s/'//g"|tr [A-Z] [a-z]`"
-		ver=`echo $ver|sed "s/'//g;s/
$//;s/,$//"`
-		if [ "$ver" = "0" ]; then
-			if [ "$first" != 1 ]; then
-				first=1
-				echo -n "'$name'"
-			else
-				echo -n " '$name'"
-			fi
-		else
-			if [ "$first" != 1 ]; then
-				first=1
-				echo -n "'$name>=$ver'"
-			else
-				echo -n " '$name>=$ver'"
-			fi
-		fi
-	done
-	echo ")"
-}
-
if [ "$1" == "-h" -o "$1" == "--help" ]; then
man fwcpan
exit $?
@@ -113,6 +76,9 @@ sha1sum=`cat $srcdump|sha1sum |sed 's/  -$//'`
makedump=`mktemp`
tar xOzf $srcdump $modname-$pkgver/Makefile.PL >$makedump 2>/dev/null

+# TODO: depends(). though this is not so problematic: the build will properly
+# abort on any missing depend
+
cat << EOF > FrugalBuild
# Compiling Time: 0.1 SBU
# Maintainer: Zsolt Szalai <xbit@frugalware.org>
@@ -121,7 +87,6 @@ _F_perl_name=$modname
_F_perl_author=$modauthor
pkgver=$pkgver
pkgdesc="$pkgdesc"
-`get_deps $makedump`
archs=('`uname -m`')
Finclude perl
sha1sums=('$sha1sum')
diff --git a/mpdep b/mpdep
deleted file mode 100644
index bd77dd8..0000000
--- a/mpdep
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Module::MakefilePL::Parse;
-use Data::Dumper;
-
-my $fh;
-open $fh, 'Makefile.PL';
-my $parser = Module::MakefilePL::Parse->new( join("", <$fh>) );
-my $info   = $parser->required;
-
-my $out = 'depends=(';
-for (keys %{$info}) {
-	$_ = lc;
-	$_ = 'perl-'.$_;
-	$_ =~ s/::/-/;
-	$out .= "'$_' ";
-}
-chop $out;
-$out .= ')';
-print "$out\n";
From vmiklos at frugalware.org  Mon Oct  1 13:33:34 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:48 2007
Subject: [Frugalware-git] pacman-tools: repoman man: two fixes
Message-ID: <20071001113334.4AC1513A4074@genesis.frugalware.org>

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

commit a4495f39a1e8f62a2069e3a72508fac26c897a6e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 13:29:48 2007 +0200

repoman man: two fixes
idea by crazy, thx

diff --git a/repoman.txt b/repoman.txt
index fd0f480..26cee44 100644
--- a/repoman.txt
+++ b/repoman.txt
@@ -250,7 +250,7 @@ Otherwise just do:
$ echo "unset GIT_DIR; cd ..; git checkout -f" > .git/hooks/post-receive
----

-Then
+Then (in case you chose the second way)

----
$ chmod +x .git/hooks/post-receive
@@ -281,6 +281,14 @@ And create a file named /etc/pacman.d/flac113:
Server = http://ftp.frugalware.org/pub/other/people/nick/flac113/frugalware-$arch/
----

+Then add
+
+----
+Include = /etc/pacman.d/flac113
+----
+
+to your `/etc/pacman.conf` _before_ any other includes.
+
Building a package will be a bit more complicated than 'sudo makepkg -c', so
let's create an alias:
From vmiklos at frugalware.org  Mon Oct  1 13:33:33 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 13:33:48 2007
Subject: [Frugalware-git] pacman-tools: move poxmlgen to the tools dir,
	it'll be never installed
Message-ID: <20071001113333.A3F1B13A4072@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=5950ddbcbd96e7dc34e1f47d2f92b4ae7ac7da9a

commit 5950ddbcbd96e7dc34e1f47d2f92b4ae7ac7da9a
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:35:52 2007 +0200

move poxmlgen to the tools dir, it'll be never installed

diff --git a/poxmlgen b/poxmlgen
deleted file mode 100644
index 520e6ac..0000000
--- a/poxmlgen
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /usr/lib/frugalware/fwmakepkg
-
-header()
-{
-	echo '<?xml version="1.0" encoding="UTF-8"?>'
-	echo '<pofile filename="descs.po" language="Hungarian">'
-}
-
-footer()
-{
-	echo '</pofile>'
-}
-
-# $1: msgid
-# $2: pkgname
-# $3: state (can be f, u, or t - defaults to u)
-genmsgentry()
-{
-	echo -e "\t<message packagename=\"$2\" state=\"${3:-u}\">"
-	echo -e "\t\t<msgid>$1</msgid>"
-	echo -e "\t\t<msgstr></msgstr>"
-	echo -e "\t</message>"
-}
-
-header
-for pkg in $(find . -name FrugalBuild)
-do
-	cd $(dirname $pkg)
-	unset pkgdesc pkgname subpkgs subdescs
-	source FrugalBuild
-	genmsgentry "$pkgdesc" "$pkgname"
-	if [ ! -z "$subpkgs" ]; then
-		i=0
-		for subpkg in "${subpkgs[@]}"
-		do
-			genmsgentry "${subdescs[$i]}" $subpkg
-			i=$(($i+1))
-		done
-	fi
-	cd - >/dev/null
-done
-footer
diff --git a/tools/poxmlgen b/tools/poxmlgen
new file mode 100644
index 0000000..520e6ac
--- /dev/null
+++ b/tools/poxmlgen
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /usr/lib/frugalware/fwmakepkg
+
+header()
+{
+	echo '<?xml version="1.0" encoding="UTF-8"?>'
+	echo '<pofile filename="descs.po" language="Hungarian">'
+}
+
+footer()
+{
+	echo '</pofile>'
+}
+
+# $1: msgid
+# $2: pkgname
+# $3: state (can be f, u, or t - defaults to u)
+genmsgentry()
+{
+	echo -e "\t<message packagename=\"$2\" state=\"${3:-u}\">"
+	echo -e "\t\t<msgid>$1</msgid>"
+	echo -e "\t\t<msgstr></msgstr>"
+	echo -e "\t</message>"
+}
+
+header
+for pkg in $(find . -name FrugalBuild)
+do
+	cd $(dirname $pkg)
+	unset pkgdesc pkgname subpkgs subdescs
+	source FrugalBuild
+	genmsgentry "$pkgdesc" "$pkgname"
+	if [ ! -z "$subpkgs" ]; then
+		i=0
+		for subpkg in "${subpkgs[@]}"
+		do
+			genmsgentry "${subdescs[$i]}" $subpkg
+			i=$(($i+1))
+		done
+	fi
+	cd - >/dev/null
+done
+footer
From crazy at frugalware.org  Mon Oct  1 13:50:42 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct  1 13:50:44 2007
Subject: [Frugalware-git] bf07: binutils-2.18.50.0.1-1-i686
Message-ID: <20071001115042.92F4013A406A@genesis.frugalware.org>

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

commit db5e3aff09b9cc9748017b66782c8cb35215730a
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 1 13:46:39 2007 +0200

binutils-2.18.50.0.1-1-i686
* Version bump
* readded static up2date for this one
* added an patch to fix newer makeinfo detection

diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild
index 56ad666..58a4b14 100644
--- a/source/devel/binutils/FrugalBuild
+++ b/source/devel/binutils/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=binutils
-pkgver=2.18
+pkgver=2.18.50.0.1
pkgrel=1
pkgdesc="A set of programs to assemble and manipulate binary and object files"
url="http://www.gnu.org/software/binutils/"
@@ -10,19 +10,25 @@ depends=('bash' 'glibc>=2.6-2')
groups=('devel' 'devel-core')
archs=('i686' 'x86_64' 'ppc')
# for now, we need a devel version to utilize glibc-2.6
-#up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.17/2.17.50.0.18/'"
-Fup2gnubz2
-#source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2)
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2)
-signatures=($source.sig)
+up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.1/'"
+#Fup2gnubz2
+source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2 makeinfo.patch)
+#source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2)
+#signatures=($source.sig)
+sha1sums=('4e28e9b2ab5f37162569a60a8a88db29bacf28fe' \
+          '27ad0ca88accd65eb47f910e111cc14504d9022b')

build()
{
-	Fbuild --enable-shared --disable-werror
+	Fcd
+	Fpatchall
+	autoconf || Fdie
+	Fmake --enable-shared --disable-werror
+	Fmakeinstall
if [ "$CARCH" == "x86_64" ]; then
-		cd libiberty
+		cd libiberty || Fdie
unset MAKEFLAGS
-		make clean
+		make clean || return 1
make CFLAGS="-g -fPIC $CFLAGS" || return 1
Ffilerel /usr/lib/libiberty.a
fi
diff --git a/source/devel/binutils/makeinfo.patch b/source/devel/binutils/makeinfo.patch
new file mode 100644
index 0000000..fbcf948
--- /dev/null
+++ b/source/devel/binutils/makeinfo.patch
@@ -0,0 +1,12 @@
+diff -Naur binutils-2.18.50.0.1/configure.ac binutils-2.18.50.0.1-p/configure.ac
+--- binutils-2.18.50.0.1/configure.ac	2007-09-08 19:33:35.000000000 +0200
++++ binutils-2.18.50.0.1-p/configure.ac	2007-10-01 11:48:52.000000000 +0200
+@@ -2424,7 +2424,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
From crazy at frugalware.org  Mon Oct  1 14:05:36 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct  1 14:05:40 2007
Subject: [Frugalware-git] bf07: gpodder-0.10.0-2-i686
Message-ID: <20071001120536.8553113A406A@genesis.frugalware.org>

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

commit e6c5ee5c81643505fccaf0a3b068fa4d231779d4
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 1 14:02:36 2007 +0200

gpodder-0.10.0-2-i686
* relbump
* adedd feedparser to depends
* added missing scriptlet option
* closes #2454

diff --git a/source/gnome-extra/gpodder/FrugalBuild b/source/gnome-extra/gpodder/FrugalBuild
index 76eab68..cf68d9d 100644
--- a/source/gnome-extra/gpodder/FrugalBuild
+++ b/source/gnome-extra/gpodder/FrugalBuild
@@ -4,14 +4,15 @@

pkgname=gpodder
pkgver=0.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="A podcast reciever/catcher."
-depends=('pygtk' 'pyxml' 'wget' 'python' 'libglade' 'imagemagick')
+depends=('pygtk' 'pyxml' 'wget' 'python' 'libglade' 'imagemagick' 'feedparser')
makedepends=('help2man')
groups=('gnome-extra')
archs=('i686')
Finclude berlios
_F_gnome_iconcache="y"
+options=('scriptlet')
Finclude gnome-scriptlet
sha1sums=('059e5ea4450afbd1681710a22abf0e1cf22627fd')
From vmiklos at frugalware.org  Mon Oct  1 15:16:41 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 15:16:43 2007
Subject: [Frugalware-git] frugalware-current: NEWS: updates for 0.7rc2
Message-ID: <20071001131641.7208513A406A@genesis.frugalware.org>

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

commit a61c0e34e2aee364ba41e7bc7a9e3dcef219be26
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 15:16:37 2007 +0200

NEWS: updates for 0.7rc2

diff --git a/NEWS b/NEWS
index 04af99c..326541f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,22 @@

Frugalware (0.7)

-  rc1: pending
+  rc2: pending
+
+    * Package updates:
+      * GNOME 2.20.0
+      * OpenOffice.org 2.3 with OOXML support and Mozilla plugin
+      * More than 1000 changes, mostly bugfixes
+    * New features:
+      * Added Gfpm, a graphical package manager
+      * New Gfpm and Gnetconfig plugins for Xfce4 settings manager
+    * Setup
+      * Fixed PPPoE support
+      * Slow format (when checking for bad blocks is enabled) works again for
+        swap partitions
+      * Fixed Swedish language support
+
+  rc1: Sep 4, 2007

* Package updates:
* GNU C Library 2.6.1
From vmiklos at frugalware.org  Mon Oct  1 15:59:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 15:59:12 2007
Subject: [Frugalware-git] vmiklos: git-1.5.3.3-1-i686
Message-ID: <20071001135911.EE4B613A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmiklos.git;a=commitdiff;h=6978c8a9243a83cbc1b5a46813721833060f1250

commit 6978c8a9243a83cbc1b5a46813721833060f1250
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 15:58:52 2007 +0200

git-1.5.3.3-1-i686
version bump
(just bugfixes, it would be annoying not having this in 0.7)

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index e238c59..64a42ae 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=git
-pkgver=1.5.3.2
+pkgver=1.5.3.3
Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2
pkgrel=1
pkgdesc="A fast, scalable, distributed revision control system."
From vmiklos at frugalware.org  Mon Oct  1 16:00:40 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 16:00:41 2007
Subject: [Frugalware-git] homepage-ng: new dtd: authors
Message-ID: <20071001140040.9906413A406A@genesis.frugalware.org>

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

commit 3ae96c0cc6c251ce8951fb6d9f17d636bfaf3771
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:00:22 2007 +0200

new dtd: authors

diff --git a/frugalware/dtd/authors.dtd b/frugalware/dtd/authors.dtd
new file mode 100644
index 0000000..dfc51f4
--- /dev/null
+++ b/frugalware/dtd/authors.dtd
@@ -0,0 +1,6 @@
+<!ELEMENT authors (author)*>
+<!ELEMENT author (name , nick , email , role+)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT nick (#PCDATA)>
+<!ELEMENT email (#PCDATA)>
+<!ELEMENT role (#PCDATA)>
From vmiklos at frugalware.org  Mon Oct  1 16:02:27 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 16:02:30 2007
Subject: [Frugalware-git] vmiklos: docs/authors.xml: use external dtd
Message-ID: <20071001140227.D507313A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmiklos.git;a=commitdiff;h=520f1f26ccc5a613333159d616aec44dff815ee3

commit 520f1f26ccc5a613333159d616aec44dff815ee3
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:02:24 2007 +0200

docs/authors.xml: use external dtd

diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml
index 068fdff..0553ab7 100644
--- a/docs/xml/authors.xml
+++ b/docs/xml/authors.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE authors [
-<!ELEMENT authors (author)*>
-<!ELEMENT author (name , nick , email , role+)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT nick (#PCDATA)>
-<!ELEMENT email (#PCDATA)>
-<!ELEMENT role (#PCDATA)>
-]>
+<!DOCTYPE authors SYSTEM "http://frugalware.org/dtd/authors.dtd">

<!-- a few comments:
- name: the order is: family, first, middle
From iron at frugalware.org  Mon Oct  1 16:49:04 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  1 16:49:06 2007
Subject: [Frugalware-git] frugalware-current: changed my roles in authors.xml
Message-ID: <20071001144904.16A3913A406A@genesis.frugalware.org>

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

commit 064aa55634ff8325ed8186c85c5cd45e2eec7b01
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 1 16:48:09 2007 +0200

changed my roles in authors.xml

diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml
index 068fdff..62247e8 100644
--- a/docs/xml/authors.xml
+++ b/docs/xml/authors.xml
@@ -115,7 +115,8 @@ if you modify this file, be sure it's still valid - xmllint is your friend
<email>iron@frugalware.org</email>
<role>Hungarian translations</role>
<role>homepage maintainer</role>
-		<role>x86_64 server administrator</role>
+		<role>i686 buildserver administrator</role>
+		<role>x86_64 buildserver administrator</role>
<role>x86_64 porter</role>
<role>Xfce maintainer</role>
<role>package maintainer</role>
From vmiklos at frugalware.org  Mon Oct  1 17:26:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 17:26:55 2007
Subject: [Frugalware-git] pacman-tools: added genchangelog manpage
Message-ID: <20071001152646.E1F7413A406B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=39217971bd2bc45ad02e67807fd9157f9a6bbb36

commit 39217971bd2bc45ad02e67807fd9157f9a6bbb36
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:29:58 2007 +0200

added genchangelog manpage

diff --git a/genchangelog.txt b/genchangelog.txt
new file mode 100644
index 0000000..7704e64
--- /dev/null
+++ b/genchangelog.txt
@@ -0,0 +1,27 @@
+= genchangelog(1)
+
+== NAME
+
+genchangelog - updates Changelogs for Frugalware packages
+
+== SYNOPSIS
+
+genchangelog [options]
+
+== OPTIONS
+
+--clean <package>::
+	Remove package from the SQL database.
+
+== DESCRIPTION
+
+'genchangelog' performs several tasks once a binary package is on the server
+and the buildscript is updated, too:
+
+* updates the Changelog file
+
+* updates pkgname.html if a README.Frugalware is available
+
+* downloads missing source files
+
+* updates the SQL database
From vmiklos at frugalware.org  Mon Oct  1 17:26:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 17:26:56 2007
Subject: [Frugalware-git] pacman-tools: genauthors: added manpage
Message-ID: <20071001152646.CA05113A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=76cc6d57569b339a9e1e674ba13abd50386a6cb3

commit 76cc6d57569b339a9e1e674ba13abd50386a6cb3
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:07:55 2007 +0200

genauthors: added manpage

diff --git a/genauthors.c b/genauthors.c
index b9cf3ef..c2b5441 100644
--- a/genauthors.c
+++ b/genauthors.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)

if(argc <= 1)
{
-		printf("Usage: %s /path/to/authors.xml \n", argv[0]);
+		system("man genauthors");
return(1);
}

diff --git a/genauthors.txt b/genauthors.txt
new file mode 100644
index 0000000..e015f14
--- /dev/null
+++ b/genauthors.txt
@@ -0,0 +1,14 @@
+= genauthors(1)
+
+== NAME
+
+genauthors - generates an AUTHORS file from an authors.xml
+
+== SYNOPSIS
+
+genauthors /path/to/authors.xml
+
+== DESCRIPTION
+
+The generated AUTHORS file is a plain text file, while the authors.xml must be
+validated against http://frugalware.org/dtd/authors.dtd.
From vmiklos at frugalware.org  Mon Oct  1 17:26:47 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 17:26:56 2007
Subject: [Frugalware-git] pacman-tools: portpkg: added a manpage
Message-ID: <20071001152647.3B01A13A4073@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=19d914de0b648e46557149d4842820349af7bfb1

commit 19d914de0b648e46557149d4842820349af7bfb1
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:45:26 2007 +0200

portpkg: added a manpage

diff --git a/portpkg b/portpkg
index b3f44ab..850d8a9 100755
--- a/portpkg
+++ b/portpkg
@@ -30,8 +30,7 @@ if [ "$1" == "--push" -o "$1" == "--silentpush" ]; then
if [ "$1" == "--push" ]; then
repoman -k push
else
-		git pull
-		git push
+		dg pull -a && git push
fi
else
die "now run '$0 --push' to record and push your changes"
diff --git a/portpkg.txt b/portpkg.txt
new file mode 100644
index 0000000..5a4c725
--- /dev/null
+++ b/portpkg.txt
@@ -0,0 +1,17 @@
+= portpkg(1)
+
+== NAME
+
+portpkg - port a package to a new architecture
+
+== SYNOPSIS
+
+portpkg [options]
+
+== OPTIONS
+
+--push::
+	Push the package after a successful build.
+
+--silentpush::
+	Just modify the buildscript, let syncpkgd to build the binary package.
From vmiklos at frugalware.org  Mon Oct  1 17:26:47 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 17:26:56 2007
Subject: [Frugalware-git] pacman-tools: pootle-update: added a manpage
Message-ID: <20071001152647.02EDC13A4072@genesis.frugalware.org>

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

commit afad7705fb140e20effc7c5a1c27122db50ebf74
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:37:12 2007 +0200

pootle-update: added a manpage

diff --git a/pootle-update b/pootle-update
index 7c06a06..eb6c55b 100644
--- a/pootle-update
+++ b/pootle-update
@@ -1,5 +1,15 @@
#!/bin/bash

+if [ "$1" == "-h" -o "$1" == "--help" ]; then
+	man pootle-update
+	exit $?
+fi
+
+if [ "$1" == "-v" -o "$1" == "--version" ]; then
+	pacman-g2 -Q pacman-tools
+	exit $?
+fi
+
cd $1

# FIXME: hard-wiring such a list to here is very ugly
diff --git a/pootle-update.txt b/pootle-update.txt
new file mode 100644
index 0000000..7e66995
--- /dev/null
+++ b/pootle-update.txt
@@ -0,0 +1,23 @@
+= pootle-update(1)
+
+== NAME
+
+pootle-update - updates local pot templates from a server
+
+== SYNOPSIS
+
+pootle-update [options | <path>]
+
+== OPTIONS
+
+--help::
+	Display this manpage.
+
+--version::
+	Display the package version.
+
+== DESCRIPTION
+
+If no options used, the <path> parameter is required.
+
+Example: /usr/lib/python2.5/site-packages/Pootle/po
From vmiklos at frugalware.org  Mon Oct  1 17:26:47 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 17:26:56 2007
Subject: [Frugalware-git] pacman-tools: revdep-rebuild: added manpage
Message-ID: <20071001152647.66FAD13A4074@genesis.frugalware.org>

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

commit f0ba7549f61b229b075ddef697c9a3a3174add70
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:56:40 2007 +0200

revdep-rebuild: added manpage

diff --git a/bumppkg.txt b/bumppkg.txt
index 4617ce3..5ad7439 100644
--- a/bumppkg.txt
+++ b/bumppkg.txt
@@ -18,7 +18,7 @@ bumppkg [options]
syncpkgd can later build it.

--push::
-	Push the changes righter after committing locally.
+	Push the changes right after committing locally.

--rebuild::
Don't bump to a newer version, but increment the package release and
diff --git a/revdep-rebuild b/revdep-rebuild
index 093dee3..512ebf1 100755
--- a/revdep-rebuild
+++ b/revdep-rebuild
@@ -22,7 +22,10 @@ die()
id=$1
shift

-[ -z "$id" ] && die "usage: $0 <package id> [-t tree] [--other] [--nobuild] [--sed <expression>]"
+if [ -z "$id" ]; then
+	man revdep-rebuild
+	exit $?
+fi

tree=$repos
if [ "$1" == "-t" ]; then
diff --git a/revdep-rebuild.txt b/revdep-rebuild.txt
new file mode 100644
index 0000000..9d8b887
--- /dev/null
+++ b/revdep-rebuild.txt
@@ -0,0 +1,37 @@
+= revdep-rebuild(1)
+
+== NAME
+
+revdep-rebuild - rebuilds reverse depends of a given package
+
+== SYNOPSIS
+
+revdep-rebuild [<package id>] [options]
+
+== OPTIONS
+
+-t <tree>::
+	Build in a chroot different to the default one.
+
+--other::
+	Rebuild other (ie not exact) reverse depends. Useful on sover bumps for
+	libraries.
+
+--nobuild::
+	Do not actually perform the build so that syncpkgd can later build it.
+
+--nopush::
+	Don't push the changes right after committing locally.
+
+--sed <expression>::
+	Use 'sed' to update the FrugalBuilds before build.
+
+== DESCRIPTION
+
+For example, to rebuild packages for `parted-1.8.8`:
+
+----
+revdep-rebuild 429 --other --sed "s|'parted[^']*'|'parted>=1.8.8'|"
+----
+
+You can get the id of a package from the http://frugalware.org/packages page.
From vmiklos at frugalware.org  Mon Oct  1 18:24:13 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 18:24:16 2007
Subject: [Frugalware-git] pacman-tools: chkdep: new -q option
Message-ID: <20071001162414.0070213A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=33ab706e8bef841d90d6421110e624b8c24dd8bf

commit 33ab706e8bef841d90d6421110e624b8c24dd8bf
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 18:24:10 2007 +0200

chkdep: new -q option

diff --git a/chkdep b/chkdep
index 6dfc09a..d40fcfb 100755
--- a/chkdep
+++ b/chkdep
@@ -34,13 +34,14 @@ def rmdupdeps(deps):
return newdeps

def detect_owner(lib):
+	global quiet
if not len(lib):
return
if lib.find(fpmroot) == 0:
return
pkg = pacman.void_to_PM_PKG(pacman.list_getdata(pacman.pkg_getowners(lib)))
owner = pacman.void_to_char(pacman.pkg_getinfo(pkg, pacman.PKG_NAME))
-	if not owner:
+	if not owner and not quiet:
print "WARNING: No package found containing %s!" % lib
elif owner not in deps:
deps.append(owner)
@@ -162,9 +163,10 @@ deps = []
dir = None
method="elf"
pkg = None
+quiet = False

try:
-	opts, args = getopt.getopt(sys.argv[1:], "d:p:n:m:vi", ["dir=", "package=", "ignore=", "method=", "version"])
+	opts, args = getopt.getopt(sys.argv[1:], "d:p:qn:m:vi", ["dir=", "package=", "quiet", "ignore=", "method=", "version"])
except getopt.GetoptError:
usage()
sys.exit(1)
@@ -174,6 +176,8 @@ for opt, arg in opts:
dir = arg
if opt in ("-p", "--package"):
pkg = arg
+	if opt in ("-q", "--quiet"):
+		quiet = True
if opt in ("-m", "--method"):
method = arg
if opt in ("-n", "--name"):
diff --git a/chkdep.txt b/chkdep.txt
index 0f8e98b..9e2a429 100644
--- a/chkdep.txt
+++ b/chkdep.txt
@@ -27,6 +27,9 @@ chkdep [ -d | -p ] <path> [options]
-p, --package <path>::
Name of the FPM package to check.

+-q, --quiet::
+	Don't display any warning.
+
-i::
Does nothing (for backward compatibility).
From vmiklos at frugalware.org  Mon Oct  1 18:36:47 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 18:36:48 2007
Subject: [Frugalware-git] pacman-tools: chkdep: handle the case when the lib
	has undefined references
Message-ID: <20071001163647.C08A913A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=149cc0775eb1a5084a0f00b2cb6730f573419a79

commit 149cc0775eb1a5084a0f00b2cb6730f573419a79
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 18:36:37 2007 +0200

chkdep: handle the case when the lib has undefined references
we usually run chkdep from makepkg where there are no undefined references,
since we just compiled the package. though this may be the case, ie when
rpm2fpm tries to figure out deps

diff --git a/chkdep b/chkdep
index d40fcfb..3f27926 100755
--- a/chkdep
+++ b/chkdep
@@ -42,7 +42,7 @@ def detect_owner(lib):
pkg = pacman.void_to_PM_PKG(pacman.list_getdata(pacman.pkg_getowners(lib)))
owner = pacman.void_to_char(pacman.pkg_getinfo(pkg, pacman.PKG_NAME))
if not owner and not quiet:
-		print "WARNING: No package found containing %s!" % lib
+		print >>sys.stderr, "WARNING: No package found containing %s!" % lib
elif owner not in deps:
deps.append(owner)

@@ -101,6 +101,9 @@ class Checks:
if i.find("=>") == -1:
continue
lib = re.sub(r".* => (.*) \(.*", r"\1", i.strip())
+			if ' ' in lib:
+				# not all the deps are installed
+				lib = lib.split(' ')[0]
if len(lib):
libs.append(lib)
sock.close()
From vmiklos at frugalware.org  Mon Oct  1 18:45:41 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 18:45:42 2007
Subject: [Frugalware-git] pacman-tools: rpm2fpm: added manpage
Message-ID: <20071001164541.54F5513A406A@genesis.frugalware.org>

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

commit ed7470c62f245a1f9fbfec3759403e5379db35c9
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 18:41:05 2007 +0200

rpm2fpm: added manpage

diff --git a/rpm2fpm b/rpm2fpm
old mode 100644
new mode 100755
diff --git a/rpm2fpm.txt b/rpm2fpm.txt
new file mode 100644
index 0000000..d17091f
--- /dev/null
+++ b/rpm2fpm.txt
@@ -0,0 +1,20 @@
+= rpm2fpm(1)
+
+== NAME
+
+rpm2fpm - converts rpm archives to frugalware ones
+
+== SYNOPSIS
+
+rpm2fpm [options] [<rpm file>]
+
+== OPTIONS
+
+-h, --help::
+	This man page.
+
+-i, --install::
+	Install the created fpm package.
+
+-r, --remove::
+	Delete the rpm package after converting.
From vmiklos at frugalware.org  Mon Oct  1 18:45:41 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 18:45:42 2007
Subject: [Frugalware-git] pacman-tools: syncemul: added manpage
Message-ID: <20071001164541.76FE313A406B@genesis.frugalware.org>

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

commit a31050a27be996607c4e27366f2e7b5a8abd4b3c
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 18:45:36 2007 +0200

syncemul: added manpage

diff --git a/syncemul b/syncemul
index 9334ab5..3a08cb2 100644
--- a/syncemul
+++ b/syncemul
@@ -2,6 +2,16 @@

. /usr/lib/frugalware/fwmakepkg

+if [ "$1" == "-h" -o "$1" == "--help" ]; then
+	man syncemul
+	exit $?
+fi
+
+if [ "$1" == "-v" -o "$1" == "--version" ]; then
+	pacman-g2 -Q pacman-tools
+	exit $?
+fi
+
if [ "`pwd|sed 's|.*/\(.*\)|\1|'`" != "emul-extra" ]; then
echo "where are you?"
exit 1
diff --git a/syncemul.txt b/syncemul.txt
new file mode 100644
index 0000000..15a0a25
--- /dev/null
+++ b/syncemul.txt
@@ -0,0 +1,26 @@
+= syncemul(1)
+
+== NAME
+
+syncemul - updates existing packages for emulation of i686 on x86_64
+
+== SYNOPSIS
+
+syncemul [options]
+
+== OPTIONS
+
+--help::
+	Display this manpage.
+
+--version::
+	Display the package version.
+
+== DESCRIPTION
+
+You should use this script, like:
+
+----
+$ cd /path/to/source/emul-extra
+$ syncemul
+----
From vmiklos at frugalware.org  Mon Oct  1 19:35:02 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 19:35:05 2007
Subject: [Frugalware-git] pacman-tools: mkiso: converted manpage to asciidoc
Message-ID: <20071001173502.806BC13A406B@genesis.frugalware.org>

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

commit e39112e27e8ee8e5e23d15746e148dd4186b1da2
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 19:18:06 2007 +0200

mkiso: converted manpage to asciidoc

diff --git a/Makefile b/Makefile
index 47cdc6f..147efe1 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ sysconfdir = /etc
docdir = /usr/share/doc/pacman-tools-$(VERSION)
FINCDIR = $(shell source /usr/lib/frugalware/fwmakepkg; echo $$Fincdir)
XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2
-DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt)
+DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt) $(wildcard mkiso/*.txt)
MANS = $(subst .txt,.1,$(DOCS))

PROGRAMS = bumppkg chkdep chkworld emulgen fblint fpmdiff fwcpan fwmirror \
@@ -69,7 +69,6 @@ install: compile
$(INSTALL) lib/fwmakepkg $(DESTDIR)$(libdir)
$(INSTALL) etcconfig.py $(DESTDIR)$(sbindir)/etcconfig
$(INSTALL) mkiso/mkiso $(DESTDIR)$(bindir)/mkiso
-	$(INSTALL) -m644 mkiso/mkiso.8 $(DESTDIR)$(man8dir)
$(INSTALL) -m644 mkiso/volumes.xml $(DESTDIR)$(docdir)/volumes.xml
$(INSTALL) -m644 apidocs/*.3 $(DESTDIR)$(man3dir)
make -C syncpkgd DESTDIR=$(DESTDIR) install
diff --git a/mkiso/mkiso.8 b/mkiso/mkiso.8
deleted file mode 100644
index 5325e1f..0000000
--- a/mkiso/mkiso.8
+++ /dev/null
@@ -1,96 +0,0 @@
-.TH "MKISO" "1" "Jun 2006" "Frugalware 0.5" "pacman-tools"
-.SH NAME
-mkiso \- Frugalware's program to generate ISO9660 images
-.SH SYNOPSIS
-\fBmkiso\fR [\f  -h | --help \fR] [\f  -s | --stable \fR] [[\f -f | --file \fR]\f  volumes.xml\fR]
-.SH DESCRIPTION
-.BR mkiso
-is meant for anyone who wants to generate (custom) iso images
-from the Frugalware Source Tree.
-.SH USAGE
-A typical iso generation should be done as follows:
-.TP
-Create a working directory:
-
-$ mkdir -p ~/iso
-
-$ cd ~/iso
-
-.TP
-Copy the descriptor xml template to there:
-
-$ cp /usr/share/doc/pacman-tools-*/volumes.xml ./
-
-.TP
-Change the fst_root to something like:
-
-<fst_root>/home/vmiklos/iso</fst_root>
-
-.TP
-In this example we create a netinstall iso, so leave only the following entry:
-
-.nf
-<volume>
-	<arch>i686</arch>
-	<media>net</media>
-</volume>
-.fi
-
-.TP
-Now we need to create a minimal mirror. we can exclude the source (.git/_darcs and source dir) and we can ignore the fpms for the netinstall:
-
-NOTE: feel free to choose a different rsync mirror from /etc/repoman.conf!
-
-.nf
-$ fwmirror -s rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/ \\
-	-v current -a i686,source -d . -- -vP --delete --exclude /_darcs/ \\
-	--exclude /.git/ --exclude /source/ --exclude '*fpm'
-.fi
-
-.TP
-Ok, we have the necessary files, let's make the iso!
-
-$ mkiso
-
-.SH THE XML FILE
-
-In the xml file primarily you should define the required volumes. The media
-type of the volume is required at least. The media can be "net", "cd", or "dvd". The
-"net" will not contain any fpm packages. The only difference between "cd" and "dvd"
-is the default size. You can define the arch, which defaults to the machine
-hardware name. For a cd or dvd a serial tag is required, 1 or the 1st cd and
-so on. You can define a custom cd/dvd size with the size tag.
-
-After defining the volumes, you must supply the root of the Frugalware
-Source Tree with the fst_root tag. Other optional tags include out_dir
-[defaults to fst_root], version [timestamp] and codename [-current].
-
-.SH HACKING
-
-Probably the most changing part is the initrd and the kernel. You can generate
-them from the 'setup' repo.
-
-.SH OPTIONS
-.TP
-.B -h|--help
-Show the help screen.
-.TP
-.B -c|--count
-Do not generate the isos, just print out the number of required isos for the
-given size.
-.TP
-.B -s|--stable
-Assume that the given repo is a -stable one, so that there will be a
-frugalware.fdb under the frugalware-<arch> directory, not a
-frugalware-current.fdb.
-.TP
-.B -f|--file <volumes.xml>
-By default, mkiso searches for the file named "volumes.xml". If you want a
-different one, then just specify it.
-.SH AUTHORS
-Written by Miklos Vajna.
-.SH "REPORTING BUGS"
-Please report bugs to http://bugs.frugalware.org/.
-.SH "SEE ALSO"
-.BR setup (1),
-.BR pacman (8)
diff --git a/mkiso/mkiso.txt b/mkiso/mkiso.txt
new file mode 100644
index 0000000..e9ac701
--- /dev/null
+++ b/mkiso/mkiso.txt
@@ -0,0 +1,106 @@
+= mkiso(1)
+
+== NAME
+
+mkiso - Frugalware's program to generate ISO9660 images
+
+== SYNOPSIS
+
+mkiso [options]
+
+== DESCRIPTION
+
+'mkiso' is meant for anyone who wants to generate (custom) iso images from the
+Frugalware Source Tree.
+
+== USAGE
+
+A typical iso generation should be done as follows:
+
+Create a working directory:
+
+----
+$ mkdir -p ~/iso
+$ cd ~/iso
+----
+
+Copy the descriptor xml template to there:
+
+----
+$ cp /usr/share/doc/pacman-tools-*/volumes.xml ./
+----
+
+Change the fst_root to something like:
+
+----
+<fst_root>/home/john/iso</fst_root>
+----
+
+In this example we create a netinstall iso, so leave only the following entry:
+
+----
+<volume>
+	<arch>i686</arch>
+	<media>net</media>
+</volume>
+----
+
+Now we need to create a minimal mirror. we can exclude the source (.git/_darcs
+and source dir) and we can ignore the fpms for the netinstall:
+
+----
+$ fwmirror -s rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/ \
+	-v current -a i686,source -d . -- -vP --delete --exclude /_darcs/ \
+	--exclude /.git/ --exclude /source/ --exclude '*fpm'
+----
+
+NOTE: feel free to choose a different rsync mirror from `/etc/repoman.conf`!
+
+Ok, we have the necessary files, let's make the iso!
+
+----
+$ mkiso
+----
+
+== THE XML FILE
+
+In the xml file primarily you should define the required volumes. The media
+type of the volume is required at least. The media can be "net", "cd", or
+"dvd". The "net" will not contain any fpm packages. The only difference between
+"cd" and "dvd" is the default size. You can define the arch, which defaults to
+the machine hardware name. For a cd or dvd a serial tag is required, 1 or the
+1st cd and so on. You can define a custom cd/dvd size with the size tag.
+
+After defining the volumes, you must supply the root of the Frugalware Source
+Tree with the fst_root tag. Other optional tags include out_dir [defaults to
+fst_root], version [timestamp] and codename [-current].
+
+== HACKING
+
+Probably the most changing part is the initrd and the kernel. You can generate them from the 'setup' repo.
+
+== OPTIONS
+
+-h, --help::
+	Show the help screen.
+
+-c, --count::
+	Do not generate the isos, just print out the number of required isos
+	for the given size.
+
+-s, --stable::
+	Assume that the given repo is a -stable one, so that there will be a
+	'frugalware.fdb' under the 'frugalware-<arch>' directory, not a
+	'frugalware-current.fdb'.
+
+-f, --file <volumes.xml>::
+	By default, 'mkiso' searches for the file named 'volumes.xml'. If you
+	want a different one, then just specify it.
+
+== REPORTING BUGS
+
+Please report bugs to http://bugs.frugalware.org/.
+
+== SEE ALSO
+
+*setup*(1), *pacman-g2*(8)
From vmiklos at frugalware.org  Mon Oct  1 19:35:02 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 19:35:07 2007
Subject: [Frugalware-git] pacman-tools: makefile cleanup: added a PROGRAMS
	variable
Message-ID: <20071001173502.6992913A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2df8d8fb899f48fffd960a4492ac1cb440d363e8

commit 2df8d8fb899f48fffd960a4492ac1cb440d363e8
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 19:01:09 2007 +0200

makefile cleanup: added a PROGRAMS variable

diff --git a/Makefile b/Makefile
index f771dfd..47cdc6f 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,11 @@ XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2
DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt)
MANS = $(subst .txt,.1,$(DOCS))

-compile: genauthors apidocs docs
+PROGRAMS = bumppkg chkdep chkworld emulgen fblint fpmdiff fwcpan fwmirror \
+	genauthors genchangelog mkisorelease mkpkghtml pear-makefb pootle-update \
+	portpkg repoman revdep-rebuild rpm2fpm syncemul
+
+compile: $(PROGRAMS) apidocs docs
$(MAKE) -C mkiso
$(MAKE) -C repoman.d

@@ -48,7 +52,6 @@ install: compile
$(INSTALL) -d $(DESTDIR)$(sbindir)
$(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(man1dir)
-	$(INSTALL) -m644 $(MANS) $(DESTDIR)$(man1dir)
$(INSTALL) -d $(DESTDIR)$(man3dir)
$(INSTALL) -d $(DESTDIR)$(man8dir)
$(INSTALL) -d $(DESTDIR)$(sysconfdir)
@@ -56,26 +59,16 @@ install: compile
$(INSTALL) -d $(DESTDIR)$(docdir)
$(INSTALL) -d $(DESTDIR)/home/syncpkgd
chown syncpkgd:daemon $(DESTDIR)/home/syncpkgd
-	$(INSTALL) chkworld $(DESTDIR)$(bindir)/chkworld
-	$(INSTALL) chkdep $(DESTDIR)$(bindir)/chkdep
-	$(INSTALL) mkpkghtml $(DESTDIR)$(bindir)/mkpkghtml
-	$(INSTALL) genchangelog $(DESTDIR)$(bindir)
+	$(INSTALL) -m755 $(PROGRAMS) $(DESTDIR)$(bindir)
+	$(INSTALL) -m644 $(MANS) $(DESTDIR)$(man1dir)
$(INSTALL) darcs-git.py $(DESTDIR)$(bindir)/darcs-git
ln -s darcs-git $(DESTDIR)$(bindir)/dg
-	$(INSTALL) repoman $(DESTDIR)$(bindir)
$(INSTALL) -m644 repoman.conf $(DESTDIR)$(sysconfdir)
$(INSTALL) -m644 repoman.d/current $(DESTDIR)$(sysconfdir)/repoman.d/current
$(INSTALL) -m644 repoman.d/stable $(DESTDIR)$(sysconfdir)/repoman.d/stable
$(INSTALL) lib/fwmakepkg $(DESTDIR)$(libdir)
$(INSTALL) etcconfig.py $(DESTDIR)$(sbindir)/etcconfig
-	$(INSTALL) rpm2fpm $(DESTDIR)$(bindir)/rpm2fpm
-	$(INSTALL) fwcpan $(DESTDIR)$(bindir)/fwcpan
-	$(INSTALL) genauthors $(DESTDIR)$(bindir)/genauthors
-	$(INSTALL) fblint $(DESTDIR)$(bindir)/fblint
-	$(INSTALL) pootle-update $(DESTDIR)$(bindir)/pootle-update
$(INSTALL) mkiso/mkiso $(DESTDIR)$(bindir)/mkiso
-	$(INSTALL) fwmirror $(DESTDIR)$(bindir)/fwmirror
-	$(INSTALL) pear-makefb $(DESTDIR)$(bindir)/pear-makefb
$(INSTALL) -m644 mkiso/mkiso.8 $(DESTDIR)$(man8dir)
$(INSTALL) -m644 mkiso/volumes.xml $(DESTDIR)$(docdir)/volumes.xml
$(INSTALL) -m644 apidocs/*.3 $(DESTDIR)$(man3dir)
From vmiklos at frugalware.org  Mon Oct  1 19:35:02 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 19:35:07 2007
Subject: [Frugalware-git] pacman-tools: added syncpkgd manpage
Message-ID: <20071001173502.B7F8413A4073@genesis.frugalware.org>

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

commit 4fd1ec80d6deb8bfa13d3f6434928e2307458ba6
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 19:28:46 2007 +0200

added syncpkgd manpage

diff --git a/syncpkgd/syncpkgd.py b/syncpkgd/syncpkgd.py
index 8892ee4..444b4bf 100644
--- a/syncpkgd/syncpkgd.py
+++ b/syncpkgd/syncpkgd.py
@@ -163,17 +163,7 @@ class Options:
self.help = False
self.uid = False
def usage(self, ret):
-		print """Usage: syncpkgd [OPTION]...
-syncpkgd is a daemon that accepts requests from syncpkg clients.
-
-Options:
-	-c      --clientlogs    set the dir to place failed build logs
-	                        (default: clientlogs)
-	-d	--daemon	run as daemon in the background
-	-l	--logfile	set the logfile (default: syncpkgd.log)
-	-p	--pidfile	set the pidfile (default: syncpkgd.pid)
-	-s	--statusfile	set the statusfile (default: syncpkgd.status)
-	-u	--uid		set the daemon's user id"""
+		os.system("man syncpkgd")
sys.exit(ret)


diff --git a/syncpkgd/syncpkgd.txt b/syncpkgd/syncpkgd.txt
new file mode 100644
index 0000000..3b459dd
--- /dev/null
+++ b/syncpkgd/syncpkgd.txt
@@ -0,0 +1,29 @@
+= syncpkgd(1)
+
+== NAME
+
+syncpkgd - a daemon that accepts requests from syncpkg clients
+
+== SYNOPSIS
+
+syncpkgd [options]
+
+== OPTIONS
+
+-c, --clientlogs <directory>::
+	set the dir to place failed build logs (default: clientlogs)
+
+-d, --daemon::
+	run as daemon in the background
+
+-l, --logfile <path>::
+	set the logfile (default: syncpkgd.log)
+
+-p, --pidfile <path>::
+	set the pidfile (default: syncpkgd.pid)
+
+-s, --statusfile <path>::
+	set the statusfile (default: syncpkgd.status)
+
+-u, --uid <username>::
+	set the daemon's user id
From vmiklos at frugalware.org  Mon Oct  1 19:35:02 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 19:35:08 2007
Subject: [Frugalware-git] pacman-tools: added manpage for syncpkg-shell
Message-ID: <20071001173502.96C7213A4072@genesis.frugalware.org>

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

commit ab53ed1d301ff6609648ab64e2ae3424be371323
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 19:23:44 2007 +0200

added manpage for syncpkg-shell

diff --git a/syncpkgd/syncpkg-shell.txt b/syncpkgd/syncpkg-shell.txt
new file mode 100644
index 0000000..84925b6
--- /dev/null
+++ b/syncpkgd/syncpkg-shell.txt
@@ -0,0 +1,18 @@
+= syncpkg-shell(1)
+
+== NAME
+
+syncpkg-shell - modified shell for syncpkg client users
+
+== SYNOPSIS
+
+syncpkg-shell <username>
+
+== DESCRIPTION
+
+'syncpkg-shell' modifies the 'uploader' environment variable, then evaluates
+the command, specified in the 'SSH_ORIGINAL_COMMAND' environment variable.
+
+== SEE ALSO
+
+*syncpkgcd*(1)
From vmiklos at frugalware.org  Mon Oct  1 19:35:02 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  1 19:35:08 2007
Subject: [Frugalware-git] pacman-tools: added syncpkgdctl manpage
Message-ID: <20071001173502.CA7BB13A4074@genesis.frugalware.org>

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

commit d92623f34ae78bdf51ea63761dab6f0f753416bd
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 19:33:47 2007 +0200

added syncpkgdctl manpage

diff --git a/syncpkgd/syncpkgdctl.py b/syncpkgd/syncpkgdctl.py
index d98f58a..5aa1a0e 100644
--- a/syncpkgd/syncpkgdctl.py
+++ b/syncpkgd/syncpkgdctl.py
@@ -12,11 +12,7 @@ if len(sys.argv) > 1:
else:
print "Oops, something went wrong. Maybe this package is already in the queue?"
else:
-	print """Hello, this is the syncpkgd control client.
-If you want to add a new package, just pass its url as a parameter, ie.:
-syncpkgdctl 'git://current/frugalwareutils-0.7.4-2-x86_64/VMiklos <vmiklos@frugalware.org>'
-(The address is used to notify you in case the build fails. Please use
-your address only.)
-At the moment the following packages are waiting to be built:"""
+	print """At the moment the following packages are waiting to be built:"""
print server.get_todo(config.server_user, config.server_pass)
print "Please not that this list does not include failed or already started builds."
+	print "See man syncpkgdctl for more info."
diff --git a/syncpkgd/syncpkgdctl.txt b/syncpkgd/syncpkgdctl.txt
new file mode 100644
index 0000000..230a80b
--- /dev/null
+++ b/syncpkgd/syncpkgdctl.txt
@@ -0,0 +1,22 @@
+= syncpkgdctl(1)
+
+== NAME
+
+syncpkgdctl - controller client for the package synchronization daemon
+
+== SYNOPSIS
+
+syncpkgdctl [<url>]
+
+== DESCTIPTION
+
+If you want to add a new package, just pass its url as a parameter, ie.:
+
+----
+$ syncpkgdctl 'git://current/frugalwareutils-0.7.4-2-x86_64/VMiklos <vmiklos@frugalware.org>'
+----
+
+(The address is used to notify you in case the build fails. Please use your
+address only.)
+
+If no parameters are passed then the current build queue is displayed.
From priyank at frugalware.org  Mon Oct  1 20:10:09 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct  1 20:10:12 2007
Subject: [Frugalware-git] pacman-tools: repoman.txt: spelling and gramatical
	fixes
Message-ID: <20071001181009.CBB9513A406A@genesis.frugalware.org>

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

commit aea055b31afb5f8f968a08f5294d01fa098c79fb
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 1 23:39:28 2007 +0530

repoman.txt: spelling and gramatical fixes

diff --git a/repoman.txt b/repoman.txt
index 26cee44..d57458d 100644
--- a/repoman.txt
+++ b/repoman.txt
@@ -51,12 +51,12 @@ $ echo 'current_servers=("<nick>@git.frugalware.org:/home/ftp/pub/frugalware/fru
$ echo 'fst_root=~/git' >> ~/.repoman.conf
----

-Replace <nick> with your nick and make sure about you will have the git tree in
+Replace <nick> with your nick and make sure that you have the git tree in
\~/git/current.

If you want to use more than one (conflicting, ie.: current and stable) trees,
then please add the <reponame>_pushonly=y option to each repo except one.
-Example: if the host system is -current and you want to enabled current and
+Example: if the host system is -current and you want to enable current and
stable, then add stable_pushonly="y" to your config.

=== Getting the repo
@@ -68,7 +68,7 @@ $ cd ~/git
$ git clone <nick>@git.frugalware.org:/home/ftp/pub/frugalware/frugalware-current current
----

-Getting other git repos are similar. Example for the pacman-tools repo:
+Getting other git repos is similar. For example, to get the pacman-tools repo, type:

----
$ git clone <nick>@git.frugalware.org:/home/ftp/pub/other/pacman-tools/pacman-tools
@@ -88,7 +88,7 @@ vmiklos.

=== Updating the repo

-If you already got the repo a simple 'git pull' should be enough.
+If you already got the repo, a simple 'git pull' should be enough.

=== Making changes and building the package

@@ -140,7 +140,7 @@ $ repoman del source/base/readline/readline-5.0.tar.g

Here you only have to do a simple 'git push'.

-This command uploads the changes you made locally to the server.
+This command uploads the changes you made locally, to the server.

=== Upload the new source package(s)

@@ -220,7 +220,7 @@ If the repo you use for your work already exists, it may need some work:
* Remove the already merged fpms manually. This usually means all fpms.

* Remove the obsolete entries from the fdb, or just remove the file if no fpms
-  left in the repo.
+  are left in the repo.

=== The How

@@ -412,7 +412,7 @@ rec|record [commit message]::
s|search [regexp]::

To be used by users. Search in those FrugalBuilds which are only available in
-	source form. If the optional regexp parameter omitted, it will list all
+	source form. If the optional regexp parameter is omitted, it will list all
source-only packages.

sync::
From priyank at frugalware.org  Mon Oct  1 20:13:24 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct  1 20:13:25 2007
Subject: [Frugalware-git] pacman-tools: fwmirror.txt: spelling and
	gramatical fixes
Message-ID: <20071001181324.E2E0513A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=98e0a11ea33de5f1127abd9ddd8a8911b0020824

commit 98e0a11ea33de5f1127abd9ddd8a8911b0020824
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 1 23:42:46 2007 +0530

fwmirror.txt: spelling and gramatical fixes

diff --git a/fwmirror.txt b/fwmirror.txt
index 5a9d0d0..2702a17 100644
--- a/fwmirror.txt
+++ b/fwmirror.txt
@@ -11,8 +11,8 @@ fwmirror [options] -- [rsync options]
== OPTIONS

-a <archs>::
-	Coma separated list of architectures you want to mirror. If you want to
-	mirror the sources, too then use the special 'source' arch.
+	Comma separated list of architectures you want to mirror. If you want to
+	mirror the sources too, then use the special 'source' arch.

-d <directory>::
Destination directory.
@@ -24,7 +24,7 @@ fwmirror [options] -- [rsync options]
The mirror server you want to use.

-v <versions>::
-	Coma separated list of versions you want to mirror. You can use
+	Comma separated list of versions you want to mirror. You can use
explicit versions and aliases (current,testing,stable), too.

--version::
From priyank at frugalware.org  Tue Oct  2 10:30:17 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 10:30:21 2007
Subject: [Frugalware-git] pacman-tools: portpkg.txt: minor grammar fix
Message-ID: <20071002083017.A238013A406A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=8e787670df5a71f5d6a1ea98f774d1aa2e1dc91d

commit 8e787670df5a71f5d6a1ea98f774d1aa2e1dc91d
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 1 23:45:02 2007 +0530

portpkg.txt: minor grammar fix

diff --git a/portpkg.txt b/portpkg.txt
index 5a4c725..23c1660 100644
--- a/portpkg.txt
+++ b/portpkg.txt
@@ -14,4 +14,4 @@ portpkg [options]
Push the package after a successful build.

--silentpush::
-	Just modify the buildscript, let syncpkgd to build the binary package.
+	Just modify the buildscript and let syncpkgd build the binary package.
From vmiklos at frugalware.org  Tue Oct  2 11:12:22 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:12:24 2007
Subject: [Frugalware-git] homepage-ng: 0.7rc2 announce :)
Message-ID: <20071002091222.4185F13A4076@genesis.frugalware.org>

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

commit 5771f213c4b50002b177615ee557482eaa86337d
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 11:12:17 2007 +0200

0.7rc2 announce :)

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index aa0f113..ad34ba7 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -17,6 +17,85 @@

<news>
<post>
+		<id>74</id>
+		<title>Frugalware 0.7rc2 (Sayshell) released</title>
+		<date>Tue Oct  2 11:08:42 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/74">announce</a> the immediate availability of Frugalware 0.7rc2, the last candidate of the upcoming 0.7 stable release.<br />
+			A short and incomplete list of changes since 0.7rc1:<br />
+			<ul>
+				<li>Package updates:
+					<ul>
+						<li>GNOME 2.20.0</li>
+						<li>OpenOffice.org 2.3 with OOXML support and Mozilla plugin</li>
+						<li>More than 1000 changes, mostly bugfixes</li>
+					</ul>
+				</li>
+				<li>New features:
+					<ul>
+						<li>Added Gfpm, a graphical package manager</li>
+						<li>New Gfpm and Gnetconfig plugins for Xfce4 settings manager</li>
+					</ul>
+				</li>
+				<li>Setup:
+					<ul>
+						<li>Fixed PPPoE support</li>
+						<li>Slow format (when checking for bad blocks is enabled) works again for swap partitions</li>
+						<li>Fixed Swedish language support</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/fwlive-0.7rc2-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+817395071b963878b186cb6de3cc625c054a2fdc  frugalware-0.7rc2-i686-cd10.iso
+08aaacc8b0a49cedbdfbf0cc250c381865e35e12  frugalware-0.7rc2-i686-cd11.iso
+26090540104483c2e0ea5cb04cef94bead0126b2  frugalware-0.7rc2-i686-cd12.iso
+57f6a6b306666bdd4e273e6b1bf860f5c2553172  frugalware-0.7rc2-i686-cd13.iso
+00f9519569b0ab82933a6f7ad72b88f416c0ff29  frugalware-0.7rc2-i686-cd1.iso
+3cb912374d3e2dd6146875b841409b8bf837fd77  frugalware-0.7rc2-i686-cd2.iso
+34d7f5629e81649985fdc51cdb393f8f58265601  frugalware-0.7rc2-i686-cd3.iso
+dab534a873c0d467189f15b939725ec13c951dd5  frugalware-0.7rc2-i686-cd4.iso
+1595df5afb10bce2c15beed340a743c1c5a7a830  frugalware-0.7rc2-i686-cd5.iso
+9d1adf02056ab5c956c58d3b1fa3fee34deb3643  frugalware-0.7rc2-i686-cd6.iso
+ae039f89f48c5ea9d9f2210818e3ad293a549c64  frugalware-0.7rc2-i686-cd7.iso
+141732044d0326a43d4fedfc625e14b78227fe11  frugalware-0.7rc2-i686-cd8.iso
+126a5e21d68e338b63d995962ffed74ee0b10f4f  frugalware-0.7rc2-i686-cd9.iso
+b07a0279cda34d253accd8cb1d20bbbec8323a22  frugalware-0.7rc2-i686-dvd1.iso
+703de06fbe5bf8a921dd359a3a645fc852f2b800  frugalware-0.7rc2-i686-dvd2.iso
+9cddd7752c80b891713e13b5cda3147babcd5fe4  frugalware-0.7rc2-i686-net.iso
+de6daa9f334d72718c789fd76351e02116ea7b24  fwlive-0.7rc2-i686-full.iso
+ca1ece2660098ea631381bb9e5ee7ab3a63e82c6  frugalware-0.7rc2-i686-tftp.img.gz
+e5171b988e894674def71156f71accc6cdc81312  frugalware-0.7rc2-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
<id>73</id>
<title>Frugalware 0.7rc1 (Sayshell) released</title>
<date>Tue Sep  4 02:40:14 CEST 2007</date>
diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml
index a0b8bcd..a7db395 100644
--- a/frugalware/xml/roadmap.xml
+++ b/frugalware/xml/roadmap.xml
@@ -31,7 +31,7 @@
<prerelease>
<preversion>rc2</preversion>
<predate>Oct 2, 2007</predate>
-			<prestatus>0</prestatus>
+			<prestatus>1</prestatus>
</prerelease>
<prerelease>
<preversion>rc1</preversion>
From vmiklos at frugalware.org  Tue Oct  2 11:21:53 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:21:56 2007
Subject: [Frugalware-git] frugalware-current: openoffice.org-2.3.0-1-i686
Message-ID: <20071002092153.813C913A4076@genesis.frugalware.org>

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

commit c6f9bc28172e45149e9e7467b86235445d0d98f6
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Sep 28 22:41:46 2007 +0200

openoffice.org-2.3.0-1-i686
source() fix

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index 5287f54..daf85e7 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -38,7 +38,7 @@ else
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/'"
fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2 \
-	http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.1/SDF/hu.sdf)
+	http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf)
signatures=($source.asc '')
options=(${options[@]} 'scriptlet')
_F_gnome_desktop="y"
From vmiklos at frugalware.org  Tue Oct  2 11:21:53 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:21:56 2007
Subject: [Frugalware-git] frugalware-current: tools/gitpull: make use of git
	remote's new --mirror switch
Message-ID: <20071002092153.9393113A4077@genesis.frugalware.org>

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

commit bbc973f8f9834a6a43833fde43977260a05dd755
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Sep 28 23:57:18 2007 +0200

tools/gitpull: make use of git remote's new --mirror switch
it results in some cleanup

diff --git a/tools/gitpull b/tools/gitpull
index a22796d..53bcadc 100755
--- a/tools/gitpull
+++ b/tools/gitpull
@@ -9,14 +9,12 @@ do
if [ -d $i.git ]; then
cd $i.git
git fetch -q origin
-		git update-ref HEAD refs/remotes/origin/master
else
git clone --bare -q $server/$i/.git $i.git
cd $i.git
-		git remote add origin $server/$i/.git
+		git remote add --mirror origin $server/$i/.git
fi
cd ..
-	rm -rf $i.git/refs/remotes
rsync $server/$i/.git/owner $i.git/
rsync $server/$i/.git/description $i.git/
echo "Anonymous Access: http://git.frugalware.org/repos/$i/.git" > $i.git/cloneurl
From vmiklos at frugalware.org  Tue Oct  2 11:21:53 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:00 2007
Subject: [Frugalware-git] frugalware-current: libsigc++12-1.2.7-4-i686
Message-ID: <20071002092153.C6A2F13A4078@genesis.frugalware.org>

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

commit b35ccd98d0eb3e3d5b3d511307b6553e3094ce79
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Sep 29 18:50:17 2007 +0200

libsigc++12-1.2.7-4-i686
up2date: get rid of pud

diff --git a/source/lib-extra/libsigc++12/FrugalBuild b/source/lib-extra/libsigc++12/FrugalBuild
index 472d7ec..ea3741d 100644
--- a/source/lib-extra/libsigc++12/FrugalBuild
+++ b/source/lib-extra/libsigc++12/FrugalBuild
@@ -11,7 +11,7 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
depends=('libstdc++')
_F_cd_path="libsigc++-$pkgver"
-up2date="pud -p 'http://ftp.gnome.org/pub/GNOME/sources/$realname/1.2/' -e 'LATEST-IS-(.*?)\s'"
+up2date="lynx -dump http://ftp.gnome.org/pub/GNOME/sources/$realname/1.2/|Flasttar"
source=(http://ftp.gnome.org/pub/GNOME/sources/$realname/1.2/$realname-$pkgver.tar.bz2)
sha1sums=('63cefd4a33193b5c80a9d00b269fe9791539d67b')
From vmiklos at frugalware.org  Tue Oct  2 11:21:53 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:00 2007
Subject: [Frugalware-git] frugalware-current: mod_perl-2.0.3-2-i686
Message-ID: <20071002092153.EBDF513A4076@genesis.frugalware.org>

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

commit 4b2053f6e127242eb33716ef91b4ffcb9db6c055
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Sep 29 20:49:46 2007 +0200

mod_perl-2.0.3-2-i686
up2date: no more pud

diff --git a/source/network-extra/mod_perl/FrugalBuild b/source/network-extra/mod_perl/FrugalBuild
index f01b9e3..b221f9f 100644
--- a/source/network-extra/mod_perl/FrugalBuild
+++ b/source/network-extra/mod_perl/FrugalBuild
@@ -9,9 +9,10 @@ url="http://perl.apache.org/start/index.html"
depends=('apr-util' 'perl>=5.8.7-2' 'apache')
groups=('network-extra')
archs=('i686' 'x86_64')
-#backup=()
-up2date="pud -p http://perl.apache.org/download/index.html -e '2.0: Version (.*?) -'"
+up2date="lynx -dump http://perl.apache.org/download/index.html|grep Version|sed 's/.*Version \(.*\) - .*/\1/;q'"
source=(http://perl.apache.org/dist/mod_perl-2.0-current.tar.gz RegistryCooker.patch)
+sha1sums=('e5d8b3cd7273c284cfbd79acb953ce179322bdc9'\
+          'be4887aa6ba38a8cba5f1ceff1ccdd69e539a44c')
options=('nofakeroot')

build()
@@ -29,6 +30,4 @@ build()
[ "$rmhosts" ] && rm /etc/hosts
}

-sha1sums=('e5d8b3cd7273c284cfbd79acb953ce179322bdc9'\
-          'be4887aa6ba38a8cba5f1ceff1ccdd69e539a44c')
# optimization OK
From vmiklos at frugalware.org  Tue Oct  2 11:21:54 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:00 2007
Subject: [Frugalware-git] frugalware-current: libvorbis-1.2.0-1-i686
Message-ID: <20071002092154.234DC13A4076@genesis.frugalware.org>

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

commit f0305c4c89a06095b03f037e24f39f33263bc97b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Sep 29 21:06:50 2007 +0200

libvorbis-1.2.0-1-i686
up2date: no more pud

diff --git a/source/lib/libvorbis/FrugalBuild b/source/lib/libvorbis/FrugalBuild
index b1d811b..afbfbb5 100644
--- a/source/lib/libvorbis/FrugalBuild
+++ b/source/lib/libvorbis/FrugalBuild
@@ -10,7 +10,7 @@ url="http://www.vorbis.com/"
groups=('lib')
archs=('i686' 'x86_64' 'ppc')
depends=('glibc' 'libogg')
-up2date="pud -p http://www.xiph.org/downloads/ -e 'libvorbis-(.*?)\.tar'";
+up2date="lynx -dump http://www.xiph.org/downloads/|grep libvorbis-|Flasttar"
source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz)
sha1sums=('6ff5f9d9d71cc385ee180171cc21af5653b76a16')
From vmiklos at frugalware.org  Tue Oct  2 11:21:54 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:00 2007
Subject: [Frugalware-git] frugalware-current: popa3d-1.0.2-1-i686
Message-ID: <20071002092154.4455D13A4076@genesis.frugalware.org>

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

commit 0808310d34596c1ef83477ca2aa5780fea1c1a2d
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Sep 29 21:15:34 2007 +0200

popa3d-1.0.2-1-i686
up2date: bye bye pud ;)

diff --git a/source/network/popa3d/FrugalBuild b/source/network/popa3d/FrugalBuild
index f77f47b..02b32f4 100644
--- a/source/network/popa3d/FrugalBuild
+++ b/source/network/popa3d/FrugalBuild
@@ -10,7 +10,7 @@ url="http://www.openwall.com/popa3d/"
groups=('network')
archs=('i686' 'x86_64')
depends=('openssl')
-up2date="pud -s http://www.openwall.com/popa3d/ -e 'popa3d-(.*?).tar'"
+up2date="lynx -dump $url |grep -m1 popa3d-.*gz|Flasttar"
source=(http://www.openwall.com/$pkgname/$pkgname-$pkgver.tar.gz popa3d-$pkgver.diff)
sha1sums=('85779cfc657050352b3bcda5ca7f1dfe7ac4e92b' \
'c91b1596096f376dd21e92f225cb13bf9f38ae7b')
From vmiklos at frugalware.org  Tue Oct  2 11:21:54 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:00 2007
Subject: [Frugalware-git] frugalware-current: source/include: move
	fwmakepkg.3 from pacman-tools
Message-ID: <20071002092154.5F55813A4076@genesis.frugalware.org>

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

commit 367b3aaee13e04bb144ac831336e82839b939643
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 22:31:48 2007 +0200

source/include: move fwmakepkg.3 from pacman-tools
fwmakepkg manpage is used to refer to all foo.sh(3) manpages generated from
include/*.sh, so it's logical to have it here

diff --git a/source/include/Makefile b/source/include/Makefile
index be6de53..756e00c 100644
--- a/source/include/Makefile
+++ b/source/include/Makefile
@@ -17,21 +17,25 @@

XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2

-all: $(subst .sh,.sh.3,$(wildcard *.sh))
+all: $(subst .sh,.sh.3,$(wildcard *.sh)) fwmakepkg.3

stat:
@echo $(shell ls *.3|wc -l)/$(shell ls *.sh|wc -l)

%.sh.txt: %.sh
-	sed -n 's/^#\( \|$$\)//;/^###/,/^###/p' $(basename $@)|sed 's/^###//' > $@
+	sed -n 's/^#\( \|$$\)//;/^###/,/^###/p' $^|sed 's/^###//' > $@

-%.sh.xml: %.sh.txt
-	asciidoc -d manpage -b docbook $(basename $@).txt
+%.xml: %.txt
+	asciidoc -d manpage -b docbook $^
sed -i '/<!DOCTYPE/s|\("http[^"].*"\)|"file://$(XML_PATH)/docbookx.dtd"|' $@

-%.sh.3: %.sh.xml
-	xsltproc --nonet --path $(XML_PATH) /etc/asciidoc/docbook-xsl/manpage.xsl $(basename $@).xml
+%.3: %.xml
+	xsltproc --nonet --path $(XML_PATH) /etc/asciidoc/docbook-xsl/manpage.xsl $^
sed -i 's/\\(bu/*/' $@

+fwmakepkg.txt: fwmakepkg.txt.in $(wildcard *.sh)
+	cat fwmakepkg.txt.in > fwmakepkg.txt
+	ls *.sh|sed '$$!s/\(.*\)$$/\*\1\*(3),/;$$s/\(.*\)$$/*\1*(3)/' >> fwmakepkg.txt
+
clean:
rm -f *.3 *.txt *.xml
diff --git a/source/include/fwmakepkg.txt.in b/source/include/fwmakepkg.txt.in
new file mode 100644
index 0000000..f88f816
--- /dev/null
+++ b/source/include/fwmakepkg.txt.in
@@ -0,0 +1,16 @@
+= fwmakepkg(3)
+
+== NAME
+
+fwmakepkg - Collection of macros used in Frugalware buildscripts
+
+== SYNOPSIS
+
+This manpage refers to all schemas which can be Fincluded in a FrugalBuild.
+
+== REPORTING BUGS
+
+Please report bugs to the <http://bugs.frugalware.org/> bug tracking system.
+
+== SEE ALSO
+
From vmiklos at frugalware.org  Tue Oct  2 11:21:54 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:00 2007
Subject: [Frugalware-git] frugalware-current: help2man-1.36.4-2-i686
Message-ID: <20071002092154.8790013A4076@genesis.frugalware.org>

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

commit 00b5b877f0cfd427e839bd46e01229286339c7ac
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Sep 30 23:45:54 2007 +0200

help2man-1.36.4-2-i686
added a README.Frugalware

diff --git a/source/apps-extra/help2man/FrugalBuild b/source/apps-extra/help2man/FrugalBuild
index e9a2fe8..7561335 100644
--- a/source/apps-extra/help2man/FrugalBuild
+++ b/source/apps-extra/help2man/FrugalBuild
@@ -3,20 +3,28 @@

pkgname=help2man
pkgver=1.36.4
-pkgrel=1
+pkgrel=2
pkgdesc="a script to create simple man pages from the --help and --version output of programs."
url="http://www.gnu.org/software/help2man/"
depends=('perl-gettext')
groups=('apps-extra')
archs=('i686' 'x86_64')
Fup2gnugz
-source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('f3ffd89d50ee158589f2d0ccdc476d2ac3ebff70')
+source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz \
+	README.Frugalware)
+sha1sums=('f3ffd89d50ee158589f2d0ccdc476d2ac3ebff70' \
+          '6e20b0bcda1f87ddc8522178ce0187543419f39f')

build()
{
+	Fcd
+	# fix broken symlink
+	rm ChangeLog
+	cat debian/changelog > ChangeLog
+
Fmkdir /usr/lib
Fbuild
+	Fdoc README.Frugalware
}

-# optimalization OK
+# optimization OK
diff --git a/source/apps-extra/help2man/README.Frugalware b/source/apps-extra/help2man/README.Frugalware
new file mode 100644
index 0000000..8981acb
--- /dev/null
+++ b/source/apps-extra/help2man/README.Frugalware
@@ -0,0 +1,5 @@
+The most common usage of this applications is something like this:
+
+----
+$ help2man -n "<oneliner description>" -S Frugalware -N ./<binary> |sed 's/\\(co/(c)/' ><binary>.1
+----
From vmiklos at frugalware.org  Tue Oct  2 11:21:54 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:01 2007
Subject: [Frugalware-git] frugalware-current: git-1.5.3.3-1-i686
Message-ID: <20071002092154.A35AA13A4076@genesis.frugalware.org>

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

commit 6978c8a9243a83cbc1b5a46813721833060f1250
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 15:58:52 2007 +0200

git-1.5.3.3-1-i686
version bump
(just bugfixes, it would be annoying not having this in 0.7)

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index e238c59..64a42ae 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=git
-pkgver=1.5.3.2
+pkgver=1.5.3.3
Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2
pkgrel=1
pkgdesc="A fast, scalable, distributed revision control system."
From vmiklos at frugalware.org  Tue Oct  2 11:21:54 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 11:22:01 2007
Subject: [Frugalware-git] frugalware-current: docs/authors.xml: use external
	dtd
Message-ID: <20071002092154.CC1A613A4076@genesis.frugalware.org>

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

commit 520f1f26ccc5a613333159d616aec44dff815ee3
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 1 16:02:24 2007 +0200

docs/authors.xml: use external dtd

diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml
index 068fdff..0553ab7 100644
--- a/docs/xml/authors.xml
+++ b/docs/xml/authors.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE authors [
-<!ELEMENT authors (author)*>
-<!ELEMENT author (name , nick , email , role+)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT nick (#PCDATA)>
-<!ELEMENT email (#PCDATA)>
-<!ELEMENT role (#PCDATA)>
-]>
+<!DOCTYPE authors SYSTEM "http://frugalware.org/dtd/authors.dtd">

<!-- a few comments:
- name: the order is: family, first, middle
From voroskoi at frugalware.org  Tue Oct  2 11:29:10 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct  2 11:29:11 2007
Subject: [Frugalware-git] frugalware-current: emerald-0.2.1-2-i686
Message-ID: <20071002092910.EAB7013A4076@genesis.frugalware.org>

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

commit 7393228af2a63bdc4a4952a3bd4d16710b38677f
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 2 11:15:12 2007 +0200

emerald-0.2.1-2-i686
recompiled with libwnck
added a patch for new libwnck builds
new m8r

diff --git a/source/x11-extra/emerald/FrugalBuild b/source/x11-extra/emerald/FrugalBuild
index 24628c5..96b19fb 100644
--- a/source/x11-extra/emerald/FrugalBuild
+++ b/source/x11-extra/emerald/FrugalBuild
@@ -1,8 +1,9 @@
# Compiling Time: 0.22 SBU
-# Maintainer: AlexExtreme <alex@alex-smith.me.uk>
+# Contributor: AlexExtreme <alex@alex-smith.me.uk>
+# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=emerald
-pkgrel=1
+pkgrel=2
makedepends=('intltool' 'perl-xml')
groups=('x11-extra')
archs=('i686' 'x86_64')
@@ -12,8 +13,10 @@ Finclude gnome-scriptlet beryl
conflicts=('cgwd')
provides=('cgwd')
replaces=('cgwd')
-depends=("beryl=$pkgver" 'gtk+2' "beryl-plugins=$pkgver" 'desktop-file-utils' 'shared-mime-info')
+depends=("beryl=$pkgver" 'gtk+2' "beryl-plugins=$pkgver" 'desktop-file-utils' 'shared-mime-info' 'libwnck>=2.20')
Fconfopts="$Fconfopts --disable-mime-update"
-sha1sums=('d3f4b15dd24f731a8a5930adff79f6503a5ea661')
+source=($source libwnck-version.patch)
+sha1sums=('d3f4b15dd24f731a8a5930adff79f6503a5ea661' \
+          'd249ab6d2efddaf6fa19a2a87836dbcad5eef4f2')

# optimization OK
diff --git a/source/x11-extra/emerald/libwnck-version.patch b/source/x11-extra/emerald/libwnck-version.patch
new file mode 100644
index 0000000..79aea4d
--- /dev/null
+++ b/source/x11-extra/emerald/libwnck-version.patch
@@ -0,0 +1,29 @@
+diff -aur emerald-0.2.1/configure.ac fw_emerald-0.2.1/configure.ac
+--- emerald-0.2.1/configure.ac	2007-01-30 05:23:43.000000000 +0100
++++ fw_emerald-0.2.1/configure.ac	2007-10-02 08:48:27.000000000 +0200
+@@ -42,6 +42,12 @@
+ AC_MSG_NOTICE([Using PKG_CONFIG_PATH=$PKG_CONFIG_PATH])
+
+ PKG_CHECK_MODULES(EMERALD, $EMERALD_REQUIRES)
++PKG_CHECK_EXISTS(libwnck-1.0 >= 2.19.3,
++		 [have_libwnck_2_19_3=yes], [have_libwnck_2_19_3=no])
++if test "$have_libwnck_2_19_3" = yes; then
++	AC_DEFINE(HAVE_LIBWNCK_2_19_3, 1,
++		  [Define to 1 if libwnck version >= 2_19_3])
++fi
+
+ AC_SUBST(EMERALD_REQUIRES)
+ CFLAGS="$CFLAGS $EMERALD_CFLAGS"
+diff -aur emerald-0.2.1/src/main.c fw_emerald-0.2.1/src/main.c
+--- emerald-0.2.1/src/main.c	2007-03-17 20:29:38.000000000 +0100
++++ fw_emerald-0.2.1/src/main.c	2007-10-02 08:49:14.000000000 +0200
+@@ -3781,7 +3781,9 @@
+ 		return;
+ 	case WNCK_WINDOW_NORMAL:
+ 	case WNCK_WINDOW_DIALOG:
++#ifndef HAVE_LIBWNCK_2_19_3
+ 	case WNCK_WINDOW_MODAL_DIALOG:
++#endif
+ 	case WNCK_WINDOW_TOOLBAR:
+ 	case WNCK_WINDOW_MENU:
+ 	case WNCK_WINDOW_UTILITY:
From priyank at frugalware.org  Tue Oct  2 12:29:57 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 12:29:58 2007
Subject: [Frugalware-git] frugalware-current: gnome-vfs-obexftp-0.4-1-i686
Message-ID: <20071002102957.83AB513A4076@genesis.frugalware.org>

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

commit 7858567e5d81b6e4aa1f0f6ed19cca9f8f71f13e
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 15:57:18 2007 +0530

gnome-vfs-obexftp-0.4-1-i686
* New package / Added as a dependency for blueman

diff --git a/source/gnome-extra/gnome-vfs-obexftp/FrugalBuild b/source/gnome-extra/gnome-vfs-obexftp/FrugalBuild
new file mode 100644
index 0000000..834f7c2
--- /dev/null
+++ b/source/gnome-extra/gnome-vfs-obexftp/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0.09 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=gnome-vfs-obexftp
+pkgver=0.4
+pkgrel=1
+pkgdesc="Browse bluetooth devices from GNOME."
+Finclude gnome
+url="http://www.gnome.org"
+depends=('gnome-vfs>=2.20.0' 'openobex' 'bluez-utils>=3.19' 'dbus')
+groups=('gnome-extra')
+archs=('i686')
+sha1sums=('5c0af3f4e92ade870fbbe88fbf05b9377c918935')
+
+# optimization OK
From crazy at frugalware.org  Tue Oct  2 12:46:56 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 12:46:59 2007
Subject: [Frugalware-git] frugalware-current: util-linux-ng-2.13-2-i686
Message-ID: <20071002104656.D5CC413A4076@genesis.frugalware.org>

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

commit 3294e61e4afaf97c252608320e6c3befed373e24
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 1 10:32:23 2007 +0200

util-linux-ng-2.13-2-i686
* relbump
* added patches from git to fix some strange bugs

diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild
index 5d7a93a..eb2ac3f 100644
--- a/source/base/util-linux-ng/FrugalBuild
+++ b/source/base/util-linux-ng/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=util-linux-ng
pkgver=2.13
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux"
backup=('etc/sysconfig/console' 'etc/sysconfig/numlock')
@@ -18,8 +18,13 @@ source=(http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v$pkgver/util-linux-
frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \
rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \
rc.swap-{de,hu}.po rc.time-{de,hu}.po \
-	README.Frugalware)
-signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+	README.Frugalware \
+	login_dont-segfault-on-EOF.patch \
+	mount_pointer-after-free.patch \
+	mount_privileges.patch \
+	namei_fifo.patch \
+	rtc_fix-rtc-option.patch)
+signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')

build() {
Fbuild --enable-arch --enable-raw --with-fsprobe=blkid --enable-elvtune \
diff --git a/source/base/util-linux-ng/login_dont-segfault-on-EOF.patch b/source/base/util-linux-ng/login_dont-segfault-on-EOF.patch
new file mode 100644
index 0000000..d9a049a
--- /dev/null
+++ b/source/base/util-linux-ng/login_dont-segfault-on-EOF.patch
@@ -0,0 +1,36 @@
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 20 Sep 2007 22:34:30 +0000 (+0200)
+Subject: login: login segfaults on EOF (rh#298461)
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=e797d83232802cf439b2ed893e784d3636357349
+
+login: login segfaults on EOF (rh#298461)
+
+Stupid bug in audit code:
+
+  $ login
+  login: ^D
+  login: ^D
+  Segmentation fault
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/login-utils/login.c b/login-utils/login.c
+index e582779..1af8792 100644
+--- a/login-utils/login.c
++++ b/login-utils/login.c
+@@ -330,12 +330,12 @@ logaudit(const char *tty, const char *username, const char *hostname,
+ 	audit_fd = audit_open();
+ 	if (audit_fd == -1)
+ 		return;
+-	if (!pwd)
++	if (!pwd && username)
+ 		pwd = getpwnam(username);
+ 	if (pwd)
+ 		snprintf(buf, sizeof(buf), "uid=%d", pwd->pw_uid);
+ 	else
+-		snprintf(buf, sizeof(buf), "acct=%s", username);
++		snprintf(buf, sizeof(buf), "acct=%s", username ? username : "(unknown)");
+
+ 	audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
+ 		buf, hostname, NULL, tty, status);
diff --git a/source/base/util-linux-ng/mount_pointer-after-free.patch b/source/base/util-linux-ng/mount_pointer-after-free.patch
new file mode 100644
index 0000000..a1d2d27
--- /dev/null
+++ b/source/base/util-linux-ng/mount_pointer-after-free.patch
@@ -0,0 +1,42 @@
+From: Norbert Buchmuller <norbi@nix.hu>
+Date: Sun, 2 Sep 2007 20:08:53 +0000 (-0600)
+Subject: mount: chain of symlinks to fstab causes use of pointer after free
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=a9d6150d12b368820a98cb26ec0d9f76fa4f0905
+
+mount: chain of symlinks to fstab causes use of pointer after free
+
+Looking at the source in 'mount/realpath.c' we find that when dealing with
+the second or later symlink in the chain, a memory block was free()d before
+copying its contents to a newly allocated block.
+---
+
+diff --git a/mount/realpath.c b/mount/realpath.c
+index 9dc517e..d659685 100644
+--- a/mount/realpath.c
++++ b/mount/realpath.c
+@@ -97,6 +97,7 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
+ 		} else {
+ #ifdef resolve_symlinks		/* Richard Gooch dislikes sl resolution */
+ 			int m;
++			char *newbuf;
+
+ 			/* Note: readlink doesn't add the null byte. */
+ 			link_path[n] = '\0';
+@@ -110,12 +111,12 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
+
+ 			/* Insert symlink contents into path. */
+ 			m = strlen(path);
++			newbuf = xmalloc(m + n + 1);
++			memcpy(newbuf, link_path, n);
++			memcpy(newbuf + n, path, m + 1);
+ 			if (buf)
+ 				free(buf);
+-			buf = xmalloc(m + n + 1);
+-			memcpy(buf, link_path, n);
+-			memcpy(buf + n, path, m + 1);
+-			path = buf;
++			path = buf = newbuf;
+ #endif
+ 		}
+ 		*npath++ = '/';
+
diff --git a/source/base/util-linux-ng/mount_privileges.patch b/source/base/util-linux-ng/mount_privileges.patch
new file mode 100644
index 0000000..a3758dd
--- /dev/null
+++ b/source/base/util-linux-ng/mount_privileges.patch
@@ -0,0 +1,52 @@
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Thu, 20 Sep 2007 12:57:20 +0000 (+0200)
+Subject: mount: doesn't drop privileges properly when calling helpers
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=ebbeb2c7ac1b00b6083905957837a271e80b187e
+
+mount: doesn't drop privileges properly when calling helpers
+
+{,u}mount calls setuid() and setgid() in the wrong order and doesn't checking
+the return value of set{u,g}id(() when running helpers like mount.nfs.
+
+Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/mount/mount.c b/mount/mount.c
+index 40699f3..5bc2b30 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -634,8 +634,12 @@ check_special_mountprog(const char *spec, const char *node, const char *type, in
+ 		 char *oo, *mountargs[10];
+ 		 int i = 0;
+
+-		 setuid(getuid());
+-		 setgid(getgid());
++		 if(setgid(getgid()) < 0)
++			 die(EX_FAIL, _("mount: cannot set group id: %s"), strerror(errno));
++
++		 if(setuid(getuid()) < 0)
++			 die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno));
++
+ 		 oo = fix_opts_string (flags, extra_opts, NULL);
+ 		 mountargs[i++] = mountprog;				/* 1 */
+ 		 mountargs[i++] = (char *) spec;			/* 2 */
+diff --git a/mount/umount.c b/mount/umount.c
+index b3100c9..3221619 100644
+--- a/mount/umount.c
++++ b/mount/umount.c
+@@ -102,8 +102,12 @@ check_special_umountprog(const char *spec, const char *node,
+ 				char *umountargs[8];
+ 				int i = 0;
+
+-				setuid(getuid());
+-				setgid(getgid());
++				if(setgid(getgid()) < 0)
++					die(EX_FAIL, _("umount: cannot set group id: %s"), strerror(errno));
++
++				if(setuid(getuid()) < 0)
++					die(EX_FAIL, _("umount: cannot set user id: %s"), strerror(errno));
++
+ 				umountargs[i++] = umountprog;
+ 				umountargs[i++] = xstrdup(node);
+ 				if (nomtab)
diff --git a/source/base/util-linux-ng/namei_fifo.patch b/source/base/util-linux-ng/namei_fifo.patch
new file mode 100644
index 0000000..cedc193
--- /dev/null
+++ b/source/base/util-linux-ng/namei_fifo.patch
@@ -0,0 +1,60 @@
+From: Li Zefan <lizf@cn.fujitsu.com>
+Date: Mon, 10 Sep 2007 08:20:48 +0000 (+0800)
+Subject: namei: add to identify FIFO (named pipe) and update manpage
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=f062c8a69a4ebae1f3b24da6fb2be1cc51a69f7c
+
+namei: add to identify FIFO (named pipe) and update manpage
+
+namei can't identify FIFO, and it will complain that it's an unknown type.
+
+Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
+---
+
+diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
+index ad37574..394eb6d 100644
+--- a/misc-utils/namei.1
++++ b/misc-utils/namei.1
+@@ -33,6 +33,7 @@ outputs a the following characters to identify the file types found:
+     s = socket
+     b = block device
+     c = character device
++    p = FIFO (named pipe)
+     - = regular file
+     ? = an error of some kind
+ .fi
+diff --git a/misc-utils/namei.c b/misc-utils/namei.c
+index b0c33e8..9480675 100644
+--- a/misc-utils/namei.c
++++ b/misc-utils/namei.c
+@@ -30,6 +30,7 @@ For each line output, the program puts a file type first:
+     s = socket
+     b = block device
+     c = character device
++    p = FIFO (named pipe)
+     - = regular file
+     ? = an error of some kind
+
+@@ -46,6 +47,9 @@ chdir to /,  or if it encounters an unknown file type.
+ - fixed logic; don't follow the path if a component is not directory
+ - fixed infinite loop of symbolic links; stack size is very limited
+
++2007-09-10 Li Zefan <lizf@cn.fujitsu.com>
++- added to identify FIFO
++
+ -------------------------------------------------------------*/
+
+ #include <stdio.h>
+@@ -306,6 +310,13 @@ namei(char *file, int lev, mode_t *lastmode) {
+ 		    (void)printf(" s %s\n", buf);
+ 		break;
+
++		case S_IFIFO:
++		if (mflag)
++			printf(" p%s %s\n", pperm(stb.st_mode), buf);
++		else
++			printf(" p %s\n", buf);
++		break;
++
+ 	    case S_IFREG:
+ 		if(mflag)
+ 		    (void)printf(" -%s %s\n", pperm(stb.st_mode), buf);
diff --git a/source/base/util-linux-ng/rtc_fix-rtc-option.patch b/source/base/util-linux-ng/rtc_fix-rtc-option.patch
new file mode 100644
index 0000000..b06b48b
--- /dev/null
+++ b/source/base/util-linux-ng/rtc_fix-rtc-option.patch
@@ -0,0 +1,71 @@
+From: Matthias Koenig <mkoenig@suse.de>
+Date: Thu, 20 Sep 2007 09:11:18 +0000 (+0200)
+Subject: hwclock: fix --rtc option
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=5d1f6bae3b298809ecd63b3e55f6ab30caaa4dbf
+
+hwclock: fix --rtc option
+
+The --rtc option does not set the name of the device correctly.
+It still uses /dev/rtc even if the --rtc option is given.
+
+Testcase:
+$ mv /dev/rtc /dev/foo
+$ hwclock --show --debug --rtc=/dev/foo
+hwclock from util-linux-2.13-rc2
+Using /dev interface to clock.
+Last drift adjustment done at 1190198135 seconds after 1969
+Last calibration done at 1190198135 seconds after 1969
+Hardware clock is on local time
+Assuming hardware clock is kept in local time.
+Waiting for clock tick...
+hwclock: open() of /dev/rtc failed, errno=2: No such file or directory.
+...got clock tick
+
+Co-Author: Karel Zak <kzak@redhat.com>
+Signed-off-by: Matthias Koenig <mkoenig@suse.de>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/hwclock/rtc.c b/hwclock/rtc.c
+index f8e626e..724daf9 100644
+--- a/hwclock/rtc.c
++++ b/hwclock/rtc.c
+@@ -104,24 +104,21 @@ open_rtc(void) {
+ 		"/dev/misc/rtc",
+ 		NULL
+ 	};
+-	char **p = fls;
+-	char *fname = rtc_dev_name ? : *p;
+-
+-	do {
+-		int fd = open(fname, O_RDONLY);
+-
+-		if (fd < 0 && errno == ENOENT) {
+-			if (fname == rtc_dev_name)
+-				break;
+-			fname = *++p;
+-		} else {
+-			rtc_dev_name = *p;
+-			return fd;
+-		}
+-	} while(fname);
+-
+-	if (!rtc_dev_name)
+-		rtc_dev_name = *fls;
++	char **p;
++
++	/* --rtc option has been given */
++	if (rtc_dev_name)
++		return open(rtc_dev_name, O_RDONLY);
++
++	for (p=fls; *p; ++p) {
++		int fd = open(*p, O_RDONLY);
++
++		if (fd < 0 && errno == ENOENT)
++			continue;
++		rtc_dev_name = *p;
++		return fd;
++	}
++	rtc_dev_name = *fls;	/* default */
+ 	return -1;
+ }
From crazy at frugalware.org  Tue Oct  2 12:46:56 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 12:47:00 2007
Subject: [Frugalware-git] frugalware-current: binutils-2.18.50.0.1-1-i686
Message-ID: <20071002104656.E4C4C13A4077@genesis.frugalware.org>

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

commit db5e3aff09b9cc9748017b66782c8cb35215730a
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 1 13:46:39 2007 +0200

binutils-2.18.50.0.1-1-i686
* Version bump
* readded static up2date for this one
* added an patch to fix newer makeinfo detection

diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild
index 56ad666..58a4b14 100644
--- a/source/devel/binutils/FrugalBuild
+++ b/source/devel/binutils/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=binutils
-pkgver=2.18
+pkgver=2.18.50.0.1
pkgrel=1
pkgdesc="A set of programs to assemble and manipulate binary and object files"
url="http://www.gnu.org/software/binutils/"
@@ -10,19 +10,25 @@ depends=('bash' 'glibc>=2.6-2')
groups=('devel' 'devel-core')
archs=('i686' 'x86_64' 'ppc')
# for now, we need a devel version to utilize glibc-2.6
-#up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.17/2.17.50.0.18/'"
-Fup2gnubz2
-#source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2)
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2)
-signatures=($source.sig)
+up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.1/'"
+#Fup2gnubz2
+source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2 makeinfo.patch)
+#source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2)
+#signatures=($source.sig)
+sha1sums=('4e28e9b2ab5f37162569a60a8a88db29bacf28fe' \
+          '27ad0ca88accd65eb47f910e111cc14504d9022b')

build()
{
-	Fbuild --enable-shared --disable-werror
+	Fcd
+	Fpatchall
+	autoconf || Fdie
+	Fmake --enable-shared --disable-werror
+	Fmakeinstall
if [ "$CARCH" == "x86_64" ]; then
-		cd libiberty
+		cd libiberty || Fdie
unset MAKEFLAGS
-		make clean
+		make clean || return 1
make CFLAGS="-g -fPIC $CFLAGS" || return 1
Ffilerel /usr/lib/libiberty.a
fi
diff --git a/source/devel/binutils/makeinfo.patch b/source/devel/binutils/makeinfo.patch
new file mode 100644
index 0000000..fbcf948
--- /dev/null
+++ b/source/devel/binutils/makeinfo.patch
@@ -0,0 +1,12 @@
+diff -Naur binutils-2.18.50.0.1/configure.ac binutils-2.18.50.0.1-p/configure.ac
+--- binutils-2.18.50.0.1/configure.ac	2007-09-08 19:33:35.000000000 +0200
++++ binutils-2.18.50.0.1-p/configure.ac	2007-10-01 11:48:52.000000000 +0200
+@@ -2424,7 +2424,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
From crazy at frugalware.org  Tue Oct  2 12:46:56 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 12:47:00 2007
Subject: [Frugalware-git] frugalware-current: gpodder-0.10.0-2-i686
Message-ID: <20071002104656.F1D8413A4078@genesis.frugalware.org>

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

commit e6c5ee5c81643505fccaf0a3b068fa4d231779d4
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 1 14:02:36 2007 +0200

gpodder-0.10.0-2-i686
* relbump
* adedd feedparser to depends
* added missing scriptlet option
* closes #2454

diff --git a/source/gnome-extra/gpodder/FrugalBuild b/source/gnome-extra/gpodder/FrugalBuild
index 76eab68..cf68d9d 100644
--- a/source/gnome-extra/gpodder/FrugalBuild
+++ b/source/gnome-extra/gpodder/FrugalBuild
@@ -4,14 +4,15 @@

pkgname=gpodder
pkgver=0.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="A podcast reciever/catcher."
-depends=('pygtk' 'pyxml' 'wget' 'python' 'libglade' 'imagemagick')
+depends=('pygtk' 'pyxml' 'wget' 'python' 'libglade' 'imagemagick' 'feedparser')
makedepends=('help2man')
groups=('gnome-extra')
archs=('i686')
Finclude berlios
_F_gnome_iconcache="y"
+options=('scriptlet')
Finclude gnome-scriptlet
sha1sums=('059e5ea4450afbd1681710a22abf0e1cf22627fd')
From iron at frugalware.org  Tue Oct  2 12:51:47 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Tue Oct  2 12:51:48 2007
Subject: [Frugalware-git] homepage-ng: fwng: 0.7rc2 Hungarian announcement
Message-ID: <20071002105147.5678513A4076@genesis.frugalware.org>

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

commit 921785a1e3896415c5d5a03df149bceb3b11df23
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Tue Oct 2 12:51:35 2007 +0200

fwng: 0.7rc2 Hungarian announcement

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index fc75f9f..c2c4d16 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -12,6 +12,85 @@
]>
<news>
<post>
+		<id>74</id>
+		<title>Megjelent a Frugalware 0.7rc2 (Sayshell)</title>
+		<date>Tue Oct  2 12:28:34 CEST 2007</date>
+		<author>IroNiQ</title>
+		<hidden>0</title>
+		<content><![CDATA[
+			A Frugalware Fejlesztői Csapat örömmel <a href="/news/74/hu">jelenti be</a> a Frugalware 0.7rc2 azonnali elérhetőségét, mint az eljövendő 0.7-es stabil kiadás utolsót, kiadásra jelölt változatát.<br />
+			Egy rĂśvid, nem teljes lista a 0.7rc1 Ăłta tĂśrtĂŠnt vĂĄltozĂĄsokrĂłl:<br />
+			<ul>
+				<li>CsomagfrissĂ­tĂŠsek:
+					<ul>
+						<li>GNOME 2.20.0</li>
+						<li>OpenOffice.org 2.3 OOXML tĂĄmogatĂĄssal ĂŠs Mozilla plugin-nal</li>
+						<li>TĂśbb, mint 1000 vĂĄltozĂĄs, tĂśbbnyire hibajavĂ­tĂĄsok</li>
+					</ul>
+				</li>
+				<li>Újdonságok:
+					<ul>
+						<li>Új, grafikus csomagkezelő: Gfpm</li>
+						<li>Új Gfpm és Gnetconfig plugin Xfce4 Beállításkezelőhöz</li>
+					</ul>
+				</li>
+				<li>Telepítő:
+					<ul>
+						<li>JavĂ­tott PPPoE tĂĄmogatĂĄs</li>
+						<li>A lassĂş formĂĄzĂĄs (hibĂĄs blokkok keresĂŠsĂŠnek engedĂŠlyezĂŠsekor) ismĂŠt mĹąkĂśdik swap partĂ­ciĂł esetĂŠn</li>
+						<li>JavĂ­tott svĂŠd nyelvi tĂĄmogatĂĄs</li>
+					</ul>
+				</li>
+			</ul>
+			Bővebb információkért tekintse meg a Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing változáslistát</a>.<br />
+			LetĂśltĂŠs i686-ra:<br />
+			<b>MEGJEGYZÉS</b>: A 3-13. CD-ket valamint a 2. DVD-t csak akkor töltse le, ha a telepítés helyén nincs internetkapcsolata.<br />
+				<a href="/download/frugalware-testing-iso/fwlive-0.7rc2-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd2.iso">dvd2</a>
+			<br />
+			SHA1SUMok:
+			<pre>
+de6daa9f334d72718c789fd76351e02116ea7b24  fwlive-0.7rc2-i686-full.iso
+9cddd7752c80b891713e13b5cda3147babcd5fe4  frugalware-0.7rc2-i686-net.iso
+e5171b988e894674def71156f71accc6cdc81312  frugalware-0.7rc2-i686-usb.tar.gz
+ca1ece2660098ea631381bb9e5ee7ab3a63e82c6  frugalware-0.7rc2-i686-tftp.img.gz
+00f9519569b0ab82933a6f7ad72b88f416c0ff29  frugalware-0.7rc2-i686-cd1.iso
+3cb912374d3e2dd6146875b841409b8bf837fd77  frugalware-0.7rc2-i686-cd2.iso
+34d7f5629e81649985fdc51cdb393f8f58265601  frugalware-0.7rc2-i686-cd3.iso
+dab534a873c0d467189f15b939725ec13c951dd5  frugalware-0.7rc2-i686-cd4.iso
+1595df5afb10bce2c15beed340a743c1c5a7a830  frugalware-0.7rc2-i686-cd5.iso
+9d1adf02056ab5c956c58d3b1fa3fee34deb3643  frugalware-0.7rc2-i686-cd6.iso
+ae039f89f48c5ea9d9f2210818e3ad293a549c64  frugalware-0.7rc2-i686-cd7.iso
+141732044d0326a43d4fedfc625e14b78227fe11  frugalware-0.7rc2-i686-cd8.iso
+126a5e21d68e338b63d995962ffed74ee0b10f4f  frugalware-0.7rc2-i686-cd9.iso
+817395071b963878b186cb6de3cc625c054a2fdc  frugalware-0.7rc2-i686-cd10.iso
+08aaacc8b0a49cedbdfbf0cc250c381865e35e12  frugalware-0.7rc2-i686-cd11.iso
+26090540104483c2e0ea5cb04cef94bead0126b2  frugalware-0.7rc2-i686-cd12.iso
+57f6a6b306666bdd4e273e6b1bf860f5c2553172  frugalware-0.7rc2-i686-cd13.iso
+b07a0279cda34d253accd8cb1d20bbbec8323a22  frugalware-0.7rc2-i686-dvd1.iso
+703de06fbe5bf8a921dd359a3a645fc852f2b800  frugalware-0.7rc2-i686-dvd2.iso
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
<id>73</id>
<title>Megjelent a Frugalware 0.7rc1 (Sayshell)</title>
<date>Thu Sep  6 11:55:14 CEST 2007</date>
From iron at frugalware.org  Tue Oct  2 12:54:04 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Tue Oct  2 12:54:06 2007
Subject: [Frugalware-git] homepage-ng: fwng: corrected an error in .hu
	announcement
Message-ID: <20071002105404.C168C13A4076@genesis.frugalware.org>

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

commit eba01cc07a833cc2f4b5c74f69579078341d4568
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Tue Oct 2 12:53:57 2007 +0200

fwng: corrected an error in .hu announcement

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index c2c4d16..cc439c1 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -15,7 +15,7 @@
<id>74</id>
<title>Megjelent a Frugalware 0.7rc2 (Sayshell)</title>
<date>Tue Oct  2 12:28:34 CEST 2007</date>
-		<author>IroNiQ</title>
+		<author>IroNiQ</author>
<hidden>0</title>
<content><![CDATA[
A Frugalware Fejlesztői Csapat örömmel <a href="/news/74/hu">jelenti be</a> a Frugalware 0.7rc2 azonnali elérhetőségét, mint az eljövendő 0.7-es stabil kiadás utolsót, kiadásra jelölt változatát.<br />
From iron at frugalware.org  Tue Oct  2 12:55:04 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Tue Oct  2 12:55:06 2007
Subject: [Frugalware-git] homepage-ng: fwng: another correction in .hu
	translation
Message-ID: <20071002105504.99CAE13A4076@genesis.frugalware.org>

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

commit 84c74f3f13c480573bd04d47fa99379e37e19f2e
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Tue Oct 2 12:54:56 2007 +0200

fwng: another correction in .hu translation

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index cc439c1..2ca9459 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -16,7 +16,7 @@
<title>Megjelent a Frugalware 0.7rc2 (Sayshell)</title>
<date>Tue Oct  2 12:28:34 CEST 2007</date>
<author>IroNiQ</author>
-		<hidden>0</title>
+		<hidden>0</hidden>
<content><![CDATA[
A Frugalware Fejlesztői Csapat örömmel <a href="/news/74/hu">jelenti be</a> a Frugalware 0.7rc2 azonnali elérhetőségét, mint az eljövendő 0.7-es stabil kiadás utolsót, kiadásra jelölt változatát.<br />
Egy rĂśvid, nem teljes lista a 0.7rc1 Ăłta tĂśrtĂŠnt vĂĄltozĂĄsokrĂłl:<br />
From iron at frugalware.org  Tue Oct  2 12:57:32 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Tue Oct  2 12:57:33 2007
Subject: [Frugalware-git] homepage-ng: small correction in translation
Message-ID: <20071002105732.371F113A4076@genesis.frugalware.org>

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

commit 3d9bc898118db28185e2e90085babd42ec8bb01d
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Tue Oct 2 12:57:22 2007 +0200

small correction in translation

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index 2ca9459..452b86d 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -62,7 +62,7 @@
<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd11.iso">cd11</a>,
<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd12.iso">cd12</a>,
<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd13.iso">cd13</a>,
-				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd1.iso">dvd1</a> ĂŠs
<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd2.iso">dvd2</a>
<br />
SHA1SUMok:
From priyank at frugalware.org  Tue Oct  2 13:48:57 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 13:49:02 2007
Subject: [Frugalware-git] setup: spelling fix
Message-ID: <20071002114857.8414D13A4076@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=62492b89d7194f7ccda4adce5b1667be61f3afce

commit 62492b89d7194f7ccda4adce5b1667be61f3afce
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 17:18:12 2007 +0530

spelling fix

diff --git a/src/plugins/select.c b/src/plugins/select.c
index bd1bd01..85dca50 100644
--- a/src/plugins/select.c
+++ b/src/plugins/select.c
@@ -484,7 +484,7 @@ int run(GList **config)

if(pacman_initialize("/mnt/target") == -1)
{
-		fprintf(stderr, "failed to initilize pacman library (%s)\n",
+		fprintf(stderr, "failed to initialize pacman library (%s)\n",
pacman_strerror(pm_errno));
return(1);
}
From priyank at frugalware.org  Tue Oct  2 14:35:37 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 14:35:41 2007
Subject: [Frugalware-git] frugalware-current: blueman-0.19-1-i686
Message-ID: <20071002123537.429AA13A4076@genesis.frugalware.org>

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

commit 22dd14f7608851fcb0521ffe7d1f13aaf6687bdf
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 18:04:11 2007 +0530

blueman-0.19-1-i686
* New package / Initial import

diff --git a/source/gnome-extra/blueman/FrugalBuild b/source/gnome-extra/blueman/FrugalBuild
new file mode 100644
index 0000000..4daea94
--- /dev/null
+++ b/source/gnome-extra/blueman/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=blueman
+pkgver=0.19
+pkgrel=1
+pkgdesc="A Bluetooth management utility for GNOME."
+_F_sourceforge_ext="-all.tar.gz"
+Finclude sourceforge
+url="http://walmis.balticum.lt/"
+depends=()
+rodepends=('gnome-bluetooth' 'gnome-vfs-obexftp' 'pybluez' 'dbus-python' 'bluez-utils>=3.19')
+groups=('gnome-extra')
+archs=('i686')
+up2date="lynx -dump $url | grep -A1 Current | tail -n1 | sed 's/ //g'"
+source=(${source[@]} $pkgname-makefile.diff)
+sha1sums=('8fcc0de14069fb3a6bac63899d62c962b4eccb8a' \
+          '10954ef32210dfa3712bdb8dfda35ac1261ddfdf')
+
+build() {
+	cd $Fsrcdir
+	patch -Np0 < $pkgname-makefile.diff
+	make prefix=$Fdestdir/usr install
+	Fcp /usr/share/blueman/icons/bluetooth.png /usr/share/pixmaps/blueman.png
+}
+
diff --git a/source/gnome-extra/blueman/blueman-makefile.diff b/source/gnome-extra/blueman/blueman-makefile.diff
new file mode 100644
index 0000000..6a8da89
--- /dev/null
+++ b/source/gnome-extra/blueman/blueman-makefile.diff
@@ -0,0 +1,32 @@
+--- makefile	2007-10-02 17:55:40.000000000 +0530
++++ makefile.new	2007-10-02 17:59:07.000000000 +0530
+@@ -2,15 +2,18 @@
+ prefix = /usr
+
+ install:
++	mkdir -p $(prefix)/bin
+ 	mkdir -p $(prefix)/share/blueman
+ 	mkdir -p $(prefix)/share/blueman/icons
+ 	mkdir -p $(prefix)/share/blueman/icons/devices
+ 	mkdir -p $(prefix)/share/blueman/icons/signal
++	mkdir -p ${prefix}/share/applications
++	mkdir -p ${prefix}/share/pixmaps
+ 	install icons/*.* $(prefix)/share/blueman/icons
+ 	install icons/devices/*.* $(prefix)/share/blueman/icons/devices
+ 	install icons/signal/*.* $(prefix)/share/blueman/icons/signal
+-	install *.desktop /usr/share/applications
+-
++	install *.desktop ${prefix}/share/applications
++
+ 	mkdir -p $(prefix)/share/blueman/lib
+
+ 	install src/*.py $(prefix)/share/blueman/lib/
+@@ -18,7 +21,7 @@
+
+ 	install src/*.glade $(prefix)/share/blueman/
+
+-	install src/blueman $(prefix)/bin
++	install src/blueman $(prefix)/bin/
+
+ uninstall:
+ 	-rm -r $(prefix)/share/blueman
From crazy at frugalware.org  Tue Oct  2 14:40:42 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 14:40:44 2007
Subject: [Frugalware-git] frugalware-current: wine-0.9.46-1-i686
Message-ID: <20071002124042.A496313A4076@genesis.frugalware.org>

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

commit 4a217c7366da1c0d8535c9eb13e703d2d75120b6
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 14:32:55 2007 +0200

wine-0.9.46-1-i686
* Version bump

diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index 180e32a..a352d01 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos <vmiklos@frugalware.org>

pkgname=wine
-pkgver=0.9.45
+pkgver=0.9.46
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=('87a0282bb5020c26a3f35a10d39140c30764c327' \
+sha1sums=('b7993b116c9efa879977f7192059f23e4dc6167e' \
'a9c70a49cef90cf60c2e90e63753858387f7117a' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
'8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
From crazy at frugalware.org  Tue Oct  2 14:52:37 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 14:52:42 2007
Subject: [Frugalware-git] frugalware-current: tzdata-2007h-1-i686
Message-ID: <20071002125237.DDBD813A4076@genesis.frugalware.org>

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

commit 4bae740a890a31c382aea7cade951b113f55994a
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 14:49:20 2007 +0200

tzdata-2007h-1-i686
* New package
* ( well is in glibc right now )
* first step for #2453

diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild
new file mode 100644
index 0000000..76b435a
--- /dev/null
+++ b/source/base/tzdata/FrugalBuild
@@ -0,0 +1,31 @@
+# Compiling Time: 0.02 SBU
+# Maintainer: crazy <crazy@frugalware.org>
+
+pkgname=tzdata
+pkgver=2007h
+pkgrel=1
+pkgdesc="Sources for time zone and daylight saving time data"
+url="http://www.twinsun.com/tz/tz-link.htm"
+depends=('glibc')
+groups=('base')
+archs=('i686' 'x86_64')
+up2date="lynx -dump -nolist ftp://elsie.nci.nih.gov/pub/|grep tzdata|sed 's/.*ta\(.*\).t.*/\1/'"
+source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver}.tar.gz \
+	ftp://elsie.nci.nih.gov/pub/${pkgname}${pkgver}.tar.gz \
+	Makefile.patch)
+sha1sums=('d04c6be80aa846d6927169b240b426d00dc6f8d9' \
+          'be408cd5c058a526922ee4bb94ee9595e465ea6d' \
+          'e8890681333949977ccff0b7a429ad25ed78dbcf')
+
+build()
+{
+	cd "$Fsrcdir"
+	tar -xf tzcode${pkgver}.tar.gz  || Fdie
+	tar -xf ${pkgname}${pkgver}.tar.gz || Fdie
+	patch -p1 -i ../Makefile.patch || Fdie
+	make || Fdie
+	Fmakeinstall
+	Frm usr/share/zoneinfo/localtime
+}
+
+# optimization OK
diff --git a/source/base/tzdata/Makefile.patch b/source/base/tzdata/Makefile.patch
new file mode 100644
index 0000000..e88f9d9
--- /dev/null
+++ b/source/base/tzdata/Makefile.patch
@@ -0,0 +1,140 @@
+diff -Naur src/Makefile src-p/Makefile
+--- src/Makefile	2007-08-20 16:47:41.000000000 +0200
++++ src-p/Makefile	2007-10-02 04:07:44.000000000 +0200
+@@ -34,17 +34,17 @@
+
+ # Everything gets put in subdirectories of. . .
+
+-TOPDIR=		/usr/local
++TOPDIR=		$(DESTDIR)/usr
+
+ # "Compiled" time zone information is placed in the "TZDIR" directory
+ # (and subdirectories).
+ # Use an absolute path name for TZDIR unless you're just testing the software.
+
+-TZDIR=		$(TOPDIR)/etc/zoneinfo
++TZDIR=		$(TOPDIR)/share/zoneinfo
+
+ # The "tzselect", "zic", and "zdump" commands get installed in. . .
+
+-ETCDIR=		$(TOPDIR)/etc
++SBINDIR=		$(TOPDIR)/sbin
+
+ # If you "make INSTALL", the "date" command gets installed in. . .
+
+@@ -52,7 +52,7 @@
+
+ # Manual pages go in subdirectories of. . .
+
+-MANDIR=		$(TOPDIR)/man
++MANDIR=		$(TOPDIR)/share/man
+
+ # Library functions are put in an archive in LIBDIR.
+
+@@ -83,7 +83,7 @@
+
+ # Non-default libraries needed to link.
+ # Add -lintl if you want to use `gettext' on Solaris.
+-LDLIBS=
++LDLIBS=$(LDFLAGS)
+
+ # Add the following to the end of the "CFLAGS=" line as needed.
+ #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
+@@ -211,7 +211,7 @@
+ # before the first Monday in January when a "%V" format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+
+-CFLAGS=
++CFLAGS += -std=gnu99
+
+ # If you want zic's -s option used when installing, uncomment the next line
+ # ZFLAGS=	-s
+@@ -220,7 +220,7 @@
+ ZIC=		$(zic) $(ZFLAGS)
+
+ # The name of a Posix-compliant `awk' on your system.
+-AWK=		nawk
++AWK=		awk
+
+ # The path where SGML DTDs are kept.
+ SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
+@@ -241,8 +241,10 @@
+
+ ###############################################################################
+
+-cc=		cc
+-CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++CC+=		-DTZDIR=\"$(TZDIR)\"
++ifeq ($(NLS),1)
++CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++endif
+
+ TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
+ TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
+@@ -282,14 +284,16 @@
+
+ ALL:		all date
+
+-install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
++install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+ 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
+ 		cp iso3166.tab zone.tab $(TZDIR)/.
+-		-mkdir $(TOPDIR) $(ETCDIR)
+-		cp tzselect zic zdump $(ETCDIR)/.
+-		-mkdir $(TOPDIR) $(MANDIR) \
++		-mkdir -p $(TOPDIR) $(SBINDIR)
++		cp zic zdump $(SBINDIR)/.
++		-mkdir -p $(TOPDIR) $(BINDIR)
++		cp tzselect $(BINDIR)/.
++		-mkdir -p $(TOPDIR) $(MANDIR) \
+ 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
+ 		-rm -f $(MANDIR)/man3/newctime.3 \
+ 			$(MANDIR)/man3/newtzset.3 \
+@@ -298,13 +302,11 @@
+ 			$(MANDIR)/man8/zdump.8 \
+ 			$(MANDIR)/man8/zic.8
+ 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
+-		cp tzfile.5 $(MANDIR)/man5/.
+-		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
+
+ INSTALL:	ALL install date.1
+-		-mkdir $(TOPDIR) $(BINDIR)
++		-mkdir -p $(TOPDIR) $(BINDIR)
+ 		cp date $(BINDIR)/.
+-		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
++		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
+ 		-rm -f $(MANDIR)/man1/date.1
+ 		cp date.1 $(MANDIR)/man1/.
+
+@@ -334,9 +336,9 @@
+ # You must replace all of $(TZDIR) to switch from not using leap seconds
+ # to using them, or vice versa.
+ other_two:	zic leapseconds $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
++		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+-			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
++			-d $(TZDIR)/right -L leapseconds $(TDATA)
+
+ posix_right:	posix_only other_two
+
+@@ -367,7 +369,7 @@
+ 			<$? >$@
+ 		chmod +x $@
+
+-check:		check_tables check_web
++check:		check_tables
+
+ check_tables:	checktab.awk $(PRIMARY_YDATA)
+ 		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
+diff -Naur src/tzselect.ksh src-p/tzselect.ksh
+--- src/tzselect.ksh	2007-08-20 16:47:42.000000000 +0200
++++ src-p/tzselect.ksh	2007-10-02 04:07:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /bin/ksh
++#! /bin/bash
+
+ # '@(#)tzselect.ksh	8.1'
+
From crazy at frugalware.org  Tue Oct  2 15:31:31 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 15:31:38 2007
Subject: [Frugalware-git] frugalware-current: kernel-xen0-2.6.19-2-i686
Message-ID: <20071002133131.2FDF313A4076@genesis.frugalware.org>

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

commit 0e6fca59feb9f67ca835fbffed69ad1bdcdf30dd
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 15:26:39 2007 +0200

kernel-xen0-2.6.19-2-i686
* added nobuild for main and subpackage's
* cleaning up fdb in a bit

diff --git a/source/base-extra/kernel-xen0/FrugalBuild b/source/base-extra/kernel-xen0/FrugalBuild
index c7209e8..6a881b4 100644
--- a/source/base-extra/kernel-xen0/FrugalBuild
+++ b/source/base-extra/kernel-xen0/FrugalBuild
@@ -19,7 +19,9 @@ groups=('base-extra')
source=(${source[@]} README.Frugalware)
signatures=("${signatures[@]}" '')
unset install
+options=('nobuild')
subgroups=('xapps-extra' 'xapps-extra')
+suboptions=('nobuild' 'nobuild')
up2date="lynx -dump http://cvs.fedora.redhat.com/viewcvs/devel/kernel-xen-2.6/sources?view=markup | grep linux | Flasttarbz2"
archs=('i686')
subarchs=('i686' 'i686')
From crazy at frugalware.org  Tue Oct  2 15:31:31 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 15:31:40 2007
Subject: [Frugalware-git] frugalware-current: kernel-xenU-2.6.19-2-i686
Message-ID: <20071002133131.3EE9E13A4077@genesis.frugalware.org>

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

commit da4c49ad4b38699cbf08bddcc942df4241b86690
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 15:28:20 2007 +0200

kernel-xenU-2.6.19-2-i686
* added nobuild for main and subpackage's

diff --git a/source/base-extra/kernel-xenU/FrugalBuild b/source/base-extra/kernel-xenU/FrugalBuild
index 4d71475..de35159 100644
--- a/source/base-extra/kernel-xenU/FrugalBuild
+++ b/source/base-extra/kernel-xenU/FrugalBuild
@@ -17,7 +17,9 @@ pkgdesc="The Xen domain U Linux Kernel and modules"
rodepends=('module-init-tools' 'xen')
groups=('base-extra')
unset install
+options=('nobuild')
subgroups=('xapps-extra' 'xapps-extra')
+suboptions=('nobuild' 'nobuild')
up2date="lynx -dump http://cvs.fedora.redhat.com/viewcvs/devel/kernel-xen-2.6/sources?view=markup | grep linux | Flasttarbz2"
archs=('i686')
subarchs=('i686' 'i686')
From priyank at frugalware.org  Tue Oct  2 15:48:35 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 15:48:37 2007
Subject: [Frugalware-git] 
	frugalware-current: gtk+2-engines-murrine-0.53.1-1-i686
Message-ID: <20071002134835.3D95713A4076@genesis.frugalware.org>

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

commit 65b0f90b7b13b3d0846f1158c2a0baebb6a43049
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 19:17:06 2007 +0530

gtk+2-engines-murrine-0.53.1-1-i686
* Version bump
* Fixed sources of some themes
* Removed three themes (no longer maintained)

diff --git a/source/gnome-extra/gtk+2-engines-murrine/FrugalBuild b/source/gnome-extra/gtk+2-engines-murrine/FrugalBuild
index c56b08c..fe4c7ee 100644
--- a/source/gnome-extra/gtk+2-engines-murrine/FrugalBuild
+++ b/source/gnome-extra/gtk+2-engines-murrine/FrugalBuild
@@ -1,8 +1,8 @@
-# Compiling Time: 0.06 SBU
+# Compiling Time: 0.04 SBU
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gtk+2-engines-murrine
-pkgver=0.52
+pkgver=0.53.1
pkgrel=1
pkgdesc="Murrine is a fast and modern looking GTK+2 engine."
url="http://www.gnome-look.org/content/show.php?content=42755"
@@ -21,15 +21,10 @@ source=(http://cimi.netsons.org/media/download_gallery/murrine/murrine-$pkgver.t
$dlurl/49952-Murrina-Brown.tar.gz \
$dlurl/50057-Murrina-CleanEyes.tar.gz \
$dlurl/47466-MurrinaCandyDuo.tar.bz2 \
+	$dlurl/57999-Murrine.tar.gz \
+	$dlurl/57919-Murrina-Aqua.tar.gz \
+	$dlurl/54814-Murrina-Olive.tar.bz2 \
'http://priyank.one09.net/files/Murrina-GT4-Rounded.tar.bz2' \
-	'http://www.kernow-webhosting.com/~bvc/theme/mcity/Murrine.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Aqua.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Blu.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Graphite.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Green.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Olive.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Pink.tar.gz' \
-	'http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/Murrina-Purple.tar.gz' \
'http://cimi.netsons.org/media/download_gallery/MurrinaFancyCandy.tar.bz2' \
'http://cimi.netsons.org/media/download_gallery/MurrinaAquaIsh.tar.bz2' \
'http://cimi.netsons.org/media/download_gallery/MurrinaVerdeOlivo.tar.bz2' \
@@ -37,28 +32,23 @@ source=(http://cimi.netsons.org/media/download_gallery/murrine/murrine-$pkgver.t
'http://cimi.netsons.org/media/download_gallery/MurrinaLoveGray.tar.bz2')
Fconfopts="${Fconfopts[@]} --enable-animation"
_F_cd_path="murrine-$pkgver"
-sha1sums=('90a57a8a22e7a30e47a6959af55e04f6fac3fa2d'\
-          '67472ec2f999ce5e71dbbc21cdbe3e20d5a5decc'\
-          'd866c7ba5db5de065f2825f05a7bb3b296567683'\
-          '222ccbf9fb9c0d78156d202929ba7dac1dfd68cd'\
-          '4435219fc62afba07f2c5a3cd111465483c19825'\
-          'b120755846d4c954922ccd2279a72806d5282aa9'\
-          '05f6dc99c77aacd4d3d79901dd9014dfd2a0917b'\
-          '8ddfab591928d0cb39c3f6dcb40c9a3f45d599d1'\
-          'd8c2a8cb68254d0fce32ea346c819c8a4d4b0424'\
-          '08d564f5d28ac1b72f578c7ff59170c35ec4fac1'\
-          '6669a8cf02aac2e5109651d0b83faf89b052f0ef'\
-          'c425be049505106fd6b959cdf0b44201821182f5'\
-          '9e45ba0211414a4a5b003c05960a3a17d9cf1e12'\
-          '15d0c2ea07f037eb150fb5464bf86466ea8ffb59'\
-          'db3a23a01ec2c01206a6112a5496db08382c452b'\
-          '9eb45f450599f3e4975c1f6e550b28a9bc497ac3'\
-          '8151807164e45ce3c6ea82005d05c15f8e9b5f33'\
-          '38f7cc7442a7ba84a8a642a096ed25144ade19e7'\
-          '6b957cdc19c113fa608ab83b690d72b77e0c1033'\
-          'bfa6099413b7de1c734b985d40713b997df7060b'\
-          '26160027366073d6d778fb9cfbe6bef4d8109b4f'\
-          '0b4717522a911511f2f75e599da929297acfe174'\
+sha1sums=('108e2fa43c152406ff0c7bcdaf484413fd7bd735' \
+          '67472ec2f999ce5e71dbbc21cdbe3e20d5a5decc' \
+          'd866c7ba5db5de065f2825f05a7bb3b296567683' \
+          '222ccbf9fb9c0d78156d202929ba7dac1dfd68cd' \
+          '4435219fc62afba07f2c5a3cd111465483c19825' \
+          'b120755846d4c954922ccd2279a72806d5282aa9' \
+          '05f6dc99c77aacd4d3d79901dd9014dfd2a0917b' \
+          '8ddfab591928d0cb39c3f6dcb40c9a3f45d599d1' \
+          'd8c2a8cb68254d0fce32ea346c819c8a4d4b0424' \
+          '6669a8cf02aac2e5109651d0b83faf89b052f0ef' \
+          '9622a04994c3199893aa375c5fef149f1a7a46ad' \
+          'ded3f2b363fe130bd40ecc87cfd6f777f3952a6d' \
+          '08d564f5d28ac1b72f578c7ff59170c35ec4fac1' \
+          '6b957cdc19c113fa608ab83b690d72b77e0c1033' \
+          'bfa6099413b7de1c734b985d40713b997df7060b' \
+          '26160027366073d6d778fb9cfbe6bef4d8109b4f' \
+          '0b4717522a911511f2f75e599da929297acfe174' \
'99b9d017384f94d160dd69a9ae5aa061d1c5eca3')

build()
@@ -75,12 +65,7 @@ build()
Fcpr MurrinaNeoGraphite /usr/share/themes
Fcpr MurrinaElegant /usr/share/themes
Fcpr Murrina-Aqua /usr/share/themes
-	Fcpr Murrina-Blu /usr/share/themes
-	Fcpr Murrina-Graphite /usr/share/themes
-	Fcpr Murrina-Green /usr/share/themes
Fcpr Murrina-Olive /usr/share/themes
-	Fcpr Murrina-Pink /usr/share/themes
-	Fcpr Murrina-Purple /usr/share/themes
Fcpr MurrinaAquaIsh /usr/share/themes
Fcpr MurrinaLoveGray /usr/share/themes
Fcpr MurrinaGilouche /usr/share/themes
From crazy at frugalware.org  Tue Oct  2 16:09:16 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 16:09:17 2007
Subject: [Frugalware-git] frugalware-current: glibc-2.6.1-3-i686
Message-ID: <20071002140916.6C1DF13A4076@genesis.frugalware.org>

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

commit 3cd9ef8293f4d02e1cfde8579d971a2c94be42aa
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 15:57:54 2007 +0200

glibc-2.6.1-3-i686
* release bump due conflicting files with tzdata
* glibc-xen is disabled for now
* added tzdata to rodepends
* closes #2453

diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild
index 3e29f1d..7f80e18 100644
--- a/source/base/glibc/FrugalBuild
+++ b/source/base/glibc/FrugalBuild
@@ -1,12 +1,13 @@
-# Compiling time: 19.65 SBU
+# Compiling time: 8.20 SBU
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=glibc
pkgver=2.6.1
-pkgrel=2
+pkgrel=3
pkgdesc="GNU C Library"
url="http://www.gnu.org/software/libc/libc.html"
depends=()
+rodepends=('tzdata')
makedepends=('grep>=2.5.3-2')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
@@ -14,15 +15,16 @@ Fup2gnugz
source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 initfini.patch)
signatures=("$source.sig" '')

-if [ "$CARCH" == "i686" ]; then
-	subpkgs=('glibc-xen')
-	subdescs=('GNU C Library for Xen.')
-	subdepends=()
-	subconflicts=('glibc')
-	subprovides=('glibc')
-	subgroups=('base-extra')
-	subarchs=('i686')
-fi
+## XEN disabled for 0.7
+#if [ "$CARCH" == "i686" ]; then
+#	subpkgs=('glibc-xen')
+#	subdescs=('GNU C Library for Xen.')
+#	subdepends=()
+#	subconflicts=('glibc')
+#	subprovides=('glibc')
+#	subgroups=('base-extra')
+#	subarchs=('i686')
+#fi

_build()
{
@@ -41,7 +43,12 @@ _build()

make install_root=$Fdestdir install || Fdie
make install_root=$Fdestdir localedata/install-locales || Fdie
-	Frm /etc/ld.so.cache /etc/localtime
+	Frm /etc/ld.so.cache
+	## conflicting files with tzdata
+	Frm etc/localtime
+	Frm usr/share/zoneinfo
+	Frm usr/sbin/{zdump,zic}
+	Frm usr/bin/tzselect

Frm /usr/info/dir
cd - >/dev/null
@@ -54,14 +61,15 @@ build()
Fpatchall
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	if [ "$CARCH" == "i686" ]; then
-		xenflag="-mno-tls-direct-seg-refs"
-		export CFLAGS="$CFLAGS $xenflag"
-		_build || return 1
-		Fsplit glibc-xen /etc /lib /sbin /usr
-		export CFLAGS="${CFLAGS/ $xenflag}"
-	fi
-	_build || return 1
+	## XEN stuff disable for 0.7
+	#if [ "$CARCH" == "i686" ]; then
+	#	xenflag="-mno-tls-direct-seg-refs"
+	#	export CFLAGS="$CFLAGS $xenflag"
+	#	_build || return 1
+	#	Fsplit glibc-xen /etc /lib /sbin /usr
+	#	export CFLAGS="${CFLAGS/ $xenflag}"
+	#fi
+	_build || Fdie
}

# optimization ok
From crazy at frugalware.org  Tue Oct  2 17:06:36 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 17:06:38 2007
Subject: [Frugalware-git] frugalware-current: pyqt4-4.3.1-1-i686
Message-ID: <20071002150636.94FFD13A4076@genesis.frugalware.org>

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

commit a1bc33ba3157662ac41a6ffe115667593e234a02
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 17:02:25 2007 +0200

pyqt4-4.3.1-1-i686
* Version bump to match the qt4 version
* fixes a lot issues

diff --git a/source/kde-extra/pyqt4/FrugalBuild b/source/kde-extra/pyqt4/FrugalBuild
index d3b376e..3ee5879 100644
--- a/source/kde-extra/pyqt4/FrugalBuild
+++ b/source/kde-extra/pyqt4/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=pyqt4
origname=PyQt
-pkgver=4.3
+pkgver=4.3.1
pkgrel=1
pkgdesc="PyQt4 is a set of Python bindings for the Qt4 toolkit."
url="http://www.riverbankcomputing.co.uk/pyqt/index.php"
-depends=('qt4>=4.2.3-2' 'sip>=4.7' 'qscintilla2-qt4')
+depends=('qt4>=4.3.1-3' 'sip>=4.7' 'qscintilla2-qt4')
up2date="lynx -dump http://www.riverbankcomputing.co.uk/pyqt/download.php |grep 'PyQt-x11-gpl-4' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'"
source=(http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/$origname-x11-gpl-$pkgver.tar.gz)
#up2date="$pkgver"
@@ -32,6 +32,6 @@ build()
Fmakeinstall INSTALL_ROOT=$Fdestdir
}

-sha1sums=('cefd8b0d7ff88277280e872bfb3130069504b8ff')
+sha1sums=('089154ca3126fe0efd3003d998f18b6db29c49b9')

# optimization OK
From crazy at frugalware.org  Tue Oct  2 18:05:31 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 18:05:34 2007
Subject: [Frugalware-git] frugalware-current: tzdata-2007h-1-i686
Message-ID: <20071002160531.3673313A4076@genesis.frugalware.org>

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

commit b9a63ee586d99e859b0136e939c8186990396dae
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 18:02:27 2007 +0200

tzdata-2007h-1-i686
* added chroot-core to groups
* sry for that I really forgot

diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild
index 76b435a..d13bdd9 100644
--- a/source/base/tzdata/FrugalBuild
+++ b/source/base/tzdata/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Sources for time zone and daylight saving time data"
url="http://www.twinsun.com/tz/tz-link.htm"
depends=('glibc')
-groups=('base')
+groups=('base' 'chroot-core')
archs=('i686' 'x86_64')
up2date="lynx -dump -nolist ftp://elsie.nci.nih.gov/pub/|grep tzdata|sed 's/.*ta\(.*\).t.*/\1/'"
source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver}.tar.gz \
From vmiklos at frugalware.org  Tue Oct  2 18:39:37 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 18:39:39 2007
Subject: [Frugalware-git] frugalware-current: kvm-35-1-i686
Message-ID: <20071002163937.8EB3A13A4076@genesis.frugalware.org>

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

commit 972f1bdbdb48a4df23c6b183b60b7d1e34bb15b0
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 18:38:49 2007 +0200

kvm-35-1-i686
- version bump. the old version did not work with 2.6.22
- up2date fix

diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild
index e4b455e..a60d577 100644
--- a/source/xapps-extra/kvm/FrugalBuild
+++ b/source/xapps-extra/kvm/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=kvm
-pkgver=17
+pkgver=35
pkgrel=1
pkgdesc="KVM is a kernel based virtual machine"
url="http://kvm.sourceforge.net"
@@ -11,20 +11,20 @@ archs=('i686')
Finclude sourceforge kernel-version
depends=("kernel>=$_F_kernelver_ver" 'sdl' 'zlib')
makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3')
-up2date="lynx -dump http://kvm.qumranet.com/kvmwiki/Downloads | grep 'Linux $_F_kernelver_ver'|sed 's/.*kvm-\(.*\)/\1/;s/ .*//g'"
-sha1sums=('ac80a36b5eacafc4880f8f07c24d164906f5d5ce')
+sha1sums=('5e20b856915091c2eb9da2adf47ef95cf6346e8b')
Fconfopts="--prefix=$Fprefix"

build() {
+	# i?86 is i386, NOT x86_64..
+	Fsed 'echo x86_64' 'echo i386' configure
+	Fsed 'datadir="$prefix/share/qemu"' 'datadir="$prefix/share/qemu-kvm"' \
+		qemu/configure
Fconf --with-patched-kernel --qemu-cc="/usr/bin/gcc-3.3"

-	sed -i 's/\/usr\/share\/qemu/\/usr\/share\/qemu-kvm/' qemu/config-host.h
-	sed -i 's/\/usr\/share\/qemu/\/usr\/share\/qemu-kvm/' qemu/config-host.mak
-	sed -i 's/\/usr\/share\/doc\/qemu/\/usr\/share\/doc\/qemu-kvm/' qemu/config-host.mak
-
sed -i '/depmod -a/d' kernel/Makefile
make || Fdie
-	Fmakeinstall
+	Fmakeinstall KERNELDIR=/usr/src/linux
+	Frm /usr/include/linux

Fmv /usr/bin/qemu /usr/bin/qemu-kvm
Fmv /usr/bin/qemu-img /usr/bin/qemu-img-kvm
From crazy at frugalware.org  Tue Oct  2 18:46:38 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 18:46:40 2007
Subject: [Frugalware-git] frugalware-current: nvu-1.0-1-i686
Message-ID: <20071002164638.8332C13A4076@genesis.frugalware.org>

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

commit fc3136f1b86fdc548854b6933fedd65cc8ceb7f6
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 18:43:16 2007 +0200

nvu-1.0-1-i686
* moved to gnome-extra , depends on libgnome

diff --git a/source/gnome-extra/nvu/FrugalBuild b/source/gnome-extra/nvu/FrugalBuild
new file mode 100644
index 0000000..7c568e5
--- /dev/null
+++ b/source/gnome-extra/nvu/FrugalBuild
@@ -0,0 +1,34 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: VMiklos <vmiklos@frugalware.org>
+
+pkgname=nvu
+pkgver=1.0
+pkgrel=1
+pkgdesc="A WYSIWG web editor for linux similiar to Dreamweaver"
+url="http://www.nvu.com/"
+depends=('libgnome' 'nss')
+groups=('gnome-extra')
+archs=('i686' 'x86_64')
+up2date="lynx -dump $url/Building_From_Source.php|grep ^Nvu |sed -n 's/Nvu //;1 p'"
+source=(http://cvs.nvu.com/download/$pkgname-$pkgver-sources.tar.bz2 config \
+	$pkgname.desktop $pkgname-$pkgver-freetype.patch0)
+sha1sums=('438b1633cb820bbede503ef2da90f46d4e96bee8' \
+          '1eaa3b3efb27d857dd8503365aca73ea5c7c7274' \
+          '390896de07a0b3006dd67f2d00e5bc5f22c5c798' \
+          '97b057707563151a867d11b3499bd49e0c768de1')
+build()
+{
+	Fcd mozilla
+	Fpatch $pkgname-$pkgver-freetype.patch0
+	sed "s/-march=i686/$CFLAGS/" $Fsrcdir/config > .mozconfig
+
+	make -f client.mk build_all
+
+	make -f client.mk DESTDIR=$Fdestdir install
+	Fln nvu-$pkgver /usr/lib/nvu
+	Ffile /usr/share/applications/$pkgname.desktop
+	# conflicts with thunderbird
+	Frm /usr/share/aclocal/nspr.m4
+}
+
+# optimalization OK
diff --git a/source/gnome-extra/nvu/config b/source/gnome-extra/nvu/config
new file mode 100644
index 0000000..e60592a
--- /dev/null
+++ b/source/gnome-extra/nvu/config
@@ -0,0 +1,37 @@
+export MOZILLA_OFFICIAL=1
+export BUILD_OFFICIAL=1
+
+export MOZ_STANDALONE_COMPOSER=1
+mk_add_options MOZ_STANDALONE_COMPOSER=1
+
+ac_add_options --enable-optimize="-march=i686"
+ac_add_options --disable-debug
+ac_add_options --with-default-mozilla-five-home=/usr/lib/nvu
+ac_add_options  --disable-svg
+ac_add_options  --without-system-mng
+ac_add_options  --without-system-png
+ac_add_options  --disable-ldap
+ac_add_options  --disable-mailnews
+ac_add_options  --disable-installer
+ac_add_options  --disable-activex
+ac_add_options  --disable-activex-scripting
+ac_add_options  --disable-tests
+ac_add_options  --disable-oji
+ac_add_options  --disable-necko-disk-cache
+ac_add_options  --enable-single-profile
+ac_add_options  --disable-profilesharing
+ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
+ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
+ac_add_options  --disable-pedantic
+ac_add_options  --disable-short-wchar
+ac_add_options  --enable-xprint
+ac_add_options  --enable-strip-libs
+ac_add_options  --enable-crypto
+ac_add_options  --disable-mathml
+ac_add_options  --with-system-zlib
+ac_add_options  --enable-toolkit=gtk2
+ac_add_options  --enable-default-toolkit=gtk2
+ac_add_options  --enable-xft
+ac_add_options  --enable-freetype2
+ac_add_options  --disable-short-wchar
+ac_add_options  --prefix=/usr
diff --git a/source/gnome-extra/nvu/nvu-1.0-freetype.patch0 b/source/gnome-extra/nvu/nvu-1.0-freetype.patch0
new file mode 100644
index 0000000..0bef6ad
--- /dev/null
+++ b/source/gnome-extra/nvu/nvu-1.0-freetype.patch0
@@ -0,0 +1,339 @@
+diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
+--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h   2004-06-10 22:56:01.000000000 +0900
+@@ -28,7 +28,8 @@
+
+ #include "baseutils.h"
+ #include "txError.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ class nsAString;
+
+ /**
+diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl    2004-04-16 10:09:33.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl  2004-06-11 00:32:42.000000000 +0900
+@@ -76,10 +76,11 @@
+ native FT_Sfnt_Tag(FT_Sfnt_Tag);
+ native FT_Size(FT_Size);
+
+-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
++[ptr] native FTC_ImageType_p(FTC_ImageType);
+ native FTC_Face_Requester(FTC_Face_Requester);
+ native FTC_Font(FTC_Font);
+-native FTC_Image_Cache(FTC_Image_Cache);
++native FTC_FaceID(FTC_FaceID);
++native FTC_ImageCache(FTC_ImageCache);
+ native FTC_Manager(FTC_Manager);
+
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
+
+     readonly attribute FT_Library library;
+     readonly attribute FTC_Manager FTCacheManager;
+-    readonly attribute FTC_Image_Cache ImageCache;
++    readonly attribute FTC_ImageCache ImageCache;
+
+     void    doneFace(in FT_Face face);
+     void    doneFreeType(in FT_Library lib);
+@@ -115,16 +116,16 @@
+     void    outlineDecompose(in FT_Outline_p outline,
+                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
+     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
+-    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
++    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
+                              in FT_UInt gindex, out FT_Glyph glyph);
+-    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
+-                              out FT_Face face, out FT_Size size);
++    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
++                              out FT_Face face);
+     void    managerDone(in FTC_Manager manager);
+     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
+                        in FT_UInt max_sizes, in FT_ULong max_bytes,
+                        in FTC_Face_Requester requester, in FT_Pointer req_data,
+                        out FTC_Manager manager);
+-    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
++    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);
+$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp  2004-02-05 10:57:05.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp    2004-06-10 23:00:08.000000000 +0900
+@@ -1141,10 +1141,10 @@
+
+   mPixelSize = NSToIntRound(app2dev * mFont->size);
+
+-  mImageDesc.font.face_id    = (void*)mEntry;
+-  mImageDesc.font.pix_width  = mPixelSize;
+-  mImageDesc.font.pix_height = mPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
++  mImageDesc->width  = mPixelSize;
++  mImageDesc->height = mPixelSize;
++  mImageDesc->flags = 0;
+
+   nsresult rv;
+   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
+@@ -1190,7 +1190,7 @@
+   if (!face)
+     return 0;
+
+-  FTC_Image_Cache iCache;
++  FTC_ImageCache iCache;
+   nsresult rv = mFt2->GetImageCache(&iCache);
+   if (NS_FAILED(rv)) {
+     NS_ERROR("Failed to get Image Cache");
+@@ -1228,8 +1228,8 @@
+
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   NS_ASSERTION(rv==0, "failed to get face/size");
+   if (rv)
+     return nsnull;
+@@ -1622,16 +1622,16 @@
+   mEntry->GetFamilyName(fontName);
+   mEntry->GetStyleName(styleName);
+
+-  mImageDesc.font.face_id    = (void*)mEntry;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
+   // TT glyph has no relation to size
+-  mImageDesc.font.pix_width  = 16;
+-  mImageDesc.font.pix_height = 16;
+-  mImageDesc.image_type = 0;
++  mImageDesc->width  = 16;
++  mImageDesc->height = 16;
++  mImageDesc->flags = 0;
+   FT_Face face = nsnull;
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   if (NS_FAILED(rv))
+     return;
+
+$NetBSD: patch-aj,v 1.10 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h   2004-04-17 06:31:42.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900
+@@ -104,13 +104,13 @@
+ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
+ typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
+ typedef FT_Error (*FTC_Image_Cache_Lookup_t)
+-                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
+-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
+-                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
++                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
++typedef FT_Error (*FTC_Manager_LookupFace_t)
++                      (FTC_Manager, FTC_FaceID, FT_Face*);
+ typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
+ typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
+                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
+-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
++typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -165,7 +165,7 @@
+   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
+   FT_Set_Charmap_t          nsFT_Set_Charmap;
+   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
+-  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
++  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
+   FTC_Manager_Done_t        nsFTC_Manager_Done;
+   FTC_Manager_New_t         nsFTC_Manager_New;
+   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
+@@ -213,7 +213,7 @@
+   PRLibrary      *mSharedLib;
+   FT_Library      mFreeTypeLibrary;
+   FTC_Manager     mFTCacheManager;
+-  FTC_Image_Cache mImageCache;
++  FTC_ImageCache  mImageCache;
+
+   static nsHashtable   *sFontFamilies;
+   static nsHashtable   *sRange1CharSetNames;
+$NetBSD: patch-ak,v 1.11 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp   2004-06-10 23:05:42.000000000 +0900
+@@ -110,11 +110,11 @@
+   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
+   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
+   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
+-  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
+-  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
++  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
++  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
+   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
+   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
+-  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
++  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
+ // #ifdef MOZ_SVG
+   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
+   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
+@@ -282,7 +282,7 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
+                               FT_UInt glyphID, FT_Glyph *glyph)
+ {
+   // call the FreeType2 function via the function pointer
+@@ -291,11 +291,11 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
+-                               FT_Face *face, FT_Size *size)
++nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
++                               FT_Face *face)
+ {
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
++  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ }
+
+@@ -320,7 +320,7 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
+ {
+   // call the FreeType2 function via the function pointer
+   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
+@@ -389,7 +389,7 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
++nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
+ {
+   *aCache = mImageCache;
+   return NS_OK;
+$NetBSD: patch-al,v 1.9 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h    2003-04-23 01:25:09.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h  2004-06-10 23:06:23.000000000 +0900
+@@ -320,7 +320,7 @@
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
+   nsCOMPtr<nsIFreeType2> mFt2;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+
+
+   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
+@@ -363,7 +363,7 @@
+ protected:
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
+   nsCOMPtr<nsIFreeType2> mFt2;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ };
+ #endif
+
+$NetBSD: patch-an,v 1.7 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h  2003-04-23 01:25:13.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h    2004-06-10 23:06:35.000000000 +0900
+@@ -110,7 +110,7 @@
+   XImage *GetXImage(PRUint32 width, PRUint32 height);
+   nsITrueTypeFontCatalogEntry *mFaceID;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+   nsCOMPtr<nsIFreeType2> mFt2;
+ };
+
+$NetBSD: patch-ao,v 1.5 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp    2003-12-25 17:24:52.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp  2004-06-10 23:06:38.000000000 +0900
+@@ -177,7 +177,7 @@
+   FTC_Manager mgr;
+   nsresult rv;
+   mFt2->GetFTCacheManager(&mgr);
+-  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
++  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
+   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
+   if (NS_FAILED(rv))
+     return nsnull;
+@@ -191,22 +191,15 @@
+   PRBool embedded_bimap = PR_FALSE;
+   mFaceID = aFaceID;
+   mPixelSize = aPixelSize;
+-  mImageDesc.font.face_id    = (void*)mFaceID;
+-  mImageDesc.font.pix_width  = aPixelSize;
+-  mImageDesc.font.pix_height = aPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
++  mImageDesc->width  = aPixelSize;
++  mImageDesc->height = aPixelSize;
++  mImageDesc->flags = 0;
+
+   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
+-    mImageDesc.image_type |= ftc_image_mono;
+     anti_alias = PR_FALSE;
+   }
+
+-  if (nsFreeType2::gFreeType2Autohinted)
+-    mImageDesc.image_type |= ftc_image_flag_autohinted;
+-
+-  if (nsFreeType2::gFreeType2Unhinted)
+-    mImageDesc.image_type |= ftc_image_flag_unhinted;
+-
+   PRUint32  num_embedded_bitmaps, i;
+   PRInt32*  embedded_bitmapheights;
+   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
+@@ -218,7 +211,6 @@
+         if (embedded_bitmapheights[i] == aPixelSize) {
+           embedded_bimap = PR_TRUE;
+           // unhinted must be set for embedded bitmaps to be used
+-          mImageDesc.image_type |= ftc_image_flag_unhinted;
+           break;
+         }
+       }
+@@ -312,7 +304,7 @@
+   if (!face)
+     return NS_ERROR_FAILURE;
+
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return NS_ERROR_FAILURE;
+@@ -401,7 +393,7 @@
+   if (!face)
+     return 0;
+
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+@@ -723,7 +715,7 @@
+     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
+ #endif
+
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
diff --git a/source/gnome-extra/nvu/nvu.desktop b/source/gnome-extra/nvu/nvu.desktop
new file mode 100644
index 0000000..f27907d
--- /dev/null
+++ b/source/gnome-extra/nvu/nvu.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Nvu
+Comment=WYSIWYG Web Editor
+Exec=nvu
+Icon=/usr/lib/nvu/icons/mozicon50.xpm
+Terminal=false
+Type=Application
+Categories=Application;Development;
+Encoding=UTF-8
diff --git a/source/xapps-extra/nvu/FrugalBuild b/source/xapps-extra/nvu/FrugalBuild
deleted file mode 100644
index 32672a2..0000000
--- a/source/xapps-extra/nvu/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: VMiklos <vmiklos@frugalware.org>
-
-pkgname=nvu
-pkgver=1.0
-pkgrel=1
-pkgdesc="A WYSIWG web editor for linux similiar to Dreamweaver"
-url="http://www.nvu.com/"
-depends=('libgnome' 'nss')
-groups=('xapps-extra')
-archs=('i686' 'x86_64')
-up2date="lynx -dump $url/Building_From_Source.php|grep ^Nvu |sed -n 's/Nvu //;1 p'"
-source=(http://cvs.nvu.com/download/$pkgname-$pkgver-sources.tar.bz2 config \
-	$pkgname.desktop $pkgname-$pkgver-freetype.patch0)
-sha1sums=('438b1633cb820bbede503ef2da90f46d4e96bee8' \
-          '1eaa3b3efb27d857dd8503365aca73ea5c7c7274' \
-          '390896de07a0b3006dd67f2d00e5bc5f22c5c798' \
-          '97b057707563151a867d11b3499bd49e0c768de1')
-build()
-{
-	Fcd mozilla
-	Fpatch $pkgname-$pkgver-freetype.patch0
-	sed "s/-march=i686/$CFLAGS/" $Fsrcdir/config > .mozconfig
-
-	make -f client.mk build_all
-
-	make -f client.mk DESTDIR=$Fdestdir install
-	Fln nvu-$pkgver /usr/lib/nvu
-	Ffile /usr/share/applications/$pkgname.desktop
-	# conflicts with thunderbird
-	Frm /usr/share/aclocal/nspr.m4
-}
-
-# optimalization OK
diff --git a/source/xapps-extra/nvu/config b/source/xapps-extra/nvu/config
deleted file mode 100644
index e60592a..0000000
--- a/source/xapps-extra/nvu/config
+++ /dev/null
@@ -1,37 +0,0 @@
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-
-export MOZ_STANDALONE_COMPOSER=1
-mk_add_options MOZ_STANDALONE_COMPOSER=1
-
-ac_add_options --enable-optimize="-march=i686"
-ac_add_options --disable-debug
-ac_add_options --with-default-mozilla-five-home=/usr/lib/nvu
-ac_add_options  --disable-svg
-ac_add_options  --without-system-mng
-ac_add_options  --without-system-png
-ac_add_options  --disable-ldap
-ac_add_options  --disable-mailnews
-ac_add_options  --disable-installer
-ac_add_options  --disable-activex
-ac_add_options  --disable-activex-scripting
-ac_add_options  --disable-tests
-ac_add_options  --disable-oji
-ac_add_options  --disable-necko-disk-cache
-ac_add_options  --enable-single-profile
-ac_add_options  --disable-profilesharing
-ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
-ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
-ac_add_options  --disable-pedantic
-ac_add_options  --disable-short-wchar
-ac_add_options  --enable-xprint
-ac_add_options  --enable-strip-libs
-ac_add_options  --enable-crypto
-ac_add_options  --disable-mathml
-ac_add_options  --with-system-zlib
-ac_add_options  --enable-toolkit=gtk2
-ac_add_options  --enable-default-toolkit=gtk2
-ac_add_options  --enable-xft
-ac_add_options  --enable-freetype2
-ac_add_options  --disable-short-wchar
-ac_add_options  --prefix=/usr
diff --git a/source/xapps-extra/nvu/nvu-1.0-freetype.patch0 b/source/xapps-extra/nvu/nvu-1.0-freetype.patch0
deleted file mode 100644
index 0bef6ad..0000000
--- a/source/xapps-extra/nvu/nvu-1.0-freetype.patch0
+++ /dev/null
@@ -1,339 +0,0 @@
-diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
---- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900
-+++ ./extensions/transformiix/source/base/ErrorObserver.h   2004-06-10 22:56:01.000000000 +0900
-@@ -28,7 +28,8 @@
-
- #include "baseutils.h"
- #include "txError.h"
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- class nsAString;
-
- /**
-diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl    2004-04-16 10:09:33.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl  2004-06-11 00:32:42.000000000 +0900
-@@ -76,10 +76,11 @@
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
-
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
-
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@
-
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
-
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
-$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp  2004-02-05 10:57:05.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.cpp    2004-06-10 23:00:08.000000000 +0900
-@@ -1141,10 +1141,10 @@
-
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
-
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1190,7 @@
-   if (!face)
-     return 0;
-
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1228,8 @@
-
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1622,16 +1622,16 @@
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-
-$NetBSD: patch-aj,v 1.10 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h   2004-04-17 06:31:42.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900
-@@ -104,13 +104,13 @@
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -165,7 +165,7 @@
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -213,7 +213,7 @@
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
-
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-$NetBSD: patch-ak,v 1.11 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.cpp   2004-06-10 23:05:42.000000000 +0900
-@@ -110,11 +110,11 @@
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
-+  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- {
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- {
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- }
-
-@@ -320,7 +320,7 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- {
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-$NetBSD: patch-al,v 1.9 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h    2003-04-23 01:25:09.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.h  2004-06-10 23:06:23.000000000 +0900
-@@ -320,7 +320,7 @@
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-
-
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif
-
-$NetBSD: patch-an,v 1.7 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h  2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h    2004-06-10 23:06:35.000000000 +0900
-@@ -110,7 +110,7 @@
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
-
-$NetBSD: patch-ao,v 1.5 2004/06/21 14:14:00 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp    2003-12-25 17:24:52.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp  2004-06-10 23:06:38.000000000 +0900
-@@ -177,7 +177,7 @@
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
-
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
-
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@
-   if (!face)
-     return NS_ERROR_FAILURE;
-
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
-   if (!face)
-     return 0;
-
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
-
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
diff --git a/source/xapps-extra/nvu/nvu.desktop b/source/xapps-extra/nvu/nvu.desktop
deleted file mode 100644
index f27907d..0000000
--- a/source/xapps-extra/nvu/nvu.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Nvu
-Comment=WYSIWYG Web Editor
-Exec=nvu
-Icon=/usr/lib/nvu/icons/mozicon50.xpm
-Terminal=false
-Type=Application
-Categories=Application;Development;
-Encoding=UTF-8
From crazy at frugalware.org  Tue Oct  2 18:56:46 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 18:56:50 2007
Subject: [Frugalware-git] frugalware-current: nvu-1.0-1-i686
Message-ID: <20071002165646.1C8EA13A4076@genesis.frugalware.org>

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

commit d09042978045ab08a610052431ce68b30e5cb87c
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 18:53:41 2007 +0200

nvu-1.0-1-i686
* Changed source to point to our FTP
* old location does not exists anymore

diff --git a/source/gnome-extra/nvu/FrugalBuild b/source/gnome-extra/nvu/FrugalBuild
index 7c568e5..1d1ea5e 100644
--- a/source/gnome-extra/nvu/FrugalBuild
+++ b/source/gnome-extra/nvu/FrugalBuild
@@ -10,7 +10,7 @@ depends=('libgnome' 'nss')
groups=('gnome-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url/Building_From_Source.php|grep ^Nvu |sed -n 's/Nvu //;1 p'"
-source=(http://cvs.nvu.com/download/$pkgname-$pkgver-sources.tar.bz2 config \
+source=(http://ftp.frugalware.org/pub/other/sources/nvu/$pkgname-$pkgver-sources.tar.bz2 config \
$pkgname.desktop $pkgname-$pkgver-freetype.patch0)
sha1sums=('438b1633cb820bbede503ef2da90f46d4e96bee8' \
'1eaa3b3efb27d857dd8503365aca73ea5c7c7274' \
From priyank at frugalware.org  Tue Oct  2 18:57:55 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 18:57:58 2007
Subject: [Frugalware-git] gfpm: updated NEWS for 1.0.3
Message-ID: <20071002165755.38E1D13A4076@genesis.frugalware.org>

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

commit 7a9c4a5bbd4bb9e4782acebcfeb7f864bbeb25bd
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 22:27:04 2007 +0530

updated NEWS for 1.0.3

diff --git a/NEWS b/NEWS
index 1d324b3..774cff0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
VERSION					DESCRIPTION
---------------------------------------------------------------------------------------------------------
+1.0.3					- Added a quick pane to enable user to quickly install/remove/
+					  upgrade packages quickly
+					- Package info now also displays the Changelog of the packages
+					- Gfpm now also checks for a new version of the gfpm package on
+					  sys upgrade
+					- Bugfix when handling frugalware stable repo
+					- Fixed the problem of accents not being displayed with some languages
+					  like fr_FR, hu_HU etc. This also prevents gfpm to crash randomly.
+					- Fixed a bug that caused the "Installed Packages" list to be empty when
+					  gfpm is run on a locale other than en
+					- Package info now also dispalyes the packages that the selected package
+					  replaces
+					- Gfpm now also displays README.Frugalware (Frugalware specific info about
+					  a package) if it exists
+					- Other minor fixes
1.0.2					- Fix segfault when trying to synchronize a repo
other than frugalware-current
- Fixed a bug where the package list went blank
From priyank at frugalware.org  Tue Oct  2 19:00:08 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 19:00:10 2007
Subject: [Frugalware-git] gfpm: Version bump to 1.0.3
Message-ID: <20071002170008.B947A13A4076@genesis.frugalware.org>

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

commit f41c49f60548d23be1f85bc451062c530d2a08f2
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 22:29:14 2007 +0530

Version bump to 1.0.3

diff --git a/configure.ac b/configure.ac
index 5c0f9da..442473b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
ENV_CFLAGS=$CFLAGS

AC_PREREQ(2.59)
-AC_INIT([Gfpm], 1.0.2, [priyankmg@gmail.com], gfpm)
+AC_INIT([Gfpm], 1.0.3, [priyankmg@gmail.com], gfpm)
AC_DEFINE_UNQUOTED([GFPM_RELEASE_NAME], ["Triton"], [Release codenames])
AC_CONFIG_SRCDIR([src/gfpm.c])
AC_LANG(C)
From priyank at frugalware.org  Tue Oct  2 19:00:37 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 19:00:38 2007
Subject: [Frugalware-git] gfpm: TAG 1.0.3
Message-ID: <20071002170037.8ACDD13A4076@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=14ec309575d5a904566eb1dadd86843d5d837e4e

commit 14ec309575d5a904566eb1dadd86843d5d837e4e
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 22:29:50 2007 +0530

TAG 1.0.3
From priyank at frugalware.org  Tue Oct  2 19:06:43 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 19:06:44 2007
Subject: [Frugalware-git] frugalware-current: gfpm-1.0.3-1-i686
Message-ID: <20071002170643.585C413A4076@genesis.frugalware.org>

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

commit ff15ceeee7075203a25b45c5fc01507a4e887dfe
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 2 22:35:04 2007 +0530

gfpm-1.0.3-1-i686
* Version bump

diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild
index 9d4017f..c42f138 100644
--- a/source/xapps/gfpm/FrugalBuild
+++ b/source/xapps/gfpm/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gfpm
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
pkgdesc="Graphical Frugalware Package Manager"
url="http://ftp.frugalware.org/pub/other/gfpm"
From crazy at frugalware.org  Tue Oct  2 19:53:59 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 19:54:01 2007
Subject: [Frugalware-git] frugalware-current: xfs-1.0.4-2-i686
Message-ID: <20071002175359.8006E13A4076@genesis.frugalware.org>

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

commit 62bb89bf250a4fa8049235f24b6c1a251d275736
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 19:50:42 2007 +0200

xfs-1.0.4-2-i686
* [SEC] relbump
* aded util-macro to makedepends because
* we need to autoreconf
* closes #2458 in -current

diff --git a/source/x11/xfs/FrugalBuild b/source/x11/xfs/FrugalBuild
index 1938c0e..594eaca 100644
--- a/source/x11/xfs/FrugalBuild
+++ b/source/x11/xfs/FrugalBuild
@@ -3,18 +3,27 @@

pkgname=xfs
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X font server"
url="http://xorg.freedesktop.org"
groups=('x11' 'xorg-core' 'xorg-apps')
archs=('i686' 'x86_64')
depends=('libfs' 'libxfont>=1.2.5')
+makedepends=('util-macros')
_F_xorg_nr=2
Finclude xorg
-sha1sums=('5c3f82746141250c49d57b5075c3e3ec42e2fd1d')
+source=($source \
+	ftp://ftp.freedesktop.org/pub/xorg/X11R7.3/patches/xorg-xfs-1.0.4-query.diff)
+sha1sums=('8d07d1f24caa44b805b2abdbf8b7110f2d3a17ae' \
+          '093db0ce2c134ebc40e47a40db89503dad2b0f3e')

-build() {
-	Fbuild --libdir=/etc --enable-IPv6
+build()
+{
+	Fcd
+	Fpatchall
+	Fautoreconf
+	Fmake --libdir=/etc --enable-IPv6
+	Fmakeinstall
# Fixup for our standards. Xorg fonts are in /usr/lib/X11/fonts/ and not
# in /etc/X11/fonts (and no we dont ship symlink)
Fsed "/etc/X11" "/usr/lib/X11" $Fdestdir/etc/X11/fs/config
From boobaa at frugalware.org  Tue Oct  2 20:13:08 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Tue Oct  2 20:13:10 2007
Subject: [Frugalware-git] boobaa: qtpfsgui-1.8.12-1-i686
Message-ID: <20071002181308.A6C9A13A4076@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa.git;a=commitdiff;h=8d55fbd3e05511a3dc7431ed3582dab321f835bf

commit 8d55fbd3e05511a3dc7431ed3582dab321f835bf
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Tue Oct 2 20:07:40 2007 +0200

qtpfsgui-1.8.12-1-i686
new package / initial import
thx crazy for the patch

diff --git a/source/kde-extra/qtpfsgui/FrugalBuild b/source/kde-extra/qtpfsgui/FrugalBuild
new file mode 100644
index 0000000..8af3cc9
--- /dev/null
+++ b/source/kde-extra/qtpfsgui/FrugalBuild
@@ -0,0 +1,28 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: CSÉCSY László <boobaa@frugalware.org>
+
+pkgname=qtpfsgui
+pkgver=1.8.12
+pkgrel=1
+pkgdesc="an open source graphical user interface application that aims to provide a workflow for HDR imaging"
+depends=('qt4' 'exiv2' 'openexr' 'fftw')
+groups=('kde-extra')
+archs=('i686')
+_F_sourceforge_ext=".tar.gz"
+_F_kde_defaults=0
+Finclude sourceforge kde
+up2date="lynx -dump http://qtpfsgui.sourceforge.net/ | grep -m1 'Released version' | sed 's/.*version \(.*\):.*/\1/'"
+source=($source fix_it.patch)
+
+build()
+{
+	Fcd
+	Fpatchall
+	/usr/bin/qmake -o Makefile project.pro || Fdie
+	make || Fdie
+	make INSTALL_ROOT=$Fdestdir install || Fdie
+}
+
+# optimization OK
+sha1sums=('3646c3f463afae74cf19246463eb3cc8413902af' \
+	  'cadb9c7196ecfba4ca07c289a404e1e7c88a4f6f')
diff --git a/source/kde-extra/qtpfsgui/fix_it.patch b/source/kde-extra/qtpfsgui/fix_it.patch
new file mode 100644
index 0000000..8c2b6f4
--- /dev/null
+++ b/source/kde-extra/qtpfsgui/fix_it.patch
@@ -0,0 +1,20 @@
+--- project.pro.orig	2007-10-01 22:17:56.000000000 +0200
++++ project.pro	2007-10-01 22:23:48.000000000 +0200
+@@ -1,8 +1,6 @@
+ TEMPLATE = app
+ CONFIG += release qt thread
+ DEFINES += QT_NO_DEBUG_OUTPUT
+-QMAKE_CXXFLAGS += -O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe
+-QMAKE_CXXFLAGS_RELEASE-=-O2
+
+ unix {
+ ########################################### QT ###########################################
+@@ -163,7 +161,7 @@
+
+ ############################## required by "make install" ########################################
+ isEmpty(PREFIX) {
+-        PREFIX = /usr/local
++        PREFIX = /usr
+ }
+ isEmpty(I18NDIR) {
+ 	I18NDIR = $${PREFIX}/share/qtpfsgui/i18n
From priyank at frugalware.org  Tue Oct  2 21:48:01 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 21:48:05 2007
Subject: [Frugalware-git] frugalware-current: xfwm4-4.4.1-2-i686
Message-ID: <20071002194801.E8F1513A4076@genesis.frugalware.org>

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

commit 61d6766fadffbeb3487833bbed1c246b5b32bd29
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 01:15:42 2007 +0530

xfwm4-4.4.1-2-i686
* Added a patch (from xfce bugzilla) that prevents xfce4 to stop responding
to keyboard / mouse events after the gtk+ 2.12 upgrade

diff --git a/source/xfce4/xfwm4/FrugalBuild b/source/xfce4/xfwm4/FrugalBuild
index 3c21c5d..6643d30 100644
--- a/source/xfce4/xfwm4/FrugalBuild
+++ b/source/xfce4/xfwm4/FrugalBuild
@@ -1,9 +1,9 @@
-# Compiling Time: 0.30 SBU
+# Compiling Time: 0.19 SBU
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=xfwm4
pkgver=4.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A window manager compatable with Xfce4, Gnome and KDE."
makedepends=('xfce-mcs-manager>=4.4.1')
depends=('libxfcegui4>=4.4.1' 'xfce-mcs-plugins>=4.4.1' 'libxfce4mcs>=4.4.1' \
@@ -12,9 +12,10 @@ groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
_F_gnome_iconcache="y"
Finclude xfce4 gnome-scriptlet
-source=(${source[@]} xfwm_frugalware.patch)
+source=(${source[@]} xfwm_frugalware.patch xfwm4-gtk212.patch)
Fconfopts="$Fconfopts --enable-compositor"
-sha1sums=('1f1c0cb374941bce2bd59eedd8d9bd05591c65a0'\
-          '581f049fe15c2c8639af5b975643b3eea1c38578')
+sha1sums=('1f1c0cb374941bce2bd59eedd8d9bd05591c65a0' \
+          '581f049fe15c2c8639af5b975643b3eea1c38578' \
+          'a44f947351144b6df035a845fc2bac175044b2c1')

# optimization OK
From priyank at frugalware.org  Tue Oct  2 21:50:12 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 21:50:14 2007
Subject: [Frugalware-git] frugalware-current: xfwm4-4.4.1-2-i686
Message-ID: <20071002195012.6AB5513A4076@genesis.frugalware.org>

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

commit 85534fa5017933f630471f2a581bf9631379e117
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 01:19:22 2007 +0530

xfwm4-4.4.1-2-i686
* brrr forgot the patch

diff --git a/source/xfce4/xfwm4/xfwm4-gtk212.patch b/source/xfce4/xfwm4/xfwm4-gtk212.patch
new file mode 100644
index 0000000..c56bfbb
--- /dev/null
+++ b/source/xfce4/xfwm4/xfwm4-gtk212.patch
@@ -0,0 +1,157 @@
+Index: src/display.c
+===================================================================
+--- src/display.c	(revision 25820)
++++ src/display.c	(working copy)
+@@ -178,6 +178,19 @@
+                           FALSE, display_info->atoms) != 0);
+ }
+
++static void
++myDisplayCreateTimestampWin (DisplayInfo *display_info)
++{
++    XSetWindowAttributes attributes;
++
++    attributes.event_mask = PropertyChangeMask;
++    attributes.override_redirect = TRUE;
++    display_info->timestamp_win =
++        XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
++                       -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
++                       CWEventMask | CWOverrideRedirect, &attributes);
++}
++
+ DisplayInfo *
+ myDisplayInit (GdkDisplay *gdisplay)
+ {
+@@ -309,6 +322,8 @@
+     display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
+         XCreateFontCursor (display->dpy, XC_bottom_side);
+
++    myDisplayCreateTimestampWin (display);
++
+     display->xfilter = NULL;
+     display->screens = NULL;
+     display->clients = NULL;
+@@ -340,6 +355,8 @@
+     display->move_cursor = None;
+     XFreeCursor (display->dpy, display->root_cursor);
+     display->root_cursor = None;
++    XDestroyWindow (display->dpy, display->timestamp_win);
++    display->timestamp_win = None;
+
+     if (display->hostname)
+     {
+Index: src/display.h
+===================================================================
+--- src/display.h	(revision 25820)
++++ src/display.h	(working copy)
+@@ -226,6 +226,7 @@
+     gboolean quit;
+     gboolean reload;
+
++    Window timestamp_win;
+     Cursor busy_cursor;
+     Cursor move_cursor;
+     Cursor root_cursor;
+Index: src/client.c
+===================================================================
+--- src/client.c	(revision 25820)
++++ src/client.c	(working copy)
+@@ -4868,21 +4868,19 @@
+
+     if (passdata.c)
+     {
+-        GdkPixbuf *icon;
+-
+         TRACE ("entering cycle loop");
+         passdata.wireframe = wireframeCreate (passdata.c);
+-        icon = getAppIcon (display_info, passdata.c->window, 32, 32);
+         passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
+                                         passdata.c, passdata.cycle_range,
+                                         screen_info->params->cycle_workspaces);
+         eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
+         gtk_main ();
+         eventFilterPop (display_info->xfilter);
+-        wireframeDelete (screen_info, passdata.wireframe);
+         TRACE ("leaving cycle loop");
+         tabwinDestroy (passdata.tabwin);
+         g_free (passdata.tabwin);
++        wireframeDelete (screen_info, passdata.wireframe);
++        updateXserverTime (display_info);
+     }
+
+     if (passdata.c)
+Index: src/hints.c
+===================================================================
+--- src/hints.c	(revision 25820)
++++ src/hints.c	(working copy)
+@@ -1167,27 +1167,18 @@
+     return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
+ }
+
+-
+-static Bool
+-checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
++void
++updateXserverTime (DisplayInfo *display_info)
+ {
+-    DisplayInfo *display_info;
+     ScreenInfo *screen_info;
++    char c = '\0';
+
+-    display_info = (DisplayInfo *) arg;
+-    g_return_val_if_fail (display_info, FALSE);
++    g_return_if_fail (display_info);
+
+-    screen_info = myDisplayGetDefaultScreen (display_info);
+-    g_return_val_if_fail (screen_info, FALSE);
+-
+-    if ((xevent->type == PropertyNotify) &&
+-        (xevent->xproperty.window == screen_info->xfwm4_win) &&
+-        (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
+-    {
+-        return TRUE;
+-    }
+-
+-    return FALSE;
++    XChangeProperty (display_info->dpy, display_info->timestamp_win,
++                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
++                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
++                     8, PropModeReplace, (unsigned char *) &c, 1);
+ }
+
+ Time
+@@ -1196,7 +1187,6 @@
+     ScreenInfo *screen_info;
+     XEvent xevent;
+     Time timestamp;
+-    char c = '\0';
+
+     g_return_val_if_fail (display_info, (Time) CurrentTime);
+     timestamp = myDisplayGetCurrentTime (display_info);
+@@ -1206,12 +1196,8 @@
+         g_return_val_if_fail (screen_info,  (Time) CurrentTime);
+
+         TRACE ("getXServerTime: Using X server roundtrip");
+-        XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
+-                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
+-                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
+-                         8, PropModeReplace, (unsigned char *) &c, 1);
+-        XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
+-
++        updateXserverTime (display_info);
++        XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
+         timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
+     }
+
+Index: src/hints.h
+===================================================================
+--- src/hints.h	(revision 25820)
++++ src/hints.h	(working copy)
+@@ -269,6 +269,7 @@
+                                                                  int,
+                                                                  Window ,
+                                                                  Window);
++void                     updateXserverTime                      (DisplayInfo *);
+ Time                     getXServerTime                         (DisplayInfo *);
+
+ #ifdef ENABLE_KDE_SYSTRAY_PROXY
From crazy at frugalware.org  Tue Oct  2 22:00:52 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 22:00:54 2007
Subject: [Frugalware-git] frugalware-current: amule-2.1.3-8-i686
Message-ID: <20071002200052.3C46A13A4076@genesis.frugalware.org>

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

commit 34c4978b1a25adcdbe76cd2b652feca05eb09a55
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 21:56:45 2007 +0200

amule-2.1.3-8-i686
* rebuild with binutils
* man this package is weird ..
* closes #2460

diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild
index 06dcb78..f81065f 100644
--- a/source/xapps-extra/amule/FrugalBuild
+++ b/source/xapps-extra/amule/FrugalBuild
@@ -3,14 +3,14 @@

pkgname=amule
pkgver=2.1.3
-pkgrel=7
+pkgrel=8
pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network."
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="aMule"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.amule.org/"
-depends=('wxgtk>=2.6.4' 'libxxf86vm' 'binutils=2.18')
+depends=('wxgtk>=2.6.4' 'libxxf86vm' 'binutils=2.18.50.0.1')
conflicts=('xmule')
up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10"
license="GPL2"
From priyank at frugalware.org  Tue Oct  2 22:07:51 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 22:07:53 2007
Subject: [Frugalware-git] fw-control-center: updated NEWS for 0.1.3
Message-ID: <20071002200751.6EC7313A4076@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=de9516276dadc4ec5da55977edef978243f69dfd

commit de9516276dadc4ec5da55977edef978243f69dfd
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 01:37:01 2007 +0530

updated NEWS for 0.1.3

diff --git a/gnetconfig/NEWS b/gnetconfig/NEWS
index a827b20..0e6d74f 100644
--- a/gnetconfig/NEWS
+++ b/gnetconfig/NEWS
@@ -1,5 +1,9 @@
VERSION			DESCRIPTION
---------------------------------------------------------------------------------------------------------
+0.1.3			- Set the textdomain codeset to UTF-8. This fixes a bug where the 				  text is not displayed correctly for accented languages like fr, hu
+			- BUGFIX: Fixed a bug where a blank gateway line was written if the
+			  user left the gateway entry blank when editing a network interface
+			- BUGFIX: Fix a double free or corruption
0.1.2			- New translation : Danish (dk)
- BUGFIX: Fixed a bug where the last active profile was not
automatically highlighted in the profile list.
From priyank at frugalware.org  Tue Oct  2 22:08:36 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 22:08:37 2007
Subject: [Frugalware-git] fw-control-center: TAG 0.1.3
Message-ID: <20071002200836.E834713A4076@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=93dea9d79a949774c7622a22e1397d64d757abe3

commit 93dea9d79a949774c7622a22e1397d64d757abe3
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 01:37:48 2007 +0530

TAG 0.1.3
From priyank at frugalware.org  Tue Oct  2 22:13:16 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  2 22:13:17 2007
Subject: [Frugalware-git] frugalware-current: gnetconfig-0.1.3-1-i686
Message-ID: <20071002201316.1046B13A4076@genesis.frugalware.org>

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

commit a7282b966e32c8d00e421880b0bb4b15b68829c9
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 01:41:34 2007 +0530

gnetconfig-0.1.3-1-i686
* Version bump

diff --git a/source/xapps/gnetconfig/FrugalBuild b/source/xapps/gnetconfig/FrugalBuild
index 61f9e14..f7e53c5 100644
--- a/source/xapps/gnetconfig/FrugalBuild
+++ b/source/xapps/gnetconfig/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gnetconfig
-pkgver=0.1.2
+pkgver=0.1.3
pkgrel=1
pkgdesc="A graphical network configuration tool for Frugalware Linux."
url="http://ftp.frugalware.org/pub/other/fw-control-center"
From vmiklos at frugalware.org  Tue Oct  2 22:37:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 22:37:48 2007
Subject: [Frugalware-git] frugalware-current: scm.sh: support _F_scm_tag for
	subversion
Message-ID: <20071002203746.9B77113A4076@genesis.frugalware.org>

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

commit 72dfdaf42c091f44741b7c367da3de12b6a1e6c2
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 22:36:08 2007 +0200

scm.sh: support _F_scm_tag for subversion

diff --git a/source/include/scm.sh b/source/include/scm.sh
index 801c64f..982b616 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
-# * _F_scm_tag: name of the tag/branch to use - implemented for darcs/cvs/git
+# * _F_scm_tag: name of the tag/branch to use - implemented for darcs/cvs/svn/git
###

# slice the / suffix if there is any
@@ -128,7 +128,11 @@ Funpack_scm()
fi
Fcd $_F_scm_module
elif [ "$_F_scm_type" == "subversion" ]; then
-		svn co $_F_scm_url $pkgname || Fdie
+		if [ -z "$_F_scm_tag" ]; then
+			svn co $_F_scm_url $pkgname || Fdie
+		else
+			svn co -r $_F_scm_tag $_F_scm_url $pkgname || Fdie
+		fi
Fcd $pkgname
elif [ "$_F_scm_type" == "git" ]; then
if [ -d $pkgname ]; then
From vmiklos at frugalware.org  Tue Oct  2 22:37:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 22:37:48 2007
Subject: [Frugalware-git] frugalware-current: scm.sh: remove obsolete
	_F_scm_module from svn example
Message-ID: <20071002203746.B1FF813A4077@genesis.frugalware.org>

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

commit 6f582d6925a50c8f2b6a4231e8f379f190da5729
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 22:36:45 2007 +0200

scm.sh: remove obsolete _F_scm_module from svn example

diff --git a/source/include/scm.sh b/source/include/scm.sh
index 982b616..0915ab5 100644
--- a/source/include/scm.sh
+++ b/source/include/scm.sh
@@ -60,7 +60,6 @@
# --------------------------------------------------
# _F_scm_type="subversion"
# _F_scm_url="svn://svn.mplayerhq.hu/mplayer/trunk"
-# _F_scm_module="mplayer"
# --------------------------------------------------
# == OPTIONS
# * _F_scm_type: can be darcs, cvs, subversion, git, mercurial or bzr - required
From vmiklos at frugalware.org  Tue Oct  2 22:42:16 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 22:42:17 2007
Subject: [Frugalware-git] bmf: libtorrent-svn975-1bmf1-i686
Message-ID: <20071002204216.17A3413A4076@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=10941a042e2e6148ffc0763267498737ae451379

commit 10941a042e2e6148ffc0763267498737ae451379
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 22:41:42 2007 +0200

libtorrent-svn975-1bmf1-i686
import from current

diff --git a/source/lib-extra/libtorrent/FrugalBuild b/source/lib-extra/libtorrent/FrugalBuild
new file mode 100644
index 0000000..3f1ac8a
--- /dev/null
+++ b/source/lib-extra/libtorrent/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: ~0.72 SBU
+# Maintainer: voroskoi <voroskoi@frugalware.org>
+
+pkgname=libtorrent
+pkgver=svn975
+pkgrel=1bmf1
+pkgdesc="LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code."
+url="http://libtorrent.rakshasa.no/"
+depends=('openssl' 'libsigc++2')
+groups=('lib-extra')
+archs=('i686' 'x86_64')
+Fconfopts="$Fconfopts --enable-static"
+
+_F_scm_type="subversion"
+_F_scm_url="svn://rakshasa.no/libtorrent/trunk/libtorrent"
+_F_scm_tag="975"
+Finclude scm
+
+build()
+{
+	Funpack_scm
+	sh autogen.sh || return 1
+	Fbuild
+}
+
+# optimization OK
From vmiklos at frugalware.org  Tue Oct  2 23:05:49 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 23:05:51 2007
Subject: [Frugalware-git] frugalware-current: kvm-35-1-i686
Message-ID: <20071002210549.6590D13A4076@genesis.frugalware.org>

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

commit 163fa9504a818a96ae9eabb690823a246a2fa004
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 23:05:33 2007 +0200

kvm-35-1-i686
added link to changelog

diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild
index a60d577..680a8a9 100644
--- a/source/xapps-extra/kvm/FrugalBuild
+++ b/source/xapps-extra/kvm/FrugalBuild
@@ -14,6 +14,9 @@ makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3')
sha1sums=('5e20b856915091c2eb9da2adf47ef95cf6346e8b')
Fconfopts="--prefix=$Fprefix"

+# no changelog in the tarball, you can reach it here:
+# http://kvm.qumranet.com/kvmwiki/ChangeLog
+
build() {
# i?86 is i386, NOT x86_64..
Fsed 'echo x86_64' 'echo i386' configure
From vmiklos at frugalware.org  Tue Oct  2 23:11:23 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 23:11:25 2007
Subject: [Frugalware-git] bmf: libtorrent-svn975-1bmf2-i686
Message-ID: <20071002211123.20EC213A4076@genesis.frugalware.org>

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

commit f2cb84fb390e99d00f3ce4b343e32df2d362c736
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 23:11:11 2007 +0200

libtorrent-svn975-1bmf2-i686
brr, forgot to add patch :)

diff --git a/source/lib-extra/libtorrent/FrugalBuild b/source/lib-extra/libtorrent/FrugalBuild
index 3f1ac8a..372559b 100644
--- a/source/lib-extra/libtorrent/FrugalBuild
+++ b/source/lib-extra/libtorrent/FrugalBuild
@@ -3,12 +3,14 @@

pkgname=libtorrent
pkgver=svn975
-pkgrel=1bmf1
+pkgrel=1bmf2
pkgdesc="LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code."
url="http://libtorrent.rakshasa.no/"
depends=('openssl' 'libsigc++2')
groups=('lib-extra')
archs=('i686' 'x86_64')
+source=(dht.diff)
+sha1sums=('efe05581d451a7d973a0865e2fd493363539726f')
Fconfopts="$Fconfopts --enable-static"

_F_scm_type="subversion"
@@ -19,8 +21,10 @@ Finclude scm
build()
{
Funpack_scm
+	Fpatchall
sh autogen.sh || return 1
-	Fbuild
+	Fmake
+	Fmakeinstall
}

# optimization OK
diff --git a/source/lib-extra/libtorrent/dht.diff b/source/lib-extra/libtorrent/dht.diff
new file mode 100644
index 0000000..12bac8a
--- /dev/null
+++ b/source/lib-extra/libtorrent/dht.diff
@@ -0,0 +1,5112 @@
+Index: libtorrent/scripts/checks.m4
+===================================================================
+--- libtorrent/scripts/checks.m4	(revision 975)
++++ libtorrent/scripts/checks.m4	(working copy)
+@@ -289,7 +289,27 @@
+     ])
+ ])
+
++AC_DEFUN([TORRENT_CHECK_TR1], [
++  AC_LANG_PUSH(C++)
++  AC_MSG_CHECKING(for TR1 support)
+
++  AC_COMPILE_IFELSE(
++    [[#include <tr1/unordered_map>
++      class Foo;
++      typedef std::tr1::unordered_map<Foo*, int> Bar;
++    ]],
++    [
++      AC_MSG_RESULT(yes)
++      AC_DEFINE(HAVE_TR1, 1, Define to 1 if your C++ library supports the extensions from Technical Report 1)
++    ],
++    [
++      AC_MSG_RESULT(no)
++    ]
++  )
++
++  AC_LANG_POP(C++)
++])
++
+ AC_DEFUN([TORRENT_WITH_FASTCGI], [
+   AC_ARG_WITH(fastcgi,
+     [  --with-fastcgi=PATH      Enable FastCGI RPC support. (DO NOT USE)],
+Index: libtorrent/scripts/common.m4
+===================================================================
+--- libtorrent/scripts/common.m4	(revision 975)
++++ libtorrent/scripts/common.m4	(working copy)
+@@ -239,3 +239,18 @@
+         fi
+     ])
+ ])
++
++AC_DEFUN([TORRENT_ENABLE_TR1], [
++  AC_ARG_ENABLE(std_tr1,
++    [  --disable-std_tr1       disable check for support for TR1 [[default=enable]]],
++    [
++      if test "$enableval" = "yes"; then
++        TORRENT_CHECK_TR1()
++      else
++        AC_MSG_CHECKING(for TR1 support)
++        AC_MSG_RESULT(disabled)
++      fi
++    ],[
++        TORRENT_CHECK_TR1()
++    ])
++])
+Index: libtorrent/src/dht/dht_tracker.h
+===================================================================
+--- libtorrent/src/dht/dht_tracker.h	(revision 0)
++++ libtorrent/src/dht/dht_tracker.h	(revision 0)
+@@ -0,0 +1,84 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_TORRENT_H
++#define LIBTORRENT_DHT_TORRENT_H
++
++#include "globals.h"
++
++#include <vector>
++#include <rak/socket_address.h>
++
++#include "download/download_info.h"  // for SocketAddressCompact
++
++namespace torrent {
++
++class Object;
++
++// Container for peers tracked in a torrent.
++
++class DhtTracker : private std::vector<SocketAddressCompact> {
++public:
++  typedef std::vector<SocketAddressCompact>  base_type;
++
++  // Maximum number of peers we return for a GET_PEERS query (default value).
++  // Needs to be small enough so that a packet with a payload of num_peers*6 bytes
++  // does not need fragmentation. Value chosen so that the size is approximately
++  // equal to a FIND_NODE reply (8*26 bytes).
++  static const unsigned int max_peers = 32;
++
++  // Maximum number of peers we keep track of. For torrents with more peers,
++  // replace random peers with new announces to avoid excessively large peer
++  // tables for active torrents.
++  static const unsigned int max_size = 128;
++
++  using base_type::empty;
++  using base_type::size;
++
++  void                add_peer(const rak::socket_address* sa);
++  std::string         get_peers(unsigned int maxPeers = max_peers);
++
++  // Remove old announces from the tracker that have not reannounced for
++  // more than the given number of prune calls.
++  void                prune(uint32_t maxAge);
++
++private:
++  std::vector<uint32_t>  m_lastSeen;
++};
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_bucket.cc
+===================================================================
+--- libtorrent/src/dht/dht_bucket.cc	(revision 0)
++++ libtorrent/src/dht/dht_bucket.cc	(revision 0)
+@@ -0,0 +1,191 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include "torrent/exceptions.h"
++
++#include "dht_bucket.h"
++#include "dht_node.h"
++
++namespace torrent {
++
++DhtBucket::DhtBucket(const HashString& begin, const HashString& end) :
++  m_parent(NULL),
++  m_child(NULL),
++
++  m_lastChanged(cachedTime.seconds()),
++
++  m_good(0),
++  m_bad(0),
++
++  m_begin(begin),
++  m_end(end) {
++
++  reserve(num_nodes);
++}
++
++void
++DhtBucket::add_node(DhtNode* n) {
++  push_back(n);
++  touch();
++
++  if (n->is_good())
++    m_good++;
++  else if (n->is_bad())
++    m_bad++;
++}
++
++void
++DhtBucket::remove_node(DhtNode* n) {
++  iterator itr = std::find_if(begin(), end(), std::bind2nd(std::equal_to<DhtNode*>(), n));
++  if (itr == end())
++    throw internal_error("DhtBucket::remove_node called for node not in bucket.");
++
++  erase(itr);
++
++  if (n->is_good())
++    m_good--;
++  else if (n->is_bad())
++    m_bad--;
++}
++
++void
++DhtBucket::count() {
++  m_good = std::count_if(begin(), end(), std::mem_fun(&DhtNode::is_good));
++  m_bad = std::count_if(begin(), end(), std::mem_fun(&DhtNode::is_bad));
++}
++
++// Called every 15 minutes for housekeeping.
++void
++DhtBucket::update() {
++  // For now we only update the counts after some nodes have become bad
++  // due to prolonged inactivity.
++  count();
++}
++
++DhtBucket::iterator
++DhtBucket::find_replacement_candidate(bool onlyOldest) {
++  iterator oldest = end();
++  unsigned int oldestTime = std::numeric_limits<unsigned int>::max();
++
++  for (iterator itr = begin(); itr != end(); ++itr) {
++    if ((*itr)->is_bad() && !onlyOldest)
++      return itr;
++
++    if ((*itr)->last_seen() < oldestTime) {
++      oldestTime = (*itr)->last_seen();
++      oldest = itr;
++    }
++  }
++
++  return oldest;
++}
++
++void
++DhtBucket::get_mid_point(HashString* middle) const {
++  *middle = m_end;
++
++  for (unsigned int i=0; i<m_begin.size(); i++)
++    if (m_begin[i] != m_end[i]) {
++      (*middle)[i] = ((uint8_t)m_begin[i] + (uint8_t)m_end[i]) / 2;
++      break;
++    }
++}
++
++void
++DhtBucket::get_random_id(HashString* rand_id) const {
++
++  // Generate a random ID between m_begin and m_end.
++  // Since m_end - m_begin = 2^n - 1, we can do a bitwise AND operation.
++  for (unsigned int i=0; i<(*rand_id).size(); i++)
++    (*rand_id)[i] = m_begin[i] + (random() & (m_end[i] - m_begin[i]));
++
++#ifdef USE_EXTRA_DEBUG
++  if (!is_in_range(*rand_id))
++    throw internal_error("DhtBucket::get_random_id generated an out-of-range ID.");
++#endif
++}
++
++DhtBucket*
++DhtBucket::split(const HashString& id) {
++  HashString mid_range;
++  get_mid_point(&mid_range);
++
++  DhtBucket* other = new DhtBucket(m_begin, mid_range);
++
++  // Set m_begin = mid_range + 1
++  int carry = 1;
++  for (unsigned int i = mid_range.size(); i>0; i--) {
++    unsigned int sum = (uint8_t)mid_range[i-1] + carry;
++    m_begin[i-1] = (uint8_t)sum;
++    carry = sum >> 8;
++  }
++
++  // Move nodes over to other bucket if they fall in its range, then
++  // delete them from this one.
++  iterator split = std::partition(begin(), end(), std::bind2nd(std::mem_fun(&DhtNode::is_in_range), this));
++  other->insert(other->end(), split, end());
++  std::for_each(other->begin(), other->end(), std::bind2nd(std::mem_fun(&DhtNode::set_bucket), other));
++  erase(split, end());
++
++  other->set_time(m_lastChanged);
++  other->count();
++
++  count();
++
++  // Maintain child (adjacent narrower bucket) and parent (adjacent wider bucket)
++  // so that given router ID is in child.
++  if (other->is_in_range(id)) {
++    // Make other become our new child.
++    m_child = other;
++    other->m_parent = this;
++
++  } else {
++    // We become other's child, other becomes our parent's child.
++    if (parent()) {
++      parent()->m_child = other;
++      other->m_parent = parent();
++    }
++
++    m_parent = other;
++    other->m_child = this;
++  }
++
++  return other;
++}
++
++}
+Index: libtorrent/src/dht/dht_bucket.h
+===================================================================
+--- libtorrent/src/dht/dht_bucket.h	(revision 0)
++++ libtorrent/src/dht/dht_bucket.h	(revision 0)
+@@ -0,0 +1,183 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_BUCKET_H
++#define LIBTORRENT_DHT_BUCKET_H
++
++#include <list>
++
++#include "globals.h"
++
++#include "torrent/hash_string.h"
++
++namespace torrent {
++
++class DhtNode;
++
++// A container holding a small number of nodes that fall in a given binary
++// partition of the 160-bit ID space (i.e. the range ID1..ID2 where ID2-ID1+1 is
++// a power of 2.)
++class DhtBucket : private std::vector<DhtNode*> {
++public:
++  static const unsigned int num_nodes = 8;
++
++  typedef std::vector<DhtNode*>      base_type;
++
++  using base_type::const_iterator;
++  using base_type::iterator;
++
++  using base_type::begin;
++  using base_type::end;
++  using base_type::size;
++  using base_type::empty;
++
++  DhtBucket(const HashString& begin, const HashString& end);
++
++  // Add new node. Does NOT set node's bucket automatically (to allow adding a
++  // node to multiple buckets, with only one "main" bucket.)
++  void                add_node(DhtNode* n);
++
++  void                remove_node(DhtNode* n);
++
++  // Bucket's ID range functions.
++  const HashString&   id_range_begin() const                  { return m_begin; }
++  HashString&         id_range_begin()                        { return m_begin; }
++  const HashString&   id_range_end() const                    { return m_end; }
++  HashString&         id_range_end()                          { return m_end; }
++
++  bool                is_in_range(const HashString& id) const { return m_begin <= id && id <= m_end; }
++
++  // Find middle or random ID in bucket.
++  void                get_mid_point(HashString* middle) const;
++  void                get_random_id(HashString* rand_id) const;
++
++  // Node counts and bucket stats.
++  bool                is_full() const                         { return size() >= num_nodes; }
++  bool                has_space() const                       { return !is_full() || num_bad() > 0; }
++  unsigned int        num_good() const                        { return m_good; }
++  unsigned int        num_bad() const                         { return m_bad; }
++
++  unsigned int        age() const                             { return cachedTime.seconds() - m_lastChanged; }
++  void                touch()                                 { m_lastChanged = cachedTime.seconds(); }
++  void                set_time(int time)                      { m_lastChanged = time; }
++
++  // Called every 15 minutes after updating nodes.
++  void                update();
++
++  // Return candidate for replacement (a bad node or the oldest node); may
++  // return end() unless has_space() is true.
++  iterator            find_replacement_candidate(bool onlyOldest = false);
++
++  // Split the bucket in two and redistribute nodes. Returned bucket is the
++  // lower half, "this" bucket keeps the upper half.   Sets parent/child so
++  // that the bucket the given ID falls in is the child.
++  DhtBucket*          split(const HashString& id);
++
++  // Parent and child buckets.  Parent is the adjacent bucket with double the
++  // ID width, child the adjacent bucket with half the width (except the very
++  // last child which has the same width.)
++  DhtBucket*          parent() const                          { return m_parent; }
++  DhtBucket*          child() const                           { return m_child; }
++
++  // Called by the DhtNode on its bucket to update good/bad node counts.
++  void                node_now_good(bool was_bad);
++  void                node_now_bad(bool was_good);
++
++private:
++  void                count();
++
++  DhtBucket*          m_parent;
++  DhtBucket*          m_child;
++
++  unsigned int        m_lastChanged;
++
++  unsigned int        m_good;
++  unsigned int        m_bad;
++
++  // These are 40 bytes together, so might as well put them last.
++  HashString          m_begin;
++  HashString          m_end;
++};
++
++// Helper class to recursively follow a chain of buckets.  It first recurses
++// into the bucket's children since they are by definition closer to the bucket,
++// then continues with the bucket's parents.
++class DhtBucketChain {
++public:
++  DhtBucketChain(const DhtBucket* b) : m_restart(b), m_cur(b) { }
++
++  const DhtBucket*          bucket()                          { return m_cur; }
++  const DhtBucket*          next();
++
++private:
++  const DhtBucket*          m_restart;
++  const DhtBucket*          m_cur;
++};
++
++inline void
++DhtBucket::node_now_good(bool was_bad) {
++  m_bad -= was_bad;
++  m_good++;
++}
++
++inline void
++DhtBucket::node_now_bad(bool was_good) {
++  m_good -= was_good;
++  m_bad++;
++}
++
++inline const DhtBucket*
++DhtBucketChain::next() {
++  // m_restart is clear when we're done recursing into the children and
++  // follow the parents instead.
++  if (m_restart == NULL) {
++    m_cur = m_cur->parent();
++
++  } else {
++    m_cur = m_cur->child();
++
++    if (!m_cur) {
++      m_cur = m_restart->parent();
++      m_restart = NULL;
++    }
++  }
++
++  return m_cur;
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_router.cc
+===================================================================
+--- libtorrent/src/dht/dht_router.cc	(revision 0)
++++ libtorrent/src/dht/dht_router.cc	(revision 0)
+@@ -0,0 +1,646 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++#include "globals.h"
++
++#include <sstream>
++#include <rak/functional.h>
++#include <rak/string_manip.h>
++
++#include "torrent/dht_manager.h"
++#include "torrent/exceptions.h"
++#include "utils/sha1.h"
++#include "manager.h"
++
++#include "dht_bucket.h"
++#include "dht_router.h"
++#include "dht_tracker.h"
++#include "dht_transaction.h"
++
++namespace torrent {
++
++HashString DhtRouter::zero_id;
++
++DhtRouter::DhtRouter(const Object& cache, const rak::socket_address* sa) :
++  DhtNode(zero_id, sa),  // actual ID is set later
++  m_server(this),
++  m_contacts(NULL),
++  m_numRefresh(0),
++  m_curToken(random()),
++  m_prevToken(random()) {
++
++  HashString ones_id;
++
++  zero_id.clear();
++  ones_id.clear(0xFF);
++
++  if (cache.has_key("self_id")) {
++    assign(cache.get_key_string("self_id").c_str());
++
++  } else {
++    long buffer[size_data];
++
++    for (long* itr = buffer; itr != buffer + size_data; ++itr)
++      *itr = random();
++
++    Sha1 sha;
++    sha.init();
++    sha.update(buffer, sizeof(buffer));
++    sha.final_c(data());
++  }
++
++  set_bucket(new DhtBucket(zero_id, ones_id));
++  m_routingTable.insert(std::make_pair(bucket()->id_range_end(), bucket()));
++
++  if (cache.has_key("nodes")) {
++    Object::map_type nodes = cache.get_key_map("nodes");
++
++    for (Object::map_type::const_iterator itr = nodes.begin(); itr != nodes.end(); ++itr) {
++      if (itr->first.length() != HashString::size_data)
++        throw bencode_error("Loading cache: Invalid node hash.");
++
++      add_node_to_bucket(m_nodes.insert(new DhtNode(itr->first, itr->second)));
++    }
++  }
++
++  if (m_nodes.size() < num_bootstrap_complete)
++    m_contacts = new std::list<rak::socket_address>;
++}
++
++DhtRouter::~DhtRouter() {
++  stop();
++  std::for_each(m_routingTable.begin(), m_routingTable.end(), rak::on(rak::mem_ref(&DhtBucketList::value_type::second), rak::call_delete<DhtBucket>()));
++  std::for_each(m_trackers.begin(), m_trackers.end(), rak::on(rak::mem_ref(&DhtTrackerList::value_type::second), rak::call_delete<DhtTracker>()));
++  std::for_each(m_nodes.begin(), m_nodes.end(), rak::on(rak::mem_ref(&DhtNodeList::value_type::second), rak::call_delete<DhtNode>()));
++}
++
++void
++DhtRouter::start(int port) {
++  m_server.start(port);
++
++  // Set timeout slot and schedule it to be called immediately for initial bootstrapping if necessary.
++  m_taskTimeout.set_slot(rak::mem_fn(this, &DhtRouter::receive_timeout_bootstrap));
++  priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(1)).round_seconds());
++}
++
++void
++DhtRouter::stop() {
++  priority_queue_erase(&taskScheduler, &m_taskTimeout);
++  m_server.stop();
++}
++
++// Start a DHT get_peers and announce_peer request.
++void
++DhtRouter::announce(DownloadInfo* info, TrackerDht* tracker) {
++  m_server.announce(*find_bucket(info->hash())->second, info->hash(), tracker);
++}
++
++// Cancel any running requests from the given tracker.
++// If info is not NULL, only cancel those requests.
++void
++DhtRouter::cancel_announce(DownloadInfo* info, const TrackerDht* tracker) {
++  m_server.cancel_announce(info, tracker);
++}
++
++DhtTracker*
++DhtRouter::get_tracker(const HashString& hash, bool create) {
++  DhtTrackerList::accessor itr = m_trackers.find(hash);
++
++  if (itr == m_trackers.end()) {
++    if (!create)
++      return NULL;
++
++    std::pair<DhtTrackerList::accessor, bool> res = m_trackers.insert(std::make_pair(hash, new DhtTracker()));
++
++    if (!res.second)
++      throw internal_error("DhtRouter::get_tracker did not actually insert tracker.");
++
++    return res.first.tracker();
++  }
++
++  return itr.tracker();
++}
++
++bool
++DhtRouter::want_node(const HashString& id) {
++  // We don't want to add ourself.  Also, too many broken implementations
++  // advertise an ID of 0, which causes collisions, so reject that.
++  if (id == this->id() || id == zero_id)
++    return false;
++
++  // We are always interested in more nodes for our own bucket (causing it
++  // to be split if full); in other buckets only if there's space.
++  DhtBucket* b = find_bucket(id)->second;
++  return b == bucket() || b->has_space();
++}
++
++DhtNode*
++DhtRouter::get_node(const HashString& id) {
++  DhtNodeList::accessor itr = m_nodes.find(&id);
++
++  if (itr == m_nodes.end()) {
++    if (id == this->id())
++      return this;
++    else
++      return NULL;
++  }
++
++  return itr.node();
++}
++
++DhtRouter::DhtBucketList::iterator
++DhtRouter::find_bucket(const HashString& id) {
++  DhtBucketList::iterator itr = m_routingTable.upper_bound(id);
++
++#ifdef USE_EXTRA_DEBUG
++  if (itr == m_routingTable.end())
++    throw internal_error("DHT Buckets not covering entire ID space.");
++
++  if (!itr->second->is_in_range(id))
++    throw internal_error("DhtRouter::find_bucket, m_routingTable.upper_bound did not find correct bucket.");
++#endif
++
++  return itr;
++}
++
++void
++DhtRouter::contact(const rak::socket_address* sa, bool external) {
++  // For non-external nodes, e.g. those from an explict add_node command
++  // or found via the BT PORT message, contact them immediately if possible.
++  if (!external) {
++    if (is_active())
++      m_server.ping(zero_id, sa);
++
++  } else {
++    // Externally obtained nodes are added to the contact list, but only if
++    // we're still bootstrapping. We don't contact external nodes after that.
++    if (m_contacts != NULL)
++      m_contacts->push_back(*sa);
++  }
++}
++
++// Received a query from the given node. If it has previously replied
++// to one of our queries, consider it alive and update the bucket mtime,
++// otherwise if we could use it in a bucket, try contacting it.
++DhtNode*
++DhtRouter::node_queried(const HashString& id, const rak::socket_address* sa) {
++  DhtNode* node = get_node(id);
++
++  if (node == NULL) {
++    if (want_node(id))
++      m_server.ping(id, sa);
++
++    return NULL;
++  }
++
++  // If we know the ID but the address is different, don't set the original node
++  // active, but neither use this new address to prevent rogue nodes from polluting
++  // our routing table with fake source addresses.
++  if (node->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
++    return NULL;
++
++  node->queried();
++  if (node->is_good())
++    node->bucket()->touch();
++
++  return node;
++}
++
++// Received a reply from a node we queried.
++// Check that it matches the information we have, set that it has replied
++// and update the bucket mtime.
++DhtNode*
++DhtRouter::node_replied(const HashString& id, const rak::socket_address* sa) {
++  DhtNode* node = get_node(id);
++
++  if (node == NULL) {
++    // New node, create it. It's a good node (it replied!) so add it to a bucket.
++    if (id == this->id() || id == zero_id)
++      return NULL;
++
++    node = m_nodes.insert(new DhtNode(id, sa));
++
++    if (!add_node_to_bucket(node))   // deletes the node if it fails
++      return NULL;
++  }
++
++  if (node->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
++    return NULL;
++
++  node->replied();
++  node->bucket()->touch();
++
++  return node;
++}
++
++// A node has not replied to one of our queries.
++DhtNode*
++DhtRouter::node_inactive(const HashString& id, const rak::socket_address* sa) {
++  DhtNodeList::accessor itr = m_nodes.find(&id);
++
++  // If not found add it to some blacklist so we won't try contacting it again immediately?
++  if (itr == m_nodes.end())
++    return NULL;
++
++  // Check source address. Normally node_inactive is called if we DON'T receive a reply,
++  // however it can also be called if a node replied with an malformed response packet,
++  // so check that the address matches so that a rogue node cannot cause other nodes
++  // to be considered bad by sending malformed packets.
++  if (itr.node()->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
++    return NULL;
++
++  itr.node()->inactive();
++
++  // Old node age normally implies no replies for many consecutive queries, however
++  // after loading the node cache after a day or more we want to give each node a few
++  // chances to reply again instead of removing all nodes instantly.
++  if (itr.node()->is_bad() && itr.node()->age() >= timeout_remove_node) {
++    delete_node(itr);
++    return NULL;
++  }
++
++  return itr.node();
++}
++
++// We sent a query to the given node ID, but received a reply from a different
++// node ID, that means the address of the original ID is invalid now.
++void
++DhtRouter::node_invalid(const HashString& id) {
++  DhtNode* node = get_node(id);
++
++  if (node == NULL || node == this)
++    return;
++
++  delete_node(m_nodes.find(&node->id()));
++}
++
++char*
++DhtRouter::store_closest_nodes(const HashString& id, char* buffer, char* bufferEnd) {
++  DhtBucketChain chain(find_bucket(id)->second);
++
++  do {
++    for (DhtBucket::const_iterator itr = chain.bucket()->begin(); itr != chain.bucket()->end(); ++itr) {
++      if (!(*itr)->is_bad()) {
++        buffer = (*itr)->store_compact(buffer);
++
++        if (buffer > bufferEnd)
++          throw internal_error("DhtRouter::store_closest_nodes wrote past buffer end.");
++
++        if (buffer == bufferEnd)
++          break;
++      }
++    }
++  } while (buffer != bufferEnd && chain.next());
++
++  return buffer;
++}
++
++Object*
++DhtRouter::store_cache(Object* container) const {
++  container->insert_key("self_id", str());
++
++  // Insert all nodes.
++  Object& nodes = container->insert_key("nodes", Object(Object::TYPE_MAP));
++  for (DhtNodeList::const_accessor itr = m_nodes.begin(); itr != m_nodes.end(); ++itr) {
++    if (!itr.node()->is_bad())
++      itr.node()->store_cache(&nodes.insert_key(itr.id().str(), Object(Object::TYPE_MAP)));
++  }
++
++  return container;
++}
++
++DhtManager::statistics_type
++DhtRouter::get_statistics() const {
++  DhtManager::statistics_type stats(*m_server.upload_throttle()->rate(), *m_server.download_throttle()->rate());
++
++  if (!m_server.is_active())
++    stats.cycle = 0;
++  else if (m_numRefresh < 2)  // still bootstrapping
++    stats.cycle = 1;
++  else
++    stats.cycle = m_numRefresh;
++
++  stats.queries_received = m_server.queries_received();
++  stats.queries_sent = m_server.queries_sent();
++  stats.replies_received = m_server.replies_received();
++
++  stats.num_nodes = m_nodes.size();
++  stats.num_buckets = m_routingTable.size();
++
++  stats.num_peers = 0;
++  stats.max_peers = 0;
++  stats.num_trackers = m_trackers.size();
++
++  for (DhtTrackerList::const_accessor itr = m_trackers.begin(); itr != m_trackers.end(); ++itr) {
++    unsigned int peers = itr.tracker()->size();
++    stats.num_peers += peers;
++    stats.max_peers = std::max(peers, stats.max_peers);
++  }
++
++  return stats;
++}
++
++void
++DhtRouter::receive_timeout_bootstrap() {
++  // If we're still bootstrapping, restart the process every 60 seconds until
++  // we have enough nodes in our routing table. After we have 32 nodes, we switch
++  // to a less aggressive non-bootstrap mode of collecting nodes that contact us
++  // and through doing normal torrent announces.
++  if (m_nodes.size() < num_bootstrap_complete) {
++    if (m_contacts == NULL)
++      throw internal_error("DhtRouter::receive_timeout_bootstrap called without contact list.");
++
++    if (!m_nodes.empty() || !m_contacts->empty())
++      bootstrap();
++
++    // Retry in 60 seconds.
++    priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(timeout_bootstrap_retry)).round_seconds());
++    m_numRefresh = 1;  // still bootstrapping
++
++  } else {
++    // We won't be needing external contacts after this.
++    if (m_contacts != NULL) {
++      delete m_contacts;
++      m_contacts = NULL;
++    }
++
++    m_taskTimeout.set_slot(rak::mem_fn(this, &DhtRouter::receive_timeout));
++
++    if (!m_numRefresh) {
++      // If we're still in the startup, do the usual refreshing too.
++      receive_timeout();
++
++    } else {
++      // Otherwise just set the 15 minute timer.
++      priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(timeout_update)).round_seconds());
++    }
++
++    m_numRefresh = 2;
++  }
++}
++
++void
++DhtRouter::receive_timeout() {
++  priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(timeout_update)).round_seconds());
++
++  m_prevToken = m_curToken;
++  m_curToken = random();
++
++  // Do some periodic accounting, refreshing buckets and marking
++  // bad nodes.
++
++  // Update nodes.
++  for (DhtNodeList::accessor itr = m_nodes.begin(); itr != m_nodes.end(); ++itr) {
++    if (!itr.node()->bucket())
++      throw internal_error("DhtRouter::receive_timeout has node without bucket.");
++
++    itr.node()->update();
++
++    // Try contacting nodes we haven't received anything from for a while.
++    // Don't contact repeatedly unresponsive nodes; we keep them in case they
++    // do send a query, until we find a better node. However, give it a last
++    // chance just before deleting it.
++    if (itr.node()->is_questionable() && (!itr.node()->is_bad() || itr.node()->age() >= timeout_remove_node))
++      m_server.ping(itr.node()->id(), itr.node()->address());
++  }
++
++  // If bucket isn't full yet or hasn't received replies/queries from
++  // its nodes for a while, try to find new nodes now.
++  for (DhtBucketList::const_iterator itr = m_routingTable.begin(); itr != m_routingTable.end(); ++itr) {
++    itr->second->update();
++
++    if (!itr->second->is_full() || itr->second->age() > timeout_bucket_bootstrap)
++      bootstrap_bucket(itr->second);
++  }
++
++  // Remove old peers and empty torrents from the tracker.
++  for (DhtTrackerList::accessor itr = m_trackers.begin(); itr != m_trackers.end(); ) {
++    itr.tracker()->prune(timeout_peer_announce);
++
++    if (itr.tracker()->empty()) {
++      delete itr.tracker();
++      m_trackers.erase(itr++);
++
++    } else {
++      ++itr;
++    }
++  }
++
++  m_server.update();
++
++  m_numRefresh++;
++}
++
++void
++DhtRouter::generate_token(const rak::socket_address* sa, int token, char buffer[20]) {
++  Sha1 sha;
++  uint32_t key = sa->sa_inet()->address_n();
++
++  sha.init();
++  sha.update(&token, sizeof(token));
++  sha.update(&key, 4);
++  sha.final_c(buffer);
++}
++
++std::string
++DhtRouter::make_token(const rak::socket_address* sa) {
++  char token[20];
++
++  generate_token(sa, m_curToken, token);
++
++  return std::string(token, size_token);
++}
++
++bool
++DhtRouter::token_valid(const std::string& token, const rak::socket_address* sa) {
++  if (token.length() != size_token)
++    return false;
++
++  // Compare given token to the reference token.
++  char reference[20];
++
++  // First try current token.
++  generate_token(sa, m_curToken, reference);
++
++  if (std::memcmp(reference, token.c_str(), size_token) == 0)
++    return true;
++
++  // If token recently changed, some clients may be using the older one.
++  // That way a token is valid for 15-30 minutes, instead of 0-15.
++  generate_token(sa, m_prevToken, reference);
++
++  return std::memcmp(reference, token.c_str(), size_token) == 0;
++}
++
++DhtNode*
++DhtRouter::find_node(const rak::socket_address* sa) {
++  for (DhtNodeList::accessor itr = m_nodes.begin(); itr != m_nodes.end(); ++itr)
++    if (itr.node()->address()->sa_inet()->address_n() == sa->sa_inet()->address_n())
++      return itr.node();
++
++  return NULL;
++}
++
++DhtRouter::DhtBucketList::iterator
++DhtRouter::split_bucket(const DhtBucketList::iterator& itr, DhtNode* node) {
++  // Split bucket. Current bucket keeps the upper half thus keeping the
++  // map key valid, new bucket is the lower half of the original bucket.
++  DhtBucket* newBucket = itr->second->split(id());
++
++  // If our bucket has a child now (the new bucket), move ourself into it.
++  if (bucket()->child() != NULL)
++    set_bucket(bucket()->child());
++
++  if (!bucket()->is_in_range(id()))
++    throw internal_error("DhtRouter::split_bucket router ID ended up in wrong bucket.");
++
++  // Insert new bucket with iterator hint = just before current bucket.
++  DhtBucketList::iterator other = m_routingTable.insert(itr, std::make_pair(newBucket->id_range_end(), newBucket));
++
++  // Check that the bucket we're not adding the node to isn't empty.
++  if (other->second->is_in_range(node->id())) {
++    if (itr->second->empty())
++      bootstrap_bucket(itr->second);
++
++  } else {
++    if (other->second->empty())
++      bootstrap_bucket(other->second);
++
++    other = itr;
++  }
++
++  return other;
++}
++
++bool
++DhtRouter::add_node_to_bucket(DhtNode* node) {
++  DhtBucketList::iterator itr = find_bucket(node->id());
++
++  while (itr->second->is_full()) {
++    // Bucket is full. If there are any bad nodes, remove the oldest.
++    DhtBucket::iterator nodeItr = itr->second->find_replacement_candidate();
++    if (nodeItr == itr->second->end())
++      throw internal_error("DhtBucket::find_candidate returned no node.");
++
++    if ((*nodeItr)->is_bad()) {
++      delete_node(m_nodes.find(&(*nodeItr)->id()));
++
++    } else {
++      // Bucket is full of good nodes; if our own ID falls in
++      // range then split the bucket else discard new node.
++      if (itr->second != bucket()) {
++        delete_node(m_nodes.find(&node->id()));
++        return false;
++      }
++
++      itr = split_bucket(itr, node);
++    }
++  }
++
++  itr->second->add_node(node);
++  node->set_bucket(itr->second);
++  return true;
++}
++
++void
++DhtRouter::delete_node(const DhtNodeList::accessor& itr) {
++  if (itr == m_nodes.end())
++    throw internal_error("DhtRouter::delete_node called with invalid iterator.");
++
++  if (itr.node()->bucket() != NULL)
++    itr.node()->bucket()->remove_node(itr.node());
++
++  delete itr.node();
++
++  m_nodes.erase(itr);
++}
++
++void
++DhtRouter::bootstrap() {
++  // Contact up to 8 nodes from the contact list.
++  for (int count = 0; count < 8 && !m_contacts->empty(); count++) {
++    if (!find_node(&m_contacts->back()))
++      m_server.ping(zero_id, &m_contacts->back());
++
++    m_contacts->pop_back();
++  }
++
++  // Abort unless we already found some nodes for a search.
++  if (m_nodes.empty())
++    return;
++
++  bootstrap_bucket(bucket());
++
++  // Aggressively ping all questionable nodes in our own bucket to weed
++  // out bad nodes as early as possible and make room for fresh nodes.
++  for (DhtBucket::iterator itr = bucket()->begin(); itr != bucket()->end(); ++itr)
++    if (!(*itr)->is_good())
++      m_server.ping((*itr)->id(), (*itr)->address());
++
++  // Also bootstrap a random bucket, if there are others.
++  if (m_routingTable.size() < 2)
++    return;
++
++  DhtBucketList::iterator itr = m_routingTable.begin();
++  std::advance(itr, random() % m_routingTable.size());
++
++  if (itr->second != bucket() && itr != m_routingTable.end())
++    bootstrap_bucket(itr->second);
++}
++
++void
++DhtRouter::bootstrap_bucket(const DhtBucket* bucket) {
++  if (!m_server.is_active())
++    return;
++
++  // Do a search for a random ID, or the ID adjacent to our
++  // own when bootstrapping our own bucket. We don't search for
++  // our own exact ID to avoid receiving only our own node info
++  // instead of closest nodes, from nodes that know us already.
++  HashString contactId;
++
++  if (bucket == this->bucket()) {
++    contactId = id();
++    contactId[contactId.size() - 1] ^= 1;
++  } else {
++    bucket->get_random_id(&contactId);
++  }
++
++  m_server.find_node(*bucket, contactId);
++}
++
++}
+Index: libtorrent/src/dht/dht_router.h
+===================================================================
+--- libtorrent/src/dht/dht_router.h	(revision 0)
++++ libtorrent/src/dht/dht_router.h	(revision 0)
+@@ -0,0 +1,174 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_ROUTER_H
++#define LIBTORRENT_DHT_ROUTER_H
++
++#include <rak/priority_queue_default.h>
++#include <rak/socket_address.h>
++
++#include "torrent/dht_manager.h"
++#include "torrent/hash_string.h"
++#include "torrent/object.h"
++
++#include "dht_node.h"
++#include "dht_hash_map.h"
++#include "dht_server.h"
++
++namespace torrent {
++
++class DhtBucket;
++class DhtTracker;
++class TrackerDht;
++
++// Main DHT class, maintains the routing table of known nodes and talks to the
++// DhtServer object that handles the actual communication.
++
++class DhtRouter : public DhtNode {
++public:
++  // How many bytes to return and verify from the 20-byte SHA token.
++  static const unsigned int size_token = 8;
++
++  static const unsigned int timeout_bootstrap_retry  =          60;  // Retry initial bootstrapping every minute.
++  static const unsigned int timeout_update           =     15 * 60;  // Regular housekeeping updates every 15 minutes.
++  static const unsigned int timeout_bucket_bootstrap =     15 * 60;  // Bootstrap idle buckets after 15 minutes.
++  static const unsigned int timeout_remove_node      = 4 * 60 * 60;  // Remove unresponsive nodes after 4 hours.
++  static const unsigned int timeout_peer_announce    =     30 * 60;  // Remove peers which haven't reannounced for 30 minutes.
++
++  // A node ID of all zero.
++  static HashString zero_id;
++
++  DhtRouter(const Object& cache, const rak::socket_address* sa);
++  ~DhtRouter();
++
++  // Start and stop the router. This starts/stops the UDP server as well.
++  void                start(int port);
++  void                stop();
++
++  bool                is_active()                        { return m_server.is_active(); }
++
++  // Find peers for given download and announce ourselves.
++  void                announce(DownloadInfo* info, TrackerDht* tracker);
++
++  // Cancel any pending transactions related to the given download (or all if NULL).
++  void                cancel_announce(DownloadInfo* info, const TrackerDht* tracker);
++
++  // Retrieve tracked torrent for the hash.
++  // Returns NULL if not tracking the torrent unless create is true.
++  DhtTracker*         get_tracker(const HashString& hash, bool create);
++
++  // Check if we are interested in inserting a new node of the given ID
++  // into our table (i.e. if we have space or bad nodes in the corresponding bucket).
++  bool                want_node(const HashString& id);
++
++  // Contact the given node, or add it to the list of potential contacts
++  // if it was obtained externally from a .torrent file for example.
++  void                contact(const rak::socket_address* sa, bool external);
++
++  // Retrieve node of given ID in constant time. Return NULL if not found, unless
++  // it's our own ID in which case it returns the DhtRouter object.
++  DhtNode*            get_node(const HashString& id);
++
++  // Search for node with given address in O(n), disregarding the port.
++  DhtNode*            find_node(const rak::socket_address* sa);
++
++  // Whenever a node queries us, replies, or is confirmed inactive (no reply) or
++  // invalid (reply with wrong ID), we need to update its status.
++  DhtNode*            node_queried(const HashString& id, const rak::socket_address* sa);
++  DhtNode*            node_replied(const HashString& id, const rak::socket_address* sa);
++  DhtNode*            node_inactive(const HashString& id, const rak::socket_address* sa);
++  void                node_invalid(const HashString& id);
++
++  // Store compact node information (26 bytes) for nodes closest to the
++  // given ID in the given buffer, return new buffer end.
++  char*               store_closest_nodes(const HashString& id, char* buffer, char* bufferEnd);
++
++  // Store DHT cache in the given container.
++  Object*             store_cache(Object* container) const;
++
++  // Create and verify a token. Tokens are valid between 15-30 minutes from creation.
++  std::string         make_token(const rak::socket_address* sa);
++  bool                token_valid(const std::string& token, const rak::socket_address* sa);
++
++  DhtManager::statistics_type get_statistics() const;
++  void                reset_statistics()                 { m_server.reset_statistics(); }
++
++  DhtServer*          server()                           { return &m_server; }
++  DhtTrackerList*     trackers()                         { return &m_trackers; }
++
++private:
++  // Number of nodes we need to consider the bootstrap process complete.
++  static const unsigned int num_bootstrap_complete = 32;
++
++  typedef std::map<const HashString, DhtBucket*> DhtBucketList;
++
++  DhtBucketList::iterator find_bucket(const HashString& id);
++
++  bool                add_node_to_bucket(DhtNode* node);
++  void                delete_node(const DhtNodeList::accessor& itr);
++
++  DhtBucketList::iterator split_bucket(const DhtBucketList::iterator& itr, DhtNode* node);
++
++  void                bootstrap();
++  void                bootstrap_bucket(const DhtBucket* bucket);
++
++  void                receive_timeout();
++  void                receive_timeout_bootstrap();
++
++  // buffer needs to hold an SHA1 hash (20 bytes), not just the token (8 bytes)
++  void                generate_token(const rak::socket_address* sa, int token, char buffer[20]);
++
++  rak::priority_item  m_taskTimeout;
++
++  DhtServer           m_server;
++  DhtNodeList         m_nodes;
++  DhtBucketList       m_routingTable;
++  DhtTrackerList      m_trackers;
++
++  std::list<rak::socket_address>* m_contacts;
++
++  int                 m_numRefresh;
++
++  bool                m_networkUp;
++
++  // Secret keys used for generating announce tokens.
++  int                 m_curToken;
++  int                 m_prevToken;
++};
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_hash_map.h
+===================================================================
+--- libtorrent/src/dht/dht_hash_map.h	(revision 0)
++++ libtorrent/src/dht/dht_hash_map.h	(revision 0)
+@@ -0,0 +1,168 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_HASH_MAP_H
++#define LIBTORRENT_DHT_HASH_MAP_H
++
++#include "config.h"
++
++#if HAVE_TR1
++#include <tr1/unordered_map>
++#else
++#include <map>
++#endif
++
++#include "torrent/hash_string.h"
++
++#include "dht_node.h"
++#include "dht_tracker.h"
++
++namespace torrent {
++
++#if HAVE_TR1
++// Hash functions for HashString keys, and dereferencing HashString pointers.
++// We use the last n bits of the 160-bit ID hash, since in sub-buckets the
++// first few bits are all identical.
++struct hashstring_ptr_hash : public std::unary_function<const HashString*, size_t> {
++  size_t operator () (const HashString* n) const
++  { return *(size_t*)(n->data() + n->size() - sizeof(size_t)); }
++};
++
++struct hashstring_hash : public std::unary_function<HashString, size_t> {
++  size_t operator () (const HashString& n) const
++  { return *(size_t*)(n.data() + n.size() - sizeof(size_t)); }
++};
++
++// Compare HashString pointers by dereferencing them.
++struct hashstring_ptr_equal : public std::binary_function<const HashString*, const HashString*, bool> {
++  size_t operator () (const HashString* one, const HashString* two) const
++  { return *one == *two; }
++};
++
++class DhtNodeList : public std::tr1::unordered_map<const HashString*, DhtNode*, hashstring_ptr_hash, hashstring_ptr_equal> {
++public:
++  typedef std::tr1::unordered_map<const HashString*, DhtNode*, hashstring_ptr_hash, hashstring_ptr_equal> base_type;
++
++  // Define accessor iterator with more convenient access to the key and
++  // element values.  Allows changing the map definition more easily if needed.
++  template<typename T>
++  struct accessor_wrapper : public T {
++    accessor_wrapper(const T& itr) : T(itr) { }
++
++    const HashString&    id() const    { return *(**this).first; }
++    DhtNode*             node() const  { return (**this).second; }
++  };
++
++  typedef accessor_wrapper<const_iterator>  const_accessor;
++  typedef accessor_wrapper<iterator>        accessor;
++
++  DhtNode*            insert(DhtNode* n);
++
++};
++
++class DhtTrackerList : public std::tr1::unordered_map<HashString, DhtTracker*, hashstring_hash> {
++public:
++  typedef std::tr1::unordered_map<HashString, DhtTracker*, hashstring_hash> base_type;
++
++  template<typename T>
++  struct accessor_wrapper : public T {
++    accessor_wrapper(const T& itr) : T(itr) { }
++
++    const HashString&    id() const       { return (**this).first; }
++    DhtTracker*          tracker() const  { return (**this).second; }
++  };
++
++  typedef accessor_wrapper<const_iterator>  const_accessor;
++  typedef accessor_wrapper<iterator>        accessor;
++
++};
++
++#else
++
++// Compare HashString pointers by dereferencing them.
++struct hashstring_ptr_less : public std::binary_function<const HashString*, const HashString*, bool> {
++  size_t operator () (const HashString* one, const HashString* two) const
++  { return *one < *two; }
++};
++
++class DhtNodeList : public std::map<const HashString*, DhtNode*, hashstring_ptr_less> {
++public:
++  typedef std::map<const HashString*, DhtNode*, hashstring_ptr_less> base_type;
++
++  // Define accessor iterator with more convenient access to the key and
++  // element values.  Allows changing the map definition more easily if needed.
++  template<typename T>
++  struct accessor_wrapper : public T {
++    accessor_wrapper(const T& itr) : T(itr) { }
++
++    const HashString&    id() const    { return *(**this).first; }
++    DhtNode*             node() const  { return (**this).second; }
++  };
++
++  typedef accessor_wrapper<const_iterator>  const_accessor;
++  typedef accessor_wrapper<iterator>        accessor;
++
++  DhtNode*            insert(DhtNode* n);
++
++};
++
++class DhtTrackerList : public std::map<HashString, DhtTracker*> {
++public:
++  typedef std::map<HashString, DhtTracker*> base_type;
++
++  template<typename T>
++  struct accessor_wrapper : public T {
++    accessor_wrapper(const T& itr) : T(itr) { }
++
++    const HashString&    id() const       { return (**this).first; }
++    DhtTracker*          tracker() const  { return (**this).second; }
++  };
++
++  typedef accessor_wrapper<const_iterator>  const_accessor;
++  typedef accessor_wrapper<iterator>        accessor;
++
++};
++#endif // HAVE_TR1
++
++inline
++DhtNode* DhtNodeList::insert(DhtNode* n) {
++  base_type::insert(std::make_pair<const HashString*, DhtNode*>(n, n));
++  return n;
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_transaction.cc
+===================================================================
+--- libtorrent/src/dht/dht_transaction.cc	(revision 0)
++++ libtorrent/src/dht/dht_transaction.cc	(revision 0)
+@@ -0,0 +1,287 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include "torrent/exceptions.h"
++#include "torrent/object_stream.h"
++#include "tracker/tracker_dht.h"
++
++#include "dht_bucket.h"
++#include "dht_transaction.h"
++
++namespace torrent {
++
++DhtSearch::DhtSearch(const HashString& target, const DhtBucket& contacts)
++  : base_type(dht_compare_closer(target)),
++    m_pending(0),
++    m_contacted(0),
++    m_replied(0),
++    m_concurrency(3),
++    m_restart(false),
++    m_started(false),
++    m_next(end()) {
++
++  add_contacts(contacts);
++}
++
++DhtSearch::~DhtSearch() {
++  // Make sure transactions were destructed first. Since it is the destruction
++  // of a transaction that triggers this destructor, that should always be the
++  // case.
++  if (m_pending)
++    throw internal_error("DhtSearch::~DhtSearch called with pending transactions.");
++
++  if (m_concurrency != 3)
++    throw internal_error("DhtSearch::~DhtSearch with invalid concurrency limit.");
++
++  for (accessor itr = begin(); itr != end(); ++itr)
++    delete itr.node();
++}
++
++bool
++DhtSearch::add_contact(const HashString& id, const rak::socket_address* sa) {
++  DhtNode* n = new DhtNode(id, sa);
++  bool added = insert(std::make_pair(n, this)).second;
++
++  if (!added)
++    delete n;
++  else
++    m_restart = true;
++
++  return added;
++}
++
++void
++DhtSearch::add_contacts(const DhtBucket& contacts) {
++  DhtBucketChain chain(&contacts);
++
++  // Add max_contacts=18 closest nodes, and fill up so we also have at least 8 good nodes.
++  int needClosest = max_contacts - size();
++  int needGood = DhtBucket::num_nodes;
++
++  for (DhtBucket::const_iterator itr = chain.bucket()->begin(); needClosest > 0 || needGood > 0; ++itr) {
++    while (itr == chain.bucket()->end()) {
++      if (!chain.next())
++        return;
++
++      itr = chain.bucket()->begin();
++    }
++
++    if ((!(*itr)->is_bad() || needClosest > 0) && add_contact((*itr)->id(), (*itr)->address())) {
++      needGood -= !(*itr)->is_bad();
++      needClosest--;
++    }
++  }
++}
++
++// Check if a node has been contacted yet.  This is the case if it is not currently
++// being contacted, nor has it been found to be good or bad.
++bool
++DhtSearch::node_uncontacted(const DhtNode* node) const {
++  return !node->is_active() && !node->is_good() && !node->is_bad();
++}
++
++// After more contacts have been added, discard least closest nodes
++// except if node has a transaction pending.
++void
++DhtSearch::trim(bool final) {
++
++  // We keep:
++  // - the max_contacts=18 closest good or unknown nodes and all nodes closer
++  //   than them (to see if further searches find closer ones)
++  // - for announces, also the 8 closest good nodes (i.e. nodes that have
++  //   replied) to have at least that many for the actual announce
++  // - any node that currently has transactions pending
++  //
++  // However, after exhausting all search nodes, we only keep good nodes.
++  //
++  // For our purposes, the node status is as follows:
++  // node is bad (contacted but hasn't replied) if is_bad()
++  // node is good (contacted and replied) if is_good()
++  // node is currently being contacted if is_active()
++  // node is new and unknown otherwise
++
++  int needClosest = final ? 0 : max_contacts;
++  int needGood = is_announce() ? DhtBucket::num_nodes : 0;
++
++  // We're done if we can't find any more nodes to contact.
++  m_next = end();
++
++  accessor itr = base_type::begin();
++  while (itr != end()) {
++    // If we have all we need, delete current node unless it is
++    // currently being contacted.
++    if (!itr.node()->is_active() && needClosest <= 0 && (!itr.node()->is_good() || needGood <= 0)) {
++      delete itr.node();
++      erase(itr++);
++      continue;
++    }
++
++    // Otherwise adjust needed counts appropriately.
++    needClosest--;
++    needGood -= itr.node()->is_good();
++
++    // Remember the first uncontacted node as the closest one to contact next.
++    if (m_next == end() && node_uncontacted(itr.node()))
++      m_next = const_accessor(itr);
++
++    ++itr;
++  }
++
++  m_restart = false;
++}
++
++DhtSearch::const_accessor
++DhtSearch::get_contact() {
++  if (m_pending >= m_concurrency)
++    return end();
++
++  if (m_restart)
++    trim(false);
++
++  const_accessor ret = m_next;
++  if (ret == end())
++    return ret;
++
++  set_node_active(ret, true);
++  m_pending++;
++  m_contacted++;
++
++  // Find next node to contact: any node we haven't contacted yet.
++  while (++m_next != end()) {
++    if (node_uncontacted(m_next.node()))
++      break;
++  }
++
++  return ret;
++}
++
++void
++DhtSearch::node_status(const_accessor& n, bool success) {
++  if (n == end() || !n.node()->is_active())
++    throw internal_error("DhtSearch::node_status called for invalid/inactive node.");
++
++  if (success) {
++    n.node()->set_good();
++    m_replied++;
++
++  } else {
++    n.node()->set_bad();
++  }
++
++  m_pending--;
++  set_node_active(n, false);
++}
++
++DhtSearch::const_accessor
++DhtAnnounce::start_announce() {
++  trim(true);
++
++  if (empty())
++    return end();
++
++  if (!complete() || m_next != end() || size() > DhtBucket::num_nodes)
++    throw internal_error("DhtSearch::start_announce called in inconsistent state.");
++
++  m_contacted = m_pending = size();
++  m_replied = 0;
++
++  for (const_accessor itr(begin()); itr != end(); ++itr)
++    set_node_active(itr, true);
++
++  return const_accessor(begin());
++}
++
++void
++DhtTransactionPacket::build_buffer(const Object& data) {
++  char buffer[1500];  // If the message would exceed an Ethernet frame, something went very wrong.
++  object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &data);
++
++  m_length = result.second - buffer;
++  m_data = new char[m_length];
++  memcpy(m_data, buffer, m_length);
++}
++
++DhtTransaction::DhtTransaction(int quick_timeout, int timeout, const HashString& id, const rak::socket_address* sa)
++  : m_hasQuickTimeout(quick_timeout > 0),
++    m_id(id),
++    m_sa(*sa),
++    m_timeout(cachedTime.seconds() + timeout),
++    m_quickTimeout(cachedTime.seconds() + quick_timeout),
++    m_retry(3),
++    m_packet(NULL) {
++
++}
++
++DhtTransaction::~DhtTransaction() {
++  if (m_packet != NULL)
++    m_packet->set_failed();
++}
++
++void
++DhtTransactionSearch::set_stalled() {
++  if (!m_hasQuickTimeout)
++    throw internal_error("DhtTransactionSearch::set_stalled called on already stalled transaction.");
++
++  m_hasQuickTimeout = false;
++  m_search->m_concurrency++;
++}
++
++void
++DhtTransactionSearch::complete(bool success) {
++  if (m_node == m_search->end())
++    throw internal_error("DhtTransactionSearch::complete called multiple times.");
++
++  if (m_node.search() != m_search)
++    throw internal_error("DhtTransactionSearch::complete called for node from wrong search.");
++
++  if (!m_hasQuickTimeout)
++    m_search->m_concurrency--;
++
++  m_search->node_status(m_node, success);
++  m_node = m_search->end();
++}
++
++DhtTransactionSearch::~DhtTransactionSearch() {
++  if (m_node != m_search->end())
++    complete(false);
++
++  if (m_search->complete())
++    delete m_search;
++}
++
++}
+Index: libtorrent/src/dht/dht_node.cc
+===================================================================
+--- libtorrent/src/dht/dht_node.cc	(revision 0)
++++ libtorrent/src/dht/dht_node.cc	(revision 0)
+@@ -0,0 +1,89 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++#include "globals.h"
++
++#include "torrent/exceptions.h"
++#include "torrent/object.h"
++
++#include "dht_node.h"
++
++namespace torrent {
++
++DhtNode::DhtNode(const HashString& id, const rak::socket_address* sa) :
++  HashString(id),
++  m_socketAddress(*sa),
++  m_lastSeen(0),
++  m_recentlyActive(false),
++  m_recentlyInactive(0),
++  m_bucket(NULL) {
++
++  if (sa->family() != rak::socket_address::af_inet)
++    throw resource_error("Address not af_inet");
++}
++
++DhtNode::DhtNode(const std::string& id, const Object& cache) :
++  HashString(*HashString::cast_from(id.c_str())),
++  m_recentlyActive(false),
++  m_recentlyInactive(0),
++  m_bucket(NULL) {
++
++  rak::socket_address_inet* sa = m_socketAddress.sa_inet();
++  sa->set_family();
++  sa->set_address_h(cache.get_key_value("i"));
++  sa->set_port(cache.get_key_value("p"));
++  m_lastSeen = cache.get_key_value("t");
++  update();
++}
++
++char*
++DhtNode::store_compact(char* buffer) const {
++  HashString::cast_from(buffer)->assign(data());
++  *(uint32_t*) (buffer+20) = address()->sa_inet()->address_n();
++  *(uint16_t*) (buffer+24) = address()->sa_inet()->port_n();
++  return buffer+26;
++}
++
++Object*
++DhtNode::store_cache(Object* container) const {
++  container->insert_key("i", m_socketAddress.sa_inet()->address_h());
++  container->insert_key("p", m_socketAddress.sa_inet()->port());
++  container->insert_key("t", m_lastSeen);
++  return container;
++}
++
++}
+Index: libtorrent/src/dht/dht_server.cc
+===================================================================
+--- libtorrent/src/dht/dht_server.cc	(revision 0)
++++ libtorrent/src/dht/dht_server.cc	(revision 0)
+@@ -0,0 +1,912 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++#include "globals.h"
++
++#include <algorithm>
++#include <sstream>
++#include <rak/error_number.h>
++#include <rak/string_manip.h>
++
++#include "net/throttle_manager.h"
++#include "torrent/exceptions.h"
++#include "torrent/connection_manager.h"
++#include "torrent/object.h"
++#include "torrent/object_stream.h"
++#include "torrent/poll.h"
++#include "tracker/tracker_dht.h"
++
++#include "dht_bucket.h"
++#include "dht_router.h"
++#include "dht_transaction.h"
++
++#include "manager.h"
++
++namespace torrent {
++
++const char* DhtServer::queries[] = {
++  "ping",
++  "find_node",
++  "get_peers",
++  "announce_peer",
++};
++
++// Error in DHT protocol, avoids std::string ctor from communication_error
++class dht_error : public network_error {
++public:
++  dht_error(int code, const char* message) : m_message(message), m_code(code) {}
++
++  virtual int          code() const throw()   { return m_code; }
++  virtual const char*  what() const throw()   { return m_message; }
++
++private:
++  const char*  m_message;
++  int          m_code;
++};
++
++DhtServer::DhtServer(DhtRouter* router) :
++  m_router(router),
++
++  m_uploadThrottle(60),
++  m_downloadThrottle(60),
++
++  m_networkUp(false) {
++
++  get_fd().clear();
++  reset_statistics();
++
++  // Reserve a socket for the DHT server, even though we don't
++  // actually open it until the server is started, which may not
++  // happen until the first non-private torrent is started.
++  manager->connection_manager()->inc_socket_count();
++}
++
++DhtServer::~DhtServer() {
++  stop();
++
++  std::for_each(m_highQueue.begin(), m_highQueue.end(), rak::call_delete<DhtTransactionPacket>());
++  std::for_each(m_lowQueue.begin(), m_lowQueue.end(), rak::call_delete<DhtTransactionPacket>());
++
++  manager->connection_manager()->dec_socket_count();
++}
++
++void
++DhtServer::start(int port) {
++  try {
++    if (!get_fd().open_datagram() || !get_fd().set_nonblock())
++      throw resource_error("Could not allocate datagram socket.");
++
++    if (!get_fd().set_reuse_address(true))
++      throw resource_error("Could not set listening port to reuse address.");
++
++    rak::socket_address sa = *m_router->address();
++    sa.set_port(port);
++
++    if (!get_fd().bind(sa))
++      throw resource_error("Could not bind datagram socket.");
++
++  } catch (...) {
++    get_fd().close();
++    get_fd().clear();
++    throw;
++  }
++
++  m_taskTimeout.set_slot(rak::mem_fn(this, &DhtServer::receive_timeout));
++
++  m_uploadThrottle.set_list_iterator(manager->upload_throttle()->throttle_list()->end());
++  m_uploadThrottle.slot_activate(rak::make_mem_fun(reinterpret_cast<SocketBase*>(this), &SocketBase::receive_throttle_up_activate));
++
++  m_downloadThrottle.set_list_iterator(manager->download_throttle()->throttle_list()->end());
++  manager->download_throttle()->throttle_list()->insert(&m_downloadThrottle);
++
++  manager->poll()->open(this);
++  manager->poll()->insert_read(this);
++  manager->poll()->insert_error(this);
++}
++
++void
++DhtServer::stop() {
++  if (!is_active())
++    return;
++
++  clear_transactions();
++
++  priority_queue_erase(&taskScheduler, &m_taskTimeout);
++
++  manager->upload_throttle()->throttle_list()->erase(&m_uploadThrottle);
++  manager->download_throttle()->throttle_list()->erase(&m_downloadThrottle);
++
++  manager->poll()->remove_read(this);
++  manager->poll()->remove_write(this);
++  manager->poll()->remove_error(this);
++  manager->poll()->close(this);
++
++  get_fd().close();
++  get_fd().clear();
++
++  m_networkUp = false;
++}
++
++void
++DhtServer::reset_statistics() {
++  m_queriesReceived = 0;
++  m_queriesSent = 0;
++  m_repliesReceived = 0;
++
++  m_uploadThrottle.rate()->set_total(0);
++  m_downloadThrottle.rate()->set_total(0);
++}
++
++// Ping a node whose ID we know.
++void
++DhtServer::ping(const HashString& id, const rak::socket_address* sa) {
++  // No point pinging a node that we're already contacting otherwise.
++  transaction_itr itr = m_transactions.lower_bound(DhtTransaction::key(sa, 0));
++  if (itr == m_transactions.end() || (itr->first >> 32 != DhtTransaction::key(sa, 0) >> 32))
++    add_transaction(new DhtTransactionPing(id, sa), packet_prio_low);
++}
++
++// Contact nodes in given bucket and ask for their nodes closest to target.
++void
++DhtServer::find_node(const DhtBucket& contacts, const HashString& target) {
++  DhtSearch* search = new DhtSearch(target, contacts);
++
++  DhtSearch::const_accessor n;
++  while ((n = search->get_contact()) != search->end())
++    add_transaction(new DhtTransactionFindNode(n), packet_prio_low);
++
++  // This shouldn't happen, it means we had no contactable nodes at all.
++  if (!search->start()) {
++    delete search;
++    return;
++  }
++
++}
++
++void
++DhtServer::announce(const DhtBucket& contacts, const HashString& infoHash, TrackerDht* tracker) {
++  DhtAnnounce* announce = new DhtAnnounce(infoHash, tracker, contacts);
++
++  DhtSearch::const_accessor n;
++  while ((n = announce->get_contact()) != announce->end())
++    add_transaction(new DhtTransactionFindNode(n), packet_prio_high);
++
++  // This can only happen if all nodes we know are bad.
++  if (!announce->start()) {
++    tracker->receive_failed("No DHT nodes available for peer search.");
++    delete announce;
++    return;
++  }
++
++  tracker->receive_status(announce->num_replied(), announce->num_contacted(), "Searching");
++}
++
++void
++DhtServer::cancel_announce(DownloadInfo* info, const TrackerDht* tracker) {
++  transaction_itr itr = m_transactions.begin();
++
++  while (itr != m_transactions.end()) {
++    if (itr->second->is_search() && itr->second->as_search()->search()->is_announce()) {
++      DhtAnnounce* announce = reinterpret_cast<DhtAnnounce*>(itr->second->as_search()->search());
++
++      if ((!info || announce->target() == info->hash()) && (!tracker || announce->tracker() == tracker)) {
++        itr = cancel_transaction(itr);
++        continue;  // itr has been incremented already
++      }
++    }
++
++    ++itr;
++  }
++}
++
++void
++DhtServer::update() {
++  // Reset this every 15 minutes. It'll get set back to true if we receive
++  // any valid packets. This allows detecting when the entire network goes
++  // down, and prevents all nodes from getting removed as unresponsive.
++  m_networkUp = false;
++}
++
++void
++DhtServer::process_query(const Object& transactionId, const HashString& id, const rak::socket_address* sa, Object& request) {
++  m_queriesReceived++;
++  m_networkUp = true;
++
++  std::string& query = request.get_key_string("q");
++
++  Object& arg = request.get_key("a");
++
++  // Construct reply.
++  Object reply(Object::TYPE_MAP);
++
++  if (query == "find_node")
++    create_find_node_response(arg, reply);
++
++  else if (query == "get_peers")
++    create_get_peers_response(arg, sa, reply);
++
++  else if (query == "announce_peer")
++    create_announce_peer_response(arg, sa, reply);
++
++  else if (query != "ping")
++    throw dht_error(dht_error_bad_method, "Unknown query type.");
++
++  m_router->node_queried(id, sa);
++
++  create_response(transactionId, sa, reply);
++}
++
++void
++DhtServer::create_find_node_response(const Object& arg, Object& reply) {
++  const std::string& target = arg.get_key_string("target");
++
++  if (target.length() < HashString::size_data)
++    throw dht_error(dht_error_protocol, "target string too short");
++
++  char compact[26*8];
++  char* end = m_router->store_closest_nodes(*HashString::cast_from(target), compact, compact + 26*8);
++
++  if (end == compact)
++    throw dht_error(dht_error_generic, "No nodes");
++
++  reply.insert_key("nodes", std::string(compact, end));
++}
++
++void
++DhtServer::create_get_peers_response(const Object& arg, const rak::socket_address* sa, Object& reply) {
++  reply.insert_key("token", m_router->make_token(sa));
++
++  const std::string& info_hash_str = arg.get_key_string("info_hash");
++
++  if (info_hash_str.length() < HashString::size_data)
++    throw dht_error(dht_error_protocol, "info hash too short");
++
++  const HashString* info_hash = HashString::cast_from(info_hash_str);
++
++  DhtTracker* tracker = m_router->get_tracker(*info_hash, false);
++
++  // If we're not tracking or have no peers, send closest nodes.
++  if (!tracker || tracker->empty()) {
++    char compact[26*8];
++    char* end = m_router->store_closest_nodes(*info_hash, compact, compact + 26*8);
++
++    if (end == compact)
++      throw dht_error(dht_error_generic, "No peers nor nodes");
++
++    reply.insert_key("nodes", std::string(compact, end));
++
++  } else {
++    Object& values = reply.insert_key("values", Object(Object::TYPE_LIST));
++    values.insert_back(tracker->get_peers());
++  }
++}
++
++void
++DhtServer::create_announce_peer_response(const Object& arg, const rak::socket_address* sa, Object& reply) {
++  const std::string& info_hash_str = arg.get_key_string("info_hash");
++
++  if (info_hash_str.length() < HashString::size_data)
++    throw dht_error(dht_error_protocol, "info hash too short");
++
++  const HashString* info_hash = HashString::cast_from(info_hash_str);
++
++  if (!m_router->token_valid(arg.get_key_string("token"), sa))
++    throw dht_error(dht_error_protocol, "Token invalid.");
++
++  DhtTracker* tracker = m_router->get_tracker(*info_hash, true);
++  rak::socket_address peer = *sa;
++  peer.set_port(arg.get_key_value("port"));
++  tracker->add_peer(&peer);
++}
++
++void
++DhtServer::process_response(int transactionId, const HashString& id, const rak::socket_address* sa, Object& request) {
++  transaction_itr itr = m_transactions.find(DhtTransaction::key(sa, transactionId));
++
++  // Response to a transaction we don't have in our table. At this point it's
++  // impossible to tell whether it used to be a valid transaction but timed out
++  // or the node did not return the ID we sent it. Best we can do is ignore the
++  // reply.
++  if (itr == m_transactions.end())
++    return;
++
++  m_repliesReceived++;
++  m_networkUp = true;
++
++  const Object& response = request.get_key("r");
++
++  // If we contact a node but the reply ID or key (address) don't match, ignore the reply
++  // to prevent interference from rogue nodes.
++  // (But ignore the port for comparison purposes since it may be changed by NAT.)
++  DhtTransaction* transaction = itr->second;
++  if (DhtTransaction::key(sa, transactionId) != transaction->key(transactionId) || (id != transaction->id() && transaction->id() != *m_router && transaction->id() != m_router->zero_id))
++    return;
++
++  switch (transaction->type()) {
++    case DhtTransaction::DHT_FIND_NODE:
++      parse_find_node_reply(transaction->as_find_node(), response.get_key_string("nodes"));
++      break;
++
++    case DhtTransaction::DHT_GET_PEERS:
++      parse_get_peers_reply(transaction->as_get_peers(), response);
++      break;
++
++    // Nothing to do for DHT_PING and DHT_ANNOUNCE_PEER
++    default:
++      break;
++  }
++
++  // Mark node responsive only if all processing was successful, without errors.
++  m_router->node_replied(id, sa);
++
++  delete itr->second;
++  m_transactions.erase(itr);
++}
++
++void
++DhtServer::process_error(int transactionId, const rak::socket_address* sa, Object& request) {
++  transaction_itr itr = m_transactions.find(DhtTransaction::key(sa, transactionId));
++
++  if (itr == m_transactions.end())
++    return;
++
++  m_repliesReceived++;
++  m_networkUp = true;
++
++  // Don't mark node as good (because it replied) or bad (because it returned an error).
++  // If it consistently returns errors for valid queries it's probably broken.  But a
++  // few error messages are acceptable. So we do nothing and pretend the query never happened.
++
++  cancel_transaction(itr);
++}
++
++void
++DhtServer::parse_node_info(node_info_list& l, const std::string& n) {
++  if (sizeof(const compact_node_info) != 26)
++    throw internal_error("DhtServer::parse_node_info(...) bad struct size.");
++
++  std::copy(reinterpret_cast<const compact_node_info*>(n.c_str()),
++            reinterpret_cast<const compact_node_info*>(n.c_str() + n.size() - n.size() % sizeof(compact_node_info)),
++            std::back_inserter(l));
++}
++
++void
++DhtServer::parse_find_node_reply(DhtTransactionSearch* transaction, const std::string& nodes) {
++  DhtSearch* search = transaction->search();
++
++  transaction->complete(true);
++
++  node_info_list l;
++  parse_node_info(l, nodes);
++
++  for (node_info_list::iterator itr = l.begin(); itr != l.end(); ++itr) {
++    if (itr->id() != m_router->id()) {
++      rak::socket_address sa = itr->address();
++      search->add_contact(itr->id(), &sa);
++    }
++  }
++
++  find_node_next(transaction);
++}
++
++void
++DhtServer::parse_get_peers_reply(DhtTransactionGetPeers* transaction, const Object& response) {
++  DhtAnnounce* announce = transaction->announce();
++
++  transaction->complete(true);
++
++  if (response.has_key_list("values"))
++    announce->tracker()->receive_peers((*response.get_key_list("values").begin()).as_string());
++
++  if (response.has_key_string("token"))
++    add_transaction(new DhtTransactionAnnounce(transaction->id(), transaction->address(), announce->target(), response.get_key_string("token")), packet_prio_low);
++
++  announce->tracker()->receive_status(announce->num_replied(), announce->num_contacted(), "Announcing");
++
++  if (!announce->complete())
++    return;
++
++  DhtTracker* torrent = m_router->get_tracker(transaction->announce()->target(), false);
++  if (torrent != NULL)
++    announce->tracker()->receive_peers(torrent->get_peers());
++
++  announce->tracker()->receive_success();
++}
++
++void
++DhtServer::find_node_next(DhtTransactionSearch* transaction) {
++  DhtSearch::const_accessor node;
++  while ((node = transaction->search()->get_contact()) != transaction->search()->end()) {
++    int prio = packet_prio_low;
++    if (transaction->search()->is_announce())
++      prio = packet_prio_high;
++
++    add_transaction(new DhtTransactionFindNode(node), prio);
++  }
++
++  if (transaction->search()->is_announce())
++    reinterpret_cast<DhtAnnounce*>(transaction->search())->tracker()->receive_status(transaction->search()->num_replied(), transaction->search()->num_contacted(), "Searching");
++
++  if (!transaction->search()->complete())
++    return;
++
++  if (!transaction->search()->is_announce())
++    return;
++
++  // We have found the 8 closest nodes to the info hash. Retrieve peers
++  // from them and announce to them.
++  DhtAnnounce* announce = transaction->as_get_peers()->announce();
++
++  for (node = announce->start_announce(); node != announce->end(); ++node)
++    add_transaction(new DhtTransactionGetPeers(node), packet_prio_high);
++
++  if (announce->complete())
++    return announce->tracker()->receive_failed("DHT search unsuccessful.");
++
++  announce->tracker()->receive_status(announce->num_replied(), announce->num_contacted(), "Announcing");
++}
++
++void
++DhtServer::add_packet(DhtTransactionPacket* packet, int priority) {
++  switch (priority) {
++    // High priority packets are for important queries, and quite small.
++    // They're added to front of high priority queue and thus will be the
++    // next packets sent.
++    case packet_prio_high:
++      m_highQueue.push_front(packet);
++      break;
++
++    // Low priority query packets are added to the back of the high priority
++    // queue and will be sent when all high priority packets have been transmitted.
++    case packet_prio_low:
++      m_highQueue.push_back(packet);
++      break;
++
++    // Reply packets will be processed after all of our own packets have been send.
++    case packet_prio_reply:
++      m_lowQueue.push_back(packet);
++      break;
++
++    default:
++      throw internal_error("DhtServer::add_packet called with invalid priority.");
++  }
++}
++
++void
++DhtServer::create_query(transaction_itr itr, int tID, const rak::socket_address* sa, int priority) {
++  if (itr->second->id() == m_router->id()) {
++    delete itr->second;
++    m_transactions.erase(itr);
++    return;   // Don't send to ourself.
++  }
++
++  Object query(Object::TYPE_MAP);
++
++  Object q(Object::TYPE_MAP);
++  q.insert_key("id", m_router->str());
++
++  DhtTransaction* transaction = itr->second;
++  switch (transaction->type()) {
++    case DhtTransaction::DHT_PING:
++      // nothing to do
++      break;
++
++    case DhtTransaction::DHT_FIND_NODE:
++      q.insert_key("target", transaction->as_find_node()->search()->target().str());
++      break;
++
++    case DhtTransaction::DHT_GET_PEERS:
++      q.insert_key("info_hash", transaction->as_get_peers()->announce()->target().str());
++      break;
++
++    case DhtTransaction::DHT_ANNOUNCE_PEER:
++      q.insert_key("info_hash", transaction->as_announce()->info_hash().str());
++      q.insert_key("port", manager->connection_manager()->listen_port());
++      q.insert_key("token", transaction->as_announce()->token());
++      break;
++  }
++
++  char trans_id = tID;
++  query.insert_key("t", std::string(&trans_id, 1));
++  query.insert_key("y", "q");
++  query.insert_key("q", queries[transaction->type()]);
++  query.insert_key("a", q);
++  query.insert_key("v", PEER_VERSION);
++
++  DhtTransactionPacket* packet = new DhtTransactionPacket(transaction->address(), query, tID, transaction);
++  transaction->set_packet(packet);
++  add_packet(packet, priority);
++
++  m_queriesSent++;
++}
++
++void
++DhtServer::create_response(const Object& transactionId, const rak::socket_address* sa, Object& r) {
++  Object reply(Object::TYPE_MAP);
++  r.insert_key("id", m_router->str());
++
++  reply.insert_key("t", transactionId);
++  reply.insert_key("y", "r");
++  reply.insert_key("r", r);
++  reply.insert_key("v", PEER_VERSION);
++
++  add_packet(new DhtTransactionPacket(sa, reply), packet_prio_reply);
++}
++
++void
++DhtServer::create_error(const Object& transactionId, const rak::socket_address* sa, int num, const std::string& msg) {
++  Object error(Object::TYPE_MAP);
++
++  error.insert_key("t", transactionId);
++  error.insert_key("y", "e");
++  error.insert_key("v", PEER_VERSION);
++
++  Object& e = error.insert_key("e", Object(Object::TYPE_LIST));
++  e.insert_back(num);
++  e.insert_back(msg);
++
++  add_packet(new DhtTransactionPacket(sa, error), packet_prio_reply);
++}
++
++int
++DhtServer::add_transaction(DhtTransaction* transaction, int priority) {
++  // Try random transaction ID. This is to make it less likely that we reuse
++  // a transaction ID from an earlier transaction which timed out and we forgot
++  // about it, so that if the node replies after the timeout it's less likely
++  // that we match the reply to the wrong transaction.
++  //
++  // If there's an existing transaction with the random ID we search for the next
++  // unused one. Since normally only one or two transactions will be active per
++  // node, a collision is extremely unlikely, and a linear search for the first
++  // open one is the most efficient.
++  unsigned int rnd = (uint8_t)random();
++  unsigned int id = rnd;
++
++  transaction_itr insertItr = m_transactions.lower_bound(transaction->key(rnd));
++
++  // If key matches, keep trying successive IDs.
++  while (insertItr != m_transactions.end() && insertItr->first == transaction->key(id)) {
++    ++insertItr;
++    id = (uint8_t)(id + 1);
++
++    // Give up after trying all possible IDs. This should never happen.
++    if (id == rnd) {
++      delete transaction;
++      return -1;
++    }
++
++    // Transaction ID wrapped around, reset iterator.
++    if (id == 0)
++      insertItr = m_transactions.lower_bound(transaction->key(id));
++  }
++
++  // We know where to insert it, so pass that as hint.
++  insertItr = m_transactions.insert(insertItr, std::make_pair(transaction->key(id), transaction));
++
++  create_query(insertItr, id, transaction->address(), priority);
++
++  start_write();
++
++  return id;
++}
++
++// Transaction received no reply and timed out. Mark node as bad and remove
++// transaction (except if it was only the quick timeout).
++DhtServer::transaction_itr
++DhtServer::failed_transaction(transaction_itr itr, bool quick) {
++  DhtTransaction* transaction = itr->second;
++
++  // If it was a known node, remember that it didn't reply, unless the transaction
++  // is only stalled (had quick timeout, but not full timeout).  Also if the
++  // transaction still has an associated packet, the packet never got sent due to
++  // throttling, so don't blame the remote node for not replying.
++  // Finally, if we haven't received anything whatsoever so far, assume the entire
++  // network is down and so we can't blame the node either.
++  if (!quick && m_networkUp && transaction->packet() == NULL && transaction->id() != *m_router)
++    m_router->node_inactive(transaction->id(), transaction->address());
++
++  switch (transaction->type()) {
++    case DhtTransaction::DHT_FIND_NODE:
++      if (quick)
++        transaction->as_find_node()->set_stalled();
++      else
++        transaction->as_find_node()->complete(false);
++
++      find_node_next(transaction->as_find_node());
++      break;
++
++    case DhtTransaction::DHT_GET_PEERS:
++      DhtAnnounce* announce;
++      announce = transaction->as_get_peers()->announce();
++      transaction->as_get_peers()->complete(false);
++      if (announce->complete())
++        announce->tracker()->receive_success();
++      break;
++
++    // Nothing to for DHT_PING and DHT_ANNOUNCE_PEER
++    default:
++      break;
++  }
++
++  if (quick) {
++    return ++itr;         // don't actually delete the transaction until the final timeout
++
++  } else {
++    delete itr->second;
++    m_transactions.erase(itr++);
++    return itr;
++  }
++}
++
++// Cancel transaction before the timeout (i.e. we aren't sure if the node is bad yet).
++DhtServer::transaction_itr
++DhtServer::cancel_transaction(transaction_itr itr) {
++  DhtTransaction* transaction = itr->second;
++
++  // If this was the last transaction of an announce search, notify tracker.
++  if (transaction->is_search() && transaction->as_search()->search()->is_announce()) {
++    transaction->as_search()->complete(false);
++
++    DhtAnnounce* announce = reinterpret_cast<DhtAnnounce*>(transaction->as_search()->search());
++    if (announce->complete()) {
++      // If we got no peers, it's a failure if the announces all failed as well.
++      // We don't want no peers to be a failure in general since it may just be
++      // a dead torrent.
++      if (announce->num_replied() == 0 && !announce->tracker()->has_peers())
++        announce->tracker()->receive_failed("Announce failed");
++      else
++        announce->tracker()->receive_success();
++    }
++  }
++
++  delete itr->second;
++  m_transactions.erase(itr++);
++  return itr;
++}
++
++void
++DhtServer::clear_transactions() {
++  std::for_each(m_transactions.begin(), m_transactions.end(),
++                rak::on(rak::mem_ref(&transaction_map::value_type::second),
++                        rak::call_delete<DhtTransaction>()));
++  m_transactions.clear();
++}
++
++void
++DhtServer::event_read() {
++  uint32_t total = 0;
++  std::istringstream sstream;
++
++  sstream.imbue(std::locale::classic());
++
++  while (true) {
++    rak::socket_address sa;
++    int type = '?';
++    const Object* transactionId = NULL;
++    const HashString* nodeId = NULL;
++
++    try {
++      char buffer[2048];
++      int32_t read = read_datagram(buffer, sizeof(buffer), &sa);
++
++      if (read < 0)
++        break;
++
++      total += read;
++      sstream.str(std::string(buffer, read));
++
++      Object request;
++      sstream >> request;
++
++      // Could throw dht_error with more descriptive error messages but
++      // we can't return an error unless the packet is valid and we have the
++      // transaction ID anyway. Searching the routing table for the source
++      // address to find the node is too expensive, so just ignore the packet.
++      if (sstream.fail() || !request.is_map() || !request.has_key("t") || !request.has_key_string("y"))
++        continue;
++
++      // Read the items required for proper error handling first.
++      transactionId = &request.get_key("t");
++      if (request.get_key_string("y").length() == 1)
++        type = request.get_key_string("y")[0];
++
++      // Queries and replies have node ID in different dictionaries.
++      if (type == 'r' || type == 'q') {
++        const std::string& nodeIdStr = request.get_key(type == 'q' ? "a" : "r").get_key_string("id");
++
++        if (nodeIdStr.length() < HashString::size_data)
++          throw dht_error(dht_error_protocol, "id value too short");
++
++        nodeId = HashString::cast_from(nodeIdStr);
++      }
++
++      // Sanity check the returned transaction ID.
++      if ((type == 'r' || type == 'e') &&
++          (!transactionId->is_string() || transactionId->as_string().length() != 1))
++        throw dht_error(dht_error_protocol, "Invalid transaction ID type/length.");
++
++      switch (type) {
++        case 'q':
++          process_query(*transactionId, *nodeId, &sa, request);
++          break;
++
++        case 'r':
++          process_response(((unsigned char*)transactionId->as_string().c_str())[0], *nodeId, &sa, request);
++          break;
++
++        case 'e':
++          process_error(((unsigned char*)transactionId->as_string().c_str())[0], &sa, request);
++          break;
++
++        default:
++          throw dht_error(dht_error_bad_method, "Unknown message type.");
++      }
++
++    } catch (bencode_error& e) {
++      if (type == 'q' && transactionId != NULL)
++        create_error(*transactionId, &sa, dht_error_protocol, std::string("Malformed packet: ") + e.what());
++      else if ((type == 'r' || type == 'e') && nodeId != NULL)
++        m_router->node_inactive(*nodeId, &sa);
++
++    } catch (dht_error& e) {
++      // If node was querying us, reply with error packet, otherwise mark the node as "query failed",
++      // so that if it repeatedly sends malformed replies we will drop it instead of propagating it
++      // to other nodes.
++      if (type == 'q' && transactionId != NULL)
++        create_error(*transactionId, &sa, e.code(), e.what());
++      else if ((type == 'r' || type == 'e') && nodeId != NULL)
++        m_router->node_inactive(*nodeId, &sa);
++
++    } catch (network_error& e) {
++
++    }
++  }
++
++  manager->download_throttle()->throttle_list()->node_used_unthrottled(total);
++  start_write();
++}
++
++bool
++DhtServer::process_queue(packet_queue& queue, uint32_t* quota) {
++  uint32_t used = 0;
++
++  while (!queue.empty()) {
++    DhtTransactionPacket* packet = queue.front();
++
++    // Make sure its transaction hasn't timed out yet, if it has/had one
++    // and don't bother sending non-transaction packets after more than
++    // 15 seconds in the queue.
++    if (packet->has_failed() || packet->age() > 15) {
++      delete packet;
++      queue.pop_front();
++      continue;
++    }
++
++    if (packet->length() > *quota) {
++      manager->upload_throttle()->throttle_list()->node_used(&m_uploadThrottle, used);
++      return false;
++    }
++
++    queue.pop_front();
++
++    try {
++      int written = write_datagram(packet->c_str(), packet->length(), packet->address());
++
++      if (written == -1)
++        throw network_error();
++
++      used += written;
++      *quota -= written;
++
++      if ((unsigned int)written != packet->length())
++        throw network_error();
++
++    } catch (network_error& e) {
++      // Couldn't write packet, maybe something wrong with node address or routing, so mark node as bad.
++      if (packet->has_transaction()) {
++        transaction_itr itr = m_transactions.find(packet->transaction()->key(packet->id()));
++        if (itr == m_transactions.end())
++          throw internal_error("DhtServer::process_queue could not find transaction.");
++
++        failed_transaction(itr, false);
++      }
++    }
++
++    if (packet->has_transaction())
++      packet->transaction()->set_packet(NULL);
++
++    delete packet;
++  }
++
++  manager->upload_throttle()->throttle_list()->node_used(&m_uploadThrottle, used);
++  return true;
++}
++
++void
++DhtServer::event_write() {
++  if (m_highQueue.empty() && m_lowQueue.empty())
++    throw internal_error("DhtServer::event_write called but both write queues are empty.");
++
++  if (!manager->upload_throttle()->throttle_list()->is_throttled(&m_uploadThrottle))
++    throw internal_error("DhtServer::event_write called while not in throttle list.");
++
++  uint32_t quota = manager->upload_throttle()->throttle_list()->node_quota(&m_uploadThrottle);
++
++  if (quota == 0 || !process_queue(m_highQueue, &quota) || !process_queue(m_lowQueue, &quota)) {
++    manager->poll()->remove_write(this);
++    manager->upload_throttle()->throttle_list()->node_deactivate(&m_uploadThrottle);
++
++  } else if (m_highQueue.empty() && m_lowQueue.empty()) {
++    manager->poll()->remove_write(this);
++    manager->upload_throttle()->throttle_list()->erase(&m_uploadThrottle);
++  }
++}
++
++void
++DhtServer::event_error() {
++}
++
++void
++DhtServer::start_write() {
++  if ((!m_highQueue.empty() || !m_lowQueue.empty()) && !manager->upload_throttle()->throttle_list()->is_throttled(&m_uploadThrottle)) {
++    manager->upload_throttle()->throttle_list()->insert(&m_uploadThrottle);
++    manager->poll()->insert_write(this);
++  }
++
++  if (!m_taskTimeout.is_queued() && !m_transactions.empty())
++    priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(5)).round_seconds());
++}
++
++void
++DhtServer::receive_timeout() {
++  transaction_itr itr = m_transactions.begin();
++  while (itr != m_transactions.end()) {
++    if (itr->second->has_quick_timeout() && itr->second->quick_timeout() < cachedTime.seconds()) {
++      itr = failed_transaction(itr, true);
++
++    } else if (itr->second->timeout() < cachedTime.seconds()) {
++      itr = failed_transaction(itr, false);
++
++    } else {
++      ++itr;
++    }
++  }
++
++  start_write();
++}
++
++}
+Index: libtorrent/src/dht/Makefile.am
+===================================================================
+--- libtorrent/src/dht/Makefile.am	(revision 0)
++++ libtorrent/src/dht/Makefile.am	(revision 0)
+@@ -0,0 +1,19 @@
++noinst_LTLIBRARIES = libsub_dht.la
++
++libsub_dht_la_SOURCES = \
++	dht_bucket.cc \
++	dht_bucket.h \
++	dht_hash_map.h \
++	dht_node.cc \
++	dht_node.h \
++	dht_router.cc \
++	dht_router.h \
++	dht_server.cc \
++	dht_server.h \
++	dht_size_list.h \
++	dht_tracker.cc \
++	dht_tracker.h \
++	dht_transaction.cc \
++	dht_transaction.h
++
++INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+Index: libtorrent/src/dht/dht_transaction.h
+===================================================================
+--- libtorrent/src/dht/dht_transaction.h	(revision 0)
++++ libtorrent/src/dht/dht_transaction.h	(revision 0)
+@@ -0,0 +1,363 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_TRANSACTION_H
++#define LIBTORRENT_DHT_TRANSACTION_H
++
++#include <map>
++
++#include <rak/socket_address.h>
++
++#include "dht/dht_node.h"
++#include "torrent/hash_string.h"
++
++namespace torrent {
++
++class DhtBucket;
++class TrackerDht;
++
++class DhtSearch;
++class DhtTransactionSearch;
++
++class DhtTransaction;
++class DhtTransactionPing;
++class DhtTransactionFindNode;
++class DhtTransactionGetPeers;
++class DhtTransactionAnnounce;
++
++// DhtSearch implements the DHT search algorithm and holds search data
++// that needs to be persistent across multiple find_node transactions.
++//
++// DhtAnnounce is a derived class used for searches that will eventually
++// lead to an announce to the closest nodes.
++
++
++// Compare predicate for ID closeness.
++struct dht_compare_closer : public std::binary_function<const DhtNode*, const DhtNode*, bool> {
++  dht_compare_closer(const HashString& target) : m_target(target) { }
++
++  bool operator () (const DhtNode* one, const DhtNode* two) const;
++
++  const HashString&               target() const   { return m_target; }
++
++  HashString m_target;
++};
++
++// DhtSearch contains a list of nodes sorted by closeness to the given target,
++// and returns what nodes to contact with up to three concurrent transactions pending.
++// The map element is the DhtSearch object itself to allow the returned accessors
++// to know which search a given node belongs to.
++class DhtSearch : protected std::map<DhtNode*, DhtSearch*, dht_compare_closer> {
++  friend class DhtTransactionSearch;
++
++public:
++  typedef std::map<DhtNode*, DhtSearch*, dht_compare_closer> base_type;
++
++  // Number of closest potential contact nodes to keep.
++  static const unsigned int max_contacts = 18;
++
++  DhtSearch(const HashString& target, const DhtBucket& contacts);
++  virtual ~DhtSearch();
++
++  // Wrapper for iterators, allowing more convenient access to the key
++  // and element values, which also makes it easier to change the container
++  // without having to modify much code using iterators.
++  template <typename T>
++  struct accessor_wrapper : public T {
++    accessor_wrapper() { }
++    accessor_wrapper(const T& itr) : T(itr) { }
++
++    DhtNode*                        node() const     { return (**this).first; }
++    DhtSearch*                      search() const   { return (**this).second; }
++  };
++
++  typedef accessor_wrapper<base_type::const_iterator>  const_accessor;
++  typedef accessor_wrapper<base_type::iterator>        accessor;
++
++  // Add a potential node to contact for the search.
++  bool                 add_contact(const HashString& id, const rak::socket_address* sa);
++  void                 add_contacts(const DhtBucket& contacts);
++
++  // Return next node to contact. Up to concurrent_searches nodes are returned,
++  // and end() after that. Don't advance the accessor to get further contacts!
++  const_accessor       get_contact();
++
++  // Search statistics.
++  int                  num_contacted()                   { return m_contacted; }
++  int                  num_replied()                     { return m_replied; }
++
++  bool                 start()                           { m_started = true; return m_pending; }
++  bool                 complete() const                  { return m_started && !m_pending; }
++
++  const HashString&    target() const                    { return key_comp().target(); }
++
++  virtual bool         is_announce() const               { return false; }
++
++  // Expose the otherwise private end() function but return an accessor,
++  // to allow code checking whether get_contact returned a valid accessor.
++  const_accessor       end() const                       { return base_type::end(); }
++
++  // Used by the sorting/comparison predicate to see which node is closer.
++  static bool          is_closer(const HashString& one, const HashString& two, const HashString& target);
++
++protected:
++  void                 trim(bool final);
++  void                 node_status(const_accessor& n, bool success);
++  void                 set_node_active(const_accessor& n, bool active);
++
++  // Statistics about contacted nodes.
++  unsigned int         m_pending;
++  unsigned int         m_contacted;
++  unsigned int         m_replied;
++  unsigned int         m_concurrency;
++
++  bool                 m_restart;  // If true, trim nodes and reset m_next on the following get_contact call.
++  bool                 m_started;
++
++  // Next node to return in get_contact, is end() if we have no more contactable nodes.
++  const_accessor       m_next;
++
++private:
++  DhtSearch(const DhtSearch& s);
++
++  bool                 node_uncontacted(const DhtNode* node) const;
++};
++
++class DhtAnnounce : public DhtSearch {
++public:
++  DhtAnnounce(const HashString& infoHash, TrackerDht* tracker, const DhtBucket& contacts)
++    : DhtSearch(infoHash, contacts),
++      m_tracker(tracker) { }
++
++  TrackerDht*          tracker() const                   { return m_tracker; }
++
++  // Start announce and return final set of nodes in get_contact() calls.
++  // This resets DhtSearch's completed() function, which now
++  // counts announces instead.
++  const_accessor       start_announce();
++
++  virtual bool         is_announce() const               { return true; }
++
++private:
++  TrackerDht*          m_tracker;
++};
++
++// Class holding transaction data to be transmitted.
++class DhtTransactionPacket {
++public:
++  // transaction packet
++  DhtTransactionPacket(const rak::socket_address* s, const Object& d, unsigned int id, DhtTransaction* t)
++    : m_sa(*s), m_id(id), m_transaction(t) { build_buffer(d); };
++
++  // non-transaction packet
++  DhtTransactionPacket(const rak::socket_address* s, const Object& d)
++    : m_sa(*s), m_id(-cachedTime.seconds()), m_transaction(NULL) { build_buffer(d); };
++
++  ~DhtTransactionPacket()                               { delete[] m_data; }
++
++  bool                        has_transaction() const   { return m_id >= -1; }
++  bool                        has_failed() const        { return m_id == -1; }
++  void                        set_failed()              { m_id = -1; }
++
++  const rak::socket_address*  address() const           { return &m_sa; }
++  rak::socket_address*        address()                 { return &m_sa; }
++
++  const char*                 c_str() const             { return m_data; }
++  size_t                      length() const            { return m_length; }
++
++  int                         id() const                { return m_id; }
++  int                         age() const               { return has_transaction() ? 0 : cachedTime.seconds() + m_id; }
++  const DhtTransaction*       transaction() const       { return m_transaction; }
++  DhtTransaction*             transaction()             { return m_transaction; }
++
++private:
++  void                        build_buffer(const Object& data);
++
++  rak::socket_address   m_sa;
++  char*                 m_data;
++  size_t                m_length;
++  int                   m_id;
++  DhtTransaction*       m_transaction;
++};
++
++// DHT Transaction classes. DhtTransaction and DhtTransactionSearch
++// are not directly usable with no public constructor, since type()
++// is a pure virtual function.
++class DhtTransaction {
++public:
++  virtual ~DhtTransaction();
++
++  typedef enum {
++    DHT_PING,
++    DHT_FIND_NODE,
++    DHT_GET_PEERS,
++    DHT_ANNOUNCE_PEER,
++  } transaction_type;
++
++  virtual transaction_type    type() = 0;
++  virtual bool                is_search()          { return false; }
++
++  // Key to uniquely identify a transaction with given per-node transaction id.
++  uint64_t                    key(int id) const    { return key(&m_sa, id); }
++  static uint64_t             key(const rak::socket_address* sa, int id) { return ((uint64_t)sa->sa_inet()->address_n() << 32) + id; }
++
++  // Node ID and address.
++  const HashString&           id()                 { return m_id; }
++  const rak::socket_address*  address()            { return &m_sa; }
++
++  int                         timeout()            { return m_timeout; }
++  int                         quick_timeout()      { return m_quickTimeout; }
++  bool                        has_quick_timeout()  { return m_hasQuickTimeout; }
++
++  int                         dec_retry()          { return m_retry--; }
++  int                         retry()              { return m_retry; }
++
++  DhtTransactionPacket*       packet()             { return m_packet; }
++  void                        set_packet(DhtTransactionPacket* p) { m_packet = p; }
++
++  // These could (should?) check that the type matches. Or use dynamic cast.
++  DhtTransactionSearch*       as_search()          { return reinterpret_cast<DhtTransactionSearch*>(this); }
++  DhtTransactionPing*         as_ping()            { return reinterpret_cast<DhtTransactionPing*>(this); }
++  DhtTransactionFindNode*     as_find_node()       { return reinterpret_cast<DhtTransactionFindNode*>(this); }
++  DhtTransactionGetPeers*     as_get_peers()       { return reinterpret_cast<DhtTransactionGetPeers*>(this); }
++  DhtTransactionAnnounce*     as_announce()        { return reinterpret_cast<DhtTransactionAnnounce*>(this); }
++
++protected:
++  DhtTransaction(int quick_timeout, int timeout, const HashString& id, const rak::socket_address* sa);
++
++  bool                 m_hasQuickTimeout;
++
++private:
++  DhtTransaction(const DhtTransaction& t);
++
++  HashString             m_id;
++  rak::socket_address    m_sa;
++  int                    m_timeout;
++  int                    m_quickTimeout;
++  int                    m_retry;
++  DhtTransactionPacket*  m_packet;
++};
++
++class DhtTransactionSearch : public DhtTransaction {
++public:
++  virtual ~DhtTransactionSearch();
++
++  virtual bool               is_search()                  { return true; }
++
++  DhtSearch::const_accessor  node()                       { return m_node; }
++  DhtSearch*                 search()                     { return m_search; }
++
++  void                       set_stalled();
++
++  void                       complete(bool success);
++
++protected:
++  DhtTransactionSearch(int quick_timeout, int timeout, DhtSearch::const_accessor& node)
++    : DhtTransaction(quick_timeout, timeout, node.node()->id(), node.node()->address()),
++      m_node(node),
++      m_search(node.search()) { if (!m_hasQuickTimeout) m_search->m_concurrency++; }
++
++private:
++  DhtSearch::const_accessor  m_node;
++  DhtSearch*                 m_search;
++};
++
++// Actual transaction classes.
++class DhtTransactionPing : public DhtTransaction {
++public:
++  DhtTransactionPing(const HashString& id, const rak::socket_address* sa)
++    : DhtTransaction(-1, 30, id, sa) { }
++
++  virtual transaction_type    type()                     { return DHT_PING; }
++};
++
++class DhtTransactionFindNode : public DhtTransactionSearch {
++public:
++  DhtTransactionFindNode(DhtSearch::const_accessor& node)
++    : DhtTransactionSearch(4, 30, node) { }
++
++  virtual transaction_type    type()                     { return DHT_FIND_NODE; }
++};
++
++class DhtTransactionGetPeers : public DhtTransactionSearch {
++public:
++  DhtTransactionGetPeers(DhtSearch::const_accessor& node)
++    : DhtTransactionSearch(-1, 30, node) { }
++
++  virtual transaction_type    type()                     { return DHT_GET_PEERS; }
++
++  DhtAnnounce*                announce()                 { return reinterpret_cast<DhtAnnounce*>(search()); }
++};
++
++class DhtTransactionAnnounce : public DhtTransaction {
++public:
++  DhtTransactionAnnounce(const HashString& id, const rak::socket_address* sa, const HashString& infoHash, const std::string& token)
++    : DhtTransaction(-1, 30, id, sa),
++      m_infoHash(infoHash),
++      m_token(token) { }
++
++  virtual transaction_type    type()                     { return DHT_ANNOUNCE_PEER; }
++
++  const HashString&           info_hash()                { return m_infoHash; }
++  const std::string&          token()                    { return m_token; }
++
++private:
++  HashString           m_infoHash;
++  std::string          m_token;
++};
++
++inline bool
++DhtSearch::is_closer(const HashString& one, const HashString& two, const HashString& target) {
++  for (unsigned int i=0; i<one.size(); i++)
++    if (one[i] != two[i])
++      return (uint8_t)(one[i] ^ target[i]) < (uint8_t)(two[i] ^ target[i]);
++
++  return false;
++}
++
++inline void
++DhtSearch::set_node_active(const_accessor& n, bool active) {
++  n.node()->m_lastSeen = active;
++}
++
++inline bool
++dht_compare_closer::operator () (const DhtNode* one, const DhtNode* two) const {
++  return DhtSearch::is_closer(*one, *two, m_target);
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_node.h
+===================================================================
+--- libtorrent/src/dht/dht_node.h	(revision 0)
++++ libtorrent/src/dht/dht_node.h	(revision 0)
+@@ -0,0 +1,136 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_NODE_H
++#define LIBTORRENT_DHT_NODE_H
++
++#include "globals.h"
++
++#include <rak/socket_address.h>
++
++#include "torrent/hash_string.h"
++
++#include "dht_bucket.h"
++
++namespace torrent {
++
++class DhtBucket;
++
++class DhtNode : public HashString {
++  friend class DhtSearch;
++
++public:
++  // A node is considered bad if it failed to reply to this many queries.
++  static const unsigned int max_failed_replies = 5;
++
++  DhtNode(const HashString& id, const rak::socket_address* sa);
++  DhtNode(const std::string& id, const Object& cache);
++
++  const HashString&           id() const                 { return *this; }
++  const rak::socket_address*  address() const            { return &m_socketAddress; }
++  void                        set_address(const rak::socket_address* sa) { m_socketAddress = *sa; }
++
++  // For determining node quality.
++  unsigned int                last_seen() const          { return m_lastSeen; }
++  unsigned int                age() const                { return cachedTime.seconds() - m_lastSeen; }
++  bool                        is_good() const            { return m_recentlyActive; }
++  bool                        is_questionable() const    { return !m_recentlyActive; }
++  bool                        is_bad() const             { return m_recentlyInactive >= max_failed_replies; };
++  bool                        is_active() const          { return m_lastSeen; }
++
++  // Update is called once every 15 minutes.
++  void                        update()                   { m_recentlyActive = age() < 15 * 60; }
++
++  // Called when node replies to us, queries us, or fails to reply.
++  void                        replied()                  { set_good(); }
++  void                        queried()                  { if (m_lastSeen) set_good(); }
++  void                        inactive();
++
++  DhtBucket*                  bucket() const             { return m_bucket; }
++  DhtBucket*                  set_bucket(DhtBucket* b)   { m_bucket = b; return b; }
++
++  bool                        is_in_range(const DhtBucket* b) { return b->is_in_range(*this); }
++
++  // Store compact node information (26 bytes address, port and ID) in the given
++  // buffer and return pointer to end of stored information.
++  char*                       store_compact(char* buffer) const;
++
++  // Store node cache in the given container object and return it.
++  Object*                     store_cache(Object* container) const;
++
++private:
++  DhtNode();
++
++  void                        set_good();
++  void                        set_bad();
++
++  rak::socket_address m_socketAddress;
++  unsigned int        m_lastSeen;
++  bool                m_recentlyActive;
++  unsigned int        m_recentlyInactive;
++  DhtBucket*          m_bucket;
++};
++
++inline void
++DhtNode::set_good() {
++  if (m_bucket != NULL && !is_good())
++    m_bucket->node_now_good(is_bad());
++
++  m_lastSeen = cachedTime.seconds();
++  m_recentlyInactive = 0;
++  m_recentlyActive = true;
++}
++
++inline void
++DhtNode::set_bad() {
++  if (m_bucket != NULL && !is_bad())
++    m_bucket->node_now_bad(is_good());
++
++  m_recentlyInactive = max_failed_replies;
++  m_recentlyActive = false;
++}
++
++inline void
++DhtNode::inactive() {
++  if (m_recentlyInactive + 1 == max_failed_replies)
++    set_bad();
++  else
++    m_recentlyInactive++;
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_server.h
+===================================================================
+--- libtorrent/src/dht/dht_server.h	(revision 0)
++++ libtorrent/src/dht/dht_server.h	(revision 0)
+@@ -0,0 +1,186 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_SERVER_H
++#define LIBTORRENT_DHT_SERVER_H
++
++#include <map>
++#include <deque>
++#include <rak/priority_queue_default.h>
++#include <rak/socket_address.h>
++
++#include "net/socket_datagram.h"
++#include "net/throttle_node.h"
++#include "download/download_info.h"  // for SocketAddressCompact
++#include "torrent/hash_string.h"
++
++namespace torrent {
++
++class DhtBucket;
++class DhtNode;
++class DhtRouter;
++
++class DownloadInfo;
++class TrackerDht;
++
++class DhtTransaction;
++class DhtTransactionPacket;
++class DhtTransactionSearch;
++class DhtTransactionGetPeers;
++
++// UDP server that handles the DHT node communications.
++
++class DhtServer : public SocketDatagram {
++public:
++  DhtServer(DhtRouter* self);
++  ~DhtServer();
++
++  void                start(int port);
++  void                stop();
++  bool                is_active() const                  { return get_fd().is_valid(); }
++
++  unsigned int        queries_received() const           { return m_queriesReceived; }
++  unsigned int        queries_sent() const               { return m_queriesSent; }
++  unsigned int        replies_received() const           { return m_repliesReceived; }
++  void                reset_statistics();
++
++  // Contact a node to see if it replies. Set id=0 if unknown.
++  void                ping(const HashString& id, const rak::socket_address* sa);
++
++  // Do a find_node search with the given contacts as starting point for the
++  // search.
++  void                find_node(const DhtBucket& contacts, const HashString& target);
++
++  // Do DHT announce, starting with the given contacts.
++  void                announce(const DhtBucket& contacts, const HashString& infoHash, TrackerDht* tracker);
++
++  // Cancel given announce for given tracker, or all matching announces if info/tracker NULL.
++  void                cancel_announce(DownloadInfo* info, const TrackerDht* tracker);
++
++  // Called every 15 minutes.
++  void                update();
++
++  ThrottleNode*       upload_throttle()                          { return &m_uploadThrottle; }
++  const ThrottleNode* upload_throttle() const                    { return &m_uploadThrottle; }
++  ThrottleNode*       download_throttle()                        { return &m_downloadThrottle; }
++  const ThrottleNode* download_throttle() const                  { return &m_downloadThrottle; }
++
++  virtual void        event_read();
++  virtual void        event_write();
++  virtual void        event_error();
++
++private:
++  // DHT error codes.
++  static const int dht_error_generic    = 201;
++  static const int dht_error_server     = 202;
++  static const int dht_error_protocol   = 203;
++  static const int dht_error_bad_method = 204;
++
++  typedef std::deque<DhtTransactionPacket*> packet_queue;
++
++  struct compact_node_info {
++    char                 _id[20];
++    SocketAddressCompact _addr;
++
++    HashString&          id()          { return *HashString::cast_from(_id); }
++    rak::socket_address  address()     { return rak::socket_address(_addr); }
++  } __attribute__ ((packed));
++  typedef std::list<compact_node_info> node_info_list;
++
++  // Pending transactions (using DhtTransaction::key as key).
++  typedef std::map<uint64_t, DhtTransaction*> transaction_map;
++  typedef transaction_map::iterator transaction_itr;
++
++  // DHT transaction names for given transaction type.
++  static const char* queries[];
++
++  // Priorities for the outgoing packets.
++  static const int packet_prio_high  = 2;  // For important queries we send (announces).
++  static const int packet_prio_low   = 1;  // For (relatively) unimportant queries we send.
++  static const int packet_prio_reply = 0;  // For replies to peer queries.
++
++  void                start_write();
++
++  void                process_query(const Object& transaction, const HashString& id, const rak::socket_address* sa, Object& req);
++  void                process_response(int transaction, const HashString& id, const rak::socket_address* sa, Object& req);
++  void                process_error(int transaction, const rak::socket_address* sa, Object& req);
++
++  void                parse_node_info(node_info_list& l, const std::string& n);
++  void                parse_find_node_reply(DhtTransactionSearch* t, const std::string& nodes);
++  void                parse_get_peers_reply(DhtTransactionGetPeers* t, const Object& res);
++
++  void                find_node_next(DhtTransactionSearch* t);
++
++  void                add_packet(DhtTransactionPacket* packet, int priority);
++  void                create_query(transaction_itr itr, int tID, const rak::socket_address* sa, int priority);
++  void                create_response(const Object& transaction, const rak::socket_address* sa, Object& r);
++  void                create_error(const Object& transaction, const rak::socket_address* sa, int num, const std::string& msg);
++
++  void                create_find_node_response(const Object& arg, Object& reply);
++  void                create_get_peers_response(const Object& arg, const rak::socket_address* sa, Object& reply);
++  void                create_announce_peer_response(const Object& arg, const rak::socket_address* sa, Object& reply);
++
++  int                 add_transaction(DhtTransaction* t, int priority);
++
++  // These methods return the iterator after the given one or end()
++  transaction_itr     failed_transaction(transaction_itr itr, bool quick);
++  transaction_itr     cancel_transaction(transaction_itr itr);
++
++  void                clear_transactions();
++
++  bool                process_queue(packet_queue& queue, uint32_t* quota);
++  void                receive_timeout();
++
++  DhtRouter*          m_router;
++  packet_queue        m_highQueue;
++  packet_queue        m_lowQueue;
++  transaction_map     m_transactions;
++
++  rak::priority_item  m_taskTimeout;
++
++  ThrottleNode        m_uploadThrottle;
++  ThrottleNode        m_downloadThrottle;
++
++  unsigned int        m_queriesReceived;
++  unsigned int        m_queriesSent;
++  unsigned int        m_repliesReceived;
++
++  bool                m_networkUp;
++};
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_tracker.cc
+===================================================================
+--- libtorrent/src/dht/dht_tracker.cc	(revision 0)
++++ libtorrent/src/dht/dht_tracker.cc	(revision 0)
+@@ -0,0 +1,129 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include "torrent/object.h"
++
++#include "dht_tracker.h"
++
++namespace torrent {
++
++void
++DhtTracker::add_peer(const rak::socket_address* sa) {
++  // Should check that sa is an INET address.
++  SocketAddressCompact compact(sa->sa_inet()->address_n(), sa->sa_inet()->port_n());
++
++  unsigned int oldest = 0;
++  uint32_t minSeen = ~uint32_t();
++
++  // Check if peer exists. If not, find oldest peer.
++  for (unsigned int i = 0; i < size(); i++) {
++    if ((*this)[i].addr == compact.addr) {
++      (*this)[i].port = compact.port;
++      m_lastSeen[i] = cachedTime.seconds();
++      return;
++
++    } else if (m_lastSeen[i] < minSeen) {
++      minSeen = m_lastSeen[i];
++      oldest = i;
++    }
++  }
++
++  // If peer doesn't exist, append to list if the table is not full.
++  if (size() < max_size) {
++    push_back(compact);
++    m_lastSeen.push_back(cachedTime.seconds());
++
++  // Peer doesn't exist and table is full: replace oldest peer.
++  } else {
++    (*this)[oldest] = compact;
++    m_lastSeen[oldest] = cachedTime.seconds();
++  }
++}
++
++// Return compact info (6 bytes) for up to 30 peers, returning different
++// peers for each call if there are more.
++std::string
++DhtTracker::get_peers(unsigned int maxPeers) {
++  iterator first;
++  iterator last;
++
++  // If we have more than max_peers, randomly return block of peers.
++  // The peers in overlapping blocks get picked twice as often, but
++  // that's better than returning fewer peers.
++  if (size() > maxPeers) {
++    unsigned int blocks = (size() + maxPeers - 1) / maxPeers;
++
++    first = begin() + (random() % blocks) * (size() - maxPeers) / (blocks - 1);
++    last = first + maxPeers;
++
++  } else {
++    first = begin();
++    last = end();
++  }
++
++  return std::string(first->c_str(), last->c_str());
++}
++
++// Remove old announces.
++void
++DhtTracker::prune(uint32_t maxAge) {
++  uint32_t minSeen = cachedTime.seconds() - maxAge;
++  unsigned int i;
++
++  for (i = 0; i < size(); i++)
++    if (m_lastSeen[i] <= minSeen)
++      break;
++
++  if (i == size())
++    return;  // No old peers found.
++
++  unsigned int index = i;
++
++  for (i++; i < size(); i++) {
++    if (m_lastSeen[i] > minSeen) {
++      m_lastSeen[index] = m_lastSeen[i];
++      (*this)[index] = (*this)[i];
++      index++;
++    }
++  }
++
++  resize(index);
++  m_lastSeen.resize(index);
++}
++
++}
+Index: libtorrent/src/net/throttle_node.h
+===================================================================
+--- libtorrent/src/net/throttle_node.h	(revision 975)
++++ libtorrent/src/net/throttle_node.h	(working copy)
+@@ -45,13 +45,13 @@
+
+ namespace torrent {
+
+-class PeerConnectionBase;
++class SocketBase;
+
+ class ThrottleNode {
+ public:
+   typedef ThrottleList::iterator                  iterator;
+   typedef ThrottleList::const_iterator            const_iterator;
+-  typedef rak::mem_fun0<PeerConnectionBase, void> SlotActivate;
++  typedef rak::mem_fun0<SocketBase, void>         SlotActivate;
+
+   ThrottleNode(uint32_t rateSpan) : m_rate(rateSpan)  { clear_quota(); }
+
+Index: libtorrent/src/net/socket_base.cc
+===================================================================
+--- libtorrent/src/net/socket_base.cc	(revision 975)
++++ libtorrent/src/net/socket_base.cc	(working copy)
+@@ -41,6 +41,8 @@
+ #include <sys/socket.h>
+
+ #include "torrent/exceptions.h"
++#include "torrent/poll.h"
++#include "manager.h"
+ #include "socket_base.h"
+
+ namespace torrent {
+@@ -72,4 +74,14 @@
+   return r == 1;
+ }
+
++void
++SocketBase::receive_throttle_down_activate() {
++  manager->poll()->insert_read(this);
++}
++
++void
++SocketBase::receive_throttle_up_activate() {
++  manager->poll()->insert_write(this);
++}
++
+ } // namespace torrent
+Index: libtorrent/src/net/socket_base.h
+===================================================================
+--- libtorrent/src/net/socket_base.h	(revision 975)
++++ libtorrent/src/net/socket_base.h	(working copy)
+@@ -60,6 +60,9 @@
+   bool                read_oob(void* buffer);
+   bool                write_oob(const void* buffer);
+
++  void                receive_throttle_down_activate();
++  void                receive_throttle_up_activate();
++
+ protected:
+   // Disable copying
+   SocketBase(const SocketBase&);
+Index: libtorrent/src/tracker/tracker_control.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_control.cc	(revision 975)
++++ libtorrent/src/tracker/tracker_control.cc	(working copy)
+@@ -43,6 +43,7 @@
+ #include "net/address_list.h"
+ #include "torrent/exceptions.h"
+ #include "tracker_control.h"
++#include "tracker_dht.h"
+ #include "tracker_http.h"
+ #include "tracker_udp.h"
+
+@@ -73,6 +74,9 @@
+   else if (std::strncmp("udp://", url.c_str(), 6) == 0)
+     t = new TrackerUdp(m_info, url);
+
++  else if (std::strncmp("dht://", url.c_str(), 6) == 0)
++    t = new TrackerDht(m_info, url);
++
+   else
+     // TODO: Error message here?... not really...
+     return;
+@@ -101,7 +105,7 @@
+   m_tries = -1;
+   m_state = s;
+
+-  m_itr = m_list.find_enabled(m_itr);
++  m_itr = m_list.find_usable(m_itr);
+
+   if (m_itr != m_list.end())
+     m_itr->second->send_state(m_state,
+Index: libtorrent/src/tracker/tracker_dht.h
+===================================================================
+--- libtorrent/src/tracker/tracker_dht.h	(revision 0)
++++ libtorrent/src/tracker/tracker_dht.h	(revision 0)
+@@ -0,0 +1,72 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_TRACKER_TRACKER_DHT_H
++#define LIBTORRENT_TRACKER_TRACKER_DHT_H
++
++#include "net/address_list.h"
++#include "torrent/object.h"
++#include "tracker_base.h"
++
++namespace torrent {
++
++class TrackerDht : public TrackerBase {
++public:
++  TrackerDht(DownloadInfo* info, const std::string& url);
++  ~TrackerDht();
++
++  virtual bool        is_busy() const;
++  virtual bool        is_usable() const;
++
++  virtual void        send_state(DownloadInfo::State state, uint64_t down, uint64_t up, uint64_t left);
++  virtual void        close();
++
++  virtual Type        type() const;
++
++  bool                has_peers() const                { return !m_peers.empty(); }
++
++  void                receive_peers(const std::string& peers);
++  void                receive_success();
++  void                receive_failed(const std::string& msg);
++  void                receive_status(int replied, int contacted, const char* stage);
++
++private:
++  AddressList  m_peers;
++};
++
++}
++
++#endif
+Index: libtorrent/src/tracker/tracker_container.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_container.cc	(revision 975)
++++ libtorrent/src/tracker/tracker_container.cc	(working copy)
+@@ -47,10 +47,13 @@
+
+ namespace torrent {
+
++struct tracker_usable_t : public std::unary_function<TrackerContainer::value_type, bool> {
++  bool operator () (const TrackerContainer::value_type& value) const { return value.second->is_usable(); }
++};
++
+ bool
+-TrackerContainer::has_enabled() const {
+-  return std::find_if(begin(), end(),
+-		      rak::on(rak::mem_ref(&value_type::second), std::mem_fun(&TrackerBase::is_enabled)))
++TrackerContainer::has_usable() const {
++  return std::find_if(begin(), end(), tracker_usable_t())
+     != end();
+ }
+
+@@ -99,8 +102,8 @@
+ }
+
+ TrackerContainer::iterator
+-TrackerContainer::find_enabled(iterator itr) {
+-  while (itr != end() && !itr->second->is_enabled())
++TrackerContainer::find_usable(iterator itr) {
++  while (itr != end() && !tracker_usable_t()(*itr))
+     ++itr;
+
+   return itr;
+Index: libtorrent/src/tracker/tracker_container.h
+===================================================================
+--- libtorrent/src/tracker/tracker_container.h	(revision 975)
++++ libtorrent/src/tracker/tracker_container.h	(working copy)
+@@ -72,7 +72,7 @@
+
+   ~TrackerContainer() { clear(); }
+
+-  bool                has_enabled() const;
++  bool                has_usable() const;
+
+   void                randomize();
+   void                clear();
+@@ -82,7 +82,7 @@
+   iterator            promote(iterator itr);
+
+   iterator            find(TrackerBase* tb);
+-  iterator            find_enabled(iterator itr);
++  iterator            find_usable(iterator itr);
+   const_iterator      find_enabled(const_iterator itr) const;
+
+   iterator            begin_group(int group);
+Index: libtorrent/src/tracker/tracker_udp.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_udp.cc	(revision 975)
++++ libtorrent/src/tracker/tracker_udp.cc	(working copy)
+@@ -36,9 +36,6 @@
+
+ #include "config.h"
+
+-#include <sigc++/bind.h>
+-#include <torrent/connection_manager.h>
+-
+ #include "net/address_list.h"
+ #include "torrent/exceptions.h"
+ #include "torrent/connection_manager.h"
+@@ -64,7 +61,7 @@
+
+   close();
+ }
+-
++
+ bool
+ TrackerUdp::is_busy() const {
+   return get_fd().is_valid();
+@@ -91,7 +88,7 @@
+   m_sendUp = up;
+   m_sendLeft = left;
+
+-  m_slotResolver = manager->connection_manager()->resolver()(hostname, PF_INET, SOCK_DGRAM,
++  m_slotResolver = manager->connection_manager()->resolver()(hostname, (int)rak::socket_address::pf_inet, SOCK_DGRAM,
+                                                              sigc::mem_fun(this, &TrackerUdp::start_announce));
+ }
+
+Index: libtorrent/src/tracker/Makefile.am
+===================================================================
+--- libtorrent/src/tracker/Makefile.am	(revision 975)
++++ libtorrent/src/tracker/Makefile.am	(working copy)
+@@ -4,6 +4,8 @@
+ 	tracker_base.h \
+ 	tracker_control.cc \
+ 	tracker_control.h \
++	tracker_dht.cc \
++	tracker_dht.h \
+ 	tracker_http.cc \
+ 	tracker_http.h \
+ 	tracker_container.cc \
+Index: libtorrent/src/tracker/tracker_base.h
+===================================================================
+--- libtorrent/src/tracker/tracker_base.h	(revision 975)
++++ libtorrent/src/tracker/tracker_base.h	(working copy)
+@@ -58,7 +58,8 @@
+   typedef enum {
+     TRACKER_NONE,
+     TRACKER_HTTP,
+-    TRACKER_UDP
++    TRACKER_UDP,
++    TRACKER_DHT
+   } Type;
+
+   TrackerBase(DownloadInfo* info, const std::string& url) :
+@@ -69,6 +70,7 @@
+
+   virtual bool        is_busy() const = 0;
+   bool                is_enabled() const                    { return m_enabled; }
++  virtual bool        is_usable() const                     { return m_enabled; }
+
+   void                enable(bool state)                    { m_enabled = state; }
+
+@@ -81,6 +83,8 @@
+   const std::string&  url() const                           { return m_url; }
+   void                set_url(const std::string& url)       { m_url = url; }
+
++  const std::string&  status() const                        { return m_status; }
++
+   const std::string&  tracker_id() const                    { return m_trackerId; }
+   void                set_tracker_id(const std::string& id) { m_trackerId = id; }
+
+@@ -106,6 +110,7 @@
+
+   DownloadInfo*       m_info;
+   std::string         m_url;
++  std::string         m_status;
+
+   std::string         m_trackerId;
+
+Index: libtorrent/src/tracker/tracker_dht.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_dht.cc	(revision 0)
++++ libtorrent/src/tracker/tracker_dht.cc	(revision 0)
+@@ -0,0 +1,151 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include <sstream>
++
++#include "dht/dht_router.h"
++#include "torrent/connection_manager.h"
++#include "torrent/dht_manager.h"
++#include "torrent/exceptions.h"
++
++#include "tracker_dht.h"
++#include "tracker_http.h"
++
++#include "globals.h"
++#include "manager.h"
++
++namespace torrent {
++
++TrackerDht::TrackerDht(DownloadInfo* info, const std::string& url) :
++  TrackerBase(info, url) {
++
++  if (!manager->dht_manager()->is_valid())
++    throw internal_error("Trying to add DHT tracker with no DHT manager.");
++}
++
++TrackerDht::~TrackerDht() {
++  if (is_busy())
++    manager->dht_manager()->router()->cancel_announce(NULL, this);
++}
++
++bool
++TrackerDht::is_busy() const {
++  return !m_status.empty();
++}
++
++bool
++TrackerDht::is_usable() const {
++  return m_enabled && manager->dht_manager()->is_active();
++}
++
++void
++TrackerDht::send_state(DownloadInfo::State state, uint64_t down, uint64_t up, uint64_t left) {
++  if (m_info == NULL)
++    throw internal_error("TrackerDht::send_state(...) does not have a valid m_info.");
++
++  if (is_busy()) {
++    manager->dht_manager()->router()->cancel_announce(m_info, this);
++
++    if (is_busy())
++      throw internal_error("TrackerDht::send_state cancel_announce did not cancel announce.");
++  }
++
++  if (state == DownloadInfo::STOPPED)
++    return;
++
++  m_status = "[Initializing]";
++
++  if (!manager->dht_manager()->is_active())
++    return receive_failed("DHT server not active.");
++
++  manager->dht_manager()->router()->announce(m_info, this);
++
++  set_normal_interval(20 * 60);
++  set_min_interval(0);
++}
++
++void
++TrackerDht::close() {
++  if (is_busy())
++    manager->dht_manager()->router()->cancel_announce(m_info, this);
++}
++
++TrackerDht::Type
++TrackerDht::type() const {
++  return TRACKER_DHT;
++}
++
++void
++TrackerDht::receive_peers(const std::string& peers) {
++  if (!is_busy())
++    throw internal_error("TrackerDht::receive_peers called while not busy.");
++
++  m_peers.parse_address_compact(peers);
++}
++
++void
++TrackerDht::receive_success() {
++  if (!is_busy())
++    throw internal_error("TrackerDht::receive_success called while not busy.");
++
++  m_status.clear();
++  m_slotSuccess(this, &m_peers);
++  m_peers.clear();
++}
++
++void
++TrackerDht::receive_failed(const std::string& msg) {
++  if (!is_busy())
++    throw internal_error("TrackerDht::receive_failed called while not busy.");
++
++  m_status.clear();
++  m_slotFailed(this, msg);
++  m_peers.clear();
++}
++
++void
++TrackerDht::receive_status(int replied, int contacted, const char* stage) {
++  if (!is_busy())
++    throw internal_error("TrackerDht::receive_status called while not busy.");
++
++  std::stringstream s;
++  s << "[" << stage << ": " << replied << "/" << contacted << " nodes replied]";
++  m_status = s.str();
++}
++
++}
+Index: libtorrent/src/torrent/tracker.cc
+===================================================================
+--- libtorrent/src/torrent/tracker.cc	(revision 975)
++++ libtorrent/src/torrent/tracker.cc	(working copy)
+@@ -46,6 +46,11 @@
+   return m_tracker.second->is_enabled();
+ }
+
++bool
++Tracker::is_usable() const {
++  return m_tracker.second->is_usable();
++}
++
+ void
+ Tracker::enable() {
+   m_tracker.second->enable(true);
+@@ -67,6 +72,11 @@
+ }
+
+ const std::string&
++Tracker::status() const {
++  return m_tracker.second->status();
++}
++
++const std::string&
+ Tracker::tracker_id() const {
+   return m_tracker.second->tracker_id();
+ }
+Index: libtorrent/src/torrent/torrent.cc
+===================================================================
+--- libtorrent/src/torrent/torrent.cc	(revision 975)
++++ libtorrent/src/torrent/torrent.cc	(working copy)
+@@ -165,6 +165,11 @@
+   return manager->connection_manager();
+ }
+
++DhtManager*
++dht_manager() {
++  return manager->dht_manager();
++}
++
+ uint32_t
+ total_handshakes() {
+   return manager->handshake_manager()->size();
+Index: libtorrent/src/torrent/tracker.h
+===================================================================
+--- libtorrent/src/torrent/tracker.h	(revision 975)
++++ libtorrent/src/torrent/tracker.h	(working copy)
+@@ -58,6 +58,7 @@
+   Tracker(value_type v) : m_tracker(v) {}
+
+   bool                is_enabled() const;
++  bool                is_usable() const;
+   bool                is_open() const;
+
+   void                enable();
+@@ -65,6 +66,7 @@
+
+   uint32_t            group() const { return m_tracker.first; }
+   const std::string&  url() const;
++  const std::string&  status() const;
+
+   // The "tracker id" string returned by the tracker.
+   const std::string&  tracker_id() const;
+Index: libtorrent/src/torrent/torrent.h
+===================================================================
+--- libtorrent/src/torrent/torrent.h	(revision 975)
++++ libtorrent/src/torrent/torrent.h	(working copy)
+@@ -65,6 +65,7 @@
+ ChunkManager*       chunk_manager() LIBTORRENT_EXPORT;
+ ClientList*         client_list() LIBTORRENT_EXPORT;
+ ConnectionManager*  connection_manager() LIBTORRENT_EXPORT;
++DhtManager*         dht_manager() LIBTORRENT_EXPORT;
+
+ uint32_t            total_handshakes() LIBTORRENT_EXPORT;
+
+Index: libtorrent/src/torrent/peer/peer_info.h
+===================================================================
+--- libtorrent/src/torrent/peer/peer_info.h	(revision 975)
++++ libtorrent/src/torrent/peer/peer_info.h	(working copy)
+@@ -80,6 +80,7 @@
+   uint32_t            last_connection() const               { return m_lastConnection; }
+   void                set_last_connection(uint32_t tvsec)   { m_lastConnection = tvsec; }
+
++  bool                supports_dht() const                  { return m_options[7] & 0x01; }
+   bool                supports_extensions() const           { return m_options[5] & 0x10; }
+
+   // Internal to libTorrent:
+Index: libtorrent/src/torrent/dht_manager.cc
+===================================================================
+--- libtorrent/src/torrent/dht_manager.cc	(revision 0)
++++ libtorrent/src/torrent/dht_manager.cc	(revision 0)
+@@ -0,0 +1,119 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include <rak/address_info.h>
++#include <rak/socket_address.h>
++
++#include <torrent/exceptions.h>
++
++#include "manager.h"
++
++#include "dht/dht_router.h"
++#include "dht/dht_server.h"
++#include "dht_manager.h"
++#include "net/throttle_manager.h"
++
++namespace torrent {
++
++DhtManager::~DhtManager() {
++  stop();
++  delete m_router;
++}
++
++void
++DhtManager::initialize(const Object& dhtCache) {
++  if (m_router != NULL)
++    throw internal_error("DhtManager::initialize called with DHT already active.");
++
++  m_router = new DhtRouter(dhtCache, rak::socket_address::cast_from(manager->connection_manager()->bind_address()));
++}
++
++void
++DhtManager::start(port_type port) {
++  if (m_router == NULL)
++    throw internal_error("DhtManager::start called without initializing first.");
++
++  m_router->start(port);
++}
++
++
++void
++DhtManager::stop() {
++  if (m_router != NULL)
++    m_router->stop();
++}
++
++bool
++DhtManager::is_active() const {
++  return m_router != NULL && m_router->is_active();
++}
++
++void
++DhtManager::add_node(const sockaddr* addr, int port, bool external) {
++  if (m_router == NULL)
++    return;
++
++  rak::socket_address sa = *rak::socket_address::cast_from(addr);
++
++  if (sa.family() != rak::socket_address::af_inet)
++    return;
++
++
++  sa.set_port(port);
++  m_router->contact(&sa, external);
++}
++
++Object*
++DhtManager::store_cache(Object* container) const {
++  if (m_router == NULL)
++    throw internal_error("DhtManager::store_cache called but DHT not initialized.");
++
++  return m_router->store_cache(container);
++}
++
++DhtManager::statistics_type
++DhtManager::get_statistics() const {
++  return m_router->get_statistics();
++}
++
++void
++DhtManager::reset_statistics() {
++  m_router->reset_statistics();
++}
++
++}
+Index: libtorrent/src/torrent/dht_manager.h
+===================================================================
+--- libtorrent/src/torrent/dht_manager.h	(revision 0)
++++ libtorrent/src/torrent/dht_manager.h	(revision 0)
+@@ -0,0 +1,125 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++// Add some helpfull words here.
++
++#ifndef LIBTORRENT_DHT_MANAGER_H
++#define LIBTORRENT_DHT_MANAGER_H
++
++#include <torrent/common.h>
++#include <torrent/connection_manager.h>
++
++namespace torrent {
++
++class ThrottleList;
++
++class LIBTORRENT_EXPORT DhtManager {
++public:
++  typedef ConnectionManager::port_type          port_type;
++
++  struct statistics_type {
++    // Cycle; 0=inactive, 1=initial bootstrapping, 2 and up=normal operation
++    unsigned int       cycle;
++
++    // UDP transfer rates.
++    const Rate&        up_rate;
++    const Rate&        down_rate;
++
++    // DHT query statistics.
++    unsigned int       queries_received;
++    unsigned int       queries_sent;
++    unsigned int       replies_received;
++
++    // DHT node info.
++    unsigned int       num_nodes;
++    unsigned int       num_buckets;
++
++    // DHT tracker info.
++    unsigned int       num_peers;
++    unsigned int       max_peers;
++    unsigned int       num_trackers;
++
++    statistics_type(const Rate& up, const Rate& down) : up_rate(up), down_rate(down) { }
++  };
++
++  DhtManager() : m_router(NULL), m_portSent(0), m_canReceive(true) { };
++  ~DhtManager();
++
++  void                initialize(const Object& dhtCache);
++
++  void                start(port_type port);
++  void                stop();
++
++  // Store DHT cache in the given container and return the container.
++  Object*             store_cache(Object* container) const;
++
++  bool                is_valid() const                        { return m_router; }
++  bool                is_active() const;
++
++  port_type           port() const                            { return m_port; }
++
++  bool                can_receive_queries() const             { return m_canReceive; }
++
++  // Call this after sending the port to a client, so the router knows
++  // that it should be getting requests.
++  void                port_sent()                             { m_portSent++; }
++
++  // Add a node by address, e.g. from a torrent file (external = true), or from
++  // explicit add_node commands or the BT PORT message (external = false).
++  void                add_node(const sockaddr* addr, int port, bool external);
++
++  statistics_type     get_statistics() const;
++  void                reset_statistics();
++
++  // To be called if upon examining the statistics, the client decides that
++  // we can't receive outside requests and therefore shouldn't advertise our
++  // UDP port after the BT handshake.
++  void                set_can_receive(bool can)               { m_canReceive = can; }
++
++  // Internal libTorrent use only
++  DhtRouter*          router()                                { return m_router; }
++
++private:
++  DhtRouter*          m_router;
++  port_type           m_port;
++
++  int                 m_portSent;
++  bool                m_canReceive;
++};
++
++}
++
++#endif
+Index: libtorrent/src/torrent/hash_string.h
+===================================================================
+--- libtorrent/src/torrent/hash_string.h	(revision 975)
++++ libtorrent/src/torrent/hash_string.h	(working copy)
+@@ -83,6 +83,10 @@
+
+   const value_type*   c_str() const                     { return m_data; }
+
++  std::string         str() const                       { return std::string(m_data, size_data); }
++
++  void                clear(int v = 0)                  { std::memset(data(), v, size()); }
++
+   void                assign(const value_type* src)     { std::memcpy(data(), src, size()); }
+
+   bool                equal_to(const char* hash) const     { return std::memcmp(m_data, hash, size()) == 0; }
+@@ -93,6 +97,8 @@
+   static const HashString* cast_from(const char* src)        { return (const HashString*)src; }
+   static const HashString* cast_from(const std::string& src) { return (const HashString*)src.c_str(); }
+
++  static HashString*  cast_from(char* src)                   { return (HashString*)src; }
++
+ private:
+   char                m_data[size_data];
+ };
+@@ -103,10 +109,20 @@
+ }
+
+ inline bool
++operator != (const HashString& one, const HashString& two) {
++  return std::memcmp(one.begin(), two.begin(), HashString::size_data) != 0;
++}
++
++inline bool
+ operator < (const HashString& one, const HashString& two) {
+   return std::memcmp(one.begin(), two.begin(), HashString::size_data) < 0;
+ }
+
++inline bool
++operator <= (const HashString& one, const HashString& two) {
++  return std::memcmp(one.begin(), two.begin(), HashString::size_data) <= 0;
+ }
+
++}
++
+ #endif
+Index: libtorrent/src/torrent/Makefile.am
+===================================================================
+--- libtorrent/src/torrent/Makefile.am	(revision 975)
++++ libtorrent/src/torrent/Makefile.am	(working copy)
+@@ -12,6 +12,8 @@
+ 	common.h \
+ 	connection_manager.cc \
+ 	connection_manager.h \
++	dht_manager.cc \
++	dht_manager.h \
+ 	download.cc \
+ 	download.h \
+ 	error.cc \
+@@ -54,6 +56,7 @@
+ 	chunk_manager.h \
+ 	common.h \
+ 	connection_manager.h \
++	dht_manager.h \
+ 	download.h \
+ 	error.h \
+ 	exceptions.h \
+Index: libtorrent/src/torrent/common.h
+===================================================================
+--- libtorrent/src/torrent/common.h	(revision 975)
++++ libtorrent/src/torrent/common.h	(working copy)
+@@ -67,6 +67,8 @@
+ class ClientList;
+ class ConnectionList;
+ class ConnectionManager;
++class DhtManager;
++class DhtRouter;
+ class Download;
+ class DownloadMain;
+ class DownloadWrapper;
+Index: libtorrent/src/manager.cc
+===================================================================
+--- libtorrent/src/manager.cc	(revision 975)
++++ libtorrent/src/manager.cc	(working copy)
+@@ -50,6 +50,7 @@
+
+ #include "torrent/chunk_manager.h"
+ #include "torrent/connection_manager.h"
++#include "torrent/dht_manager.h"
+ #include "torrent/data/file_manager.h"
+ #include "torrent/peer/client_list.h"
+
+@@ -70,6 +71,7 @@
+   m_chunkManager(new ChunkManager),
+   m_clientList(new ClientList),
+   m_connectionManager(new ConnectionManager),
++  m_dhtManager(new DhtManager),
+
+   m_poll(NULL),
+
+@@ -99,6 +101,7 @@
+   delete m_hashQueue;
+
+   delete m_resourceManager;
++  delete m_dhtManager;
+   delete m_connectionManager;
+   delete m_chunkManager;
+
+Index: libtorrent/src/manager.h
+===================================================================
+--- libtorrent/src/manager.h	(revision 975)
++++ libtorrent/src/manager.h	(working copy)
+@@ -58,6 +58,7 @@
+ class ChunkManager;
+ class ConnectionManager;
+ class ThrottleManager;
++class DhtManager;
+
+ typedef std::list<std::string> EncodingList;
+
+@@ -75,6 +76,7 @@
+   ChunkManager*       chunk_manager()                           { return m_chunkManager; }
+   ClientList*         client_list()                             { return m_clientList; }
+   ConnectionManager*  connection_manager()                      { return m_connectionManager; }
++  DhtManager*         dht_manager()                             { return m_dhtManager; }
+
+   Poll*               poll()                                    { return m_poll; }
+   void                set_poll(Poll* p)                         { m_poll = p; }
+@@ -99,6 +101,7 @@
+   ChunkManager*       m_chunkManager;
+   ClientList*         m_clientList;
+   ConnectionManager*  m_connectionManager;
++  DhtManager*         m_dhtManager;
+   Poll*               m_poll;
+
+   EncodingList        m_encodingList;
+Index: libtorrent/src/protocol/protocol_base.h
+===================================================================
+--- libtorrent/src/protocol/protocol_base.h	(revision 975)
++++ libtorrent/src/protocol/protocol_base.h	(working copy)
+@@ -62,6 +62,7 @@
+     REQUEST,
+     PIECE,
+     CANCEL,
++    PORT,
+
+     EXTENSION_PROTOCOL = 20,
+
+@@ -108,6 +109,7 @@
+   void                write_request(const Piece& p);
+   void                write_cancel(const Piece& p);
+   void                write_piece(const Piece& p);
++  void                write_port(uint16_t port);
+   void                write_extension(uint8_t id, uint32_t length);
+
+   static const size_type sizeof_keepalive    = 4;
+@@ -122,6 +124,8 @@
+   static const size_type sizeof_cancel_body  = 12;
+   static const size_type sizeof_piece        = 13;
+   static const size_type sizeof_piece_body   = 8;
++  static const size_type sizeof_port         = 7;
++  static const size_type sizeof_port_body    = 2;
+   static const size_type sizeof_extension    = 6;
+   static const size_type sizeof_extension_body=1;
+
+@@ -133,12 +137,14 @@
+   bool                can_write_request() const               { return m_buffer.reserved_left() >= sizeof_request; }
+   bool                can_write_cancel() const                { return m_buffer.reserved_left() >= sizeof_cancel; }
+   bool                can_write_piece() const                 { return m_buffer.reserved_left() >= sizeof_piece; }
++  bool                can_write_port() const                  { return m_buffer.reserved_left() >= sizeof_port; }
+   bool                can_write_extension() const             { return m_buffer.reserved_left() >= sizeof_extension; }
+
+   bool                can_read_have_body() const              { return m_buffer.remaining() >= sizeof_have_body; }
+   bool                can_read_request_body() const           { return m_buffer.remaining() >= sizeof_request_body; }
+   bool                can_read_cancel_body() const            { return m_buffer.remaining() >= sizeof_request_body; }
+   bool                can_read_piece_body() const             { return m_buffer.remaining() >= sizeof_piece_body; }
++  bool                can_read_port_body() const              { return m_buffer.remaining() >= sizeof_port_body; }
+   bool                can_read_extension_body() const         { return m_buffer.remaining() >= sizeof_extension_body; }
+
+ protected:
+@@ -223,6 +229,13 @@
+ }
+
+ inline void
++ProtocolBase::write_port(uint16_t port) {
++  m_buffer.write_32(3);
++  write_command(PORT);
++  m_buffer.write_16(port);
++}
++
++inline void
+ ProtocolBase::write_extension(uint8_t id, uint32_t length) {
+   m_buffer.write_32(2 + length);
+   write_command(EXTENSION_PROTOCOL);
+Index: libtorrent/src/protocol/peer_connection_base.cc
+===================================================================
+--- libtorrent/src/protocol/peer_connection_base.cc	(revision 975)
++++ libtorrent/src/protocol/peer_connection_base.cc	(working copy)
+@@ -51,6 +51,7 @@
+ #include "download/download_main.h"
+ #include "net/socket_base.h"
+ #include "torrent/connection_manager.h"
++#include "torrent/dht_manager.h"
+ #include "torrent/peer/peer_info.h"
+
+ #include "extensions.h"
+@@ -118,10 +119,10 @@
+   m_peerChunks.bitfield()->swap(*bitfield);
+
+   m_peerChunks.upload_throttle()->set_list_iterator(m_download->upload_throttle()->end());
+-  m_peerChunks.upload_throttle()->slot_activate(rak::make_mem_fun(this, &PeerConnectionBase::receive_throttle_up_activate));
++  m_peerChunks.upload_throttle()->slot_activate(rak::make_mem_fun(static_cast<SocketBase*>(this), &SocketBase::receive_throttle_up_activate));
+
+   m_peerChunks.download_throttle()->set_list_iterator(m_download->download_throttle()->end());
+-  m_peerChunks.download_throttle()->slot_activate(rak::make_mem_fun(this, &PeerConnectionBase::receive_throttle_down_activate));
++  m_peerChunks.download_throttle()->slot_activate(rak::make_mem_fun(static_cast<SocketBase*>(this), &SocketBase::receive_throttle_down_activate));
+
+   download_queue()->set_delegator(m_download->delegator());
+   download_queue()->set_peer_chunks(&m_peerChunks);
+@@ -323,16 +324,6 @@
+ }
+
+ void
+-PeerConnectionBase::receive_throttle_down_activate() {
+-  manager->poll()->insert_read(this);
+-}
+-
+-void
+-PeerConnectionBase::receive_throttle_up_activate() {
+-  manager->poll()->insert_write(this);
+-}
+-
+-void
+ PeerConnectionBase::event_error() {
+   m_download->connection_list()->erase(this, 0);
+ }
+Index: libtorrent/src/protocol/peer_connection_base.h
+===================================================================
+--- libtorrent/src/protocol/peer_connection_base.h	(revision 975)
++++ libtorrent/src/protocol/peer_connection_base.h	(working copy)
+@@ -140,9 +140,6 @@
+
+   void                load_up_chunk();
+
+-  void                receive_throttle_down_activate();
+-  void                receive_throttle_up_activate();
+-
+   void                read_request_piece(const Piece& p);
+   void                read_cancel_piece(const Piece& p);
+
+Index: libtorrent/src/protocol/peer_connection_leech.cc
+===================================================================
+--- libtorrent/src/protocol/peer_connection_leech.cc	(revision 975)
++++ libtorrent/src/protocol/peer_connection_leech.cc	(working copy)
+@@ -45,6 +45,8 @@
+ #include "download/chunk_statistics.h"
+ #include "download/download_info.h"
+ #include "download/download_main.h"
++#include "torrent/dht_manager.h"
++#include "torrent/peer/peer_info.h"
+
+ #include "extensions.h"
+ #include "peer_connection_leech.h"
+@@ -275,6 +277,13 @@
+     read_cancel_piece(m_down->read_request());
+     return true;
+
++  case ProtocolBase::PORT:
++    if (!m_down->can_read_port_body())
++      break;
++
++    manager->dht_manager()->add_node(m_peerInfo->socket_address(), m_down->buffer()->read_16(), false);
++    return true;
++
+   case ProtocolBase::EXTENSION_PROTOCOL:
+     if (!m_down->can_read_extension_body())
+       break;
+Index: libtorrent/src/protocol/peer_connection_seed.cc
+===================================================================
+--- libtorrent/src/protocol/peer_connection_seed.cc	(revision 975)
++++ libtorrent/src/protocol/peer_connection_seed.cc	(working copy)
+@@ -43,6 +43,8 @@
+ #include "download/chunk_statistics.h"
+ #include "download/download_info.h"
+ #include "download/download_main.h"
++#include "torrent/dht_manager.h"
++#include "torrent/peer/peer_info.h"
+
+ #include "extensions.h"
+ #include "peer_connection_seed.h"
+@@ -175,6 +177,13 @@
+     read_cancel_piece(m_down->read_request());
+     return true;
+
++  case ProtocolBase::PORT:
++    if (!m_down->can_read_port_body())
++      break;
++
++    manager->dht_manager()->add_node(m_peerInfo->socket_address(), m_down->buffer()->read_16(), false);
++    return true;
++
+   case ProtocolBase::EXTENSION_PROTOCOL:
+     if (!m_down->can_read_extension_body())
+       break;
+Index: libtorrent/src/protocol/handshake.cc
+===================================================================
+--- libtorrent/src/protocol/handshake.cc	(revision 975)
++++ libtorrent/src/protocol/handshake.cc	(working copy)
+@@ -38,6 +38,7 @@
+
+ #include "download/download_info.h"
+ #include "download/download_main.h"
++#include "torrent/dht_manager.h"
+ #include "net/throttle_list.h"
+ #include "net/throttle_manager.h"
+ #include "torrent/exceptions.h"
+@@ -522,18 +523,19 @@
+
+   // The download is just starting so we're not sending any
+   // bitfield.
+-  if (m_download->file_list()->bitfield()->is_all_unset())
+-    prepare_keepalive();
+-  else
++  if (m_download->file_list()->bitfield()->is_all_unset()) {
++    prepare_post_handshake(true);
++
++  } else {
+     prepare_bitfield();
+
+-  m_state = BITFIELD;
++    // Give some extra time for reading/writing the bitfield.
++    priority_queue_erase(&taskScheduler, &m_taskTimeout);
++    priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(120)).round_seconds());
++  }
++
+   manager->poll()->insert_write(this);
+
+-  // Give some extra time for reading/writing the bitfield.
+-  priority_queue_erase(&taskScheduler, &m_taskTimeout);
+-  priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(120)).round_seconds());
+-
+   return false;
+ }
+
+@@ -731,6 +733,7 @@
+         goto restart;
+
+     case BITFIELD:
++    case POST_HANDSHAKE:
+       read_bitfield();
+       break;
+
+@@ -864,8 +867,12 @@
+     if (!m_writeBuffer.remaining())
+       throw internal_error("event_write called with empty write buffer.");
+
+-    if (m_writeBuffer.consume(write_unthrottled(m_writeBuffer.position(), m_writeBuffer.remaining())))
+-      manager->poll()->remove_write(this);
++    if (m_writeBuffer.consume(write_stream_throws(m_writeBuffer.position(), m_writeBuffer.remaining()))) {
++      if (m_state == POST_HANDSHAKE)
++        write_done();
++      else
++        manager->poll()->remove_write(this);
++    }
+
+   } catch (handshake_succeeded& e) {
+     m_manager->receive_succeeded(this);
+@@ -948,6 +955,8 @@
+   m_writeBuffer.write_range(m_protocol, m_protocol + 19);
+
+   std::memset(m_writeBuffer.end(), 0, 8);
++  if (manager->dht_manager()->is_active())
++    *(m_writeBuffer.end()+7) |= 0x01;	// DHT support, enable PORT message
+   m_writeBuffer.move_end(8);
+
+   m_writeBuffer.write_range(m_download->info()->hash().c_str(), m_download->info()->hash().c_str() + 20);
+@@ -990,20 +999,50 @@
+     m_encryption.info()->encrypt(m_writeBuffer.end() - 5, 5);
+
+   m_writePos = 0;
++
++  m_state = BITFIELD;
+ }
+
+ void
+-Handshake::prepare_keepalive() {
+-  m_writeBuffer.write_32(0);
++Handshake::prepare_post_handshake(bool must_write) {
++  m_state = POST_HANDSHAKE;
+
+-  if (m_encryption.info()->is_encrypted())
+-    m_encryption.info()->encrypt(m_writeBuffer.end() - 4, 4);
++  // Send PORT message for DHT if enabled and peer supports it.
++  if (m_peerInfo->supports_dht() && manager->dht_manager()->is_active() && manager->dht_manager()->can_receive_queries()) {
++    m_writeBuffer.write_32(3);
++    m_writeBuffer.write_8(protocol_port);
++    m_writeBuffer.write_16(manager->dht_manager()->port());
++    manager->dht_manager()->port_sent();
++    if (m_encryption.info()->is_encrypted())
++      m_encryption.info()->encrypt(m_writeBuffer.end() - 7, 7);
+
+-  // Skip writting the bitfield.
+-  m_writePos = m_download->file_list()->bitfield()->size_bytes();
++    must_write = false;
++  }
++
++  // Send a keep-alive if we still must send something.
++  if (must_write) {
++    m_writeBuffer.write_32(0);
++
++    if (m_encryption.info()->is_encrypted())
++      m_encryption.info()->encrypt(m_writeBuffer.end() - 4, 4);
++  }
++
++  if (!m_writeBuffer.remaining())
++    write_done();
+ }
+
+ void
++Handshake::write_done() {
++  m_writeDone = true;
++  manager->poll()->remove_write(this);
++
++  // Ok to just check m_readDone as the call in event_read() won't
++  // set it before the call.
++  if (m_readDone)
++    throw handshake_succeeded();
++}
++
++void
+ Handshake::write_extension_handshake() {
+   if (m_extensions->is_default())
+     m_extensions = new ProtocolExtension;
+@@ -1059,15 +1098,8 @@
+     }
+   }
+
+-  if (m_writePos == bitfield->size_bytes()) {
+-    m_writeDone = true;
+-    manager->poll()->remove_write(this);
+-
+-    // Ok to just check m_readDone as the call in event_read() won't
+-    // set it before the call.
+-    if (m_readDone)
+-      throw handshake_succeeded();
+-  }
++  if (m_writePos == bitfield->size_bytes())
++    prepare_post_handshake(false);
+ }
+
+ void
+Index: libtorrent/src/protocol/handshake.h
+===================================================================
+--- libtorrent/src/protocol/handshake.h	(revision 975)
++++ libtorrent/src/protocol/handshake.h	(working copy)
+@@ -74,6 +74,7 @@
+     INACTIVE,
+     CONNECTING,
+     BITFIELD,
++    POST_HANDSHAKE,
+
+     PROXY_CONNECT,
+     PROXY_DONE,
+@@ -130,6 +131,7 @@
+   void operator = (const Handshake&);
+
+   void                read_done();
++  void                write_done();
+
+   bool                fill_read_buffer(int size);
+
+@@ -151,7 +153,7 @@
+   void                prepare_handshake();
+   void                prepare_peer_info();
+   void                prepare_bitfield();
+-  void                prepare_keepalive();
++  void                prepare_post_handshake(bool must_write);
+
+   void                write_extension_handshake();
+   void                write_bitfield();
+Index: libtorrent/src/download/download_constructor.cc
+===================================================================
+--- libtorrent/src/download/download_constructor.cc	(revision 975)
++++ libtorrent/src/download/download_constructor.cc	(working copy)
+@@ -42,6 +42,7 @@
+ #include <rak/string_manip.h>
+
+ #include "download/download_wrapper.h"
++#include "torrent/dht_manager.h"
+ #include "torrent/exceptions.h"
+ #include "torrent/object.h"
+ #include "torrent/data/file.h"
+@@ -50,6 +51,8 @@
+
+ #include "download_constructor.h"
+
++#include "manager.h"
++
+ namespace torrent {
+
+ struct download_constructor_is_single_path {
+@@ -167,9 +170,16 @@
+   else if (b.has_key("announce"))
+     add_tracker_single(b.get_key("announce"), 0);
+
+-  else
++  else if (!manager->dht_manager()->is_valid() || m_download->info()->is_private())
+     throw bencode_error("Could not find any trackers");
+
++  if (manager->dht_manager()->is_valid() && !m_download->info()->is_private())
++    tracker->insert(tracker->group_size(), "dht://");
++
++  if (manager->dht_manager()->is_valid() && b.has_key_list("nodes"))
++    std::for_each(b.get_key_list("nodes").begin(), b.get_key_list("nodes").end(),
++                  rak::make_mem_fun(this, &DownloadConstructor::add_dht_node));
++
+   tracker->randomize();
+ }
+
+@@ -191,6 +201,35 @@
+   m_download->main()->tracker_manager()->insert(group, rak::trim_classic(b.as_string()));
+ }
+
++struct call_add_node_t {
++  call_add_node_t(int port) : m_port(port) { }
++
++  void operator() (const sockaddr* sa, int err) {
++    if (sa != NULL)
++      manager->dht_manager()->add_node(sa, m_port, true);
++  }
++
++  int m_port;
++};
++
++void
++DownloadConstructor::add_dht_node(const Object& b) {
++  if (!b.is_list() || b.as_list().size() < 2)
++    return;
++
++  Object::list_type::const_iterator el = b.as_list().begin();
++
++  if (!el->is_string())
++    return;
++
++  const std::string& host = el->as_string();
++
++  if (!(++el)->is_value())
++    return;
++
++  manager->connection_manager()->resolver()(host.c_str(), (int)rak::socket_address::pf_inet, SOCK_DGRAM, call_add_node_t(el->as_value()));
++}
++
+ bool
+ DownloadConstructor::is_valid_path_element(const Object& b) {
+   return
+Index: libtorrent/src/download/download_constructor.h
+===================================================================
+--- libtorrent/src/download/download_constructor.h	(revision 975)
++++ libtorrent/src/download/download_constructor.h	(working copy)
+@@ -67,6 +67,7 @@
+
+   void                add_tracker_group(const Object& b);
+   void                add_tracker_single(const Object& b, int group);
++  void                add_dht_node(const Object& b);
+
+   static bool         is_valid_path_element(const Object& b);
+   static bool         is_invalid_path_element(const Object& b) { return !is_valid_path_element(b); }
+Index: libtorrent/src/Makefile.am
+===================================================================
+--- libtorrent/src/Makefile.am	(revision 975)
++++ libtorrent/src/Makefile.am	(working copy)
+@@ -1,6 +1,7 @@
+ SUBDIRS = \
+ 	torrent \
+ 	data \
++	dht \
+ 	download \
+ 	net \
+ 	protocol \
+@@ -15,6 +16,7 @@
+ 	$(top_srcdir)/src/torrent/data/libsub_torrentdata.la \
+ 	$(top_srcdir)/src/torrent/peer/libsub_torrentpeer.la \
+ 	$(top_srcdir)/src/data/libsub_data.la \
++	$(top_srcdir)/src/dht/libsub_dht.la \
+ 	$(top_srcdir)/src/download/libsub_download.la \
+ 	$(top_srcdir)/src/net/libsub_net.la \
+ 	$(top_srcdir)/src/protocol/libsub_protocol.la \
+Index: libtorrent/configure.ac
+===================================================================
+--- libtorrent/configure.ac	(revision 975)
++++ libtorrent/configure.ac	(working copy)
+@@ -2,6 +2,7 @@
+
+ dnl Find a better way to do this
+ AC_DEFINE(PEER_NAME, "-lt0B80-", Identifier that is part of the default peer id)
++AC_DEFINE(PEER_VERSION, "lt\x0B\x80", 4 byte client and version identifier for DHT)
+
+ LIBTORRENT_CURRENT=10
+ LIBTORRENT_REVISION=8
+@@ -32,6 +33,7 @@
+ TORRENT_ENABLE_DEBUG
+ TORRENT_ENABLE_EXTRA_DEBUG
+ TORRENT_ENABLE_WERROR
++TORRENT_ENABLE_TR1
+
+ TORRENT_DISABLE_IPV6
+
+@@ -104,6 +106,7 @@
+ 	src/torrent/peer/Makefile
+ 	src/torrent/data/Makefile
+ 	src/data/Makefile
++	src/dht/Makefile
+ 	src/download/Makefile
+ 	src/net/Makefile
+ 	src/protocol/Makefile
From voroskoi at frugalware.org  Tue Oct  2 23:23:08 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct  2 23:23:10 2007
Subject: [Frugalware-git] frugalware-current: t1lib-5.1.1-2-i686
Message-ID: <20071002212308.679CB13A4077@genesis.frugalware.org>

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

commit 8e45d38022ef049108cfbcf6a73de67c94797c9e
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 2 23:06:55 2007 +0200

t1lib-5.1.1-2-i686
secfix relbump, closes #2297
disabled docs build because does not work
fixed .so permissions
new m8r

diff --git a/source/xlib/t1lib/CVE-2007-4033.diff b/source/xlib/t1lib/CVE-2007-4033.diff
new file mode 100644
index 0000000..6154c56
--- /dev/null
+++ b/source/xlib/t1lib/CVE-2007-4033.diff
@@ -0,0 +1,15 @@
+--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
++++ t1lib-5.1.0/lib/t1lib/t1env.c
+@@ -611,6 +611,12 @@
+ #endif
+     strcat( pathbuf, DIRECTORY_SEP);
+     /* And finally the filename: */
++    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
++       let's try next pathbuf */
++    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
++	i++;
++    	continue;
++    }
+     strcat( pathbuf, StrippedName);
+
+     /* Check for existence of the path: */
diff --git a/source/xlib/t1lib/FrugalBuild b/source/xlib/t1lib/FrugalBuild
index 088f2a9..2f5bd01 100644
--- a/source/xlib/t1lib/FrugalBuild
+++ b/source/xlib/t1lib/FrugalBuild
@@ -1,23 +1,27 @@
# Compiling time: 0.28 SBU
-# Maintainer: Bence Nagy <nagybence@tipogral.hu>
+# Contributor: Bence Nagy <nagybence@tipogral.hu>
+# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=t1lib
pkgver=5.1.1
-pkgrel=1
-pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts"
+pkgrel=2
+pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts."
url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
depends=('libxaw')
-makedepends=('tetex')
groups=('xlib')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.ibiblio.org/pub/Linux/libs/graphics/ | grep t1lib-.*.tar.gz | tail -n 1 | sed \"s/.*t1lib-\(.*\).tar.gz.*/\1/\""
-source=("http://www.ibiblio.org/pub/Linux/libs/graphics/$pkgname-$pkgver.tar.gz")
+source=(http://www.ibiblio.org/pub/Linux/libs/graphics/$pkgname-$pkgver.tar.gz CVE-2007-4033.diff)

build()
{
-	Fsed "all: t1lib_doc.ps" "all: pdf" doc/Makefile.in
-	Fbuild
+	Fpatchall
+	Fconf
+	make without_doc || Fdie
+	Fmakeinstall
+	chmod +x $Fdestdir/usr/lib/*.so || Fdie
}
+sha1sums=('98418741cb9e0a27d65c2313f93bd1ef53ec1833' \
+          'f99460baf795c67bf4063fad33c93b040a13e78a')

-sha1sums=('98418741cb9e0a27d65c2313f93bd1ef53ec1833')
# optimization OK
From voroskoi at frugalware.org  Tue Oct  2 23:25:06 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct  2 23:25:08 2007
Subject: [Frugalware-git] frugalware-current: emerald-0.2.1-2-i686
Message-ID: <20071002212506.9A64313A4077@genesis.frugalware.org>

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

commit 215b23d054ffa2089124e70cf5ff2df59c86e261
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 2 23:13:14 2007 +0200

emerald-0.2.1-2-i686
added pkgdesc

diff --git a/source/x11-extra/emerald/FrugalBuild b/source/x11-extra/emerald/FrugalBuild
index 96b19fb..950e5f1 100644
--- a/source/x11-extra/emerald/FrugalBuild
+++ b/source/x11-extra/emerald/FrugalBuild
@@ -10,6 +10,7 @@ archs=('i686' 'x86_64')
_F_gnome_mime=y
_F_gnome_desktop=y
Finclude gnome-scriptlet beryl
+pkgdesc="An alternative themeable window decorator."
conflicts=('cgwd')
provides=('cgwd')
replaces=('cgwd')
From crazy at frugalware.org  Tue Oct  2 23:35:46 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 23:35:53 2007
Subject: [Frugalware-git] frugalware-current: xmule-1.13.7_rc1-2-i686
Message-ID: <20071002213546.65C8513A4077@genesis.frugalware.org>

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

commit 93614199e6371444870a7b2c8fd89ee888db69cb
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 23:29:30 2007 +0200

xmule-1.13.7_rc1-2-i686
* relbump
* fixed conflicts with amule
* source points to our FTP now , xmule download site
* is broken :|

diff --git a/source/xapps-extra/xmule/FrugalBuild b/source/xapps-extra/xmule/FrugalBuild
index 89aca4f..5cf1d0f 100644
--- a/source/xapps-extra/xmule/FrugalBuild
+++ b/source/xapps-extra/xmule/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=xmule
pkgver=1.13.7_rc1
-pkgrel=1
+pkgrel=2
pkgdesc="The Multiplatform Fork of the xMule Client | Inspiring P2P for Geeks"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
@@ -14,8 +14,9 @@ groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
up2date="lynx -dump $url/|grep xmule.*.tar.bz2|sed -ne 's/.*xmule-\(.*\)\.t.*/\1/;1 p'"
-source=($url/files/releases/$pkgname-1.13.7-rc1.tar.bz2 ed2k.protocol)
-
+#source=($url/files/releases/$pkgname-1.13.7-rc1.tar.bz2 ed2k.protocol)
+source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xapps-extra/xmule/xmule-1.13.7-rc1.tar.bz2 \
+	ed2k.protocol)
build()
{
Fcd $pkgname-1.13.7/
@@ -29,8 +30,12 @@ build()

# Install KDE ed2k protocol
Ffile /usr/share/services/ed2k.protocol
+
+	# fix conflicts with amule
+	Frm usr/bin/ed2k
+	Fln /usr/bin/ed2k.xmule-2.0 /usr/bin/xed2k
}

-sha1sums=('2d7b058094fd89912179a9675d26c9a31d638506'\
-          '5226282278b9c34344c0da75c97f393b43a8c797')
+sha1sums=('2d7b058094fd89912179a9675d26c9a31d638506' \
+          'f5eb94d97813e1d6665a4652e32085ac2b27a5db')
# optimization OK
diff --git a/source/xapps-extra/xmule/ed2k.protocol b/source/xapps-extra/xmule/ed2k.protocol
index a99f55f..c073c85 100644
--- a/source/xapps-extra/xmule/ed2k.protocol
+++ b/source/xapps-extra/xmule/ed2k.protocol
@@ -1,5 +1,5 @@
[Protocol]
-	exec=/usr/bin/ed2k "%u"
+	exec=/usr/bin/xed2k "%u"
protocol=ed2k
input=none
output=none
From vmiklos at frugalware.org  Tue Oct  2 23:36:50 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  2 23:36:53 2007
Subject: [Frugalware-git] bmf: rtorrent-svn975-1bmf1-i686
Message-ID: <20071002213650.6498C13A4077@genesis.frugalware.org>

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

commit b4300ed01f4d72176fb17ec05820d24d24ddc624
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 2 23:36:33 2007 +0200

rtorrent-svn975-1bmf1-i686
import from current + add dht patch

diff --git a/source/network-extra/rtorrent/FrugalBuild b/source/network-extra/rtorrent/FrugalBuild
new file mode 100644
index 0000000..870125e
--- /dev/null
+++ b/source/network-extra/rtorrent/FrugalBuild
@@ -0,0 +1,32 @@
+# Compiling Time: 0.70 SBU
+# Maintainer: voroskoi <voroskoi@frugalware.org>
+
+pkgname=rtorrent
+pkgver=svn975
+pkgrel=1bmf1
+pkgdesc="The ncurses client for libtorrent."
+url="http://libtorrent.rakshasa.no/"
+depends=('ncurses' 'libtorrent>=svn975' 'xmlrpc-c>=1.11.00')
+groups=('network-extra')
+archs=('i686' 'x86_64')
+Fconfopts="$Fconfopts --with-xmlrpc-c"
+up2date="lynx -dump $url |grep rtorrent.*.tar |sed -ne 's/.*t-\(.*\).t.*/\1/;1p'"
+source=(curl_segfault_dirty_hack.diff dht.diff)
+sha1sums=('583dadf10d30956ec796ec9f3c2c4d5dfff64c79' \
+          'dcf3adce965952263179f814e468c155613e9493')
+
+_F_scm_type="subversion"
+_F_scm_url="svn://rakshasa.no/libtorrent/trunk/rtorrent"
+_F_scm_tag="975"
+Finclude scm
+
+build()
+{
+	Funpack_scm
+	Fpatchall
+	sh autogen.sh || return 1
+	Fmake
+	Fmakeinstall
+}
+
+# optimization OK
diff --git a/source/network-extra/rtorrent/curl_segfault_dirty_hack.diff b/source/network-extra/rtorrent/curl_segfault_dirty_hack.diff
new file mode 100644
index 0000000..05a59a6
--- /dev/null
+++ b/source/network-extra/rtorrent/curl_segfault_dirty_hack.diff
@@ -0,0 +1,13 @@
+Index: src/core/curl_get.cc
+===================================================================
+--- rtorrent/src/core/curl_get.cc	(revision 868)
++++ rtorrent/src/core/curl_get.cc	(working copy)
+@@ -66,7 +66,7 @@
+   if (m_stream == NULL)
+     throw torrent::internal_error("Tried to call CurlGet::start without a valid output stream.");
+
+-  m_handle = curl_easy_init();
++  if ((m_handle = curl_easy_init()) == NULL) return;
+
+   curl_easy_setopt(m_handle, CURLOPT_URL,            m_url.c_str());
+   curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION,  &curl_get_receive_write);
diff --git a/source/network-extra/rtorrent/dht.diff b/source/network-extra/rtorrent/dht.diff
new file mode 100644
index 0000000..160763e
--- /dev/null
+++ b/source/network-extra/rtorrent/dht.diff
@@ -0,0 +1,708 @@
+Index: rtorrent/doc/rtorrent.rc
+===================================================================
+--- rtorrent/doc/rtorrent.rc	(revision 975)
++++ rtorrent/doc/rtorrent.rc	(working copy)
+@@ -74,6 +74,17 @@
+ #
+ # encryption = allow_incoming,enable_retry,prefer_plaintext
+
++# Enable DHT support for trackerless torrents or when all trackers are down.
++# May be set to "disable" (completely disable DHT), "off" (do not start DHT),
++# "auto" (start and stop DHT as needed), or "on" (start DHT immediately).
++# The default is "off". For DHT to work, a session directory must be defined.
++#
++# dht = auto
++
++# UDP port to use for DHT.
++#
++# dht_port = 6881
++
+ # Enable peer exchange (for torrents not marked private)
+ #
+ # peer_exchange = yes
+Index: rtorrent/doc/rtorrent.1.xml
+===================================================================
+--- rtorrent/doc/rtorrent.1.xml	(revision 975)
++++ rtorrent/doc/rtorrent.1.xml	(working copy)
+@@ -1,4 +1,5 @@
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
++  "http://oasis-open.org/docbook/xml/4.1/docbookx.dtd">
+
+ <refentry id="rtorrent">
+
+@@ -705,7 +706,39 @@
+         </para></listitem>
+       </varlistentry>
+
++       <varlistentry>
++        <term>dht = <replaceable>disabled|off|auto|on</replaceable></term>
++        <listitem><para>
++Support for querying the distributed hash table (DHT) to find peers for trackerless
++torrents or when all trackers are down. Set to <emphasis>disable</emphasis> to completely
++disable DHT, <emphasis>off</emphasis> (default) to enable DHT but to not start the
++DHT server, <emphasis>auto</emphasis> to automatically start and stop the DHT server
++as needed or <emphasis>on</emphasis> for permanently keeping the DHT server running.
++When set to automatic, the DHT server will start up when the first non-private torrent
++is started, and will stop 15-30 minutes after the last non-private torrent is
++stopped (or when rTorrent quits). For DHT to work, a session directory must be set (for
++saving the DHT cache).
++        </para></listitem>
++      </varlistentry>
++
+       <varlistentry>
++        <term>dht_port = <replaceable>number</replaceable></term>
++        <listitem><para>
++Set the UDP listen port for DHT. Defaults to 6881.
++        </para></listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>dht_add_node = <replaceable>host[:port]</replaceable></term>
++        <listitem><para>
++Not intended for use in the configuration file but as one-time option in the
++client or on the command line to bootstrap an empty DHT node table. Contacts
++the given node and attempts to bootstrap from it if it replies.
++The port is optional, with port 6881 being used by default.
++        </para></listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term>http_capath = <replaceable>path</replaceable></term>
+         <term>http_cacert = <replaceable>filename</replaceable></term>
+         <listitem><para>
+Index: rtorrent/src/core/download_list.cc
+===================================================================
+--- rtorrent/src/core/download_list.cc	(revision 975)
++++ rtorrent/src/core/download_list.cc	(working copy)
+@@ -55,6 +55,7 @@
+ #include "globals.h"
+ #include "manager.h"
+
++#include "dht_manager.h"
+ #include "download.h"
+ #include "download_list.h"
+ #include "download_store.h"
+@@ -94,6 +95,8 @@
+ void
+ DownloadList::session_save() {
+   std::for_each(begin(), end(), std::bind1st(std::mem_fun(&DownloadStore::save), control->core()->download_store()));
++
++  control->dht_manager()->save_dht_cache();
+ }
+
+ DownloadList::iterator
+@@ -388,6 +391,9 @@
+       torrent::resume_save_progress(*download->download(), download->download()->bencode()->get_key("libtorrent_resume"), true);
+     }
+
++    // If the DHT server is set to auto, start it now.
++    control->dht_manager()->auto_start();
++
+     // Update the priority to ensure it has the correct
+     // seeding/unfinished modifiers.
+     download->set_priority(download->priority());
+Index: rtorrent/src/core/dht_manager.cc
+===================================================================
+--- rtorrent/src/core/dht_manager.cc	(revision 0)
++++ rtorrent/src/core/dht_manager.cc	(revision 0)
+@@ -0,0 +1,302 @@
++// rTorrent - BitTorrent client
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include <fstream>
++#include <sstream>
++#include <torrent/object.h>
++#include <torrent/dht_manager.h>
++#include <torrent/object_stream.h>
++#include <torrent/rate.h>
++
++#include "rpc/parse_commands.h"
++
++#include "globals.h"
++
++#include "control.h"
++#include "dht_manager.h"
++#include "download.h"
++#include "download_store.h"
++#include "manager.h"
++
++namespace core {
++
++const char* DhtManager::dht_settings[dht_settings_num] = { "disable", "off", "auto", "on" };
++
++DhtManager::~DhtManager() {
++  priority_queue_erase(&taskScheduler, &m_updateTimeout);
++  priority_queue_erase(&taskScheduler, &m_stopTimeout);
++}
++
++void
++DhtManager::load_dht_cache() {
++  if (m_start == dht_disable || !control->core()->download_store()->is_enabled())
++    return;
++
++  torrent::Object cache(torrent::Object::TYPE_MAP);
++  std::fstream cache_file((control->core()->download_store()->path() + "rtorrent.dht_cache").c_str(), std::ios::in | std::ios::binary);
++
++  if (cache_file.is_open()) {
++    cache_file >> cache;
++
++    if (cache_file.fail())
++      throw torrent::input_error("Invalid DHT cache.");
++  }
++
++  try {
++    torrent::dht_manager()->initialize(cache);
++
++    if (m_start == dht_on)
++      start_dht();
++
++  } catch (torrent::local_error& e) {
++   control->core()->push_log((std::string("DHT error: ") + e.what()).c_str());
++  }
++}
++
++void
++DhtManager::start_dht() {
++  priority_queue_erase(&taskScheduler, &m_stopTimeout);
++
++  if (torrent::dht_manager()->is_active() || !torrent::dht_manager()->is_valid())
++    return;
++
++  int port = rpc::call_command_value("get_dht_port");
++  if (port <= 0)
++    return;
++
++  char msg[128];
++  snprintf(msg, sizeof(msg), "Starting DHT server on port %d.", port);
++  control->core()->push_log(msg);
++
++  try {
++    torrent::dht_manager()->start(port);
++
++    m_updateTimeout.set_slot(rak::mem_fn(this, &DhtManager::update));
++    priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime + rak::timer::from_seconds(60)).round_seconds());
++
++    m_dhtPrevCycle = 0;
++    m_dhtPrevQueriesSent = 0;
++    m_dhtPrevRepliesReceived = 0;
++    m_dhtPrevQueriesReceived = 0;
++    m_dhtPrevBytesUp = 0;
++    m_dhtPrevBytesDown = 0;
++
++  } catch (torrent::local_error& e) {
++    control->core()->push_log((std::string("DHT error: ") + e.what()).c_str());
++    m_start = dht_off;
++  }
++}
++
++void
++DhtManager::stop_dht() {
++  priority_queue_erase(&taskScheduler, &m_updateTimeout);
++  priority_queue_erase(&taskScheduler, &m_stopTimeout);
++  if (m_stopTimeout.is_queued())
++    priority_queue_erase(&taskScheduler, &m_stopTimeout);
++
++  if (torrent::dht_manager()->is_active()) {
++    log_statistics(true);
++    control->core()->push_log("Stopping DHT server.");
++    torrent::dht_manager()->stop();
++  }
++}
++
++void
++DhtManager::save_dht_cache() {
++  if (!control->core()->download_store()->is_enabled() || !torrent::dht_manager()->is_active())
++    return;
++
++  std::string filename = control->core()->download_store()->path() + "rtorrent.dht_cache";
++  std::string filename_tmp = filename + ".new";
++  std::fstream cache_file(filename_tmp.c_str(), std::ios::out | std::ios::trunc);
++
++  if (!cache_file.is_open())
++    return;
++
++  torrent::Object cache(torrent::Object::TYPE_MAP);
++  cache_file << *torrent::dht_manager()->store_cache(&cache);
++
++  if (!cache_file.good())
++    return;
++
++  cache_file.close();
++
++  ::rename(filename_tmp.c_str(), filename.c_str());
++}
++
++void
++DhtManager::set_start(const std::string& arg) {
++  int i;
++  for (i = 0; i < dht_settings_num; i++) {
++    if (arg == dht_settings[i]) {
++      m_start = i;
++      break;
++    }
++  }
++
++  if (i == dht_settings_num)
++    throw torrent::input_error("Invalid argument.");
++
++  if (m_start == dht_off)
++    stop_dht();
++  else if (m_start == dht_on)
++    start_dht();
++}
++
++void
++DhtManager::update() {
++  if (!torrent::dht_manager()->is_active())
++    throw torrent::internal_error("DhtManager::update called with DHT inactive.");
++
++  if (m_start == dht_auto && !m_stopTimeout.is_queued()) {
++    DownloadList::const_iterator itr = std::find_if(control->core()->download_list()->begin(), control->core()->download_list()->end(), std::mem_fun(&Download::is_active));
++    if (itr == control->core()->download_list()->end()) {
++      m_stopTimeout.set_slot(rak::mem_fn(this, &DhtManager::stop_dht));
++      priority_queue_insert(&taskScheduler, &m_stopTimeout, (cachedTime + rak::timer::from_seconds(15 * 60)).round_seconds());
++    }
++  }
++
++  // While bootstrapping (log_statistics returns true), check every minute if it completed, otherwise update every 15 minutes.
++  if (log_statistics(false))
++    priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime + rak::timer::from_seconds(60)).round_seconds());
++  else
++    priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime + rak::timer::from_seconds(15 * 60)).round_seconds());
++}
++
++bool
++DhtManager::log_statistics(bool force) {
++  torrent::DhtManager::statistics_type stats = torrent::dht_manager()->get_statistics();
++
++  // Check for firewall problems.
++
++  if (stats.cycle > 2 && stats.queries_sent - m_dhtPrevQueriesSent > 100 && stats.queries_received == m_dhtPrevQueriesReceived) {
++    // We should have had clients ping us at least but have received
++    // nothing, that means the UDP port is probably unreachable.
++    if (torrent::dht_manager()->can_receive_queries())
++      control->core()->push_log("Warning: DHT port appears to be unreachable, no queries received.");
++
++    torrent::dht_manager()->set_can_receive(false);
++  }
++
++  if (stats.queries_sent - m_dhtPrevQueriesSent > stats.num_nodes * 2 + 20 && stats.replies_received == m_dhtPrevRepliesReceived) {
++    // No replies to over 20 queries plus two per node we have. Probably firewalled.
++    if (!m_warned)
++      control->core()->push_log("Warning: DHT port appears to be firewalled, no replies received.");
++
++    m_warned = true;
++    return false;
++  }
++
++  m_warned = false;
++
++  if (stats.queries_received > m_dhtPrevQueriesReceived)
++    torrent::dht_manager()->set_can_receive(true);
++
++  // Nothing to log while bootstrapping, but check again every minute.
++  if (stats.cycle <= 1) {
++    m_dhtPrevCycle = stats.cycle;
++    return true;
++  }
++
++  // If bootstrap completed between now and the previous check, notify user.
++  if (m_dhtPrevCycle == 1) {
++    char buffer[128];
++    snprintf(buffer, sizeof(buffer), "DHT bootstrap complete, have %d nodes in %d buckets.", stats.num_nodes, stats.num_buckets);
++    control->core()->get_log_complete().push_front(buffer);
++    m_dhtPrevCycle = stats.cycle;
++    return false;
++  };
++
++  // Standard DHT statistics on first real cycle, and every 8th cycle
++  // afterwards (i.e. every 2 hours), or when forced.
++  if ((force && stats.cycle != m_dhtPrevCycle) || stats.cycle == 3 || stats.cycle > m_dhtPrevCycle + 7) {
++    char buffer[256];
++    snprintf(buffer, sizeof(buffer),
++             "DHT statistics: %d queries in, %d queries out, %d replies received, %lld bytes read, %lld bytes sent, "
++             "%d known nodes in %d buckets, %d peers (highest: %d) tracked in %d torrents.",
++             stats.queries_received - m_dhtPrevQueriesReceived,
++             stats.queries_sent - m_dhtPrevQueriesSent,
++             stats.replies_received - m_dhtPrevRepliesReceived,
++             stats.down_rate.total() - m_dhtPrevBytesDown,
++             stats.up_rate.total() - m_dhtPrevBytesUp,
++             stats.num_nodes,
++             stats.num_buckets,
++             stats.num_peers,
++             stats.max_peers,
++             stats.num_trackers);
++
++    control->core()->get_log_complete().push_front(buffer);
++
++    m_dhtPrevCycle = stats.cycle;
++    m_dhtPrevQueriesSent = stats.queries_sent;
++    m_dhtPrevRepliesReceived = stats.replies_received;
++    m_dhtPrevQueriesReceived = stats.queries_received;
++    m_dhtPrevBytesUp = stats.up_rate.total();
++    m_dhtPrevBytesDown = stats.down_rate.total();
++  }
++
++ return false;
++}
++
++torrent::Object
++DhtManager::dht_statistics() {
++  torrent::Object dhtStats(torrent::Object::TYPE_MAP);
++
++  dhtStats.insert_key("dht",              dht_settings[m_start]);
++  dhtStats.insert_key("active",           torrent::dht_manager()->is_active());
++
++  if (torrent::dht_manager()->is_active()) {
++    torrent::DhtManager::statistics_type stats = torrent::dht_manager()->get_statistics();
++
++    dhtStats.insert_key("cycle",            stats.cycle);
++    dhtStats.insert_key("queries_received", stats.queries_received);
++    dhtStats.insert_key("queries_sent",     stats.queries_sent);
++    dhtStats.insert_key("replies_received", stats.replies_received);
++    dhtStats.insert_key("bytes_read",       stats.down_rate.total());
++    dhtStats.insert_key("bytes_written",    stats.up_rate.total());
++    dhtStats.insert_key("nodes",            stats.num_nodes);
++    dhtStats.insert_key("buckets",          stats.num_buckets);
++    dhtStats.insert_key("peers",            stats.num_peers);
++    dhtStats.insert_key("peers_max",        stats.max_peers);
++    dhtStats.insert_key("torrents",         stats.num_trackers);
++  }
++
++  return dhtStats;
++}
++
++}
+Index: rtorrent/src/core/dht_manager.h
+===================================================================
+--- rtorrent/src/core/dht_manager.h	(revision 0)
++++ rtorrent/src/core/dht_manager.h	(revision 0)
+@@ -0,0 +1,89 @@
++// rTorrent - BitTorrent client
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// 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
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL.  If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so.  If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact:  Jari Sundell <jaris@ifi.uio.no>
++//
++//           Skomakerveien 33
++//           3185 Skoppum, NORWAY
++
++#ifndef RTORRENT_CORE_DHT_MANAGER_H
++#define RTORRENT_CORE_DHT_MANAGER_H
++
++#include <rak/priority_queue_default.h>
++
++#include <torrent/object.h>
++
++namespace core {
++
++class DhtManager {
++public:
++  DhtManager() : m_warned(false), m_start(dht_off) { }
++  ~DhtManager();
++
++  void                load_dht_cache();
++  void                save_dht_cache();
++  torrent::Object     dht_statistics();
++
++  void                start_dht();
++  void                stop_dht();
++  void                auto_start()                 { if (m_start == dht_auto) start_dht(); }
++
++  void                set_start(const std::string& arg);
++
++private:
++  static const int    dht_disable = 0;
++  static const int    dht_off     = 1;
++  static const int    dht_auto    = 2;
++  static const int    dht_on      = 3;
++
++  static const int    dht_settings_num = 4;
++  static const char*  dht_settings[dht_settings_num];
++
++  void                update();
++  bool                log_statistics(bool force);
++
++  unsigned int        m_dhtPrevCycle;
++  unsigned int        m_dhtPrevQueriesSent;
++  unsigned int        m_dhtPrevRepliesReceived;
++  unsigned int        m_dhtPrevQueriesReceived;
++  uint64_t            m_dhtPrevBytesUp;
++  uint64_t            m_dhtPrevBytesDown;
++
++  rak::priority_item  m_updateTimeout;
++  rak::priority_item  m_stopTimeout;
++  bool                m_warned;
++
++  int                 m_start;
++};
++
++}
++
++#endif
+Index: rtorrent/src/core/manager.cc
+===================================================================
+--- rtorrent/src/core/manager.cc	(revision 975)
++++ rtorrent/src/core/manager.cc	(working copy)
+@@ -242,6 +242,9 @@
+
+   m_downloadList->clear();
+
++  // When we implement asynchronous DNS lookups, we need to cancel them
++  // here before the torrent::* objects are deleted.
++
+   torrent::cleanup();
+   CurlStack::global_cleanup();
+
+Index: rtorrent/src/core/Makefile.am
+===================================================================
+--- rtorrent/src/core/Makefile.am	(revision 975)
++++ rtorrent/src/core/Makefile.am	(working copy)
+@@ -5,6 +5,8 @@
+ 	curl_get.h \
+ 	curl_stack.cc \
+ 	curl_stack.h \
++	dht_manager.cc \
++	dht_manager.h \
+ 	download.cc \
+ 	download.h \
+ 	download_factory.cc \
+Index: rtorrent/src/control.cc
+===================================================================
+--- rtorrent/src/control.cc	(revision 975)
++++ rtorrent/src/control.cc	(working copy)
+@@ -44,6 +44,7 @@
+ #include "core/download_store.h"
+ #include "core/view_manager.h"
+ #include "core/scheduler.h"
++#include "core/dht_manager.h"
+
+ #include "display/canvas.h"
+ #include "display/window.h"
+@@ -75,6 +76,7 @@
+   m_core        = new core::Manager();
+   m_viewManager = new core::ViewManager(m_core->download_list());
+   m_scheduler   = new core::Scheduler(m_core->download_list());
++  m_dhtManager  = new core::DhtManager();
+
+   m_inputStdin->slot_pressed(sigc::mem_fun(m_input, &input::Manager::pressed));
+
+@@ -95,6 +97,7 @@
+   delete m_display;
+   delete m_core;
+   delete m_scheduler;
++  delete m_dhtManager;
+ }
+
+ void
+Index: rtorrent/src/display/utils.cc
+===================================================================
+--- rtorrent/src/display/utils.cc	(revision 975)
++++ rtorrent/src/display/utils.cc	(working copy)
+@@ -191,8 +191,8 @@
+   } else if (d->tracker_list()->is_busy() && d->tracker_list()->focus() < d->tracker_list()->size()) {
+     torrent::TrackerList* tl = d->tracker_list();
+
+-    first = print_buffer(first, last, "Tracker[%i:%i]: Connecting to %s",
+-                         tl->get(tl->focus()).group(), tl->focus(), tl->get(tl->focus()).url().c_str());
++    first = print_buffer(first, last, "Tracker[%i:%i]: Connecting to %s %s",
++                         tl->get(tl->focus()).group(), tl->focus(), tl->get(tl->focus()).url().c_str(), tl->get(tl->focus()).status().c_str());
+
+   } else if (!d->message().empty()) {
+     first = print_buffer(first, last, "%s", d->message().c_str());
+Index: rtorrent/src/display/window_tracker_list.cc
+===================================================================
+--- rtorrent/src/display/window_tracker_list.cc	(revision 975)
++++ rtorrent/src/display/window_tracker_list.cc	(working copy)
+@@ -91,7 +91,7 @@
+     m_canvas->print(4, pos++, "Id: %s Focus: %s Enabled: %s Open: %s S/L: %u/%u",
+                     rak::copy_escape_html(tracker.tracker_id()).c_str(),
+                     range.first == tl->focus() ? "yes" : " no",
+-                    tracker.is_enabled() ? "yes" : " no",
++                    tracker.is_usable() ? "yes" : tracker.is_enabled() ? "off" : " no",
+                     tracker.is_open() ? "yes" : " no",
+                     tracker.scrape_complete(),
+                     tracker.scrape_incomplete());
+Index: rtorrent/src/control.h
+===================================================================
+--- rtorrent/src/control.h	(revision 975)
++++ rtorrent/src/control.h	(working copy)
+@@ -51,6 +51,7 @@
+   class Manager;
+   class ViewManager;
+   class Scheduler;
++  class DhtManager;
+ }
+
+ namespace display {
+@@ -89,6 +90,7 @@
+   core::Manager*      core()                        { return m_core; }
+   core::ViewManager*  view_manager()                { return m_viewManager; }
+   core::Scheduler*    scheduler()                   { return m_scheduler; }
++  core::DhtManager*   dht_manager()                 { return m_dhtManager; }
+
+   torrent::Poll*      poll();
+
+@@ -118,6 +120,7 @@
+   core::Manager*      m_core;
+   core::ViewManager*  m_viewManager;
+   core::Scheduler*    m_scheduler;
++  core::DhtManager*   m_dhtManager;
+
+   ui::Root*           m_ui;
+   display::Manager*   m_display;
+Index: rtorrent/src/main.cc
+===================================================================
+--- rtorrent/src/main.cc	(revision 975)
++++ rtorrent/src/main.cc	(working copy)
+@@ -49,6 +49,7 @@
+ #include <execinfo.h>
+ #endif
+
++#include "core/dht_manager.h"
+ #include "core/download.h"
+ #include "core/download_factory.h"
+ #include "core/download_store.h"
+@@ -244,6 +245,7 @@
+
+     // Load session torrents and perform scheduled tasks to ensure
+     // session torrents are loaded before arg torrents.
++    control->dht_manager()->load_dht_cache();
+     load_session_torrents(control);
+     rak::priority_queue_perform(&taskScheduler, cachedTime);
+
+Index: rtorrent/src/command_network.cc
+===================================================================
+--- rtorrent/src/command_network.cc	(revision 975)
++++ rtorrent/src/command_network.cc	(working copy)
+@@ -41,10 +41,12 @@
+ #include <rak/file_stat.h>
+ #include <rak/path.h>
+ #include <torrent/connection_manager.h>
++#include <torrent/dht_manager.h>
+ #include <torrent/tracker.h>
+ #include <torrent/tracker_list.h>
+ #include <torrent/torrent.h>
+
++#include "core/dht_manager.h"
+ #include "core/download.h"
+ #include "core/manager.h"
+ #include "rpc/scgi.h"
+@@ -119,7 +121,42 @@
+ void apply_hash_interval(int arg)                { torrent::set_hash_interval(arg * 1000); }
+ void apply_encoding_list(const std::string& arg) { torrent::encoding_list()->push_back(arg); }
+
++struct call_add_node_t {
++  call_add_node_t(int port) : m_port(port) { }
++
++  void operator() (const sockaddr* sa, int err) {
++    if (sa == NULL)
++      control->core()->push_log("Could not resolve host.");
++    else
++      torrent::dht_manager()->add_node(sa, m_port, false);
++  }
++
++  int m_port;
++};
++
+ void
++apply_dht_add_node(const std::string& arg) {
++  if (!torrent::dht_manager()->is_valid())
++    throw torrent::input_error("DHT not enabled.");
++
++  int port, ret;
++  char dummy;
++  char host[1024];
++
++  ret = std::sscanf(arg.c_str(), "%1023[^:]:%i%c", host, &port, &dummy);
++
++  if (ret == 1)
++    port = 6881;
++  else if (ret != 2)
++    throw torrent::input_error("Could not parse host.");
++
++  if (port < 1 || port > 65535)
++    throw torrent::input_error("Invalid port number.");
++
++  torrent::connection_manager()->resolver()(host, (int)rak::socket_address::pf_inet, SOCK_DGRAM, call_add_node_t(port));
++}
++
++void
+ apply_enable_trackers(int64_t arg) {
+   for (core::Manager::DListItr itr = control->core()->download_list()->begin(), last = control->core()->download_list()->end(); itr != last; ++itr) {
+     torrent::TrackerList tl = (*itr)->download()->tracker_list();
+@@ -324,6 +361,11 @@
+   ADD_COMMAND_VALUE_UN("enable_trackers",       std::ptr_fun(&apply_enable_trackers));
+   ADD_COMMAND_STRING_UN("encoding_list",        std::ptr_fun(&apply_encoding_list));
+
++  ADD_VARIABLE_VALUE("dht_port", 6881);
++  ADD_COMMAND_STRING_UN("dht",                  rak::make_mem_fun(control->dht_manager(), &core::DhtManager::set_start));
++  ADD_COMMAND_STRING_UN("dht_add_node",         std::ptr_fun(&apply_dht_add_node));
++  ADD_COMMAND_VOID("dht_statistics",            rak::make_mem_fun(control->dht_manager(), &core::DhtManager::dht_statistics));
++
+   ADD_VARIABLE_BOOL("peer_exchange", false);
+
+   // Not really network stuff:
From crazy at frugalware.org  Tue Oct  2 23:39:01 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 23:39:03 2007
Subject: [Frugalware-git] frugalware-current: xmule-1.13.7_rc1-2-i686
Message-ID: <20071002213901.84E9D13A4077@genesis.frugalware.org>

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

commit fa458757651ba708e1dafe28ad06540ce7325607
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 23:35:50 2007 +0200

xmule-1.13.7_rc1-2-i686
* heh need to git add that

diff --git a/source/xapps-extra/xmule/ed2k.protocol b/source/xapps-extra/xmule/ed2k.protocol
index c073c85..c770b64 100644
--- a/source/xapps-extra/xmule/ed2k.protocol
+++ b/source/xapps-extra/xmule/ed2k.protocol
@@ -8,4 +8,4 @@
reading=false
writing=false
makedir=false
-	deleting=false
\ No newline at end of file
+	deleting=false
From crazy at frugalware.org  Tue Oct  2 23:42:08 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct  2 23:42:09 2007
Subject: [Frugalware-git] frugalware-current: amule-2.1.3-8-i686
Message-ID: <20071002214208.5FF2213A4077@genesis.frugalware.org>

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

commit e28415bcd30563d4be8eb40c86e077d19b2af680
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 2 23:39:00 2007 +0200

amule-2.1.3-8-i686
* removed conflicts for xmule

diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild
index f81065f..408e954 100644
--- a/source/xapps-extra/amule/FrugalBuild
+++ b/source/xapps-extra/amule/FrugalBuild
@@ -11,7 +11,6 @@ _F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.amule.org/"
depends=('wxgtk>=2.6.4' 'libxxf86vm' 'binutils=2.18.50.0.1')
-conflicts=('xmule')
up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10"
license="GPL2"
groups=('xapps-extra')
From priyank at frugalware.org  Wed Oct  3 10:47:18 2007
From: priyank at frugalware.org (Priyank)
Date: Wed Oct  3 10:47:20 2007
Subject: [Frugalware-git] frugalware-current: xfce4-xmms-plugin-0.5.1-1-i686
Message-ID: <20071003084718.4513213A4012@genesis.frugalware.org>

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

commit 3f228bedbb2132a33217c50c8a14eb4a43a86f22
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 14:15:36 2007 +0530

xfce4-xmms-plugin-0.5.1-1-i686
* Removed from xfce4 group.
* should be only in xfce4-goodies

diff --git a/source/xfce4/xfce4-xmms-plugin/FrugalBuild b/source/xfce4/xfce4-xmms-plugin/FrugalBuild
index fee7f83..c0689ee 100644
--- a/source/xfce4/xfce4-xmms-plugin/FrugalBuild
+++ b/source/xfce4/xfce4-xmms-plugin/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="An XMMS control plugin for the Xfce4 panel."
makedepends=('intltool')
depends=('xfce4-panel>=4.4.0' 'xmms')
-groups=('xfce4' 'xfce4-goodies')
+groups=('xfce4-goodies')
archs=('i686' 'x86_64')
Finclude xfce4
sha1sums=('8fa306b003935d1c54ed078c5f18cb61513df682')
From priyank at frugalware.org  Wed Oct  3 10:50:46 2007
From: priyank at frugalware.org (Priyank)
Date: Wed Oct  3 10:50:47 2007
Subject: [Frugalware-git] frugalware-current: xfce4-xmms-plugin-0.5.1-1-i686
Message-ID: <20071003085046.6F3FE13A4012@genesis.frugalware.org>

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

commit fa61fbfac83141952f2b9e63da5bbe86c6bb86a8
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 14:19:54 2007 +0530

xfce4-xmms-plugin-0.5.1-1-i686
* Moved to xfce4-extra

diff --git a/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild b/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild
new file mode 100644
index 0000000..df302a6
--- /dev/null
+++ b/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0.07 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=xfce4-xmms-plugin
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="An XMMS control plugin for the Xfce4 panel."
+makedepends=('intltool')
+depends=('xfce4-panel>=4.4.0' 'xmms')
+groups=('xfce4-extra')
+archs=('i686' 'x86_64')
+Finclude xfce4
+sha1sums=('8fa306b003935d1c54ed078c5f18cb61513df682')
+
+# optimization OK
diff --git a/source/xfce4/xfce4-xmms-plugin/FrugalBuild b/source/xfce4/xfce4-xmms-plugin/FrugalBuild
deleted file mode 100644
index c0689ee..0000000
--- a/source/xfce4/xfce4-xmms-plugin/FrugalBuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Compiling Time: 0.07 SBU
-# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
-
-pkgname=xfce4-xmms-plugin
-pkgver=0.5.1
-pkgrel=1
-pkgdesc="An XMMS control plugin for the Xfce4 panel."
-makedepends=('intltool')
-depends=('xfce4-panel>=4.4.0' 'xmms')
-groups=('xfce4-goodies')
-archs=('i686' 'x86_64')
-Finclude xfce4
-sha1sums=('8fa306b003935d1c54ed078c5f18cb61513df682')
-
-# optimization OK
From vmiklos at frugalware.org  Wed Oct  3 10:50:56 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Wed Oct  3 10:50:58 2007
Subject: [Frugalware-git] frugalware-current: eric4-4.0.3-1-i686
Message-ID: <20071003085056.DC7CC13A4012@genesis.frugalware.org>

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

commit 6883465f215c9e59664245cadbce913e5b6adc02
Author: VMiklos <vmiklos@frugalware.org>
Date:   Wed Oct 3 10:50:31 2007 +0200

eric4-4.0.3-1-i686
version bump
the old version somewhat worked with pyqt 4.3.1 already, but is had still some
PATH problems which are fixed in this release
ok crazy@

diff --git a/source/xapps-extra/eric4/FrugalBuild b/source/xapps-extra/eric4/FrugalBuild
index 5b6b023..b867ea7 100644
--- a/source/xapps-extra/eric4/FrugalBuild
+++ b/source/xapps-extra/eric4/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=eric4
-pkgver=4.0.1
-pkgrel=2
+pkgver=4.0.3
+pkgrel=1
pkgdesc="Eric4 is a full featured Python (and Ruby) IDE that is written in PyQt4."
_F_sourceforge_dirname="eric-ide"
Finclude sourceforge python
@@ -15,6 +15,12 @@ source=($source \
${source/eric4-$pkgver/eric4-i18n-ru-$pkgver} \
${source/eric4-$pkgver/eric4-i18n-cs_CZ-$pkgver}
$pkgname.desktop)
+sha1sums=('81b467768bce5c3736ff35e0f59ec9d718a7248e' \
+          '9d87642b6f900550c860b5d92dc41d21d0483cbb' \
+          '64bc254d5717720876f5411182361d0f82a31eb0' \
+          'c6dd1a2486eee7e259f7da88faf3daae3215fabd' \
+          '5d4c00bfd2828347514acccc55cf8c833c3bc0ee' \
+          'bdc6b72e48c1cab4bf779ed72a61b42cc1f997e5')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -45,9 +51,3 @@ build()
Fsplit $pkgname-i18n-ru $_F_python_libdir/eric4/i18n/eric4_ru.qm
Fsplit $pkgname-i18n-cs_cz $_F_python_libdir/eric4/i18n/eric4_cs_CZ.qm
}
-sha1sums=('9f5682e4d9754ce87daf6bd7c3ad92f644c64c99' \
-          '99f5ae661460c1333ae09b35c892a43fe1395b61' \
-          '86e1619c243ea62ed302ab8d15d250830fe93c85' \
-          '3f8e8c9e2d35269e509e526fc04e1094f56d4e74' \
-          'ed1ba6c667b016d3b8ec2fec539054ac33d1fa44' \
-          'bdc6b72e48c1cab4bf779ed72a61b42cc1f997e5')
From priyank at frugalware.org  Wed Oct  3 11:00:21 2007
From: priyank at frugalware.org (Priyank)
Date: Wed Oct  3 11:00:24 2007
Subject: [Frugalware-git] frugalware-current: xfce4-xmms-plugin-0.5.1-2-i686
Message-ID: <20071003090021.1D76313A4012@genesis.frugalware.org>

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

commit 7a324b43e400740a28dc34563c77c20a682202e8
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 14:28:42 2007 +0530

xfce4-xmms-plugin-0.5.1-2-i686
* Fixed url, source, up2date

diff --git a/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild b/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild
index df302a6..5f56cb5 100644
--- a/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild
+++ b/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild
@@ -3,13 +3,15 @@

pkgname=xfce4-xmms-plugin
pkgver=0.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="An XMMS control plugin for the Xfce4 panel."
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin"
makedepends=('intltool')
depends=('xfce4-panel>=4.4.0' 'xmms')
groups=('xfce4-extra')
archs=('i686' 'x86_64')
-Finclude xfce4
+up2date="lynx -dump http://goodies.xfce.org/releases/$pkgname/ | grep tar.bz2 | Flasttarbz2"
+source=(http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
sha1sums=('8fa306b003935d1c54ed078c5f18cb61513df682')

# optimization OK
From priyank at frugalware.org  Wed Oct  3 11:09:25 2007
From: priyank at frugalware.org (Priyank)
Date: Wed Oct  3 11:09:27 2007
Subject: [Frugalware-git] fw-control-center: gnetconfig-mcs-plugin: Fixed
	button caption
Message-ID: <20071003090925.1484C13A4012@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=990b7cb600219677adc193c27cbb68f9ca4b916e

commit 990b7cb600219677adc193c27cbb68f9ca4b916e
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 14:38:33 2007 +0530

gnetconfig-mcs-plugin: Fixed button caption

diff --git a/gnetconfig-mcs-plugin/src/gnetconfig-plugin.c b/gnetconfig-mcs-plugin/src/gnetconfig-plugin.c
index 404770e..ac427ac 100644
--- a/gnetconfig-mcs-plugin/src/gnetconfig-plugin.c
+++ b/gnetconfig-mcs-plugin/src/gnetconfig-plugin.c
@@ -67,7 +67,7 @@ McsPluginInitResult mcs_plugin_init (McsPlugin *plugin)

plugin->plugin_name = g_strdup ("gnetconfig");
/* the button label in the xfce-mcs-manager dialog */
-    plugin->caption = g_strdup (Q_ ("Button Label|Network Configuration"));
+    plugin->caption = g_strdup (Q_ ("Network Configuration"));
plugin->run_dialog = run_dialog;
plugin->icon = xfce_themed_icon_load (GNETCONFIG_ICON, 48);
if (plugin->icon) {
From krics at linuxforum.hu  Wed Oct  3 11:14:14 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Wed Oct  3 11:14:15 2007
Subject: [Frugalware-git] frugalware-current: libelf-0.8.10-1-i686
Message-ID: <20071003091414.1BB3613A4012@genesis.frugalware.org>

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

commit c629d97163eb9ce3f7721b6aa88112c5df38d9fc
Author: Christian Hamar alias krix <krics@linuxforum.hu>
Date:   Wed Oct 3 11:14:05 2007 +0200

libelf-0.8.10-1-i686
* New package for bug-buddy <- (replaces / conflicts with elfutils)
- elfutils need to be killed! :P

diff --git a/source/lib/libelf/FrugalBuild b/source/lib/libelf/FrugalBuild
new file mode 100644
index 0000000..ac46796
--- /dev/null
+++ b/source/lib/libelf/FrugalBuild
@@ -0,0 +1,23 @@
+# Compiling Time: 0.02 SBU
+# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>
+
+pkgname=libelf
+pkgver=0.8.10
+pkgrel=1
+pkgdesc="ELF object file access library"
+url="http://www.mr511.de/software/english.html"
+depends=('glibc')
+groups=('lib')
+conflicts=('elfutils')
+replaces=('elfutils')
+archs=('i686' 'x86_64')
+up2date="lynx -dump http://www.mr511.de/software/english.html | grep libelf | Flasttar"
+source=(http://www.mr511.de/software/$pkgname-$pkgver.tar.gz)
+sha1sums=('5f6fb666b0cf604243110383ba55ef37df1c8ece')
+
+build() {
+    Fmake
+    Fmakeinstall install-compat
+}
+
+# optimization OK
From priyank at frugalware.org  Wed Oct  3 11:16:54 2007
From: priyank at frugalware.org (Priyank)
Date: Wed Oct  3 11:16:55 2007
Subject: [Frugalware-git] fw-control-center: gfpm-mcs-plugin: Fixed caption
Message-ID: <20071003091654.3791413A4012@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=4beece408faf1be7808fc4c68e6758a8b02fa53d

commit 4beece408faf1be7808fc4c68e6758a8b02fa53d
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 14:46:03 2007 +0530

gfpm-mcs-plugin: Fixed caption

diff --git a/gfpm-mcs-plugin/src/gfpm-plugin.c b/gfpm-mcs-plugin/src/gfpm-plugin.c
index 26eb4f5..e5ec847 100644
--- a/gfpm-mcs-plugin/src/gfpm-plugin.c
+++ b/gfpm-mcs-plugin/src/gfpm-plugin.c
@@ -67,7 +67,7 @@ McsPluginInitResult mcs_plugin_init (McsPlugin *plugin)

plugin->plugin_name = g_strdup ("gfpm");
/* the button label in the xfce-mcs-manager dialog */
-    plugin->caption = g_strdup (Q_ ("Button Label|Package Manager"));
+    plugin->caption = g_strdup (Q_ ("Package Manager"));
plugin->run_dialog = run_dialog;
plugin->icon = xfce_themed_icon_load (GFPM_ICON, 48);
if (plugin->icon) {
From krics at linuxforum.hu  Wed Oct  3 11:30:03 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Wed Oct  3 11:30:06 2007
Subject: [Frugalware-git] frugalware-current: bug-buddy-2.20.0-3-i686
Message-ID: <20071003093003.935EF13A4012@genesis.frugalware.org>

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

commit c6684072377654623444deb8835368784da607a3
Author: Christian Hamar alias krix <krics@linuxforum.hu>
Date:   Wed Oct 3 11:29:49 2007 +0200

bug-buddy-2.20.0-3-i686
* Release bump
* Added a patch from gentoo to fix gnomebreakpad
* Use libelf instead of elfutils as depends

diff --git a/source/gnome/bug-buddy/FrugalBuild b/source/gnome/bug-buddy/FrugalBuild
index e1772ad..4369d27 100644
--- a/source/gnome/bug-buddy/FrugalBuild
+++ b/source/gnome/bug-buddy/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=bug-buddy
pkgver=2.20.0
-pkgrel=2
+pkgrel=3
pkgdesc="A bug reporting tool for GNOME"
url="http://www.gnome.org/"
depends=('gnome-desktop>=2.20.0' 'gnome-menus>=2.20.0' 'rarian' 'desktop-file-utils' \
-	'libsoup>=2.2.100-4' 'libgtop>=2.20.0' 'evolution-data-server>=1.12.0' 'elfutils')
+	'libsoup>=2.2.100-4' 'libgtop>=2.20.0' 'evolution-data-server>=1.12.0' 'libelf')
makedepends=('intltool' 'gnome-doc-utils>=0.12.0')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
@@ -15,7 +15,9 @@ _F_gnome_schemas=('/etc/gconf/schemas/bug-buddy.schemas')
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
-sha1sums=('c4d0d2345e13e4f85051f4ca1488d1a08d38fe4b')
+source=(${source[@]} bug-buddy-2.20.0-fix-breakpad.patch)
+sha1sums=('c4d0d2345e13e4f85051f4ca1488d1a08d38fe4b' \
+          '0b52f9e9b67bdd70a108be0f2a444caaf00720f2')

build() {
Fcd
diff --git a/source/gnome/bug-buddy/bug-buddy-2.20.0-fix-breakpad.patch b/source/gnome/bug-buddy/bug-buddy-2.20.0-fix-breakpad.patch
new file mode 100644
index 0000000..ccc2dcf
--- /dev/null
+++ b/source/gnome/bug-buddy/bug-buddy-2.20.0-fix-breakpad.patch
@@ -0,0 +1,69 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN bug-buddy-2.20.0.orig/gnome-breakpad/gnome-breakpad.cc bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc
+--- bug-buddy-2.20.0.orig/gnome-breakpad/gnome-breakpad.cc	2007-09-04 15:53:55.000000000 -0400
++++ bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc	2007-10-02 11:23:54.000000000 -0400
+@@ -291,22 +291,59 @@ gtk_module_init (int *argc, char** argv[
+
+ 	if (bugbuddy && !g_getenv ("GNOME_DISABLE_CRASH_DIALOG")) {
+ #ifdef ENABLE_GOOGLE_BREAKPAD
++        	static struct sigaction old_action;
++
++		sigaction(SIGSEGV, NULL, &old_action);
++		if (old_action.sa_handler != SIG_DFL)
++			return 0;
++
++                sigaction(SIGABRT, NULL, &old_action);
++		if (old_action.sa_handler != SIG_DFL)
++			return 0;
++
++                sigaction(SIGTRAP, NULL, &old_action);
++		if (old_action.sa_handler != SIG_DFL)
++			return 0;
++
++                sigaction(SIGFPE, NULL, &old_action);
++		if (old_action.sa_handler != SIG_DFL)
++			return 0;
++
++                sigaction(SIGBUS, NULL, &old_action);
++		if (old_action.sa_handler != SIG_DFL)
++			return 0;
++
+   		static ExceptionHandler handler("/tmp", check_if_gdb,
+ 						MinidumpCallback, NULL, true);
+ #else
+         	static struct sigaction *setptr;
++        	static struct sigaction old_action;
+         	struct sigaction sa;
+                 memset(&sa, 0, sizeof(sa));
+                 setptr = &sa;
+
+                 sa.sa_handler = bugbuddy_segv_handle;
+
+-                sigaction(SIGSEGV, setptr, NULL);
+-                sigaction(SIGABRT, setptr, NULL);
+-                sigaction(SIGTRAP, setptr, NULL);
+-                sigaction(SIGFPE, setptr, NULL);
+-                sigaction(SIGBUS, setptr, NULL);
++                sigaction(SIGSEGV, NULL, &old_action);
++		if (old_action.sa_handler == SIG_DFL)
++                	sigaction(SIGSEGV, setptr, NULL);
++
++                sigaction(SIGABRT, NULL, &old_action);
++		if (old_action.sa_handler == SIG_DFL)
++                	sigaction(SIGABRT, setptr, NULL);
++
++                sigaction(SIGTRAP, NULL, &old_action);
++		if (old_action.sa_handler == SIG_DFL)
++                	sigaction(SIGTRAP, setptr, NULL);
++
++                sigaction(SIGFPE, NULL, &old_action);
++		if (old_action.sa_handler == SIG_DFL)
++                	sigaction(SIGFPE, setptr, NULL);
++
++                sigaction(SIGBUS, NULL, &old_action);
++		if (old_action.sa_handler == SIG_DFL)
++                	sigaction(SIGBUS, setptr, NULL);
+ #endif
+ 	}
+-
++	return 0;
+ }
From krics at linuxforum.hu  Wed Oct  3 11:56:51 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Wed Oct  3 11:56:53 2007
Subject: [Frugalware-git] frugalware-current: ltrace-0.5-1-i686
Message-ID: <20071003095651.482CB13A4012@genesis.frugalware.org>

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

commit 38c5276f78092556cf3c91389524c72623ba4f0c
Author: Christian Hamar alias krix <krics@linuxforum.hu>
Date:   Wed Oct 3 11:56:41 2007 +0200

ltrace-0.5-1-i686
* Version bump (ah because of libelf, i bumped it)
* Use diff from debian for patches

diff --git a/source/devel-extra/ltrace/FrugalBuild b/source/devel-extra/ltrace/FrugalBuild
index d5e3ca8..55c85ca 100644
--- a/source/devel-extra/ltrace/FrugalBuild
+++ b/source/devel-extra/ltrace/FrugalBuild
@@ -2,21 +2,25 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=ltrace
-pkgver=0.4
-pkgrel=2
+pkgver=0.5
+pkgrel=1
pkgdesc="ltrace shows runtime library call information for dynamically linked executables"
url="http://packages.debian.org/unstable/utils/ltrace.html"
-depends=('elfutils>=0.128')
+depends=('libelf')
groups=('devel-extra')
archs=('i686' 'x86_64')
# NOTE: Check $pkgver-diff-X.gz on debians server before bumping
up2date="lynx -dump  -nolist 'http://ftp.debian.org/debian/pool/main/l/ltrace/?S=D'|grep -om1 'ltrace_\(.*\).orig.tar.gz'|sed 's/.*_\(.*\).o.*/\1/'"
-source=(ftp://ftp.debian.org/debian/pool/main/l/$pkgname/${pkgname}_$pkgver.orig.tar.gz)
-sha1sums=('7c39e42a2071bc794364c1e8a5bd0ecf3f430b0f')
+source=(ftp://ftp.debian.org/debian/pool/main/l/$pkgname/${pkgname}_$pkgver.orig.tar.gz \
+	ftp://ftp.debian.org/debian/pool/main/l/$pkgname/${pkgname}_$pkgver-3.diff.gz)
+sha1sums=('f3e7ff45b3973330277360fcb3e80af5917817a1' \
+          '5cf39bd8a19696bd2ab431365e4e7f561f9c3082')

build() {
Fcd
Fsed "doc/ltrace" "doc/ltrace-${pkgver}" Makefile.in
+	# Debian patches from the diff (not the debian/ dir intrested :PP )
+	Fpatchall
Fmake
Fmakeinstall
}
From priyank at frugalware.org  Wed Oct  3 15:15:51 2007
From: priyank at frugalware.org (Priyank)
Date: Wed Oct  3 15:15:53 2007
Subject: [Frugalware-git] fw-control-center: gfpm-mcs-plugin: Fixed a bug
	where an xterm window was not fired up in absence of gksu
Message-ID: <20071003131551.7015913A4012@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=81a7fe77bf3bc9f57dac9f2623d9fe29a95ab5db

commit 81a7fe77bf3bc9f57dac9f2623d9fe29a95ab5db
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 3 18:44:54 2007 +0530

gfpm-mcs-plugin: Fixed a bug where an xterm window was not fired up in absence of gksu

diff --git a/gfpm-mcs-plugin/src/gfpm-plugin.c b/gfpm-mcs-plugin/src/gfpm-plugin.c
index e5ec847..e289a0d 100644
--- a/gfpm-mcs-plugin/src/gfpm-plugin.c
+++ b/gfpm-mcs-plugin/src/gfpm-plugin.c
@@ -42,7 +42,7 @@ static gchar *xterm_argv[] = {
"xterm",
"-T", "GFpm starter -- DONT'T CLOSE THAT WINDOW",
"-geometry", "50x1",
-    "+tb -e", "su -c " GFPM_BIN,
+    "-e", "su -c " GFPM_BIN,
NULL
};
From crazy at frugalware.org  Wed Oct  3 18:29:40 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct  3 18:29:42 2007
Subject: [Frugalware-git] frugalware-current: pidgin-2.2.1-1-i686
Message-ID: <20071003162940.EA92C13A4012@genesis.frugalware.org>

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

commit 66f479ee3752dcd0030aed2f4ff3da7397e8d1ae
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 3 18:22:06 2007 +0200

pidgin-2.2.1-1-i686
* [SEC] Version bump
* closes #2461

diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild
index 08745ad..759f59c 100644
--- a/source/xapps/pidgin/FrugalBuild
+++ b/source/xapps/pidgin/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: voroskoi <voroskoi@gmail.com>

pkgname=pidgin
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
pkgdesc="A multi-protocol instant messaging (IM) client"
url="http://www.pidgin.im/"
depends=('gtk+2>=2.12.0' 'libao' 'audiofile' 'gtkspell' 'nss' 'startup-notification>=0.9' \
@@ -21,7 +21,7 @@ _F_sourceforge_broken_up2date=1
Finclude sourceforge
options=('scriptlet')
source=(${source[@]} perl-fix.patch)
-sha1sums=('b6762d5d7865587bfe0d87f95285d60cd8c667a1' \
+sha1sums=('2dc920b156a2ba559108042ac2178f3bb8282e8e' \
'c3facfbc8ec54b6b5a4f83a827cd766658fd9777')

build() {
@@ -33,7 +33,8 @@ build() {
make docs || Fdie
Fmakeinstall
Fmkdir usr/share/doc/$pkgname-$pkgver/html/
-	cp -aR $Fsrcdir/$pkgname-$pkgver/doc/html/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/html/
+	cp -aR $Fsrcdir/$pkgname-$pkgver/doc/html/* \
+		$Fdestdir/usr/share/doc/$pkgname-$pkgver/html/ || Fdie
}

# optimization OK
From crazy at frugalware.org  Wed Oct  3 19:14:08 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct  3 19:14:09 2007
Subject: [Frugalware-git] frugalware-current: libmp4v2-1.6-2-i686
Message-ID: <20071003171408.57FE313A4012@genesis.frugalware.org>

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

commit bfa07749d144baef1868fecaecea8bf56da7fc60
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 3 19:10:27 2007 +0200

libmp4v2-1.6-2-i686
* relbump
* added an patch to fix mp4v2 issues

diff --git a/source/multimedia/libmp4v2/FrugalBuild b/source/multimedia/libmp4v2/FrugalBuild
index bc14e70..80db672 100644
--- a/source/multimedia/libmp4v2/FrugalBuild
+++ b/source/multimedia/libmp4v2/FrugalBuild
@@ -3,19 +3,23 @@

pkgname=libmp4v2
pkgver=1.6
-pkgrel=1
+pkgrel=2
pkgdesc="A library for working with files using the mp4 container format. (extracted from mpeg4ip)."
_F_sourceforge_dirname="mpeg4ip"
_F_sourceforge_name="mpeg4ip"
Finclude sourceforge
depends=('libstdc++')
url="http://mpeg4ip.sourceforge.net/"
-source=($source compile.patch autoreconf.patch)
+source=($source \
+	compile.patch \
+	autoreconf.patch \
+	from-mpeg4ip-1.6.1-mp4v2_fixes.patch)
groups=('multimedia')
archs=('i686' 'x86_64')
sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
'4325daa5f3ffa38c61f74d438a0221e2a1909ac7' \
-          '40b3370027cace5e3cfecfbf15798bf0ade5f036')
+          '40b3370027cace5e3cfecfbf15798bf0ade5f036' \
+          '5a2944a6ea56fd255cafef7626eaed60fed170e2')

build()
{
diff --git a/source/multimedia/libmp4v2/from-mpeg4ip-1.6.1-mp4v2_fixes.patch b/source/multimedia/libmp4v2/from-mpeg4ip-1.6.1-mp4v2_fixes.patch
new file mode 100644
index 0000000..6f3ba04
--- /dev/null
+++ b/source/multimedia/libmp4v2/from-mpeg4ip-1.6.1-mp4v2_fixes.patch
@@ -0,0 +1,175 @@
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4.cpp	2007-07-19 20:09:44.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -119,15 +119,16 @@
+ 	try {
+ 		pFile = new MP4File(verbosity);
+ 		// LATER useExtensibleFormat, moov first, then mvex's
+-		pFile->Modify(fileName);
++		if (pFile->Modify(fileName))
+ 		return (MP4FileHandle)pFile;
+ 	}
+ 	catch (MP4Error* e) {
+ 		VERBOSE_ERROR(verbosity, e->Print());
+ 		delete e;
+-		delete pFile;
+-		return MP4_INVALID_FILE_HANDLE;
+ 	}
++
++	if (pFile) delete pFile;
++	return MP4_INVALID_FILE_HANDLE;
+ }
+
+ extern "C" bool MP4Optimize(const char* existingFileName,
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4file.cpp	2007-07-05 18:38:02.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -195,7 +195,7 @@
+ }
+
+
+-void MP4File::Modify(const char* fileName)
++bool MP4File::Modify(const char* fileName)
+ {
+ 	m_fileName = MP4Stralloc(fileName);
+ 	m_mode = 'r';
+@@ -211,7 +211,8 @@
+
+ 	if (pMoovAtom == NULL) {
+ 		// there isn't one, odd but we can still proceed
+-		pMoovAtom = AddChildAtom(m_pRootAtom, "moov");
++	  return false;
++	  //pMoovAtom = AddChildAtom(m_pRootAtom, "moov");
+ 	} else {
+ 		numAtoms = m_pRootAtom->GetNumberOfChildAtoms();
+
+@@ -285,6 +286,7 @@
+
+ 	// start writing new mdat
+ 	pMdatAtom->BeginWrite(Use64Bits("mdat"));
++	return true;
+ }
+
+ void MP4File::Optimize(const char* orgFileName, const char* newFileName)
+@@ -624,7 +626,6 @@
+ 		ASSERT(m_pTracks[i]);
+ 		m_pTracks[i]->FinishWrite();
+ 	}
+-
+ 	// ask root atom to write
+ 	m_pRootAtom->FinishWrite();
+
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.h mpeg4ip-1.6.1/lib/mp4v2/mp4file.h
+--- mpeg4ip-1.6/lib/mp4v2/mp4file.h	2007-06-04 18:21:51.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.h	2007-09-28 22:45:11.000000000 +0200
+@@ -56,7 +56,7 @@
+ 		    char* majorBrand = NULL,
+ 		    u_int32_t minorVersion = 0, char** supportedBrands = NULL,
+ 		    u_int32_t supportedBrandsCount = 0);
+-	void Modify(const char* fileName);
++	bool Modify(const char* fileName);
+ 	void Optimize(const char* orgFileName,
+ 		const char* newFileName = NULL);
+ 	void Dump(FILE* pDumpFile = NULL, bool dumpImplicits = false);
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.h mpeg4ip-1.6.1/lib/mp4v2/mp4.h
+--- mpeg4ip-1.6/lib/mp4v2/mp4.h	2007-09-19 19:44:49.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4.h	2007-09-28 22:45:11.000000000 +0200
+@@ -1287,6 +1287,9 @@
+ 			uint32_t decodeSize,
+ 			uint32_t *pDataSize);
+ void MP4Free(void *p);
++
++  void MP4SetLibFunc(lib_message_func_t libfunc);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4track.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4track.cpp	2007-04-12 19:04:03.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -483,6 +483,7 @@
+ {
+ 	// write out any remaining samples in chunk buffer
+ 	WriteChunkBuffer();
++
+ 	if (m_pStszFixedSampleSizeProperty == NULL &&
+ 	    m_stsz_sample_bits == 4) {
+ 	  if (m_have_stz2_4bit_sample) {
+@@ -646,7 +647,10 @@
+     numBytes /= m_bytesPerSample;
+   }
+ 	// for first sample
+-	if (sampleId == 1) {
++	// wmay - if we are adding, we want to make sure that
++	// we don't inadvertently set up the fixed size again.
++	// so, we check the number of samples
++	if (sampleId == 1 && GetNumberOfSamples() == 0) {
+ 	  if (m_pStszFixedSampleSizeProperty == NULL ||
+ 	      numBytes == 0) {
+ 	    // special case of first sample is zero bytes in length
+@@ -670,13 +674,15 @@
+ 	  // doesn't match our sample size, we need to write the current
+ 	  // sample size into the table
+ 	  if (fixedSampleSize == 0 || numBytes != fixedSampleSize) {
+-
+ 	    if (fixedSampleSize != 0) {
+ 	      // fixed size was set; we need to clear fixed sample size
+ 	      m_pStszFixedSampleSizeProperty->SetValue(0);
+
+ 	      // and create sizes for all previous samples
+-	      for (MP4SampleId sid = 1; sid < sampleId; sid++) {
++	      // use GetNumberOfSamples due to needing the total number
++	      // not just the appended part of the file
++	      uint32_t samples = GetNumberOfSamples();
++	      for (MP4SampleId sid = 1; sid <= samples; sid++) {
+ 		SampleSizePropertyAddValue(fixedSampleSize);
+ 	      }
+ 	    }
+@@ -1345,7 +1351,8 @@
+ 			      (MP4Property**)&m_pStssSampleProperty));
+
+       // set values for all samples that came before this one
+-      for (MP4SampleId sid = 1; sid < sampleId; sid++) {
++      uint32_t samples = GetNumberOfSamples();
++      for (MP4SampleId sid = 1; sid < samples; sid++) {
+ 	m_pStssSampleProperty->AddValue(sid);
+ 	m_pStssCountProperty->IncrementValue();
+       }
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4util.cpp	2007-04-12 19:04:03.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -22,8 +22,21 @@
+
+ #include "mp4common.h"
+
++static lib_message_func_t libfunc = NULL;
++extern "C"   void MP4SetLibFunc(lib_message_func_t libf)
++{
++  libfunc = libf;
++}
++
+ void MP4Error::Print(FILE* pFile)
+ {
++  if (libfunc != NULL) {
++    (libfunc)(LOG_ERR, "MP4ERROR", "%s:%s:%s",
++	      m_where == NULL ? "" : m_where,
++	      m_errstring == NULL ? "" : m_errstring,
++	      m_errno ? strerror(m_errno) : "");
++    return;
++  }
+ 	fprintf(pFile, "MP4ERROR: ");
+ 	if (m_where) {
+ 		fprintf(pFile, "%s", m_where);
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.h mpeg4ip-1.6.1/lib/mp4v2/mp4util.h
+--- mpeg4ip-1.6/lib/mp4v2/mp4util.h	2007-05-24 21:13:17.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.h	2007-09-28 22:45:11.000000000 +0200
+@@ -26,8 +26,7 @@
+ #ifndef ASSERT
+ #define ASSERT(expr) \
+ 	if (!(expr)) { \
+-		(void)fflush(stdout); \
+-		assert((expr)); \
++		throw new MP4Error("assert failure", __STRING((expr))); \
+ 	}
+ #endif
+ #define WARNING(expr) \
From crazy at frugalware.org  Wed Oct  3 19:36:20 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct  3 19:36:23 2007
Subject: [Frugalware-git] frugalware-current: mpeg4ip-1.6-2-i686
Message-ID: <20071003173620.8A88613A4012@genesis.frugalware.org>

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

commit 827e9d02f5583ed03b2a9ba3e775ce90a4813652
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 3 19:31:38 2007 +0200

mpeg4ip-1.6-2-i686
* relbump
* added an patch to fix mp4v2 issues

diff --git a/source/multimedia/mpeg4ip/FrugalBuild b/source/multimedia/mpeg4ip/FrugalBuild
index 2845961..e788c45 100644
--- a/source/multimedia/mpeg4ip/FrugalBuild
+++ b/source/multimedia/mpeg4ip/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=mpeg4ip
pkgver=1.6
-pkgrel=1
+pkgrel=2
pkgdesc="mpeg4ip provides an end-to-end system to explore streaming multimedia"
Finclude sourceforge
depends=("libmp4v2=$pkgver")
@@ -15,12 +15,14 @@ options=('scriptlet')
archs=('i686' 'x86_64')
source=($source autoreconf.patch \
type_basic.cpp_compile.patch alsa.patch \
-	build-with-werror-is-a-configure-option.patch)
+	build-with-werror-is-a-configure-option.patch \
+	from-mpeg4ip-1.6.1-mp4v2_fixes.patch)
sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
'40b3370027cace5e3cfecfbf15798bf0ade5f036' \
'9657405dfe23cd8baeb4ea419cd5f036b03fa8c8' \
'ec4cf44483d9e92afb97e7eb0866da5813577464' \
-          'a2f18f62986a7f19acce4c788e8ce30d3c3e0691')
+          'a2f18f62986a7f19acce4c788e8ce30d3c3e0691' \
+          '5a2944a6ea56fd255cafef7626eaed60fed170e2')

subpkgs=("$pkgname-player" "$pkgname-server" "$pkgname-utils")
subdescs=('mpeg4ip player' 'mpeg4ip server' 'mpeg4ip utils')
diff --git a/source/multimedia/mpeg4ip/from-mpeg4ip-1.6.1-mp4v2_fixes.patch b/source/multimedia/mpeg4ip/from-mpeg4ip-1.6.1-mp4v2_fixes.patch
new file mode 100644
index 0000000..6f3ba04
--- /dev/null
+++ b/source/multimedia/mpeg4ip/from-mpeg4ip-1.6.1-mp4v2_fixes.patch
@@ -0,0 +1,175 @@
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4.cpp	2007-07-19 20:09:44.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -119,15 +119,16 @@
+ 	try {
+ 		pFile = new MP4File(verbosity);
+ 		// LATER useExtensibleFormat, moov first, then mvex's
+-		pFile->Modify(fileName);
++		if (pFile->Modify(fileName))
+ 		return (MP4FileHandle)pFile;
+ 	}
+ 	catch (MP4Error* e) {
+ 		VERBOSE_ERROR(verbosity, e->Print());
+ 		delete e;
+-		delete pFile;
+-		return MP4_INVALID_FILE_HANDLE;
+ 	}
++
++	if (pFile) delete pFile;
++	return MP4_INVALID_FILE_HANDLE;
+ }
+
+ extern "C" bool MP4Optimize(const char* existingFileName,
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4file.cpp	2007-07-05 18:38:02.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -195,7 +195,7 @@
+ }
+
+
+-void MP4File::Modify(const char* fileName)
++bool MP4File::Modify(const char* fileName)
+ {
+ 	m_fileName = MP4Stralloc(fileName);
+ 	m_mode = 'r';
+@@ -211,7 +211,8 @@
+
+ 	if (pMoovAtom == NULL) {
+ 		// there isn't one, odd but we can still proceed
+-		pMoovAtom = AddChildAtom(m_pRootAtom, "moov");
++	  return false;
++	  //pMoovAtom = AddChildAtom(m_pRootAtom, "moov");
+ 	} else {
+ 		numAtoms = m_pRootAtom->GetNumberOfChildAtoms();
+
+@@ -285,6 +286,7 @@
+
+ 	// start writing new mdat
+ 	pMdatAtom->BeginWrite(Use64Bits("mdat"));
++	return true;
+ }
+
+ void MP4File::Optimize(const char* orgFileName, const char* newFileName)
+@@ -624,7 +626,6 @@
+ 		ASSERT(m_pTracks[i]);
+ 		m_pTracks[i]->FinishWrite();
+ 	}
+-
+ 	// ask root atom to write
+ 	m_pRootAtom->FinishWrite();
+
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.h mpeg4ip-1.6.1/lib/mp4v2/mp4file.h
+--- mpeg4ip-1.6/lib/mp4v2/mp4file.h	2007-06-04 18:21:51.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.h	2007-09-28 22:45:11.000000000 +0200
+@@ -56,7 +56,7 @@
+ 		    char* majorBrand = NULL,
+ 		    u_int32_t minorVersion = 0, char** supportedBrands = NULL,
+ 		    u_int32_t supportedBrandsCount = 0);
+-	void Modify(const char* fileName);
++	bool Modify(const char* fileName);
+ 	void Optimize(const char* orgFileName,
+ 		const char* newFileName = NULL);
+ 	void Dump(FILE* pDumpFile = NULL, bool dumpImplicits = false);
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.h mpeg4ip-1.6.1/lib/mp4v2/mp4.h
+--- mpeg4ip-1.6/lib/mp4v2/mp4.h	2007-09-19 19:44:49.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4.h	2007-09-28 22:45:11.000000000 +0200
+@@ -1287,6 +1287,9 @@
+ 			uint32_t decodeSize,
+ 			uint32_t *pDataSize);
+ void MP4Free(void *p);
++
++  void MP4SetLibFunc(lib_message_func_t libfunc);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4track.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4track.cpp	2007-04-12 19:04:03.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -483,6 +483,7 @@
+ {
+ 	// write out any remaining samples in chunk buffer
+ 	WriteChunkBuffer();
++
+ 	if (m_pStszFixedSampleSizeProperty == NULL &&
+ 	    m_stsz_sample_bits == 4) {
+ 	  if (m_have_stz2_4bit_sample) {
+@@ -646,7 +647,10 @@
+     numBytes /= m_bytesPerSample;
+   }
+ 	// for first sample
+-	if (sampleId == 1) {
++	// wmay - if we are adding, we want to make sure that
++	// we don't inadvertently set up the fixed size again.
++	// so, we check the number of samples
++	if (sampleId == 1 && GetNumberOfSamples() == 0) {
+ 	  if (m_pStszFixedSampleSizeProperty == NULL ||
+ 	      numBytes == 0) {
+ 	    // special case of first sample is zero bytes in length
+@@ -670,13 +674,15 @@
+ 	  // doesn't match our sample size, we need to write the current
+ 	  // sample size into the table
+ 	  if (fixedSampleSize == 0 || numBytes != fixedSampleSize) {
+-
+ 	    if (fixedSampleSize != 0) {
+ 	      // fixed size was set; we need to clear fixed sample size
+ 	      m_pStszFixedSampleSizeProperty->SetValue(0);
+
+ 	      // and create sizes for all previous samples
+-	      for (MP4SampleId sid = 1; sid < sampleId; sid++) {
++	      // use GetNumberOfSamples due to needing the total number
++	      // not just the appended part of the file
++	      uint32_t samples = GetNumberOfSamples();
++	      for (MP4SampleId sid = 1; sid <= samples; sid++) {
+ 		SampleSizePropertyAddValue(fixedSampleSize);
+ 	      }
+ 	    }
+@@ -1345,7 +1351,8 @@
+ 			      (MP4Property**)&m_pStssSampleProperty));
+
+       // set values for all samples that came before this one
+-      for (MP4SampleId sid = 1; sid < sampleId; sid++) {
++      uint32_t samples = GetNumberOfSamples();
++      for (MP4SampleId sid = 1; sid < samples; sid++) {
+ 	m_pStssSampleProperty->AddValue(sid);
+ 	m_pStssCountProperty->IncrementValue();
+       }
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp
+--- mpeg4ip-1.6/lib/mp4v2/mp4util.cpp	2007-04-12 19:04:03.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp	2007-09-28 22:45:11.000000000 +0200
+@@ -22,8 +22,21 @@
+
+ #include "mp4common.h"
+
++static lib_message_func_t libfunc = NULL;
++extern "C"   void MP4SetLibFunc(lib_message_func_t libf)
++{
++  libfunc = libf;
++}
++
+ void MP4Error::Print(FILE* pFile)
+ {
++  if (libfunc != NULL) {
++    (libfunc)(LOG_ERR, "MP4ERROR", "%s:%s:%s",
++	      m_where == NULL ? "" : m_where,
++	      m_errstring == NULL ? "" : m_errstring,
++	      m_errno ? strerror(m_errno) : "");
++    return;
++  }
+ 	fprintf(pFile, "MP4ERROR: ");
+ 	if (m_where) {
+ 		fprintf(pFile, "%s", m_where);
+diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.h mpeg4ip-1.6.1/lib/mp4v2/mp4util.h
+--- mpeg4ip-1.6/lib/mp4v2/mp4util.h	2007-05-24 21:13:17.000000000 +0200
++++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.h	2007-09-28 22:45:11.000000000 +0200
+@@ -26,8 +26,7 @@
+ #ifndef ASSERT
+ #define ASSERT(expr) \
+ 	if (!(expr)) { \
+-		(void)fflush(stdout); \
+-		assert((expr)); \
++		throw new MP4Error("assert failure", __STRING((expr))); \
+ 	}
+ #endif
+ #define WARNING(expr) \
From priyank at frugalware.org  Thu Oct  4 08:24:38 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 08:24:41 2007
Subject: [Frugalware-git] gfpm: Migrate from libglade to GtkBuilder
Message-ID: <20071004062438.ECC2C13A4012@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=952f9f28bbe47c4961a589d3a72303438bb31e67

commit 952f9f28bbe47c4961a589d3a72303438bb31e67
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 11:53:25 2007 +0530

Migrate from libglade to GtkBuilder

diff --git a/data/gfpm.glade b/data/gfpm.glade
deleted file mode 100644
index c83bb78..0000000
--- a/data/gfpm.glade
+++ /dev/null
@@ -1,1602 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="mainwindow">
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="default_width">780</property>
-    <property name="default_height">600</property>
-    <signal name="delete_event" handler="gtk_main_quit"/>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkMenuItem" id="menu_action">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Gfpm</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu_action_menu">
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_action_exit">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">E_xit</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="gtk_main_quit"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image12">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-quit</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="opt1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="tooltip" translatable="yes">Options</property>
-                <property name="label" translatable="yes">Options</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="clr1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">clear package cache</property>
-                        <property name="label" translatable="yes">_Clear package cache</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="gtk_widget_show" object="clear_cache_dlg"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image3">
-                            <property name="stock">gtk-clear</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="opt1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">optimize your package database to improve performance</property>
-                        <property name="label" translatable="yes">_Optimize package database</property>
-                        <property name="use_underline">True</property>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image4">
-                            <property name="stock">gtk-refresh</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="help1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="help1_menu">
-                    <child>
-                      <widget class="GtkImageMenuItem" id="about_gfpm1">
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">About Gfpm</property>
-                        <property name="label" translatable="yes">_About Gfpm</property>
-                        <property name="use_underline">True</property>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image13">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-about</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
-            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-            <child>
-              <widget class="GtkToolButton" id="button_apply">
-                <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Apply Changes</property>
-                <property name="label" translatable="yes">Apply</property>
-                <property name="icon_name">gfpm-apply</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="button_refresh1">
-                <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Refresh the package lists</property>
-                <property name="label">Synchronize</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-refresh</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="button_file1">
-                <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Refresh the package lists</property>
-                <property name="label">Install from file</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">gfpm-instfromfile</property>
-                <signal name="clicked" handler="gtk_widget_show" object="inst_from_file_dlg"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="button_help1">
-                <property name="visible">True</property>
-                <property name="label">Help</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-help</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolitem1">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkVSeparator" id="vseparator1">
-                    <property name="width_request">20</property>
-                    <property name="visible">True</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolitem2">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkHBox" id="hbox3">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <widget class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Search packages</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="search_entry1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolitem3">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkImage" id="search_image">
-                    <property name="visible">True</property>
-                    <property name="xpad">10</property>
-                    <property name="icon_size">3</property>
-                    <property name="icon_name">gfpm-search</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Quit</property>
-                <property name="stock_id">gtk-quit</property>
-                <signal name="clicked" handler="gtk_main_quit"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHPaned" id="hpaned1">
-            <property name="visible">True</property>
-            <property name="position">170</property>
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkFrame" id="groupframe">
-                    <property name="visible">True</property>
-                    <property name="border_width">4</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="top_padding">5</property>
-                        <property name="bottom_padding">5</property>
-                        <property name="left_padding">5</property>
-                        <property name="right_padding">5</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox4">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkComboBox" id="combobox_repos">
-                                <property name="visible">True</property>
-                                <property name="items"></property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkScrolledWindow" id="scrolledwindow4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
-                                <child>
-                                  <widget class="GtkTreeView" id="grouptreeview">
-                                    <property name="visible">True</property>
-                                    <property name="border_width">2</property>
-                                    <property name="headers_visible">False</property>
-                                    <property name="rules_hint">True</property>
-                                  </widget>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="padding">2</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVPaned" id="vpaned1">
-                <property name="visible">True</property>
-                <property name="position">250</property>
-                <child>
-                  <widget class="GtkFrame" id="pkgsframe">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="top_padding">5</property>
-                        <property name="bottom_padding">5</property>
-                        <property name="left_padding">5</property>
-                        <property name="right_padding">5</property>
-                        <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <child>
-                              <widget class="GtkTreeView" id="pkgstreeview">
-                                <property name="visible">True</property>
-                                <property name="rules_hint">True</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Packages&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="resize">False</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame1">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkVBox" id="vbox11">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment3">
-                            <property name="visible">True</property>
-                            <property name="top_padding">5</property>
-                            <property name="bottom_padding">2</property>
-                            <property name="left_padding">5</property>
-                            <property name="right_padding">5</property>
-                            <child>
-                              <widget class="GtkNotebook" id="notebook1">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <child>
-                                      <widget class="GtkTreeView" id="infotreeview">
-                                        <property name="visible">True</property>
-                                        <property name="headers_visible">False</property>
-                                        <property name="rules_hint">True</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="lblblll">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Details</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">tab</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <child>
-                                      <widget class="GtkTextView" id="filestextview">
-                                        <property name="visible">True</property>
-                                        <property name="editable">False</property>
-                                        <property name="cursor_visible">False</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label5">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Files</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">tab</property>
-                                    <property name="position">1</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <child>
-                                      <widget class="GtkTextView" id="changelogtextview">
-                                        <property name="visible">True</property>
-                                        <property name="editable">False</property>
-                                        <property name="cursor_visible">False</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label12">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Changelog</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">tab</property>
-                                    <property name="position">2</property>
-                                    <property name="tab_fill">False</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment5">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="right_padding">5</property>
-                            <child>
-                              <widget class="GtkHButtonBox" id="quick_pane">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="spacing">2</property>
-                                <property name="layout_style">GTK_BUTTONBOX_END</property>
-                                <child>
-                                  <widget class="GtkButton" id="quick_install">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox6">
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <child>
-                                          <widget class="GtkImage" id="image2">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="stock">gtk-add</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label13">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Install</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                </child>
-                                <child>
-                                  <widget class="GtkButton" id="quick_remove">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox7">
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <child>
-                                          <widget class="GtkImage" id="image5">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="stock">gtk-remove</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label15">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Remove</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkButton" id="quick_upgrade">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox8">
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <child>
-                                          <widget class="GtkImage" id="image7">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="stock">gtk-redo</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label17">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">Upgrade</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkButton" id="quick_readme">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox9">
-                                        <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <child>
-                                          <widget class="GtkImage" id="image9">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="stock">gtk-info</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label19">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="label" translatable="yes">View Readme</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="padding">3</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkStatusbar" id="statusbar">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="splash_window">
-    <property name="title" translatable="yes">window1</property>
-    <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="decorated">False</property>
-    <property name="gravity">GDK_GRAVITY_CENTER</property>
-    <child>
-      <widget class="GtkVBox" id="vbox5">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="pixbuf">splash.png</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="progresswindow">
-    <property name="title" translatable="yes">Gfpm</property>
-    <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="urgency_hint">True</property>
-    <child>
-      <widget class="GtkVBox" id="vbox6">
-        <property name="visible">True</property>
-        <property name="border_width">8</property>
-        <child>
-          <widget class="GtkVBox" id="vbox7">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkLabel" id="main_pr_label">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Please wait...</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">4</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="sub_pr_label">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">4</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkProgressBar" id="progressbar1">
-            <property name="width_request">330</property>
-            <property name="visible">True</property>
-            <property name="show_text">True</property>
-            <property name="pulse_step">0.10000000149</property>
-            <property name="text" translatable="yes"></property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">3</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="hbox2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkHBox" id="rate_pr_box">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkLabel" id="label8">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Transfer Rate:  </property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="rate_pr_label">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkAlignment" id="alignment4">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="rx_pr_label">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xpad">2</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">4</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkScrolledWindow" id="details_scrollwindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="shadow_type">GTK_SHADOW_IN</property>
-            <child>
-              <widget class="GtkTextView" id="progress_txtvw">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="editable">False</property>
-                <property name="left_margin">1</property>
-                <property name="cursor_visible">False</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">3</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkCheckButton" id="autoclose_checkbtn">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Close this dialog when the operation is finished</property>
-            <property name="response_id">0</property>
-            <property name="draw_indicator">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">2</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkToggleButton" id="show_details">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Details</property>
-                <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="close_progress">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">5</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="clear_cache_dlg">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <signal name="delete_event" handler="gtk_widget_hide" object="clear_cache_dlg"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">5</property>
-        <child>
-          <widget class="GtkVBox" id="vbox3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">8</property>
-            <child>
-              <widget class="GtkRadioButton" id="rem_old_opt">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Remove old packages from cache</property>
-                <property name="response_id">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkRadioButton" id="rem_all_opt">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Remove all packages from cache</property>
-                <property name="response_id">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">rem_old_opt</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
-            <child>
-              <widget class="GtkButton" id="rem_apply">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-apply</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="rem_close">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="clear_cache_dlg"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="inst_from_file_dlg">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Install package from file</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <signal name="delete_event" handler="gtk_widget_hide" object="inst_from_file_dlg"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkFileChooserButton" id="gfpm_inst_filechooser">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkCheckButton" id="forcheck">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Force install</property>
-            <property name="response_id">0</property>
-            <property name="draw_indicator">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkCheckButton" id="upgcheck">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Upgrade existing</property>
-            <property name="response_id">0</property>
-            <property name="draw_indicator">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkCheckButton" id="depcheck">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Skip dependency checks</property>
-            <property name="response_id">0</property>
-            <property name="draw_indicator">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
-            <child>
-              <widget class="GtkButton" id="inst_from_file_install">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="response_id">0</property>
-                <child>
-                  <widget class="GtkHBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkImage" id="image3">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xpad">3</property>
-                        <property name="stock">gtk-apply</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Install</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="inst_from_file_close">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="inst_from_file_dlg"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="apply_dlg">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="default_width">350</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="transient_for">mainwindow</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox8">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">6</property>
-            <child>
-              <widget class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">The following operations will be performed</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="instbox">
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">2</property>
-                <child>
-                  <widget class="GtkLabel" id="label7">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Install packages:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkScrolledWindow" id="instscroll">
-                    <property name="height_request">110</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
-                    <child>
-                      <widget class="GtkTreeView" id="insttvw">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="headers_clickable">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="instsizelbl">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="ypad">4</property>
-                    <property name="label" translatable="yes">Total size:</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkVBox" id="vbox9">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkCheckButton" id="applyinstdepcheck">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Skip dependency checks</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckButton" id="applyinstdwcheck">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Download only (do not install/upgrade)</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHSeparator" id="hseparator1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="rembox">
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">2</property>
-                <child>
-                  <widget class="GtkLabel" id="label9">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Remove packages:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkScrolledWindow" id="remscroll">
-                    <property name="height_request">110</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
-                    <child>
-                      <widget class="GtkTreeView" id="remtvw">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="headers_clickable">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="remsizelbl">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="ypad">3</property>
-                    <property name="label" translatable="yes">Total size:</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkHBox" id="hbox5">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkCheckButton" id="applyremdepcheck">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Skip dependency checks</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="optimize_db_dlg">
-    <property name="width_request">400</property>
-    <property name="height_request">150</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="default_width">400</property>
-    <property name="default_height">150</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox10">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">2</property>
-            <child>
-              <widget class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;span size="larger"&gt;&lt;b&gt;Optimize package database&lt;/b&gt;&lt;/span&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">7</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHBox" id="hbox4">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkLabel" id="label11">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Status : &lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="optimize_db_label">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">7</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkProgressBar" id="optimize_db_progress">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="text" translatable="yes"></property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">3</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
-            <child>
-              <widget class="GtkButton" id="optimize_db_start">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Optimize</property>
-                <property name="response_id">0</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="optimize_db_close">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Close</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="readme_dlg">
-    <property name="width_request">475</property>
-    <property name="height_request">400</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">6</property>
-    <child>
-      <widget class="GtkVBox" id="vbox12">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <child>
-          <widget class="GtkHBox" id="hbox10">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkImage" id="image4">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="yalign">0</property>
-                <property name="stock">gtk-info</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="readme_dlg_label">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xpad">6</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow6">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="shadow_type">GTK_SHADOW_IN</property>
-            <child>
-              <widget class="GtkTextView" id="readme_dlg_txtvw">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="editable">False</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="button1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="readme_dlg"/>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="padding">2</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/data/gfpm.ui b/data/gfpm.ui
new file mode 100644
index 0000000..44022c8
--- /dev/null
+++ b/data/gfpm.ui
@@ -0,0 +1,2251 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkUIManager" id="uimanager1">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup1">
+        <child>
+          <object class="GtkAction" id="menu_action">
+            <property name="name">menu_action</property>
+            <property name="label">_Gfpm</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menu_action_exit">
+            <property name="stock_id">gtk-quit</property>
+            <property name="name">menu_action_exit</property>
+            <signal handler="gtk_main_quit" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="opts">
+            <property name="name">opts</property>
+            <property name="label">Options</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="clr1">
+            <property name="stock_id">gtk-clear</property>
+            <property name="name">clr1</property>
+			<property name="label" translatable="yes">_Clear package cache</property>
+            <signal handler="gtk_widget_show" name="activate" object="clear_cache_dlg"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="optimize">
+            <property name="stock_id">gtk-refresh</property>
+			<property name="name">optimize</property>
+			<property name="label" translatable="yes">_Optimize package database</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="help1">
+            <property name="name">help1</property>
+            <property name="label" translatable="yes">_Help</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="about_gfpm1">
+            <property name="stock_id">gtk-about</property>
+            <property name="name">about_gfpm1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <menubar name="menubar1">
+        <menu action="menu_action">
+          <menuitem action="menu_action_exit"/>
+        </menu>
+        <menu action="opts">
+          <menuitem action="clr1"/>
+          <menuitem action="optimize"/>
+        </menu>
+        <menu action="help1">
+          <menuitem action="about_gfpm1"/>
+        </menu>
+      </menubar>
+    </ui>
+  </object>
+  <object class="GtkWindow" id="mainwindow">
+    <property name="title" translatable="yes"></property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">False</property>
+    <property name="default_width">780</property>
+    <property name="default_height">600</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <signal handler="gtk_main_quit" name="delete_event"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child>
+          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+            <property name="visible">True</property>
+            <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+            <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">True</property>
+            <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+            <property name="tooltips">True</property>
+            <property name="show_arrow">True</property>
+            <child>
+              <object class="GtkToolButton" id="button_apply">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Apply Changes</property>
+                <property name="label" translatable="yes">Apply</property>
+                <property name="use_underline">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+                <property name="icon_name">gfpm-apply</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button_refresh1">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Refresh the package lists</property>
+                <property name="label">Synchronize</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-refresh</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button_file1">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Refresh the package lists</property>
+                <property name="label">Install from file</property>
+                <property name="use_underline">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+                <property name="icon_name">gfpm-instfromfile</property>
+                <signal handler="gtk_widget_show" name="clicked" object="inst_from_file_dlg"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="button_help1">
+                <property name="visible">True</property>
+                <property name="label">Help</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-help</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolitem1">
+                <property name="visible">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+                <child>
+                  <object class="GtkVSeparator" id="vseparator1">
+                    <property name="width_request">20</property>
+                    <property name="visible">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolitem2">
+                <property name="visible">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+                <child>
+                  <object class="GtkHBox" id="hbox3">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Search packages</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="search_entry1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">True</property>
+                        <property name="visibility">True</property>
+                        <property name="max_length">0</property>
+                        <property name="text" translatable="yes"></property>
+                        <property name="has_frame">True</property>
+                        <property name="invisible_char">*</property>
+                        <property name="activates_default">False</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="toolitem3">
+                <property name="visible">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+                <child>
+                  <object class="GtkImage" id="search_image">
+                    <property name="visible">True</property>
+                    <property name="icon_size">3</property>
+                    <property name="icon_name">gfpm-search</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">10</property>
+                    <property name="ypad">0</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton1">
+                <property name="visible">True</property>
+                <property name="draw">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="toolbutton2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Quit</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-quit</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">False</property>
+                <signal handler="gtk_main_quit" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStatusbar" id="statusbar">
+            <property name="border_width">5</property>
+            <property name="visible">True</property>
+            <property name="has_resize_grip">True</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHPaned" id="hpaned1">
+            <property name="visible">True</property>
+            <property name="position">170</property>
+            <child>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">0</property>
+                <child>
+                  <object class="GtkFrame" id="groupframe">
+                    <property name="border_width">4</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xscale">1</property>
+                        <property name="yscale">1</property>
+                        <property name="top_padding">5</property>
+                        <property name="bottom_padding">5</property>
+                        <property name="left_padding">5</property>
+                        <property name="right_padding">5</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox4">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
+                            <child>
+                              <object class="GtkComboBox" id="repobox">
+                                <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                <child>
+                                  <object class="GtkTreeView" id="grouptreeview">
+                                    <property name="border_width">2</property>
+                                    <property name="visible">True</property>
+                                    <property name="headers_visible">False</property>
+                                    <property name="rules_hint">True</property>
+                                    <property name="reorderable">False</property>
+                                    <property name="enable_search">True</property>
+                                    <property name="fixed_height_mode">False</property>
+                                    <property name="hover_selection">False</property>
+                                    <property name="hover_expand">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">2</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="shrink">True</property>
+                <property name="resize">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVPaned" id="vpaned1">
+                <property name="visible">True</property>
+                <property name="position">250</property>
+                <child>
+                  <object class="GtkFrame" id="pkgsframe">
+                    <property name="border_width">5</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xscale">1</property>
+                        <property name="yscale">1</property>
+                        <property name="top_padding">5</property>
+                        <property name="bottom_padding">5</property>
+                        <property name="left_padding">5</property>
+                        <property name="right_padding">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
+                            <property name="visible">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                            <child>
+                              <object class="GtkTreeView" id="pkgstreeview">
+                                <property name="visible">True</property>
+                                <property name="headers_visible">True</property>
+                                <property name="rules_hint">True</property>
+                                <property name="reorderable">False</property>
+                                <property name="enable_search">True</property>
+                                <property name="fixed_height_mode">False</property>
+                                <property name="hover_selection">False</property>
+                                <property name="hover_expand">False</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Packages&lt;/b&gt;</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="shrink">True</property>
+                    <property name="resize">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="border_width">5</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox11">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment3">
+                            <property name="visible">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xscale">1</property>
+                            <property name="yscale">1</property>
+                            <property name="top_padding">5</property>
+                            <property name="bottom_padding">2</property>
+                            <property name="left_padding">5</property>
+                            <property name="right_padding">5</property>
+                            <child>
+                              <object class="GtkNotebook" id="notebook1">
+                                <property name="visible">True</property>
+                                <property name="show_tabs">True</property>
+                                <property name="show_border">True</property>
+                                <property name="tab_pos">GTK_POS_TOP</property>
+                                <property name="scrollable">False</property>
+                                <property name="enable_popup">False</property>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                                    <property name="visible">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="infotreeview">
+                                        <property name="visible">True</property>
+                                        <property name="headers_visible">False</property>
+                                        <property name="rules_hint">True</property>
+                                        <property name="reorderable">False</property>
+                                        <property name="enable_search">True</property>
+                                        <property name="fixed_height_mode">False</property>
+                                        <property name="hover_selection">False</property>
+                                        <property name="hover_expand">False</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="tab_expand">False</property>
+                                    <property name="tab_fill">True</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="lblblll">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Details</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow3">
+                                    <property name="visible">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                    <child>
+                                      <object class="GtkTextView" id="filestextview">
+                                        <property name="visible">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="overwrite">False</property>
+                                        <property name="accepts_tab">True</property>
+                                        <property name="justification">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap_mode">GTK_WRAP_NONE</property>
+                                        <property name="cursor_visible">False</property>
+                                        <property name="pixels_above_lines">0</property>
+                                        <property name="pixels_below_lines">0</property>
+                                        <property name="pixels_inside_wrap">0</property>
+                                        <property name="left_margin">0</property>
+                                        <property name="right_margin">0</property>
+                                        <property name="indent">0</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="tab_expand">False</property>
+                                    <property name="tab_fill">True</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label5">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Files</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                    <child>
+                                      <object class="GtkTextView" id="changelogtextview">
+                                        <property name="visible">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="overwrite">False</property>
+                                        <property name="accepts_tab">True</property>
+                                        <property name="justification">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap_mode">GTK_WRAP_NONE</property>
+                                        <property name="cursor_visible">False</property>
+                                        <property name="pixels_above_lines">0</property>
+                                        <property name="pixels_below_lines">0</property>
+                                        <property name="pixels_inside_wrap">0</property>
+                                        <property name="left_margin">0</property>
+                                        <property name="right_margin">0</property>
+                                        <property name="indent">0</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="tab_expand">False</property>
+                                    <property name="tab_fill">True</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label12">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Changelog</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment5">
+                            <property name="visible">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xscale">1</property>
+                            <property name="yscale">1</property>
+                            <property name="top_padding">0</property>
+                            <property name="bottom_padding">0</property>
+                            <property name="left_padding">0</property>
+                            <property name="right_padding">5</property>
+                            <child>
+                              <object class="GtkHButtonBox" id="quick_pane">
+                                <property name="visible">True</property>
+                                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <object class="GtkButton" id="quick_install">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox6">
+                                        <property name="visible">True</property>
+                                        <property name="homogeneous">False</property>
+                                        <property name="spacing">0</property>
+                                        <child>
+                                          <object class="GtkImage" id="image2">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-add</property>
+                                            <property name="icon_size">4</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label13">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Install</property>
+                                            <property name="use_underline">False</property>
+                                            <property name="use_markup">False</property>
+                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                            <property name="wrap">False</property>
+                                            <property name="selectable">False</property>
+                                            <property name="xalign">0.5</property>
+                                            <property name="yalign">0.5</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                            <property name="width_chars">-1</property>
+                                            <property name="single_line_mode">False</property>
+                                            <property name="angle">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="quick_remove">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox7">
+                                        <property name="visible">True</property>
+                                        <property name="homogeneous">False</property>
+                                        <property name="spacing">0</property>
+                                        <child>
+                                          <object class="GtkImage" id="image5">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-remove</property>
+                                            <property name="icon_size">4</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label15">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Remove</property>
+                                            <property name="use_underline">False</property>
+                                            <property name="use_markup">False</property>
+                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                            <property name="wrap">False</property>
+                                            <property name="selectable">False</property>
+                                            <property name="xalign">0.5</property>
+                                            <property name="yalign">0.5</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                            <property name="width_chars">-1</property>
+                                            <property name="single_line_mode">False</property>
+                                            <property name="angle">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="quick_upgrade">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox8">
+                                        <property name="visible">True</property>
+                                        <property name="homogeneous">False</property>
+                                        <property name="spacing">0</property>
+                                        <child>
+                                          <object class="GtkImage" id="image7">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-redo</property>
+                                            <property name="icon_size">4</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label17">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Upgrade</property>
+                                            <property name="use_underline">False</property>
+                                            <property name="use_markup">False</property>
+                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                            <property name="wrap">False</property>
+                                            <property name="selectable">False</property>
+                                            <property name="xalign">0.5</property>
+                                            <property name="yalign">0.5</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                            <property name="width_chars">-1</property>
+                                            <property name="single_line_mode">False</property>
+                                            <property name="angle">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="quick_readme">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox9">
+                                        <property name="visible">True</property>
+                                        <property name="homogeneous">False</property>
+                                        <property name="spacing">0</property>
+                                        <child>
+                                          <object class="GtkImage" id="image9">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-info</property>
+                                            <property name="icon_size">4</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label19">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">View Readme</property>
+                                            <property name="use_underline">False</property>
+                                            <property name="use_markup">False</property>
+                                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                            <property name="wrap">False</property>
+                                            <property name="selectable">False</property>
+                                            <property name="xalign">0.5</property>
+                                            <property name="yalign">0.5</property>
+                                            <property name="xpad">0</property>
+                                            <property name="ypad">0</property>
+                                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                            <property name="width_chars">-1</property>
+                                            <property name="single_line_mode">False</property>
+                                            <property name="angle">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="padding">0</property>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">3</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="shrink">True</property>
+                    <property name="resize">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="shrink">True</property>
+                <property name="resize">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="splash_window">
+    <property name="title" translatable="yes">window1</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+    <property name="modal">False</property>
+    <property name="resizable">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="decorated">False</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="gravity">GDK_GRAVITY_CENTER</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <child>
+      <object class="GtkVBox" id="vbox5">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child>
+          <object class="GtkImage" id="image1">
+            <property name="visible">True</property>
+            <property name="pixbuf">splash.png</property>
+            <property name="xalign">0.5</property>
+            <property name="yalign">0.5</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="progresswindow">
+    <property name="title" translatable="yes">Gfpm</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="modal">True</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox6">
+        <property name="border_width">8</property>
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child>
+          <object class="GtkVBox" id="vbox7">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkLabel" id="main_pr_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Please wait...</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+              <packing>
+                <property name="padding">4</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="sub_pr_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes"></property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.10000000149</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+              <packing>
+                <property name="padding">4</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkProgressBar" id="progressbar1">
+            <property name="width_request">330</property>
+            <property name="visible">True</property>
+            <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+            <property name="fraction">0</property>
+            <property name="pulse_step">0.10000000149</property>
+            <property name="text" translatable="yes"></property>
+            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+          </object>
+          <packing>
+            <property name="padding">3</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox2">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkHBox" id="rate_pr_box">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">0</property>
+                <child>
+                  <object class="GtkLabel" id="label8">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Transfer Rate:  </property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="rate_pr_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes"></property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment4">
+                <property name="visible">True</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xscale">1</property>
+                <property name="yscale">1</property>
+                <property name="top_padding">0</property>
+                <property name="bottom_padding">0</property>
+                <property name="left_padding">0</property>
+                <property name="right_padding">0</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="rx_pr_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes"></property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">2</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">4</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="details_scrollwindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="shadow_type">GTK_SHADOW_IN</property>
+            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+            <child>
+              <object class="GtkTextView" id="progress_txtvw">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="editable">False</property>
+                <property name="overwrite">False</property>
+                <property name="accepts_tab">True</property>
+                <property name="justification">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap_mode">GTK_WRAP_NONE</property>
+                <property name="cursor_visible">False</property>
+                <property name="pixels_above_lines">0</property>
+                <property name="pixels_below_lines">0</property>
+                <property name="pixels_inside_wrap">0</property>
+                <property name="left_margin">1</property>
+                <property name="right_margin">0</property>
+                <property name="indent">0</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">3</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="autoclose_checkbtn">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">Close this dialog when the operation is finished</property>
+            <property name="use_underline">True</property>
+            <property name="relief">GTK_RELIEF_NORMAL</property>
+            <property name="focus_on_click">True</property>
+            <property name="active">False</property>
+            <property name="inconsistent">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="padding">2</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkToggleButton" id="show_details">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Details</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <property name="active">False</property>
+                <property name="inconsistent">False</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="close_progress">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="clear_cache_dlg">
+    <property name="border_width">5</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes"></property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <signal handler="gtk_widget_hide" name="delete_event" object="clear_cache_dlg"/>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">5</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <child>
+              <object class="GtkButton" id="rem_apply">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="rem_close">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="gtk_widget_hide" name="clicked" object="clear_cache_dlg"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox3">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">8</property>
+            <child>
+              <object class="GtkRadioButton" id="rem_old_opt">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Remove old packages from cache</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <property name="active">True</property>
+                <property name="inconsistent">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="rem_all_opt">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Remove all packages from cache</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <property name="active">True</property>
+                <property name="inconsistent">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">rem_old_opt</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">rem_apply</action-widget>
+      <action-widget response="0">rem_close</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="inst_from_file_dlg">
+    <property name="border_width">5</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes">Install package from file</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <signal handler="gtk_widget_hide" name="delete_event" object="inst_from_file_dlg"/>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <child>
+              <object class="GtkButton" id="inst_from_file_install">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <child>
+                  <object class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkImage" id="image3">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-apply</property>
+                        <property name="icon_size">4</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">3</property>
+                        <property name="ypad">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Install</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="inst_from_file_close">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="gtk_widget_hide" name="clicked" object="inst_from_file_dlg"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFileChooserButton" id="gfpm_inst_filechooser">
+            <property name="visible">True</property>
+            <property name="title" translatable="yes">Select A File</property>
+            <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+            <property name="local_only">True</property>
+            <property name="show_hidden">False</property>
+            <property name="do_overwrite_confirmation">False</property>
+            <property name="width_chars">-1</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="forcheck">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">Force install</property>
+            <property name="use_underline">True</property>
+            <property name="relief">GTK_RELIEF_NORMAL</property>
+            <property name="focus_on_click">True</property>
+            <property name="active">False</property>
+            <property name="inconsistent">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="upgcheck">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">Upgrade existing</property>
+            <property name="use_underline">True</property>
+            <property name="relief">GTK_RELIEF_NORMAL</property>
+            <property name="focus_on_click">True</property>
+            <property name="active">False</property>
+            <property name="inconsistent">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="depcheck">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">Skip dependency checks</property>
+            <property name="use_underline">True</property>
+            <property name="relief">GTK_RELIEF_NORMAL</property>
+            <property name="focus_on_click">True</property>
+            <property name="active">False</property>
+            <property name="inconsistent">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">inst_from_file_install</action-widget>
+      <action-widget response="0">inst_from_file_close</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="apply_dlg">
+    <property name="border_width">5</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes"></property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="modal">False</property>
+    <property name="default_width">350</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox8">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">The following operations will be performed</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="instbox">
+                <property name="homogeneous">False</property>
+                <property name="spacing">2</property>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Install packages:&lt;/b&gt;</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="instscroll">
+                    <property name="height_request">110</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                    <child>
+                      <object class="GtkTreeView" id="insttvw">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">True</property>
+                        <property name="rules_hint">False</property>
+                        <property name="reorderable">False</property>
+                        <property name="enable_search">True</property>
+                        <property name="fixed_height_mode">False</property>
+                        <property name="hover_selection">False</property>
+                        <property name="hover_expand">False</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="instsizelbl">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Total size:</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">4</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox9">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkCheckButton" id="applyinstdepcheck">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Skip dependency checks</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="applyinstdwcheck">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Download only (do not install/upgrade)</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHSeparator" id="hseparator1">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="rembox">
+                <property name="homogeneous">False</property>
+                <property name="spacing">2</property>
+                <child>
+                  <object class="GtkLabel" id="label9">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Remove packages:&lt;/b&gt;</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="remscroll">
+                    <property name="height_request">110</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                    <child>
+                      <object class="GtkTreeView" id="remtvw">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">True</property>
+                        <property name="rules_hint">False</property>
+                        <property name="reorderable">False</property>
+                        <property name="enable_search">True</property>
+                        <property name="fixed_height_mode">False</property>
+                        <property name="hover_selection">False</property>
+                        <property name="hover_expand">False</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="remsizelbl">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Total size:</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">3</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox5">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkCheckButton" id="applyremdepcheck">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Skip dependency checks</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="optimize_db_dlg">
+    <property name="border_width">5</property>
+    <property name="width_request">400</property>
+    <property name="height_request">150</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes"></property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="modal">False</property>
+    <property name="default_width">400</property>
+    <property name="default_height">150</property>
+    <property name="resizable">False</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <child>
+              <object class="GtkButton" id="optimize_db_start">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Optimize</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="optimize_db_close">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Close</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox10">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;span size="larger"&gt;&lt;b&gt;Optimize package database&lt;/b&gt;&lt;/span&gt;</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+              <packing>
+                <property name="padding">7</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox4">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">0</property>
+                <child>
+                  <object class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Status : &lt;/b&gt;</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="optimize_db_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes"></property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">7</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="optimize_db_progress">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+                <property name="fraction">0</property>
+                <property name="pulse_step">0.10000000149</property>
+                <property name="text" translatable="yes"></property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+              </object>
+              <packing>
+                <property name="padding">3</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">optimize_db_start</action-widget>
+      <action-widget response="0">optimize_db_close</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="readme_dlg">
+    <property name="border_width">6</property>
+    <property name="width_request">475</property>
+    <property name="height_request">400</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes"></property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <child>
+      <object class="GtkVBox" id="vbox12">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child>
+          <object class="GtkHBox" id="hbox10">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkImage" id="image4">
+                <property name="visible">True</property>
+                <property name="stock">gtk-info</property>
+                <property name="icon_size">4</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="readme_dlg_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes"></property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">6</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">3</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow6">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="shadow_type">GTK_SHADOW_IN</property>
+            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+            <child>
+              <object class="GtkTextView" id="readme_dlg_txtvw">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="editable">False</property>
+                <property name="overwrite">False</property>
+                <property name="accepts_tab">True</property>
+                <property name="justification">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap_mode">GTK_WRAP_NONE</property>
+                <property name="cursor_visible">True</property>
+                <property name="pixels_above_lines">0</property>
+                <property name="pixels_below_lines">0</property>
+                <property name="pixels_inside_wrap">0</property>
+                <property name="left_margin">0</property>
+                <property name="right_margin">0</property>
+                <property name="indent">0</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="gtk_widget_hide" name="clicked" object="readme_dlg"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">2</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
From priyank at frugalware.org  Thu Oct  4 08:25:58 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 08:25:59 2007
Subject: [Frugalware-git] gfpm: configure.ac: gfpm no longer depends on
	libglade
Message-ID: <20071004062558.8B3EA13A4012@genesis.frugalware.org>

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

commit e142dc060bf120a4a9d2bc96ae73b131b0adc3cb
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 11:54:55 2007 +0530

configure.ac: gfpm no longer depends on libglade

diff --git a/configure.ac b/configure.ac
index 442473b..8303a8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [needed for bindtextdoma
AM_GLIB_GNU_GETTEXT
AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)

-pkg_modules="gtk+-2.0 >= 2.6.0 \
-			 libglade-2.0 >= 2.6.0"
+pkg_modules="gtk+-2.0 >= 2.12.0"
PKG_CHECK_MODULES([GFPM], [$pkg_modules])

CFLAGS="${CFLAGS}"
From priyank at frugalware.org  Thu Oct  4 08:27:06 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 08:27:07 2007
Subject: [Frugalware-git] gfpm: Removed all references to libglade calls
Message-ID: <20071004062706.01CC713A4012@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=2febdd2df205c23c75a3263b41a98b09f4a60cd7

commit 2febdd2df205c23c75a3263b41a98b09f4a60cd7
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 11:56:08 2007 +0530

Removed all references to libglade calls
* Use the new GtkBuilder API

diff --git a/data/Makefile.am b/data/Makefile.am
index 83cc419..7a0d7d4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = icons

gladedir	= $(datadir)/gfpm
-glade_DATA	= gfpm.glade splash.png
+glade_DATA	= gfpm.ui splash.png

gnomedesktopdir = $(datadir)/applications
gnomedesktop_DATA = gfpm.desktop
diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 94b0142..5c621a8 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -21,7 +21,6 @@
#define _GNU_SOURCE
#include <locale.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>

@@ -45,7 +44,7 @@
#include "gfpm-about.h"
#include "gfpm-db.h"

-extern GladeXML *xml;
+extern GtkBuilder *xml;
extern PM_DB	*sync_db;
extern PM_DB	*local_db;
extern GfpmList *install_list;
@@ -59,12 +58,12 @@ gchar *current_group = NULL;

/* The GFPM main window */
GtkWidget *gfpm_mw;
-GtkWidget *gfpm_pkgs_tvw;
+GtkWidget *gfpm_pkgs_tvw = NULL;

-static GtkWidget *gfpm_statusbar;
-static GtkWidget *gfpm_groups_tvw;
-static GtkWidget *gfpm_info_tvw;
-static GtkWidget *gfpm_files_txtvw;
+static GtkWidget *gfpm_statusbar = NULL;
+static GtkWidget *gfpm_groups_tvw = NULL;
+static GtkWidget *gfpm_info_tvw = NULL;
+static GtkWidget *gfpm_files_txtvw = NULL;
static GtkWidget *gfpm_clog_txtvw;
static GtkWidget *gfpm_clrall_opt;
static GtkWidget *gfpm_clrold_opt;
@@ -96,10 +95,16 @@ gfpm_populate_repos_combobox (GtkComboBox *combo)
{
GList		*rlist = NULL;
GtkListStore	*store = NULL;
+	GtkCellRenderer *renderer = NULL;
GtkTreeIter	iter;
gint		c_index = -1;
+
+	store = gtk_list_store_new (1, G_TYPE_STRING);
+	gtk_combo_box_set_model (GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store));
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(combo), renderer, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL);

-	store = GTK_LIST_STORE (gtk_combo_box_get_model(GTK_COMBO_BOX(combo)));
rlist = gfpm_db_get_repolist ();
for (;rlist != NULL;rlist=rlist->next)
{
@@ -128,29 +133,29 @@ gfpm_interface_init (void)
GtkTreeViewColumn	*column;
gchar			*title = NULL;

-	gfpm_mw		= glade_xml_get_widget (xml, "mainwindow");
-	gfpm_splash	= glade_xml_get_widget (xml, "splash_window");
-	gfpm_statusbar	= glade_xml_get_widget (xml, "statusbar");
+	gfpm_mw		= GTK_WIDGET (gtk_builder_get_object (xml, "mainwindow"));
+	gfpm_splash	= GTK_WIDGET (gtk_builder_get_object (xml, "splash_window"));
+	gfpm_statusbar	= GTK_WIDGET (gtk_builder_get_object (xml, "statusbar"));
gtk_widget_show (gfpm_splash);
while (gtk_events_pending())
gtk_main_iteration ();

sleep (1);
-	gfpm_groups_tvw = glade_xml_get_widget (xml, "grouptreeview");
-	gfpm_pkgs_tvw	= glade_xml_get_widget (xml, "pkgstreeview");
-	gfpm_info_tvw	= glade_xml_get_widget (xml, "infotreeview");
-	gfpm_files_txtvw = glade_xml_get_widget (xml, "filestextview");
-	gfpm_clog_txtvw = glade_xml_get_widget (xml, "changelogtextview");
-	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");
-	gfpm_inst_depcheck = glade_xml_get_widget (xml, "depcheck");
-	gfpm_inst_upgcheck = glade_xml_get_widget (xml, "upgcheck");
-	gfpm_inst_forcheck = glade_xml_get_widget (xml, "forcheck");
-	gfpm_apply_inst_depcheck = glade_xml_get_widget (xml, "applyinstdepcheck");
-	gfpm_apply_rem_depcheck = glade_xml_get_widget (xml, "applyremdepcheck");
-	gfpm_apply_inst_dwocheck = glade_xml_get_widget (xml, "applyinstdwcheck");
+	gfpm_groups_tvw = GTK_WIDGET (gtk_builder_get_object (xml, "grouptreeview"));
+	gfpm_pkgs_tvw	= GTK_WIDGET (gtk_builder_get_object (xml, "pkgstreeview"));
+	gfpm_info_tvw	= GTK_WIDGET (gtk_builder_get_object (xml, "infotreeview"));
+	gfpm_files_txtvw = GTK_WIDGET (gtk_builder_get_object (xml, "filestextview"));
+	gfpm_clog_txtvw = GTK_WIDGET (gtk_builder_get_object (xml, "changelogtextview"));
+	gfpm_clrold_opt = GTK_WIDGET (gtk_builder_get_object (xml, "rem_old_opt"));
+	gfpm_clrall_opt = GTK_WIDGET (gtk_builder_get_object (xml, "rem_all_opt"));
+	gfpm_inst_from_file_dlg = GTK_WIDGET (gtk_builder_get_object (xml, "inst_from_file_dlg"));
+	gfpm_inst_filechooser = GTK_WIDGET (gtk_builder_get_object (xml, "gfpm_inst_filechooser"));
+	gfpm_inst_depcheck = GTK_WIDGET (gtk_builder_get_object (xml, "depcheck"));
+	gfpm_inst_upgcheck = GTK_WIDGET (gtk_builder_get_object (xml, "upgcheck"));
+	gfpm_inst_forcheck = GTK_WIDGET (gtk_builder_get_object (xml, "forcheck"));
+	gfpm_apply_inst_depcheck = GTK_WIDGET (gtk_builder_get_object (xml, "applyinstdepcheck"));
+	gfpm_apply_rem_depcheck = GTK_WIDGET (gtk_builder_get_object (xml, "applyremdepcheck"));
+	gfpm_apply_inst_dwocheck = GTK_WIDGET (gtk_builder_get_object (xml, "applyinstdwcheck"));

/* Setup groups treeview */
store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -233,34 +238,34 @@ gfpm_interface_init (void)
g_object_set (gfpm_info_tvw, "hover-selection", TRUE, NULL);

/* Setup repository combobox */
-	widget = glade_xml_get_widget (xml, "combobox_repos");
+	widget = GTK_WIDGET (gtk_builder_get_object (xml, "repobox"));
if (gfpm_db_populate_repolist() == 0)
gfpm_populate_repos_combobox (GTK_COMBO_BOX(widget));

/* search */
-	g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "search_entry1")), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL);
+	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "search_entry1")), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL);

/* about */
-	g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "about_gfpm1")), "activate", G_CALLBACK(gfpm_about), NULL);
+	g_signal_connect (G_OBJECT(gtk_builder_get_object(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);
+	g_signal_connect (G_OBJECT(gtk_builder_get_object(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_gfpm_refresh_button_clicked), NULL);
+	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_gfpm_refresh_button_clicked), NULL);

/* 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);
+	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "rem_apply")), "clicked", G_CALLBACK(cb_gfpm_clear_cache_apply_clicked), NULL);

/* install from file */
-	g_signal_connect (G_OBJECT(glade_xml_get_widget(xml, "inst_from_file_install")), "clicked", G_CALLBACK(cb_gfpm_install_file_clicked), NULL);
+	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "inst_from_file_install")), "clicked", G_CALLBACK(cb_gfpm_install_file_clicked), NULL);

/* Disable Apply, Refresh and File buttons if user is not root */
if ( geteuid() != 0 )
{
-		gtk_widget_set_sensitive (GTK_WIDGET(glade_xml_get_widget(xml, "button_apply")), FALSE);
-		gtk_widget_set_sensitive (GTK_WIDGET(glade_xml_get_widget(xml, "button_refresh1")), FALSE);
-		gtk_widget_set_sensitive (GTK_WIDGET(glade_xml_get_widget(xml, "button_file1")), FALSE);
+		gtk_widget_set_sensitive (GTK_WIDGET(gtk_builder_get_object(xml, "button_apply")), FALSE);
+		gtk_widget_set_sensitive (GTK_WIDGET(gtk_builder_get_object(xml, "button_refresh1")), FALSE);
+		gtk_widget_set_sensitive (GTK_WIDGET(gtk_builder_get_object(xml, "button_file1")), FALSE);
}

/* initialize modules */
@@ -279,7 +284,7 @@ gfpm_interface_init (void)
gtk_window_present (GTK_WINDOW(gfpm_mw));

/* unref the glade xml object */
-	g_object_unref (xml);
+//	g_object_unref (xml);

return;
}
@@ -1143,6 +1148,7 @@ cb_gfpm_repos_combo_changed (GtkComboBox *combo, gpointer data)
gchar *text = NULL;

text = gtk_combo_box_get_active_text (combo);
+	if (text == NULL) return;
if (!strcmp(text, _("Installed Packages")))
{
g_free (text);
diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c
index 675e0b1..97ad81d 100644
--- a/src/gfpm-messages.c
+++ b/src/gfpm-messages.c
@@ -22,10 +22,9 @@
#define _GNU_SOURCE
#include "gfpm-messages.h"
#include "gfpm-packagelist.h"
-#include <glade/glade.h>

extern GtkWidget	*gfpm_mw;
-extern GladeXML		*xml;
+extern GtkBuilder	*xml;
extern PM_DB		*sync_db;
extern PM_DB		*local_db;
extern GfpmList		*install_list;
@@ -49,13 +48,13 @@ gfpm_messages_init (void)
GtkWidget	*button = NULL;

/* lookup necessary widgets */
-	gfpm_apply_dlg = glade_xml_get_widget (xml, "apply_dlg");
-	gfpm_apply_inst_tvw = glade_xml_get_widget (xml, "insttvw");
-	gfpm_apply_inst_box = glade_xml_get_widget (xml, "instbox");
-	gfpm_apply_rem_tvw = glade_xml_get_widget (xml, "remtvw");
-	gfpm_apply_rem_box = glade_xml_get_widget (xml, "rembox");
-	gfpm_apply_inst_sizelbl = glade_xml_get_widget (xml, "instsizelbl");
-	gfpm_apply_rem_sizelbl = glade_xml_get_widget (xml, "remsizelbl");
+	gfpm_apply_dlg = GTK_WIDGET (gtk_builder_get_object (xml, "apply_dlg"));
+	gfpm_apply_inst_tvw = GTK_WIDGET (gtk_builder_get_object (xml, "insttvw"));
+	gfpm_apply_inst_box = GTK_WIDGET (gtk_builder_get_object (xml, "instbox"));
+	gfpm_apply_rem_tvw = GTK_WIDGET (gtk_builder_get_object (xml, "remtvw"));
+	gfpm_apply_rem_box = GTK_WIDGET (gtk_builder_get_object (xml, "rembox"));
+	gfpm_apply_inst_sizelbl = GTK_WIDGET (gtk_builder_get_object (xml, "instsizelbl"));
+	gfpm_apply_rem_sizelbl = GTK_WIDGET (gtk_builder_get_object (xml, "remsizelbl"));

/* setup apply dialog */
button = gtk_button_new_from_stock (GTK_STOCK_OK);
diff --git a/src/gfpm-optimizedb.c b/src/gfpm-optimizedb.c
index 77fea3e..5149d8a 100644
--- a/src/gfpm-optimizedb.c
+++ b/src/gfpm-optimizedb.c
@@ -24,7 +24,6 @@
#include "gfpm-messages.h"

#include <fcntl.h>
-#include <glade/glade.h>
#include <glib.h>
#include <glib/gstdio.h>

@@ -34,7 +33,7 @@
#define NEWSUM "/tmp/dbsums.new"
#define LOCKFILE "/tmp/pacman-g2.lck"

-extern GladeXML *xml;
+extern GtkBuilder *xml;

static GtkWidget *gfpm_optimize_db_dlg;
static GtkWidget *gfpm_optimize_db_progressbar;
@@ -50,24 +49,24 @@ static void gfpm_optimize_db (void);
void
gfpm_optimize_db_dlg_init (void)
{
-	gfpm_optimize_db_dlg = glade_xml_get_widget (xml, "optimize_db_dlg");
-	gfpm_optimize_db_progressbar = glade_xml_get_widget (xml, "optimize_db_progress");
-	gfpm_optimize_db_startbtn = glade_xml_get_widget (xml, "optimize_db_start");
-	gfpm_optimize_db_closebtn = glade_xml_get_widget (xml, "optimize_db_close");
-	gfpm_optimize_db_label = glade_xml_get_widget (xml, "optimize_db_label");
+	gfpm_optimize_db_dlg = GTK_WIDGET (gtk_builder_get_object (xml, "optimize_db_dlg"));
+	gfpm_optimize_db_progressbar = GTK_WIDGET (gtk_builder_get_object (xml, "optimize_db_progress"));
+	gfpm_optimize_db_startbtn = GTK_WIDGET (gtk_builder_get_object (xml, "optimize_db_start"));
+	gfpm_optimize_db_closebtn = GTK_WIDGET (gtk_builder_get_object (xml, "optimize_db_close"));
+	gfpm_optimize_db_label = GTK_WIDGET (gtk_builder_get_object (xml, "optimize_db_label"));

g_signal_connect (G_OBJECT(gfpm_optimize_db_startbtn),
-					"clicked",
-					G_CALLBACK(gfpm_optimize_db_optimize_btn_clicked),
-					NULL);
+			"clicked",
+			G_CALLBACK(gfpm_optimize_db_optimize_btn_clicked),
+			NULL);
g_signal_connect (G_OBJECT(gfpm_optimize_db_closebtn),
-					"clicked",
-					G_CALLBACK(gfpm_optimize_db_dlg_hide),
-					NULL);
-	g_signal_connect (G_OBJECT(glade_xml_get_widget(xml,"opt1")),
-					"activate",
-					G_CALLBACK(gfpm_optimize_db_dlg_show),
-					NULL);
+			"clicked",
+			G_CALLBACK(gfpm_optimize_db_dlg_hide),
+			NULL);
+	g_signal_connect (gtk_builder_get_object(xml,"optimize"),
+			"activate",
+			G_CALLBACK(gfpm_optimize_db_dlg_show),
+			NULL);

return;
}
diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c
index 9309db8..31c4fa9 100644
--- a/src/gfpm-progress.c
+++ b/src/gfpm-progress.c
@@ -22,7 +22,6 @@
#define _GNU_SOURCE
#include <time.h>
#include <sys/time.h>
-#include <glade/glade.h>
#include "gfpm.h"
#include "gfpm-progress.h"

@@ -30,11 +29,11 @@
#include "config.h"
#endif

-extern GladeXML		*xml;
+extern GtkBuilder	*xml;
extern GtkWidget	*gfpm_mw;

GtkProgressBar		*progressbar = NULL;
-GtkWidget			*progresswindow = NULL;
+GtkWidget		*progresswindow = NULL;
static GtkWidget	*main_label = NULL;
static GtkWidget	*sub_label = NULL;
static GtkWidget	*rate_label = NULL;
@@ -69,18 +68,18 @@ gfpm_progress_init (void)
pacman_set_option (PM_OPT_DLRATE, (long)&rate);
pacman_set_option (PM_OPT_DLFNM, (long)reponame);

-	progressbar = GTK_PROGRESS_BAR(glade_xml_get_widget (xml, "progressbar1"));
-	progresswindow = glade_xml_get_widget (xml, "progresswindow");
-	main_label = glade_xml_get_widget (xml, "main_pr_label");
-	sub_label = glade_xml_get_widget (xml, "sub_pr_label");
-	rate_label = glade_xml_get_widget (xml, "rate_pr_label");
-	rate_box = glade_xml_get_widget (xml, "rate_pr_box");
-	rec_label = glade_xml_get_widget (xml, "rx_pr_label");
-	progress_txtvw = glade_xml_get_widget (xml, "progress_txtvw");
-	button_close = glade_xml_get_widget (xml, "close_progress");
-	details_scroll = glade_xml_get_widget (xml, "details_scrollwindow");
-	autoclose_checkbtn = glade_xml_get_widget (xml, "autoclose_checkbtn");
-	g_signal_connect (G_OBJECT(glade_xml_get_widget(xml,"show_details")),
+	progressbar = GTK_PROGRESS_BAR(gtk_builder_get_object (xml, "progressbar1"));
+	progresswindow = GTK_WIDGET (gtk_builder_get_object (xml, "progresswindow"));
+	main_label = GTK_WIDGET (gtk_builder_get_object (xml, "main_pr_label"));
+	sub_label = GTK_WIDGET (gtk_builder_get_object (xml, "sub_pr_label"));
+	rate_label = GTK_WIDGET (gtk_builder_get_object (xml, "rate_pr_label"));
+	rate_box = GTK_WIDGET (gtk_builder_get_object (xml, "rate_pr_box"));
+	rec_label = GTK_WIDGET (gtk_builder_get_object (xml, "rx_pr_label"));
+	progress_txtvw = GTK_WIDGET (gtk_builder_get_object (xml, "progress_txtvw"));
+	button_close = GTK_WIDGET (gtk_builder_get_object (xml, "close_progress"));
+	details_scroll = GTK_WIDGET (gtk_builder_get_object (xml, "details_scrollwindow"));
+	autoclose_checkbtn = GTK_WIDGET (gtk_builder_get_object (xml, "autoclose_checkbtn"));
+	g_signal_connect (gtk_builder_get_object(xml,"show_details"),
"toggled",
G_CALLBACK(cb_gfpm_details_button_toggled),
NULL);
diff --git a/src/gfpm-quickpane.c b/src/gfpm-quickpane.c
index de50e78..2b75936 100644
--- a/src/gfpm-quickpane.c
+++ b/src/gfpm-quickpane.c
@@ -21,11 +21,10 @@
#include "gfpm-quickpane.h"
#include "gfpm-packagelist.h"
#include "gfpm-interface.h"
-#include <glade/glade.h>

gchar *quickpane_pkg = NULL;

-extern GladeXML *xml;
+extern GtkBuilder *xml;
extern GfpmList *install_list;
extern GfpmList *remove_list;
extern GtkWidget *gfpm_pkgs_tvw;
@@ -48,14 +47,14 @@ static void cb_gfpm_quickpane_readme_clicked (GtkWidget *button, gpointer data);
void
gfpm_quickpane_init (void)
{
-	quick_pane_install_btn = glade_xml_get_widget (xml, "quick_install");
-	quick_pane_remove_btn = glade_xml_get_widget (xml, "quick_remove");
-	quick_pane_upgrade_btn = glade_xml_get_widget (xml, "quick_upgrade");
-	quick_pane_readme_btn = glade_xml_get_widget (xml, "quick_readme");
-	quick_pane_readme_dlg = glade_xml_get_widget (xml, "readme_dlg");
-	quick_pane_readme_dlg_label = glade_xml_get_widget (xml, "readme_dlg_label");
-	quick_pane_readme_dlg_txtvw = glade_xml_get_widget (xml, "readme_dlg_txtvw");
-	quick_pane = glade_xml_get_widget (xml, "quick_pane");
+	quick_pane_install_btn = GTK_WIDGET (gtk_builder_get_object (xml, "quick_install"));
+	quick_pane_remove_btn = GTK_WIDGET (gtk_builder_get_object (xml, "quick_remove"));
+	quick_pane_upgrade_btn = GTK_WIDGET (gtk_builder_get_object (xml, "quick_upgrade"));
+	quick_pane_readme_btn = GTK_WIDGET (gtk_builder_get_object (xml, "quick_readme"));
+	quick_pane_readme_dlg = GTK_WIDGET (gtk_builder_get_object (xml, "readme_dlg"));
+	quick_pane_readme_dlg_label = GTK_WIDGET (gtk_builder_get_object (xml, "readme_dlg_label"));
+	quick_pane_readme_dlg_txtvw = GTK_WIDGET (gtk_builder_get_object (xml, "readme_dlg_txtvw"));
+	quick_pane = GTK_WIDGET (gtk_builder_get_object (xml, "quick_pane"));
gfpm_quickpane_show (FALSE, 0, 0);
g_signal_connect (G_OBJECT(quick_pane_install_btn),
"clicked",
diff --git a/src/gfpm.c b/src/gfpm.c
index 90158a6..406e2cd 100644
--- a/src/gfpm.c
+++ b/src/gfpm.c
@@ -21,7 +21,6 @@
#define _GNU_SOURCE
#include <locale.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -32,14 +31,15 @@
#include "gfpm-messages.h"
#include "gfpm-db.h"

-#define GLADE_FILE	"/share/gfpm/gfpm.glade"
+#define UI_FILE	"/share/gfpm/gfpm.ui"

-GladeXML *xml = NULL;
+GtkBuilder *xml = NULL;

int
main (int argc, char *argv[])
{
gchar *path;
+	GError *error = NULL;

setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -48,17 +48,19 @@ main (int argc, char *argv[])

gtk_init (&argc, &argv);

-	path = g_strdup_printf ("%s%s", PREFIX, GLADE_FILE);
-	xml = glade_xml_new (path, NULL, NULL);
-	g_free (path);
+	path = g_strdup_printf ("%s%s", PREFIX, UI_FILE);
+	xml = gtk_builder_new ();

-	if (!xml)
+	if (!gtk_builder_add_from_file(xml, path, &error))
{
-		gfpm_error (_("Interface initialization failed"), _("Failed to initialize interface."));
+		gchar *errstr = g_strdup_printf ("%s%s", _("Failed to initialize interface: "), error->message);
+		gfpm_error (_("Interface initialization failed"), errstr);
+		g_free (errstr);
return 1;
}
+	g_free (path);

-	glade_xml_signal_autoconnect (xml);
+	gtk_builder_connect_signals (xml, NULL);

if (pacman_initialize ("/") == -1)
{
From voroskoi at frugalware.org  Thu Oct  4 11:03:15 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:03:19 2007
Subject: [Frugalware-git] frugalware-current: mrxvt-0.5.3-1-i686
Message-ID: <20071004090315.AFACC13A4012@genesis.frugalware.org>

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

commit 064454b4acf4539897ce5b2f22fa8faef1632530
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 10:50:44 2007 +0200

mrxvt-0.5.3-1-i686
version bump
fixes an annoying scrolling bug (that's why it's necessary)
new m8r, ok boobaa@

diff --git a/source/x11-extra/mrxvt/FrugalBuild b/source/x11-extra/mrxvt/FrugalBuild
index 7eca0a2..8a3e3b1 100644
--- a/source/x11-extra/mrxvt/FrugalBuild
+++ b/source/x11-extra/mrxvt/FrugalBuild
@@ -1,22 +1,22 @@
# Compiling Time: ~0.01 SBU
# Contributor: VMiklos <vmiklos@frugalware.org>
-# Maintainer: CSÉCSY László <boobaa@frugalware.org>
+# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=mrxvt
-pkgver=0.5.2
+pkgver=0.5.3
pkgrel=1
-pkgdesc="lightweight and powerful multi-tabbed X terminal emulator"
+pkgdesc="Mrxvt(Materm) is a portable, lightweight, fast and multi-tabbed X terminal emulator based on rxvt."
depends=('libjpeg' 'libsm' 'libxft' 'libpng' 'libxpm')
groups=('x11-extra')
archs=('i686' 'x86_64')
_F_sourceforge_dirname="materm"
+_F_sourceforge_broken_up2date=1
Finclude sourceforge
-url="http://materm.sourceforge.net/"
-up2date="lynx -dump ${url}wiki/Main/HomePage|grep -m1 'Mrxvt version \(.*\) is released'|sed 's/.*ion \([^ ]*\) is.*/\1/'"
-sha1sums=('a8fba2500b1edfabdd794e899b74666b2d909692')
+sha1sums=('442006f1d797ea5464c5c49d26d0cdecf79160f4')

Fconfopts="$Fconfopts --enable-everything --disable-debug \
--disable-greek --disable-cjk --disable-thai --disable-utmp \
-		--disable-wtmp --disable-lastlog --disable-utempter"
+		--disable-wtmp --disable-lastlog --disable-utempter \
+		--with-max-profiles=10"

# optimization OK
From voroskoi at frugalware.org  Thu Oct  4 11:24:10 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:24:11 2007
Subject: [Frugalware-git] homepage-ng: FSA284-wordpress
Message-ID: <20071004092410.20B3413A4012@genesis.frugalware.org>

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

commit c05ddc10f16426a52ea736ee29be03ca4ae892c4
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 11:11:54 2007 +0200

FSA284-wordpress

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index fd2079b..78802a7 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,20 @@

<fsas>
<fsa>
+		<id>284</id>
+		<date>2007-10-04</date>
+		<author>voroskoi</author>
+		<package>wordpress</package>
+		<vulnerable>2.2.2-1terminus1</vulnerable>
+		<unaffected>2.2.3-1terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2398</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4893
+			http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4894</cve>
+		<desc>Some vulnerabilities have been reported in Wordpress, which can be exploited by malicious users to conduct script insertion attacks and by malicious people to conduct SQL injection attacks.
+			1) The "unfiltered_html" privilege feature can be bypassed by adding a field named "no_filter". This can be exploited by malicious users without the "unfiltered_html" privilege to e.g. post blog entries with arbitrary HTML and script code via specially crafted POST requests.
+			2) Input passed to certain parameters (e.g. the "post_type" parameter of the URL passed to the "pingback.extensions.getPingbacks()" XMLRPC method) is not properly sanitised before being used in SQL queries. This can be exploited to manipulate SQL queries by injecting arbitrary SQL code.</desc>
+	</fsa>
+	<fsa>
<id>283</id>
<date>2007-10-01</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Thu Oct  4 11:29:43 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:29:44 2007
Subject: [Frugalware-git] homepage-ng: FSA285-mediawiki
Message-ID: <20071004092943.16A6D13A4012@genesis.frugalware.org>

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

commit 3b05b035ae85cbfb3a2de6a580cf05190a7afc71
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 11:17:34 2007 +0200

FSA285-mediawiki

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 78802a7..c5e4558 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,20 @@

<fsas>
<fsa>
+		<id>285</id>
+		<date>2007-10-04</date>
+		<author>voroskoi</author>
+		<package>mediawiki</package>
+		<vulnerable>1.9.3-1</vulnerable>
+		<unaffected>1.9.4-1terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2412</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4828
+			http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4883</cve>
+		<desc>A vulnerability has been reported in MediaWiki, which can be exploited by malicious people to conduct cross-site scripting attacks.
+			Input passed to unspecified parameters in the API pretty-printing mode is not properly sanitised before being returned to the user. This can be exploited to execute arbitrary HTML and script code in a user's browser session in context of an affected site.
+			Successful exploitation requires that the API interface is enabled.</desc>
+	</fsa>
+	<fsa>
<id>284</id>
<date>2007-10-04</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Thu Oct  4 11:37:26 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:37:29 2007
Subject: [Frugalware-git] homepage-ng: FSA286-firefox
Message-ID: <20071004093726.B0D4413A4012@genesis.frugalware.org>

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

commit e3a77601123b637b083c0b4f57b05ec4ec115802
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 11:25:16 2007 +0200

FSA286-firefox

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index c5e4558..f1d7992 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,18 @@

<fsas>
<fsa>
+		<id>286</id>
+		<date>2007-10-04</date>
+		<author>voroskoi</author>
+		<package>firefox</package>
+		<vulnerable>2.0.0.6-1terminus1</vulnerable>
+		<unaffected>2.0.0.7-1terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2423</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4965</cve>
+		<desc>Mozilla has acknowledged a security issue in Firefox, which potentially can be exploited by malicious people to compromise a user's system.
+			The security issue is caused due to the "-chrome" parameter allowing execution of arbitrary Javascript script code in chrome context. This can be exploited to execute arbitrary commands on a user's system e.g. via applications invoking Firefox with unfiltered command line arguments.</desc>
+	</fsa>
+	<fsa>
<id>285</id>
<date>2007-10-04</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Thu Oct  4 11:43:10 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:43:11 2007
Subject: [Frugalware-git] homepage-ng: FSA287-inotify-tools
Message-ID: <20071004094310.0B23C13A4012@genesis.frugalware.org>

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

commit 34aff1381bf577e3f6d7aab80e5ad47ec5379802
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 11:31:01 2007 +0200

FSA287-inotify-tools

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index f1d7992..8bed5bd 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,19 @@

<fsas>
<fsa>
+		<id>287</id>
+		<date>2007-10-04</date>
+		<author>voroskoi</author>
+		<package>inotify-tools</package>
+		<vulnerable>3.8-1</vulnerable>
+		<unaffected>3.8-2terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2425</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5037</cve>
+		<desc>A vulnerability has been reported in inotify-tools, which can potentially be exploited by malicious users to compromise an application using the library.
+			The vulnerability is caused due to a boundary error within the "inotifytools_snprintf()" function in src/inotifytools.c. This can be exploited to cause a buffer overflow by e.g. creating a file with an overly long filename in a specific directory.
+			Successful exploitation may allow the execution of arbitrary code with privileges of the application using the affected library.</desc>
+	</fsa>
+	<fsa>
<id>286</id>
<date>2007-10-04</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Thu Oct  4 11:48:05 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:48:07 2007
Subject: [Frugalware-git] homepage-ng: FSA288-libsndfile
Message-ID: <20071004094805.3E71E13A4012@genesis.frugalware.org>

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

commit 74c9146fcd09ec70412e6bcc89ec9915651b55ce
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 11:35:54 2007 +0200

FSA288-libsndfile

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 8bed5bd..17ce019 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,19 @@

<fsas>
<fsa>
+		<id>288</id>
+		<date>2007-10-04</date>
+		<author>voroskoi</author>
+		<package>libsndfile</package>
+		<vulnerable>1.0.17-2</vulnerable>
+		<unaffected>1.0.17-3terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2431</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4974</cve>
+		<desc>Robert Buchholz has reported a vulnerability in libsndfile, which potentially can be exploited by malicious people to compromise an application using the library.
+			The vulnerability is caused due to a boundary error within the "flac_buffer_copy()" function in src/flac.c when handling FLAC files with variable bitrates. This can be exploited to cause a heap-based buffer overflow by e.g. tricking a user into playing a specially crafted FLAC file with an application using the library.
+			Successful exploitation may allow the execution of arbitrary code.</desc>
+	</fsa>
+	<fsa>
<id>287</id>
<date>2007-10-04</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Thu Oct  4 11:53:12 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Thu Oct  4 11:53:13 2007
Subject: [Frugalware-git] homepage-ng: FSA289-elinks
Message-ID: <20071004095312.22AE113A4012@genesis.frugalware.org>

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

commit f720aedf2568e38e442a2371545702e2512f5ff0
Author: voroskoi <voroskoi@frugalware.org>
Date:   Thu Oct 4 11:40:58 2007 +0200

FSA289-elinks

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 17ce019..5b0b8b6 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,18 @@

<fsas>
<fsa>
+		<id>289</id>
+		<date>2007-10-04</date>
+		<author>voroskoi</author>
+		<package>elinks</package>
+		<vulnerable>0.11.2-2terminus1</vulnerable>
+		<unaffected>0.11.2-2terminus2</unaffected>
+		<bts>http://bugs.frugalware.org/task/2457</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5034</cve>
+		<desc>A weakness has been reported in ELinks, which can be exploited by malicious people to disclose sensitive information.
+			The content of POST requests sent to HTTPS webservers via a proxy is sent unencrypted via the CONNECT command to the configured proxy. This can be exploited to disclose the content of POST requests by e.g. sniffing network traffic.</desc>
+	</fsa>
+	<fsa>
<id>288</id>
<date>2007-10-04</date>
<author>voroskoi</author>
From priyank at frugalware.org  Thu Oct  4 16:46:08 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 16:46:09 2007
Subject: [Frugalware-git] frugalware-current: slim-1.3.0-4-i686
Message-ID: <20071004144608.0EE7613A4012@genesis.frugalware.org>

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

commit ad07edc76eed2d6d7cde5ab2998d0dc3dd230fe9
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 20:13:24 2007 +0530

slim-1.3.0-4-i686
* Moved to xfce4 group
* slim.conf: default login_cmd is startxfce4

diff --git a/source/x11-extra/slim/FrugalBuild b/source/x11-extra/slim/FrugalBuild
deleted file mode 100644
index 6c355c3..0000000
--- a/source/x11-extra/slim/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: 0.03 SBU
-# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
-
-pkgname=slim
-pkgver=1.3.0
-pkgrel=3
-pkgdesc="SLiM is a lightweight, Desktop-independent graphical login manager for X11."
-depends=('libpng' 'libjpeg')
-makedepends=('libx11' 'libxft' 'libxmu')
-rodepends=('xorg-server')
-groups=('x11-extra')
-archs=('i686' 'x86_64')
-backup=('etc/slim.conf')
-Finclude berlios
-up2date=("lynx -dump http://developer.berlios.de/project/showfiles.php?group_id=2663 |grep slim-[0-9].[0-9].[0-9].tar |sed -ne 's/.*-\(.*\).t.*/\1/;1p'")
-source=(${source[@]} \
-	slim.conf \
-	slim.install \
-	$pkgname-$pkgver-cflags.diff \
-	ftp://ftp.frugalware.org/pub/other/people/priyank/slim/frugalware.tar.bz2)
-sha1sums=('f27f40c73a2f757f1ae32155bf0438c97be2c019' \
-          '7fd75448667f8e6941c6d236b758caae17275ef4' \
-          'a17849f628f4f74cf1bd48eea21a144f2f1a274d' \
-          '279111ffb45456f646250fb5e21eec53426c0a9b' \
-          'd2024f15d7a896b396db04605ea67c9573e939c2')
-
-build()
-{
-	Fbuild
-	Fcpr frugalware /usr/share/slim/themes/frugalware
-	Fcpr slim.conf /etc/slim.conf
-}
-
-# optimization OK
diff --git a/source/x11-extra/slim/slim-1.3.0-cflags.diff b/source/x11-extra/slim/slim-1.3.0-cflags.diff
deleted file mode 100644
index 66709a2..0000000
--- a/source/x11-extra/slim/slim-1.3.0-cflags.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur slim-1.3.0/Makefile slim-1.3.0.new/Makefile
---- slim-1.3.0/Makefile	2007-07-15 19:39:28.000000000 +0530
-+++ slim-1.3.0.new/Makefile	2007-08-28 16:04:15.000000000 +0530
-@@ -5,9 +5,9 @@
- #######################################################
- CXX=/usr/bin/g++
- CC=/usr/bin/gcc
--CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-+CFLAGS+=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
- CXXFLAGS=$(CFLAGS)
--LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
-+LDFLAGS+=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
- CUSTOM=-DHAVE_SHADOW
- ifdef USE_PAM
- LDFLAGS+= -lpam
diff --git a/source/x11-extra/slim/slim.conf b/source/x11-extra/slim/slim.conf
deleted file mode 100644
index d46037b..0000000
--- a/source/x11-extra/slim/slim.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-# Path, X server and arguments (if needed)
-# Note: -xauth $authfile is automatically appended
-default_path        ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-default_xserver     /usr/bin/X
-xserver_arguments   vt12 -dpi 72
-
-# Commands for halt, login, etc.
-halt_cmd            /sbin/shutdown -h now
-reboot_cmd          /sbin/shutdown -r now
-console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
-#suspend_cmd        /usr/sbin/suspend
-
-# Full path to the xauth binary
-xauth_path         /usr/bin/xauth
-
-# Xauth file for server
-authfile           /var/run/slim.auth
-
-
-# Activate numlock when slim starts. Valid values: on|off
-# numlock             on
-
-# Hide the mouse cursor (note: does not work with some WMs).
-# Valid values: true|false
-# hidecursor          false
-
-# This command is executed after a succesful login.
-# you can place the %session and %theme variables
-# to handle launching of specific commands in .xinitrc
-# depending of chosen session and slim theme
-#
-# NOTE: if your system does not have bash you need
-# to adjust the command according to your preferred shell,
-# i.e. for freebsd use:
-# login_cmd           exec /bin/sh - ~/.xinitrc %session
-login_cmd           exec /bin/bash -login ~/.xinitrc %session
-
-# Commands executed when starting and exiting a session.
-# They can be used for registering a X11 session with
-# sessreg. You can use the %user variable
-#
-# sessionstart_cmd	some command
-# sessionstop_cmd	some command
-
-# Start in daemon mode. Valid values: yes | no
-# Note that this can overridden by the command line
-# option "-d"
- daemon	yes
-
-# Available sessions (first one is the default).
-# The current chosen session name is replaced in the login_cmd
-# above, so your login command can handle different sessions.
-# see the xinitrc.sample file shipped with slim sources
-sessions            xfce4,icewm,wmaker,blackbox
-
-# Executed when pressing F11 (requires imagemagick)
-screenshot_cmd      import -window root /slim.png
-
-# welcome message. Available variables: %host, %domain
-welcome_msg         Welcome to %host
-
-# shutdown / reboot messages
-shutdown_msg       The system is halting...
-reboot_msg         The system is rebooting...
-
-# default user, leave blank or remove this line
-# for avoid pre-loading the username.
-#default_user        simone
-
-# current theme, use comma separated list to specify a set to
-# randomly choose from
-current_theme       frugalware
-
-# Lock file
-lockfile            /var/run/slim.lock
-
-# Log file
-logfile             /var/log/slim.log
-
diff --git a/source/x11-extra/slim/slim.install b/source/x11-extra/slim/slim.install
deleted file mode 100644
index 993935d..0000000
--- a/source/x11-extra/slim/slim.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install()
-{
-	sed 's|^#desktop="/usr/bin/slim"$|desktop="/usr/bin/slim"|' -i /etc/sysconfig/desktop
-}
-
-post_upgrade()
-{
-	post_install
-}
-
-post_remove()
-{
-	sed 's|^desktop="/usr/bin/slim"$|#desktop="/usr/bin/slim"|' -i /etc/sysconfig/desktop
-}
-
-op=$1
-shift
-
-$op $*
-
-# vim: ft=sh
diff --git a/source/xfce4/slim/FrugalBuild b/source/xfce4/slim/FrugalBuild
new file mode 100644
index 0000000..f58f911
--- /dev/null
+++ b/source/xfce4/slim/FrugalBuild
@@ -0,0 +1,34 @@
+# Compiling Time: 0.03 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=slim
+pkgver=1.3.0
+pkgrel=4
+pkgdesc="SLiM is a lightweight, Desktop-independent graphical login manager for X11."
+depends=('libpng' 'libjpeg')
+makedepends=('libx11' 'libxft' 'libxmu')
+rodepends=('xorg-server')
+groups=('xfce4')
+archs=('i686' 'x86_64')
+backup=('etc/slim.conf')
+Finclude berlios
+up2date=("lynx -dump http://developer.berlios.de/project/showfiles.php?group_id=2663 |grep slim-[0-9].[0-9].[0-9].tar |sed -ne 's/.*-\(.*\).t.*/\1/;1p'")
+source=(${source[@]} \
+	slim.conf \
+	slim.install \
+	$pkgname-$pkgver-cflags.diff \
+	ftp://ftp.frugalware.org/pub/other/people/priyank/slim/frugalware.tar.bz2)
+sha1sums=('f27f40c73a2f757f1ae32155bf0438c97be2c019' \
+          '98dcec8ae2d52ae9c9b5abcfa3d145882a0848bd' \
+          'a17849f628f4f74cf1bd48eea21a144f2f1a274d' \
+          '279111ffb45456f646250fb5e21eec53426c0a9b' \
+          'd2024f15d7a896b396db04605ea67c9573e939c2')
+
+build()
+{
+	Fbuild
+	Fcpr frugalware /usr/share/slim/themes/frugalware
+	Fcpr slim.conf /etc/slim.conf
+}
+
+# optimization OK
diff --git a/source/xfce4/slim/slim-1.3.0-cflags.diff b/source/xfce4/slim/slim-1.3.0-cflags.diff
new file mode 100644
index 0000000..66709a2
--- /dev/null
+++ b/source/xfce4/slim/slim-1.3.0-cflags.diff
@@ -0,0 +1,15 @@
+diff -Naur slim-1.3.0/Makefile slim-1.3.0.new/Makefile
+--- slim-1.3.0/Makefile	2007-07-15 19:39:28.000000000 +0530
++++ slim-1.3.0.new/Makefile	2007-08-28 16:04:15.000000000 +0530
+@@ -5,9 +5,9 @@
+ #######################################################
+ CXX=/usr/bin/g++
+ CC=/usr/bin/gcc
+-CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
++CFLAGS+=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+ CXXFLAGS=$(CFLAGS)
+-LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
++LDFLAGS+=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
+ CUSTOM=-DHAVE_SHADOW
+ ifdef USE_PAM
+ LDFLAGS+= -lpam
diff --git a/source/xfce4/slim/slim.conf b/source/xfce4/slim/slim.conf
new file mode 100644
index 0000000..4431534
--- /dev/null
+++ b/source/xfce4/slim/slim.conf
@@ -0,0 +1,78 @@
+# Path, X server and arguments (if needed)
+# Note: -xauth $authfile is automatically appended
+default_path        ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+default_xserver     /usr/bin/X
+xserver_arguments   vt12 -dpi 72
+
+# Commands for halt, login, etc.
+halt_cmd            /sbin/shutdown -h now
+reboot_cmd          /sbin/shutdown -r now
+console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
+#suspend_cmd        /usr/sbin/suspend
+
+# Full path to the xauth binary
+xauth_path         /usr/bin/xauth
+
+# Xauth file for server
+authfile           /var/run/slim.auth
+
+
+# Activate numlock when slim starts. Valid values: on|off
+# numlock             on
+
+# Hide the mouse cursor (note: does not work with some WMs).
+# Valid values: true|false
+# hidecursor          false
+
+# This command is executed after a succesful login.
+# you can place the %session and %theme variables
+# to handle launching of specific commands in .xinitrc
+# depending of chosen session and slim theme
+#
+# NOTE: if your system does not have bash you need
+# to adjust the command according to your preferred shell,
+# i.e. for freebsd use:
+# login_cmd           exec /bin/sh - ~/.xinitrc %session
+login_cmd           exec /bin/bash -login /usr/bin/startxfce4 %session
+
+# Commands executed when starting and exiting a session.
+# They can be used for registering a X11 session with
+# sessreg. You can use the %user variable
+#
+# sessionstart_cmd	some command
+# sessionstop_cmd	some command
+
+# Start in daemon mode. Valid values: yes | no
+# Note that this can overridden by the command line
+# option "-d"
+ daemon	yes
+
+# Available sessions (first one is the default).
+# The current chosen session name is replaced in the login_cmd
+# above, so your login command can handle different sessions.
+# see the xinitrc.sample file shipped with slim sources
+sessions            xfce4
+
+# Executed when pressing F11 (requires imagemagick)
+screenshot_cmd      import -window root /slim.png
+
+# welcome message. Available variables: %host, %domain
+welcome_msg         Welcome to %host
+
+# shutdown / reboot messages
+shutdown_msg       The system is halting...
+reboot_msg         The system is rebooting...
+
+# default user, leave blank or remove this line
+# for avoid pre-loading the username.
+#default_user        simone
+
+# current theme, use comma separated list to specify a set to
+# randomly choose from
+current_theme       frugalware
+
+# Lock file
+lockfile            /var/run/slim.lock
+
+# Log file
+logfile             /var/log/slim.log
diff --git a/source/xfce4/slim/slim.install b/source/xfce4/slim/slim.install
new file mode 100644
index 0000000..993935d
--- /dev/null
+++ b/source/xfce4/slim/slim.install
@@ -0,0 +1,21 @@
+post_install()
+{
+	sed 's|^#desktop="/usr/bin/slim"$|desktop="/usr/bin/slim"|' -i /etc/sysconfig/desktop
+}
+
+post_upgrade()
+{
+	post_install
+}
+
+post_remove()
+{
+	sed 's|^desktop="/usr/bin/slim"$|#desktop="/usr/bin/slim"|' -i /etc/sysconfig/desktop
+}
+
+op=$1
+shift
+
+$op $*
+
+# vim: ft=sh
From vmiklos at frugalware.org  Thu Oct  4 17:18:36 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:18:37 2007
Subject: [Frugalware-git] homepage-ng: news: draft for the kernel update
Message-ID: <20071004151836.2139F13A4012@genesis.frugalware.org>

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

commit 0d9e0cb2093cc7c9d85e93a28a4eb2fc5e1e7365
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:18:30 2007 +0200

news: draft for the kernel update

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index ad34ba7..02f1af1 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -17,6 +17,24 @@

<news>
<post>
+	<post>
+		<id>75</id>
+		<title>Kernel update in -current: WARNING for Intel users</title>
+		<date>Thu Oct  4 15:08:53 UTC 2007</date>
+		<author>VMiklos</author>
+		<hidden>1</hidden>
+		<content><![CDATA[
+						As of kernel-2.6.22-5 in Frugalware-current, Intel users will have /dev/sd* devices rather than /dev/hd* ones. The reason is the following: It was not possible to boot the kernel on some machines without this change. See <a href="http://bugs.frugalware.org/2243">this bugreport</a> for more details. So after upgrading using pacman -Syu, you need to:
+						<ol>
+										<li>Check if you have an Intel IDE controller using sudo lspci |grep -i intel.*ide. If you got no result then probably you're not affected.</li>
+										<li>Edit /etc/fstab: change all occurrences of /etc/hd to /etc/sd.</li>
+										<li>Edit /boot/grub/menu.lst: change all occurrences of /etc/hd to /etc/sd in the Frugalware entry.</li>
+										<li>Reboot.</li>
+						</ol>
+						Thanks for your understandings!
+			]]>
+		</content>
+	</post>
<id>74</id>
<title>Frugalware 0.7rc2 (Sayshell) released</title>
<date>Tue Oct  2 11:08:42 CEST 2007</date>
From vmiklos at frugalware.org  Thu Oct  4 17:21:33 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:21:34 2007
Subject: [Frugalware-git] homepage-ng: fix a typo which was not pointed out
	by xmllint
Message-ID: <20071004152133.0F27113A4012@genesis.frugalware.org>

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

commit d6fec809b53bdc6590c883c5acda5fbebb2efffe
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:21:28 2007 +0200

fix a typo which was not pointed out by xmllint

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 02f1af1..760c84b 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -17,12 +17,11 @@

<news>
<post>
-	<post>
<id>75</id>
<title>Kernel update in -current: WARNING for Intel users</title>
<date>Thu Oct  4 15:08:53 UTC 2007</date>
<author>VMiklos</author>
-		<hidden>1</hidden>
+		<hidden>0</hidden>
<content><![CDATA[
As of kernel-2.6.22-5 in Frugalware-current, Intel users will have /dev/sd* devices rather than /dev/hd* ones. The reason is the following: It was not possible to boot the kernel on some machines without this change. See <a href="http://bugs.frugalware.org/2243">this bugreport</a> for more details. So after upgrading using pacman -Syu, you need to:
<ol>
@@ -34,6 +33,7 @@
Thanks for your understandings!
]]>
</content>
+	<post>
</post>
<id>74</id>
<title>Frugalware 0.7rc2 (Sayshell) released</title>
From vmiklos at frugalware.org  Thu Oct  4 17:26:08 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:26:08 2007
Subject: [Frugalware-git] homepage-ng: fixes from boobaa (that's why i
	wanted a draft first)
Message-ID: <20071004152608.53F3B13A4012@genesis.frugalware.org>

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

commit 87b39156895c30feb229afb4433ddb84ad41e407
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:26:04 2007 +0200

fixes from boobaa (that's why i wanted a draft first)

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 760c84b..ff9d99a 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -30,7 +30,7 @@
<li>Edit /boot/grub/menu.lst: change all occurrences of /etc/hd to /etc/sd in the Frugalware entry.</li>
<li>Reboot.</li>
</ol>
-						Thanks for your understandings!
+						Thanks for your understanding!
]]>
</content>
<post>
From vmiklos at frugalware.org  Thu Oct  4 17:27:03 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:27:04 2007
Subject: [Frugalware-git] homepage-ng: and another one..
Message-ID: <20071004152703.3C23C13A4012@genesis.frugalware.org>

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

commit 2624bbfb8de55a6b88170096e63afc4f506e737c
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:26:58 2007 +0200

and another one..
i hope this is the last one :)

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index ff9d99a..75fe689 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -26,8 +26,8 @@
As of kernel-2.6.22-5 in Frugalware-current, Intel users will have /dev/sd* devices rather than /dev/hd* ones. The reason is the following: It was not possible to boot the kernel on some machines without this change. See <a href="http://bugs.frugalware.org/2243">this bugreport</a> for more details. So after upgrading using pacman -Syu, you need to:
<ol>
<li>Check if you have an Intel IDE controller using sudo lspci |grep -i intel.*ide. If you got no result then probably you're not affected.</li>
-										<li>Edit /etc/fstab: change all occurrences of /etc/hd to /etc/sd.</li>
-										<li>Edit /boot/grub/menu.lst: change all occurrences of /etc/hd to /etc/sd in the Frugalware entry.</li>
+										<li>Edit /etc/fstab: change all occurrences of /dev/hd to /dev/sd.</li>
+										<li>Edit /boot/grub/menu.lst: change all occurrences of /dev/hd to /dev/sd in the Frugalware entry.</li>
<li>Reboot.</li>
</ol>
Thanks for your understanding!
From vmiklos at frugalware.org  Thu Oct  4 17:28:40 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:28:42 2007
Subject: [Frugalware-git] homepage-ng: and an another "well formed but not
	valid" fix
Message-ID: <20071004152840.6D31813A4012@genesis.frugalware.org>

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

commit 7c99b768154eb4c035c3cd021f13caba4f351ae3
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:28:37 2007 +0200

and an another "well formed but not valid" fix
this is not my day;)

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 75fe689..b6f25eb 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -33,8 +33,8 @@
Thanks for your understanding!
]]>
</content>
-	<post>
</post>
+	<post>
<id>74</id>
<title>Frugalware 0.7rc2 (Sayshell) released</title>
<date>Tue Oct  2 11:08:42 CEST 2007</date>
From vmiklos at frugalware.org  Thu Oct  4 17:30:51 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:30:52 2007
Subject: [Frugalware-git] frugalware-current: kernel-2.6.22-6-i686
Message-ID: <20071004153051.0B4BD13A4012@genesis.frugalware.org>

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

commit 1f8e34be008d71a61623e4abf89cbfc5815758f1
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 12:58:43 2007 +0200

kernel-2.6.22-6-i686
update to patchlevel '.9'
change CONFIG_IDE_GENERIC to 'm'
closes #2243
WARNING: we need a post on the website, this changes hd* to sd* for intel users

diff --git a/source/base/kernel/CVE-2007-3843.diff b/source/base/kernel/CVE-2007-3843.diff
index bda4c88..cb4563a 100644
--- a/source/base/kernel/CVE-2007-3843.diff
+++ b/source/base/kernel/CVE-2007-3843.diff
@@ -1,33 +1,28 @@
-From: Steve French <sfrench@us.ibm.com>
-Date: Thu, 28 Jun 2007 18:41:42 +0000 (+0000)
-Subject: [CIFS] Fix sign mount option and sign proc config setting
-X-Git-Tag: v2.6.23-rc1~478^2~20
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=762e5ab77c803c819e45d054518a98efb70b0f60
+From cf14ec24796741560004f19b92b89b4f910aab17 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Mon, 9 Jul 2007 09:20:30 -0400
+Subject: [PATCH] BZ#246595: [CIFS] fix signing sec= mount options

-[CIFS] Fix sign mount option and sign proc config setting
-
-We were checking the wrong (old) global variable to determine
-whether to override server and force signing on the SMB
-connection.
-
-Acked-by: Dave Kleikamp <shaggy@austin.ibm.com>
-Signed-off-by: Steve French <sfrench@us.ibm.com>
---
+ fs/cifs/cifs_debug.c |   92 ++++---------------------------------------------
+ fs/cifs/cifsglob.h   |    2 +-
+ fs/cifs/cifssmb.c    |   36 +++++++++++++------
+ 3 files changed, 34 insertions(+), 96 deletions(-)

-diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
-index ebd1335..42fafa1 100644
+Index: b/fs/cifs/cifs_debug.c
+===================================================================
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
-@@ -901,90 +901,14 @@ security_flags_write(struct file *file, const char __user *buffer,
+@@ -895,90 +895,14 @@ security_flags_write(struct file *file,
}
/* flags look ok - update the global security flags for cifs module */
extended_security = flags;
+	if (extended_security & CIFSSEC_MUST_SIGN) {
+		/* requiring signing implies signing is allowed */
+		extended_security |= CIFSSEC_MAY_SIGN;
-+		cFYI(1, ("packet signing now required"));
++		cFYI(1,("packet signing now required"));
+	} else if ((extended_security & CIFSSEC_MAY_SIGN) == 0) {
-+		cFYI(1, ("packet signing disabled"));
++		cFYI(1,("packet signing disabled"));
+	}
+	/* BB should we turn on MAY flags for other MUST options? */
return count;
@@ -117,12 +112,31 @@ index ebd1335..42fafa1 100644
-
-
#endif
-diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
-index 57419a1..4a2458e 100644
+Index: b/fs/cifs/cifsglob.h
+===================================================================
+--- a/fs/cifs/cifsglob.h
++++ b/fs/cifs/cifsglob.h
+@@ -1,7 +1,7 @@
+ /*
+  *   fs/cifs/cifsglob.h
+  *
+- *   Copyright (C) International Business Machines  Corp., 2002,2006
++ *   Copyright (C) International Business Machines  Corp., 2002,2007
+  *   Author(s): Steve French (sfrench@us.ibm.com)
+  *              Jeremy Allison (jra@samba.org)
+  *
+Index: b/fs/cifs/cifssmb.c
+===================================================================
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
-@@ -426,11 +426,11 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
+@@ -439,13 +439,17 @@ CIFSSMBNegotiate(unsigned int xid, struc
+ 	if (rc)
+ 		return rc;

++#ifdef CONFIG_CIFS_DEBUG2
++	cFYI(1, ("security flags 0x%x override flags 0x%x",
++		extended_security, ses->overrideSecFlg));
++#endif
/* if any of auth flags (ie not sign or seal) are overriden use them */
if(ses->overrideSecFlg & (~(CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL)))
-		secFlags = ses->overrideSecFlg;
@@ -134,14 +148,14 @@ index 57419a1..4a2458e 100644
+	cFYI(1, ("secFlags 0x%x", secFlags));

pSMB->hdr.Mid = GetNextMid(server);
- 	pSMB->hdr.Flags2 |= (SMBFLG2_UNICODE | SMBFLG2_ERR_STATUS);
-@@ -633,22 +633,32 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
+ 	pSMB->hdr.Flags2 |= SMBFLG2_UNICODE;
+@@ -648,22 +652,32 @@ CIFSSMBNegotiate(unsigned int xid, struc
#ifdef CONFIG_CIFS_WEAK_PW_HASH
signing_check:
#endif
-	if(sign_CIFS_PDUs == FALSE) {
-+	if ((secFlags & CIFSSEC_MAY_SIGN) == 0) {
-+		/* MUST_SIGN already includes the MAY_SIGN FLAG
++	if((secFlags & CIFSSEC_MAY_SIGN) == 0) {
++		/* MUST_SIGN already includes the MAY_SIGN FLAG
+		   so if this is zero it means that signing is disabled */
+		cFYI(1, ("Signing disabled"));
if(server->secMode & SECMODE_SIGN_REQUIRED)
@@ -153,25 +167,25 @@ index 57419a1..4a2458e 100644
server->secMode &=
~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
-	} else if(sign_CIFS_PDUs == 1) {
+-		if((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
+-			server->secMode &=
+-				~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
+-	} else if(sign_CIFS_PDUs == 2) {
+	} else if ((secFlags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN) {
+		/* signing required */
+		cFYI(1, ("Must sign - segFlags 0x%x", secFlags));
-+		if ((server->secMode &
-+			(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) {
-+			cERROR(1,
-+				("signing required but server lacks support"));
-+		} else
+ 		if((server->secMode &
+ 			(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) {
+ 			cERROR(1,("signing required but server lacks support"));
+-		}
++			rc = -EOPNOTSUPP;
++		} else
+			server->secMode |= SECMODE_SIGN_REQUIRED;
+	} else {
+		/* signing optional ie CIFSSEC_MAY_SIGN */
- 		if((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
- 			server->secMode &=
- 				~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
--	} else if(sign_CIFS_PDUs == 2) {
--		if((server->secMode &
--			(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) {
--			cERROR(1,("signing required but server lacks support"));
--		}
++		if((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
++			server->secMode &=
++				~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
}
+
neg_err_exit:
diff --git a/source/base/kernel/config b/source/base/kernel/config
index 1a2216d..35e2145 100644
--- a/source/base/kernel/config
+++ b/source/base/kernel/config
@@ -1149,7 +1149,7 @@ CONFIG_IDE_PROC_FS=y
#
# IDE chipset support/bugfixes
#
-CONFIG_IDE_GENERIC=y
+CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
CONFIG_BLK_DEV_CMD640_ENHANCED=y
CONFIG_BLK_DEV_IDEPNP=y
@@ -1157,7 +1157,7 @@ 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_GENERIC is not set
CONFIG_BLK_DEV_OPTI621=y
CONFIG_BLK_DEV_RZ1000=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
@@ -1179,7 +1179,7 @@ CONFIG_BLK_DEV_HPT34X=y
CONFIG_BLK_DEV_HPT366=y
CONFIG_BLK_DEV_JMICRON=y
CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_PIIX is not set
CONFIG_BLK_DEV_IT8213=y
CONFIG_BLK_DEV_IT821X=y
CONFIG_BLK_DEV_NS87415=m
diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh
index 41c3c63..055a9ad 100644
--- a/source/include/kernel-version.sh
+++ b/source/include/kernel-version.sh
@@ -16,5 +16,5 @@
# * _F_kernelver_stable: the number of the -stable patch to use (if any)
###
_F_kernelver_ver=2.6.22
-_F_kernelver_rel=5
-_F_kernelver_stable=6
+_F_kernelver_rel=6
+_F_kernelver_stable=9
From priyank at frugalware.org  Thu Oct  4 17:37:20 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 17:37:22 2007
Subject: [Frugalware-git] frugalware-current: slim-1.3.0-5-i686
Message-ID: <20071004153720.E1FEB13A4012@genesis.frugalware.org>

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

commit 51b679792762752271cc23a7d5b4dceb70a5c1ce
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 21:05:00 2007 +0530

slim-1.3.0-5-i686
* New default theme for 0.7 Sayshell

diff --git a/source/xfce4/slim/FrugalBuild b/source/xfce4/slim/FrugalBuild
index f58f911..a6723a7 100644
--- a/source/xfce4/slim/FrugalBuild
+++ b/source/xfce4/slim/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=slim
pkgver=1.3.0
-pkgrel=4
+pkgrel=5
pkgdesc="SLiM is a lightweight, Desktop-independent graphical login manager for X11."
depends=('libpng' 'libjpeg')
makedepends=('libx11' 'libxft' 'libxmu')
@@ -17,17 +17,17 @@ source=(${source[@]} \
slim.conf \
slim.install \
$pkgname-$pkgver-cflags.diff \
-	ftp://ftp.frugalware.org/pub/other/people/priyank/slim/frugalware.tar.bz2)
+	ftp://ftp.frugalware.org/pub/other/people/priyank/slim/frugalware-0.7.tar.bz2)
sha1sums=('f27f40c73a2f757f1ae32155bf0438c97be2c019' \
'98dcec8ae2d52ae9c9b5abcfa3d145882a0848bd' \
'a17849f628f4f74cf1bd48eea21a144f2f1a274d' \
'279111ffb45456f646250fb5e21eec53426c0a9b' \
-          'd2024f15d7a896b396db04605ea67c9573e939c2')
+          'bb38d2ca1ab7a8e0c7d8d7a98760d602974a5fef')

build()
{
Fbuild
-	Fcpr frugalware /usr/share/slim/themes/frugalware
+	Fcpr frugalware-0.7 /usr/share/slim/themes/frugalware
Fcpr slim.conf /etc/slim.conf
}
From vmiklos at frugalware.org  Thu Oct  4 17:41:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:13 2007
Subject: [Frugalware-git] frugalware-current: cdemu-0.8-26-i686
Message-ID: <20071004154111.802AB13A4012@genesis.frugalware.org>

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

commit 892befa07faa3e0f12108c48df12712ea980df71
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:39:56 2007 +0200

cdemu-0.8-26-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/apps-extra/cdemu/FrugalBuild b/source/apps-extra/cdemu/FrugalBuild
index 548b753..eccf891 100644
--- a/source/apps-extra/cdemu/FrugalBuild
+++ b/source/apps-extra/cdemu/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=cdemu
pkgver=0.8
-pkgrel=25
+pkgrel=26
pkgdesc="A kernel module designed to simulate a CD drive with just simple cue/bin files."
Finclude kernel-module
depends=(${depends[@]} 'python')
From vmiklos at frugalware.org  Thu Oct  4 17:41:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:43 2007
Subject: [Frugalware-git] frugalware-current: adm8211-20060111-28-i686
Message-ID: <20071004154111.C3D9413A4014@genesis.frugalware.org>

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

commit 01514cb06d854108b51594fc82842bcb71430449
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:00 2007 +0200

adm8211-20060111-28-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/adm8211/FrugalBuild b/source/network-extra/adm8211/FrugalBuild
index bad15a2..ab206d9 100644
--- a/source/network-extra/adm8211/FrugalBuild
+++ b/source/network-extra/adm8211/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=adm8211
pkgver=20060111
-pkgrel=27
+pkgrel=28
pkgdesc="IEEE 802.11 wireless LAN driver for adm8211 based cards"
url="http://aluminum.sourmilk.net/adm8211/"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:41:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:43 2007
Subject: [Frugalware-git] frugalware-current: rt2400-1.2.2_b3-10-i686
Message-ID: <20071004154112.26B1813A4012@genesis.frugalware.org>

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

commit 7be904fc4cab7fb8dc4d2bf8841b40474064c67f
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:01 2007 +0200

rt2400-1.2.2_b3-10-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/rt2400/FrugalBuild b/source/network-extra/rt2400/FrugalBuild
index 250ed79..c5d9c5d 100644
--- a/source/network-extra/rt2400/FrugalBuild
+++ b/source/network-extra/rt2400/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=rt2400
pkgver=1.2.2_b3
-pkgrel=9
+pkgrel=10
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"
From vmiklos at frugalware.org  Thu Oct  4 17:41:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:44 2007
Subject: [Frugalware-git] frugalware-current: rt2500-1.1.0_b4-28-i686
Message-ID: <20071004154112.4738A13A4013@genesis.frugalware.org>

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

commit da2e43fd787a9ede973a32a49cc0954baecfe6ad
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:03 2007 +0200

rt2500-1.1.0_b4-28-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/rt2500/FrugalBuild b/source/network-extra/rt2500/FrugalBuild
index f2d5eff..beb5b2d 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=27
+pkgrel=28
pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 and rt2500 chipsets."
_F_sourceforge_dirname="rt2400"
Finclude kernel-module sourceforge
From vmiklos at frugalware.org  Thu Oct  4 17:41:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:44 2007
Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-22-i686
Message-ID: <20071004154112.7537613A4012@genesis.frugalware.org>

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

commit 168b6818738099fca297e319be490c0dee4c5661
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:04 2007 +0200

qc-usb-0.6.6-22-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild
index 2df13cc..020ac7e 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=21
+pkgrel=22
pkgdesc="Quickcam kernel driver."
groups=('multimedia-extra')
archs=('i686' 'x86_64')
From vmiklos at frugalware.org  Thu Oct  4 17:41:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:44 2007
Subject: [Frugalware-git] frugalware-current: rlocate-0.5.6-4-i686
Message-ID: <20071004154112.A1EFC13A4013@genesis.frugalware.org>

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

commit e806033aed1ea2229ceb8ea700465c67f578d5ba
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:06 2007 +0200

rlocate-0.5.6-4-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/apps-extra/rlocate/FrugalBuild b/source/apps-extra/rlocate/FrugalBuild
index 6cb0907..0eac092 100644
--- a/source/apps-extra/rlocate/FrugalBuild
+++ b/source/apps-extra/rlocate/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=rlocate
pkgver=0.5.6
-pkgrel=3
+pkgrel=4
pkgdesc="rlocate is an implementation of the locate command"
Finclude kernel-module
depends=(${depends[@]} 'glibc' 'util-linux' 'psmisc')
From vmiklos at frugalware.org  Thu Oct  4 17:41:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:45 2007
Subject: [Frugalware-git] frugalware-current: ipw3945-1.2.2-4-i686
Message-ID: <20071004154112.C2B2013A4012@genesis.frugalware.org>

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

commit 663dda75f4532459a4d23452f63ab666d1fb1ba0
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:08 2007 +0200

ipw3945-1.2.2-4-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild
index c048830..b28ad58 100644
--- a/source/network-extra/ipw3945/FrugalBuild
+++ b/source/network-extra/ipw3945/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=ipw3945
pkgver=1.2.2
-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  Thu Oct  4 17:41:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:45 2007
Subject: [Frugalware-git] frugalware-current: dazuko-2.3.3-11-i686
Message-ID: <20071004154112.E231513A4013@genesis.frugalware.org>

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

commit a3134fe820242d84c16ccb6d03da5434beacbcca
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:09 2007 +0200

dazuko-2.3.3-11-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild
index 57633b2..7219141 100644
--- a/source/apps-extra/dazuko/FrugalBuild
+++ b/source/apps-extra/dazuko/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=dazuko
pkgver=2.3.3
-pkgrel=10
+pkgrel=11
pkgdesc="On-access virus scanning kernel interface"
url="http://www.dazuko.org"
license="GPL-2 BSD"
From vmiklos at frugalware.org  Thu Oct  4 17:41:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:45 2007
Subject: [Frugalware-git] frugalware-current: fglrx-8.40.4-5-i686
Message-ID: <20071004154111.A5B2613A4013@genesis.frugalware.org>

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

commit 0d311a6d26c45ac8f733a629f802ed18ed51efb5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:39:58 2007 +0200

fglrx-8.40.4-5-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild
index 5bea4ab..2266ad3 100644
--- a/source/x11-extra/fglrx/FrugalBuild
+++ b/source/x11-extra/fglrx/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=fglrx
pkgver=8.40.4
-pkgrel=4
+pkgrel=5
pkgdesc="Hardware Accelerated ATi driver for xorg"
url="http://www.ati.com/"
# libstdc++5: no hardware acceleration without it
From vmiklos at frugalware.org  Thu Oct  4 17:41:13 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:45 2007
Subject: [Frugalware-git] frugalware-current: nvidia-100.14.11-6-i686
Message-ID: <20071004154113.1732313A4012@genesis.frugalware.org>

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

commit c711ff5e27c177b55a65e04cede9916ffee1e0f5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:11 2007 +0200

nvidia-100.14.11-6-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild
index 192aaa4..8b38b09 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=nvidia
pkgver=100.14.11
-pkgrel=5
+pkgrel=6
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  Thu Oct  4 17:41:13 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:46 2007
Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.18-10-i686
Message-ID: <20071004154113.55AD513A4013@genesis.frugalware.org>

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

commit dca148ae24e6bf7b756db6f3f08fdc3cf7772a8a
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:12 2007 +0200

gspcav1-1.00.18-10-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild
index 33fb9ef..a0d5936 100644
--- a/source/multimedia-extra/gspcav1/FrugalBuild
+++ b/source/multimedia-extra/gspcav1/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gspcav1
pkgver=1.00.18
-pkgrel=9
+pkgrel=10
pkgdate=20070508
pkgdesc="One driver Upto 220 Webcams supported"
url="http://mxhaard.free.fr"
From vmiklos at frugalware.org  Thu Oct  4 17:41:14 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:46 2007
Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.48-2-i686
Message-ID: <20071004154114.6D90813A4013@genesis.frugalware.org>

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

commit e81547f84ad448df580c50e251ff4f478d160bf1
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:14 2007 +0200

ndiswrapper-1.48-2-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild
index 73f6ad5..92b892f 100644
--- a/source/network-extra/ndiswrapper/FrugalBuild
+++ b/source/network-extra/ndiswrapper/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=ndiswrapper
pkgver=1.48
-pkgrel=1
+pkgrel=2
pkgdesc="Wrapper for using Windows drivers for some wireless cards"
Finclude kernel-module sourceforge
unset install
From vmiklos at frugalware.org  Thu Oct  4 17:41:15 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:46 2007
Subject: [Frugalware-git] frugalware-current: lirc-0.8.2-8-i686
Message-ID: <20071004154115.79BB013A4014@genesis.frugalware.org>

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

commit 0cbfa1a63473cddb6fa1472057740f6dcd501d4e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:16 2007 +0200

lirc-0.8.2-8-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild
index 9f31430..f6099ab 100644
--- a/source/apps-extra/lirc/FrugalBuild
+++ b/source/apps-extra/lirc/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=lirc
pkgver=0.8.2
-pkgrel=7
+pkgrel=8
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  Thu Oct  4 17:41:16 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:47 2007
Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-15-i686
Message-ID: <20071004154116.77D0F13A4013@genesis.frugalware.org>

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

commit d47786d07e4db9042d090d8459d93ab8af502448
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:17 2007 +0200

kqemu-1.3.0pre11-15-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild
index d22a7d6..a80d899 100644
--- a/source/xapps-extra/kqemu/FrugalBuild
+++ b/source/xapps-extra/kqemu/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=kqemu
pkgver=1.3.0pre11
-pkgrel=14
+pkgrel=15
pkgdesc="QEMU Accelerator Module"
url="http://fabrice.bellard.free.fr/qemu/"
depends=('qemu')
From vmiklos at frugalware.org  Thu Oct  4 17:41:19 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:47 2007
Subject: [Frugalware-git] frugalware-current: rtl8110-1.07-2-i686
Message-ID: <20071004154119.7D15C13A4027@genesis.frugalware.org>

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

commit 18d74c7232abf8cdce0de71c022358c8d3da8c74
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:20 2007 +0200

rtl8110-1.07-2-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/rtl8110/FrugalBuild b/source/network-extra/rtl8110/FrugalBuild
index 82dda77..3ead1c5 100644
--- a/source/network-extra/rtl8110/FrugalBuild
+++ b/source/network-extra/rtl8110/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=rtl8110
pkgver=1.07
-pkgrel=1
+pkgrel=2
pkgdesc="Realtek driver(r1000) for RTL8169/8110 cards."
url="http://www.realtek.com.tw"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:41:21 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:47 2007
Subject: [Frugalware-git] frugalware-current: virtualbox-1.5.0-2-i686
Message-ID: <20071004154121.36A4613A4012@genesis.frugalware.org>

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

commit 2a06b7712c449013c0b8a4d2f9e80b840defea39
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:21 2007 +0200

virtualbox-1.5.0-2-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild
index 681d610..ec01db7 100644
--- a/source/xapps-extra/virtualbox/FrugalBuild
+++ b/source/xapps-extra/virtualbox/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=virtualbox
realname=VirtualBox
pkgver=1.5.0
-pkgrel=1
+pkgrel=2
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  Thu Oct  4 17:41:21 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:49 2007
Subject: [Frugalware-git] frugalware-current: nvidia-96xx-1.0_9639-8-i686
Message-ID: <20071004154121.7C8CB13A4013@genesis.frugalware.org>

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

commit 087124430ac438b47106882f63021dcd23d50b8c
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:23 2007 +0200

nvidia-96xx-1.0_9639-8-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild
index 88ed912..054f300 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=7
+pkgrel=8
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  Thu Oct  4 17:41:21 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:49 2007
Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-9-i686
Message-ID: <20071004154121.CC5ED13A4012@genesis.frugalware.org>

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

commit e8ae065decaa78feaca0dd6a3fe857f033786af4
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:25 2007 +0200

wlan-ng-0.2.8-9-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild
index b74be27..6ccb8c4 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=8
+pkgrel=9
pkgdesc="Wireless Lan modules"
url="http://www.linux-wlan.org/"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:41:22 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:49 2007
Subject: [Frugalware-git] frugalware-current: acx100-0.3.36-16-i686
Message-ID: <20071004154122.574A613A4017@genesis.frugalware.org>

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

commit d7ba9f13ffa402d624b743e9034826ed44cc7170
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:28 2007 +0200

acx100-0.3.36-16-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild
index d960213..b260aa3 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=15
+pkgrel=16
pkgdesc="The ACX100/ACX111 wireless network driver."
url="http://www.cmartin.tk/acx"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:41:22 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:50 2007
Subject: [Frugalware-git] frugalware-current: acerhk-0.5.34-6-i686
Message-ID: <20071004154122.0F42E13A4012@genesis.frugalware.org>

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

commit d9fd5642b8dce96ac49625e80dfd1ce4c702d275
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:26 2007 +0200

acerhk-0.5.34-6-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild
index 304ef64..6c402dc 100644
--- a/source/apps-extra/acerhk/FrugalBuild
+++ b/source/apps-extra/acerhk/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=acerhk
pkgver=0.5.34
-pkgrel=5
+pkgrel=6
pkgdesc="Acer Hotkey driver for Linux"
url="http://www.cakey.de/acerhk/"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:41:23 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:50 2007
Subject: [Frugalware-git] frugalware-current: madwifi-0.9.3.2-4-i686
Message-ID: <20071004154123.8549213A4012@genesis.frugalware.org>

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

commit 59bf34522f4de2d27af74c6f21304094bd0ed98f
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:32 2007 +0200

madwifi-0.9.3.2-4-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild
index af966aa..3e59ff4 100644
--- a/source/network/madwifi/FrugalBuild
+++ b/source/network/madwifi/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=madwifi
pkgver=0.9.3.2
-pkgrel=3
+pkgrel=4
pkgdesc="Madwifi drivers for Atheros wireless chipsets"
url="http://madwifi.sourceforge.net/"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:41:22 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:41:51 2007
Subject: [Frugalware-git] frugalware-current: truecrypt-4.3-12-i686
Message-ID: <20071004154122.EB71913A4078@genesis.frugalware.org>

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

commit 7179056dd58c1476e80bd7ed1c7a98dcf5db92fd
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:40:30 2007 +0200

truecrypt-4.3-12-i686
rebuilt with kernel-2.6.22-6

diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild
index 8096252..c30d5de 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=11
+pkgrel=12
pkgdesc="A free open-source disk encryption software"
url="http://www.truecrypt.org/"
Finclude kernel-module
From vmiklos at frugalware.org  Thu Oct  4 17:45:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:45:47 2007
Subject: [Frugalware-git] homepage-ng: correct title
Message-ID: <20071004154546.6962C13A4012@genesis.frugalware.org>

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

commit 2419da78264f9f6f02a9983a43a6c26ace210c97
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:45:40 2007 +0200

correct title

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index b6f25eb..d63b63a 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -18,7 +18,7 @@
<news>
<post>
<id>75</id>
-		<title>Kernel update in -current: WARNING for Intel users</title>
+		<title>Kernel update in -current: WARNING for Intel users with IDE controllers</title>
<date>Thu Oct  4 15:08:53 UTC 2007</date>
<author>VMiklos</author>
<hidden>0</hidden>
From vmiklos at frugalware.org  Thu Oct  4 17:53:25 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 17:53:28 2007
Subject: [Frugalware-git] homepage-ng: news_hu: sync with news
Message-ID: <20071004155325.0801C13A4012@genesis.frugalware.org>

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

commit cef142d4c81d0787f20f91e6e347c16d3d47a4d1
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 17:53:19 2007 +0200

news_hu: sync with news

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index 452b86d..9f8ef98 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -12,6 +12,24 @@
]>
<news>
<post>
+		<id>75</id>
+		<title>Kernel frissítés a -currentben: FIGYELMEZTETÉS az Intel IDE verérlőt használóknak</title>
+		<date>Thu Oct  4 15:08:53 UTC 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+						A kernel-2.6.22-5 csomagra frissítve a Frugalware-currentben az Intel felhasználóknak /dev/sd* eszközei lesznek a régi /dev/hd* helyett. Ennek a változtatásnak az oka, hogy néhány gépen a régi kernel nem tudott betöltődni. <a href="http://bugs.frugalware.org/2243">Ez a hibajegy</a> ad további információt a problémával kapcsolatban. Tehát miután frissített a pacman -Syu használatával:
+						<ol>
+										<li>Vizsgálja me, hogy használ-e Intel IDE vezérlőt a sudo lspci |grep -i intel.*ide parancs használatával. Ha a parancs nem ad kimenetet, akkor valószínűleg a számítógép nem érintett.</li>
+										<li>Szerkessze a /etc/fstab-ot: cserĂŠlje az Ăśsszes /dev/hd-t /dev/sd-re.</li>
+										<li>Szerkessze a /boot/grub/menu.lst-t: cserĂŠlje az Ăśsszes /dev/hd-t /dev/sd-re a Frugalware bejegyzĂŠsben.</li>
+										<li>IndĂ­tsa Ăşjra a szĂĄmĂ­tĂłgĂŠpet.</li>
+						</ol>
+						KĂśszĂśnjĂźk megĂŠrtĂŠsĂŠt!
+			]]>
+		</content>
+	</post>
+	<post>
<id>74</id>
<title>Megjelent a Frugalware 0.7rc2 (Sayshell)</title>
<date>Tue Oct  2 12:28:34 CEST 2007</date>
From vmiklos at frugalware.org  Thu Oct  4 18:14:19 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 18:14:23 2007
Subject: [Frugalware-git] frugalware-current: quota-tools-3.15-3-i686
Message-ID: <20071004161419.BAA1013A4012@genesis.frugalware.org>

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

commit 695919e845a39c7215b28132e22c534e17befaef
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 18:14:05 2007 +0200

quota-tools-3.15-3-i686
- convert old broken rc script to Frcd2
- add missing README.Frugalware documentation on how to use quotas under
Frugalware

diff --git a/source/apps/quota-tools/FrugalBuild b/source/apps/quota-tools/FrugalBuild
index b1ec5e4..9b99e45 100644
--- a/source/apps/quota-tools/FrugalBuild
+++ b/source/apps/quota-tools/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=quota-tools
pkgver=3.15
-pkgrel=2
+pkgrel=3
pkgdesc="Linux disk quota utilities"
url="http://sourceforge.net/projects/linuxquota/"
depends=('e2fsprogs')
@@ -11,20 +11,22 @@ groups=('apps')
archs=('i686' 'x86_64')
_F_sourceforge_name=linuxquota
Finclude sourceforge
-source=(${source/linuxquota-/quota-} rc.quota)
+source=(${source/linuxquota-/quota-} rc.quota README.Frugalware)
sha1sums=('3a1ea8d48910ef760950e2c2e236e9c2e44dea3a' \
-          'bfd62292fe953bf00d2f19a9a2496d085d151aac')
+          '6f4d07646a627544194324af9ea1c9758ebea306' \
+          '5c16336dce569446d9df7ce7a70c951f2b9a2af4')

build()
{
Fcd $pkgname
Fmake --sysconfdir=/etc || return 1
make ROOTDIR=$Fdestdir install || return 1
-	Frcd quota
+	Frcd2 quota
# remove conflicts: glibc and nfs-utils
Frm /usr/include/rpcsvc/rquota.{h,x}
Frm /usr/share/man/man{2/quotactl.2,8/rquotad.8}
Frm /usr/sbin/rpc.rquotad
+	Fdoc README.Frugalware
}

# optimization OK
diff --git a/source/apps/quota-tools/README.Frugalware b/source/apps/quota-tools/README.Frugalware
new file mode 100644
index 0000000..3b3e13f
--- /dev/null
+++ b/source/apps/quota-tools/README.Frugalware
@@ -0,0 +1,17 @@
+To really activate quotas, you'll need to add `usrquota` to the appropriate
+partitions as listed in `/etc/fstab`.  Here's an example:
+
+----
+/dev/hda2   /home   ext2   defaults,usrquota    1   1
+----
+
+When you want quota support for a given partition, some special files have to
+be created boot-time. This is not done by default. To do so, you need to
+
+----
+# touch /var/lib/quota/new
+----
+
+then, reboot to create those files.
+
+To edit user quotas, use `edquota`.  See `man edquota`.
diff --git a/source/apps/quota-tools/messages/quota.en b/source/apps/quota-tools/messages/quota.en
deleted file mode 100644
index f9becae..0000000
--- a/source/apps/quota-tools/messages/quota.en
+++ /dev/null
@@ -1,2 +0,0 @@
-stopquota="Turning off filesystem quotas"
-startquota="Activating filesystem quotas"
diff --git a/source/apps/quota-tools/messages/quota.hu b/source/apps/quota-tools/messages/quota.hu
deleted file mode 100644
index e7fb439..0000000
--- a/source/apps/quota-tools/messages/quota.hu
+++ /dev/null
@@ -1,2 +0,0 @@
-stopquota="Kvóták kikapcsolása"
-startquota="Kvóták bekapcsolása"
diff --git a/source/apps/quota-tools/quota-tools.install b/source/apps/quota-tools/quota-tools.install
index a0af513..925368c 100644
--- a/source/apps/quota-tools/quota-tools.install
+++ b/source/apps/quota-tools/quota-tools.install
@@ -11,5 +11,3 @@ pre_remove()
op=$1
shift
$op $*
-
-# vim: ft=sh
diff --git a/source/apps/quota-tools/rc.quota b/source/apps/quota-tools/rc.quota
index 4ee773f..8e24837 100644
--- a/source/apps/quota-tools/rc.quota
+++ b/source/apps/quota-tools/rc.quota
@@ -1,40 +1,127 @@
-#!/bin/sh
+#!/bin/bash

-# (c) 2003 Vajna Miklos <vmiklos@frugalware.org>
-# (c)      Patrick J. Volkerding, <volkerdi@slackware.com>
-# rc.quota for FrugalWare
+# (c) 2007 CSÉCSY László <boobaa@frugalware.org>
+# rc.quota for Frugalware
# distributed under GPL License

-. /etc/rc.d/rc.functions
-
# chkconfig: 345 55 60
# description: Check quotas and then turn quota system on/off

-# To really activate quotas, you'll need to add 'usrquota' to the appropriate
-# partitions as listed in /etc/fstab.  Here's an example:
-# 	/dev/hda2   /home   ext2   defaults,usrquota    1   1
-# You'll then need to setup initial quota files at the top of the partitions
-# to support quota, like this:
-# 	touch /home/quota.user /home/quota.group
-# 	chmod 600 /home/quota.user /home/quota.group
-# Then, reboot to activate the system.
-# To edit user quotas, use 'edquota'.  See 'man edquota'.
-
-if [ "$1" = "stop" ]; then
-	stop "$stopquota"
-	if fgrep quota /etc/fstab 1> /dev/null 2> /dev/null ; then
-		quotaoff -a
+source /lib/initscripts/functions
+TEXTDOMAIN=quota
+TEXTDOMAINDIR=/lib/initscripts/messages
+
+actions=(start stop)
+daemon=$"quota service"
+
+# names of binaries
+check=/usr/sbin/quotacheck
+on=/usr/sbin/quotaon
+off=/usr/sbin/quotaoff
+quotaisoff=/var/lib/quota/off
+quotaisnew=/var/lib/quota/new
+
+ALLFLAGS=-aug            #hint: --all --user --group
+CHECKFLAGS=${ALLFLAGS}m  #hint: --no-remount
+USERFLAGS=-uc            #hint: --create-files
+GROUPFLAGS=-gc           #hint: --create-files
+
+# create list of all fs with quota
+scan_fstab()
+{
+        tmplist=`grep "^[ ]*[^#].*$1" /etc/fstab | \
+              sed -e 's/\(^[[:space:]]*[^[:space:]]*[[:space:]]*[^[:space:]]*[[:space:]]*[^[:space:]]*\).*/\1/g' \
+                  -e 's/^[[:space:]]*[^[:space:]]*[[:space:]]*//g'`
+        list=${tmplist:=empty}
+}
+
+
+rc_start()
+{
+	start_msg
+	# Check if quota already has been enabled
+	if ! quotaon -ap|grep -q "is off"; then #hint: --all --print-state
+		ok 999
+		exit 0
fi
-	ok $?
-elif [ "$1" = "restart" ]; then
-	"$0" stop
-	sleep 1
-	"$0" start
-else # start
-	start "$startquota"
-	if fgrep quota /etc/fstab 1> /dev/null 2> /dev/null ; then
-		quotacheck -avugM
-		quotaon -avug
+	ok 0
+
+	# Check all filesystems if quota is new or wasn't shut down correctly
+	msg $"Checking quotas..."
+	if [ -x $check ] && ( [ ! -f $quotaisoff ] || [ -f $quotaisnew ] ); then
+		$check $CHECKFLAGS || $check -c $CHECKFLAGS #hint: --create-files
+		check_ok=997
+	else
+		check_ok=0
+		# if some filesystems are new check just these filesystems
+		scan_fstab "usrquota"
+		set -- $list
+
+		while [ $# -ge 2 ]
+		do
+			if [ "$2" != "xfs" ]
+			then
+				if test ! -e $1/quota.user && test ! -e $1/aquota.user; then
+					ok 1
+					msg $"Warning: user quota not configured in filesystem" "\`$1.'"
+					check_ok=999
+				elif test ! -e $1/aquota.user; then
+					test ! -s $1/quota.user && $check $USERFLAGS $1
+					check_ok=$?
+				elif test ! -s $1/aquota.user; then
+					$check $USERFLAGS $1
+					check_ok=$?
+				fi
+			fi
+			shift; shift
+		done
+
+		scan_fstab "grpquota"
+		set $list
+
+		while [ $# -ge 2 ]
+		do
+			if [ "$2" != "xfs" ]
+			then
+				if test ! -e $1/quota.group && test ! -e $1/aquota.group; then
+					ok 1
+					msg $"Warning: group quota not configured in filesystem" "\`$1.'"
+					check_ok=999
+				elif test ! -e $1/aquota.group; then
+					test ! -s $1/quota.group && $check $GROUPFLAGS $1
+					check_ok=$?
+				elif test ! -s $1/aquota.group; then
+					$check $GROUPFLAGS $1
+					check_ok=$?
+				fi
+			fi
+			shift; shift
+		done
fi
+	ok $check_ok
+
+	# Remove quota-off and quota-new files
+	rm -f $quotaisoff $quotaisnew
+
+	# Turn quotas on.
+	if [ -x $on ]
+	then
+		msg $"Turning on quotas"
+		$on $ALLFLAGS
+	fi
+	ok $?
+}
+
+rc_stop()
+{
+	stop_msg $"Turning off quotas"
+        if [ -x $off ]
+        then
+                $off $ALLFLAGS || true
+                # Create quota-on file
+                touch $quotaisoff
+        fi
ok $?
-fi
+}
+
+rc_exec $1
From priyank at frugalware.org  Thu Oct  4 18:46:07 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 18:46:09 2007
Subject: [Frugalware-git] frugalware-current: xfce4-session-4.4.1-4-i686
Message-ID: <20071004164607.2BBB413A4012@genesis.frugalware.org>

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

commit 22cb5e445ae20fb1ff4f919dc51bd8476539cce6
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 22:13:43 2007 +0530

xfce4-session-4.4.1-4-i686
* Added a new splash screen for Sayshell (Thanks raozuzu)

diff --git a/source/xfce4/xfce4-session/FrugalBuild b/source/xfce4/xfce4-session/FrugalBuild
index 11392d8..c68a958 100644
--- a/source/xfce4/xfce4-session/FrugalBuild
+++ b/source/xfce4/xfce4-session/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=xfce4-session
pkgver=4.4.1
-pkgrel=3
+pkgrel=4
pkgdesc="A session manager for Xfce4."
url="http://www.xfce.org/"
depends=('libsm' 'libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1' \
@@ -22,7 +22,7 @@ source=(${source[@]} \
xfce4-session-suspend_hibernate.patch xfce4-session_icons.patch xfce4-session xfce4.desktop)
Fconfopts="$Fconfopts --with-shutdown-style=hal --with-x"
sha1sums=('05a47d55830a9f9b91498a6a3fd1bf3eb197d42a' \
-          'b1afae197de7aff960a6a49d60a42f32ef7037a3' \
+          '4454c513ffed8fbb0647887d380cb78720d0aaa7' \
'ecaf290e94eea48812c189108532b81f28b15879' \
'84e0eb59643910a81a501af844ae510f12848093' \
'd99d32e3dfb82ace51fd0ca6699b57078ad350fd' \
From priyank at frugalware.org  Thu Oct  4 18:49:54 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 18:49:56 2007
Subject: [Frugalware-git] frugalware-current: xfce-frugalware-0.4-1-i686
Message-ID: <20071004164954.2C67A13A4012@genesis.frugalware.org>

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

commit 402e09facea70b65bcbd3dd03cdf4ab826557f02
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 22:17:48 2007 +0530

xfce-frugalware-0.4-1-i686
* Version bump
* Added a new wallpaper for 0.7 Sayshell (Thanks raozuzu)

diff --git a/source/xfce4/xfce-frugalware/FrugalBuild b/source/xfce4/xfce-frugalware/FrugalBuild
index 9686a97..9a504ce 100644
--- a/source/xfce4/xfce-frugalware/FrugalBuild
+++ b/source/xfce4/xfce-frugalware/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=xfce-frugalware
-pkgver=0.3
-pkgrel=3
+pkgver=0.4
+pkgrel=1
pkgdesc="Default Xfce artwork for Frugalware."
url="http://frugalware.org/"
rodepends=('gtk+2-engines' 'gtk+2-theme-frugalware' 'gtk+2-engines-rezlooks' 'tango-icon-theme')
@@ -12,7 +12,7 @@ groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
up2date="$pkgver"
source=(http://frugalware.org/~priyank/$pkgname-$pkgver.tar.bz2)
-sha1sums=('2c2ec25f609bfcbd7f5e6cf166a99c06a4cf37cb')
+sha1sums=('87ebdee4a7dbbf0f898e02b844288d1df2db047b')

build()
{
From priyank at frugalware.org  Thu Oct  4 18:56:04 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 18:56:06 2007
Subject: [Frugalware-git] frugalware-current: xfce-mcs-plugins-4.4.1-2-i686
Message-ID: <20071004165604.1414513A4012@genesis.frugalware.org>

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

commit 8e18290b885ea35dec201427198628857fc0138c
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 4 22:23:58 2007 +0530

xfce-mcs-plugins-4.4.1-2-i686
* updated xfce-frugalware depends to 0.4

diff --git a/source/xfce4/xfce-mcs-plugins/FrugalBuild b/source/xfce4/xfce-mcs-plugins/FrugalBuild
index 4856ee2..f10b6fb 100644
--- a/source/xfce4/xfce-mcs-plugins/FrugalBuild
+++ b/source/xfce4/xfce-mcs-plugins/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=xfce-mcs-plugins
pkgver=4.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A set of plugins for the Xfce multi channel settings manager."
depends=('libxfce4mcs>=4.4.1' 'libxfcegui4>=4.4.1' \
-		'xfce-frugalware' 'xfce-mcs-manager>=4.4.1')
+		'xfce-frugalware>=0.4' 'xfce-mcs-manager>=4.4.1')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
Finclude xfce4
From priyank at frugalware.org  Thu Oct  4 20:33:45 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 20:33:48 2007
Subject: [Frugalware-git] frugalware-current: thunderbird-2.0.0.6-2-i686
Message-ID: <20071004183345.471FF13A4012@genesis.frugalware.org>

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

commit f3907ff7695e67e779dcca2ea7b926e1dd102f75
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 5 00:02:23 2007 +0530

thunderbird-2.0.0.6-2-i686
* thunderbird.desktop: Added XFCE to OnlyShowIn list so that thunderbird icon is also displayed in Xfce

diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild
index 536cfdf..394dfe7 100644
--- a/source/xapps/thunderbird/FrugalBuild
+++ b/source/xapps/thunderbird/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=thunderbird
pkgver=2.0.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="Mozilla Thunderbird mail and newsgroup client"
url="http://www.mozilla.org/products/thunderbird/"
depends=('gtk+2>=2.10.11' 'nss>=3.11.5' 'pango>=1.16.2' 'cairo>=1.4.4' 'libstdc++' 'libxt' 'libidl' 'libxcb')
diff --git a/source/xapps/thunderbird/thunderbird.desktop b/source/xapps/thunderbird/thunderbird.desktop
index 75b4298..b35b46a 100644
--- a/source/xapps/thunderbird/thunderbird.desktop
+++ b/source/xapps/thunderbird/thunderbird.desktop
@@ -11,6 +11,6 @@ StartupNotify=false
Terminal=false
Type=Application
Icon=thunderbird.png
-OnlyShowIn=GNOME;
+OnlyShowIn=GNOME;XFCE;
Categories=Application;Network;
StartupWMClass=Thunderbird-bin
From priyank at frugalware.org  Thu Oct  4 20:56:16 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct  4 20:56:21 2007
Subject: [Frugalware-git] gfpm: gfpm-interface.c
Message-ID: <20071004185616.2E7DC13A4012@genesis.frugalware.org>

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

commit e10aed19ba4d9f8d800be7f8a1487c2c55645fd8
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 5 00:25:02 2007 +0530

gfpm-interface.c
* Don't cast references returned by gtk_builder_get_object() to G_OBJECT during g_signal_connect()
gtk_builder_get_object() already returns a G_OBJECT

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 5c621a8..06fe702 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -243,22 +243,22 @@ gfpm_interface_init (void)
gfpm_populate_repos_combobox (GTK_COMBO_BOX(widget));

/* search */
-	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "search_entry1")), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL);
+	g_signal_connect (gtk_builder_get_object(xml, "search_entry1"), "key-release-event", G_CALLBACK(cb_gfpm_search_keypress), NULL);

/* about */
-	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "about_gfpm1")), "activate", G_CALLBACK(gfpm_about), NULL);
+	g_signal_connect (gtk_builder_get_object(xml, "about_gfpm1"), "activate", G_CALLBACK(gfpm_about), NULL);

/* aply */
-	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "button_apply")), "clicked", G_CALLBACK(cb_gfpm_apply_btn_clicked), NULL);
+	g_signal_connect (gtk_builder_get_object(xml, "button_apply"), "clicked", G_CALLBACK(cb_gfpm_apply_btn_clicked), NULL);

/* refresh db */
-	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "button_refresh1")), "clicked", G_CALLBACK(cb_gfpm_refresh_button_clicked), NULL);
+	g_signal_connect (gtk_builder_get_object(xml, "button_refresh1"), "clicked", G_CALLBACK(cb_gfpm_refresh_button_clicked), NULL);

/* clear cache dialog */
-	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "rem_apply")), "clicked", G_CALLBACK(cb_gfpm_clear_cache_apply_clicked), NULL);
+	g_signal_connect (gtk_builder_get_object(xml, "rem_apply"), "clicked", G_CALLBACK(cb_gfpm_clear_cache_apply_clicked), NULL);

/* install from file */
-	g_signal_connect (G_OBJECT(gtk_builder_get_object(xml, "inst_from_file_install")), "clicked", G_CALLBACK(cb_gfpm_install_file_clicked), NULL);
+	g_signal_connect (gtk_builder_get_object(xml, "inst_from_file_install"), "clicked", G_CALLBACK(cb_gfpm_install_file_clicked), NULL);

/* Disable Apply, Refresh and File buttons if user is not root */
if ( geteuid() != 0 )
From boobaa at frugalware.org  Thu Oct  4 22:32:07 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Thu Oct  4 22:32:10 2007
Subject: [Frugalware-git] frugalware-current: xmoto-0.3.3-2-i686
Message-ID: <20071004203207.ADF9313A4013@genesis.frugalware.org>

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

commit 3e6c5492b7fd09e3cca37520b76638c4d1268dfe
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Thu Oct 4 22:31:37 2007 +0200

xmoto-0.3.3-2-i686
install the .desktop file & co
closes #2465

diff --git a/source/games-extra/xmoto/FrugalBuild b/source/games-extra/xmoto/FrugalBuild
index 6ecec37..5981804 100644
--- a/source/games-extra/xmoto/FrugalBuild
+++ b/source/games-extra/xmoto/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=xmoto
pkgver=0.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A challenging 2D motocross platform game."
url="http://xmoto.tuxfamily.org/"
depends=('sdl' 'libogg' 'libvorbis' 'libjpeg' 'ode' 'sdl_mixer' 'libpng' 'freeglut' 'curl' 'lua' 'sqlite3' 'sdl_ttf')
@@ -12,5 +12,13 @@ archs=('i686' 'x86_64')
up2date="lynx -dump http://xmoto.tuxfamily.org/dev/ChangeLog | grep -m1 'X-Moto' | sed 's/.* \(.*\) .*/\1/'"
source=(http://download.tuxfamily.org/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tar.gz)

+build()
+{
+	Fbuild
+	cd extra || Fdie
+	Fmkdir usr/share/applications
+	Ffilerel xmoto.desktop /usr/share/applications/
+	Ficonrel xmoto.xpm
+}
# optimization OK
sha1sums=('0c086845537d3376f6b83b47833cf07d25725684')
From boobaa at frugalware.org  Thu Oct  4 23:13:49 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Thu Oct  4 23:13:52 2007
Subject: [Frugalware-git] frugalware-current: shadow-4.0.18.1-8-i686
Message-ID: <20071004211349.9239513A4013@genesis.frugalware.org>

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

commit dbf396286c16fa6baf6ea22f402a02c6e4c493a0
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Thu Oct 4 23:13:27 2007 +0200

shadow-4.0.18.1-8-i686
fix setting the realname for a user in non-interactive mode
thanks alex for pointing out this bug
ok by vmiklos@

diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild
index 8bca550..a03d001 100644
--- a/source/base/shadow/FrugalBuild
+++ b/source/base/shadow/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=shadow
pkgver=4.0.18.1
-pkgrel=7
+pkgrel=8
pkgdesc="Shadow password file utilities"
url="http://shadow.pld.org.pl"
backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits)
@@ -34,7 +34,7 @@ build()
}

sha1sums=('1a30458e9db05560bfc82529048bd5d60b45cf9b' \
-          'fa57c052143beaac183d6b500f78790e3616363e' \
+          'd02dcaea4dc78d7feab23baae57f9a0a77db457f' \
'fcdfccf5e6741d2f310e18c2bfa26b205832240a' \
'e1554d118f582a978b4b14c348c155af957a1368' \
'a70e741ccea2d2f81b25b8b608a5fc3d3ab83ebe' \
diff --git a/source/base/shadow/adduser b/source/base/shadow/adduser
index 320811f..ac648cf 100644
--- a/source/base/shadow/adduser
+++ b/source/base/shadow/adduser
@@ -439,7 +439,7 @@ if [ $? -gt 0 ]; then
echo "- Warning: an error occurred while setting finger information"
fi
else
-$chfn -f "$2"
+$chfn -f "$2" "$LOGIN"
fi

# Set a password
From vmiklos at frugalware.org  Thu Oct  4 23:30:22 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Thu Oct  4 23:30:24 2007
Subject: [Frugalware-git] frugalware-current: ruby-1.8.6-4-i686
Message-ID: <20071004213022.52A4913A4013@genesis.frugalware.org>

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

commit c898c1f49c0cb8e030efe644d2eef1d097428d04
Author: VMiklos <vmiklos@frugalware.org>
Date:   Thu Oct 4 23:30:01 2007 +0200

ruby-1.8.6-4-i686
update to patchlevel '111'
closes #2459

diff --git a/source/devel/ruby/FrugalBuild b/source/devel/ruby/FrugalBuild
index 3e6a1a2..87d650c 100644
--- a/source/devel/ruby/FrugalBuild
+++ b/source/devel/ruby/FrugalBuild
@@ -4,8 +4,8 @@

pkgname=ruby
pkgver=1.8.6
-pkgextraver=-p110
-pkgrel=3
+pkgextraver=-p111
+pkgrel=4
pkgdesc="An object-oriented programming language."
url="http://www.ruby-lang.org/"
depends=('termcap' 'zlib' 'db>=4.6.18' 'readline' 'openssl' 'gdbm')
@@ -14,7 +14,7 @@ groups=('devel')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.ruby-lang.org/en/downloads/ |grep tar.gz |sed -ne 's/.*y-\(.*\).tar.*/\1/;1p' |sed s/$pkgextraver//"
source=(ftp://ftp.ruby-lang.org/pub/ruby/ruby-${pkgver}${pkgextraver}.tar.bz2)
-sha1sums=('b9c980dabd6c99f3663d463a586b18f2637c9e5b')
+sha1sums=('d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f')

build() {
Fbuild --enable-shared --enable-pthread \
From crazy at frugalware.org  Thu Oct  4 23:46:33 2007
From: crazy at frugalware.org (crazy)
Date: Thu Oct  4 23:46:37 2007
Subject: [Frugalware-git] frugalware-current: xchat-2.8.4-3-i686
Message-ID: <20071004214633.BA01713A4013@genesis.frugalware.org>

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

commit 40e6e02c17a9964d93b65bad58ea9066b41efbc6
Author: crazy <crazy@frugalware.org>
Date:   Thu Oct 4 23:40:58 2007 +0200

xchat-2.8.4-3-i686
* relbump
* fixed issue with fonts being too small by default
* thx Alex for reporting this

diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild
index b9758a0..6456fc5 100644
--- a/source/xapps/xchat/FrugalBuild
+++ b/source/xapps/xchat/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=xchat
pkgver=2.8.4
-pkgrel=2
+pkgrel=3
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')
@@ -29,7 +29,11 @@ subdepends=('xchat python perl tcl')
subgroups=('xapps')
subarchs=('i686 x86_64')

-build() {
+build()
+{
+	Fcd
+	# fix issue with fonts being too small  by default
+	Fsed "Monospace 9" "Monospace 11" src/common/cfgfiles.c
Fbuild --localstatedir=/var/lib --enable-ipv6 --enable-tcl \
--enable-openssl --enable-perl --enable-python --enable-spell=libsexy
# Needed for plugin development
From vmiklos at frugalware.org  Fri Oct  5 00:00:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 00:00:48 2007
Subject: [Frugalware-git] bmf: git-1.5.3.2.111.g5166-1-i686
Message-ID: <20071004220046.77DA913A4013@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=38ccdb19ac531a37a1e8857db7434f5769ac3da9

commit 38ccdb19ac531a37a1e8857db7434f5769ac3da9
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 00:00:41 2007 +0200

git-1.5.3.2.111.g5166-1-i686
nobuild, newer version in -current

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index b72c3c3..d5821eb 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -19,7 +19,7 @@ if ! Fuse $USE_DEVEL; then
signatures=(${source[0]}.sign '' '' '')
fi
source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware)
-options=('scriptlet')
+options=('scriptlet' 'nobuild')

subpkgs=('gitweb' 'git-gui' 'gitk')
subdescs=('Web interface for Git.' 'Git GUI tool.' 'Git revision tree visualiser.')
From vmiklos at frugalware.org  Fri Oct  5 01:57:03 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 01:57:06 2007
Subject: [Frugalware-git] pacman-g2: cb_trans_evt() fix output for LOCAL
	files
Message-ID: <20071004235703.277A913A4013@genesis.frugalware.org>

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

commit 5e0c759d50e2eb629a08ebc1944ebfe6b452c9c5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 01:26:36 2007 +0200

cb_trans_evt() fix output for LOCAL files

diff --git a/src/pacman-g2/trans.c b/src/pacman-g2/trans.c
index 7c96414..cfb01f8 100644
--- a/src/pacman-g2/trans.c
+++ b/src/pacman-g2/trans.c
@@ -37,6 +37,7 @@
#include "trans.h"
#include "list.h"
#include "conf.h"
+#include "download.h"

#define LOG_STR_LEN 256

@@ -161,7 +162,8 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2)
fflush(stdout);
break;
case PM_TRANS_EVT_RETRIEVE_LOCAL:
-			MSG(NL, " %s [", (char*)data1);
+			STRNCPY(str, (char*)data1, DLFNM_PROGRESS_LEN);
+			MSG(NL, " %s [", str);
STRNCPY(out, (char*)data2, maxcols-42);
MSG(CL, "%s", out);
for(i = strlen(out); i < maxcols-43; i++) {
From vmiklos at frugalware.org  Fri Oct  5 02:00:19 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 02:00:21 2007
Subject: [Frugalware-git] frugalware-current: git-1.5.3.4-1-i686
Message-ID: <20071005000019.3A0A413A4013@genesis.frugalware.org>

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

commit 5032043d92c2bb048be439cc2c6c618826ac4cd3
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 02:00:01 2007 +0200

git-1.5.3.4-1-i686
bump to newer maintainance release. fixes a nice git ls-files segfault

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index 64a42ae..b5f9ba0 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=git
-pkgver=1.5.3.3
+pkgver=1.5.3.4
Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2
pkgrel=1
pkgdesc="A fast, scalable, distributed revision control system."
From vmiklos at frugalware.org  Fri Oct  5 02:09:33 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 02:09:34 2007
Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.3-2-i686
Message-ID: <20071005000933.5EE6713A4013@genesis.frugalware.org>

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

commit 2ad66407eaa7bc53bbb0f9381f0f18eb9c2b4636
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 02:09:20 2007 +0200

pacman-g2-3.6.3-2-i686
the output was horrible when using file:/// mirrors
added a patch from git to fix the issue

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 080cbb9..5cd9bf4 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=pacman-g2
pkgver=3.6.3
Fuse $USE_DEVEL && pkgver=3.6.2.10.g928a3ae
-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})
@@ -18,8 +18,9 @@ groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump $url/releases/ |Flasttar"
if ! Fuse $USE_DEVEL; then
-	source=($url/releases/$pkgname-$pkgver.tar.gz)
-	signatures=("$source.asc")
+	source=($url/releases/$pkgname-$pkgver.tar.gz \
+		http://git.frugalware.org/patches/pacman-g2/5e0c759d50e2eb629a08ebc1944ebfe6b452c9c5.patch)
+	signatures=("$source.asc" '')
else
_F_scm_type="git"
_F_scm_url="http://git.frugalware.org/repos/pacman-g2/.git/"
From vmiklos at frugalware.org  Fri Oct  5 02:23:18 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 02:23:21 2007
Subject: [Frugalware-git] bmf: pacman-g2-3.6.3.10.g5e0c759-1-i686
Message-ID: <20071005002318.EFF6413A4013@genesis.frugalware.org>

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

commit ce3b98c3502cfa22e28685107c0da09c80379593
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 02:22:55 2007 +0200

pacman-g2-3.6.3.10.g5e0c759-1-i686
update to newer snapshot

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 1f3b966..7a96a5e 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"}

pkgname=pacman-g2
pkgver=3.6.3
-Fuse $USE_DEVEL && pkgver=3.6.3.9.g2bcd461
+Fuse $USE_DEVEL && pkgver=3.6.3.10.g5e0c759
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/"
From priyank at frugalware.org  Fri Oct  5 10:55:16 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct  5 10:55:19 2007
Subject: [Frugalware-git] gfpm: replace gfpm.glade with gfpm.ui (thx krix)
Message-ID: <20071005085516.57E6E13A4013@genesis.frugalware.org>

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

commit 0d614723e1231d20cfa1d4329709027c835e498e
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 5 14:24:00 2007 +0530

replace gfpm.glade with gfpm.ui (thx krix)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 269b813..1a35bb2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,4 +8,4 @@ src/gfpm.c
src/gfpm-packagelist.c
src/gfpm-optimizedb.c
src/gfpm-messages.c
-data/gfpm.glade
+data/gfpm.ui
From priyank at frugalware.org  Fri Oct  5 11:01:52 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct  5 11:01:53 2007
Subject: [Frugalware-git] gfpm: gfpm-interface
Message-ID: <20071005090152.2A44113A4013@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=3986b0ea9ea204baa302c9da5156029e437af890

commit 3986b0ea9ea204baa302c9da5156029e437af890
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 5 14:30:34 2007 +0530

gfpm-interface
* Fixed a compiletime warning about dereferencing type-punned pointer

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 06fe702..64d2c40 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -954,14 +954,14 @@ gfpm_load_changelog_txtvw (const char *pkg_name, gboolean inst)
if (inst == TRUE)
{
PM_PKG *pkg = NULL;
-		gchar *dbpath = NULL;
+		long dbpath;
gchar logpath[PATH_MAX];
FILE *fp = NULL;
gchar line[PATH_MAX+1];
pkg = pacman_db_readpkg (local_db, (char*)pkg_name);
-		pacman_get_option (PM_OPT_DBPATH, (long*) &dbpath);
+		pacman_get_option (PM_OPT_DBPATH, &dbpath);
snprintf (logpath, PATH_MAX, "/%s/%s/%s-%s/changelog",
-				dbpath,
+				(char*)dbpath,
(char*)pacman_db_getinfo (local_db, PM_DB_TREENAME),
(char*)pacman_pkg_getinfo (pkg, PM_PKG_NAME),
(char*)pacman_pkg_getinfo (pkg, PM_PKG_VERSION));
From voroskoi at frugalware.org  Fri Oct  5 11:41:08 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Fri Oct  5 11:41:10 2007
Subject: [Frugalware-git] frugalware-current: openssl-0.9.8-8-i686
Message-ID: <20071005094108.9EFEF13A4013@genesis.frugalware.org>

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

commit 482ba76eb8537d79867df763179634cbf07e7112
Author: voroskoi <voroskoi@frugalware.org>
Date:   Fri Oct 5 11:24:54 2007 +0200

openssl-0.9.8-8-i686
secfix relbump, closes #2466

diff --git a/source/lib/openssl/CVE-2007-5135.diff b/source/lib/openssl/CVE-2007-5135.diff
new file mode 100644
index 0000000..7107bd0
--- /dev/null
+++ b/source/lib/openssl/CVE-2007-5135.diff
@@ -0,0 +1,42 @@
+diff -aur openssl-0.9.8e/ssl/ssl_lib.c fw_openssl-0.9.8e/ssl/ssl_lib.c
+--- openssl-0.9.8e/ssl/ssl_lib.c	2006-11-29 21:47:15.000000000 +0100
++++ fw_openssl-0.9.8e/ssl/ssl_lib.c	2007-10-05 10:35:10.000000000 +0200
+@@ -1201,7 +1201,6 @@
+ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
+ 	{
+ 	char *p;
+-	const char *cp;
+ 	STACK_OF(SSL_CIPHER) *sk;
+ 	SSL_CIPHER *c;
+ 	int i;
+@@ -1214,20 +1213,20 @@
+ 	sk=s->session->ciphers;
+ 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
+ 		{
+-		/* Decrement for either the ':' or a '\0' */
+-		len--;
++		int n;
+ 		c=sk_SSL_CIPHER_value(sk,i);
+-		for (cp=c->name; *cp; )
++		n=strlen(c->name);
++		if (n+1 > len)
+ 			{
+-			if (len-- <= 0)
+-				{
+-				*p='\0';
+-				return(buf);
+-				}
+-			else
+-				*(p++)= *(cp++);
++			if (p != buf)
++				 --p;
++			*p='\0';
++			return buf;
+ 			}
++		strcpy(p,c->name);
++		p+=n;
+ 		*(p++)=':';
++		len-=n+1;
+ 		}
+ 	p[-1]='\0';
+ 	return(buf);
diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild
index 7460d1c..3ce8613 100644
--- a/source/lib/openssl/FrugalBuild
+++ b/source/lib/openssl/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=openssl
pkgver=0.9.8
pkgextraver=e
-pkgrel=7
+pkgrel=8
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
url="http://www.openssl.org/source/"
groups=('lib' 'chroot-core')
@@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('glibc')
makedepends=('util-linux')
up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'"
-source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff)
-signatures=("$source.asc" '' '')
+source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff)
+signatures=("$source.asc" '' '' '' '')

build()
{
diff --git a/source/lib/openssl/bn_mont.c.diff b/source/lib/openssl/bn_mont.c.diff
new file mode 100644
index 0000000..a09b56e
--- /dev/null
+++ b/source/lib/openssl/bn_mont.c.diff
@@ -0,0 +1,114 @@
+--- openssl-0.9.8c.orig/crypto/bn/bn_mont.c
++++ openssl-0.9.8c/crypto/bn/bn_mont.c
+@@ -176,7 +176,6 @@
+
+ 	max=(nl+al+1); /* allow for overflow (no?) XXX */
+ 	if (bn_wexpand(r,max) == NULL) goto err;
+-	if (bn_wexpand(ret,max) == NULL) goto err;
+
+ 	r->neg=a->neg^n->neg;
+ 	np=n->d;
+@@ -228,19 +227,70 @@
+ 		}
+ 	bn_correct_top(r);
+
+-	/* mont->ri will be a multiple of the word size */
+-#if 0
+-	BN_rshift(ret,r,mont->ri);
+-#else
+-	ret->neg = r->neg;
+-	x=ri;
++	/* mont->ri will be a multiple of the word size and below code
++	 * is kind of BN_rshift(ret,r,mont->ri) equivalent */
++	if (r->top <= ri)
++		{
++		ret->top=0;
++		retn=1;
++		goto err;
++		}
++	al=r->top-ri;
++
++# define BRANCH_FREE 1
++# if BRANCH_FREE
++	if (bn_wexpand(ret,ri) == NULL) goto err;
++	x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
++	ret->top=x=(ri&~x)|(al&x);	/* min(ri,al) */
++	ret->neg=r->neg;
++
+ 	rp=ret->d;
+-	ap= &(r->d[x]);
+-	if (r->top < x)
+-		al=0;
+-	else
+-		al=r->top-x;
++	ap=&(r->d[ri]);
++
++	{
++	size_t m1,m2;
++
++	v=bn_sub_words(rp,ap,np,ri);
++	/* this ----------------^^ works even in al<ri case
++	 * thanks to zealous zeroing of top of the vector in the
++	 * beginning. */
++
++	/* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
++	/* in other words if subtraction result is real, then
++	 * trick unconditional memcpy below to perform in-place
++	 * "refresh" instead of actual copy. */
++	m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);	/* al<ri */
++	m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);	/* al>ri */
++	m1|=m2;			/* (al!=ri) */
++	m1|=(0-(size_t)v);	/* (al!=ri || v) */
++	m1&=~m2;		/* (al!=ri || v) && !al>ri */
++	nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
++	}
++
++	/* 'i<ri' is chosen to eliminate dependency on input data, even
++	 * though it results in redundant copy in al<ri case. */
++	for (i=0,ri-=4; i<ri; i+=4)
++		{
++		BN_ULONG t1,t2,t3,t4;
++
++		t1=nrp[i+0];
++		t2=nrp[i+1];
++		t3=nrp[i+2];	ap[i+0]=0;
++		t4=nrp[i+3];	ap[i+1]=0;
++		rp[i+0]=t1;	ap[i+2]=0;
++		rp[i+1]=t2;	ap[i+3]=0;
++		rp[i+2]=t3;
++		rp[i+3]=t4;
++		}
++	for (ri+=4; i<ri; i++)
++		rp[i]=nrp[i], ap[i]=0;
++# else
++	if (bn_wexpand(ret,al) == NULL) goto err;
+ 	ret->top=al;
++	ret->neg=r->neg;
++
++	rp=ret->d;
++	ap=&(r->d[ri]);
+ 	al-=4;
+ 	for (i=0; i<al; i+=4)
+ 		{
+@@ -258,7 +308,7 @@
+ 	al+=4;
+ 	for (; i<al; i++)
+ 		rp[i]=ap[i];
+-#endif
++# endif
+ #else /* !MONT_WORD */
+ 	BIGNUM *t1,*t2;
+
+@@ -278,10 +328,12 @@
+ 	if (!BN_rshift(ret,t2,mont->ri)) goto err;
+ #endif /* MONT_WORD */
+
++#if !defined(BRANCH_FREE) || BRANCH_FREE==0
+ 	if (BN_ucmp(ret, &(mont->N)) >= 0)
+ 		{
+ 		if (!BN_usub(ret,ret,&(mont->N))) goto err;
+ 		}
++#endif
+ 	retn=1;
+ 	bn_check_top(ret);
+  err:
diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild
index 52c3434..3b9e29b 100644
--- a/source/xapps/imagemagick/FrugalBuild
+++ b/source/xapps/imagemagick/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=imagemagick
-pkgver=6.3.5_6
+pkgver=6.3.5_9
pkgrel=1
pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files"
url="http://www.imagemagick.org"
@@ -17,7 +17,7 @@ options=('scriptlet')
up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'"
source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \
libpng_mmx_patch_x86_64.patch)
-sha1sums=('5155402d3d3d43128e5e07cc5cef6042c1d2ee45' \
+sha1sums=('71de22d770a4cb3de94c1925a03fba6d16e71513' \
'e42f3acbe85b6098af75c5cecc9a254baaa0482c')

build() {
@@ -29,9 +29,6 @@ build() {
[ "$CARCH" == "x86_64" ] && Fpatch libpng_mmx_patch_x86_64.patch
Fmake --with-windows-font-dir=/usr/lib/X11/fonts/TTF --with-modules
Fmakeinstall
-	Frm /usr/lib/libltdl*
-	Frm /usr/lib/perl5/?.?.?/
-	Frm /usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi/auto/Image/Magick/.packlist
}

# optimization OK
From voroskoi at frugalware.org  Fri Oct  5 11:54:27 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Fri Oct  5 11:54:30 2007
Subject: [Frugalware-git] frugalware-current: Revert "openssl-0.9.8-8-i686"
Message-ID: <20071005095427.B361C13A4013@genesis.frugalware.org>

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

commit 9ad42020bfea5ff40d279d3e52221b4ef435b12d
Author: voroskoi <voroskoi@frugalware.org>
Date:   Fri Oct 5 11:41:37 2007 +0200

Revert "openssl-0.9.8-8-i686"
accidentally committed the imagemagick changes too, reverting
This reverts commit 482ba76eb8537d79867df763179634cbf07e7112.

diff --git a/source/lib/openssl/CVE-2007-5135.diff b/source/lib/openssl/CVE-2007-5135.diff
deleted file mode 100644
index 7107bd0..0000000
--- a/source/lib/openssl/CVE-2007-5135.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -aur openssl-0.9.8e/ssl/ssl_lib.c fw_openssl-0.9.8e/ssl/ssl_lib.c
---- openssl-0.9.8e/ssl/ssl_lib.c	2006-11-29 21:47:15.000000000 +0100
-+++ fw_openssl-0.9.8e/ssl/ssl_lib.c	2007-10-05 10:35:10.000000000 +0200
-@@ -1201,7 +1201,6 @@
- char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
- 	{
- 	char *p;
--	const char *cp;
- 	STACK_OF(SSL_CIPHER) *sk;
- 	SSL_CIPHER *c;
- 	int i;
-@@ -1214,20 +1213,20 @@
- 	sk=s->session->ciphers;
- 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
- 		{
--		/* Decrement for either the ':' or a '\0' */
--		len--;
-+		int n;
- 		c=sk_SSL_CIPHER_value(sk,i);
--		for (cp=c->name; *cp; )
-+		n=strlen(c->name);
-+		if (n+1 > len)
- 			{
--			if (len-- <= 0)
--				{
--				*p='\0';
--				return(buf);
--				}
--			else
--				*(p++)= *(cp++);
-+			if (p != buf)
-+				 --p;
-+			*p='\0';
-+			return buf;
- 			}
-+		strcpy(p,c->name);
-+		p+=n;
- 		*(p++)=':';
-+		len-=n+1;
- 		}
- 	p[-1]='\0';
- 	return(buf);
diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild
index 3ce8613..7460d1c 100644
--- a/source/lib/openssl/FrugalBuild
+++ b/source/lib/openssl/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=openssl
pkgver=0.9.8
pkgextraver=e
-pkgrel=8
+pkgrel=7
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
url="http://www.openssl.org/source/"
groups=('lib' 'chroot-core')
@@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('glibc')
makedepends=('util-linux')
up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'"
-source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff)
-signatures=("$source.asc" '' '' '' '')
+source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff)
+signatures=("$source.asc" '' '')

build()
{
diff --git a/source/lib/openssl/bn_mont.c.diff b/source/lib/openssl/bn_mont.c.diff
deleted file mode 100644
index a09b56e..0000000
--- a/source/lib/openssl/bn_mont.c.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- openssl-0.9.8c.orig/crypto/bn/bn_mont.c
-+++ openssl-0.9.8c/crypto/bn/bn_mont.c
-@@ -176,7 +176,6 @@
-
- 	max=(nl+al+1); /* allow for overflow (no?) XXX */
- 	if (bn_wexpand(r,max) == NULL) goto err;
--	if (bn_wexpand(ret,max) == NULL) goto err;
-
- 	r->neg=a->neg^n->neg;
- 	np=n->d;
-@@ -228,19 +227,70 @@
- 		}
- 	bn_correct_top(r);
-
--	/* mont->ri will be a multiple of the word size */
--#if 0
--	BN_rshift(ret,r,mont->ri);
--#else
--	ret->neg = r->neg;
--	x=ri;
-+	/* mont->ri will be a multiple of the word size and below code
-+	 * is kind of BN_rshift(ret,r,mont->ri) equivalent */
-+	if (r->top <= ri)
-+		{
-+		ret->top=0;
-+		retn=1;
-+		goto err;
-+		}
-+	al=r->top-ri;
-+
-+# define BRANCH_FREE 1
-+# if BRANCH_FREE
-+	if (bn_wexpand(ret,ri) == NULL) goto err;
-+	x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
-+	ret->top=x=(ri&~x)|(al&x);	/* min(ri,al) */
-+	ret->neg=r->neg;
-+
- 	rp=ret->d;
--	ap= &(r->d[x]);
--	if (r->top < x)
--		al=0;
--	else
--		al=r->top-x;
-+	ap=&(r->d[ri]);
-+
-+	{
-+	size_t m1,m2;
-+
-+	v=bn_sub_words(rp,ap,np,ri);
-+	/* this ----------------^^ works even in al<ri case
-+	 * thanks to zealous zeroing of top of the vector in the
-+	 * beginning. */
-+
-+	/* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
-+	/* in other words if subtraction result is real, then
-+	 * trick unconditional memcpy below to perform in-place
-+	 * "refresh" instead of actual copy. */
-+	m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);	/* al<ri */
-+	m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);	/* al>ri */
-+	m1|=m2;			/* (al!=ri) */
-+	m1|=(0-(size_t)v);	/* (al!=ri || v) */
-+	m1&=~m2;		/* (al!=ri || v) && !al>ri */
-+	nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
-+	}
-+
-+	/* 'i<ri' is chosen to eliminate dependency on input data, even
-+	 * though it results in redundant copy in al<ri case. */
-+	for (i=0,ri-=4; i<ri; i+=4)
-+		{
-+		BN_ULONG t1,t2,t3,t4;
-+
-+		t1=nrp[i+0];
-+		t2=nrp[i+1];
-+		t3=nrp[i+2];	ap[i+0]=0;
-+		t4=nrp[i+3];	ap[i+1]=0;
-+		rp[i+0]=t1;	ap[i+2]=0;
-+		rp[i+1]=t2;	ap[i+3]=0;
-+		rp[i+2]=t3;
-+		rp[i+3]=t4;
-+		}
-+	for (ri+=4; i<ri; i++)
-+		rp[i]=nrp[i], ap[i]=0;
-+# else
-+	if (bn_wexpand(ret,al) == NULL) goto err;
- 	ret->top=al;
-+	ret->neg=r->neg;
-+
-+	rp=ret->d;
-+	ap=&(r->d[ri]);
- 	al-=4;
- 	for (i=0; i<al; i+=4)
- 		{
-@@ -258,7 +308,7 @@
- 	al+=4;
- 	for (; i<al; i++)
- 		rp[i]=ap[i];
--#endif
-+# endif
- #else /* !MONT_WORD */
- 	BIGNUM *t1,*t2;
-
-@@ -278,10 +328,12 @@
- 	if (!BN_rshift(ret,t2,mont->ri)) goto err;
- #endif /* MONT_WORD */
-
-+#if !defined(BRANCH_FREE) || BRANCH_FREE==0
- 	if (BN_ucmp(ret, &(mont->N)) >= 0)
- 		{
- 		if (!BN_usub(ret,ret,&(mont->N))) goto err;
- 		}
-+#endif
- 	retn=1;
- 	bn_check_top(ret);
-  err:
diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild
index 3b9e29b..52c3434 100644
--- a/source/xapps/imagemagick/FrugalBuild
+++ b/source/xapps/imagemagick/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=imagemagick
-pkgver=6.3.5_9
+pkgver=6.3.5_6
pkgrel=1
pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files"
url="http://www.imagemagick.org"
@@ -17,7 +17,7 @@ options=('scriptlet')
up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'"
source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \
libpng_mmx_patch_x86_64.patch)
-sha1sums=('71de22d770a4cb3de94c1925a03fba6d16e71513' \
+sha1sums=('5155402d3d3d43128e5e07cc5cef6042c1d2ee45' \
'e42f3acbe85b6098af75c5cecc9a254baaa0482c')

build() {
@@ -29,6 +29,9 @@ build() {
[ "$CARCH" == "x86_64" ] && Fpatch libpng_mmx_patch_x86_64.patch
Fmake --with-windows-font-dir=/usr/lib/X11/fonts/TTF --with-modules
Fmakeinstall
+	Frm /usr/lib/libltdl*
+	Frm /usr/lib/perl5/?.?.?/
+	Frm /usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi/auto/Image/Magick/.packlist
}

# optimization OK
From voroskoi at frugalware.org  Fri Oct  5 12:13:33 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Fri Oct  5 12:13:36 2007
Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.5_9-1-i686
Message-ID: <20071005101333.246DD13A4013@genesis.frugalware.org>

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

commit 11c6093f7d6f544fe77f6c9ffd35973b34eb6964
Author: voroskoi <voroskoi@frugalware.org>
Date:   Fri Oct 5 11:48:51 2007 +0200

imagemagick-6.3.5_9-1-i686
version bump, closes #2456

diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild
index 52c3434..3b9e29b 100644
--- a/source/xapps/imagemagick/FrugalBuild
+++ b/source/xapps/imagemagick/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=imagemagick
-pkgver=6.3.5_6
+pkgver=6.3.5_9
pkgrel=1
pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files"
url="http://www.imagemagick.org"
@@ -17,7 +17,7 @@ options=('scriptlet')
up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'"
source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \
libpng_mmx_patch_x86_64.patch)
-sha1sums=('5155402d3d3d43128e5e07cc5cef6042c1d2ee45' \
+sha1sums=('71de22d770a4cb3de94c1925a03fba6d16e71513' \
'e42f3acbe85b6098af75c5cecc9a254baaa0482c')

build() {
@@ -29,9 +29,6 @@ build() {
[ "$CARCH" == "x86_64" ] && Fpatch libpng_mmx_patch_x86_64.patch
Fmake --with-windows-font-dir=/usr/lib/X11/fonts/TTF --with-modules
Fmakeinstall
-	Frm /usr/lib/libltdl*
-	Frm /usr/lib/perl5/?.?.?/
-	Frm /usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi/auto/Image/Magick/.packlist
}

# optimization OK
From voroskoi at frugalware.org  Fri Oct  5 12:42:56 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Fri Oct  5 12:42:59 2007
Subject: [Frugalware-git] frugalware-current: openssl-0.9.8-8-i686
Message-ID: <20071005104256.7B5F513A4013@genesis.frugalware.org>

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

commit 24d0cbc0e714a2be04b8692538c072e77c6aa624
Author: voroskoi <voroskoi@frugalware.org>
Date:   Fri Oct 5 12:27:07 2007 +0200

openssl-0.9.8-8-i686
secfix relbump, closes #2466

diff --git a/source/lib/openssl/CVE-2007-5135.diff b/source/lib/openssl/CVE-2007-5135.diff
new file mode 100644
index 0000000..130b262
--- /dev/null
+++ b/source/lib/openssl/CVE-2007-5135.diff
@@ -0,0 +1,43 @@
+diff -aur openssl-0.9.8e/ssl/ssl_lib.c fw_openssl-0.9.8e/ssl/ssl_lib.c
+--- openssl-0.9.8e/ssl/ssl_lib.c	2006-11-29 21:47:15.000000000 +0100
++++ fw_openssl-0.9.8e/ssl/ssl_lib.c	2007-10-05 12:12:10.000000000 +0200
+@@ -1201,7 +1201,6 @@
+ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
+ 	{
+ 	char *p;
+-	const char *cp;
+ 	STACK_OF(SSL_CIPHER) *sk;
+ 	SSL_CIPHER *c;
+ 	int i;
+@@ -1214,20 +1213,21 @@
+ 	sk=s->session->ciphers;
+ 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
+ 		{
+-		/* Decrement for either the ':' or a '\0' */
+-		len--;
++		int n;
++
+ 		c=sk_SSL_CIPHER_value(sk,i);
+-		for (cp=c->name; *cp; )
++		n=strlen(c->name);
++		if (n+1 > len)
+ 			{
+-			if (len-- <= 0)
+-				{
+-				*p='\0';
+-				return(buf);
+-				}
+-			else
+-				*(p++)= *(cp++);
++			if (p != buf)
++				--p;
++			*p='\0';
++			return buf;
+ 			}
++		strcpy(p,c->name);
++		p+=n;
+ 		*(p++)=':';
++		len-=n+1;
+ 		}
+ 	p[-1]='\0';
+ 	return(buf);
diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild
index 7460d1c..3ce8613 100644
--- a/source/lib/openssl/FrugalBuild
+++ b/source/lib/openssl/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=openssl
pkgver=0.9.8
pkgextraver=e
-pkgrel=7
+pkgrel=8
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
url="http://www.openssl.org/source/"
groups=('lib' 'chroot-core')
@@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('glibc')
makedepends=('util-linux')
up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'"
-source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff)
-signatures=("$source.asc" '' '')
+source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff)
+signatures=("$source.asc" '' '' '' '')

build()
{
diff --git a/source/lib/openssl/bn_mont.c.diff b/source/lib/openssl/bn_mont.c.diff
new file mode 100644
index 0000000..a09b56e
--- /dev/null
+++ b/source/lib/openssl/bn_mont.c.diff
@@ -0,0 +1,114 @@
+--- openssl-0.9.8c.orig/crypto/bn/bn_mont.c
++++ openssl-0.9.8c/crypto/bn/bn_mont.c
+@@ -176,7 +176,6 @@
+
+ 	max=(nl+al+1); /* allow for overflow (no?) XXX */
+ 	if (bn_wexpand(r,max) == NULL) goto err;
+-	if (bn_wexpand(ret,max) == NULL) goto err;
+
+ 	r->neg=a->neg^n->neg;
+ 	np=n->d;
+@@ -228,19 +227,70 @@
+ 		}
+ 	bn_correct_top(r);
+
+-	/* mont->ri will be a multiple of the word size */
+-#if 0
+-	BN_rshift(ret,r,mont->ri);
+-#else
+-	ret->neg = r->neg;
+-	x=ri;
++	/* mont->ri will be a multiple of the word size and below code
++	 * is kind of BN_rshift(ret,r,mont->ri) equivalent */
++	if (r->top <= ri)
++		{
++		ret->top=0;
++		retn=1;
++		goto err;
++		}
++	al=r->top-ri;
++
++# define BRANCH_FREE 1
++# if BRANCH_FREE
++	if (bn_wexpand(ret,ri) == NULL) goto err;
++	x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
++	ret->top=x=(ri&~x)|(al&x);	/* min(ri,al) */
++	ret->neg=r->neg;
++
+ 	rp=ret->d;
+-	ap= &(r->d[x]);
+-	if (r->top < x)
+-		al=0;
+-	else
+-		al=r->top-x;
++	ap=&(r->d[ri]);
++
++	{
++	size_t m1,m2;
++
++	v=bn_sub_words(rp,ap,np,ri);
++	/* this ----------------^^ works even in al<ri case
++	 * thanks to zealous zeroing of top of the vector in the
++	 * beginning. */
++
++	/* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
++	/* in other words if subtraction result is real, then
++	 * trick unconditional memcpy below to perform in-place
++	 * "refresh" instead of actual copy. */
++	m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);	/* al<ri */
++	m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);	/* al>ri */
++	m1|=m2;			/* (al!=ri) */
++	m1|=(0-(size_t)v);	/* (al!=ri || v) */
++	m1&=~m2;		/* (al!=ri || v) && !al>ri */
++	nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
++	}
++
++	/* 'i<ri' is chosen to eliminate dependency on input data, even
++	 * though it results in redundant copy in al<ri case. */
++	for (i=0,ri-=4; i<ri; i+=4)
++		{
++		BN_ULONG t1,t2,t3,t4;
++
++		t1=nrp[i+0];
++		t2=nrp[i+1];
++		t3=nrp[i+2];	ap[i+0]=0;
++		t4=nrp[i+3];	ap[i+1]=0;
++		rp[i+0]=t1;	ap[i+2]=0;
++		rp[i+1]=t2;	ap[i+3]=0;
++		rp[i+2]=t3;
++		rp[i+3]=t4;
++		}
++	for (ri+=4; i<ri; i++)
++		rp[i]=nrp[i], ap[i]=0;
++# else
++	if (bn_wexpand(ret,al) == NULL) goto err;
+ 	ret->top=al;
++	ret->neg=r->neg;
++
++	rp=ret->d;
++	ap=&(r->d[ri]);
+ 	al-=4;
+ 	for (i=0; i<al; i+=4)
+ 		{
+@@ -258,7 +308,7 @@
+ 	al+=4;
+ 	for (; i<al; i++)
+ 		rp[i]=ap[i];
+-#endif
++# endif
+ #else /* !MONT_WORD */
+ 	BIGNUM *t1,*t2;
+
+@@ -278,10 +328,12 @@
+ 	if (!BN_rshift(ret,t2,mont->ri)) goto err;
+ #endif /* MONT_WORD */
+
++#if !defined(BRANCH_FREE) || BRANCH_FREE==0
+ 	if (BN_ucmp(ret, &(mont->N)) >= 0)
+ 		{
+ 		if (!BN_usub(ret,ret,&(mont->N))) goto err;
+ 		}
++#endif
+ 	retn=1;
+ 	bn_check_top(ret);
+  err:
From boobaa at frugalware.org  Fri Oct  5 14:31:03 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 14:31:05 2007
Subject: [Frugalware-git] frugalware-current: quota-tools-3.15-4-i686
Message-ID: <20071005123103.393E513A4013@genesis.frugalware.org>

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

commit 801da63793a074ddee03f01a2cc23063c762cf7e
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 14:27:03 2007 +0200

quota-tools-3.15-4-i686
doh, forgot the Fmkdir
ok by vmiklos@

diff --git a/source/apps/quota-tools/FrugalBuild b/source/apps/quota-tools/FrugalBuild
index 9b99e45..888f168 100644
--- a/source/apps/quota-tools/FrugalBuild
+++ b/source/apps/quota-tools/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=quota-tools
pkgver=3.15
-pkgrel=3
+pkgrel=4
pkgdesc="Linux disk quota utilities"
url="http://sourceforge.net/projects/linuxquota/"
depends=('e2fsprogs')
@@ -27,6 +27,7 @@ build()
Frm /usr/share/man/man{2/quotactl.2,8/rquotad.8}
Frm /usr/sbin/rpc.rquotad
Fdoc README.Frugalware
+	Fmkdir /var/lib/quota
}

# optimization OK
From vmiklos at frugalware.org  Fri Oct  5 14:36:18 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 14:36:20 2007
Subject: [Frugalware-git] homepage-ng: news: the new kernel's pkgrel is -6,
	not -5
Message-ID: <20071005123618.AF79913A4013@genesis.frugalware.org>

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

commit 0408a868eae0853509248332d6e80dabe57279eb
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 14:35:12 2007 +0200

news: the new kernel's pkgrel is -6, not -5

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index d63b63a..0b38d96 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -23,7 +23,7 @@
<author>VMiklos</author>
<hidden>0</hidden>
<content><![CDATA[
-						As of kernel-2.6.22-5 in Frugalware-current, Intel users will have /dev/sd* devices rather than /dev/hd* ones. The reason is the following: It was not possible to boot the kernel on some machines without this change. See <a href="http://bugs.frugalware.org/2243">this bugreport</a> for more details. So after upgrading using pacman -Syu, you need to:
+						As of kernel-2.6.22-6 in Frugalware-current, Intel users will have /dev/sd* devices rather than /dev/hd* ones. The reason is the following: It was not possible to boot the kernel on some machines without this change. See <a href="http://bugs.frugalware.org/2243">this bugreport</a> for more details. So after upgrading using pacman -Syu, you need to:
<ol>
<li>Check if you have an Intel IDE controller using sudo lspci |grep -i intel.*ide. If you got no result then probably you're not affected.</li>
<li>Edit /etc/fstab: change all occurrences of /dev/hd to /dev/sd.</li>
From vmiklos at frugalware.org  Fri Oct  5 15:04:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct  5 15:04:44 2007
Subject: [Frugalware-git] pacman-tools: pootle-update: added gfpm-mcs-plugin
Message-ID: <20071005130442.0E43B13A4013@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=0842285555f007c3ad58d2d0edcc5bf9ebaa6887

commit 0842285555f007c3ad58d2d0edcc5bf9ebaa6887
Author: VMiklos <vmiklos@frugalware.org>
Date:   Fri Oct 5 15:04:38 2007 +0200

pootle-update: added gfpm-mcs-plugin

diff --git a/pootle-update b/pootle-update
index eb6c55b..16f6978 100644
--- a/pootle-update
+++ b/pootle-update
@@ -35,6 +35,7 @@ rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/xco
rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/xwmconfig/po/xwmconfig.pot frugalwareutils/templates/xwmconfig.pot
rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gnetconfig/po/gnetconfig.pot fwcontrolcenter/templates/gnetconfig.pot
rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gnetconfig-mcs-plugin/po/gnetconfig-mcs-plugin.pot fwcontrolcenter/templates/gnetconfig-mcs-plugin.pot
+rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gfpm-mcs-plugin/po/gfpm-mcs-plugin.pot fwcontrolcenter/templates/gfpm-mcs-plugin.pot
rsync rsync://rsync.frugalware.org/pub/other/gfpm/gfpm/po/gfpm.pot gfpm/templates/gfpm.pot
echo "done."
From boobaa at frugalware.org  Fri Oct  5 15:58:55 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 15:58:57 2007
Subject: [Frugalware-git] boobaa: munin-node-1.2.5-2-i686
Message-ID: <20071005135855.A63DC13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boobaa.git;a=commitdiff;h=5802c3218c3b7c797863739b18a0c64ce8de755d

commit 5802c3218c3b7c797863739b18a0c64ce8de755d
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 15:58:21 2007 +0200

munin-node-1.2.5-2-i686
new m8r, ok by iron@
big cleanup
now it should work out-of-the-box with the default plugins

diff --git a/source/network-extra/munin-node/FrugalBuild b/source/network-extra/munin-node/FrugalBuild
index 30d1271..afee43e 100644
--- a/source/network-extra/munin-node/FrugalBuild
+++ b/source/network-extra/munin-node/FrugalBuild
@@ -1,9 +1,10 @@
# Compiling Time: 0.01 SBU
-# Maintainer: Karoly CZOVEK <slinky@rei.keni.hu>
+# Maintainer: CSÉCSY László <boobaa@frugalware.hu>
+# Contributor: Karoly CZOVEK <slinky@rei.keni.hu>

pkgname=munin-node
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface. (Node)"
_F_sourceforge_name="munin"
Finclude sourceforge
@@ -12,11 +13,14 @@ depends=('perl-net-server')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url|grep 'Stable'|sed 's/.*: \(.*\)\ .*D.*/\1/'"
-source=(${source/$_F_sourceforge_name-/${_F_sourceforge_name}_} Makefile.config rc.munin-node munin-node.logrotate)
+source=(${source/$_F_sourceforge_name-/${_F_sourceforge_name}_} Makefile.config rc.munin-node munin-node.logrotate munin-node.conf)
sha1sums=('c46c92e6860a447aebd1c738dbe316d40d905e4f' \
-          '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
-          'e2bed01c7fa552820fc83f6ca66a81600b18cf27' \
-          '2950e0a37d42abb2b152a40f24498982613a4b62')
+	  '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
+	  '7aca25ab795ac2b07848cf07b3169ba6a628fc3c' \
+	  '2950e0a37d42abb2b152a40f24498982613a4b62' \
+	  '30389dab21fbffdbdab52f7aacf3eb63b9e32ef9')
+options=('scriptlet')
+backup=(etc/munin/{munin-node.conf,plugin-conf.d/munin-node})

build()
{
@@ -29,12 +33,16 @@ build()
Fmv etc/logrotate.d/munin-node.logrotate etc/logrotate.d/munin-node

Frcd munin-node
+	Ffile etc/munin/plugin-conf.d/munin-node.conf
+	Fmv etc/munin/plugin-conf.d/munin-node.conf etc/munin/plugin-conf.d/munin-node

Fsed "$Fdestdir" "" $Fdestdir/etc/munin/munin-node.conf
Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node
Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure
-	Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure-snmp
+#	Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure-snmp
Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-run
+
+	Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/plugins/*
}

-# optimalization OK
+# optimization OK
diff --git a/source/network-extra/munin-node/messages/munin-node.hu b/source/network-extra/munin-node/messages/munin-node.hu
index e69de29..4163cab 100644
--- a/source/network-extra/munin-node/messages/munin-node.hu
+++ b/source/network-extra/munin-node/messages/munin-node.hu
@@ -0,0 +1,4 @@
+stopmuninnode="A munin-node leállítása"
+startmuninnode="A munin-node indítása"
+nrmuninnode="A munin-node nem fut"
+armuninnode="A munin-node már fut"
diff --git a/source/network-extra/munin-node/munin-node.conf b/source/network-extra/munin-node/munin-node.conf
new file mode 100644
index 0000000..4fe8307
--- /dev/null
+++ b/source/network-extra/munin-node/munin-node.conf
@@ -0,0 +1,21 @@
+[postfix_*]
+env.logfile maillog
+
+[postfix_mailvolume]
+user root
+
+[postfix_mailqueue]
+user root
+
+
+[if_*]
+user root
+
+[netstat]
+user root
+
+[processes]
+user root
+
+[vmstat]
+user root
diff --git a/source/network-extra/munin-node/munin-node.install b/source/network-extra/munin-node/munin-node.install
index 181067d..c955970 100644
--- a/source/network-extra/munin-node/munin-node.install
+++ b/source/network-extra/munin-node/munin-node.install
@@ -1,24 +1,27 @@
post_install()
{
-	# if munin pkg not installed then create user&group
-	if [ ! -f /usr/bin/munin-cron ]; then
-	    /usr/sbin/groupadd munin
-	    /usr/sbin/useradd -g munin -d /var/lib/munin -s /bin/false \
-		-c "Munin User" munin
+	if ! grep -q '^munin:' /etc/group ; then
+		groupadd -g 41 munin
fi
-
+	if ! grep -q '^munin:' /etc/passwd ; then
+		useradd -u 41 -g 41 -s /bin/false -c "Munin User" -d /var/lib/munin munin
+	fi
+
+	# permissions
+	chown -R munin:munin /var/log/munin
+	chown -R munin:munin /var/lib/munin
+	chown -R munin:munin /var/run/munin
+
# init plugins
-	echo -n "Initializing plugins.."
-        munin-node-configure --shell | sh
-	echo " done."
+	munin-node-configure --shell | sh
}

pre_remove()
{
test -d /etc/munin/plugins/ && for plugin in $(find /etc/munin/plugins/ -type l); do
-	    if [ ! -e $(readlink $plugin) ]; then
-	    rm $plugin
-	    fi
+		if [ ! -e $(readlink $plugin) ]; then
+			rm $plugin
+		fi
done
}

@@ -26,8 +29,8 @@ post_remove()
{
# if munin pkg installed then don't remove user&group
if [ ! -f /usr/bin/munin-cron ]; then
-            /usr/sbin/userdel -r munin >/dev/null 2>&1
-            /usr/sbin/groupdel munin >/dev/null 2>&1
+		/usr/sbin/userdel -r munin >/dev/null 2>&1
+		/usr/sbin/groupdel munin >/dev/null 2>&1
fi

# delete dangling symlinks
@@ -37,9 +40,7 @@ post_remove()

post_upgrade()
{
-        echo -n "Initializing new plugins.."
-        munin-node-configure --shell --newer "${0%-*}" | sh
-	echo " done."
+	munin-node-configure --shell --newer "${0%-*}" | sh
}

op=$1
From boobaa at frugalware.org  Fri Oct  5 16:01:20 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 16:01:22 2007
Subject: [Frugalware-git] boobaa: munin-node-1.2.5-2-i686
Message-ID: <20071005140120.38CE713A40D5@genesis.frugalware.org>

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

commit 6ccfebe1785beb74bb8fab970acd20c1fb50b2ba
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 16:01:14 2007 +0200

munin-node-1.2.5-2-i686
typo fix

diff --git a/source/network-extra/munin-node/FrugalBuild b/source/network-extra/munin-node/FrugalBuild
index afee43e..5fa86c6 100644
--- a/source/network-extra/munin-node/FrugalBuild
+++ b/source/network-extra/munin-node/FrugalBuild
@@ -1,5 +1,5 @@
# Compiling Time: 0.01 SBU
-# Maintainer: CSÉCSY László <boobaa@frugalware.hu>
+# Maintainer: CSÉCSY László <boobaa@frugalware.org>
# Contributor: Karoly CZOVEK <slinky@rei.keni.hu>

pkgname=munin-node
From boobaa at frugalware.org  Fri Oct  5 16:04:50 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 16:04:57 2007
Subject: [Frugalware-git] boobaa: munin-1.2.5-2-i686
Message-ID: <20071005140451.A633113A40D5@genesis.frugalware.org>

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

commit 6da1dbacc248a170f0536b9b7391c9c13e73dfef
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 16:04:13 2007 +0200

munin-1.2.5-2-i686
new m8r, ok by iron@
big cleanup
now it should work out-of-the-box with the default plugins

diff --git a/source/network-extra/munin/FrugalBuild b/source/network-extra/munin/FrugalBuild
index 9d2bb65..79e555f 100644
--- a/source/network-extra/munin/FrugalBuild
+++ b/source/network-extra/munin/FrugalBuild
@@ -1,9 +1,10 @@
# Compiling Time: 0.01 SBU
-# Maintainer: Karoly CZOVEK <slinky@rei.keni.hu>
+# Maintainer: CSÉCSY László <boobaa@frugalware.org>
+# Contributor: Karoly CZOVEK <slinky@rei.keni.hu>

pkgname=munin
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface."
Finclude sourceforge
url="http://munin.projects.linpro.no/"
@@ -11,13 +12,14 @@ depends=('rrdtool>=1.2.11-2' 'perl-html-template')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url|grep 'Stable'|sed 's/.*: \(.*\)\ .*D.*/\1/'"
-source=(${source/$pkgname-/${pkgname}_}  Makefile.config munin.cron munin.logrotate )
+source=(${source/$pkgname-/${pkgname}_}  Makefile.config munin.cron munin.logrotate README.Frugalware)
sha1sums=('c46c92e6860a447aebd1c738dbe316d40d905e4f' \
-          '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
-          '876dfcb7c1690be14611db4e9d55b9b40cedac88' \
-          'a1ce31369c2278c1f53509178856341f9a9f6cc6')
-
+	  '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
+	  '876dfcb7c1690be14611db4e9d55b9b40cedac88' \
+	  'a1ce31369c2278c1f53509178856341f9a9f6cc6' \
+	  '0632fb4750c1fb63e31b4c957963e42205ef77d6')
options=('scriptlet')
+backup=('etc/munin/munin.conf')

build()
{
@@ -30,7 +32,7 @@ build()
Ffile etc/logrotate.d/munin.logrotate
Fmv etc/logrotate.d/munin.logrotate etc/logrotate.d/munin

-	Fsed "$Fdestdir" "" $Fdestdir/etc/munin/munin.conf
+	Fsed "$Fdestdir\/*" "\/" $Fdestdir/etc/munin/munin.conf
Fsed "$Fdestdir"/"" "" $Fdestdir/usr/bin/munin-cron
Fsed "$Fdestdir" "" $Fdestdir/usr/lib/perl5/site_perl/`perl -e 'printf "%vd", $^V'`/Munin.pm
Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/munin-graph
@@ -40,4 +42,4 @@ build()
Fsed "$Fdestdir" "" $Fdestdir/usr/libexec/cgi-bin/munin-cgi-graph
}

-# optimalization OK
+# optimization OK
diff --git a/source/network-extra/munin/README.Frugalware b/source/network-extra/munin/README.Frugalware
new file mode 100644
index 0000000..57eb40c
--- /dev/null
+++ b/source/network-extra/munin/README.Frugalware
@@ -0,0 +1,15 @@
+From munin-1.2.5-2 we no longer use a random uid/gid, but dedicated
+ones. Because of this munin service will not start if you have it installed
+before, so you have to correct this by issuing these commands:
+
+------------
+groupmod -g 41 munin
+usermod -u 41 -g 41 munin
+chown -R munin:munin /var/lib/munin
+chown -R munin:munin /var/www/html/munin
+chown -R munin:munin /var/log/munin
+chown -R munin:munin /var/run/munin
+------------
+
+You should chown any other munin-owned stuff you may have lying around, these
+are only the default ones.
diff --git a/source/network-extra/munin/munin.install b/source/network-extra/munin/munin.install
index 49ff2c5..433ec74 100644
--- a/source/network-extra/munin/munin.install
+++ b/source/network-extra/munin/munin.install
@@ -1,41 +1,36 @@
post_install()
{
-
-        if [ ! -f /usr/sbin/munin-node ]; then
-		/usr/sbin/groupadd munin
-		/usr/sbin/useradd -g munin -d /var/lib/munin -s /bin/false \
-		    -c "Munin User" munin
+	if ! grep -q '^munin:' /etc/group ; then
+		groupadd -g 41 munin
+	fi
+	if ! grep -q '^munin:' /etc/passwd ; then
+		useradd -u 41 -g 41 -s /bin/false -c "Munin User" -d /var/lib/munin munin
fi

# permissions
-	chown -R munin:adm /var/www/html/munin
-	chown -R munin:adm /var/log/munin
-	chown -R munin:adm /var/lib/munin
-	chown -R munin:adm /var/run/munin
+	chown -R munin:munin /var/www/html/munin
+	chown -R munin:munin /var/log/munin
+	chown -R munin:munin /var/lib/munin
+	chown -R munin:munin /var/run/munin
}

post_remove()
{
-    if [ ! -f /usr/sbin/munin-node ]; then
-	/usr/sbin/userdel -r munin >/dev/null 2>&1
-	/usr/sbin/groupdel munin >/dev/null 2>&1
-    fi
-
-    echo && echo "The generated web site or accumulated data won't be removed."
+	if [ ! -f /usr/sbin/munin-node ]; then
+		/usr/sbin/userdel -r munin >/dev/null 2>&1
+		/usr/sbin/groupdel munin >/dev/null 2>&1
+	fi

-    rm -f /var/lib/munin/datafile
-    rm -f /var/lib/munin/limits
-    rm -f /var/lib/munin/*.stats
-    rm -f /var/lib/munin/*/*.ok
-    rm -f /var/run/munin/*.lock
-
-    rm -f /var/log/munin/munin-update.log*
-    rm -f /var/log/munin/munin-graph.log*
-    rm -f /var/log/munin/munin-html.log*
-    rm -f /var/log/munin/munin-limits.log*
-
-    rm -f /var/log/munin/munin-nagios.log*
-
+	rm -f /var/lib/munin/datafile
+	rm -f /var/lib/munin/limits
+	rm -f /var/lib/munin/*.stats
+	rm -f /var/lib/munin/*/*.ok
+	rm -f /var/run/munin/*.lock
+	rm -f /var/log/munin/munin-update.log*
+	rm -f /var/log/munin/munin-graph.log*
+	rm -f /var/log/munin/munin-html.log*
+	rm -f /var/log/munin/munin-limits.log*
+	rm -f /var/log/munin/munin-nagios.log*
}

op=$1
From boobaa at frugalware.org  Fri Oct  5 16:22:17 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 16:22:20 2007
Subject: [Frugalware-git] frugalware-current: munin-node-1.2.5-2-i686
Message-ID: <20071005142217.9D9AA13A40D5@genesis.frugalware.org>

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

commit 6a67ca0d01a01778200ba938be1eab260f1f5ab2
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 15:58:21 2007 +0200

munin-node-1.2.5-2-i686
new m8r, ok by iron@
big cleanup
now it should work out-of-the-box with the default plugins

diff --git a/source/network-extra/munin-node/FrugalBuild b/source/network-extra/munin-node/FrugalBuild
index 30d1271..afee43e 100644
--- a/source/network-extra/munin-node/FrugalBuild
+++ b/source/network-extra/munin-node/FrugalBuild
@@ -1,9 +1,10 @@
# Compiling Time: 0.01 SBU
-# Maintainer: Karoly CZOVEK <slinky@rei.keni.hu>
+# Maintainer: CSÉCSY László <boobaa@frugalware.hu>
+# Contributor: Karoly CZOVEK <slinky@rei.keni.hu>

pkgname=munin-node
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface. (Node)"
_F_sourceforge_name="munin"
Finclude sourceforge
@@ -12,11 +13,14 @@ depends=('perl-net-server')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url|grep 'Stable'|sed 's/.*: \(.*\)\ .*D.*/\1/'"
-source=(${source/$_F_sourceforge_name-/${_F_sourceforge_name}_} Makefile.config rc.munin-node munin-node.logrotate)
+source=(${source/$_F_sourceforge_name-/${_F_sourceforge_name}_} Makefile.config rc.munin-node munin-node.logrotate munin-node.conf)
sha1sums=('c46c92e6860a447aebd1c738dbe316d40d905e4f' \
-          '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
-          'e2bed01c7fa552820fc83f6ca66a81600b18cf27' \
-          '2950e0a37d42abb2b152a40f24498982613a4b62')
+	  '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
+	  '7aca25ab795ac2b07848cf07b3169ba6a628fc3c' \
+	  '2950e0a37d42abb2b152a40f24498982613a4b62' \
+	  '30389dab21fbffdbdab52f7aacf3eb63b9e32ef9')
+options=('scriptlet')
+backup=(etc/munin/{munin-node.conf,plugin-conf.d/munin-node})

build()
{
@@ -29,12 +33,16 @@ build()
Fmv etc/logrotate.d/munin-node.logrotate etc/logrotate.d/munin-node

Frcd munin-node
+	Ffile etc/munin/plugin-conf.d/munin-node.conf
+	Fmv etc/munin/plugin-conf.d/munin-node.conf etc/munin/plugin-conf.d/munin-node

Fsed "$Fdestdir" "" $Fdestdir/etc/munin/munin-node.conf
Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node
Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure
-	Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure-snmp
+#	Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure-snmp
Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-run
+
+	Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/plugins/*
}

-# optimalization OK
+# optimization OK
diff --git a/source/network-extra/munin-node/messages/munin-node.hu b/source/network-extra/munin-node/messages/munin-node.hu
index e69de29..4163cab 100644
--- a/source/network-extra/munin-node/messages/munin-node.hu
+++ b/source/network-extra/munin-node/messages/munin-node.hu
@@ -0,0 +1,4 @@
+stopmuninnode="A munin-node leállítása"
+startmuninnode="A munin-node indítása"
+nrmuninnode="A munin-node nem fut"
+armuninnode="A munin-node már fut"
diff --git a/source/network-extra/munin-node/munin-node.conf b/source/network-extra/munin-node/munin-node.conf
new file mode 100644
index 0000000..4fe8307
--- /dev/null
+++ b/source/network-extra/munin-node/munin-node.conf
@@ -0,0 +1,21 @@
+[postfix_*]
+env.logfile maillog
+
+[postfix_mailvolume]
+user root
+
+[postfix_mailqueue]
+user root
+
+
+[if_*]
+user root
+
+[netstat]
+user root
+
+[processes]
+user root
+
+[vmstat]
+user root
diff --git a/source/network-extra/munin-node/munin-node.install b/source/network-extra/munin-node/munin-node.install
index 181067d..c955970 100644
--- a/source/network-extra/munin-node/munin-node.install
+++ b/source/network-extra/munin-node/munin-node.install
@@ -1,24 +1,27 @@
post_install()
{
-	# if munin pkg not installed then create user&group
-	if [ ! -f /usr/bin/munin-cron ]; then
-	    /usr/sbin/groupadd munin
-	    /usr/sbin/useradd -g munin -d /var/lib/munin -s /bin/false \
-		-c "Munin User" munin
+	if ! grep -q '^munin:' /etc/group ; then
+		groupadd -g 41 munin
fi
-
+	if ! grep -q '^munin:' /etc/passwd ; then
+		useradd -u 41 -g 41 -s /bin/false -c "Munin User" -d /var/lib/munin munin
+	fi
+
+	# permissions
+	chown -R munin:munin /var/log/munin
+	chown -R munin:munin /var/lib/munin
+	chown -R munin:munin /var/run/munin
+
# init plugins
-	echo -n "Initializing plugins.."
-        munin-node-configure --shell | sh
-	echo " done."
+	munin-node-configure --shell | sh
}

pre_remove()
{
test -d /etc/munin/plugins/ && for plugin in $(find /etc/munin/plugins/ -type l); do
-	    if [ ! -e $(readlink $plugin) ]; then
-	    rm $plugin
-	    fi
+		if [ ! -e $(readlink $plugin) ]; then
+			rm $plugin
+		fi
done
}

@@ -26,8 +29,8 @@ post_remove()
{
# if munin pkg installed then don't remove user&group
if [ ! -f /usr/bin/munin-cron ]; then
-            /usr/sbin/userdel -r munin >/dev/null 2>&1
-            /usr/sbin/groupdel munin >/dev/null 2>&1
+		/usr/sbin/userdel -r munin >/dev/null 2>&1
+		/usr/sbin/groupdel munin >/dev/null 2>&1
fi

# delete dangling symlinks
@@ -37,9 +40,7 @@ post_remove()

post_upgrade()
{
-        echo -n "Initializing new plugins.."
-        munin-node-configure --shell --newer "${0%-*}" | sh
-	echo " done."
+	munin-node-configure --shell --newer "${0%-*}" | sh
}

op=$1
From boobaa at frugalware.org  Fri Oct  5 16:22:17 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 16:22:21 2007
Subject: [Frugalware-git] frugalware-current: munin-node-1.2.5-2-i686
Message-ID: <20071005142217.B800D13A40EA@genesis.frugalware.org>

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

commit 79d9c9bb21a3fbe371a11987dcdccea55caf5199
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 16:01:14 2007 +0200

munin-node-1.2.5-2-i686
typo fix

diff --git a/source/network-extra/munin-node/FrugalBuild b/source/network-extra/munin-node/FrugalBuild
index afee43e..5fa86c6 100644
--- a/source/network-extra/munin-node/FrugalBuild
+++ b/source/network-extra/munin-node/FrugalBuild
@@ -1,5 +1,5 @@
# Compiling Time: 0.01 SBU
-# Maintainer: CSÉCSY László <boobaa@frugalware.hu>
+# Maintainer: CSÉCSY László <boobaa@frugalware.org>
# Contributor: Karoly CZOVEK <slinky@rei.keni.hu>

pkgname=munin-node
From boobaa at frugalware.org  Fri Oct  5 16:22:17 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 16:22:22 2007
Subject: [Frugalware-git] frugalware-current: munin-1.2.5-2-i686
Message-ID: <20071005142217.D945C13A40F0@genesis.frugalware.org>

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

commit 80ca515c7dec7aa672ff05a71c0b3ec1fe22b9d7
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 16:04:13 2007 +0200

munin-1.2.5-2-i686
new m8r, ok by iron@
big cleanup
now it should work out-of-the-box with the default plugins

diff --git a/source/network-extra/munin/FrugalBuild b/source/network-extra/munin/FrugalBuild
index 9d2bb65..79e555f 100644
--- a/source/network-extra/munin/FrugalBuild
+++ b/source/network-extra/munin/FrugalBuild
@@ -1,9 +1,10 @@
# Compiling Time: 0.01 SBU
-# Maintainer: Karoly CZOVEK <slinky@rei.keni.hu>
+# Maintainer: CSÉCSY László <boobaa@frugalware.org>
+# Contributor: Karoly CZOVEK <slinky@rei.keni.hu>

pkgname=munin
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface."
Finclude sourceforge
url="http://munin.projects.linpro.no/"
@@ -11,13 +12,14 @@ depends=('rrdtool>=1.2.11-2' 'perl-html-template')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url|grep 'Stable'|sed 's/.*: \(.*\)\ .*D.*/\1/'"
-source=(${source/$pkgname-/${pkgname}_}  Makefile.config munin.cron munin.logrotate )
+source=(${source/$pkgname-/${pkgname}_}  Makefile.config munin.cron munin.logrotate README.Frugalware)
sha1sums=('c46c92e6860a447aebd1c738dbe316d40d905e4f' \
-          '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
-          '876dfcb7c1690be14611db4e9d55b9b40cedac88' \
-          'a1ce31369c2278c1f53509178856341f9a9f6cc6')
-
+	  '0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
+	  '876dfcb7c1690be14611db4e9d55b9b40cedac88' \
+	  'a1ce31369c2278c1f53509178856341f9a9f6cc6' \
+	  '0632fb4750c1fb63e31b4c957963e42205ef77d6')
options=('scriptlet')
+backup=('etc/munin/munin.conf')

build()
{
@@ -30,7 +32,7 @@ build()
Ffile etc/logrotate.d/munin.logrotate
Fmv etc/logrotate.d/munin.logrotate etc/logrotate.d/munin

-	Fsed "$Fdestdir" "" $Fdestdir/etc/munin/munin.conf
+	Fsed "$Fdestdir\/*" "\/" $Fdestdir/etc/munin/munin.conf
Fsed "$Fdestdir"/"" "" $Fdestdir/usr/bin/munin-cron
Fsed "$Fdestdir" "" $Fdestdir/usr/lib/perl5/site_perl/`perl -e 'printf "%vd", $^V'`/Munin.pm
Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/munin-graph
@@ -40,4 +42,4 @@ build()
Fsed "$Fdestdir" "" $Fdestdir/usr/libexec/cgi-bin/munin-cgi-graph
}

-# optimalization OK
+# optimization OK
diff --git a/source/network-extra/munin/README.Frugalware b/source/network-extra/munin/README.Frugalware
new file mode 100644
index 0000000..57eb40c
--- /dev/null
+++ b/source/network-extra/munin/README.Frugalware
@@ -0,0 +1,15 @@
+From munin-1.2.5-2 we no longer use a random uid/gid, but dedicated
+ones. Because of this munin service will not start if you have it installed
+before, so you have to correct this by issuing these commands:
+
+------------
+groupmod -g 41 munin
+usermod -u 41 -g 41 munin
+chown -R munin:munin /var/lib/munin
+chown -R munin:munin /var/www/html/munin
+chown -R munin:munin /var/log/munin
+chown -R munin:munin /var/run/munin
+------------
+
+You should chown any other munin-owned stuff you may have lying around, these
+are only the default ones.
diff --git a/source/network-extra/munin/munin.install b/source/network-extra/munin/munin.install
index 49ff2c5..433ec74 100644
--- a/source/network-extra/munin/munin.install
+++ b/source/network-extra/munin/munin.install
@@ -1,41 +1,36 @@
post_install()
{
-
-        if [ ! -f /usr/sbin/munin-node ]; then
-		/usr/sbin/groupadd munin
-		/usr/sbin/useradd -g munin -d /var/lib/munin -s /bin/false \
-		    -c "Munin User" munin
+	if ! grep -q '^munin:' /etc/group ; then
+		groupadd -g 41 munin
+	fi
+	if ! grep -q '^munin:' /etc/passwd ; then
+		useradd -u 41 -g 41 -s /bin/false -c "Munin User" -d /var/lib/munin munin
fi

# permissions
-	chown -R munin:adm /var/www/html/munin
-	chown -R munin:adm /var/log/munin
-	chown -R munin:adm /var/lib/munin
-	chown -R munin:adm /var/run/munin
+	chown -R munin:munin /var/www/html/munin
+	chown -R munin:munin /var/log/munin
+	chown -R munin:munin /var/lib/munin
+	chown -R munin:munin /var/run/munin
}

post_remove()
{
-    if [ ! -f /usr/sbin/munin-node ]; then
-	/usr/sbin/userdel -r munin >/dev/null 2>&1
-	/usr/sbin/groupdel munin >/dev/null 2>&1
-    fi
-
-    echo && echo "The generated web site or accumulated data won't be removed."
+	if [ ! -f /usr/sbin/munin-node ]; then
+		/usr/sbin/userdel -r munin >/dev/null 2>&1
+		/usr/sbin/groupdel munin >/dev/null 2>&1
+	fi

-    rm -f /var/lib/munin/datafile
-    rm -f /var/lib/munin/limits
-    rm -f /var/lib/munin/*.stats
-    rm -f /var/lib/munin/*/*.ok
-    rm -f /var/run/munin/*.lock
-
-    rm -f /var/log/munin/munin-update.log*
-    rm -f /var/log/munin/munin-graph.log*
-    rm -f /var/log/munin/munin-html.log*
-    rm -f /var/log/munin/munin-limits.log*
-
-    rm -f /var/log/munin/munin-nagios.log*
-
+	rm -f /var/lib/munin/datafile
+	rm -f /var/lib/munin/limits
+	rm -f /var/lib/munin/*.stats
+	rm -f /var/lib/munin/*/*.ok
+	rm -f /var/run/munin/*.lock
+	rm -f /var/log/munin/munin-update.log*
+	rm -f /var/log/munin/munin-graph.log*
+	rm -f /var/log/munin/munin-html.log*
+	rm -f /var/log/munin/munin-limits.log*
+	rm -f /var/log/munin/munin-nagios.log*
}

op=$1
From boobaa at frugalware.org  Fri Oct  5 18:49:00 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 18:49:02 2007
Subject: [Frugalware-git] frugalware-current: openssl-0.9.8-9-i686
Message-ID: <20071005164900.DAC7E13A40D5@genesis.frugalware.org>

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

commit fa812685d8756d7493b3aa38b826df2b25095474
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 18:45:43 2007 +0200

openssl-0.9.8-9-i686
added a patch from alex@
now httpd, monit, ... - whatever uses it is usable again

diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild
index 3ce8613..14c829b 100644
--- a/source/lib/openssl/FrugalBuild
+++ b/source/lib/openssl/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=openssl
pkgver=0.9.8
pkgextraver=e
-pkgrel=8
+pkgrel=9
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
url="http://www.openssl.org/source/"
groups=('lib' 'chroot-core')
@@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('glibc')
makedepends=('util-linux')
up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'"
-source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff)
-signatures=("$source.asc" '' '' '' '')
+source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff openssl-0.9.8e-gcc42.patch)
+signatures=("$source.asc" '' '' '' '' '')

build()
{
diff --git a/source/lib/openssl/openssl-0.9.8e-gcc42.patch b/source/lib/openssl/openssl-0.9.8e-gcc42.patch
new file mode 100644
index 0000000..191cf22
--- /dev/null
+++ b/source/lib/openssl/openssl-0.9.8e-gcc42.patch
@@ -0,0 +1,182 @@
+Index: openssl/crypto/asn1/asn1.h
+===================================================================
+RCS file: /home/ncvs/src/crypto/openssl/crypto/asn1/asn1.h,v
+retrieving revision 1.1.1.8
+diff -u -r1.1.1.8 asn1.h
+--- openssl/crypto/asn1/asn1.h	29 Jul 2006 19:10:16 -0000	1.1.1.8
++++ openssl/crypto/asn1/asn1.h	20 May 2007 05:01:40 -0000
+@@ -903,22 +903,22 @@
+ /* Used to implement other functions */
+ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
+ #define ASN1_dup_of(type,i2d,d2i,x) \
+-	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
++    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
+ #define ASN1_dup_of_const(type,i2d,d2i,x) \
+-	((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
++    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
+
+ void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
+
+ #ifndef OPENSSL_NO_FP_API
+ void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
+ #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
+-	((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
++	((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
+ void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
+ int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
+ #define ASN1_i2d_fp_of(type,i2d,out,x) \
+-	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
++	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
+ #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
+-	((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
++	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
+ int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
+ int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
+ #endif
+@@ -928,13 +928,13 @@
+ #ifndef OPENSSL_NO_BIO
+ void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
+ #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
+-	((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
++	((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
+ void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
+ int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
+ #define ASN1_i2d_bio_of(type,i2d,out,x) \
+-	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
++    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
+ #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
+-	((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
++    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
+ int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
+ int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
+ int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
+@@ -978,7 +978,7 @@
+ ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
+ 			      ASN1_OCTET_STRING **oct);
+ #define ASN1_pack_string_of(type,obj,i2d,oct) \
+-	((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
++    	(ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct)))
+ ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
+
+ void ASN1_STRING_set_default_mask(unsigned long mask);
+Index: openssl/crypto/ocsp/ocsp.h
+===================================================================
+RCS file: /home/ncvs/src/crypto/openssl/crypto/ocsp/ocsp.h,v
+retrieving revision 1.1.1.2
+diff -u -r1.1.1.2 ocsp.h
+--- openssl/crypto/ocsp/ocsp.h	29 Jul 2006 19:10:18 -0000	1.1.1.2
++++ openssl/crypto/ocsp/ocsp.h	20 May 2007 05:13:06 -0000
+@@ -469,7 +469,7 @@
+ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
+ 				void *data, STACK_OF(ASN1_OBJECT) *sk);
+ #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
+-((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
++(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk)))
+
+ X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
+
+Index: openssl/crypto/pem/pem.h
+===================================================================
+RCS file: /home/ncvs/src/crypto/openssl/crypto/pem/pem.h,v
+retrieving revision 1.1.1.7
+diff -u -r1.1.1.7 pem.h
+--- openssl/crypto/pem/pem.h	15 Mar 2007 20:03:01 -0000	1.1.1.7
++++ openssl/crypto/pem/pem.h	20 May 2007 06:02:41 -0000
+@@ -220,19 +220,20 @@
+ #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
+ type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
+ { \
+-return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
+-}
++return((type *)PEM_ASN1_read( \
++	(d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \
++}
+
+ #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
+ int PEM_write_##name(FILE *fp, type *x) \
+ { \
+-return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
++return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
+ }
+
+ #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
+ int PEM_write_##name(FILE *fp, const type *x) \
+ { \
+-return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
++return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
+ }
+
+ #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
+@@ -240,7 +241,7 @@
+ 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
+ 		  void *u) \
+ 	{ \
+-	return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
++return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
+ 	}
+
+ #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
+@@ -248,7 +249,7 @@
+ 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
+ 		  void *u) \
+ 	{ \
+-	return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
++return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
+ 	}
+
+ #endif
+@@ -256,33 +257,34 @@
+ #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
+ type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
+ { \
+-return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \
++return((type *)PEM_ASN1_read_bio( \
++	(d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \
+ }
+
+ #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
+ int PEM_write_bio_##name(BIO *bp, type *x) \
+ { \
+-return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
++return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
+ }
+
+ #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
+ int PEM_write_bio_##name(BIO *bp, const type *x) \
+ { \
+-return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
++return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
+ }
+
+ #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
+ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
+ 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
+ 	{ \
+-	return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
++return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
+ 	}
+
+ #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
+ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
+ 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
+ 	{ \
+-	return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
++return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
+ 	}
+
+ #define IMPLEMENT_PEM_write(name, type, str, asn1) \
+@@ -546,12 +548,12 @@
+ void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
+ 			  void **x, pem_password_cb *cb, void *u);
+ #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
+-((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
++((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u))
+ int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
+ 			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
+ 			   pem_password_cb *cb, void *u);
+ #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
+-	((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)
++	(PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u)
+
+ STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
+ int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
From priyank at frugalware.org  Fri Oct  5 21:05:50 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct  5 21:05:51 2007
Subject: [Frugalware-git] fw-control-center: bug fix while deleting the last
	DNS entry
Message-ID: <20071005190550.0A04313A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=12d218713474cda9610d47392628f9a9ff6a2115

commit 12d218713474cda9610d47392628f9a9ff6a2115
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 00:34:35 2007 +0530

bug fix while deleting the last DNS entry
* Fixed a bug where the last DNS entry in the DNS list was not removed from the list even after it was deleted

diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c
index f3e1735..1f5d5b7 100644
--- a/gnetconfig/src/gnetconfig-interface.c
+++ b/gnetconfig/src/gnetconfig-interface.c
@@ -479,12 +479,13 @@ gnetconfig_populate_dns_list (GList *list)
GtkListStore	*store = NULL;
GtkTreeIter	iter;

-	if (!list)
-		return;

model = gtk_tree_view_get_model (GTK_TREE_VIEW(gn_dns_listview));
store = GTK_LIST_STORE (model);
gtk_list_store_clear (store);
+
+	if (!list)
+		return;

while (list != NULL)
{
From priyank at frugalware.org  Fri Oct  5 21:11:45 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct  5 21:11:46 2007
Subject: [Frugalware-git] 
	fw-control-center: gnetconfig_new_nameserver_dialog_show()
Message-ID: <20071005191145.39A3713A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=0b9301ebe0dfa53f310708e10f77407ab33c7714

commit 0b9301ebe0dfa53f310708e10f77407ab33c7714
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 00:40:32 2007 +0530

gnetconfig_new_nameserver_dialog_show()
* Don't allow the user to add duplicate DNS entries

diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c
index 1f5d5b7..adbe696 100644
--- a/gnetconfig/src/gnetconfig-interface.c
+++ b/gnetconfig/src/gnetconfig-interface.c
@@ -564,11 +564,21 @@ gnetconfig_new_nameserver_dialog_show (void)
up:ip = gn_input (_("New DNS"), _("Enter the ip address of the nameserver:"), &res);
if (res == GTK_RESPONSE_ACCEPT)
{
+		GList *l = NULL;
if (ip == NULL || !strlen(ip))
{
gn_error (_("Required field cannot be left blank."));
goto up;
}
+		for (l = active_profile->dnses; l!=NULL;l = l->next)
+		{
+			if (!strcmp(l->data, ip))
+			{
+				gn_error (_("The IP address you entered already exists in the DNS list. Please enter a different IP address."));
+				goto up;
+			}
+		}
+
active_profile->dnses = g_list_append (active_profile->dnses, (gpointer)g_strdup(ip));
gnetconfig_save_profile (active_profile);
gnetconfig_populate_dns_list (active_profile->dnses);
From boobaa at frugalware.org  Fri Oct  5 21:41:02 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 21:41:04 2007
Subject: [Frugalware-git] frugalware-current: Assign uid/gid for munin and
	munin-node
Message-ID: <20071005194102.58B0B13A40D5@genesis.frugalware.org>

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

commit 0ae5f9663a24e3c3ab01666ca0eff78b95e9c3c1
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 21:39:58 2007 +0200

Assign uid/gid for munin and munin-node
duh, my bad, I forgot to pull before today's work
and forgot to assign these... sorry

diff --git a/docs/ids.txt b/docs/ids.txt
index de0ea94..480be1f 100644
--- a/docs/ids.txt
+++ b/docs/ids.txt
@@ -1,74 +1,62 @@
= Table of user / group ids used in Frugalware

-== Without specific uid/gid
-
-.Users and groups that are added without specific uid/gid (should be changed)
-[grid="all"]
-`---------------`---------------`-----------------------------------------------
-User		Group		Package
---------------------------------------------------------------------------------
-munin		munin		munin and munin-node
---------------------------------------------------------------------------------
-
-== With specific uid/gid
-
.Users and groups that are added with a specific uid/gid
[grid="all"]
-`-------`---------------`---------------`-----------------------`---------------
-ID	User		Package		Group			Package
+`-------`---------------`-----------------------`-----------------------`-------
+ID	User		Package			Group			Package
--------------------------------------------------------------------------------
-000	root		shadow		root			shadow
-001	bin		shadow		bin			shadow
-002	daemon		shadow		daemon			shadow
-003	adm		shadow		sys			shadow
-004	lp		shadow		adm			shadow
-005	sync		shadow		tty			shadow
-006	shutdown	shadow		disk			shadow
-007	halt		shadow		lp			shadow
-008	mail		shadow		mem			shadow
-009	news		shadow		kmem			shadow
-010	uucp		shadow		wheel			shadow
-011	operator	shadow		floppy			shadow
-012	syncpkgd	pacman-tools	mail			shadow
-013					news			shadow
-014	ftp		shadow		uucp			shadow
-015					man			shadow
-016					cdrom			shadow
-017					scanner			shadow
-018	privoxy		privoxy		privoxy			privoxy
-019	fst		pacman		audio			shadow
-020	nx		freenx		games			shadow
-021					slocate			slocate
-022					utmp			shadow
-023					camera			shadow
-024					video			shadow
-025	smmsp		shadow		smmsp			shadow
-026	clamav		clamav		clamav			clamav
-027	mysql		shadow		mysql			shadow
-028	rsyncd		rsync		rsyncd			rsync
-029	_ntp		openntpd	_ntp			openntpd
-030					storage			shadow
-031	pgdb		postgresql	pgdb			postgresql
-032	rpc		shadow		rpc			shadow
-033	sshd		shadow		sshd			shadow
-034	scponly		scponly		scponly			scponly
-035					sbox			scratchbox
-036                                     rlocate 		rlocate
-037                                     netdev			shadow
-038	messagebus	dbus		messagebus		dbus
-039     hald		hal 		hald			hal
-040	amavis		amavisd-new	amavis			amavisd-new
-041	ejabberd	ejabberd	ejabberd		ejabberd
-042	gdm		shadow		gdm			shadow
-043					shadow			shadow
-044     beagleindex     beagle          beagleindex		beagle
-045     partimag        partimage       partimag        	partimage
-046     sabayon         sabayon         sabayon         	sabayon
-047
+000	root		shadow			root			shadow
+001	bin		shadow			bin			shadow
+002	daemon		shadow			daemon			shadow
+003	adm		shadow			sys			shadow
+004	lp		shadow			adm			shadow
+005	sync		shadow			tty			shadow
+006	shutdown	shadow			disk			shadow
+007	halt		shadow			lp			shadow
+008	mail		shadow			mem			shadow
+009	news		shadow			kmem			shadow
+010	uucp		shadow			wheel			shadow
+011	operator	shadow			floppy			shadow
+012	syncpkgd	pacman-tools		mail			shadow
+013						news			shadow
+014	ftp		shadow			uucp			shadow
+015						man			shadow
+016						cdrom			shadow
+017						scanner			shadow
+018	privoxy		privoxy			privoxy			privoxy
+019	fst		pacman			audio			shadow
+020	nx		freenx			games			shadow
+021						slocate			slocate
+022						utmp			shadow
+023						camera			shadow
+024						video			shadow
+025	smmsp		shadow			smmsp			shadow
+026	clamav		clamav			clamav			clamav
+027	mysql		shadow			mysql			shadow
+028	rsyncd		rsync			rsyncd			rsync
+029	_ntp		openntpd		_ntp			openntpd
+030						storage			shadow
+031	pgdb		postgresql		pgdb			postgresql
+032	rpc		shadow			rpc			shadow
+033	sshd		shadow			sshd			shadow
+034	scponly		scponly			scponly			scponly
+035						sbox			scratchbox
+036                                     	rlocate 		rlocate
+037                                     	netdev			shadow
+038	messagebus	dbus			messagebus		dbus
+039     hald		hal 			hald			hal
+040	amavis		amavisd-new		amavis			amavisd-new
+041	ejabberd	ejabberd		ejabberd		ejabberd
+042	gdm		shadow			gdm			shadow
+043						shadow			shadow
+044     beagleindex     beagle          	beagleindex		beagle
+045     partimag        partimage       	partimag        	partimage
+046     sabayon         sabayon         	sabayon         	sabayon
+047	munin		munin and munin-node	munin			munin and munin-node
048
049
-050					ftp			shadow
-051					telnetd			shadow
+050						ftp			shadow
+051						telnetd			shadow
052
053
054
@@ -77,12 +65,12 @@ ID	User		Package		Group			Package
057
058
059
-060					grsec_procview		kernel-grsec
-061					grsec_audit		kernel-grsec
-062					grsec_tpe		kernel-grsec
-063					grsec_s_all		kernel-grsec
-064					grsec_s_client		kernel-grsec
-065					grsec_s_server		kernel-grsec
+060						grsec_procview		kernel-grsec
+061						grsec_audit		kernel-grsec
+062						grsec_tpe		kernel-grsec
+063						grsec_s_all		kernel-grsec
+064						grsec_s_client		kernel-grsec
+065						grsec_s_server		kernel-grsec
066
067
068
@@ -90,24 +78,24 @@ ID	User		Package		Group			Package
070
071
072
-073	postfix		postfix		postfix			postfix
+073	postfix		postfix			postfix			postfix
074
-075					postdrop		postfix
+075						postdrop		postfix
076
-077	dspam		dspam		dspam			dspam
+077	dspam		dspam			dspam			dspam
078
079
-080	mailman		mailman		mailman			mailman
+080	mailman		mailman			mailman			mailman
081
082
083
-084     avahi           avahi           avahi           	avahi
-085	firebird	firebird 	firebird 		firebird
+084	avahi		avahi			avahi			avahi
+085	firebird	firebird 		firebird 		firebird
086
087
088
089
-090	pop		shadow		pop			shadow
+090	pop		shadow			pop			shadow
091
092
093
@@ -115,13 +103,13 @@ ID	User		Package		Group			Package
095
096
097
-098					nobody			shadow
-099	nobody		shadow		nogroups		shadow
-100			shadow		users			shadow
-101			shadow		console			shadow
+098						nobody			shadow
+099	nobody		shadow			nogroups		shadow
+100			shadow			users			shadow
+101			shadow			console			shadow
102
103
-104	distccd		distcc		distccd			distcc
+104	distccd		distcc			distccd			distcc
105
106
107
@@ -130,7 +118,7 @@ ID	User		Package		Group			Package
110
111
112
-113	logcheck	logcheck	logcheck		logcheck
+113	logcheck	logcheck		logcheck		logcheck
114
115
116
@@ -520,7 +508,7 @@ ID	User		Package		Group			Package
500
501
502
-503	bitlbee		bitlbee		bitlbee			bitlbee
+503	bitlbee		bitlbee			bitlbee			bitlbee
504
505
506
From boobaa at frugalware.org  Fri Oct  5 21:43:02 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 21:43:04 2007
Subject: [Frugalware-git] frugalware-current: munin-1.2.5-3-i686
Message-ID: <20071005194302.C18D413A40D5@genesis.frugalware.org>

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

commit 333e0f2c02cb95e0074a9aa4018ca7f4c5243a19
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 21:42:46 2007 +0200

munin-1.2.5-3-i686
duh, my bad, relbump again to correct the uid/gid

diff --git a/source/network-extra/munin/FrugalBuild b/source/network-extra/munin/FrugalBuild
index 79e555f..9bdb957 100644
--- a/source/network-extra/munin/FrugalBuild
+++ b/source/network-extra/munin/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=munin
pkgver=1.2.5
-pkgrel=2
+pkgrel=3
pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface."
Finclude sourceforge
url="http://munin.projects.linpro.no/"
@@ -17,7 +17,7 @@ sha1sums=('c46c92e6860a447aebd1c738dbe316d40d905e4f' \
'0f2df42722449dc9983bc3e1dd8a81406ea95c32' \
'876dfcb7c1690be14611db4e9d55b9b40cedac88' \
'a1ce31369c2278c1f53509178856341f9a9f6cc6' \
-	  '0632fb4750c1fb63e31b4c957963e42205ef77d6')
+	  '264321148f314a2d28a71b688f414e933a0dee03')
options=('scriptlet')
backup=('etc/munin/munin.conf')

diff --git a/source/network-extra/munin/README.Frugalware b/source/network-extra/munin/README.Frugalware
index 57eb40c..6cd1e17 100644
--- a/source/network-extra/munin/README.Frugalware
+++ b/source/network-extra/munin/README.Frugalware
@@ -3,8 +3,8 @@ ones. Because of this munin service will not start if you have it installed
before, so you have to correct this by issuing these commands:

------------
-groupmod -g 41 munin
-usermod -u 41 -g 41 munin
+groupmod -g 47 munin
+usermod -u 47 -g 47 munin
chown -R munin:munin /var/lib/munin
chown -R munin:munin /var/www/html/munin
chown -R munin:munin /var/log/munin
diff --git a/source/network-extra/munin/munin.install b/source/network-extra/munin/munin.install
index 433ec74..72d78d4 100644
--- a/source/network-extra/munin/munin.install
+++ b/source/network-extra/munin/munin.install
@@ -1,10 +1,10 @@
post_install()
{
if ! grep -q '^munin:' /etc/group ; then
-		groupadd -g 41 munin
+		groupadd -g 47 munin
fi
if ! grep -q '^munin:' /etc/passwd ; then
-		useradd -u 41 -g 41 -s /bin/false -c "Munin User" -d /var/lib/munin munin
+		useradd -u 47 -g 47 -s /bin/false -c "Munin User" -d /var/lib/munin munin
fi

# permissions
From boobaa at frugalware.org  Fri Oct  5 21:50:12 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Oct  5 21:50:14 2007
Subject: [Frugalware-git] frugalware-current: munin-node-1.2.5-3-i686
Message-ID: <20071005195012.E787F13A40D5@genesis.frugalware.org>

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

commit dbd33c9f10712d832b2116b23170128fedf17b25
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Fri Oct 5 21:49:24 2007 +0200

munin-node-1.2.5-3-i686
duh, my bad, relbump again to correct the uid/gid

diff --git a/source/network-extra/munin-node/FrugalBuild b/source/network-extra/munin-node/FrugalBuild
index 5fa86c6..6d12cf1 100644
--- a/source/network-extra/munin-node/FrugalBuild
+++ b/source/network-extra/munin-node/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=munin-node
pkgver=1.2.5
-pkgrel=2
+pkgrel=3
pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface. (Node)"
_F_sourceforge_name="munin"
Finclude sourceforge
diff --git a/source/network-extra/munin-node/munin-node.install b/source/network-extra/munin-node/munin-node.install
index c955970..9438a11 100644
--- a/source/network-extra/munin-node/munin-node.install
+++ b/source/network-extra/munin-node/munin-node.install
@@ -1,10 +1,10 @@
post_install()
{
if ! grep -q '^munin:' /etc/group ; then
-		groupadd -g 41 munin
+		groupadd -g 47 munin
fi
if ! grep -q '^munin:' /etc/passwd ; then
-		useradd -u 41 -g 41 -s /bin/false -c "Munin User" -d /var/lib/munin munin
+		useradd -u 47 -g 47 -s /bin/false -c "Munin User" -d /var/lib/munin munin
fi

# permissions
diff --git a/source/network-extra/munin-node/rc.munin-node b/source/network-extra/munin-node/rc.munin-node
index 53d9051..608069a 100644
--- a/source/network-extra/munin-node/rc.munin-node
+++ b/source/network-extra/munin-node/rc.munin-node
@@ -36,4 +36,3 @@ if [ "$1" = "stop" ]; then
start "$startmuninnode"
ok $?
fi
-
\ No newline at end of file
From crazy at frugalware.org  Fri Oct  5 21:58:33 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct  5 21:58:35 2007
Subject: [Frugalware-git] frugalware-current: elfutils-0.128-2-i686
Message-ID: <20071005195833.A072613A40D5@genesis.frugalware.org>

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

commit 5d66573fcd57fc7d45df2e80c38dc31a31d3c44c
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 5 21:57:51 2007 +0200

elfutils-0.128-2-i686
* nobuild that crap , replaced already my libelf
* krix use your brain after freeze and fix the conflicts
* or remove it

diff --git a/source/lib-extra/elfutils/FrugalBuild b/source/lib-extra/elfutils/FrugalBuild
index 02ddf7b..ca08e43 100644
--- a/source/lib-extra/elfutils/FrugalBuild
+++ b/source/lib-extra/elfutils/FrugalBuild
@@ -11,6 +11,7 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump ftp://sources.redhat.com/pub/systemtap/elfutils|grep 'elfutils-\(.*\).tar.gz$'|Flasttar"
source=(ftp://sources.redhat.com/pub/systemtap/elfutils/$pkgname-$pkgver.tar.gz)
+options=('nobuild')
sha1sums=('1440cfdbfa30bd6f9c1fdfb9a97cf87f38b7b6c5')

build() {
From priyank at frugalware.org  Fri Oct  5 22:01:59 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct  5 22:02:01 2007
Subject: [Frugalware-git] frugalware-current: glibmm-2.14.1-1-i686
Message-ID: <20071005200159.929F113A40D5@genesis.frugalware.org>

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

commit 0dcf90769168976b7ad936ee9b22dee6f93bcad5
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 01:23:25 2007 +0530

glibmm-2.14.1-1-i686
* Version bump

diff --git a/source/lib/glibmm/FrugalBuild b/source/lib/glibmm/FrugalBuild
index e901dbc..12a215a 100644
--- a/source/lib/glibmm/FrugalBuild
+++ b/source/lib/glibmm/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=glibmm
-pkgver=2.14.0
+pkgver=2.14.1
pkgrel=1
pkgdesc="C++ interface for glib2"
url="http://www.gnome.org/"
@@ -10,6 +10,6 @@ depends=('libsigc++2' 'glib2>=2.14.1')
groups=('lib')
archs=('i686' 'x86_64')
Finclude gnome
-sha1sums=('a512fd9b7ef0b1d315ed9297ca411daacac85da7')
+sha1sums=('aa6125f8967c5852f378c1997f4482b46b5c4282')

# optimization OK
From priyank at frugalware.org  Fri Oct  5 22:34:16 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct  5 22:34:19 2007
Subject: [Frugalware-git] frugalware-current: gtkmm-2.12.1-1-i686
Message-ID: <20071005203416.D86B113A40D5@genesis.frugalware.org>

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

commit e3dfae8c13b8f798ab8882008df374bef623d29d
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 01:53:59 2007 +0530

gtkmm-2.12.1-1-i686
* Version bump
* SBU fix

diff --git a/source/gnome/gtkmm/FrugalBuild b/source/gnome/gtkmm/FrugalBuild
index c4f4bb8..a50480d 100644
--- a/source/gnome/gtkmm/FrugalBuild
+++ b/source/gnome/gtkmm/FrugalBuild
@@ -1,16 +1,16 @@
-# Compiling Time: 1.38 SBU
+# Compiling Time: 1.53 SBU
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=gtkmm
-pkgver=2.12.0
+pkgver=2.12.1
pkgrel=1
pkgdesc="C++ interface for GTK+2"
url="http://www.gnome.org/"
-depends=('glibmm>=2.14.0' 'gtk+2' 'cairomm>=1.4.2')
+depends=('glibmm>=2.14.1' 'gtk+2' 'cairomm>=1.4.2')
groups=('gnome')
archs=('i686' 'x86_64')
Finclude gnome
Fconfopts="$Fconfopts --disable-examples --disable-demos"
-sha1sums=('a8a8e24a01e3205ac693138377c6090db7202de8')
+sha1sums=('9f20a32b2e0a3c43efb5732a0917db69ac9493a9')

# optimization OK
From vmiklos at frugalware.org  Sat Oct  6 01:18:55 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 01:18:57 2007
Subject: [Frugalware-git] frugalware-current: splashy-0.3.5-2-i686
Message-ID: <20071005231855.144CA13A40D5@genesis.frugalware.org>

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

commit 80f268648dcdf172c06ce4d2d0729fffb9b6ed96
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 01:18:19 2007 +0200

splashy-0.3.5-2-i686
- rebuilt with newer theme
- shutdown now has a different image
- this time the text is hardwired to the image..

diff --git a/source/base/splashy/FrugalBuild b/source/base/splashy/FrugalBuild
index 39b3088..e238397 100644
--- a/source/base/splashy/FrugalBuild
+++ b/source/base/splashy/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=splashy
pkgver=0.3.5
-themever=0.6
+themever=0.7
# see http://alioth.debian.org/project/showfiles.php?group_id=30657
rel_id=2071
-pkgrel=1
+pkgrel=2
pkgdesc="A complete user-space boot splash system"
url="http://alioth.debian.org/projects/splashy/"
depends=('libgcc')
@@ -21,6 +21,15 @@ source=(http://alioth.debian.org/download.php/$rel_id/splashy-$pkgver.tar.gz \
splashy-0.3.0-frugalware.diff splashy-0.3.0-nof2.diff \
rc.{zz-,}splash rc.splash-{de,hu,it}.po \
http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.gz)
+sha1sums=('9a3a012a1d1d3a16db2765d8b15deaa3312f6732' \
+          '857b93276015072589bece4eef5004bcc8ee208b' \
+          '4979a54122223dc7d4324f52e120ff9005a8c17b' \
+          '006d65bb621d1108cbb994fb50712bad4d61b6d0' \
+          'dc5ebe596cd9379d40985d0d0873545450f1fe06' \
+          '82c272166e89ecc840169fa76cc3fb45e2236712' \
+          'd86d3554aa64b129352e826d1e659a5a4611b47d' \
+          'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \
+          '5834d1c3d1f0327f2c341f84d07e137afcbb86e2')

build()
{
@@ -39,14 +48,5 @@ build()
Fexe /etc/rc.d/rc.zz-splash
}

-sha1sums=('9a3a012a1d1d3a16db2765d8b15deaa3312f6732' \
-          'dac9317fdf981dd1b55dfd3043a6e86f40a5ff9e' \
-          '4979a54122223dc7d4324f52e120ff9005a8c17b' \
-          '006d65bb621d1108cbb994fb50712bad4d61b6d0' \
-          'd9fc082529391f5572020a15607d354dc95f2835' \
-          '82c272166e89ecc840169fa76cc3fb45e2236712' \
-          'd86d3554aa64b129352e826d1e659a5a4611b47d' \
-          'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \
-          'a86c9b771b8b9a4b02cd76b917a3afaebc359a1f')
# optimization OK

diff --git a/source/base/splashy/rc.splash b/source/base/splashy/rc.splash
index 7005cdf..7b4a9b5 100644
--- a/source/base/splashy/rc.splash
+++ b/source/base/splashy/rc.splash
@@ -18,7 +18,12 @@ rc_start()
{
grep -q nosplashy /proc/cmdline && return
chvt 1
-	splashy boot 2>/dev/null
+	if [ -n "$1" ]; then
+		splashy $1 2>/dev/null
+	else
+		splashy boot 2>/dev/null
+	fi
+	return # FIXME: this time the text is included in the image
str=$"Press Esc for verbose mode"
max=1024
i=0
@@ -32,7 +37,7 @@ rc_start()

rc_stop()
{
-	rc_start
+	rc_start shutdown
}

rc_exec $1
diff --git a/source/base/splashy/splashy-0.3.0-frugalware.diff b/source/base/splashy/splashy-0.3.0-frugalware.diff
index 69d29b2..ac920ce 100644
--- a/source/base/splashy/splashy-0.3.0-frugalware.diff
+++ b/source/base/splashy/splashy-0.3.0-frugalware.diff
@@ -13,15 +13,16 @@ diff -Naur splashy-0.3.0.orig/doc/config.xml.in splashy-0.3.0/doc/config.xml.in
diff -Naur splashy-0.3.0.orig/Makefile.am splashy-0.3.0/Makefile.am
--- splashy-0.3.0.orig/Makefile.am	2007-01-23 21:20:58.000000000 +0100
+++ splashy-0.3.0/Makefile.am	2007-01-26 15:00:26.000000000 +0100
-@@ -10,7 +10,10 @@
+@@ -10,7 +10,11 @@
themes/default/background.jpg \
themes/default/error.jpg \
themes/default/theme.xml \
-	themes/default/FreeSans.ttf
+	themes/default/FreeSans.ttf \
+	themes/frugalware/background.png \
-+	themes/frugalware/theme.xml \
-+	themes/frugalware/FreeSans.ttf
++	themes/frugalware/error.png \
++	themes/frugalware/shutdown.png \
++	themes/frugalware/theme.xml


# This will canonically be installed in /usr/share/splashy
From priyank at frugalware.org  Sat Oct  6 07:39:32 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 07:39:35 2007
Subject: [Frugalware-git] frugalware-current: libsoup-2.2.101-1-i686
Message-ID: <20071006053932.969A313A40D5@genesis.frugalware.org>

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

commit a4dc2188489063cc6b3fb26d9937e4451cdaddcf
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 11:05:41 2007 +0530

libsoup-2.2.101-1-i686
* Version bump

diff --git a/source/gnome/libsoup/FrugalBuild b/source/gnome/libsoup/FrugalBuild
index eff745c..62673a0 100644
--- a/source/gnome/libsoup/FrugalBuild
+++ b/source/gnome/libsoup/FrugalBuild
@@ -2,15 +2,15 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=libsoup
-pkgver=2.2.100
-pkgrel=4
+pkgver=2.2.101
+pkgrel=1
pkgdesc="An HTTP library implementation in C"
url="http://www.gnome.org/"
depends=('glib2>=2.14.1' 'gnutls>=2.0.1-2' 'libxml2' 'libgcrypt')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
-sha1sums=('d17c08ec3300d357d71758ce43b1ea5422c61d48')
+sha1sums=('3feaeea68cb5515e96933e3ff2da4c5d51ab3476')
Fconfopts="$Fconfopts --enable-ssl --enable-libgpg-error"

# optimization OK
From voroskoi at frugalware.org  Sat Oct  6 09:26:30 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Sat Oct  6 09:26:31 2007
Subject: [Frugalware-git] homepage-ng: FSA290-t1lib
Message-ID: <20071006072630.7D0B813A40D5@genesis.frugalware.org>

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

commit dec6652199713e0cf348b92ea27fb04a4475b5ab
Author: voroskoi <voroskoi@frugalware.org>
Date:   Sat Oct 6 09:13:33 2007 +0200

FSA290-t1lib

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 5b0b8b6..36dc98c 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,18 @@

<fsas>
<fsa>
+		<id>290</id>
+		<date>2007-10-06</date>
+		<author>voroskoi</author>
+		<package>t1lib</package>
+		<vulnerable>5.1.1-1</vulnerable>
+		<unaffected>5.1.1-2terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2297</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4033</cve>
+		<desc>Hamid Ebadi has reported a vulnerability in t1lib, which can be exploited by malicious users to potentially compromise a vulnerable system.
+			The vulnerability is caused due to a boundary error within the "intT1_EnvGetCompletePath()" function in lib/t1lib/t1env.c. This can be exploited to cause a buffer overflow when an application processes an overly long string in the "FileName" parameter.</desc>
+	</fsa>
+	<fsa>
<id>289</id>
<date>2007-10-04</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Sat Oct  6 09:33:18 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Sat Oct  6 09:33:20 2007
Subject: [Frugalware-git] homepage-ng: FSA291-ruby
Message-ID: <20071006073318.96B7513A40D5@genesis.frugalware.org>

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

commit bc3fcae6e0dc3df604183203538bcd169f2a2e6b
Author: voroskoi <voroskoi@frugalware.org>
Date:   Sat Oct 6 09:20:20 2007 +0200

FSA291-ruby

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 36dc98c..4b0f44a 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,19 @@

<fsas>
<fsa>
+		<id>291</id>
+		<date>2007-10-06</date>
+		<author>voroskoi</author>
+		<package>ruby</package>
+		<vulnerable>1.8.5-4terminus1</vulnerable>
+		<unaffected>1.8.5-4terminus2</unaffected>
+		<bts>http://bugs.frugalware.org/task/2459</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5162</cve>
+		<desc>Chris Clark has reported a security issue in Ruby, which can be exploited by malicious people to conduct spoofing attacks.
+			The security issue is caused due to the "Net::HTTPS" library not properly checking if the Common Name field provided inside SSL server certificates matches the requested hostname of a server. This can be exploited to conduct spoofing attacks.
+			Successful exploitation requires a MitM (Man-in-the-Middle) attack and possession of a valid certificate, which is signed by the CA specified in the client.</desc>
+	</fsa>
+	<fsa>
<id>290</id>
<date>2007-10-06</date>
<author>voroskoi</author>
From vmiklos at frugalware.org  Sat Oct  6 12:51:36 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 12:51:40 2007
Subject: [Frugalware-git] frugalware-current: python-2.5.1-6-i686
Message-ID: <20071006105136.4971113A40D5@genesis.frugalware.org>

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

commit 13815dcfdec821592e12406b319b232df0c2b258
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 12:51:12 2007 +0200

python-2.5.1-6-i686
added -2.5.CVE-2007-4965-int-overflow.patch
closes #2428

diff --git a/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild
index 510a818..f601804 100644
--- a/source/devel/python/FrugalBuild
+++ b/source/devel/python/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=python
pkgver=2.5.1
shortpkgver=2.5 # 2.3 if $pkgver=2.3.4
-pkgrel=5
+pkgrel=6
pkgdesc="A high-level scripting language"
url="http://www.python.org"
depends=('glibc' 'db>=4.6.18' 'bzip2' 'gdbm' 'openssl' 'glib2')
@@ -15,8 +15,9 @@ options=('scriptlet')
up2date="lynx -dump $url/download/|grep current|sed 's/.*n \(.*\)\. .*/\1/;q'"
source=(http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2 \
Python-2.4.1-gdbm-1.patch \
-	insecure_pathnames.diff)
-signatures=($source.asc '' '')
+	insecure_pathnames.diff \
+	http://bugs.python.org/file8450/python-2.5.CVE-2007-4965-int-overflow.patch)
+signatures=($source.asc '' '' '')

subpkgs=("$pkgname-tools")
subdescs=("Optional development tools to extending Python")
From vmiklos at frugalware.org  Sat Oct  6 14:26:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 14:26:49 2007
Subject: [Frugalware-git] frugalware-current: python-2.5.1-7-i686
Message-ID: <20071006122646.98C6713A40D5@genesis.frugalware.org>

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

commit f8addd09690541d8ade7d3af6c1073f4a4c7e5f5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 14:26:35 2007 +0200

python-2.5.1-7-i686
grr, wrong sec patch. now using the correct one

diff --git a/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild
index f601804..cf8b274 100644
--- a/source/devel/python/FrugalBuild
+++ b/source/devel/python/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=python
pkgver=2.5.1
shortpkgver=2.5 # 2.3 if $pkgver=2.3.4
-pkgrel=6
+pkgrel=7
pkgdesc="A high-level scripting language"
url="http://www.python.org"
depends=('glibc' 'db>=4.6.18' 'bzip2' 'gdbm' 'openssl' 'glib2')
@@ -16,7 +16,7 @@ up2date="lynx -dump $url/download/|grep current|sed 's/.*n \(.*\)\. .*/\1/;q'"
source=(http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2 \
Python-2.4.1-gdbm-1.patch \
insecure_pathnames.diff \
-	http://bugs.python.org/file8450/python-2.5.CVE-2007-4965-int-overflow.patch)
+	http://bugs.python.org/file8452/python-2.5.CVE-2007-4965-int-overflow.patch)
signatures=($source.asc '' '' '')

subpkgs=("$pkgname-tools")
From vmiklos at frugalware.org  Sat Oct  6 17:17:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 17:17:12 2007
Subject: [Frugalware-git] bitlbee-skype: readme: skype4py 0.9.28.4 has some
	incompatible changes, mention this
Message-ID: <20071006151711.0CE4B13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=963b4f21f7ae784c6688339d3bc7ab1816cc84ec

commit 963b4f21f7ae784c6688339d3bc7ab1816cc84ec
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 16:46:59 2007 +0200

readme: skype4py 0.9.28.4 has some incompatible changes, mention this
also correct an outdated comment about dbus

diff --git a/README b/README
index d889a57..3b85d16 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ not..)

* Skype 1.4.0.99. 1.4.0.74 did *not* work for me.
* bitlbee-dev >= rev245. Previous versions need patching.
-* Skype4Py >= 0.9.28.1. Previous versions uses `DBus` by default.
+* Skype4Py >= 0.9.28.1. Previous versions uses `DBus` by default. The latest version I've tested is 0.9.28.3.
* Python 2.5. Skype4Py does not work with 2.4.
* pygobject

@@ -95,7 +95,7 @@ skyped
----

NOTE: It's important to start `skyped` on the same machine and using the same
-user as you run Skype as it uses the session `DBus` for communication!
+user!

- Start your `IRC` client, connect to BitlBee and add your account:
From vmiklos at frugalware.org  Sat Oct  6 17:17:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 17:17:13 2007
Subject: [Frugalware-git] bitlbee-skype: notification when somebody wants to
	transfer a file
Message-ID: <20071006151711.4E4FD13A40EA@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=7783bf47d9c1b0a315e6a4212d51549eae0b6b42

commit 7783bf47d9c1b0a315e6a4212d51549eae0b6b42
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 17:16:06 2007 +0200

notification when somebody wants to transfer a file

diff --git a/README b/README
index 3b85d16..9be0057 100644
--- a/README
+++ b/README
@@ -181,6 +181,8 @@ your VNC server regularly. (How ugly.)

- Detect when somebody wants to add you and ask for confirmation

+- Detect when somebody wants to transfer a file
+
== What needs to be done (aka. TODO)

- Group chat support. For an initial support the followings would be needed:
@@ -193,8 +195,6 @@ your VNC server regularly. (How ugly.)

- Add a question callback for calls.

-- Somehow at least mention that somebody offers a file for transfer.
-
== I would like to have support for ...

If something does not work and it's not in the TODO section, then please
diff --git a/skype.c b/skype.c
index dc47074..e1fb729 100644
--- a/skype.c
+++ b/skype.c
@@ -35,10 +35,16 @@

typedef enum
{
-	SKYPE_CALL_RINGING,
+	SKYPE_CALL_RINGING = 1,
SKYPE_CALL_MISSED
} skype_call_status;

+typedef enum
+{
+	SKYPE_FILETRANSFER_NEW = 1,
+	SKYPE_FILETRANSFER_FAILED
+} skype_filetransfer_status;
+
/*
* Structures
*/
@@ -61,6 +67,8 @@ struct skype_data
* handle. So we store the state here and then we can send a
* notification about the handle is in a given status. */
skype_call_status call_status;
+	/* Same for file transfers. */
+	skype_filetransfer_status filetransfer_status;
};

struct skype_away_state
@@ -312,14 +320,55 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
else if(!strncmp(info, "PARTNER_HANDLE ", 15))
{
info += 15;
-						switch(sd->call_status)
-						{
-							case SKYPE_CALL_RINGING:
-								imcb_log(ic, "The user %s is currently ringing you.", info);
-							break;
-							case SKYPE_CALL_MISSED:
-								imcb_log(ic, "You have missed a call from user %s.", info);
-							break;
+						if(sd->call_status) {
+							switch(sd->call_status)
+							{
+								case SKYPE_CALL_RINGING:
+									imcb_log(ic, "The user %s is currently ringing you.", info);
+									break;
+								case SKYPE_CALL_MISSED:
+									imcb_log(ic, "You have missed a call from user %s.", info);
+									break;
+							}
+							sd->call_status = 0;
+						}
+					}
+				}
+			}
+			else if(!strncmp(line, "FILETRANSFER ", 13))
+			{
+				char *id = strchr(line, ' ');
+				if(++id)
+				{
+					char *info = strchr(id, ' ');
+					*info = '\0';
+					info++;
+					if(!strcmp(info, "STATUS NEW"))
+					{
+						g_snprintf(buf, 1024, "GET FILETRANSFER %s PARTNER_HANDLE\n", id);
+						skype_write( ic, buf, strlen( buf ) );
+						sd->filetransfer_status = SKYPE_FILETRANSFER_NEW;
+					}
+					else if(!strcmp(info, "STATUS FAILED"))
+					{
+						g_snprintf(buf, 1024, "GET FILETRANSFER %s PARTNER_HANDLE\n", id);
+						skype_write( ic, buf, strlen( buf ) );
+						sd->filetransfer_status = SKYPE_FILETRANSFER_FAILED;
+					}
+					else if(!strncmp(info, "PARTNER_HANDLE ", 15))
+					{
+						info += 15;
+						if(sd->filetransfer_status) {
+							switch(sd->filetransfer_status)
+							{
+								case SKYPE_FILETRANSFER_NEW:
+									imcb_log(ic, "The user %s offered a new file for you.", info);
+									break;
+								case SKYPE_FILETRANSFER_FAILED:
+									imcb_log(ic, "Failed to transfer file from user %s.", info);
+									break;
+							}
+							sd->filetransfer_status = 0;
}
}
}
From vmiklos at frugalware.org  Sat Oct  6 17:26:20 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 17:26:21 2007
Subject: [Frugalware-git] bitlbee-skype: handle the case when ping fails
	(ie: timeout)
Message-ID: <20071006152620.9351E13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=c982f1158bc9f07f2f4b97bd20bbc1a47d9416b9

commit c982f1158bc9f07f2f4b97bd20bbc1a47d9416b9
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 17:25:21 2007 +0200

handle the case when ping fails (ie: timeout)

diff --git a/skyped.py b/skyped.py
index a79cd4f..7e15b72 100644
--- a/skyped.py
+++ b/skyped.py
@@ -51,7 +51,10 @@ def input_handler(fd, io_condition):
return True

def idle_handler(skype):
-	skype.skype.SendCommand(skype.skype.Command(-1, "PING"))
+	try:
+		skype.skype.SendCommand(skype.skype.Command(-1, "PING"))
+	except Skype4Py.SkypeAPIError, s:
+		dprint("Warning, pinging Skype failed (%s)." % (s))
try:
time.sleep(2)
except KeyboardInterrupt:
From vmiklos at frugalware.org  Sat Oct  6 17:36:55 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 17:36:56 2007
Subject: [Frugalware-git] bitlbee-skype: display received messages in utf8,
	so that we can avoid most UnicodeEncodeErrors
Message-ID: <20071006153655.78C4A13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=24cd60dd1e64ed8648a910012a8283cc0904037a

commit 24cd60dd1e64ed8648a910012a8283cc0904037a
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 17:35:55 2007 +0200

display received messages in utf8, so that we can avoid most UnicodeEncodeErrors

diff --git a/skyped.py b/skyped.py
index 7e15b72..22b0b32 100644
--- a/skyped.py
+++ b/skyped.py
@@ -102,13 +102,18 @@ class SkypeApi():
else:
msg_text = [msg_text]
for i in msg_text:
-			e = i.encode(locale.getdefaultlocale()[1])
+			# use utf-8 here to solve the following problem:
+			# people use env vars like LC_ALL=en_US (latin1) then
+			# they complain about why can't they receive latin2
+			# messages.. so here it is: always use utf-8 then
+			# everybody will be happy
+			e = i.encode('UTF-8')
dprint('<< ' + e)
if conn:
try:
conn.send(e + "\n")
except IOError, s:
-					dprint("Warning, seding '%s' failed (%s)." % (e, s))
+					dprint("Warning, sending '%s' failed (%s)." % (e, s))

def send(self, msg_text):
if not len(msg_text):
@@ -120,7 +125,7 @@ class SkypeApi():
except Skype4Py.ISkypeError:
pass
except Skype4Py.SkypeAPIError, s:
-			dprint("Warning, seding '%s' failed (%s)." % (e, s))
+			dprint("Warning, sending '%s' failed (%s)." % (e, s))

class Options:
def __init__(self):
From vmiklos at frugalware.org  Sat Oct  6 18:06:44 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 18:06:47 2007
Subject: [Frugalware-git] bitlbee-skype: handle topic changes
Message-ID: <20071006160644.C457F13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=b2d9bfa54753bcf0c617cc515d08f0ac46c1d65e

commit b2d9bfa54753bcf0c617cc515d08f0ac46c1d65e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 18:05:44 2007 +0200

handle topic changes

diff --git a/README b/README
index 9be0057..0457c3e 100644
--- a/README
+++ b/README
@@ -183,6 +183,8 @@ your VNC server regularly. (How ugly.)

- Detect when somebody wants to transfer a file

+- Handle topic changes
+
== What needs to be done (aka. TODO)

- Group chat support. For an initial support the followings would be needed:
@@ -191,8 +193,6 @@ your VNC server regularly. (How ugly.)

* Send / receive group chat messages.

-  * Handle topic changes.
-
- Add a question callback for calls.

== I would like to have support for ...
diff --git a/skype.c b/skype.c
index e1fb729..9658c79 100644
--- a/skype.c
+++ b/skype.c
@@ -69,6 +69,8 @@ struct skype_data
skype_call_status call_status;
/* Same for file transfers. */
skype_filetransfer_status filetransfer_status;
+	/* True if the next message will be a topic */
+	int topic;
};

struct skype_away_state
@@ -292,7 +294,13 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(sd->handle && strlen(info))
{
/* New body, we have everything to use imcb_buddy_msg() now! */
-							imcb_buddy_msg(ic, sd->handle, info, 0, 0);
+							if(sd->topic)
+							{
+								imcb_log(ic, "%s has changed the chat topic to \"%s\"", sd->handle, info);
+								sd->topic = 0;
+							}
+							else
+								imcb_buddy_msg(ic, sd->handle, info, 0, 0);
}
}
}
@@ -373,6 +381,18 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
}
}
}
+			else if(!strncmp(line, "CHAT ", 5))
+			{
+				char *id = strchr(line, ' ');
+				if(++id)
+				{
+					char *info = strchr(id, ' ');
+					*info = '\0';
+					info++;
+					if(!strncmp(info, "TOPIC ", 6))
+						sd->topic = 1;
+				}
+			}
lineptr++;
}
g_strfreev(lines);
From priyank at frugalware.org  Sat Oct  6 18:33:13 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 18:33:16 2007
Subject: [Frugalware-git] frugalware-current: mesa-cvs-20070601-1-i686
Message-ID: <20071006163313.0923913A40D5@genesis.frugalware.org>

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

commit f26140b01935aab7907af296162212085c9d4d0e
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 21:50:24 2007 +0530

mesa-cvs-20070601-1-i686
* updated to a more recent git snapshot (20070601)
* fixed depends

diff --git a/source/xlib-extra/mesa-cvs/FrugalBuild b/source/xlib-extra/mesa-cvs/FrugalBuild
index 4e364e5..a29472a 100644
--- a/source/xlib-extra/mesa-cvs/FrugalBuild
+++ b/source/xlib-extra/mesa-cvs/FrugalBuild
@@ -3,19 +3,20 @@

pkgname=mesa-cvs
origname=Mesa-cvs
-pkgver=20060624
+pkgver=20070601
pkgrel=1
pkgdesc="Mesa is a 3D graphics library (CVS Version)"
url="http://mesa3d.sourceforge.net/"
-depends=('libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm')
+depends=('libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm' \
+	'libxfixes' 'libxdamage')
makedepends=('makedepend' 'glproto' 'xf86vidmodeproto')
archs=('x86_64' 'i686')
groups=('xlib-extra')
up2date=$pkgver
source=(http://ftp.frugalware.org/pub/other/sources/mesa-cvs/$origname-$pkgver.tar.bz2 \
r200-copy-pixels-1.patch)
-sha1sums=('178b9c34315c5e01311385074de4d872d83cdf2d' \
-	  '1396202a472a59266e884cfef5654af4e4cd451c')
+sha1sums=('bb66411c631fcd3788ef0ed624a85c6ddad78c15' \
+          '1396202a472a59266e884cfef5654af4e4cd451c')

# NOTE: If you bump version (major or minor) you need to review the symlinking at the end of this
#       file !!!! On minor bump last number will be changed.
@@ -52,12 +53,12 @@ build()

Fmkdir /usr/lib/mesa-cvs

-	[ "$CARCH" == "x86_64" ] && mv $Fsrcdir/Mesa-cvs-20060624/lib64 $Fsrcdir/Mesa-cvs-20060624/lib
+	[ "$CARCH" == "x86_64" ] && mv $Fsrcdir/Mesa-cvs-$pkgver/lib64 $Fsrcdir/Mesa-cvs-$pkgver/lib

make install || Fdie

Fmkdir /usr/share/doc/$origname-$pkgver
-	cp -r docs/{README.*,*.html,RELNOTES-6.4.2,RELNOTES-6.5,COPYING,VERSIONS} \
+	cp -r docs/{README.*,*.html,RELNOTES-6.4,COPYING,VERSIONS} \
$Fdestdir/usr/share/doc/$origname-$pkgver/ || Fdie

Fmkdir /usr/lib/mesa-cvs/lib/xorg/modules/dri
From crazy at frugalware.org  Sat Oct  6 18:37:46 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct  6 18:37:48 2007
Subject: [Frugalware-git] frugalware-current: monodevelop-0.16-1-i686
Message-ID: <20071006163746.4B24313A40D5@genesis.frugalware.org>

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

commit 3cb3fd1e9257e7389cf7d63115b3723f7f767022
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 6 18:32:19 2007 +0200

monodevelop-0.16-1-i686
* Version bump
* closes #2471

diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild
index 7df08ef..9a96cb5 100644
--- a/source/gnome-extra/monodevelop/FrugalBuild
+++ b/source/gnome-extra/monodevelop/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=monodevelop
-pkgver=0.15
-pkgrel=2
+pkgver=0.16
+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>=1.2.4-2' 'firefox=2.0.0.7' 'ikvm' 'boo' 'gnome-sharp')
@@ -19,7 +19,7 @@ options=('scriptlet' 'force')
_F_gnome_desktop=y
_F_gnome_mime=y
Finclude gnome-scriptlet mono
-sha1sums=('83c903107590204e140cfb25c8bd7cdf437ec35b' \
+sha1sums=('d1fffaa28c68f566517c3ed9b882ebc23ffa72c6' \
'719b456cee8e5e2b4cf3778915464c191f246d98' \
'7e138cb136265162cdaf86520c4781b6ff2b9192' \
'db0fe450ef76f83853179bd0fd557f408175c3ee')
From priyank at frugalware.org  Sat Oct  6 18:42:16 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 18:42:18 2007
Subject: [Frugalware-git] frugalware-current: xgl-20070601-1-i686
Message-ID: <20071006164216.9A36313A40D5@genesis.frugalware.org>

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

commit a4d976d20e25f9786a4578866fb3cf1fc229b089
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 22:07:08 2007 +0530

xgl-20070601-1-i686
* updated to a more recent snapshot (20070601)
* fixed depends
* no longer remove the two headers
* removed 3 patches (fixed in upstream)

diff --git a/source/x11-extra/xgl/FrugalBuild b/source/x11-extra/xgl/FrugalBuild
index d9a9f7c..5bf9c0e 100644
--- a/source/x11-extra/xgl/FrugalBuild
+++ b/source/x11-extra/xgl/FrugalBuild
@@ -1,39 +1,35 @@
-# Compiling Time: 6.34 SBU
-# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>
+# Compiling Time: 1.22 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=xgl
-pkgver=20060505
-mesaver=20060505
-mesaname=Mesa-cvs
-pkgrel=8
+pkgver=20070601
+mesaver=20070601
+mesaname=Mesa-cvs-$mesaver
+pkgrel=1
pkgdesc="OpenGL accelerated X server"
url="http://www.freedesktop.org/Software/Xgl"
groups=('x11-extra')
archs=('x86_64' 'i686')
-depends=('glitz>=0.5.5_cvs' 'libxfont' 'libxdmcp' 'libxau' 'mesa-cvs' 'libxrandr' 'libxrender')
-makedepends=('randrproto' 'renderproto' 'fixesproto>=4.0' 'damageproto' 'xextproto' 'xproto' 'xf86dgaproto' 'xf86miscproto' \
-	     'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' 'compositeproto' 'recordproto' 'resourceproto' \
-	     'videoproto' 'scrnsaverproto>=1.1.0' 'evieext' 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' \
-	     'bigreqsproto' 'xcmiscproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' \
-	     'sgml-common' 'util-macros' 'glproto' 'libxkbfile' 'xorg-cf-files' 'libxxf86misc' 'libxkbui' 'libxaw' 'libxpm')
+depends=('glitz>=0.5.6' 'libglx' 'libxfont' 'libxdmcp' 'libxau' 'mesa-cvs' 'libxrandr' 'libxrender' 'libxinerama')
+makedepends=('randrproto' 'renderproto' 'fixesproto>=4.0' 'damageproto' 'xextproto' 'xproto' \
+	'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \
+	'compositeproto' 'recordproto' 'resourceproto' 'videoproto' 'scrnsaverproto>=1.1.0' \
+	'evieext' 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' 'bigreqsproto' \
+	'xcmiscproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' \
+	'sgml-common' 'util-macros' 'glproto' 'libxkbfile' 'xorg-cf-files' 'libxxf86misc' 'libxkbui' 'libxaw' 'libxpm')
up2date=$pkgver
-source=(http://ftp.frugalware.org/pub/other/sources/xgl/$pkgname-$pkgver.tar.bz2 \
-	http://ftp.frugalware.org/pub/other/sources/xgl/$mesaname-$mesaver.tar.bz2 \
-	01-kernel-headers-fix.patch \
-	02-access_c_skip_null_addresses.patch \
-	03-black-background.patch \
+source=(http://ftp.frugalware.org/pub/other/sources/xgl/$pkgname-$pkgver.tar.gz \
+	http://ftp.frugalware.org/pub/other/sources/mesa-cvs/$mesaname.tar.bz2 \
autogen-no-run-configure.patch \
README.Frugalware fw-xgl-control)
-sha1sums=('65f14bbccdb080512a19131522f51602e4501ca9' \
-          '5ea5b7a76de393098e0171e4e2a48a7969a5356c' \
-          'f31702e0029b2d68018598e73ed55c4d6c58367b' \
-          '859b98a4049400be152032fc09ceff2afe9e6dcf' \
-          '863ad92892785c3785b122bf54d0def4d4d2732c' \
+sha1sums=('1bd0731bbccf8c1bc763ac6092374b0a25f11e8e' \
+          'bb66411c631fcd3788ef0ed624a85c6ddad78c15' \
'9080a863743aa22710edb4ca5e5552b48db00e6f' \
'355a6b1c34420f12774045e821a447fab7074d39' \
'6efd93510083337d4f58e427fae26bace535bb91')

build() {
+	Fcd xserver
Fpatchall

./autogen.sh || Fdie
@@ -45,7 +41,7 @@ build() {
--localstatedir=/var \
--with-xkb-output=/var/lib/xkb \
--enable-multibuffer \
-		--with-mesa-source=$Fsrcdir/$mesaname-$mesaver \
+		--with-mesa-source=$Fsrcdir/$mesaname \
--with-vendor-web="http://www.frugalware.org" \
--with-os-name="Linux" \
--with-os-vendor="Frugalware" \
@@ -68,10 +64,6 @@ build() {
Frm usr/share/man
Frm var/lib/xkb/README.compiled

-	# Remove misplaced headers :)
-	rm $Fdestdir/exa.h
-	rm $Fdestdir/randrstr.h
-
Fmkdir /usr/sbin
Fexe fw-xgl-control /usr/sbin/
}
From priyank at frugalware.org  Sat Oct  6 18:45:45 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 18:45:47 2007
Subject: [Frugalware-git] frugalware-current: xgl-20070601-1-i686
Message-ID: <20071006164545.8E1FE13A40D5@genesis.frugalware.org>

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

commit e8718fd3c8fa6f667352a86bc090ef75c299ebbb
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 22:14:27 2007 +0530

xgl-20070601-1-i686
* the last commit didn't remove the three unwanted patches

diff --git a/source/x11-extra/xgl/01-kernel-headers-fix.patch b/source/x11-extra/xgl/01-kernel-headers-fix.patch
deleted file mode 100644
index 794efc6..0000000
--- a/source/x11-extra/xgl/01-kernel-headers-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xorg-server-0.99.3.orig/hw/xfree86/os-support/linux/lnx_agp.c xorg-server-0.99.3/hw/xfree86/os-support/linux/lnx_agp.c
---- xorg-server-0.99.3.orig/hw/xfree86/os-support/linux/lnx_agp.c	2005-11-19 13:58:12.336920250 +0100
-+++ xorg-server-0.99.3/hw/xfree86/os-support/linux/lnx_agp.c	2005-11-19 13:58:33.118219000 +0100
-@@ -20,6 +20,8 @@
- #include "xf86OSpriv.h"
-
- #if defined(linux)
-+#undef _LINUX_TYPES_H
-+#include <linux/types.h>
- #include <asm/ioctl.h>
- #include <linux/agpgart.h>
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
diff --git a/source/x11-extra/xgl/02-access_c_skip_null_addresses.patch b/source/x11-extra/xgl/02-access_c_skip_null_addresses.patch
deleted file mode 100644
index 8de9bd1..0000000
--- a/source/x11-extra/xgl/02-access_c_skip_null_addresses.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-*** xorg-server-1.0.1/os/access.c	Thu Dec 22 07:13:56 2005
---- xorg-server-1.0.1/os/access.c	Thu Dec 22 07:13:33 2005
-***************
-*** 978,985 ****
---- 978,987 ----
-  #ifdef DNETCONN
-  	if (ifr->ifa_addr.sa_family == AF_DECnet)
-  	    continue;
-  #endif /* DNETCONN */
-+ 	if(!ifr->ifa_addr)
-+             continue;
-  	len = sizeof(*(ifr->ifa_addr));
-  	family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr);
-  	if (family == -1 || family == FamilyLocal)
-  	    continue;
diff --git a/source/x11-extra/xgl/03-black-background.patch b/source/x11-extra/xgl/03-black-background.patch
deleted file mode 100644
index 7c68d35..0000000
--- a/source/x11-extra/xgl/03-black-background.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove the default root window grey stipple pattern, replacing it with
-blackness.
-
---- xorg-server-1.0.1/dix/window.c.die-ugly-pattern-die-die-die	Tue Feb 12 16:33:04 2002
-+++ xorg-server-1.0.1/dix/window.c	Tue Feb 12 16:45:32 2002
-@@ -119,8 +119,8 @@
-  *
-  ******/
-
--static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
--static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
-+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
-+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
-
- int screenIsSaved = SCREEN_SAVER_OFF;
-
From priyank at frugalware.org  Sat Oct  6 18:57:19 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 18:57:22 2007
Subject: [Frugalware-git] frugalware-current: xgl-20070601-1-i686
Message-ID: <20071006165719.E730813A40D5@genesis.frugalware.org>

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

commit 0e3276633a8497999628d640f5b5fa170b9e7c5c
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 22:26:00 2007 +0530

xgl-20070601-1-i686
* brr one more patch removed!

diff --git a/source/x11-extra/xgl/xgl-slang-library-noise.diff b/source/x11-extra/xgl/xgl-slang-library-noise.diff
deleted file mode 100644
index a4fe5b9..0000000
--- a/source/x11-extra/xgl/xgl-slang-library-noise.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- xgl-xorg/GL/symlink-mesa.sh.orig	2006-02-18 22:22:13.653757750 +0100
-+++ xgl-xorg/GL/symlink-mesa.sh	2006-02-18 22:21:56.088660000 +0100
-@@ -433,6 +433,8 @@
-     action slang_compile_variable.h
-     action slang_execute.c
-     action slang_execute.h
-+    action slang_library_noise.c
-+    action slang_library_noise.h
-     action slang_mesa.h
-     action slang_preprocess.c
-     action slang_preprocess.h
---- xgl-xorg/GL/mesa/shader/slang/Makefile.am.orig	2006-02-18 22:23:09.421243000 +0100
-+++ xgl-xorg/GL/mesa/shader/slang/Makefile.am	2006-02-18 22:22:55.644382000 +0100
-@@ -27,6 +27,7 @@
-                       slang_compile_struct.c \
-                       slang_compile_variable.c \
- 		      slang_execute.c \
-+		      slang_library_noise.c \
- 		      slang_preprocess.c \
- 		      slang_storage.c \
- 		      slang_utility.c
From priyank at frugalware.org  Sat Oct  6 19:01:27 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 19:01:28 2007
Subject: [Frugalware-git] frugalware-current: compiz-0.6.0-1-i686
Message-ID: <20071006170127.3989113A40D5@genesis.frugalware.org>

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

commit c841ceb8a8753dc6024464a689bd3882ed66d839
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 6 22:28:12 2007 +0530

compiz-0.6.0-1-i686
* Version bump
* New maintainer
* Fixed depends

diff --git a/source/gnome-extra/compiz/FrugalBuild b/source/gnome-extra/compiz/FrugalBuild
index 1544ea1..ba43fdb 100644
--- a/source/gnome-extra/compiz/FrugalBuild
+++ b/source/gnome-extra/compiz/FrugalBuild
@@ -1,13 +1,14 @@
-# Compiling Time: 0.42 SBU
-# Maintainer: AlexExtreme <alex@alex-smith.me.uk>
+# Compiling Time: 0.30 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=compiz
-pkgver=0.5.2
+pkgver=0.6.0
pkgrel=1
pkgdesc="Compiz is a compositing window manager using GLX_EXT_texture_from_pixmap"
url="http://www.go-compiz.org"
depends=('libgl' 'libglx' 'gconf' 'librsvg' 'libpng' 'control-center' 'gnome-desktop' 'libxcomposite' 'libxfixes' \
-	 'libxdamage' 'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libwnck>=2.20.0' 'libxrender')
+	 'libxdamage' 'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libwnck>=2.20.0' 'libxrender' \
+	 'libxslt' 'dbus')
makedepends=('perl-xml')
groups=('gnome-extra')
archs=('i686' 'x86_64')
@@ -16,8 +17,8 @@ _F_gnome_schemas=('/etc/gconf/schemas/compiz.schemas' \
Finclude gnome-scriptlet
up2date="lynx -dump http://www.compiz.org/index.php?title=Home:Start | grep development | Flasttar"
source=(http://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.gz)
-sha1sums=('0d0a4a39bfbe0ada770d9206b7a1b6b443c53c29')
defaultplugins="png,svg,decoration,fade,minimize,move,place,resize,water,wobbly,minimize,cube,switcher,scale,rotate"
Fconfopts="$Fconfopts --enable-librsvg --disable-metacity --enable-gnome --enable-gtk --with-scale-corner=no --with-default-plugins=$defaultplugins"
+sha1sums=('c296f9ccf0e35c582760880a6f0ac4fd34ee1bbf')

# optimization OK
From priyank at frugalware.org  Sat Oct  6 21:09:24 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct  6 21:09:26 2007
Subject: [Frugalware-git] frugalware-current: compiz-0.6.0-2-i686
Message-ID: <20071006190924.8935113A40D5@genesis.frugalware.org>

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

commit 2f196f0a005f35f23638c7d134832c078a57df77
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 7 00:36:15 2007 +0530

compiz-0.6.0-2-i686
* Installed quite a *lot* of missing schemas
* Fixed url

diff --git a/source/gnome-extra/compiz/FrugalBuild b/source/gnome-extra/compiz/FrugalBuild
index ba43fdb..040ae2f 100644
--- a/source/gnome-extra/compiz/FrugalBuild
+++ b/source/gnome-extra/compiz/FrugalBuild
@@ -3,17 +3,45 @@

pkgname=compiz
pkgver=0.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Compiz is a compositing window manager using GLX_EXT_texture_from_pixmap"
-url="http://www.go-compiz.org"
-depends=('libgl' 'libglx' 'gconf' 'librsvg' 'libpng' 'control-center' 'gnome-desktop' 'libxcomposite' 'libxfixes' \
+url="http://www.compiz.org"
+depends=('libgl' 'libglx' 'gconf' 'librsvg' 'libpng' 'control-center' 'gnome-desktop>=2.20.0' 'libxcomposite' 'libxfixes' \
'libxdamage' 'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libwnck>=2.20.0' 'libxrender' \
'libxslt' 'dbus')
makedepends=('perl-xml')
groups=('gnome-extra')
archs=('i686' 'x86_64')
-_F_gnome_schemas=('/etc/gconf/schemas/compiz.schemas' \
-		  '/etc/gconf/schemas/gwd.schemas')
+_F_gnome_schemas=('/etc/gconf/schemas/gwd.schemas' \
+		'/etc/gconf/schemas/compiz-zoom.schemas' \
+		'/etc/gconf/schemas/compiz-wobbly.schemas' \
+		'/etc/gconf/schemas/compiz-water.schemas' \
+		'/etc/gconf/schemas/compiz-video.schemas' \
+		'/etc/gconf/schemas/compiz-switcher.schemas' \
+		'/etc/gconf/schemas/compiz-svg.schemas' \
+		'/etc/gconf/schemas/compiz-screenshot.schemas' \
+		'/etc/gconf/schemas/compiz-scale.schemas' \
+		'/etc/gconf/schemas/compiz-rotate.schemas' \
+		'/etc/gconf/schemas/compiz-resize.schemas' \
+		'/etc/gconf/schemas/compiz-regex.schemas' \
+		'/etc/gconf/schemas/compiz-png.schemas' \
+		'/etc/gconf/schemas/compiz-plane.schemas' \
+		'/etc/gconf/schemas/compiz-place.schemas' \
+		'/etc/gconf/schemas/compiz-move.schemas' \
+		'/etc/gconf/schemas/compiz-minimize.schemas' \
+		'/etc/gconf/schemas/compiz-inotify.schemas' \
+		'/etc/gconf/schemas/compiz-ini.schemas' \
+		'/etc/gconf/schemas/compiz-glib.schemas' \
+		'/etc/gconf/schemas/compiz-gconf.schemas' \
+		'/etc/gconf/schemas/compiz-fs.schemas' \
+		'/etc/gconf/schemas/compiz-fade.schemas' \
+		'/etc/gconf/schemas/compiz-decoration.schemas' \
+		'/etc/gconf/schemas/compiz-dbus.schemas' \
+		'/etc/gconf/schemas/compiz-cube.schemas' \
+		'/etc/gconf/schemas/compiz-core.schemas' \
+		'/etc/gconf/schemas/compiz-clone.schemas' \
+		'/etc/gconf/schemas/compiz-blur.schemas' \
+		'/etc/gconf/schemas/compiz-annotate.schemas')
Finclude gnome-scriptlet
up2date="lynx -dump http://www.compiz.org/index.php?title=Home:Start | grep development | Flasttar"
source=(http://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.gz)
From vmiklos at frugalware.org  Sat Oct  6 21:21:27 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 21:21:31 2007
Subject: [Frugalware-git] bitlbee-skype: initial groupchat support
Message-ID: <20071006192127.1A35913A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=18c4dc21267adc8949210d793937f2ca4c872a3e

commit 18c4dc21267adc8949210d793937f2ca4c872a3e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 21:20:12 2007 +0200

initial groupchat support
read: we detect that we are invited we retreive the nicklist but we can't
receive/send messages yet

diff --git a/skype.c b/skype.c
index 9658c79..615fca0 100644
--- a/skype.c
+++ b/skype.c
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <poll.h>
#include <bitlbee.h>
+#include <glib.h>

#define SKYPE_PORT_DEFAULT "2727"

@@ -169,6 +170,19 @@ void skype_buddy_ask( struct im_connection *ic, char *handle, char *message)
g_free( buf );
}

+struct groupchat *skype_chat_by_name( struct im_connection *ic, char *name )
+{
+	struct groupchat *ret;
+
+	for( ret = ic->conversations; ret; ret = ret->next )
+	{
+		if(strcmp(name, ret->title ) == 0 )
+			break;
+	}
+
+	return ret;
+}
+
static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition cond )
{
struct im_connection *ic = data;
@@ -391,6 +405,29 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
info++;
if(!strncmp(info, "TOPIC ", 6))
sd->topic = 1;
+					else if(!strcmp(info, "STATUS MULTI_SUBSCRIBED"))
+					{
+						struct groupchat *gc;
+						gc = imcb_chat_new( ic, id );
+					}
+					else if(!strncmp(info, "ACTIVEMEMBERS ", 14))
+					{
+						info += 14;
+						struct groupchat *gc = skype_chat_by_name(ic, id);
+						if(!gc)
+							gc = imcb_chat_new( ic, id );
+						char **members = g_strsplit(info, " ", 0);
+						int i;
+						for(i=0;members[i];i++)
+						{
+							if(!strcmp(members[i], sd->username))
+								continue;
+							g_snprintf(buf, 1024, "%s@skype.com", members[i]);
+							imcb_chat_add_buddy(gc, buf);
+						}
+						imcb_chat_add_buddy(gc, sd->username);
+						g_strfreev(members);
+					}
}
}
lineptr++;
From vmiklos at frugalware.org  Sat Oct  6 22:45:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 22:45:45 2007
Subject: [Frugalware-git] bitlbee-skype: revert "handle topic changes"
Message-ID: <20071006204542.680D113A40EA@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=8ad7605b6999100d19fb5e0d5b2de98715807815

commit 8ad7605b6999100d19fb5e0d5b2de98715807815
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 22:03:49 2007 +0200

revert "handle topic changes"
- this reverts commit b2d9bfa54753bcf0c617cc515d08f0ac46c1d65e.
- the proper way will be to query the type of a CHATMESSAGE object, and if it's
SETTOPIC, then do the same

diff --git a/skype.c b/skype.c
index da7bf09..d0d6940 100644
--- a/skype.c
+++ b/skype.c
@@ -70,8 +70,6 @@ struct skype_data
skype_call_status call_status;
/* Same for file transfers. */
skype_filetransfer_status filetransfer_status;
-	/* True if the next message will be a topic */
-	int topic;
};

struct skype_away_state
@@ -308,13 +306,7 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(sd->handle && strlen(info))
{
/* New body, we have everything to use imcb_buddy_msg() now! */
-							if(sd->topic)
-							{
-								imcb_log(ic, "%s has changed the chat topic to \"%s\"", sd->handle, info);
-								sd->topic = 0;
-							}
-							else
-								imcb_buddy_msg(ic, sd->handle, info, 0, 0);
+							imcb_buddy_msg(ic, sd->handle, info, 0, 0);
}
}
}
@@ -403,9 +395,7 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
char *info = strchr(id, ' ');
*info = '\0';
info++;
-					if(!strncmp(info, "TOPIC ", 6))
-						sd->topic = 1;
-					else if(!strcmp(info, "STATUS MULTI_SUBSCRIBED"))
+					if(!strcmp(info, "STATUS MULTI_SUBSCRIBED"))
{
struct groupchat *gc;
gc = imcb_chat_new( ic, id );
From vmiklos at frugalware.org  Sat Oct  6 22:45:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 22:45:46 2007
Subject: [Frugalware-git] bitlbee-skype: new dummy skype_chat_msg() function
Message-ID: <20071006204542.5832413A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=f3dd0d05b317fda1016317493b6fd2db2b12211b

commit f3dd0d05b317fda1016317493b6fd2db2b12211b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 21:59:58 2007 +0200

new dummy skype_chat_msg() function

diff --git a/skype.c b/skype.c
index 615fca0..da7bf09 100644
--- a/skype.c
+++ b/skype.c
@@ -584,6 +584,11 @@ static void skype_remove_buddy( struct im_connection *ic, char *who, char *group
g_free(nick);
}

+int skype_chat_msg( struct groupchat *c, char *message, int flags )
+{
+	// TODO: this is just here atm to prevent a segfault
+}
+
void init_plugin(void)
{
struct prpl *ret = g_new0( struct prpl, 1 );
@@ -597,6 +602,7 @@ void init_plugin(void)
ret->set_away = skype_set_away;
ret->add_buddy = skype_add_buddy;
ret->remove_buddy = skype_remove_buddy;
+	ret->chat_msg = skype_chat_msg;
ret->handle_cmp = g_strcasecmp;
register_protocol( ret );
}
From vmiklos at frugalware.org  Sat Oct  6 22:45:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 22:45:46 2007
Subject: [Frugalware-git] bitlbee-skype: don't mark messages as seen
Message-ID: <20071006204542.8375A13A4101@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=f3263711b005b91eac7353dfa3b59da556115f51

commit f3263711b005b91eac7353dfa3b59da556115f51
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 22:06:14 2007 +0200

don't mark messages as seen
- they still spams the skype client
- unnecessary transfer then

diff --git a/skype.c b/skype.c
index d0d6940..532196e 100644
--- a/skype.c
+++ b/skype.c
@@ -270,14 +270,11 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
/* New message ID:
* (1) Request its from field
* (2) Request its body
-						 * (3) Mark it as seen
*/
g_snprintf(buf, 1024, "GET CHATMESSAGE %s FROM_HANDLE\n", id);
skype_write( ic, buf, strlen( buf ) );
g_snprintf(buf, 1024, "GET CHATMESSAGE %s BODY\n", id);
skype_write( ic, buf, strlen( buf ) );
-						g_snprintf(buf, 1024, "SET CHATMESSAGE %s SEEN\n", id);
-						skype_write( ic, buf, strlen( buf ) );
}
else if(!strncmp(info, "FROM_HANDLE ", 12))
{
From vmiklos at frugalware.org  Sat Oct  6 22:45:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 22:45:47 2007
Subject: [Frugalware-git] bitlbee-skype: remove debug printfs
Message-ID: <20071006204542.9DBA613A4108@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=56aa8056f13d08057aba9c706e0a60bd07831fb6

commit 56aa8056f13d08057aba9c706e0a60bd07831fb6
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 22:44:00 2007 +0200

remove debug printfs

diff --git a/skype.c b/skype.c
index 3ba8cc3..22f422f 100644
--- a/skype.c
+++ b/skype.c
@@ -314,16 +314,11 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
{
struct groupchat *gc = skype_chat_by_name(ic, info);
if(!gc)
-							{
-								printf("gc is null, id is '%s'\n", info);
/* Private message */
imcb_buddy_msg(ic, sd->handle, sd->body, 0, 0);
-							}
else
-							{
-								printf("gc is not null, id is '%s'\n", info);
+								/* Groupchat message */
imcb_chat_msg(gc, sd->handle, sd->body, 0, 0);
-							}
}
}
}
From vmiklos at frugalware.org  Sat Oct  6 22:45:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 22:45:47 2007
Subject: [Frugalware-git] bitlbee-skype: implement skype_chat_msg()
Message-ID: <20071006204542.A791F13A4109@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=4309521c2d10e28e7bdca1762c0d62bf6d60098b

commit 4309521c2d10e28e7bdca1762c0d62bf6d60098b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 22:44:31 2007 +0200

implement skype_chat_msg()
now sending groupchat messages works, too :)

diff --git a/skype.c b/skype.c
index 22f422f..95aab5d 100644
--- a/skype.c
+++ b/skype.c
@@ -586,9 +586,13 @@ static void skype_remove_buddy( struct im_connection *ic, char *who, char *group
g_free(nick);
}

-void skype_chat_msg( struct groupchat *c, char *message, int flags )
+void skype_chat_msg( struct groupchat *gc, char *message, int flags )
{
-	// TODO: this is just here atm to prevent a segfault
+	struct im_connection *ic = gc->ic;
+	char *buf;
+	buf = g_strdup_printf("CHATMESSAGE %s %s\n", gc->title, message);
+	skype_write( ic, buf, strlen( buf ) );
+	g_free(buf);
}

void init_plugin(void)
From vmiklos at frugalware.org  Sat Oct  6 22:45:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 22:45:48 2007
Subject: [Frugalware-git] bitlbee-skype: receiving group chat messages now
	works
Message-ID: <20071006204542.922F913A4107@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=55f2d43694055f47fb5f4eac00a4a7ca25ac3b80

commit 55f2d43694055f47fb5f4eac00a4a7ca25ac3b80
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 22:28:44 2007 +0200

receiving group chat messages now works
it's a bit agressive. dialogs are not group chats, but i'll fix it later

diff --git a/skype.c b/skype.c
index 532196e..3ba8cc3 100644
--- a/skype.c
+++ b/skype.c
@@ -60,10 +60,11 @@ struct skype_data
/* File descriptor returned by bitlbee. we store it so we know when
* we're connected and when we aren't. */
int bfd;
-	/* When we receive a new message id, we query the handle, then the
-	 * body. Store the handle here so that we imcb_buddy_msg() when we got
-	 * the body. */
+	/* When we receive a new message id, we query the handle, the body and
+	 * the chatname. Store the handle and the body here so that we
+	 * imcb_buddy_msg() when we got the chatname. */
char *handle;
+	char *body;
/* This is necessary because we send a notification when we get the
* handle. So we store the state here and then we can send a
* notification about the handle is in a given status. */
@@ -270,11 +271,14 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
/* New message ID:
* (1) Request its from field
* (2) Request its body
+						 * (3) Query chatname
*/
g_snprintf(buf, 1024, "GET CHATMESSAGE %s FROM_HANDLE\n", id);
skype_write( ic, buf, strlen( buf ) );
g_snprintf(buf, 1024, "GET CHATMESSAGE %s BODY\n", id);
skype_write( ic, buf, strlen( buf ) );
+						g_snprintf(buf, 1024, "GET CHATMESSAGE %s CHATNAME\n", id);
+						skype_write( ic, buf, strlen( buf ) );
}
else if(!strncmp(info, "FROM_HANDLE ", 12))
{
@@ -300,10 +304,26 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
else if(!strncmp(info, "BODY ", 5))
{
info += 5;
-						if(sd->handle && strlen(info))
+						g_free(sd->body);
+						sd->body = g_strdup(info);
+					}
+					else if(!strncmp(info, "CHATNAME ", 9))
+					{
+						info += 9;
+						if(sd->handle && sd->body && strlen(info))
{
-							/* New body, we have everything to use imcb_buddy_msg() now! */
-							imcb_buddy_msg(ic, sd->handle, info, 0, 0);
+							struct groupchat *gc = skype_chat_by_name(ic, info);
+							if(!gc)
+							{
+								printf("gc is null, id is '%s'\n", info);
+								/* Private message */
+								imcb_buddy_msg(ic, sd->handle, sd->body, 0, 0);
+							}
+							else
+							{
+								printf("gc is not null, id is '%s'\n", info);
+								imcb_chat_msg(gc, sd->handle, sd->body, 0, 0);
+							}
}
}
}
@@ -571,7 +591,7 @@ static void skype_remove_buddy( struct im_connection *ic, char *who, char *group
g_free(nick);
}

-int skype_chat_msg( struct groupchat *c, char *message, int flags )
+void skype_chat_msg( struct groupchat *c, char *message, int flags )
{
// TODO: this is just here atm to prevent a segfault
}
From vmiklos at frugalware.org  Sat Oct  6 23:23:42 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct  6 23:23:44 2007
Subject: [Frugalware-git] bitlbee-skype: fix agressive groupchat mechanism
Message-ID: <20071006212342.42E4913A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=26661af76a03444d0a83264f0b4f4f29edc3c039

commit 26661af76a03444d0a83264f0b4f4f29edc3c039
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 6 22:53:32 2007 +0200

fix agressive groupchat mechanism
since 55f2d43, a groupchat was created even for 2 people. this is wrong. we
should not create a group chat when receiving an ACTIVEMEMBERS, only when the
CHAT's TYPE is MULTICHAT

diff --git a/skype.c b/skype.c
index 95aab5d..dcc50f5 100644
--- a/skype.c
+++ b/skype.c
@@ -416,19 +416,20 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
{
info += 14;
struct groupchat *gc = skype_chat_by_name(ic, id);
-						if(!gc)
-							gc = imcb_chat_new( ic, id );
-						char **members = g_strsplit(info, " ", 0);
-						int i;
-						for(i=0;members[i];i++)
+						if(gc)
{
-							if(!strcmp(members[i], sd->username))
-								continue;
-							g_snprintf(buf, 1024, "%s@skype.com", members[i]);
-							imcb_chat_add_buddy(gc, buf);
+							char **members = g_strsplit(info, " ", 0);
+							int i;
+							for(i=0;members[i];i++)
+							{
+								if(!strcmp(members[i], sd->username))
+									continue;
+								g_snprintf(buf, 1024, "%s@skype.com", members[i]);
+								imcb_chat_add_buddy(gc, buf);
+							}
+							imcb_chat_add_buddy(gc, sd->username);
+							g_strfreev(members);
}
-						imcb_chat_add_buddy(gc, sd->username);
-						g_strfreev(members);
}
}
}
From vmiklos at frugalware.org  Sun Oct  7 00:25:21 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 00:25:24 2007
Subject: [Frugalware-git] bitlbee-skype: handle the topic changes in group
	chats correctly
Message-ID: <20071006222521.B98AB13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=19c8e11ab504e43806ddb7b4e11f10d0dada0f63

commit 19c8e11ab504e43806ddb7b4e11f10d0dada0f63
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 00:23:49 2007 +0200

handle the topic changes in group chats correctly

diff --git a/skype.c b/skype.c
index dcc50f5..19c2c98 100644
--- a/skype.c
+++ b/skype.c
@@ -60,11 +60,12 @@ struct skype_data
/* File descriptor returned by bitlbee. we store it so we know when
* we're connected and when we aren't. */
int bfd;
-	/* When we receive a new message id, we query the handle, the body and
-	 * the chatname. Store the handle and the body here so that we
+	/* When we receive a new message id, we query the properties, finally
+	 * the chatname. Store the properties here so that we can use
* imcb_buddy_msg() when we got the chatname. */
char *handle;
char *body;
+	char *type;
/* This is necessary because we send a notification when we get the
* handle. So we store the state here and then we can send a
* notification about the handle is in a given status. */
@@ -271,12 +272,15 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
/* New message ID:
* (1) Request its from field
* (2) Request its body
-						 * (3) Query chatname
+						 * (3) Request its type
+						 * (4) Query chatname
*/
g_snprintf(buf, 1024, "GET CHATMESSAGE %s FROM_HANDLE\n", id);
skype_write( ic, buf, strlen( buf ) );
g_snprintf(buf, 1024, "GET CHATMESSAGE %s BODY\n", id);
skype_write( ic, buf, strlen( buf ) );
+						g_snprintf(buf, 1024, "GET CHATMESSAGE %s TYPE\n", id);
+						skype_write( ic, buf, strlen( buf ) );
g_snprintf(buf, 1024, "GET CHATMESSAGE %s CHATNAME\n", id);
skype_write( ic, buf, strlen( buf ) );
}
@@ -307,18 +311,33 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
g_free(sd->body);
sd->body = g_strdup(info);
}
+					else if(!strncmp(info, "TYPE ", 5))
+					{
+						info += 5;
+						g_free(sd->type);
+						sd->type = g_strdup(info);
+					}
else if(!strncmp(info, "CHATNAME ", 9))
{
info += 9;
-						if(sd->handle && sd->body && strlen(info))
+						if(sd->handle && sd->body && sd->type)
{
-							struct groupchat *gc = skype_chat_by_name(ic, info);
-							if(!gc)
-								/* Private message */
-								imcb_buddy_msg(ic, sd->handle, sd->body, 0, 0);
-							else
-								/* Groupchat message */
-								imcb_chat_msg(gc, sd->handle, sd->body, 0, 0);
+							if(!strcmp(sd->type, "SAID"))
+							{
+								struct groupchat *gc = skype_chat_by_name(ic, info);
+								if(!gc)
+									/* Private message */
+									imcb_buddy_msg(ic, sd->handle, sd->body, 0, 0);
+								else
+									/* Groupchat message */
+									imcb_chat_msg(gc, sd->handle, sd->body, 0, 0);
+							}
+							else if(!strcmp(sd->type, "SETTOPIC"))
+							{
+								struct groupchat *gc = skype_chat_by_name(ic, info);
+								if(gc)
+									imcb_log(ic, "%s changed the topic of %s to: %s", sd->handle, gc->title, sd->body);
+							}
}
}
}
From crazy at frugalware.org  Sun Oct  7 01:04:09 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 01:04:15 2007
Subject: [Frugalware-git] 
	frugalware-current: system-tools-backends-2.4.1-1-i686
Message-ID: <20071006230409.DCFCE13A40D5@genesis.frugalware.org>

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

commit 24aee33be16d5704dc600ff34f96513bc637d1e8
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 01:02:53 2007 +0200

system-tools-backends-2.4.1-1-i686
* Version bump to bugfix release '1'

diff --git a/source/gnome-extra/system-tools-backends/FrugalBuild b/source/gnome-extra/system-tools-backends/FrugalBuild
index 159ac44..5a2f6da 100644
--- a/source/gnome-extra/system-tools-backends/FrugalBuild
+++ b/source/gnome-extra/system-tools-backends/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=system-tools-backends
-pkgver=2.4.0
+pkgver=2.4.1
pkgrel=1
pkgdesc="Backends for Gnome System Toools"
url="http://www.gnome.org/projects/gst/"
@@ -12,7 +12,7 @@ archs=('i686' 'x86_64')
Finclude gnome
source=(${source[@]} $pkgname-$pkgver-frugalware-as-slackware.patch rc.$pkgname)
Fconfopts="$Fconfopts --with-stb-group=root --datadir=/usr/share --with-net-dbus=/usr/lib/perl5"
-sha1sums=('8a65751b82a1d2a52afb9e466c586db7f4b957d8' \
+sha1sums=('bdd7a295c4b265173861e88deb7b12104dde76a2' \
'c777161b43f7f6e498975b1e18b9ce09d533dd87' \
'bb75706748353647b71c102f45ac72cc91d50800')

diff --git a/source/gnome-extra/system-tools-backends/system-tools-backends-2.4.0-frugalware-as-slackware.patch b/source/gnome-extra/system-tools-backends/system-tools-backends-2.4.0-frugalware-as-slackware.patch
deleted file mode 100644
index 0167e70..0000000
--- a/source/gnome-extra/system-tools-backends/system-tools-backends-2.4.0-frugalware-as-slackware.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur system-tools-backends-2.4.0/Utils/Platform.pm system-tools-backends-2.4.0-p/Utils/Platform.pm
---- system-tools-backends-2.4.0/Utils/Platform.pm	2007-09-12 00:43:37.000000000 +0200
-+++ system-tools-backends-2.4.0-p/Utils/Platform.pm	2007-09-26 03:02:42.000000000 +0200
-@@ -74,6 +74,7 @@
-   "slackware-10.2.0" => [ "Slackware", "10.2.0", "" ],
-   "slackware-11.0.0" => [ "Slackware", "11.0.0", "" ],
-   "slackware-12.0.0" => [ "Slackware", "12.0.0", "" ],
-+  "frugalware"      => [ "Frugalware Linux", "", "" ],
-   "bluewhite64-12.0.0" => [ "Bluewhite64", "12.0.0", "" ],
-   "freebsd-4"       => [ "FreeBSD", "4", "" ],
-   "freebsd-5"       => [ "FreeBSD", "5", "" ],
-@@ -144,6 +145,7 @@
-      "slackware-10.2.0" => "slackware-9.1.0",
-      "slackware-11.0.0" => "slackware-9.1.0",
-      "slackware-12.0.0" => "slackware-9.1.0",
-+     "frugalware"       => "slackware-9.1.0",
-      "bluewhite64-12.0.0" => "slackware-9.1.0",
-      "suse-9.1"         => "suse-9.0",
-      "ubuntu-5.04"      => "debian-3.0",
-@@ -381,6 +383,7 @@
-                   [ \&check_distro_file, "/etc/bluewhite64-version", "bluewhite64", "^Bluewhite64 (\\S+)" ],
-                   [ \&check_distro_file, "/etc/vlos-release", "vlos", "^VLOS.*\\s+(\\S+)" ],
-                   [ \&check_file_exists, "/usr/portage", "gentoo" ],
-+		  [ \&check_file_exists, "/etc/frugalware-release", "frugalware" ],
-                   [ \&check_distro_file, "/etc/pld-release", "pld", "^(\\S+) PLD Linux" ],
-                   [ \&check_rpath ],
-                   [ \&check_file_exists, "/etc/arch-release", "archlinux" ],
diff --git a/source/gnome-extra/system-tools-backends/system-tools-backends-2.4.1-frugalware-as-slackware.patch b/source/gnome-extra/system-tools-backends/system-tools-backends-2.4.1-frugalware-as-slackware.patch
new file mode 100644
index 0000000..0167e70
--- /dev/null
+++ b/source/gnome-extra/system-tools-backends/system-tools-backends-2.4.1-frugalware-as-slackware.patch
@@ -0,0 +1,27 @@
+diff -Naur system-tools-backends-2.4.0/Utils/Platform.pm system-tools-backends-2.4.0-p/Utils/Platform.pm
+--- system-tools-backends-2.4.0/Utils/Platform.pm	2007-09-12 00:43:37.000000000 +0200
++++ system-tools-backends-2.4.0-p/Utils/Platform.pm	2007-09-26 03:02:42.000000000 +0200
+@@ -74,6 +74,7 @@
+   "slackware-10.2.0" => [ "Slackware", "10.2.0", "" ],
+   "slackware-11.0.0" => [ "Slackware", "11.0.0", "" ],
+   "slackware-12.0.0" => [ "Slackware", "12.0.0", "" ],
++  "frugalware"      => [ "Frugalware Linux", "", "" ],
+   "bluewhite64-12.0.0" => [ "Bluewhite64", "12.0.0", "" ],
+   "freebsd-4"       => [ "FreeBSD", "4", "" ],
+   "freebsd-5"       => [ "FreeBSD", "5", "" ],
+@@ -144,6 +145,7 @@
+      "slackware-10.2.0" => "slackware-9.1.0",
+      "slackware-11.0.0" => "slackware-9.1.0",
+      "slackware-12.0.0" => "slackware-9.1.0",
++     "frugalware"       => "slackware-9.1.0",
+      "bluewhite64-12.0.0" => "slackware-9.1.0",
+      "suse-9.1"         => "suse-9.0",
+      "ubuntu-5.04"      => "debian-3.0",
+@@ -381,6 +383,7 @@
+                   [ \&check_distro_file, "/etc/bluewhite64-version", "bluewhite64", "^Bluewhite64 (\\S+)" ],
+                   [ \&check_distro_file, "/etc/vlos-release", "vlos", "^VLOS.*\\s+(\\S+)" ],
+                   [ \&check_file_exists, "/usr/portage", "gentoo" ],
++		  [ \&check_file_exists, "/etc/frugalware-release", "frugalware" ],
+                   [ \&check_distro_file, "/etc/pld-release", "pld", "^(\\S+) PLD Linux" ],
+                   [ \&check_rpath ],
+                   [ \&check_file_exists, "/etc/arch-release", "archlinux" ],
From vmiklos at frugalware.org  Sun Oct  7 01:16:41 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 01:16:44 2007
Subject: [Frugalware-git] bitlbee-skype: handle parts in groupchats
Message-ID: <20071006231641.8B08A13A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=bf7b46d529cb8a6598d595da8011d075db4ca10e

commit bf7b46d529cb8a6598d595da8011d075db4ca10e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 01:12:09 2007 +0200

handle parts in groupchats

diff --git a/skype.c b/skype.c
index 19c2c98..bf8abc2 100644
--- a/skype.c
+++ b/skype.c
@@ -322,9 +322,9 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
info += 9;
if(sd->handle && sd->body && sd->type)
{
+							struct groupchat *gc = skype_chat_by_name(ic, info);
if(!strcmp(sd->type, "SAID"))
{
-								struct groupchat *gc = skype_chat_by_name(ic, info);
if(!gc)
/* Private message */
imcb_buddy_msg(ic, sd->handle, sd->body, 0, 0);
@@ -334,10 +334,14 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
}
else if(!strcmp(sd->type, "SETTOPIC"))
{
-								struct groupchat *gc = skype_chat_by_name(ic, info);
if(gc)
imcb_log(ic, "%s changed the topic of %s to: %s", sd->handle, gc->title, sd->body);
}
+							else if(!strcmp(sd->type, "LEFT"))
+							{
+								if(gc)
+									imcb_chat_remove_buddy(gc, sd->handle, NULL);
+							}
}
}
}
From crazy at frugalware.org  Sun Oct  7 01:16:47 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 01:16:51 2007
Subject: [Frugalware-git] frugalware-current: gcalctool-5.20.1-1-i686
Message-ID: <20071006231647.5E86A13A40D5@genesis.frugalware.org>

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

commit 06cf5e0782300dbceb94a91cf0d678bb7f528b66
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 01:15:17 2007 +0200

gcalctool-5.20.1-1-i686
* Version bump to bugfix release '1'

diff --git a/source/gnome/gcalctool/FrugalBuild b/source/gnome/gcalctool/FrugalBuild
index b28e34a..50b9bdf 100644
--- a/source/gnome/gcalctool/FrugalBuild
+++ b/source/gnome/gcalctool/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=gcalctool
-pkgver=5.20.0
+pkgver=5.20.1
pkgrel=1
pkgdesc="A scientific calculator for GNOME"
url="http://www.gnome.org/"
@@ -14,6 +14,6 @@ _F_gnome_schemas=('/etc/gconf/schemas/gcalctool.schemas')
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
-sha1sums=('55e876d2e6cfa0312603a0e02cbba1c19935382a')
+sha1sums=('fb3d132298b7a5191ba2c65c42ec1d0526196dee')

# optimization OK
From crazy at frugalware.org  Sun Oct  7 01:31:21 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 01:31:24 2007
Subject: [Frugalware-git] frugalware-current: devhelp-0.16.1-1-i686
Message-ID: <20071006233121.1828F13A40D5@genesis.frugalware.org>

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

commit a19ef7615e7acc8c3c923b2370e6086a9e830b44
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 01:30:04 2007 +0200

devhelp-0.16.1-1-i686
* Version bump to bugfix release '1'
* added missing _F_gnome_{iconcache,desktop}

diff --git a/source/gnome-extra/devhelp/FrugalBuild b/source/gnome-extra/devhelp/FrugalBuild
index 99af84b..b0024d7 100644
--- a/source/gnome-extra/devhelp/FrugalBuild
+++ b/source/gnome-extra/devhelp/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=devhelp
-pkgver=0.16
+pkgver=0.16.1
pkgrel=1
pkgdesc="Developer API documentation browser"
url="http://www.gnome.org/"
@@ -12,9 +12,11 @@ groups=('gnome-extra')
archs=('i686' 'x86_64')
_F_gnome_schemas=('/etc/gconf/schemas/devhelp.schemas')
_F_gnome_devel=y
+_F_gnome_iconcache="y"
+_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
options=('scriptlet')
-sha1sums=('9bd44f0ee83727a8ce6277351b2ae0f79e6de7c6')
+sha1sums=('fe62dcde16b54229f1b89827b37a9e2db99be05e')

subpkgs=('devhelp-gedit')
subdescs=('Gedit plugin for Devhelp')
From vmiklos at frugalware.org  Sun Oct  7 03:07:32 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 03:07:36 2007
Subject: [Frugalware-git] bitlbee-skype: avoid nicks joining to a group chat
	multiple times
Message-ID: <20071007010732.CEFAB13A40EA@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=d5f0b024bc37cde407a8b1aa797c5c9bbcec38ff

commit d5f0b024bc37cde407a8b1aa797c5c9bbcec38ff
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 02:27:28 2007 +0200

avoid nicks joining to a group chat multiple times

diff --git a/skype.c b/skype.c
index 3777a37..dcca7b6 100644
--- a/skype.c
+++ b/skype.c
@@ -448,7 +448,8 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(!strcmp(members[i], sd->username))
continue;
g_snprintf(buf, 1024, "%s@skype.com", members[i]);
-								imcb_chat_add_buddy(gc, buf);
+								if(!g_list_find_custom(gc->in_room, buf, (GCompareFunc)strcmp))
+									imcb_chat_add_buddy(gc, buf);
}
imcb_chat_add_buddy(gc, sd->username);
g_strfreev(members);
From vmiklos at frugalware.org  Sun Oct  7 03:07:32 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 03:07:37 2007
Subject: [Frugalware-git] bitlbee-skype: implemented skype_chat_leave()
Message-ID: <20071007010732.B401313A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=fe8a2a5e024aaebae71b5df16abdc0d0925092fd

commit fe8a2a5e024aaebae71b5df16abdc0d0925092fd
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 01:38:49 2007 +0200

implemented skype_chat_leave()

diff --git a/skype.c b/skype.c
index bf8abc2..3777a37 100644
--- a/skype.c
+++ b/skype.c
@@ -619,6 +619,15 @@ void skype_chat_msg( struct groupchat *gc, char *message, int flags )
g_free(buf);
}

+void skype_chat_leave( struct groupchat *gc )
+{
+	struct im_connection *ic = gc->ic;
+	char *buf;
+	buf = g_strdup_printf("ALTER CHAT %s LEAVE\n", gc->title);
+	skype_write( ic, buf, strlen( buf ) );
+	g_free(buf);
+}
+
void init_plugin(void)
{
struct prpl *ret = g_new0( struct prpl, 1 );
@@ -633,6 +642,7 @@ void init_plugin(void)
ret->add_buddy = skype_add_buddy;
ret->remove_buddy = skype_remove_buddy;
ret->chat_msg = skype_chat_msg;
+	ret->chat_leave = skype_chat_leave;
ret->handle_cmp = g_strcasecmp;
register_protocol( ret );
}
From vmiklos at frugalware.org  Sun Oct  7 03:07:32 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 03:07:37 2007
Subject: [Frugalware-git] bitlbee-skype: fix unwanted rejoin after /part
Message-ID: <20071007010732.E170E13A4107@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=e5c8f1cc5531f787ac5ac80098ea1da7ce39653f

commit e5c8f1cc5531f787ac5ac80098ea1da7ce39653f
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 03:06:22 2007 +0200

fix unwanted rejoin after /part

diff --git a/skype.c b/skype.c
index dcca7b6..d24424d 100644
--- a/skype.c
+++ b/skype.c
@@ -435,11 +435,21 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
struct groupchat *gc;
gc = imcb_chat_new( ic, id );
}
+					else if(!strcmp(info, "STATUS UNSUBSCRIBED"))
+					{
+						struct groupchat *gc = skype_chat_by_name(ic, id);
+						if(gc)
+							gc->data = (void*)FALSE;
+					}
else if(!strncmp(info, "ACTIVEMEMBERS ", 14))
{
info += 14;
struct groupchat *gc = skype_chat_by_name(ic, id);
-						if(gc)
+						/* Hack! We set ->data to TRUE
+						 * while we're on the channel
+						 * so that we won't rejoin
+						 * after a /part. */
+						if(gc && !gc->data)
{
char **members = g_strsplit(info, " ", 0);
int i;
@@ -453,6 +463,7 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
}
imcb_chat_add_buddy(gc, sd->username);
g_strfreev(members);
+							gc->data = (void*)TRUE;
}
}
}
From vmiklos at frugalware.org  Sun Oct  7 04:02:04 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 04:02:10 2007
Subject: [Frugalware-git] bitlbee-skype: skype_read_callback(): sanity check
Message-ID: <20071007020204.353D013A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=649f451a075db3d43b5d1292b992e6f94e7fd3f6

commit 649f451a075db3d43b5d1292b992e6f94e7fd3f6
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 03:55:17 2007 +0200

skype_read_callback(): sanity check

diff --git a/skype.c b/skype.c
index d24424d..5d5854b 100644
--- a/skype.c
+++ b/skype.c
@@ -428,7 +428,8 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(++id)
{
char *info = strchr(id, ' ');
-					*info = '\0';
+					if(info)
+						*info = '\0';
info++;
if(!strcmp(info, "STATUS MULTI_SUBSCRIBED"))
{
From vmiklos at frugalware.org  Sun Oct  7 04:02:04 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 04:02:12 2007
Subject: [Frugalware-git] bitlbee-skype: implemented skype_chat_invite()
Message-ID: <20071007020204.77DB813A40EA@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=de45b5665d15cafd7c70bb05bef204225d7b573e

commit de45b5665d15cafd7c70bb05bef204225d7b573e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 03:55:46 2007 +0200

implemented skype_chat_invite()

diff --git a/skype.c b/skype.c
index 5d5854b..0937400 100644
--- a/skype.c
+++ b/skype.c
@@ -464,7 +464,6 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
}
imcb_chat_add_buddy(gc, sd->username);
g_strfreev(members);
-							gc->data = (void*)TRUE;
}
}
}
@@ -639,6 +638,21 @@ void skype_chat_leave( struct groupchat *gc )
buf = g_strdup_printf("ALTER CHAT %s LEAVE\n", gc->title);
skype_write( ic, buf, strlen( buf ) );
g_free(buf);
+	gc->data = (void*)TRUE;
+}
+
+void skype_chat_invite(struct groupchat *gc, char *who, char *message)
+{
+	struct im_connection *ic = gc->ic;
+	char *buf, *ptr, *nick;
+	nick = g_strdup(message);
+	ptr = strchr(nick, '@');
+	if(ptr)
+		*ptr = '\0';
+	buf = g_strdup_printf("ALTER CHAT %s ADDMEMBERS %s\n", gc->title, nick);
+	skype_write( ic, buf, strlen( buf ) );
+	g_free(buf);
+	g_free(nick);
}

void init_plugin(void)
@@ -656,6 +670,7 @@ void init_plugin(void)
ret->remove_buddy = skype_remove_buddy;
ret->chat_msg = skype_chat_msg;
ret->chat_leave = skype_chat_leave;
+	ret->chat_invite = skype_chat_invite;
ret->handle_cmp = g_strcasecmp;
register_protocol( ret );
}
From vmiklos at frugalware.org  Sun Oct  7 04:02:04 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 04:02:13 2007
Subject: [Frugalware-git] bitlbee-skype: update documentation
Message-ID: <20071007020204.C8DA913A4107@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=344445136a45cbedb50e366415aa0c4a115e9997

commit 344445136a45cbedb50e366415aa0c4a115e9997
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 04:00:52 2007 +0200

update documentation

diff --git a/README b/README
index 0457c3e..23a383e 100644
--- a/README
+++ b/README
@@ -185,16 +185,25 @@ your VNC server regularly. (How ugly.)

- Handle topic changes

-== What needs to be done (aka. TODO)
+- Group chat support:
+
+  * Detect if we're invited
+
+  * Send / receive group chat messages

-- Group chat support. For an initial support the followings would be needed:
+  * Invite others

-  * Detect if we're invited.
+  * Part from group chats

-  * Send / receive group chat messages.
+== What needs to be done (aka. TODO)

- Add a question callback for calls.

+- Notice if foo invites bar. Currently you can see only that bar joined.
+
+- Currently we can't start a new group chat, just we can join if we're invited
+  and then invite others.
+
== I would like to have support for ...

If something does not work and it's not in the TODO section, then please
From voroskoi at frugalware.org  Sun Oct  7 11:55:25 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Sun Oct  7 11:55:27 2007
Subject: [Frugalware-git] homepage-ng: FSA292-openssl
Message-ID: <20071007095525.2F14213A40D5@genesis.frugalware.org>

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

commit 80ca36ea4bb47a2b346aaaab6c6be88dc2d8ae9e
Author: voroskoi <voroskoi@frugalware.org>
Date:   Sun Oct 7 11:42:04 2007 +0200

FSA292-openssl

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 4b0f44a..64bcaeb 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,20 @@

<fsas>
<fsa>
+		<id>292</id>
+		<date>2007-10-07</date>
+		<author>voroskoi</author>
+		<package>openssl</package>
+		<vulnerable>0.9.8-6</vulnerable>
+		<unaffected>0.9.8-7terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2466</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3108
+			http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5135</cve>
+		<desc>Some vulnerabilities have been reported in OpenSSL, which can be exploited by malicious people to cause a DoS (Denial of Service) and compromise a vulnerable system.
+			1) This fixes a weakness, which can be exploited by malicious, local users to disclose sensitive information. The problem is caused due to an error in the RSA implementation and can be exploited to disclose private keys via side-channel attacks.
+			2) Off-by-one error in the SSL_get_shared_ciphers function in OpenSSL 0.9.7l and 0.9.8d might allow remote attackers to execute arbitrary code via a crafted packet that triggers a one-byte buffer underflow. NOTE: this issue was introduced as a result of a fix for CVE-2006-3738.</desc>
+	</fsa>
+	<fsa>
<id>291</id>
<date>2007-10-06</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Sun Oct  7 12:00:14 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Sun Oct  7 12:00:15 2007
Subject: [Frugalware-git] homepage-ng: FSA293-xfs
Message-ID: <20071007100014.92F5113A40D5@genesis.frugalware.org>

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

commit 786f6bbf98e39f6378fd4a2c43246c9380f8938f
Author: voroskoi <voroskoi@frugalware.org>
Date:   Sun Oct 7 11:46:53 2007 +0200

FSA293-xfs

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 64bcaeb..c8cbb87 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,21 @@

<fsas>
<fsa>
+		<id>293</id>
+		<date>2007-10-07</date>
+		<author>voroskoi</author>
+		<package>xfs</package>
+		<vulnerable>1.0.4-1</vulnerable>
+		<unaffected>1.0.4-2terminus1</unaffected>
+		<bts>http://bugs.frugalware.org/task/2458</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4568
+			http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4989
+			http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4990</cve>
+		<desc>Some vulnerabilities have been reported in the X.Org X11 X Font Server (XFS), which can be exploited by malicious, local users to gain escalated privileges.
+			1) An integer overflow exists within the handlers for the X protocol requests "QueryXBitmaps" and "QueryXExtents", which do not correctly check the "length" parameters before passing them to the "build_range()" function. This can be exploited to cause a heap-based buffer overflow by sending specially crafted "QueryXBitmaps" and "QueryXExtents" requests to a vulnerable service.
+			2) An error exists within the handler for the X protocol requests "QueryXBitmaps" and "QueryXExtents" when calling the "swap_char2b()" function, which can be exploited to swap an arbitrary number of bytes on the heap, resulting in a heap corruption.</desc>
+	</fsa>
+	<fsa>
<id>292</id>
<date>2007-10-07</date>
<author>voroskoi</author>
From crazy at frugalware.org  Sun Oct  7 15:37:12 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 15:37:15 2007
Subject: [Frugalware-git] frugalware-current: bug-buddy-2.20.1-1-i686
Message-ID: <20071007133712.5B4C613A40D5@genesis.frugalware.org>

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

commit 92a9f59a4e0939dbbd1b6b90a7f779f6b72819c0
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 15:35:35 2007 +0200

bug-buddy-2.20.1-1-i686
* Version bump
* added missing _F_gnome_iconcache
* removed patch in workarounds , solved upstream

diff --git a/source/gnome/bug-buddy/FrugalBuild b/source/gnome/bug-buddy/FrugalBuild
index 4369d27..bdc4a03 100644
--- a/source/gnome/bug-buddy/FrugalBuild
+++ b/source/gnome/bug-buddy/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=bug-buddy
-pkgver=2.20.0
-pkgrel=3
+pkgver=2.20.1
+pkgrel=1
pkgdesc="A bug reporting tool for GNOME"
url="http://www.gnome.org/"
depends=('gnome-desktop>=2.20.0' 'gnome-menus>=2.20.0' 'rarian' 'desktop-file-utils' \
@@ -14,19 +14,15 @@ archs=('i686' 'x86_64')
_F_gnome_schemas=('/etc/gconf/schemas/bug-buddy.schemas')
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
+_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-source=(${source[@]} bug-buddy-2.20.0-fix-breakpad.patch)
-sha1sums=('c4d0d2345e13e4f85051f4ca1488d1a08d38fe4b' \
-          '0b52f9e9b67bdd70a108be0f2a444caaf00720f2')
+sha1sums=('ef6f82b2444e3b72bd6ac4197086d9b1697ae928')

-build() {
+build()
+{
Fcd
Fbuild_slice_scrollkeeper
Fbuild
-    # No need version numbering here
-    Frm usr/lib/gtk-2.0/modules/libgnomebreakpad.so
-    Frm usr/lib/gtk-2.0/modules/libgnomebreakpad.so.0
-    Fmv usr/lib/gtk-2.0/modules/libgnomebreakpad.so.0.0.0 usr/lib/gtk-2.0/modules/libgnomebreakpad.so
Fbuild_gnome_scriptlet
}

diff --git a/source/gnome/bug-buddy/bug-buddy-2.20.0-fix-breakpad.patch b/source/gnome/bug-buddy/bug-buddy-2.20.0-fix-breakpad.patch
deleted file mode 100644
index ccc2dcf..0000000
--- a/source/gnome/bug-buddy/bug-buddy-2.20.0-fix-breakpad.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN bug-buddy-2.20.0.orig/gnome-breakpad/gnome-breakpad.cc bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc
---- bug-buddy-2.20.0.orig/gnome-breakpad/gnome-breakpad.cc	2007-09-04 15:53:55.000000000 -0400
-+++ bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc	2007-10-02 11:23:54.000000000 -0400
-@@ -291,22 +291,59 @@ gtk_module_init (int *argc, char** argv[
-
- 	if (bugbuddy && !g_getenv ("GNOME_DISABLE_CRASH_DIALOG")) {
- #ifdef ENABLE_GOOGLE_BREAKPAD
-+        	static struct sigaction old_action;
-+
-+		sigaction(SIGSEGV, NULL, &old_action);
-+		if (old_action.sa_handler != SIG_DFL)
-+			return 0;
-+
-+                sigaction(SIGABRT, NULL, &old_action);
-+		if (old_action.sa_handler != SIG_DFL)
-+			return 0;
-+
-+                sigaction(SIGTRAP, NULL, &old_action);
-+		if (old_action.sa_handler != SIG_DFL)
-+			return 0;
-+
-+                sigaction(SIGFPE, NULL, &old_action);
-+		if (old_action.sa_handler != SIG_DFL)
-+			return 0;
-+
-+                sigaction(SIGBUS, NULL, &old_action);
-+		if (old_action.sa_handler != SIG_DFL)
-+			return 0;
-+
-   		static ExceptionHandler handler("/tmp", check_if_gdb,
- 						MinidumpCallback, NULL, true);
- #else
-         	static struct sigaction *setptr;
-+        	static struct sigaction old_action;
-         	struct sigaction sa;
-                 memset(&sa, 0, sizeof(sa));
-                 setptr = &sa;
-
-                 sa.sa_handler = bugbuddy_segv_handle;
-
--                sigaction(SIGSEGV, setptr, NULL);
--                sigaction(SIGABRT, setptr, NULL);
--                sigaction(SIGTRAP, setptr, NULL);
--                sigaction(SIGFPE, setptr, NULL);
--                sigaction(SIGBUS, setptr, NULL);
-+                sigaction(SIGSEGV, NULL, &old_action);
-+		if (old_action.sa_handler == SIG_DFL)
-+                	sigaction(SIGSEGV, setptr, NULL);
-+
-+                sigaction(SIGABRT, NULL, &old_action);
-+		if (old_action.sa_handler == SIG_DFL)
-+                	sigaction(SIGABRT, setptr, NULL);
-+
-+                sigaction(SIGTRAP, NULL, &old_action);
-+		if (old_action.sa_handler == SIG_DFL)
-+                	sigaction(SIGTRAP, setptr, NULL);
-+
-+                sigaction(SIGFPE, NULL, &old_action);
-+		if (old_action.sa_handler == SIG_DFL)
-+                	sigaction(SIGFPE, setptr, NULL);
-+
-+                sigaction(SIGBUS, NULL, &old_action);
-+		if (old_action.sa_handler == SIG_DFL)
-+                	sigaction(SIGBUS, setptr, NULL);
- #endif
- 	}
--
-+	return 0;
- }
From priyank at frugalware.org  Sun Oct  7 15:48:41 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct  7 15:48:43 2007
Subject: [Frugalware-git] fw-control-center: gfpm-mcs-plugin: bump to
	version 0.1.1
Message-ID: <20071007134841.94B9913A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=2f8cd2b3c7483bfcd53ea075fe494fcf79fdef84

commit 2f8cd2b3c7483bfcd53ea075fe494fcf79fdef84
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 7 19:17:24 2007 +0530

gfpm-mcs-plugin: bump to version 0.1.1
* updated AUTHORS

diff --git a/gfpm-mcs-plugin/AUTHORS b/gfpm-mcs-plugin/AUTHORS
index 842c89e..41435af 100644
--- a/gfpm-mcs-plugin/AUTHORS
+++ b/gfpm-mcs-plugin/AUTHORS
@@ -8,3 +8,6 @@ Bernhard Walle <bwalle@suse.de>

Translators
===========
+da_DK - Carl Andersen <carl@frugalware.dk>
+fr_FR - Michel Hermier <michel.hermier@gmail.com>
+hu_HU - Vajna Miklos <vmiklos@frugalware.org>
diff --git a/gfpm-mcs-plugin/NEWS b/gfpm-mcs-plugin/NEWS
index a20e9c0..1305a97 100644
--- a/gfpm-mcs-plugin/NEWS
+++ b/gfpm-mcs-plugin/NEWS
@@ -1,3 +1,6 @@
VERSION				DESCRIPTION
------------------------------------------------------------------------------------------
+0.1.1				- Added Translations hu_HU, fr_FR, da_DA
+				- Small bugfix in displaying caption text in
+				  languages other than en
0.1.0 (2007-09-21)		- Initial Release
diff --git a/gfpm-mcs-plugin/configure.in b/gfpm-mcs-plugin/configure.in
index 9055e9a..8520f83 100644
--- a/gfpm-mcs-plugin/configure.in
+++ b/gfpm-mcs-plugin/configure.in
@@ -6,7 +6,7 @@ dnl *** Version information ***
dnl ***************************
m4_define([gfpm_mcs_plugin_version_major], [0])
m4_define([gfpm_mcs_plugin_version_minor], [1])
-m4_define([gfpm_mcs_plugin_version_micro], [0])
+m4_define([gfpm_mcs_plugin_version_micro], [1])
m4_define([gfpm_mcs_plugin_version_nano], [])
m4_define([gfpm_mcs_plugin_version_tag], [])
m4_define([gfpm_mcs_plugin_version], [gfpm_mcs_plugin_version_major().gfpm_mcs_plugin_version_minor().gfpm_mcs_plugin_version_micro()ifelse(gfpm_mcs_plugin_version_nano(), [], [], [.gfpm_mcs_plugin_version_nano()])ifelse(gfpm_mcs_plugin_version_tag(), [svn], [gfpm_mcs_plugin_version_tag()-gfpm_mcs_plugin_version_build()], [gfpm_mcs_plugin_version_tag()])])
From priyank at frugalware.org  Sun Oct  7 15:53:28 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct  7 15:53:32 2007
Subject: [Frugalware-git] fw-control-center: gnetconfig-mcs-plugin: version
	bump to 0.1.2
Message-ID: <20071007135328.C80B613A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=e01b76d90d3a39b7daefd004931ac1310254d29a

commit e01b76d90d3a39b7daefd004931ac1310254d29a
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 7 19:22:09 2007 +0530

gnetconfig-mcs-plugin: version bump to 0.1.2

diff --git a/gnetconfig-mcs-plugin/NEWS b/gnetconfig-mcs-plugin/NEWS
index 4a00198..1aa225c 100644
--- a/gnetconfig-mcs-plugin/NEWS
+++ b/gnetconfig-mcs-plugin/NEWS
@@ -1,5 +1,8 @@
VERSION				DESCRIPTION
------------------------------------------------------------------------------------------
+0.1.2				- Translation updates
+				- Fixed a small bug when setting caption in locales
+				  other than en
0.1.1				- Spelling fix in setting xterm title
- Use gnetconfig-mcs-plugin's .po files and not
the ones of gnetconfig.
diff --git a/gnetconfig-mcs-plugin/configure.in b/gnetconfig-mcs-plugin/configure.in
index 8ef2edb..a99bc21 100644
--- a/gnetconfig-mcs-plugin/configure.in
+++ b/gnetconfig-mcs-plugin/configure.in
@@ -6,7 +6,7 @@ dnl *** Version information ***
dnl ***************************
m4_define([gnetconfig_mcs_plugin_version_major], [0])
m4_define([gnetconfig_mcs_plugin_version_minor], [1])
-m4_define([gnetconfig_mcs_plugin_version_micro], [1])
+m4_define([gnetconfig_mcs_plugin_version_micro], [2])
m4_define([gnetconfig_mcs_plugin_version_nano], [])
m4_define([gnetconfig_mcs_plugin_version_tag], [])
m4_define([gnetconfig_mcs_plugin_version], [gnetconfig_mcs_plugin_version_major().gnetconfig_mcs_plugin_version_minor().gnetconfig_mcs_plugin_version_micro()ifelse(gnetconfig_mcs_plugin_version_nano(), [], [], [.gnetconfig_mcs_plugin_version_nano()])ifelse(gnetconfig_mcs_plugin_version_tag(), [svn], [gnetconfig_mcs_plugin_version_tag()-gnetconfig_mcs_plugin_version_build()], [gnetconfig_mcs_plugin_version_tag()])])
From priyank at frugalware.org  Sun Oct  7 15:55:41 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct  7 15:55:43 2007
Subject: [Frugalware-git] frugalware-current: gfpm-mcs-plugin-0.1.1-1-i686
Message-ID: <20071007135541.B5A8813A40D5@genesis.frugalware.org>

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

commit 600a2a803124519052ba13c086babeb223d8ba6e
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 7 19:22:32 2007 +0530

gfpm-mcs-plugin-0.1.1-1-i686
* Version bump

diff --git a/source/xfce4/gfpm-mcs-plugin/FrugalBuild b/source/xfce4/gfpm-mcs-plugin/FrugalBuild
index afa48e4..97005b6 100644
--- a/source/xfce4/gfpm-mcs-plugin/FrugalBuild
+++ b/source/xfce4/gfpm-mcs-plugin/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gfpm-mcs-plugin
-pkgver=0.1.0
+pkgver=0.1.1
pkgrel=1
pkgdesc="GFpm plugin for Xfce4 settings manager."
url="ftp://ftp.frugalware.org/pub/other/fw-control-center/"
makedepends=('intltool' 'xfce4-dev-tools>=4.4.1')
depends=('libxfcegui4>=4.4.1' 'xfce-mcs-manager>=4.4.1' 'libxml2')
-rodepends=('gfpm>=1.0.2')
+rodepends=('gfpm>=1.0.3')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
up2date="lynx -dump $url | grep $pkgname | Flasttar"
From priyank at frugalware.org  Sun Oct  7 16:02:06 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct  7 16:02:11 2007
Subject: [Frugalware-git] 
	frugalware-current: gnetconfig-mcs-plugin-0.1.2-1-i686
Message-ID: <20071007140206.ECFA213A40D5@genesis.frugalware.org>

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

commit 1a689ace3f749b86c18f2f7e82cd54d81c244ced
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 7 19:29:10 2007 +0530

gnetconfig-mcs-plugin-0.1.2-1-i686
* Version bump

diff --git a/source/xfce4/gnetconfig-mcs-plugin/FrugalBuild b/source/xfce4/gnetconfig-mcs-plugin/FrugalBuild
index 9598af2..1dfe8a9 100644
--- a/source/xfce4/gnetconfig-mcs-plugin/FrugalBuild
+++ b/source/xfce4/gnetconfig-mcs-plugin/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gnetconfig-mcs-plugin
-pkgver=0.1.1
+pkgver=0.1.2
pkgrel=1
pkgdesc="Gnetconfig plugin for Xfce4 settings manager."
url="ftp://ftp.frugalware.org/pub/other/fw-control-center/"
makedepends=('intltool' 'xfce4-dev-tools>=4.4.1')
depends=('libxfcegui4>=4.4.1' 'xfce-mcs-manager>=4.4.1' 'libxml2')
-rodepends=('gnetconfig>=0.1.2')
+rodepends=('gnetconfig>=0.1.3')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
up2date="lynx -dump $url | grep $pkgname | Flasttar"
From crazy at frugalware.org  Sun Oct  7 16:16:48 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 16:16:52 2007
Subject: [Frugalware-git] frugalware-current: hardinfo-0.4.2.2-2-i686
Message-ID: <20071007141648.2493513A40D5@genesis.frugalware.org>

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

commit 9d758b89a325f3d97fa62cb8d319cd662fa43176
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 16:15:03 2007 +0200

hardinfo-0.4.2.2-2-i686
* relbump
* added an patch from svn to fix some issues
* added G_SLICE 'workaround' to fix #2441 for stable

diff --git a/source/gnome-extra/hardinfo/FrugalBuild b/source/gnome-extra/hardinfo/FrugalBuild
index a9fe279..f8ff2b1 100644
--- a/source/gnome-extra/hardinfo/FrugalBuild
+++ b/source/gnome-extra/hardinfo/FrugalBuild
@@ -4,14 +4,29 @@

pkgname=hardinfo
pkgver=0.4.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="A system information and benchmark tool."
_F_berlios_ext=".tar.bz2"
Finclude berlios
-source=($source frugalware.patch)
+source=($source frugalware.patch backport_fixes.patch)
options=('scriptlet')
depends=('gtk+2' 'libsoup' 'pciutils')
groups=('gnome-extra')
archs=('i686' 'x86_64')
sha1sums=('e3ec42cdb5ee03b002aa071d418f951579998408' \
-          '18894bbc8fb42655660e700543adb04db5568308')
+          '18894bbc8fb42655660e700543adb04db5568308' \
+          'e5e6fcc602aede6f28fbdde0ea5456bc833601e6')
+
+build()
+{
+	Fcd
+	Fpatchall
+	Fmake
+	Fmakeinstall
+	# 'workaround' bug #2441 for 0.7
+	Fmv usr/bin/hardinfo usr/bin/hardinfo.bin
+	echo '#!/bin/sh' >$Fdestdir/usr/bin/hardinfo
+	echo 'G_SLICE=always-malloc /usr/bin/hardinfo.bin' \
+		>$Fdestdir/usr/bin/hardinfo
+	chmod 0755 $Fdestdir/usr/bin/hardinfo || Fdie
+}
diff --git a/source/gnome-extra/hardinfo/backport_fixes.patch b/source/gnome-extra/hardinfo/backport_fixes.patch
new file mode 100644
index 0000000..0613b5e
--- /dev/null
+++ b/source/gnome-extra/hardinfo/backport_fixes.patch
@@ -0,0 +1,369 @@
+Index: hardinfo2/hardinfo.h
+===================================================================
+--- hardinfo2/hardinfo.h	(Revision 149)
++++ hardinfo2/hardinfo.h	(Revision 160)
+@@ -98,7 +98,9 @@
+
+ gchar        *h_strdup_cprintf(const gchar *format, gchar *source, ...);
+ gchar	     *h_strconcat(gchar *string1, ...);
++void          h_hash_table_remove_all (GHashTable *hash_table);
+
++
+ void	      module_entry_scan_all_except(ModuleEntry *entries, gint except_entry);
+ void	      module_entry_scan_all(ModuleEntry *entries);
+ void	      module_entry_reload(ShellModuleEntry *module_entry);
+Index: hardinfo2/configure
+===================================================================
+--- hardinfo2/configure	(Revision 149)
++++ hardinfo2/configure	(Revision 160)
+@@ -167,7 +167,7 @@
+ # --------------------------------------------------------------------------
+
+ if [ $SOUP -eq -1 ]; then
+-	echo "Disabling libsoup support. (Network Manager won't be available.)"
++	echo "Disabling libsoup support. (Network Updater won't be available.)"
+ fi
+
+ # --------------------------------------------------------------------------
+Index: hardinfo2/computer.h
+===================================================================
+--- hardinfo2/computer.h	(Revision 149)
++++ hardinfo2/computer.h	(Revision 160)
+@@ -34,6 +34,7 @@
+     { DB_PREFIX "SuSE-release",		"suse" },
+     { DB_PREFIX "sun-release",		"sun"  },
+     { DB_PREFIX "zenwalk-version",	"zen"  },
++    { DB_PREFIX "puppyversion",		"ppy"  },
+     /*
+      * RedHat must be the *last* one to be checked, since
+      * some distros (like Mandrake) includes a redhat-relase
+Index: hardinfo2/syncmanager.c
+===================================================================
+--- hardinfo2/syncmanager.c	(Revision 149)
++++ hardinfo2/syncmanager.c	(Revision 160)
+@@ -110,7 +110,7 @@
+ {
+ #ifndef HAS_LIBSOUP
+     g_warning
+-	("HardInfo was compiled without libsoup support. (Network Manager requires it.)");
++	("HardInfo was compiled without libsoup support. (Network Updater requires it.)");
+ #else				/* !HAS_LIBSOUP */
+     SyncDialog *sd = sync_dialog_new();
+
+Index: hardinfo2/util.c
+===================================================================
+--- hardinfo2/util.c	(Revision 149)
++++ hardinfo2/util.c	(Revision 160)
+@@ -1041,3 +1041,16 @@
+
+     return concat;
+ }
++
++static gboolean h_hash_table_remove_all_true(gpointer key, gpointer data, gpointer user_data)
++{
++    return TRUE;
++}
++
++void
++h_hash_table_remove_all(GHashTable *hash_table)
++{
++    g_hash_table_foreach_remove(hash_table,
++				h_hash_table_remove_all_true,
++				NULL);
++}
+Index: hardinfo2/devices.c
+===================================================================
+--- hardinfo2/devices.c	(Revision 149)
++++ hardinfo2/devices.c	(Revision 160)
+@@ -23,6 +23,7 @@
+ #include <hardinfo.h>
+ #include <shell.h>
+ #include <iconcache.h>
++#include <syncmanager.h>
+
+ #include <expr.h>
+ #include <socket.h>
+@@ -346,8 +347,20 @@
+
+ void hi_module_init(void)
+ {
+-    moreinfo =
+-	g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
++    if (!g_file_test("/usr/share/misc/pci.ids", G_FILE_TEST_EXISTS)) {
++        static SyncEntry se[] = {
++            {
++             .fancy_name = "Update PCI ID listing",
++             .name = "GetPCIIds",
++             .save_to = "pci.ids",
++             .get_data = NULL
++            }
++        };
++
++        sync_manager_add_entry(&se[0]);
++    }
++
++    moreinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+     __init_memory_labels();
+ }
+
+Index: hardinfo2/arch/linux/common/sensors.h
+===================================================================
+--- hardinfo2/arch/linux/common/sensors.h	(Revision 149)
++++ hardinfo2/arch/linux/common/sensors.h	(Revision 160)
+@@ -254,7 +254,7 @@
+
+ 	if ((tz = g_dir_open(path_tz, 0, NULL))) {
+ 	    const gchar *entry;
+-	    gchar *temp = "";
++	    gchar *temp = g_strdup("");
+
+
+ 	    while ((entry = g_dir_read_name(tz))) {
+Index: hardinfo2/arch/linux/common/storage.h
+===================================================================
+--- hardinfo2/arch/linux/common/storage.h	(Revision 149)
++++ hardinfo2/arch/linux/common/storage.h	(Revision 160)
+@@ -335,7 +335,7 @@
+ 	    g_hash_table_insert(moreinfo, devid, strhash);
+
+ 	    g_free(model);
+-	    model = "";
++	    model = g_strdup("");
+ 	} else
+ 	    g_free(device);
+
+Index: hardinfo2/arch/linux/common/pci.h
+===================================================================
+--- hardinfo2/arch/linux/common/pci.h	(Revision 149)
++++ hardinfo2/arch/linux/common/pci.h	(Revision 160)
+@@ -21,16 +21,32 @@
+ {
+     FILE *lspci;
+     gchar buffer[256], *buf, *strhash = NULL, *strdevice = NULL;
+-    gchar *category = NULL, *name = NULL;
+-    gint n = 0;
++    gchar *category = NULL, *name = NULL, *icon;
++    gint n = 0, x = 0;
+
+-    if (!(lspci = popen(LSPCI, "r"))) {
+-      goto pci_error;
++    buf = g_build_filename(g_get_home_dir(), ".hardinfo", "pci.ids", NULL);
++    if (!g_file_test(buf, G_FILE_TEST_EXISTS)) {
++      DEBUG("using system-provided PCI IDs");
++      g_free(buf);
++      if (!(lspci = popen(LSPCI, "r"))) {
++        goto pci_error;
++      }
++    } else {
++      gchar *tmp;
++
++      tmp = g_strdup_printf("%s -i '%s'", LSPCI, buf);
++      g_free(buf);
++      buf = tmp;
++
++      DEBUG("using updated PCI IDs (from %s)", buf);
++      if (!(lspci = popen(tmp, "r"))) {
++        g_free(buf);
++        goto pci_error;
++      } else {
++        g_free(buf);
++      }
+     }
+
+-    gchar *icon;
+-
+-    int x = 0;			/* unique Memory, Capability and I/O port */
+     while (fgets(buffer, 256, lspci)) {
+ 	buf = g_strstrip(buffer);
+
+Index: hardinfo2/arch/linux/common/alsa.h
+===================================================================
+--- hardinfo2/arch/linux/common/alsa.h	(Revision 149)
++++ hardinfo2/arch/linux/common/alsa.h	(Revision 160)
+@@ -20,16 +20,15 @@
+ computer_get_alsacards(Computer * computer)
+ {
+     GSList *p;
+-    gchar *tmp = "";
++    gchar *tmp = g_strdup("");
+     gint n = 0;
+
+     if (computer->alsa) {
+ 	for (p = computer->alsa->cards; p; p = p->next) {
+ 	    AlsaCard *ac = (AlsaCard *) p->data;
+
+-	    tmp =
+-		g_strdup_printf("Audio Adapter#%d=%s\n%s", ++n,
+-				ac->friendly_name, tmp);
++	    tmp = h_strdup_cprintf("Audio Adapter#%d=%s\n",
++	                           tmp, ++n, ac->friendly_name);
+ 	}
+     }
+
+Index: hardinfo2/arch/linux/common/os.h
+===================================================================
+--- hardinfo2/arch/linux/common/os.h	(Revision 149)
++++ hardinfo2/arch/linux/common/os.h	(Revision 160)
+@@ -185,6 +185,15 @@
+ 		    os->distro = g_strdup(buf);
+ 		}
+ 	    }
++
++	    if (g_str_equal(distro_db[i].codename, "ppy")) {
++	      gchar *tmp;
++
++	      tmp = g_strdup_printf("Puppy Linux %.2f", atof(os->distro) / 100.0);
++	      g_free(os->distro);
++	      os->distro = tmp;
++	    }
++
+ 	    os->distrocode = g_strdup(distro_db[i].codename);
+
+ 	    break;
+Index: hardinfo2/shell.c
+===================================================================
+--- hardinfo2/shell.c	(Revision 149)
++++ hardinfo2/shell.c	(Revision 160)
+@@ -544,6 +544,8 @@
+     shell->info = info_tree_new(FALSE);
+     shell->moreinfo = info_tree_new(TRUE);
+     shell->loadgraph = load_graph_new(75);
++    update_tbl = g_hash_table_new_full(g_str_hash, g_str_equal,
++                                       g_free, g_free);
+
+     gtk_paned_pack1(GTK_PANED(shell->hpaned), shell->tree->scroll,
+ 		    SHELL_PACK_RESIZE, SHELL_PACK_SHRINK);
+@@ -585,8 +587,14 @@
+
+ static gboolean update_field(gpointer data)
+ {
+-    ShellFieldUpdate *fu = (ShellFieldUpdate *) data;
+-    GtkTreeIter *iter = g_hash_table_lookup(update_tbl, fu->field_name);
++    ShellFieldUpdate *fu;
++    GtkTreeIter *iter;
++
++    fu = (ShellFieldUpdate *) data;
++    g_return_val_if_fail(fu != NULL, FALSE);
++
++    iter = g_hash_table_lookup(update_tbl, fu->field_name);
++    g_return_val_if_fail(iter != NULL, FALSE);
+
+     /* if the entry is still selected, update it */
+     if (iter && fu->entry->selected && fu->entry->fieldfunc) {
+@@ -1002,9 +1010,8 @@
+ module_selected_show_info(ShellModuleEntry * entry, gboolean reload)
+ {
+     GKeyFile *key_file = g_key_file_new();
+-    gchar *key_data;
+-    gchar **groups;
+     GtkTreeStore *store;
++    gchar *key_data, **groups;
+     gint i;
+     gsize ngroups;
+
+@@ -1016,16 +1023,9 @@
+
+     /* recreate the iter hash table */
+     if (!reload) {
+-	if (update_tbl) {
+-	    g_hash_table_foreach_remove(update_tbl, (GHRFunc) gtk_true,
+-					NULL);
+-	} else {
+-	    update_tbl =
+-		g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+-				      g_free);
+-	}
++        h_hash_table_remove_all(update_tbl);
+     }
+-
++
+     if (update_sfusrc) {
+ 	GSList *sfusrc;
+
+@@ -1123,23 +1123,19 @@
+     GtkTreeIter parent;
+     ShellModuleEntry *entry;
+     static ShellModuleEntry *current = NULL;
+-    static gboolean updating = FALSE;
+
+-    if (updating)
+-	return;
+-
+-    updating = TRUE;
+-
+     /* Gets the currently selected item on the left-side TreeView; if there is no
+        selection, silently return */
+     if (!gtk_tree_selection_get_selected
+-	(shelltree->selection, &model, &parent))
++	(shelltree->selection, &model, &parent)) {
+ 	return;
++    }
+
+     /* Mark the currently selected module as "unselected"; this is used to kill the
+        update timeout. */
+-    if (current)
++    if (current) {
+ 	current->selected = FALSE;
++    }
+
+     /* Get the current selection and shows its related info */
+     gtk_tree_model_get(model, &parent, TREE_COL_DATA, &entry, -1);
+@@ -1190,7 +1186,6 @@
+     }
+
+     current = entry;
+-    updating = FALSE;
+ }
+
+ static void info_selected(GtkTreeSelection * ts, gpointer data)
+Index: hardinfo2/report.c
+===================================================================
+--- hardinfo2/report.c	(Revision 149)
++++ hardinfo2/report.c	(Revision 160)
+@@ -366,7 +366,7 @@
+ 					 GTK_RESPONSE_ACCEPT, NULL);
+
+     gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
+-				      "hardinfo report");
++				      "hardinfo_report");
+
+     file_chooser_add_filters(dialog, file_types);
+     file_chooser_open_expander(dialog);
+Index: hardinfo2/iconcache.c
+===================================================================
+--- hardinfo2/iconcache.c	(Revision 149)
++++ hardinfo2/iconcache.c	(Revision 160)
+@@ -48,7 +48,9 @@
+ 	g_free(path);
+     }
+
+-    g_object_ref(icon);
++    if (icon) {
++      g_object_ref(icon);
++    }
+
+     return icon;
+ }
+@@ -81,7 +83,9 @@
+ 	g_free(path);
+     }
+
+-    g_object_ref(icon);
++    if (icon) {
++      g_object_ref(icon);
++    }
+
+     return icon;
+ }
+Index: hardinfo2/vendor.c
+===================================================================
+--- hardinfo2/vendor.c	(Revision 149)
++++ hardinfo2/vendor.c	(Revision 160)
+@@ -57,6 +57,7 @@
+     {"Logitech", "Logitech International SA", "www.logitech.com"},
+     {"FUJITSU", "Fujitsu", "www.fujitsu.com"},
+     {"CDU", "Sony", "www.sony.com"},
++    {"SanDisk", "SanDisk", "www.sandisk.com"},
+     {NULL, NULL, NULL},
+ };
+
From crazy at frugalware.org  Sun Oct  7 16:36:13 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 16:36:17 2007
Subject: [Frugalware-git] frugalware-current: nuvola-1.0-4-i686
Message-ID: <20071007143613.B416613A40D5@genesis.frugalware.org>

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

commit c9629ec655ede49be33581f9f71614845961f44f
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 16:27:42 2007 +0200

nuvola-1.0-4-i686
* relbump
* removed broken laptop* icons
* /me gives vmiklos some cookies ;)

diff --git a/source/kde/nuvola/FrugalBuild b/source/kde/nuvola/FrugalBuild
index d81bb17..e005088 100644
--- a/source/kde/nuvola/FrugalBuild
+++ b/source/kde/nuvola/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=nuvola
pkgver=1.0
-pkgrel=3
+pkgrel=4
pkgdesc="Nuvola SVG icon theme"
url="http://www.icon-king.com/"
depends=()
@@ -26,6 +26,7 @@ build() {
for i in `find . -maxdepth 1 -mindepth 1 -type d`; do
cp -R "$i" "$Fdestdir"/usr/share/icons/nuvola || Fdie
done
+	find $Fdestdir/usr/share/icons/nuvola -name "laptop_*charge.png" -exec rm -fv {} \; || Fdie
Fdocrel readme.txt thanks.to license.txt license.png readme
}
sha1sums=('0a3c300121ebaa63576c7af86df6c8c0473436e3'\
From crazy at frugalware.org  Sun Oct  7 19:59:52 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 19:59:57 2007
Subject: [Frugalware-git] frugalware-current: gtkam-0.1.14-2-i686
Message-ID: <20071007175952.9F50B13A40D5@genesis.frugalware.org>

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

commit 15e821c416f6d516324b6efb59d8a8d8596e60ac
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 19:58:17 2007 +0200

gtkam-0.1.14-2-i686
* relbump
* fixed all corrupted pngs
* removed build() not needed and broke desktop file ( brr krix )
* added missing scriptlet option

diff --git a/source/gnome/gtkam/FrugalBuild b/source/gnome/gtkam/FrugalBuild
index e8fd267..5733a9a 100644
--- a/source/gnome/gtkam/FrugalBuild
+++ b/source/gnome/gtkam/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gtkam
pkgver=0.1.14
-pkgrel=1
+pkgrel=2
pkgdesc="GTKam is a GTK-frontend to gphoto2."
depends=('libgnomeui' 'libgphoto2' 'atk' 'gimp' 'pango' 'libexif-gtk')
groups=('gnome')
@@ -12,15 +12,10 @@ _F_sourceforge_dirname=gphoto
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
Finclude sourceforge gnome-scriptlet
+options=('scriptlet')
up2date="lynx -dump \"http://sourceforge.net/project/showfiles.php?group_id=8874\" | grep $pkgname-.*.tar.gz | head -n 1 | sed \"s/.*gtkam-\(.*\).tar.gz.*/\1/\""
-
-build() {
-	Fcd
-	Fbuild_slice_scrollkeeper
-	echo "Icon=gtkam.png" >> gtkam.desktop
-	Fbuild
-	Fbuild_gnome_scriptlet
-}
+source=($source fix_corrupted_pngs.patch)
+sha1sums=('7a46ee2cc9d88ed31d6ee46b15bc51ac296488ba' \
+          '59f188efb4c5a613b08b0a25a27758baaae51b61')

# optimization OK
-sha1sums=('7a46ee2cc9d88ed31d6ee46b15bc51ac296488ba')
diff --git a/source/gnome/gtkam/fix_corrupted_pngs.patch b/source/gnome/gtkam/fix_corrupted_pngs.patch
new file mode 100644
index 0000000..13908b1
Binary files /dev/null and b/source/gnome/gtkam/fix_corrupted_pngs.patch differ
From crazy at frugalware.org  Sun Oct  7 21:40:48 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct  7 21:40:52 2007
Subject: [Frugalware-git] frugalware-current: zapping-0.10cvs6-4-i686
Message-ID: <20071007194048.CFC6D13A40D5@genesis.frugalware.org>

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

commit ce3d91e13b015dc09de1e3050cc627875c4b7c78
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 7 21:38:35 2007 +0200

zapping-0.10cvs6-4-i686
* fixed icon

diff --git a/source/gnome-extra/zapping/FrugalBuild b/source/gnome-extra/zapping/FrugalBuild
index b00b494..6d05492 100644
--- a/source/gnome-extra/zapping/FrugalBuild
+++ b/source/gnome-extra/zapping/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=zapping
pkgver=0.10cvs6
-pkgrel=3
+pkgrel=4
pkgdesc="Zapping is a TV viewer"
license="GPL"
depends=('libgnomeui' 'libxxf86vm' 'libxmu' 'rte' 'libxv' 'atk' 'freetype2' 'pango' 'zvbi' 'libxxf86dga' 'perl-xml' 'dbus-glib>=0.71')
@@ -24,6 +24,8 @@ sha1sums=('2c25d525553ba2fe9d193bed5c91d23ec360a22f' \
build()
{
Fcd
+	Fsed "Icon=.*" "Icon=/usr/share/pixmaps/zapping/gnome-television.png" \
+		$pkgname.desktop*
Fbuild_slice_scrollkeeper
Fpatchall
autoconf || Fdie
From vmiklos at frugalware.org  Sun Oct  7 21:46:18 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 21:46:21 2007
Subject: [Frugalware-git] 
	frugalware-current: grub-theme-frugalware-0.7.0-1-i686
Message-ID: <20071007194618.E103013A40D5@genesis.frugalware.org>

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

commit dca481030b1bfc3c4ccb277a30d7e7a42dd0c6ae
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 21:45:46 2007 +0200

grub-theme-frugalware-0.7.0-1-i686
version bump (new artwork from raozuzu)

diff --git a/source/base/grub-theme-frugalware/FrugalBuild b/source/base/grub-theme-frugalware/FrugalBuild
index 13821b3..2cae886 100644
--- a/source/base/grub-theme-frugalware/FrugalBuild
+++ b/source/base/grub-theme-frugalware/FrugalBuild
@@ -2,24 +2,22 @@
# Maintainer: Krisztian VASAS <iron@frugalware.org>

pkgname=grub-theme-frugalware
-pkgver=0.6.2
-pkgrel=4
+pkgver=0.7.0
+pkgrel=1
pkgdesc="Frugalware theme for GNU GRand Unified Bootloader"
url="http://ftp.frugalware.org/pub/other/artwork/grub-theme/"
rodepends=('grub')
makedepends=('gfxboot>=3.3.22' 'perl-html-parser' 'cpio')
groups=('base')
archs=('i686' 'x86_64')
-up2date="lynx -dump '${url}?C=M;O=A' | grep frugalware-grub-theme | sed -ne 's/.*frugalware-grub-theme-\(.*\).tar.gz/\1/; $ p'"
+up2date="lynx -dump $url | grep frugalware-grub-theme | Flasttar"
source=($url/frugalware-grub-theme-$pkgver.tar.gz)
+sha1sums=('530998f60d0c1a7432c9cf8c060fe4ea3c28a487')
options=('nodocs')

build()
{
cd $Fsrcdir/themes/frugalware
-	make BINDIR=/usr/sbin/
+	Fmake
Ffilerel boot/message /boot/grub/message-frugalware
}
-
-sha1sums=('df84c103dad1f0eb13efaa4a13e015291e67fdfe')
-
From priyank at frugalware.org  Sun Oct  7 21:46:41 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct  7 21:46:43 2007
Subject: [Frugalware-git] frugalware-current: gdm-2.20.0-4-i686
Message-ID: <20071007194641.7C78513A40D5@genesis.frugalware.org>

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

commit ae29b59a05600e207f1b177ea44ac35bad0c7115
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 8 01:14:31 2007 +0530

gdm-2.20.0-4-i686
* Updated the gdmconf patch to fix the blank user list bug

diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index 8486374..369e251 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gdm
pkgver=2.20.0
-pkgrel=3
+pkgrel=4
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/"
backup=(etc/gdm/custom.conf)
@@ -15,10 +15,15 @@ groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
options=(${options[@]} 'force')
-source=(${source[@]} $pkgname-2.15.9-gdmconf.patch \
+source=(${source[@]} $pkgname-$pkgver-gdmconf.patch \
$pkgname-2.18.0-gksu.patch \
fix_reboot_path.patch \
http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2)
+sha1sums=('73f7840180645b6a3da0f3c3ac0518c2b4aef1d6' \
+          'bc0209e8700b01e2369a66e93b2c86766ff988fd' \
+          'a702961b7851b1e7c946fc8e3fb29bd1d807a02f' \
+          'b602b6805d1d4787e4404827abf3d6f346843317' \
+          'b13852bf7ce59df5d02f27b3603e274fba3e074d')

build() {
Fcd
@@ -43,10 +48,4 @@ build() {
mv $Fsrcdir/Frugalware $Fdestdir/usr/share/gdm/themes/Frugalware || Fdie
}

-sha1sums=('73f7840180645b6a3da0f3c3ac0518c2b4aef1d6' \
-          '809407f910e6aefe26a34211e215e5cc996575a0' \
-          'a702961b7851b1e7c946fc8e3fb29bd1d807a02f' \
-          'b602b6805d1d4787e4404827abf3d6f346843317' \
-          'b13852bf7ce59df5d02f27b3603e274fba3e074d')
-
# optimization OK
diff --git a/source/gnome/gdm/gdm-2.15.9-gdmconf.patch b/source/gnome/gdm/gdm-2.15.9-gdmconf.patch
deleted file mode 100644
index 612ac9d..0000000
--- a/source/gnome/gdm/gdm-2.15.9-gdmconf.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur gdm-2.20.0.orig/config/gdm.conf.in gdm-2.20.0/config/gdm.conf.in
---- gdm-2.20.0.orig/config/gdm.conf.in	2007-09-24 14:25:20.000000000 +0200
-+++ gdm-2.20.0/config/gdm.conf.in	2007-09-24 14:28:49.000000000 +0200
-@@ -68,7 +68,7 @@
-
- # The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
- # to get the new graphical greeter.
--#Greeter=@libexecdir@/gdmlogin
-+Greeter=@libexecdir@/gdmgreeter
-
- # The greeter for xdmcp logins, usually you want a less graphically intensive
- # greeter here so it's better to leave this with gdmlogin
-@@ -99,7 +99,7 @@
- # User and group used for running GDM GUI applications.  By default this is set
- # to user "gdm" and group "gdm".  This user/group should have very limited
- # permissions and access to only the gdm directories and files.
--User=gdm
-+User=nobody
- Group=gdm
-
- # To try to kill all clients started at greeter time or in the Init script.
-@@ -163,7 +163,7 @@
- # really a PATH style variable since 2.4.4.2 to allow actual interoperability
- # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
- # compatibility reasons with 2.4.4.x.
--#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
-+SessionDesktopDir=/etc/X11/sessions/:@datadir@/gdm/BuiltInSessions/
- # This is the default .desktop session.  One of the ones in SessionDesktopDir
- #DefaultSession=gnome.desktop
- # Better leave this blank and HOME will be used.  You can use syntax ~/ below
-@@ -202,8 +202,8 @@
- # Automatic VT allocation.  Right now only works on Linux.  This way we force
- # X to use specific vts.  Turn VTAllocation to false if this is causing
- # problems.
--#FirstVT=7
--#VTAllocation=true
-+FirstVT=12
-+VTAllocation=true
- # Should double login be treated with a warning (and possibility to change VT's
- # on Linux and FreeBSD systems for console logins)
- #DoubleLoginWarning=true
-@@ -242,7 +242,7 @@
- [security]
- # Allow root to login.  It makes sense to turn this off for kiosk use, when
- # you want to minimize the possibility of break in.
--AllowRoot=true
-+AllowRoot=false
- # Allow login as root via XDMCP.  This value will be overridden and set to
- # false if the /etc/default/login file exists and contains
- # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
-@@ -352,7 +352,7 @@
- #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
-
- # The GTK+ theme to use for the GUI.
--#GtkTheme=Default
-+GtkTheme=Clearlooks
- # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
- # this only affects the standard greeter as the graphical greeter does not yet
- # have this ability.
-@@ -499,10 +499,10 @@
- # where the session saving stuff is disabled in GDM
- #ShowLastSession=true
- # Always use 24 hour clock no matter what the locale.
--#Use24Clock=auto
-+Use24Clock=auto
- # Use circles in the password field.  Looks kind of cool actually, but only
- # works with certain fonts.
--#UseCirclesInEntry=false
-+UseCirclesInEntry=true
- # Do not show any visible feedback in the password field. This is standard for
- # instance in console, xdm and ssh.
- #UseInvisibleInEntry=false
-@@ -512,7 +512,7 @@
- # list then provide a list that is delimited by /: to the GraphicalThemes
- # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
- # and specify just one theme.
--#GraphicalTheme=circles
-+GraphicalTheme=Frugalware
- #GraphicalThemes=circles/:happygnome
- GraphicalThemeDir=@datadir@/gdm/themes/
- GraphicalThemeRand=false
-@@ -528,7 +528,7 @@
- # user input.  If SoundOnLogin is a file and the greeter finds the 'play'
- # executable (see daemon/SoundProgram) it will play that file instead of just
- # beeping.
--#SoundOnLogin=true
-+SoundOnLogin=false
- #SoundOnLoginFile=
- # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a
- # user successfully logs in.
-@@ -629,7 +629,7 @@
-
- [server-Standard]
- name=Standard server
--command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
-+command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -dpi 72
- flexible=true
- # Indicates that the X server should be started at a different process
- # priority.  Values can be any integer value accepted by the setpriority C
-@@ -644,7 +644,7 @@
- [server-Terminal]
- name=Terminal server
- # Add -terminate to make things behave more nicely
--command=@X_SERVER@ @X_CONFIG_OPTIONS@ -terminate
-+command=@X_SERVER@ @X_CONFIG_OPTIONS@ -terminate -dpi 72
- # Make this not appear in the flexible servers (we need extra params anyway,
- # and terminate would be bad for xdmcp choosing).  You can make a terminal
- # server flexible, but not with an indirect query.  If you need flexible
-@@ -658,7 +658,7 @@
- # command line.
- [server-Chooser]
- name=Chooser server
--command=@X_SERVER@ @X_CONFIG_OPTIONS@
-+command=@X_SERVER@ @X_CONFIG_OPTIONS@ -dpi 72
- # Make this not appear in the flexible servers for now, but if you wish to
- # allow a chooser server then make this true.  This is the only way to make a
- # flexible chooser server that behaves nicely.
diff --git a/source/gnome/gdm/gdm-2.20.0-gdmconf.patch b/source/gnome/gdm/gdm-2.20.0-gdmconf.patch
new file mode 100644
index 0000000..7f2420f
--- /dev/null
+++ b/source/gnome/gdm/gdm-2.20.0-gdmconf.patch
@@ -0,0 +1,138 @@
+diff -Naur gdm-2.20.0.orig/config/gdm.conf.in gdm-2.20.0/config/gdm.conf.in
+--- gdm-2.20.0.orig/config/gdm.conf.in	2007-10-08 01:01:39.000000000 +0530
++++ gdm-2.20.0/config/gdm.conf.in	2007-10-08 01:02:34.000000000 +0530
+@@ -68,7 +68,7 @@
+
+ # The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
+ # to get the new graphical greeter.
+-#Greeter=@libexecdir@/gdmlogin
++Greeter=@libexecdir@/gdmgreeter
+
+ # The greeter for xdmcp logins, usually you want a less graphically intensive
+ # greeter here so it's better to leave this with gdmlogin
+@@ -99,7 +99,7 @@
+ # User and group used for running GDM GUI applications.  By default this is set
+ # to user "gdm" and group "gdm".  This user/group should have very limited
+ # permissions and access to only the gdm directories and files.
+-User=gdm
++User=nobody
+ Group=gdm
+
+ # To try to kill all clients started at greeter time or in the Init script.
+@@ -163,7 +163,7 @@
+ # really a PATH style variable since 2.4.4.2 to allow actual interoperability
+ # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
+ # compatibility reasons with 2.4.4.x.
+-#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
++SessionDesktopDir=/etc/X11/sessions/:@datadir@/gdm/BuiltInSessions/
+ # This is the default .desktop session.  One of the ones in SessionDesktopDir
+ #DefaultSession=gnome.desktop
+ # Better leave this blank and HOME will be used.  You can use syntax ~/ below
+@@ -202,8 +202,8 @@
+ # Automatic VT allocation.  Right now only works on Linux.  This way we force
+ # X to use specific vts.  Turn VTAllocation to false if this is causing
+ # problems.
+-#FirstVT=7
+-#VTAllocation=true
++FirstVT=12
++VTAllocation=true
+ # Should double login be treated with a warning (and possibility to change VT's
+ # on Linux and FreeBSD systems for console logins)
+ #DoubleLoginWarning=true
+@@ -242,7 +242,7 @@
+ [security]
+ # Allow root to login.  It makes sense to turn this off for kiosk use, when
+ # you want to minimize the possibility of break in.
+-AllowRoot=true
++AllowRoot=false
+ # Allow login as root via XDMCP.  This value will be overridden and set to
+ # false if the /etc/default/login file exists and contains
+ # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
+@@ -352,7 +352,7 @@
+ #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
+
+ # The GTK+ theme to use for the GUI.
+-#GtkTheme=Default
++GtkTheme=Clearlooks
+ # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
+ # this only affects the standard greeter as the graphical greeter does not yet
+ # have this ability.
+@@ -391,9 +391,9 @@
+ # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude,
+ # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed
+ # greeter.
+-Browser=false
++Browser=true
+ # The default picture in the browser.
+-#DefaultFace=@pixmapdir@/nobody.png
++DefaultFace=@pixmapdir@/nobody.png
+ # User ID's less than the MinimalUID value will not be included in the face
+ # browser or in the gdmselection list for Automatic/Timed login.  They will not
+ # be displayed regardless of the settings for Include and Exclude.
+@@ -414,7 +414,7 @@
+ # large numbers of users and this feature should not be used in such
+ # environments.  The setting of IncludeAll does nothing if Include is set to a
+ # non-empty value.
+-#IncludeAll=false
++IncludeAll=true
+ # If user or user.png exists in this dir it will be used as his picture.
+ #GlobalFaceDir=@datadir@/pixmaps/faces/
+
+@@ -499,10 +499,10 @@
+ # where the session saving stuff is disabled in GDM
+ #ShowLastSession=true
+ # Always use 24 hour clock no matter what the locale.
+-#Use24Clock=auto
++Use24Clock=auto
+ # Use circles in the password field.  Looks kind of cool actually, but only
+ # works with certain fonts.
+-#UseCirclesInEntry=false
++UseCirclesInEntry=true
+ # Do not show any visible feedback in the password field. This is standard for
+ # instance in console, xdm and ssh.
+ #UseInvisibleInEntry=false
+@@ -512,7 +512,7 @@
+ # list then provide a list that is delimited by /: to the GraphicalThemes
+ # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
+ # and specify just one theme.
+-#GraphicalTheme=circles
++GraphicalTheme=Frugalware
+ #GraphicalThemes=circles/:happygnome
+ GraphicalThemeDir=@datadir@/gdm/themes/
+ GraphicalThemeRand=false
+@@ -528,7 +528,7 @@
+ # user input.  If SoundOnLogin is a file and the greeter finds the 'play'
+ # executable (see daemon/SoundProgram) it will play that file instead of just
+ # beeping.
+-#SoundOnLogin=true
++SoundOnLogin=false
+ #SoundOnLoginFile=
+ # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a
+ # user successfully logs in.
+@@ -629,7 +629,7 @@
+
+ [server-Standard]
+ name=Standard server
+-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
++command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -dpi 72
+ flexible=true
+ # Indicates that the X server should be started at a different process
+ # priority.  Values can be any integer value accepted by the setpriority C
+@@ -644,7 +644,7 @@
+ [server-Terminal]
+ name=Terminal server
+ # Add -terminate to make things behave more nicely
+-command=@X_SERVER@ @X_CONFIG_OPTIONS@ -terminate
++command=@X_SERVER@ @X_CONFIG_OPTIONS@ -terminate -dpi 72
+ # Make this not appear in the flexible servers (we need extra params anyway,
+ # and terminate would be bad for xdmcp choosing).  You can make a terminal
+ # server flexible, but not with an indirect query.  If you need flexible
+@@ -658,7 +658,7 @@
+ # command line.
+ [server-Chooser]
+ name=Chooser server
+-command=@X_SERVER@ @X_CONFIG_OPTIONS@
++command=@X_SERVER@ @X_CONFIG_OPTIONS@ -dpi 72
+ # Make this not appear in the flexible servers for now, but if you wish to
+ # allow a chooser server then make this true.  This is the only way to make a
+ # flexible chooser server that behaves nicely.
From vmiklos at frugalware.org  Sun Oct  7 21:48:49 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 21:48:51 2007
Subject: [Frugalware-git] frugalware: updates for 0.7
Message-ID: <20071007194849.5FC4E13A40D5@genesis.frugalware.org>

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

commit f7997bfb867dafa18e23ebb29354c96fda0f2669
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 21:47:23 2007 +0200

updates for 0.7

diff --git a/Makefile b/Makefile
index 7394d08..8822b72 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#

-VERSION = 0.7rc2
+VERSION = 0.7
CODENAME = Sayshell

FRUGALWARE_LANGS = de hu it
@@ -144,5 +144,5 @@ dist:
mv frugalware-$(VERSION).tar.gz{,.asc} ../

release:
-	git tag $(VERSION)
+	git tag -l |grep -q $(VERSION) || dg tag $(VERSION)
$(MAKE) dist
From vmiklos at frugalware.org  Sun Oct  7 21:48:49 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 21:48:53 2007
Subject: [Frugalware-git] frugalware: TAG 0.7
Message-ID: <20071007194849.78A0E13A40EA@genesis.frugalware.org>

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

commit 618250e5b4a65d0c1514559bd544fe32503b1503
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 21:47:32 2007 +0200

TAG 0.7
From vmiklos at frugalware.org  Sun Oct  7 21:51:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 21:51:13 2007
Subject: [Frugalware-git] frugalware-current: frugalware-0.7-1-i686
Message-ID: <20071007195111.B9EB613A40D5@genesis.frugalware.org>

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

commit 56c0b3a54a3271acb3a5df46c1302be346b5b6e6
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 21:50:37 2007 +0200

frugalware-0.7-1-i686
version bump

diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild
index 7aa5e8b..2721bc6 100644
--- a/source/base/frugalware/FrugalBuild
+++ b/source/base/frugalware/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=frugalware
-pkgver=0.7rc2
+pkgver=0.7
pkgrel=1
pkgdesc="Basic Frugalware Linux filesystem package"
url="http://ftp.frugalware.org/pub/other/frugalware/"
From vmiklos at frugalware.org  Sun Oct  7 21:55:25 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 21:55:28 2007
Subject: [Frugalware-git] setup: updates for 0.8.1
Message-ID: <20071007195525.DAB1013A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=929d94a5ce17ed7c44ad886c4b1b7095c9b0c15f

commit 929d94a5ce17ed7c44ad886c4b1b7095c9b0c15f
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 21:54:08 2007 +0200

updates for 0.8.1

diff --git a/Makefile b/Makefile
index 116104b..1fcf629 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ ifeq ($(GPG),true)
endif

release:
-	git tag $(VERSION)
+	git tag -l |grep -q $(VERSION) || dg tag $(VERSION)
$(MAKE) dist

ccache:
diff --git a/NEWS b/NEWS
index c437697..236fdfb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
VERSION         DESCRIPTION
-----------------------------------------------------------------------------
+0.8.1         - maintainance release for 0.7 final
+              - a spelling fix
+              - usual translation updates
0.8.0         - util-linux is now replaced with util-linux-ng
- fix for dsl connections
- enable wildcards for password boxes, like in netconfig
diff --git a/configure b/configure
index 3e86d0e..1a6fb0c 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.8.0"
+version = "0.8.1"

# parse our options
parser = OptionParser(version="configure for Frugalware Setup v%s" % (version))
From vmiklos at frugalware.org  Sun Oct  7 21:55:26 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 21:55:31 2007
Subject: [Frugalware-git] setup: TAG 0.8.1
Message-ID: <20071007195526.036DE13A40EA@genesis.frugalware.org>

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

commit 6dc51b7e452060a819eae184866e9ce201e70e2d
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 21:54:14 2007 +0200

TAG 0.8.1
From vmiklos at frugalware.org  Sun Oct  7 22:02:03 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:02:12 2007
Subject: [Frugalware-git] bitlbee-skype: implement skype_chat_with()
Message-ID: <20071007200203.09AC613A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=58b8a06b05415e797d07922abe8707de505c458e

commit 58b8a06b05415e797d07922abe8707de505c458e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 16:36:03 2007 +0200

implement skype_chat_with()
so that '/j #nick' is possible: we can start a group chat now, too

diff --git a/skype.c b/skype.c
index 0937400..3f272e1 100644
--- a/skype.c
+++ b/skype.c
@@ -72,6 +72,9 @@ struct skype_data
skype_call_status call_status;
/* Same for file transfers. */
skype_filetransfer_status filetransfer_status;
+	/* Using /j #nick we want to have a groupchat with two people. Usually
+	 * not (default). */
+	char* groupchat_with;
};

struct skype_away_state
@@ -433,8 +436,24 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
info++;
if(!strcmp(info, "STATUS MULTI_SUBSCRIBED"))
{
-						struct groupchat *gc;
-						gc = imcb_chat_new( ic, id );
+						imcb_chat_new( ic, id );
+					}
+					else if(!strcmp(info, "STATUS DIALOG") && sd->groupchat_with)
+					{
+						struct groupchat *gc = imcb_chat_new( ic, id );
+						/* According to the docs this
+						 * is necessary. However it
+						 * does not seem the situation
+						 * and it would open an extra
+						 * window on our client, so
+						 * just leave it out. */
+						/*g_snprintf(buf, 1024, "OPEN CHAT %s\n", id);
+						skype_write(ic, buf, strlen(buf));*/
+						g_snprintf(buf, 1024, "%s@skype.com", sd->groupchat_with);
+						imcb_chat_add_buddy(gc, buf);
+						imcb_chat_add_buddy(gc, sd->username);
+						g_free(sd->groupchat_with);
+						sd->groupchat_with = NULL;
}
else if(!strcmp(info, "STATUS UNSUBSCRIBED"))
{
@@ -655,6 +674,22 @@ void skype_chat_invite(struct groupchat *gc, char *who, char *message)
g_free(nick);
}

+struct groupchat *skype_chat_with(struct im_connection *ic, char *who)
+{
+	struct skype_data *sd = ic->proto_data;
+	char *ptr, *nick, *buf;
+	nick = g_strdup(who);
+	ptr = strchr(nick, '@');
+	if(ptr)
+		*ptr = '\0';
+	buf = g_strdup_printf("CHAT CREATE %s\n", nick);
+	skype_write(ic, buf, strlen(buf));
+	g_free(buf);
+	sd->groupchat_with = g_strdup(nick);
+	g_free(nick);
+	return(NULL);
+}
+
void init_plugin(void)
{
struct prpl *ret = g_new0( struct prpl, 1 );
@@ -671,6 +706,7 @@ void init_plugin(void)
ret->chat_msg = skype_chat_msg;
ret->chat_leave = skype_chat_leave;
ret->chat_invite = skype_chat_invite;
+	ret->chat_with = skype_chat_with;
ret->handle_cmp = g_strcasecmp;
register_protocol( ret );
}
From vmiklos at frugalware.org  Sun Oct  7 22:02:03 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:02:15 2007
Subject: [Frugalware-git] bitlbee-skype: docu update for recent changes
Message-ID: <20071007200203.BB87D13A40EA@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=ed2a123476ecf18d1f89071f40214e6fadbcef2b

commit ed2a123476ecf18d1f89071f40214e6fadbcef2b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 16:37:34 2007 +0200

docu update for recent changes

diff --git a/README b/README
index 23a383e..b6a06e0 100644
--- a/README
+++ b/README
@@ -191,18 +191,19 @@ your VNC server regularly. (How ugly.)

* Send / receive group chat messages

-  * Invite others
+  * Invite others (using `/invite <nick>`)

* Part from group chats

+  * Starting a group chat (using `/j #nick`)
+
== What needs to be done (aka. TODO)

- Add a question callback for calls.

- Notice if foo invites bar. Currently you can see only that bar joined.

-- Currently we can't start a new group chat, just we can join if we're invited
-  and then invite others.
+- Are there public named chats for Skype? If yes, they are not supported ATM.

== I would like to have support for ...
From vmiklos at frugalware.org  Sun Oct  7 22:02:05 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:02:15 2007
Subject: [Frugalware-git] bitlbee-skype: update docu for skype-1.4.0.118
Message-ID: <20071007200205.93AB213A4107@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=0452458343f0357d4e09ec0f8cb2475ae0d7ccd1

commit 0452458343f0357d4e09ec0f8cb2475ae0d7ccd1
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 17:13:32 2007 +0200

update docu for skype-1.4.0.118

diff --git a/README b/README
index b6a06e0..3445b0f 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ not..)

== Requirements

-* Skype 1.4.0.99. 1.4.0.74 did *not* work for me.
+* Skype >= 1.4.0.99. (1.4.0.74 did not work for me, 1.4.0.118 seems to be OK.)
* bitlbee-dev >= rev245. Previous versions need patching.
* Skype4Py >= 0.9.28.1. Previous versions uses `DBus` by default. The latest version I've tested is 0.9.28.3.
* Python 2.5. Skype4Py does not work with 2.4.
From vmiklos at frugalware.org  Sun Oct  7 22:04:11 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:04:13 2007
Subject: [Frugalware-git] frugalware-current: fwsetup-0.8.1-1-i686
Message-ID: <20071007200411.B975313A40D5@genesis.frugalware.org>

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

commit 65d43b10430b4577318901760279350beeca8392
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:03:54 2007 +0200

fwsetup-0.8.1-1-i686
version bump

diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild
index 7836de5..5ecf4fd 100644
--- a/source/devel-extra/fwsetup/FrugalBuild
+++ b/source/devel-extra/fwsetup/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=fwsetup
-pkgver=0.8.0
+pkgver=0.8.1
pkgrel=1
pkgdesc="Frugalware Setup"
url="http://ftp.frugalware.org/pub/other/setup/"
@@ -15,5 +15,5 @@ source=($url/releases/$pkgname-$pkgver.tar.gz)
signatures=("$source.asc")
options=('nofakeroot')
unset MAKEFLAGS
-Fconfopts="$Fconfopts --repo=testing"
+Fconfopts="$Fconfopts --repo=stable"
# optimization OK
From vmiklos at frugalware.org  Sun Oct  7 22:21:47 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:21:50 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-encode-hanextra-0.21-1-i686
Message-ID: <20071007202147.A16AD13A40D5@genesis.frugalware.org>

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

commit 6735753079c19224e877c652208069342c397ff5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:21:36 2007 +0200

perl-encode-hanextra-0.21-1-i686
new package
this is a missing dependency/closes #2472

diff --git a/source/devel-extra/perl-encode-hanextra/FrugalBuild b/source/devel-extra/perl-encode-hanextra/FrugalBuild
new file mode 100644
index 0000000..978c20e
--- /dev/null
+++ b/source/devel-extra/perl-encode-hanextra/FrugalBuild
@@ -0,0 +1,11 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=Encode-HanExtra
+_F_perl_author=A/AU/AUDREYT
+pkgver=0.21
+pkgdesc="Extra sets of Chinese encodings"
+Finclude perl
+sha1sums=('8b4c3fbee0b224048daa56d60f4b22773af0c16a')
+
+# optimization OK
From vmiklos at frugalware.org  Sun Oct  7 22:23:46 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:23:48 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-encode-hanextra-0.21-1-x86_64
Message-ID: <20071007202346.9597D13A40D5@genesis.frugalware.org>

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

commit e7fe91bd052c303cdbf4d1df1846cdd981af5bbd
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:23:42 2007 +0200

perl-encode-hanextra-0.21-1-x86_64
added x86_64 to archs()

diff --git a/source/devel-extra/perl-encode-hanextra/FrugalBuild b/source/devel-extra/perl-encode-hanextra/FrugalBuild
index 978c20e..44fd56e 100644
--- a/source/devel-extra/perl-encode-hanextra/FrugalBuild
+++ b/source/devel-extra/perl-encode-hanextra/FrugalBuild
@@ -6,6 +6,7 @@ _F_perl_author=A/AU/AUDREYT
pkgver=0.21
pkgdesc="Extra sets of Chinese encodings"
Finclude perl
+archs=('i686' 'x86_64')
sha1sums=('8b4c3fbee0b224048daa56d60f4b22773af0c16a')

# optimization OK
From vmiklos at frugalware.org  Sun Oct  7 22:28:37 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:28:40 2007
Subject: [Frugalware-git] frugalware-current: perl-encode-jis2k-0.02-1-i686
Message-ID: <20071007202837.928ED13A40D5@genesis.frugalware.org>

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

commit 0faa3aa63503758b89ffff9adc6116a698e3586b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:28:29 2007 +0200

perl-encode-jis2k-0.02-1-i686
new package
next module for #2472

diff --git a/source/devel-extra/perl-encode-jis2k/FrugalBuild b/source/devel-extra/perl-encode-jis2k/FrugalBuild
new file mode 100644
index 0000000..f3eecfa
--- /dev/null
+++ b/source/devel-extra/perl-encode-jis2k/FrugalBuild
@@ -0,0 +1,12 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=Encode-JIS2K
+_F_perl_author=D/DA/DANKOGAI
+pkgver=0.02
+pkgdesc="JIS X 0212 (aka JIS 2000) Encodings"
+Finclude perl
+archs=('i686' 'x86_64')
+sha1sums=('18cbf86bb6bf30e17b50b991c60c11ebe405b026')
+
+# optimization OK
From vmiklos at frugalware.org  Sun Oct  7 22:33:32 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:33:35 2007
Subject: [Frugalware-git] frugalware-current: perl-html-encoding-0.53-1-i686
Message-ID: <20071007203332.9124C13A40D5@genesis.frugalware.org>

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

commit 5dadbf20155846bf8f57646edc12f3209e7d83b9
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:33:21 2007 +0200

perl-html-encoding-0.53-1-i686
new package
3rd perl module for #2472

diff --git a/source/devel-extra/perl-html-encoding/FrugalBuild b/source/devel-extra/perl-html-encoding/FrugalBuild
new file mode 100644
index 0000000..90ef89a
--- /dev/null
+++ b/source/devel-extra/perl-html-encoding/FrugalBuild
@@ -0,0 +1,10 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=HTML-Encoding
+_F_perl_author=B/BJ/BJOERN
+pkgver=0.53
+pkgdesc="Determine the encoding of HTML/XML/XHTML documents"
+Finclude perl
+archs=('i686' 'x86_64')
+sha1sums=('bed06ee0b737e137c035089e99f950df664d7e55')
From vmiklos at frugalware.org  Sun Oct  7 22:37:55 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:37:58 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-sgml-parser-opensp-0.99-1-i686
Message-ID: <20071007203755.F0DF913A40D5@genesis.frugalware.org>

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

commit a372b033aa0618d187741449ea05145700906b64
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:37:48 2007 +0200

perl-sgml-parser-opensp-0.99-1-i686
new package
4th perl module for #2472

diff --git a/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild b/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild
new file mode 100644
index 0000000..2194820
--- /dev/null
+++ b/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild
@@ -0,0 +1,13 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=SGML-Parser-OpenSP
+_F_perl_author=B/BJ/BJOERN
+pkgver=0.99
+pkgdesc="Parse SGML documents using OpenSP"
+Finclude perl
+depends=(${depends[@]} 'libstdc++' 'opensp')
+archs=('i686' 'x86_64')
+sha1sums=('5bb63a184aeff8282c396ce1588937e2197ef94e')
+
+# optimization OK
From vmiklos at frugalware.org  Sun Oct  7 22:40:53 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:40:55 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-class-accessor-0.31-1-i686
Message-ID: <20071007204053.40EA713A40D5@genesis.frugalware.org>

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

commit 4897ebc11f92969d8573ac2ba28dbfbf3a87b805
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:40:45 2007 +0200

perl-class-accessor-0.31-1-i686
new package
5th perl module for #2472

diff --git a/source/devel-extra/perl-class-accessor/FrugalBuild b/source/devel-extra/perl-class-accessor/FrugalBuild
new file mode 100644
index 0000000..3b800a0
--- /dev/null
+++ b/source/devel-extra/perl-class-accessor/FrugalBuild
@@ -0,0 +1,10 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=Class-Accessor
+_F_perl_author=K/KA/KASEI
+pkgver=0.31
+pkgdesc="Automated accessor generation"
+Finclude perl
+archs=('i686' 'x86_64')
+sha1sums=('f7925450ca9b567251854e672a3631ccfd20b131')
From vmiklos at frugalware.org  Sun Oct  7 22:46:25 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:46:27 2007
Subject: [Frugalware-git] frugalware-current: validator-0.8.1-2-i686
Message-ID: <20071007204625.197C013A40D5@genesis.frugalware.org>

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

commit deab58d2da03f17e933d0403b79fbf859d5f8133
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:46:18 2007 +0200

validator-0.8.1-2-i686
added missing perl-encode-hanextra, perl-encode-jis2k, perl-html-encoding,
perl-sgml-parser-opensp, perl-class-accessor, perl-xml-libxml to depends()
finally really closes #2472

diff --git a/source/network-extra/validator/FrugalBuild b/source/network-extra/validator/FrugalBuild
index 646493c..a10e1f0 100644
--- a/source/network-extra/validator/FrugalBuild
+++ b/source/network-extra/validator/FrugalBuild
@@ -3,12 +3,14 @@

pkgname=validator
pkgver=0.8.1
-pkgrel=1
+pkgrel=2
pkgdesc="The W3C Markup Validator."
url="http://validator.w3.org/"
rodepends=('perl-config-general' 'perl-net-ip' 'perl-set-intspan' \
'perl-html-parser' 'perl-libwww' 'perl-text-iconv' 'perl-uri' \
-	 'apache' 'opensp' 'perl-html-template')
+	 'apache' 'opensp' 'perl-html-template' 'perl-encode-hanextra' \
+	 'perl-encode-jis2k' 'perl-html-encoding' 'perl-sgml-parser-opensp' \
+	 'perl-class-accessor' 'perl-xml-libxml')
backup=('etc/httpd/conf/modules.d/validator.conf')
groups=('network-extra')
archs=('i686' 'x86_64')
@@ -22,7 +24,6 @@ sha1sums=('eef9f1e15831812059650499d96e0fa04649ef38' \

build()
{
-	Fcd
Fpatchall
Fmkdir /var/www/validator
Fsed '#Base = /usr/local/validator' 'Base = /var/www/validator' htdocs/config/validator.conf
From vmiklos at frugalware.org  Sun Oct  7 22:59:55 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sun Oct  7 22:59:58 2007
Subject: [Frugalware-git] bitlbee-skype: updates for 0.2.0
Message-ID: <20071007205955.41C9513A40D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=12e97750a28468200dced16ef70bd9262a015337

commit 12e97750a28468200dced16ef70bd9262a015337
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sun Oct 7 22:56:17 2007 +0200

updates for 0.2.0

diff --git a/Makefile b/Makefile
index 3f6792d..06b1712 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-include config.mak

-VERSION = 0.1.4
+VERSION = 0.2.0

skype.so: skype.c config.mak
$(CC) $(CFLAGS) -shared -o skype.so skype.c $(LDFLAGS)
diff --git a/NEWS b/NEWS
index b81fb5c..e2ff922 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
VERSION         DESCRIPTION
-----------------------------------------------------------------------------
+0.2.0         - group chat support
+              - ~300 lines of new code, so be careful :)
+              - the version number mentions that this is not a minor change
0.1.4         - documentation: mention the version of all deps (requirements
section)
- fix sending / sending accents
From iron at frugalware.org  Mon Oct  8 09:57:52 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  8 09:57:55 2007
Subject: [Frugalware-git] homepage-ng: fwng: fixed error in pkg search
	(quoting strings)
Message-ID: <20071008075752.2F52013A40D5@genesis.frugalware.org>

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

commit a5c89add333b47bfe3f320b02978c21a9063c9e2
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 8 09:54:27 2007 +0200

fwng: fixed error in pkg search (quoting strings)

diff --git a/frugalware/db.inc.php b/frugalware/db.inc.php
index 97e0776..feef300 100644
--- a/frugalware/db.inc.php
+++ b/frugalware/db.inc.php
@@ -139,6 +139,11 @@ class FwDB
{
return $res->RecordCount();
}
+
+	function doQuoteString( &$query )
+	{
+		$query = $this->db->qstr( $query );
+	}
}

?>
diff --git a/frugalware/packages.php b/frugalware/packages.php
index a03b99d..a73383d 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -169,6 +169,7 @@ function search_pkg()
}
$query .= " order by fwver desc";
$db = new FwDB();
+	$db->doQuoteString( &$query );
$db->doConnect($sqlhost, $sqluser, $sqlpass, "frugalware2");
$res = $db->doQuery($query);
if ($db->doCountRows($res) > 0)
From iron at frugalware.org  Mon Oct  8 10:09:32 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  8 10:09:34 2007
Subject: [Frugalware-git] homepage-ng: fwng: last quote patch was not good,
	maybe now solved
Message-ID: <20071008080932.9EC5313A40D5@genesis.frugalware.org>

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

commit 25dfda0244cc387c1938823a817470e71d3d6ac8
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 8 10:09:31 2007 +0200

fwng: last quote patch was not good, maybe now solved

diff --git a/frugalware/db.inc.php b/frugalware/db.inc.php
index feef300..97e0776 100644
--- a/frugalware/db.inc.php
+++ b/frugalware/db.inc.php
@@ -139,11 +139,6 @@ class FwDB
{
return $res->RecordCount();
}
-
-	function doQuoteString( &$query )
-	{
-		$query = $this->db->qstr( $query );
-	}
}

?>
diff --git a/frugalware/packages.php b/frugalware/packages.php
index a73383d..03e08f2 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -150,7 +150,8 @@ function search_pkg()
main();
return;
}
-	$search = $_GET['srch'];
+	$search = addcslashes( $_GET['srch'], '+' );
+	$search = str_replace( '+', '\+', $search );
$arch = $_GET['arch'];
$fwver = $_GET['ver'];
$sub = ($_GET['sub'] == "on") ? 1 : 0; # whether the search is for a substring or exact match
@@ -169,7 +170,6 @@ function search_pkg()
}
$query .= " order by fwver desc";
$db = new FwDB();
-	$db->doQuoteString( &$query );
$db->doConnect($sqlhost, $sqluser, $sqlpass, "frugalware2");
$res = $db->doQuery($query);
if ($db->doCountRows($res) > 0)
From iron at frugalware.org  Mon Oct  8 10:13:06 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  8 10:13:08 2007
Subject: [Frugalware-git] homepage-ng: fwng: last patch fixed the query,
	but got another small error - now fixed
Message-ID: <20071008081306.93E7313A40D5@genesis.frugalware.org>

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

commit af3f433f44e5f2111640aa9a9366cc7c32a4e1d5
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 8 10:13:12 2007 +0200

fwng: last patch fixed the query, but got another small error - now fixed

diff --git a/frugalware/packages.php b/frugalware/packages.php
index 03e08f2..4ed9e55 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -150,8 +150,8 @@ function search_pkg()
main();
return;
}
-	$search = addcslashes( $_GET['srch'], '+' );
-	$search = str_replace( '+', '\+', $search );
+	$search = $_GET['srch'];
+	$srch = str_replace( '+', '\+', addcslashes( $search, '+' ) );
$arch = $_GET['arch'];
$fwver = $_GET['ver'];
$sub = ($_GET['sub'] == "on") ? 1 : 0; # whether the search is for a substring or exact match
@@ -159,7 +159,7 @@ function search_pkg()
$query = "select id, pkgname, pkgver, fwver, arch from packages where ";
# if the 'desc' is set (searching in description, too) I have to put
# the restrictions between brackets, because of the 'arch' below...
-	($_GET['desc'] == "on" || $_GET['desc'] == 1) ? $query .= "(pkgname rlike '$search' or `desc` rlike '$search')" : $query .= "(pkgname rlike '$search')";
+	($_GET['desc'] == "on" || $_GET['desc'] == 1) ? $query .= "(pkgname rlike '$srch' or `desc` rlike '$srch')" : $query .= "(pkgname rlike '$srch')";
if ($arch != "" and $arch != "all")
{
$query .= " and arch='$arch'";
From vmiklos at frugalware.org  Mon Oct  8 12:18:17 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  8 12:18:19 2007
Subject: [Frugalware-git] frugalware-current: revert
	"perl-class-accessor-0.31-1-i686"
Message-ID: <20071008101817.D106D13A40D5@genesis.frugalware.org>

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

commit fbebe2e112ec525dae03668234eb49ce6bde2ca4
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 8 12:18:09 2007 +0200

revert "perl-class-accessor-0.31-1-i686"
- this reverts commit 4897ebc11f92969d8573ac2ba28dbfbf3a87b805
- it was already in 'devel', my bad

diff --git a/source/devel-extra/perl-class-accessor/FrugalBuild b/source/devel-extra/perl-class-accessor/FrugalBuild
deleted file mode 100644
index 3b800a0..0000000
--- a/source/devel-extra/perl-class-accessor/FrugalBuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Compiling Time: 0.1 SBU
-# Maintainer: Zsolt Szalai <xbit@frugalware.org>
-
-_F_perl_name=Class-Accessor
-_F_perl_author=K/KA/KASEI
-pkgver=0.31
-pkgdesc="Automated accessor generation"
-Finclude perl
-archs=('i686' 'x86_64')
-sha1sums=('f7925450ca9b567251854e672a3631ccfd20b131')
From vmiklos at frugalware.org  Mon Oct  8 12:44:10 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  8 12:44:12 2007
Subject: [Frugalware-git] frugalware-current: mesa-cvs-20070601-2-x86_64
Message-ID: <20071008104410.EC2D913A40D5@genesis.frugalware.org>

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

commit d6ad96c307e992f5d7444607a104adf9df68e777
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 8 12:43:58 2007 +0200

mesa-cvs-20070601-2-x86_64
lib64 fix
yes, it's ugly to push this fix so late, but we really want the testsuite to
pass

diff --git a/source/xlib-extra/mesa-cvs/FrugalBuild b/source/xlib-extra/mesa-cvs/FrugalBuild
index a29472a..3eeac61 100644
--- a/source/xlib-extra/mesa-cvs/FrugalBuild
+++ b/source/xlib-extra/mesa-cvs/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=mesa-cvs
origname=Mesa-cvs
pkgver=20070601
-pkgrel=1
+pkgrel=2
pkgdesc="Mesa is a 3D graphics library (CVS Version)"
url="http://mesa3d.sourceforge.net/"
depends=('libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm' \
@@ -63,6 +63,8 @@ build()

Fmkdir /usr/lib/mesa-cvs/lib/xorg/modules/dri
cp -ar $Fsrcdir/$origname-$pkgver/lib$dripath/*_dri.so $Fdestdir/usr/lib/mesa-cvs/lib/xorg/modules/dri/ || Fdie
+	# remove empty dir
+	[ "$CARCH" == "x86_64" ] && Frm /usr/lib/mesa-cvs/lib64
}

# optimization OK
From iron at frugalware.org  Mon Oct  8 13:14:00 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  8 13:14:03 2007
Subject: [Frugalware-git] homepage-ng: fwng: reworked pkg search part &&
	changed doQuery() error reporting
Message-ID: <20071008111400.2069213A40D5@genesis.frugalware.org>

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

commit 731b3843b1673fc3f4bf304b793fc52d4cfd0490
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 8 13:14:01 2007 +0200

fwng: reworked pkg search part && changed doQuery() error reporting

diff --git a/frugalware/db.inc.php b/frugalware/db.inc.php
index 97e0776..f975928 100644
--- a/frugalware/db.inc.php
+++ b/frugalware/db.inc.php
@@ -94,7 +94,7 @@ class FwDB
}
if (!$result)
{
-			die("Query ".$query." failed with the following error: ".$this->db->ErrorMsg());
+			$result = -1;
}
return $result;
}
diff --git a/frugalware/packages.php b/frugalware/packages.php
index 4ed9e55..a5ccdd1 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -151,7 +151,7 @@ function search_pkg()
return;
}
$search = $_GET['srch'];
-	$srch = str_replace( '+', '\+', addcslashes( $search, '+' ) );
+	//$srch = str_replace( '+', '\+', addcslashes( $search, '+' ) );
$arch = $_GET['arch'];
$fwver = $_GET['ver'];
$sub = ($_GET['sub'] == "on") ? 1 : 0; # whether the search is for a substring or exact match
@@ -159,7 +159,7 @@ function search_pkg()
$query = "select id, pkgname, pkgver, fwver, arch from packages where ";
# if the 'desc' is set (searching in description, too) I have to put
# the restrictions between brackets, because of the 'arch' below...
-	($_GET['desc'] == "on" || $_GET['desc'] == 1) ? $query .= "(pkgname rlike '$srch' or `desc` rlike '$srch')" : $query .= "(pkgname rlike '$srch')";
+	($_GET['desc'] == "on" || $_GET['desc'] == 1) ? $query .= "(pkgname rlike '$search' or `desc` rlike '$search')" : $query .= "(pkgname rlike '$search')";
if ($arch != "" and $arch != "all")
{
$query .= " and arch='$arch'";
@@ -172,7 +172,7 @@ function search_pkg()
$db = new FwDB();
$db->doConnect($sqlhost, $sqluser, $sqlpass, "frugalware2");
$res = $db->doQuery($query);
-	if ($db->doCountRows($res) > 0)
+	if ($res != -1 && $db->doCountRows($res) > 0)
{
while ($i = $db->doFetchRow($res))
{
@@ -181,6 +181,12 @@ function search_pkg()
$db->doClose();
res_show($res_set, 'p', $search);
}
+	elseif
+	{
+		print '<h3>' . gettext( 'Error in the query, please change the searching conditions' ) . '</h3>';
+		$db->doClose();
+		main();
+	}
else
{
print "<h3>".gettext("No package found")."</h3>";
From iron at frugalware.org  Mon Oct  8 13:15:01 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  8 13:15:03 2007
Subject: [Frugalware-git] homepage-ng: fwng: added missing if()
Message-ID: <20071008111501.E8CE713A40D5@genesis.frugalware.org>

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

commit ab2e197cde417428b9f5004b928b4be5aaf88eab
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 8 13:15:04 2007 +0200

fwng: added missing if()

diff --git a/frugalware/packages.php b/frugalware/packages.php
index a5ccdd1..34c3cb0 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -181,7 +181,7 @@ function search_pkg()
$db->doClose();
res_show($res_set, 'p', $search);
}
-	elseif
+	elseif ( $res == -1 )
{
print '<h3>' . gettext( 'Error in the query, please change the searching conditions' ) . '</h3>';
$db->doClose();
From vmiklos at frugalware.org  Mon Oct  8 13:15:21 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Mon Oct  8 13:15:23 2007
Subject: [Frugalware-git] frugalware-current: mesa-cvs-20070601-2-i686
Message-ID: <20071008111521.2E50613A40EA@genesis.frugalware.org>

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

commit f3e0cd04d7e92dd19176af39d433f821b18b523e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Mon Oct 8 13:15:16 2007 +0200

mesa-cvs-20070601-2-i686
typo

diff --git a/source/xlib-extra/mesa-cvs/FrugalBuild b/source/xlib-extra/mesa-cvs/FrugalBuild
index 3eeac61..b497a5f 100644
--- a/source/xlib-extra/mesa-cvs/FrugalBuild
+++ b/source/xlib-extra/mesa-cvs/FrugalBuild
@@ -64,7 +64,9 @@ build()
Fmkdir /usr/lib/mesa-cvs/lib/xorg/modules/dri
cp -ar $Fsrcdir/$origname-$pkgver/lib$dripath/*_dri.so $Fdestdir/usr/lib/mesa-cvs/lib/xorg/modules/dri/ || Fdie
# remove empty dir
-	[ "$CARCH" == "x86_64" ] && Frm /usr/lib/mesa-cvs/lib64
+	if [ "$CARCH" == "x86_64" ]; then
+		Frm /usr/lib/mesa-cvs/lib64
+	fi
}

# optimization OK
From iron at frugalware.org  Mon Oct  8 13:27:28 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Oct  8 13:27:30 2007
Subject: [Frugalware-git] homepage-ng: fwng: added info text to the search
	input box
Message-ID: <20071008112728.37FF313A40D5@genesis.frugalware.org>

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

commit c620cbeaed213e7d72d2ea5d1a8061bc679fee3b
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Mon Oct 8 13:27:29 2007 +0200

fwng: added info text to the search input box

diff --git a/frugalware/packages.php b/frugalware/packages.php
index 34c3cb0..b0b09be 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -94,7 +94,7 @@ function main()
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input class=\"required\" type=\"checkbox\" name=\"desc\" id=\"descr\" /><label for=\"descr\" class=\"pkg-phrasing\">".gettext("Search in description")."</label><br />
<input type=\"radio\" name=\"op\" value=\"file\" />files<br />
<input type=\"radio\" name=\"op\" value=\"groups\" />groups<br />
-		<input class=\"required\" type=\"text\" id=\"pkgsrc\" name=\"srch\" size=\"40\" title=\"".gettext("Regular expression")."\"/>
+		<input class=\"required\" type=\"text\" id=\"pkgsrc\" name=\"srch\" size=\"40\" title=\"".gettext("Regular expression")."\"/> " . gettext( '(regular expression)' ) . "
<br />
<br />
".gettext("Architecture:")."<br />
From crazy at frugalware.org  Mon Oct  8 15:22:13 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct  8 15:22:16 2007
Subject: [Frugalware-git] frugalware-current: kde-frugalware-0.7.0-1-i686
Message-ID: <20071008132213.D9BF613A40D5@genesis.frugalware.org>

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

commit a949ccaa17e07c06a94f7570793a55d2781cbdf6
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 8 15:18:48 2007 +0200

kde-frugalware-0.7.0-1-i686
* Version bump

diff --git a/source/kde/kde-frugalware/FrugalBuild b/source/kde/kde-frugalware/FrugalBuild
index d8c7c7d..3c77bd2 100644
--- a/source/kde/kde-frugalware/FrugalBuild
+++ b/source/kde/kde-frugalware/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kde-frugalware
-pkgver=0.6.0
-pkgrel=3
+pkgver=0.7.0
+pkgrel=1
pkgdesc="KDE artwork for Frugalware Linux."
url="http://ftp.frugalware.org/pub/other/kde/kde-frugalware/"
depends=()
@@ -13,8 +13,7 @@ options=('nodocs')
groups=('kde' 'kde-core')
archs=('i686' 'x86_64')
up2date="$pkgver"
-source=(http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/$pkgname-$pkgver.tar.bz2 \
-	fixes_for_final.patch fix_syntax_error.patch)
+source=(http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/$pkgname-$pkgver.tar.bz2)

build()
{
@@ -30,6 +29,4 @@ build()

}

-sha1sums=('cfd0c0f25522921332ba93c191f758838daa0f66'\
-          '2ea1667c602b795f3ee1c96cc0d23200de21dfad'\
-          '4a24a4846f9bcadf5a4ea595df78a5dbd9daa27f')
+sha1sums=('e1e3b3cc635431c2daca3bb0c42a3348250d750a')
diff --git a/source/kde/kde-frugalware/fix_syntax_error.patch b/source/kde/kde-frugalware/fix_syntax_error.patch
deleted file mode 100644
index 5b66af3..0000000
--- a/source/kde/kde-frugalware/fix_syntax_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kde-frugalware-0.6.0/etc/xdg/menus/applications-merged/kde-not-show.menu kde-frugalware-0.6.0-p/etc/xdg/menus/applications-merged/kde-not-show.menu
---- kde-frugalware-0.6.0/etc/xdg/menus/applications-merged/kde-not-show.menu	2007-02-25 04:59:49.000000000 +0100
-+++ kde-frugalware-0.6.0-p/etc/xdg/menus/applications-merged/kde-not-show.menu	2007-03-27 14:41:42.000000000 +0200
-@@ -4,6 +4,7 @@
-   <Filename>kde-Kfind.desktop</Filename>
-   <Filename>kde-Help.desktop</Filename>
-   <Filename>kde-Home.desktop</Filename>
-+ </Exclude>
-  <Menu>
-   <Name>.hidden</Name>
-   <Include>
diff --git a/source/kde/kde-frugalware/fixes_for_final.patch b/source/kde/kde-frugalware/fixes_for_final.patch
deleted file mode 100644
index ccf7a2e..0000000
--- a/source/kde/kde-frugalware/fixes_for_final.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -Naurp kde-frugalware-0.6.0/config/konquerorrc kde-frugalware-0.6.0-p/config/konquerorrc
---- kde-frugalware-0.6.0/config/konquerorrc	2007-02-25 03:03:23.000000000 +0100
-+++ kde-frugalware-0.6.0-p/config/konquerorrc	2007-03-14 20:37:11.000000000 +0100
-@@ -13,7 +13,7 @@ FormCompletion=true
- HoverLinks=true
- MaxFormCompletionItems=10
- MediumFontSize=12
--MinimumFontSize=9
-+MinimumFontSize=10
- ShowAnimations=Enabled
- UnderlineLinks=false
- UnfinishedImageFrame=true
-diff -Naurp kde-frugalware-0.6.0/usr/share/apps/kdm/themes/frugalware/frugalware.xml kde-frugalware-0.6.0-p/usr/share/apps/kdm/themes/frugalware/frugalware.xml
---- kde-frugalware-0.6.0/usr/share/apps/kdm/themes/frugalware/frugalware.xml	2007-02-24 21:49:50.000000000 +0100
-+++ kde-frugalware-0.6.0-p/usr/share/apps/kdm/themes/frugalware/frugalware.xml	2007-03-14 20:29:23.000000000 +0100
-@@ -8,53 +8,53 @@
-
- 	<item type="pixmap">
- 		<normal file="login.png"/>
--		<pos anchor="c" x="78%" y="40%" width="350" height="185"/>
-+		<pos anchor="c" x="78%" y="40%" width="380" height="230"/>
-
- 		<item type="pixmap">
- 			<normal file="emberke.png"/>
--			<pos anchor="emberke" x="15%" y="45%" width="48" height="48"/>
-+			<pos anchor="emberke" x="12%" y="54%" width="48" height="48"/>
- 		</item>
-
- 		<item type="rect">
- 			<normal color="#ffff00" alpha="0.0"/>
--			<pos anchor="e" x="45%" y="43%" width="190" height="180"/>
-+			<pos anchor="e" x="49%" y="37%" width="190" height="180"/>
-
- 			<item type="label">
--				<pos anchor="ne" x="90%" y="40%"/>
--				<normal color="#000000" font="Sans 10"/>
-+				<pos anchor="ne" x="103%" y="60%"/>
-+				<normal color="#000000" font="DejaVu Sans 10"/>
- 				<stock type="username-label"/>
- 			</item>
-
- 			<item type="label">
--				<pos anchor="ne" x="90%" y="60%"/>
--				<normal color="#000000" font="Sans 10"/>
-+				<pos anchor="ne" x="103%" y="80%"/>
-+				<normal color="#000000" font="DejaVu Sans 10"/>
- 				<stock type="password-label"/>
- 			</item>
- 		</item>
-
- 		<item type="rect">
- 			<normal color="#00ffff" alpha="0.0"/>
--			<pos anchor="w" x="45%" y="43%" width="190" height="180"/>
-+			<pos anchor="w" x="48%" y="47%" width="190" height="180"/>
-
- 			<item type="entry" id="user-entry">
--				<pos anchor="n" x="45%" y="40%" height="24" width="150"/>
-+				<pos anchor="n" x="48%" y="45%" height="24" width="150"/>
- 			</item>
-
- 			<item type="entry" id="pw-entry">
--				<pos anchor="n" x="45%" y="60%" height="24" width="150"/>
-+				<pos anchor="n" x="48%" y="65%" height="24" width="150"/>
- 			</item>
- 		</item>
- 	</item>
-
- 	<item type="pixmap" id="caps-lock-warning">
- 		<normal file="error.png"/>
--		<pos anchor="c" x="78%" y="45%" width="400" height="70"/>
-+		<pos anchor="c" x="84%" y="50%" width="400" height="70"/>
- 		<item type="rect" id="caps-lock-warning">
- 			<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
- 			<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
- 				<item type="label">
- 					<normal color="#000000" font="Sans 12"/>
--					<pos x="50%" anchor="n"/>
-+					<pos x="48%" anchor="n"/>
- 					<stock type="caps-lock-warning"/>
- 				</item>
- 			</box>
-@@ -63,7 +63,7 @@
-
- 	<item type="pixmap" id="pam-error">
- 		<normal file="error.png"/>
--		<pos anchor="c" x="78%" y="45%" width="400" height="70"/>
-+		<pos anchor="c" x="84%" y="48%" width="400" height="70"/>
- 		<item type="rect">
- 			<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
- 			<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
-@@ -79,39 +79,39 @@
-
-
- <item type="label">
--	<pos x="72%" y="30%"/>
--	<normal color="#000000" font="Sans 16"/>
-+	<pos x="69%" y="33%"/>
-+	<normal color="#000000" font="DejaVu Sans 17"/>
- 	<stock type="welcome-label"/>
- </item>
-
-
- <item type="rect">
--	<pos x="0%" y="70%" width="640" height="90"/>
-+	<pos x="0%" y="71%" width="640" height="90"/>
-
- 	<item type="pixmap">
- 		<normal file="clock.png"/>
--		<pos x="55%" y="13%" width="48" height="48"/>
-+		<pos x="54%" y="10%" width="48" height="48"/>
- 	</item>
- 	<item type="pixmap">
- 		<normal file="session.png"/>
--		<pos x="1%" y="11%" width="48" height="48"/>
-+		<pos x="2%" y="10%" width="48" height="48"/>
- 	</item>
- 	<item type="pixmap">
- 		<normal file="system_menu.png"/>
--		<pos x="25%" y="10%" width="48" height="48"/>
-+		<pos x="26%" y="10%" width="48" height="48"/>
- 	</item>
- 	<item type="label" id="clock">
--		<normal color="#000000" font="Sans 12"/>
--		<pos x="65%" y="22"/>
-+		<normal color="#000000" font="DejaVu Sans 12"/>
-+		<pos x="66%" y="25"/>
- 		<text>%c</text>
- 	</item>
-
- 	<item type="rect" id="session_button" button="true">
--		<pos x="10%" y="22" width="100" height="100%"/>
-+		<pos x="13%" y="25" width="100" height="100%"/>
- 		<item type="label">
--			<normal color="#000000" font="Sans 12"/>
--			<prelight color="#262626" font="Sans 12"/>
--			<active color="#ff0000" font="Sans 12"/>
-+			<normal color="#000000" font="DejaVu Sans 12"/>
-+			<prelight color="#262626" font="DejaVu Sans 12"/>
-+			<active color="#ff0000" font="DejaVu Sans 12"/>
- 			<pos y="0" x="0"/>
- 			<text>Sessions</text>
- 			<text xml:lang="ca">Sessi&#xF3;</text>
-@@ -124,11 +124,11 @@
-
- 	<item type="rect" id="system_button" button="true">
- 		<show modes="console" type="system"/>
--		<pos x="35%" y="22" width="100" height="100%"/>
-+		<pos x="36%" y="24" width="100" height="100%"/>
- 		<item type="label">
--			<normal color="#000000" font="Sans 12"/>
--			<prelight color="#262626" font="Sans 12"/>
--			<active color="#ff0000" font="Sans 12"/>
-+			<normal color="#000000" font="DejaVu Sans 12"/>
-+			<prelight color="#262626" font="DejaVu Sans 12"/>
-+			<active color="#ff0000" font="DejaVu Sans 12"/>
- 			<pos y="0" x="0"/>
- 			<text>System Menu</text>
- 			<text xml:lang="ca">Men&#xFA;</text>
From priyank at frugalware.org  Mon Oct  8 15:44:30 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct  8 15:44:32 2007
Subject: [Frugalware-git] frugalware-current: gfpm-1.0.3-2-i686
Message-ID: <20071008134430.6730613A40D5@genesis.frugalware.org>

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

commit e5e507f38e238316b843a2a76fb594e1ff9d90e4
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 8 19:11:17 2007 +0530

gfpm-1.0.3-2-i686
* Added a patch to fix a segfault (thanks crazy for noticing it)

diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild
index c42f138..6f5ba2a 100644
--- a/source/xapps/gfpm/FrugalBuild
+++ b/source/xapps/gfpm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gfpm
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="Graphical Frugalware Package Manager"
url="http://ftp.frugalware.org/pub/other/gfpm"
depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2')
@@ -14,8 +14,8 @@ archs=('i686' 'x86_64')
_F_gnome_iconcache="y"
Finclude gnome-scriptlet
up2date="lynx -dump $url | Flasttar"
-source=($url/$pkgname-$pkgver.tar.gz)
-signatures=(${source[0]}.asc)
+source=($url/$pkgname-$pkgver.tar.gz $pkgname-$pkgver-crashfix.diff)
+signatures=(${source[0]}.asc '')

build()
{
diff --git a/source/xapps/gfpm/gfpm-1.0.3-crashfix.diff b/source/xapps/gfpm/gfpm-1.0.3-crashfix.diff
new file mode 100644
index 0000000..0b48187
--- /dev/null
+++ b/source/xapps/gfpm/gfpm-1.0.3-crashfix.diff
@@ -0,0 +1,12 @@
+diff -Naur gfpm-1.0.3/src/gfpm-interface.c gfpm-1.0.3.new/src/gfpm-interface.c
+--- gfpm-1.0.3/src/gfpm-interface.c	2007-10-02 22:29:50.000000000 +0530
++++ gfpm-1.0.3.new/src/gfpm-interface.c	2007-10-08 19:03:29.000000000 +0530
+@@ -1401,8 +1401,6 @@
+ 					-1);
+ 			pacman_pkg_free (pm_lpkg);
+ 			pacman_pkg_free (pm_spkg);
+-			g_free (v1);
+-			g_free (v2);
+ 		}
+ 		while (gtk_events_pending())
+ 			gtk_main_iteration ();
From voroskoi at frugalware.org  Mon Oct  8 15:45:21 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct  8 15:45:22 2007
Subject: [Frugalware-git] homepage-ng: FSA294-kdebase
Message-ID: <20071008134521.4F74613A40D5@genesis.frugalware.org>

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

commit 8f0a5fe1a86bf30a6e90aeb2c8c109e0fab2c93a
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 8 15:31:34 2007 +0200

FSA294-kdebase

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index c8cbb87..1ad38fc 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,18 @@

<fsas>
<fsa>
+		<id>294</id>
+		<date>2007-10-08</date>
+		<author>voroskoi</author>
+		<package>kdebase</package>
+		<vulnerable>3.5.6-3terminus2</vulnerable>
+		<unaffected>3.5.6-3terminus3</unaffected>
+		<bts>http://bugs.frugalware.org/task/2198</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2022</cve>
+		<desc>A vulnerability has been reported in Konqueror, which can be exploited by malicious people to disclose potentially sensitive information.
+			The vulnerability is caused due to an unspecified error within the interaction between Konqueror and the Adobe Flash Player plug-in, which may result in key presses being leaked to a Flash applet. This can be exploited to disclose potentially sensitive information.</desc>
+	</fsa>
+	<fsa>
<id>293</id>
<date>2007-10-07</date>
<author>voroskoi</author>
From voroskoi at frugalware.org  Mon Oct  8 15:51:08 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct  8 15:51:10 2007
Subject: [Frugalware-git] homepage-ng: FSA295-python
Message-ID: <20071008135108.6EF5313A40D5@genesis.frugalware.org>

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

commit 98adb928bbbeb2bd13cef3f9881e1b80b76aa358
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 8 15:37:17 2007 +0200

FSA295-python

diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml
index 1ad38fc..4d136fd 100644
--- a/frugalware/xml/security.xml
+++ b/frugalware/xml/security.xml
@@ -27,6 +27,19 @@

<fsas>
<fsa>
+		<id>295</id>
+		<date>2007-10-08</date>
+		<author>voroskoi</author>
+		<package>python</package>
+		<vulnerable>2.5-3terminus2</vulnerable>
+		<unaffected>2.5-3terminus3</unaffected>
+		<bts>http://bugs.frugalware.org/task/2428</bts>
+		<cve>http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4965</cve>
+		<desc>Slythers Bro has discovered a security issue in the imageop module for Python, which can be exploited by malicious people to cause a DoS (Denial of Service) and potentially compromise a vulnerable system.
+			The security issue is caused due to an integer overflow error within the "tovideo()" function and can be exploited to cause a heap-based buffer overflow when specially crafted parameters are passed to the function.
+			Successful exploitation may allow execution of arbitrary code.</desc>
+	</fsa>
+	<fsa>
<id>294</id>
<date>2007-10-08</date>
<author>voroskoi</author>
From vmiklos at frugalware.org  Tue Oct  9 00:49:17 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 00:49:21 2007
Subject: [Frugalware-git] frugalware-current: docs/xml: add raozuzu and move
	Nadfoke to former_devs.xml
Message-ID: <20071008224917.B720F13A40EA@genesis.frugalware.org>

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

commit f9869c8c54edeceb83bf78893df97eb6c06f68f8
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 00:49:12 2007 +0200

docs/xml: add raozuzu and move Nadfoke to former_devs.xml

diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml
index 5b538ec..32f8a1e 100644
--- a/docs/xml/authors.xml
+++ b/docs/xml/authors.xml
@@ -37,9 +37,9 @@ if you modify this file, be sure it's still valid - xmllint is your friend
<role>translator (german)</role>
</author>
<author>
-		<name>Gondor, Viktor</name>
-		<nick>Nadfoka</nick>
-		<email>nadfoka@frugalware.org</email>
+		<name>Buzzotta, Richy</name>
+		<nick>raozuzu</nick>
+		<email>raozuzu@yahoo.it</email>
<role>frugalware artwork</role>
</author>
<author>
diff --git a/docs/xml/former_devs.xml b/docs/xml/former_devs.xml
index 1858331..8da331f 100644
--- a/docs/xml/former_devs.xml
+++ b/docs/xml/former_devs.xml
@@ -13,6 +13,12 @@

<authors>
<author>
+		<name>Gondor, Viktor</name>
+		<nick>Nadfoka</nick>
+		<email>viktor.gondor@gmail.com</email>
+		<role>Artwork maintainer till Frugalware 0.6 (Terminus)</role>
+	</author>
+	<author>
<name>Smith, Alex</name>
<nick>AlexExtreme</nick>
<email>alex@alex-smith.me.uk</email>
From vmiklos at frugalware.org  Tue Oct  9 00:49:17 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 00:49:22 2007
Subject: [Frugalware-git] frugalware-current: authors.xml: whitespace fix
Message-ID: <20071008224917.A7E8D13A40D5@genesis.frugalware.org>

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

commit 4d71ba6ed709726aaa9b362681ff7f7633ec296b
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 00:43:29 2007 +0200

authors.xml: whitespace fix

diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml
index de5915f..5b538ec 100644
--- a/docs/xml/authors.xml
+++ b/docs/xml/authors.xml
@@ -45,7 +45,7 @@ if you modify this file, be sure it's still valid - xmllint is your friend
<author>
<name>Gosalia, Priyank</name>
<nick>priyank</nick>
-    <email>priyank@frugalware.org</email>
+		<email>priyank@frugalware.org</email>
<role>XFCE Maintainer</role>
<role>Package Maintainer</role>
<role>Graphical Configuration Tools</role>
From vmiklos at frugalware.org  Tue Oct  9 01:14:25 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 01:14:27 2007
Subject: [Frugalware-git] frugalware-current: xorg-server-1.2.0-10-i686
Message-ID: <20071008231425.BE35913A40D5@genesis.frugalware.org>

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

commit 11c29e7b669cab245b210548f3359014ee3514b5
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 01:13:46 2007 +0200

xorg-server-1.2.0-10-i686
fix the desktop file: slim should not have a bigger priority than gdm or kdm

diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild
index e257d12..8bdd82e 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=xorg-server
pkgver=1.2.0
-pkgrel=9
+pkgrel=10
mesaver=7.0.1
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
@@ -123,7 +123,7 @@ sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106' \
'f31702e0029b2d68018598e73ed55c4d6c58367b' \
'859b98a4049400be152032fc09ceff2afe9e6dcf' \
'863ad92892785c3785b122bf54d0def4d4d2732c' \
-          '7f1925d2c0307e507e5ce8f39224f6481a469185' \
+          '1456207203932404752e2519c5b7fe830a913cf4' \
'4713d46b31eafbde58a1fafe8269642df6a12d77' \
'426b0b08617ec19cba41ab20f3891cab82f205a2' \
'f7f706ec568a80543c6d6096b3d8a833b80399ed' \
diff --git a/source/x11/xorg-server/desktop b/source/x11/xorg-server/desktop
index d3ab947..dfd468d 100644
--- a/source/x11/xorg-server/desktop
+++ b/source/x11/xorg-server/desktop
@@ -3,6 +3,6 @@
# Which session manager try to use.

#desktop="/usr/bin/xdm -nodaemon"
+#desktop="/usr/bin/slim"
#desktop="/usr/sbin/gdm --nodaemon"
#desktop="/usr/bin/kdm -nodaemon"
-#desktop="/usr/bin/slim"
From vmiklos at frugalware.org  Tue Oct  9 01:55:36 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 01:55:38 2007
Subject: [Frugalware-git] frugalware-current: TAG 0.7
Message-ID: <20071008235536.51D5A13A40D5@genesis.frugalware.org>

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

commit d9b2dc15af52ddf5cc6171bfc9645235f2faee4d
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 01:55:26 2007 +0200

TAG 0.7
From priyank at frugalware.org  Tue Oct  9 14:10:53 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct  9 14:10:56 2007
Subject: [Frugalware-git] gfpm: Fix a segfault when searching in installed
	packages
Message-ID: <20071009121053.6D20B1688058@genesis.frugalware.org>

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

commit da7d9cb9b5ae032781d00281f35e04344a47ce83
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 9 17:39:19 2007 +0530

Fix a segfault when searching in installed packages
* pointer returned by pacman_pkg_getinfo() shouldn't be freed!

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 64d2c40..4579f62 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -1407,8 +1407,6 @@ cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data)
-1);
pacman_pkg_free (pm_lpkg);
pacman_pkg_free (pm_spkg);
-			g_free (v1);
-			g_free (v2);
}
while (gtk_events_pending())
gtk_main_iteration ();
From hermier at frugalware.org  Tue Oct  9 17:28:41 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Oct  9 17:28:43 2007
Subject: [Frugalware-git] 
	frugalware-current: Organise the channels a little,
	and add the frugalware.it channel.
Message-ID: <20071009152841.A751F1688058@genesis.frugalware.org>

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

commit c41b5b5e7bdbd7f8688edbb3215d14c694e117cf
Author: Michel Hermier <hermier@frugalware.org>
Date:   Tue Oct 9 17:27:28 2007 +0200

Organise the channels a little, and add the frugalware.it channel.

diff --git a/docs/irc-rules.txt b/docs/irc-rules.txt
index 2095581..b497049 100644
--- a/docs/irc-rules.txt
+++ b/docs/irc-rules.txt
@@ -14,18 +14,21 @@ that they're available to everyone.

== IRC channels

-.There are four (4) Frugalware Linux channels
+.There are 4 Frugalware Linux channels for users
* #frugalware (Main, English-language only)
-* #frugalware.hu (Hungarian-language only)
* #frugalware.fr (French-language only)
-* #frugalware.dev (Frugalware development discussion.  Only Frugalware
-  developers can 'speak' on this channel but everyone can see what's being
-  discussed).
+* #frugalware.hu (Hungarian-language only)
+* #frugalware.it (Italian-language only)

Please use only the language appropriate to the channel.  If you don't do
so, you'll be asked to change channels.  If you know of other non-English
channels, please tell us.

+.There is a Frugalware Linux channel for developers
+* #frugalware.dev (Frugalware development discussion.  Only Frugalware
+  developers can 'speak' on this channel but everyone can see what's being
+  discussed).
+
== Frugalware developers

If you're a Frugalware developer, please also join one or more of the user
From vmiklos at frugalware.org  Tue Oct  9 18:22:25 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 18:22:27 2007
Subject: [Frugalware-git] frugalware-0.7: pacman-g2-3.6.3-3sayshell1-i686
Message-ID: <20071009162225.CD5991688007@genesis.frugalware.org>

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

commit bbdfd9f6aa0c2145c8a00d801d82a5aa0902e8f1
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 18:21:37 2007 +0200

pacman-g2-3.6.3-3sayshell1-i686
default to -stable

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 5cd9bf4..cd5fa8e 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=pacman-g2
pkgver=3.6.3
Fuse $USE_DEVEL && pkgver=3.6.2.10.g928a3ae
-pkgrel=2
+pkgrel=3sayshell1
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})
@@ -19,8 +19,9 @@ archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump $url/releases/ |Flasttar"
if ! Fuse $USE_DEVEL; then
source=($url/releases/$pkgname-$pkgver.tar.gz \
-		http://git.frugalware.org/patches/pacman-g2/5e0c759d50e2eb629a08ebc1944ebfe6b452c9c5.patch)
-	signatures=("$source.asc" '')
+		http://git.frugalware.org/patches/pacman-g2/5e0c759d50e2eb629a08ebc1944ebfe6b452c9c5.patch \
+		stable.diff)
+	signatures=("$source.asc" '' '')
else
_F_scm_type="git"
_F_scm_url="http://git.frugalware.org/repos/pacman-g2/.git/"
diff --git a/source/base/pacman-g2/stable.diff b/source/base/pacman-g2/stable.diff
new file mode 100644
index 0000000..7663516
--- /dev/null
+++ b/source/base/pacman-g2/stable.diff
@@ -0,0 +1,17 @@
+diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
+index d8e9374..9656565 100644
+--- a/etc/pacman.conf.in
++++ b/etc/pacman.conf.in
+@@ -19,10 +19,10 @@ OldDelay    = 3
+ # tree to avoid conflicts
+
+ # -current
+-Include = /etc/pacman.d/frugalware-current
++#Include = /etc/pacman.d/frugalware-current
+
+ # -stable
+-#Include = /etc/pacman.d/frugalware
++Include = /etc/pacman.d/frugalware
+
+ # An example of a custom package repository.  See the pacman-g2 manpage for
+ # tips on creating your own repositories.
From vmiklos at frugalware.org  Tue Oct  9 18:29:12 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 18:29:16 2007
Subject: [Frugalware-git] frugalware-0.7: pacman-tools-1.0.0-2sayshell1-i686
Message-ID: <20071009162912.38EAB1688007@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=8dd9213c1cdbc2c20a513e215f06a927de17d041

commit 8dd9213c1cdbc2c20a513e215f06a927de17d041
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 18:28:39 2007 +0200

pacman-tools-1.0.0-2sayshell1-i686
default to -stable

diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild
index 273f313..a33b603 100644
--- a/source/devel/pacman-tools/FrugalBuild
+++ b/source/devel/pacman-tools/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=pacman-tools
pkgver=1.0.0
-pkgrel=1
+pkgrel=2sayshell1
pkgdesc="Tools for developers for managing packages"
url="http://ftp.frugalware.org/pub/other/pacman-tools"
depends=('bash' 'perl' 'pacman-g2>=3.5.1' 'wget' 'python' 'libxml2' 'glib2')
@@ -12,7 +12,7 @@ groups=('devel' 'devel-core')
archs=('i686' 'x86_64' 'ppc')
backup=(etc/{genchangelog,repoman}.conf etc/syncpkg{cd/c,d/d,d/ctl}config.py)
up2date="lynx -dump $url|Flasttar"
-source=($url/$pkgname-$pkgver.tar.gz)
+source=($url/$pkgname-$pkgver.tar.gz stable.diff)
options=('scriptlet')
-signatures=(${source[0]}.asc)
+signatures=(${source[0]}.asc '')
# optimization OK
diff --git a/source/devel/pacman-tools/stable.diff b/source/devel/pacman-tools/stable.diff
new file mode 100644
index 0000000..b9523d9
--- /dev/null
+++ b/source/devel/pacman-tools/stable.diff
@@ -0,0 +1,15 @@
+diff --git a/repoman.conf b/repoman.conf
+index 35d41f6..37ca7b2 100644
+--- a/repoman.conf
++++ b/repoman.conf
+@@ -7,8 +7,8 @@
+
+ # the order is important, the first repo will be used as a default for
+ # developer actions (like up, del and so on)
+-source /etc/repoman.d/current
+-#source /etc/repoman.d/stable
++#source /etc/repoman.d/current
++source /etc/repoman.d/stable
+
+ # default repo to search the include dir in
+ fst_root=/var/fst/
From vmiklos at frugalware.org  Tue Oct  9 23:47:31 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Tue Oct  9 23:47:34 2007
Subject: [Frugalware-git] frugalware: use -m1777 while installing /var/tmp
Message-ID: <20071009214731.AF4081688007@genesis.frugalware.org>

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

commit bafa5aafb991da1b520cd77969101ea1465c00b8
Author: VMiklos <vmiklos@frugalware.org>
Date:   Tue Oct 9 23:47:26 2007 +0200

use -m1777 while installing /var/tmp
thx voroskoi for noticing this

diff --git a/Makefile b/Makefile
index 8822b72..a88dee8 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ install:
$(INSTALL) -d $(DESTDIR)/var/spool
$(INSTALL) -d $(DESTDIR)/var/spool/mail
$(INSTALL) -d $(DESTDIR)/var/man
-	$(INSTALL) -d $(DESTDIR)/var/tmp
+	$(INSTALL) -d -m1777 $(DESTDIR)/var/tmp
ln -sf /var/spool/rwho $(DESTDIR)/var/rwho
ifeq ($(shell uname -m),x86_64)
ln -sf /lib $(DESTDIR)/lib64
From priyank at frugalware.org  Thu Oct 11 18:30:53 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct 11 18:30:55 2007
Subject: [Frugalware-git] gfpm: gfpm now supports removing entire package
	groups
Message-ID: <20071011163053.3C9C713A4004@genesis.frugalware.org>

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

commit e5495d63278c0e52c2bb32b7651f8c7f94b385cb
Author: Priyank <priyank@frugalware.org>
Date:   Thu Oct 11 21:59:13 2007 +0530

gfpm now supports removing entire package groups
* This can be accessed by right clicking a group and selecting "Remove"

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 4579f62..6747b55 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -79,9 +79,11 @@ static GtkWidget *gfpm_apply_rem_depcheck;
static void gfpm_populate_repos_combobox (GtkComboBox *combo);
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_groups_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event);
static void cb_gfpm_pkgs_tvw_selected (GtkTreeSelection *selection, gpointer data);
static void cb_gfpm_pkgs_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event);
static void cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data);
+static void cb_gfpm_remove_group_clicked (GtkButton *button, gpointer data);
static void cb_gfpm_pkg_selection_toggled (GtkCellRendererToggle *toggle, gchar *path_str, 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);
@@ -223,6 +225,7 @@ gfpm_interface_init (void)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_pkgs_tvw));
g_signal_connect(selection, "changed", G_CALLBACK(cb_gfpm_pkgs_tvw_selected), NULL);
g_signal_connect (gfpm_pkgs_tvw, "button-release-event", G_CALLBACK(cb_gfpm_pkgs_tvw_right_click), NULL);
+	g_signal_connect (gfpm_groups_tvw, "button-release-event", G_CALLBACK(cb_gfpm_groups_tvw_right_click), NULL);

/* Setup info treeview */
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
@@ -1253,6 +1256,42 @@ cb_gfpm_pkgs_tvw_selected (GtkTreeSelection *selection, gpointer data)
}

static void
+cb_gfpm_groups_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event)
+{
+	GtkWidget *menu;
+	GtkWidget *menu_item;
+	GtkWidget *image;
+	GtkTreeModel *model;
+	GtkTreeSelection *selection;
+	GtkTreeIter iter;
+	gchar *groupname = NULL;
+
+	if (event->button != 3)
+		return;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW(gfpm_groups_tvw));
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gfpm_groups_tvw));
+	if (FALSE == gtk_tree_selection_get_selected(selection, &model, &iter))
+		return;
+	gtk_tree_model_get (model, &iter, 0, &groupname, -1);
+	menu = gtk_menu_new ();
+	menu_item = gtk_image_menu_item_new_from_stock ("gtk-remove", NULL);
+	g_signal_connect (G_OBJECT(menu_item), "activate", G_CALLBACK(cb_gfpm_remove_group_clicked), (gpointer)groupname);
+	gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item);
+	gtk_widget_show (menu_item);
+	gtk_widget_show (menu);
+	gtk_menu_popup (GTK_MENU(menu),
+			NULL,
+			NULL,
+			NULL,
+			NULL,
+			3,
+			gtk_get_current_event_time());
+
+	return;
+}
+
+static void
cb_gfpm_pkgs_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event)
{
GtkWidget 		*menu;
@@ -1320,6 +1359,40 @@ cb_gfpm_mark_for_upgrade (GtkButton *button, gpointer data)
}

static void
+cb_gfpm_remove_group_clicked (GtkButton *button, gpointer data)
+{
+	PM_DB	*group = NULL;
+	PM_LIST *list = NULL;
+	PM_LIST *i = NULL;
+	const char	*group_name = (char*) data;
+
+	group = pacman_db_readgrp (sync_db, (char*)group_name);
+	list = pacman_grp_getinfo (group, PM_GRP_PKGNAMES);
+	if (list == NULL)
+	{
+		gfpm_error (_("Error"), _("There was an error while populating packages"));
+		return;
+	}
+	gfpm_package_list_free (GFPM_REMOVE_LIST);
+	for (i = list; i != NULL; i = pacman_list_next(i))
+	{
+		PM_PKG *lpkg = NULL;
+		lpkg = pacman_db_readpkg (local_db, pacman_list_getdata(i));
+		if (lpkg != NULL)
+			gfpm_package_list_add (GFPM_REMOVE_LIST, pacman_list_getdata(i));
+	}
+	if (!gfpm_package_list_is_empty(GFPM_REMOVE_LIST))
+	{
+		gfpm_error (_("Error"), _("There are no installed pacakges in this group"));
+		return;
+	}
+	if (gfpm_question(_("Remove Group"), _("Are you sure you want to remove the entire group ?")) == GTK_RESPONSE_YES)
+		cb_gfpm_apply_btn_clicked (NULL, NULL);
+
+	gfpm_package_list_free (GFPM_REMOVE_LIST);
+}
+
+static void
cb_gfpm_search_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data)
{
GtkListStore	*store;
From priyank at frugalware.org  Thu Oct 11 21:13:55 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct 11 21:13:57 2007
Subject: [Frugalware-git] gfpm: gfpm-interface
Message-ID: <20071011191355.44E3613A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=432cfe2e5cdff43c2bd1750049c8c2d107e95bdc

commit 432cfe2e5cdff43c2bd1750049c8c2d107e95bdc
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 12 00:42:02 2007 +0530

gfpm-interface
* Added gfpm_trans_commit() : A wrapper to pacman_trans_commit() that checks for errors if a transaction commit fails and accordingly displays it.
* cb_gfpm_apply_btn_clicked(): If gfpm_trans_commit() fails, reset and close the progress dialog.

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 6747b55..b214acd 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -90,7 +90,7 @@ static void cb_gfpm_clear_cache_apply_clicked (GtkButton *button, gpointer data)
static void cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer data);
static void cb_gfpm_mark_for_upgrade (GtkButton *button, gpointer data);
static gint gfpm_trans_prepare (PM_LIST *list);
-
+static gint gfpm_trans_commit (PM_LIST *list);

static void
gfpm_populate_repos_combobox (GtkComboBox *combo)
@@ -358,6 +358,7 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_
if (pkgs == NULL) g_print ("pkgs is null.. bad bad bad!\n");

/* commit transaction */
+		/*
if (pacman_trans_commit(&pdata) == -1)
{
char *str = g_strdup_printf ("Failed to commit transaction (%s)", pacman_strerror(pm_errno));
@@ -367,6 +368,8 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_
g_string_free (errorstr, FALSE);
return;
}
+		*/
+		gfpm_trans_commit (&pdata);

down:
/* release the transaction */
@@ -378,6 +381,7 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_
if (gfpm_package_list_is_empty(GFPM_INSTALL_LIST))
{
gint flags = 0;
+		gint ret = 0;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfpm_apply_inst_depcheck)))
flags |= PM_TRANS_FLAG_NODEPS;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfpm_apply_inst_dwocheck)))
@@ -415,6 +419,7 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
if (pkgs == NULL) gfpm_error (_("Error"), _("Error getting transaction info"));

/* commit transaction */
+		/*
if (pacman_trans_commit(&pdata) == -1)
{
char *str = g_strdup_printf ("Failed to commit transaction (%s)", pacman_strerror(pm_errno));
@@ -424,6 +429,8 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
g_string_free (errorstr, FALSE);
return;
}
+		*/
+		ret = gfpm_trans_commit (pdata);

cleanup:
/* release the transaction */
@@ -431,6 +438,8 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
/* clear list */
gfpm_package_list_free (GFPM_INSTALL_LIST);
gfpm_apply_dlg_reset ();
+		if (ret == -1)
+			gfpm_progress_show (FALSE);
}
gfpm_db_reset_localdb ();
//gfpm_progress_show (FALSE);
@@ -1071,6 +1080,51 @@ gfpm_trans_prepare (PM_LIST *list)
}
}

+
+static gint
+gfpm_trans_commit (PM_LIST *list)
+{
+	if (pacman_trans_commit(&list) == -1)
+	{
+		PM_LIST *i;
+		GList	*pkgs = NULL;
+		gchar	*str = NULL;
+		str = g_strdup_printf (_("Failed to commit transaction (%s)\n"), pacman_strerror (pm_errno));
+		gfpm_error (_("Error"), str);
+		g_free (str);
+
+		switch ((long)pm_errno)
+		{
+			case PM_ERR_FILE_CONFLICTS:
+			{
+				for (i=pacman_list_first(list);i;i=pacman_list_next(i))
+				{
+					PM_CONFLICT *cnf = pacman_list_getdata (i);
+					switch ((long)pacman_conflict_getinfo(cnf,PM_CONFLICT_TYPE))
+					{
+						case PM_CONFLICT_TYPE_FILE:
+						{
+							gchar* cstr = g_strdup_printf ("%s: /%s",
+															(char*)pacman_conflict_getinfo (cnf, PM_CONFLICT_TARGET),
+															(char*)pacman_conflict_getinfo (cnf, PM_CONFLICT_FILE));
+							pkgs = g_list_append (pkgs, cstr);
+						}
+					}
+				}
+				gfpm_plist_message (_("Conflicting Files"),
+									_("The file(s) provided by the following package(s) already exist on the system"),
+									GTK_MESSAGE_WARNING,
+									pkgs);
+			}
+		}
+		return -1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
/* CALLBACKS */

static void
From priyank at frugalware.org  Thu Oct 11 21:16:45 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct 11 21:16:48 2007
Subject: [Frugalware-git] gfpm: gfpm_messages
Message-ID: <20071011191645.C139513A4002@genesis.frugalware.org>

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

commit be70df35eda747377000ca33a8cea7be6d3378ac
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 12 00:45:09 2007 +0530

gfpm_messages
* gfpm_plist_message()
- set the scrolled window's policy type to GTK_SHADOW_IN to make it look better
- increased the size of the window a bit because messages displayed here could be too long sometimes.
- made the window resizable if the message is reaally loong.

diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c
index 97ad81d..426a706 100644
--- a/src/gfpm-messages.c
+++ b/src/gfpm-messages.c
@@ -418,6 +418,7 @@ gfpm_plist_message (const char *message_title, const char *main_msg, GtkMessageT
main_msg);
swindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL));
gtk_scrolled_window_set_policy (swindow, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (swindow, GTK_SHADOW_OUT);
tvw = gtk_tree_view_new ();
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tvw), FALSE);
gtk_container_add (GTK_CONTAINER(swindow), tvw);
@@ -432,11 +433,11 @@ gfpm_plist_message (const char *message_title, const char *main_msg, GtkMessageT
g_free (pkgstring);
}
gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store));
-	gtk_widget_set_size_request (tvw, 230, 80);
+	gtk_widget_set_size_request (tvw, 330, 120);
gtk_widget_show (tvw);
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_window_set_resizable (GTK_WINDOW(dialog), TRUE);
gtk_window_set_title (GTK_WINDOW(dialog), message_title);
gtk_dialog_run (GTK_DIALOG(dialog));
From priyank at frugalware.org  Thu Oct 11 21:21:30 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct 11 21:21:31 2007
Subject: [Frugalware-git] gfpm: gfpm_interface
Message-ID: <20071011192130.9C5FD13A4002@genesis.frugalware.org>

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

commit 6f0a2a54361eda81b4b2deb9b4e8618f87822602
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 12 00:49:51 2007 +0530

gfpm_interface
* cb_gfpm_apply_btn_clicked(): code cleanup

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index b214acd..9405eec 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -358,18 +358,7 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_
if (pkgs == NULL) g_print ("pkgs is null.. bad bad bad!\n");

/* commit transaction */
-		/*
-		if (pacman_trans_commit(&pdata) == -1)
-		{
-			char *str = g_strdup_printf ("Failed to commit transaction (%s)", pacman_strerror(pm_errno));
-			errorstr = g_string_append (errorstr, str);
-			gfpm_error (_("Error"), errorstr->str);
-			g_free (str);
-			g_string_free (errorstr, FALSE);
-			return;
-		}
-		*/
-		gfpm_trans_commit (&pdata);
+		ret = gfpm_trans_commit (&pdata);

down:
/* release the transaction */
@@ -377,6 +366,9 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_
/* clear list */
gfpm_package_list_free (GFPM_REMOVE_LIST);
gfpm_apply_dlg_reset ();
+		/* close the progress dialog if commit failed */
+		if (ret == -1)
+			gfpm_progress_show (FALSE);
}
if (gfpm_package_list_is_empty(GFPM_INSTALL_LIST))
{
@@ -419,17 +411,6 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
if (pkgs == NULL) gfpm_error (_("Error"), _("Error getting transaction info"));

/* commit transaction */
-		/*
-		if (pacman_trans_commit(&pdata) == -1)
-		{
-			char *str = g_strdup_printf ("Failed to commit transaction (%s)", pacman_strerror(pm_errno));
-			errorstr = g_string_append (errorstr, str);
-			gfpm_error (_("Error"), errorstr->str);
-			g_free (str);
-			g_string_free (errorstr, FALSE);
-			return;
-		}
-		*/
ret = gfpm_trans_commit (pdata);

cleanup:
@@ -438,6 +419,7 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
/* clear list */
gfpm_package_list_free (GFPM_INSTALL_LIST);
gfpm_apply_dlg_reset ();
+		/* hide the progress dialog if commit fails */
if (ret == -1)
gfpm_progress_show (FALSE);
}
@@ -453,7 +435,6 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
return;
}

-
void
gfpm_update_status (const gchar *message)
{
From priyank at frugalware.org  Thu Oct 11 21:25:40 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct 11 21:25:42 2007
Subject: [Frugalware-git] gfpm: gfpm_interface
Message-ID: <20071011192540.191D313A4002@genesis.frugalware.org>

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

commit dd28ced2cb0eb92cb46f5b2038d7158ddda9fd89
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 12 00:54:04 2007 +0530

gfpm_interface
* suppressed compiler warnings

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 9405eec..6472575 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -346,6 +346,7 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_

gfpm_progress_show (TRUE);
GList *i = NULL;
+		gint ret = 0;
PM_LIST *pdata, *pkgs;
for (i = (GList*)remove_list; i; i = i->next)
{
@@ -400,6 +401,7 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
gfpm_progress_show (TRUE);
GList *i = NULL;
PM_LIST *pdata, *pkgs;
+		pdata = NULL;
for (i = (GList*)install_list; i; i = i->next)
{
char *target = i->data;
@@ -1295,7 +1297,6 @@ cb_gfpm_groups_tvw_right_click (GtkTreeView *treeview, GdkEventButton *event)
{
GtkWidget *menu;
GtkWidget *menu_item;
-	GtkWidget *image;
GtkTreeModel *model;
GtkTreeSelection *selection;
GtkTreeIter iter;
@@ -1396,7 +1397,7 @@ cb_gfpm_mark_for_upgrade (GtkButton *button, gpointer data)
static void
cb_gfpm_remove_group_clicked (GtkButton *button, gpointer data)
{
-	PM_DB	*group = NULL;
+	PM_GRP	*group = NULL;
PM_LIST *list = NULL;
PM_LIST *i = NULL;
const char	*group_name = (char*) data;
From priyank at frugalware.org  Thu Oct 11 21:50:11 2007
From: priyank at frugalware.org (Priyank)
Date: Thu Oct 11 21:50:14 2007
Subject: [Frugalware-git] gfpm: gfpm_interface
Message-ID: <20071011195011.C1FA713A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=25614f35184b39aaa6cc83c43b42259ee4788228

commit 25614f35184b39aaa6cc83c43b42259ee4788228
Author: Priyank <priyank@frugalware.org>
Date:   Fri Oct 12 01:18:26 2007 +0530

gfpm_interface
* gfpm_trans_commit() : if commit fails due to corrupted files, display the list of corrupted files.

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 6472575..8fa79bc 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -1099,6 +1099,15 @@ gfpm_trans_commit (PM_LIST *list)
GTK_MESSAGE_WARNING,
pkgs);
}
+			case PM_ERR_PKG_CORRUPTED:
+			{
+				for (i=pacman_list_first(list);i;i=pacman_list_next(i))
+					pkgs = g_list_append (pkgs, g_strdup (pacman_list_getdata(i)));
+				gfpm_plist_message (_("Corrupted package(s)"),
+									_("The package(s) you're trying to install are corrupted"),
+									GTK_MESSAGE_ERROR,
+									pkgs);
+			}
}
return -1;
}
From crazy at frugalware.org  Fri Oct 12 01:15:26 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 01:15:29 2007
Subject: [Frugalware-git] p07: foo2zjs-2007_07_15-1-i686
Message-ID: <20071011231526.A088913A4002@genesis.frugalware.org>

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

commit cac4d1abe905ab2cc87cd09bc0df35ce64444ff9
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:09:41 2007 +0200

foo2zjs-2007_07_15-1-i686
* added a simply Fmkdir to build()
* so ppds get installed.
* thx 'mwc' for the fix :)
* bump after freeze while that package changes sha1sum every day

diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild
index 25ebeba..545f295 100644
--- a/source/apps-extra/foo2zjs/FrugalBuild
+++ b/source/apps-extra/foo2zjs/FrugalBuild
@@ -29,6 +29,7 @@ build() {
#./getweb 1000 || Fdie
## heh well get all
./getweb all || Fdie
+	Fmkdir /usr/share/cups/model
Fmakeinstall
Fexerel /etc/hotplug/usb/hplj1000
Fln /etc/hotplug/usb/hplj1000 /etc/hotplug/usb/hplj1005
From crazy at frugalware.org  Fri Oct 12 01:32:33 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 01:32:35 2007
Subject: [Frugalware-git] p07: libmtp-0.2.2-1-i686
Message-ID: <20071011233233.5E55513A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=35fb3580e88ab85b9f6871c63f05a57eb98765a3

commit 35fb3580e88ab85b9f6871c63f05a57eb98765a3
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:29:44 2007 +0200

libmtp-0.2.2-1-i686
* Version bump

diff --git a/source/lib-extra/libmtp/FrugalBuild b/source/lib-extra/libmtp/FrugalBuild
index 454c153..41ba29d 100644
--- a/source/lib-extra/libmtp/FrugalBuild
+++ b/source/lib-extra/libmtp/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=libmtp
-pkgver=0.2.1
+pkgver=0.2.2
pkgrel=1
pkgdesc="libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)."
depends=('libusb')
groups=('lib-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
-sha1sums=('395a24c815967af7a2b8e2034fc0e24f19bca268')
+sha1sums=('6337173e6a11269f97315085fc4a8d5d0e8b2e84')

# optimization OK
From crazy at frugalware.org  Fri Oct 12 01:37:18 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 01:37:23 2007
Subject: [Frugalware-git] p07: dbus-python-0.82.3-1-i686
Message-ID: <20071011233718.A584213A4002@genesis.frugalware.org>

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

commit e7e1af3aef9301b07915370055b9d93d9962ece1
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:34:34 2007 +0200

dbus-python-0.82.3-1-i686
* Version bump

diff --git a/source/apps/dbus-python/FrugalBuild b/source/apps/dbus-python/FrugalBuild
index 38aef71..bcb8690 100644
--- a/source/apps/dbus-python/FrugalBuild
+++ b/source/apps/dbus-python/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=dbus-python
-pkgver=0.82.2
+pkgver=0.82.3
pkgrel=1
pkgdesc="Python bindings for D-BUS"
url="http://www.freedesktop.org/wiki/Software_2fDBusBindings"
From crazy at frugalware.org  Fri Oct 12 01:57:22 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 01:57:24 2007
Subject: [Frugalware-git] p07: lipstik-2.2.3-1-i686
Message-ID: <20071011235722.1AECD13A4002@genesis.frugalware.org>

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

commit fb52e7310d020c9e96c7a97ae4c5ee0d6cf3887c
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:54:30 2007 +0200

lipstik-2.2.3-1-i686
repoman -t p07 -k push

diff --git a/source/kde-extra/lipstik/FrugalBuild b/source/kde-extra/lipstik/FrugalBuild
index 5cdc363..d011df0 100644
--- a/source/kde-extra/lipstik/FrugalBuild
+++ b/source/kde-extra/lipstik/FrugalBuild
@@ -3,14 +3,14 @@
# Contributor: Dániel Zámbó <rage@mtrr.hu>

pkgname=lipstik
-pkgver=2.2.2
+pkgver=2.2.3
pkgrel=1
pkgdesc="Lipstik theme for KDE"
-depends=('kdebase>=3.5.6')
+depends=('kdebase>=3.5.7')
groups=('kde-extra')
archs=('i686' 'x86_64')
_F_kde_id2="18223"
Finclude kde
-source=(http://www.kde-look.org/CONTENT/content-files/18223-$pkgname-$pkgver.tar.bz2)
-sha1sums=('6643230e4b5a646191c444b439a6658470a1812a')
+source=(http://www.kde-look.org/CONTENT/content-files/18223-$pkgname-$pkgver.tar.gz)
+sha1sums=('8ede346df983eabfd31057a7d60a74faa2d46081')
# optimization OK
From crazy at frugalware.org  Fri Oct 12 02:11:58 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 02:12:01 2007
Subject: [Frugalware-git] p07: tastymenu-1.0.1-1-i686
Message-ID: <20071012001158.9A63A13A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=5670f51b84b007ddcf9da7e3e71690b8ee6e3e28

commit 5670f51b84b007ddcf9da7e3e71690b8ee6e3e28
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:09:06 2007 +0200

tastymenu-1.0.1-1-i686
* Version bump

diff --git a/source/kde-extra/tastymenu/FrugalBuild b/source/kde-extra/tastymenu/FrugalBuild
index 358c67c..a63c7ea 100644
--- a/source/kde-extra/tastymenu/FrugalBuild
+++ b/source/kde-extra/tastymenu/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=tastymenu
-pkgver=1.0
+pkgver=1.0.1
pkgrel=1
pkgdesc="Tasty Menu is a KMenu replacement."
depends=('kdelibs>=3.5.7')
@@ -11,6 +11,6 @@ archs=('i686' 'x86_64')
_F_kde_id="41866"
Finclude kde
source=(http://www.notmart.org/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('7de7ed4bc39be7632c526e3bd3a0e729c254f1e9')
+sha1sums=('fa67025a4d229037f3d04188116fd4d294e4a983')

# optimization OK
From crazy at frugalware.org  Fri Oct 12 02:27:19 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 02:27:22 2007
Subject: [Frugalware-git] p07: yakuake-2.8-1-i686
Message-ID: <20071012002719.10B6413A4002@genesis.frugalware.org>

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

commit acee8665527bcda15358f09ed026b774bf5b7560
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:24:31 2007 +0200

yakuake-2.8-1-i686
* Version bump

diff --git a/source/kde-extra/yakuake/FrugalBuild b/source/kde-extra/yakuake/FrugalBuild
index e3138bc..0d6cd11 100644
--- a/source/kde-extra/yakuake/FrugalBuild
+++ b/source/kde-extra/yakuake/FrugalBuild
@@ -2,11 +2,10 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=yakuake
-pkgver=2.7.5
+pkgver=2.8
pkgrel=1
pkgdesc="Yakuake is a Quake-style terminal emulator based on KDE Konsole technology."
depends=('kdebase')
-source=("http://www.kde-apps.org/content/files/29153-$pkgname-$pkgver.tar.bz2")
license="GPL"
groups=('kde-extra')
archs=('i686' 'x86_64')
@@ -14,7 +13,9 @@ _F_kde_id="29153"
_F_kde_reconf=1
Finclude kde
url="http://extragear.kde.org/apps/yakuake/"
-source=("http://www.kde-apps.org/content/files/29153-$pkgname-$pkgver.tar.bz2")
-sha1sums=('6bcb732877cda8747e5c874175e7627e8d642953')
+source=(http://download2.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('4d9c0da7ba4fe20b05af9c97346805acd887c7a2')

# optimalization OK
+
+# optimization OK
From crazy at frugalware.org  Fri Oct 12 02:34:16 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 02:34:19 2007
Subject: [Frugalware-git] p07: unicap-0.2.17-1-i686
Message-ID: <20071012003416.A00611678009@genesis.frugalware.org>

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

commit ebf15bd89e55a4830a1fb59ae7b7ae742df2dc81
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:31:21 2007 +0200

unicap-0.2.17-1-i686
* Version bump

diff --git a/source/xlib-extra/unicap/FrugalBuild b/source/xlib-extra/unicap/FrugalBuild
index 889b88f..9099065 100644
--- a/source/xlib-extra/unicap/FrugalBuild
+++ b/source/xlib-extra/unicap/FrugalBuild
@@ -2,15 +2,16 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=unicap
-pkgver=0.2.13
+pkgver=0.2.17
pkgrel=1
pkgdesc="unicap provides a uniform API for all kinds of video capture devices."
depends=('libxv' 'gtk+2' 'freetype2>=2.3.3' 'libraw1394')
+makedepends=('perl-xml')
options=('scriptlet')
groups=('xlib-extra')
archs=('i686')
Finclude sourceforge
url="http://unicap-imaging.org/"
-sha1sums=('2f15aa36c80501017e11c2fadd63e120207aef91')
+sha1sums=('72c759bbf4d4ca8191f79366ea1903592ec442ef')

# optimization OK
From crazy at frugalware.org  Fri Oct 12 02:39:50 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 02:39:51 2007
Subject: [Frugalware-git] p07: geany-0.12-1-i686
Message-ID: <20071012003950.0735B1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=3a2dcc59e0f42830eb21c7553ff41230be99b153

commit 3a2dcc59e0f42830eb21c7553ff41230be99b153
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:36:37 2007 +0200

geany-0.12-1-i686
* Version bump

diff --git a/source/xapps-extra/geany/FrugalBuild b/source/xapps-extra/geany/FrugalBuild
index 78916cd..5e9e5a7 100644
--- a/source/xapps-extra/geany/FrugalBuild
+++ b/source/xapps-extra/geany/FrugalBuild
@@ -2,14 +2,15 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=geany
-pkgver=0.11
+pkgver=0.12
pkgrel=1
pkgdesc="Geany is a text editor using the GTK2 toolkit."
depends=('vte')
+makedepends=('perl-xml')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
+sha1sums=('5dcd16837e3bfeecbf91953992d2960cf4d80b84')

-sha1sums=('e3bb677adf43b284204f0cb11e3f31c37b464f20')
# optimization OK
From crazy at frugalware.org  Fri Oct 12 02:55:58 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 02:55:59 2007
Subject: [Frugalware-git] p07: perl-test-builder-tester-1.01-3-i686
Message-ID: <20071012005558.2CD551678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=5936fcf31908cd5056b1ecdbad71e47255397532

commit 5936fcf31908cd5056b1ecdbad71e47255397532
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:53:17 2007 +0200

perl-test-builder-tester-1.01-3-i686
* fixed conflicting files
* something to push for 0.7 tree after is out =)

diff --git a/source/devel-extra/perl-test-builder-tester/FrugalBuild b/source/devel-extra/perl-test-builder-tester/FrugalBuild
index dc6a705..fb60007 100644
--- a/source/devel-extra/perl-test-builder-tester/FrugalBuild
+++ b/source/devel-extra/perl-test-builder-tester/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=perl-test-builder-tester
pkgver=1.01
-pkgrel=2
+pkgrel=3
pkgdesc="test testsuites that have been built with Test::Builder"
url="http://cpan.org/"
depends=('perl')
@@ -19,6 +19,8 @@ build()
Fcd Test-Builder-Tester-$pkgver
Fbuild
Frm /usr/lib/perl5/current
+	# conficts with perl
+	Frm /usr/man
}

From crazy at frugalware.org  Fri Oct 12 03:20:30 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 03:20:31 2007
Subject: [Frugalware-git] p07: perl-test-number-delta-1.03-1-i686
Message-ID: <20071012012030.641A81678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=320d1b896fb48219fce7519d48ec583578e6407b

commit 320d1b896fb48219fce7519d48ec583578e6407b
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:17:49 2007 +0200

perl-test-number-delta-1.03-1-i686
* New package for perl-cairo

diff --git a/source/devel-extra/perl-test-number-delta/FrugalBuild b/source/devel-extra/perl-test-number-delta/FrugalBuild
new file mode 100644
index 0000000..dec5e31
--- /dev/null
+++ b/source/devel-extra/perl-test-number-delta/FrugalBuild
@@ -0,0 +1,11 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=Test-Number-Delta
+_F_perl_author=D/DA/DAGOLDEN
+pkgver=1.03
+pkgdesc="Compare the difference between numbers against a given tolerance"
+depends=('perl-test-builder-tester>=1.01-3')
+Finclude perl
+archs=('i686' 'x86_64')
+sha1sums=('f7693a1cb856a9ab441a1ea2c9f8c14fc0e561b6')
From crazy at frugalware.org  Fri Oct 12 03:25:45 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 03:25:47 2007
Subject: [Frugalware-git] p07: perl-cairo-1.042-1-i686
Message-ID: <20071012012545.025121678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=9606eacda6cec13c5c5fa0c7dd8bc9cae66e63b1

commit 9606eacda6cec13c5c5fa0c7dd8bc9cae66e63b1
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:23:00 2007 +0200

perl-cairo-1.042-1-i686
* Version bump

diff --git a/source/xlib-extra/perl-cairo/FrugalBuild b/source/xlib-extra/perl-cairo/FrugalBuild
index 6ef5a8c..0c9cf94 100644
--- a/source/xlib-extra/perl-cairo/FrugalBuild
+++ b/source/xlib-extra/perl-cairo/FrugalBuild
@@ -1,10 +1,10 @@
# Compiling Time: 0.05 SBU
# Maintainer: crazy <crazy@frugalware.org>

-pkgver=1.041
+pkgver=1.042
pkgdesc="Perl interface to the cairo library"
depends=('cairo>=1.2.4')
-makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'perl-test-number-delta')
options=('scriptlet' 'force')
_F_perl_name=Cairo
_F_perl_author=T/TS/TSCH
@@ -14,6 +14,6 @@ _F_sourceforge_name="Cairo"
Finclude sourceforge perl
archs=($archs 'x86_64')
groups=('xlib-extra')
-sha1sums=('906b55645db1d26f37a7e2e5763664ad3ebf850a')
+sha1sums=('5a9b9b1eaa1d2b8141f8e5a81c375f21cd66e780')

# optimization OK
From crazy at frugalware.org  Fri Oct 12 03:32:55 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 03:32:56 2007
Subject: [Frugalware-git] p07: faac-1.26-1-i686
Message-ID: <20071012013255.4E9DF1678009@genesis.frugalware.org>

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

commit a66bc53df80eb520a90880888c317d322d99eb5b
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:30:12 2007 +0200

faac-1.26-1-i686
* Version bump
* wow the devels fixed the broken files *I wonder*

diff --git a/source/multimedia/faac/FrugalBuild b/source/multimedia/faac/FrugalBuild
index 4f2ee96..1e88ee4 100644
--- a/source/multimedia/faac/FrugalBuild
+++ b/source/multimedia/faac/FrugalBuild
@@ -2,23 +2,21 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=faac
-pkgver=1.25
+pkgver=1.26
pkgrel=1
pkgdesc="FAAC is an AAC audio encoder."
depends=('libmp4v2')
-makedepends=('hd2u')
groups=('multimedia')
archs=('i686' 'x86_64')
_F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://www.audiocoding.com"
-sha1sums=('482a0217362c50ce523ce5e165c5566e1a4a2a87')
+sha1sums=('5aad6d5a60107a5d6bf79654970168f498961b21')


build()
{
Fcd $pkgname
-	dos2unix * || Fdie
chmod +x bootstrap || Fdie
./bootstrap || Fdie
Fbuild
From crazy at frugalware.org  Fri Oct 12 03:50:48 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 03:50:50 2007
Subject: [Frugalware-git] p07: faad2-2.6-1-i686
Message-ID: <20071012015048.96DDD1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=29cad2ab7f44f37d0c8aecdf95e21c6920f8f999

commit 29cad2ab7f44f37d0c8aecdf95e21c6920f8f999
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:47:59 2007 +0200

faad2-2.6-1-i686
* Version bump
* removed patch and all hacks , all fixed upsream O_O
* added sysfsutils to makedepends

diff --git a/source/multimedia/faad2/FrugalBuild b/source/multimedia/faad2/FrugalBuild
index 458a81b..bb2436c 100644
--- a/source/multimedia/faad2/FrugalBuild
+++ b/source/multimedia/faad2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=faad2
-pkgver=2.5
+pkgver=2.6
pkgrel=1
pkgdesc="ISO AAC audio decoder"
url="http://www.audiocoding.com/"
@@ -14,20 +14,13 @@ depends=('libstdc++')
rodepends=('libmp4v2')
groups=('multimedia')
archs=('i686' 'x86_64')
-makedepends=('libsndfile' 'id3lib' 'hd2u')
-source=($source first_add_the_dirs_to_the_source_till_then_kill_die.patch)
-sha1sums=('3805d32c9d0033572eced93482f81c1dd198cd2c' \
-          'd62e6f375a6ceb098951fc7d4af7866dd00a681a')
+makedepends=('libsndfile' 'id3lib' 'sysfsutils')
+sha1sums=('6af7fb40fc063effd5cb6c43e0b372e77408a01a')


build()
{
-	## SA-MI BAG ....
Fcd $pkgname
-	Fpatchall
-	dos2unix * || Fdie
-	## for all archs()
-	export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
Fautoreconf
Fmake --with-drm
Fmakeinstall
diff --git a/source/multimedia/faad2/first_add_the_dirs_to_the_source_till_then_kill_die.patch b/source/multimedia/faad2/first_add_the_dirs_to_the_source_till_then_kill_die.patch
deleted file mode 100644
index ac6134f..0000000
--- a/source/multimedia/faad2/first_add_the_dirs_to_the_source_till_then_kill_die.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur faad2/configure.in faad2-p/configure.in
---- faad2/configure.in	2006-08-13 16:13:31.000000000 +0200
-+++ faad2-p/configure.in	2006-11-18 03:00:56.000000000 +0100
-@@ -29,8 +29,6 @@
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)
-
--AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],
--	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
-
- AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],
- 	     WITHDRM=$withval, WITHDRM=no)
-@@ -114,11 +112,6 @@
-  AM_CONDITIONAL(HAVE_XMMS, false)
- fi
-
--if test x$WITHBMP = xyes; then
--  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
--  AM_CONDITIONAL([HAVE_XMMS], true)
--  AM_CONDITIONAL([HAVE_BMP], true)
--fi
-
- if test x$WITHDRM = xyes; then
-   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
-diff -Naur faad2/plugins/Makefile.am faad2-p/plugins/Makefile.am
---- faad2/plugins/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/Makefile.am	2006-11-18 03:00:56.000000000 +0100
-@@ -8,10 +8,6 @@
- if HAVE_XMMS
- SUBDIRS = xmms
- else
--if HAVE_BMP
--SUBDIRS = bmp
--else
- SUBDIRS =
--endif #HAVE_BMP
- endif #HAVE_XMMS
- endif #HAVE_MPEG4IP_PLUG
-diff -Naur faad2/plugins/xmms/src/Makefile.am faad2-p/plugins/xmms/src/Makefile.am
---- faad2/plugins/xmms/src/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/xmms/src/Makefile.am	2006-11-18 03:02:11.000000000 +0100
-@@ -1,12 +1,7 @@
--if HAVE_BMP
--libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
--local_CFLAGS=$(shell pkg-config --cflags bmp)
--local_LDFLAGS=$(shell pkg-config --libs bmp)
--else
-+
- local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
- local_LDFLAGS=`$(XMMS_CONFIG) --libs`
- libdir = `$(XMMS_CONFIG) --input-plugin-dir`
--endif #HAVE_BMP
- lib_LTLIBRARIES = libmp4.la
-
- libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
From crazy at frugalware.org  Fri Oct 12 16:24:14 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 16:24:17 2007
Subject: [Frugalware-git] p07: xmms-aac-2.6-1-i686
Message-ID: <20071012142414.475A71678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=058476aa0b9b8a7a73b0a11f7940cfa5816fd655

commit 058476aa0b9b8a7a73b0a11f7940cfa5816fd655
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 16:21:15 2007 +0200

xmms-aac-2.6-1-i686
* Version bump

diff --git a/source/xlib-extra/xmms-aac/FrugalBuild b/source/xlib-extra/xmms-aac/FrugalBuild
index 1be56f0..45fb08e 100644
--- a/source/xlib-extra/xmms-aac/FrugalBuild
+++ b/source/xlib-extra/xmms-aac/FrugalBuild
@@ -2,32 +2,26 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=xmms-aac
-pkgver=2.5
+pkgver=2.6
pkgrel=1
pkgdesc="ISO AAC audio decoder plugin for xmms"
_F_sourceforge_dirname="faac"
_F_sourceforge_name="faad2"
_F_sourceforge_broken_up2date=1
Finclude sourceforge
-depends=('libstdc++' 'xmms' 'faad2')
+depends=('libstdc++' 'xmms' 'faad2>=2.6')
groups=('xlib-extra')
archs=('i686' 'x86_64')
-makedepends=('libsndfile' 'id3lib' 'hd2u')
-source=(${source[@]} first_add_the_dirs_to_the_source_till_then_kill_die.patch)
-sha1sums=('3805d32c9d0033572eced93482f81c1dd198cd2c' \
-	  'd62e6f375a6ceb098951fc7d4af7866dd00a681a')
+makedepends=('libsndfile' 'id3lib' 'sysfsutils')
+sha1sums=('6af7fb40fc063effd5cb6c43e0b372e77408a01a')

-build() {
+build()
+{
Fcd faad2
-	Fpatchall
-	dos2unix * || Fdie
-	export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
Fautoreconf
Fmake --with-mp4v2 --with-xmms
Fmakeinstall
Frm usr/{bin,include} usr/lib/*.{la,0,so,a}
}

-# optimalization OK
-
# optimization OK
diff --git a/source/xlib-extra/xmms-aac/first_add_the_dirs_to_the_source_till_then_kill_die.patch b/source/xlib-extra/xmms-aac/first_add_the_dirs_to_the_source_till_then_kill_die.patch
deleted file mode 100644
index ac6134f..0000000
--- a/source/xlib-extra/xmms-aac/first_add_the_dirs_to_the_source_till_then_kill_die.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur faad2/configure.in faad2-p/configure.in
---- faad2/configure.in	2006-08-13 16:13:31.000000000 +0200
-+++ faad2-p/configure.in	2006-11-18 03:00:56.000000000 +0100
-@@ -29,8 +29,6 @@
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)
-
--AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],
--	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
-
- AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],
- 	     WITHDRM=$withval, WITHDRM=no)
-@@ -114,11 +112,6 @@
-  AM_CONDITIONAL(HAVE_XMMS, false)
- fi
-
--if test x$WITHBMP = xyes; then
--  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
--  AM_CONDITIONAL([HAVE_XMMS], true)
--  AM_CONDITIONAL([HAVE_BMP], true)
--fi
-
- if test x$WITHDRM = xyes; then
-   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
-diff -Naur faad2/plugins/Makefile.am faad2-p/plugins/Makefile.am
---- faad2/plugins/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/Makefile.am	2006-11-18 03:00:56.000000000 +0100
-@@ -8,10 +8,6 @@
- if HAVE_XMMS
- SUBDIRS = xmms
- else
--if HAVE_BMP
--SUBDIRS = bmp
--else
- SUBDIRS =
--endif #HAVE_BMP
- endif #HAVE_XMMS
- endif #HAVE_MPEG4IP_PLUG
-diff -Naur faad2/plugins/xmms/src/Makefile.am faad2-p/plugins/xmms/src/Makefile.am
---- faad2/plugins/xmms/src/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/xmms/src/Makefile.am	2006-11-18 03:02:11.000000000 +0100
-@@ -1,12 +1,7 @@
--if HAVE_BMP
--libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
--local_CFLAGS=$(shell pkg-config --cflags bmp)
--local_LDFLAGS=$(shell pkg-config --libs bmp)
--else
-+
- local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
- local_LDFLAGS=`$(XMMS_CONFIG) --libs`
- libdir = `$(XMMS_CONFIG) --input-plugin-dir`
--endif #HAVE_BMP
- lib_LTLIBRARIES = libmp4.la
-
- libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
From crazy at frugalware.org  Fri Oct 12 16:45:27 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 16:45:31 2007
Subject: [Frugalware-git] p07: xine-lib-1.1.8-2-i686
Message-ID: <20071012144527.DB6FD1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=01c59ab9ebd685eab04fc9db398d32380235bf15

commit 01c59ab9ebd685eab04fc9db398d32380235bf15
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 16:41:13 2007 +0200

xine-lib-1.1.8-2-i686
* rebuild
* added -fno-strict-aliasing to CFLAGS

diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild
index c567b79..2f0c334 100644
--- a/source/xlib/xine-lib/FrugalBuild
+++ b/source/xlib/xine-lib/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=xine-lib
pkgver=1.1.8
-pkgrel=1
+pkgrel=2
pkgdesc="Xine multimedia playback engine libraries"
_F_sourceforge_dirname="xine"
_F_sourceforge_ext=".tar.bz2"
@@ -12,7 +12,7 @@ _F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://xinehq.de"
depends=('imagemagick' 'aalib' 'libmng' 'libtheora' 'libvorbis' \
-	'faad2>=2.5' 'flac>=1.1.4' 'libxvmc' 'libxv' \
+	'faad2>=2.6' 'flac>=1.1.4' 'libxvmc' 'libxv' \
'speex' 'wavpack' 'libmpcdec' 'freetype2>=2.3.4' 'fontconfig' \
'mesa' 'libx11' 'libxxf86vm' 'ffmpeg')
options=('scriptlet')
@@ -22,7 +22,7 @@ archs=('i686' 'x86_64')
sha1sums=('48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf')
build()
{
-	export CFLAGS="$CFLAGS -UHAVE_MMX"
+	export CFLAGS="$CFLAGS -fno-strict-aliasing -UHAVE_MMX"
Fbuild \
--enable-ipv6 \
--with-arts \
From crazy at frugalware.org  Fri Oct 12 17:12:10 2007
From: crazy at frugalware.org (crazy)
Date: Fri Oct 12 17:12:14 2007
Subject: [Frugalware-git] p07: bmpx-0.40.11-1-i686
Message-ID: <20071012151210.E1D9B1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=93a10a91629bc6dc9eccd15d5623a2615dbf106b

commit 93a10a91629bc6dc9eccd15d5623a2615dbf106b
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 17:07:46 2007 +0200

bmpx-0.40.11-1-i686
* Version bump

diff --git a/source/xmultimedia-extra/bmpx/FrugalBuild b/source/xmultimedia-extra/bmpx/FrugalBuild
index d078a81..33550d8 100644
--- a/source/xmultimedia-extra/bmpx/FrugalBuild
+++ b/source/xmultimedia-extra/bmpx/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=bmpx
-pkgver=0.40.10
+pkgver=0.40.11
basever=0.40
-pkgrel=2
+pkgrel=1
pkgdesc="A media player that features support for specifications like XDS DnD, XSPF and DBus."
url="http://bmpx.beep-media-player.org"
depends=('libsidplay' 'gamin' 'alsa-lib' 'dbus>=1.0.0-2' 'dbus-glib' 'libglademm>=2.6.3-2' 'hal>=0.5.8.1' \
@@ -23,7 +23,7 @@ archs=('i686' 'x86_64')
up2date="lynx -dump 'http://bmpx.beep-media-player.org/site/BMPx_Homepage'|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2 \
01-fw_builduser.patch)
-sha1sums=('93516775311d76b4b34efc88bb512c7f9ec564b1' \
+sha1sums=('fc6f947ca59edcce6051e31710def54f8ee4b369' \
'a8aabe4db10959e488ffdc38881c88a7cd72855e')

subpkgs=("$pkgname-lastfm-firefox-plugin")
From priyank at frugalware.org  Fri Oct 12 22:03:17 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct 12 22:03:19 2007
Subject: [Frugalware-git] fw-control-center: updatenotifier
Message-ID: <20071012200317.2E07B1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=412ddb33ca38e4fd187b18fa3a90f09f106deea8

commit 412ddb33ca38e4fd187b18fa3a90f09f106deea8
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 01:31:32 2007 +0530

updatenotifier
* Initial import

diff --git a/updatenotifier/AUTHORS b/updatenotifier/AUTHORS
new file mode 100644
index 0000000..1fe29ca
--- /dev/null
+++ b/updatenotifier/AUTHORS
@@ -0,0 +1 @@
+Alex Smith <alex@alex-smith.me.uk>
diff --git a/updatenotifier/ChangeLog b/updatenotifier/ChangeLog
new file mode 100644
index 0000000..e69de29
diff --git a/updatenotifier/INSTALL b/updatenotifier/INSTALL
new file mode 100644
index 0000000..5458714
--- /dev/null
+++ b/updatenotifier/INSTALL
@@ -0,0 +1,234 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/updatenotifier/Makefile.am b/updatenotifier/Makefile.am
new file mode 100644
index 0000000..0b8e3df
--- /dev/null
+++ b/updatenotifier/Makefile.am
@@ -0,0 +1,10 @@
+SUBDIRS = src
+
+dbusdir = $(DBUS_SYS_DIR)
+dbus_DATA = updnotifierd.conf
+
+EXTRA_DIST = $(dbus_DATA)
+
+clean-local :
+	rm -f *~
+
diff --git a/updatenotifier/NEWS b/updatenotifier/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/updatenotifier/README b/updatenotifier/README
new file mode 100644
index 0000000..e69de29
diff --git a/updatenotifier/autoclean.sh b/updatenotifier/autoclean.sh
new file mode 100644
index 0000000..dfc8a6d
--- /dev/null
+++ b/updatenotifier/autoclean.sh
@@ -0,0 +1,24 @@
+#!/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/Makefile
+rm -rf src/Makefile.in
+rm -rf aclocal.m4
+rm -rf ltmain.sh
+rm -rf compile
+rm -rf libtool
+rm -rf mkinstalldirs
+rm -rf config.rpath
+rm -rf intltool-extract
+rm -rf intltool-merge
+rm -rf intltool-update
+rm -rf po/stamp-it
diff --git a/updatenotifier/autogen.sh b/updatenotifier/autogen.sh
new file mode 100644
index 0000000..502c2c0
--- /dev/null
+++ b/updatenotifier/autogen.sh
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+aclocal --force
+autoheader -f
+autoconf -f
+cp -f $(dirname $(which automake))/../share/automake/mkinstalldirs ./
+cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./
+automake -a -c --gnu --foreign
diff --git a/updatenotifier/configure.ac b/updatenotifier/configure.ac
new file mode 100644
index 0000000..d975267
--- /dev/null
+++ b/updatenotifier/configure.ac
@@ -0,0 +1,51 @@
+ENV_CFLAGS=$CFLAGS
+
+AC_PREREQ(2.59)
+AC_INIT([updnotifierd], 0.1, [frugalware-devel@frugalware.org], updnotifierd)
+AC_CONFIG_SRCDIR([src/updnotifierd.c])
+AC_LANG(C)
+AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE
+
+AC_PROG_CC
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h unistd.h pacman.h libfwutil.h])
+
+AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool, no)
+
+if test "x$DBUSBINDINGTOOL" = "xno"; then
+	AC_MSG_ERROR([dbus-binding-tool not found in your PATH. Please correct this])
+fi
+
+AC_SUBST(DBUS_BINDING_TOOL)
+
+PKG_CHECK_MODULES([UPDNOTIFIERD], [dbus-glib-1 >= 0.73])
+
+AC_ARG_WITH(dbus-sys, [  --with-dbus-sys=<dir>   where D-BUS system.d directory is])
+
+if ! test -z "$with_dbus_sys" ; then
+	DBUS_SYS_DIR="$with_dbus_sys"
+else
+	DBUS_SYS_DIR="$sysconfdir/dbus-1/system.d"
+fi
+
+AC_SUBST(DBUS_SYS_DIR)
+
+CFLAGS="${CFLAGS}"
+
+dnl ==========================================================================
+
+AC_OUTPUT([
+src/Makefile
+Makefile
+])
+
+echo "
+Updatenotifierd $VERSION configuration summary:
+
+        prefix                   : ${prefix}
+        source code location     : ${srcdir}
+        compiler                 : ${CC}
+        compiler flags           : ${CFLAGS}
+"
diff --git a/updatenotifier/src/Makefile.am b/updatenotifier/src/Makefile.am
new file mode 100644
index 0000000..7355636
--- /dev/null
+++ b/updatenotifier/src/Makefile.am
@@ -0,0 +1,19 @@
+INCLUDES = @UPDNOTIFIERD_CFLAGS@ \
+	-DPREFIX=\"$(prefix)\" \
+	-fPIC
+
+sbin_PROGRAMS = updnotifierd
+
+updnotifierd_SOURCES = updnotifierd.c
+
+updnotifierd_LDADD= @UPDNOTIFIERD_LIBS@ -lpacman -lfwutil
+
+BUILT_SOURCES = updnotifierd-dbus-glue.h
+
+updnotifierd-dbus-glue.h: updnotifierd.xml
+	@DBUSBINDINGTOOL@ --mode=glib-server --prefix=updnotifierd \
+		$(srcdir)/updnotifierd.xml > updnotifierd-dbus-glue.h
+
+EXTRA_DIST = updnotifierd.xml
+DISTCLEANFILES = \
+	updnotifierd-dbus-glue.h
diff --git a/updatenotifier/src/netconfig-command b/updatenotifier/src/netconfig-command
new file mode 100644
index 0000000..f4a56b8
--- /dev/null
+++ b/updatenotifier/src/netconfig-command
@@ -0,0 +1,60 @@
+#!/usr/bin/python
+
+import os, sys, dbus
+
+if os.getuid() != 0:
+	print "Must be run as root!"
+	sys.exit(1)
+
+bus = dbus.SystemBus()
+object = bus.get_object('org.frugalware.UpdNotifier', '/org/frugalware/UpdNotifier')
+
+if len(sys.argv) < 2:
+	print "Must specify an action: start, stop, changeprofile"
+	sys.exit(1)
+
+def doStop():
+	print "Stopping networking... " ,
+	ret = object.StopNetworking()
+	if ret > 0:
+		print "failed!"
+	else:
+		print "done."
+
+def doStart():
+	print "Starting networking... " ,
+	ret = object.StartNetworking()
+	if ret > 0:
+		print "failed!"
+	else:
+		print "done."
+
+def doChangeProfile(profile):
+	print "Changing profile... " ,
+	ret = object.ChangeProfile(profile)
+	if ret > 0:
+		print "failed!"
+	else:
+		print "done."
+
+def doUpdateCheck():
+	print "checking for updates..." ,
+	ret = object.CheckUpdate()
+	if ret == 0:
+		print "success"
+	else:
+		print "failed"
+
+if sys.argv[1] == "stop":
+	doStop()
+elif sys.argv[1] == "start":
+	doUpdateCheck()
+elif sys.argv[1] == "changeprofile":
+	if len(sys.argv) != 3:
+		doChangeProfile(sys.argv[2])
+	else:
+		print "Missing profile name!"
+		sys.exit(1)
+else:
+	print "Invalid action. Valid actions are: start, stop, changeprofile"
+	sys.exit(1)
diff --git a/updatenotifier/src/updnotifierd.c b/updatenotifier/src/updnotifierd.c
new file mode 100644
index 0000000..26c7d9f
--- /dev/null
+++ b/updatenotifier/src/updnotifierd.c
@@ -0,0 +1,269 @@
+/***************************************************************************
+ *  netconfigd.c
+ *  Author(s):  Alex Smith <alex@alex-smith.me.uk>
+ *  Copyright (C) 2007 Frugalware Developer Team
+ ****************************************************************************/
+
+/*
+ *  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 <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <dbus/dbus-glib-bindings.h>
+#include <libfwutil.h>
+#include <dirent.h>
+#include <config.h>
+#include <syslog.h>
+#include <pacman.h>
+#include "updnotifierd.h"
+#include "updnotifierd-dbus-glue.h"
+
+typedef void* netbuf;
+static PM_DB *sync_db = NULL;
+
+G_DEFINE_TYPE(UpdNotifier, updnotifierd, G_TYPE_OBJECT);
+
+void updnotifierd_class_init(UpdNotifierClass *class) {
+	// Nothing here
+}
+
+void updnotifierd_init(UpdNotifier *server) {
+	GError *error = NULL;
+	DBusGProxy *driver_proxy;
+	int request_ret;
+
+	// Init the DBus connection
+	server->connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+	if (server->connection == NULL) {
+		g_warning("Unable to connect to dbus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	dbus_g_object_type_install_info(updnotifierd_get_type(), &dbus_glib_updnotifierd_object_info);
+
+	// Register DBUS path
+	dbus_g_connection_register_g_object(server->connection, "/org/frugalware/UpdNotifier", G_OBJECT(server));
+
+	// Register the service name, the constant here are defined in dbus-glib-bindings.h
+	driver_proxy = dbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+
+	if (!org_freedesktop_DBus_request_name (driver_proxy, "org.frugalware.UpdNotifier", 0, &request_ret, &error)) {
+		g_warning("Unable to register service: %s", error->message);
+		g_error_free(error);
+	}
+
+	g_object_unref(driver_proxy);
+}
+
+// Copied from netconfig.
+int handle_network_stop() {
+	return(1);
+}
+
+int handle_network_start() {
+	return 0;
+}
+
+static void
+_db_callback (char *section, PM_DB *db) {
+	g_print ("section: %s\n", section);
+	return;
+}
+
+static void
+_evt_progress (netbuf *ctl, int xferred, void *arg) {
+	g_print ("im here\n");
+}
+
+static void
+_evt_evt (unsigned char event, char *pkgname, int percent, int howmany, int remain) {
+	return;
+}
+
+static void
+_log_cb (unsigned short level, char *msg) {
+	g_print ("%s\n", msg);
+
+	return;
+}
+
+static gboolean
+_updatenotifierd_init_pacman () {
+	/* initialize the pacman-g2 library */
+	if (pacman_initialize ("/") == -1)
+		return FALSE;
+
+	/* parse the pacman-g2 config */
+	pacman_parse_config ("/etc/pacman.conf", _db_callback, "");
+	pacman_set_option (PM_OPT_LOGMASK, (long)-1);
+	pacman_set_option (PM_OPT_LOGCB, (long)_log_cb);
+
+	/* register the main repo */
+	/* FIXME: Later add support for custom repos */
+	sync_db = pacman_db_register ("frugalware-current");
+
+	if (sync_db == NULL)
+		return FALSE;
+
+	return TRUE;
+}
+
+static gint
+_updnotifierd_update_db () {
+	int ret = 0;
+
+	/* update the pacman database */
+	ret = pacman_db_update (0, sync_db);
+
+	/* something went wrong */
+	if (ret == -1) {
+		printf ("%s\n", pacman_strerror(pm_errno));
+		return ret;
+	}
+	else if (ret == 0) {
+		printf ("Database updated\n");
+	}
+	else {
+		printf ("Database is up to date\n");
+	}
+
+	return ret;
+}
+
+gboolean updnotifier_update_database (UpdNotifier *obj, gint32 *ret, GError **error) {
+	PM_LIST *packages = NULL;
+
+	if (_updnotifierd_update_db() == 0) {
+		*ret = 0;
+	}
+
+	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, _evt_evt, NULL, _evt_progress) == -1) {
+		gchar *errorstr = g_strdup_printf ("Failed to init transaction (%s)\n", pacman_strerror(pm_errno));
+		g_print (errorstr);
+		g_free (errorstr);
+	}
+	else {
+		if (pacman_trans_sysupgrade() == -1) {
+			g_print (pacman_strerror(pm_errno));
+		}
+		else {
+			packages = pacman_trans_getinfo (PM_TRANS_PACKAGES);
+			if (packages == NULL) {
+				g_print ("No new updates are available\n");
+				g_print (pacman_strerror(pm_errno));
+			}
+			else {
+				PM_LIST *i = NULL;
+
+				for (i=packages;i!=NULL;i=pacman_list_next(i)) {
+					g_print ("%s\n", pacman_list_getdata(i));
+				}
+			}
+			pacman_trans_release ();
+		}
+	}
+
+	return TRUE;
+}
+
+gboolean netconfig_get_current_profile(UpdNotifier *obj, gchar **profile, GError **error) {
+	return TRUE;
+}
+
+gboolean netconfig_change_profile(UpdNotifier *obj, gchar *profile, gint32 *ret, GError **error) {
+	return TRUE;
+}
+
+gboolean netconfig_stop_networking(UpdNotifier *obj, gint32 *ret, GError **error) {
+	return TRUE;
+}
+
+gboolean netconfig_start_networking(UpdNotifier *obj, gint32 *ret, GError **error) {
+	return TRUE;
+}
+
+gboolean netconfig_get_profiles(UpdNotifier *obj, gchar **profiles, GError **error) {
+	return TRUE;
+}
+
+void usage() {
+	printf("Netconfigd v" VERSION "\n");
+	printf(" --help        Display this help text\n");
+	printf(" --daemon      Fork into the background\n");
+}
+
+int main (int argc, char *argv[]) {
+	GMainLoop *main_loop;
+	UpdNotifier *server;
+	int i = 1;
+	int daemonize = 0;
+
+	// Parse command line options
+	for (i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "--daemon"))
+			daemonize = 1;
+		else if (!strcmp(argv[i], "--help")) {
+			usage();
+			return 0;
+		} else {
+			usage();
+			return 1;
+		}
+	}
+
+	if (getuid() != 0) {
+		printf("Must run as root!\n");
+		exit(1);
+	}
+
+	// Daemonize if wanted
+	if (daemonize) {
+		switch (fork()) {
+			case 0:
+				break;
+			case -1:
+				printf("Can't fork: %s\n", strerror(errno));
+				exit(1);
+				break;
+			default:
+				exit(0);
+		}
+
+		fclose(stdin);
+		fclose(stdout);
+		fclose(stderr);
+	}
+
+	// Connect to syslog
+	openlog("netconfigd", LOG_PID, LOG_DAEMON);
+
+	syslog(LOG_INFO, "Netconfigd v" VERSION " started...");
+
+	g_type_init();
+
+	server = g_object_new(updnotifierd_get_type(), NULL);
+
+	_updatenotifierd_init_pacman ();
+	main_loop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(main_loop);
+
+	return 0;
+}
+
diff --git a/updatenotifier/src/updnotifierd.h b/updatenotifier/src/updnotifierd.h
new file mode 100644
index 0000000..3d4c4e9
--- /dev/null
+++ b/updatenotifier/src/updnotifierd.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *  netconfigd.h
+ *  Author(s):  Alex Smith <alex@alex-smith.me.uk>
+ *  Copyright (C) 2007 Frugalware Developer Team
+ ****************************************************************************/
+
+/*
+ *  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.
+ */
+
+#ifndef _UPDNOTIFIERD_H
+#define _UPDNOTIFIERD_H
+
+typedef struct
+{
+	GObject parent;
+	DBusGConnection *connection;
+} UpdNotifier;
+
+typedef struct
+{
+	GObjectClass parent_class;
+} UpdNotifierClass;
+
+static void updnotifierd_init(UpdNotifier *server);
+static void updnotifierd_class_init(UpdNotifierClass *class);
+
+gboolean netconfig_get_current_profile(UpdNotifier *obj, gchar **profile, GError **error);
+gboolean netconfig_change_profile(UpdNotifier *obj, gchar *profile, gint32 *ret, GError **error);
+gboolean netconfig_stop_networking(UpdNotifier *obj, gint32 *ret, GError **error);
+gboolean netconfig_start_networking(UpdNotifier *obj, gint32 *ret, GError **error);
+gboolean netconfig_get_profiles(UpdNotifier *obj, gchar **profiles, GError **error);
+gboolean updnotifier_update_database(UpdNotifier *obj, gint32 *ret, GError **error);
+
+#endif
diff --git a/updatenotifier/src/updnotifierd.xml b/updatenotifier/src/updnotifierd.xml
new file mode 100644
index 0000000..bc5db75
--- /dev/null
+++ b/updatenotifier/src/updnotifierd.xml
@@ -0,0 +1,30 @@
+<node name="/org/frugalware/UpdNotifier">
+	<interface name="org.frugalware.UpdNotifier">
+		<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="updnotifier"/>
+		<method name="GetCurrentProfile">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="netconfig_get_current_profile"/>
+			<arg type="s" name="profile" direction="out" />
+		</method>
+		<method name="ChangeProfile">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="netconfig_change_profile"/>
+			<arg type="s" name="profile" direction="in" />
+			<arg type="u" direction="out" />
+		</method>
+		<method name="StopNetworking">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="netconfig_stop_networking"/>
+			<arg type="u" direction="out" />
+		</method>
+		<method name="StartNetworking">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="netconfig_start_networking"/>
+			<arg type="u" direction="out" />
+		</method>
+		<method name="GetProfiles">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="netconfig_get_profiles"/>
+			<arg type="s" name="profiles" direction="out" />
+		</method>
+		<method name="CheckUpdate">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="updnotifier_update_database"/>
+			<arg type="s" name="profiles" direction="out" />
+		</method>
+	</interface>
+</node>
diff --git a/updatenotifier/updnotifierd.conf b/updatenotifier/updnotifierd.conf
new file mode 100644
index 0000000..1557583
--- /dev/null
+++ b/updatenotifier/updnotifierd.conf
@@ -0,0 +1,20 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+	<policy user="root">
+		<allow own="org.frugalware.UpdNotifier"/>
+		<allow send_destination="org.frugalware.UpdNotifier"/>
+		<allow send_interface="org.frugalware.UpdNotifier"/>
+	</policy>
+	<policy group="users">
+		<deny own="org.frugalware.UpdNotifier"/>
+		<allow send_destination="org.frugalware.UpdNotifier"/>
+		<allow send_interface="org.frugalware.UpdNotifier"/>
+	</policy>
+	<policy context="default">
+		<deny own="org.frugalware.UpdNotifier"/>
+		<deny send_destination="org.frugalware.UpdNotifier"/>
+		<deny send_interface="org.frugalware.UpdNotifier"/>
+	</policy>
+</busconfig>
From priyank at frugalware.org  Fri Oct 12 22:06:41 2007
From: priyank at frugalware.org (Priyank)
Date: Fri Oct 12 22:06:43 2007
Subject: [Frugalware-git] pacman-g2: libpacman/server.c
Message-ID: <20071012200641.414141678009@genesis.frugalware.org>

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

commit f062d2ad0cb750f2a18dc24ef1d8e4f94393e13b
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 01:34:14 2007 +0530

libpacman/server.c
* Added a couple of sanity checks to prevent a segfault when DLOFFSET isn't set

diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index 627f4c7..bcbfef5 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -434,7 +434,9 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath,
}

if(!stat(output, &st)) {
-						*pm_dloffset = (int)st.st_size;
+						if (pm_dloffset) {
+								*pm_dloffset = (int)st.st_size;
+						}
}
if(!handle->proxyhost) {
snprintf(src, PATH_MAX, "%s%s", server->path, fn);
@@ -464,7 +466,7 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const char *localpath,

}
fmtime2.tm_year = 0;
-					if(!HttpGet(server->server, output, src, &fsz, control, *pm_dloffset,
+					if(!HttpGet(server->server, output, src, &fsz, control, (pm_dloffset ? *pm_dloffset:0),
(mtime1) ? &fmtime1 : NULL, (mtime2) ? &fmtime2 : NULL)) {
if(strstr(FtpLastResponse(control), "304")) {
_pacman_log(PM_LOG_DEBUG, _("mtimes are identical, skipping %s\n"), fn);
From vmiklos at frugalware.org  Fri Oct 12 22:37:44 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Fri Oct 12 22:37:46 2007
Subject: [Frugalware-git] fw-control-center: fix _evt_progress() and
	_evt_evt() declaration
Message-ID: <20071012203744.45AE41678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=62ec113346b2f565355d632ad2570f544c79f37d

commit 62ec113346b2f565355d632ad2570f544c79f37d
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 13 00:35:52 2007 +0200

fix _evt_progress() and _evt_evt() declaration

diff --git a/updatenotifier/src/updnotifierd.c b/updatenotifier/src/updnotifierd.c
index 26c7d9f..de6cf3d 100644
--- a/updatenotifier/src/updnotifierd.c
+++ b/updatenotifier/src/updnotifierd.c
@@ -88,12 +88,12 @@ _db_callback (char *section, PM_DB *db) {
}

static void
-_evt_progress (netbuf *ctl, int xferred, void *arg) {
+_evt_progress (unsigned char event, char *pkgname, int percent, int howmany, int remain) {
g_print ("im here\n");
}

static void
-_evt_evt (unsigned char event, char *pkgname, int percent, int howmany, int remain) {
+_evt_evt (unsigned char event, void* data1, void *data2) {
return;
}
From crazy at frugalware.org  Sat Oct 13 00:50:01 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 00:50:03 2007
Subject: [Frugalware-git] p07: perl-mime-tools-5.423-1-i686
Message-ID: <20071012225001.DFD181678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=95a92078ad232f59a54624589391e1be617b9d8f

commit 95a92078ad232f59a54624589391e1be617b9d8f
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 00:46:55 2007 +0200

perl-mime-tools-5.423-1-i686
* Version bump

diff --git a/source/devel-extra/perl-mime-tools/FrugalBuild b/source/devel-extra/perl-mime-tools/FrugalBuild
index 3c9d183..d5d6268 100644
--- a/source/devel-extra/perl-mime-tools/FrugalBuild
+++ b/source/devel-extra/perl-mime-tools/FrugalBuild
@@ -2,11 +2,10 @@
# Maintainer: crazy <crazy@frugalware.org>

_F_perl_name=MIME-tools
-_F_perl_author=D/DS/DSKOLL
-pkgver=5.420
-pkgrel=1
+_F_perl_author=D/DO/DONEILL
+pkgver=5.423
pkgdesc="Perl modules for parsing (and creating!) MIME entities"
depends=('perl-io-stringy' 'perl-mailtools')
Finclude perl
archs=('i686' 'x86_64')
-sha1sums=('cabeda2fb536c1ab426e3c20435318f5b2257c6c')
+sha1sums=('047507820fac12f124f3730577b35117d21d5c80')
From crazy at frugalware.org  Sat Oct 13 00:55:26 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 00:55:31 2007
Subject: [Frugalware-git] p07: pxlib-0.6.3-1-i686
Message-ID: <20071012225526.ED1B01678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=23e632abdf6de68d3d89821affbe2b7daa4ea910

commit 23e632abdf6de68d3d89821affbe2b7daa4ea910
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 00:52:22 2007 +0200

pxlib-0.6.3-1-i686
* Version bump
* fixed depends
* kill off custom up2date

diff --git a/source/lib-extra/pxlib/FrugalBuild b/source/lib-extra/pxlib/FrugalBuild
index 18db5a1..4195719 100644
--- a/source/lib-extra/pxlib/FrugalBuild
+++ b/source/lib-extra/pxlib/FrugalBuild
@@ -2,15 +2,15 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=pxlib
-pkgver=0.6.2
+pkgver=0.6.3
pkgrel=1
pkgdesc="A simply, small C library to read and write Paradox DB files."
-url="http://pxlib.sourceforge.net/"
-depends=('glibc' 'perl-xml')
+depends=('glibc')
+makedepends=('perl-xml')
groups=('lib-extra')
archs=('i686' 'x86_64')
+_F_sourceforge_broken_up2date=1
Finclude sourceforge
-up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=79398'|grep '.tar.gz'|grep -m1 'pxlib'|sed 's/.*b-\(.*\).tar.gz .*/\1/'"
-sha1sums=('2940328777738b332c9733bffa5733fdef692be2')
+sha1sums=('3a4f192a98aa294721ab603da41f58358593a4b1')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 01:05:47 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 01:05:50 2007
Subject: [Frugalware-git] p07: xapian-core-1.0.3-1-i686
Message-ID: <20071012230547.59DD71678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=63be18a7b81d2498e3e9ff48f9952f364796d84f

commit 63be18a7b81d2498e3e9ff48f9952f364796d84f
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:01:28 2007 +0200

xapian-core-1.0.3-1-i686
* Version bump

diff --git a/source/lib-extra/xapian-core/FrugalBuild b/source/lib-extra/xapian-core/FrugalBuild
index b052f7a..7bbd749 100644
--- a/source/lib-extra/xapian-core/FrugalBuild
+++ b/source/lib-extra/xapian-core/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=xapian-core
-pkgver=1.0.2
+pkgver=1.0.3
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=('2be47ea020604270ccde8218a5de5647c9fe49ab')
+sha1sums=('4df3edb104ebab10c4f8ee7694971a894e8d18b4')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 01:18:45 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 01:18:49 2007
Subject: [Frugalware-git] p07: pinot-0.76-2-i686
Message-ID: <20071012231845.BD24C1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=2104ba7f844c0377e9f79db5dc852ae173997158

commit 2104ba7f844c0377e9f79db5dc852ae173997158
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:15:09 2007 +0200

pinot-0.76-2-i686
* rebuild with xapian-core

diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild
index dd78027..d0f861e 100644
--- a/source/xapps-extra/pinot/FrugalBuild
+++ b/source/xapps-extra/pinot/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=pinot
pkgver=0.76
-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.2' 'gmime' 'atk' 'gtkmm' 'boost>=1.34.0-4' \
+depends=('openssl' 'curl' 'cairomm' 'dbus-glib' 'xapian-core>=1.0.3' '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 Oct 13 01:25:52 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 01:25:57 2007
Subject: [Frugalware-git] p07: recoll-1.8.1-5-i686
Message-ID: <20071012232552.2716A1678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=p07.git;a=commitdiff;h=71a56f939d26def118ec6d1c4a9b841e6b8ea59a

commit 71a56f939d26def118ec6d1c4a9b841e6b8ea59a
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:22:20 2007 +0200

recoll-1.8.1-5-i686
* rebuild with xapian-core

diff --git a/source/xapps-extra/recoll/FrugalBuild b/source/xapps-extra/recoll/FrugalBuild
index 42e8f1f..78be589 100644
--- a/source/xapps-extra/recoll/FrugalBuild
+++ b/source/xapps-extra/recoll/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=recoll
pkgver=1.8.1
-pkgrel=4
+pkgrel=5
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.2' 'gamin' 'aspell')
+depends=('qt' 'xapian-core>=1.0.3' '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 crazy at frugalware.org  Sat Oct 13 01:57:11 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 01:57:15 2007
Subject: [Frugalware-git] p07: ode-0.9-1-i686
Message-ID: <20071012235711.B7CF61678009@genesis.frugalware.org>

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

commit e0809575cc1cada3e8ee6e07d5dde5988d758535
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:53:56 2007 +0200

ode-0.9-1-i686
* Version bump
* fixed up some stuff
* disabled demos while these need X and are not even
* installed =))

diff --git a/source/lib-extra/ode/FrugalBuild b/source/lib-extra/ode/FrugalBuild
index 11d7fec..6fd5d67 100644
--- a/source/lib-extra/ode/FrugalBuild
+++ b/source/lib-extra/ode/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=ode
-pkgver=0.8
+pkgver=0.9
pkgrel=1
pkgdesc="ODE is an open source, high performance library for simulating rigid body dynamics."
_F_sourceforge_dirname="opende"
@@ -14,10 +14,13 @@ depends=('libstdc++')
makedepends=('unzip')
groups=('lib-extra')
archs=('i686' 'x86_64')
-Fconfopts="$Fconfopts --enable-release=no --enable-tests=no"
+Fconfopts="$Fconfopts --enable-release=yes --enable-tests=no --enable-demos=no"

build()
{
+	if [ "$CARCH" == "i686" ]; then
+		Fconfopts="$Fconfopts --with-arch=i686"
+	fi
Fcd
Fpatchall
./autogen.sh || Fdie
@@ -26,5 +29,5 @@ build()
}


-sha1sums=('8e8a956ecebfc9e1f5f76b4e0083147581d85abe')
+sha1sums=('3b39ce085c2dc77c3fad7abaa382ffc20d3780e5')
# optimization OK
From vmiklos at frugalware.org  Sat Oct 13 02:51:09 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct 13 02:51:11 2007
Subject: [Frugalware-git] frugalware-0.7: docs/upgrade: minor fixes
Message-ID: <20071013005109.D8961167800A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=434d7b4a6a429409e8bce3478bdd38fc2f55a9ee

commit 434d7b4a6a429409e8bce3478bdd38fc2f55a9ee
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 13 02:51:01 2007 +0200

docs/upgrade: minor fixes
thanks goes to crazy for some of them

diff --git a/docs/upgrade.txt b/docs/upgrade.txt
index cfa04b6..5931392 100644
--- a/docs/upgrade.txt
+++ b/docs/upgrade.txt
@@ -17,6 +17,11 @@ provided by the `pacman-g2` package, so the first step is to install it:
NOTE: Don't worry, this will upgrade glibc and the timezone database, too. This
is expected.

+== The first reboot
+
+You have now a newer glibc installed which is not binary compatible with the
+previous one. You need to reboot to continue the upgrade.
+
== Removing obsolete packages

Some software has been removed from Sayshell, after the upgrade you can install
@@ -55,7 +60,7 @@ ENTER):
:: Replace x-cursors-industrial with frugalware/x-cursors-dmz? [Y/n]
----

-After this the list of to-be-upgraded packages is displayed. Just hit anter and
+After this the list of to-be-upgraded packages is displayed. Just hit enter and
wait. Make some tea, it can take a while :-)

== Install replacement softwares
@@ -89,8 +94,8 @@ bugreport] for more details. So after upgrading, you need to:
* Edit `/boot/grub/menu.lst`: change all occurrences of `/dev/hd` to `/dev/sd`
in the Frugalware entry.

-== Rebooting
+== The second reboot

-Since the kernel is upgraded, too, you have to reboot your machine now.
+Since the kernel is upgraded, too, you have to reboot your machine again.

Done!
From vmiklos at frugalware.org  Sat Oct 13 02:51:09 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct 13 02:51:15 2007
Subject: [Frugalware-git] frugalware-0.7: docs/upgrade: added an upgrade
	howto
Message-ID: <20071013005109.BED991678009@genesis.frugalware.org>

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

commit fc167a4d59179fb1fec6fca92714a24116e9f224
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 13 01:37:02 2007 +0200

docs/upgrade: added an upgrade howto

diff --git a/docs/index-user.txt b/docs/index-user.txt
index 6ad1c02..a28c312 100644
--- a/docs/index-user.txt
+++ b/docs/index-user.txt
@@ -18,6 +18,8 @@ Documentations:

* link:quickref.html[Quick reference]

+* link:upgrade.html[Upgrading from Frugalware 0.5]
+
* link:install.html[Installation]

* link:postinst.html[Post-install configuration]
diff --git a/docs/index.txt b/docs/index.txt
index 6be992a..6fc9600 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -17,6 +17,8 @@ Documentation for users:

* link:quickref.html[Quick reference]

+* link:upgrade.html[Upgrading from Frugalware 0.5]
+
* link:install.html[Installation]

* link:postinst.html[Post-install configuration]
diff --git a/docs/upgrade.txt b/docs/upgrade.txt
new file mode 100644
index 0000000..cfa04b6
--- /dev/null
+++ b/docs/upgrade.txt
@@ -0,0 +1,96 @@
+= Upgrading from Frugalware 0.6 to 0.7
+
+== Preamble
+
+The aim of this howto is to show how you can upgrade a Frugalware-0.6
+(Terminus) system to Frugalware-0.7 (Sayshell).
+
+== libpacman
+
+Terminus comes with a new package magement library, called libpacman. It is
+provided by the `pacman-g2` package, so the first step is to install it:
+
+-------------------------------------------------------------------------------
+# pacman-g2 -Sy pacman-g2
+-------------------------------------------------------------------------------
+
+NOTE: Don't worry, this will upgrade glibc and the timezone database, too. This
+is expected.
+
+== Removing obsolete packages
+
+Some software has been removed from Sayshell, after the upgrade you can install
+their alternates. To remove them:
+
+----
+# pacman-g2 -Rd gst-plugins-bad-swfdec gst-plugins-bad-wavpack libgc
+----
+
+NOTE: Of course if you don't have these packages (which is not the default) you
+can skip this step.
+
+== Upgrading the system
+
+Now it's time to upgrade the system itself:
+
+-------------------------------------------------------------------------------
+# pacman-g2 -Su
+-------------------------------------------------------------------------------
+
+You will be asked to replace a few packages automatically. The following ones
+are normal and you are expected to answer 'Y' to these questions (or just hit
+ENTER):
+
+----
+: Starting local database upgrade...
+:: Replace cvsup with frugalware/csup? [Y/n]
+:: Replace frugalpkg with frugalware/gfpm? [Y/n]
+:: Replace control-center with frugalware/gnome-control-center? [Y/n]
+:: Replace libgksu2 with frugalware/libgksu? [Y/n]
+:: Replace gaim with frugalware/pidgin? [Y/n]
+:: Replace gaim-plugin-encryption with frugalware/pidgin-encryption? [Y/n]
+:: Replace gaim-plugin-guifications with frugalware/pidgin-plugin-guifications? [Y/n]
+:: Replace scrollkeeper with frugalware/rarian? [Y/n]
+:: Replace util-linux with frugalware/util-linux-ng? [Y/n]
+:: Replace x-cursors-industrial with frugalware/x-cursors-dmz? [Y/n]
+----
+
+After this the list of to-be-upgraded packages is displayed. Just hit anter and
+wait. Make some tea, it can take a while :-)
+
+== Install replacement softwares
+
+----
+# pacman-g2 -S gst-plugins-bad gst-plugins-good-wavpack libgc --noconfirm
+----
+
+NOTE: If you did not remove the equivalent of these packages before the
+upgrade, then you can skip this step.
+
+== amavis and munin
+
+The upgrade of these packages are not fully automated. You have to read the
+documents located at `/usr/share/doc/amavisd-new-2.5.2/README.Frugalware` and
+`/usr/share/doc/munin-1.2.5/README.Frugalware` to complete the upgrade if you
+have these packages installed.
+
+== Device name changes
+
+Intel users will have `/dev/sd*` devices rather than `/dev/hd*` ones. The
+reason is the following: It was not possible to boot the kernel on some
+machines without this change. See link:http://bugs.frugalware.org/2243[this
+bugreport] for more details. So after upgrading, you need to:
+
+* Check if you have an Intel IDE controller using `lspci |grep -i intel.*ide`
+  as `root`. If you got no result then probably you're not affected.
+
+* Edit `/etc/fstab`: change all occurrences of `/dev/hd` to `/dev/sd`.
+
+* Edit `/boot/grub/menu.lst`: change all occurrences of `/dev/hd` to `/dev/sd`
+  in the Frugalware entry.
+
+== Rebooting
+
+Since the kernel is upgraded, too, you have to reboot your machine now.
+
+Done!
From crazy at frugalware.org  Sat Oct 13 02:56:07 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 02:56:10 2007
Subject: [Frugalware-git] p07: wine-0.9.47-1-i686
Message-ID: <20071013005607.BEBF61678009@genesis.frugalware.org>

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

commit 5e00154a08a877aebf028b43374489023e36f3f5
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 02:48:34 2007 +0200

wine-0.9.47-1-i686
* Version bump

diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index a352d01..922e294 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos <vmiklos@frugalware.org>

pkgname=wine
-pkgver=0.9.46
+pkgver=0.9.47
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=('b7993b116c9efa879977f7192059f23e4dc6167e' \
+sha1sums=('38f288f56a9a8ca1f71709209727c07930e04024' \
'a9c70a49cef90cf60c2e90e63753858387f7117a' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
'8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
From vmiklos at frugalware.org  Sat Oct 13 03:21:09 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct 13 03:21:11 2007
Subject: [Frugalware-git] homepage-ng: 0.7 announce draft
Message-ID: <20071013012109.1FF371678009@genesis.frugalware.org>

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

commit fbc960796bcdd688fc3b680327130e05ec479e9e
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 13 03:20:49 2007 +0200

0.7 announce draft

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 0b38d96..5e6ad9e 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -17,6 +17,110 @@

<news>
<post>
+		<id>76</id>
+		<title>Frugalware 0.7 (Sayshell) for i686 and x86_64 released</title>
+		<date>Sat Oct 13 02:58:26 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>1</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/76">announce</a> the immediate availability of Frugalware 0.7, our seventh stable release.<br />
+			No new features has been added since 0.7rc2, but more than 150 changes has been made to fix minor bugs.
+			If you didn't follow the changes during the pre/rc releases, here are the most important changes since 0.6:<br />
+			<ul>
+				<li>Up to date base system: Linux kernel 2.6.22.9, Glibc 2.6.1 and GCC 4.2.1</li>
+				<li>Up to date desktop packages: KDE 3.5.7, GNOME 2.20, XFCE 4.4.1, OpenOffice 2.3.0 and Firefox 2.0.0.7</li>
+				<li>A LiveCD called FwLive is now available for this release.</li>
+				<li>Setup: language-specific defaults (keymap, timezone, default mirror), the installation is now logged.</li>
+				<li>Supported new languages: Romanian, Swedish, Italian and Danish.</li>
+				<li>New graphical tools: Gfpm (package manager) and Gnetconfig (network configurator).</li>
+				<li>Documentation: The Frugalware User Manual is now more than 100 pages: tutorials, tips and tricks.</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-0.7/ChangeLog.txt">Sayshell ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+				<a href="/download/frugalware-0.6-iso/fwlive-0.6-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.6-iso/fwchroot-0.6-i686.tar.bz2">chroot tarball</a>
+				<br />
+			Download for x86_64:<br />
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.6-iso/fwchroot-0.6-x86_64.tar.bz2">chroot tarball</a>
+				<br />
+			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection.<br />
+			SHA1SUMs:
+			<pre>
+11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
+c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
+0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
+c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
+6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
+3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
+c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
+3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
+621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
+b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
+af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
+00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
+a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
+f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
+0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
+b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
+a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
+dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
+95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
+89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
+0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
+7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
+93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
+9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
+82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
+339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
+4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
+f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
+9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
+00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
+eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
+fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
+26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
+31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
+88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz
+			</pre>
+			If you are upgrading to Sayshell from our previous stable release (Terminus), please read the <a href="http://frugalware.org/docs/stable/upgrade">upgrade</a> part of our documentation.<br />
+			]]>
+		</content>
+	</post>
+	<post>
<id>75</id>
<title>Kernel update in -current: WARNING for Intel users with IDE controllers</title>
<date>Thu Oct  4 15:08:53 UTC 2007</date>
From vmiklos at frugalware.org  Sat Oct 13 03:23:59 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct 13 03:24:01 2007
Subject: [Frugalware-git] homepage-ng: fix up links
Message-ID: <20071013012359.3F18A1678009@genesis.frugalware.org>

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

commit ca63ca610b6ea3840c9bda1c357fd8fcf1528edc
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 13 03:23:56 2007 +0200

fix up links

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 5e6ad9e..da0a38e 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -37,45 +37,45 @@
</ul>
Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-0.7/ChangeLog.txt">Sayshell ChangeLog</a> for more information.<br />
Download for i686:<br />
-				<a href="/download/frugalware-0.6-iso/fwlive-0.6-i686-full.iso">livecd</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-net.iso">netinstall</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd1.iso">cd1</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd2.iso">cd2</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd3.iso">cd3</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd4.iso">cd4</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd5.iso">cd5</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd6.iso">cd6</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd7.iso">cd7</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd8.iso">cd8</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd9.iso">cd9</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd10.iso">cd10</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd11.iso">cd11</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd12.iso">cd12</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd13.iso">cd13</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-dvd1.iso">dvd1</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-dvd2.iso">dvd2</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-tftp.img.gz">tftp</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-usb.tar.gz">usb</a>,
-				<a href="/download/frugalware-0.6-iso/fwchroot-0.6-i686.tar.bz2">chroot tarball</a>
+				<a href="/download/frugalware-0.7-iso/fwlive-0.7-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.7-iso/fwchroot-0.7-i686.tar.bz2">chroot tarball</a>
<br />
Download for x86_64:<br />
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-net.iso">netinstall</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd1.iso">cd1</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd2.iso">cd2</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd3.iso">cd3</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd4.iso">cd4</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd5.iso">cd5</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd6.iso">cd6</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd7.iso">cd7</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd8.iso">cd8</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd9.iso">cd9</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd10.iso">cd10</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd11.iso">cd11</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-dvd1.iso">dvd1</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-dvd2.iso">dvd2</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-tftp.img.gz">tftp</a>,
-				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-usb.tar.gz">usb</a>,
-				<a href="/download/frugalware-0.6-iso/fwchroot-0.6-x86_64.tar.bz2">chroot tarball</a>
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.7-iso/fwchroot-0.7-x86_64.tar.bz2">chroot tarball</a>
<br />
<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection.<br />
SHA1SUMs:
From vmiklos at frugalware.org  Sat Oct 13 03:29:04 2007
From: vmiklos at frugalware.org (VMiklos)
Date: Sat Oct 13 03:29:04 2007
Subject: [Frugalware-git] homepage-ng: stable 0.7 is out :)
Message-ID: <20071013012904.266151678009@genesis.frugalware.org>

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

commit 5812cdf5559ecb8ef740f7342c7babd011db6a0c
Author: VMiklos <vmiklos@frugalware.org>
Date:   Sat Oct 13 03:28:18 2007 +0200

stable 0.7 is out :)

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index da0a38e..9fd165b 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -21,7 +21,7 @@
<title>Frugalware 0.7 (Sayshell) for i686 and x86_64 released</title>
<date>Sat Oct 13 02:58:26 CEST 2007</date>
<author>VMiklos</author>
-		<hidden>1</hidden>
+		<hidden>0</hidden>
<content><![CDATA[
The Frugalware Developer Team is pleased to <a href="/news/76">announce</a> the immediate availability of Frugalware 0.7, our seventh stable release.<br />
No new features has been added since 0.7rc2, but more than 150 changes has been made to fix minor bugs.
diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml
index a7db395..6348a28 100644
--- a/frugalware/xml/roadmap.xml
+++ b/frugalware/xml/roadmap.xml
@@ -26,8 +26,8 @@
<definition>Sayshell is a planet in Foundation's Edge by Isaac Asimov.</definition>
<version>0.7</version>
<date>Oct 13, 2007</date>
-		<status>0</status>
-		<newsid></newsid>
+		<status>1</status>
+		<newsid>76</newsid>
<prerelease>
<preversion>rc2</preversion>
<predate>Oct 2, 2007</predate>
From priyank at frugalware.org  Sat Oct 13 07:21:21 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 07:21:25 2007
Subject: [Frugalware-git] frugalware-current: gimmix-0.4.2-1-i686
Message-ID: <20071013052121.CEA691678009@genesis.frugalware.org>

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

commit 4c55a2ab923861493bea79bc6ff8db7ade68fd49
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 10:47:17 2007 +0530

gimmix-0.4.2-1-i686
* Version bump

diff --git a/source/xapps-extra/gimmix/FrugalBuild b/source/xapps-extra/gimmix/FrugalBuild
index 1508695..8053496 100644
--- a/source/xapps-extra/gimmix/FrugalBuild
+++ b/source/xapps-extra/gimmix/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gimmix
-pkgver=0.4.1
+pkgver=0.4.2
pkgrel=1
pkgdesc="Gimmix is a graphical music player daemon (MPD) client."
_F_berlios_ext=".tar.bz2"
@@ -13,6 +13,6 @@ depends=('gtk+2' 'libglade' 'libmpd>=0.12.0' 'taglib')
makedepends=('intltool')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-sha1sums=('61dec8ef535bf8b53872990ac4a3b81dc57176e9')
+sha1sums=('3ee6573ec348656ec907af7a2942946824b665b1')

# optimization OK
From priyank at frugalware.org  Sat Oct 13 07:26:35 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 07:26:39 2007
Subject: [Frugalware-git] frugalware-current: acroread-8.1.1-1-i686
Message-ID: <20071013052635.9850B1678009@genesis.frugalware.org>

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

commit d9078f5ff2534c064555f8d8e82b3c6bdc918215
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 10:54:19 2007 +0530

acroread-8.1.1-1-i686
* Version bump
* Removed 'acroread' binary
* New maintainer

diff --git a/source/xapps-extra/acroread/FrugalBuild b/source/xapps-extra/acroread/FrugalBuild
index a38dee8..ab4e76b 100644
--- a/source/xapps-extra/acroread/FrugalBuild
+++ b/source/xapps-extra/acroread/FrugalBuild
@@ -1,16 +1,16 @@
# Compiling Time: 0.01 SBU
-# Maintainer: Bence Nagy <nagybence@tipogral.hu>
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=acroread
-pkgver=7.0.9
-pkgrel=3
+pkgver=8.1.1
+pkgrel=1
pkgdesc="Adobe Acrobat Reader for viewing PDF files"
url="http://www.adobe.com/products/acrobat/readermain.html"
depends=('gtk+2' 'libstdc++5')
groups=('xapps-extra')
archs=('i686')
up2date="lynx -dump 'http://www.adobe.com/products/acrobat/readstep2_allversions_nojs2.html?option=full&platform=LINUX_.tar.gz&language=English'|grep 'Adobe Reader [0-9.]\+'|head -n 1|sed 's/.*Adobe Reader \(.*\)/\1/'"
-source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/$pkgver/enu/AdobeReader_enu-$pkgver-1.i386.tar.gz acroread.sh acroread)
+source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/$pkgver/enu/AdobeReader_enu-$pkgver-1.i486.tar.gz acroread.sh)
options=('nobuild' 'nostrip')
_F_desktop_name="Adobe Reader"
_F_desktop_icon="acroread.png"
@@ -28,12 +28,11 @@ build()
Fln /usr/lib/acroread/Browser/intellinux/nppdf.so \
/usr/lib/mozilla/plugins
Fexe /etc/profile.d/acroread.sh
-	Fexe /usr/lib/acroread/bin/acroread
Frm /usr/share/doc/$pkgname-$pkgver/INSTALL
Fmkdir /usr/share/pixmaps
-	Fcp /usr/lib/acroread/Resource/Icons/32x32/AdobeReader.png /usr/share/pixmaps/acroread.png
+	Fcp /usr/lib/acroread/Adobe/Reader8/Resource/Icons/32x32/AdobeReader8.png \
+		/usr/share/pixmaps/acroread.png
Fdesktop2
}
-sha1sums=('793cc8bcf59a6c24b6e74881bad978efcd447df9' \
-	  '2aaa59074757af472e488b8b23db7caf5fcde69c' \
-	  '56989ede7ef2143806b029710df87aa7554a12ee')
+sha1sums=('916ed44715e61e0384da2be69f968a59b15ea69d' \
+          '4b14a08c12f8c56a33421670831eeccb2eb45793')
diff --git a/source/xapps-extra/acroread/acroread b/source/xapps-extra/acroread/acroread
deleted file mode 100644
index 16f022e..0000000
--- a/source/xapps-extra/acroread/acroread
+++ /dev/null
@@ -1,758 +0,0 @@
-#!/bin/sh
-#
-
-
-setLangENU()
-{
-ST_LANG="ENU"
-ST_LANG_SMALL="enu"
-ST_READER_RPM_NAME="AdobeReader_enu"
-ST_EXCHANGE_RPM_NAME="AdobeAcrobat_enu"
-ST_COMMENT_WORD="Comment"
-ST_DESCRIPTION_WORD="Description"
-ST_COMMENT_RPM="Launch Adobe Reader 7.0"
-ST_DES_RPM="Adobe Reader for Linux. An application that can view, navigate and print PDF documents."
-ST_DES_TAG01="Adobe Reader can read documents in PDF format."
-ST_DES_TAG02="Adobe Reader also allows you to search within PDF files,"
-ST_DES_TAG03="search for PDF files on the internet and participate in collaborative document reviews."
-ST_DES_TAG04="For details, please check www.adobe.com."
-ST_THE_FILE="The file"
-ST_FOR="for"
-ST_YES="yes"
-ST_NO="no"
-ST_OR="or"
-ST_SMALL_Y="y"
-ST_SMALL_N="n"
-ST_CAPS_Y="Y"
-ST_CAPS_N="N"
-ST_ACCEPT_CAPS="ACCEPT"
-ST_DECLINE_CAPS="DECLINE"
-ST_ACCEPT="accept"
-ST_DECLINE="decline"
-ST_VERSION="version"
-ST_STATEMENT_ACCEPT_DECLINE="Please type \\\"accept\\\" to accept the terms and conditions of license agreement; Type \\\"decline\\\" to exit. "
-ST_RESTATEMENT_ACCEPT_DECLINE="Invalid response, expected \\\"accept\\\" or \\\"decline\\\" ... try again ?"
-ST_ER_INVALID_RESP1="ERROR: Invalid response, expected"
-ST_ER_INVALID_RESP2="ERROR: Invalid response ... try again"
-ST_ER_INVALID_RESP3="... try again ?"
-ST_ER_NO_LIC_FILE="ERROR: Cannot find license file ... aborting"
-ST_TO_ACCEPT="To accept the terms and conditions of this agreement enter"
-ST_TO_DECLINE="To decline the terms and conditions of this agreement enter"
-ST_REQ0101="Please type"
-ST_REQ0102="to accept the terms and conditions of license agreement;"
-ST_REQ0103="Type"
-ST_REQ0104="to exit. "
-ST_ER_LIC_NOT_ACCP="License agreement not accepted ... aborting installation"
-ST_FREE_SPACE_INFO01="This installation requires"
-ST_FREE_SPACE_INFO02="MB of free disk space."
-ST_DONE_WORD="Done"
-ST_ER_INSTALLING01="ERROR installing"
-ST_ER_INSTALLING02="invalid product name"
-ST_RES_INST_DIR="Enter installation directory for Adobe Reader"
-ST_ER_SAME_FILE_NAME_AS_DIR="exists but is not a directory. Please specify a different location."
-ST_DIR_INFO01="Directory"
-ST_DIR_INFO02="does not exist."
-ST_QUES_CREAT_DIR="Do you want to create it now? [y] "
-ST_ER_EXIT="Exiting installation..."
-ST_ER_DIR="ERROR: Cannot make directory"
-ST_ER_WRITE="ERROR: Cannot write to directory"
-ST_ER_NO_LIBCURL01="Not able to locate libcurl.so. Some of the functionality of Adobe Reader may be hampered."
-ST_ER_NO_LIBCURL02="It is recommended to install curl ver."
-ST_ER_NO_LIBCURL03="or any version later than ver."
-ST_WARN_NO_LIBSSL01="WARNING: The libssl.so version on your machine is not compatible to libssl.so.0.9.6."
-ST_WARN_NO_LIBSSL02="Please install libssl.so.0.9.6."
-ST_WARN_LD_LIB01="exists in the directory"
-ST_WARN_LD_LIB02="but this directory is not included in LD_LIBRARY_PATH."
-ST_WARN_LD_LIB03="Please include the directory"
-ST_WARN_LD_LIB04="in LD_LIBRARY_PATH"
-ST_WARN_LD_LIB05="exists in the directory"
-ST_ER_NO_CONFIG="ERROR: No configurations found ... aborting"
-ST_WARN_NO_CONFIG="WARNING: The chosen configuration will not run on your current platform"
-ST_QUE_CONT="Continue installation?"
-ST_INFO_DEF_CONFIG1="Install default configuration"
-ST_INFO_DEF_CONFIG2="The following configurations are available for installation:"
-ST_QUE_CONFIG="Enter the configuration number to install: "
-ST_EXIT_INFO="Exit Acrobat installation"
-ST_PLAT_INDEP_FILES="Installing platform independent files ... "
-ST_PLAT_DEP_FILES="Installing platform dependent files ... "
-ST_RPM_CAN_NOT_DEL="could not be deleted as it has some extra file or files that were not installed by rpm"
-ST_WEL_ALK="Welcome to the Asian Language Kit installation."
-ST_INFO_ALK01="This installation will not work if you do not have the"
-ST_INFO_ALK02="Unix Adobe Reader version 7.0 installed prior to this installation."
-ST_INFO_ALK03="If you do not have Adobe Reader version 7.0 already installed on your"
-ST_INFO_ALK04="system please do so before installing this Asian Language Kit."
-ST_ER_ALK01="ERROR: directory must be an absolute path"
-ST_ER_ALK02="ERROR: Directory "
-ST_ER_ALK03="does not exist."
-ST_ER_ALK04="ERROR: AcroVersion file does not exist."
-ST_ER_ALK05="ERROR: Incorrect Acrobat version:"
-ST_ER_ALK06="ERROR: Could not find distribution ... aborting"
-ST_IF_ALK07="Enter the location where you installed the Adobe Reader"
-ST_INFO_ALK_CMPLT="Installation completed."
-ST_WEL_HLK="Welcome to the Extended Language Pack installation."
-ST_INFO_HLK04="system please do so before installing this Extended Language Pack."
-ST_INFO_HLK05="Installing Extended Language Pack Files ... "
-ST_WEL_CLK="Welcome to the Central European Font Pack installation."
-ST_INFO_CLK04="system please do so before installing this Central European Font Pack."
-ST_INFO_CLK05="Installing Central European Language Pack Files ... "
-ST_ER_AR01="ERROR: Cannot determine current directory."
-ST_ER_AR02="ERROR: Cannot find installation directory."
-ST_ER_AR03="ERROR: Cannot find"
-ST_INFO_AR01="The OS named "
-ST_INFO_AR02="is currently not installed."
-ST_INFO_AR03="Try running on an installed platform and connecting to your display."
-ST_INFO_AR04="Installed platform(s) include the following:"
-ST_INFO_AR05="not installed for this configuration,"
-ST_IBP_MISC_03="Mozilla"
-ST_IBP_MISC_04="Firefox"
-ST_IBP_MISC_05="Netscape"
-ST_IBP_MISC_06="Quit"
-ST_IBP_INFO_01="This will install the browser plugin for acroread."
-ST_IBP_INFO_02="Perform global installation"
-ST_IBP_INFO_03="Perform user-specific installation"
-ST_IBP_INFO_04="Enter your choice"
-ST_IBP_INFO_05="Do you want to install another browser ?"
-ST_IBP_INFO_06="Enter the install directory for Adobe Reader 7.0"
-ST_IBP_INFO_07="Enter the browser install directory"
-ST_IBP_INFO_08="The plugin seems to be already installed. Are you sure you want to overwrite ?"
-ST_IBP_INFO_09="Installation cancelled."
-ST_IBP_INFO_10="Installation successful."
-ST_IBP_INFO_11="This will enable the plugin for Mozilla, Firefox and Netscape."
-ST_IBP_INFO_12="If you are facing any problem in getting the installation to work for your browser, please copy the following file to the plugin folder of the browser:"
-ST_IBP_INFO_13="Acroread path specified"
-ST_IBP_INFO_14="Press <Enter> to continue"
-ST_IBP_INFO_15="In case of difficulties please refer to the documentation provided along with the browser for addition of new plugins."
-ST_IBP_INFO_16="Installing plugin in"
-ST_IBP_INFO_17="Do you want to perform automatic installation ?"
-ST_IBP_INFO_18="Finished with automatic install."
-ST_IBP_INFO_19="Do you want to perform manual installation ?"
-ST_IBP_INFO_20="Do you want to install the browser plugin ?"
-ST_IBP_INFO_21="Browser plugin installation skipped."
-ST_IBP_INFO_22_1="Run"
-ST_IBP_INFO_22_2="to install browser plugin."
-ST_IBP_INFO_23="has been added."
-ST_IBP_INFO_24="Trying to install plugin for browser"
-ST_IBP_INFO_25="Installation failed"
-ST_IBP_ERR_01="Could not find the browser plugin file"
-ST_IBP_ERR_02="Could not find the browser plugins folder"
-ST_IBP_ERR_03="Could not find the browser folder"
-ST_IBP_ERR_04="Could not remove previous version of the plugin in"
-ST_IBP_ERR_05_1="Could not copy the plugin file"
-ST_IBP_ERR_05_2="to"
-ST_IBP_ERR_06="Could not create the directory"
-ST_IBP_ERR_07="Could not find browser plugin install script."
-ST_IBP_ERR_08="already exists as a special file and cannot overwrite it."
-ST_IBP_ERR_09="Unable to query HOME variable from the environment. Cannot find your home directory."
-ST_IBP_ERR_10="Could not find the installation folder"
-ST_IBP_ERR_11="INTERNAL ERROR ..... No matching OS name."
-ST_SEP_INFO_01="Enter the install directory for Adobe Reader 7.0"
-ST_SEP_INFO_02="INTERNAL ERROR ..... No matching OS name."
-ST_SEP_INFO_03="Unable to find appropriate files in the installation path."
-ST_SEP_INFO_04="Resetting old contexts"
-ST_SEP_INFO_05="Setting new contexts for library files"
-ST_SEP_INFO_06="This will try to update the library files to make them SELinux aware."
-ST_SEP_INFO_07="Could not find the installation folder."
-ST_SEP_INFO_08="Finished setting the contexts. You can check the log at"
-ST_SEP_INFO_09="Failure in command"
-ST_SEP_INFO_10="Patch might not have completed properly. You can check the log at"
-ST_IOP_ERR1="OpenOffice PDF Plugin could not be registered. Please read the instructions in "
-ST_IOP_ERR2="for manual installation."
-ST_IOP_ERR3="OpenOffice >= 1.9 is required for OpenOffice PDF Plugin to run properly. Skipping registration of PDF Plugin."
-ST_IOP_ERR4="OpenOffice binary soffice could not located in the specified directory."
-ST_IOP_INFO_01="Please specify the directory where OpenOffice is installed: "
-ST_IOP_INFO_02="Do you want to install the OpenOffice Plugin ?"
-ST_IAP_ERR1="Adobe PDF Plugin could not be registered. Please follow the instructions in "
-ST_IAP_INFO_01="Do you want to install the Adobe PDF plugin ?"
-ST_IFE_INFO_01="Do you want to install the firefox extension ?"
-ST_IFE_INFO_02="Please specify the path for Firefox executable : "
-ST_IFE_ERR_01="Firefox exe not found or does not have executable permissions."
-ST_IDI_INFO_01="Do you want to install the Distiller ?"
-ST_MIME_INFO_01="Please login again for changes to MIME types and icons to take effect."
-true
-}
-
-setLangENU
-
-MkTemp()
-{
-    if [ -z "$mkTempCount" ]; then
-        mkTempCount="0"
-    fi
-
-    TmpFile="/tmp/acrobat.$$.$mkTempCount"
-
-    while [ -f "$TmpFile" ]; do
-        mkTempCount=`expr $mkTempCount + 1`
-        TmpFile="/tmp/acrobat.$$.$mkTempCount"
-    done
-
-    touch "$TmpFile" && chmod 644 "$TmpFile" && echo "$TmpFile"
-}
-
-readlink()
-{
-    OLDPWD="`/bin/pwd`"
-    lfile="$1"
-
-    while [ -h "$lfile" -a -f "$lfile" ]; do
-        CWD="`dirname "$lfile"`"
-        if [ "`expr "${CWD}" : "\.\."`" = "2" ]; then
-            CWD="`/bin/pwd`/$CWD"
-        fi
-        lfile="`basename "$lfile"`"
-        cd "$CWD"
-        lfile="`/bin/ls -l "$lfile"|sed 's/^.*-> *\(.*\) *$/\1/'`"
-    done
-
-    if [ -f "$lfile" ]; then
-        CWD="`dirname "$lfile"`"
-        lfile="`basename "$lfile"`"
-        if [ "`expr "${CWD}" : "\.\."`" = "2" ]; then
-            CWD="`/bin/pwd`/$CWD"
-        fi
-        cd "$CWD"
-        echo `/bin/pwd`/$lfile
-        cd "$OLDPWD"
-        return 0
-    fi
-
-    cd "$OLDPWD"
-    return 1
-}
-
-
-ver=7.0.9
-cwd="`/bin/pwd 2> /dev/null`"
-
-if [ -h "$0" ]; then
- ScriptVariable=`readlink $0`
- ScriptDirectory=`dirname "$ScriptVariable"`
-else
- ScriptDirectory=`dirname "$0"`
- cd "$ScriptDirectory"
- ScriptDirectory="`/bin/pwd 2> /dev/null`"
- cd "$cwd"
-fi
-install_dir=`dirname "$ScriptDirectory"`/Reader
-
-
-#
-# Prepend a colon separated environment variable
-# $1 string to be prepended
-# $2 environment variable
-#
-prepend()
-{
-  if [ -z "$2" -o "$2" = "$1" ] ; then
-    echo "$1"
-  else
-    first="`expr "$2" : '\([^:]*\):'`"
-    if [ "$first" = "$1" ] ; then
-      echo "$2"
-    else
-      echo "${1}:${2}"
-    fi
-  fi
-}
-
-
-#
-# Tests the version file in an installation directory.
-#
-test_install_dir()
-{
-	if [ "`cat "$1"/AcroVersion 2>/dev/null`" = "$ver" ] ; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-
-#
-# Check a given file in given path
-#
-check_file_in_named_path()
-{
-    if [ -x "$2/$1" ] ; then
-	return 1
-    fi
-
-    return 0
-}
-
-
-#
-# Check a given file in $PATH
-#
-
-check_file_in_path()
-{
-    OLD_IFS=$IFS
-    IFS=":"
-
-    if [ -n "$PATH" ] ; then
-	for i in $PATH; do
-	    if [ -d "$i" ] ; then
-		check_file_in_named_path "$1" "$i"
-		if [ $? -eq 1 ]; then
-		    IFS=$OLD_IFS
-		    return 1
-		fi
-	    fi
-	done
-    fi
-
-    IFS=$OLD_IFS
-    return 0
-}
-
-IsUserAffirmative()
-{
-    read userResp
-        if [ "$userResp" ] ; then
-            case "$userResp" in
-                y|Y|[yY][eE][sS]) return 0 ;;
-            esac
-        fi
-        return 1
-}
-
-InstallCertificate()
-{
-#$1 is install_dir
-#$2 is URL
-#$3 is port
-    RETVAL=0
-    INSTALL_DIR=$1
-    LOGFILE=`MkTemp /tmp/ssl_logXXXXXX`
-    CERTNAME=`MkTemp /tmp/certi.cerXXXXXX`
-    CERTDATA=`MkTemp /tmp/certDataXXXXXX`
-
-    CertificateInstallDirectory="$HOME/.adobe/Acrobat/`echo $ver | cut -c1-3`/Cert"
-
-    check_file_in_path openssl
-    if [ $? -ne 1 ]
-    then
-      echo "Unable to find openssl, please make sure the openssl binary is in the PATH"
-      exit 1
-    fi
-
-    echo "Fetching certificate from website...."
-    echo "QUIT"  | openssl s_client -connect $2:$3 >$LOGFILE
-
-    echo "Processing ...."
-
-
-    beginCert=`cat $LOGFILE |grep -n "BEGIN CERTIFICATE---" |cut -f1 -d":"`
-    endCert=`cat $LOGFILE |grep -n "END CERTIFICATE---" |cut -f1 -d":"`
-
-    head -$endCert $LOGFILE | tail -`expr $endCert - $beginCert + 1` >$CERTNAME
-
-    openssl x509 -inform PEM -in $CERTNAME -text -out $CERTDATA
-    HASH=`openssl x509 -hash -noout -in $CERTNAME`
-
-    echo "The website presented the following Certificate"
-    echo
-    echo
-
-    more $CERTDATA
-
-    echo "Do you want to accept and install it (y/n)?"
-
-    if IsUserAffirmative
-        then
-            if [ ! -d "$CertificateInstallDirectory" ]
-            then
-              mkdir -p "$CertificateInstallDirectory"
-              if [ $? -ne 0 ]
-              then
-                echo $$ST_ER_DIR
-                exit 1
-              fi
-            fi
-
-            cp $CERTNAME "$CertificateInstallDirectory"/${HASH}.0
-            if [ $? = "0" ]
-                then
-                    echo "Certificate successfuly installed."
-            else
-                echo "There was a problem installing the certificate"
-                RETVAL=1
-            fi
-    else
-        echo "Not installing the certtificate."
-        RETVAL=2
-    fi
-
-
-    rm -f $CERTNAME
-    rm -f $CERTDATA
-    rm -f $LOGFILE
-    return $RETVAL
-}
-
-#  Function : get_gtk_file_ver($1)
-#  $1 : name of the gtk-lib file
-#  Return value : 0 if version >= 2.4 else 1
-#  Side Effects : echo the gtk-version
-#  Aim : To find the version of gtk-lib file and echo it
-
-get_gtk_file_ver()
-{
-   	if [ -f "$1" ]; then
-    	if [ -h "$1" ]; then
-	    	ifile=`readlink $1`
-		    if [ $? -eq 1 ]; then
-   				return 1
-    		fi
-        fi
-
-   		mfile=`basename $ifile`
-    	echo $mfile | grep -q "libgtk-x11-\([0-9]*\).0.so.0.\([0-9]*\).\([0-9]*\)" 2>/dev/null
-
-   		if [ $? -ne 0 ]; then
-           return 1
-        fi
-
-   		echo $mfile| sed 's/libgtk-x11-\([0-9]*\).0.so.0.\([0-9]*\)00.\([0-9]*\)\|\(.*\)/\1\2\3/g'
-        return 0
-    fi
-
-    return 1
-}
-
-
-#  Function : check_gtk_ver_and_set_lib_path($1)
-#  $1 : minimum base version of the gtk required.
-#  Return Value : 0 if LD_LIBRARY_PATH is set properly else 1
-#  Side Effects : LD_LIBRARY_PATH is modified
-#  Aim : To find out the correct gtk libraries and LD_LIBRARY_PATH to include the directory at the start which contain gtk-libs >= 2.4
-
-check_gtk_ver_and_set_lib_path()
-{
-    if [ -z "$LD_LIBRARY_PATH" ]; then
-        LD_LIBRARY_PATH=/lib:/usr/lib
-    else
-        LD_LIBRARY_PATH="$LD_LIBRARY_PATH":/lib:/usr/lib
-    fi
-
-    OLD_IFS="$IFS"
-    IFS=':'
-
-    for idir in $LD_LIBRARY_PATH
-    do
-        if [ -z "$idir" ]; then
-            continue
-        fi
-
-	    ifile="$idir"/libgtk-x11-2.0.so
-
-		base_version="$1"
-        version=`get_gtk_file_ver "$ifile"`
-
-        if [ $? -ne 0 ]; then
-            continue
-        fi
-
-        len_version=`expr length $version`
-        base_version=`expr substr "${base_version}0000000000" 1 $len_version`
-        len_base_version=`expr length $base_version`
-
-        while [ $len_version -gt $len_base_version ]; do
-            base_version=`expr substr "${base_version}0000000000" 1 $len_version`
-            len_base_version=`expr length $base_version`
-        done
-
-    	if [ $version -ge $base_version ]; then
-	   		export LD_LIBRARY_PATH="$idir":"$LD_LIBRARY_PATH"
-            IFS="$OLD_IFS"
-            OLD_IFS=""
-		    return 0
-    	fi
-    done
-
-    IFS="$OLD_IFS"
-    OLD_IFS=""
-
-    # This checks for libs in cache /etc/ld.so.cache
-    for ifile in `/sbin/ldconfig -p|grep "libgtk-x11-2.0.so$"|sed 's/.*[ \t]*=>[ \t]*\(.*\)/\1/g' 2>/dev/null`; do
-        version=`get_gtk_file_ver "$ifile"`
-
-    	while [ ${#version} -gt ${#base_version} ]; do
-	   		base_version="${base_version}0"
-	    done
-
-        if [ $version -ge $base_version ]; then
-            export LD_LIBRARY_PATH="`dirname "$ifile"`":"$LD_LIBRARY_PATH"
-            return 0
-        fi
-    done
-
-    return 1
-}
-
-
-#
-# Get the current working directory.
-# Try to avoid automounter directories by checking
-# if $HOME or $PWD is the same directory as pwd,
-# and removing the automount directory component.
-#
-if [ -z "$cwd" -o ! -d "$cwd" ] ; then
-  echo "$ST_ER_AR01"
-  exit 1
-fi
-
-if [ "$HOME" -a -d "$HOME" ] && [ "`cd / ; cd "$HOME" ; /bin/pwd`" = "$cwd" ] ; then
-  cwd="$HOME"
-elif [ "$PWD" -a -d "$PWD" ] && [ "`cd / ; cd "$PWD" ; /bin/pwd`" = "$cwd" ] ; then
-  cwd="$PWD"
-fi
-
-
-PWD="$cwd"
-export PWD
-
-
-#
-# Setup ACRO_ARG0 to this script
-#
-arg0="$0"
-if [ "$arg0" ] ; then
-  case "$arg0" in
-     /*) ;;
-    ./*) arg0="$cwd/`expr "$arg0" : '\./\(.*\)'`" ;;
-      *) arg0="$cwd/$arg0" ;;
-  esac
-
-  ACRO_ARG0="$arg0"
-  export ACRO_ARG0
-fi
-
-
-#
-# Try to find the installation directory
-#
-if ( test_install_dir "$install_dir" ) ; then
-  ACRO_INSTALL_DIR="$install_dir"
-  export ACRO_INSTALL_DIR
-
-else
-  script="$arg0"
-  while [ "$script" ] ; do
-    install_dir="`dirname "$script"`"
-    if ( test_install_dir "$install_dir/Reader" ) ; then
-      ACRO_INSTALL_DIR="$install_dir/Reader"
-      export ACRO_INSTALL_DIR
-      break
-    fi
-
-    install_dir="`dirname "$install_dir"`"
-    if ( test_install_dir "$install_dir/Reader" ) ; then
-      ACRO_INSTALL_DIR="$install_dir/Reader"
-      export ACRO_INSTALL_DIR
-      break
-    fi
-
-    if [ -h "$script" ] ; then
-      new_script=`readlink "$script"`
-      if [ "$new_script" -a "`expr "$new_script" : '/.*'`" = 0 ] ; then
-        new_script="`dirname "$script"`/$new_script"
-      fi
-      script="$new_script"
-    else
-      break
-    fi
-  done
-
-  if ( test_install_dir "$ACRO_INSTALL_DIR" ) ; then
-    :
-  elif ( test_install_dir "$ACRO_HOME" ) ; then
-    ACRO_INSTALL_DIR="$ACRO_HOME"
-    export ACRO_INSTALL_DIR
-  else
-    echo "$ST_ER_AR02"
-    exit 1
-  fi
-fi
-
-
-#
-# setup the configuration from uname
-#
-os_name=`uname -s`
-os_release=`uname -r`
-
-case "$os_name" in
-  SunOS)
-    case "$os_release" in
-      4.1.3*|4.1.4*|4.1C)
-        ACRO_CONFIG=sparcsun
-        export ACRO_CONFIG
-        ;;
-      5.*)
-        machine_type=`uname -p`
-        case "$machine_type" in
-          sparc)
-            ACRO_CONFIG=sparcsolaris
-            export ACRO_CONFIG
-            ;;
-          intel|i386)
-            ACRO_CONFIG=intelsolaris
-            export ACRO_CONFIG
-            ;;
-          ppc)
-            ACRO_CONFIG=ppcsolaris
-            export ACRO_CONFIG
-            ;;
-        esac
-        ;;
-    esac
-    ;;
-  Linux)
-    ACRO_CONFIG=intellinux
-    export ACRO_CONFIG
-    ;;
-  AIX)
-    ACRO_CONFIG=rs6000aix
-    export ACRO_CONFIG
-    ;;
-  HP-UX)
-    ACRO_CONFIG=hppahpux
-    export ACRO_CONFIG
-esac
-
-if [ -z "$ACRO_CONFIG" ] ; then
-   echo "$ST_INFO_AR01 $os_name $ST_VERSION $os_release $ST_INFO_AR02"
-   echo "$ST_INFO_AR03"
-   echo "$ST_INFO_AR04"
-
-  if [ -d "$ACRO_INSTALL_DIR"/sparcsolaris ] ; then
-    echo "  SPARC/Solaris version 2.x"
-  fi
-  if [ -d "$ACRO_INSTALL_DIR"/intellinux ] ; then
-    echo "  Intel/Linux"
-  fi
-  exit 1
-fi
-
-# Check the version of gtk and update the LD_LIBRARY_PATH if required.
-
-if [ "`uname -s`" = "Linux" ]; then
-	MIN_GTK_VERSION="240"
-	check_gtk_ver_and_set_lib_path  "$MIN_GTK_VERSION"  ### returns 0 if found gtk >= 2.4
-fi
-
-#
-# Setup configuration specific environment variables
-#
-case "$ACRO_CONFIG" in
-  sparcsolaris)
-    LD_LIBRARY_PATH="`prepend "$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib:$ACRO_INSTALL_DIR/$ACRO_CONFIG/sidecars" "$LD_LIBRARY_PATH"`"
-    export LD_LIBRARY_PATH
-    ;;
-  intellinux)
-    LD_LIBRARY_PATH="`prepend "$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib:$ACRO_INSTALL_DIR/$ACRO_CONFIG/sidecars" "$LD_LIBRARY_PATH"`"
-    export LD_LIBRARY_PATH
-    ;;
-  rs6000aix)
-    LIBPATH="`prepend "$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib:$ACRO_INSTALL_DIR/$ACRO_CONFIG/sidecars:/opt/freeware/lib:" "$LIBPATH"`"
-    export LIBPATH
-	;;
-  hppahpux)
-    SHLIB_PATH="`prepend "$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib:$ACRO_INSTALL_DIR/$ACRO_CONFIG/sidecars:/opt/graphics/OpenGL/lib" "$SHLIB_PATH"`"
-	LD_PRELOAD=/opt/graphics/OpenGL/lib/libGL.sl
-	export SHLIB_PATH
-	export LD_PRELOAD
-    ;;
-esac
-
-DefaultPSRESPATH="$HOME/psres:$HOME/fonts:/usr/psres"
-if [ -z "$PSRESOURCEPATH" ] ; then
-  PSRESOURCEPATH="$DefaultPSRESPATH"
-else
-  PSRESOURCEPATH="$PSRESOURCEPATH":"$DefaultPSRESPATH"
-fi
-case "$PSRESOURCEPATH" in
-  ::*|*::*|*::)
-    ;;
-  *)
-    PSRESOURCEPATH="$PSRESOURCEPATH"::
-    ;;
-esac
-export PSRESOURCEPATH
-
-directory="`basename \"$ACRO_INSTALL_DIR\"`"
-
-if [ "$directory" = "Reader" ]; then
-	cmd="acroread"
-    	prod="Adobe Reader"
-else
-	if [ "$directory" = "Acrobat" ]; then
-		cmd="acroexch"
-    		prod="Adobe Acrobat"
-	fi
-fi
-
-#
-# Set the command.  Process any debug flags and exec.
-#
-ACRO_EXEC_CMD="$ACRO_INSTALL_DIR/$ACRO_CONFIG/bin/$cmd"
-export ACRO_EXEC_CMD
-
-ACRO_RES_DIR=$ACRO_INSTALL_DIR/../Resource
-export ACRO_RES_DIR
-
-ACRO_LANG=$ST_LANG
-export ACRO_LANG
-
-# Adobe Reader/Acrobat uses gconftool-2 to check whether accessibility support is enabled. Please refer to the Readme file to work around this.
-check_file_in_path gconftool-2
-if [ $? -eq 0 ]
-then
-	# gconftool-2 is not there on system, turn off AT support
-	ACRO_AT_ACTIVE="false"
-	export ACRO_AT_ACTIVE
-else
-	ACRO_AT_ACTIVE=`gconftool-2 -g /desktop/gnome/interface/accessibility 2>/dev/null`
-	export ACRO_AT_ACTIVE
-fi
-
-if [ "$ACRO_AT_ACTIVE" = "true" ]; then
-	GTK_MODULES=gail:atk-bridge
-	export GTK_MODULES
-fi
-
-if [ "$1" = "-installCertificate" ]
-then
-    InstallCertificate $ACRO_INSTALL_DIR $2 $3
-    exit $?
-fi
-
-if [ "$1" = "-DEBUG" ] ; then
-  ACRODEBUG=1
-  ACRO_CRASHLOG=1
-  export ACRODEBUG ACRO_CRASHLOG
-
-  if [ "`ulimit -c 2>/dev/null`" = "0" ]
-  then
-    ulimit -c 1000000 >/dev/null 2>&1
-  fi
-
-  if [ $# = 1 ] ; then
-    export ACRO_EXEC_CMD
-    exec "$SHELL"
-  else
-    shift
-    exec ${1+"$@"} "$ACRO_EXEC_CMD"
-  fi
-fi
-
-if [ -f "$ACRO_EXEC_CMD" ] ; then
-  exec "$ACRO_EXEC_CMD" ${1+"$@"}
-else
-  echo "$ST_ER_AR03 $ACRO_EXEC_CMD"
-  echo "  $prod $ST_INFO_AR05 \"$ACRO_CONFIG\"."
-  exit 1
-fi
diff --git a/source/xapps-extra/acroread/acroread.sh b/source/xapps-extra/acroread/acroread.sh
index 35016f7..5150273 100644
--- a/source/xapps-extra/acroread/acroread.sh
+++ b/source/xapps-extra/acroread/acroread.sh
@@ -1 +1 @@
-export PATH=$PATH:/usr/lib/acroread/bin
+export PATH=$PATH:/usr/lib/acroread/Adobe/Reader8/bin
From priyank at frugalware.org  Sat Oct 13 07:50:16 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 07:50:20 2007
Subject: [Frugalware-git] frugalware-current: xgl-20071010-1-i686
Message-ID: <20071013055016.C65E0167800A@genesis.frugalware.org>

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

commit 1aaed382457f049a28b82a26bdfdebf281941a0b
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 11:11:36 2007 +0530

xgl-20071010-1-i686
* updated to a more recent cvs snapshot
* built with a more updated mesa-cvs snapshot
* mesa-cvs is now not a dependency
* added xgl-compalloc.patch to speed up xgl on some cards

diff --git a/source/x11-extra/xgl/FrugalBuild b/source/x11-extra/xgl/FrugalBuild
index 5bf9c0e..e39a839 100644
--- a/source/x11-extra/xgl/FrugalBuild
+++ b/source/x11-extra/xgl/FrugalBuild
@@ -2,15 +2,14 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=xgl
-pkgver=20070601
-mesaver=20070601
-mesaname=Mesa-cvs-$mesaver
+pkgver=20071010
+mesaname=Mesa-cvs-$pkgver
pkgrel=1
pkgdesc="OpenGL accelerated X server"
url="http://www.freedesktop.org/Software/Xgl"
groups=('x11-extra')
archs=('x86_64' 'i686')
-depends=('glitz>=0.5.6' 'libglx' 'libxfont' 'libxdmcp' 'libxau' 'mesa-cvs' 'libxrandr' 'libxrender' 'libxinerama')
+depends=('glitz>=0.5.6' 'libglx' 'libxfont' 'libxdmcp' 'libxau' 'mesa' 'libxrandr' 'libxrender' 'libxinerama')
makedepends=('randrproto' 'renderproto' 'fixesproto>=4.0' 'damageproto' 'xextproto' 'xproto' \
'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \
'compositeproto' 'recordproto' 'resourceproto' 'videoproto' 'scrnsaverproto>=1.1.0' \
@@ -18,13 +17,15 @@ makedepends=('randrproto' 'renderproto' 'fixesproto>=4.0' 'damageproto' 'xextpro
'xcmiscproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' \
'sgml-common' 'util-macros' 'glproto' 'libxkbfile' 'xorg-cf-files' 'libxxf86misc' 'libxkbui' 'libxaw' 'libxpm')
up2date=$pkgver
-source=(http://ftp.frugalware.org/pub/other/sources/xgl/$pkgname-$pkgver.tar.gz \
-	http://ftp.frugalware.org/pub/other/sources/mesa-cvs/$mesaname.tar.bz2 \
+source=(http://ftp.frugalware.org/pub/other/sources/xgl/$pkgname-$pkgver.tar.bz2 \
+	http://ftp.frugalware.org/pub/other/sources/xgl/$mesaname.tar.bz2 \
autogen-no-run-configure.patch \
+	xgl-compalloc.patch \
README.Frugalware fw-xgl-control)
-sha1sums=('1bd0731bbccf8c1bc763ac6092374b0a25f11e8e' \
-          'bb66411c631fcd3788ef0ed624a85c6ddad78c15' \
+sha1sums=('80ebf2e7896cb79665f042100ec3edfc68c6c910' \
+          'a69b05111872d98e9408409523ee969618d30d94' \
'9080a863743aa22710edb4ca5e5552b48db00e6f' \
+          '73f4b837e2b39774e909818bdc380a0523c5ca92' \
'355a6b1c34420f12774045e821a447fab7074d39' \
'6efd93510083337d4f58e427fae26bace535bb91')

diff --git a/source/x11-extra/xgl/xgl-compalloc.patch b/source/x11-extra/xgl/xgl-compalloc.patch
new file mode 100644
index 0000000..7cf3721
--- /dev/null
+++ b/source/x11-extra/xgl/xgl-compalloc.patch
@@ -0,0 +1,27 @@
+--- a/composite/compalloc.c
++++ b/composite/compalloc.c
+@@ -486,12 +486,24 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
+
+ 	ValidateGC(&pPixmap->drawable, pGC);
+ 	dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
++
++#if 1 /* ugly hack to avoid frame buffer reads */
++	val = 0;
++	dixChangeGC (serverClient, pGC, GCForeground, &val, NULL);
++
++	{
++	    xRectangle rect = { 0, 0, w, h };
++	    (*pGC->ops->PolyFillRect) (&pPixmap->drawable, pGC, 1, &rect);
++	}
++#else
+ 	(*pGC->ops->CopyArea) (&pParent->drawable,
+ 			       &pPixmap->drawable,
+ 			       pGC,
+ 			       x - pParent->drawable.x,
+ 			       y - pParent->drawable.y,
+ 			       w, h, 0, 0);
++#endif
++
+ 	FreeScratchGC (pGC);
+     }
+     return pPixmap;
From priyank at frugalware.org  Sat Oct 13 07:50:16 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 07:50:23 2007
Subject: [Frugalware-git] frugalware-current: mesa-cvs-20070601-1-i686
Message-ID: <20071013055016.EE5AD167800C@genesis.frugalware.org>

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

commit fc72c9b492efc87ecf1ea58a0f8fcefa78d9761a
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 11:18:31 2007 +0530

mesa-cvs-20070601-1-i686
* removed

diff --git a/source/xlib-extra/mesa-cvs/FrugalBuild b/source/xlib-extra/mesa-cvs/FrugalBuild
deleted file mode 100644
index b497a5f..0000000
--- a/source/xlib-extra/mesa-cvs/FrugalBuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Compiling Time: 1.14 SBU
-# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>
-
-pkgname=mesa-cvs
-origname=Mesa-cvs
-pkgver=20070601
-pkgrel=2
-pkgdesc="Mesa is a 3D graphics library (CVS Version)"
-url="http://mesa3d.sourceforge.net/"
-depends=('libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm' \
-	'libxfixes' 'libxdamage')
-makedepends=('makedepend' 'glproto' 'xf86vidmodeproto')
-archs=('x86_64' 'i686')
-groups=('xlib-extra')
-up2date=$pkgver
-source=(http://ftp.frugalware.org/pub/other/sources/mesa-cvs/$origname-$pkgver.tar.bz2 \
-	r200-copy-pixels-1.patch)
-sha1sums=('bb66411c631fcd3788ef0ed624a85c6ddad78c15' \
-          '1396202a472a59266e884cfef5654af4e4cd451c')
-
-# NOTE: If you bump version (major or minor) you need to review the symlinking at the end of this
-#       file !!!! On minor bump last number will be changed.
-
-build()
-{
-	Fcd $origname-$pkgver
-
-	[ "$CARCH" == "i686" ] && CONFIG=linux-dri-x86
-	[ "$CARCH" == "x86_64" ] && CONFIG=linux-dri-x86-64 && dripath=64
-	[ "$CARCH" == "ppc" ] && CONFIG=linux-dri-ppc
-	Fpatchall
-
-	HOSTCONF="configs/${CONFIG}"
-
-	Fsed "MKDEP = /usr/X11R6/bin/makedepend" "MKDEP = /usr/bin/makedepend" configs/linux-dri
-	Fsed "X11_INCLUDES = -I/usr/X11R6/include" "X11_INCLUDES = -I/usr/include" configs/linux-dri
-	Fsed "EXTRA_LIB_PATH=-L/usr/X11R6/lib" "EXTRA_LIB_PATH=-L/usr/lib" configs/linux-dri
-	Fsed '#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"' '#define DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"' src/glx/x11/dri_glx.c
-
-	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/lib/mesa-cvs/lib/xorg/modules/dri\"'" >> ${HOSTCONF}
-	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "SRC_DIRS = glx/x11 mesa" >> ${HOSTCONF}
-	rm -f include/GL/glut*h
-	echo "USING_EGL = 0" >> ${HOSTCONF}
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
-#	echo "DRI_DIRS =" >> ${HOSTCONF}
-
-	echo "INSTALL_DIR = $Fdestdir/usr/lib/mesa-cvs" >> ${HOSTCONF}
-	echo "DRI_DRIVER_INSTALL_DIR = $Fdestdir/usr/lib/mesa-cvs/lib/xorg/modules/dri" >> ${HOSTCONF}
-
-	make ${CONFIG} || Fdie
-
-	Fmkdir /usr/lib/mesa-cvs
-
-	[ "$CARCH" == "x86_64" ] && mv $Fsrcdir/Mesa-cvs-$pkgver/lib64 $Fsrcdir/Mesa-cvs-$pkgver/lib
-
-	make install || Fdie
-
-	Fmkdir /usr/share/doc/$origname-$pkgver
-	cp -r docs/{README.*,*.html,RELNOTES-6.4,COPYING,VERSIONS} \
-		$Fdestdir/usr/share/doc/$origname-$pkgver/ || Fdie
-
-	Fmkdir /usr/lib/mesa-cvs/lib/xorg/modules/dri
-	cp -ar $Fsrcdir/$origname-$pkgver/lib$dripath/*_dri.so $Fdestdir/usr/lib/mesa-cvs/lib/xorg/modules/dri/ || Fdie
-	# remove empty dir
-	if [ "$CARCH" == "x86_64" ]; then
-		Frm /usr/lib/mesa-cvs/lib64
-	fi
-}
-
-# optimization OK
diff --git a/source/xlib-extra/mesa-cvs/r200-copy-pixels-1.patch b/source/xlib-extra/mesa-cvs/r200-copy-pixels-1.patch
deleted file mode 100644
index 26463cd..0000000
--- a/source/xlib-extra/mesa-cvs/r200-copy-pixels-1.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -u ../Mesa-6.4.1.old/src/mesa/drivers/dri/r200/r200_pixel.c ./src/mesa/drivers/dri/r200/r200_pixel.c
---- ../Mesa-6.4.1.old/src/mesa/drivers/dri/r200/r200_pixel.c	2004-07-31 10:14:50.000000000 +0200
-+++ ./src/mesa/drivers/dri/r200/r200_pixel.c	2005-12-21 15:19:24.000000000 +0100
-@@ -472,6 +472,98 @@
- }
-
-
-+void
-+r200CopyPixels( GLcontext *ctx,
-+		GLint srcx, GLint srcy, GLsizei width, GLsizei height,
-+		GLint destx, GLint desty,
-+		GLenum type )
-+{
-+    if (type == GL_COLOR &&
-+	ctx->Pixel.ReadBuffer == GL_BACK &&
-+	ctx->Color.DrawBuffer[0] == GL_FRONT &&
-+	srcx == destx && srcy == desty &&
-+	ctx->_ImageTransferState == 0 && /* no color tables, scale/bias, etc */
-+	ctx->Pixel.ZoomX == 1.0 && /* no zooming */
-+	ctx->Pixel.ZoomY == 1.0)
-+    {
-+	r200ContextPtr rmesa = R200_CONTEXT (ctx);
-+	__DRIdrawablePrivate *dPriv = rmesa->dri.drawable;
-+	GLint x, y, size;
-+	GLint nbox, i, ret;
-+
-+	x = destx;
-+	y = desty;
-+
-+	if (!clip_pixelrect (ctx, ctx->DrawBuffer, &x, &y, &width, &height,
-+			     &size))
-+	{
-+	    if (R200_DEBUG & DEBUG_PIXEL)
-+		fprintf (stderr, "%s totally clipped -- nothing to do\n",
-+			 __FUNCTION__);
-+
-+	    return;
-+	}
-+
-+	y = dPriv->h - y - height; /* convert from gl to hardware coords */
-+	x += dPriv->x;
-+	y += dPriv->y;
-+
-+	R200_FIREVERTICES( rmesa );
-+
-+	LOCK_HARDWARE( rmesa );
-+
-+	nbox = dPriv->numClipRects; /* must be in locked region */
-+
-+	for (i = 0; i < nbox; )
-+	{
-+	    drm_clip_rect_t *box = dPriv->pClipRects;
-+	    drm_clip_rect_t *b = rmesa->sarea->boxes;
-+	    drm_clip_rect_t r;
-+	    GLint	    n = 0;
-+
-+	    while (n < RADEON_NR_SAREA_CLIPRECTS && i < nbox)
-+	    {
-+		r = box[i++];
-+
-+		if (r.x1 < x)
-+		    r.x1 = x;
-+		if (r.y1 < y)
-+		    r.y1 = y;
-+		if (r.x2 > x + width)
-+		    r.x2 = x + width;
-+		if (r.y2 > y + height)
-+		    r.y2 = y + height;
-+
-+		if (r.x1 < r.x2 && r.y1 < r.y2)
-+		{
-+		    *b++ = r;
-+		    n++;
-+		}
-+	    }
-+
-+	    if (n)
-+	    {
-+		rmesa->sarea->nbox = n;
-+
-+		ret = drmCommandNone ( rmesa->dri.fd, DRM_RADEON_SWAP );
-+
-+		if ( ret ) {
-+		    fprintf( stderr, "DRM_R200_SWAP_BUFFERS: return = %d\n",
-+			     ret );
-+		    UNLOCK_HARDWARE( rmesa );
-+		    exit( 1 );
-+		}
-+	    }
-+	}
-+
-+	UNLOCK_HARDWARE( rmesa );
-+   }
-+   else
-+   {
-+       _swrast_CopyPixels (ctx, srcx, srcy, width, height, destx, desty, type);
-+   }
-+}
-+
-
- void r200InitPixelFuncs( GLcontext *ctx )
- {
-@@ -485,7 +577,8 @@
-
-    if (!getenv("R200_NO_BLITS") && R200_CONTEXT(ctx)->dri.drmMinor >= 6) {
-       ctx->Driver.ReadPixels = r200ReadPixels;
--      ctx->Driver.DrawPixels = r200DrawPixels;
-+      ctx->Driver.DrawPixels = r200DrawPixels;
-+      ctx->Driver.CopyPixels = r200CopyPixels;
-       if (getenv("R200_HW_BITMAP"))
- 	 ctx->Driver.Bitmap = r200Bitmap;
-    }
From iron at frugalware.org  Sat Oct 13 08:30:07 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 08:30:09 2007
Subject: [Frugalware-git] frugalware-current: changed IroNiQ's role to
	former xfce maintainer
Message-ID: <20071013063007.498C713A4002@genesis.frugalware.org>

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

commit 5961c81c891bf43bfa4c93a829e7618464d03231
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Thu Oct 11 16:14:50 2007 +0200

changed IroNiQ's role to former xfce maintainer

diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml
index 32f8a1e..b346917 100644
--- a/docs/xml/authors.xml
+++ b/docs/xml/authors.xml
@@ -111,7 +111,7 @@ if you modify this file, be sure it's still valid - xmllint is your friend
<role>i686 buildserver administrator</role>
<role>x86_64 buildserver administrator</role>
<role>x86_64 porter</role>
-		<role>Xfce maintainer</role>
+		<role>former Xfce maintainer</role>
<role>package maintainer</role>
</author>
<author>
From iron at frugalware.org  Sat Oct 13 09:43:16 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 09:43:19 2007
Subject: [Frugalware-git] homepage-ng: fwng: Hungarian translation of 0.7
	announcement - still hidden, needs review
Message-ID: <20071013074316.14EE913A4002@genesis.frugalware.org>

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

commit bb239cb9d7a2994dbe9bd3f64b6adbe1e9b57c07
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 09:42:34 2007 +0200

fwng: Hungarian translation of 0.7 announcement - still hidden, needs review

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index 21f092e..90693e3 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -12,6 +12,110 @@
]>
<news>
<post>
+		<id>76</id>
+		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra ĂŠs x86_64-re</title>
+		<date>Sat Oct 13 09:11:34 CEST 2007</date>
+		<author>IroNiQ</author>
+		<hidden>1</hidden>
+		<content><![CDATA[
+			A Frugalware Fejelsztői Csapat örömmel <a href="/new/76/hu">jelenti be</a> a Frugalware 0.7 azonnali elérhetőségét, mint hetedik stabil kiadásunkat.<br />
+			Igaz, hogy ĂşjdonsĂĄg nem kerĂźlt bele 0.7rc2 Ăłta, de tĂśbb, mint 150 aprĂłbb hibĂĄk javĂ­tĂĄs tĂśrtĂŠnt.
+			Ha nem kĂśvette folyamatosan a vĂĄltozĂĄsokat, Ă­me a legfontosabb vĂĄltozĂĄsok 0.6 Ăłta:<br />
+			<ul>
+				<li>NaprakĂŠsz alaprendszer: 2.6.22.9-es Linux kernel, 2.6.1-es Glibc ĂŠs 4.2.1-es GCC</li>
+				<li>NaprakĂŠsz grafikus csomagok: KDE 3.5.7, GNOME 2.20, XFCE 4.4.1, OpenOffice 2.3.0 ĂŠs Firefox 2.0.0.7</li>
+				<li>Ehhez a kiadáshoz már elérhető az FwLive-nak nevezett LiveCDnk</li>
+				<li>Telepítő: nyelv-specifikus alapbeállítások (billentyűzetkiosztás, időzóna, alapértelmezett tükörszerver), a telepítési folyamat teljesen logolva van</li>
+				<li>Új támogatott nyelvek: román, svéd, olasz és dán</li>
+				<li>Új grafikus eszközök: Gfpm (csomagkezelő) és Gnetconfig (hálózati beállító eszköz)</li>
+				<li>DokumentĂĄciĂł: a Frugalware FelhasznĂĄlĂłi KĂŠzikĂśnyv tĂśbb, mint 100 oldalas: leĂ­rĂĄsok, tippek/trĂźkkĂśk</li>
+			</ul>
+			Bővebb információért tekintse meg a Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-0.7/ChangeLog.txt">0.7 (Sayshell) Változások Listáját</a>.<br />
+			LetĂśltĂŠs i686-ra:<br />
+				<a href="/download/frugalware-0.7-iso/fwlive-0.7-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.7-iso/fwchroot-0.7-i686.tar.bz2">chroot tarball</a>
+				<br />
+			LetĂśltĂŠs x86_64-re:<br />
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.7-iso/fwchroot-0.7-x86_64.tar.bz2">chroot tarball</a>
+				<br />
+			<b>MEGJEGYZÉS</b>: A 3-13. CD-ket valamint a 2. DVD-t csak akkor töltse le, ha a telepítés helyén nincs internetkapcsolata.<br />
+			SHA1SUMok:
+			<pre>
+6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
+3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
+c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
+3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
+621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
+b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
+af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
+00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
+a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
+11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
+c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
+0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
+c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
+f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
+0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
+b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
+95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
+89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
+0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
+7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
+93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
+9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
+82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
+339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
+4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
+a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
+dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
+f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
+9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
+00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
+eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
+fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
+26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
+31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
+88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz
+			</pre>
+			Ha a korábbi stabil kiadásunkról (Terminus) frissít, kérjük olvassa el a dokumentáció <a href="http://frugalware.org/docs/stable/upgrade">frissítés</a>ről szóló részét.<br />
+			]]>
+		</content>
+	</post>
+	<post>
<id>75</id>
<title>Kernel frissítés a -currentben: FIGYELMEZTETÉS az Intel IDE vezérlőt használóknak</title>
<date>Thu Oct  4 15:08:53 UTC 2007</date>
From iron at frugalware.org  Sat Oct 13 09:44:58 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 09:45:00 2007
Subject: [Frugalware-git] homepage-ng: fwng: small fix in .hu announcement
Message-ID: <20071013074458.A232013A4002@genesis.frugalware.org>

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

commit dc0b0df83cf226a0aac4ef47d2c5b9c018b1b3dc
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 09:44:20 2007 +0200

fwng: small fix in .hu announcement

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index 90693e3..ce82b50 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -20,7 +20,7 @@
<content><![CDATA[
A Frugalware Fejelsztői Csapat örömmel <a href="/new/76/hu">jelenti be</a> a Frugalware 0.7 azonnali elérhetőségét, mint hetedik stabil kiadásunkat.<br />
Igaz, hogy ĂşjdonsĂĄg nem kerĂźlt bele 0.7rc2 Ăłta, de tĂśbb, mint 150 aprĂłbb hibĂĄk javĂ­tĂĄs tĂśrtĂŠnt.
-			Ha nem kĂśvette folyamatosan a vĂĄltozĂĄsokat, Ă­me a legfontosabb vĂĄltozĂĄsok 0.6 Ăłta:<br />
+			Ha nem kĂśvette folyamatosan a vĂĄltozĂĄsokat, Ă­me a legfontosabbak 0.6 Ăłta:<br />
<ul>
<li>NaprakĂŠsz alaprendszer: 2.6.22.9-es Linux kernel, 2.6.1-es Glibc ĂŠs 4.2.1-es GCC</li>
<li>NaprakĂŠsz grafikus csomagok: KDE 3.5.7, GNOME 2.20, XFCE 4.4.1, OpenOffice 2.3.0 ĂŠs Firefox 2.0.0.7</li>
From iron at frugalware.org  Sat Oct 13 09:56:36 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 09:56:37 2007
Subject: [Frugalware-git] homepage-ng: fwng: small fix #2 in Hungarian
	announce - thx janny
Message-ID: <20071013075636.5EC6313A4002@genesis.frugalware.org>

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

commit 09393afdf4324e682be47501b770a1e209f2ef12
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 09:55:58 2007 +0200

fwng: small fix #2 in Hungarian announce - thx janny

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index ce82b50..e3b813e 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -19,7 +19,7 @@
<hidden>1</hidden>
<content><![CDATA[
A Frugalware Fejelsztői Csapat örömmel <a href="/new/76/hu">jelenti be</a> a Frugalware 0.7 azonnali elérhetőségét, mint hetedik stabil kiadásunkat.<br />
-			Igaz, hogy ĂşjdonsĂĄg nem kerĂźlt bele 0.7rc2 Ăłta, de tĂśbb, mint 150 aprĂłbb hibĂĄk javĂ­tĂĄs tĂśrtĂŠnt.
+			Igaz, hogy ĂşjdonsĂĄg nem kerĂźlt bele 0.7rc2 Ăłta, de tĂśbb, mint 150 aprĂłbb hibajavĂ­tĂĄs tĂśrtĂŠnt.
Ha nem kĂśvette folyamatosan a vĂĄltozĂĄsokat, Ă­me a legfontosabbak 0.6 Ăłta:<br />
<ul>
<li>NaprakĂŠsz alaprendszer: 2.6.22.9-es Linux kernel, 2.6.1-es Glibc ĂŠs 4.2.1-es GCC</li>
From iron at frugalware.org  Sat Oct 13 10:57:33 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 10:57:35 2007
Subject: [Frugalware-git] homepage-ng: fwng: .hu translation officially
	released
Message-ID: <20071013085733.237DA13A4002@genesis.frugalware.org>

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

commit 2946b38fc3fc529cd65d9917b72e7cd82c34ffdb
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 10:56:53 2007 +0200

fwng: .hu translation officially released

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index e3b813e..f5f7e3a 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -16,7 +16,7 @@
<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra ĂŠs x86_64-re</title>
<date>Sat Oct 13 09:11:34 CEST 2007</date>
<author>IroNiQ</author>
-		<hidden>1</hidden>
+		<hidden>0</hidden>
<content><![CDATA[
A Frugalware Fejelsztői Csapat örömmel <a href="/new/76/hu">jelenti be</a> a Frugalware 0.7 azonnali elérhetőségét, mint hetedik stabil kiadásunkat.<br />
Igaz, hogy ĂşjdonsĂĄg nem kerĂźlt bele 0.7rc2 Ăłta, de tĂśbb, mint 150 aprĂłbb hibajavĂ­tĂĄs tĂśrtĂŠnt.
From iron at frugalware.org  Sat Oct 13 11:00:00 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 11:00:03 2007
Subject: [Frugalware-git] homepage-ng: fwng: small fix in .hu announce title
Message-ID: <20071013090000.860A913A4002@genesis.frugalware.org>

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

commit c7703731e47b0d143fa3cfd2546394f2882d481d
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 10:59:20 2007 +0200

fwng: small fix in .hu announce title

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index f5f7e3a..afa3544 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -13,7 +13,7 @@
<news>
<post>
<id>76</id>
-		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra ĂŠs x86_64-re</title>
+		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra&nbsp;ĂŠs x86_64-re</title>
<date>Sat Oct 13 09:11:34 CEST 2007</date>
<author>IroNiQ</author>
<hidden>0</hidden>
From iron at frugalware.org  Sat Oct 13 11:00:57 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 11:00:59 2007
Subject: [Frugalware-git] homepage-ng: previous fix caused an error,
	so removed
Message-ID: <20071013090057.CF01713A4002@genesis.frugalware.org>

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

commit b1872f3f8c5d546c84015d8b6f626dd36eed6143
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 11:00:18 2007 +0200

previous fix caused an error, so removed

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index afa3544..f5f7e3a 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -13,7 +13,7 @@
<news>
<post>
<id>76</id>
-		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra&nbsp;ĂŠs x86_64-re</title>
+		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra ĂŠs x86_64-re</title>
<date>Sat Oct 13 09:11:34 CEST 2007</date>
<author>IroNiQ</author>
<hidden>0</hidden>
From iron at frugalware.org  Sat Oct 13 11:07:34 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 11:07:38 2007
Subject: [Frugalware-git] homepage-ng: fix in .hu announce url
Message-ID: <20071013090734.E7C3713A4002@genesis.frugalware.org>

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

commit e2b0f5a9d5c16fc46f3fec391fdcd501a13d7cd2
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 11:06:51 2007 +0200

fix in .hu announce url

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index f5f7e3a..e9cbd00 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -18,7 +18,7 @@
<author>IroNiQ</author>
<hidden>0</hidden>
<content><![CDATA[
-			A Frugalware Fejelsztői Csapat örömmel <a href="/new/76/hu">jelenti be</a> a Frugalware 0.7 azonnali elérhetőségét, mint hetedik stabil kiadásunkat.<br />
+			A Frugalware Fejelsztői Csapat örömmel <a href="/news/76/hu">jelenti be</a> a Frugalware 0.7 azonnali elérhetőségét, mint hetedik stabil kiadásunkat.<br />
Igaz, hogy ĂşjdonsĂĄg nem kerĂźlt bele 0.7rc2 Ăłta, de tĂśbb, mint 150 aprĂłbb hibajavĂ­tĂĄs tĂśrtĂŠnt.
Ha nem kĂśvette folyamatosan a vĂĄltozĂĄsokat, Ă­me a legfontosabbak 0.6 Ăłta:<br />
<ul>
From hermier at frugalware.org  Sat Oct 13 11:39:34 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Sat Oct 13 11:39:36 2007
Subject: [Frugalware-git] homepage-ng: First attempt to make the locale news
	for french.
Message-ID: <20071013093934.11D8813A4002@genesis.frugalware.org>

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

commit c903fe58c7b4580ee5d04580145ef6f2e4f2d4e4
Author: Michel Hermier <hermier@frugalware.org>
Date:   Sat Oct 13 11:39:26 2007 +0200

First attempt to make the locale news for french.

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
new file mode 100644
index 0000000..26b2a82
--- /dev/null
+++ b/frugalware/xml/news_fr.xml
@@ -0,0 +1,2366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE news [
+<!ELEMENT news (post)*>
+<!ELEMENT post (id , title , date , author , editedby* , icon* , content, hidden)>
+<!ELEMENT id (#PCDATA)>
+<!ELEMENT date (#PCDATA)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT author (#PCDATA)>
+<!ELEMENT content (#PCDATA)>
+<!ELEMENT hidden (#PCDATA)>
+<!ELEMENT editedby (name , date)>
+<!ELEMENT icon (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
+]>
+
+<!-- if you modify this file, be sure it's still valid - xmllint is your friend -->
+
+<news>
+	<post>
+		<id>76</id>
+		<title>Frugalware 0.7 (Sayshell) for i686 and x86_64 released</title>
+		<date>Sat Oct 13 02:58:26 CEST 2007</date>
+		<author>hermier</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Les dÊveloppeurs de Frugalware ont le plaisir de vous <a href="/news/76">annoncer</a> la sortie de Frugalware 0.7, notre septième version stable.<br />
+			Aucune nouvelles fonctionalitĂŠs n'a ĂŠtĂŠ ajoutĂŠes depuis la 0.7rc2, mais plus de 150 modifications ont ĂŠtĂŠ effectuĂŠes pour corriger des bugs mineurs.
+			Si vous n'avez pas suivi les changements avec les pre-release et les release candidate, voici les plus importants changements depuis la version 0.6:<br />
+			<ul>
+				<li>Mise à jour du système de bas: Linux kernel 2.6.22.9, Glibc 2.6.1 et GCC 4.2.1.</li>
+				<li>Mise Ă  jour des environnements graphiques: KDE 3.5.7, GNOME 2.20, XFCE 4.4.1, OpenOffice 2.3.0 et Firefox 2.0.0.7.</li>
+				<li>Un LiveCD appellĂŠ FwLive est maintenant disponible pour cette release.</li>
+				<li>Installateur: langue spĂŠcifique par dĂŠfaut (clavier, zone horaire, mirroir par dĂŠfaut), l'installation est maintenant enregistrĂŠe dans un log.</li>
+				<li>Ajout du support pour les langues suivantes: Roumain, SuĂŠdois, Italien et Danois.</li>
+				<li>Nouveaux outils graphiques: Gfpm (gestionnaire de paquet) et Gnetconfig (configurateur de rĂŠseau).</li>
+				<li>Documentation: le manuel d'utilisateur Frugalware compte maintenant plus de 100 pages: tutoriels, trucs et astuces.</li>
+			</ul>
+			Pour plus d'informations consultez le <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-0.7/ChangeLog.txt">Changelog</a> de Frugalware Sayshell.<br />
+			TĂŠlĂŠchargements pour i686:<br />
+				<a href="/download/frugalware-0.7-iso/fwlive-0.7-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.7-iso/fwchroot-0.7-i686.tar.bz2">chroot tarball</a>
+				<br />
+			TĂŠlĂŠchargements pour x86_64:<br />
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.7-iso/fwchroot-0.7-x86_64.tar.bz2">chroot tarball</a>
+				<br />
+			<b>NOTE</b>: Ne tÊlÊchargez pas les CD 3 à 12, ou le deuxième DVD à moins que vous n'ayez pas de connexion internet !!!<br />
+			SHA1SUMs:
+			<pre>
+11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
+c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
+0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
+c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
+6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
+3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
+c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
+3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
+621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
+b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
+af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
+00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
+a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
+f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
+0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
+b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
+a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
+dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
+95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
+89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
+0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
+7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
+93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
+9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
+82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
+339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
+4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
+f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
+9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
+00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
+eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
+fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
+26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
+31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
+88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz
+			</pre>
+			Si vous mettez votre système à jour vers Sayshell depuis une prÊcÊdente version (Terminus), veuillez lire la partie <a href="http://frugalware.org/docs/stable/upgrade">mise à jour</a> de notre documentation.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>75</id>
+		<title>Mise Ă  jour du noeau dans -current: AVERTISSEMENT pour les utilisateurs Intel avec des controlleurs IDE</title>
+		<date>Thu Oct  4 15:08:53 UTC 2007</date>
+		<author>hermier</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+						Depuis le kernel-2.6.22-6 dans Frugalware-current, les utilisateurs Intel aurons des pÊriphÊriques /dev/sd* à la place des /dev/hd*. La raison est la suivante: Il à ÊtÊ impossible de dÊmarrer le noyeau sur certaines machine sans ce changement. Voir <a href="http://bugs.frugalware.org/2243">ce rapport d'erreur</a> pour plus de dÊtails. En consÊquence, apès avoir mis à jour en utilisant pacman -Syu, vous devrez:
+						<ol>
+										<li>Verrifiez si vous possĂŠdez un controlleur IDE Intel en faisant un: sudo lspci |grep -i intel.*ide. Si vous n'avez aucun rĂŠsultat sous n'ĂŞtes probablement pas affectĂŠ.</li>
+										<li>Edit /etc/fstab: changez toutes les occurrences de /dev/hd en /dev/sd.</li>
+										<li>Edit /boot/grub/menu.lst: changez toutes les occurrences de /dev/hd en /dev/sd dans les entrĂŠes Frugalware.</li>
+										<li>Reboot.</li>
+						</ol>
+						En vous remerciant de votre comprĂŠhension!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>74</id>
+		<title>Frugalware 0.7rc2 (Sayshell) released</title>
+		<date>Tue Oct  2 11:08:42 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/74">announce</a> the immediate availability of Frugalware 0.7rc2, the last candidate of the upcoming 0.7 stable release.<br />
+			A short and incomplete list of changes since 0.7rc1:<br />
+			<ul>
+				<li>Package updates:
+					<ul>
+						<li>GNOME 2.20.0</li>
+						<li>OpenOffice.org 2.3 with OOXML support and Mozilla plugin</li>
+						<li>More than 1000 changes, mostly bugfixes</li>
+					</ul>
+				</li>
+				<li>New features:
+					<ul>
+						<li>Added Gfpm, a graphical package manager</li>
+						<li>New Gfpm and Gnetconfig plugins for Xfce4 settings manager</li>
+					</ul>
+				</li>
+				<li>Setup:
+					<ul>
+						<li>Fixed PPPoE support</li>
+						<li>Slow format (when checking for bad blocks is enabled) works again for swap partitions</li>
+						<li>Fixed Swedish language support</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/fwlive-0.7rc2-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc2-i686-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+817395071b963878b186cb6de3cc625c054a2fdc  frugalware-0.7rc2-i686-cd10.iso
+08aaacc8b0a49cedbdfbf0cc250c381865e35e12  frugalware-0.7rc2-i686-cd11.iso
+26090540104483c2e0ea5cb04cef94bead0126b2  frugalware-0.7rc2-i686-cd12.iso
+57f6a6b306666bdd4e273e6b1bf860f5c2553172  frugalware-0.7rc2-i686-cd13.iso
+00f9519569b0ab82933a6f7ad72b88f416c0ff29  frugalware-0.7rc2-i686-cd1.iso
+3cb912374d3e2dd6146875b841409b8bf837fd77  frugalware-0.7rc2-i686-cd2.iso
+34d7f5629e81649985fdc51cdb393f8f58265601  frugalware-0.7rc2-i686-cd3.iso
+dab534a873c0d467189f15b939725ec13c951dd5  frugalware-0.7rc2-i686-cd4.iso
+1595df5afb10bce2c15beed340a743c1c5a7a830  frugalware-0.7rc2-i686-cd5.iso
+9d1adf02056ab5c956c58d3b1fa3fee34deb3643  frugalware-0.7rc2-i686-cd6.iso
+ae039f89f48c5ea9d9f2210818e3ad293a549c64  frugalware-0.7rc2-i686-cd7.iso
+141732044d0326a43d4fedfc625e14b78227fe11  frugalware-0.7rc2-i686-cd8.iso
+126a5e21d68e338b63d995962ffed74ee0b10f4f  frugalware-0.7rc2-i686-cd9.iso
+b07a0279cda34d253accd8cb1d20bbbec8323a22  frugalware-0.7rc2-i686-dvd1.iso
+703de06fbe5bf8a921dd359a3a645fc852f2b800  frugalware-0.7rc2-i686-dvd2.iso
+9cddd7752c80b891713e13b5cda3147babcd5fe4  frugalware-0.7rc2-i686-net.iso
+de6daa9f334d72718c789fd76351e02116ea7b24  fwlive-0.7rc2-i686-full.iso
+ca1ece2660098ea631381bb9e5ee7ab3a63e82c6  frugalware-0.7rc2-i686-tftp.img.gz
+e5171b988e894674def71156f71accc6cdc81312  frugalware-0.7rc2-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>73</id>
+		<title>Frugalware 0.7rc1 (Sayshell) released</title>
+		<date>Tue Sep  4 02:40:14 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/73">announce</a> the immediate availability of Frugalware 0.7rc1, the first candidate of the upcoming 0.7 stable release.<br />
+			A short and incomplete list of changes since 0.7pre2:<br />
+			<ul>
+				<li>Package updates:
+					<ul>
+						<li>GNU C Library 2.6.1</li>
+						<li>Replaced util-linux with util-linux-ng</li>
+						<li>More than 30 new packages</li>
+						<li>Added detailed documentation for the util-linux-ng, amavisd-new and ejabberd packages</li>
+						<li>More than 900 changes: package updates, bug- and security fixes.</li>
+					</ul>
+				</li>
+				<li>New features:
+					<ul>
+						<li>Added permalinks to the documentation</li>
+						<li>Rewritten the package builder daemon, which now supports distributed operation. This results in continuous package updates even if one package builder server is not available.</li>
+					</ul>
+				</li>
+				<li>Setup:
+					<ul>
+						<li>new Danish translation</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/fwlive-0.7rc1-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7rc1-i686-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+4bb7b25e1a0e10e3074e8536043b2560e7d1482b  frugalware-0.7rc1-i686-cd10.iso
+930bffed77bc653acb36def009e3cd60967888c2  frugalware-0.7rc1-i686-cd11.iso
+99dec9ae6fa90e65a55ada6066006fe7077c2674  frugalware-0.7rc1-i686-cd12.iso
+c99cb96116a19a5d08520855eda42410fb879e2c  frugalware-0.7rc1-i686-cd13.iso
+cc5917a64ae70ca5b1abacf77b91a456e22a10a3  frugalware-0.7rc1-i686-cd1.iso
+12c6510a6b82fb59993776b6f70bb3f00484f219  frugalware-0.7rc1-i686-cd2.iso
+16d444b76438c322af803677566af1f6a4061055  frugalware-0.7rc1-i686-cd3.iso
+aa96e6d0e10707219967fa350e7db4548df69e5d  frugalware-0.7rc1-i686-cd4.iso
+7adc55e038707e989062b93a633cdbb622481cbd  frugalware-0.7rc1-i686-cd5.iso
+7e6985290a71b5e60605829894d12bb12f0b7385  frugalware-0.7rc1-i686-cd6.iso
+155f8d14301c8ac4bc40f2fc94f97051be376ce0  frugalware-0.7rc1-i686-cd7.iso
+0f02412084c7ec1b5a9a00f27cce755663286cf7  frugalware-0.7rc1-i686-cd8.iso
+e5cdb93601e2d56da31efd207fb45160ac67e096  frugalware-0.7rc1-i686-cd9.iso
+8e7d7936a578a6fef9065bbb80c7cd4b02ee3e45  frugalware-0.7rc1-i686-dvd1.iso
+eb2ad29098cc9fcab5b715abda398f559ed4080e  frugalware-0.7rc1-i686-dvd2.iso
+86818f76c430a9a941d7c292ca9e17dc90f686d7  frugalware-0.7rc1-i686-net.iso
+50d45d74cf8d019df9ab1b1cbd988902b74a7536  fwlive-0.7rc1-i686-full.iso
+819e936e9b4ce96f92279958ecb869e744d07874  frugalware-0.7rc1-i686-tftp.img.gz
+a1a22df8d4ea671fb88c0fac30510af19bd578e3  frugalware-0.7rc1-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>72</id>
+		<title>Frugalware 0.7pre2 (Sayshell) released</title>
+		<date>Mon Jul 30 09:25:25 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/72">announce</a> the immediate availability of Frugalware 0.7pre2, the second technical preview of the upcoming 0.7 stable release.<br />
+			A short and incomplete list of changes since 0.7pre1:<br />
+			<ul>
+				<li>New features:
+					<ul>
+						<li>New graphical configuration tool, Gnetconfig to tweak your network settings.</li>
+						<li>Setup now puts the installer log to the target system, so that the log is not lost.</li>
+						<li>The default timezone and keyboard layout is now language-dependent.</li>
+						<li>New Italian translation in the installer.</li>
+					</ul>
+				</li>
+				<li>Package updates:
+					<ul>
+						<li>Linux kernel 2.6.22 (+ fixes)</li>
+						<li>GCC-4.2.1, with several bugfixes and a usable java browser plug-in for systems where the binary is not available, like x86_64.</li>
+						<li>OpenOffice.org 2.2.1</li>
+					</ul>
+				</li>
+				<li>New packages:
+					<ul>
+						<li>VIM spell-check dictionaries for various languages</li>
+						<li>More than 100 new packages: qmpdclient, gpsdrive, emovix, gpodder, horde-webmail and many more!</li>
+					</ul>
+				</li>
+				<li>Homepage:
+					<ul>
+						<li>It is now possible to browse HTML documentation for a package on the homepage.</li>
+						<li>Replaced darcsweb with gitweb in accordance with the darcs to git change.</li>
+					</ul>
+				</li>
+				<li>A list of bugs reported after the release of the installer images can be viewed <a href="http://wiki.frugalware.org/KnownBugs-0.7pre2">here</a>.
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/fwlive-0.7pre2-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-cd13.iso">cd13</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre2-i686-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+f0a2f5c804d94105d670b2d0b53eee677fb7131c  frugalware-0.7pre2-i686-cd10.iso
+58d87ad2c982bc199cee0133c8a9430e7f67e9d4  frugalware-0.7pre2-i686-cd11.iso
+bdee557bd72c8d63a25218cf8f1fceb8157d44bd  frugalware-0.7pre2-i686-cd12.iso
+4ea19e4128b19e6c1aa47627003f31eb09478ecb  frugalware-0.7pre2-i686-cd13.iso
+b16584609343dcf61ec837fa7e037cc07b60a517  frugalware-0.7pre2-i686-cd1.iso
+0575d77c27bedc2c963745690496c4bdbe5d9937  frugalware-0.7pre2-i686-cd2.iso
+c00ca8074ab6c8db80e3fad5fd2ada0e7cc137e9  frugalware-0.7pre2-i686-cd3.iso
+21df7dc6a7005b29ed25e35ef0b7b7e2e5d2345d  frugalware-0.7pre2-i686-cd4.iso
+cb421cf75ad1f2b82d0188334044a4d07154ac3d  frugalware-0.7pre2-i686-cd5.iso
+aee3e763c91c5b980db61018fa228e6142cb131e  frugalware-0.7pre2-i686-cd6.iso
+e95951f7c88030622f21797ea4f2930d10c5bcdf  frugalware-0.7pre2-i686-cd7.iso
+7d9b1ffcc055513890c2a27300967dc2cb1c454b  frugalware-0.7pre2-i686-cd8.iso
+2c364a96517e248a17a9d92bf20c0a4ff9b2f09c  frugalware-0.7pre2-i686-cd9.iso
+a678d9fbb675b9208a1827e8bb04738114497ca0  frugalware-0.7pre2-i686-dvd1.iso
+a45cadb05177d45e953f39006424a2eaf975d0b0  frugalware-0.7pre2-i686-dvd2.iso
+379dc4155b4de15fe1aa0c50bc2ccecf216da1eb  frugalware-0.7pre2-i686-net.iso
+a53b074f258a63ed004fab1853f31ab5f2259dad  fwlive-0.7pre2-i686-full.iso
+f4945dd97d922cc668bc26c78cde2ba8638753de  frugalware-0.7pre2-i686-tftp.img.gz
+2618cf5e815f9af6be792b0376217dc3091f333e  frugalware-0.7pre2-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>71</id>
+		<title>Frugalware Newsletter Issue 9</title>
+		<date>Wed Jul 25 14:06:29 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The ninth issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/9">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>70</id>
+		<title>Frugalware Newsletter Issue 8</title>
+		<date>Sun Jul  1 12:28:27 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The eighth issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/8">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>69</id>
+		<title>Frugalware Newsletter Issue 7</title>
+		<date>Sun Jun 17 12:17:25 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The seventh issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/7">here</a>. We hope you like it! If you would like to vote on which design you would like to see on the next version of our homepage, read this issue!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>68</id>
+		<title>Happy 3rd birthday, Frugalware!</title>
+		<date>Sat Jun 16 13:14:49 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+						<pre>
+$ lynx -dump http://ftp.frugalware.org/pub/archive/frugalware-0.1/ChangeLog.txt|tail -n 7
+Wed <b>Jun 16</b> 14:42:01 CEST 2004, by VMiklos
+- Changelog: initial release
+...
+
+$ date
+Sat <b>Jun 16</b> 13:14:49 CEST 2007
+						</pre>
+						Cheer, dance, party!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>67</id>
+		<title>Frugalware 0.6a (Terminus) for x86_64 released</title>
+		<date>Sun Jun 3 07:54:12 CEST 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/67">announce</a> the immediate availability of Frugalware 0.6a for x86_64. This is a bug fix release to fix
+			various issues that users have encountered with the x86_64 0.6 releases. These new ISOs contain all security fixes since the release of 0.6.<br /><br />
+
+			Please note that if you want to use i686, you should still use the original 0.6 ISOs. This release is for x86_64 only.<br /><br />
+
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-stable/ChangeLog.txt">ChangeLog</a> for more information.<br />
+			Download for x86_64:<br />
+			<b>NOTE</b>: Don't download CDs 3-9 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6a-x86_64-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+1d6f6a8a2b816090e3ba5399f5b4caeea9a588b7  frugalware-0.6a-x86_64-cd1.iso
+25fe5dab4f02d1c0ecc812e47cd139e1edc71a23  frugalware-0.6a-x86_64-cd2.iso
+a47d2b65f10fdf3d2a16621e8fe307f653dd251a  frugalware-0.6a-x86_64-cd3.iso
+a90f2faca524c97502f53557348a84fcb4465e87  frugalware-0.6a-x86_64-cd4.iso
+424c4b8351196ce10384dbb6a1fb72f35569198a  frugalware-0.6a-x86_64-cd5.iso
+cf5fa95b4afd4ee0cf07b59305b5ae821aa7f52c  frugalware-0.6a-x86_64-cd6.iso
+b613c3b5cd9d7f4b7950eb9bdfed683bb1761a84  frugalware-0.6a-x86_64-cd7.iso
+11c82a8b4d60fe3c17e5a16ab9540d4544d76cfa  frugalware-0.6a-x86_64-cd8.iso
+6ab188efb1e806f60b2b07591c7c488687f2c4de  frugalware-0.6a-x86_64-cd9.iso
+975254550d328b9a6f0a173c4affbba4bf197258  frugalware-0.6a-x86_64-dvd1.iso
+193e15d1c9e762db73cf1344336355c89a5739dd  frugalware-0.6a-x86_64-dvd2.iso
+93f4b96bb0aa3cbafeb3a6bac12deee80e5e84bb  frugalware-0.6a-x86_64-net.iso
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>66</id>
+		<title>Frugalware Newsletter Issue 6</title>
+		<date>Sat Jun 2 08:45:13 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The sixth issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/6">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>65</id>
+		<title>Yugo: new i686 buildserver</title>
+		<date>Sat May 26 07:56:26 CEST 2007</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			I'm pleased to announce our new i686 buildserver, called yugo.<br />The server is working well, you can see the syncpkgd results <a href="http://yugo.frugalware.org/">here</a>.<br />I'd like to thank everyone who offered to donate!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>64</id>
+		<title>Frugalware 0.6 and 0.7pre1 torrents</title>
+		<date>Thu May 24 23:14:08 CEST 2007</date>
+		<author>Hermier</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Trackerless torrents for Frugalware's ISO can be found <a href="http://blogs.frugalware.org/index.php?cat=51">here</a>.
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>63</id>
+		<title>Frugalware 0.7pre1 (Sayshell) released</title>
+		<date>Tue May 24 07:14:08 CEST 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/63">announce</a> the immediate availability of Frugalware 0.7pre1, the first technical preview release of the upcoming 0.7 stable release.<br />
+			A short and incomplete list of changes since 0.6:<br />
+			<ul>
+				<li>Improvements:
+					<ul>
+						<li>The package manager (pacman-g2) now supports checking the integrity of your database.</li>
+						<li>A LiveCD called FwLive is now available for this prerelease.</li>
+						<li>A new web interface has been added to help translating Frugalware. See the <a href="http://frugalware.org/docs/translations">documentation</a> for more information.</li>
+						<li>Support for XOrg 6.x has been dropped.</li>
+					</ul>
+				</li>
+				<li>Setup:
+					<ul>
+						<li>New Romanian and Swedish translations.</li>
+						<li>The keyboard layouts are now sorted.</li>
+					</ul>
+				</li>
+				<li>Package updates:
+					<ul>
+						<li>Linux kernel 2.6.21</li>
+						<li>GCC 4.2.0</li>
+						<li>GNU C Library 2.6</li>
+						<li>Pidgin replaced Gaim, the external plugin packages have been updated accordingly.</li>
+						<li>A new XULRunner package has been added and all GNOME apps that have depended upon Firefox for HTML rendering have been rebuilt against XULRunner.</li>
+						<li>OpenOffice.org 2.2 + updated localizations + updated dictionaries</li>
+						<li>More than 100 new packages</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/fwlive-0.7pre1-i686-full.iso">livecd</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-cd12.iso">cd12</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.7pre1-i686-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+2951f4943fbdd46e669925cd2510fe625e4bef91  frugalware-0.7pre1-i686-cd10.iso
+195481436ddbcdb7f189aec8c99813f07da1b600  frugalware-0.7pre1-i686-cd11.iso
+59ae45534fc7a1732439811fd7d1d24066f22890  frugalware-0.7pre1-i686-cd12.iso
+7897353b7aef0d10a61cc646f61e7d92a3ad0d51  frugalware-0.7pre1-i686-cd1.iso
+135acbd57121546144f12d6e0969e632992eadd6  frugalware-0.7pre1-i686-cd2.iso
+0a63f6fb5daf14abfa6bae548accf36cbf843e7a  frugalware-0.7pre1-i686-cd3.iso
+48d7a75f4a375b4738efc5546c9690c003e9a023  frugalware-0.7pre1-i686-cd4.iso
+9e083a479103a9a5efac0afab96b75b5514be8f5  frugalware-0.7pre1-i686-cd5.iso
+f6ecd759a0b0837b2928d3d3659fd92555f06796  frugalware-0.7pre1-i686-cd6.iso
+678a0903d897a06ea449a6cf07f6494105ef7930  frugalware-0.7pre1-i686-cd7.iso
+ae8caff2992fb7069a80e5a350ece8bd90dab467  frugalware-0.7pre1-i686-cd8.iso
+1385ed8f87104b923a57d2f38701489f3dd30f4f  frugalware-0.7pre1-i686-cd9.iso
+6931e71d3ff07340dc380a907b1fb45d67d91b1e  frugalware-0.7pre1-i686-dvd1.iso
+db304778e4d36c549b3a58ace6550d6b85d9acf5  frugalware-0.7pre1-i686-dvd2.iso
+4fc67b372cbb2d6e7d7772b4d35f1246b274538e  frugalware-0.7pre1-i686-net.iso
+0ecd35c293dcbbe5b56bafb4837ab137efb7c35e  fwlive-0.7pre1-i686-full.iso
+29d9969df2c65fc1437d7e9fab8a997c21a6d6a2  frugalware-0.7pre1-i686-tftp.img.gz
+bdef8ebc832707a33ef60b4a257e832df74d3859  frugalware-0.7pre1-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>62</id>
+		<title>Frugalware Newsletter Issue 5</title>
+		<date>Tue May 14 17:37:15 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The fifth issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/5">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>61</id>
+		<title>Frugalware Newsletter Issue 4</title>
+		<date>Tue May  1 19:08:24 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The fourth issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/4">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>60</id>
+		<title>Request: IDE HDDs</title>
+		<date>Tue Apr 24 20:35:18 CEST 2007</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Unfortunately we lost our i686 buildserver. But we have changed our main server to a stronger one, so now we have a quiet good machine. Without any hard disks. So we'd like to ask our users to donate us. Till the i686 buildserver is not working, the current repo is not in sync with the x86_64 one.<br />
+			The needed HDDs:
+			<ul>
+				<li>at least one smaller (20-40GB) IDE HDD for system</li>
+				<li>at least one bigger (min. 80-100GB) IDE HDD for build environment</li>
+			</ul>
+			If you have anything to donate, please send a mail to VMiklos (vmiklos at frugalware dot org) or IroNiQ (iron at frugalware dot org) or search for them on Freenode Network at #frugalware channel.<br />
+			Thank you for your donation.
+		]]>
+		</content>
+	</post>
+	<post>
+		<id>59</id>
+		<title>Frugalware Newsletter Issue 3 and Homepage design contest!</title>
+		<date>Thu Apr 14 21:43:31 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The third issue of our fortnightly newsletter has been released! You can read it <a href="/newsletter/3">here</a>. In this issue we have announced a contest to create a design for the next version of the Frugalware homepage.
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>58</id>
+		<title>Frugalware Newsletter Issue 2</title>
+		<date>Thu Mar 31 21:12:35 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The second issue of our newsletter has been released! You can read it <a href="/newsletter/2">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>57</id>
+		<title>Frugalware 0.6 (Terminus) for i686 and x86_64 released</title>
+		<date>Thu Mar 22 07:04:52 CET 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/57">announce</a> the immediate availability of Frugalware 0.6, our sixth stable release.<br />
+			A short and incomplete list of changes since 0.6rc2:<br />
+			<ul>
+				<li>Linux 2.6.20.3</li>
+				<li>We are proud to be one of the first distributions to ship the stable GNOME 2.18</li>
+				<li>Fixed a few bugs in XDM</li>
+			</ul>
+			If you didn't follow the changes during the pre/rc releases, here are the most important changes since 0.5:<br />
+			<ul>
+				<li>Up to date base system: Glibc 2.5, Binutils 2.17.50.0.6 with DT_GNU_HASH support, DBUS 1.0 and Python 2.5</li>
+				<li>Up to date desktop packages: KDE 3.5.6, XFCE 4.4, Beryl 0.2.0, OpenOffice 2.1, Firefox 2.0.0.2 and GNOME 2.18</li>
+				<li>All installed-by-default packages using Java are now built using gcj/ecj, the original binary javac is only provided as an alternate compiler.</li>
+				<li>Setup: speed improvements, support for more custom action, tftp installs and usb sticks are now supported.</li>
+				<li>Full support for Xgl/Beryl in KDE</li>
+				<li>Documentation: it is more than two times longer than it was until now.</li>
+			</ul>
+			Known Issues:<br />
+			<ul>
+				<li>If you use a JMicron disk controller and you cannot boot 0.6, try booting with any of these options on the GRUB prompt: irqpoll, libata.atapi_enabled=0 and combined_mode=libata</li>
+				<li>The first time you attempt to use the Main Menu application in GNOME to edit the menus, the GNOME Panel will crash. This will not happen again after that. This will hopefully be fixed sometime and an update will be released.</li>
+				<li>If you want to use x86_64, <b>download <a href="/news/67">0.6a for x86_64</a> instead!</b></li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-0.6/ChangeLog.txt">Terminus ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.6-iso/fwchroot-0.6-i686.tar.bz2">chroot tarball</a>
+				<br />
+			Download for x86_64:<br />
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-net.iso">netinstall</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-dvd1.iso">dvd1</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-dvd2.iso">dvd2</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-0.6-iso/frugalware-0.6-x86_64-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-0.6-iso/fwchroot-0.6-x86_64.tar.bz2">chroot tarball</a>
+				<br />
+			<b>NOTE</b>: CDs 3+ or the second DVD is needed only if you don't have an internet connection!<br />
+			SHA1SUMs:
+			<pre>
+0c14c830b2257e6772dd134d062e3c34faa841c9  frugalware-0.6-i686-cd10.iso
+909b1a2d0db63685e60a382ec3e04429e9097ed1  frugalware-0.6-i686-cd11.iso
+f38e82d9ed02efe39a06f66128f93fb224509cf0  frugalware-0.6-i686-cd1.iso
+604594990afaf82e8a0565debcaf3eb57692c912  frugalware-0.6-i686-cd2.iso
+c938a4a9030a26a2a26e2f770fff6ca43a2833b3  frugalware-0.6-i686-cd3.iso
+dccb31cd81b8e18aa81c0b4f01278dabcdd59a00  frugalware-0.6-i686-cd4.iso
+a0e5731f835f5c6f2ff39c7b0b06b75a098ba845  frugalware-0.6-i686-cd5.iso
+d46d7ad304ff6cf6ad85afbdc27dc351a9fbc255  frugalware-0.6-i686-cd6.iso
+66418f82dbff85d5b47ec22053511355ab040e06  frugalware-0.6-i686-cd7.iso
+1d229da2c46a5afceb5ec35a4dcafaccd3a4ef09  frugalware-0.6-i686-cd8.iso
+a67324848c276954982c8d3f1c428b294d01f746  frugalware-0.6-i686-cd9.iso
+2d8b63f9bf5ef39215ac6a6fbc15262963f0a521  frugalware-0.6-i686-dvd1.iso
+cd5c19e93c33e46f42e6678e24e15708684c6656  frugalware-0.6-i686-dvd2.iso
+f7a53822e544f74edb2ffb6194d67ffcbf3f51a9  frugalware-0.6-i686-net.iso
+505fceb77f476c48bbb3c5635953c6449e6826fb  frugalware-0.6-x86_64-cd1.iso
+29e35194627771550dfebff03ff74537a3641ee8  frugalware-0.6-x86_64-cd2.iso
+c7615bffb692855c4aa509ca51f3dcedf4086015  frugalware-0.6-x86_64-cd3.iso
+2295fe302c76513b97ece7b613c3f14c51ceb902  frugalware-0.6-x86_64-cd4.iso
+2eb0bd1e8022b289a425c546dfbc484decc1987a  frugalware-0.6-x86_64-cd5.iso
+5dc16e1ef1b0020edecb98e2dc30abb8a9055bf7  frugalware-0.6-x86_64-cd6.iso
+10c06c76c30c42cbbb2313851e914e007e9ce3f3  frugalware-0.6-x86_64-cd7.iso
+a5394def2b7bc5dcfdeb32682f2303bed196faaf  frugalware-0.6-x86_64-cd8.iso
+d2fc7a8385fee28b8a98ae133a9bb6d719bf2b61  frugalware-0.6-x86_64-cd9.iso
+f93c730809525ec3662c375ee061e7f296ef3150  frugalware-0.6-x86_64-dvd1.iso
+ec86c28e314e385dd411535c819c71428f36852f  frugalware-0.6-x86_64-dvd2.iso
+43e75f0dc34aa8a2e61de09f89c8a0db9fbc1d04  frugalware-0.6-x86_64-net.iso
+			</pre>
+			If you are upgrading from our previous stable release, you may want to read the <a href="http://frugalware.org/docs/stable/upgrade">upgrade</a> part of our documentation.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>56</id>
+		<title>Frugalware Newsletter Issue 1</title>
+		<date>Thu Mar 13 07:58:20 CET 2007</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Newsletter is a new fortnightly (Hopefully... ;-)) newsletter which aims to keep users up to date about what's been going on in Frugalware development.<br />
+			The first issue can be found <a href="/newsletter/1">here</a>. We hope you like it!
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>55</id>
+		<title>Frugalware 0.6rc2 (Terminus) released</title>
+		<date>Thu Mar  8 07:57:25 CET 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/55">announce</a> the immediate availability of Frugalware 0.6rc2, the second release candidate of the upcoming 0.6 stable release.<br />
+			A short and incomplete list of changes since 0.6rc1:<br />
+			<ul>
+				<li>Improvements:
+					<ul>
+						<li>Updated the documentation: obsolete parts are removed, new parts are written, it is more than two times longer than it was till now.</li>
+						<li>Finished the artwork update, it is now homogenous again.</li>
+						<li>Updated the translations of the installer</li>
+					</ul>
+				</li>
+				<li>Package updates:
+					<ul>
+						<li>GCC 4.1.2 with changes to correct regressions from previous releases</li>
+						<li>GNOME 2.18.0 RC1 with cool features, important bug fixes, great translations</li>
+						<li>More than 30 new packages: asciidoc, bzflag, rtl8110, new beryl plugins and much more!</li>
+					</ul>
+				</li>
+			</ul>
+			<b>WARNING:</b> It has been discovered that the GConf version included in 0.6rc2 is broken and therefore GNOME will not work on a default install. To get around this, you should not install the gnome group when installing, and install it from frugalware-current afterwards, making sure that the gconf version to install is 2.18.0.1. Sorry for the inconvenience<br /><br />
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-11 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-net.iso">netinstall</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-usb.tar.gz">usb</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-tftp.img.gz">tftp</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd1.iso">cd1</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd2.iso">cd2</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd3.iso">cd3</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd4.iso">cd4</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd5.iso">cd5</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd6.iso">cd6</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd7.iso">cd7</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd8.iso">cd8</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd9.iso">cd9</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd10.iso">cd10</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-cd11.iso">cd11</a>,
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-dvd1.iso">dvd1</a> and
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc2-i686-dvd2.iso">dvd2</a>
+				<br />
+			SHA1SUMS:
+			<pre>
+66c303c9b17043ecce69abf4f8320f4669044bfe  frugalware-0.6rc2-i686-cd1.iso
+ed3c81f600e9c62e714ea183fa457fdf4028e759  frugalware-0.6rc2-i686-cd2.iso
+2ac932a6757a9eec4648bb39dbcf56844456f856  frugalware-0.6rc2-i686-cd3.iso
+25ce844a8e2ae1754d060b7839373aeedc2d3b61  frugalware-0.6rc2-i686-cd4.iso
+71e628b6de75218b8c564314820591960ca95d89  frugalware-0.6rc2-i686-cd5.iso
+080e946d74f269a5dcbd20c3ec0f7dfe132ccd2e  frugalware-0.6rc2-i686-cd6.iso
+0d29ddff61379825401fffd2a862f0e25ddda32b  frugalware-0.6rc2-i686-cd7.iso
+22c20685309f593a208fe778488c4fe0cf5bd3d1  frugalware-0.6rc2-i686-cd8.iso
+4d0a842692f4a9a846612ab3b35806987f84b948  frugalware-0.6rc2-i686-cd9.iso
+ea0965c3d416b756d02a80aa48fe169285080c18  frugalware-0.6rc2-i686-cd10.iso
+5ce856f979e19f50e46ee29eefc9b5448a47b90e  frugalware-0.6rc2-i686-cd11.iso
+78dde3b0db56db9d03d4238b48289682307c468d  frugalware-0.6rc2-i686-dvd1.iso
+46595eac01beec13e2d94c8e356af98b188665d6  frugalware-0.6rc2-i686-dvd2.iso
+90d7a03bdad19646c4acc6b3a2eb24fa4dd742ed  frugalware-0.6rc2-i686-net.iso
+3b5b9794ac9ee850634c609bf186d558aac00f69  frugalware-0.6rc2-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>54</id>
+		<title>Frugalware 0.6rc1 (Terminus) released</title>
+		<date>Thu Feb 15 07:22:24 CET 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/54">announce</a> the immediate availability of Frugalware 0.6rc1, the first release candidate of the upcoming 0.6 stable release.<br />
+			A short and incomplete list of changes since 0.6pre2:<br />
+			<ul>
+				<li>Improvements:
+					<ul>
+						<li>Brand new GDM theme, which has many improvements over previous themes.</li>
+						<li>Many packages recompiled to take advantage of new features in Glibc 2.5 and GCC 4.1.</li>
+					</ul>
+				</li>
+				<li>Package updates:
+					<ul>
+									<li>GNOME 2.17.90 with several bug fixes and speed enhancements</li>
+									<li>XFCE 4.4 with many new features and numerous bug fixes</li>
+									<li>Beryl 0.1.99.2 with many usablity, speed and reliability improvements</li>
+									<li>Added a package for VirtualBox, a free opensource virtualization program</li>
+									<li>Kernel 2.6.20 with KVM virtualization support and many speed enhancements</li>
+									<li>KDE 3.5.6</li>
+									<li>Wine 0.9.29 bringing stability improvements</li>
+									<li>45 new packages: mythtv, kvm, xfburn, cdrkit and much more!</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-11 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-net.iso">netinstall</a> (23M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-usb.tar.gz">usb</a> (21M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-tftp.img.gz">tftp</a> (114K),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd1.iso">cd1</a> (644M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd2.iso">cd2</a> (638M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd3.iso">cd3</a> (636M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd4.iso">cd4</a> (632M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd5.iso">cd5</a> (626M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd6.iso">cd6</a> (609M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd7.iso">cd7</a> (643M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd8.iso">cd8</a> (546M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd9.iso">cd9</a> (551M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd10.iso">cd10</a> (624M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-cd11.iso">cd11</a> (261M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-dvd1.iso">dvd1</a> (4.2G)
+				<a href="/download/frugalware-testing-iso/frugalware-0.6rc1-i686-dvd2.iso">dvd2</a> (2.0G)
+				<br />
+			SHA1SUMS:
+			<pre>
+60bcefcaa4c6c1a6a8e0161da9f11734a8b5dfad  frugalware-0.6rc1-i686-cd10.iso
+ad6117e2794f8d27f17b5328e0e047f38d87cfa7  frugalware-0.6rc1-i686-cd11.iso
+13b65b30f0bd4fea35faf93f2fab44a834ac852b  frugalware-0.6rc1-i686-cd1.iso
+dfa58ac7634c34081abc071c9f594b06ab94be84  frugalware-0.6rc1-i686-cd2.iso
+fa3d8467d863ae8e07289ff1dd93eef22f284ff0  frugalware-0.6rc1-i686-cd3.iso
+3b8d624f54b3499ac1c4fd39f74b66b7f6018f11  frugalware-0.6rc1-i686-cd4.iso
+d2f463156477b75e834808f01e77ee5d20483a2c  frugalware-0.6rc1-i686-cd5.iso
+734e4837ef97326d239e5512b7ab30820219a2ed  frugalware-0.6rc1-i686-cd6.iso
+b760124be5d1c0cf6680fc4a0bfe53f18d3a10c2  frugalware-0.6rc1-i686-cd7.iso
+6f804b2511531241b6493acc451ac8b1e6318027  frugalware-0.6rc1-i686-cd8.iso
+0faefa6e7f3d8be7226c9c022ff7db75aea16fcf  frugalware-0.6rc1-i686-cd9.iso
+a2b747af6515fbbe467c4951acbdeb9b3824509a  frugalware-0.6rc1-i686-dvd1.iso
+c159d032f794393896570c70eca7b12480fb0f7a  frugalware-0.6rc1-i686-dvd2.iso
+52429f74cb961805790e163f2c6a83ded9a4db8c  frugalware-0.6rc1-i686-net.iso
+02e773e302d2bbb0d4ce1b8e3fa00ca934514746  frugalware-0.6rc1-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>53</id>
+		<title>Frugalware 0.6pre2 (Terminus) released</title>
+		<date>Thu Jan 11 13:05:38 CET 2007</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/53">announce</a> the immediate availability of Frugalware 0.6pre2, the second technical preview release of the upcoming 0.6 stable release.<br />
+			A short and incomplete list of changes since 0.6pre1:<br />
+			<ul>
+				<li>New features in the installer:
+					<ul>
+						<li>Much improved error handling. A dialog box will be displayed in the unlikely event of a segmentation fault and the installer will exit, instead of just restarting from the beginning.</li>
+						<li>Use library calls to download the package database, which gives better error handling. If the database update fails, you will be told about it, instead of being given an empty category list.</li>
+						<li>There is now an option to go back to a previous step in the installer (where it makes sense).</li>
+						<li>CD/DVD installation is now faster: integrity and conflict checks are done before creating the installation images.</li>
+						<li>There is floppy image available now for tftp installs.</li>
+					</ul>
+				</li>
+				<li>Improvements:
+					<ul>
+						<li>Added KDE support to fw-xgl-control and Beryl.</li>
+						<li>Gnome-mount, a replacement for pmount in GNOME resulting in more reliable and flexible automounting in GNOME.</li>
+					</ul>
+				</li>
+				<li>Updates:
+					<ul>
+									<li>Linux Kernel 2.6.19</li>
+									<li>Added virt-manager and gnome-applet-vm packages as GUI tools for Xen</li>
+									<li>GNOME 2.17.3, with new features and bug fixes</li>
+									<li>Xfce 4.4 Release Candidate 2, with a lot of bug fixes</li>
+									<li>Beryl 0.1.3 with lots of new eye-candy effects</li>
+									<li>dhcpcd 3.0, resulting in more reliable network autoconfiguration</li>
+									<li>Curl 7.16.0</li>
+									<li>DBUS 1.0 with several improvements and fixes</li>
+									<li>HAL 0.5.8.1 with new features and bug fixes</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-11 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-net.iso">netinstall</a> (22M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-usb.tar.gz">usb</a> (20M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-tftp.img.gz">tftp</a> (116K),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd1.iso">cd1</a> (643M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd2.iso">cd2</a> (638M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd3.iso">cd3</a> (634M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd4.iso">cd4</a> (643M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd5.iso">cd5</a> (633M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd6.iso">cd6</a> (626M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd7.iso">cd7</a> (609M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd8.iso">cd8</a> (556M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd9.iso">cd9</a> (552M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd10.iso">cd10</a> (643M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-cd11.iso">cd11</a> (229M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-dvd1.iso">dvd1</a> (4.2G)
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre2-i686-dvd2.iso">dvd2</a> (2.0G)
+				<br />
+			SHA1SUMS:
+			<pre>
+080e622c798520b422c8c0bb1701b00befd3358a  frugalware-0.6pre2-i686-cd1.iso
+9d04a684e8c16f8bc752b506718566e0f0060876  frugalware-0.6pre2-i686-cd2.iso
+4a4dcabcfe788b94a80cbeff9c0f7098e55d333c  frugalware-0.6pre2-i686-cd3.iso
+8ec847d3dae136829334d4d4a2aed1d2a45048c4  frugalware-0.6pre2-i686-cd4.iso
+e7b5fef4f747edc30d1684202b5ce06c4a86acc7  frugalware-0.6pre2-i686-cd5.iso
+0c654cc082b6df9354ff5c24827cca5363d239c1  frugalware-0.6pre2-i686-cd6.iso
+4f7de0abddc31543cc793efcd948b503f02a917a  frugalware-0.6pre2-i686-cd7.iso
+959a01a6e19b3f6edd2c22a26526e6961813a90d  frugalware-0.6pre2-i686-cd8.iso
+8a06f41c40ea632fdb5932067a41cc43bc9ae017  frugalware-0.6pre2-i686-cd9.iso
+5e094695448176111117c6f56c9d1af297da4f05  frugalware-0.6pre2-i686-cd10.iso
+a45e39c99ec9e80a8372858348f039f614cac98f  frugalware-0.6pre2-i686-cd11.iso
+b1c7c4ee7641e993dc6668fd3f1cffcb662875f6  frugalware-0.6pre2-i686-dvd1.iso
+44d4ce0c172d777248925c8bad704eb068e79ac8  frugalware-0.6pre2-i686-dvd2.iso
+ab191be15a05e42c87218048f55900fcde476b10  frugalware-0.6pre2-i686-net.iso
+09397ba7ea37ab2122e0e6222ad8f1aae0310c0e  frugalware-0.6pre2-i686-tftp.img.gz
+450c82a0eae61fd97d2b5c78e1702a57dddb6149  frugalware-0.6pre2-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>52</id>
+		<title>Big Fat Warning: postgresql package upgrade</title>
+		<date>Sat Jan  6 17:27:05 CET 2007</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Before upgrading to 8.2 version of postgresql, dump your databases. The new version is incompatible with the older one.
+			]]>
+		</content>
+		<icon>/images/icons/bug.png</icon>
+	</post>
+	<post>
+		<id>51</id>
+		<title>Big Fat Warning: nVidia package upgrade</title>
+		<date>Tue Dec 26 20:26:13 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			If you are using current and you have a GeForce 4 graphics card (this is a lot of laptops), please do not do a system upgrade until the nvidia-96xx package is available tomorrow. Once it is available, install it. The latest version of nvidia removes support for GeForce 4 cards.<br />
+			<br />
+			As a side note, the Frugalware developer team would like to wish all our users a very Merry Christmas, and a Happy New Year!
+			]]>
+		</content>
+		<icon>/images/icons/bug.png</icon>
+	</post>
+	<post>
+		<id>50</id>
+		<title>Frugalware 0.6pre1 (Terminus) released</title>
+		<date>Thu Nov  9 01:02:04 CET 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/50">announce</a> the immediate availability of Frugalware 0.6pre1, the first technical preview release of the upcoming 0.6 stable release.<br />
+			A short and incomplete list of changes since 0.5:<br />
+			<ul>
+				<li>New features:
+					<ul>
+						<li>All installed-by-default packages are now built using gcj/ecj, javac is
+							only provided as an alternate compiler.</li>
+						<li>Installing from a USB stick is now supported.</li>
+						<li>Added PHP documentation for 23 languages.</li>
+					</ul>
+				</li>
+				<li>Updates:
+					<ul>
+									<li>Linux 2.6.18 with a much improved SATA layer and a few new drivers</li>
+									<li>GNU C Library 2.5 with support for the new ELF hash table format</li>
+									<li>Mozilla Firefox 2.0 with improved tabbed browsing and inline spell checking</li>
+									<li>Xfce 4.4rc1: This fixes all plugin crash problems with the old Xfce 4.2.x
+													and the new version is much more stable.</li>
+									<li>KDE 3.5.5 with KHTML improvements, and support for sudo in kdesu</li>
+									<li>OpenOffice.org 2.0.4 with a latex export filter and encryption support in
+													the pdf export filter</li>
+									<li>D-Bus 0.93 with many memleaks and bugs fixed</li>
+									<li>neon 0.26.1 with internationalization support</li>
+									<li>Xen 3.0.3 with HVM and XenFB support; Xen kernels upgraded to 2.6.18</li>
+									<li>db 4.5.20 with Multi-Version Concurrency Control (MVCC) support</li>
+									<li>Python 2.5 with an interesting mix of language and library improvements</li>
+									<li>GNOME 2.17.1 with various bugfixes and new features</li>
+									<li>Binutils 2.17.50.0.6 - this allows us to use the new ELF hash table
+													format which is now enabled by default in our build system. This will
+													cause a considerable performance increase in newly built packages.</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-9 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-net.iso">netinstall</a> (20M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-usb.tar.gz">usb</a> (18M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd1.iso">cd1</a> (642M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd2.iso">cd2</a> (643M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd3.iso">cd3</a> (639M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd4.iso">cd4</a> (642M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd5.iso">cd5</a> (636M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd6.iso">cd6</a> (641M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd7.iso">cd7</a> (642M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd8.iso">cd8</a> (641M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd9.iso">cd9</a> (642M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-cd9.iso">cd10</a> (250M),
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-dvd1.iso">dvd1</a> (4.2G)
+				<a href="/download/frugalware-testing-iso/frugalware-0.6pre1-i686-dvd2.iso">dvd2</a> (1.6G)
+				<br />
+			SHA1SUMS:
+			<pre>
+9519c08313fd786e3b1f858e8d03fc82cf0298b3  frugalware-0.6pre1-i686-cd1.iso
+e0689fe3716099b2e052779ee41966ba428f0dd9  frugalware-0.6pre1-i686-cd2.iso
+f1bd6cafa9fcb40542a9ccb7413c1a68a503fb7b  frugalware-0.6pre1-i686-cd3.iso
+f09367e36cd1f9b8d9608d23113866a271b800d0  frugalware-0.6pre1-i686-cd4.iso
+5ebc71fa7fd6761a736d3d76970e8e392834cc2f  frugalware-0.6pre1-i686-cd5.iso
+bd4c83b05a8a1a5d59829dcef0654c4d54efb919  frugalware-0.6pre1-i686-cd6.iso
+fc1c0e4f80e290cee0450fa1812e9d549ca75572  frugalware-0.6pre1-i686-cd7.iso
+8166ca475dd2320687d0caaa30bfb5e7eb88344b  frugalware-0.6pre1-i686-cd8.iso
+19bdbe64efdb050ef1c0c551157e86b51fa05e1b  frugalware-0.6pre1-i686-cd9.iso
+08110f0ad259d2f1b2b44048a34af70ab615150b  frugalware-0.6pre1-i686-cd10.iso
+36b3c488cf625b090e399f655a03e55517993623  frugalware-0.6pre1-i686-dvd1.iso
+34c610b521a998d87f1e5fafff4a34e310f61e92  frugalware-0.6pre1-i686-dvd2.iso
+eeaa4b9bafab9b1c3c5454c1599687fd600b3525  frugalware-0.6pre1-i686-net.iso
+6b59b1e750626f907107bcec6ead006d8e6a69a7  frugalware-0.6pre1-i686-usb.tar.gz
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>49</id>
+		<title>Yet another homepage redesign!</title>
+		<date>Sun Oct 24 20:37:14 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			I'm one of the fussy web-designers. I create a design, a few months later I think it's rubbish. So I created a new design :) Feel free to drop your comments to the Frugalware-devel list.<br /><br />
+
+			In other news, ftp5 should be back in sync. Have a good day! ;)
+			]]>
+		</content>
+		<icon>/images/icons/homepage.png</icon>
+	</post>
+	<post>
+		<id>48</id>
+		<title>ftp5.frugalware.org is currently out of sync</title>
+		<date>Sun Oct 12 17:41:12 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			ftp5.frugalware.org is currently out of sync for -current users. Please temporarily switch to a different mirror in /etc/pacman.d/frugalware-current!
+			]]>
+		</content>
+		<icon>/images/icons/homepage.png</icon>
+	</post>
+	<post>
+		<id>47</id>
+		<title>We want your DBUS bug reports!</title>
+		<date>Sun Sep 30 12:01:44 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			If you find any apps that don't start with a message about libdbus-1.so.2 not found, we want to know about it now! Just submit a report with the package's name to the <a href="http://bugs.frugalware.org">Bug Tracker</a>. Thanks!
+			]]>
+		</content>
+		<icon>/images/icons/bug.png</icon>
+	</post>
+	<post>
+		<id>46</id>
+		<title>Please, don't file bug reports about DBUS in current (yet!)</title>
+		<date>Sun Sep 24 17:02:53 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			We've upgraded to DBUS 0.9x in -current, meaning that some apps will be broken. We currently don't want any reports on any broken apps so that we don't get flooded by bug reports!
+			We have a very big list of things that need rebuilding, so we'll probably cover most apps over this week. We'll post a note when we want your bug reports again!<br /><br />
+			Thanks!
+			]]>
+		</content>
+		<icon>/images/icons/bug.png</icon>
+	</post>
+	<post>
+		<id>45</id>
+		<title>Frugalware 0.5 (Siwenna) for i686 and x86_64 released</title>
+		<date>Wed Sep 14 00:08:25 CEST 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/45">announce</a> the immediate availability of Frugalware 0.5, our fifth stable release.<br />
+			A short and incomplete list of changes since 0.5rc2:<br />
+			<ul>
+				<li>Linux 2.6.17.11</li>
+				<li>We are proud to be one of the first distributions that ship the stable GNOME 2.16</li>
+				<li>20 new packages</li>
+			</ul>
+			If you didn't follow the changes during the pre/rc releases, here are the most important changes since 0.4:<br />
+			<ul>
+				<li>Up-to-date packages: GNU C Library 2.4, GCC 4.1.1, KDE 3.5.4, XOrg 7.1, OpenOffice.org 2.0.3 (a native version for x86_64 users, too)</li>
+				<li>Security support: as of Frugalware-0.5, security support is provided until the release of the stable Frugalware-0.6. The -stable updates are only security fixes and bugfixes, no new features are added.</li>
+				<li>Created a new tool called 'setup' to collect the available configuration tools.</li>
+				<li>Localized the package manager (French, German and Hungarian translations are available)</li>
+				<li>Switched from bootsplash to splashy, so that the splash can be used with any custom vanilla kernel, too.</li>
+				<li>Installer improvements: Added wireless support, support for detecting other distributions and other operating systems, utf8-specific updates, all packages are available on CDs.</li>
+				<li>fw-xgl-control: Easily enables/disables Xgl on your system with one simple command.</li>
+				<li>fwmirror: A new tool to help mirroring Frugalware.</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-0.5/ChangeLog.txt">0.5 ChangeLog</a> for more information.<br />
+			If you don't have space for mirroring Frugalware but you want to help other i686 users to be able to get Frugalware quickly, use the <a href="http://linuxtracker.org/torrents-details.php?id=2863">CD</a> or <a href="http://linuxtracker.org/torrents-details.php?id=2864">DVD</a> torrents.<br />
+			If you want to sponsor us or you don't want to download the huge images, order the <a href="http://on-disk.com/product_info.php/products_id/162">i686 CDs</a>, <a href="http://on-disk.com/product_info.php/products_id/163">i686 DVDs</a>, <a href="http://on-disk.com/product_info.php/products_id/164">x86_64 CDs</a> or <a href="http://on-disk.com/product_info.php/products_id/165">x86_64 DVDs</a>, a part of the sum goes for the support of the continued development of Frugalware!<br />
+			Download for i686:<br />
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-net.iso">netinstall</a> (21M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd1.iso">cd1</a> (644M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd2.iso">cd2</a> (644M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd3.iso">cd3</a> (638M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd4.iso">cd4</a> (639M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd5.iso">cd5</a> (590M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd6.iso">cd6</a> (627M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd7.iso">cd7</a> (632M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd8.iso">cd8</a> (427M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd9.iso">cd9</a> (640M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-cd10.iso">cd10</a> (129M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-dvd1.iso">dvd1</a> (4.2G)
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-i686-dvd2.iso">dvd2</a> (1.2G)
+				<br />
+			Download for x86_64:<br />
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-net.iso">netinstall</a> (21M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd1.iso">cd1</a> (643M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd2.iso">cd2</a> (644M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd3.iso">cd3</a> (642M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd4.iso">cd4</a> (644M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd5.iso">cd5</a> (644M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd6.iso">cd6</a> (642M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd7.iso">cd7</a> (635M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-cd8.iso">cd8</a> (92M),
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-dvd1.iso">dvd1</a> (4.1G)
+				<a href="/download/frugalware-0.5-iso/frugalware-0.5-x86_64-dvd2.iso">dvd2</a> (264M)
+				<br />
+			<b>NOTE</b>: CDs 3-10 or the second DVD is needed only if you don't have an internet connection!<br />
+			SHA1SUMs:
+			<pre>
+5829cbb49528b60627fa290c2d0f8c66439139ab  frugalware-0.5-i686-cd10.iso
+7972d7ae74da64794d627b5058f4f23ac06fa0b5  frugalware-0.5-i686-cd1.iso
+e0a5e842d84bb4196cf05eb9d9d53bff038faef0  frugalware-0.5-i686-cd2.iso
+dc0c16158368bf198714ebeff3f6338f96ac5510  frugalware-0.5-i686-cd3.iso
+ade3147023769155cf35ead2738632499607ee44  frugalware-0.5-i686-cd4.iso
+9810ebcd5743461e79aafce74d7abd9981326ce0  frugalware-0.5-i686-cd5.iso
+919ca39d89699a8462f4ee8ac49853baf5af1caa  frugalware-0.5-i686-cd6.iso
+1efdb0b68bbb1a92e86341fbab171a24b661edf5  frugalware-0.5-i686-cd7.iso
+ef572faa5f6a6f103f48a7465d0ec8aeced4791f  frugalware-0.5-i686-cd8.iso
+6563f6b87cecd1c54914fc130798cbc8eb49ea5e  frugalware-0.5-i686-cd9.iso
+913aeea9426a9ec0453d9abd16c9e8e9b9c00cb2  frugalware-0.5-i686-dvd1.iso
+635c5df1312bcf0a7f86f08d3dec77111e7fe348  frugalware-0.5-i686-dvd2.iso
+b22d26e26b1ed07c285cba3c83162173fa2c4ff7  frugalware-0.5-i686-net.iso
+7a7342d42f53a50bb316c596fe4188d9ae72d051  frugalware-0.5-x86_64-cd1.iso
+6f13b4d6cffe3d42510ccb944268e34c2d587d40  frugalware-0.5-x86_64-cd2.iso
+8824fdd05c11473cb2c7bb5a3a2d32c74d999378  frugalware-0.5-x86_64-cd3.iso
+e8d4933ee2d1d45d827b2dd54090d5172bc4cb2c  frugalware-0.5-x86_64-cd4.iso
+ed78594a70af0dded0483914437566702b05b576  frugalware-0.5-x86_64-cd5.iso
+720c0f6bf84ca222a9bf000300d49783efe176fd  frugalware-0.5-x86_64-cd6.iso
+9ec70d74470ceb69e8a4e5eb4ecb1b61b083fc21  frugalware-0.5-x86_64-cd7.iso
+089b510f3bf59b7ea04041f237a4beb26ef50993  frugalware-0.5-x86_64-cd8.iso
+4f1c3871c3b6b03773090c8509b730a8d59fae64  frugalware-0.5-x86_64-dvd1.iso
+1ad4968050816e4854f5fbde8016a4a5c45be947  frugalware-0.5-x86_64-dvd2.iso
+81e26cd95c1ad3502bfee1f125e19f4c81f357a6  frugalware-0.5-x86_64-net.iso
+			</pre>
+			A list of bugs reported after the release of the installer images  can be viewed <a href="http://wiki.frugalware.org/KnownBugs-0.5">here</a>.<br />
+			If you are upgrading from our previous stable release, you may want to read our <a href="http://wiki.frugalware.org/Upgrade-0.4-0.5">mini-howto</a> on this topic.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>44</id>
+		<title>Upgrade to the new type of nvidia package</title>
+		<date>Sat Sep  9 00:35:47 CEST 2006</date>
+		<author>Boobaa</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+      It was a trouble for several users to upgrade the old nvidia package (locally-compiled at install) to the new, binary one. Here is the solution (provided that the database and the other packages are up-to-date):<br />
+			<pre>pacman -Sfd nvidia --noconfirm</pre>
+			(No, it does not mean that we dislike the Software Freedom Day...)
+			]]>
+		</content>
+		<icon>/images/icons/bug.png</icon>
+	</post>
+	<post>
+		<id>43</id>
+		<title>Frugalware 0.5rc2 (Siwenna) released</title>
+		<date>Fri Sep  1 11:26:39 CEST 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="/news/43">announce</a> the immediate availability of Frugalware 0.5rc2, the second release candidate of the upcoming 0.5 stable release.<br />
+			A short and incomplete list of changes since 0.5rc1:<br />
+			<ul>
+				<li>Updated GNOME to 2.16 Release Candidate (2.15.92)</li>
+				<li>~300 bugfixes</li>
+				<li>Updated KDE and GRUB artwork</li>
+				<li>More than 30 new packages: ntfs-3g, avifile, gnome-sharp and much more!</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-9 or the second DVD unless you don't have an internet connection<br />
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-net.iso">netinstall</a> (21M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd1.iso">cd1</a> (632M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd2.iso">cd2</a> (641M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd3.iso">cd3</a> (643M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd4.iso">cd4</a> (640M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd5.iso">cd5</a> (599M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd6.iso">cd6</a> (630M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd7.iso">cd7</a> (627M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd8.iso">cd8</a> (417M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd9.iso">cd9</a> (638M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-cd9.iso">cd10</a> (128M),
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-dvd1.iso">dvd1</a> (4.2G)
+				<a href="/download/frugalware-current-iso/frugalware-0.5rc2-i686-dvd2.iso">dvd2</a> (1.2G)
+				<br />
+			SHA1SUMS:
+			<pre>
+68b77bf880dcb5a05ba66ae9b80a7831d3fcbd8c  frugalware-0.5rc2-i686-cd10.iso
+65d73a3408d3a7e4a6f28b990c60be40706f265d  frugalware-0.5rc2-i686-cd1.iso
+0581700c2139059cee22f10c6b40561af9973d8f  frugalware-0.5rc2-i686-cd2.iso
+580bc19fa7bfcc509e075f1f337953a6da60f93a  frugalware-0.5rc2-i686-cd3.iso
+d1d78560f6f4c641621ac41c4f0e5c12d5d58a9d  frugalware-0.5rc2-i686-cd4.iso
+d72bfe2ffcd935b6d02bde576d78a5076651a2b5  frugalware-0.5rc2-i686-cd5.iso
+ffb7f8186dc804e8484082be72dfd340f83a9d8b  frugalware-0.5rc2-i686-cd6.iso
+045ed869c57eadebf172d38d506e5d775b41711c  frugalware-0.5rc2-i686-cd7.iso
+99062bdaed26566b95e78773ed3c045b5fac442a  frugalware-0.5rc2-i686-cd8.iso
+82da06750a859584804191889bd5c23e86f9edc9  frugalware-0.5rc2-i686-cd9.iso
+94f7a0a0a1d2a9d209a1f85ed251a0e78c128f36  frugalware-0.5rc2-i686-dvd1.iso
+e4397526607832e83684be5c7f88598242d05e75  frugalware-0.5rc2-i686-dvd2.iso
+fae88cc8378e2982a87761c0d97fdfbf42eb321c  frugalware-0.5rc2-i686-net.iso
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>42</id>
+		<title>Frugalware 0.5rc1 (Siwenna) released</title>
+		<date>Thu Aug 17 01:31:02 CEST 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="http://frugalware.org/news/42">announce</a> the immediate availability of Frugalware 0.5rc1, the fist release candidate of the upcoming 0.5 stable release.<br />
+			A short and incomplete list of changes since 0.5pre2:<br />
+			<ul>
+				<li>Updates:
+					<ul>
+						<li>Linux 2.6.17.8</li>
+						<li>KDE 3.5.4</li>
+						<li>Firefox 1.5.0.6</li>
+						<li>Thunderbird 1.5.0.5</li>
+						<li>Gnome 2.16 Beta 2 (2.15.91)</li>
+					</ul>
+				</li>
+				<li>New features:
+					<ul>
+						<li>Splitted the MySQL, PostgreSQL, Samba and LDAP packages so that having these servers installed is no longer forced on a desktop machine</li>
+						<li>fwmirror: A new tool to help mirroring Frugalware</li>
+						<li>fw-xgl-control: Easily enables/disables Xgl on your system with one simple command</li>
+						<li>Homepage: improved the binary packages page - now you can browse by categories and view reverse dependencies</li>
+						<li>Added a workaround for nVidia cards in Xorg 7.1</li>
+						<li>New 0.5 artwork (except KDE)</li>
+					</ul>
+				</li>
+				<li>Bugfixes:
+					<ul>
+						<li>Fixed handling of the dependencies of the language packs</li>
+						<li>Fixed netinstall when using PPPoE connection</li>
+						<li>Burning the first DVD iso no longer requires any overburn options</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-testing/ChangeLog.txt">Testing ChangeLog</a> for more information.<br />
+			Download for i686:<br />
+			<b>NOTE</b>: Don't download CDs 3-9 or the second DVD unless you don't have an internet connection<br />
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-net.iso">netinstall</a> (20M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd1.iso">cd1</a> (635M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd2.iso">cd2</a> (638M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd3.iso">cd3</a> (635M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd4.iso">cd4</a> (639M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd5.iso">cd5</a> (580M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd6.iso">cd6</a> (642M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd7.iso">cd7</a> (638M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd8.iso">cd8</a> (642M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-cd9.iso">cd9</a> (394M),
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-dvd1.iso">dvd1</a> (4.2G)
+				<a href="download/frugalware-current-iso/frugalware-0.5rc1-i686-dvd2.iso">dvd2</a> (1.1G)
+				<br />
+			SHA1SUMS:
+			<pre>
+385719ecc1e68a5e4b2f8c6fb49e79b7333fe820  frugalware-0.5rc1-i686-cd1.iso
+c9324c9a6bcf5024076a5f5f494fecada7d383ac  frugalware-0.5rc1-i686-cd2.iso
+ae5d33bc4c69978cbedcb4bbf3182253cc9eaecd  frugalware-0.5rc1-i686-cd3.iso
+31d386c3d81a64c3d554b186973df41071741fe9  frugalware-0.5rc1-i686-cd4.iso
+529bfcb37b7feb24e8bf62316371c54e8c4d402d  frugalware-0.5rc1-i686-cd5.iso
+b7278a5147102a1e049cdb7fb81d136893d1c4cf  frugalware-0.5rc1-i686-cd6.iso
+09a5098c561dcf406a83bfb8e5a6eec1e192aa52  frugalware-0.5rc1-i686-cd7.iso
+36e300772e5052aa5b81308af8288374c0a930d4  frugalware-0.5rc1-i686-cd8.iso
+a1a0864648db68b9c01f274ddffc9172b3ae6908  frugalware-0.5rc1-i686-cd9.iso
+0216a7ee71b0dda9d00d64fc093b993f2af47a2b  frugalware-0.5rc1-i686-dvd1.iso
+987d2302a1268a2b1033f8d00e84f8c8ce290ae9  frugalware-0.5rc1-i686-dvd2.iso
+a62f42f3135f1415edced1db5c9f9511de598fd7  frugalware-0.5rc1-i686-net.iso
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>41</id>
+		<title>Frugalware 0.5pre2 (Siwenna) released</title>
+		<date>Mon Jul 31 01:17:32 CEST 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to <a href="http://frugalware.org/news/41">announce</a> the immediate availability of Frugalware 0.5pre2, the second technical preview of the upcoming 0.5 stable release.<br />
+			A short and incomplete list of changes since 0.5pre1:<br />
+			<ul>
+				<li>Updates:
+					<ul>
+						<li>Linux 2.6.17 (+ security patches)</li>
+						<li>GCC 4.1.1</li>
+						<li>Apache 2.2.3</li>
+						<li>XOrg 7.1 (updated the fglrx driver accordingly, nVIDIA still doesn't work)</li>
+						<li>GNOME 2.16 Beta 1 (there may be some problems with some Gnome and GTK software - see earlier news posts)</li>
+						<li>OpenOffice.org 2.0.3 (this time a native version is available for x86_64 users, too)</li>
+					</ul>
+				</li>
+				<li>New features:
+					<ul>
+						<li>All configuration tools have been updated to the new framework, type "setup" to reach them</li>
+						<li>Switched to splashy from bootsplash, so that the splash can be used with any custom vanilla kernel, too</li>
+						<li>Added French localization for the package manager</li>
+					</ul>
+				</li>
+				<li>Installer:
+					<ul>
+						<li>Added an eyecandy tetris, use it on tty5 while netinstall downloads the selected packages :)</li>
+						<li>Several utf8-specific update for Chinese users</li>
+						<li>Added wireless support to the netinstall</li>
+						<li>Added French translation</li>
+						<li>The DVD iso has been splitted so that it can be burned again to a single-layer DVD.<br />
+							<b>Note</b>: Don't download the second DVD unless you don't have an internet connection</li>
+						<li>All the packages are available on CDs.<br />
+							<b>Note</b>: Don't download CDs 3 - 9 unless you don't have an internet connection</li>
+						<li>The installer now recognizes os-specific informations, like the name of the already installed other distributions or the version of many other operating systems</li>
+					</ul>
+				</li>
+				<li>Packages:
+					<ul>
+						<li>More than 2600 packages have been updated</li>
+						<li>More than 220 new packages</li>
+					</ul>
+				</li>
+			</ul>
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">Development ChangeLog</a> for more information.<br />
+			Download for i686:
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-net.iso">netinstall</a> (20M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd1.iso">cd1</a> (643M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd2.iso">cd2</a> (633M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd3.iso">cd3</a> (640M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd4.iso">cd4</a> (642M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd5.iso">cd5</a> (554M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd6.iso">cd6</a> (642M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd7.iso">cd7</a> (643M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd8.iso">cd8</a> (558M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-cd9.iso">cd9</a> (385M),
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-dvd1.iso">dvd1</a> (4.4G)
+				<a href="download/frugalware-current-iso/frugalware-0.5pre2-i686-dvd2.iso">dvd2</a> (712M)
+				<br />
+			SHA1SUMS:
+			<pre>
+07271ddb32e831ebeecdc7c01d1bdb6c429b5ef4  frugalware-0.5pre2-i686-cd1.iso
+07c5b548d8d9e7a011a3ab7a145c48731e5fbee4  frugalware-0.5pre2-i686-cd2.iso
+7354ff3d44f480dfae8d27fde0c22343f042d349  frugalware-0.5pre2-i686-cd3.iso
+07ff975bf2b554fcf9f4c4bca171613f7456567e  frugalware-0.5pre2-i686-cd4.iso
+fd9a48885cc66d7dfc35ac0060b7804cbb55ef4a  frugalware-0.5pre2-i686-cd5.iso
+0a4acbdb359f0424f6f081b134964d231648fe1c  frugalware-0.5pre2-i686-cd6.iso
+539eb9b343466f7428dbe185aaa9a7b5b6cc94fb  frugalware-0.5pre2-i686-cd7.iso
+a3596b7f25437447c3c117eb0bb883b040a3024a  frugalware-0.5pre2-i686-cd8.iso
+257a426eb08230ae24d7b81af042c30f995b6f0e  frugalware-0.5pre2-i686-cd9.iso
+64c2662ca21407bbe548ce6396aab659376184a0  frugalware-0.5pre2-i686-dvd1.iso
+44dd9bb8c98a1370571ed799e53e8129ad78a3e4  frugalware-0.5pre2-i686-dvd2.iso
+0c0cedda6de27378916f4093ba7c7145f3487455  frugalware-0.5pre2-i686-net.iso
+			</pre>
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>40</id>
+		<title>Gnome upgrade done (for now)</title>
+		<date>Tue Jul 22 09:09:41 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			All the GNOME packages have been updated to 2.15, so now would be the time to starting posting reports about any problems that you find. To do this, you can use our <a href="http://bugs.frugalware.org">Bug Tracker</a>. There are currently several known issues that we will try to fix soon. These are as follows<br />
+			<ul>
+				<li>Gaim gets SIGABRT when trying to add an account.</li>
+				<li>Banshee Segmentation Faults at startup</li>
+				<li>File-roller segmentation faults at startup</li>
+			</ul>
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>39</id>
+		<title>Gnome and GTK breakage in -current</title>
+		<date>Tue Jul  8 17:03:46 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Yes, we know Gnome and GTK stuff is a bit broken in -current :)<br /><br />
+			This is because we have upgraded to GTK 2.10, and also we are upgrading Gnome to the development version (see the mailing list archive for reasons why). So please bear with us while we do this. The result at the end of this should be a faster and nicer Gnome. I will post here once we have finished upgrading, at which point it will be good to start posting bug reports about problems that you find.<br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>38</id>
+		<title>Improvements on the homepage</title>
+		<date>Tue Jul  7 21:11:32 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Amazingly, in the time since our homepage upgrade, we've only had 1 bug report to do with the packages section. So now we can work on adding a few improvements. I've just written a kind of robot that automatically posts all news posts from the site to the Frugalware-announce mailing list. It works thanks to darcs post-hooks, so that whenever we push a change to the homepage darcs repository, the post-hook is run to check for new news posts. Don't forget, if you do find a bug remember to post it on our Bug Tracker.<br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>37</id>
+		<title>New Frugalware homepage!</title>
+		<date>Tue Jun 20 07:59:25 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Welcome to the brand new Frugalware homepage! This is a complete rewrite of our homepage, featuring table-less design, XML for data storage, user-friendly URLs with mod_rewrite and easy translations with Gettext. If you would like to help translate the page, please post to the frugalware-devel mailing list. If you find any bugs while using the page, please report them to the <a href="http://bugs.frugalware.org">Bug Tracker</a> under the Homepage category, or visit our IRC channel and report them to AlexExtreme or IroNiQ. Also, feel free to give them your comments on the page too.<br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>36</id>
+		<title>ATI and nVidia binary drivers broken in current</title>
+		<date>Sat May 27 20:53:09 CEST 2006</date>
+		<author>AlexExtreme</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			For those of you that use the current branch of Frugalware, nVidia and ATI binary drivers are currently broken due to the upgrade to Xorg 7.1. Specifically, fonts do not display at all on screen. There are 2 solutions to this problem - either downgrade all Xorg packages, or switch to using the open source Xorg drivers for your card in /etc/X11/xorg.conf. (ati and nv). Note that Frugalware 0.5pre1 is not affected unless you have run pacman -Syu since installation.<br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>35</id>
+		<title>Frugalware 0.5pre1 (Siwenna) for i686 released</title>
+		<date>Thu May 25 01:18:52 CEST 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.5pre1, the first technical preview of the upcoming 0.5 stable release for the i686 architecture.<br />
+			A short and incomplete list of the more than 3000 changes since 0.4:<br />
+			<ul><li>Updates:<br />
+			        <ul><li>GNU C Library 2.4<br />
+			        </li><li>GCC 4.1.0<br />
+			        </li><li>KDE 3.5.2<br />
+			        </li><li>More than 300 new packages</li></ul><br />
+			</li><li>New features:<br />
+			        <ul><li>Created a new tool, called 'setup', to summarize the available configuration tools. (<a href="http://darcs.frugalware.org/repos/frugalwareutils/setup.png">screenshot</a>)<br />
+			        </li><li>Localized the package manager. (currently German and Hungarian language support available)<br />
+			        </li><li>Added Brazilian and Indonesian translation to the setup.</li></ul><br />
+			</li><li>Known problems:<br />
+			        <ul><li>The dvd image is more than 4.7 GB so it will not fit on a single-layer DVD.</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">Development ChangeLog</a> for more information.<br />
+			Download for i686: <a href="download.php?url=frugalware-current-iso/frugalware-0.5pre1-i686-net.iso">netinstall</a> (27M), <a href="download.php?url=frugalware-current-iso/frugalware-0.5pre1-i686-cd1.iso">cd1</a> (476M), <a href="download.php?url=frugalware-current-iso/frugalware-0.5pre1-i686-cd2.iso">cd2</a> (651M), <a href="download.php?url=frugalware-current-iso/frugalware-0.5pre1-i686-dvd.iso">dvd</a> (4.8G)<br />
+			SHA1SUMS:<br />
+			<tt>8cc23502d6ed87b1744f31de676d782793449d74  frugalware-0.5pre1-i686-cd1.iso<br />
+			c3f7e39c9f3c3ca09efd7f635f2fa60cce7df337  frugalware-0.5pre1-i686-cd2.iso<br />
+			4ea37741a1d614d627ff28009ee9c44beaca24bf  frugalware-0.5pre1-i686-dvd.iso<br />
+			87fc8dc2102cc365ead513b9a4640c3377170ec9  frugalware-0.5pre1-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>34</id>
+		<title>Frugalware 0.4 for i686 and x86_64 released</title>
+		<date>Tue Mar 30 07:42:21 CEST 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.4 for the i686 and x86_64 architectures, our fourth stable release.<br />
+			A short and incomplete list of changes since 0.4rc2-i686:<br />
+			<ul><li>Updates:<br />
+			        <ul><li>Update to Linux 2.6.16<br />
+			        </li><li>Update to GNOME 2.14<br />
+			        </li><li>Update to OpenOffice.org 2.0.2.1<br />
+			        </li><li>Lots of minor bugfixes<br />
+			        </li><li>Create a <a href="http://wiki.frugalware.org/Upgrade-0.3-0.4">howto</a> about upgrading from the previous stable release</li></ul><br />
+			</li><li>A few statistics since 0.3:<br />
+			        <ul><li>4186 changes<br />
+			        </li><li>732 new packages<br />
+			        </li><li>302 fixed bugs</li></ul><br />
+			</li><li>For who haven't followed the changes in the pre/rc releases, the most important changes:<br />
+			        <ul><li>Implemented fwcpan, a new tool to install any cpan module, just like it would when you install it with pacman.<br />
+			        </li><li>Split OpenOffice, now all language packs and dictionaries can be installed/removed separately.<br />
+			        </li><li>Libificated pacman to meet our needs, and the newborn pacman 3 has become the default package manager.<br />
+			        </li><li>Network configuration has been redesigned, now we support various network profiles, and many more network parameters (hardware address, multiple ip addresses on a single interface, etc) than before.<br />
+			        </li><li>Created a new, more verbose documentation.<br />
+			        </li><li>Switched to udev as the default hotplug multiplexer.<br />
+			        </li><li>Bugfix: now automounting for usb sticks works fine, not only for CDs or DVDs.<br />
+			        </li><li>Added package splitting support.<br />
+			        </li><li>Started to work on a PPC port.<br />
+			        </li><li>Rewritten setup from scratch in C. The new framework will allow to implement a graphical installer, too.<br />
+			        </li><li>The init script system was redesigned: more user-friendly error messages, now uses gettext for translations.<br />
+			        </li><li>Modularized Xorg 7.0, Apache 2.2.0, KDE 3.5.1, Firefox 1.5.0.1, Thunderbird 1.5</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-stable;a=log">Stable ChangeLog</a> for more information.<br />
+			Download for i686: <a href="download.php?url=frugalware-0.4-iso/frugalware-0.4-i686-net.iso">netinstall</a> (19M), <a href="download.php?url=frugalware-0.4-iso/frugalware-0.4-i686-cd1.iso">cd1</a> (490M), <a href="download.php?url=frugalware-0.4-iso/frugalware-0.4-i686-cd2.iso">cd2</a> (604M), <a href="download.php?url=frugalware-0.4-iso/frugalware-0.4-i686-dvd.iso">dvd</a> (3.5G)<br />
+			Download for x86_64: <a href="download.php?url=frugalware-0.4-iso/frugalware-0.4-x86_64-net.iso">netinstall</a> (19M), <a href="download.php?url=frugalware-0.4-iso/frugalware-0.4-x86_64-dvd.iso">dvd</a> (2.5G)<br />
+			Torrents also <a href="http://linuxtracker.org/index.php?cat=146">available</a>.<br />
+			SHA1SUMS:<br />
+			<tt>dfec06c393187037a362f4d2e57819c4e97e71dd  frugalware-0.4-i686-cd1.iso<br />
+			09c29ec582eadc02dee2be0fd1230cff8ec40695  frugalware-0.4-i686-cd2.iso<br />
+			872912bc9f1caa46895247364bcf7538074f8238  frugalware-0.4-i686-dvd.iso<br />
+			6a1a49985450d2cad8c8efb7f988c266a454f899  frugalware-0.4-i686-net.iso<br />
+			81e79a3bbb9d327555d272d841e3d0fc0c784de7  frugalware-0.4-x86_64-dvd.iso<br />
+			d4b39dbdc9bfadaf379bf7cc3662ce9d0b20a010  frugalware-0.4-x86_64-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>33</id>
+		<title>Frugalware 0.4rc2-i686 released</title>
+		<date>Thu Mar 16 00:08:01 CET 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.4rc2-i686, the last release candidate of the 0.4-i686 stable release.<br />
+			A short and incomplete list of changes since 0.4rc1-i686:<br />
+			<ul><li>New features:<br />
+				<ul><li>Better support for changing between opensource and proprietary ATI/NVIDIA drivers.<br />
+				</li><li>All packages have been reviewed to work perfectly with X.Org 7.0.<br />
+				</li><li>Various spelling fixes in the configuration tools.<br />
+				</li><li>Fixed font settings for non-English users.<br />
+				</li><li>Reworked the mirror mechanism to ensure that the iso images are available on all mirrors at release time.<br />
+				</li><li>More than 60 new packages: freenx packages + knx (<a href="http://wiki.frugalware.org/Nx">tutorial</a>), lighttpd, sword, thunderbird-locale-switcher, katapult and much more!</li></ul><br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Gcc 4.0.3 (and <a href="http://wiki.frugalware.org/Gcc_building">optionally</a> 4.1.0)<br />
+				</li><li>UDev 087<br />
+				</li><li>MySQL 5.0.19</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc2-i686-net.iso">netinstall</a> (19M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc2-i686-cd1.iso">cd1</a> (486M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc2-i686-cd2.iso">cd2</a> (576M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc2-i686-dvd.iso">dvd</a> (3.4G)<br />
+			SHA1SUMS:<br />
+			<tt>49701b761904ed9504198eba8ab1bacae1368d1f  frugalware-0.4rc2-i686-cd1.iso<br />
+			450038688aaf5d7e225b2777f092f604aeb1dc27  frugalware-0.4rc2-i686-cd2.iso<br />
+			f3d90ac6100acb5a8d0d84d3149d18d3b612b46f  frugalware-0.4rc2-i686-dvd.iso<br />
+			9ba1b1325545fd6fcf8353482fde25d82c1877ce  frugalware-0.4rc2-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>32</id>
+		<title>Frugalware 0.4rc1-i686 released</title>
+		<date>Thu Mar  2 00:26:59 CET 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.4rc1-i686, the first release candidate of 0.4-i686.<br />
+			A short and incomplete list of changes since 0.4pre2-i686:<br />
+			<ul><li>New features:<br />
+				<ul><li>Created a package synchronization client and daemon (syncpkg and syncpkgd) to update packages faster on arches other than i686 (x86_64 and later ppc).<br />
+				</li><li>Implemented fwcpan, a new tool to install any cpan module, just like it would when you install it with the pacman.<br />
+				</li><li>Split OpenOffice, now all language packs and dictionaries can be installed/removed separately.<br />
+				</li><li>More than 80 new packages: Xgl (with a <a href="http://wiki.frugalware.org/Xgl">step by step howto</a>), beagle, fvwm-crystal, cdcat, klamav, kcheckgmail, xvidcap, synaptics, rt2500, rdiff-backup and much more!</li></ul><br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.15.4<br />
+				</li><li>Perl 5.8.8<br />
+				</li><li>Firefox 1.5.0.1<br />
+				</li><li>Thunderbird 1.5<br />
+				</li><li>KDE 3.5.1<br />
+				</li><li>GNOME 2.12.3</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc1-i686-net.iso">netinstall</a> (19M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc1-i686-cd1.iso">cd1</a> (494M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc1-i686-cd2.iso">cd2</a> (605M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4rc1-i686-dvd.iso">dvd</a> (3.2G)<br />
+			SHA1SUMS:<br />
+			<tt>d686c6b9c34fc03acab6be99468a4fc3b5e5d294  frugalware-0.4rc1-i686-cd1.iso<br />
+			3f8f703d43a0f42bdb65d567c65840a6c14d4704  frugalware-0.4rc1-i686-cd2.iso<br />
+			96a7e8b3cb88caa552a40e87dd04c7c23667e985  frugalware-0.4rc1-i686-dvd.iso<br />
+			13f84d9fe9eedf197a146612244a8c3077dea5f0  frugalware-0.4rc1-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>31</id>
+		<title>Frugalware 0.4pre2-i686 released</title>
+		<date>Thu Feb  2 00:29:05 CET 2006</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.4pre2-i686, the second technical preview release of 0.4-i686.<br />
+			A short and incomplete list of changes since 0.4pre1-i686:<br />
+			<ul><li>New features:<br />
+				<ul><li>Libificated <a href="http://www.archlinux.org/pacman/">pacman</a> to meet our needs, and the newborn <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman">pacman 3</a> has become the default package manager.<br />
+				</li><li>Network configuration has been redesigned, now we support various network profiles, and much more network parameters (hardware address, multiple ip addresses on a single interface, etc) than before.<br />
+				</li><li>Created a new, more verbose <a href="http://frugalware.org/docs.php">documentation</a>.<br />
+				</li><li>Switched to udev as the default hotplug multiplexer.<br />
+				</li><li>Bugfix: now automounting for usb sticks works fine, not only for CDs or DVDs.<br />
+				</li><li>More than 100 new packages - on client side: wepdecrypt, konversation, ltp, gtkpod, firefox extensions, etc.<br />
+				</li><li>New server side packages: xen (with dom0 and domU kernels), darcsweb, rails, perl modules and much more!</li></ul><br />
+			</li><li>Behind the scenes:<br />
+				<ul><li>Added package splitting support.<br />
+				</li><li>Started to work on a PPC port.</li></ul><br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.15<br />
+				</li><li>Modularized Xorg 7.0<br />
+				</li><li>Apache 2.2.0</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre2-i686-net.iso">netinstall</a> (19M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre2-i686-cd1.iso">cd1</a> (491M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre2-i686-cd2.iso">cd2</a> (694M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre2-i686-dvd.iso">dvd</a> (3.1G)<br />
+			SHA1SUMS:<br />
+			<tt>c1f5ab83d14f95247f7e3c6ddfd2f1ffc7125551  frugalware-0.4pre2-i686-cd1.iso<br />
+			def8069198c08cc208c075f3803581ea8b7ef7d1  frugalware-0.4pre2-i686-cd2.iso<br />
+			df8f2ff8f5f6f2b20fa2018bf18a863227769028  frugalware-0.4pre2-i686-dvd.iso<br />
+			8f9ada32b3f37a3a4dd790335df20b347b66df79  frugalware-0.4pre2-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>30</id>
+		<title>Frugalware 0.4pre1-i686 released</title>
+		<date>Wed Dec  7 20:23:55 CET 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.4pre1-i686, the first technical preview release of 0.4-i686.<br />
+			A short and incomplete list of changes since 0.3-i686:<br />
+			<ul><li>New features:<br />
+				<ul><li>Rewritten setup from scratch in C. The new framework will allow to implement a graphical installer, too.<br />
+				</li><li>Added lots of new features to the setup, such as expert and normal mode, ignoring (non fatal) errors.<br />
+				</li><li>Added several translations to the setup.<br />
+				</li><li>The init script system was redesigned: more user-friendly error messages, now uses gettext for translations.<br />
+				</li><li>More than 100 new packages: treewm, octave, toolame, mingw, ddd, tellico and much more!</li></ul><br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.14.3<br />
+				</li><li>KDE 3.5.0<br />
+				</li><li>Firefox 1.5<br />
+				</li><li>GCC 4.0.2<br />
+				</li><li>GNU C Library 2.3.6<br />
+				</li><li>GNOME 2.12.2</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre1-i686-net.iso">netinstall</a> (20M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre1-i686-cd1.iso">cd1</a> (473M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre1-i686-cd2.iso">cd2</a> (650M), <a href="download.php?url=frugalware-current-iso/frugalware-0.4pre1-i686-dvd.iso">dvd</a> (2.9G)<br />
+			SHA1SUMS:<br />
+			<tt>10cc34847b8a4b9f6b83dad3d437cbed6898e436  frugalware-0.4pre1-i686-cd1.iso<br />
+			32bcca919a1cbdafd673f8f64300a8ad480df12c  frugalware-0.4pre1-i686-cd2.iso<br />
+			8ae11f0cd5a8afd3b505e129788bf7a1943afaaf  frugalware-0.4pre1-i686-dvd.iso<br />
+			4517c1c2bf790cd492e45b04f1c78e986d9719f1  frugalware-0.4pre1-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>29</id>
+		<title>Frugalware 0.3-x86_64 released</title>
+		<date>Wed Oct 19 19:06:30 CEST 2005</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			We are pleased to announce the immediate availability of the x86_64 port of Frugalware 0.3.<br />
+			Frugalware 0.3-x86_64 is now a full-featured port of Frugalware, with almost all of the packages that are available on i686.<br />
+			What does not work currently?<br />
+				<ul><li>OpenOffice.org<br />
+				</li><li>Official flash plugin (from Macromedia)<br />
+				</li><li>Dosemu</li></ul><br />
+			If you can, please test it. If you find a bug, report to <a href="http://bugs.frugalware.org">us</a>. Please include as many details as possible in the bugreport! Thank you.<br />
+			<b>Important:</b> You will need an AMD64 CPU to use 0.3-x86_64! (Intel processors with EM64T extensions might work as well, but those are untested.)<br />
+			Download: <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-x86_64-net.iso">netinstall</a> (19M), <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-x86_64-cd1.iso">cd1</a> (492M), <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-x86_64-cd2.iso">cd2</a> (593M), <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-x86_64-dvd.iso">dvd</a> (2.0G)<br />
+			SHA1SUMS:<br />
+			<tt>4b3c84723e54e98300b1133413fa2e987c08c2eb  frugalware-0.3-x86_64-cd1.iso<br />
+			e7c28286e9cd819f1eef596000e8902fd10a1932  frugalware-0.3-x86_64-cd2.iso<br />
+			1a78fdfde3dd83b844d44dd5e687e494029b77ec  frugalware-0.3-x86_64-dvd.iso<br />
+			95cf37d80902ad323722b3a0d709fb91de7b11c6  frugalware-0.3-x86_64-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>28</id>
+		<title>Frugalware 0.3-i686 released</title>
+		<date>Thu Oct 13 01:09:20 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.3-i686, our third stable release.<br />
+			A short list of most important improvements and news since 0.3rc2-i686:<ul><li>Improvements:<br />
+				<ul><li>Setup: added spannish translation.<br />
+				</li><li>GNOME updated to 2.12.1</li></ul><br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.13.3<br />
+				</li><li>GCC 4.0.2<br />
+				</li><li>Thunderbird 1.0.7</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-stable;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-i686-net.iso">netinstall</a> (18M), <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-i686-cd1.iso">cd1</a> (478M), <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-i686-cd2.iso">cd2</a> (648M), <a href="download.php?url=frugalware-0.3-iso/frugalware-0.3-i686-dvd.iso">dvd</a> (2.8G)<br />
+			SHA1SUMS:<br />
+			<tt>3538fe3f1d5151828cf1c9f7daff0ab8115a3ec7  frugalware-0.3-i686-cd1.iso<br />
+			fe942eecd83774eddb5d045e4d477e83ef485c24  frugalware-0.3-i686-cd2.iso<br />
+			fe2d52e2036bb258f5ec51730a07e49c9666edb0  frugalware-0.3-i686-dvd.iso<br />
+			b11a257a4e9f34fe292abbf7d22402b8b9a24199  frugalware-0.3-i686-net.iso</tt><br />
+			<br />
+			<b>Update</b>: CD images also <a href="http://linuxtracker.org/torrents-details.php?id=681">available</a> via bittorrent.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>27</id>
+		<title>Frugalware 0.3rc2-i686 released</title>
+		<date>Mon Oct  3 22:17:09 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.3rc2-i686, the second release candidate of the upcoming 0.3-i686 stable release.<br />
+			A short list of most important improvements and news since 0.3rc1-i686:<ul><li>Improvements:<br />
+				<ul><li>Setup: added PPPoE support, added Polish translation, now the whole installation process' log saved to the installed system.<br />
+				</li><li>New wireless packages: madwifi, wlan-ng, etc.</li></ul><br />
+			</li><li>Package highlights: More than 60 new packages: gprsec, squid, privoxy, tor, weechat and more!<br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.13<br />
+				</li><li>OpenOffice.org 1.1.5<br />
+				</li><li>Firefox 1.0.7</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc2-i686-net.iso">netinstall</a> (18M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc2-i686-cd1.iso">cd1</a> (488M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc2-i686-cd2.iso">cd2</a> (649M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc2-i686-dvd.iso">dvd</a> (2.7G)<br />
+			SHA1SUMS:<br />
+			<tt>1e647a622223383008b0d119b5ba745d8eba637f  frugalware-0.3rc2-i686-cd1.iso<br />
+			f68794f3c0d9151965ab46f83992c28932129c71  frugalware-0.3rc2-i686-cd2.iso<br />
+			e9ac4a6fb5d4c2ab9cad909b07222528ac972531  frugalware-0.3rc2-i686-dvd.iso<br />
+			7630567a25764113000f744a742e10a93cd2a7b5  frugalware-0.3rc2-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>26</id>
+		<title>Frugalware 0.3rc1-i686 released</title>
+		<date>Thu Sep 15 22:15:47 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.3rc1-i686, the first release candidate of the upcoming 0.3-i686 stable release.<br />
+			A short list of most important improvements and news since 0.3pre2-i686:<ul><li>Improvements:<br />
+				<ul><li>Setup: added XFS support, and now you can configure the source of packages (install from a custom mirror or HDD)<br />
+				</li><li>Added mbrola and hunspell language packs.<br />
+				</li><li>New stats-generator packages: webalizer, munin, etc.<br />
+				</li><li>Added several adesklet applet package.</li></ul><br />
+			</li><li>Package highlights: More than 120 new packages: kdebluetooth, kismet, lives, fuse, muttng amavisd-new and more!<br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.13<br />
+				</li><li>GNOME 2.12<br />
+				</li><li>Gtk+ 2.8.3</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=log">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc1-i686-net.iso">netinstall</a> (18M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc1-i686-cd1.iso">cd1</a> (523M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc1-i686-cd2.iso">cd2</a> (649M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3rc1-i686-dvd.iso">dvd</a> (2.7G)<br />
+			SHA1SUMS:<br />
+			<tt>9098d53612de87d7198390f46252db54b1289959  frugalware-0.3rc1-i686-cd1.iso<br />
+			4fbd648f02ca75dc20cbc12f3f7a969b10140b6c  frugalware-0.3rc1-i686-cd2.iso<br />
+			0008ce00fa4a68d53de71f9c19569d4fa664359f  frugalware-0.3rc1-i686-dvd.iso<br />
+			58f392f701560670192695e2add982fd16e08582  frugalware-0.3rc1-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>25</id>
+		<title>Frugalware 0.3pre2-i686 released</title>
+		<date>Wed Aug 18 07:13:14 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.3pre2-i686, the second preview of the upcoming 0.3-i686 stable release.<br />
+			A short list of most important improvements and news since 0.3pre1-i686:<ul><li>Improvements:<br />
+				<ul><li>Ivman replaced submount, which is no longer installed by default.<br />
+				</li><li>Setup: Now Frugalware can be installed to a software RAID partition.<br />
+				</li><li>Added French language support to the installer.</li></ul><br />
+			</li><li>Package highlights: More than 180 new packages: abiword, nvu, ndiswrapper, kaffeine, chkrootkit and more!<br />
+			</li><li>Updates: As usual, Frugalware comes with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.12.4<br />
+				</li><li>GCC 4.0.1<br />
+				</li><li>HAL 0.5.3<br />
+				</li><li>KOffice 1.4.1</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href="changelog.php">ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre2-i686-net.iso">netinstall</a> (18M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre2-i686-cd1.iso">cd1</a> (510M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre2-i686-cd2.iso">cd2</a> (683M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre2-i686-dvd.iso">dvd</a> (2.6G)<br />
+			MD5SUMS:<br />
+			<tt>95f1920e936b016c4117908b1afcbc8b  frugalware-0.3pre2-i686-cd1.iso<br />
+			28643f599df88e72cf4830a6f5e533d2  frugalware-0.3pre2-i686-cd2.iso<br />
+			6466754fd31c3454e6f50bb848660828  frugalware-0.3pre2-i686-dvd.iso<br />
+			9f85841e54d326b97215cb164daebf54  frugalware-0.3pre2-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>24</id>
+		<title>Frugalware 0.3pre1-x86_64 released</title>
+		<date>Sun Jul  3 19:46:19 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			We are pleased to announce the immediate availability of the x86_64 port of Frugalware 0.3pre1.<br />
+			Frugalware 0.3pre1-x86_64 is a native 64-bit system, which means we don't use multilib. (For example because of this, you have to use our gplflash package instead of the usual flashplugin.)<br />
+			What works?<br />
+				<ul><li>base system :-)<br />
+				</li><li>the graphical system's core<br />
+				</li><li>desktop environments: KDE, Xfce and GNOME</li></ul><br />
+			What does not work currently?<br />
+				<ul><li>OpenOffice.org (we are working on it and we have promising results)<br />
+				</li><li>I18n: Firefox, Thunderbird, KOffice</li></ul><br />
+			If you can, please test it. If you find a bug, report to <a href="mailto:frugalware-users@frugalware.org">us</a>. Please include as many details as possible in the bugreport! Thank you.<br />
+			<b>Important:</b> You will need an AMD64 CPU to use 0.3pre1-x86_64! (Intel processors with EM64T extensions might work as well, but those are untested.)<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-x86_64-net.iso">netinstall</a> (17M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-x86_64-cd1.iso">cd1</a> (495M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-x86_64-cd2.iso">cd2</a> (578M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-x86_64-dvd.iso">dvd</a> (1.7G)<br />
+			MD5SUMS:<br />
+			<tt>78f35ff5a9389930781e626f91124637  frugalware-0.3pre1-x86_64-cd1.iso<br />
+			ed6ff1bc5033a715041a1b00b382a113  frugalware-0.3pre1-x86_64-cd2.iso<br />
+			4dd5391696395caa67206dc56cedf3ac  frugalware-0.3pre1-x86_64-dvd.iso<br />
+			3b9a75ec84c21af53e14cd2f500d318c  frugalware-0.3pre1-x86_64-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>23</id>
+		<title>0.3pre1 in the news</title>
+		<date>Wed Jun 29 09:57:27 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			There's a new <a href="http://www.tuxmachines.org/node/1501">review</a> about Frugalware over at <a href="http://www.tuxmachines.org/">tuxmachines</a>. Also you can find <a href="http://www.tuxmachines.org/gallery/frugal">there</a> 65 screenshots, too.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>22</id>
+		<title>Frugalware 0.3pre1-i686 released</title>
+		<date>Wed Jun 22 23:34:49 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.3pre1-i686, the first preview of the upcoming 0.3-i686 stable release.<br />
+			A short list of most important improvements and news since 0.2:<ul><li>Improvements:<br />
+				<ul><li>Added a new tool: repoman. It helps you to compile packages from source, allowing to automatically create and install closed-source packages like realplayer or skype (<tt>repoman merge packagename</tt>). Also it allows you to download all package's buildscript (<tt>repoman update</tt>) and recompile them with your compiler flags, "a la Gentoo".<br />
+				</li><li>Our build system now supports more than one architecture which means you can expect an x86_64 preview release soon.<br />
+				</li><li>All packages got their group, so that if you installed only a base system, you can install all network-related packages with <tt>pacman -S network</tt> and so.<br />
+				</li><li>Created a new config tool: wificonfig, to configure your wireless connection.<br />
+				</li><li>The KDE menu changed a bit: now most installed non-kde applications should apper in the menu, too.<br />
+				</li><li>Localized Thunderbird and added localized spellcheck support.<br />
+				</li><li>The gimp-print printer drivers replaced with the foomatic ones, wich means we support much more printers now.<br />
+				</li><li>Packaged the rox desktop environment.<br />
+				</li><li>New web <a href="http://frugalware.org/packages.php">interface</a> for viewing informations about packages.<br />
+				</li><li>Now all package has it's own changelog, which can be viewed from for example the packages page.</li></ul><br />
+			</li><li>Package highlights: More than 150 new packages: windowmaker applets, firestarter, pure-ftpd, subversion and more.<br />
+			</li><li>Updates: As usual, Frugalware cames with the latest version of upstream stable releases, including:<br />
+				<ul><li>Linux kernel 2.6.12<br />
+				</li><li>GCC 3.4.4<br />
+				</li><li>KDE 3.4.1</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-i686-net.iso">netinstall</a> (16M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-i686-cd1.iso">cd1</a> (506M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-i686-cd2.iso">cd2</a> (692M), <a href="download.php?url=frugalware-current-iso/frugalware-0.3pre1-i686-dvd.iso">dvd</a> (2.4G)<br />
+			MD5SUMS:<br />
+			<tt>7e62e1aeb2a32f29edf26670f268bd63  frugalware-0.3pre1-i686-cd1.iso<br />
+			6ba2f51262fd81850a03c8c9603823af  frugalware-0.3pre1-i686-cd2.iso<br />
+			284386e5fcf062c4b71f9a72cd8f138f  frugalware-0.3pre1-i686-dvd.iso<br />
+			5066616ee44c8489b14a573cbaeba95b  frugalware-0.3pre1-i686-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>21</id>
+		<title>3 more articles in online IT newspages</title>
+		<date>Sun Jun 23 23:21:34 CEST 2005</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			</p><div align="justify">Three more articles are published in online IT newspages about Frugalware Linux. The first can be read on th Newsforge site <a href="http://os.newsforge.com/os/05/06/03/2046247.shtml?tid=152&amp;tid=2">here</a> (the article is also available on Linux.com, <a href="http://distrocenter.linux.com/distrocenter/05/06/03/2046259.shtml?tid=127">here</a>), written by Eduardo Romero. The other two articles are reviews from different point of view. The <a href="http://www.linuxquestions.org/reviews/showproduct.php/product/565">first review</a> is readable on <a href="http://www.linuxquestions.org">linuxquestions.org</a>. The other <a href="http://www.distrotalk.net/cms_view_article.php?aid=4">review</a> is avialable on <a href="http://www.distrotalk.net/">distrotalk.net</a>.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>20</id>
+		<title>Articles about Frugalware Linux</title>
+		<date>Mon May  9 21:42:15 CEST 2005</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			</p><div align="justify">Two arcticles are published about Frugalware Linux. The first is an interview on <a href="http://www.jox.hu">jox.hu</a>, a hungarian IT page. The article is available from <a href="http://www.jox.hu/cikk/?id=141&amp;r=12">here</a> (only in Hungarian). The second is on <a href="http://distrowatch.com">Distrowatch.com</a>. The Distrowatch staff chose the Frugalware Linux to the "Featured distribution of the week". They spent some time to install and evaluate other, well-known Linux distributions and decided to give our distro that title. You can read this article <a href="http://distrowatch.com/weekly.php?issue=20050509#fdow">here</a>.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>19</id>
+		<title>Frugalware 0.2 released</title>
+		<date>Thu Apr 28 09:33:28 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.2, our second stable release.<br />
+			A short list of the most important improvements and bugfixes since 0.2rc2:<ul><li>updates:<br />
+				<ul><li>Mozilla Suite to 1.7.7<br />
+				</li><li>MPlayer 1.0pre7</li></ul><br />
+			</li><li>new packages:<br />
+				<ul><li>irda-utils (Utilities for infrared communication between devices)<br />
+				</li><li>frugalrledit (Runlevel Editor for Frugalware Linux.)</li></ul><br />
+			</li><li>fixes:<br />
+				<ul><li>added patch to binutils to ignore as_needed libs that were not needed</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>ChangeLog</a> for more information.<br />
+			Download: <a href="download.php?url=frugalware-0.2-iso/frugalware-0.2-net.iso">netinstall</a> (21M), <a href="download.php?url=frugalware-0.2-iso/frugalware-0.2-cd1.iso">cd1</a> (473M), <a href="download.php?url=frugalware-0.2-iso/frugalware-0.2-cd2.iso">cd2</a> (691M), <a href="download.php?url=frugalware-0.2-iso/frugalware-0.2-cd3.iso">cd3</a> (700M), <a href="download.php?url=frugalware-0.2-iso/frugalware-0.2-dvd.iso">dvd</a> (2.5G)<br />
+			MD5SUMS:<br />
+			<tt>252b1b80a7dced637d581215ae8a5c0d  frugalware-0.2-cd1.iso<br />
+			626a429a63e9fa050feac480f03bb2f2  frugalware-0.2-cd2.iso<br />
+			396e4cb0ffe5e66803d609fe675b9615  frugalware-0.2-cd3.iso<br />
+			bb0e6b7ac803ff70553f497c91abd6f0  frugalware-0.2-dvd.iso<br />
+			537648812bed287fb3d23965c5f0a266  frugalware-0.2-net.iso</tt><br />
+			<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>18</id>
+		<title>Frugalware 0.2rc2 released</title>
+		<date>Mon Apr 18 09:22:55 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.2rc2, the second (and last) release candidate of the upcoming 0.2 stable release.<br />
+			A short list of the most important improvements and bugfixes since 0.2rc1:<ul><li>updates:<br />
+				<ul><li>updated GNOME to 2.10.1<br />
+				</li><li>Firefox (+ language packs) updated to 1.0.3<br />
+				</li><li>updated Linux kernel to 2.6.11.7<br />
+				</li><li>updated glibc to 2.3.5</li></ul><br />
+			</li><li>new packages:<br />
+				<ul><li>bk-client (The Open Source BitKeeper Client)<br />
+				</li><li>xemacs (A highly customizable open source text editor and application development system.)<br />
+				</li><li>raggle (A console RSS aggregator, written in Ruby.)<br />
+				</li><li>lsof (Displays information about files open to Unix processes.)</li></ul><br />
+			</li><li>fixes:<br />
+				<ul><li>now loop and lp modules are loaded automatically, so /dev/loop* and /dev/lp* devices will be created during boot</li></ul><br />
+			</li><li>setup:<br />
+				<ul><li>display a progressbar while downloading in netinstall mode<br />
+				</li><li>if an error occured during the installation, you have to press enter before setup continues<br />
+				</li><li>don't restart your computer after a successful setup, if you want</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>ChangeLog</a> for more information.<br />
+			Frugalware 0.2rc2 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>17</id>
+		<title>Frugalware 0.2rc1 released</title>
+		<date>Thu Apr  7 09:17:18 CEST 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.2rc1, the first release candidate of the upcoming 0.2 stable release.<br />
+			A short list of most important improvements and fixed bugs since 0.2pre2:<ul><li>updates:<br />
+				<ul><li>updated GNOME to 2.10.0<br />
+				</li><li>updated KDE to 3.4.0<br />
+				</li><li>updated Linux kernel to 2.6.11<br />
+				</li><li>Firefox (+language packs) and Thunderbird updated to 1.0.2<br />
+				</li><li>Xfce updated to 4.2.1</li></ul><br />
+			</li><li>new packages:<br />
+				<ul><li>new openoffice.org language packs<br />
+				</li><li>new firefox language packs<br />
+				</li><li>gnome-spell (A GNOME/Bonobo component for spell checking)<br />
+				</li><li>wvdial (WVDial CLI dialer)<br />
+				</li><li>valknut (Direct Connect 4 Linux File Sharing program.)<br />
+				</li><li>courier-imap (The Courier IMAP and POP3 server)</li></ul><br />
+			</li><li>artwork:<br />
+				<ul><li>new default cursor and GNOME theme</li></ul><br />
+			</li><li>setup:<br />
+				<ul><li>support for XDM configuration (if you do not install KDM or GDM)</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>ChangeLog</a> for more information.<br />
+			Frugalware 0.2rc1 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>16</id>
+		<title>KDE 3.4.0 packages are on mirrors</title>
+		<date>Sun Mar 20 23:30:16 CET 2005</date>
+		<author>aThom</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			KDE 3.4.0 packages are ready!<br />
+			You can read the announcement <a href="http://kde.org/announcements/announce-3.4.php">here</a>.<br />
+			You can read about the new features <a href="http://developer.kde.org/development-versions/kde-3.4-features.html">here</a>.<br />
+			Packaging changes since 3.3.2:<br />
+			<ul><li>Changing groups: If you want to install only the core kde packages, use 'pacman -S kde-core', if you want additional packages (k3b, krusader, etc) use 'pacman -S kde'.<br />
+			</li><li>kde-i18n packages are in the 'extra/locale' group.</li></ul><br />
+			New packages:<blockquote>kde-i18n-br, kde-i18n-fy, kde-i18n-ga, kde-i18n-lt, kde-i18n-mk, kde-i18n-se</blockquote><br />
+			Removed packages:<blockquote>kde-i18n-af, kde-i18n-el, kde-i18n-fa, kde-i18n-gl, kde-i18n-hr, kde-i18n-mn, kde-i18n-ms, kde-i18n-uz, kde-i18n-zh_TW</blockquote><br />
+			Known "bugs" / need to fix:<br />
+			<ul><li>A bug was found in the groupware support of kontact/kmail, which was too late for the KDE 3.4 release. Get <a href="http://download.kde.org/stable/3.4/src/kdepim-fix-imap-resource-type.diff">kdepim-fix-imap-resource-type.diff</a> applied to the sources before you're using the groupware wizard. For more information, see <a href="http://kde.org/info/3.4.php">http://kde.org/info/3.4.php</a><br />
+			</li><li>If you start the OpenOffice.org, and choose File -&gt; Open, then the dialog appears shortly. After that the KDE Crashmanager come up with the following message:<br />
+			The Program Openoffice (kdefilepicker) crash and send signal 11<br />
+			It's fixed in the OOo2 KDE builds. (See <a href="http://bugs.kde.org/show_bug.cgi?id=100849">http://bugs.kde.org/show_bug.cgi?id=100849</a>.) As workaround on KDE side, add the following lines to your ~/.kde/share/config/kdeglobals:<br />
+			[Development]<br />
+			AutoCheckAccelerators=false<br />
+			</li><li>Upgraders: after the usual 'pacman -Syu', use 'pacman -S kdelibs kdebase' again, otherwise you'll have problems with kde menus!<br />
+			</ul><br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>15</id>
+		<title>GNOME 2.10.0 is in -current</title>
+		<date>Mon Mar 14 15:20:02 CET 2005</date>
+		<author>laci</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			If everything goes fine tomorrow GNOME 2.10.0 will be on mirrors.<br />
+			Official release notes: <a href="http://www.gnome.org/start/2.10/notes/">http://www.gnome.org/start/2.10/notes/</a><br />
+			These are untested and need to review or update:<br />
+			<ul><li>GNOME bindings.<br />
+			</li><li>Mono.<br />
+			</li><li>Some packages in extra/gnome.</li></ul><br />
+			Packaging changes from 2.8:<br />
+			<ul><li>Prefix is /usr.<br />
+			</li><li>Added groups() directive where it was missed.</li></ul><br />
+			New packages:<br />
+			<ul><li>gnome-backgrounds<br />
+			</li><li>gnome-doc-utils<br />
+			</li><li>gnome-menus<br />
+			</li><li>gnome-pilot-conduits<br />
+			</li><li>libcroco</li></ul><br />
+			Removed packages (go to pasture):<br />
+			<ul><li>at-spi<br />
+			</li><li>gnome-mag<br />
+			</li><li>gnome-speech<br />
+			</li><li>gnopernicus<br />
+			</li><li>gok<br />
+			</li><li>nautilus-media</li></ul><br />
+			Not packaged packages:<br />
+			<ul><li>sound-juicer (I think goobox is better grabber application)</li></ul><br />
+			Known "bugs" / need to fix:<br />
+			<ul><li>If KDE is installed, the GNOME menu aren't displayed correctly:<br />
+			<a href="http://frugalware.org/~laci/screenshots/menu-bad.png">http://frugalware.org/~laci/screenshots/menu-bad.png</a><br />
+			Good menu: <a href="http://frugalware.org/~laci/screenshots/menu-good.png">http://frugalware.org/~laci/screenshots/menu-good.png</a><br />
+			</li><li>OpenOffice.org menu entries isn't in the GNOME menu.</li></ul><br />
+			Screenshots:<br />
+			<ul><li><a href="http://frugalware.org/~laci/screenshots/GNOME06.png">http://frugalware.org/~laci/screenshots/GNOME06.png</a><br />
+			</li><li><a href="http://frugalware.org/~laci/screenshots/GNOME07.png">http://frugalware.org/~laci/screenshots/GNOME07.png</a></li></ul><br />
+			Please test it and report me if something doesn't work as it should.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>14</id>
+		<title>Frugalware 0.2pre2 released</title>
+		<date>Wed Feb 23 22:59:18 CET 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.2pre2, the second preview of the upcoming 0.2 stable release.<br />
+			A short list of most important improvements and fixed bugs since 0.2pre1:<ul><li>new packages:<br />
+				<ul><li>OpenOffice.org 1.1.4 + language packs<br />
+				</li><li>frugalpkg (Graphical frontend to pacman)<br />
+				</li><li>gnomebaker (CD/DVD Burner for GNOME)<br />
+				</li><li>fglrx (Hardware Accelerated ATI driver for xorg)<br />
+				</li><li>wireless_tools (including iwconfig)<br />
+				</li><li>audacity<br />
+				</li><li>fontforge<br />
+				</li><li>krusader<br />
+				</li><li>qemu (A fast processor emulator)<br />
+				</li><li>rpm</li></ul><br />
+			</li><li>updates:<br />
+				<ul><li>updated GNOME to 2.8.3<br />
+				</li><li>Xfce updated to 4.2.0<br />
+				</li><li>updated XOrg to 6.8.2<br />
+				</li><li>updated tetex to 3.0<br />
+				</li><li>updated glibc to 2.3.4</li></ul><br />
+			</li><li>improvements:<br />
+				<ul><li>added .desktop files to window managers to work with GDM<br />
+				</li><li>Hungarian documentation<br />
+				</li><li>Slovak setup and documentation</li></ul><br />
+			</li><li>setup:<br />
+				<ul><li>initial netinstall support</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>ChangeLog</a> for more information.<br />
+			Frugalware 0.2pre2 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>13</id>
+		<title>OpenOffice.org in Frugalware</title>
+		<date>Mon Feb 21 15:40:32 CET 2005</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			We have good news to our users: the openoffice.org package is ready to use. This package was made from the <a href="http://www.novell.com/linux/ximian.html">Ximian</a> <a href="http://www.openoffice.org/">OpenOffice.org</a>. The main package is the "openoffice.org" what contains the user interface and also the dictionary, the hyphenation and the thesaurus in English.<br />
+			The languaga packs are called "openoffice.org-i18n-xx" (where xx is the small country code, eg: hu, de, fr) and contains the dictionaries, the hyphenations and the thesaurus in te given language.<br />
+			IroNiQ<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>12</id>
+		<title>Offical Forum</title>
+		<date>Sun Feb  6 19:46:21 CET 2005</date>
+		<author>shrift</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Hi all! So, at last we made it! Our new forum can be reached here: <a href="http://forums.frugalware.org/">forums.frugalware.org</a>!<br />
+			Any problems can be reported at: <a href="mailto:shrift@frugalware.org">shrift@frugalware.org</a> or at the "<a href="http://forums.frugalware.org/index.php?t=thread&amp;frm_id=29">About the forum</a>" topic.<br />
+			Shrift<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>11</id>
+		<title>Irc web interface and logs</title>
+		<date>Thu Jan 20 00:21:12 CET 2005</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			We have good news to that users, who cannot join our irc server: we have a web interface to our irc channel. You can join the channel on <a href="irc.php">this</a> address. You can also find here the channel log.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>10</id>
+		<title>Forum and coming new functions</title>
+		<date>Sun Jan 16 21:58:22 CET 2005</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			We are pleased to inform our Hungarian users that the HUP (Hungarian Unix Portal) made a complete forum for us, which is available <a href="http://hup.hu/modules.php?name=Forums&amp;file=viewforum&amp;f=56">here</a>.<br />
+			In the near future two new things will be available in our webpage: the Wiki page and our Forum.<br />
+			Besides these things, the Frugalware will widen with the slovak language. The Frugalware User Documentation is ready (can be read <a href="http://ftp.frugalware.org/pub/frugalware/frugalware-current/docs/html/sk/">here</a>) in slovak language, the translation of the setup and the init system is going on now.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>9</id>
+		<title>Frugalware 0.2pre1 released</title>
+		<date>Mon Jan 10 09:22:50 CET 2005</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.2pre1, the first preview of the upcoming 0.2 stable release.<br />
+			A short list of most important improvements and fixed bugs since 0.1:<ul><li>new packages:<br />
+				<ul><li>GNOME 2.8 (including GDM)<br />
+				</li><li>Xfce 4.2rc3<br />
+				</li><li>Firefox 1.0 language packs<br />
+				</li><li>Thunderbird 1.0<br />
+				</li><li>tetex-bin, tetex-base and kile<br />
+				</li><li>wine<br />
+				</li><li>reiser4progs<br />
+				</li><li>fluxbox</li></ul><br />
+			</li><li>updates:<br />
+				<ul><li>updated KDE to 3.3.2 (+ security fixes)<br />
+				</li><li>KOffice updated to 1.3.5<br />
+				</li><li>kernel updated to 2.6.10 (+ security fixes)<br />
+				</li><li>blender updated to 2.36<br />
+				</li><li>Firefox updated to 1.0<br />
+				</li><li>new bootsplash theme<br />
+				</li><li>GTK+2 updated to 2.6.1<br />
+				</li><li>GCC updated to 3.4.3</li></ul><br />
+			</li><li>fixes:<br />
+				<ul><li>XOrg now should work with i810 cards<br />
+				</li><li>fixed grubconfig to report no error when hitting cancel before installation</li></ul><br />
+			</li><li>setup:<br />
+				<ul><li>the first CD splitted up: one for the base system, one for the graphical (x11) system<br />
+				</li><li>prevented several memory leaks in setup, now should work with 64MB of memory<br />
+				</li><li>fixed several typos in setup texts</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>ChangeLog</a> for more information.<br />
+			Frugalware 0.2pre1 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>8</id>
+		<title>XFce is in -current, Firefox locale packages, too</title>
+		<date>Thu Dec 30 21:15:06 CET 2004</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of the long-time expected Xfce4 window manager and the xfce4-goodies package. Besides new language packages are available to the firefox browser.<br />
+			Install method:<br />
+			<ul><li>Syncronizing package database: pacman -Sy<br />
+			</li><li>installing Xfce4: pacman -S xfce4<br />
+			</li><li>installing xfce4-goodies: pacman -S xfce4-goodies<br />
+			</li><li>installing firefox language packages: pacman -S firefox-$lang (where $lang is the two-letter language code, like: hu, de, fr)</ul><br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>7</id>
+		<title>Planned downtime</title>
+		<date>Tue Nov 16 09:52:54 CET 2004</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Today, approximately between 17-18h (CET), frugalware.org will be unavailable. This affects all (www, ftp, rsync, mailman) services, except dns. Thank for your understanding.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>6</id>
+		<title>New functions on webpage</title>
+		<date>Sun Nov 14 23:23:21 CET 2004</date>
+		<author>IroNiQ</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			Two new functions are available on our webpage: the <a href=roadmap.php>roadmap</a>, where you can find our releasing cycle, and the <a href=wishlist.php>wishlist</a>/<a href=todolist.php>todolist</a>, where you can ask for your favourite program or see the list, what do we have to do.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>5</id>
+		<title>Frugalware 0.1 screenshot tour by OSDir</title>
+		<date>Sat Nov  6 22:35:40 CET 2004</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			OSDir installed a Frugalware 0.1 to a test machine and took 78 pictures during installation, wich can be found <a href="http://osdir.com/shots/slideshows/slideshow.php?release=169&amp;slide=1">here</a>.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>4</id>
+		<title>Frugalware 0.1 released</title>
+		<date>Tue Nov  2 10:27:36 CET 2004</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.1, our first stable release.<br />
+			A short list of improvements and fixed bugs since rc2:<ul><li>improvements:<br />
+				<ul><li>added support for using a separate /boot partition<br />
+				</li><li>moved all removable media entries from /mnt to /media<br />
+				</li><li>updated kde to 3.3.1</li></ul><br />
+			</li><li>new packages:<br />
+				<ul><li>strace<br />
+				</li><li>openbox, obconf, and their dependencies<br />
+				</li><li>irssi<br />
+				</li><li>lmsensors<br />
+				</li><li>nano<br />
+				</li><li>hunspell<br />
+				</li><li>screen<br />
+				</li><li>centericq</li></ul><br />
+			</li><li>fixes:<br />
+				<ul><li>got xdm to work</li></ul><br />
+			</li><li>setup:<br />
+				<ul><li>fixed cleaning up cache when only the first cd used<br />
+				</li><li>added support for displaying detailed information about MS partitions<br />
+				</li><li>now short descriptions are available for packages<br />
+				</li><li>support for usb keyboards</li></ul></li></ul><br />
+			Please refer to the Frugalware <a href=changelog.php>Change Log</a> for more information.<br />
+			Frugalware 0.1 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>3</id>
+		<title>Frugalware 0.1rc2 released</title>
+		<date>Mon Oct 11 15:40:13 CEST 2004</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.1rc2, the second release candidate of the 0.1 release.<br />
+			For a list of improvements and fixed bugs since rc1, please refer to the Frugalware <a href=changelog.php>Change Log</a>.<br />
+			Frugalware 0.1rc2 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>2</id>
+		<title>Frugalware 0.1rc1 released</title>
+		<date>Wed Sep 29 07:14:26 CEST 2004</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			The Frugalware Developer Team is pleased to announce the immediate availability of Frugalware 0.1rc1, the first release candidate of the 0.1 release.<br />
+			For a list of improvements since the beginning, please refer to the Frugalware <a href=changelog.php>Change Log</a>.<br />
+			Frugalware 0.1rc1 can be downloaded by visiting the <a href=download.php>download</a> page.<br />
+			]]>
+		</content>
+	</post>
+	<post>
+		<id>1</id>
+		<title>Test message</title>
+		<date>Mon Sep 13 13:53:37 CEST 2004</date>
+		<author>VMiklos</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+			seems to work... ;-)<br />
+			]]>
+		</content>
+	</post>
+</news>
+<!-- vim: ts=2
+-->
From hermier at frugalware.org  Sat Oct 13 11:55:04 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Sat Oct 13 11:55:06 2007
Subject: [Frugalware-git] homepage-ng: Fixing some typos for fr.
Message-ID: <20071013095504.3747213A4002@genesis.frugalware.org>

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

commit 774816453f0a29ac0ff933733ce4f9239f355e21
Author: Michel Hermier <hermier@frugalware.org>
Date:   Sat Oct 13 11:54:53 2007 +0200

Fixing some typos for fr.

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index 26b2a82..324c9c0 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -27,7 +27,7 @@
Aucune nouvelles fonctionalitĂŠs n'a ĂŠtĂŠ ajoutĂŠes depuis la 0.7rc2, mais plus de 150 modifications ont ĂŠtĂŠ effectuĂŠes pour corriger des bugs mineurs.
Si vous n'avez pas suivi les changements avec les pre-release et les release candidate, voici les plus importants changements depuis la version 0.6:<br />
<ul>
-				<li>Mise à jour du système de bas: Linux kernel 2.6.22.9, Glibc 2.6.1 et GCC 4.2.1.</li>
+				<li>Mise à jour du système de base: Linux kernel 2.6.22.9, Glibc 2.6.1 et GCC 4.2.1.</li>
<li>Mise Ă  jour des environnements graphiques: KDE 3.5.7, GNOME 2.20, XFCE 4.4.1, OpenOffice 2.3.0 et Firefox 2.0.0.7.</li>
<li>Un LiveCD appellĂŠ FwLive est maintenant disponible pour cette release.</li>
<li>Installateur: langue spĂŠcifique par dĂŠfaut (clavier, zone horaire, mirroir par dĂŠfaut), l'installation est maintenant enregistrĂŠe dans un log.</li>
@@ -122,14 +122,14 @@ fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
</post>
<post>
<id>75</id>
-		<title>Mise Ă  jour du noeau dans -current: AVERTISSEMENT pour les utilisateurs Intel avec des controlleurs IDE</title>
+		<title>Mise Ă  jour du noyau dans -current: AVERTISSEMENT pour les utilisateurs Intel avec des controlleurs IDE</title>
<date>Thu Oct  4 15:08:53 UTC 2007</date>
<author>hermier</author>
<hidden>0</hidden>
<content><![CDATA[
-						Depuis le kernel-2.6.22-6 dans Frugalware-current, les utilisateurs Intel aurons des pÊriphÊriques /dev/sd* à la place des /dev/hd*. La raison est la suivante: Il à ÊtÊ impossible de dÊmarrer le noyeau sur certaines machine sans ce changement. Voir <a href="http://bugs.frugalware.org/2243">ce rapport d'erreur</a> pour plus de dÊtails. En consÊquence, apès avoir mis à jour en utilisant pacman -Syu, vous devrez:
+						Depuis le kernel-2.6.22-6 dans Frugalware-current, les utilisateurs Intel aurons des pÊriphÊriques /dev/sd* à la place des /dev/hd*. La raison est la suivante: il a ÊtÊ impossible de dÊmarrer le noyau sur certaines machine sans ce changement. Voir <a href="http://bugs.frugalware.org/2243">ce rapport d'erreur</a> pour plus de dÊtails. En consÊquence, après avoir mis à jour en utilisant pacman -Syu, vous devrez:
<ol>
-										<li>Verrifiez si vous possĂŠdez un controlleur IDE Intel en faisant un: sudo lspci |grep -i intel.*ide. Si vous n'avez aucun rĂŠsultat sous n'ĂŞtes probablement pas affectĂŠ.</li>
+										<li>VĂŠrifiez si vous possĂŠdez un controlleur IDE Intel en faisant un: sudo lspci |grep -i intel.*ide. Si vous n'avez aucun rĂŠsultat sous n'ĂŞtes probablement pas affectĂŠ.</li>
<li>Edit /etc/fstab: changez toutes les occurrences de /dev/hd en /dev/sd.</li>
<li>Edit /boot/grub/menu.lst: changez toutes les occurrences de /dev/hd en /dev/sd dans les entrĂŠes Frugalware.</li>
<li>Reboot.</li>
From crazy at frugalware.org  Sat Oct 13 12:35:26 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:35 2007
Subject: [Frugalware-git] frugalware-current: foo2zjs-2007_07_15-1-i686
Message-ID: <20071013103526.C148313A4002@genesis.frugalware.org>

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

commit cac4d1abe905ab2cc87cd09bc0df35ce64444ff9
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:09:41 2007 +0200

foo2zjs-2007_07_15-1-i686
* added a simply Fmkdir to build()
* so ppds get installed.
* thx 'mwc' for the fix :)
* bump after freeze while that package changes sha1sum every day

diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild
index 25ebeba..545f295 100644
--- a/source/apps-extra/foo2zjs/FrugalBuild
+++ b/source/apps-extra/foo2zjs/FrugalBuild
@@ -29,6 +29,7 @@ build() {
#./getweb 1000 || Fdie
## heh well get all
./getweb all || Fdie
+	Fmkdir /usr/share/cups/model
Fmakeinstall
Fexerel /etc/hotplug/usb/hplj1000
Fln /etc/hotplug/usb/hplj1000 /etc/hotplug/usb/hplj1005
From crazy at frugalware.org  Sat Oct 13 12:35:26 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:38 2007
Subject: [Frugalware-git] frugalware-current: libmtp-0.2.2-1-i686
Message-ID: <20071013103526.DFDD413A4004@genesis.frugalware.org>

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

commit 35fb3580e88ab85b9f6871c63f05a57eb98765a3
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:29:44 2007 +0200

libmtp-0.2.2-1-i686
* Version bump

diff --git a/source/lib-extra/libmtp/FrugalBuild b/source/lib-extra/libmtp/FrugalBuild
index 454c153..41ba29d 100644
--- a/source/lib-extra/libmtp/FrugalBuild
+++ b/source/lib-extra/libmtp/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=libmtp
-pkgver=0.2.1
+pkgver=0.2.2
pkgrel=1
pkgdesc="libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)."
depends=('libusb')
groups=('lib-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
-sha1sums=('395a24c815967af7a2b8e2034fc0e24f19bca268')
+sha1sums=('6337173e6a11269f97315085fc4a8d5d0e8b2e84')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:38 2007
Subject: [Frugalware-git] frugalware-current: lipstik-2.2.3-1-i686
Message-ID: <20071013103527.159E113A4006@genesis.frugalware.org>

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

commit fb52e7310d020c9e96c7a97ae4c5ee0d6cf3887c
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:54:30 2007 +0200

lipstik-2.2.3-1-i686
repoman -t p07 -k push

diff --git a/source/kde-extra/lipstik/FrugalBuild b/source/kde-extra/lipstik/FrugalBuild
index 5cdc363..d011df0 100644
--- a/source/kde-extra/lipstik/FrugalBuild
+++ b/source/kde-extra/lipstik/FrugalBuild
@@ -3,14 +3,14 @@
# Contributor: Dániel Zámbó <rage@mtrr.hu>

pkgname=lipstik
-pkgver=2.2.2
+pkgver=2.2.3
pkgrel=1
pkgdesc="Lipstik theme for KDE"
-depends=('kdebase>=3.5.6')
+depends=('kdebase>=3.5.7')
groups=('kde-extra')
archs=('i686' 'x86_64')
_F_kde_id2="18223"
Finclude kde
-source=(http://www.kde-look.org/CONTENT/content-files/18223-$pkgname-$pkgver.tar.bz2)
-sha1sums=('6643230e4b5a646191c444b439a6658470a1812a')
+source=(http://www.kde-look.org/CONTENT/content-files/18223-$pkgname-$pkgver.tar.gz)
+sha1sums=('8ede346df983eabfd31057a7d60a74faa2d46081')
# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:39 2007
Subject: [Frugalware-git] frugalware-current: dbus-python-0.82.3-1-i686
Message-ID: <20071013103527.0637F13A4005@genesis.frugalware.org>

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

commit e7e1af3aef9301b07915370055b9d93d9962ece1
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 01:34:34 2007 +0200

dbus-python-0.82.3-1-i686
* Version bump

diff --git a/source/apps/dbus-python/FrugalBuild b/source/apps/dbus-python/FrugalBuild
index 38aef71..bcb8690 100644
--- a/source/apps/dbus-python/FrugalBuild
+++ b/source/apps/dbus-python/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=dbus-python
-pkgver=0.82.2
+pkgver=0.82.3
pkgrel=1
pkgdesc="Python bindings for D-BUS"
url="http://www.freedesktop.org/wiki/Software_2fDBusBindings"
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:40 2007
Subject: [Frugalware-git] frugalware-current: tastymenu-1.0.1-1-i686
Message-ID: <20071013103527.2AA6913A4007@genesis.frugalware.org>

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

commit 5670f51b84b007ddcf9da7e3e71690b8ee6e3e28
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:09:06 2007 +0200

tastymenu-1.0.1-1-i686
* Version bump

diff --git a/source/kde-extra/tastymenu/FrugalBuild b/source/kde-extra/tastymenu/FrugalBuild
index 358c67c..a63c7ea 100644
--- a/source/kde-extra/tastymenu/FrugalBuild
+++ b/source/kde-extra/tastymenu/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=tastymenu
-pkgver=1.0
+pkgver=1.0.1
pkgrel=1
pkgdesc="Tasty Menu is a KMenu replacement."
depends=('kdelibs>=3.5.7')
@@ -11,6 +11,6 @@ archs=('i686' 'x86_64')
_F_kde_id="41866"
Finclude kde
source=(http://www.notmart.org/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('7de7ed4bc39be7632c526e3bd3a0e729c254f1e9')
+sha1sums=('fa67025a4d229037f3d04188116fd4d294e4a983')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:42 2007
Subject: [Frugalware-git] frugalware-current: yakuake-2.8-1-i686
Message-ID: <20071013103527.51C7D13A400D@genesis.frugalware.org>

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

commit acee8665527bcda15358f09ed026b774bf5b7560
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:24:31 2007 +0200

yakuake-2.8-1-i686
* Version bump

diff --git a/source/kde-extra/yakuake/FrugalBuild b/source/kde-extra/yakuake/FrugalBuild
index e3138bc..0d6cd11 100644
--- a/source/kde-extra/yakuake/FrugalBuild
+++ b/source/kde-extra/yakuake/FrugalBuild
@@ -2,11 +2,10 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=yakuake
-pkgver=2.7.5
+pkgver=2.8
pkgrel=1
pkgdesc="Yakuake is a Quake-style terminal emulator based on KDE Konsole technology."
depends=('kdebase')
-source=("http://www.kde-apps.org/content/files/29153-$pkgname-$pkgver.tar.bz2")
license="GPL"
groups=('kde-extra')
archs=('i686' 'x86_64')
@@ -14,7 +13,9 @@ _F_kde_id="29153"
_F_kde_reconf=1
Finclude kde
url="http://extragear.kde.org/apps/yakuake/"
-source=("http://www.kde-apps.org/content/files/29153-$pkgname-$pkgver.tar.bz2")
-sha1sums=('6bcb732877cda8747e5c874175e7627e8d642953')
+source=(http://download2.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('4d9c0da7ba4fe20b05af9c97346805acd887c7a2')

# optimalization OK
+
+# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:42 2007
Subject: [Frugalware-git] frugalware-current: unicap-0.2.17-1-i686
Message-ID: <20071013103527.74CC113A4011@genesis.frugalware.org>

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

commit ebf15bd89e55a4830a1fb59ae7b7ae742df2dc81
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:31:21 2007 +0200

unicap-0.2.17-1-i686
* Version bump

diff --git a/source/xlib-extra/unicap/FrugalBuild b/source/xlib-extra/unicap/FrugalBuild
index 889b88f..9099065 100644
--- a/source/xlib-extra/unicap/FrugalBuild
+++ b/source/xlib-extra/unicap/FrugalBuild
@@ -2,15 +2,16 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=unicap
-pkgver=0.2.13
+pkgver=0.2.17
pkgrel=1
pkgdesc="unicap provides a uniform API for all kinds of video capture devices."
depends=('libxv' 'gtk+2' 'freetype2>=2.3.3' 'libraw1394')
+makedepends=('perl-xml')
options=('scriptlet')
groups=('xlib-extra')
archs=('i686')
Finclude sourceforge
url="http://unicap-imaging.org/"
-sha1sums=('2f15aa36c80501017e11c2fadd63e120207aef91')
+sha1sums=('72c759bbf4d4ca8191f79366ea1903592ec442ef')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:43 2007
Subject: [Frugalware-git] frugalware-current: geany-0.12-1-i686
Message-ID: <20071013103527.92EA113A4018@genesis.frugalware.org>

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

commit 3a2dcc59e0f42830eb21c7553ff41230be99b153
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:36:37 2007 +0200

geany-0.12-1-i686
* Version bump

diff --git a/source/xapps-extra/geany/FrugalBuild b/source/xapps-extra/geany/FrugalBuild
index 78916cd..5e9e5a7 100644
--- a/source/xapps-extra/geany/FrugalBuild
+++ b/source/xapps-extra/geany/FrugalBuild
@@ -2,14 +2,15 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=geany
-pkgver=0.11
+pkgver=0.12
pkgrel=1
pkgdesc="Geany is a text editor using the GTK2 toolkit."
depends=('vte')
+makedepends=('perl-xml')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
+sha1sums=('5dcd16837e3bfeecbf91953992d2960cf4d80b84')

-sha1sums=('e3bb677adf43b284204f0cb11e3f31c37b464f20')
# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:44 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-test-builder-tester-1.01-3-i686
Message-ID: <20071013103527.9B9D113A401F@genesis.frugalware.org>

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

commit 5936fcf31908cd5056b1ecdbad71e47255397532
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 02:53:17 2007 +0200

perl-test-builder-tester-1.01-3-i686
* fixed conflicting files
* something to push for 0.7 tree after is out =)

diff --git a/source/devel-extra/perl-test-builder-tester/FrugalBuild b/source/devel-extra/perl-test-builder-tester/FrugalBuild
index dc6a705..fb60007 100644
--- a/source/devel-extra/perl-test-builder-tester/FrugalBuild
+++ b/source/devel-extra/perl-test-builder-tester/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=perl-test-builder-tester
pkgver=1.01
-pkgrel=2
+pkgrel=3
pkgdesc="test testsuites that have been built with Test::Builder"
url="http://cpan.org/"
depends=('perl')
@@ -19,6 +19,8 @@ build()
Fcd Test-Builder-Tester-$pkgver
Fbuild
Frm /usr/lib/perl5/current
+	# conficts with perl
+	Frm /usr/man
}

From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:44 2007
Subject: [Frugalware-git] frugalware-current: perl-cairo-1.042-1-i686
Message-ID: <20071013103527.C2EEF13A4021@genesis.frugalware.org>

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

commit 9606eacda6cec13c5c5fa0c7dd8bc9cae66e63b1
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:23:00 2007 +0200

perl-cairo-1.042-1-i686
* Version bump

diff --git a/source/xlib-extra/perl-cairo/FrugalBuild b/source/xlib-extra/perl-cairo/FrugalBuild
index 6ef5a8c..0c9cf94 100644
--- a/source/xlib-extra/perl-cairo/FrugalBuild
+++ b/source/xlib-extra/perl-cairo/FrugalBuild
@@ -1,10 +1,10 @@
# Compiling Time: 0.05 SBU
# Maintainer: crazy <crazy@frugalware.org>

-pkgver=1.041
+pkgver=1.042
pkgdesc="Perl interface to the cairo library"
depends=('cairo>=1.2.4')
-makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'perl-test-number-delta')
options=('scriptlet' 'force')
_F_perl_name=Cairo
_F_perl_author=T/TS/TSCH
@@ -14,6 +14,6 @@ _F_sourceforge_name="Cairo"
Finclude sourceforge perl
archs=($archs 'x86_64')
groups=('xlib-extra')
-sha1sums=('906b55645db1d26f37a7e2e5763664ad3ebf850a')
+sha1sums=('5a9b9b1eaa1d2b8141f8e5a81c375f21cd66e780')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:45 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-test-number-delta-1.03-1-i686
Message-ID: <20071013103527.AEE6313A4020@genesis.frugalware.org>

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

commit 320d1b896fb48219fce7519d48ec583578e6407b
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:17:49 2007 +0200

perl-test-number-delta-1.03-1-i686
* New package for perl-cairo

diff --git a/source/devel-extra/perl-test-number-delta/FrugalBuild b/source/devel-extra/perl-test-number-delta/FrugalBuild
new file mode 100644
index 0000000..dec5e31
--- /dev/null
+++ b/source/devel-extra/perl-test-number-delta/FrugalBuild
@@ -0,0 +1,11 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Zsolt Szalai <xbit@frugalware.org>
+
+_F_perl_name=Test-Number-Delta
+_F_perl_author=D/DA/DAGOLDEN
+pkgver=1.03
+pkgdesc="Compare the difference between numbers against a given tolerance"
+depends=('perl-test-builder-tester>=1.01-3')
+Finclude perl
+archs=('i686' 'x86_64')
+sha1sums=('f7693a1cb856a9ab441a1ea2c9f8c14fc0e561b6')
From crazy at frugalware.org  Sat Oct 13 12:35:27 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:45 2007
Subject: [Frugalware-git] frugalware-current: faac-1.26-1-i686
Message-ID: <20071013103527.DC81213A4002@genesis.frugalware.org>

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

commit a66bc53df80eb520a90880888c317d322d99eb5b
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:30:12 2007 +0200

faac-1.26-1-i686
* Version bump
* wow the devels fixed the broken files *I wonder*

diff --git a/source/multimedia/faac/FrugalBuild b/source/multimedia/faac/FrugalBuild
index 4f2ee96..1e88ee4 100644
--- a/source/multimedia/faac/FrugalBuild
+++ b/source/multimedia/faac/FrugalBuild
@@ -2,23 +2,21 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=faac
-pkgver=1.25
+pkgver=1.26
pkgrel=1
pkgdesc="FAAC is an AAC audio encoder."
depends=('libmp4v2')
-makedepends=('hd2u')
groups=('multimedia')
archs=('i686' 'x86_64')
_F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://www.audiocoding.com"
-sha1sums=('482a0217362c50ce523ce5e165c5566e1a4a2a87')
+sha1sums=('5aad6d5a60107a5d6bf79654970168f498961b21')


build()
{
Fcd $pkgname
-	dos2unix * || Fdie
chmod +x bootstrap || Fdie
./bootstrap || Fdie
Fbuild
From crazy at frugalware.org  Sat Oct 13 12:35:28 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:46 2007
Subject: [Frugalware-git] frugalware-current: faad2-2.6-1-i686
Message-ID: <20071013103528.CF30713A4004@genesis.frugalware.org>

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

commit 29cad2ab7f44f37d0c8aecdf95e21c6920f8f999
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 03:47:59 2007 +0200

faad2-2.6-1-i686
* Version bump
* removed patch and all hacks , all fixed upsream O_O
* added sysfsutils to makedepends

diff --git a/source/multimedia/faad2/FrugalBuild b/source/multimedia/faad2/FrugalBuild
index 458a81b..bb2436c 100644
--- a/source/multimedia/faad2/FrugalBuild
+++ b/source/multimedia/faad2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=faad2
-pkgver=2.5
+pkgver=2.6
pkgrel=1
pkgdesc="ISO AAC audio decoder"
url="http://www.audiocoding.com/"
@@ -14,20 +14,13 @@ depends=('libstdc++')
rodepends=('libmp4v2')
groups=('multimedia')
archs=('i686' 'x86_64')
-makedepends=('libsndfile' 'id3lib' 'hd2u')
-source=($source first_add_the_dirs_to_the_source_till_then_kill_die.patch)
-sha1sums=('3805d32c9d0033572eced93482f81c1dd198cd2c' \
-          'd62e6f375a6ceb098951fc7d4af7866dd00a681a')
+makedepends=('libsndfile' 'id3lib' 'sysfsutils')
+sha1sums=('6af7fb40fc063effd5cb6c43e0b372e77408a01a')


build()
{
-	## SA-MI BAG ....
Fcd $pkgname
-	Fpatchall
-	dos2unix * || Fdie
-	## for all archs()
-	export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
Fautoreconf
Fmake --with-drm
Fmakeinstall
diff --git a/source/multimedia/faad2/first_add_the_dirs_to_the_source_till_then_kill_die.patch b/source/multimedia/faad2/first_add_the_dirs_to_the_source_till_then_kill_die.patch
deleted file mode 100644
index ac6134f..0000000
--- a/source/multimedia/faad2/first_add_the_dirs_to_the_source_till_then_kill_die.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur faad2/configure.in faad2-p/configure.in
---- faad2/configure.in	2006-08-13 16:13:31.000000000 +0200
-+++ faad2-p/configure.in	2006-11-18 03:00:56.000000000 +0100
-@@ -29,8 +29,6 @@
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)
-
--AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],
--	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
-
- AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],
- 	     WITHDRM=$withval, WITHDRM=no)
-@@ -114,11 +112,6 @@
-  AM_CONDITIONAL(HAVE_XMMS, false)
- fi
-
--if test x$WITHBMP = xyes; then
--  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
--  AM_CONDITIONAL([HAVE_XMMS], true)
--  AM_CONDITIONAL([HAVE_BMP], true)
--fi
-
- if test x$WITHDRM = xyes; then
-   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
-diff -Naur faad2/plugins/Makefile.am faad2-p/plugins/Makefile.am
---- faad2/plugins/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/Makefile.am	2006-11-18 03:00:56.000000000 +0100
-@@ -8,10 +8,6 @@
- if HAVE_XMMS
- SUBDIRS = xmms
- else
--if HAVE_BMP
--SUBDIRS = bmp
--else
- SUBDIRS =
--endif #HAVE_BMP
- endif #HAVE_XMMS
- endif #HAVE_MPEG4IP_PLUG
-diff -Naur faad2/plugins/xmms/src/Makefile.am faad2-p/plugins/xmms/src/Makefile.am
---- faad2/plugins/xmms/src/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/xmms/src/Makefile.am	2006-11-18 03:02:11.000000000 +0100
-@@ -1,12 +1,7 @@
--if HAVE_BMP
--libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
--local_CFLAGS=$(shell pkg-config --cflags bmp)
--local_LDFLAGS=$(shell pkg-config --libs bmp)
--else
-+
- local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
- local_LDFLAGS=`$(XMMS_CONFIG) --libs`
- libdir = `$(XMMS_CONFIG) --input-plugin-dir`
--endif #HAVE_BMP
- lib_LTLIBRARIES = libmp4.la
-
- libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
From crazy at frugalware.org  Sat Oct 13 12:35:29 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:47 2007
Subject: [Frugalware-git] frugalware-current: xmms-aac-2.6-1-i686
Message-ID: <20071013103529.43B5413A4002@genesis.frugalware.org>

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

commit 058476aa0b9b8a7a73b0a11f7940cfa5816fd655
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 16:21:15 2007 +0200

xmms-aac-2.6-1-i686
* Version bump

diff --git a/source/xlib-extra/xmms-aac/FrugalBuild b/source/xlib-extra/xmms-aac/FrugalBuild
index 1be56f0..45fb08e 100644
--- a/source/xlib-extra/xmms-aac/FrugalBuild
+++ b/source/xlib-extra/xmms-aac/FrugalBuild
@@ -2,32 +2,26 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=xmms-aac
-pkgver=2.5
+pkgver=2.6
pkgrel=1
pkgdesc="ISO AAC audio decoder plugin for xmms"
_F_sourceforge_dirname="faac"
_F_sourceforge_name="faad2"
_F_sourceforge_broken_up2date=1
Finclude sourceforge
-depends=('libstdc++' 'xmms' 'faad2')
+depends=('libstdc++' 'xmms' 'faad2>=2.6')
groups=('xlib-extra')
archs=('i686' 'x86_64')
-makedepends=('libsndfile' 'id3lib' 'hd2u')
-source=(${source[@]} first_add_the_dirs_to_the_source_till_then_kill_die.patch)
-sha1sums=('3805d32c9d0033572eced93482f81c1dd198cd2c' \
-	  'd62e6f375a6ceb098951fc7d4af7866dd00a681a')
+makedepends=('libsndfile' 'id3lib' 'sysfsutils')
+sha1sums=('6af7fb40fc063effd5cb6c43e0b372e77408a01a')

-build() {
+build()
+{
Fcd faad2
-	Fpatchall
-	dos2unix * || Fdie
-	export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
Fautoreconf
Fmake --with-mp4v2 --with-xmms
Fmakeinstall
Frm usr/{bin,include} usr/lib/*.{la,0,so,a}
}

-# optimalization OK
-
# optimization OK
diff --git a/source/xlib-extra/xmms-aac/first_add_the_dirs_to_the_source_till_then_kill_die.patch b/source/xlib-extra/xmms-aac/first_add_the_dirs_to_the_source_till_then_kill_die.patch
deleted file mode 100644
index ac6134f..0000000
--- a/source/xlib-extra/xmms-aac/first_add_the_dirs_to_the_source_till_then_kill_die.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur faad2/configure.in faad2-p/configure.in
---- faad2/configure.in	2006-08-13 16:13:31.000000000 +0200
-+++ faad2-p/configure.in	2006-11-18 03:00:56.000000000 +0100
-@@ -29,8 +29,6 @@
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)
-
--AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],
--	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
-
- AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],
- 	     WITHDRM=$withval, WITHDRM=no)
-@@ -114,11 +112,6 @@
-  AM_CONDITIONAL(HAVE_XMMS, false)
- fi
-
--if test x$WITHBMP = xyes; then
--  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
--  AM_CONDITIONAL([HAVE_XMMS], true)
--  AM_CONDITIONAL([HAVE_BMP], true)
--fi
-
- if test x$WITHDRM = xyes; then
-   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
-diff -Naur faad2/plugins/Makefile.am faad2-p/plugins/Makefile.am
---- faad2/plugins/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/Makefile.am	2006-11-18 03:00:56.000000000 +0100
-@@ -8,10 +8,6 @@
- if HAVE_XMMS
- SUBDIRS = xmms
- else
--if HAVE_BMP
--SUBDIRS = bmp
--else
- SUBDIRS =
--endif #HAVE_BMP
- endif #HAVE_XMMS
- endif #HAVE_MPEG4IP_PLUG
-diff -Naur faad2/plugins/xmms/src/Makefile.am faad2-p/plugins/xmms/src/Makefile.am
---- faad2/plugins/xmms/src/Makefile.am	2006-08-07 20:47:45.000000000 +0200
-+++ faad2-p/plugins/xmms/src/Makefile.am	2006-11-18 03:02:11.000000000 +0100
-@@ -1,12 +1,7 @@
--if HAVE_BMP
--libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
--local_CFLAGS=$(shell pkg-config --cflags bmp)
--local_LDFLAGS=$(shell pkg-config --libs bmp)
--else
-+
- local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
- local_LDFLAGS=`$(XMMS_CONFIG) --libs`
- libdir = `$(XMMS_CONFIG) --input-plugin-dir`
--endif #HAVE_BMP
- lib_LTLIBRARIES = libmp4.la
-
- libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
From crazy at frugalware.org  Sat Oct 13 12:35:29 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:48 2007
Subject: [Frugalware-git] frugalware-current: xine-lib-1.1.8-2-i686
Message-ID: <20071013103529.AEBF313A4002@genesis.frugalware.org>

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

commit 01c59ab9ebd685eab04fc9db398d32380235bf15
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 16:41:13 2007 +0200

xine-lib-1.1.8-2-i686
* rebuild
* added -fno-strict-aliasing to CFLAGS

diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild
index c567b79..2f0c334 100644
--- a/source/xlib/xine-lib/FrugalBuild
+++ b/source/xlib/xine-lib/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=xine-lib
pkgver=1.1.8
-pkgrel=1
+pkgrel=2
pkgdesc="Xine multimedia playback engine libraries"
_F_sourceforge_dirname="xine"
_F_sourceforge_ext=".tar.bz2"
@@ -12,7 +12,7 @@ _F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://xinehq.de"
depends=('imagemagick' 'aalib' 'libmng' 'libtheora' 'libvorbis' \
-	'faad2>=2.5' 'flac>=1.1.4' 'libxvmc' 'libxv' \
+	'faad2>=2.6' 'flac>=1.1.4' 'libxvmc' 'libxv' \
'speex' 'wavpack' 'libmpcdec' 'freetype2>=2.3.4' 'fontconfig' \
'mesa' 'libx11' 'libxxf86vm' 'ffmpeg')
options=('scriptlet')
@@ -22,7 +22,7 @@ archs=('i686' 'x86_64')
sha1sums=('48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf')
build()
{
-	export CFLAGS="$CFLAGS -UHAVE_MMX"
+	export CFLAGS="$CFLAGS -fno-strict-aliasing -UHAVE_MMX"
Fbuild \
--enable-ipv6 \
--with-arts \
From crazy at frugalware.org  Sat Oct 13 12:35:30 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:48 2007
Subject: [Frugalware-git] frugalware-current: bmpx-0.40.11-1-i686
Message-ID: <20071013103530.7402013A4005@genesis.frugalware.org>

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

commit 93a10a91629bc6dc9eccd15d5623a2615dbf106b
Author: crazy <crazy@frugalware.org>
Date:   Fri Oct 12 17:07:46 2007 +0200

bmpx-0.40.11-1-i686
* Version bump

diff --git a/source/xmultimedia-extra/bmpx/FrugalBuild b/source/xmultimedia-extra/bmpx/FrugalBuild
index d078a81..33550d8 100644
--- a/source/xmultimedia-extra/bmpx/FrugalBuild
+++ b/source/xmultimedia-extra/bmpx/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=bmpx
-pkgver=0.40.10
+pkgver=0.40.11
basever=0.40
-pkgrel=2
+pkgrel=1
pkgdesc="A media player that features support for specifications like XDS DnD, XSPF and DBus."
url="http://bmpx.beep-media-player.org"
depends=('libsidplay' 'gamin' 'alsa-lib' 'dbus>=1.0.0-2' 'dbus-glib' 'libglademm>=2.6.3-2' 'hal>=0.5.8.1' \
@@ -23,7 +23,7 @@ archs=('i686' 'x86_64')
up2date="lynx -dump 'http://bmpx.beep-media-player.org/site/BMPx_Homepage'|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2 \
01-fw_builduser.patch)
-sha1sums=('93516775311d76b4b34efc88bb512c7f9ec564b1' \
+sha1sums=('fc6f947ca59edcce6051e31710def54f8ee4b369' \
'a8aabe4db10959e488ffdc38881c88a7cd72855e')

subpkgs=("$pkgname-lastfm-firefox-plugin")
From crazy at frugalware.org  Sat Oct 13 12:35:31 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:49 2007
Subject: [Frugalware-git] frugalware-current: perl-mime-tools-5.423-1-i686
Message-ID: <20071013103531.799D313A4002@genesis.frugalware.org>

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

commit 95a92078ad232f59a54624589391e1be617b9d8f
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 00:46:55 2007 +0200

perl-mime-tools-5.423-1-i686
* Version bump

diff --git a/source/devel-extra/perl-mime-tools/FrugalBuild b/source/devel-extra/perl-mime-tools/FrugalBuild
index 3c9d183..d5d6268 100644
--- a/source/devel-extra/perl-mime-tools/FrugalBuild
+++ b/source/devel-extra/perl-mime-tools/FrugalBuild
@@ -2,11 +2,10 @@
# Maintainer: crazy <crazy@frugalware.org>

_F_perl_name=MIME-tools
-_F_perl_author=D/DS/DSKOLL
-pkgver=5.420
-pkgrel=1
+_F_perl_author=D/DO/DONEILL
+pkgver=5.423
pkgdesc="Perl modules for parsing (and creating!) MIME entities"
depends=('perl-io-stringy' 'perl-mailtools')
Finclude perl
archs=('i686' 'x86_64')
-sha1sums=('cabeda2fb536c1ab426e3c20435318f5b2257c6c')
+sha1sums=('047507820fac12f124f3730577b35117d21d5c80')
From crazy at frugalware.org  Sat Oct 13 12:35:31 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:50 2007
Subject: [Frugalware-git] frugalware-current: pxlib-0.6.3-1-i686
Message-ID: <20071013103531.DD29713A4018@genesis.frugalware.org>

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

commit 23e632abdf6de68d3d89821affbe2b7daa4ea910
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 00:52:22 2007 +0200

pxlib-0.6.3-1-i686
* Version bump
* fixed depends
* kill off custom up2date

diff --git a/source/lib-extra/pxlib/FrugalBuild b/source/lib-extra/pxlib/FrugalBuild
index 18db5a1..4195719 100644
--- a/source/lib-extra/pxlib/FrugalBuild
+++ b/source/lib-extra/pxlib/FrugalBuild
@@ -2,15 +2,15 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=pxlib
-pkgver=0.6.2
+pkgver=0.6.3
pkgrel=1
pkgdesc="A simply, small C library to read and write Paradox DB files."
-url="http://pxlib.sourceforge.net/"
-depends=('glibc' 'perl-xml')
+depends=('glibc')
+makedepends=('perl-xml')
groups=('lib-extra')
archs=('i686' 'x86_64')
+_F_sourceforge_broken_up2date=1
Finclude sourceforge
-up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=79398'|grep '.tar.gz'|grep -m1 'pxlib'|sed 's/.*b-\(.*\).tar.gz .*/\1/'"
-sha1sums=('2940328777738b332c9733bffa5733fdef692be2')
+sha1sums=('3a4f192a98aa294721ab603da41f58358593a4b1')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:32 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:57 2007
Subject: [Frugalware-git] frugalware-current: xapian-core-1.0.3-1-i686
Message-ID: <20071013103532.1AFE013A4007@genesis.frugalware.org>

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

commit 63be18a7b81d2498e3e9ff48f9952f364796d84f
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:01:28 2007 +0200

xapian-core-1.0.3-1-i686
* Version bump

diff --git a/source/lib-extra/xapian-core/FrugalBuild b/source/lib-extra/xapian-core/FrugalBuild
index b052f7a..7bbd749 100644
--- a/source/lib-extra/xapian-core/FrugalBuild
+++ b/source/lib-extra/xapian-core/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=xapian-core
-pkgver=1.0.2
+pkgver=1.0.3
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=('2be47ea020604270ccde8218a5de5647c9fe49ab')
+sha1sums=('4df3edb104ebab10c4f8ee7694971a894e8d18b4')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:32 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:57 2007
Subject: [Frugalware-git] frugalware-current: recoll-1.8.1-5-i686
Message-ID: <20071013103532.EDA7013A401F@genesis.frugalware.org>

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

commit 71a56f939d26def118ec6d1c4a9b841e6b8ea59a
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:22:20 2007 +0200

recoll-1.8.1-5-i686
* rebuild with xapian-core

diff --git a/source/xapps-extra/recoll/FrugalBuild b/source/xapps-extra/recoll/FrugalBuild
index 42e8f1f..78be589 100644
--- a/source/xapps-extra/recoll/FrugalBuild
+++ b/source/xapps-extra/recoll/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=recoll
pkgver=1.8.1
-pkgrel=4
+pkgrel=5
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.2' 'gamin' 'aspell')
+depends=('qt' 'xapian-core>=1.0.3' '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 crazy at frugalware.org  Sat Oct 13 12:35:32 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:58 2007
Subject: [Frugalware-git] frugalware-current: pinot-0.76-2-i686
Message-ID: <20071013103532.7691F13A4002@genesis.frugalware.org>

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

commit 2104ba7f844c0377e9f79db5dc852ae173997158
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:15:09 2007 +0200

pinot-0.76-2-i686
* rebuild with xapian-core

diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild
index dd78027..d0f861e 100644
--- a/source/xapps-extra/pinot/FrugalBuild
+++ b/source/xapps-extra/pinot/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=pinot
pkgver=0.76
-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.2' 'gmime' 'atk' 'gtkmm' 'boost>=1.34.0-4' \
+depends=('openssl' 'curl' 'cairomm' 'dbus-glib' 'xapian-core>=1.0.3' '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 Oct 13 12:35:33 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:58 2007
Subject: [Frugalware-git] frugalware-current: ode-0.9-1-i686
Message-ID: <20071013103533.30AB813A4020@genesis.frugalware.org>

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

commit e0809575cc1cada3e8ee6e07d5dde5988d758535
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 01:53:56 2007 +0200

ode-0.9-1-i686
* Version bump
* fixed up some stuff
* disabled demos while these need X and are not even
* installed =))

diff --git a/source/lib-extra/ode/FrugalBuild b/source/lib-extra/ode/FrugalBuild
index 11d7fec..6fd5d67 100644
--- a/source/lib-extra/ode/FrugalBuild
+++ b/source/lib-extra/ode/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=ode
-pkgver=0.8
+pkgver=0.9
pkgrel=1
pkgdesc="ODE is an open source, high performance library for simulating rigid body dynamics."
_F_sourceforge_dirname="opende"
@@ -14,10 +14,13 @@ depends=('libstdc++')
makedepends=('unzip')
groups=('lib-extra')
archs=('i686' 'x86_64')
-Fconfopts="$Fconfopts --enable-release=no --enable-tests=no"
+Fconfopts="$Fconfopts --enable-release=yes --enable-tests=no --enable-demos=no"

build()
{
+	if [ "$CARCH" == "i686" ]; then
+		Fconfopts="$Fconfopts --with-arch=i686"
+	fi
Fcd
Fpatchall
./autogen.sh || Fdie
@@ -26,5 +29,5 @@ build()
}


-sha1sums=('8e8a956ecebfc9e1f5f76b4e0083147581d85abe')
+sha1sums=('3b39ce085c2dc77c3fad7abaa382ffc20d3780e5')
# optimization OK
From crazy at frugalware.org  Sat Oct 13 12:35:33 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 12:35:59 2007
Subject: [Frugalware-git] frugalware-current: wine-0.9.47-1-i686
Message-ID: <20071013103533.AE2DB13A4007@genesis.frugalware.org>

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

commit 5e00154a08a877aebf028b43374489023e36f3f5
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 02:48:34 2007 +0200

wine-0.9.47-1-i686
* Version bump

diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index a352d01..922e294 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos <vmiklos@frugalware.org>

pkgname=wine
-pkgver=0.9.46
+pkgver=0.9.47
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=('b7993b116c9efa879977f7192059f23e4dc6167e' \
+sha1sums=('38f288f56a9a8ca1f71709209727c07930e04024' \
'a9c70a49cef90cf60c2e90e63753858387f7117a' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
'8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
From iron at frugalware.org  Sat Oct 13 12:49:19 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 12:49:22 2007
Subject: [Frugalware-git] homepage-ng: another workaround for buggy .hu
	announcement title from vmiklos
Message-ID: <20071013104919.9004C13A4002@genesis.frugalware.org>

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

commit 90a7efb6de2bef38394076cf59481aec53025b5c
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 12:48:17 2007 +0200

another workaround for buggy .hu announcement title from vmiklos

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index e9cbd00..0ceb6ac 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -13,7 +13,7 @@
<news>
<post>
<id>76</id>
-		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra ĂŠs x86_64-re</title>
+		<title>Megjelent a Frugalware 0.7 (Sayshell) i686-ra&amp;nbsp;ĂŠs x86_64-re</title>
<date>Sat Oct 13 09:11:34 CEST 2007</date>
<author>IroNiQ</author>
<hidden>0</hidden>
From vmiklos at frugalware.org  Sat Oct 13 12:52:32 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 12:52:35 2007
Subject: [Frugalware-git] frugalware-0.7: docs/upgrade: typo fix from Alex
Message-ID: <20071013105233.0644413A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=97c99b09b116a30c8cc4b70dd7620fae32deeaf4

commit 97c99b09b116a30c8cc4b70dd7620fae32deeaf4
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 12:52:05 2007 +0200

docs/upgrade: typo fix from Alex

diff --git a/docs/upgrade.txt b/docs/upgrade.txt
index 5931392..c1e12cb 100644
--- a/docs/upgrade.txt
+++ b/docs/upgrade.txt
@@ -7,7 +7,7 @@ The aim of this howto is to show how you can upgrade a Frugalware-0.6

== libpacman

-Terminus comes with a new package magement library, called libpacman. It is
+Sayshell comes with a new package magement library, called libpacman. It is
provided by the `pacman-g2` package, so the first step is to install it:

-------------------------------------------------------------------------------
From priyank at frugalware.org  Sat Oct 13 13:01:45 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 13:01:50 2007
Subject: [Frugalware-git] frugalware-current: bluez-libs-3.20-1-i686
Message-ID: <20071013110145.B200913A4002@genesis.frugalware.org>

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

commit aa4f329e24b8430c6b910e9f0f9c605844513dc6
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 16:26:50 2007 +0530

bluez-libs-3.20-1-i686
* Version bump

diff --git a/source/lib/bluez-libs/FrugalBuild b/source/lib/bluez-libs/FrugalBuild
index aefa95a..e389ce6 100644
--- a/source/lib/bluez-libs/FrugalBuild
+++ b/source/lib/bluez-libs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=bluez-libs
-pkgver=3.19
+pkgver=3.20
pkgrel=1
pkgdesc="Library to use the BlueZ Linux Bluetooth stack"
url="http://bluez.sourceforge.net/"
@@ -11,5 +11,5 @@ groups=('lib')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.bluez.org/download.html|grep 'bluez-libs-'|sed -n 's/.*bluez-libs-\(.*\)\.t.*/\1/; 1 p'"
source=($url/download/$pkgname-$pkgver.tar.gz)
-sha1sums=('0e470102550c31ba90778f15d8b7771eecf15ba4')
+sha1sums=('b4d7af39c5816925074aeb98b925f8b84e3f3435')
# optimization OK
From priyank at frugalware.org  Sat Oct 13 13:11:04 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 13:11:07 2007
Subject: [Frugalware-git] frugalware-current: bluez-utils-3.20-1-i686
Message-ID: <20071013111104.377DC13A4002@genesis.frugalware.org>

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

commit ce8217420c13664d7eced0f0176e07faf8bcfc22
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 16:36:28 2007 +0530

bluez-utils-3.20-1-i686
* Version bump

diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild
index 0c64a44..51d813d 100644
--- a/source/apps-extra/bluez-utils/FrugalBuild
+++ b/source/apps-extra/bluez-utils/FrugalBuild
@@ -2,18 +2,18 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=bluez-utils
-pkgver=3.19
-pkgrel=3
+pkgver=3.20
+pkgrel=1
pkgdesc="Bluetooth tools and daemons"
url="http://bluez.sourceforge.net/"
-depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.19')
+depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.20')
makedepends=('alsa-lib' 'fuse')
groups=('apps-extra')
archs=('i686' 'x86_64')
backup=(etc/sysconfig/bluetooth etc/bluetooth/hcid.conf etc/bluetooth/rfcomm.conf etc/bluetooth/uart.conf)
up2date="lynx -dump http://www.bluez.org/download.html|grep bluez-utils-|sed -n 's/.*bluez-utils-\(.*\)\.t.*/\1/; 1 p'"
source=("http://bluez.sourceforge.net/download/bluez-utils-$pkgver.tar.gz" rc.bluetooth uart.conf bluetooth.default)
-sha1sums=('69cf0cc59cac2b37ffcd80e48ba6ff9057de2ae9' \
+sha1sums=('1d7f845642d0e27c5a853bb05fa5f8065a435fc0' \
'831cbfe1e96fc72ca71e9ec5b2b0209512f90ccc' \
'706231256b0ef53e20f22b4f163e8008f092d28a' \
'cc763966542a83f0de4c56268c541a7b43aa2182')
From priyank at frugalware.org  Sat Oct 13 13:19:24 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 13:19:31 2007
Subject: [Frugalware-git] frugalware-current: bluez-gnome-0.14-2-i686
Message-ID: <20071013111925.17E6313A4002@genesis.frugalware.org>

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

commit a5517cc893c7144409d81ad049a1fa199629520f
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 16:45:31 2007 +0530

bluez-gnome-0.14-2-i686
* Rebuild with bluez-libs-3.20

diff --git a/source/gnome-extra/bluez-gnome/FrugalBuild b/source/gnome-extra/bluez-gnome/FrugalBuild
index 53efa82..dd741ad 100644
--- a/source/gnome-extra/bluez-gnome/FrugalBuild
+++ b/source/gnome-extra/bluez-gnome/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=bluez-gnome
pkgver=0.14
-pkgrel=1
+pkgrel=2
pkgdesc="Bluetooth tools for GNOME"
url="http://www.bluez.org/"
-depends=('dbus-glib>=0.71' 'openobex>=1.3-10' 'bluez-libs>=3.12' 'libnotify' 'gconf' 'gtk+2')
+depends=('dbus-glib>=0.71' 'openobex>=1.3-10' 'bluez-libs>=3.20' 'libnotify' 'gconf' 'gtk+2')
makedepends=('perl-xml' 'intltool')
groups=('gnome-extra')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Sat Oct 13 13:54:35 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 13:54:36 2007
Subject: [Frugalware-git] frugalware-current: autogen-5.9.3-1-i686
Message-ID: <20071013115435.AE70913A4002@genesis.frugalware.org>

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

commit 73b4d3217569e14a15197a30e86456f209b29cc6
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 13:51:01 2007 +0200

autogen-5.9.3-1-i686
* Version bump

diff --git a/source/devel-extra/autogen/FrugalBuild b/source/devel-extra/autogen/FrugalBuild
index 70cc49a..88a89e6 100644
--- a/source/devel-extra/autogen/FrugalBuild
+++ b/source/devel-extra/autogen/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=autogen
-pkgver=5.9.2
+pkgver=5.9.3
pkgrel=1
pkgdesc="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
depends=('libxml2' 'guile')
@@ -11,6 +11,6 @@ archs=('i686' 'x86_64')
Finclude sourceforge
up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3593&package_id=3552' | grep -m2 '.tar.gz' | sed '/doc/d' | sed 's/.*autogen-//' | sed 's/\.tar.*//'"
unset MAKEFLAGS
-sha1sums=('b0e7fddf4401b779034cdf20bb5b54cd2196e681')
+sha1sums=('e42bcb2fc2e0e6c8a76cdf02510213cc312cc60d')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 13:56:59 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 13:57:01 2007
Subject: [Frugalware-git] frugalware-current: xmltv-0.5.49-1-i686
Message-ID: <20071013115659.9000013A4002@genesis.frugalware.org>

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

commit d862c257d765f73a03796650c9166b105fddb398
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 13:53:34 2007 +0200

xmltv-0.5.49-1-i686
* Version bump

diff --git a/source/apps-extra/xmltv/FrugalBuild b/source/apps-extra/xmltv/FrugalBuild
index f15fef0..c57cc43 100644
--- a/source/apps-extra/xmltv/FrugalBuild
+++ b/source/apps-extra/xmltv/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=xmltv
-pkgver=0.5.48
+pkgver=0.5.49
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=('f3bc8b17d7e3fe2c656e34d984edef40d042fb9c')
+sha1sums=('265a9884d3a38cad4398f19934be2db84d8b8a66')

build() {
Fcd
From crazy at frugalware.org  Sat Oct 13 13:58:58 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 13:59:00 2007
Subject: [Frugalware-git] frugalware-current: dhcpcd-3.1.6-1-i686
Message-ID: <20071013115858.E09A813A4002@genesis.frugalware.org>

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

commit 6510ffd3c72cf49914d8b0adb14cbdd250a9f062
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 13:55:44 2007 +0200

dhcpcd-3.1.6-1-i686
* Version bump

diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild
index 8a42634..d1c79b7 100644
--- a/source/base/dhcpcd/FrugalBuild
+++ b/source/base/dhcpcd/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=dhcpcd
-pkgver=3.1.5
+pkgver=3.1.6
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=('17396b60ffd780c0dd08035e98e23b35c7f3ca39' \
+sha1sums=('2fcb64a05becc3232132ded52a51b907df249890' \
'661bacf94b26bec5ae8f9fe27083adb03ea5c5b4' \
'171e1b8bffe2b9c12744029cb516d7c245c8770b')
From priyank at frugalware.org  Sat Oct 13 14:19:43 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 14:19:46 2007
Subject: [Frugalware-git] frugalware-current: libbtctl-0.9.0-1-i686
Message-ID: <20071013121943.4A8F513A4002@genesis.frugalware.org>

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

commit c35ad57df53d415fcae2b157dd5de6f326cbd49c
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 17:44:46 2007 +0530

libbtctl-0.9.0-1-i686
* Version bump
* Moved to gnome-extra
* Lots of cleanups in the FB
* Created a new subpackage libbtctl-python

diff --git a/source/gnome-extra/libbtctl/FrugalBuild b/source/gnome-extra/libbtctl/FrugalBuild
new file mode 100644
index 0000000..0b0a281
--- /dev/null
+++ b/source/gnome-extra/libbtctl/FrugalBuild
@@ -0,0 +1,33 @@
+# Compiling Time: 0.7 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=libbtctl
+pkgver=0.9.0
+pkgrel=1
+pkgdesc="A GObject wrapper for Bluetooth functionality"
+url="http://usefulinc.com/software/gnome-bluetooth/"
+depends=('glib2' 'bluez-utils>=3.20' 'bluez-libs>=3.20' 'openobex>=1.3-10' 'python>=2.5' 'pygtk')
+makedepends=('pkgconfig' 'intltool' 'mono' 'gtk2-sharp')
+groups=('gnome-extra')
+archs=('i686' 'x86_64')
+_F_gnome_devel="y"
+Finclude gnome mono
+sha1sums=('0bbeac7ac22dff5b352e2fb4944cf0c679ffdd74')
+
+subpkgs=("$pkgname-mono" "$pkgname-python")
+subdescs=('MONO bindings for libbtctl' 'Python bindings for libbtctl')
+subdepends=("$pkgname=$pkgver mono gtk2-sharp" '$pkgname=$pkgver python')
+subgroups=('gnome-extra' 'gnome-extra')
+subarchs=('i686 x86_64' 'i686 x86_64')
+
+build() {
+	unset MAKEFLAGS
+	Fmonoexport
+	Fbuild --enable-mono --disable-gtk-doc --disable-sdp-test
+	Fmonocleanup
+	Fsplit $pkgname-mono usr/lib/mono
+	Fsplit $pkgname-mono usr/lib/pkgconfig/libbtctl-sharp.pc
+	Fsplit $pkgname-python usr/lib/python2.5
+}
+
+# optimization OK
From priyank at frugalware.org  Sat Oct 13 14:30:13 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 14:30:22 2007
Subject: [Frugalware-git] frugalware-current: libbtctl-0.9.0-2-i686
Message-ID: <20071013123013.CB11B13A4004@genesis.frugalware.org>

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

commit 789d7c2a0e4e9b9f711d2b97c2ed4f4af04de90b
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 17:55:02 2007 +0530

libbtctl-0.9.0-2-i686
* Fixed a big typo in one of the subdepends

diff --git a/source/gnome-extra/libbtctl/FrugalBuild b/source/gnome-extra/libbtctl/FrugalBuild
index 0b0a281..0073645 100644
--- a/source/gnome-extra/libbtctl/FrugalBuild
+++ b/source/gnome-extra/libbtctl/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=libbtctl
pkgver=0.9.0
-pkgrel=1
+pkgrel=2
pkgdesc="A GObject wrapper for Bluetooth functionality"
url="http://usefulinc.com/software/gnome-bluetooth/"
depends=('glib2' 'bluez-utils>=3.20' 'bluez-libs>=3.20' 'openobex>=1.3-10' 'python>=2.5' 'pygtk')
@@ -16,7 +16,7 @@ sha1sums=('0bbeac7ac22dff5b352e2fb4944cf0c679ffdd74')

subpkgs=("$pkgname-mono" "$pkgname-python")
subdescs=('MONO bindings for libbtctl' 'Python bindings for libbtctl')
-subdepends=("$pkgname=$pkgver mono gtk2-sharp" '$pkgname=$pkgver python')
+subdepends=("$pkgname=$pkgver mono gtk2-sharp" "$pkgname=$pkgver python")
subgroups=('gnome-extra' 'gnome-extra')
subarchs=('i686 x86_64' 'i686 x86_64')
From crazy at frugalware.org  Sat Oct 13 14:31:38 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 14:31:42 2007
Subject: [Frugalware-git] frugalware-current: fltk2-r5941-1-i686
Message-ID: <20071013123138.1538D13A4002@genesis.frugalware.org>

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

commit 2ea9e6aafb5f9f6d14f20dc65d52ed3425abe3f7
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 14:27:04 2007 +0200

fltk2-r5941-1-i686
* Version bump

diff --git a/source/xlib-extra/fltk2/FrugalBuild b/source/xlib-extra/fltk2/FrugalBuild
index c93089f..f18578f 100644
--- a/source/xlib-extra/fltk2/FrugalBuild
+++ b/source/xlib-extra/fltk2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=fltk2
-pkgver=r5940
+pkgver=r5941
origname=fltk-2.0.x-${pkgver}
pkgrel=1
pkgdesc="FLTK2 is a cross-platform C++ GUI toolkit for X."
@@ -15,7 +15,7 @@ archs=('i686' 'x86_64')
up2date="lynx -dump http://www.fltk.org/|grep -m1 'VERSION=2'|sed 's/.*=2.*.x-\(.*\).*/\1/'"
source=(http://ftp.easysw.com/pub/fltk/snapshots/$origname.tar.bz2 \
disable_crappy_test.patch)
-sha1sums=('b5e074817c2111ee7a2c4f1eba369bf0eeb1ce45' \
+sha1sums=('da286ed3159db311be85195259efa4131893c852' \
'007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74')

build()
From priyank at frugalware.org  Sat Oct 13 14:43:13 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 14:43:16 2007
Subject: [Frugalware-git] frugalware-current: gnome-bluetooth-0.9.1-1-i686
Message-ID: <20071013124313.1B1B313A4002@genesis.frugalware.org>

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

commit e69cdee9ef0b0c4da23e87b7d6c662fbadffa810
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 18:08:32 2007 +0530

gnome-bluetooth-0.9.1-1-i686
* Version bump
* updated depends and a bit of FB cleanup

diff --git a/source/gnome-extra/gnome-bluetooth/FrugalBuild b/source/gnome-extra/gnome-bluetooth/FrugalBuild
index 7cee098..a52362a 100644
--- a/source/gnome-extra/gnome-bluetooth/FrugalBuild
+++ b/source/gnome-extra/gnome-bluetooth/FrugalBuild
@@ -2,29 +2,27 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=gnome-bluetooth
-pkgver=0.8.0
-pkgrel=8
+pkgver=0.9.1
+pkgrel=1
pkgdesc="The GNOME Bluetooth Subsystem."
url="http://www.usefulinc.com/software/gnome-bluetooth/"
makedepends=('intltool' 'pkgconfig')
-depends=('bluez-utils>=3.12' 'bluez-libs>=3.12' 'gob2' 'pygtk' \
-		'librsvg>=2.16.0' 'gnome-python>=2.16.0' 'libbtctl>=0.8.2-5' \
-		'libgnomeui>=2.16.0')
+depends=('bluez-utils>=3.20' 'bluez-libs>=3.20' 'gob2' 'pygtk' \
+		'librsvg>=2.18.2' 'gnome-python>=2.20.0' 'libbtctl-python>=0.9.0' \
+		'libgnomeui>=2.20.0')
groups=('gnome-extra')
archs=('i686' 'x86_64')
_F_gnome_schemas=('/etc/gconf/schemas/gnome-obex-server.schemas')
_F_gnome_scrollkeeper="y"
+_F_gnome_devel="y"
Finclude gnome gnome-scriptlet
-sha1sums=('f428008706788b433dee1051d99b3df327f2424c')
+sha1sums=('c67ae127760cc24e0d2be75e0b518da5565e91c6')

build() {
Fbuild_slice_scrollkeeper
Fmake
Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1

-	# Install gnome-bluetooth python files in correct location
-	Fmv /usr/usr/lib/* /usr/lib/
-	Frm usr/usr
Fbuild_gnome_scriptlet
}
From priyank at frugalware.org  Sat Oct 13 14:45:11 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 14:45:12 2007
Subject: [Frugalware-git] frugalware-current: kdebluetooth-1.0_beta8
Message-ID: <20071013124511.8130E13A4002@genesis.frugalware.org>

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

commit 0b0202354ac56569bc4839993d48800d126aa341
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 18:13:20 2007 +0530

kdebluetooth-1.0_beta8
* Rebuild with new bluez-libs-3.20

diff --git a/source/kde-extra/kdebluetooth/FrugalBuild b/source/kde-extra/kdebluetooth/FrugalBuild
index 528ab3b..3ffc9a1 100644
--- a/source/kde-extra/kdebluetooth/FrugalBuild
+++ b/source/kde-extra/kdebluetooth/FrugalBuild
@@ -4,10 +4,10 @@

pkgname=kdebluetooth
pkgver=1.0_beta8
-pkgrel=2
+pkgrel=3
pkgdesc="KDE Bluetooth Framework"
-depends=('kdepim>=3.5.7' 'dbus>=1.0.2' 'bluez-libs>=3.19' 'openobex>=1.3-10' \
-	'bluez-utils>=3.19' 'obexftp>=0.20-5' 'libgcc' 'libxfixes')
+depends=('kdepim>=3.5.7' 'dbus>=1.0.2' 'bluez-libs>=3.20' 'openobex>=1.3-10' \
+	'bluez-utils>=3.20' 'obexftp>=0.20-5' 'libgcc' 'libxfixes')
groups=('kde-extra')
archs=('i686' 'x86_64')
_F_sourceforge_dirname="kde-bluetooth"
From priyank at frugalware.org  Sat Oct 13 14:47:54 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 14:47:58 2007
Subject: [Frugalware-git] frugalware-current: kmobiletools-0.5.0_beta3-5
Message-ID: <20071013124754.A3D6A13A4002@genesis.frugalware.org>

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

commit 2e33b3ad16a6dad96737a08e94b70279988158ad
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 18:16:02 2007 +0530

kmobiletools-0.5.0_beta3-5
* updated kdebluetooth dependency to 1.0_beta8-3

diff --git a/source/kde-extra/kmobiletools/FrugalBuild b/source/kde-extra/kmobiletools/FrugalBuild
index 4445c5c..3ee9ffb 100644
--- a/source/kde-extra/kmobiletools/FrugalBuild
+++ b/source/kde-extra/kmobiletools/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=kmobiletools
pkgver=0.5.0_beta3
-pkgrel=4
+pkgrel=5
pkgdesc="A complete management system for mobile phones."
## this could be added to depends as well but not sure about :
## http://sourceforge.net/project/showfiles.php?group_id=132142
-depends=('kdepim>=3.5.7'  'kdebluetooth>=1.0_beta8-2')
+depends=('kdepim>=3.5.7'  'kdebluetooth>=1.0_beta8-3')
rodepends=('bluez-hcidump>=1.40' 'bluez-firmware')
groups=('kde-extra')
archs=('i686' 'x86_64')
From priyank at frugalware.org  Sat Oct 13 14:52:25 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 14:52:28 2007
Subject: [Frugalware-git] frugalware-current: pybluez-0.13-3-i686
Message-ID: <20071013125225.6F60E13A4002@genesis.frugalware.org>

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

commit 84aa5778ef311c25411e934e50291f1767677cc7
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 18:18:57 2007 +0530

pybluez-0.13-3-i686
* rebuild with bluez-libs-3.20

diff --git a/source/lib-extra/pybluez/FrugalBuild b/source/lib-extra/pybluez/FrugalBuild
index 01e5e1e..4c49918 100644
--- a/source/lib-extra/pybluez/FrugalBuild
+++ b/source/lib-extra/pybluez/FrugalBuild
@@ -4,10 +4,10 @@

pkgname=pybluez
pkgver=0.13
-pkgrel=2
+pkgrel=3
pkgdesc="Python wrapper for bluez-libs"
url="http://org.csail.mit.edu/pybluez"
-depends=('bluez-libs>=3.19' 'python')
+depends=('bluez-libs>=3.20' 'python')
license="GPL"
groups=('lib-extra')
archs=('i686' 'x86_64')
From priyank at frugalware.org  Sat Oct 13 15:12:10 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 15:12:14 2007
Subject: [Frugalware-git] frugalware-current: swfdec-0.5.3-1-i686
Message-ID: <20071013131210.30C4C13A4002@genesis.frugalware.org>

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

commit 1078ddea8c64c00b37d5c804b853179824a0fb25
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 18:38:14 2007 +0530

swfdec-0.5.3-1-i686
* Version bump

diff --git a/source/xlib/swfdec/FrugalBuild b/source/xlib/swfdec/FrugalBuild
index d1b2777..6328b26 100644
--- a/source/xlib/swfdec/FrugalBuild
+++ b/source/xlib/swfdec/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=swfdec
-pkgver=0.5.2
+pkgver=0.5.3
pkgrel=1
pkgdesc="Swfdec is a decoder/renderer library for Macromedia Flash animations.."
url="http://swfdec.freedesktop.org/"
@@ -14,6 +14,6 @@ archs=('i686' 'x86_64')
up2date="lynx -dump http://swfdec.freedesktop.org/|grep -om1 'swfdec-\(.*\).tar.gz$'|Flasttar"
source=($url/download/$pkgname/0.5/$pkgname-$pkgver.tar.gz)
Fconfopts="${Fconfopts[@]} --enable-gnome-vfs=no --enable-libsoup"
-sha1sums=('0ab05ff6f7e27a7509bb9ea98cef608abaf41d02')
+sha1sums=('34f9f51d2e4ea2a28bc974ceaa5f07c93703e867')

# optimization OK
From priyank at frugalware.org  Sat Oct 13 15:19:30 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 15:19:33 2007
Subject: [Frugalware-git] frugalware-current: wtf-20071004-1-i686
Message-ID: <20071013131930.615BE13A4002@genesis.frugalware.org>

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

commit e40ccccd563ffd843f969b9ab51d177ad1a23afc
Author: Priyank <priyank@frugalware.org>
Date:   Sat Oct 13 18:45:54 2007 +0530

wtf-20071004-1-i686
* Version bump
* Removed acronyms, acronyms.comp (now provided by upstream)

diff --git a/source/apps-extra/wtf/FrugalBuild b/source/apps-extra/wtf/FrugalBuild
index 7ee0ead..6eee34c 100644
--- a/source/apps-extra/wtf/FrugalBuild
+++ b/source/apps-extra/wtf/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=wtf
-pkgver=20051104
+pkgver=20071004
pkgrel=1
pkgdesc="wtf is an ancronym dictionary"
url="http://www.mu.org/~mux/wtf/"
@@ -10,23 +10,19 @@ depends=('bash')
groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.mu.org/~mux/wtf/ | grep tar.gz$ | Flasttar"
-source=(http://www.mu.org/~mux/wtf/$pkgname-$pkgver.tar.gz acronyms acronyms.comp)
-sha1sums=('15ebea8a8ef90fd45f5fe8ea6f076db795ec406c' \
-	'e14a36bd7b368498325b261abff7a9618b9cf815' \
-	'b4af863c936fc6480d33a2cfeec5159ddf077ada')
+source=(http://www.mu.org/~mux/wtf/$pkgname-$pkgver.tar.gz)
+sha1sums=('c5bf7cd557ca15aa16db0f7e79d1b95d24ff9e5f')

build() {
Fcd
-	# Copy the man pages
-	Fmkdir usr/man/man6
-	Ffilerel wtf.6 usr/man/man6
+	# Install the man pages
+	Fmanrel wtf.6

# Copy the binary
Fmkdir usr/bin
Fexerel wtf usr/bin

# Copy acronym files
-	cd ..
Fmkdir usr/share/misc/
Ffilerel acronyms acronyms.comp usr/share/misc/
}
diff --git a/source/apps-extra/wtf/acronyms b/source/apps-extra/wtf/acronyms
deleted file mode 100644
index b9cda70..0000000
--- a/source/apps-extra/wtf/acronyms
+++ /dev/null
@@ -1,253 +0,0 @@
-$NetBSD: acronyms,v 1.146 2005/03/10 05:45:25 soda Exp $
-
-AFAIC   as far as I'm concerned
-AFAICR  as far as I can recall
-AFAICT  as far as I can tell
-AFAIK   as far as I know
-AFAIR   as far as I recall
-AFAIU   as far as I understand
-AFD away from desktop
-AFK away from keyboard
-AFU all fucked up
-AFW away from window
-AIU as I understand
-AIUI    as I understand it
-AKA also known as
-ASAIC   as soon as I can
-ASAP    as soon as possible
-ATM at the moment
-AWOL    absent without official leave
-AYBABTU all your base are belong to us
-AYT are you there
-B/C because
-B/S bullshit
-B/W between
-BBIAB   be back in a bit
-BBL [I'll] be back later
-BBS be back soon
-BBT be back tomorrow
-BFD big fucking deal
-BIAB    back in a bit
-BIAF    back in a few
-BIALW   back in a little while
-BIAS    back in a second
-BIAW    back in a while
-BOATILAS    bend over and take it like a slut
-BOFH    bastard operator from hell
-BOGAHICA    bend over, grab ankles, here it comes again
-BOHICA  bend over here it comes again
-BRB [I'll] be right back
-BS  bullshit
-BTDT    been there, done that
-BTTH    boot to the head
-BTW by the way
-CMIIW   correct me if I'm wrong
-CNP continued [in my] next post
-COB close of business [day]
-COTS    commercial off-the-shelf
-CYA see you around
-D/L download
-DIY do it yourself
-DKDC    don't know, don't care
-DSTM    don't shoot the messenger
-DTRT    do the right thing
-DTWT    do the wrong thing
-DWIM    do what I mean
-EG  evil grin
-EMSG    email message
-EOB end of business [day]
-EOD end of discussion
-EOL end of life
-ETLA    extended three letter acronym
-EWAG    experienced wild-ass guess
-FAQ frequently asked question
-FCFS    first come first served
-FIGJAM  fuck I'm good, just ask me
-FIIK    fuck[ed] if I know
-FIIR    fuck[ed] if I remember
-FM  fucking magic
-FOAD    fall over and die
-FSDO    for some definition of
-FSVO    for some value of
-FTFM    fuck the fuckin' manual!
-FUBAR   fucked up beyond all recognition
-FUD fear, uncertainty and doubt
-FWIW    for what it's worth
-FYI for your information
-G   grin
-G/C garbage collect
-GAC get a clue
-GAL get a life
-GIGO    garbage in, garbage out
-GMTA    great minds think alike
-GTFO    get the fuck out
-GTG got to go
-HAND    have a nice day
-HHIS    hanging head in shame
-HICA    here it comes again
-HTH hope this helps
-IAC in any case
-IANAL   I am not a lawyer
-IC  I see
-ICBW    I could be wrong
-ICCL    I couldn't care less
-IHAFC   I haven't a fucking clue
-IHBW    I have been wrong
-IHNFC   I have no fucking clue
-IIANM   if I am not mistaken
-IIRC    if I recall correctly
-IIUC    if I understand correctly
-IMAO    in my arrogant opinion
-IMCO    in my considered opinion
-IMHO    in my humble opinion
-IMNSHO  in my not so humble opinion
-IMO in my opinion
-IOW in other words
-IRL in real life
-ISAGN   I see a great need
-ISTM    it seems to me
-ISTR    I seem to recall
-ITYM    I think you mean
-IWBNI   it would be nice if
-IYSS    if you say so
-J/K just kidding
-JHD just hit ``delete''
-JIC just in case
-JK  just kidding
-JMO just my opinion
-JSYK    just so you know
-JTLYK   just to let you know
-KISS    keep it simple, stupid
-KITA    kick in the ass
-KNF kernel normal form
-L8R later
-LART    luser attitude readjustment tool (ie, hammer)
-LBNL    last but not least
-LJBF    let's just be friends
-LMAO    laughing my ass off
-LMSO    laughing my socks off
-LOL laughing out loud
-LTNS    long time no see
-MIA missing in action
-MOTAS   member of the appropriate sex
-MOTOS   member of the opposite sex
-MOTSS   member of the same sex
-MTF more to follow
-MYOB    mind your own business
-N/M never mind
-NBD no big deal
-NFC no fucking clue
-NFI no fucking idea
-NFW no fucking way
-NIH not invented here
-NMF not my fault
-NMP not my problem
-NOYB    none of your business
-NOYFB   none of your fucking business
-NP  no problem
-NRFPT   not ready for prime time
-NRN no reply necessary
-OIC oh, I see
-OMG oh, my god
-OT  off topic
-OTL out to lunch
-OTOH    on the other hand
-OTT over the top
-OTTOMH  off the top of my head
-PEBKAC  problem exists between keyboard and chair
-PFO please fuck off
-PFY pimply faced youth
-PITA    pain in the ass
-PKSP    pound keys and spew profanity
-PNG persona non grata
-PNP plug and pray
-POC point of contact
-POLA    principle of least astonishment
-POLS    principle of least surprise
-POS piece of shit
-PPL pretty please
-PTV parental tunnel vision
-QED quod erat demonstrandum
-RFC request for comments
-RIP rest in peace
-RL  real life
-RLC rod length check
-ROFL    rolling on floor laughing
-ROFLMAO rolling on floor laughing my ass off
-ROTFL   rolling on the floor laughing
-RP  responsible person
-RSN real soon now
-RTFB    read the fine/fucking book
-RTFC    read the fine/fucking code
-RTFD    read the fine/fucking documentation
-RTFM    read the fine/fucking manual
-RTFMP   read the fine/fucking man page
-RTFS    read the fine/fucking source
-SCNR    sorry, could not resist
-SEP someone else's problem
-SFA sweet fuck all
-SHID    slaps head in disgust
-SIMCA   sitting in my chair amused
-SMLSFB  so many losers, so few bullets
-SMOP    simple matter of programming
-SNAFU   situation normal, all fucked up
-SNERT   snot-nosed egotistical rude teenager
-SNMP    sorry, not my problem
-SNR signal to noise ratio
-SO  significant other
-SOB son of [a] bitch
-SOL shit out [of] luck
-SOP standard operating procedure
-SSIA    subject says it all
-STFA    search the fucking archives
-STFU    shut the fuck up
-STFW    search the fucking web
-SUS stupid user syndrome
-SWAG    silly, wild-assed guess
-SWAHBI  silly, wild-assed hare-brained idea
-SWMBO   she who must be obeyed
-TANSTAAFL   there ain't no such thing as a free lunch
-TBC to be continued
-TBD to be {decided,determined,done}
-TBOMK   the best of my knowledge
-THNX    thanks
-THX thanks
-TIA thanks in advance
-TINC    there is no cabal
-TLA three letter acronym
-TLB translation lookaside buffer
-TMA too many abbreviations
-TMI too much information
-TNF The NetBSD Foundation
-TOEFL   test of english as a foreign language
-TPTB    the powers that be
-TRT the right thing
-TTBOMK  to the best of my knowledge
-TTFN    ta ta for now
-TTYL    talk to you later
-TWIAVBP the world is a very big place
-TY  thank you
-TYVM    thank you very much
-U/L upload
-UTSL    use the source, Luke
-VEG very evil grin
-W/  with
-W/O without
-WAG wild-ass guess
-WB  welcome back
-WFM works for me
-WIBNI   wouldn't it be nice if
-WIP work in progress
-WOFTAM  waste of fucking time and money
-WOMBAT  waste of money, brain, and time
-WRT with respect to
-WTF {what,where,who,why} the fuck
-WTH {what,where,who,why} the hell
-WYSIWYG what you see is what you get
-YALIMO  you are lame, in my opinion
-YHBT    you have been trolled
-YHL you have lost
-YKWIM   you know what I mean
-YMA yo momma's ass
-YMMV    your mileage may vary
-YW  you're welcome
diff --git a/source/apps-extra/wtf/acronyms.comp b/source/apps-extra/wtf/acronyms.comp
deleted file mode 100644
index 864dc64..0000000
--- a/source/apps-extra/wtf/acronyms.comp
+++ /dev/null
@@ -1,323 +0,0 @@
-$NetBSD: acronyms.comp,v 1.61 2005/03/28 15:07:16 jschauma Exp $
-
-3WHS    three-way handshake
-ABI application binary interface
-ACL access control list
-ACPI    advanced configuration and power interface
-ADC analog [to] digital converter
-ADPCM   adaptive differential pulse code modulation
-ADSL    asymmetric digital subscriber line
-AGP accelerated graphics port
-AM  amplitude modulation
-AMI alternate mark inversion
-ANSI    american national standards institute
-AP  access point
-API application programming interface
-APIC    advanced programmable interrupt controller
-ARP address resolution protocol
-ARQ automatic repeat request
-AS  autonomous system
-ASN autonomous system number
-ASCII   american standard code for information interchange
-AT  advanced technology
-ATA advanced technology attachment
-ATAPI   advanced technology attachment packet interface
-ATM asynchronous transfer mode
-ATX advanced technology extended
-BEDO    burst extended data output
-BER basic encoding rules
-BER bit error rate
-BGP border gateway protocol
-BIOS    basic input/output system
-BLOB    binary large object
-BPS bits per second
-BSD berkeley software distribution
-CAD computer-aided design
-CAV constant angular velocity (as opposed to CLV)
-CCD charge coupled device
-CD  compact disc
-CDDA    compact disc digital audio
-CDRAM   cache dynamic random access memory
-CER canonical encoding rules
-CGA color graphics array
-CGI common gateway interface
-CHS cylinder/head/sector
-CIDR    classless inter-domain routing
-CIS contact image sensor
-CLI command line interface
-CLUT    color look-up table
-CLV constant linear velocity (as opposed to CAV)
-CMYK    cyan magenta yellow black
-COFF    common object file format
-COW copy-on-write
-CPU central processing unit
-CRLF    carriage return line feed
-CRT cathode ray tube
-CSMA    carrier sense multiple access
-CSMA/CA carrier sense multiple access with collision avoidance
-CSMA/CD carrier sense multiple access with collision detection
-CSS cascading style sheets
-CTS clear to send
-CVS concurrent versions system
-DAC digital [to] analog converter
-DCE data control equipment
-DCE distributed computing environment
-DCT discrete cosine transform
-DDC display data channel
-DDR double data rate
-DDWG    digital display working group
-DER distinguished encoding rules
-DFT discrete fourier transform
-DHCP    dynamic host configuration protocol
-DIFS    distributed inter-frame space
-DLE data link escape
-DMA direct memory access
-DNS domain name system
-DOS denial of service
-DPCM    differential pulse code modulation
-DPI dots per inch
-DRAM    dynamic random access memory
-DSL digital subscriber line
-DSSS    direct sequence spread spectrum
-DTD document type definition
-DTE data terminal equipment
-DTE dumb terminal emulator
-DVD digital versatile disc
-DVI digital visual interface
-ECP enhanced capability port
-EDID    extended display identification data
-EDO extended data out
-EEPROM  electrically erasable programmable read only memory
-EFM eight to fourteen modulation
-EGA enhanced graphics array
-EGP exterior gateway protocol
-EISA    extended industry standard architecture
-ELF executable and linking format
-EPP enhanced parallel port
-EPRML   extended partial response, maximum likelihood
-EPROM   erasable programmable read only memory
-ESDRAM  enhanced synchronous dynamic random access memory
-E-XER   extended XML encoding rules
-FAT file allocation table
-FBRAM   frame buffer random access memory
-FCS frame check sequence
-FDDI    fiber distributed data interface
-FFS fast file system
-FHSS    frequency hop spread spectrum
-FIR fast infrared
-FLOPS   floating [point] operations per second
-FM  frequency modulation
-FPM fast page mode
-FQDN    fully qualified domain name
-FTP file transfer protocol
-GC  garbage collector
-GCR group-coded recording
-GIF graphics interchange format
-GNU gnu's not unix
-GPL gnu/general public license
-GPU graphics processing unit
-GRE generic routing encapsulation
-GUI graphics user interface
-HDCP    high-bandwidth digital content protection
-HTML    hyper-text markup language
-HTTP    hyper-text transfer protocol
-I2O intelligent input/output
-IANA    internet assigned number authority
-IC  integrated circuit
-ICB internet citizen's band
-ICMP    internet control message protocol
-IDE integrated drive electronics
-IDRP    inter-domain routing protocol
-IEC international electrotechnical commission
-IEEE    institute [of] electrical [and] electronics engineers
-IESG    internet engineering steering group
-IETF    internet engineering task force
-IGP interior gateway protocol
-IKE internet key exchange
-IMAP    internet mail access protocol
-INCITS  international committee on information technology standards
-IPC interprocess communication
-IO  input/output
-IOCTL   input/output control
-IP  internet protocol
-IPNG    internet protocol, next generation
-IPSEC   internet protocol security
-IRC internet relay chat
-IRQ interrupt request
-IRTF    internet research task force
-ISA industry standard architecture
-ISDN    integrated services digital network
-ISI inter-symbol interference
-ISM industrial, scientific and medical
-ISN initial serial number
-ISO international standards organization
-ISOC    internet society
-ISP internet service provider
-JPEG    joint photographic experts group
-KVA kernel virtual address
-LAN local area network
-LBA logical block addressing
-LCD liquid crystal display
-LCP link control protocol
-LDAP    lightweight directory access protocol
-LED light emitting diode
-LIR local internet registry
-LLC logical link control
-LRC longitudinal redundancy check
-LSB least significant bit [or: byte]
-LUN logical unit number
-LZW Lempel Ziv Welch
-MAC medium access control
-MBR master boot record
-MDRAM   multibank dynamic random access memory
-MFM modified frequency modulation
-MIDI    musical instrument digital interface
-MIME    multipurpose internet mail extensions
-MIPS    million instructions per second
-MMU memory management unit
-MPEG    moving picture experts group
-MSB most significant bit [or: byte]
-MSF minutes seconds frames
-MSS maximum segment size
-MTA mail transfer agent
-MTU maximum transmission unit
-MUA mail user agent
-MWE module width encoding
-NAT network address translation
-NAV network allocation vector
-NCP network control protocol
-NFS network file system
-NIC network interface card
-NIS network information service
-NRZ non-return to zero
-NUMA    non uniform memory access
-OCL object constraint language
-OCR optical character recognition
-OEM original equipment manufacturer
-OFDM    orthogonal frequency division multiplexing
-OSF open software foundation
-OSI open systems interconnection
-OTP one time password
-PAM pluggable authentication modules
-PAM pulse amplitude modulation
-PAT port address translation
-PAX portable archive exchange
-PC  personal computer
-PCI peripheral component interconnect
-PCM pulse code modulation
-PCMCIA  personal computer memory card international association
-PDU protocol data unit
-PDP page descriptor page
-PER packed encoding rules
-PERL    practical extraction [and] report language
-PGP pretty good privacy
-PIC programmable interrupt controller
-PID process id
-PIN personal identification number
-PIO programmed input/output
-PLL phase locked loop
-PMT photo-multiplier tube
-PNG portable network graphics
-POP post office protocol
-POSIX   portable operating system interface [for] unix
-POST    power on self test
-POTS    plain old telephone system
-PPP point-to-point protocol
-PPPOA   point-to-point protocol over ATM
-PPPOE   point-to-point protocol over ethernet
-PRML    partial response, maximum likelihood
-PROM    programmable read only memory
-PTE page table entry
-PTLA    pseudo top level aggregator
-PTP page table page
-PSTN    public switched telephone network
-PWM pulse width modulation
-QOS quality of service
-RAID    redundant array of inexpensive disks
-RAM random access memory
-RCS revision control system
-RFC request for comments
-RGB red green blue
-RIFF    Resource Interchange File Format
-RIP routing information protocol
-RIR regional internet registry
-RISC    reduced instruction set computing
-RLE run length encoding
-RLL run length limited
-ROM read only memory
-RPM revolutions per minute
-RTF rich text format
-RTS request to send
-RTT round time trip
-S/PDIF  sony/phillips digital interface
-SACD    super audio compact disc
-SAM serial access memory
-SASI    shugart associates system interface (predecessor to SCSI)
-SATA    serial advanced technology attachment
-SCSI    small computer system interface
-SDRAM   synchronous dynamic random access memory
-SGRAM   synchronous graphics random access memory
-SIFS    short inter-frame space
-SIP session initiation protocol
-SIR slow infrared
-SLDRAM  synchronous-link dynamic random access memory
-SMART   self-monitoring analysis and reporting technology
-SMP symmetric multiprocessing
-SMTP    simple mail transfer protocol
-SNMP    simple network management protocol
-SPD serial presence detect
-SRAM    static random access memory
-SSFDC   solid state floppy disc card
-SSH secure shell
-SSL secure sockets layer
-STP shielded twisted pair
-SVGA    super video graphics array
-TCL tool command language
-TCP transmission control protocol
-TDD test driven development
-TFT thin film transistor
-TIFF    tagged image file format
-TLA top level aggregator
-TLB transition lookaside buffer
-TLD top level domain
-TLS transport layer security
-TMDS    transition minimized differential signaling
-TR  token ring
-TTL time to live
-TTY teletype
-TZ  time zone
-UART    universal asynchronous receiver/transmitter
-UC  uncacheable
-UDO ultra density optical (storage)
-UDP user datagram protocol
-UFS unix file system
-UML unified modeling language
-UPS uninterruptible power supply
-URI uniform resource identifier
-URL uniform resource locator
-USART   universal synchronous/asynchronous receiver/transmitter
-USB universal serial bus
-USWC    uncacheable speculative write combining
-UTP unshielded twisted pair
-UUCP    unix-to-unix copy protocol
-VAX virtual address extension
-VCM virtual channel memory
-VESA    video electronics standards association
-VGA video graphics array
-VLAN    virtual local area network
-VLSM    variable length subnetting mask
-VM  virtual memory
-VPN virtual private network
-VRAM    video random access memory
-WAN wide area network
-WAP wireless application protocol
-WLAN    wireless local area network
-WRAM    window random access memory
-WWW world wide web
-XER XML encoding rules
-XGA extended graphics array
-XML extensible markup language
-XSL extensible stylesheet language
-XT  extended technology
-ZFOD    zero-filled on demand
-
From vmiklos at frugalware.org  Sat Oct 13 16:27:12 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 16:27:16 2007
Subject: [Frugalware-git] 
	frugalware-current: firefox-flashblock-1.5.4.1-1-i686
Message-ID: <20071013142712.EB05913A4002@genesis.frugalware.org>

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

commit 7ab4ebcdb9182d056ad9557f378330781e51fa6e
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 16:26:37 2007 +0200

firefox-flashblock-1.5.4.1-1-i686
version bump
closes #2485

diff --git a/source/xapps-extra/firefox-flashblock/FrugalBuild b/source/xapps-extra/firefox-flashblock/FrugalBuild
index 1164b55..faab51d 100644
--- a/source/xapps-extra/firefox-flashblock/FrugalBuild
+++ b/source/xapps-extra/firefox-flashblock/FrugalBuild
@@ -4,16 +4,16 @@
pkgname=firefox-flashblock
_F_firefox_ext=flashblock
_F_firefox_id=3d7eb24f-2740-49df-8937-200b1cc08f8a
-pkgver=1.5
-pkgrel=2
+pkgver=1.5.4.1
+pkgrel=1
pkgdesc="Replaces Flash objects with a button you can click to view them."
url="http://flashblock.mozdev.org/"
depends=('firefox>=1.5')
groups=('xapps-extra' 'firefox-extensions')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://downloads.mozdev.org/flashblock/ |grep 'flashblock-[0-9\.]*xpi$' |sed -n 's/.*-\(.*\)\.x.*/\1/;$ p'"
+up2date="lynx -dump http://downloads.mozdev.org/flashblock/|grep [0-9].xpi$|sed 's/.*-\(.*\)\.xpi/\1/'|Fsort|tail -n 1"
source=(http://downloads.mozdev.org/$_F_firefox_ext/$_F_firefox_ext-$pkgver.xpi \
chrome.manifest)
-sha1sums=('579d27e006715c213db85b6eade00bb41e77aa0c' \
-	  '08b5540b3fc3872cdf3124ead702c0db7b6df7b7')
+sha1sums=('11f2f3c250b77a0331646079187b509a4b904206' \
+          '08b5540b3fc3872cdf3124ead702c0db7b6df7b7')
Finclude firefox-extension
From vmiklos at frugalware.org  Sat Oct 13 17:07:25 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 17:07:28 2007
Subject: [Frugalware-git] 
	frugalware-current: firefox-flashblock-1.5.4.1-1-i686
Message-ID: <20071013150725.2E2E313A4002@genesis.frugalware.org>

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

commit c67f2f6cb5b0d7e4eb4c3515982489b7d4c01056
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 17:07:14 2007 +0200

firefox-flashblock-1.5.4.1-1-i686
- depends() -> rodepends()

diff --git a/source/xapps-extra/firefox-flashblock/FrugalBuild b/source/xapps-extra/firefox-flashblock/FrugalBuild
index faab51d..6d7e3b8 100644
--- a/source/xapps-extra/firefox-flashblock/FrugalBuild
+++ b/source/xapps-extra/firefox-flashblock/FrugalBuild
@@ -8,7 +8,7 @@ pkgver=1.5.4.1
pkgrel=1
pkgdesc="Replaces Flash objects with a button you can click to view them."
url="http://flashblock.mozdev.org/"
-depends=('firefox>=1.5')
+rodepends=('firefox>=1.5')
groups=('xapps-extra' 'firefox-extensions')
archs=('i686' 'x86_64')
up2date="lynx -dump http://downloads.mozdev.org/flashblock/|grep [0-9].xpi$|sed 's/.*-\(.*\)\.xpi/\1/'|Fsort|tail -n 1"
From crazy at frugalware.org  Sat Oct 13 17:13:50 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:13:52 2007
Subject: [Frugalware-git] frugalware-current: pureadmin-0.4-1-i686
Message-ID: <20071013151350.A3E3E13A4002@genesis.frugalware.org>

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

commit 12ecc92d870dec537989165abd1d33c0a1d5c7bc
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:10:25 2007 +0200

pureadmin-0.4-1-i686
* Version bump
* added missing scriptlet option

diff --git a/source/xapps-extra/pureadmin/FrugalBuild b/source/xapps-extra/pureadmin/FrugalBuild
index b085d17..9d3cf4a 100644
--- a/source/xapps-extra/pureadmin/FrugalBuild
+++ b/source/xapps-extra/pureadmin/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: BMH1980 <bmh1980@frugalware.org>

pkgname=pureadmin
-pkgver=0.3
+pkgver=0.4
pkgrel=1
pkgdesc="Graphical tool used to make the management of PureFTPd a little easier."
_F_sourceforge_dirname="purify"
@@ -10,11 +10,14 @@ Finclude sourceforge
url="http://purify.sourceforge.net/"
license="GPL2"
up2date="lynx -dump $url | grep Latest | cut -d ' ' -f 6 | cut -d ']' -f 2"
-sha1sums=('44c19f16f5e2a4c5204c56a5feeeca52ef255ce2')
groups=('xapps-extra')
archs=('i686' 'x86_64')
depends=('libglade' 'gamin' 'pure-ftpd')
+options=('scriptlet')
makedepends=('perl-xml')
Fconfopts="$Fconfopts --with-everything"
+sha1sums=('2ba6260bd13c03eecf7ef919fe826ffa5c256b3f')
+
+export CFLAGS="$CFLAGS -fgnu89-inline"

# optimization OK
From crazy at frugalware.org  Sat Oct 13 17:18:05 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:18:13 2007
Subject: [Frugalware-git] frugalware-current: python-xlib-0.14-1-i686
Message-ID: <20071013151806.304B313A4002@genesis.frugalware.org>

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

commit 366537d248734862351e3e212063720f79d9a7ec
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:14:45 2007 +0200

python-xlib-0.14-1-i686
* Version bump

diff --git a/source/xlib-extra/python-xlib/FrugalBuild b/source/xlib-extra/python-xlib/FrugalBuild
index 95f0e7f..86c4ac3 100644
--- a/source/xlib-extra/python-xlib/FrugalBuild
+++ b/source/xlib-extra/python-xlib/FrugalBuild
@@ -2,12 +2,12 @@
# Maintainer: BMH1980 <bmh1980@frugalware.org>

pkgname=python-xlib
-pkgver=0.13
-pkgrel=2
+pkgver=0.14
+pkgrel=1
pkgdesc="The Python X Library is a complete X11R6 client-side implementation."
license="GPL2"
Finclude sourceforge
groups=('xlib-extra')
archs=('i686' 'x86_64')
depends=('python')
-sha1sums=('076df2e48ffe4cdbd82439ef611eda4f04ce94f2')
+sha1sums=('e25e3c1284e768d3f84eaebbea4ed3e647c2a05b')
From crazy at frugalware.org  Sat Oct 13 17:26:45 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:26:48 2007
Subject: [Frugalware-git] frugalware-current: libglademm-2.6.5-1-i686
Message-ID: <20071013152645.9F7CC13A4002@genesis.frugalware.org>

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

commit 9d45c93c3411930a5461077ce3248718afe63063
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:23:23 2007 +0200

libglademm-2.6.5-1-i686
* Version bump

diff --git a/source/gnome-extra/libglademm/FrugalBuild b/source/gnome-extra/libglademm/FrugalBuild
index 598f272..248217c 100644
--- a/source/gnome-extra/libglademm/FrugalBuild
+++ b/source/gnome-extra/libglademm/FrugalBuild
@@ -2,14 +2,14 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=libglademm
-pkgver=2.6.4
-pkgrel=5
+pkgver=2.6.5
+pkgrel=1
pkgdesc="C++ interface for Libglade"
url="http://www.gnome.org/"
depends=('gtkmm>=2.12.0' 'libglade>=2.6.2-2' 'cairomm>=1.4.4')
groups=('gnome-extra')
archs=('i686' 'x86_64')
Finclude gnome
-sha1sums=('7db86cb5942e7eed5668776e49aeb3731b3a34c9')
+sha1sums=('92a347cefcb4e0dc66eda06ba414bfd68dff1e64')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 17:37:53 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:37:56 2007
Subject: [Frugalware-git] frugalware-current: poppler-0.6.1-1-i686
Message-ID: <20071013153753.3EE9D13A4002@genesis.frugalware.org>

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

commit 85bc72ce006abf03ddab9b7feb7b763e808d707d
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:33:20 2007 +0200

poppler-0.6.1-1-i686
* Version bump

diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild
index c72e608..fb348ec 100644
--- a/source/xlib/poppler/FrugalBuild
+++ b/source/xlib/poppler/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=poppler
-pkgver=0.6
+pkgver=0.6.1
pkgrel=1
pkgdesc="A PDF rendering library"
url="http://poppler.freedesktop.org/"
@@ -39,6 +39,6 @@ build() {
Fsplit poppler-qt4 usr/include/poppler/qt4/
}

-sha1sums=('a40abb17b912d6ecd0e4ece609b74647b8d04279' \
+sha1sums=('f28184df94fe6312db0a11e285d7832c3cfd0797' \
'a048348d9a8c6d545714350d3ab66dc7028e4b7f')
# optimization OK
From crazy at frugalware.org  Sat Oct 13 17:38:40 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:38:41 2007
Subject: [Frugalware-git] frugalware-current: xkeyboard-config-1.1-1-i686
Message-ID: <20071013153840.AFB9113A4002@genesis.frugalware.org>

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

commit e308b3b3613f5b403192e56aa2f381313f49c895
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:35:16 2007 +0200

xkeyboard-config-1.1-1-i686
* Version bump

diff --git a/source/x11/xkeyboard-config/FrugalBuild b/source/x11/xkeyboard-config/FrugalBuild
index 96d1cf8..434b359 100644
--- a/source/x11/xkeyboard-config/FrugalBuild
+++ b/source/x11/xkeyboard-config/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=xkeyboard-config
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc="X.org XML-based XKB configuration registry"
url="http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig"
@@ -16,7 +16,7 @@ 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=('bc99e0d13d4400d8fc7d353e485a7ca88f3582bb')
+sha1sums=('56aae0b152f468c0627637e632cbfc1527f26a62')

build() {
Fcd
From crazy at frugalware.org  Sat Oct 13 17:44:30 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:44:32 2007
Subject: [Frugalware-git] frugalware-current: raptor-1.4.16-1-i686
Message-ID: <20071013154430.9F94113A4002@genesis.frugalware.org>

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

commit b82c5744b6aa6469abd2c9a9896319aac29d9389
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:41:02 2007 +0200

raptor-1.4.16-1-i686
* Version bump
* new m8r

diff --git a/source/lib-extra/raptor/FrugalBuild b/source/lib-extra/raptor/FrugalBuild
index 289622f..b08a515 100644
--- a/source/lib-extra/raptor/FrugalBuild
+++ b/source/lib-extra/raptor/FrugalBuild
@@ -1,9 +1,9 @@
# Compiling Time: 0.19 SBU
-# Maintainer: DNAku <DNAku@frugalware.org>
+# Maintainer: crazy <crazy@frugalware.org>
# Contributor: Tuxbubling <tuxbubling@tiscali.fr>

pkgname=raptor
-pkgver=1.4.15
+pkgver=1.4.16
pkgrel=1
pkgdesc="Library providing a set of parsers that generate Resource Description Framework (RDF)."
url="http://librdf.org/raptor/"
@@ -12,6 +12,6 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://librdf.org/raptor/ | grep 'Latest version' | sed 's/.*: \(.*\) .*/\1/'"
source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz)
-sha1sums=('38f99c3223a97a5eeba49239fdf229cbbe7d3700')
+sha1sums=('b85488c588ea49a44428bfa28c866047d65dd2ea')

# optimization OK
From crazy at frugalware.org  Sat Oct 13 17:59:56 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 17:59:58 2007
Subject: [Frugalware-git] frugalware-current: foo2zjs-2007_10_11-1-i686
Message-ID: <20071013155956.24EBD13A4002@genesis.frugalware.org>

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

commit 1186840c1be98a516cc9e45bb753bdd89eb161d0
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 17:54:19 2007 +0200

foo2zjs-2007_10_11-1-i686
* Version bump
* ppd files are now installed

diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild
index 545f295..f6e4a42 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_07_15
+pkgver=2007_10_11
pkgrel=1
pkgdesc="A linux printer driver for ZjStream protocol"
url="http://foo2zjs.rkkda.com/"
@@ -39,6 +39,6 @@ build() {
Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver
}

-sha1sums=('e0a3156c8536f566f544f21ff5ee96e197cec215' \
+sha1sums=('238129a6e2a4f7205d263a2a803822043d846ad6' \
'7b89eae53167a7ebef0cd9f7f405f2a787e3d13c')
# optimization OK
From crazy at frugalware.org  Sat Oct 13 18:07:05 2007
From: crazy at frugalware.org (crazy)
Date: Sat Oct 13 18:07:08 2007
Subject: [Frugalware-git] frugalware-current: swfdec-mozilla-0.5.3-1-i686
Message-ID: <20071013160705.403EC13A4002@genesis.frugalware.org>

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

commit c3d41c1abae323c41e25dc84e1f072e0f9052a46
Author: crazy <crazy@frugalware.org>
Date:   Sat Oct 13 18:03:42 2007 +0200

swfdec-mozilla-0.5.3-1-i686
* Version bump

diff --git a/source/xlib-extra/swfdec-mozilla/FrugalBuild b/source/xlib-extra/swfdec-mozilla/FrugalBuild
index c071c8b..bbc49a6 100644
--- a/source/xlib-extra/swfdec-mozilla/FrugalBuild
+++ b/source/xlib-extra/swfdec-mozilla/FrugalBuild
@@ -2,17 +2,17 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=swfdec-mozilla
-pkgver=0.5.2
+pkgver=0.5.3
pkgrel=1
pkgdesc="Mozilla plugin that uses the Swfdec library for playing SWF files in a browser capable of loading NS-Plugins"
url="http://swfdec.freedesktop.org/"
license="LGPL"
-depends=('swfdec=0.5.2' 'firefox')
+depends=('swfdec=0.5.3' 'firefox')
options=('scriptlet')
groups=('xlib-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://swfdec.freedesktop.org/|grep -om1 'swfdec-\(.*\).tar.gz$'|Flasttar"
source=($url/download/$pkgname/0.5/$pkgname-$pkgver.tar.gz)
-sha1sums=('6bff82add45482fccc3653ebbf9ca248a46ab15c')
+sha1sums=('e525da807cf30b3e97bdccc1055162400884b748')

# optimization OK
From janny at frugalware.org  Sat Oct 13 19:08:22 2007
From: janny at frugalware.org (janny)
Date: Sat Oct 13 19:08:24 2007
Subject: [Frugalware-git] frugalware-current: dazuko-2.3.4-1-i686
Message-ID: <20071013170822.B9CC813A4002@genesis.frugalware.org>

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

commit d32d5727f8770c4369f86ff6cf48fc1d21002823
Author: janny <janny@frugalware.org>
Date:   Sat Oct 13 19:07:37 2007 +0200

dazuko-2.3.4-1-i686
version bump

diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild
index 7219141..483fea0 100644
--- a/source/apps-extra/dazuko/FrugalBuild
+++ b/source/apps-extra/dazuko/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=dazuko
-pkgver=2.3.3
-pkgrel=11
+pkgver=2.3.4
+pkgrel=1
pkgdesc="On-access virus scanning kernel interface"
url="http://www.dazuko.org"
license="GPL-2 BSD"
@@ -30,5 +30,5 @@ build() {
Ffile $pkgname-${pkgver//_/-}/library/libdazuko.a /usr/lib/libdazuko.a
Fdoc README.Frugalware
}
-sha1sums=('a1772d42327a9c2cc5737993abd2a3bc392ae67c'\
+sha1sums=('271d0a23d7aed2555f023141504386b6042a5efa' \
'8292447cba4bdab9dfbb8169c011e74559a00804')
From iron at frugalware.org  Sat Oct 13 19:32:43 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Sat Oct 13 19:32:45 2007
Subject: [Frugalware-git] homepage-ng: fwng: changed stable rss url
Message-ID: <20071013173243.6C44413A4002@genesis.frugalware.org>

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

commit 5fa4999d6ebf7aace6a88477a5b61e317e100848
Author: Krisztian VASAS <iron@frugalware.org>
Date:   Sat Oct 13 19:31:39 2007 +0200

fwng: changed stable rss url

diff --git a/frugalware/rss.php b/frugalware/rss.php
index 92eddef..5defc38 100644
--- a/frugalware/rss.php
+++ b/frugalware/rss.php
@@ -159,7 +159,7 @@ switch($_GET['type'])
die();
case "stable":
header('Content-Type: application/xml; charset=utf-8');
-		print(file_get_contents("http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-stable;a=rss"));
+		print(file_get_contents("http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-stable.git;a=rss;opt=--no-merges"));
die();
case "bugs":
header('Content-Type: application/xml; charset=utf-8');
From vmiklos at frugalware.org  Sat Oct 13 19:46:33 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 19:46:35 2007
Subject: [Frugalware-git] frugalware-current: git-1.5.3.4-2-i686
Message-ID: <20071013174633.DD17613A4002@genesis.frugalware.org>

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

commit 5eab36c9e746e4af35b6fe401580adf73d62dd0c
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 19:46:19 2007 +0200

git-1.5.3.4-2-i686
added an init script for git-daemon

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index b5f9ba0..571f4c2 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=git
pkgver=1.5.3.4
Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2
-pkgrel=1
+pkgrel=2
pkgdesc="A fast, scalable, distributed revision control system."
url="http://www.kernel.org/pub/software/scm/git/"
depends=('curl>=7.16.0' 'openssl')
@@ -16,9 +16,9 @@ archs=('i686' 'x86_64')
up2date="lynx -dump '$url/?C=M;O=D'|grep 'git-[0-9.]*.tar.bz2$'|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
if ! Fuse $USE_DEVEL; then
source=($url/$pkgname-$pkgver.tar.bz2)
-	signatures=(${source[0]}.sign '' '' '')
+	signatures=(${source[0]}.sign '' '' '' '' '')
fi
-source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware)
+source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware rc.git git.sysconfig)
options=('scriptlet')

subpkgs=('gitweb' 'git-gui' 'gitk')
@@ -77,6 +77,10 @@ build()
Fsplit gitweb /etc /var
Fdoc README.Frugalware

+	# git-daemon
+	Ffile git.sysconfig /etc/sysconfig/git
+	Fexe /etc/rc.d/rc.git
+
# git-gui
Fsplit git-gui usr/bin/git-{gui,citool}
Fsplit git-gui usr/share/git-gui
diff --git a/source/devel-extra/git/git.sysconfig b/source/devel-extra/git/git.sysconfig
new file mode 100644
index 0000000..324b90c
--- /dev/null
+++ b/source/devel-extra/git/git.sysconfig
@@ -0,0 +1,18 @@
+#
+# /etc/sysconfig/git
+#
+# confiugation file for the git daemon
+#
+
+# remap all the path requests as relative to this path
+BASE_PATH="/home/ftp"
+
+# allow pulling from all directories that look like git repositories, even if
+# they do not have the git-daemon-export-ok file
+EXPORT="--export-all"
+
+# translate ~user to $HOME/git/public
+USER_PATH="--user-path=git/public"
+
+# the fun part
+GIT_OPTIONS="--reuseaddr --base-path=$BASE_PATH $EXPORT $USER_PATH --detach --pid-file=/var/run/gitd.pid"
diff --git a/source/devel-extra/git/rc.git b/source/devel-extra/git/rc.git
new file mode 100644
index 0000000..a4f3d24
--- /dev/null
+++ b/source/devel-extra/git/rc.git
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# (c) 2007 Miklos Vajna <vmiklos@frugalware.org>
+# rc.git for Frugalware
+# distributed under GPL License
+
+# chkconfig: 2345 99 01
+# description: Git daemon
+
+source /lib/initscripts/functions
+TEXTDOMAIN=git
+TEXTDOMAINDIR=/lib/initscripts/messages
+
+actions=(restart status start stop)
+daemon=$"GIT daemon"
+
+pid="cat /var/run/gitd.pid 2> /dev/null" # Change me! :)
+source /etc/sysconfig/git
+
+rc_start()
+{
+	start_msg
+	if [[ "$(eval $pid)" == "" ]] ; then
+		git daemon $GIT_OPTIONS
+		ok $?
+	else
+		ok 999
+	fi
+}
+
+rc_stop()
+{
+	stop_msg
+	if [[ "$(eval $pid)" != "" ]] ; then
+		kill $(eval $pid)
+		ok $?
+		rm /var/run/gitd.pid
+	else
+		ok 999
+	fi
+}
+
+rc_exec $1
From vmiklos at frugalware.org  Sat Oct 13 20:28:38 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 20:28:41 2007
Subject: [Frugalware-git] frugalware-current: tools/gitpull: update,
	now there is a git-daemon @ genesis
Message-ID: <20071013182838.C6D3C13A4002@genesis.frugalware.org>

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

commit abd50768b0b5fef5f060cfa019dab34a34dceeea
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 20:28:19 2007 +0200

tools/gitpull: update, now there is a git-daemon @ genesis

diff --git a/tools/gitpull b/tools/gitpull
index 53bcadc..beb92c3 100755
--- a/tools/gitpull
+++ b/tools/gitpull
@@ -6,19 +6,20 @@ cd `dirname $0`/../repos
: > projects.list.new
for i in `rsync $server|sed 's/.* \([^ ]\)/\1/;1 d'`
do
+	giturl=`python -c "import os; sock = os.popen('rsync -l $server/$i'); buf = sock.read(); sock.close(); print 'git://git.frugalware.org' + os.path.abspath('$server/$i/../'[len('rsync://rsync.frugalware.org'):] + buf.split(' -> ')[1].strip())"`
if [ -d $i.git ]; then
cd $i.git
git fetch -q origin
else
-		git clone --bare -q $server/$i/.git $i.git
+		git clone --bare -q $giturl $i.git
cd $i.git
-		git remote add --mirror origin $server/$i/.git
+		git remote add --mirror origin $giturl
fi
cd ..
rsync $server/$i/.git/owner $i.git/
rsync $server/$i/.git/description $i.git/
-	echo "Anonymous Access: 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 'Developer Access: \${USER}@git.frugalware.org:/home/ftp' + os.path.abspath('$server/$i/../'[len('rsync://rsync.frugalware.org'):] + buf.split(' -> ')[1].strip())" >> $i.git/cloneurl
+	echo "$giturl" > $i.git/cloneurl
+	echo "http://git.frugalware.org/repos/$i/.git" >> $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
From priyank at frugalware.org  Sat Oct 13 21:52:52 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 21:52:53 2007
Subject: [Frugalware-git] gfpm: Implemented hicolor iconcache updater
Message-ID: <20071013195252.046F713A4002@genesis.frugalware.org>

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

commit be8fdfa6f92068cd06bd80d4305075b685754fd0
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 01:20:59 2007 +0530

Implemented hicolor iconcache updater
* gfpm_icmonitor: It automatically checks /usr/share/icons/hicolor directory for any changes (using inotify)
after every package removal / install / upgrade and if something was changed, it auto-updates the hicolor
iconcache. (Thanks crazy for the idea)
* gfpm_util: added gfpm_update_iconcache()

diff --git a/src/Makefile.am b/src/Makefile.am
index 30a9571..8156e1d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,8 @@ gfpm_SOURCES=				\
gfpm-optimizedb.c \
gfpm-quickpane.c \
gfpm-about.c \
+			gfpm-icmonitor.c \
gfpm.c

-gfpm_LDADD= @GFPM_LIBS@ -lpacman
+gfpm_LDADD= @GFPM_LIBS@ -lpacman -linotifytools

diff --git a/src/gfpm-icmonitor.c b/src/gfpm-icmonitor.c
new file mode 100644
index 0000000..910dd53
--- /dev/null
+++ b/src/gfpm-icmonitor.c
@@ -0,0 +1,140 @@
+/*
+ *  gfpm-icmonitor.c for gfpm
+ *  Gfpm Icon cache monitor
+ *
+ *  Copyright (C) 2006-2007 by Priyank Gosalia <priyankmg@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#define MON_DIR	"/usr/share/icons/hicolor"
+
+#include <inotifytools/inotifytools.h>
+#include <inotifytools/inotify.h>
+#include "gfpm-icmonitor.h"
+
+static gboolean changed;
+static gboolean inited;
+static gboolean stop = FALSE;
+struct inotify_event *event;
+
+static gboolean gfpm_icmonitor (void);
+
+int
+gfpm_icmonitor_init (void)
+{
+	if (!inotifytools_initialize())
+	{
+		inited = FALSE;
+		return -1;
+	}
+
+	if (!inotifytools_watch_recursively(MON_DIR, IN_ALL_EVENTS))
+	{
+		inited = FALSE;
+		return -1;
+	}
+
+	inited = TRUE;
+
+	return 0;
+}
+
+/* execute the monitor function every 0.5 second to monitor changes
+   in the MON_DIR
+*/
+static gboolean
+gfpm_icmonitor_monitor (void)
+{
+	if (stop == TRUE)
+	{
+		return FALSE;
+	}
+	if (changed)
+	{
+		return TRUE;
+	}
+	g_print ("monitoring..\n");
+	event = inotifytools_next_event (-1);
+	while (event)
+	{
+		switch (event->mask)
+		{
+			case IN_ALL_EVENTS:
+			case IN_ACCESS:
+			case IN_CREATE:
+			case IN_DELETE:
+			case IN_MODIFY:
+			{
+				changed = TRUE;
+				return TRUE;
+				break;
+			}
+			default:
+			{
+				break;
+			}
+		}
+		event = inotifytools_next_event (-1);
+	}
+
+	return TRUE;
+}
+
+void
+gfpm_icmonitor_start_monitor (void)
+{
+	if (inited)
+	{
+		if (changed)
+			return;
+		stop = FALSE;
+		/* start the timer */
+		g_timeout_add (100, (GSourceFunc)gfpm_icmonitor_monitor, NULL);
+	}
+
+	return;
+}
+
+void
+gfpm_icmonitor_stop_monitor (void)
+{
+	stop = TRUE;
+}
+
+void
+gfpm_icmonitor_reset_ic (void)
+{
+	changed = FALSE;
+}
+
+gboolean
+gfpm_icmonitor_is_ic_changed (void)
+{
+	if (inited)
+		return changed;
+
+	return FALSE;
+}
+
+gboolean
+gfpm_icmonitor_is_running (void)
+{
+	if (stop == TRUE)
+		return FALSE;
+
+	return TRUE;
+}
+
diff --git a/src/gfpm-icmonitor.h b/src/gfpm-icmonitor.h
new file mode 100644
index 0000000..a81ce2e
--- /dev/null
+++ b/src/gfpm-icmonitor.h
@@ -0,0 +1,25 @@
+#ifndef __GFPM_ICMONITOR_H__
+#define __GFPM_ICMONITOR_H__
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <locale.h>
+#include <libintl.h>
+#include <gtk/gtk.h>
+
+int gfpm_icmonitor_init (void);
+
+void gfpm_icmonitor_start_monitor (void);
+
+void gfpm_icmonitor_stop_monitor (void);
+
+void gfpm_icmonitor_reset_ic (void);
+
+gboolean gfpm_icmonitor_is_ic_changed (void);
+
+gboolean gfpm_icmonitor_is_running (void);
+
+#endif
+
diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index 8fa79bc..ef5c108 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -40,6 +40,7 @@
#include "gfpm-progress.h"
#include "gfpm-optimizedb.h"
#include "gfpm-quickpane.h"
+#include "gfpm-icmonitor.h"
#include "gfpm-util.h"
#include "gfpm-about.h"
#include "gfpm-db.h"
@@ -278,6 +279,7 @@ gfpm_interface_init (void)
gfpm_progress_init ();
gfpm_optimize_db_dlg_init ();
gfpm_quickpane_init ();
+	gfpm_icmonitor_init ();

gtk_widget_hide (gfpm_splash);
title = g_strdup_printf ("%s (%s)", PACKAGE_STRING, GFPM_RELEASE_NAME);
@@ -318,6 +320,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data)
}

gfpm_apply_dlg_hide ();
+
/* process remove list first */
if (gfpm_package_list_is_empty(GFPM_REMOVE_LIST))
{
@@ -358,6 +361,8 @@ try: if (pacman_trans_init(PM_TRANS_TYPE_REMOVE, flags, gfpm_progress_event, cb_
pkgs = pacman_trans_getinfo (PM_TRANS_PACKAGES);
if (pkgs == NULL) g_print ("pkgs is null.. bad bad bad!\n");

+		/* start iconcache montior */
+		gfpm_icmonitor_start_monitor ();
/* commit transaction */
ret = gfpm_trans_commit (&pdata);

@@ -412,8 +417,12 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
pkgs = pacman_trans_getinfo (PM_TRANS_PACKAGES);
if (pkgs == NULL) gfpm_error (_("Error"), _("Error getting transaction info"));

+		/* start iconcache montior if it wasn't already started */
+		if (gfpm_icmonitor_is_running()==FALSE)
+			gfpm_icmonitor_start_monitor ();
/* commit transaction */
-		ret = gfpm_trans_commit (pdata);
+		ret = gfpm_trans_commit (&pdata);
+

cleanup:
/* release the transaction */
@@ -426,8 +435,13 @@ itry:	if (pacman_trans_init(PM_TRANS_TYPE_SYNC, flags, gfpm_progress_event, cb_g
gfpm_progress_show (FALSE);
}
gfpm_db_reset_localdb ();
-	//gfpm_progress_show (FALSE);

+	gfpm_icmonitor_stop_monitor ();
+	if (gfpm_icmonitor_is_ic_changed() == TRUE)
+	{
+		gfpm_icmonitor_reset_ic ();
+		gfpm_update_iconcache ();
+	}
if (current_group != NULL)
gfpm_load_pkgs_tvw ((const char*)current_group);

diff --git a/src/gfpm-util.c b/src/gfpm-util.c
index 97da9be..c4433e2 100644
--- a/src/gfpm-util.c
+++ b/src/gfpm-util.c
@@ -85,3 +85,17 @@ gfpm_check_if_package_updatable (const gchar *package)
return ret;
}

+void
+gfpm_update_iconcache (void)
+{
+	if (!g_file_test("/usr/bin/gtk-update-icon-cache", G_FILE_TEST_EXISTS))
+		return;
+
+	g_print ("updating iconcache..\n");
+	while (gtk_events_pending()) gtk_main_iteration ();
+	system ("gtk-update-icon-cache -f -t /usr/share/icons/hicolor > /dev/null 2>&1");
+	while (gtk_events_pending()) gtk_main_iteration ();
+
+	return;
+}
+
diff --git a/src/gfpm-util.h b/src/gfpm-util.h
index 233ff51..444d232 100644
--- a/src/gfpm-util.h
+++ b/src/gfpm-util.h
@@ -20,4 +20,6 @@ GdkPixbuf *gfpm_get_icon (const char *, int);

gint gfpm_check_if_package_updatable (const gchar *);

+void gfpm_update_iconcache (void);
+
#endif
From priyank at frugalware.org  Sat Oct 13 21:59:57 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 21:59:59 2007
Subject: [Frugalware-git] gfpm: gfpm_icmonitor should perform a non-blocking
	scan for events
Message-ID: <20071013195957.56D1013A4002@genesis.frugalware.org>

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

commit b7fe9642a0963372011ec9498f229acfdc2e65d1
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 01:28:05 2007 +0530

gfpm_icmonitor should perform a non-blocking scan for events
gfpm_icmonitor_monitor() : perform a non-blocking scan

diff --git a/src/gfpm-icmonitor.c b/src/gfpm-icmonitor.c
index 910dd53..09b8829 100644
--- a/src/gfpm-icmonitor.c
+++ b/src/gfpm-icmonitor.c
@@ -67,7 +67,7 @@ gfpm_icmonitor_monitor (void)
return TRUE;
}
g_print ("monitoring..\n");
-	event = inotifytools_next_event (-1);
+	event = inotifytools_next_event (0);
while (event)
{
switch (event->mask)
@@ -87,7 +87,7 @@ gfpm_icmonitor_monitor (void)
break;
}
}
-		event = inotifytools_next_event (-1);
+		event = inotifytools_next_event (0);
}

return TRUE;
From priyank at frugalware.org  Sat Oct 13 22:01:51 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 22:01:53 2007
Subject: [Frugalware-git] gfpm: removed some debug strings
Message-ID: <20071013200151.C247B13A4002@genesis.frugalware.org>

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

commit ee997b2455374bc6edcf7ee597d8a8878694f4d8
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 01:30:04 2007 +0530

removed some debug strings

diff --git a/src/gfpm-icmonitor.c b/src/gfpm-icmonitor.c
index 09b8829..ce4ad03 100644
--- a/src/gfpm-icmonitor.c
+++ b/src/gfpm-icmonitor.c
@@ -66,7 +66,6 @@ gfpm_icmonitor_monitor (void)
{
return TRUE;
}
-	g_print ("monitoring..\n");
event = inotifytools_next_event (0);
while (event)
{
diff --git a/src/gfpm-util.c b/src/gfpm-util.c
index c4433e2..84ade54 100644
--- a/src/gfpm-util.c
+++ b/src/gfpm-util.c
@@ -91,7 +91,6 @@ gfpm_update_iconcache (void)
if (!g_file_test("/usr/bin/gtk-update-icon-cache", G_FILE_TEST_EXISTS))
return;

-	g_print ("updating iconcache..\n");
while (gtk_events_pending()) gtk_main_iteration ();
system ("gtk-update-icon-cache -f -t /usr/share/icons/hicolor > /dev/null 2>&1");
while (gtk_events_pending()) gtk_main_iteration ();
From priyank at frugalware.org  Sat Oct 13 22:05:05 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 22:05:07 2007
Subject: [Frugalware-git] gfpm: configure.ac
Message-ID: <20071013200505.5FFAD13A4002@genesis.frugalware.org>

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

commit 4ae1231226bad2a0dcf2b58af52e7f44b8f4c7de
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 01:33:14 2007 +0530

configure.ac
shoudln't check for alpm.h

diff --git a/configure.ac b/configure.ac
index 8303a8d..224c331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE

AC_PROG_CC(GCC)
AC_HEADER_STDC
-AC_CHECK_HEADERS([locale.h stdlib.h string.h sys/ioctl.h unistd.h alpm.h])
+AC_CHECK_HEADERS([locale.h stdlib.h string.h sys/ioctl.h unistd.h])

AC_ARG_ENABLE(werror,
AC_HELP_STRING([  --enable-werror], [Enable -Werror usage]), [werror="yes"])
From priyank at frugalware.org  Sat Oct 13 22:15:14 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 22:15:16 2007
Subject: [Frugalware-git] frugalware-current: libpaper-1.1.23-1-i686
Message-ID: <20071013201514.09EDB13A4002@genesis.frugalware.org>

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

commit ef743324e4d145ee9bd4e438b9065d822f0100f4
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 01:41:54 2007 +0530

libpaper-1.1.23-1-i686
* Version bump

diff --git a/source/lib-extra/libpaper/FrugalBuild b/source/lib-extra/libpaper/FrugalBuild
index 74bda9d..1c86d57 100644
--- a/source/lib-extra/libpaper/FrugalBuild
+++ b/source/lib-extra/libpaper/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=libpaper
-pkgver=1.1.22
+pkgver=1.1.23
pkgrel=1
pkgdesc="The paper library provides a simple way for applications to take actions based on a user-defined paper size"
url="http://packages.debian.org/unstable/source/libpaper"
@@ -11,6 +11,6 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url | grep tar.gz -m1 | sed 's/.*r_\(.*\).t.*/\1/'"
source=(http://ftp.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_${pkgver}.tar.gz)
-sha1sums=('b811b432b25ae699c5ea5583841703460f793b88')
+sha1sums=('e1c03fc0fa708cafe12d00a120685ef566100468')

# optimization OK
From priyank at frugalware.org  Sat Oct 13 22:58:59 2007
From: priyank at frugalware.org (Priyank)
Date: Sat Oct 13 22:59:01 2007
Subject: [Frugalware-git] frugalware-current: epdfview-0.1.6-1-i686
Message-ID: <20071013205859.2B2AF13A4002@genesis.frugalware.org>

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

commit a7d21eaed15584a6ea937dd878adb5c71071a0e7
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 02:25:53 2007 +0530

epdfview-0.1.6-1-i686
* New package / Initial import

diff --git a/source/xapps-extra/epdfview/FrugalBuild b/source/xapps-extra/epdfview/FrugalBuild
new file mode 100644
index 0000000..5ace94c
--- /dev/null
+++ b/source/xapps-extra/epdfview/FrugalBuild
@@ -0,0 +1,16 @@
+# Compiling Time: 0.05 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=epdfview
+pkgver=0.1.6
+pkgrel=1
+pkgdesc="ePDFView is a free lightweight PDF document viewer"
+url="http://trac.emma-soft.com/epdfview"
+depends=('gtk+2' 'poppler-glib')
+groups=('xapps-extra')
+archs=('i686')
+up2date="lynx -dump $url/wiki/Download | grep -m1 tar.bz2 | sed 's/.*w-\(.*\).t.*/\1/'"
+source=($url/chrome/site/releases/$pkgname-$pkgver.tar.bz2)
+sha1sums=('1bb3a1d85b1d5b13c24a38c144910ddc329e0f0e')
+
+# optimization OK
From vmiklos at frugalware.org  Sat Oct 13 23:20:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 23:20:28 2007
Subject: [Frugalware-git] frugalware-current: gcc-4.2.2-1-i686
Message-ID: <20071013212026.5A74513A4002@genesis.frugalware.org>

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

commit 681b6ce0278ff6f649bc7b48c9e6f318f3a6a311
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 23:19:34 2007 +0200

gcc-4.2.2-1-i686
version bump

diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index 6cc32d6..ce04e66 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=gcc
-pkgver=4.2.1
-pkgrel=3
+pkgver=4.2.2
+pkgrel=1
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
depends=('binutils>=2.17.50.0.18' 'libstdc++')
From janny at frugalware.org  Sat Oct 13 23:32:26 2007
From: janny at frugalware.org (janny)
Date: Sat Oct 13 23:32:28 2007
Subject: [Frugalware-git] 
	frugalware-current: teamspeak-client-2.0.32.60-1-i686
Message-ID: <20071013213226.078ED13A4002@genesis.frugalware.org>

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

commit 45e6299f04c92a4e6d1a7b1c7216189f24a1c5a9
Author: janny <janny@frugalware.org>
Date:   Sat Oct 13 23:30:56 2007 +0200

teamspeak-client-2.0.32.60-1-i686
version bump

diff --git a/source/xapps-extra/teamspeak-client/FrugalBuild b/source/xapps-extra/teamspeak-client/FrugalBuild
index a9e5567..1f1d97d 100644
--- a/source/xapps-extra/teamspeak-client/FrugalBuild
+++ b/source/xapps-extra/teamspeak-client/FrugalBuild
@@ -31,9 +31,11 @@ build()
Fln /usr/lib/teamspeak/TeamSpeak $_root/usr/bin/teamspeak
Ffilerel icon.xpm /usr/share/pixmaps/teamspeak.xpm
if [ "$CARCH" == "x86_64" ]; then
-	    Fdesktop "emul32 /usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;"
+	   Fdesktop "emul32 /usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;"
else
-	    Fdesktop "/usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;"
+	   Fdesktop "/usr/bin/teamspeak" "teamspeak.xpm" "Application;Audio;"
+	fi
+	if [ "$CARCH" == "x86_64" ]; then
+		unset _root
fi
-	[ "$CARCH" == "x86_64" ] && unset _root
}
From vmiklos at frugalware.org  Sat Oct 13 23:58:46 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sat Oct 13 23:58:49 2007
Subject: [Frugalware-git] frugalware-current: git-1.5.3.4-3-i686
Message-ID: <20071013215846.ECDBA13A4002@genesis.frugalware.org>

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

commit 80018945a1042779536d65bb15975106e4bdc535
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sat Oct 13 23:58:25 2007 +0200

git-1.5.3.4-3-i686
oops, fix duplicated rc script

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index 571f4c2..10694e8 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=git
pkgver=1.5.3.4
Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2
-pkgrel=2
+pkgrel=3
pkgdesc="A fast, scalable, distributed revision control system."
url="http://www.kernel.org/pub/software/scm/git/"
depends=('curl>=7.16.0' 'openssl')
@@ -74,12 +74,11 @@ build()
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
+	Fsplit gitweb /etc/{httpd,gitweb.conf} /var
Fdoc README.Frugalware

# git-daemon
Ffile git.sysconfig /etc/sysconfig/git
-	Fexe /etc/rc.d/rc.git

# git-gui
Fsplit git-gui usr/bin/git-{gui,citool}
From crazy at frugalware.org  Sun Oct 14 00:07:02 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 00:07:05 2007
Subject: [Frugalware-git] frugalware-current: sdl_mixer-1.2.8-1-i686
Message-ID: <20071013220702.5CE1513A4002@genesis.frugalware.org>

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

commit 43c92d7135d7817cc4373bddc9f976b0ecfba98f
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 00:03:26 2007 +0200

sdl_mixer-1.2.8-1-i686
* Version bump
* use _F_cd_path

diff --git a/source/xlib-extra/sdl_mixer/FrugalBuild b/source/xlib-extra/sdl_mixer/FrugalBuild
index 6ee0538..cbae1d3 100644
--- a/source/xlib-extra/sdl_mixer/FrugalBuild
+++ b/source/xlib-extra/sdl_mixer/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=sdl_mixer
realname=SDL_mixer
-pkgver=1.2.7
+pkgver=1.2.8
pkgrel=1
pkgdesc="SDL Mixer library"
url="http://www.libsdl.org/projects/SDL_mixer/"
@@ -12,13 +12,7 @@ groups=('xlib-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.libsdl.org/projects/$realname/|grep /$realname-.*tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'"
source=(http://www.libsdl.org/projects/$realname/release/$realname-$pkgver.tar.gz)
-
-build()
-{
-	Fcd $realname-$pkgver
-	Fbuild
-}
+_F_cd_path="$realname-$pkgver"
+sha1sums=('7fa56d378f9ca53434f9470aeb2997ad84a348c6')

# optimization OK
-
-sha1sums=('42b351360ea9debb2bec23e7e67ba355ec3762a9')
From janny at frugalware.org  Sun Oct 14 00:11:08 2007
From: janny at frugalware.org (janny)
Date: Sun Oct 14 00:11:12 2007
Subject: [Frugalware-git] frugalware-current: squirrelmail-1.4.11-1-i686
Message-ID: <20071013221108.87A5A13A4002@genesis.frugalware.org>

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

commit f39482cd2e30d71b5bd8dca4b52328f88e15c0fb
Author: janny <janny@frugalware.org>
Date:   Sun Oct 14 00:10:28 2007 +0200

squirrelmail-1.4.11-1-i686
version bump

diff --git a/source/network-extra/squirrelmail/FrugalBuild b/source/network-extra/squirrelmail/FrugalBuild
index 9c8e598..3e96671 100644
--- a/source/network-extra/squirrelmail/FrugalBuild
+++ b/source/network-extra/squirrelmail/FrugalBuild
@@ -3,9 +3,9 @@
# Contributor: Kapolnasi Tamas <ktamas@tdc.hu>

pkgname=squirrelmail
-pkgver=1.4.10
-pkgextraver=a
-pkgrel=2
+pkgver=1.4.11
+pkgextraver=
+pkgrel=1
pkgdesc="SquirrelMail is a standards-based webmail package written in PHP"
rodepends=('php' 'php-pear-db')
backup=(var/www/squirrelmail/config/config.php \
@@ -16,7 +16,7 @@ _F_sourceforge_ext=$pkgextraver.tar.gz
Finclude sourceforge
up2date="lynx -dump http://www.squirrelmail.org/download.php|grep 'squirrelmail-'|sed -n 's/.*squirrelmail-\(.*\)\.t.*/\1/; 1 p' |sed s/$pkgextraver//"
source=($source README.Frugalware)
-sha1sums=('fd0a29d4d105d2b1a4713b286cc3bf15c20a1345'\
+sha1sums=('1f662e71efb1fd9ff7322672aae8faeb6c6df140' \
'1bfe33f98b235076efc97764d8b0224fb1141f65')

build()
From vmiklos at frugalware.org  Sun Oct 14 00:28:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 00:28:39 2007
Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.72-6-i686
Message-ID: <20071013222837.A2CC713A4002@genesis.frugalware.org>

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

commit 1332b6c89f13204eb354dcd6d264fd6a3773c0a0
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 00:28:23 2007 +0200

java-gcj-compat-1.0.72-6-i686
rebuilt with gcj-4.2.2

diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild
index dcb1de4..099ccf2 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=5
-gccver=4.2.1
+pkgrel=6
+gccver=4.2.2
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 vmiklos at frugalware.org  Sun Oct 14 00:53:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 00:53:39 2007
Subject: [Frugalware-git] frugalware-current: frugalpkg-1.1-2-i686
Message-ID: <20071013225337.5840B13A4002@genesis.frugalware.org>

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

commit ab1febf2f66b25700642378ff2adb7ccfecb2982
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 00:53:31 2007 +0200

frugalpkg-1.1-2-i686
bin, replaced by gfpm

diff --git a/source/xapps/frugalpkg/FrugalBuild b/source/xapps/frugalpkg/FrugalBuild
deleted file mode 100644
index 49ec893..0000000
--- a/source/xapps/frugalpkg/FrugalBuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Compiling Time: 0.02 SBU
-# Maintainer: BMH1980 <bmh1980@frugalware.org>
-
-pkgname=frugalpkg
-pkgver=1.1
-pkgrel=2
-pkgdesc="Graphical frontend to pacman"
-url="http://ftp.frugalware.org/pub/other/frugalpkg"
-depends=('pacman-g2' 'pygtk' 'shared-mime-info')
-makedepends=('desktop-file-utils' 'python-tools')
-groups=('xapps')
-archs=('i686' 'x86_64')
-up2date="lynx -dump $url|Flasttar"
-source=($url/$pkgname-$pkgver.tar.gz)
-sha1sums=('e514eaf749ef122289dc7a860630d677c7e21547')
-license="GPL2"
-install=$pkgname.install
-conflicts=('kde-frugalware-menu')
-
-build()
-{
-	Fsed "$pkgname.glade" "/usr/share/$pkgname/$pkgname.glade" $pkgname.py
-	Fsed "doc/help.html" "/usr/share/doc/$pkgname-$pkgver/help.html" \
-		$pkgname.py
-	Fsed "$pkgname.png" "/usr/share/icons/hicolor/48x48/apps/$pkgname.png" \
-		$pkgname.py
-	Fmkdir /usr/bin /usr/share/doc/$pkgname-$pkgver/html_data \
-	       /usr/share/mimelnk/applications /usr/share/applications/kde \
-	       /usr/share/icons/{crystalsvg,hicolor}/48x48/{apps,mimetypes} \
-	       /usr/share/$pkgname /usr/share/mime/packages \
-	       /usr/share/locale/{de_DE,hu_HU}/LC_MESSAGES
-	Fexerel $pkgname.py /usr/bin/$pkgname
-	Ffilerel /usr/share/$pkgname/$pkgname.glade
-	Ffilerel menu/gnome-$pkgname.desktop \
-		/usr/share/applications/$pkgname.desktop
-	Ffilerel menu/kde-$pkgname.desktop \
-		/usr/share/applications/kde/$pkgname.desktop
-	Fdocrel doc/help.html
-	Ffilerel doc/html_data/*.png /usr/share/doc/$pkgname-$pkgver/html_data/
-	Ffilerel mime/$pkgname.xml /usr/share/mime/packages/
-	Ffilerel mime/x-fpm.desktop /usr/share/mimelnk/applications/
-	Ffilerel icons/$pkgname.png \
-		/usr/share/icons/crystalsvg/48x48/apps/$pkgname.png
-	Ffilerel icons/$pkgname.png \
-		/usr/share/icons/hicolor/48x48/apps/$pkgname.png
-	Ffilerel icons/gtk-$pkgname.png \
-		/usr/share/icons/hicolor/48x48/mimetypes/gnome-mime-application-frugalware-package.png
-	Ffilerel icons/kde-$pkgname.png \
-		/usr/share/icons/crystalsvg/48x48/mimetypes/fpm.png
-	msgfmt.py -o $Fdestdir/usr/share/locale/de_DE/LC_MESSAGES/$pkgname.mo \
-		po/de.po || return 1
-	msgfmt.py -o $Fdestdir/usr/share/locale/hu_HU/LC_MESSAGES/$pkgname.mo \
-		po/hu.po || return 1
-}
-
-# optimalization ok - noarch
-
-# vim: ft=sh
diff --git a/source/xapps/frugalpkg/frugalpkg.install b/source/xapps/frugalpkg/frugalpkg.install
deleted file mode 100644
index 748133b..0000000
--- a/source/xapps/frugalpkg/frugalpkg.install
+++ /dev/null
@@ -1,32 +0,0 @@
-post_install()
-{
-	echo -n "updating desktop database..."
-	if update-desktop-database > /dev/null 2>&1 ; then
-		echo " done."
-	else
-		echo " failed."
-	fi
-	echo -n "updating mime database..."
-	if update-mime-database /usr/share/mime > /dev/null 2>&1 ; then
-		echo " done."
-	else
-		echo " failed."
-	fi
-}
-
-post_upgrade()
-{
-	post_install
-}
-
-post_remove()
-{
-	post_install
-}
-
-op=$1
-shift
-
-$op $*
-
-# vim: ft=sh
From vmiklos at frugalware.org  Sun Oct 14 01:14:53 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 01:14:55 2007
Subject: [Frugalware-git] bitlbee-skype: doc: update about group/public chats
Message-ID: <20071013231453.8B48B13A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=3adf6cb8a2387729369248f3e4e45d89b8155858

commit 3adf6cb8a2387729369248f3e4e45d89b8155858
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 01:12:56 2007 +0200

doc: update about group/public chats

diff --git a/README b/README
index 3445b0f..46af4f4 100644
--- a/README
+++ b/README
@@ -203,7 +203,9 @@ your VNC server regularly. (How ugly.)

- Notice if foo invites bar. Currently you can see only that bar joined.

-- Are there public named chats for Skype? If yes, they are not supported ATM.
+- Public chats. See link:http://forum.skype.com/index.php?showtopic=98872[this
+  forum thread], it is still unclear how could it be done for you to be able to
+  `/join` to a public chat..

== I would like to have support for ...

@@ -217,7 +219,9 @@ then it would be nice to include them here.

== Known bugs

-- None at this time.
+- When you join start a group chat, a warning is shown saying creating the
+  group chat is failed. Indeed it is created. I should improve the API to be
+  able to suppress that warning.

== Screenshots
From vmiklos at frugalware.org  Sun Oct 14 01:20:06 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 01:20:11 2007
Subject: [Frugalware-git] pacman-tools: repoman: create tmp files in ~
Message-ID: <20071013232006.2BCEF13A4002@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=650c02656928d2de288c0c67159c7c424e5ace31

commit 650c02656928d2de288c0c67159c7c424e5ace31
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 01:19:45 2007 +0200

repoman: create tmp files in ~
this is necessary in case /tmp is smaller than the fpm to be uploaded
thanks crazy for reporting this bug

diff --git a/repoman b/repoman
index 4878460..25703c4 100755
--- a/repoman
+++ b/repoman
@@ -113,7 +113,7 @@ upload()
do
name=`basename $src`
msg "Requesting a temporary file"
-		tmp=`ssh $host mktemp 2>/dev/null`
+		tmp=`ssh $host mktemp -p ~ 2>/dev/null`
msg "Uploading file: $src (to $tmp)"
scp $src $host:$tmp
if echo "`sha1sum $src|sed 's/\(.*\)  .*/\1/'`  $tmp" |ssh $host sha1sum -c - >/dev/null 2>&1; then
From crazy at frugalware.org  Sun Oct 14 01:41:18 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 01:41:21 2007
Subject: [Frugalware-git] frugalware-current: wesnoth-1.2.7-1-i686
Message-ID: <20071013234118.4366013A4002@genesis.frugalware.org>

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

commit 52309ea7524f154177c6206db0a1b1a5e3035546
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 00:29:39 2007 +0200

wesnoth-1.2.7-1-i686
* [SEC] version bump
* fixed depends
* closes #2486 in -current

diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild
index a542394..a3a2047 100644
--- a/source/games-extra/wesnoth/FrugalBuild
+++ b/source/games-extra/wesnoth/FrugalBuild
@@ -2,12 +2,12 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=wesnoth
-pkgver=1.2.6
+pkgver=1.2.7
pkgrel=1
pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world"
url="http://www.wesnoth.org/"
-depends=('sdl' 'sdlimage' 'sdl_net' 'sdl_mixer' 'libpng' 'libjpeg' 'libogg' \
-	'vorbis-tools' 'freetype2')
+depends=('sdl' 'sdlimage' 'sdl_net' 'sdl_mixer>=1.2.8' 'libpng' 'libjpeg' 'libogg' \
+	'vorbis-tools' 'freetype2' 'python-tools' 'fribidi')
groups=('games-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep stable|sed 's/.* \([^ ]*\) (.*/\1/;q'"
@@ -15,6 +15,6 @@ source=(http://www.wesnoth.org/files/$pkgname-$pkgver.tar.bz2)
Fconfopts="$Fconfopts --enable-server --enable-editor --enable-tools \
--enable-campaing-server --with-kde --with-gnome \
--with-fifodir=/var/run/wesnothd"
-sha1sums=('09c531f77856387239c94fc2c3e2f0b07f30dc32')
+sha1sums=('04ebdda9fe7ed8d728343331e2d37fe01f12ad16')

# optimization OK
From vmiklos at frugalware.org  Sun Oct 14 01:45:50 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 01:45:52 2007
Subject: [Frugalware-git] frugalware-current: docs/po4a.cfg: added dk to
	po4a_langs
Message-ID: <20071013234550.2E4B113A4002@genesis.frugalware.org>

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

commit bffae512454f50ba839b34262140e16da8a15928
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 01:45:33 2007 +0200

docs/po4a.cfg: added dk to po4a_langs

diff --git a/docs/po4a.cfg b/docs/po4a.cfg
index b2552e9..4685fa5 100644
--- a/docs/po4a.cfg
+++ b/docs/po4a.cfg
@@ -7,7 +7,7 @@
# translating developer-ralted documents.

# language list
-[po4a_langs] hu fr
+[po4a_langs] hu fr dk
[po4a_paths] po/docs.pot $lang:po/$lang.po
# alias
[po4a_alias: simpletext] text opt:"-o nobullets"
From crazy at frugalware.org  Sun Oct 14 02:09:23 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 02:09:27 2007
Subject: [Frugalware-git] frugalware-current: hal-0.5.9.1-2-i686
Message-ID: <20071014000923.9AF3E13A4002@genesis.frugalware.org>

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

commit 852b6f2265b27cde71e5eb8ae59e352cd95da8a5
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 01:56:58 2007 +0200

hal-0.5.9.1-2-i686
* url , up2date , source fix

diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild
index f1cfe58..636a247 100644
--- a/source/apps/hal/FrugalBuild
+++ b/source/apps/hal/FrugalBuild
@@ -6,7 +6,7 @@ pkgname=hal
pkgver=0.5.9.1
pkgrel=2
pkgdesc="Hardware Abstraction Layer"
-url="http://freedesktop.org/wiki/Software_2fhal"
+url="http://www.freedesktop.org/wiki/Software/hal"
depends=('dbus-glib>=0.71' 'udev>=100' 'glib2' 'libcap' 'dbus>=1.0.0' \
'libusb' 'popt' 'pciutils' 'parted>=1.8.8' 'shadow>=4.0.18.1-2' \
'dmidecode' 'usbutils' 'zlib')
@@ -16,8 +16,8 @@ groups=('apps')
replaces=('submount')
options=('scriptlet')
archs=('i686' 'x86_64')
-up2date="lynx -dump 'http://people.freedesktop.org/~david/dist/?C=M;O=A'|grep -v 'hal-info'|grep -v 'gnome'|grep -v PolicyKit|Flasttar"
-source=(http://freedesktop.org/~david/dist/$pkgname-$pkgver.tar.gz \
+up2date="lynx -dump 'http://hal.freedesktop.org/releases/?C=M;O=A'|grep -v 'hal-info'|grep -v 'gnome'|grep -v PolicyKit|Flasttar"
+source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \
rc.hald \
hal.conf.in.patch \
hal-device-manager.desktop \
From crazy at frugalware.org  Sun Oct 14 02:09:23 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 02:09:30 2007
Subject: [Frugalware-git] frugalware-current: hal-info-20070618-1-i686
Message-ID: <20071014000923.E0D1E1678009@genesis.frugalware.org>

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

commit cd997a61261f37488c7126fac45b20fd4ec7bb6b
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 02:05:14 2007 +0200

hal-info-20070618-1-i686
* url , up2date , source fix

diff --git a/source/apps/hal-info/FrugalBuild b/source/apps/hal-info/FrugalBuild
index 32e63f3..88dbf79 100644
--- a/source/apps/hal-info/FrugalBuild
+++ b/source/apps/hal-info/FrugalBuild
@@ -5,12 +5,12 @@ pkgname=hal-info
pkgver=20070618
pkgrel=1
pkgdesc="hal-info contains device information for HAL."
-url="http://freedesktop.org/wiki/Software_2fhal"
+url="http://www.freedesktop.org/wiki/Software/hal"
depends=()
groups=('apps')
archs=('i686' 'x86_64')
-up2date="lynx -dump 'http://people.freedesktop.org/~david/dist/?C=M;O=A'|grep 'hal-info-\(.*\).tar.gz'|Flasttar"
-source=(http://freedesktop.org/~david/dist/$pkgname-$pkgver.tar.gz)
+up2date="lynx -dump 'http://hal.freedesktop.org/releases/?C=M;O=A'|grep 'hal-info-\(.*\).tar.gz'|Flasttar"
+source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
## brr broken p*** of c****
Fconfopts="$Fconfopts --datarootdir=/usr/share --datadir=/usr/share"
sha1sums=('0b586373cdf425180c9fe803b576fd7ca86c07c4')
From vmiklos at frugalware.org  Sun Oct 14 03:16:44 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 03:16:48 2007
Subject: [Frugalware-git] pacman-tools: updates for 1.0.1
Message-ID: <20071014011644.6DF9A13A4002@genesis.frugalware.org>

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

commit e76cc707a67240a84e80198c9d450cf9479f85bf
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 03:16:40 2007 +0200

updates for 1.0.1

diff --git a/Makefile b/Makefile
index 147efe1..5d28f67 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#

-VERSION = 1.0.0
+VERSION = 1.0.1

CFLAGS ?= -Wall -Werror -g -O2 -pipe
CFLAGS += $(shell pkg-config --cflags libxml-2.0)
diff --git a/NEWS b/NEWS
index 8ffa597..b8e46f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
VERSION         DESCRIPTION
-----------------------------------------------------------------------------
+1.0.1         - converted documentation to asciidoc
+              - added several new manpage, now every command have to have one
+              - new command: syncpkg-shell
+              - minor bugfix in repoman
1.0.0         - dg push now pushes tags, too
- dg pull now uses fetch + rebase instead of pull
- dg rec: support for packed refs (git gc v1.5.3 uses them)
From vmiklos at frugalware.org  Sun Oct 14 03:16:54 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 03:16:55 2007
Subject: [Frugalware-git] pacman-tools: TAG 1.0.1
Message-ID: <20071014011654.4250213A4002@genesis.frugalware.org>

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

commit c08febb23d0c8c546c479445441287faf773822b
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 03:16:51 2007 +0200

TAG 1.0.1
From vmiklos at frugalware.org  Sun Oct 14 03:27:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 03:27:28 2007
Subject: [Frugalware-git] frugalware-current: pacman-tools-1.0.1-1-i686
Message-ID: <20071014012726.2C25613A4002@genesis.frugalware.org>

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

commit b731875854ec43f5de14df86017191a0f7024920
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 03:26:03 2007 +0200

pacman-tools-1.0.1-1-i686
version bump
woho, 19 new manpages! :)

diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild
index 273f313..84da961 100644
--- a/source/devel/pacman-tools/FrugalBuild
+++ b/source/devel/pacman-tools/FrugalBuild
@@ -2,12 +2,12 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=pacman-tools
-pkgver=1.0.0
+pkgver=1.0.1
pkgrel=1
pkgdesc="Tools for developers for managing packages"
url="http://ftp.frugalware.org/pub/other/pacman-tools"
depends=('bash' 'perl' 'pacman-g2>=3.5.1' 'wget' 'python' 'libxml2' 'glib2')
-makedepends=('help2man' 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common')
+makedepends=('asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common')
groups=('devel' 'devel-core')
archs=('i686' 'x86_64' 'ppc')
backup=(etc/{genchangelog,repoman}.conf etc/syncpkg{cd/c,d/d,d/ctl}config.py)
From crazy at frugalware.org  Sun Oct 14 05:48:58 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 05:49:00 2007
Subject: [Frugalware-git] frugalware-current: glib2-2.14.1-5-i686
Message-ID: <20071014034858.497FD1688018@genesis.frugalware.org>

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

commit aa7aab71dde2d147966092bee4513640a6a2d4a6
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 05:43:11 2007 +0200

glib2-2.14.1-5-i686
* release bump
* debug is on again ( watch for broken apps )
* moved docs to an own subpkg

diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild
index a8e6c1d..381e4ce 100644
--- a/source/base/glib2/FrugalBuild
+++ b/source/base/glib2/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=glib2
pkgver=2.14.1
-pkgrel=4
+pkgrel=5
pkgdesc="Common C routines used by GTK+2 and other libraries"
url="http://www.gtk.org/"
depends=('glibc')
@@ -20,11 +20,7 @@ source=($source \
glib2-bug479724.patch \
glib-cast.patch)
_F_cd_path="glib-$pkgver"
-## DON'T remove nor change the debug level or it breaks again .. ## --enable-debug=yes #
-## Gnome segfaults all over the place with debug , remover for rc2 , maybe for stable.
-## NOTE: there is still a way to debug even with debug enabled :
-## http://library.gnome.org/devel/glib/unstable/glib-running.html
-Fconfopts="$Fconfopts --enable-gtk-doc --enable-static --with-threads=posix"
+## DON'T remove nor change the debug level or it breaks again ..
sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8' \
'0c6723a3af0c19c735014071d59751ca138d28f8' \
'd5294900ed3ee713ee0472a8f05fd9286d2a5690' \
@@ -33,4 +29,20 @@ sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8' \
# Don't touch that
export CFLAGS="$CFLAGS -fno-strict-aliasing"

+subpkgs=("$pkgname-docs")
+subdescs=("Glib2 Documentation")
+subdepends=()
+subgroups=('gnome-extra')
+subarchs=('i686 x86_64')
+
+build()
+{
+	Fbuild \
+		--enable-gtk-doc \
+		--enable-static \
+		--with-threads=posix \
+		--enable-debug=yes
+	Fsplit $pkgname-docs usr/share/gtk-doc
+}
+
# optimization OK
From crazy at frugalware.org  Sun Oct 14 06:41:52 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 06:41:54 2007
Subject: [Frugalware-git] frugalware-current: gtk+2-2.12.0-3-i686
Message-ID: <20071014044152.27AFA1678009@genesis.frugalware.org>

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

commit 2583f39d39dcb8badda9b25e14a5e5114712c248
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 06:35:34 2007 +0200

gtk+2-2.12.0-3-i686
* release bump
* minore changes to build()
* docs moved to an own subpackage

diff --git a/source/gnome/gtk+2/FrugalBuild b/source/gnome/gtk+2/FrugalBuild
index cb3685a..d6f4084 100644
--- a/source/gnome/gtk+2/FrugalBuild
+++ b/source/gnome/gtk+2/FrugalBuild
@@ -4,11 +4,11 @@
pkgname=gtk+2
_F_gnome_name=gtk+
pkgver=2.12.0
-pkgrel=2
+pkgrel=3
pkgdesc="The GTK+ Toolkit (2.x series)"
url="http://www.gtk.org/"
depends=('libtiff' 'atk>=1.20.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \
-	 'pango>=1.18.2' 'cairo>=1.4.0' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.14.1-3' \
+	 'pango>=1.18.2' 'cairo>=1.4.0' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.14.1-5' \
'libcups' 'libx11' 'libtiff' 'libpng')
rodepends=('gnome-icon-theme')
groups=('gnome' 'gnome-core')
@@ -35,6 +35,11 @@ source=($source \
# http://bugzilla.gnome.org/show_bug.cgi?id=456137
# http://bugzilla.gnome.org/show_bug.cgi?id=479197

+subpkgs=("$pkgname-docs")
+subdescs=("GTK+2 Documentation")
+subdepends=()
+subgroups=('gnome-extra')
+subarchs=('i686 x86_64')


build() {
@@ -43,9 +48,12 @@ build() {
--with-xinput=yes \
--enable-gtk-doc \
--with-gdktarget=x11 \
-		--with-libpng
+		--with-libpng \
+		--disable-dependency-tracking \
+		--with-x
Fmkdir /etc/gtk-2.0
-	echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie
+	echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie
+	Fsplit $pkgname-docs usr/share/gtk-doc
}

sha1sums=('f5ecbf73a789a8880a6b2e15279267bb113980e2' \
From crazy at frugalware.org  Sun Oct 14 07:07:10 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 07:07:12 2007
Subject: [Frugalware-git] frugalware-current: glibmm-2.14.1-2-i686
Message-ID: <20071014050710.410481688018@genesis.frugalware.org>

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

commit a1d824a9cd7bfa24707e33f404c3d7153d8db1e2
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 07:02:07 2007 +0200

glibmm-2.14.1-2-i686
* fixed strict-aliasing bug
* rebuild with glib2
* moved docs to an own subpackage

diff --git a/source/lib/glibmm/FrugalBuild b/source/lib/glibmm/FrugalBuild
index 12a215a..b030b75 100644
--- a/source/lib/glibmm/FrugalBuild
+++ b/source/lib/glibmm/FrugalBuild
@@ -3,13 +3,25 @@

pkgname=glibmm
pkgver=2.14.1
-pkgrel=1
+pkgrel=2
pkgdesc="C++ interface for glib2"
url="http://www.gnome.org/"
-depends=('libsigc++2' 'glib2>=2.14.1')
+depends=('libsigc++2' 'glib2>=2.14.1-5')
groups=('lib')
archs=('i686' 'x86_64')
Finclude gnome
sha1sums=('aa6125f8967c5852f378c1997f4482b46b5c4282')
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"

+subpkgs=("$pkgname-docs")
+subdescs=("Glibmm Documentation")
+subdepends=()
+subgroups=('lib-extra')
+subarchs=('i686 x86_64')
+
+build()
+{
+	Fbuild
+	Fsplit $pkgname-docs usr/share/doc
+}
# optimization OK
From crazy at frugalware.org  Sun Oct 14 07:30:39 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 07:30:42 2007
Subject: [Frugalware-git] frugalware-current: gtkmm-2.12.1-2-i686
Message-ID: <20071014053039.E47011678009@genesis.frugalware.org>

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

commit 188c31e228554294e7f4f4d6b2fabbe913a14bd6
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 07:22:35 2007 +0200

gtkmm-2.12.1-2-i686
* fixed strict-aliasing bug
* rebuild with glibmm
* moved docs to an own subpackage

diff --git a/source/gnome/gtkmm/FrugalBuild b/source/gnome/gtkmm/FrugalBuild
index a50480d..16884e5 100644
--- a/source/gnome/gtkmm/FrugalBuild
+++ b/source/gnome/gtkmm/FrugalBuild
@@ -3,14 +3,28 @@

pkgname=gtkmm
pkgver=2.12.1
-pkgrel=1
+pkgrel=2
pkgdesc="C++ interface for GTK+2"
url="http://www.gnome.org/"
-depends=('glibmm>=2.14.1' 'gtk+2' 'cairomm>=1.4.2')
+depends=('glibmm>=2.14.1-2' 'gtk+2>=2.12.0-3' 'cairomm>=1.4.2')
groups=('gnome')
archs=('i686' 'x86_64')
Finclude gnome
Fconfopts="$Fconfopts --disable-examples --disable-demos"
sha1sums=('9f20a32b2e0a3c43efb5732a0917db69ac9493a9')

+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
+subpkgs=("$pkgname-docs")
+subdescs=("Gtkmm Documentation")
+subdepends=()
+subgroups=('gnome-extra')
+subarchs=('i686 x86_64')
+
+build()
+{
+        Fbuild
+        Fsplit $pkgname-docs usr/share/doc
+}
+
# optimization OK
From priyank at frugalware.org  Sun Oct 14 09:17:50 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 09:17:57 2007
Subject: [Frugalware-git] gfpm: indentation fixes
Message-ID: <20071014071750.852C31678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=914ae874fd6a14378f95821296d851534c3d1dc8

commit 914ae874fd6a14378f95821296d851534c3d1dc8
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 12:37:02 2007 +0530

indentation fixes

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index ef5c108..843aaa3 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -1102,25 +1102,25 @@ gfpm_trans_commit (PM_LIST *list)
case PM_CONFLICT_TYPE_FILE:
{
gchar* cstr = g_strdup_printf ("%s: /%s",
-															(char*)pacman_conflict_getinfo (cnf, PM_CONFLICT_TARGET),
-															(char*)pacman_conflict_getinfo (cnf, PM_CONFLICT_FILE));
+											(char*)pacman_conflict_getinfo (cnf, PM_CONFLICT_TARGET),
+											(char*)pacman_conflict_getinfo (cnf, PM_CONFLICT_FILE));
pkgs = g_list_append (pkgs, cstr);
}
}
}
gfpm_plist_message (_("Conflicting Files"),
-									_("The file(s) provided by the following package(s) already exist on the system"),
-									GTK_MESSAGE_WARNING,
-									pkgs);
+						_("The file(s) provided by the following package(s) already exist on the system"),
+						GTK_MESSAGE_WARNING,
+						pkgs);
}
case PM_ERR_PKG_CORRUPTED:
{
for (i=pacman_list_first(list);i;i=pacman_list_next(i))
pkgs = g_list_append (pkgs, g_strdup (pacman_list_getdata(i)));
gfpm_plist_message (_("Corrupted package(s)"),
-									_("The package(s) you're trying to install are corrupted"),
-									GTK_MESSAGE_ERROR,
-									pkgs);
+							_("The package(s) you're trying to install are corrupted"),
+							GTK_MESSAGE_ERROR,
+							pkgs);
}
}
return -1;
From priyank at frugalware.org  Sun Oct 14 09:17:50 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 09:17:59 2007
Subject: [Frugalware-git] gfpm: gfpm_icmonitor
Message-ID: <20071014071750.BD2C5167800A@genesis.frugalware.org>

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

commit cce3bd3d4a81e77500736c89d969b4e2c4e0f76b
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 12:45:37 2007 +0530

gfpm_icmonitor
* gfpm_icmonitor_monitor(): If the monitor finds that something was changed, immediately terminate the monitor

diff --git a/src/gfpm-icmonitor.c b/src/gfpm-icmonitor.c
index ce4ad03..360f7ca 100644
--- a/src/gfpm-icmonitor.c
+++ b/src/gfpm-icmonitor.c
@@ -78,7 +78,8 @@ gfpm_icmonitor_monitor (void)
case IN_MODIFY:
{
changed = TRUE;
-				return TRUE;
+				stop = TRUE;
+				return FALSE;
break;
}
default:
From vmiklos at frugalware.org  Sun Oct 14 15:23:01 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 15:23:06 2007
Subject: [Frugalware-git] frugalware-current: foo2zjs-2007_10_12-1-i686
Message-ID: <20071014132301.3BFE81678009@genesis.frugalware.org>

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

commit 3392690beac75ed7ce61e65e5aaefc29b098a86c
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 15:22:46 2007 +0200

foo2zjs-2007_10_12-1-i686
- version bump
- i just wanted to relbump it, but the source tarball is not versioned

diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild
index f6e4a42..01c2a7d 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_10_11
+pkgver=2007_10_12
pkgrel=1
pkgdesc="A linux printer driver for ZjStream protocol"
url="http://foo2zjs.rkkda.com/"
@@ -39,6 +39,6 @@ build() {
Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver
}

-sha1sums=('238129a6e2a4f7205d263a2a803822043d846ad6' \
+sha1sums=('b63fe31485ce217cd7f34868254ae2979f40c4d3' \
'7b89eae53167a7ebef0cd9f7f405f2a787e3d13c')
# optimization OK
From priyank at frugalware.org  Sun Oct 14 15:34:08 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 15:34:12 2007
Subject: [Frugalware-git] homepage-ng: small typo fix in 0.7 release
	announcement
Message-ID: <20071014133408.721F71678009@genesis.frugalware.org>

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

commit 6c217ea85952c7d75d6c22dc01c70f2c5fc8a397
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 19:02:16 2007 +0530

small typo fix in 0.7 release announcement

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index df408cd..df0b1de 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -77,7 +77,7 @@
<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-usb.tar.gz">usb</a>,
<a href="/download/frugalware-0.7-iso/fwchroot-0.7-x86_64.tar.bz2">chroot tarball</a>
<br />
-			<b>NOTE</b>: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection.<br />
+			<b>NOTE</b>: Don't download CDs 3-13 or the second DVD unless you don't have an internet connection.<br />
SHA1SUMs:
<pre>
11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
From hermier at frugalware.org  Sun Oct 14 15:45:25 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Sun Oct 14 15:45:27 2007
Subject: [Frugalware-git] homepage-ng: Fir typo, we have 13 CDs now.
Message-ID: <20071014134525.B714F1678009@genesis.frugalware.org>

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

commit 26f958a6b36fb479503eb9ce163304adbbd37c60
Author: Michel Hermier <hermier@frugalware.org>
Date:   Sun Oct 14 15:45:19 2007 +0200

Fir typo, we have 13 CDs now.

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index 324c9c0..2f74540 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -77,7 +77,7 @@
<a href="/download/frugalware-0.7-iso/frugalware-0.7-x86_64-usb.tar.gz">usb</a>,
<a href="/download/frugalware-0.7-iso/fwchroot-0.7-x86_64.tar.bz2">chroot tarball</a>
<br />
-			<b>NOTE</b>: Ne tÊlÊchargez pas les CD 3 à 12, ou le deuxième DVD à moins que vous n'ayez pas de connexion internet !!!<br />
+			<b>NOTE</b>: Ne tÊlÊchargez pas les CD 3 à 13, ou le deuxième DVD à moins que vous n'ayez pas de connexion internet.<br />
SHA1SUMs:
<pre>
11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
From crazy at frugalware.org  Sun Oct 14 17:15:06 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 17:15:09 2007
Subject: [Frugalware-git] frugalware-current: eog-2.20.0-2-i686
Message-ID: <20071014151506.4E85B1678009@genesis.frugalware.org>

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

commit 72b0ed2d88e13ac45b17b373d1ac401de5e27bf7
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 17:09:33 2007 +0200

eog-2.20.0-2-i686
* relbump
* fixed depends/makedepends so we get pythong support again
* killed off 'gdk-pixbuf' from depends while isn't
* addeed missing _F_gnome*

diff --git a/source/gnome/eog/FrugalBuild b/source/gnome/eog/FrugalBuild
index e794cb9..591355a 100644
--- a/source/gnome/eog/FrugalBuild
+++ b/source/gnome/eog/FrugalBuild
@@ -3,17 +3,18 @@

pkgname=eog
pkgver=2.20.0
-pkgrel=1
+pkgrel=2
pkgdesc="An image viewing and cataloging program for GNOME"
url="http://www.gnome.org/"
depends=('libexif' 'libgnomeui>=2.20.0' 'rarian' 'desktop-file-utils' \
-	 'gnome-desktop>=2.20.0' 'lcms')
-makedepends=('intltool' 'gdk-pixbuf' 'libart_lgpl' 'gnome-doc-utils>=0.10.3')
+	 'gnome-desktop>=2.20.0' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl')
+makedepends=('intltool' 'gnome-doc-utils>=0.10.3')
groups=('gnome')
archs=('i686' 'x86_64')
_F_gnome_schemas=('/etc/gconf/schemas/eog.schemas')
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
+_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet

sha1sums=('c20a3ada9d8d0a8b4c3d2db462b630666b9ee5d7')
From priyank at frugalware.org  Sun Oct 14 17:21:10 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 17:21:12 2007
Subject: [Frugalware-git] frugalware-current: inotify-tools-3.11-1-i686
Message-ID: <20071014152110.150D2167800A@genesis.frugalware.org>

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

commit c7820177b4a904c649265dd1906e66bee7fcba91
Author: Priyank <priyank@frugalware.org>
Date:   Sun Oct 14 20:49:03 2007 +0530

inotify-tools-3.11-1-i686
* Moved to apps (required by Gfpm)
* New maintainer

diff --git a/source/apps/inotify-tools/FrugalBuild b/source/apps/inotify-tools/FrugalBuild
new file mode 100644
index 0000000..200cce8
--- /dev/null
+++ b/source/apps/inotify-tools/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0.02 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=inotify-tools
+pkgver=3.11
+pkgrel=1
+pkgdesc="inotify-tools is a set of command-line programs for Linux providing a simple interface to inotify"
+depends=()
+groups=('apps-extra')
+archs=('i686' 'x86_64')
+_F_sourceforge_broken_up2date=1
+Finclude sourceforge
+sha1sums=('59c99d479ad0733cc4a01a5028522f3e9bf09000')
+
+# optimization OK
From janny at frugalware.org  Sun Oct 14 17:27:20 2007
From: janny at frugalware.org (janny)
Date: Sun Oct 14 17:27:23 2007
Subject: [Frugalware-git] frugalware-current: ksniffer-0.3.1-1-i686
Message-ID: <20071014152720.979E01678009@genesis.frugalware.org>

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

commit 90423bc2904ee7648c88637b17ada8ef74223f09
Author: janny <janny@frugalware.org>
Date:   Sun Oct 14 17:26:38 2007 +0200

ksniffer-0.3.1-1-i686
version bump

diff --git a/source/kde-extra/ksniffer/FrugalBuild b/source/kde-extra/ksniffer/FrugalBuild
index b7bbd28..637058f 100644
--- a/source/kde-extra/ksniffer/FrugalBuild
+++ b/source/kde-extra/ksniffer/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=ksniffer
-pkgver=0.3
-pkgrel=2
+pkgver=0.3.1
+pkgrel=1
pkgdesc="Network sniffing application for KDE"
license="GPL"
depends=('libxi' 'expat' 'libstdc++' 'qt' 'libxmu' 'kdelibs')
@@ -16,6 +16,6 @@ _F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://www.ksniffer.org/"
Fconfopts="--disable-debug --enable-final --with-gnu-ld"
-sha1sums=('cd06b37b9c831452dff579eb931373d310f2e16c')
+sha1sums=('b11efdfce2927d38f21f67319fac31b109765b38')

# optimization OK
From crazy at frugalware.org  Sun Oct 14 17:28:49 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 17:28:55 2007
Subject: [Frugalware-git] frugalware-current: xchat-2.8.4-4-i686
Message-ID: <20071014152849.C016C1688018@genesis.frugalware.org>

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

commit 4b890e00b7c33a81fa5397328f709730fa4454a3
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 17:24:11 2007 +0200

xchat-2.8.4-4-i686
* gdk-pixbuf is not a depend , removed

diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild
index 6456fc5..48ddc59 100644
--- a/source/xapps/xchat/FrugalBuild
+++ b/source/xapps/xchat/FrugalBuild
@@ -4,10 +4,10 @@

pkgname=xchat
pkgver=2.8.4
-pkgrel=3
+pkgrel=4
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')
+depends=('gtk+2>=2.12.0-3' 'openssl' 'glib2>=2.14.1-5'  'libsexy' 'dbus-glib')
makedepends=('python' 'perl' 'tcl')
groups=('xapps')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Sun Oct 14 17:55:31 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 17:55:34 2007
Subject: [Frugalware-git] frugalware-current: gst-plugins-good-0.10.6-3-i686
Message-ID: <20071014155531.A8AAC1678009@genesis.frugalware.org>

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

commit 59a1dc875c246c2dcb1fefce2f99ce29d9ed6840
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 17:48:59 2007 +0200

gst-plugins-good-0.10.6-3-i686
* bye gdk-pixbuf

diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild
index 2cd86d6..4a9c2ba 100644
--- a/source/xmultimedia/gst-plugins-good/FrugalBuild
+++ b/source/xmultimedia/gst-plugins-good/FrugalBuild
@@ -4,13 +4,15 @@

pkgname=gst-plugins-good
pkgver=0.10.6
-pkgrel=2
+pkgrel=3
pkgdesc="Plugins for GStreamer (Good)"
url="http://gstreamer.freedesktop.org/"
depends=('gst-plugins-base>=0.10.13' 'gstreamer>=0.10.13' 'zlib')
-makedepends=('gtk-doc' 'pyxml' 'gconf' 'esd' 'ladspa_sdk' 'speex' 'libshout' 'aalib' 'libjpeg' 'flac>=1.1.3' 'libavc1394' \
-	'libpng' 'libcdio' 'libdv' 'cairo' 'liboil>=0.3.10' 'taglib' 'hal>=0.5.7.1-3' 'libiec61883' 'libcaca' 'gdk-pixbuf' \
-	'wavpack' 'libsm' 'libice' 'libxext' 'libxdamage' 'libxfixes' 'libx11' 'libxdmcp' 'libxau' 'libxcb')
+makedepends=('gtk-doc' 'pyxml' 'gconf' 'esd' 'ladspa_sdk' 'speex' 'libshout' 'aalib' \
+	'libjpeg' 'flac>=1.1.3' 'libavc1394' 'libpng' 'libcdio' 'libdv' 'cairo' \
+	'liboil>=0.3.10' 'taglib' 'hal>=0.5.7.1-3' 'libiec61883' 'libcaca' \
+	'wavpack' 'libsm' 'libice' 'libxext' 'libxdamage' 'libxfixes' 'libx11' \
+	'libxdmcp' 'libxau' 'libxcb' 'gtk+2')
groups=('xmultimedia')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -33,7 +35,7 @@ subdepends=("gconf $pkgname=$pkgver" "esd $pkgname=$pkgver" "speex $pkgname=$pkg
"libshout $pkgname=$pkgver" "libjpeg $pkgname=$pkgver" "flac $pkgname=$pkgver" "libavc1394 $pkgname=$pkgver libiec61883" \
"$pkgname=$pkgver libpng" "libcdio $pkgname=$pkgver" "libdv $pkgname=$pkgver" "cairo $pkgname=$pkgver" \
"liboil>=0.3.10 $pkgname=$pkgver" "taglib $pkgname=$pkgver" "$pkgname=$pkgver hal>=0.5.7.1-3 dbus>=0.93 e2fsprogs" \
-	   "libcaca $pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver gdk-pixbuf" "$pkgname=$pkgver libxml2" \
+	   "libcaca $pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver gtk+2" "$pkgname=$pkgver libxml2" \
"$pkgname=$pkgver wavpack" "$pkgname=$pkgver libsm libice libxext libxdamage libxfixes libx11 libxdmcp libxau libxcb")
_F_gnome_schemas=('/etc/gconf/schemas/gstreamer-0.10.schemas')
Finclude gnome-scriptlet
From crazy at frugalware.org  Sun Oct 14 18:45:44 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 18:45:47 2007
Subject: [Frugalware-git] frugalware-current: claws-mail-3.0.2-1-i686
Message-ID: <20071014164544.7ECBE1688018@genesis.frugalware.org>

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

commit c81560d769ef307d69261fa6519fcb702b4c7787
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 18:40:39 2007 +0200

claws-mail-3.0.2-1-i686
* Version bump
* gdk-pixbuf is not a depend , removed

diff --git a/source/xapps-extra/claws-mail/FrugalBuild b/source/xapps-extra/claws-mail/FrugalBuild
index fad4eb7..ec97d1f 100644
--- a/source/xapps-extra/claws-mail/FrugalBuild
+++ b/source/xapps-extra/claws-mail/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Bence Nagy <nagybence@tipogral.hu>

pkgname=claws-mail
-pkgver=3.0.1
+pkgver=3.0.2
pkgrel=1
pkgdesc="The extended version of Sylpheed, a GTK+ based, lightweight, and fast e-mail client"
groups=('xapps-extra')
@@ -11,8 +11,8 @@ archs=('i686' 'x86_64')
options=('scriptlet')
depends=('openssl' 'aspell' 'clamav' 'pilot-link>=0.12.1'  \
'gtk+2>=2.12.0-2'  'gpgme' 'startup-notification' 'libldap' \
-	'spamassassin' 'curl' 'gdk-pixbuf' 'libetpan>=0.49' \
-	'hicolor-icon-theme' 'glib2>=2.14.1-4' 'db>=4.6.18')
+	'spamassassin' 'curl' 'libetpan>=0.49' \
+	'hicolor-icon-theme' 'glib2>=2.14.1-5' 'db>=4.6.18')
makedepends=('openldap')
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_dirname="sylpheed-claws"
@@ -39,5 +39,5 @@ build() {
Ffilerel claws-mail.desktop /usr/share/applications/claws-mail.desktop
}

-sha1sums=('670c2731bf6bf209ca7d3bd341b38fc3108e6390')
+sha1sums=('a607aca53a349f3a0a8d8f7a51f4754705e12350')
# optimization OK
From janny at frugalware.org  Sun Oct 14 20:21:23 2007
From: janny at frugalware.org (janny)
Date: Sun Oct 14 20:21:26 2007
Subject: [Frugalware-git] frugalware-current: clamav.install
Message-ID: <20071014182123.71D551678009@genesis.frugalware.org>

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

commit 71bce0a3172cbebaa4a08b6e9de3077b414e9f26
Author: janny <janny@frugalware.org>
Date:   Sun Oct 14 20:10:37 2007 +0200

clamav.install
add absolut path in install

diff --git a/source/apps-extra/clamav/clamav.install b/source/apps-extra/clamav/clamav.install
index b07ac2f..9396fb6 100644
--- a/source/apps-extra/clamav/clamav.install
+++ b/source/apps-extra/clamav/clamav.install
@@ -1,24 +1,24 @@
post_install()
{
if ! grep -q '^clamav:' /etc/group ; then
-		groupadd -g 26 clamav
+		/usr/sbin/groupadd -g 26 clamav
fi
if ! grep -q '^clamav:' /etc/passwd ; then
-                useradd -u 26 -g 26 -s /bin/false -c "Clam AntiVirus" -d /var/lib/clamav clamav
+                /usr/sbin/useradd -u 26 -g 26 -s /bin/false -c "Clam AntiVirus" -d /var/lib/clamav clamav
fi
}

pre_remove()
{
-	userdel -r clamav >/dev/null 2>&1
-	groupdel clamav >/dev/null 2>&1
+	/usr/sbin/userdel -r clamav >/dev/null 2>&1
+	/usr/sbin/groupdel clamav >/dev/null 2>&1
rm -fr /var/lib/clamav 2>&1
}

pre_upgrade()
{
if [ `vercmp $2 0.88.7-2` -lt 0 ] ; then
-		chkconfig --del freshclam
+		/usr/sbin/chkconfig --del freshclam
fi
}
From boobaa at frugalware.org  Sun Oct 14 21:31:12 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Sun Oct 14 21:31:15 2007
Subject: [Frugalware-git] frugalware-current: qtpfsgui-1.8.12-1-i686
Message-ID: <20071014193112.EFD2B1678009@genesis.frugalware.org>

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

commit 6ad1f656e2f3d29c9d72041751126e7f9302d4dd
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Sun Oct 14 21:31:06 2007 +0200

qtpfsgui-1.8.12-1-i686
new package / initial import
thx crazy for the patch

diff --git a/source/kde-extra/qtpfsgui/FrugalBuild b/source/kde-extra/qtpfsgui/FrugalBuild
new file mode 100644
index 0000000..e15dd60
--- /dev/null
+++ b/source/kde-extra/qtpfsgui/FrugalBuild
@@ -0,0 +1,28 @@
+# Compiling Time: 0.50 SBU
+# Maintainer: CSÉCSY László <boobaa@frugalware.org>
+
+pkgname=qtpfsgui
+pkgver=1.8.12
+pkgrel=1
+pkgdesc="an open source graphical user interface application that aims to provide a workflow for HDR imaging"
+depends=('qt4' 'exiv2' 'openexr' 'fftw')
+groups=('kde-extra')
+archs=('i686')
+_F_sourceforge_ext=".tar.gz"
+_F_kde_defaults=0
+Finclude sourceforge kde
+up2date="lynx -dump http://qtpfsgui.sourceforge.net/ | grep -m1 'Released version' | sed 's/.*version \(.*\):.*/\1/'"
+source=($source fix_it.patch)
+
+build()
+{
+	Fcd
+	Fpatchall
+	/usr/bin/qmake -o Makefile project.pro || Fdie
+	make || Fdie
+	make INSTALL_ROOT=$Fdestdir install || Fdie
+}
+
+# optimization OK
+sha1sums=('3646c3f463afae74cf19246463eb3cc8413902af' \
+	  'cadb9c7196ecfba4ca07c289a404e1e7c88a4f6f')
diff --git a/source/kde-extra/qtpfsgui/fix_it.patch b/source/kde-extra/qtpfsgui/fix_it.patch
new file mode 100644
index 0000000..8c2b6f4
--- /dev/null
+++ b/source/kde-extra/qtpfsgui/fix_it.patch
@@ -0,0 +1,20 @@
+--- project.pro.orig	2007-10-01 22:17:56.000000000 +0200
++++ project.pro	2007-10-01 22:23:48.000000000 +0200
+@@ -1,8 +1,6 @@
+ TEMPLATE = app
+ CONFIG += release qt thread
+ DEFINES += QT_NO_DEBUG_OUTPUT
+-QMAKE_CXXFLAGS += -O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe
+-QMAKE_CXXFLAGS_RELEASE-=-O2
+
+ unix {
+ ########################################### QT ###########################################
+@@ -163,7 +161,7 @@
+
+ ############################## required by "make install" ########################################
+ isEmpty(PREFIX) {
+-        PREFIX = /usr/local
++        PREFIX = /usr
+ }
+ isEmpty(I18NDIR) {
+ 	I18NDIR = $${PREFIX}/share/qtpfsgui/i18n
From crazy at frugalware.org  Sun Oct 14 21:40:36 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 21:40:39 2007
Subject: [Frugalware-git] frugalware-current: zinf-2.2.5-3-i686
Message-ID: <20071014194036.5487E1678009@genesis.frugalware.org>

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

commit 3612f9468302e6d4e8027031a536ea84057e0ef5
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 21:36:12 2007 +0200

zinf-2.2.5-3-i686
* relbump
* added 2 patches to fix some crashes ( still one left :| )
* killed off gdk-pixbux from depends while isn't
* fixed url bug
* added missing scriptlet option
* ( this package need some more work )

diff --git a/source/xmultimedia-extra/zinf/FrugalBuild b/source/xmultimedia-extra/zinf/FrugalBuild
index acf9be7..cb317b0 100644
--- a/source/xmultimedia-extra/zinf/FrugalBuild
+++ b/source/xmultimedia-extra/zinf/FrugalBuild
@@ -3,17 +3,20 @@

pkgname=zinf
pkgver=2.2.5
-pkgrel=2
+pkgrel=3
pkgdesc="The Zinf audio player is a simple, but powerful audio player for Linux."
-url="http://www.zinf.org"
-depends=('esd' 'gtk+2' 'gdbm' 'ncurses' 'libmusicbrainz' 'arts' 'id3lib' 'gdk-pixbuf' 'libx11')
+depends=('esd' 'gtk+2' 'gdbm' 'ncurses' 'libmusicbrainz' 'arts' 'id3lib' 'libx11')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
+options=('scriptlet')
+url="http://www.zinf.org"
up2date="lynx -dump http://www.zinf.org/download.php |grep zinf.*.tar.gz |sed -ne 's/.*f-\(.*\)\.t.*/\1/;1 p'"
-source=(${source[@]} zinf_gcc4.patch)
+source=(${source[@]} zinf_gcc4.patch zinf-ds.patch sem_fix.diff)
sha1sums=('5ef056e476fa3bfedcb2d0f7de7859b97a22ca6b' \
-	  '73eeafe8c3f46386878e95e4ad7ebae5e62a0a8b')
+          '73eeafe8c3f46386878e95e4ad7ebae5e62a0a8b' \
+          'd1ade23f5ac9496146c122c825518d52f2492d3a' \
+          'e5dc31d63a4a043cdaf790d8f795d6f3e952b19f')

build() {
Fpatchall
diff --git a/source/xmultimedia-extra/zinf/sem_fix.diff b/source/xmultimedia-extra/zinf/sem_fix.diff
new file mode 100644
index 0000000..1e8a9c0
--- /dev/null
+++ b/source/xmultimedia-extra/zinf/sem_fix.diff
@@ -0,0 +1,14 @@
+diff -NruBb zinf-2.2.5ori/base/unix/src/bootstrap.cpp zinf-2.2.5/base/unix/src/bootstrap.cpp
+--- zinf-2.2.5ori/base/unix/src/bootstrap.cpp	2003-11-21 01:21:58.000000000 +0100
++++ zinf-2.2.5/base/unix/src/bootstrap.cpp	2005-05-19 16:57:50.000000000 +0200
+@@ -149,7 +149,9 @@
+                         ResolvePath(path);
+
+                     strncpy(pPtr, path.c_str(),path.length());
+-                    pPtr += strlen(pPtr) + 1;
++
++		    pPtr[path.length()]='\0';
++		    pPtr += path.length() + 1;
+                 }
+                 *pPtr = 0;
+
diff --git a/source/xmultimedia-extra/zinf/zinf-ds.patch b/source/xmultimedia-extra/zinf/zinf-ds.patch
new file mode 100644
index 0000000..4e4b839
--- /dev/null
+++ b/source/xmultimedia-extra/zinf/zinf-ds.patch
@@ -0,0 +1,229 @@
+diff -dPNur zinf-2.2.5/plm/metadata/id3lib/id3lib.cpp zinf-2.2.5-new/plm/metadata/id3lib/id3lib.cpp
+--- zinf-2.2.5/plm/metadata/id3lib/id3lib.cpp	2004-01-30 13:06:02.000000000 +0100
++++ zinf-2.2.5-new/plm/metadata/id3lib/id3lib.cpp	2005-07-19 23:37:11.000000000 +0200
+@@ -304,10 +304,45 @@
+ }
+
+
++static int rccGetCurrentEncoding(char *result, unsigned int n) {
++    unsigned int i;
++    char *l;
++
++    if ((!result)||(!n)) return -1;
++
++	l = getenv("CHARSET");
++#ifdef HAVE_CODESET
++	if (!l) l = nl_langinfo(CODESET);
++#endif
++	if (l) {
++	    if (strlen(l)>=n) return -1;
++	    strcpy(result, l);
++	    return 0;
++	}
++
++	l = setlocale(LC_CTYPE, NULL);
++	if (!l) return -1;
++
++    for (i=0;((l[i])&&(l[i]!='.')&&(l[i]!='_'));i++);
++    if (i>=n) return -1;
++
++    l = strrchr(l, '.');
++    if (!l) return -1;
++
++    for (i=0;((l[i])&&(l[i]!='@'));i++);
++    if (i>=n) return -1;
++
++    strncpy(result,l+1,i-1);
++    result[i]=0;
++
++    return 0;
++}
++
+ static
+ bool getTag(ID3_Tag&tag, ID3_FrameID frameid, string &result)
+ {
+-    static char buffer[1024];
++    int err;
++    static char buffer[1024], locale[64];
+ #ifdef HAVE_GLIB
+     gchar *utfbuffer;
+ #endif
+@@ -326,7 +361,8 @@
+ 	    return true;
+ 	  }
+ 	  else {
+-	    utfbuffer=g_convert(buffer, sizeof buffer, "UTF-8", charset.c_str(), NULL, NULL, NULL);
++	    err = rccGetCurrentEncoding(locale, 64);
++	    utfbuffer=g_convert(buffer, sizeof buffer, "UTF-8", err?charset.c_str():locale, NULL, NULL, NULL);
+ 	    result=utfbuffer;
+ 	    g_free(utfbuffer);
+ 	    return true;
+diff -dPNur zinf-2.2.5/ui/ncurses/Makefile.am zinf-2.2.5-new/ui/ncurses/Makefile.am
+--- zinf-2.2.5/ui/ncurses/Makefile.am	2003-09-16 19:35:31.000000000 +0200
++++ zinf-2.2.5-new/ui/ncurses/Makefile.am	2005-07-19 23:51:02.000000000 +0200
+@@ -3,11 +3,11 @@
+ plugin_LTLIBRARIES = ncurses-ui.la
+
+ ncurses_ui_la_SOURCES = ncursesUI.cpp
+-ncurses_ui_la_LIBADD = $(NCURSES_LIBS)
++ncurses_ui_la_LIBADD = $(NCURSES_LIBS) $(GLIB_LIBS)
+ ncurses_ui_la_LDFLAGS = $(plugin_ldflags)
+
+ noinst_HEADERS = ncursesUI.h
+
+-AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes)
++AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) $(GLIB_CFLAGS)
+
+ # arch-tag: 19b44c0b-0802-4cfc-9d47-519f9049c888
+diff -dPNur zinf-2.2.5/ui/ncurses/Makefile.in zinf-2.2.5-new/ui/ncurses/Makefile.in
+--- zinf-2.2.5/ui/ncurses/Makefile.in	2004-02-09 01:48:25.000000000 +0100
++++ zinf-2.2.5-new/ui/ncurses/Makefile.in	2005-07-20 00:23:03.823574339 +0200
+@@ -231,7 +231,7 @@
+
+ noinst_HEADERS = ncursesUI.h
+
+-AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes)
++AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) $(GLIB_CFLAGS)
+ subdir = ui/ncurses
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+diff -dPNur zinf-2.2.5/ui/ncurses/ncursesUI.cpp zinf-2.2.5-new/ui/ncurses/ncursesUI.cpp
+--- zinf-2.2.5/ui/ncurses/ncursesUI.cpp	2003-09-16 19:35:31.000000000 +0200
++++ zinf-2.2.5-new/ui/ncurses/ncursesUI.cpp	2005-07-20 00:03:31.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <termios.h>
+ #include <signal.h>
+
++
+ using namespace std;
+ #include "config.h"
+ #include "i18n.h"
+@@ -41,6 +42,10 @@
+ #include "thread.h"
+ #include "eventdata.h"
+
++#ifdef HAVE_GLIB
++#include <glib.h>
++#endif
++
+ #define stdinfd 0
+
+ extern "C" {
+@@ -262,6 +267,40 @@
+
+ }
+
++static int rccGetCurrentEncoding(char *result, unsigned int n) {
++    unsigned int i;
++    char *l;
++
++    if ((!result)||(!n)) return -1;
++
++	l = getenv("CHARSET");
++#ifdef HAVE_CODESET
++	if (!l) l = nl_langinfo(CODESET);
++#endif
++	if (l) {
++	    if (strlen(l)>=n) return -1;
++	    strcpy(result, l);
++	    return 0;
++	}
++
++	l = setlocale(LC_CTYPE, NULL);
++	if (!l) return -1;
++
++    for (i=0;((l[i])&&(l[i]!='.')&&(l[i]!='_'));i++);
++    if (i>=n) return -1;
++
++    l = strrchr(l, '.');
++    if (!l) return -1;
++
++    for (i=0;((l[i])&&(l[i]!='@'));i++);
++    if (i>=n) return -1;
++
++    strncpy(result,l+1,i-1);
++    result[i]=0;
++
++    return 0;
++}
++
+ Error ncursesUI::AcceptEvent(Event *e) {
+     if (e) {
+         switch (e->Type()) {
+@@ -342,36 +381,69 @@
+                     break;
+                 md = pItem->GetMetaData();
+
++		char *recoded;
++		char locale[64];
++#ifdef HAVE_GLIB
++		if (rccGetCurrentEncoding(locale, 64)) strcpy(locale, "UTF-8");
++#else
++		recoded = NULL;
++#endif
++
++
+                 clear();
+                 move(0,0);
+                 showInfo();
+                 move(2, 0);
+                 addstr(_("Title  : "));
+-                if (md.Title().c_str()[0] != '\0')
+-                    addstr((char *)md.Title().c_str());
+-                else
++                if (md.Title().c_str()[0] != '\0') {
++#ifdef HAVE_GLIB
++		    recoded = g_convert(md.Title().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
++#endif
++                    addstr(recoded?recoded:(char *)md.Title().c_str());
++                } else
+                     addstr(pmvi->m_filename.c_str());
++
++#ifdef HAVE_GLIB
++		if (recoded) free(recoded);
++		recoded = g_convert(md.Artist().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
++#endif
+                 addstr(_("\nArtist : "));
+-                addstr((char *)md.Artist().c_str());
++                addstr(recoded?recoded:(char *)md.Artist().c_str());
++#ifdef HAVE_GLIB
++		if (recoded) free(recoded);
++		recoded = g_convert(md.Album().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
++#endif
+                 addstr(_("\nAlbum  : "));
+-                addstr((char *)md.Album().c_str());
++                addstr(recoded?recoded:(char *)md.Album().c_str());
+                 addstr(_("\nYear   : "));
+                 if (md.Year() != 0)
+                 {
+                     sprintf(buf, "%d", md.Year());
+                     addstr(buf);
+                 }
++#ifdef HAVE_GLIB
++		if (recoded) free(recoded);
++		recoded = g_convert(md.Genre().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
++#endif
+                 addstr(_("\nGenre  : "));
+-                addstr((char *)md.Genre().c_str());
++                addstr(recoded?recoded:(char *)md.Genre().c_str());
+                 addstr(_("\nTrack  : "));
+                 if (md.Track() != 0)
+                 {
+                     sprintf(buf, "%d", md.Track());
+                     addstr(buf);
+                 }
++#ifdef HAVE_GLIB
++		if (recoded) free(recoded);
++		recoded = g_convert(md.Comment().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
++#endif
+                 addstr(_("\nComment: "));
+-                addstr((char *)md.Comment().c_str());
++                addstr(recoded?recoded:(char *)md.Comment().c_str());
+                 addstr("\n");
++
++#ifdef HAVE_GLIB
++		if (recoded) free(recoded);
++#endif
+                 refresh();
+
+                 counter = 0;
From priyank at frugalware.org  Sun Oct 14 21:54:02 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 21:54:04 2007
Subject: [Frugalware-git] frugalware-current: ristretto-0.0.8-1-i686
Message-ID: <20071014195402.242001678009@genesis.frugalware.org>

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

commit 3995e4fd8bb09fb1f51335479517c05e83b3d6e9
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 01:20:30 2007 +0530

ristretto-0.0.8-1-i686
* Version bump

diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild
index e444c1c..fa18d72 100644
--- a/source/xfce4/ristretto/FrugalBuild
+++ b/source/xfce4/ristretto/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=ristretto
-pkgver=0.0.5
+pkgver=0.0.8
pkgrel=1
pkgdesc="A fast and lightweight picture viewer for Xfce."
makedepends=('intltool')
@@ -13,6 +13,6 @@ _F_gnome_iconcache="y"
_F_xfce_goodies_ext=".tar.gz"
Finclude xfce4 gnome-scriptlet
url="http://goodies.xfce.org/projects/applications/ristretto"
-sha1sums=('e539d4f91904a49dc5543ab39afad79e2dd2cf28')
+sha1sums=('ac17624fa7b0d5ea2f182468527d739300ce85fb')

# optimization OK
From priyank at frugalware.org  Sun Oct 14 22:01:28 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 22:01:32 2007
Subject: [Frugalware-git] frugalware-current: guile-gtk-1.2.60-1-i686
Message-ID: <20071014200128.AAAAE1688018@genesis.frugalware.org>

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

commit 50570edd060bdac7584fdbe7a0183dd10baf2e99
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 01:29:28 2007 +0530

guile-gtk-1.2.60-1-i686
* Moved to xlib-extra
* I'll bump this to 2.0 soon

diff --git a/source/xlib-extra/guile-gtk/FrugalBuild b/source/xlib-extra/guile-gtk/FrugalBuild
new file mode 100644
index 0000000..d3bbbb6
--- /dev/null
+++ b/source/xlib-extra/guile-gtk/FrugalBuild
@@ -0,0 +1,18 @@
+# Compiling Time: 0.15 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=guile-gtk
+pkgver=1.2.60
+pkgrel=1
+pkgdesc="GTK+ bindings for guile."
+url="http://www.gnu.org/software/guile-gtk/"
+makedepends=('pkgconfig')
+depends=('guile' 'gtk+' 'gdk-pixbuf')
+groups=('xlib-extra')
+archs=('i686' 'x86_64')
+up2date="$pkgver"
+source=(ftp://ftp.gnu.org/gnu/guile-gtk/$pkgname-${pkgver/1.2./0.}.tar.gz)
+_F_cd_path="$pkgname-${pkgver/1.2./0.}"
+sha1sums=('dd25377098d61fc1030a769caa5e5777a4abd9e8')
+
+# optimization OK
diff --git a/source/xlib/guile-gtk/FrugalBuild b/source/xlib/guile-gtk/FrugalBuild
deleted file mode 100644
index 9860d97..0000000
--- a/source/xlib/guile-gtk/FrugalBuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Compiling Time: 0.15 SBU
-# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
-
-pkgname=guile-gtk
-pkgver=1.2.60
-pkgrel=1
-pkgdesc="GTK+ bindings for guile."
-url="http://www.gnu.org/software/guile-gtk/"
-makedepends=('pkgconfig')
-depends=('guile' 'gtk+' 'gdk-pixbuf')
-groups=('xlib')
-archs=('i686' 'x86_64')
-up2date="$pkgver"
-source=(ftp://ftp.gnu.org/gnu/guile-gtk/$pkgname-${pkgver/1.2./0.}.tar.gz)
-_F_cd_path="$pkgname-${pkgver/1.2./0.}"
-sha1sums=('dd25377098d61fc1030a769caa5e5777a4abd9e8')
-
-# optimization OK
From crazy at frugalware.org  Sun Oct 14 22:03:32 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 22:03:37 2007
Subject: [Frugalware-git] frugalware-current: gdk-pixbuf-0.22.0-3-i686
Message-ID: <20071014200332.D821D1678009@genesis.frugalware.org>

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

commit c5d428143ae13c7300ec6a07dc8a609bed5c1ccb
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 21:58:22 2007 +0200

gdk-pixbuf-0.22.0-3-i686
* moved to gnome-extra

diff --git a/source/gnome-extra/gdk-pixbuf/FrugalBuild b/source/gnome-extra/gdk-pixbuf/FrugalBuild
new file mode 100644
index 0000000..ae4cc8b
--- /dev/null
+++ b/source/gnome-extra/gdk-pixbuf/FrugalBuild
@@ -0,0 +1,30 @@
+# Compiling Time: 0.30 SBU
+# Maintainer: Bence Nagy <nagybence@tipogral.hu>
+
+pkgname=gdk-pixbuf
+pkgver=0.22.0
+pkgrel=3
+pkgdesc="Image loading and manipulation library"
+depends=('libtiff' 'libjpeg' 'gtk+' 'libpng')
+groups=('gnome-extra')
+archs=('i686' 'x86_64')
+url="http://developer.gnome.org/arch/imaging/gdkpixbuf.html"
+Finclude gnome
+source=(${source[@]} tons-of-patches-from-fedora.patch)
+sha1sums=('495324afb5abebc14567ffd5a6cd72333bcc7f5b' \
+	  '62fca9a9ae67420f8ada40e2a842fcf5b7119f1d')
+
+build() {
+    Fcd
+    Fpatchall
+    # Need this, else we got relink errors for loader .so's
+    Facu
+    cp -a /usr/share/automake/missing ./missing || Fdie
+    libtoolize -c -f || Fdie
+    aclocal || Fdie
+    autoconf || Fdie
+    Fmake --disable-gtk-doc
+    Fmakeinstall
+}
+
+# optimization OK
diff --git a/source/gnome-extra/gdk-pixbuf/tons-of-patches-from-fedora.patch b/source/gnome-extra/gdk-pixbuf/tons-of-patches-from-fedora.patch
new file mode 100644
index 0000000..49c7be9
--- /dev/null
+++ b/source/gnome-extra/gdk-pixbuf/tons-of-patches-from-fedora.patch
@@ -0,0 +1,409 @@
+diff -Naur gdk-pixbuf-0.22.0.orig/configure.in gdk-pixbuf-0.22.0/configure.in
+--- gdk-pixbuf-0.22.0.orig/configure.in	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/configure.in	2006-08-24 22:44:01.000000000 +0200
+@@ -48,7 +48,7 @@
+ AC_SUBST(STRIP_BEGIN)
+ AC_SUBST(STRIP_END)
+
+-AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
++AC_PATH_PROG(GNOME_CONFIG,no-gnome-config-here,no)
+ if test x$GNOME_CONFIG != xno; then
+ 	echo "Building the GnomeCanvasPixbuf library"
+ 	GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
+@@ -129,7 +129,7 @@
+ AC_MSG_CHECKING([for location of rgb.txt database])
+
+ dnl default to this..
+-path_rgb_txt=/usr/lib/X11/rgb.txt
++path_rgb_txt=/usr/share/X11/rgb.txt
+
+ if test -r ${x_libraries}/X11/rgb.txt; then
+   path_rgb_txt="${x_libraries}/X11/rgb.txt"
+@@ -147,18 +147,18 @@
+ dnl Test for libtiff
+   if test -z "$LIBTIFF"; then
+     AC_CHECK_LIB(tiff, TIFFReadScanline,
+-      AC_CHECK_HEADER(tiffio.h,
++      [AC_CHECK_HEADER(tiffio.h,
+         TIFF='tiff'; LIBTIFF='-ltiff',
+-        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
+-      AC_CHECK_LIB(tiff, TIFFWriteScanline,
+-        AC_CHECK_HEADER(tiffio.h,
++        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
++      [AC_CHECK_LIB(tiff, TIFFWriteScanline,
++        [AC_CHECK_HEADER(tiffio.h,
+           TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
+-          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
+-        AC_CHECK_LIB(tiff34, TIFFFlushData,
+-          AC_CHECK_HEADER(tiffio.h,
++          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
++        [AC_CHECK_LIB(tiff34, TIFFFlushData,
++          [AC_CHECK_HEADER(tiffio.h,
+             TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
+-            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
+-        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
++            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
++        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+   fi
+
+ dnl Test for libjpeg
+@@ -191,9 +191,9 @@
+ dnl Test for libpng
+   if test -z "$LIBPNG"; then
+     AC_CHECK_LIB(png, png_read_info,
+-      AC_CHECK_HEADER(png.h,
++      [AC_CHECK_HEADER(png.h,
+         png_ok=yes,
+-        png_ok=no),
++        png_ok=no)],
+       AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
+     if test "$png_ok" = yes; then
+       AC_MSG_CHECKING([for png_structp in png.h])
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-bmp.c gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-bmp.c	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2006-08-24 22:43:43.000000000 +0200
+@@ -129,6 +129,7 @@
+ 	guint depth;
+ 	guint Negative;		/* Negative = 1 -> top down BMP,
+ 				   Negative = 0 -> bottom up BMP */
++	guint  n_colors;
+ };
+
+ /* Data needed for the "state" during decompression */
+@@ -153,8 +154,8 @@
+ 	guint Lines;		/* # of finished lines */
+
+ 	guchar *buff;
+-	gint BufferSize;
+-	gint BufferDone;
++	guint BufferSize;
++	guint BufferDone;
+
+ 	guchar (*Colormap)[3];
+
+@@ -245,7 +246,14 @@
+ static gboolean
+ grow_buffer (struct bmp_progressive_state *State)
+ {
+-  guchar *tmp = realloc (State->buff, State->BufferSize);
++  guchar *tmp;
++
++  if (State->BufferSize == 0) {
++    State->read_state = READ_STATE_ERROR;
++    return FALSE;
++  }
++
++  tmp = realloc (State->buff, State->BufferSize);
+   if (!tmp) {
+     State->read_state = READ_STATE_ERROR;
+     return FALSE;
+@@ -258,6 +266,8 @@
+ DecodeHeader (unsigned char *BFH, unsigned char *BIH,
+ 	      struct bmp_progressive_state *State)
+ {
++ 	gint clrUsed;
++
+ 	g_assert (State->read_state == READ_STATE_HEADERS);
+
+         /* FIXME this is totally unrobust against bogus image data. */
+@@ -295,6 +305,23 @@
+ 		return FALSE;
+ 	}
+
++	clrUsed = (int) (BIH[35] << 24) + (BIH[34] << 16) + (BIH[33] << 8) + (BIH[32]);
++	if (clrUsed != 0)
++		State->Header.n_colors = clrUsed;
++	else
++            State->Header.n_colors = 1 << State->Header.depth;
++
++	if (State->Header.n_colors > 1 << State->Header.depth) {
++#if 0
++		g_set_error (error,
++			     GDK_PIXBUF_ERROR,
++			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
++			     _("BMP image has bogus header data"));
++#endif
++		State->read_state = READ_STATE_ERROR;
++		return FALSE;
++	}
++
+ 	State->Type = State->Header.depth;	/* This may be less trivial someday */
+
+ 	/* Negative heights indicates bottom-down pixelorder */
+@@ -422,16 +449,25 @@
+ 		struct bmp_progressive_state *State)
+ {
+ 	gint i;
+-
++ 	gint samples;
++
+ 	g_assert (State->read_state == READ_STATE_PALETTE);
+
++ 	samples = (State->Header.size == 12 ? 3 : 4);
++ 	if (State->BufferSize < State->Header.n_colors * samples) {
++ 		State->BufferSize = State->Header.n_colors * samples;
++ 		if (!grow_buffer (State))
++ 			return FALSE;
++ 		return TRUE;
++ 	}
++
+ 	State->Colormap = g_malloc ((1 << State->Header.depth) * sizeof (*State->Colormap));
+
+-	for (i = 0; i < (1 << State->Header.depth); i++)
++ 	for (i = 0; i < State->Header.n_colors; i++)
+ 	{
+-		State->Colormap[i][0] = buff[i * (State->Header.size == 12 ? 3 : 4)];
+-		State->Colormap[i][1] = buff[i * (State->Header.size == 12 ? 3 : 4) + 1];
+-		State->Colormap[i][2] = buff[i * (State->Header.size == 12 ? 3 : 4) + 2];
++ 		State->Colormap[i][0] = buff[i * samples];
++ 		State->Colormap[i][1] = buff[i * samples + 1];
++ 		State->Colormap[i][2] = buff[i * samples + 2];
+ 	}
+
+ 	State->read_state = READ_STATE_DATA;
+@@ -870,8 +906,18 @@
+ 	guchar c;
+ 	gint idx;
+
+-	if (context->compr.y >= context->Header.height)
++	/* context->compr.y might be past the last line because we are
++	 * on padding past the end of a valid data, or we might have hit
++	 * out-of-bounds data. Either way we just eat-and-ignore the
++	 * rest of the file. Doing the check only here and not when
++	 * we change y below is fine since BufferSize is always 2 here
++	 * and the BMP file format always starts new data on 16-bit
++	 * boundaries.
++	 */
++	if (context->compr.y >= context->Header.height) {
++		context->BufferDone = 0;
+ 		return TRUE;
++	}
+
+ 	y = context->compr.y;
+
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-ico.c	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c	2006-08-24 22:43:53.000000000 +0200
+@@ -330,6 +330,9 @@
+
+ 	State->HeaderSize+=I;
+
++ 	if (State->HeaderSize < 0)
++ 		return FALSE;
++
+  	if (State->HeaderSize>State->BytesInHeaderBuf) {
+ 		guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
+ 		if (!tmp)
+@@ -360,7 +363,7 @@
+ 	else if (State->Type == 24)
+ 		State->LineWidth = State->Header.width * 3;
+ 	else if (State->Type == 16)
+-		State->LineWidth = State->Header.height * 2;
++		State->LineWidth = State->Header.width * 2;
+ 	else if (State->Type == 8)
+ 		State->LineWidth = State->Header.width * 1;
+ 	else if (State->Type == 4)
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-xpm.c	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c	2006-08-24 22:44:14.000000000 +0200
+@@ -243,8 +243,8 @@
+ 			break;
+ 		else {
+ 			if (numnames > 0) {
+-				space -= 1;
+-				strcat (color, " ");
++				strncat (color, " ", space);
++				space -= MIN (space, 1);
+ 			}
+
+ 			strncat (color, temp, space);
+@@ -281,7 +281,8 @@
+ 		/* Fall through to the xpm_read_string. */
+
+ 	case op_body:
+-		xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
++		if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
++			return NULL;
+ 		return h->buffer;
+
+ 	default:
+@@ -317,13 +318,6 @@
+ 	return NULL;
+ }
+
+-/* Destroy notification function for the pixbuf */
+-static void
+-free_buffer (guchar *pixels, gpointer data)
+-{
+-	free (pixels);
+-}
+-
+ static gboolean
+ xpm_color_parse (const char *spec, XColor *color)
+ {
+@@ -342,7 +336,8 @@
+ 	gchar pixel_str[32];
+ 	GHashTable *color_hash;
+ 	_XPMColor *colors, *color, *fallbackcolor;
+-	guchar *pixels, *pixtmp;
++	guchar *pixtmp;
++	GdkPixbuf* pixbuf;
+
+ 	fallbackcolor = NULL;
+
+@@ -352,16 +347,33 @@
+ 		return NULL;
+ 	}
+ 	sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
+-	if (cpp >= 32) {
+-		g_warning ("XPM has more than 31 chars per pixel.");
++	if (cpp <= 0 || cpp >= 32) {
++		g_warning ("XPM has invalid number of chars per pixel.");
+ 		return NULL;
+ 	}
++        if (n_col <= 0 ||
++            n_col >= G_MAXINT / (cpp + 1) ||
++            n_col >= G_MAXINT / sizeof (_XPMColor)) {
++		g_warning ("XPM file has invalid number of colors");
++  		return NULL;
++  	}
+
+ 	/* The hash is used for fast lookups of color from chars */
+ 	color_hash = g_hash_table_new (g_str_hash, g_str_equal);
+
+-	name_buf = g_new (gchar, n_col * (cpp + 1));
+-	colors = g_new (_XPMColor, n_col);
++ 	name_buf = malloc (n_col * (cpp + 1));
++ 	if (!name_buf) {
++		g_warning ("Cannot allocate memory for loading XPM image");
++ 		g_hash_table_destroy (color_hash);
++ 		return NULL;
++ 	}
++ 	colors = (_XPMColor *) malloc (sizeof (_XPMColor) * n_col);
++ 	if (!colors) {
++		g_warning ("Cannot allocate memory for loading XPM image");
++ 		g_hash_table_destroy (color_hash);
++ 		free (name_buf);
++ 		return NULL;
++ 	}
+
+ 	for (cnt = 0; cnt < n_col; cnt++) {
+ 		gchar *color_name;
+@@ -397,20 +409,16 @@
+ 			fallbackcolor = color;
+ 	}
+
+-	if (is_trans)
+-		pixels = malloc (w * h * 4);
+-	else
+-		pixels = malloc (w * h * 3);
+-
+-	if (!pixels) {
++	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h);
++	if (!pixbuf) {
+ 		g_hash_table_destroy (color_hash);
+-		g_free (colors);
+-		g_free (name_buf);
++		free (colors);
++		free (name_buf);
+ 		return NULL;
+ 	}
+
+ 	wbytes = w * cpp;
+-	pixtmp = pixels;
++	pixtmp = pixbuf->pixels;
+
+ 	for (ycnt = 0; ycnt < h; ycnt++) {
+ 		buffer = (*get_buf) (op_body, handle);
+@@ -440,12 +448,10 @@
+ 	}
+
+ 	g_hash_table_destroy (color_hash);
+-	g_free (colors);
+-	g_free (name_buf);
++	free (colors);
++	free (name_buf);
+
+-	return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8,
+-					 w, h, is_trans ? (w * 4) : (w * 3),
+-					 free_buffer, NULL);
++	return pixbuf;
+ }
+
+ /* Shared library entry point for file loading */
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S	2006-08-24 22:44:29.000000000 +0200
+@@ -3,6 +3,12 @@
+ gcc2_compiled.:
+ .text
+ 	.align 16
++
++/* Magic indicating no need for an executable stack */
++#if !defined __powerpc64__ && !defined __ia64__
++.section .note.GNU-stack;  .previous
++#endif
++
+ .globl pixops_composite_line_22_4a4_mmx
+ 	.type	 pixops_composite_line_22_4a4_mmx,@function
+ /*
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S	2006-08-24 22:44:29.000000000 +0200
+@@ -3,6 +3,12 @@
+ gcc2_compiled.:
+ .text
+ 	.align 16
++
++/* Magic indicating no need for an executable stack */
++#if !defined __powerpc64__ && !defined __ia64__
++.section .note.GNU-stack;  .previous
++#endif
++
+ .globl pixops_composite_line_color_22_4a4_mmx
+ 	.type	 pixops_composite_line_color_22_4a4_mmx,@function
+ /*
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/have_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/have_mmx.S
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/have_mmx.S	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/have_mmx.S	2006-08-24 22:44:29.000000000 +0200
+@@ -3,6 +3,12 @@
+ gcc2_compiled.:
+ .text
+ 	.align 16
++
++/* Magic indicating no need for an executable stack */
++#if !defined __powerpc64__ && !defined __ia64__
++.section .note.GNU-stack;  .previous
++ #endif
++
+ .globl pixops_have_mmx
+ 	.type	 pixops_have_mmx,@function
+
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/scale_line_22_33_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/scale_line_22_33_mmx.S
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/scale_line_22_33_mmx.S	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/scale_line_22_33_mmx.S	2006-08-24 22:44:29.000000000 +0200
+@@ -3,6 +3,12 @@
+ gcc2_compiled.:
+ .text
+ 	.align 16
++
++/* Magic indicating no need for an executable stack */
++#if !defined __powerpc64__ && !defined __ia64__
++.section .note.GNU-stack;  .previous
++#endif
++
+ .globl pixops_scale_line_22_33_mmx
+ 	.type	 pixops_scale_line_22_33_mmx,@function
+ /*
+diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf.m4 gdk-pixbuf-0.22.0/gdk-pixbuf.m4
+--- gdk-pixbuf-0.22.0.orig/gdk-pixbuf.m4	2006-08-24 22:42:29.000000000 +0200
++++ gdk-pixbuf-0.22.0/gdk-pixbuf.m4	2006-08-24 22:44:19.000000000 +0200
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_GDK_PIXBUF,
++AC_DEFUN([AM_PATH_GDK_PIXBUF],
+ [dnl
+ dnl Get the cflags and libraries from the gdk-pixbuf-config script
+ dnl
diff --git a/source/gnome/gdk-pixbuf/FrugalBuild b/source/gnome/gdk-pixbuf/FrugalBuild
deleted file mode 100644
index fe37c42..0000000
--- a/source/gnome/gdk-pixbuf/FrugalBuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Compiling Time: 0.30 SBU
-# Maintainer: Bence Nagy <nagybence@tipogral.hu>
-
-pkgname=gdk-pixbuf
-pkgver=0.22.0
-pkgrel=3
-pkgdesc="Image loading and manipulation library"
-depends=('libtiff' 'libjpeg' 'gtk+' 'libpng')
-groups=('gnome')
-archs=('i686' 'x86_64')
-url="http://developer.gnome.org/arch/imaging/gdkpixbuf.html"
-Finclude gnome
-source=(${source[@]} tons-of-patches-from-fedora.patch)
-sha1sums=('495324afb5abebc14567ffd5a6cd72333bcc7f5b' \
-	  '62fca9a9ae67420f8ada40e2a842fcf5b7119f1d')
-
-build() {
-    Fcd
-    Fpatchall
-    # Need this, else we got relink errors for loader .so's
-    Facu
-    cp -a /usr/share/automake/missing ./missing || Fdie
-    libtoolize -c -f || Fdie
-    aclocal || Fdie
-    autoconf || Fdie
-    Fmake --disable-gtk-doc
-    Fmakeinstall
-}
-
-# optimization OK
diff --git a/source/gnome/gdk-pixbuf/tons-of-patches-from-fedora.patch b/source/gnome/gdk-pixbuf/tons-of-patches-from-fedora.patch
deleted file mode 100644
index 49c7be9..0000000
--- a/source/gnome/gdk-pixbuf/tons-of-patches-from-fedora.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-diff -Naur gdk-pixbuf-0.22.0.orig/configure.in gdk-pixbuf-0.22.0/configure.in
---- gdk-pixbuf-0.22.0.orig/configure.in	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/configure.in	2006-08-24 22:44:01.000000000 +0200
-@@ -48,7 +48,7 @@
- AC_SUBST(STRIP_BEGIN)
- AC_SUBST(STRIP_END)
-
--AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
-+AC_PATH_PROG(GNOME_CONFIG,no-gnome-config-here,no)
- if test x$GNOME_CONFIG != xno; then
- 	echo "Building the GnomeCanvasPixbuf library"
- 	GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
-@@ -129,7 +129,7 @@
- AC_MSG_CHECKING([for location of rgb.txt database])
-
- dnl default to this..
--path_rgb_txt=/usr/lib/X11/rgb.txt
-+path_rgb_txt=/usr/share/X11/rgb.txt
-
- if test -r ${x_libraries}/X11/rgb.txt; then
-   path_rgb_txt="${x_libraries}/X11/rgb.txt"
-@@ -147,18 +147,18 @@
- dnl Test for libtiff
-   if test -z "$LIBTIFF"; then
-     AC_CHECK_LIB(tiff, TIFFReadScanline,
--      AC_CHECK_HEADER(tiffio.h,
-+      [AC_CHECK_HEADER(tiffio.h,
-         TIFF='tiff'; LIBTIFF='-ltiff',
--        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--      AC_CHECK_LIB(tiff, TIFFWriteScanline,
--        AC_CHECK_HEADER(tiffio.h,
-+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+      [AC_CHECK_LIB(tiff, TIFFWriteScanline,
-+        [AC_CHECK_HEADER(tiffio.h,
-           TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
--          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--        AC_CHECK_LIB(tiff34, TIFFFlushData,
--          AC_CHECK_HEADER(tiffio.h,
-+          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+        [AC_CHECK_LIB(tiff34, TIFFFlushData,
-+          [AC_CHECK_HEADER(tiffio.h,
-             TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
--            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
-+            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
-   fi
-
- dnl Test for libjpeg
-@@ -191,9 +191,9 @@
- dnl Test for libpng
-   if test -z "$LIBPNG"; then
-     AC_CHECK_LIB(png, png_read_info,
--      AC_CHECK_HEADER(png.h,
-+      [AC_CHECK_HEADER(png.h,
-         png_ok=yes,
--        png_ok=no),
-+        png_ok=no)],
-       AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
-     if test "$png_ok" = yes; then
-       AC_MSG_CHECKING([for png_structp in png.h])
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-bmp.c gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-bmp.c	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2006-08-24 22:43:43.000000000 +0200
-@@ -129,6 +129,7 @@
- 	guint depth;
- 	guint Negative;		/* Negative = 1 -> top down BMP,
- 				   Negative = 0 -> bottom up BMP */
-+	guint  n_colors;
- };
-
- /* Data needed for the "state" during decompression */
-@@ -153,8 +154,8 @@
- 	guint Lines;		/* # of finished lines */
-
- 	guchar *buff;
--	gint BufferSize;
--	gint BufferDone;
-+	guint BufferSize;
-+	guint BufferDone;
-
- 	guchar (*Colormap)[3];
-
-@@ -245,7 +246,14 @@
- static gboolean
- grow_buffer (struct bmp_progressive_state *State)
- {
--  guchar *tmp = realloc (State->buff, State->BufferSize);
-+  guchar *tmp;
-+
-+  if (State->BufferSize == 0) {
-+    State->read_state = READ_STATE_ERROR;
-+    return FALSE;
-+  }
-+
-+  tmp = realloc (State->buff, State->BufferSize);
-   if (!tmp) {
-     State->read_state = READ_STATE_ERROR;
-     return FALSE;
-@@ -258,6 +266,8 @@
- DecodeHeader (unsigned char *BFH, unsigned char *BIH,
- 	      struct bmp_progressive_state *State)
- {
-+ 	gint clrUsed;
-+
- 	g_assert (State->read_state == READ_STATE_HEADERS);
-
-         /* FIXME this is totally unrobust against bogus image data. */
-@@ -295,6 +305,23 @@
- 		return FALSE;
- 	}
-
-+	clrUsed = (int) (BIH[35] << 24) + (BIH[34] << 16) + (BIH[33] << 8) + (BIH[32]);
-+	if (clrUsed != 0)
-+		State->Header.n_colors = clrUsed;
-+	else
-+            State->Header.n_colors = 1 << State->Header.depth;
-+
-+	if (State->Header.n_colors > 1 << State->Header.depth) {
-+#if 0
-+		g_set_error (error,
-+			     GDK_PIXBUF_ERROR,
-+			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+			     _("BMP image has bogus header data"));
-+#endif
-+		State->read_state = READ_STATE_ERROR;
-+		return FALSE;
-+	}
-+
- 	State->Type = State->Header.depth;	/* This may be less trivial someday */
-
- 	/* Negative heights indicates bottom-down pixelorder */
-@@ -422,16 +449,25 @@
- 		struct bmp_progressive_state *State)
- {
- 	gint i;
--
-+ 	gint samples;
-+
- 	g_assert (State->read_state == READ_STATE_PALETTE);
-
-+ 	samples = (State->Header.size == 12 ? 3 : 4);
-+ 	if (State->BufferSize < State->Header.n_colors * samples) {
-+ 		State->BufferSize = State->Header.n_colors * samples;
-+ 		if (!grow_buffer (State))
-+ 			return FALSE;
-+ 		return TRUE;
-+ 	}
-+
- 	State->Colormap = g_malloc ((1 << State->Header.depth) * sizeof (*State->Colormap));
-
--	for (i = 0; i < (1 << State->Header.depth); i++)
-+ 	for (i = 0; i < State->Header.n_colors; i++)
- 	{
--		State->Colormap[i][0] = buff[i * (State->Header.size == 12 ? 3 : 4)];
--		State->Colormap[i][1] = buff[i * (State->Header.size == 12 ? 3 : 4) + 1];
--		State->Colormap[i][2] = buff[i * (State->Header.size == 12 ? 3 : 4) + 2];
-+ 		State->Colormap[i][0] = buff[i * samples];
-+ 		State->Colormap[i][1] = buff[i * samples + 1];
-+ 		State->Colormap[i][2] = buff[i * samples + 2];
- 	}
-
- 	State->read_state = READ_STATE_DATA;
-@@ -870,8 +906,18 @@
- 	guchar c;
- 	gint idx;
-
--	if (context->compr.y >= context->Header.height)
-+	/* context->compr.y might be past the last line because we are
-+	 * on padding past the end of a valid data, or we might have hit
-+	 * out-of-bounds data. Either way we just eat-and-ignore the
-+	 * rest of the file. Doing the check only here and not when
-+	 * we change y below is fine since BufferSize is always 2 here
-+	 * and the BMP file format always starts new data on 16-bit
-+	 * boundaries.
-+	 */
-+	if (context->compr.y >= context->Header.height) {
-+		context->BufferDone = 0;
- 		return TRUE;
-+	}
-
- 	y = context->compr.y;
-
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-ico.c	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c	2006-08-24 22:43:53.000000000 +0200
-@@ -330,6 +330,9 @@
-
- 	State->HeaderSize+=I;
-
-+ 	if (State->HeaderSize < 0)
-+ 		return FALSE;
-+
-  	if (State->HeaderSize>State->BytesInHeaderBuf) {
- 		guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
- 		if (!tmp)
-@@ -360,7 +363,7 @@
- 	else if (State->Type == 24)
- 		State->LineWidth = State->Header.width * 3;
- 	else if (State->Type == 16)
--		State->LineWidth = State->Header.height * 2;
-+		State->LineWidth = State->Header.width * 2;
- 	else if (State->Type == 8)
- 		State->LineWidth = State->Header.width * 1;
- 	else if (State->Type == 4)
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/io-xpm.c	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c	2006-08-24 22:44:14.000000000 +0200
-@@ -243,8 +243,8 @@
- 			break;
- 		else {
- 			if (numnames > 0) {
--				space -= 1;
--				strcat (color, " ");
-+				strncat (color, " ", space);
-+				space -= MIN (space, 1);
- 			}
-
- 			strncat (color, temp, space);
-@@ -281,7 +281,8 @@
- 		/* Fall through to the xpm_read_string. */
-
- 	case op_body:
--		xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
-+		if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
-+			return NULL;
- 		return h->buffer;
-
- 	default:
-@@ -317,13 +318,6 @@
- 	return NULL;
- }
-
--/* Destroy notification function for the pixbuf */
--static void
--free_buffer (guchar *pixels, gpointer data)
--{
--	free (pixels);
--}
--
- static gboolean
- xpm_color_parse (const char *spec, XColor *color)
- {
-@@ -342,7 +336,8 @@
- 	gchar pixel_str[32];
- 	GHashTable *color_hash;
- 	_XPMColor *colors, *color, *fallbackcolor;
--	guchar *pixels, *pixtmp;
-+	guchar *pixtmp;
-+	GdkPixbuf* pixbuf;
-
- 	fallbackcolor = NULL;
-
-@@ -352,16 +347,33 @@
- 		return NULL;
- 	}
- 	sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
--	if (cpp >= 32) {
--		g_warning ("XPM has more than 31 chars per pixel.");
-+	if (cpp <= 0 || cpp >= 32) {
-+		g_warning ("XPM has invalid number of chars per pixel.");
- 		return NULL;
- 	}
-+        if (n_col <= 0 ||
-+            n_col >= G_MAXINT / (cpp + 1) ||
-+            n_col >= G_MAXINT / sizeof (_XPMColor)) {
-+		g_warning ("XPM file has invalid number of colors");
-+  		return NULL;
-+  	}
-
- 	/* The hash is used for fast lookups of color from chars */
- 	color_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
--	name_buf = g_new (gchar, n_col * (cpp + 1));
--	colors = g_new (_XPMColor, n_col);
-+ 	name_buf = malloc (n_col * (cpp + 1));
-+ 	if (!name_buf) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		return NULL;
-+ 	}
-+ 	colors = (_XPMColor *) malloc (sizeof (_XPMColor) * n_col);
-+ 	if (!colors) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		free (name_buf);
-+ 		return NULL;
-+ 	}
-
- 	for (cnt = 0; cnt < n_col; cnt++) {
- 		gchar *color_name;
-@@ -397,20 +409,16 @@
- 			fallbackcolor = color;
- 	}
-
--	if (is_trans)
--		pixels = malloc (w * h * 4);
--	else
--		pixels = malloc (w * h * 3);
--
--	if (!pixels) {
-+	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h);
-+	if (!pixbuf) {
- 		g_hash_table_destroy (color_hash);
--		g_free (colors);
--		g_free (name_buf);
-+		free (colors);
-+		free (name_buf);
- 		return NULL;
- 	}
-
- 	wbytes = w * cpp;
--	pixtmp = pixels;
-+	pixtmp = pixbuf->pixels;
-
- 	for (ycnt = 0; ycnt < h; ycnt++) {
- 		buffer = (*get_buf) (op_body, handle);
-@@ -440,12 +448,10 @@
- 	}
-
- 	g_hash_table_destroy (color_hash);
--	g_free (colors);
--	g_free (name_buf);
-+	free (colors);
-+	free (name_buf);
-
--	return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8,
--					 w, h, is_trans ? (w * 4) : (w * 3),
--					 free_buffer, NULL);
-+	return pixbuf;
- }
-
- /* Shared library entry point for file loading */
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S	2006-08-24 22:44:29.000000000 +0200
-@@ -3,6 +3,12 @@
- gcc2_compiled.:
- .text
- 	.align 16
-+
-+/* Magic indicating no need for an executable stack */
-+#if !defined __powerpc64__ && !defined __ia64__
-+.section .note.GNU-stack;  .previous
-+#endif
-+
- .globl pixops_composite_line_22_4a4_mmx
- 	.type	 pixops_composite_line_22_4a4_mmx,@function
- /*
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S	2006-08-24 22:44:29.000000000 +0200
-@@ -3,6 +3,12 @@
- gcc2_compiled.:
- .text
- 	.align 16
-+
-+/* Magic indicating no need for an executable stack */
-+#if !defined __powerpc64__ && !defined __ia64__
-+.section .note.GNU-stack;  .previous
-+#endif
-+
- .globl pixops_composite_line_color_22_4a4_mmx
- 	.type	 pixops_composite_line_color_22_4a4_mmx,@function
- /*
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/have_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/have_mmx.S
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/have_mmx.S	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/have_mmx.S	2006-08-24 22:44:29.000000000 +0200
-@@ -3,6 +3,12 @@
- gcc2_compiled.:
- .text
- 	.align 16
-+
-+/* Magic indicating no need for an executable stack */
-+#if !defined __powerpc64__ && !defined __ia64__
-+.section .note.GNU-stack;  .previous
-+ #endif
-+
- .globl pixops_have_mmx
- 	.type	 pixops_have_mmx,@function
-
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/scale_line_22_33_mmx.S gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/scale_line_22_33_mmx.S
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/pixops/scale_line_22_33_mmx.S	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/scale_line_22_33_mmx.S	2006-08-24 22:44:29.000000000 +0200
-@@ -3,6 +3,12 @@
- gcc2_compiled.:
- .text
- 	.align 16
-+
-+/* Magic indicating no need for an executable stack */
-+#if !defined __powerpc64__ && !defined __ia64__
-+.section .note.GNU-stack;  .previous
-+#endif
-+
- .globl pixops_scale_line_22_33_mmx
- 	.type	 pixops_scale_line_22_33_mmx,@function
- /*
-diff -Naur gdk-pixbuf-0.22.0.orig/gdk-pixbuf.m4 gdk-pixbuf-0.22.0/gdk-pixbuf.m4
---- gdk-pixbuf-0.22.0.orig/gdk-pixbuf.m4	2006-08-24 22:42:29.000000000 +0200
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf.m4	2006-08-24 22:44:19.000000000 +0200
-@@ -9,7 +9,7 @@
- dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
- dnl
--AC_DEFUN(AM_PATH_GDK_PIXBUF,
-+AC_DEFUN([AM_PATH_GDK_PIXBUF],
- [dnl
- dnl Get the cflags and libraries from the gdk-pixbuf-config script
- dnl
From priyank at frugalware.org  Sun Oct 14 22:09:41 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 22:09:42 2007
Subject: [Frugalware-git] frugalware-current: compiz-0.6.0-3-i686
Message-ID: <20071014200941.343DF1678009@genesis.frugalware.org>

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

commit 12f5f718864b80adafc1e0fd533557ceb5c843ac
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 01:34:36 2007 +0530

compiz-0.6.0-3-i686
* Moved to x11-extra
* Splitted into compiz, compiz-gnome and compiz-kde packages.
* small fixes

diff --git a/source/gnome-extra/compiz/FrugalBuild b/source/gnome-extra/compiz/FrugalBuild
deleted file mode 100644
index 040ae2f..0000000
--- a/source/gnome-extra/compiz/FrugalBuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Compiling Time: 0.30 SBU
-# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
-
-pkgname=compiz
-pkgver=0.6.0
-pkgrel=2
-pkgdesc="Compiz is a compositing window manager using GLX_EXT_texture_from_pixmap"
-url="http://www.compiz.org"
-depends=('libgl' 'libglx' 'gconf' 'librsvg' 'libpng' 'control-center' 'gnome-desktop>=2.20.0' 'libxcomposite' 'libxfixes' \
-	 'libxdamage' 'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libwnck>=2.20.0' 'libxrender' \
-	 'libxslt' 'dbus')
-makedepends=('perl-xml')
-groups=('gnome-extra')
-archs=('i686' 'x86_64')
-_F_gnome_schemas=('/etc/gconf/schemas/gwd.schemas' \
-		'/etc/gconf/schemas/compiz-zoom.schemas' \
-		'/etc/gconf/schemas/compiz-wobbly.schemas' \
-		'/etc/gconf/schemas/compiz-water.schemas' \
-		'/etc/gconf/schemas/compiz-video.schemas' \
-		'/etc/gconf/schemas/compiz-switcher.schemas' \
-		'/etc/gconf/schemas/compiz-svg.schemas' \
-		'/etc/gconf/schemas/compiz-screenshot.schemas' \
-		'/etc/gconf/schemas/compiz-scale.schemas' \
-		'/etc/gconf/schemas/compiz-rotate.schemas' \
-		'/etc/gconf/schemas/compiz-resize.schemas' \
-		'/etc/gconf/schemas/compiz-regex.schemas' \
-		'/etc/gconf/schemas/compiz-png.schemas' \
-		'/etc/gconf/schemas/compiz-plane.schemas' \
-		'/etc/gconf/schemas/compiz-place.schemas' \
-		'/etc/gconf/schemas/compiz-move.schemas' \
-		'/etc/gconf/schemas/compiz-minimize.schemas' \
-		'/etc/gconf/schemas/compiz-inotify.schemas' \
-		'/etc/gconf/schemas/compiz-ini.schemas' \
-		'/etc/gconf/schemas/compiz-glib.schemas' \
-		'/etc/gconf/schemas/compiz-gconf.schemas' \
-		'/etc/gconf/schemas/compiz-fs.schemas' \
-		'/etc/gconf/schemas/compiz-fade.schemas' \
-		'/etc/gconf/schemas/compiz-decoration.schemas' \
-		'/etc/gconf/schemas/compiz-dbus.schemas' \
-		'/etc/gconf/schemas/compiz-cube.schemas' \
-		'/etc/gconf/schemas/compiz-core.schemas' \
-		'/etc/gconf/schemas/compiz-clone.schemas' \
-		'/etc/gconf/schemas/compiz-blur.schemas' \
-		'/etc/gconf/schemas/compiz-annotate.schemas')
-Finclude gnome-scriptlet
-up2date="lynx -dump http://www.compiz.org/index.php?title=Home:Start | grep development | Flasttar"
-source=(http://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.gz)
-defaultplugins="png,svg,decoration,fade,minimize,move,place,resize,water,wobbly,minimize,cube,switcher,scale,rotate"
-Fconfopts="$Fconfopts --enable-librsvg --disable-metacity --enable-gnome --enable-gtk --with-scale-corner=no --with-default-plugins=$defaultplugins"
-sha1sums=('c296f9ccf0e35c582760880a6f0ac4fd34ee1bbf')
-
-# optimization OK
diff --git a/source/x11-extra/compiz/FrugalBuild b/source/x11-extra/compiz/FrugalBuild
new file mode 100644
index 0000000..0483d52
--- /dev/null
+++ b/source/x11-extra/compiz/FrugalBuild
@@ -0,0 +1,101 @@
+# Compiling Time: 0.30 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=compiz
+pkgver=0.6.0
+pkgrel=3
+pkgdesc="Compiz is a compositing window manager using GLX_EXT_texture_from_pixmap"
+url="http://www.compiz.org"
+depends=('libgl' 'libglx' 'libpng' 'libxcomposite' 'libxfixes' 'libxdamage' \
+		'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libxrender' \
+		'libxslt' 'dbus')
+makedepends=('kdebase>=3.5.7' 'perl-xml' 'fixesproto' 'damageproto' 'gnome-control-center>=2.20.0' 'gconf' 'metacity>=2.20.0')
+groups=('x11-extra')
+archs=('i686' 'x86_64')
+up2date="lynx -dump http://www.compiz.org/index.php?title=Home:Start | grep development | Flasttar"
+source=(http://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.gz)
+sha1sums=('c296f9ccf0e35c582760880a6f0ac4fd34ee1bbf')
+_F_gnome_schemas=('/etc/gconf/schemas/gwd.schemas' \
+		'/etc/gconf/schemas/compiz-zoom.schemas' \
+		'/etc/gconf/schemas/compiz-wobbly.schemas' \
+		'/etc/gconf/schemas/compiz-water.schemas' \
+		'/etc/gconf/schemas/compiz-video.schemas' \
+		'/etc/gconf/schemas/compiz-switcher.schemas' \
+		'/etc/gconf/schemas/compiz-svg.schemas' \
+		'/etc/gconf/schemas/compiz-screenshot.schemas' \
+		'/etc/gconf/schemas/compiz-scale.schemas' \
+		'/etc/gconf/schemas/compiz-rotate.schemas' \
+		'/etc/gconf/schemas/compiz-resize.schemas' \
+		'/etc/gconf/schemas/compiz-regex.schemas' \
+		'/etc/gconf/schemas/compiz-png.schemas' \
+		'/etc/gconf/schemas/compiz-plane.schemas' \
+		'/etc/gconf/schemas/compiz-place.schemas' \
+		'/etc/gconf/schemas/compiz-move.schemas' \
+		'/etc/gconf/schemas/compiz-minimize.schemas' \
+		'/etc/gconf/schemas/compiz-inotify.schemas' \
+		'/etc/gconf/schemas/compiz-ini.schemas' \
+		'/etc/gconf/schemas/compiz-glib.schemas' \
+		'/etc/gconf/schemas/compiz-gconf.schemas' \
+		'/etc/gconf/schemas/compiz-fs.schemas' \
+		'/etc/gconf/schemas/compiz-fade.schemas' \
+		'/etc/gconf/schemas/compiz-decoration.schemas' \
+		'/etc/gconf/schemas/compiz-dbus.schemas' \
+		'/etc/gconf/schemas/compiz-cube.schemas' \
+		'/etc/gconf/schemas/compiz-core.schemas' \
+		'/etc/gconf/schemas/compiz-clone.schemas' \
+		'/etc/gconf/schemas/compiz-blur.schemas' \
+		'/etc/gconf/schemas/compiz-annotate.schemas')
+Finclude gnome-scriptlet
+unset install
+
+subpkgs=("$pkgname-gnome" "$pkgname-kde")
+subdescs=('Compiz for GNOME' 'Compiz for KDE')
+subdepends=("$pkgname=$pkgver librsvg metacity>=2.20.0 gnome-control-center>=2.20.0 gconf" \
+	"$pkgname=$pkgver kdebase>=3.5.7")
+subinstall=("$_F_gnome_scriptlet" "")
+subgroups=('gnome-extra' 'kde-extra')
+subarchs=('i686 x86_64' 'i686 x86_64')
+
+
+build() {
+	Fbuild --enable-gconf --enable-librsvg --enable-metacity --enable-gnome \
+		--enable-kde --enable-gtk --with-scale-corner=no
+
+	Fsplit compiz-gnome usr/share/gnome/
+	Fsplit compiz-gnome usr/share/gnome-control-center/
+	Fsplit compiz-gnome usr/bin/gtk-window-decorator
+	Fsplit compiz-gnome etc/gconf/schemas/gwd.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-zoom.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-wobbly.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-water.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-video.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-switcher.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-svg.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-screenshot.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-scale.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-rotate.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-resize.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-regex.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-png.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-plane.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-place.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-move.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-minimize.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-inotify.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-ini.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-glib.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-gconf.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-fs.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-fade.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-decoration.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-dbus.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-cube.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-core.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-clone.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-blur.schemas
+	Fsplit compiz-gnome etc/gconf/schemas/compiz-annotate.schemas
+	Fsplit compiz-kde usr/bin/kde-window-decorator
+	Fbuild_gnome_scriptlet
+}
+
+# optimization OK
From priyank at frugalware.org  Sun Oct 14 22:18:37 2007
From: priyank at frugalware.org (Priyank)
Date: Sun Oct 14 22:18:41 2007
Subject: [Frugalware-git] frugalware-current: compiz-0.6.0-3-i686
Message-ID: <20071014201837.D55D81678009@genesis.frugalware.org>

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

commit 981ffffc474c5c1f6144ec8388b939e3977189eb
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 01:46:44 2007 +0530

compiz-0.6.0-3-i686
* indentation fixes

diff --git a/source/x11-extra/compiz/FrugalBuild b/source/x11-extra/compiz/FrugalBuild
index 0483d52..415437f 100644
--- a/source/x11-extra/compiz/FrugalBuild
+++ b/source/x11-extra/compiz/FrugalBuild
@@ -7,8 +7,8 @@ pkgrel=3
pkgdesc="Compiz is a compositing window manager using GLX_EXT_texture_from_pixmap"
url="http://www.compiz.org"
depends=('libgl' 'libglx' 'libpng' 'libxcomposite' 'libxfixes' 'libxdamage' \
-		'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libxrender' \
-		'libxslt' 'dbus')
+	'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libxrender' \
+	'libxslt' 'dbus')
makedepends=('kdebase>=3.5.7' 'perl-xml' 'fixesproto' 'damageproto' 'gnome-control-center>=2.20.0' 'gconf' 'metacity>=2.20.0')
groups=('x11-extra')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Sun Oct 14 22:20:54 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 22:20:57 2007
Subject: [Frugalware-git] frugalware-current: xmms-1.2.10-13-i686
Message-ID: <20071014202054.D2F691678009@genesis.frugalware.org>

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

commit 9de39df784606c21625d8e1f7121caca0b19ae01
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 22:15:23 2007 +0200

xmms-1.2.10-13-i686
* moved to -extra

diff --git a/source/xapps-extra/xmms/FrugalBuild b/source/xapps-extra/xmms/FrugalBuild
new file mode 100644
index 0000000..3c4564e
--- /dev/null
+++ b/source/xapps-extra/xmms/FrugalBuild
@@ -0,0 +1,36 @@
+# Compiling Time: 0.80 SBU
+# Maintainer: VMiklos <vmiklos@frugalware.org>
+
+pkgname=xmms
+pkgver=1.2.10
+pkgrel=13
+pkgdesc="The X MultiMedia System"
+url="http://www.xmms.org"
+depends=('gtk+' 'libvorbis' 'alsa-lib' 'libmikmod')
+makedepends=('esd' 'libglx' 'mesa')
+groups=('xapps-extra')
+archs=('i686' 'x86_64')
+provides=('songplayer')
+up2date="lynx -dump http://www.xmms.org/download.php|grep ^XMMS|cut -d ' ' -f 2"
+source=(http://www.xmms.org/files/1.2.x/$pkgname-$pkgver.tar.bz2 \
+	$pkgname.desktop \
+	http://ftp.frugalware.org/pub/other/sources/xmms/xmms-cvs-20070427-backport.patch.bz2 \
+	xmms-1.2.10-cvs-fw.patch SA23986.diff)
+[ "$CARCH" == "x86_64" ] && confopts=--disable-simd
+[ "$CARCH" != "x86_64" ] && confopts=--enable-simd
+
+build() {
+	Fpatchall
+	chmod +x $Fsrcdir/$pkgname-$pkgver/po/update.pl || Fdie
+	sh autogen.sh || Fdie
+	Fmake $confopts
+	Fmakeinstall
+	Ffile /usr/share/applnk/Multimedia/xmms.desktop
+}
+
+sha1sums=('a3c3d3756d5263183c27b3c50a7f5404cba8bfaf'\
+          'af83776c2704f950957b161b1f408d4e17130c69'\
+          '8fb12ff8b74c8dbc6222f2e13e21b2bb8542cd1b'\
+          '7d5c91904c0c93bc058ead66aac36d955652683b'\
+          'b1d3a803950ce4d83090a43d5b076afd48c135b5')
+# optimization OK
diff --git a/source/xapps-extra/xmms/SA23986.diff b/source/xapps-extra/xmms/SA23986.diff
new file mode 100644
index 0000000..f70b495
--- /dev/null
+++ b/source/xapps-extra/xmms/SA23986.diff
@@ -0,0 +1,43 @@
+--- xmms-1.2.10/xmms/bmp.c.orig	2007-04-05 21:59:08.000000000 +0200
++++ xmms-1.2.10/xmms/bmp.c	2007-04-05 22:02:38.000000000 +0200
+@@ -19,6 +19,12 @@
+  */
+ #include "xmms.h"
+
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(UINT32_MAX)
++#define UINT32_MAX 0xffffffffU
++#endif
++
+ struct rgb_quad
+ {
+ 	guchar rgbBlue;
+@@ -183,7 +189,7 @@
+ 	}
+ 	else if (bitcount != 24 && bitcount != 16 && bitcount != 32)
+ 	{
+-		gint ncols, i;
++		guint32 ncols, i;
+
+ 		ncols = offset - headSize - 14;
+ 		if (headSize == 12)
+@@ -201,9 +207,17 @@
+ 		}
+ 	}
+ 	fseek(file, offset, SEEK_SET);
++	/* verify buffer size */
++	if (!h || !w ||
++			w > (((UINT32_MAX - 3) / 3) / h) ||
++			h > (((UINT32_MAX - 3) / 3) / w)) {
++		g_warning("read_bmp(): width(%u)*height(%u) too large", w, h);
++		fclose(file);
++		return NULL;
++	}
++	data = g_malloc0((w * 3 * h) + 3);      /* +3 is just for safety */
+ 	buffer = g_malloc(imgsize);
+ 	fread(buffer, imgsize, 1, file);
+-	data = g_malloc0((w * 3 * h) + 3);	/* +3 is just for safety */
+
+ 	if (bitcount == 1)
+ 		read_1b_rgb(buffer, imgsize, data, w, h, rgb_quads);
diff --git a/source/xapps-extra/xmms/xmms-1.2.10-cvs-fw.patch b/source/xapps-extra/xmms/xmms-1.2.10-cvs-fw.patch
new file mode 100644
index 0000000..4b9888c
--- /dev/null
+++ b/source/xapps-extra/xmms/xmms-1.2.10-cvs-fw.patch
@@ -0,0 +1,376 @@
+diff -Naur xmms-1.2.10.orig/Output/esd/esdout.h xmms-1.2.10/Output/esd/esdout.h
+--- xmms-1.2.10.orig/Output/esd/esdout.h	2006-10-02 12:48:27.000000000 +0200
++++ xmms-1.2.10/Output/esd/esdout.h	2006-10-02 12:49:37.000000000 +0200
+@@ -58,6 +58,7 @@
+ ESDConfig;
+
+ extern ESDConfig esd_cfg;
++extern void esdout_reset_playerid(void);
+
+ void esdout_init(void);
+ void esdout_about(void);
+diff -Naur xmms-1.2.10.orig/xmms/main.c xmms-1.2.10/xmms/main.c
+--- xmms-1.2.10.orig/xmms/main.c	2006-10-02 12:48:27.000000000 +0200
++++ xmms-1.2.10/xmms/main.c	2006-10-02 13:37:32.000000000 +0200
+@@ -112,6 +112,7 @@
+ void mainwin_options_menu_callback(gpointer cb_data, guint action, GtkWidget * w);
+ void mainwin_volume_motioncb(gint pos);
+ static void set_timer_mode_menu_cb(TimerMode mode);
++static void mainwin_jump_to_file(void);
+ static void mainwin_queue_manager_queue_refresh(GtkWidget * widget, gpointer userdata);
+
+ enum
+@@ -255,7 +256,7 @@
+ enum
+ {
+ 	MAINWIN_GENERAL_ABOUT, MAINWIN_GENERAL_PLAYFILE, MAINWIN_GENERAL_PLAYDIRECTORY,
+-	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_FILEINFO,
++	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_PLAYAUDIOCD, MAINWIN_GENERAL_FILEINFO,
+ 	MAINWIN_GENERAL_SHOWMWIN, MAINWIN_GENERAL_SHOWPLWIN,
+ 	MAINWIN_GENERAL_SHOWEQWIN, MAINWIN_GENERAL_PREV, MAINWIN_GENERAL_PLAY,
+ 	MAINWIN_GENERAL_PAUSE, MAINWIN_GENERAL_STOP, MAINWIN_GENERAL_NEXT,
+@@ -271,9 +272,11 @@
+ {
+ 	{N_("/About XMMS"), NULL, mainwin_general_menu_callback, MAINWIN_GENERAL_ABOUT, "<Item>"},
+ 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
+-	{N_("/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
+-	{N_("/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
+-	{N_("/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
++	{N_("/Play"), NULL, NULL, 0, "<Branch>"},
++	{N_("/Play/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
++	{N_("/Play/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
++	{N_("/Play/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
++	{N_("/Play/Play AudioCD"), "<control>C", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYAUDIOCD, "<Item>"},
+ 	{N_("/View File Info"), "<control>3" , mainwin_general_menu_callback, MAINWIN_GENERAL_FILEINFO, "<Item>"},
+ 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
+ 	{N_("/Main Window"), "<alt>W", mainwin_general_menu_callback, MAINWIN_GENERAL_SHOWMWIN, "<ToggleItem>"},
+@@ -322,6 +325,21 @@
+ 	g_free(filename);
+ }
+
++#ifndef CDDA_DIRECTORY
++# ifdef HAVE_SYS_CDIO_H
++#  ifdef __FreeBSD__
++#   define CDDA_DIRECTORY "/cdrom"
++#  elif defined __OpenBSD__
++#   define CDDA_DIRECTORY "/cdrom"
++#  else
++#   define CDDA_DIRECTORY "/cdrom/cdrom"
++#  endif
++# else
++#   define CDDA_DIRECTORY "/mnt/cdrom"
++# endif
++#endif
++
++
+ static void read_config(void)
+ {
+ 	ConfigFile *cfgfile;
+@@ -366,6 +384,10 @@
+ 	cfg.snap_distance = 10;
+ 	cfg.pause_between_songs_time = 2;
+
++	/** Added by Tatu Lahtela */
++	cfg.mousewheel_scroll_amount = 10;
++	/* end */
++
+ 	cfg.vis_type = VIS_ANALYZER;
+ 	cfg.analyzer_mode = ANALYZER_NORMAL;
+ 	cfg.analyzer_type = ANALYZER_BARS;
+@@ -381,6 +403,8 @@
+
+ 	cfg.gentitle_format = NULL;
+
++	cfg.cdda_directory = CDDA_DIRECTORY;
++
+ 	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
+ 	cfgfile = xmms_cfg_open_file(filename);
+ 	if (cfgfile)
+@@ -442,6 +466,7 @@
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "equalizer_autoload", &cfg.equalizer_autoload);
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "easy_move", &cfg.easy_move);
+ 		xmms_cfg_read_float(cfgfile, "xmms", "equalizer_preamp", &cfg.equalizer_preamp);
++		xmms_cfg_read_string(cfgfile, "xmms", "cdda_directory", &cfg.cdda_directory);
+ 		for (i = 0; i < 10; i++)
+ 		{
+ 			gchar eqtext[18];
+@@ -465,6 +490,9 @@
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "random_skin_on_play", &cfg.random_skin_on_play);
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "pause_between_songs", &cfg.pause_between_songs);
+ 		xmms_cfg_read_int(cfgfile, "xmms", "pause_between_songs_time", &cfg.pause_between_songs_time);
++		/** Added by Tatu Lahtela */
++		xmms_cfg_read_int(cfgfile, "xmms", "mousewheel_scroll_amount", &cfg.mousewheel_scroll_amount);
++		/* end */
+ 		xmms_cfg_read_int(cfgfile, "xmms", "mouse_wheel_change", &cfg.mouse_change);
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "show_wm_decorations", &cfg.show_wm_decorations);
+ 		if (xmms_cfg_read_int(cfgfile, "xmms", "url_history_length", &length))
+@@ -616,10 +644,14 @@
+ 	xmms_cfg_write_boolean(cfgfile, "xmms", "random_skin_on_play", cfg.random_skin_on_play);
+ 	xmms_cfg_write_boolean(cfgfile, "xmms", "pause_between_songs", cfg.pause_between_songs);
+ 	xmms_cfg_write_int(cfgfile, "xmms", "pause_between_songs_time", cfg.pause_between_songs_time);
++	/** Added by Tatu Lahtela */
++	xmms_cfg_write_int(cfgfile, "xmms", "mousewheel_scroll_amount", cfg.mousewheel_scroll_amount);
++	/* end */
+ 	xmms_cfg_write_int(cfgfile, "xmms", "mouse_wheel_change", cfg.mouse_change);
+ 	xmms_cfg_write_boolean(cfgfile, "xmms", "show_wm_decorations", cfg.show_wm_decorations);
+ 	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_default_file", cfg.eqpreset_default_file);
+ 	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_extension", cfg.eqpreset_extension);
++	xmms_cfg_write_string(cfgfile, "xmms", "cdda_direcory", cfg.cdda_directory);
+ 	for (i = 0; i < 10; i++)
+ 	{
+ 		str = g_strdup_printf("equalizer_band%d", i);
+@@ -1405,22 +1437,47 @@
+ 	{
+ 	case GDK_Up:
+ 	case GDK_KP_Up:
++	case GDK_KP_8:
+ 		mainwin_set_volume_diff(2);
+ 		break;
+ 	case GDK_Down:
+ 	case GDK_KP_Down:
++	case GDK_KP_2:
+ 		mainwin_set_volume_diff(-2);
+ 		break;
+ 	case GDK_Left:
+ 	case GDK_KP_Left:
++	case GDK_KP_7:
+ 		if(playlist_get_current_length() != -1)
+ 			input_seek(CLAMP(input_get_time() - 5000, 0, playlist_get_current_length()) / 1000);
+ 		break;
+ 	case GDK_Right:
+ 	case GDK_KP_Right:
++	case GDK_KP_9:
+ 		if(playlist_get_current_length() != -1)
+ 			input_seek(CLAMP(input_get_time() + 5000, 0, playlist_get_current_length()) / 1000);
+ 		break;
++	case GDK_KP_0:
++		mainwin_eject_pushed();
++		break;
++	case GDK_KP_1:
++		playlist_set_position((((get_playlist_position() - 10) >= 0) ? get_playlist_position() - 10 : 0));
++		break;
++	case GDK_KP_3:
++		playlist_set_position((((get_playlist_position() + 10) < get_playlist_length()) ? (get_playlist_position() + 10) : (get_playlist_length() - 1)));
++		break;
++	case GDK_KP_4:
++		playlist_prev();
++		break;
++	case GDK_KP_5:
++		mainwin_play_pushed();
++		break;
++	case GDK_KP_6:
++		playlist_next();
++		break;
++	case GDK_KP_Decimal:
++		mainwin_jump_to_file();
++		break;
+ 	default:
+ 	     break;
+
+@@ -2998,6 +3055,12 @@
+ 	case MAINWIN_GENERAL_PLAYLOCATION:
+ 		mainwin_show_add_url_window();
+ 		break;
++	case MAINWIN_GENERAL_PLAYAUDIOCD:
++		if (cfg.cdda_directory != NULL)
++		{
++			mainwin_add_dir_handler(cfg.cdda_directory);
++		}
++		break;
+ 	case MAINWIN_GENERAL_FILEINFO:
+ 		playlist_fileinfo_current();
+ 		break;
+diff -Naur xmms-1.2.10.orig/xmms/main.h xmms-1.2.10/xmms/main.h
+--- xmms-1.2.10.orig/xmms/main.h	2006-10-02 12:48:27.000000000 +0200
++++ xmms-1.2.10/xmms/main.h	2006-10-02 12:50:19.000000000 +0200
+@@ -59,7 +59,9 @@
+ 	gboolean pause_between_songs, show_wm_decorations;
+ 	gint mouse_change;
+ 	gboolean playlist_transparent;
+-        gchar *gentitle_format;
++   gchar *gentitle_format;
++   gint mousewheel_scroll_amount;
++ 	gchar *cdda_directory;
+ }
+ Config;
+
+diff -Naur xmms-1.2.10.orig/xmms/playlistwin.c xmms-1.2.10/xmms/playlistwin.c
+--- xmms-1.2.10.orig/xmms/playlistwin.c	2006-10-02 12:48:27.000000000 +0200
++++ xmms-1.2.10/xmms/playlistwin.c	2006-10-02 12:50:30.000000000 +0200
+@@ -1274,9 +1274,25 @@
+ 		grab = FALSE;
+ 	}
+ 	else if (event->button == 4) /* Scrollwheel up */
+-		playlistwin_scroll(-3);
++	  /** Added by Tatu Lahtela */
++	  if ( cfg.mousewheel_scroll_amount ) {
++	    playlistwin_scroll(-1*cfg.mousewheel_scroll_amount );
++	  }
++	  else {
++	    playlistwin_scroll(-10);
++	  }
++	/* end */
++
+ 	else if(event->button == 5) /* Scrollwheel down */
+-		playlistwin_scroll(3);
++	  /** Added by Tatu Lahtela */
++	  if ( cfg.mousewheel_scroll_amount ) {
++	    playlistwin_scroll(cfg.mousewheel_scroll_amount ) ;
++	      //playlistwin_scroll(10);
++	      }
++	  else {
++		playlistwin_scroll(10);
++	  }
++	/* end */
+ 	else
+ 	{
+ 		handle_press_cb(playlistwin_wlist, widget, event);
+diff -Naur xmms-1.2.10.orig/xmms/prefswin.c xmms-1.2.10/xmms/prefswin.c
+--- xmms-1.2.10.orig/xmms/prefswin.c	2006-10-02 12:48:27.000000000 +0200
++++ xmms-1.2.10/xmms/prefswin.c	2006-10-02 13:19:37.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include "xmms.h"
+ #include "libxmms/util.h"
+ #include "libxmms/titlestring.h"
++#include "libxmms/dirbrowser.h"
+
+ static GtkWidget *prefswin, *prefswin_notebook, *prefswin_ok;
+ static GtkWidget *prefswin_audio_ie_cbox;
+@@ -37,11 +38,16 @@
+ static GtkWidget *prefswin_options_font_entry, *prefswin_options_font_browse;
+ static GtkWidget *prefswin_options_fontset, *prefswin_mainwin_font_entry;
+ static GtkWidget *prefswin_mainwin_xfont, *prefswin_options_mouse_spin;
++/** Added by Tatu Lahtela */
++static GtkWidget *prefswin_options_mousewheel;
++/* end */
+ static gboolean updating_ilist = FALSE, updating_glist = FALSE, updating_vlist = FALSE, updating_elist = FALSE;
+
+ static GtkWidget *prefswin_title_entry;
+ static GtkTooltips *prefswin_tooltips;
+
++static GtkWidget *prefswin_audiocd_cddadirectory;
++
+ extern MenuRow *mainwin_menurow;
+
+ extern PButton *playlistwin_shade, *playlistwin_close, *equalizerwin_close;
+@@ -350,6 +356,11 @@
+ 	cfg.gentitle_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_title_entry)));
+ 	cfg.pause_between_songs_time = CLAMP(atoi(gtk_entry_get_text(GTK_ENTRY(prefswin_options_pbs_entry))), 0, 1000);
+ 	cfg.mouse_change = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mouse_spin));
++	cfg.cdda_directory = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)));
++
++	/** Added by Tatu Lahtela */
++	cfg.mousewheel_scroll_amount = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mousewheel));
++	/* end */
+
+ 	set_current_output_plugin(selected_oplugin);
+
+@@ -493,6 +504,21 @@
+ 	gtk_clist_select_row(clist, sel, 0);
+ }
+
++static void prefswin_audiocd_browse_handler(gchar *dir)
++{
++	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), dir);
++}
++
++static gint prefswin_audiocd_browse_cb(GtkWidget * w, gpointer data)
++{
++	GtkWidget *prefswin_audiocd_browser;
++	prefswin_audiocd_browser = xmms_create_dir_browser(_("Select directory to add:"), gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)), GTK_SELECTION_SINGLE, prefswin_audiocd_browse_handler);
++	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &prefswin_audiocd_browser);
++	gtk_window_set_transient_for(GTK_WINDOW(prefswin_audiocd_browser), GTK_WINDOW(prefswin));
++	gtk_widget_show(prefswin_audiocd_browser);
++	return (TRUE);
++}
++
+ void prefswin_vplugins_rescan(void)
+ {
+ 	gint sel;
+@@ -702,6 +728,10 @@
+ 	GtkWidget *prefswin_title_frame, *prefswin_title_vbox;
+ 	GtkWidget *prefswin_title_hbox, *prefswin_title_vbox2;
+
++	GtkWidget *prefswin_audiocd_frame, *prefswin_audiocd_vbox;
++	GtkWidget *prefswin_audiocd_hbox, *prefswin_audiocd_browse;
++	GtkWidget *prefswin_audiocd_label;
++
+ 	GtkWidget *options_table;
+ 	GtkWidget *options_giop, *options_giod, *options_giol, *options_rt;
+ 	GtkWidget *options_sw, *options_sw_box, *options_sw_label;
+@@ -711,6 +741,12 @@
+ 	GtkWidget *options_font_hbox, *options_font_vbox;
+ 	GtkWidget *options_mouse_box, *options_mouse_label;
+ 	GtkObject *options_mouse_adj;
++
++	/** Added by Tatu Lahtela */
++	GtkWidget *options_mousewheel_scroll_box, *options_mousewheel_scroll_label;
++	GtkObject *options_mousewheel_scroll_adj;
++	/* end */
++
+ 	GtkWidget *prefswin_title_desc, *prefswin_title_label, *prefswin_moreinfo_label, *opt;
+
+ 	char *titles[1];
+@@ -1047,6 +1083,18 @@
+ 	opt = prefswin_option_new_with_label_to_table(&cfg.use_pl_metadata,
+ 						      _("Use meta-data in playlists"),
+ 						      GTK_TABLE(options_table), 1, 8);
++
++	/** Added by Tatu Lahtela */
++	options_mousewheel_scroll_box = gtk_hbox_new(FALSE, 5);
++	options_mousewheel_scroll_label = gtk_label_new(_("Mouse wheel scrolls playlist by (lines)"));
++	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), options_mousewheel_scroll_label, FALSE, FALSE, 0);
++	options_mousewheel_scroll_adj = gtk_adjustment_new(cfg.mousewheel_scroll_amount, 1, 100, 1, 1, 1);
++	prefswin_options_mousewheel = gtk_spin_button_new(GTK_ADJUSTMENT(options_mousewheel_scroll_adj), 1, 0);
++	gtk_widget_set_usize(prefswin_options_mousewheel, 45, -1);
++	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), prefswin_options_mousewheel, FALSE, FALSE, 0);
++	gtk_table_attach_defaults(GTK_TABLE(options_table), options_mousewheel_scroll_box, 0, 1, 9, 10);
++	/* end */
++
+ 	gtk_tooltips_set_tip(prefswin_tooltips, opt,
+ 			     _("Store information such as song title and "
+ 			       "length to playlists"), NULL);
+@@ -1147,6 +1195,30 @@
+
+ 	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_title_vbox, gtk_label_new(_("Title")));
+
++	/*
++	 * Audio CD page
++	 */
++	prefswin_audiocd_vbox = gtk_vbox_new(FALSE, 0);
++
++	prefswin_audiocd_frame = gtk_frame_new(_("Audio CD Directory"));
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_vbox), prefswin_audiocd_frame, FALSE, FALSE, 0);
++	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_frame), 5);
++
++	prefswin_audiocd_hbox = gtk_hbox_new(FALSE, 10);
++	gtk_container_add(GTK_CONTAINER(prefswin_audiocd_frame), prefswin_audiocd_hbox);
++	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_hbox), 5);
++
++	prefswin_audiocd_label = gtk_label_new(_("Directory:"));
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_label, FALSE, FALSE, 0);
++
++	prefswin_audiocd_cddadirectory = gtk_entry_new();
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_cddadirectory, TRUE, TRUE, 0);
++
++	prefswin_audiocd_browse = gtk_button_new_with_label(_("Browse"));
++	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browse), "clicked", GTK_SIGNAL_FUNC(prefswin_audiocd_browse_cb), NULL);
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_browse, TRUE, TRUE, 0);
++
++	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_audiocd_vbox, gtk_label_new(_("Audio CD")));
+
+ 	/*
+ 	 * OK, Cancel & Apply
+@@ -1392,6 +1464,12 @@
+ 	gtk_entry_set_text(GTK_ENTRY(prefswin_options_pbs_entry), temp);
+ 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mouse_spin), cfg.mouse_change);
+
++	/** Added by Tatu Lahtela */
++	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mousewheel), cfg.mousewheel_scroll_amount);
++	/* end */
++
++	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), cfg.cdda_directory);
++
+  	gtk_widget_show_all(prefswin);
+ 	gtk_widget_grab_default(prefswin_ok);
+
diff --git a/source/xapps-extra/xmms/xmms-1.2.10-fw.patch.skip b/source/xapps-extra/xmms/xmms-1.2.10-fw.patch.skip
new file mode 100644
index 0000000..71c4edf
--- /dev/null
+++ b/source/xapps-extra/xmms/xmms-1.2.10-fw.patch.skip
@@ -0,0 +1,401 @@
+Initial Package Version: 1.2.10
+Origin:    		Con Kolivas, gentoo
+Description:	This is a cumulative patch including, gcc4 fix, 0060_all_keypad.patch,
+					0120_all_wheelamount.patch and 0130_all_play_audiocd.patch
+
+diff -urN xmms-1.2.10/General/ir/ir.h xmms-1.2.10_patch/General/ir/ir.h
+--- xmms-1.2.10/General/ir/ir.h	2001-03-05 14:17:44.000000000 +0100
++++ xmms-1.2.10_patch/General/ir/ir.h	2005-09-21 22:05:53.122021000 +0200
+@@ -49,8 +49,6 @@
+ }
+ irConfig;
+
+-extern pthread_t irapp_thread;
+-extern gboolean keepGoing;
+ extern irConfig ircfg;
+ extern gboolean irconf_is_going;
+
+diff -urN xmms-1.2.10/Output/esd/esdout.h xmms-1.2.10_patch/Output/esd/esdout.h
+--- xmms-1.2.10/Output/esd/esdout.h	2001-12-03 03:38:42.000000000 +0100
++++ xmms-1.2.10_patch/Output/esd/esdout.h	2005-09-21 22:05:53.122021000 +0200
+@@ -58,6 +58,7 @@
+ ESDConfig;
+
+ extern ESDConfig esd_cfg;
++extern void esdout_reset_playerid(void);
+
+ void esdout_init(void);
+ void esdout_about(void);
+diff -urN xmms-1.2.10/xmms/main.c xmms-1.2.10_patch/xmms/main.c
+--- xmms-1.2.10/xmms/main.c	2004-02-23 21:31:43.000000000 +0100
++++ xmms-1.2.10_patch/xmms/main.c	2005-09-21 22:11:12.727433592 +0200
+@@ -109,6 +109,7 @@
+ void mainwin_options_menu_callback(gpointer cb_data, guint action, GtkWidget * w);
+ void mainwin_volume_motioncb(gint pos);
+ static void set_timer_mode_menu_cb(TimerMode mode);
++static void mainwin_jump_to_file(void);
+
+ enum
+ {
+@@ -250,7 +251,7 @@
+ enum
+ {
+ 	MAINWIN_GENERAL_ABOUT, MAINWIN_GENERAL_PLAYFILE, MAINWIN_GENERAL_PLAYDIRECTORY,
+-	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_FILEINFO,
++	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_PLAYAUDIOCD, MAINWIN_GENERAL_FILEINFO,
+ 	MAINWIN_GENERAL_SHOWMWIN, MAINWIN_GENERAL_SHOWPLWIN,
+ 	MAINWIN_GENERAL_SHOWEQWIN, MAINWIN_GENERAL_PREV, MAINWIN_GENERAL_PLAY,
+ 	MAINWIN_GENERAL_PAUSE, MAINWIN_GENERAL_STOP, MAINWIN_GENERAL_NEXT,
+@@ -266,9 +267,11 @@
+ {
+ 	{N_("/About XMMS"), NULL, mainwin_general_menu_callback, MAINWIN_GENERAL_ABOUT, "<Item>"},
+ 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
+-	{N_("/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
+-	{N_("/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
+-	{N_("/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
++	{N_("/Play"), NULL, NULL, 0, "<Branch>"},
++	{N_("/Play/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
++	{N_("/Play/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
++	{N_("/Play/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
++	{N_("/Play/Play AudioCD"), "<control>C", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYAUDIOCD, "<Item>"},
+ 	{N_("/View File Info"), "<control>3" , mainwin_general_menu_callback, MAINWIN_GENERAL_FILEINFO, "<Item>"},
+ 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
+ 	{N_("/Main Window"), "<alt>W", mainwin_general_menu_callback, MAINWIN_GENERAL_SHOWMWIN, "<ToggleItem>"},
+@@ -317,6 +320,20 @@
+ 	g_free(filename);
+ }
+
++#ifndef CDDA_DIRECTORY
++# ifdef HAVE_SYS_CDIO_H
++#  ifdef __FreeBSD__
++#   define CDDA_DIRECTORY "/cdrom"
++#  elif defined __OpenBSD__
++#   define CDDA_DIRECTORY "/cdrom"
++#  else
++#   define CDDA_DIRECTORY "/cdrom/cdrom0"
++#  endif
++# else
++#   define CDDA_DIRECTORY "/mnt/cdrom"
++# endif
++#endif
++
+ static void read_config(void)
+ {
+ 	ConfigFile *cfgfile;
+@@ -361,6 +378,10 @@
+ 	cfg.snap_distance = 10;
+ 	cfg.pause_between_songs_time = 2;
+
++	/** Added by Tatu Lahtela */
++        cfg.mousewheel_scroll_amount = 10;
++	/* end */
++
+ 	cfg.vis_type = VIS_ANALYZER;
+ 	cfg.analyzer_mode = ANALYZER_NORMAL;
+ 	cfg.analyzer_type = ANALYZER_BARS;
+@@ -375,6 +396,8 @@
+ 	cfg.mouse_change = 8;
+
+ 	cfg.gentitle_format = NULL;
++
++	cfg.cdda_directory = CDDA_DIRECTORY;
+
+ 	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
+ 	cfgfile = xmms_cfg_open_file(filename);
+@@ -436,6 +459,7 @@
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "equalizer_autoload", &cfg.equalizer_autoload);
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "easy_move", &cfg.easy_move);
+ 		xmms_cfg_read_float(cfgfile, "xmms", "equalizer_preamp", &cfg.equalizer_preamp);
++		xmms_cfg_read_string(cfgfile, "xmms", "cdda_directory", &cfg.cdda_directory);
+ 		for (i = 0; i < 10; i++)
+ 		{
+ 			gchar eqtext[18];
+@@ -459,6 +483,9 @@
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "random_skin_on_play", &cfg.random_skin_on_play);
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "pause_between_songs", &cfg.pause_between_songs);
+ 		xmms_cfg_read_int(cfgfile, "xmms", "pause_between_songs_time", &cfg.pause_between_songs_time);
++		/** Added by Tatu Lahtela */
++		xmms_cfg_read_int(cfgfile, "xmms", "mousewheel_scroll_amount", &cfg.mousewheel_scroll_amount);
++		/* end */
+ 		xmms_cfg_read_int(cfgfile, "xmms", "mouse_wheel_change", &cfg.mouse_change);
+ 		xmms_cfg_read_boolean(cfgfile, "xmms", "show_wm_decorations", &cfg.show_wm_decorations);
+ 		if (xmms_cfg_read_int(cfgfile, "xmms", "url_history_length", &length))
+@@ -609,10 +636,14 @@
+ 	xmms_cfg_write_boolean(cfgfile, "xmms", "random_skin_on_play", cfg.random_skin_on_play);
+ 	xmms_cfg_write_boolean(cfgfile, "xmms", "pause_between_songs", cfg.pause_between_songs);
+ 	xmms_cfg_write_int(cfgfile, "xmms", "pause_between_songs_time", cfg.pause_between_songs_time);
++	/** Added by Tatu Lahtela */
++	xmms_cfg_write_int(cfgfile, "xmms", "mousewheel_scroll_amount", cfg.mousewheel_scroll_amount);
++	/* end */
+ 	xmms_cfg_write_int(cfgfile, "xmms", "mouse_wheel_change", cfg.mouse_change);
+ 	xmms_cfg_write_boolean(cfgfile, "xmms", "show_wm_decorations", cfg.show_wm_decorations);
+  	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_default_file", cfg.eqpreset_default_file);
+  	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_extension", cfg.eqpreset_extension);
++ 	xmms_cfg_write_string(cfgfile, "xmms", "cdda_directory", cfg.cdda_directory);
+ 	for (i = 0; i < 10; i++)
+ 	{
+ 		str = g_strdup_printf("equalizer_band%d", i);
+@@ -1390,22 +1421,47 @@
+ 	{
+ 	case GDK_Up:
+ 	case GDK_KP_Up:
++	case GDK_KP_8:
+ 		mainwin_set_volume_diff(2);
+ 		break;
+ 	case GDK_Down:
+ 	case GDK_KP_Down:
++	case GDK_KP_2:
+ 		mainwin_set_volume_diff(-2);
+ 		break;
+ 	case GDK_Left:
+ 	case GDK_KP_Left:
++	case GDK_KP_7:
+ 		if(playlist_get_current_length() != -1)
+ 			input_seek(CLAMP(input_get_time() - 5000, 0, playlist_get_current_length()) / 1000);
+ 		break;
+ 	case GDK_Right:
+ 	case GDK_KP_Right:
++	case GDK_KP_9:
+ 		if(playlist_get_current_length() != -1)
+ 			input_seek(CLAMP(input_get_time() + 5000, 0, playlist_get_current_length()) / 1000);
+ 		break;
++	case GDK_KP_0:
++		mainwin_eject_pushed();
++		break;
++	case GDK_KP_1:
++		playlist_set_position((((get_playlist_position() - 10) >= 0) ? get_playlist_position() - 10 : 0));
++		break;
++	case GDK_KP_3:
++		playlist_set_position((((get_playlist_position() + 10) < get_playlist_length()) ? (get_playlist_position() + 10) : (get_playlist_length() - 1)));
++		break;
++	case GDK_KP_4:
++		playlist_prev();
++		break;
++	case GDK_KP_5:
++		mainwin_play_pushed();
++		break;
++	case GDK_KP_6:
++		playlist_next();
++		break;
++	case GDK_KP_Decimal:
++		mainwin_jump_to_file();
++		break;
+ 	default:
+ 	     break;
+
+@@ -2491,6 +2547,12 @@
+ 	case MAINWIN_GENERAL_PLAYLOCATION:
+ 		mainwin_show_add_url_window();
+ 		break;
++	case MAINWIN_GENERAL_PLAYAUDIOCD:
++		if (cfg.cdda_directory != NULL)
++		{
++			mainwin_add_dir_handler(cfg.cdda_directory);
++		}
++		break;
+ 	case MAINWIN_GENERAL_FILEINFO:
+ 		playlist_fileinfo_current();
+ 		break;
+diff -urN xmms-1.2.10/xmms/main.h xmms-1.2.10_patch/xmms/main.h
+--- xmms-1.2.10/xmms/main.h	2003-12-07 03:06:43.000000000 +0100
++++ xmms-1.2.10_patch/xmms/main.h	2005-09-21 22:12:06.383276664 +0200
+@@ -59,7 +59,9 @@
+ 	gboolean pause_between_songs, show_wm_decorations;
+ 	gint mouse_change;
+ 	gboolean playlist_transparent;
+-        gchar *gentitle_format;
++   gchar *gentitle_format;
++   gint mousewheel_scroll_amount;
++ 	gchar *cdda_directory;
+ }
+ Config;
+
+diff -urN xmms-1.2.10/xmms/playlistwin.c xmms-1.2.10_patch/xmms/playlistwin.c
+--- xmms-1.2.10/xmms/playlistwin.c	2004-02-23 21:31:43.000000000 +0100
++++ xmms-1.2.10_patch/xmms/playlistwin.c	2005-09-21 22:06:06.912924464 +0200
+@@ -1274,9 +1274,25 @@
+ 		grab = FALSE;
+ 	}
+ 	else if (event->button == 4) /* Scrollwheel up */
+-		playlistwin_scroll(-3);
++	  /** Added by Tatu Lahtela */
++	  if ( cfg.mousewheel_scroll_amount ) {
++	    playlistwin_scroll(-1*cfg.mousewheel_scroll_amount );
++	  }
++	  else {
++	    playlistwin_scroll(-10);
++	  }
++	/* end */
++
+ 	else if(event->button == 5) /* Scrollwheel down */
+-		playlistwin_scroll(3);
++	  /** Added by Tatu Lahtela */
++	  if ( cfg.mousewheel_scroll_amount ) {
++	    playlistwin_scroll(cfg.mousewheel_scroll_amount ) ;
++	      //playlistwin_scroll(10);
++	      }
++	  else {
++		playlistwin_scroll(10);
++	  }
++	/* end */
+ 	else
+ 	{
+ 		handle_press_cb(playlistwin_wlist, widget, event);
+diff -urN xmms-1.2.10/xmms/prefswin.c xmms-1.2.10_patch/xmms/prefswin.c
+--- xmms-1.2.10/xmms/prefswin.c	2003-12-07 03:06:43.000000000 +0100
++++ xmms-1.2.10_patch/xmms/prefswin.c	2005-09-21 22:10:28.450164760 +0200
+@@ -20,6 +20,7 @@
+ #include "xmms.h"
+ #include "libxmms/util.h"
+ #include "libxmms/titlestring.h"
++#include "libxmms/dirbrowser.h"
+
+ static GtkWidget *prefswin, *prefswin_notebook, *prefswin_ok;
+ static GtkWidget *prefswin_audio_ie_cbox;
+@@ -37,11 +38,16 @@
+ static GtkWidget *prefswin_options_font_entry, *prefswin_options_font_browse;
+ static GtkWidget *prefswin_options_fontset, *prefswin_mainwin_font_entry;
+ static GtkWidget *prefswin_mainwin_xfont, *prefswin_options_mouse_spin;
++/** Added by Tatu Lahtela */
++static GtkWidget *prefswin_options_mousewheel;
++/* end */
+ static gboolean updating_ilist = FALSE, updating_glist = FALSE, updating_vlist = FALSE, updating_elist = FALSE;
+
+ static GtkWidget *prefswin_title_entry;
+ static GtkTooltips *prefswin_tooltips;
+
++static GtkWidget *prefswin_audiocd_cddadirectory;
++
+ extern MenuRow *mainwin_menurow;
+
+ extern PButton *playlistwin_shade, *playlistwin_close, *equalizerwin_close;
+@@ -350,6 +356,11 @@
+ 	cfg.gentitle_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_title_entry)));
+ 	cfg.pause_between_songs_time = CLAMP(atoi(gtk_entry_get_text(GTK_ENTRY(prefswin_options_pbs_entry))), 0, 1000);
+ 	cfg.mouse_change = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mouse_spin));
++	cfg.cdda_directory = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)));
++
++	/** Added by Tatu Lahtela */
++        cfg.mousewheel_scroll_amount =  gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mousewheel));
++	/* end */
+
+ 	set_current_output_plugin(selected_oplugin);
+
+@@ -587,6 +598,21 @@
+ 	gtk_clist_select_row(clist, sel, 0);
+ }
+
++static void prefswin_audiocd_browse_handler(gchar *dir)
++{
++	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), dir);
++}
++
++static gint prefswin_audiocd_browse_cb(GtkWidget * w, gpointer data)
++{
++	GtkWidget *prefswin_audiocd_browser;
++	prefswin_audiocd_browser = xmms_create_dir_browser(_("Select directory to add:"), gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)), GTK_SELECTION_SINGLE, prefswin_audiocd_browse_handler);
++	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &prefswin_audiocd_browser);
++	gtk_window_set_transient_for(GTK_WINDOW(prefswin_audiocd_browser), GTK_WINDOW(prefswin));
++	gtk_widget_show(prefswin_audiocd_browser);
++	return (TRUE);
++}
++
+ static GtkWidget * prefswin_option_new(gboolean * cfg)
+ {
+ 	struct option_info *info;
+@@ -701,6 +727,10 @@
+
+ 	GtkWidget *prefswin_title_frame, *prefswin_title_vbox;
+ 	GtkWidget *prefswin_title_hbox, *prefswin_title_vbox2;
++
++	GtkWidget *prefswin_audiocd_frame, *prefswin_audiocd_vbox;
++	GtkWidget *prefswin_audiocd_hbox, *prefswin_audiocd_browse;
++	GtkWidget *prefswin_audiocd_label;
+
+ 	GtkWidget *options_table;
+ 	GtkWidget *options_giop, *options_giod, *options_giol, *options_rt;
+@@ -711,6 +741,12 @@
+ 	GtkWidget *options_font_hbox, *options_font_vbox;
+ 	GtkWidget *options_mouse_box, *options_mouse_label;
+ 	GtkObject *options_mouse_adj;
++
++ 	/** Added by Tatu Lahtela */
++ 	GtkWidget *options_mousewheel_scroll_box, *options_mousewheel_scroll_label;
++ 	GtkObject *options_mousewheel_scroll_adj;
++ 	/* end */
++
+ 	GtkWidget *prefswin_title_desc, *prefswin_title_label, *opt;
+
+ 	char *titles[1];
+@@ -1031,6 +1067,7 @@
+ 			     _("Recommended if you want to load playlists "
+ 			       "that was created in MS Windows"), NULL);
+
++
+ 	options_mouse_box = gtk_hbox_new(FALSE, 5);
+ 	options_mouse_label = gtk_label_new(_("Mouse Wheel adjusts Volume by (%)"));
+ 	gtk_box_pack_start(GTK_BOX(options_mouse_box), options_mouse_label, FALSE, FALSE, 0);
+@@ -1044,6 +1081,17 @@
+ 						_("Use meta-data in playlists"),
+ 						GTK_TABLE(options_table), 1, 8);
+
++ 	/** Added by Tatu Lahtela */
++ 	options_mousewheel_scroll_box = gtk_hbox_new(FALSE, 5);
++ 	options_mousewheel_scroll_label = gtk_label_new(_("Mouse Wheel scrolls playlist by (lines)"));
++ 	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), options_mousewheel_scroll_label, FALSE, FALSE, 0);
++ 	options_mousewheel_scroll_adj = gtk_adjustment_new(cfg.mousewheel_scroll_amount, 1, 100, 1, 1, 1);
++ 	prefswin_options_mousewheel = gtk_spin_button_new(GTK_ADJUSTMENT(options_mousewheel_scroll_adj), 1, 0);
++ 	gtk_widget_set_usize(prefswin_options_mousewheel, 45, -1);
++ 	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), prefswin_options_mousewheel, FALSE, FALSE, 0);
++ 	gtk_table_attach_defaults(GTK_TABLE(options_table), options_mousewheel_scroll_box, 0, 1, 9, 10);
++ 	/* end */
++
+ 	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_options_vbox, gtk_label_new(_("Options")));
+
+ 	/*
+@@ -1118,7 +1166,31 @@
+ 	gtk_box_pack_start(GTK_BOX(prefswin_title_vbox2), prefswin_title_desc, FALSE, FALSE, 0);
+
+ 	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_title_vbox, gtk_label_new(_("Title")));
+-
++
++	/*
++	 * Audio CD page
++	 */
++	prefswin_audiocd_vbox = gtk_vbox_new(FALSE, 0);
++
++	prefswin_audiocd_frame = gtk_frame_new(_("Audio CD directory"));
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_vbox), prefswin_audiocd_frame, FALSE, FALSE, 0);
++	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_frame), 5);
++
++	prefswin_audiocd_hbox = gtk_hbox_new(FALSE, 10);
++	gtk_container_add(GTK_CONTAINER(prefswin_audiocd_frame), prefswin_audiocd_hbox);
++	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_hbox), 5);
++
++	prefswin_audiocd_label = gtk_label_new(_("Directory:"));
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_label, FALSE, FALSE, 0);
++
++	prefswin_audiocd_cddadirectory = gtk_entry_new();
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_cddadirectory, TRUE, TRUE, 0);
++
++	prefswin_audiocd_browse = gtk_button_new_with_label(_("Browse"));
++	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browse), "clicked", GTK_SIGNAL_FUNC(prefswin_audiocd_browse_cb), NULL);
++	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_browse, TRUE, TRUE, 0);
++
++	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_audiocd_vbox, gtk_label_new(_("Audio CD")));
+
+ 	/*
+ 	 * Ok, Cancel & Apply
+@@ -1364,6 +1436,12 @@
+ 	gtk_entry_set_text(GTK_ENTRY(prefswin_options_pbs_entry), temp);
+ 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mouse_spin), cfg.mouse_change);
+
++	/** Added by Tatu Lahtela */
++	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mousewheel), cfg.mousewheel_scroll_amount);
++	/* end */
++
++	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), cfg.cdda_directory);
++
+  	gtk_widget_show_all(prefswin);
+ 	gtk_widget_grab_default(prefswin_ok);
+
diff --git a/source/xapps-extra/xmms/xmms.desktop b/source/xapps-extra/xmms/xmms.desktop
new file mode 100644
index 0000000..30fc277
--- /dev/null
+++ b/source/xapps-extra/xmms/xmms.desktop
@@ -0,0 +1,85 @@
+[Desktop Entry]
+Encoding=UTF-8
+BinaryPattern=
+GenericName=Multimedia Player
+GenericName[af]=Multimedia Speler
+GenericName[ar]=مشغل الوسائط المتعددة
+GenericName[az]=Multimedia Çalğıcısı
+GenericName[bg]=Мултимедиен плеър
+GenericName[bn]=মাল্টিমিডিয়া প্লেয়ার
+GenericName[bs]=Preglednik multimedijalnih datoteka
+GenericName[ca]=Reproductor multimèdia
+GenericName[cs]=Přehrávač multimédií
+GenericName[cy]=Chwaraewr Amlgyfrwng
+GenericName[da]=Multimedieafspiller
+GenericName[de]=Multimedia-Wiedergabe
+GenericName[el]=Αναπαραγωγέας πολυμέσων
+GenericName[eo]=Plurmedia ludilo
+GenericName[es]=Reproductor multimedia
+GenericName[et]=Multimeedia mängija
+GenericName[eu]=Multimedia Jolea
+GenericName[fa]=پخش کننده‌ی چندرسانه‌ای
+GenericName[fi]=Multimediasoittaja
+GenericName[fr]=Lecteur multimĂŠdia
+GenericName[gl]=Reproductor Multimedia
+GenericName[he]=נגן מולטימדיה
+GenericName[hi]=मल्टीमीडिया प्लेयर
+GenericName[hr]=Multimedijski player
+GenericName[hu]=MĂŠdialejĂĄtszĂł
+GenericName[is]=MargmiĂ°lunarspilari
+GenericName[it]=Lettore multimediale
+GenericName[ja]=メディアプレーヤー
+GenericName[ko]=멀티미디어 연주기
+GenericName[lo]=ເຄື່ອງມືຫລິ້ນແຟ້ມສີ
+GenericName[lt]=Multimedijos grotuvas
+GenericName[lv]=Multimēdiju Atskaņotājs
+GenericName[mn]=Мултимедиа-Тоглуулагч
+GenericName[mt]=Plejer Multimedia
+GenericName[nb]=Multimediaspiller
+GenericName[nl]=Multimediaspeler
+GenericName[nn]=Multimediespelar
+GenericName[nso]=Sebapadi sa Media wa Bontshi
+GenericName[pa]=ਬਹੁਰੰਗ ਵਾਜਾ
+GenericName[pl]=Odtwarzacz multimedialny
+GenericName[pt]=Reprodutor MultimĂŠdia
+GenericName[pt_BR]=Reprodutor multimĂ­dia
+GenericName[ro]=Program de redare multimedia
+GenericName[ru]=Мультимедийный проигрыватель
+GenericName[se]=Multimediačuojaheaddji
+GenericName[sk]=Multimediálny prehrávač
+GenericName[sl]=Večpredstavnostni predvajalnik
+GenericName[sr]=Мултимедијални приказивач
+GenericName[sr@Latn]=Multimedijalni prikazivač
+GenericName[ss]=Sidlali setindzaba letinyenti
+GenericName[sv]=Multimediaspelare
+GenericName[ta]=பல்ஊடக சாதனம்
+GenericName[tg]=Плейери Мултимедия
+GenericName[th]=เครื่องมือเล่นแฟ้มสื่อ
+GenericName[tr]=Çoklu Ortam Yürütücüsü
+GenericName[uk]=Програвач файлів мультимедія
+GenericName[uz]=Мултимедиа плейер
+GenericName[ven]=Tshitambi tsha Zwimvumvusi
+GenericName[vi]=Trình chơi nhạc đa phương tiện
+GenericName[wa]=Djouweu multimedia
+GenericName[xh]=Umdlali we Multimedia
+GenericName[xx]=xxMultimedia Playerxx
+GenericName[zh_CN]=多媒体播放器
+GenericName[zh_TW]=多媒體播放程式
+GenericName[zu]=Umdlali wonozindaba abaningi
+Exec=xmms %U
+Icon=xmms
+MimeType=audio/x-mp3;audio/x-mod;audio/x-wav;audio/x-flac;audio/x-mpegurl;audio/x-scpls;audio/vorbis
+Name=XMMS
+Name[af]=Xmms
+Name[fa]=سیستم چندرسانه‌ای X
+Name[hi]=एक्सएमएमएस
+Name[vi]=XMMS
+Name[xx]=xxXMMSxx
+Path=
+SwallowExec=
+SwallowTitle=
+Terminal=0
+TerminalOptions=
+Type=Application
+X-KDE-StartupNotify=false
+X-DCOP-ServiceType=None
diff --git a/source/xapps/xmms/FrugalBuild b/source/xapps/xmms/FrugalBuild
deleted file mode 100644
index 714e90a..0000000
--- a/source/xapps/xmms/FrugalBuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Compiling Time: 0.80 SBU
-# Maintainer: VMiklos <vmiklos@frugalware.org>
-
-pkgname=xmms
-pkgver=1.2.10
-pkgrel=13
-pkgdesc="The X MultiMedia System"
-url="http://www.xmms.org"
-depends=('gtk+' 'libvorbis' 'alsa-lib' 'libmikmod')
-makedepends=('esd' 'libglx' 'mesa')
-groups=('xapps')
-archs=('i686' 'x86_64')
-provides=('songplayer')
-up2date="lynx -dump http://www.xmms.org/download.php|grep ^XMMS|cut -d ' ' -f 2"
-source=(http://www.xmms.org/files/1.2.x/$pkgname-$pkgver.tar.bz2 \
-	$pkgname.desktop \
-	http://ftp.frugalware.org/pub/other/sources/xmms/xmms-cvs-20070427-backport.patch.bz2 \
-	xmms-1.2.10-cvs-fw.patch SA23986.diff)
-[ "$CARCH" == "x86_64" ] && confopts=--disable-simd
-[ "$CARCH" != "x86_64" ] && confopts=--enable-simd
-
-build() {
-	Fpatchall
-	chmod +x $Fsrcdir/$pkgname-$pkgver/po/update.pl || Fdie
-	sh autogen.sh || Fdie
-	Fmake $confopts
-	Fmakeinstall
-	Ffile /usr/share/applnk/Multimedia/xmms.desktop
-}
-
-sha1sums=('a3c3d3756d5263183c27b3c50a7f5404cba8bfaf'\
-          'af83776c2704f950957b161b1f408d4e17130c69'\
-          '8fb12ff8b74c8dbc6222f2e13e21b2bb8542cd1b'\
-          '7d5c91904c0c93bc058ead66aac36d955652683b'\
-          'b1d3a803950ce4d83090a43d5b076afd48c135b5')
-# optimization OK
diff --git a/source/xapps/xmms/SA23986.diff b/source/xapps/xmms/SA23986.diff
deleted file mode 100644
index f70b495..0000000
--- a/source/xapps/xmms/SA23986.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- xmms-1.2.10/xmms/bmp.c.orig	2007-04-05 21:59:08.000000000 +0200
-+++ xmms-1.2.10/xmms/bmp.c	2007-04-05 22:02:38.000000000 +0200
-@@ -19,6 +19,12 @@
-  */
- #include "xmms.h"
-
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- struct rgb_quad
- {
- 	guchar rgbBlue;
-@@ -183,7 +189,7 @@
- 	}
- 	else if (bitcount != 24 && bitcount != 16 && bitcount != 32)
- 	{
--		gint ncols, i;
-+		guint32 ncols, i;
-
- 		ncols = offset - headSize - 14;
- 		if (headSize == 12)
-@@ -201,9 +207,17 @@
- 		}
- 	}
- 	fseek(file, offset, SEEK_SET);
-+	/* verify buffer size */
-+	if (!h || !w ||
-+			w > (((UINT32_MAX - 3) / 3) / h) ||
-+			h > (((UINT32_MAX - 3) / 3) / w)) {
-+		g_warning("read_bmp(): width(%u)*height(%u) too large", w, h);
-+		fclose(file);
-+		return NULL;
-+	}
-+	data = g_malloc0((w * 3 * h) + 3);      /* +3 is just for safety */
- 	buffer = g_malloc(imgsize);
- 	fread(buffer, imgsize, 1, file);
--	data = g_malloc0((w * 3 * h) + 3);	/* +3 is just for safety */
-
- 	if (bitcount == 1)
- 		read_1b_rgb(buffer, imgsize, data, w, h, rgb_quads);
diff --git a/source/xapps/xmms/xmms-1.2.10-cvs-fw.patch b/source/xapps/xmms/xmms-1.2.10-cvs-fw.patch
deleted file mode 100644
index 4b9888c..0000000
--- a/source/xapps/xmms/xmms-1.2.10-cvs-fw.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-diff -Naur xmms-1.2.10.orig/Output/esd/esdout.h xmms-1.2.10/Output/esd/esdout.h
---- xmms-1.2.10.orig/Output/esd/esdout.h	2006-10-02 12:48:27.000000000 +0200
-+++ xmms-1.2.10/Output/esd/esdout.h	2006-10-02 12:49:37.000000000 +0200
-@@ -58,6 +58,7 @@
- ESDConfig;
-
- extern ESDConfig esd_cfg;
-+extern void esdout_reset_playerid(void);
-
- void esdout_init(void);
- void esdout_about(void);
-diff -Naur xmms-1.2.10.orig/xmms/main.c xmms-1.2.10/xmms/main.c
---- xmms-1.2.10.orig/xmms/main.c	2006-10-02 12:48:27.000000000 +0200
-+++ xmms-1.2.10/xmms/main.c	2006-10-02 13:37:32.000000000 +0200
-@@ -112,6 +112,7 @@
- void mainwin_options_menu_callback(gpointer cb_data, guint action, GtkWidget * w);
- void mainwin_volume_motioncb(gint pos);
- static void set_timer_mode_menu_cb(TimerMode mode);
-+static void mainwin_jump_to_file(void);
- static void mainwin_queue_manager_queue_refresh(GtkWidget * widget, gpointer userdata);
-
- enum
-@@ -255,7 +256,7 @@
- enum
- {
- 	MAINWIN_GENERAL_ABOUT, MAINWIN_GENERAL_PLAYFILE, MAINWIN_GENERAL_PLAYDIRECTORY,
--	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_FILEINFO,
-+	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_PLAYAUDIOCD, MAINWIN_GENERAL_FILEINFO,
- 	MAINWIN_GENERAL_SHOWMWIN, MAINWIN_GENERAL_SHOWPLWIN,
- 	MAINWIN_GENERAL_SHOWEQWIN, MAINWIN_GENERAL_PREV, MAINWIN_GENERAL_PLAY,
- 	MAINWIN_GENERAL_PAUSE, MAINWIN_GENERAL_STOP, MAINWIN_GENERAL_NEXT,
-@@ -271,9 +272,11 @@
- {
- 	{N_("/About XMMS"), NULL, mainwin_general_menu_callback, MAINWIN_GENERAL_ABOUT, "<Item>"},
- 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
--	{N_("/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
--	{N_("/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
--	{N_("/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
-+	{N_("/Play"), NULL, NULL, 0, "<Branch>"},
-+	{N_("/Play/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
-+	{N_("/Play/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
-+	{N_("/Play/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
-+	{N_("/Play/Play AudioCD"), "<control>C", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYAUDIOCD, "<Item>"},
- 	{N_("/View File Info"), "<control>3" , mainwin_general_menu_callback, MAINWIN_GENERAL_FILEINFO, "<Item>"},
- 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
- 	{N_("/Main Window"), "<alt>W", mainwin_general_menu_callback, MAINWIN_GENERAL_SHOWMWIN, "<ToggleItem>"},
-@@ -322,6 +325,21 @@
- 	g_free(filename);
- }
-
-+#ifndef CDDA_DIRECTORY
-+# ifdef HAVE_SYS_CDIO_H
-+#  ifdef __FreeBSD__
-+#   define CDDA_DIRECTORY "/cdrom"
-+#  elif defined __OpenBSD__
-+#   define CDDA_DIRECTORY "/cdrom"
-+#  else
-+#   define CDDA_DIRECTORY "/cdrom/cdrom"
-+#  endif
-+# else
-+#   define CDDA_DIRECTORY "/mnt/cdrom"
-+# endif
-+#endif
-+
-+
- static void read_config(void)
- {
- 	ConfigFile *cfgfile;
-@@ -366,6 +384,10 @@
- 	cfg.snap_distance = 10;
- 	cfg.pause_between_songs_time = 2;
-
-+	/** Added by Tatu Lahtela */
-+	cfg.mousewheel_scroll_amount = 10;
-+	/* end */
-+
- 	cfg.vis_type = VIS_ANALYZER;
- 	cfg.analyzer_mode = ANALYZER_NORMAL;
- 	cfg.analyzer_type = ANALYZER_BARS;
-@@ -381,6 +403,8 @@
-
- 	cfg.gentitle_format = NULL;
-
-+	cfg.cdda_directory = CDDA_DIRECTORY;
-+
- 	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
- 	cfgfile = xmms_cfg_open_file(filename);
- 	if (cfgfile)
-@@ -442,6 +466,7 @@
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "equalizer_autoload", &cfg.equalizer_autoload);
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "easy_move", &cfg.easy_move);
- 		xmms_cfg_read_float(cfgfile, "xmms", "equalizer_preamp", &cfg.equalizer_preamp);
-+		xmms_cfg_read_string(cfgfile, "xmms", "cdda_directory", &cfg.cdda_directory);
- 		for (i = 0; i < 10; i++)
- 		{
- 			gchar eqtext[18];
-@@ -465,6 +490,9 @@
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "random_skin_on_play", &cfg.random_skin_on_play);
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "pause_between_songs", &cfg.pause_between_songs);
- 		xmms_cfg_read_int(cfgfile, "xmms", "pause_between_songs_time", &cfg.pause_between_songs_time);
-+		/** Added by Tatu Lahtela */
-+		xmms_cfg_read_int(cfgfile, "xmms", "mousewheel_scroll_amount", &cfg.mousewheel_scroll_amount);
-+		/* end */
- 		xmms_cfg_read_int(cfgfile, "xmms", "mouse_wheel_change", &cfg.mouse_change);
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "show_wm_decorations", &cfg.show_wm_decorations);
- 		if (xmms_cfg_read_int(cfgfile, "xmms", "url_history_length", &length))
-@@ -616,10 +644,14 @@
- 	xmms_cfg_write_boolean(cfgfile, "xmms", "random_skin_on_play", cfg.random_skin_on_play);
- 	xmms_cfg_write_boolean(cfgfile, "xmms", "pause_between_songs", cfg.pause_between_songs);
- 	xmms_cfg_write_int(cfgfile, "xmms", "pause_between_songs_time", cfg.pause_between_songs_time);
-+	/** Added by Tatu Lahtela */
-+	xmms_cfg_write_int(cfgfile, "xmms", "mousewheel_scroll_amount", cfg.mousewheel_scroll_amount);
-+	/* end */
- 	xmms_cfg_write_int(cfgfile, "xmms", "mouse_wheel_change", cfg.mouse_change);
- 	xmms_cfg_write_boolean(cfgfile, "xmms", "show_wm_decorations", cfg.show_wm_decorations);
- 	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_default_file", cfg.eqpreset_default_file);
- 	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_extension", cfg.eqpreset_extension);
-+	xmms_cfg_write_string(cfgfile, "xmms", "cdda_direcory", cfg.cdda_directory);
- 	for (i = 0; i < 10; i++)
- 	{
- 		str = g_strdup_printf("equalizer_band%d", i);
-@@ -1405,22 +1437,47 @@
- 	{
- 	case GDK_Up:
- 	case GDK_KP_Up:
-+	case GDK_KP_8:
- 		mainwin_set_volume_diff(2);
- 		break;
- 	case GDK_Down:
- 	case GDK_KP_Down:
-+	case GDK_KP_2:
- 		mainwin_set_volume_diff(-2);
- 		break;
- 	case GDK_Left:
- 	case GDK_KP_Left:
-+	case GDK_KP_7:
- 		if(playlist_get_current_length() != -1)
- 			input_seek(CLAMP(input_get_time() - 5000, 0, playlist_get_current_length()) / 1000);
- 		break;
- 	case GDK_Right:
- 	case GDK_KP_Right:
-+	case GDK_KP_9:
- 		if(playlist_get_current_length() != -1)
- 			input_seek(CLAMP(input_get_time() + 5000, 0, playlist_get_current_length()) / 1000);
- 		break;
-+	case GDK_KP_0:
-+		mainwin_eject_pushed();
-+		break;
-+	case GDK_KP_1:
-+		playlist_set_position((((get_playlist_position() - 10) >= 0) ? get_playlist_position() - 10 : 0));
-+		break;
-+	case GDK_KP_3:
-+		playlist_set_position((((get_playlist_position() + 10) < get_playlist_length()) ? (get_playlist_position() + 10) : (get_playlist_length() - 1)));
-+		break;
-+	case GDK_KP_4:
-+		playlist_prev();
-+		break;
-+	case GDK_KP_5:
-+		mainwin_play_pushed();
-+		break;
-+	case GDK_KP_6:
-+		playlist_next();
-+		break;
-+	case GDK_KP_Decimal:
-+		mainwin_jump_to_file();
-+		break;
- 	default:
- 	     break;
-
-@@ -2998,6 +3055,12 @@
- 	case MAINWIN_GENERAL_PLAYLOCATION:
- 		mainwin_show_add_url_window();
- 		break;
-+	case MAINWIN_GENERAL_PLAYAUDIOCD:
-+		if (cfg.cdda_directory != NULL)
-+		{
-+			mainwin_add_dir_handler(cfg.cdda_directory);
-+		}
-+		break;
- 	case MAINWIN_GENERAL_FILEINFO:
- 		playlist_fileinfo_current();
- 		break;
-diff -Naur xmms-1.2.10.orig/xmms/main.h xmms-1.2.10/xmms/main.h
---- xmms-1.2.10.orig/xmms/main.h	2006-10-02 12:48:27.000000000 +0200
-+++ xmms-1.2.10/xmms/main.h	2006-10-02 12:50:19.000000000 +0200
-@@ -59,7 +59,9 @@
- 	gboolean pause_between_songs, show_wm_decorations;
- 	gint mouse_change;
- 	gboolean playlist_transparent;
--        gchar *gentitle_format;
-+   gchar *gentitle_format;
-+   gint mousewheel_scroll_amount;
-+ 	gchar *cdda_directory;
- }
- Config;
-
-diff -Naur xmms-1.2.10.orig/xmms/playlistwin.c xmms-1.2.10/xmms/playlistwin.c
---- xmms-1.2.10.orig/xmms/playlistwin.c	2006-10-02 12:48:27.000000000 +0200
-+++ xmms-1.2.10/xmms/playlistwin.c	2006-10-02 12:50:30.000000000 +0200
-@@ -1274,9 +1274,25 @@
- 		grab = FALSE;
- 	}
- 	else if (event->button == 4) /* Scrollwheel up */
--		playlistwin_scroll(-3);
-+	  /** Added by Tatu Lahtela */
-+	  if ( cfg.mousewheel_scroll_amount ) {
-+	    playlistwin_scroll(-1*cfg.mousewheel_scroll_amount );
-+	  }
-+	  else {
-+	    playlistwin_scroll(-10);
-+	  }
-+	/* end */
-+
- 	else if(event->button == 5) /* Scrollwheel down */
--		playlistwin_scroll(3);
-+	  /** Added by Tatu Lahtela */
-+	  if ( cfg.mousewheel_scroll_amount ) {
-+	    playlistwin_scroll(cfg.mousewheel_scroll_amount ) ;
-+	      //playlistwin_scroll(10);
-+	      }
-+	  else {
-+		playlistwin_scroll(10);
-+	  }
-+	/* end */
- 	else
- 	{
- 		handle_press_cb(playlistwin_wlist, widget, event);
-diff -Naur xmms-1.2.10.orig/xmms/prefswin.c xmms-1.2.10/xmms/prefswin.c
---- xmms-1.2.10.orig/xmms/prefswin.c	2006-10-02 12:48:27.000000000 +0200
-+++ xmms-1.2.10/xmms/prefswin.c	2006-10-02 13:19:37.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "xmms.h"
- #include "libxmms/util.h"
- #include "libxmms/titlestring.h"
-+#include "libxmms/dirbrowser.h"
-
- static GtkWidget *prefswin, *prefswin_notebook, *prefswin_ok;
- static GtkWidget *prefswin_audio_ie_cbox;
-@@ -37,11 +38,16 @@
- static GtkWidget *prefswin_options_font_entry, *prefswin_options_font_browse;
- static GtkWidget *prefswin_options_fontset, *prefswin_mainwin_font_entry;
- static GtkWidget *prefswin_mainwin_xfont, *prefswin_options_mouse_spin;
-+/** Added by Tatu Lahtela */
-+static GtkWidget *prefswin_options_mousewheel;
-+/* end */
- static gboolean updating_ilist = FALSE, updating_glist = FALSE, updating_vlist = FALSE, updating_elist = FALSE;
-
- static GtkWidget *prefswin_title_entry;
- static GtkTooltips *prefswin_tooltips;
-
-+static GtkWidget *prefswin_audiocd_cddadirectory;
-+
- extern MenuRow *mainwin_menurow;
-
- extern PButton *playlistwin_shade, *playlistwin_close, *equalizerwin_close;
-@@ -350,6 +356,11 @@
- 	cfg.gentitle_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_title_entry)));
- 	cfg.pause_between_songs_time = CLAMP(atoi(gtk_entry_get_text(GTK_ENTRY(prefswin_options_pbs_entry))), 0, 1000);
- 	cfg.mouse_change = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mouse_spin));
-+	cfg.cdda_directory = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)));
-+
-+	/** Added by Tatu Lahtela */
-+	cfg.mousewheel_scroll_amount = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mousewheel));
-+	/* end */
-
- 	set_current_output_plugin(selected_oplugin);
-
-@@ -493,6 +504,21 @@
- 	gtk_clist_select_row(clist, sel, 0);
- }
-
-+static void prefswin_audiocd_browse_handler(gchar *dir)
-+{
-+	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), dir);
-+}
-+
-+static gint prefswin_audiocd_browse_cb(GtkWidget * w, gpointer data)
-+{
-+	GtkWidget *prefswin_audiocd_browser;
-+	prefswin_audiocd_browser = xmms_create_dir_browser(_("Select directory to add:"), gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)), GTK_SELECTION_SINGLE, prefswin_audiocd_browse_handler);
-+	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &prefswin_audiocd_browser);
-+	gtk_window_set_transient_for(GTK_WINDOW(prefswin_audiocd_browser), GTK_WINDOW(prefswin));
-+	gtk_widget_show(prefswin_audiocd_browser);
-+	return (TRUE);
-+}
-+
- void prefswin_vplugins_rescan(void)
- {
- 	gint sel;
-@@ -702,6 +728,10 @@
- 	GtkWidget *prefswin_title_frame, *prefswin_title_vbox;
- 	GtkWidget *prefswin_title_hbox, *prefswin_title_vbox2;
-
-+	GtkWidget *prefswin_audiocd_frame, *prefswin_audiocd_vbox;
-+	GtkWidget *prefswin_audiocd_hbox, *prefswin_audiocd_browse;
-+	GtkWidget *prefswin_audiocd_label;
-+
- 	GtkWidget *options_table;
- 	GtkWidget *options_giop, *options_giod, *options_giol, *options_rt;
- 	GtkWidget *options_sw, *options_sw_box, *options_sw_label;
-@@ -711,6 +741,12 @@
- 	GtkWidget *options_font_hbox, *options_font_vbox;
- 	GtkWidget *options_mouse_box, *options_mouse_label;
- 	GtkObject *options_mouse_adj;
-+
-+	/** Added by Tatu Lahtela */
-+	GtkWidget *options_mousewheel_scroll_box, *options_mousewheel_scroll_label;
-+	GtkObject *options_mousewheel_scroll_adj;
-+	/* end */
-+
- 	GtkWidget *prefswin_title_desc, *prefswin_title_label, *prefswin_moreinfo_label, *opt;
-
- 	char *titles[1];
-@@ -1047,6 +1083,18 @@
- 	opt = prefswin_option_new_with_label_to_table(&cfg.use_pl_metadata,
- 						      _("Use meta-data in playlists"),
- 						      GTK_TABLE(options_table), 1, 8);
-+
-+	/** Added by Tatu Lahtela */
-+	options_mousewheel_scroll_box = gtk_hbox_new(FALSE, 5);
-+	options_mousewheel_scroll_label = gtk_label_new(_("Mouse wheel scrolls playlist by (lines)"));
-+	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), options_mousewheel_scroll_label, FALSE, FALSE, 0);
-+	options_mousewheel_scroll_adj = gtk_adjustment_new(cfg.mousewheel_scroll_amount, 1, 100, 1, 1, 1);
-+	prefswin_options_mousewheel = gtk_spin_button_new(GTK_ADJUSTMENT(options_mousewheel_scroll_adj), 1, 0);
-+	gtk_widget_set_usize(prefswin_options_mousewheel, 45, -1);
-+	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), prefswin_options_mousewheel, FALSE, FALSE, 0);
-+	gtk_table_attach_defaults(GTK_TABLE(options_table), options_mousewheel_scroll_box, 0, 1, 9, 10);
-+	/* end */
-+
- 	gtk_tooltips_set_tip(prefswin_tooltips, opt,
- 			     _("Store information such as song title and "
- 			       "length to playlists"), NULL);
-@@ -1147,6 +1195,30 @@
-
- 	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_title_vbox, gtk_label_new(_("Title")));
-
-+	/*
-+	 * Audio CD page
-+	 */
-+	prefswin_audiocd_vbox = gtk_vbox_new(FALSE, 0);
-+
-+	prefswin_audiocd_frame = gtk_frame_new(_("Audio CD Directory"));
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_vbox), prefswin_audiocd_frame, FALSE, FALSE, 0);
-+	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_frame), 5);
-+
-+	prefswin_audiocd_hbox = gtk_hbox_new(FALSE, 10);
-+	gtk_container_add(GTK_CONTAINER(prefswin_audiocd_frame), prefswin_audiocd_hbox);
-+	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_hbox), 5);
-+
-+	prefswin_audiocd_label = gtk_label_new(_("Directory:"));
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_label, FALSE, FALSE, 0);
-+
-+	prefswin_audiocd_cddadirectory = gtk_entry_new();
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_cddadirectory, TRUE, TRUE, 0);
-+
-+	prefswin_audiocd_browse = gtk_button_new_with_label(_("Browse"));
-+	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browse), "clicked", GTK_SIGNAL_FUNC(prefswin_audiocd_browse_cb), NULL);
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_browse, TRUE, TRUE, 0);
-+
-+	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_audiocd_vbox, gtk_label_new(_("Audio CD")));
-
- 	/*
- 	 * OK, Cancel & Apply
-@@ -1392,6 +1464,12 @@
- 	gtk_entry_set_text(GTK_ENTRY(prefswin_options_pbs_entry), temp);
- 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mouse_spin), cfg.mouse_change);
-
-+	/** Added by Tatu Lahtela */
-+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mousewheel), cfg.mousewheel_scroll_amount);
-+	/* end */
-+
-+	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), cfg.cdda_directory);
-+
-  	gtk_widget_show_all(prefswin);
- 	gtk_widget_grab_default(prefswin_ok);
-
diff --git a/source/xapps/xmms/xmms-1.2.10-fw.patch.skip b/source/xapps/xmms/xmms-1.2.10-fw.patch.skip
deleted file mode 100644
index 71c4edf..0000000
--- a/source/xapps/xmms/xmms-1.2.10-fw.patch.skip
+++ /dev/null
@@ -1,401 +0,0 @@
-Initial Package Version: 1.2.10
-Origin:    		Con Kolivas, gentoo
-Description:	This is a cumulative patch including, gcc4 fix, 0060_all_keypad.patch,
-					0120_all_wheelamount.patch and 0130_all_play_audiocd.patch
-
-diff -urN xmms-1.2.10/General/ir/ir.h xmms-1.2.10_patch/General/ir/ir.h
---- xmms-1.2.10/General/ir/ir.h	2001-03-05 14:17:44.000000000 +0100
-+++ xmms-1.2.10_patch/General/ir/ir.h	2005-09-21 22:05:53.122021000 +0200
-@@ -49,8 +49,6 @@
- }
- irConfig;
-
--extern pthread_t irapp_thread;
--extern gboolean keepGoing;
- extern irConfig ircfg;
- extern gboolean irconf_is_going;
-
-diff -urN xmms-1.2.10/Output/esd/esdout.h xmms-1.2.10_patch/Output/esd/esdout.h
---- xmms-1.2.10/Output/esd/esdout.h	2001-12-03 03:38:42.000000000 +0100
-+++ xmms-1.2.10_patch/Output/esd/esdout.h	2005-09-21 22:05:53.122021000 +0200
-@@ -58,6 +58,7 @@
- ESDConfig;
-
- extern ESDConfig esd_cfg;
-+extern void esdout_reset_playerid(void);
-
- void esdout_init(void);
- void esdout_about(void);
-diff -urN xmms-1.2.10/xmms/main.c xmms-1.2.10_patch/xmms/main.c
---- xmms-1.2.10/xmms/main.c	2004-02-23 21:31:43.000000000 +0100
-+++ xmms-1.2.10_patch/xmms/main.c	2005-09-21 22:11:12.727433592 +0200
-@@ -109,6 +109,7 @@
- void mainwin_options_menu_callback(gpointer cb_data, guint action, GtkWidget * w);
- void mainwin_volume_motioncb(gint pos);
- static void set_timer_mode_menu_cb(TimerMode mode);
-+static void mainwin_jump_to_file(void);
-
- enum
- {
-@@ -250,7 +251,7 @@
- enum
- {
- 	MAINWIN_GENERAL_ABOUT, MAINWIN_GENERAL_PLAYFILE, MAINWIN_GENERAL_PLAYDIRECTORY,
--	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_FILEINFO,
-+	MAINWIN_GENERAL_PLAYLOCATION, MAINWIN_GENERAL_PLAYAUDIOCD, MAINWIN_GENERAL_FILEINFO,
- 	MAINWIN_GENERAL_SHOWMWIN, MAINWIN_GENERAL_SHOWPLWIN,
- 	MAINWIN_GENERAL_SHOWEQWIN, MAINWIN_GENERAL_PREV, MAINWIN_GENERAL_PLAY,
- 	MAINWIN_GENERAL_PAUSE, MAINWIN_GENERAL_STOP, MAINWIN_GENERAL_NEXT,
-@@ -266,9 +267,11 @@
- {
- 	{N_("/About XMMS"), NULL, mainwin_general_menu_callback, MAINWIN_GENERAL_ABOUT, "<Item>"},
- 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
--	{N_("/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
--	{N_("/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
--	{N_("/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
-+	{N_("/Play"), NULL, NULL, 0, "<Branch>"},
-+	{N_("/Play/Play File"), "L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYFILE, "<Item>"},
-+	{N_("/Play/Play Directory"), "<shift>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
-+	{N_("/Play/Play Location"), "<control>L", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYLOCATION, "<Item>"},
-+	{N_("/Play/Play AudioCD"), "<control>C", mainwin_general_menu_callback, MAINWIN_GENERAL_PLAYAUDIOCD, "<Item>"},
- 	{N_("/View File Info"), "<control>3" , mainwin_general_menu_callback, MAINWIN_GENERAL_FILEINFO, "<Item>"},
- 	{N_("/-"), NULL, NULL, 0, "<Separator>"},
- 	{N_("/Main Window"), "<alt>W", mainwin_general_menu_callback, MAINWIN_GENERAL_SHOWMWIN, "<ToggleItem>"},
-@@ -317,6 +320,20 @@
- 	g_free(filename);
- }
-
-+#ifndef CDDA_DIRECTORY
-+# ifdef HAVE_SYS_CDIO_H
-+#  ifdef __FreeBSD__
-+#   define CDDA_DIRECTORY "/cdrom"
-+#  elif defined __OpenBSD__
-+#   define CDDA_DIRECTORY "/cdrom"
-+#  else
-+#   define CDDA_DIRECTORY "/cdrom/cdrom0"
-+#  endif
-+# else
-+#   define CDDA_DIRECTORY "/mnt/cdrom"
-+# endif
-+#endif
-+
- static void read_config(void)
- {
- 	ConfigFile *cfgfile;
-@@ -361,6 +378,10 @@
- 	cfg.snap_distance = 10;
- 	cfg.pause_between_songs_time = 2;
-
-+	/** Added by Tatu Lahtela */
-+        cfg.mousewheel_scroll_amount = 10;
-+	/* end */
-+
- 	cfg.vis_type = VIS_ANALYZER;
- 	cfg.analyzer_mode = ANALYZER_NORMAL;
- 	cfg.analyzer_type = ANALYZER_BARS;
-@@ -375,6 +396,8 @@
- 	cfg.mouse_change = 8;
-
- 	cfg.gentitle_format = NULL;
-+
-+	cfg.cdda_directory = CDDA_DIRECTORY;
-
- 	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
- 	cfgfile = xmms_cfg_open_file(filename);
-@@ -436,6 +459,7 @@
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "equalizer_autoload", &cfg.equalizer_autoload);
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "easy_move", &cfg.easy_move);
- 		xmms_cfg_read_float(cfgfile, "xmms", "equalizer_preamp", &cfg.equalizer_preamp);
-+		xmms_cfg_read_string(cfgfile, "xmms", "cdda_directory", &cfg.cdda_directory);
- 		for (i = 0; i < 10; i++)
- 		{
- 			gchar eqtext[18];
-@@ -459,6 +483,9 @@
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "random_skin_on_play", &cfg.random_skin_on_play);
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "pause_between_songs", &cfg.pause_between_songs);
- 		xmms_cfg_read_int(cfgfile, "xmms", "pause_between_songs_time", &cfg.pause_between_songs_time);
-+		/** Added by Tatu Lahtela */
-+		xmms_cfg_read_int(cfgfile, "xmms", "mousewheel_scroll_amount", &cfg.mousewheel_scroll_amount);
-+		/* end */
- 		xmms_cfg_read_int(cfgfile, "xmms", "mouse_wheel_change", &cfg.mouse_change);
- 		xmms_cfg_read_boolean(cfgfile, "xmms", "show_wm_decorations", &cfg.show_wm_decorations);
- 		if (xmms_cfg_read_int(cfgfile, "xmms", "url_history_length", &length))
-@@ -609,10 +636,14 @@
- 	xmms_cfg_write_boolean(cfgfile, "xmms", "random_skin_on_play", cfg.random_skin_on_play);
- 	xmms_cfg_write_boolean(cfgfile, "xmms", "pause_between_songs", cfg.pause_between_songs);
- 	xmms_cfg_write_int(cfgfile, "xmms", "pause_between_songs_time", cfg.pause_between_songs_time);
-+	/** Added by Tatu Lahtela */
-+	xmms_cfg_write_int(cfgfile, "xmms", "mousewheel_scroll_amount", cfg.mousewheel_scroll_amount);
-+	/* end */
- 	xmms_cfg_write_int(cfgfile, "xmms", "mouse_wheel_change", cfg.mouse_change);
- 	xmms_cfg_write_boolean(cfgfile, "xmms", "show_wm_decorations", cfg.show_wm_decorations);
-  	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_default_file", cfg.eqpreset_default_file);
-  	xmms_cfg_write_string(cfgfile, "xmms", "eqpreset_extension", cfg.eqpreset_extension);
-+ 	xmms_cfg_write_string(cfgfile, "xmms", "cdda_directory", cfg.cdda_directory);
- 	for (i = 0; i < 10; i++)
- 	{
- 		str = g_strdup_printf("equalizer_band%d", i);
-@@ -1390,22 +1421,47 @@
- 	{
- 	case GDK_Up:
- 	case GDK_KP_Up:
-+	case GDK_KP_8:
- 		mainwin_set_volume_diff(2);
- 		break;
- 	case GDK_Down:
- 	case GDK_KP_Down:
-+	case GDK_KP_2:
- 		mainwin_set_volume_diff(-2);
- 		break;
- 	case GDK_Left:
- 	case GDK_KP_Left:
-+	case GDK_KP_7:
- 		if(playlist_get_current_length() != -1)
- 			input_seek(CLAMP(input_get_time() - 5000, 0, playlist_get_current_length()) / 1000);
- 		break;
- 	case GDK_Right:
- 	case GDK_KP_Right:
-+	case GDK_KP_9:
- 		if(playlist_get_current_length() != -1)
- 			input_seek(CLAMP(input_get_time() + 5000, 0, playlist_get_current_length()) / 1000);
- 		break;
-+	case GDK_KP_0:
-+		mainwin_eject_pushed();
-+		break;
-+	case GDK_KP_1:
-+		playlist_set_position((((get_playlist_position() - 10) >= 0) ? get_playlist_position() - 10 : 0));
-+		break;
-+	case GDK_KP_3:
-+		playlist_set_position((((get_playlist_position() + 10) < get_playlist_length()) ? (get_playlist_position() + 10) : (get_playlist_length() - 1)));
-+		break;
-+	case GDK_KP_4:
-+		playlist_prev();
-+		break;
-+	case GDK_KP_5:
-+		mainwin_play_pushed();
-+		break;
-+	case GDK_KP_6:
-+		playlist_next();
-+		break;
-+	case GDK_KP_Decimal:
-+		mainwin_jump_to_file();
-+		break;
- 	default:
- 	     break;
-
-@@ -2491,6 +2547,12 @@
- 	case MAINWIN_GENERAL_PLAYLOCATION:
- 		mainwin_show_add_url_window();
- 		break;
-+	case MAINWIN_GENERAL_PLAYAUDIOCD:
-+		if (cfg.cdda_directory != NULL)
-+		{
-+			mainwin_add_dir_handler(cfg.cdda_directory);
-+		}
-+		break;
- 	case MAINWIN_GENERAL_FILEINFO:
- 		playlist_fileinfo_current();
- 		break;
-diff -urN xmms-1.2.10/xmms/main.h xmms-1.2.10_patch/xmms/main.h
---- xmms-1.2.10/xmms/main.h	2003-12-07 03:06:43.000000000 +0100
-+++ xmms-1.2.10_patch/xmms/main.h	2005-09-21 22:12:06.383276664 +0200
-@@ -59,7 +59,9 @@
- 	gboolean pause_between_songs, show_wm_decorations;
- 	gint mouse_change;
- 	gboolean playlist_transparent;
--        gchar *gentitle_format;
-+   gchar *gentitle_format;
-+   gint mousewheel_scroll_amount;
-+ 	gchar *cdda_directory;
- }
- Config;
-
-diff -urN xmms-1.2.10/xmms/playlistwin.c xmms-1.2.10_patch/xmms/playlistwin.c
---- xmms-1.2.10/xmms/playlistwin.c	2004-02-23 21:31:43.000000000 +0100
-+++ xmms-1.2.10_patch/xmms/playlistwin.c	2005-09-21 22:06:06.912924464 +0200
-@@ -1274,9 +1274,25 @@
- 		grab = FALSE;
- 	}
- 	else if (event->button == 4) /* Scrollwheel up */
--		playlistwin_scroll(-3);
-+	  /** Added by Tatu Lahtela */
-+	  if ( cfg.mousewheel_scroll_amount ) {
-+	    playlistwin_scroll(-1*cfg.mousewheel_scroll_amount );
-+	  }
-+	  else {
-+	    playlistwin_scroll(-10);
-+	  }
-+	/* end */
-+
- 	else if(event->button == 5) /* Scrollwheel down */
--		playlistwin_scroll(3);
-+	  /** Added by Tatu Lahtela */
-+	  if ( cfg.mousewheel_scroll_amount ) {
-+	    playlistwin_scroll(cfg.mousewheel_scroll_amount ) ;
-+	      //playlistwin_scroll(10);
-+	      }
-+	  else {
-+		playlistwin_scroll(10);
-+	  }
-+	/* end */
- 	else
- 	{
- 		handle_press_cb(playlistwin_wlist, widget, event);
-diff -urN xmms-1.2.10/xmms/prefswin.c xmms-1.2.10_patch/xmms/prefswin.c
---- xmms-1.2.10/xmms/prefswin.c	2003-12-07 03:06:43.000000000 +0100
-+++ xmms-1.2.10_patch/xmms/prefswin.c	2005-09-21 22:10:28.450164760 +0200
-@@ -20,6 +20,7 @@
- #include "xmms.h"
- #include "libxmms/util.h"
- #include "libxmms/titlestring.h"
-+#include "libxmms/dirbrowser.h"
-
- static GtkWidget *prefswin, *prefswin_notebook, *prefswin_ok;
- static GtkWidget *prefswin_audio_ie_cbox;
-@@ -37,11 +38,16 @@
- static GtkWidget *prefswin_options_font_entry, *prefswin_options_font_browse;
- static GtkWidget *prefswin_options_fontset, *prefswin_mainwin_font_entry;
- static GtkWidget *prefswin_mainwin_xfont, *prefswin_options_mouse_spin;
-+/** Added by Tatu Lahtela */
-+static GtkWidget *prefswin_options_mousewheel;
-+/* end */
- static gboolean updating_ilist = FALSE, updating_glist = FALSE, updating_vlist = FALSE, updating_elist = FALSE;
-
- static GtkWidget *prefswin_title_entry;
- static GtkTooltips *prefswin_tooltips;
-
-+static GtkWidget *prefswin_audiocd_cddadirectory;
-+
- extern MenuRow *mainwin_menurow;
-
- extern PButton *playlistwin_shade, *playlistwin_close, *equalizerwin_close;
-@@ -350,6 +356,11 @@
- 	cfg.gentitle_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_title_entry)));
- 	cfg.pause_between_songs_time = CLAMP(atoi(gtk_entry_get_text(GTK_ENTRY(prefswin_options_pbs_entry))), 0, 1000);
- 	cfg.mouse_change = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mouse_spin));
-+	cfg.cdda_directory = g_strdup(gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)));
-+
-+	/** Added by Tatu Lahtela */
-+        cfg.mousewheel_scroll_amount =  gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefswin_options_mousewheel));
-+	/* end */
-
- 	set_current_output_plugin(selected_oplugin);
-
-@@ -587,6 +598,21 @@
- 	gtk_clist_select_row(clist, sel, 0);
- }
-
-+static void prefswin_audiocd_browse_handler(gchar *dir)
-+{
-+	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), dir);
-+}
-+
-+static gint prefswin_audiocd_browse_cb(GtkWidget * w, gpointer data)
-+{
-+	GtkWidget *prefswin_audiocd_browser;
-+	prefswin_audiocd_browser = xmms_create_dir_browser(_("Select directory to add:"), gtk_entry_get_text(GTK_ENTRY(prefswin_audiocd_cddadirectory)), GTK_SELECTION_SINGLE, prefswin_audiocd_browse_handler);
-+	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &prefswin_audiocd_browser);
-+	gtk_window_set_transient_for(GTK_WINDOW(prefswin_audiocd_browser), GTK_WINDOW(prefswin));
-+	gtk_widget_show(prefswin_audiocd_browser);
-+	return (TRUE);
-+}
-+
- static GtkWidget * prefswin_option_new(gboolean * cfg)
- {
- 	struct option_info *info;
-@@ -701,6 +727,10 @@
-
- 	GtkWidget *prefswin_title_frame, *prefswin_title_vbox;
- 	GtkWidget *prefswin_title_hbox, *prefswin_title_vbox2;
-+
-+	GtkWidget *prefswin_audiocd_frame, *prefswin_audiocd_vbox;
-+	GtkWidget *prefswin_audiocd_hbox, *prefswin_audiocd_browse;
-+	GtkWidget *prefswin_audiocd_label;
-
- 	GtkWidget *options_table;
- 	GtkWidget *options_giop, *options_giod, *options_giol, *options_rt;
-@@ -711,6 +741,12 @@
- 	GtkWidget *options_font_hbox, *options_font_vbox;
- 	GtkWidget *options_mouse_box, *options_mouse_label;
- 	GtkObject *options_mouse_adj;
-+
-+ 	/** Added by Tatu Lahtela */
-+ 	GtkWidget *options_mousewheel_scroll_box, *options_mousewheel_scroll_label;
-+ 	GtkObject *options_mousewheel_scroll_adj;
-+ 	/* end */
-+
- 	GtkWidget *prefswin_title_desc, *prefswin_title_label, *opt;
-
- 	char *titles[1];
-@@ -1031,6 +1067,7 @@
- 			     _("Recommended if you want to load playlists "
- 			       "that was created in MS Windows"), NULL);
-
-+
- 	options_mouse_box = gtk_hbox_new(FALSE, 5);
- 	options_mouse_label = gtk_label_new(_("Mouse Wheel adjusts Volume by (%)"));
- 	gtk_box_pack_start(GTK_BOX(options_mouse_box), options_mouse_label, FALSE, FALSE, 0);
-@@ -1044,6 +1081,17 @@
- 						_("Use meta-data in playlists"),
- 						GTK_TABLE(options_table), 1, 8);
-
-+ 	/** Added by Tatu Lahtela */
-+ 	options_mousewheel_scroll_box = gtk_hbox_new(FALSE, 5);
-+ 	options_mousewheel_scroll_label = gtk_label_new(_("Mouse Wheel scrolls playlist by (lines)"));
-+ 	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), options_mousewheel_scroll_label, FALSE, FALSE, 0);
-+ 	options_mousewheel_scroll_adj = gtk_adjustment_new(cfg.mousewheel_scroll_amount, 1, 100, 1, 1, 1);
-+ 	prefswin_options_mousewheel = gtk_spin_button_new(GTK_ADJUSTMENT(options_mousewheel_scroll_adj), 1, 0);
-+ 	gtk_widget_set_usize(prefswin_options_mousewheel, 45, -1);
-+ 	gtk_box_pack_start(GTK_BOX(options_mousewheel_scroll_box), prefswin_options_mousewheel, FALSE, FALSE, 0);
-+ 	gtk_table_attach_defaults(GTK_TABLE(options_table), options_mousewheel_scroll_box, 0, 1, 9, 10);
-+ 	/* end */
-+
- 	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_options_vbox, gtk_label_new(_("Options")));
-
- 	/*
-@@ -1118,7 +1166,31 @@
- 	gtk_box_pack_start(GTK_BOX(prefswin_title_vbox2), prefswin_title_desc, FALSE, FALSE, 0);
-
- 	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_title_vbox, gtk_label_new(_("Title")));
--
-+
-+	/*
-+	 * Audio CD page
-+	 */
-+	prefswin_audiocd_vbox = gtk_vbox_new(FALSE, 0);
-+
-+	prefswin_audiocd_frame = gtk_frame_new(_("Audio CD directory"));
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_vbox), prefswin_audiocd_frame, FALSE, FALSE, 0);
-+	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_frame), 5);
-+
-+	prefswin_audiocd_hbox = gtk_hbox_new(FALSE, 10);
-+	gtk_container_add(GTK_CONTAINER(prefswin_audiocd_frame), prefswin_audiocd_hbox);
-+	gtk_container_border_width(GTK_CONTAINER(prefswin_audiocd_hbox), 5);
-+
-+	prefswin_audiocd_label = gtk_label_new(_("Directory:"));
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_label, FALSE, FALSE, 0);
-+
-+	prefswin_audiocd_cddadirectory = gtk_entry_new();
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_cddadirectory, TRUE, TRUE, 0);
-+
-+	prefswin_audiocd_browse = gtk_button_new_with_label(_("Browse"));
-+	gtk_signal_connect(GTK_OBJECT(prefswin_audiocd_browse), "clicked", GTK_SIGNAL_FUNC(prefswin_audiocd_browse_cb), NULL);
-+	gtk_box_pack_start(GTK_BOX(prefswin_audiocd_hbox), prefswin_audiocd_browse, TRUE, TRUE, 0);
-+
-+	gtk_notebook_append_page(GTK_NOTEBOOK(prefswin_notebook), prefswin_audiocd_vbox, gtk_label_new(_("Audio CD")));
-
- 	/*
- 	 * Ok, Cancel & Apply
-@@ -1364,6 +1436,12 @@
- 	gtk_entry_set_text(GTK_ENTRY(prefswin_options_pbs_entry), temp);
- 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mouse_spin), cfg.mouse_change);
-
-+	/** Added by Tatu Lahtela */
-+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefswin_options_mousewheel), cfg.mousewheel_scroll_amount);
-+	/* end */
-+
-+	gtk_entry_set_text(GTK_ENTRY(prefswin_audiocd_cddadirectory), cfg.cdda_directory);
-+
-  	gtk_widget_show_all(prefswin);
- 	gtk_widget_grab_default(prefswin_ok);
-
diff --git a/source/xapps/xmms/xmms.desktop b/source/xapps/xmms/xmms.desktop
deleted file mode 100644
index 30fc277..0000000
--- a/source/xapps/xmms/xmms.desktop
+++ /dev/null
@@ -1,85 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-BinaryPattern=
-GenericName=Multimedia Player
-GenericName[af]=Multimedia Speler
-GenericName[ar]=مشغل الوسائط المتعددة
-GenericName[az]=Multimedia Çalğıcısı
-GenericName[bg]=Мултимедиен плеър
-GenericName[bn]=মাল্টিমিডিয়া প্লেয়ার
-GenericName[bs]=Preglednik multimedijalnih datoteka
-GenericName[ca]=Reproductor multimèdia
-GenericName[cs]=Přehrávač multimédií
-GenericName[cy]=Chwaraewr Amlgyfrwng
-GenericName[da]=Multimedieafspiller
-GenericName[de]=Multimedia-Wiedergabe
-GenericName[el]=Αναπαραγωγέας πολυμέσων
-GenericName[eo]=Plurmedia ludilo
-GenericName[es]=Reproductor multimedia
-GenericName[et]=Multimeedia mängija
-GenericName[eu]=Multimedia Jolea
-GenericName[fa]=پخش کننده‌ی چندرسانه‌ای
-GenericName[fi]=Multimediasoittaja
-GenericName[fr]=Lecteur multimĂŠdia
-GenericName[gl]=Reproductor Multimedia
-GenericName[he]=נגן מולטימדיה
-GenericName[hi]=मल्टीमीडिया प्लेयर
-GenericName[hr]=Multimedijski player
-GenericName[hu]=MĂŠdialejĂĄtszĂł
-GenericName[is]=MargmiĂ°lunarspilari
-GenericName[it]=Lettore multimediale
-GenericName[ja]=メディアプレーヤー
-GenericName[ko]=멀티미디어 연주기
-GenericName[lo]=ເຄື່ອງມືຫລິ້ນແຟ້ມສີ
-GenericName[lt]=Multimedijos grotuvas
-GenericName[lv]=Multimēdiju Atskaņotājs
-GenericName[mn]=Мултимедиа-Тоглуулагч
-GenericName[mt]=Plejer Multimedia
-GenericName[nb]=Multimediaspiller
-GenericName[nl]=Multimediaspeler
-GenericName[nn]=Multimediespelar
-GenericName[nso]=Sebapadi sa Media wa Bontshi
-GenericName[pa]=ਬਹੁਰੰਗ ਵਾਜਾ
-GenericName[pl]=Odtwarzacz multimedialny
-GenericName[pt]=Reprodutor MultimĂŠdia
-GenericName[pt_BR]=Reprodutor multimĂ­dia
-GenericName[ro]=Program de redare multimedia
-GenericName[ru]=Мультимедийный проигрыватель
-GenericName[se]=Multimediačuojaheaddji
-GenericName[sk]=Multimediálny prehrávač
-GenericName[sl]=Večpredstavnostni predvajalnik
-GenericName[sr]=Мултимедијални приказивач
-GenericName[sr@Latn]=Multimedijalni prikazivač
-GenericName[ss]=Sidlali setindzaba letinyenti
-GenericName[sv]=Multimediaspelare
-GenericName[ta]=பல்ஊடக சாதனம்
-GenericName[tg]=Плейери Мултимедия
-GenericName[th]=เครื่องมือเล่นแฟ้มสื่อ
-GenericName[tr]=Çoklu Ortam Yürütücüsü
-GenericName[uk]=Програвач файлів мультимедія
-GenericName[uz]=Мултимедиа плейер
-GenericName[ven]=Tshitambi tsha Zwimvumvusi
-GenericName[vi]=Trình chơi nhạc đa phương tiện
-GenericName[wa]=Djouweu multimedia
-GenericName[xh]=Umdlali we Multimedia
-GenericName[xx]=xxMultimedia Playerxx
-GenericName[zh_CN]=多媒体播放器
-GenericName[zh_TW]=多媒體播放程式
-GenericName[zu]=Umdlali wonozindaba abaningi
-Exec=xmms %U
-Icon=xmms
-MimeType=audio/x-mp3;audio/x-mod;audio/x-wav;audio/x-flac;audio/x-mpegurl;audio/x-scpls;audio/vorbis
-Name=XMMS
-Name[af]=Xmms
-Name[fa]=سیستم چندرسانه‌ای X
-Name[hi]=एक्सएमएमएस
-Name[vi]=XMMS
-Name[xx]=xxXMMSxx
-Path=
-SwallowExec=
-SwallowTitle=
-Terminal=0
-TerminalOptions=
-Type=Application
-X-KDE-StartupNotify=false
-X-DCOP-ServiceType=None
From crazy at frugalware.org  Sun Oct 14 22:47:08 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 22:47:10 2007
Subject: [Frugalware-git] frugalware-current: gtk1-sharp-1.0.10-5-i686
Message-ID: <20071014204708.A5CC71678009@genesis.frugalware.org>

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

commit 65d9ed9ad02cd55ccc9bec2a278c37298636fce8
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 22:43:28 2007 +0200

gtk1-sharp-1.0.10-5-i686
* moved to gnome-extra
* the only app need it is in -extra

diff --git a/source/gnome-extra/gtk1-sharp/FrugalBuild b/source/gnome-extra/gtk1-sharp/FrugalBuild
new file mode 100644
index 0000000..dd6feda
--- /dev/null
+++ b/source/gnome-extra/gtk1-sharp/FrugalBuild
@@ -0,0 +1,36 @@
+# Compiling time: 0.73 SBU
+# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>
+# Contributor: crazy <crazy@frugalware.org>
+
+pkgname=gtk1-sharp
+pkgver=1.0.10
+origname=gtk-sharp
+pkgrel=5
+pkgdesc="A C# language binding for the GTK toolkit and GNOME libraries"
+url="http://www.mono-project.com/GtkSharp"
+depends=('expat' 'atk' 'libsm' 'mono' 'libgnomedb' 'librsvg' 'vte' 'gtkhtml')
+options=('scriptlet')
+groups=('gnome-extra')
+archs=('i686' 'x86_64')
+up2date="lynx -dump http://go-mono.com/sources-stable/|grep -m1 'gtk-sharp'|sed 's/.*-\(.*\).t.*/\1/'"
+source=(http://go-mono.com/sources/$origname/$origname-$pkgver.tar.gz)
+sha1sums=('6965559e2e3b741f587a41d286935c73a2c2c437')
+Finclude mono
+_F_cd_path="$origname-$pkgver"
+
+build() {
+	Fmonoexport
+
+	Fcd
+	Fsed "libgtkhtml-3.6" "libgtkhtml-3.8" configure.in
+	Fsed "GTKHTML_VERSION=3.6" "GTKHTML_VERSION=3.8" configure.in
+	Fsed "GTKHTML_SOVERSION=18" "GTKHTML_SOVERSION=15" configure.in
+	Fsed "libgda" "libgda-2.0" configure.in
+	Fsed "libgnomedb" "libgnomedb-2.0" configure.in
+	aclocal || Fdie
+	(autoconf || autoconf) || Fdie
+
+	Fbuild
+
+	Fmonocleanup
+}
diff --git a/source/gnome/gtk1-sharp/FrugalBuild b/source/gnome/gtk1-sharp/FrugalBuild
deleted file mode 100644
index 264f335..0000000
--- a/source/gnome/gtk1-sharp/FrugalBuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Compiling time: 0.73 SBU
-# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>
-# Contributor: crazy <crazy@frugalware.org>
-
-pkgname=gtk1-sharp
-pkgver=1.0.10
-origname=gtk-sharp
-pkgrel=5
-pkgdesc="A C# language binding for the GTK toolkit and GNOME libraries"
-url="http://www.mono-project.com/GtkSharp"
-depends=('expat' 'atk' 'libsm' 'mono' 'libgnomedb' 'librsvg' 'vte' 'gtkhtml')
-options=('scriptlet')
-groups=('gnome')
-archs=('i686' 'x86_64')
-up2date="lynx -dump http://go-mono.com/sources-stable/|grep -m1 'gtk-sharp'|sed 's/.*-\(.*\).t.*/\1/'"
-source=(http://go-mono.com/sources/$origname/$origname-$pkgver.tar.gz)
-sha1sums=('6965559e2e3b741f587a41d286935c73a2c2c437')
-Finclude mono
-_F_cd_path="$origname-$pkgver"
-
-build() {
-	Fmonoexport
-
-	Fcd
-	Fsed "libgtkhtml-3.6" "libgtkhtml-3.8" configure.in
-	Fsed "GTKHTML_VERSION=3.6" "GTKHTML_VERSION=3.8" configure.in
-	Fsed "GTKHTML_SOVERSION=18" "GTKHTML_SOVERSION=15" configure.in
-	Fsed "libgda" "libgda-2.0" configure.in
-	Fsed "libgnomedb" "libgnomedb-2.0" configure.in
-	aclocal || Fdie
-	(autoconf || autoconf) || Fdie
-
-	Fbuild
-
-	Fmonocleanup
-}
From crazy at frugalware.org  Sun Oct 14 22:54:14 2007
From: crazy at frugalware.org (crazy)
Date: Sun Oct 14 22:54:16 2007
Subject: [Frugalware-git] frugalware-current: gtk+-1.2.10-3-i686
Message-ID: <20071014205414.1A3EE1688018@genesis.frugalware.org>

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

commit 7b640691102d561d0449d2e7d7c541640c966db1
Author: crazy <crazy@frugalware.org>
Date:   Sun Oct 14 22:49:49 2007 +0200

gtk+-1.2.10-3-i686
* moved to xlib

diff --git a/source/gnome/gtk+/FrugalBuild b/source/gnome/gtk+/FrugalBuild
deleted file mode 100644
index 8911878..0000000
--- a/source/gnome/gtk+/FrugalBuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: VMiklos <vmiklos@frugalware.org>
-
-pkgname=gtk+
-pkgver=1.2.10
-pkgrel=3
-pkgdesc="The GTK+ toolkit"
-url="http://www.gtk.org/"
-depends=('glib' 'libxi' 'libxt' 'libxext')
-groups=('gnome')
-archs=('i686' 'x86_64')
-preup2date=`echo $pkgver|cut -d . -f 1`.`echo $pkgver|cut -d . -f 2`
-up2date="lynx -dump ftp://ftp.gtk.org/pub/gtk/v1.2/|grep LATEST-GTK+|sed -n 's/.*-\(.*\)/\1/;1 p'"
-source=(ftp://ftp.gtk.org/pub/gtk/v$preup2date/$pkgname-$pkgver.tar.gz
-	gtk+-1.2.10-m4.patch)
-sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' \
-	  '898e6846de5d4c57ecc2e2503ed56355324fd2ee')
-
-build()
-{
-	Fcd
-	Facu
-	Fbuild --with-glib-prefix=/usr --with-x
-}
-
-# optimization OK
diff --git a/source/gnome/gtk+/gtk+-1.2.10-m4.patch b/source/gnome/gtk+/gtk+-1.2.10-m4.patch
deleted file mode 100644
index 37fb7c2..0000000
--- a/source/gnome/gtk+/gtk+-1.2.10-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warnings:
-/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
---- gtk+-1.2.10/gtk.m4
-+++ gtk+-1.2.10/gtk.m4
-@@ -6,3 +6,3 @@
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl
diff --git a/source/xlib/gtk+/FrugalBuild b/source/xlib/gtk+/FrugalBuild
new file mode 100644
index 0000000..36e1f33
--- /dev/null
+++ b/source/xlib/gtk+/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: VMiklos <vmiklos@frugalware.org>
+
+pkgname=gtk+
+pkgver=1.2.10
+pkgrel=3
+pkgdesc="The GTK+ toolkit"
+url="http://www.gtk.org/"
+depends=('glib' 'libxi' 'libxt' 'libxext')
+groups=('xlib')
+archs=('i686' 'x86_64')
+preup2date=`echo $pkgver|cut -d . -f 1`.`echo $pkgver|cut -d . -f 2`
+up2date="lynx -dump ftp://ftp.gtk.org/pub/gtk/v1.2/|grep LATEST-GTK+|sed -n 's/.*-\(.*\)/\1/;1 p'"
+source=(ftp://ftp.gtk.org/pub/gtk/v$preup2date/$pkgname-$pkgver.tar.gz
+	gtk+-1.2.10-m4.patch)
+sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' \
+	  '898e6846de5d4c57ecc2e2503ed56355324fd2ee')
+
+build()
+{
+	Fcd
+	Facu
+	Fbuild --with-glib-prefix=/usr --with-x
+}
+
+# optimization OK
diff --git a/source/xlib/gtk+/gtk+-1.2.10-m4.patch b/source/xlib/gtk+/gtk+-1.2.10-m4.patch
new file mode 100644
index 0000000..37fb7c2
--- /dev/null
+++ b/source/xlib/gtk+/gtk+-1.2.10-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warnings:
+/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
+--- gtk+-1.2.10/gtk.m4
++++ gtk+-1.2.10/gtk.m4
+@@ -6,3 +6,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK],
+ [dnl
From vmiklos at frugalware.org  Sun Oct 14 23:20:22 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Oct 14 23:20:26 2007
Subject: [Frugalware-git] frugalware-0.7: t/fpmjunk: s/remove old pkgs/move
	pkgs to a different dir/
Message-ID: <20071014212022.9FCBC167800A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=4267642fd66a8a4c11dcbc73b56d57e55852ea9c

commit 4267642fd66a8a4c11dcbc73b56d57e55852ea9c
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Sun Oct 14 23:01:36 2007 +0200

t/fpmjunk: s/remove old pkgs/move pkgs to a different dir/

diff --git a/t/fpmjunk.py b/t/fpmjunk.py
index 4a54c8c..04bb789 100644
--- a/t/fpmjunk.py
+++ b/t/fpmjunk.py
@@ -24,8 +24,10 @@ for i in ['frugalware-%s' % arch]:
pacman.initialize(root)
if os.getcwd().split('/')[-2] == "frugalware-current":
treename = "frugalware-current"
+		archive = treename
else:
treename = "frugalware"
+		archive = treename + "-stable"
db = pacman.db_register(treename)
pacman.db_setserver(db, "file://" + os.getcwd() + "/../frugalware-" + arch)
pacman.db_update(1, db)
@@ -43,4 +45,4 @@ for i in ['frugalware-%s' % arch]:
if j not in fdb and j != treename + ".fdb":
print "frugalware-" + arch + "/" + j
if remove:
-				os.unlink("../frugalware-" + arch + "/" + j)
+				os.rename("../frugalware-" + arch + "/" + j, "/home/ftp/pub/archive/fpmjunk/" + archive + "/frugalware-" + arch + "/" + j)
From janny at frugalware.org  Sun Oct 14 23:43:08 2007
From: janny at frugalware.org (janny)
Date: Sun Oct 14 23:43:11 2007
Subject: [Frugalware-git] frugalware-current: kmplayer-0.10.0-1-i686
Message-ID: <20071014214308.714A41678009@genesis.frugalware.org>

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

commit 3d009043500522a158cacae12b3ab8571e6ce8a1
Author: janny <janny@frugalware.org>
Date:   Sun Oct 14 23:42:16 2007 +0200

kmplayer-0.10.0-1-i686
version bump

diff --git a/source/kde-extra/kmplayer/FrugalBuild b/source/kde-extra/kmplayer/FrugalBuild
index 9fd17af..6e330c3 100644
--- a/source/kde-extra/kmplayer/FrugalBuild
+++ b/source/kde-extra/kmplayer/FrugalBuild
@@ -2,27 +2,29 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=kmplayer
-pkgver=0.9.4a
+pkgver=0.10.0
pkgrel=1
pkgdesc="The KMPlayer KPart plugin for Konqueror mimics QuickTime, MS Media Player and RealPlayer plugin browser plugins."
url="http://kmplayer.kde.org"
license="GPL"
-depends=('mplayer' 'gstreamer>=0.10.10' 'gst-plugins-bad' 'gst-plugins-base' \
-	'gst-plugins-good' 'gst-plugins-ugly' 'libstdc++' 'libxml2' 'xine-lib' 'popt' 'kdelibs')
+depends=('mplayer' 'gstreamer>=0.10.10' 'gst-plugins-bad' 'gst-plugins-base' 'libxi' 'libxmu' 'libxv' \
+	'gst-plugins-good' 'gst-plugins-ugly' 'libstdc++' 'libxml2' 'xine-lib' 'popt' 'kdelibs' 'dbus-qt3')
#depends=('libxi' 'libstdc++' 'libxmu' 'libxv' 'xfsprogs-attr' 'libgl' 'qt' 'kdelibs')
archs=('i686' 'x86_64')
groups=('kde-extra')
options=('scriptlet')
up2date="lynx -dump $url/pkgs/?D=D|grep km |grep -m1 .tar|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
source=($url/pkgs/$pkgname-$pkgver.tar.bz2)
+sha1sums=('b99ecdff0c77b8db549579ef45538750aa0dc1d4')

build()
{
+	unset MAKEFLAGS
+	Fcd $pkgname-$pkgver/
Fbuild --enable-profile --enable-final \
--disable-debug --without-debug --with-gnu-ld
## now in kdelibs
Frm /usr/share/mimelnk/application/x-mplayer2.desktop
}

-sha1sums=('27d78793d6e9ac37a5810b8e742ffa0f55317488')
# optimization OK
From janny at frugalware.org  Mon Oct 15 00:09:38 2007
From: janny at frugalware.org (janny)
Date: Mon Oct 15 00:09:43 2007
Subject: [Frugalware-git] frugalware-current: kcheckgmail-0.5.7.2-1-i686
Message-ID: <20071014220938.494AF1688018@genesis.frugalware.org>

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

commit 4cebf5d0d8cc30f29aac998b47d704b4d3969b28
Author: janny <janny@frugalware.org>
Date:   Mon Oct 15 00:09:13 2007 +0200

kcheckgmail-0.5.7.2-1-i686
version bump

diff --git a/source/kde-extra/kcheckgmail/FrugalBuild b/source/kde-extra/kcheckgmail/FrugalBuild
index 04b0a8b..be88ef3 100644
--- a/source/kde-extra/kcheckgmail/FrugalBuild
+++ b/source/kde-extra/kcheckgmail/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=kcheckgmail
-pkgver=0.5.7.1
+pkgver=0.5.7.2
pkgrel=1
pkgdesc="KCheckGmail is a system tray application to notify you about how many email messages you have in your Gmail account."
license="GPL"
@@ -12,6 +12,6 @@ groups=('kde-extra')
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_broken_up2date=1
Finclude kde sourceforge
-sha1sums=('46a979738dc9a453303624f2fcf1e6ddaede80bb')
+sha1sums=('38cfa3d278be29dc2f966a08c342389c11975f56')

# optimization ok
From janny at frugalware.org  Mon Oct 15 00:16:55 2007
From: janny at frugalware.org (janny)
Date: Mon Oct 15 00:16:59 2007
Subject: [Frugalware-git] frugalware-current: skype-1.4.0.118-1-i686
Message-ID: <20071014221655.8F7E51678009@genesis.frugalware.org>

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

commit d2917231fa7657f630a0a1b887568ab8fbf1f83d
Author: janny <janny@frugalware.org>
Date:   Mon Oct 15 00:15:59 2007 +0200

skype-1.4.0.118-1-i686
version bump

diff --git a/source/xapps-extra/skype/FrugalBuild b/source/xapps-extra/skype/FrugalBuild
index 479b16c..720da09 100644
--- a/source/xapps-extra/skype/FrugalBuild
+++ b/source/xapps-extra/skype/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=skype
-pkgver=1.4.0.99
+pkgver=1.4.0.118
pkgrel=1
pkgdesc="Skype will let you make free calls to your friends all over the world."
url="http://skype.com"
@@ -13,7 +13,7 @@ up2date="lynx -dump http://www.skype.com/download/skype/linux/ | grep Version |
source=(http://download.skype.com/linux/$pkgname-$pkgver.tar.bz2)
license="skype-eula"
options=('nobuild')
-sha1sums=('4908c0cc1005cc0591844d1d3bda45472e9deb88')
+sha1sums=('8bf7737086702adbd276f081aad3bfe00ea8e22c')

build()
{
From janny at frugalware.org  Mon Oct 15 00:25:48 2007
From: janny at frugalware.org (janny)
Date: Mon Oct 15 00:25:50 2007
Subject: [Frugalware-git] frugalware-current: x11vnc-0.9.3-1-i686
Message-ID: <20071014222548.1943F1688018@genesis.frugalware.org>

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

commit 34796f4df830bd792c4d24d631b968780b141759
Author: janny <janny@frugalware.org>
Date:   Mon Oct 15 00:25:15 2007 +0200

x11vnc-0.9.3-1-i686
version bump

diff --git a/source/xapps-extra/x11vnc/FrugalBuild b/source/xapps-extra/x11vnc/FrugalBuild
index cb2c64c..6769937 100644
--- a/source/xapps-extra/x11vnc/FrugalBuild
+++ b/source/xapps-extra/x11vnc/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=x11vnc
-pkgver=0.9.2
+pkgver=0.9.3
pkgrel=1
pkgdesc="a VNC server for real X displays"
_F_sourceforge_dirname="libvncserver"
@@ -15,6 +15,6 @@ depends=('libxtst' 'libjpeg' 'zlib')
makedepends=('inputproto')
archs=('i686' 'x86_64')
groups=('xapps-extra')
-sha1sums=('adc9f61e949c30890bf8617669bef6bfa6a37137' \
+sha1sums=('7bb5e0d16d5fae301e6f4dcb5b9419a5e2396ee3' \
'ffb34daee8f3099e65290225bf648950b1e61f92')
# optimization OK
From crazy at frugalware.org  Mon Oct 15 00:29:40 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 00:29:44 2007
Subject: [Frugalware-git] frugalware-current: pygtk-2.12.0-2-i686
Message-ID: <20071014222940.2DAB91678009@genesis.frugalware.org>

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

commit 153d0180e2675b73704f0b7f45ea17d991025070
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 00:24:49 2007 +0200

pygtk-2.12.0-2-i686
* added docs subpackage

diff --git a/source/gnome/pygtk/FrugalBuild b/source/gnome/pygtk/FrugalBuild
index c02e6e0..eaf2061 100644
--- a/source/gnome/pygtk/FrugalBuild
+++ b/source/gnome/pygtk/FrugalBuild
@@ -3,13 +3,25 @@

pkgname=pygtk
pkgver=2.12.0
-pkgrel=1
+pkgrel=2
pkgdesc="Python bindings for GTK+2"
url="http://www.daa.com.au/~james/pygtk/"
depends=('libglade>=2.6.2-2' 'pycairo' 'pygobject>=2.14.0' 'python-numeric>=24.2-3')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
-
sha1sums=('8248a620ef4147af07a708643926523024789d4e')
+export CFLAGS="$CFLAGS -fno-strict-aliasing -fgnu89-inline"
+
+subpkgs=("$pkgname-docs")
+subdescs=("Pygtk Documentation")
+subdepends=()
+subgroups=('gnome-extra')
+subarchs=('i686 x86_64')
+
+build()
+{
+	Fbuild
+	Fsplit $pkgname-docs usr/share/gtk-doc
+}
# optimization OK
From vmiklos at frugalware.org  Mon Oct 15 00:35:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 00:35:42 2007
Subject: [Frugalware-git] frugalware-current: magpierss-0.72-1-i686
Message-ID: <20071014223537.23A621688018@genesis.frugalware.org>

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

commit 8c73f90ae8fbd914685a0a962340dae2f7227b8c
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 00:35:17 2007 +0200

magpierss-0.72-1-i686
new package

diff --git a/source/network-extra/magpierss/FrugalBuild b/source/network-extra/magpierss/FrugalBuild
new file mode 100644
index 0000000..a2fef4f
--- /dev/null
+++ b/source/network-extra/magpierss/FrugalBuild
@@ -0,0 +1,24 @@
+# Compiling Time: 0 SBU
+# Maintainer: VMiklos <vmiklos@frugalware.org>
+
+pkgname=magpierss
+pkgver=0.72
+pkgrel=1
+pkgdesc="An XML-based (expat) RSS parser in PHP."
+_F_sourceforge_prefix="magpierss-"
+Finclude sourceforge
+rodepends=('php')
+groups=('network-extra')
+archs=('i686')
+source=($source magpierss-0.72-warning_fix.diff)
+sha1sums=('0d23b5a2aa3f58ad791593f2ab1b6e9ca0857793' \
+          '430b6c3bf9741a2927c41cde7ba288942e4ca386')
+
+build()
+{
+	Fpatchall
+	Fmkdir /usr/lib/php/
+	Fcprrel . /usr/lib/php/$pkgname
+	# remove duplicated documentation
+	Frm /usr/lib/php/$pkgname/{AUTHORS,CHANGES,ChangeLog,INSTALL,NEWS,README}
+}
diff --git a/source/network-extra/magpierss/magpierss-0.72-warning_fix.diff b/source/network-extra/magpierss/magpierss-0.72-warning_fix.diff
new file mode 100644
index 0000000..7301da6
--- /dev/null
+++ b/source/network-extra/magpierss/magpierss-0.72-warning_fix.diff
@@ -0,0 +1,14 @@
+From http://www.sweeting.org/mark/blog/2006/07/11/undefined-property-etag-in-rss_fetchinc.
+diff -Naur magpierss-0.72.orig/rss_fetch.inc magpierss-0.72/rss_fetch.inc
+--- magpierss-0.72.orig/rss_fetch.inc	2005-11-05 22:10:56.000000000 +0100
++++ magpierss-0.72/rss_fetch.inc	2007-10-15 00:32:23.000000000 +0200
+@@ -153,7 +153,8 @@
+         // setup headers
+         if ( $cache_status == 'STALE' ) {
+             $rss = $cache->get( $cache_key );
+-            if ( $rss and $rss->etag and $rss->last_modified ) {
++            if ( $rss and array_key_exists("etag", get_object_vars($rss)) and
++                array_key_exists("last_modified", get_object_vars($rss)) ) {
+                 $request_headers['If-None-Match'] = $rss->etag;
+                 $request_headers['If-Last-Modified'] = $rss->last_modified;
+             }
From crazy at frugalware.org  Mon Oct 15 01:38:56 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 01:38:59 2007
Subject: [Frugalware-git] frugalware-current: ivtv-utils-1.0.3-1-i686
Message-ID: <20071014233856.1A36B1678009@genesis.frugalware.org>

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

commit ec533f41b4b10aed0d1119d3c787c074971a1424
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 01:34:52 2007 +0200

ivtv-utils-1.0.3-1-i686
* Version bump

diff --git a/source/apps-extra/ivtv-utils/FrugalBuild b/source/apps-extra/ivtv-utils/FrugalBuild
index 2d4f498..27f2893 100644
--- a/source/apps-extra/ivtv-utils/FrugalBuild
+++ b/source/apps-extra/ivtv-utils/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=ivtv-utils
branch=1.0.x
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
pkgdesc="Tools for managing the hardware supported by ivtv driver"
url="http://ivtvdriver.org/index.php/Main_Page"
@@ -13,10 +13,10 @@ rodepends=('ivtv-firmware')
conflicts=('ivtv')
groups=('apps-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://ivtvdriver.org/index.php/Main_Page|grep -m1 'ivtv-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'"
+up2date="lynx -dump http://dl.ivtvdriver.org/ivtv/archive/$branch/|Flasttar"
source=(http://dl.ivtvdriver.org/ivtv/archive/$branch/ivtv-$pkgver.tar.gz \
http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz)
-sha1sums=('32cbc3f891cad54f8705f61780c05bd7bc536bba' \
+sha1sums=('c2268f0b611378cbb180904cd6cc5774a17a978c' \
'68fef52289fed191aac19ce4c0f84fb25740f028')

subpkgs=('ivtv-firmware')
From voroskoi at frugalware.org  Mon Oct 15 11:46:24 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 11:46:28 2007
Subject: [Frugalware-git] frugalware-current: libpng-1.2.22-1-i686
Message-ID: <20071015094624.C0C681678009@genesis.frugalware.org>

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

commit ed93c5f31a0233c36f413bb5148dc03884fc52b4
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 11:29:44 2007 +0200

libpng-1.2.22-1-i686
version bump
closes #2475 in -current

diff --git a/source/lib/libpng/FrugalBuild b/source/lib/libpng/FrugalBuild
index f8a7b72..9302ec2 100644
--- a/source/lib/libpng/FrugalBuild
+++ b/source/lib/libpng/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=libpng
-pkgver=1.2.20
+pkgver=1.2.22
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
url="http://www.libpng.org/"
@@ -19,7 +19,7 @@ build() {
./autogen.sh || Fdie
Fbuild
}
-sha1sums=('3fc27faf224ea31a43771c214f2f903ea2e98b0d' \
+sha1sums=('15134a21e606254ba0a9e37af510a975c00d7c36' \
'2bb13a8eb62115998ab628948cab4f905dc5289e')

# optimization OK
From vmiklos at frugalware.org  Mon Oct 15 12:26:03 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 12:26:06 2007
Subject: [Frugalware-git] homepage-ng: added roadmap for 0.8-Kalgan
Message-ID: <20071015102603.77AAC1678009@genesis.frugalware.org>

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

commit 547ccdb9e3c62256cda28c8e48cb40967ac08c3d
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 12:25:50 2007 +0200

added roadmap for 0.8-Kalgan

diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml
index 6348a28..ac93175 100644
--- a/frugalware/xml/roadmap.xml
+++ b/frugalware/xml/roadmap.xml
@@ -22,6 +22,34 @@

<roadmap>
<release>
+		<name>Kalgan</name>
+		<definition>Kalgan is a fictional planet in Isaac Asimov's Foundation series.</definition>
+		<version>0.8</version>
+		<date>Mar 11, 2008</date>
+		<status>0</status>
+		<newsid></newsid>
+		<prerelease>
+			<preversion>rc2</preversion>
+			<predate>Feb 19, 2008</predate>
+			<prestatus>0</prestatus>
+		</prerelease>
+		<prerelease>
+			<preversion>rc1</preversion>
+			<predate>Jan 29, 2008</predate>
+			<prestatus>0</prestatus>
+		</prerelease>
+		<prerelease>
+			<preversion>pre2</preversion>
+			<predate>Jan 8, 2008</predate>
+			<prestatus>0</prestatus>
+		</prerelease>
+		<prerelease>
+			<preversion>pre1</preversion>
+			<predate>Dec 4, 2007</predate>
+			<prestatus>0</prestatus>
+		</prerelease>
+	</release>
+	<release>
<name>Sayshell</name>
<definition>Sayshell is a planet in Foundation's Edge by Isaac Asimov.</definition>
<version>0.7</version>
From vmiklos at frugalware.org  Mon Oct 15 12:27:36 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 12:27:37 2007
Subject: [Frugalware-git] frugalware-0.7: depends() fix
Message-ID: <20071015102736.5D0381678009@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=469a3e845da6d23214be140f646d0081be794214

commit 469a3e845da6d23214be140f646d0081be794214
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 12:27:28 2007 +0200

depends() fix

diff --git a/source/apps-extra/xmltv/FrugalBuild b/source/apps-extra/xmltv/FrugalBuild
index f15fef0..6493849 100644
--- a/source/apps-extra/xmltv/FrugalBuild
+++ b/source/apps-extra/xmltv/FrugalBuild
@@ -9,7 +9,7 @@ _F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.xmltv.org"
depends=('perl-xml' 'perl-xml-twig' 'perl-libwww' 'perl-archive-zip' 'perl-cgi' 'perl-compress-zlib' \
-	 'perl-html-parser' 'perl-datemanip' 'perl-xml-libxml' 'perl-term-progressbar' 'perl-html-tree' \
+	 'perl-html-parser' 'perl-date-manip' 'perl-xml-libxml' 'perl-term-progressbar' 'perl-html-tree' \
'perl-xml-writer' 'perl-unicode-string')
groups=('apps-extra')
archs=('i686' 'x86_64')
From vmiklos at frugalware.org  Mon Oct 15 12:42:30 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 12:42:31 2007
Subject: [Frugalware-git] frugalware-current: busybox-1.7.2-1-i686
Message-ID: <20071015104230.40B051678009@genesis.frugalware.org>

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

commit a60648cdc297f91be57074fb7d81c8ef088fbb2d
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 12:42:09 2007 +0200

busybox-1.7.2-1-i686
version bump

diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild
index 824b998..da27ea4 100644
--- a/source/apps-extra/busybox/FrugalBuild
+++ b/source/apps-extra/busybox/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=busybox
-pkgver=1.7.1
+pkgver=1.7.2
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://busybox.net/'|grep '(stable)'|sed 's/.*BusyBox \(.*\) (.*/\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=('439ebcbe2b48e19e1c9acc5aa886b24795d523b1' \
+sha1sums=('d9c618a7b104af4e70d623b1b6f3bc454405e12b' \
'4e281c8f6ee3f89d9c51f0b28f93f2bcf1943303')

build()
From vmiklos at frugalware.org  Mon Oct 15 12:44:03 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 12:44:04 2007
Subject: [Frugalware-git] frugalware-current: which-2.17-1-i686
Message-ID: <20071015104403.340AE1678009@genesis.frugalware.org>

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

commit b9177a040d9af3da9e623d77e7ec61b8447ab6a4
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 12:43:55 2007 +0200

which-2.17-1-i686
version bump

diff --git a/source/base/which/FrugalBuild b/source/base/which/FrugalBuild
index ddadf77..35f94c3 100644
--- a/source/base/which/FrugalBuild
+++ b/source/base/which/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=which
-pkgver=2.16
-pkgrel=3
+pkgver=2.17
+pkgrel=1
pkgdesc="A utility to show the full path of commands"
url="http://www.xs4all.nl/~carlo17/which"
depends=('glibc')
@@ -11,6 +11,6 @@ groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.xs4all.nl/~carlo17/which/NEWS|sed -n '1 p'|cut -d  '>' -f 2|tr -d ' '"
source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('247804c95e91583020b4d57ccb517a2997041bd5')
+sha1sums=('f92dd2a68e057c07d9a927d2c92d1b968873620c')

# optimization ok
From vmiklos at frugalware.org  Mon Oct 15 12:46:47 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 12:46:49 2007
Subject: [Frugalware-git] frugalware-current: udev-116-1-i686
Message-ID: <20071015104647.432F11678009@genesis.frugalware.org>

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

commit e80fa0f58214c9446b3eadcdedad68322ecc44b2
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 12:46:36 2007 +0200

udev-116-1-i686
version bump
(just minor changes this time)

diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild
index f25690a..56b4b18 100644
--- a/source/base/udev/FrugalBuild
+++ b/source/base/udev/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=udev
-pkgver=115
-pkgrel=3
+pkgver=116
+pkgrel=1
pkgdesc="A userspace implementation of devfs"
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"
backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules} \
From vmiklos at frugalware.org  Mon Oct 15 12:49:44 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 12:49:46 2007
Subject: [Frugalware-git] frugalware-current: less-409-1-i686
Message-ID: <20071015104944.64E771678009@genesis.frugalware.org>

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

commit d6169c42d1be8bf67e17906da7d7d742c965dfd8
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 12:49:40 2007 +0200

less-409-1-i686
version bump

diff --git a/source/base/less/FrugalBuild b/source/base/less/FrugalBuild
index 77a5254..b427432 100644
--- a/source/base/less/FrugalBuild
+++ b/source/base/less/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=less
-pkgver=406
+pkgver=409
pkgrel=1
pkgdesc="A paginator similar to more"
url="http://www.greenwoodsoftware.com/less"
@@ -11,7 +11,7 @@ groups=('base')
archs=('i686' 'x86_64' 'ppc')
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=('7aeab848682c3ac7cd9ba54e4c96199f9fdf25e5' \
+sha1sums=('6c554f520b635d783e16f19bfb3d7d00176a8a2d' \
'3e7e305a7eec7d3a52fd994f93c6065a71319086')

build()
From voroskoi at frugalware.org  Mon Oct 15 13:54:31 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 13:54:33 2007
Subject: [Frugalware-git] ssl_f: openssl-0.9.8-10-i686
Message-ID: <20071015115431.702A313A4023@genesis.frugalware.org>

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

commit b7aab729624becc17c6cb7a2420a5189eb1870fa
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 13:29:42 2007 +0200

openssl-0.9.8-10-i686
bump to patchlevel f
closes #2488 in -current

diff --git a/source/lib/openssl/CVE-2007-5135.diff b/source/lib/openssl/CVE-2007-5135.diff
deleted file mode 100644
index 130b262..0000000
--- a/source/lib/openssl/CVE-2007-5135.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -aur openssl-0.9.8e/ssl/ssl_lib.c fw_openssl-0.9.8e/ssl/ssl_lib.c
---- openssl-0.9.8e/ssl/ssl_lib.c	2006-11-29 21:47:15.000000000 +0100
-+++ fw_openssl-0.9.8e/ssl/ssl_lib.c	2007-10-05 12:12:10.000000000 +0200
-@@ -1201,7 +1201,6 @@
- char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
- 	{
- 	char *p;
--	const char *cp;
- 	STACK_OF(SSL_CIPHER) *sk;
- 	SSL_CIPHER *c;
- 	int i;
-@@ -1214,20 +1213,21 @@
- 	sk=s->session->ciphers;
- 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
- 		{
--		/* Decrement for either the ':' or a '\0' */
--		len--;
-+		int n;
-+
- 		c=sk_SSL_CIPHER_value(sk,i);
--		for (cp=c->name; *cp; )
-+		n=strlen(c->name);
-+		if (n+1 > len)
- 			{
--			if (len-- <= 0)
--				{
--				*p='\0';
--				return(buf);
--				}
--			else
--				*(p++)= *(cp++);
-+			if (p != buf)
-+				--p;
-+			*p='\0';
-+			return buf;
- 			}
-+		strcpy(p,c->name);
-+		p+=n;
- 		*(p++)=':';
-+		len-=n+1;
- 		}
- 	p[-1]='\0';
- 	return(buf);
diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild
index 14c829b..3834e73 100644
--- a/source/lib/openssl/FrugalBuild
+++ b/source/lib/openssl/FrugalBuild
@@ -4,8 +4,8 @@

pkgname=openssl
pkgver=0.9.8
-pkgextraver=e
-pkgrel=9
+pkgextraver=f
+pkgrel=10
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
url="http://www.openssl.org/source/"
groups=('lib' 'chroot-core')
@@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('glibc')
makedepends=('util-linux')
up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'"
-source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff openssl-0.9.8e-gcc42.patch)
-signatures=("$source.asc" '' '' '' '' '')
+source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff)
+signatures=("$source.asc" '')

build()
{
diff --git a/source/lib/openssl/bn_mont.c.diff b/source/lib/openssl/bn_mont.c.diff
deleted file mode 100644
index a09b56e..0000000
--- a/source/lib/openssl/bn_mont.c.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- openssl-0.9.8c.orig/crypto/bn/bn_mont.c
-+++ openssl-0.9.8c/crypto/bn/bn_mont.c
-@@ -176,7 +176,6 @@
-
- 	max=(nl+al+1); /* allow for overflow (no?) XXX */
- 	if (bn_wexpand(r,max) == NULL) goto err;
--	if (bn_wexpand(ret,max) == NULL) goto err;
-
- 	r->neg=a->neg^n->neg;
- 	np=n->d;
-@@ -228,19 +227,70 @@
- 		}
- 	bn_correct_top(r);
-
--	/* mont->ri will be a multiple of the word size */
--#if 0
--	BN_rshift(ret,r,mont->ri);
--#else
--	ret->neg = r->neg;
--	x=ri;
-+	/* mont->ri will be a multiple of the word size and below code
-+	 * is kind of BN_rshift(ret,r,mont->ri) equivalent */
-+	if (r->top <= ri)
-+		{
-+		ret->top=0;
-+		retn=1;
-+		goto err;
-+		}
-+	al=r->top-ri;
-+
-+# define BRANCH_FREE 1
-+# if BRANCH_FREE
-+	if (bn_wexpand(ret,ri) == NULL) goto err;
-+	x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
-+	ret->top=x=(ri&~x)|(al&x);	/* min(ri,al) */
-+	ret->neg=r->neg;
-+
- 	rp=ret->d;
--	ap= &(r->d[x]);
--	if (r->top < x)
--		al=0;
--	else
--		al=r->top-x;
-+	ap=&(r->d[ri]);
-+
-+	{
-+	size_t m1,m2;
-+
-+	v=bn_sub_words(rp,ap,np,ri);
-+	/* this ----------------^^ works even in al<ri case
-+	 * thanks to zealous zeroing of top of the vector in the
-+	 * beginning. */
-+
-+	/* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
-+	/* in other words if subtraction result is real, then
-+	 * trick unconditional memcpy below to perform in-place
-+	 * "refresh" instead of actual copy. */
-+	m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);	/* al<ri */
-+	m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);	/* al>ri */
-+	m1|=m2;			/* (al!=ri) */
-+	m1|=(0-(size_t)v);	/* (al!=ri || v) */
-+	m1&=~m2;		/* (al!=ri || v) && !al>ri */
-+	nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
-+	}
-+
-+	/* 'i<ri' is chosen to eliminate dependency on input data, even
-+	 * though it results in redundant copy in al<ri case. */
-+	for (i=0,ri-=4; i<ri; i+=4)
-+		{
-+		BN_ULONG t1,t2,t3,t4;
-+
-+		t1=nrp[i+0];
-+		t2=nrp[i+1];
-+		t3=nrp[i+2];	ap[i+0]=0;
-+		t4=nrp[i+3];	ap[i+1]=0;
-+		rp[i+0]=t1;	ap[i+2]=0;
-+		rp[i+1]=t2;	ap[i+3]=0;
-+		rp[i+2]=t3;
-+		rp[i+3]=t4;
-+		}
-+	for (ri+=4; i<ri; i++)
-+		rp[i]=nrp[i], ap[i]=0;
-+# else
-+	if (bn_wexpand(ret,al) == NULL) goto err;
- 	ret->top=al;
-+	ret->neg=r->neg;
-+
-+	rp=ret->d;
-+	ap=&(r->d[ri]);
- 	al-=4;
- 	for (i=0; i<al; i+=4)
- 		{
-@@ -258,7 +308,7 @@
- 	al+=4;
- 	for (; i<al; i++)
- 		rp[i]=ap[i];
--#endif
-+# endif
- #else /* !MONT_WORD */
- 	BIGNUM *t1,*t2;
-
-@@ -278,10 +328,12 @@
- 	if (!BN_rshift(ret,t2,mont->ri)) goto err;
- #endif /* MONT_WORD */
-
-+#if !defined(BRANCH_FREE) || BRANCH_FREE==0
- 	if (BN_ucmp(ret, &(mont->N)) >= 0)
- 		{
- 		if (!BN_usub(ret,ret,&(mont->N))) goto err;
- 		}
-+#endif
- 	retn=1;
- 	bn_check_top(ret);
-  err:
diff --git a/source/lib/openssl/key-length.diff b/source/lib/openssl/key-length.diff
deleted file mode 100644
index 1e3a9a4..0000000
--- a/source/lib/openssl/key-length.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/evp/evp_lib.c	2006/11/29 20:47:13	1.10.2.1
-+++ crypto/evp/evp_lib.c	2007/02/27 18:42:52	1.10.2.2
-@@ -225,7 +225,7 @@
-
- int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
- 	{
--	return ctx->cipher->key_len;
-+	return ctx->key_len;
- 	}
-
- int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
diff --git a/source/lib/openssl/openssl-0.9.8e-gcc42.patch b/source/lib/openssl/openssl-0.9.8e-gcc42.patch
deleted file mode 100644
index 191cf22..0000000
--- a/source/lib/openssl/openssl-0.9.8e-gcc42.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Index: openssl/crypto/asn1/asn1.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/asn1/asn1.h,v
-retrieving revision 1.1.1.8
-diff -u -r1.1.1.8 asn1.h
---- openssl/crypto/asn1/asn1.h	29 Jul 2006 19:10:16 -0000	1.1.1.8
-+++ openssl/crypto/asn1/asn1.h	20 May 2007 05:01:40 -0000
-@@ -903,22 +903,22 @@
- /* Used to implement other functions */
- void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
- #define ASN1_dup_of(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
- #define ASN1_dup_of_const(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
-
- void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
- #ifndef OPENSSL_NO_FP_API
- void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
- #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
--	((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
-+	((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
- void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
- int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
- #define ASN1_i2d_fp_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
- #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
--	((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
- int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
- int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
- #endif
-@@ -928,13 +928,13 @@
- #ifndef OPENSSL_NO_BIO
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
- #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
--	((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
-+	((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
- void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
- int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
- #define ASN1_i2d_bio_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
- #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
--	((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
- int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
- int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
- int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
-@@ -978,7 +978,7 @@
- ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
- 			      ASN1_OCTET_STRING **oct);
- #define ASN1_pack_string_of(type,obj,i2d,oct) \
--	((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
-+    	(ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct)))
- ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
-
- void ASN1_STRING_set_default_mask(unsigned long mask);
-Index: openssl/crypto/ocsp/ocsp.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/ocsp/ocsp.h,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 ocsp.h
---- openssl/crypto/ocsp/ocsp.h	29 Jul 2006 19:10:18 -0000	1.1.1.2
-+++ openssl/crypto/ocsp/ocsp.h	20 May 2007 05:13:06 -0000
-@@ -469,7 +469,7 @@
- ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
- 				void *data, STACK_OF(ASN1_OBJECT) *sk);
- #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
--((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
-+(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk)))
-
- X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
-
-Index: openssl/crypto/pem/pem.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/pem/pem.h,v
-retrieving revision 1.1.1.7
-diff -u -r1.1.1.7 pem.h
---- openssl/crypto/pem/pem.h	15 Mar 2007 20:03:01 -0000	1.1.1.7
-+++ openssl/crypto/pem/pem.h	20 May 2007 06:02:41 -0000
-@@ -220,19 +220,20 @@
- #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
- type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
--}
-+return((type *)PEM_ASN1_read( \
-+	(d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \
-+}
-
- #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-@@ -240,7 +241,7 @@
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
- 		  void *u) \
- 	{ \
--	return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-@@ -248,7 +249,7 @@
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
- 		  void *u) \
- 	{ \
--	return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #endif
-@@ -256,33 +257,34 @@
- #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
- type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \
-+return((type *)PEM_ASN1_read_bio( \
-+	(d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- 	{ \
--	return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- 	{ \
--	return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #define IMPLEMENT_PEM_write(name, type, str, asn1) \
-@@ -546,12 +548,12 @@
- void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
- 			  void **x, pem_password_cb *cb, void *u);
- #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
--((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
-+((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u))
- int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
- 			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
- 			   pem_password_cb *cb, void *u);
- #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
--	((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)
-+	(PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u)
-
- STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
- int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
From voroskoi at frugalware.org  Mon Oct 15 14:09:12 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 14:09:13 2007
Subject: [Frugalware-git] ssl_f: openssh-4.7p1-2-i686
Message-ID: <20071015120912.116A613A4023@genesis.frugalware.org>

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

commit 5dd568534a5556d27622a129986aa1f6fee13e64
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 13:52:14 2007 +0200

openssh-4.7p1-2-i686
rebuilt with new openssl

diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild
index f236994..5bcdacc 100644
--- a/source/network/openssh/FrugalBuild
+++ b/source/network/openssh/FrugalBuild
@@ -4,11 +4,11 @@

pkgname=openssh
pkgver=4.7p1
-pkgrel=1
+pkgrel=2
pkgdesc='Secure Shell daemon and clients'
url="http://www.openssh.com/"
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/sysconfig/tunnel')
-depends=('openssl=0.9.8' 'zlib')
+depends=('openssl>=0.9.8-10' 'zlib')
makedepends=('tcp_wrappers')
groups=('network')
archs=('i686' 'x86_64')
From vmiklos at frugalware.org  Mon Oct 15 14:32:52 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 14:32:54 2007
Subject: [Frugalware-git] frugalware-current: nss_ldap-258-1-i686
Message-ID: <20071015123252.1B91313A4023@genesis.frugalware.org>

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

commit 5e8a28465a9c8ada445317d96b1ac85aa8a8873a
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 14:32:37 2007 +0200

nss_ldap-258-1-i686
version bump

diff --git a/source/network-extra/nss_ldap/FrugalBuild b/source/network-extra/nss_ldap/FrugalBuild
index 654624e..a868143 100644
--- a/source/network-extra/nss_ldap/FrugalBuild
+++ b/source/network-extra/nss_ldap/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=nss_ldap
-pkgver=257
+pkgver=258
pkgrel=1
pkgdesc="Resolve the entities defined in RFC 2307 from LDAP directories."
url="http://www.padl.com/OSS/nss_ldap.html"
@@ -13,5 +13,5 @@ up2date="lynx -dump http://www.padl.com/download/ |grep nss_ldap- |Flasttar"
source=(http://www.padl.com/download/$pkgname-$pkgver.tar.gz)
Fconfopts="$Fconfopts --with-ldap=openldap --libdir=/lib --enable-schema-mapping \
--enable-rfc2307bis"
-sha1sums=('fc57c721bcbab7eaa3ddcf4953141ab03d788fc2')
+sha1sums=('50a5128db5a4d894fba35aeb092685605fba578d')
# optimization OK
From priyank at frugalware.org  Mon Oct 15 14:35:43 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct 15 14:35:45 2007
Subject: [Frugalware-git] frugalware-current: asterisk-1.4.13-1-i686
Message-ID: <20071015123543.A3B5F13A4023@genesis.frugalware.org>

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

commit 28b61c43044ea57ad262e8c6032ce21b3a125826
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 17:55:59 2007 +0530

asterisk-1.4.13-1-i686
* Version bump (Closes SEC #2494)

diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild
index 02f65f5..42d35df 100644
--- a/source/apps-extra/asterisk/FrugalBuild
+++ b/source/apps-extra/asterisk/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: Balint Kovacs <blint@blint.hu>

pkgname=asterisk
-pkgver=1.4.11
-pkgrel=2
+pkgver=1.4.13
+pkgrel=1
pkgdesc="Open Source Private Branch Exchange (PBX)."
url="http://asterisk.org/"
backup=(etc/asterisk/*)
@@ -16,11 +16,9 @@ groups=('apps-extra')
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 \
-	CVE-2007-4521.patch)
-sha1sums=('2a27155dd716bf8bd3f92fe9eee7fe82e311170c' \
-          '1c18155cdece83d556e2295b54508636ff74f307' \
-          '900ec28ba2121cb996b3d62710e5606e54eadd44')
+	rc.asterisk)
+sha1sums=('76c07dcbc39bf77ef3de6eba5d345a1f22d1dc16' \
+          '1c18155cdece83d556e2295b54508636ff74f307')

build()
{
From priyank at frugalware.org  Mon Oct 15 14:40:12 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct 15 14:40:13 2007
Subject: [Frugalware-git] frugalware-current: asterisk-1.4.13-1-i686
Message-ID: <20071015124012.0A86013A4023@genesis.frugalware.org>

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

commit 30a3b7392ea7943c83e0a045f458cbaba5688298
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 18:08:11 2007 +0530

asterisk-1.4.13-1-i686
* Removed CVE-2007-4521.patch (fixed in upstream)

diff --git a/source/apps-extra/asterisk/CVE-2007-4521.patch b/source/apps-extra/asterisk/CVE-2007-4521.patch
deleted file mode 100644
index 5dd4f7e..0000000
--- a/source/apps-extra/asterisk/CVE-2007-4521.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1.4/apps/app_voicemail.c	2007/08/24 15:49:37	80749
-+++ 1.4/apps/app_voicemail.c	2007/08/24 15:51:03	80750
-@@ -4421,7 +4421,7 @@
- 	mail_fetchstructure (vms->mailstream,vms->msgArray[vms->curmsg],&body);
-
- 	/* We have the body, now we extract the file name of the first attachment. */
--	if (body->nested.part->next && body->nested.part->next->body.parameter->value) {
-+	if (body->nested.part && body->nested.part->next && body->nested.part->next->body.parameter->value) {
- 		attachedfilefmt = ast_strdupa(body->nested.part->next->body.parameter->value);
- 	} else {
- 		ast_log(LOG_ERROR, "There is no file attached to this IMAP message.\n");
From vmiklos at frugalware.org  Mon Oct 15 14:58:57 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 14:58:59 2007
Subject: [Frugalware-git] frugalware-current: kismet-2007_10_R1-1-i686
Message-ID: <20071015125857.E5AC813A4023@genesis.frugalware.org>

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

commit 277f46e91bb23b4e3e433f2d5d65be74fc6bef58
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 14:58:40 2007 +0200

kismet-2007_10_R1-1-i686
version bump

diff --git a/source/network-extra/kismet/FrugalBuild b/source/network-extra/kismet/FrugalBuild
index 2ae78eb..3b57251 100644
--- a/source/network-extra/kismet/FrugalBuild
+++ b/source/network-extra/kismet/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=kismet
-pkgver=2007_01_R1
-extrapkgver=b
-pkgrel=3
+pkgver=2007_10_R1
+extrapkgver=
+pkgrel=1
pkgdesc="IEEE 802.11 wireless LAN sniffer"
url="http://www.kismetwireless.net/"
depends=('wireless_tools' 'libstdc++' 'ncurses' 'libpcap')
@@ -13,6 +13,7 @@ backup=(etc/kismet{,_drone,_ui}.conf)
archs=('i686' 'x86_64')
up2date="lynx -dump $url/download.shtml |grep 'Latest stable'|sed 's/.*t-\([^ ]*\) .*/\1/;s/-/_/g;s/$extrapkgver//'"
source=($url/code/$pkgname-${pkgver//_/-}$extrapkgver.tar.gz)
+sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4')

build()
{
@@ -23,4 +24,3 @@ build()
}

# optimization OK
-sha1sums=('d09256e744ec0ca924f80863feaba8e548d4b4bf')
From vmiklos at frugalware.org  Mon Oct 15 15:12:21 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 15:12:23 2007
Subject: [Frugalware-git] frugalware-current: fudforum-2.7.7-1-i686
Message-ID: <20071015131221.521A713A4023@genesis.frugalware.org>

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

commit 66c7fd5e9e6eb47b250ee41627ee58751b7765ca
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 15:12:13 2007 +0200

fudforum-2.7.7-1-i686
version bump

diff --git a/source/network-extra/fudforum/FrugalBuild b/source/network-extra/fudforum/FrugalBuild
index f781d89..8beb6e7 100644
--- a/source/network-extra/fudforum/FrugalBuild
+++ b/source/network-extra/fudforum/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=fudforum
-pkgver=2.7.6
+pkgver=2.7.7
pkgrel=1
pkgdesc="An Open Source web forum"
url="http://fudforum.org/"
@@ -11,6 +11,9 @@ groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump ${url}download.php|grep Stable|sed -n 's/.* v\([0-9\.]*\)).*/\1/;1 p'"
source=(http://static.fudforum.org/FUDforum_${pkgver//./-}.tar.bz2 fudforumsetup README.Frugalware)
+sha1sums=('7ea414aff1036dc630be0439df2b02d22b49186b' \
+          '702d0c6244e33bd5e52ac178a1e83e9aeb3fe9c5' \
+          'a1a4085c563ec04530db04d031c109cece045596')

build()
{
@@ -20,6 +23,3 @@ build()
Fexe /usr/bin/fudforumsetup
Fdoc README.Frugalware
}
-sha1sums=('a23c31761915c84054b78fc61236450a5819db41' \
-	  '702d0c6244e33bd5e52ac178a1e83e9aeb3fe9c5' \
-	  'a1a4085c563ec04530db04d031c109cece045596')
From voroskoi at frugalware.org  Mon Oct 15 15:13:54 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 15:13:58 2007
Subject: [Frugalware-git] frugalware-current: proftpd-1.3.1-1-i686
Message-ID: <20071015131354.9A50113A4023@genesis.frugalware.org>

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

commit ef0d4be6cba27b204ca18e754b11a51a90692829
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 14:54:39 2007 +0200

proftpd-1.3.1-1-i686
version bump
updated depends()
sha1->signatures
removed patches, all of them in upstream now

diff --git a/source/network/proftpd/CVE-2006-6563.diff b/source/network/proftpd/CVE-2006-6563.diff
deleted file mode 100644
index 0c33991..0000000
--- a/source/network/proftpd/CVE-2006-6563.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: src/ctrls.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/src/ctrls.c,v
-retrieving revision 1.14
-diff -u -r1.14 ctrls.c
---- proftpd/src/ctrls.c	24 Oct 2006 16:13:31 -0000	1.14
-+++ src/ctrls.c	8 Dec 2006 17:02:34 -0000
-@@ -534,11 +534,20 @@
-     return -1;
-   }
-
-+  if (reqarglen >= sizeof(reqaction)) {
-+    pr_signals_unblock();
-+    errno = ENOMEM;
-+    return -1;
-+  }
-+
-+  memset(reqaction, '\0', sizeof(reqaction));
-+
-   if (read(cl->cl_fd, reqaction, reqarglen) < 0) {
-     pr_signals_unblock();
-     return -1;
-   }
-
-+  reqaction[sizeof(reqaction)-1] = '\0';
-   nreqargs--;
-
-   /* Find a matching action object, and use it to populate a ctrl object,
-@@ -657,17 +666,16 @@
-       return -1;
-     }
-
--    memset(response, '\0', sizeof(response));
--
-     /* Make sure resparglen is not too big */
--    if (resparglen > sizeof(response)) {
-+    if (resparglen >= sizeof(response)) {
-       pr_signals_unblock();
-       errno = ENOMEM;
-       return -1;
-     }
-
--    bread = read(ctrls_sockfd, response, resparglen);
-+    memset(response, '\0', sizeof(response));
-
-+    bread = read(ctrls_sockfd, response, resparglen);
-     while (bread != resparglen) {
-       if (bread < 0) {
-         pr_signals_unblock();
diff --git a/source/network/proftpd/FrugalBuild b/source/network/proftpd/FrugalBuild
index bc6a629..816aa88 100644
--- a/source/network/proftpd/FrugalBuild
+++ b/source/network/proftpd/FrugalBuild
@@ -3,20 +3,20 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=proftpd
-pkgver=1.3.0
-pkgextraver=a
-pkgrel=7
+pkgver=1.3.1
+pkgextraver=
+pkgrel=1
pkgdesc="Highly configurable GPL-licensed FTP server software"
url="http://www.proftpd.org/"
groups=('network')
archs=('i686' 'x86_64')
-depends=('glibc' 'openssl' 'ncurses' 'libmysqlclient')
+depends=('ncurses' 'libmysqlclient')
makedepends=('tcp_wrappers' 'mysql')
backup=(etc/{proftpd.conf,ftpusers})
-up2date="lynx -dump http://proftpd.org |grep source |sed -ne 's/.*-\(.*\).t.*/\1/;1p' |sed s/$pkgextraver//"
+up2date="lynx -dump http://proftpd.org |grep source |sed -ne 's/.*-\(.*\).t.*/\1/;1p' -e s/$pkgextraver//"
source=(ftp://ftp.proftpd.org/distrib/source/$pkgname-$pkgver$pkgextraver.tar.bz2 \
-	rc.proftpd proftpd.conf ftpusers cmd_loop_fix.patch proftpd_mod_tls.patch CVE-2006-6563.diff \
-	auth_loop.patch auth_cache.patch)
+	rc.proftpd proftpd.conf ftpusers)
+signatures=($source.asc '' '' '')

build() {
Fbuild --disable-pam \
@@ -30,14 +30,5 @@ build() {
Ffile /etc/ftpusers
Frcd
}
-sha1sums=('03573bfe342e1e9dbfec2983efe2265d3c0c5a12'\
-          '42e7041d44446bdc9577a3c06fc78c97e95d00e1'\
-          '08eef67bc0bf9b851899189e99ab08dc3120f064'\
-          'b98fb782b45916364e5dd0ce4084bf86bdc20ae4'\
-          '3c825dfbb08a45c4927e61b90f74a86267f21128'\
-          'd418b86d3279bba16854db5a96543c363425bfd8'\
-          'cfabdf7b124120cc5f0c7aa664caee767edf3730'\
-          'd37d5d379019ab38d116397d96d2a8633f72d91c'\
-          '326c897cc92428d49a1d03c9b0bf57cb81f21741')

# optimization OK
diff --git a/source/network/proftpd/auth_cache.patch b/source/network/proftpd/auth_cache.patch
deleted file mode 100644
index 09846f5..0000000
--- a/source/network/proftpd/auth_cache.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-diff -urNad proftpd-dfsg-1.3.0~/include/auth.h proftpd-dfsg-1.3.0/include/auth.h
---- proftpd-dfsg-1.3.0~/include/auth.h	2007-04-17 23:42:54.000000000 +0200
-+++ proftpd-dfsg-1.3.0/include/auth.h	2007-04-17 23:43:42.000000000 +0200
-@@ -86,6 +86,7 @@
- config_rec *pr_auth_get_anon_config(pool *p, char **, char **, char **);
-
- /* For internal use only. */
-+int init_auth(void);
- int set_groups(pool *, gid_t, array_header *);
-
- #endif /* PR_MODULES_H */
-diff -urNad proftpd-dfsg-1.3.0~/modules/mod_core.c proftpd-dfsg-1.3.0/modules/mod_core.c
---- proftpd-dfsg-1.3.0~/modules/mod_core.c	2007-04-17 23:43:42.000000000 +0200
-+++ proftpd-dfsg-1.3.0/modules/mod_core.c	2007-04-17 23:43:42.000000000 +0200
-@@ -4403,6 +4403,8 @@
-   config_rec *c = NULL;
-   unsigned int *debug_level = NULL;
-
-+  init_auth();
-+
-   /* Check for a server-specific TimeoutIdle. */
-   c = find_config(main_server->conf, CONF_PARAM, "TimeoutIdle", FALSE);
-   if (c != NULL)
-diff -urNad proftpd-dfsg-1.3.0~/src/auth.c proftpd-dfsg-1.3.0/src/auth.c
---- proftpd-dfsg-1.3.0~/src/auth.c	2007-04-17 23:43:42.000000000 +0200
-+++ proftpd-dfsg-1.3.0/src/auth.c	2007-04-17 23:44:48.000000000 +0200
-@@ -30,6 +30,10 @@
-
- #include "conf.h"
-
-+static pool *auth_pool = NULL;
-+static pr_table_t *auth_tab = NULL;
-+static const char *trace_channel = "auth";
-+
- /* The difference between this function, and pr_cmd_alloc(), is that this
-  * allocates the cmd_rec directly from the given pool, whereas pr_cmd_alloc()
-  * will allocate a subpool from the given pool, and allocate its cmd_rec
-@@ -63,7 +67,7 @@
-   return c;
- }
-
--static modret_t *dispatch_auth(cmd_rec *cmd, char *match) {
-+static modret_t *dispatch_auth(cmd_rec *cmd, char *match, module **m) {
-   authtable *start_tab = NULL, *iter_tab = NULL;
-   modret_t *mr = NULL;
-
-@@ -74,6 +78,10 @@
-   while (iter_tab) {
-     pr_signals_handle();
-
-+    if (m && *m && *m != iter_tab->m) {
-+      goto next;
-+    }
-+
-     pr_log_debug(DEBUG6, "dispatching auth request \"%s\" to module mod_%s",
-       match, iter_tab->m->name);
-
-@@ -83,9 +91,19 @@
-       break;
-
-     if (MODRET_ISHANDLED(mr) ||
--        MODRET_ISERROR(mr))
-+        MODRET_ISERROR(mr)) {
-+
-+      /* Return a pointer, if requested, to the module which answered the
-+       * auth request.  This is used, for example, by auth_getpwnam() for
-+       * associating the answering auth module with the data looked up.
-+       */
-+      if (m)
-+        *m = iter_tab->m;
-+
-       break;
-+    }
-
-+  next:
-     iter_tab = pr_stash_get_symbol(PR_SYM_AUTH, match, iter_tab,
-       &cmd->stash_index);
-
-@@ -93,7 +111,7 @@
-        /* We have looped back to the start.  Break out now and do not loop
-         * around again (and again, and again...)
-         */
--       mr = PR_DECLINED(cmd);
-+       mr = DECLINED(cmd);
-        break;
-      }
-   }
-@@ -106,7 +124,7 @@
-   modret_t *mr = NULL;
-
-   cmd = make_cmd(p, 0);
--  mr = dispatch_auth(cmd, "setpwent");
-+  mr = dispatch_auth(cmd, "setpwent", NULL);
-
-   if (cmd->tmp_pool) {
-     destroy_pool(cmd->tmp_pool);
-@@ -121,13 +139,20 @@
-   modret_t *mr = NULL;
-
-   cmd = make_cmd(p, 0);
--  mr = dispatch_auth(cmd, "endpwent");
-+  mr = dispatch_auth(cmd, "endpwent", NULL);
-
-   if (cmd->tmp_pool) {
-     destroy_pool(cmd->tmp_pool);
-     cmd->tmp_pool = NULL;
-   }
-
-+  if (auth_tab) {
-+    pr_log_debug(DEBUG5, "emptying authcache");
-+    (void) pr_table_empty(auth_tab);
-+    (void) pr_table_free(auth_tab);
-+    auth_tab = NULL;
-+  }
-+
-   return;
- }
-
-@@ -136,7 +161,7 @@
-   modret_t *mr = NULL;
-
-   cmd = make_cmd(p, 0);
--  mr = dispatch_auth(cmd, "setgrent");
-+  mr = dispatch_auth(cmd, "setgrent", NULL);
-
-   if (cmd->tmp_pool) {
-     destroy_pool(cmd->tmp_pool);
-@@ -151,7 +176,7 @@
-   modret_t *mr = NULL;
-
-   cmd = make_cmd(p, 0);
--  mr = dispatch_auth(cmd, "endgrent");
-+  mr = dispatch_auth(cmd, "endgrent", NULL);
-
-   if (cmd->tmp_pool) {
-     destroy_pool(cmd->tmp_pool);
-@@ -167,7 +192,7 @@
-   struct passwd *res = NULL;
-
-   cmd = make_cmd(p, 0);
--  mr = dispatch_auth(cmd, "getpwent");
-+  mr = dispatch_auth(cmd, "getpwent", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-     res = mr->data;
-@@ -201,7 +226,7 @@
-   struct group *res = NULL;
-
-   cmd = make_cmd(p, 0);
--  mr = dispatch_auth(cmd, "getgrent");
-+  mr = dispatch_auth(cmd, "getgrent", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-     res = mr->data;
-@@ -228,11 +253,13 @@
-   cmd_rec *cmd = NULL;
-   modret_t *mr = NULL;
-   struct passwd *res = NULL;
-+  module *m = NULL;
-
-   cmd = make_cmd(p, 1, name);
--  mr = dispatch_auth(cmd, "getpwnam");
-+  mr = dispatch_auth(cmd, "getpwnam", &m);
-
--  if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-+  if (MODRET_ISHANDLED(mr) &&
-+      MODRET_HASDATA(mr))
-     res = mr->data;
-
-   if (cmd->tmp_pool) {
-@@ -257,6 +284,46 @@
-     return NULL;
-   }
-
-+  if (!auth_tab && auth_pool) {
-+    auth_tab = pr_table_alloc(auth_pool, 0);
-+  }
-+
-+  if (m && auth_tab) {
-+    int count = 0;
-+    void *value = NULL;
-+
-+    value = palloc(auth_pool, sizeof(module *));
-+    *((module **) value) = m;
-+
-+    count = pr_table_exists(auth_tab, name);
-+    if (count <= 0) {
-+      if (pr_table_add(auth_tab, pstrdup(auth_pool, name), value,
-+          sizeof(module *)) < 0) {
-+        pr_log_debug(DEBUG3,
-+          "error adding module 'mod_%s.c' for user '%s' to the authcache: %s",
-+          m->name, name, strerror(errno));
-+
-+      } else {
-+        pr_log_debug(DEBUG5,
-+          "stashed module 'mod_%s.c' for user '%s' in the authcache",
-+          m->name, name);
-+      }
-+
-+    } else {
-+      if (pr_table_set(auth_tab, pstrdup(auth_pool, name), value,
-+          sizeof(module *)) < 0) {
-+        pr_log_debug(DEBUG3,
-+          "error setting module 'mod_%s.c' for user '%s' in the authcache: %s",
-+          m->name, name, strerror(errno));
-+
-+      } else {
-+        pr_log_debug(DEBUG5,
-+          "stashed module 'mod_%s.c' for user '%s' in the authcache",
-+          m->name, name);
-+      }
-+    }
-+  }
-+
-   pr_log_debug(DEBUG10, "retrieved UID %lu for user '%s'",
-     (unsigned long) res->pw_uid, name);
-   return res;
-@@ -268,7 +335,7 @@
-   struct passwd *res = NULL;
-
-   cmd = make_cmd(p, 1, (void *) &uid);
--  mr = dispatch_auth(cmd, "getpwuid");
-+  mr = dispatch_auth(cmd, "getpwuid", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-     res = mr->data;
-@@ -306,7 +373,7 @@
-   struct group *res = NULL;
-
-   cmd = make_cmd(p, 1, name);
--  mr = dispatch_auth(cmd, "getgrnam");
-+  mr = dispatch_auth(cmd, "getgrnam", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-     res = mr->data;
-@@ -339,7 +406,7 @@
-   struct group *res = NULL;
-
-   cmd = make_cmd(p, 1, (void *) &gid);
--  mr = dispatch_auth(cmd, "getgrgid");
-+  mr = dispatch_auth(cmd, "getgrgid", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-     res = mr->data;
-@@ -369,10 +436,25 @@
- int pr_auth_authenticate(pool *p, const char *name, const char *pw) {
-   cmd_rec *cmd = NULL;
-   modret_t *mr = NULL;
-+  module *m = NULL;
-   int res = PR_AUTH_NOPWD;
-
-   cmd = make_cmd(p, 2, name, pw);
--  mr = dispatch_auth(cmd, "auth");
-+
-+  if (auth_tab) {
-+
-+    /* Fetch the specific module to be used for authenticating this user. */
-+    void *v = pr_table_get(auth_tab, name, NULL);
-+    if (v) {
-+      m = *((module **) v);
-+
-+      pr_log_debug(DEBUG4,
-+        "using module 'mod_%s.c' from authcache to authenticate user '%s'",
-+        m->name, name);
-+    }
-+  }
-+
-+  mr = dispatch_auth(cmd, "auth", m ? &m : NULL);
-
-   if (MODRET_ISHANDLED(mr))
-     res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
-@@ -391,10 +473,25 @@
- int pr_auth_check(pool *p, const char *cpw, const char *name, const char *pw) {
-   cmd_rec *cmd = NULL;
-   modret_t *mr = NULL;
-+  module *m = NULL;
-   int res = PR_AUTH_BADPWD;
-
-   cmd = make_cmd(p, 3, cpw, name, pw);
--  mr = dispatch_auth(cmd, "check");
-+
-+  if (auth_tab) {
-+
-+    /* Fetch the specific module to be used for authenticating this user. */
-+    void *v = pr_table_get(auth_tab, name, NULL);
-+    if (v) {
-+      m = *((module **) v);
-+
-+      pr_log_debug(DEBUG4,
-+        "using module 'mod_%s.c' from authcache to authenticate user '%s'",
-+        m->name, name);
-+    }
-+  }
-+
-+  mr = dispatch_auth(cmd, "check", m ? &m : NULL);
-
-   if (MODRET_ISHANDLED(mr))
-     res = MODRET_HASDATA(mr) ? PR_AUTH_RFC2228_OK : PR_AUTH_OK;
-@@ -413,7 +510,7 @@
-   int res = TRUE;
-
-   cmd = make_cmd(p, 1, name);
--  mr = dispatch_auth(cmd, "requires_pass");
-+  mr = dispatch_auth(cmd, "requires_pass", NULL);
-
-   if (MODRET_ISHANDLED(mr))
-     res = FALSE;
-@@ -438,7 +535,7 @@
-   memset(namebuf, '\0', sizeof(namebuf));
-
-   cmd = make_cmd(p, 1, (void *) &uid);
--  mr = dispatch_auth(cmd, "uid2name");
-+  mr = dispatch_auth(cmd, "uid2name", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
-     res = mr->data;
-@@ -463,7 +560,7 @@
-   memset(namebuf, '\0', sizeof(namebuf));
-
-   cmd = make_cmd(p, 1, (void *) &gid);
--  mr = dispatch_auth(cmd, "gid2name");
-+  mr = dispatch_auth(cmd, "gid2name", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
-     res = mr->data;
-@@ -485,7 +582,7 @@
-   uid_t res = (uid_t) -1;
-
-   cmd = make_cmd(p, 1, name);
--  mr = dispatch_auth(cmd, "name2uid");
-+  mr = dispatch_auth(cmd, "name2uid", NULL);
-
-   if (MODRET_ISHANDLED(mr))
-     res = *((uid_t *) mr->data);
-@@ -506,7 +603,7 @@
-   gid_t res = (gid_t) -1;
-
-   cmd = make_cmd(p, 1, name);
--  mr = dispatch_auth(cmd, "name2gid");
-+  mr = dispatch_auth(cmd, "name2gid", NULL);
-
-   if (MODRET_ISHANDLED(mr))
-     res = *((gid_t *) mr->data);
-@@ -538,7 +635,7 @@
-   cmd = make_cmd(p, 3, name, group_ids ? *group_ids : NULL,
-     group_names ? *group_names : NULL);
-
--  mr = dispatch_auth(cmd, "getgroups");
-+  mr = dispatch_auth(cmd, "getgroups", NULL);
-
-   if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr)) {
-     res = *((int *) mr->data);
-@@ -832,3 +929,10 @@
-   return res;
- }
-
-+/* Internal use only.  To be called in the session process. */
-+int init_auth(void) {
-+  auth_pool = make_sub_pool(permanent_pool);
-+  pr_pool_tag(auth_pool, "Auth API");
-+
-+  return 0;
-+}
diff --git a/source/network/proftpd/auth_loop.patch b/source/network/proftpd/auth_loop.patch
deleted file mode 100644
index febf49f..0000000
--- a/source/network/proftpd/auth_loop.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urNad proftpd-dfsg-1.3.0~/src/auth.c proftpd-dfsg-1.3.0/src/auth.c
---- proftpd-dfsg-1.3.0~/src/auth.c	2007-04-17 23:38:06.000000000 +0200
-+++ proftpd-dfsg-1.3.0/src/auth.c	2007-04-17 23:38:50.000000000 +0200
-@@ -64,27 +64,38 @@
- }
-
- static modret_t *dispatch_auth(cmd_rec *cmd, char *match) {
--  authtable *authtab = NULL;
-+  authtable *start_tab = NULL, *iter_tab = NULL;
-   modret_t *mr = NULL;
-
--  authtab = pr_stash_get_symbol(PR_SYM_AUTH, match, NULL,
-+  start_tab = pr_stash_get_symbol(PR_SYM_AUTH, match, NULL,
-     &cmd->stash_index);
-+  iter_tab = start_tab;
-+
-+  while (iter_tab) {
-+    pr_signals_handle();
-
--  while (authtab) {
-     pr_log_debug(DEBUG6, "dispatching auth request \"%s\" to module mod_%s",
--      match, authtab->m->name);
-+      match, iter_tab->m->name);
-
--    mr = call_module(authtab->m, authtab->handler, cmd);
-+    mr = call_module(iter_tab->m, iter_tab->handler, cmd);
-
--    if (authtab->auth_flags & PR_AUTH_FL_REQUIRED)
-+    if (iter_tab->auth_flags & PR_AUTH_FL_REQUIRED)
-       break;
-
-     if (MODRET_ISHANDLED(mr) ||
-         MODRET_ISERROR(mr))
-       break;
-
--    authtab = pr_stash_get_symbol(PR_SYM_AUTH, match, authtab,
-+    iter_tab = pr_stash_get_symbol(PR_SYM_AUTH, match, iter_tab,
-       &cmd->stash_index);
-+
-+     if (iter_tab == start_tab) {
-+       /* We have looped back to the start.  Break out now and do not loop
-+        * around again (and again, and again...)
-+        */
-+       mr = PR_DECLINED(cmd);
-+       break;
-+     }
-   }
-
-   return mr;
diff --git a/source/network/proftpd/cmd_loop_fix.patch b/source/network/proftpd/cmd_loop_fix.patch
deleted file mode 100644
index eaa4b10..0000000
--- a/source/network/proftpd/cmd_loop_fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- proftpd-1.3.0/src/main.c	2006-03-15 20:41:01.000000000 +0100
-+++ proftpd-1.3.0/src/main.c.new	2006-11-23 22:55:28.000000000 +0100
-@@ -116,6 +116,8 @@
-
- static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
-
-+#define PR_DEFAULT_CMD_BUFSZ   512
-+
- static char **Argv = NULL;
- static char *LastArgv = NULL;
- static const char *PidPath = PR_PID_FILE_PATH;
-@@ -820,16 +822,23 @@
-       pr_timer_reset(TIMER_IDLE, NULL);
-
-     if (cmd_buf_size == -1) {
--      long *buf_size = get_param_ptr(main_server->conf,
--        "CommandBufferSize", FALSE);
--
--      if (buf_size == NULL || *buf_size <= 0)
--        cmd_buf_size = 512;
--
--      else if (*buf_size + 1 > sizeof(buf)) {
--	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
--          "Resetting to 512.");
--	cmd_buf_size = 512;
-+	    int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
-+	    if (bufsz == NULL) {
-+		    cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
-+	    } else if (*bufsz <= 0) {
-+		    pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
-+				    "given, using default buffer size (%u) instead",
-+				    *bufsz, PR_DEFAULT_CMD_BUFSZ);
-+		    cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
-+	    } else if (*bufsz + 1 > sizeof(buf)) {
-+		    pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
-+				    "given, using default buffer size (%u) instead",
-+				    *bufsz, PR_DEFAULT_CMD_BUFSZ);
-+		    cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
-+
-+	} else {
-+		pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
-+		cmd_buf_size = (long) *bufsz;
-       }
-     }
-
diff --git a/source/network/proftpd/proftpd_mod_tls.patch b/source/network/proftpd/proftpd_mod_tls.patch
deleted file mode 100644
index 43ce40d..0000000
--- a/source/network/proftpd/proftpd_mod_tls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: contrib/mod_tls.c
---- proftpd/contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
-+++ proftpd/contrib/mod_tls.c   2006-11-15 17:54:43 +0100
-@@ -2421,6 +2421,8 @@
-      datalen = BIO_get_mem_data(mem, &data);
-
-   if (data) {
-+    if (datalen > sizeof(buf)-1)
-+        datalen = sizeof(buf)-1;
-     memset(&buf, '\0', sizeof(buf));
-     memcpy(buf, data, datalen);
-     buf[datalen] = '\0';
From vmiklos at frugalware.org  Mon Oct 15 15:24:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 15:24:28 2007
Subject: [Frugalware-git] frugalware-current: sudo-1.6.9p6-1-i686
Message-ID: <20071015132426.19B4F13A4023@genesis.frugalware.org>

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

commit 994a8b05b7ca2571ef8e41cfaf0ed5e2735acd77
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 15:24:14 2007 +0200

sudo-1.6.9p6-1-i686
version bump

diff --git a/source/apps/sudo/FrugalBuild b/source/apps/sudo/FrugalBuild
index 687178f..7f741d9 100644
--- a/source/apps/sudo/FrugalBuild
+++ b/source/apps/sudo/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=sudo
-pkgver=1.6.9p5
+pkgver=1.6.9p6
pkgrel=1
pkgdesc="Give limited root privileges to certain users"
url="http://www.sudo.ws/"
@@ -12,7 +12,7 @@ archs=('i686' 'x86_64')
backup=('etc/sudoers')
up2date="lynx -dump http://www.sudo.ws/|grep 'stable version is'|sed 's/.*sudo \(.*\), .*/\1/'"
source=(http://www.sudo.ws/$pkgname/dist/$pkgname-$pkgver.tar.gz sudo.sh)
-sha1sums=('fe7a0b92c59c067476d8e21c4aaf338c372d18e9' \
+sha1sums=('c243b51dccfca5972eda68f23ee31b78a3c0c121' \
'ff0745f1d95c614f55e8fd1f85abee2486cf24ba')

build()
From priyank at frugalware.org  Mon Oct 15 15:44:53 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct 15 15:44:55 2007
Subject: [Frugalware-git] frugalware-current: asterisk-addons-1.4.3-1-i686
Message-ID: <20071015134453.C1EE113A4023@genesis.frugalware.org>

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

commit 055e015ef10b8b79a231045ed27ae85f8684f887
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 19:10:06 2007 +0530

asterisk-addons-1.4.3-1-i686
* Version bump

diff --git a/source/apps-extra/asterisk-addons/FrugalBuild b/source/apps-extra/asterisk-addons/FrugalBuild
index b2da5e0..c294525 100644
--- a/source/apps-extra/asterisk-addons/FrugalBuild
+++ b/source/apps-extra/asterisk-addons/FrugalBuild
@@ -3,17 +3,17 @@
# Contributor: Balint Kovacs <blint@blint.hu>

pkgname=asterisk-addons
-pkgver=1.4.2
+pkgver=1.4.3
pkgrel=1
pkgdesc="Open Source Private Branch Exchange (PBX) - Addons"
url="http://www.asterisk.org/"
backup=(etc/asterisk/*)
-depends=('asterisk-sounds' 'asterisk>=1.4.5' 'mysql' 'libpqxx' 'openssl')
+depends=('asterisk-sounds' 'asterisk>=1.4.13' 'mysql' 'libpqxx' 'openssl')
groups=('apps-extra')
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')
+sha1sums=('c55dd8c637285e28fed04b2b7d88f2a94df32f48')

build()
{
From priyank at frugalware.org  Mon Oct 15 16:23:13 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct 15 16:23:16 2007
Subject: [Frugalware-git] 
	frugalware-current: thunar-archive-plugin-0.2.4-2-i686
Message-ID: <20071015142313.5412613A4023@genesis.frugalware.org>

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

commit a99a2d12afa525be7a5e41bb88d2c6b8a715d6c6
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 19:49:25 2007 +0530

thunar-archive-plugin-0.2.4-2-i686
* added missing _F_gnome_iconcache=y
* updated dependencies (now depends on squeeze)

diff --git a/source/xfce4-extra/thunar-archive-plugin/FrugalBuild b/source/xfce4-extra/thunar-archive-plugin/FrugalBuild
index 37b8704..d7c97ff 100644
--- a/source/xfce4-extra/thunar-archive-plugin/FrugalBuild
+++ b/source/xfce4-extra/thunar-archive-plugin/FrugalBuild
@@ -3,15 +3,17 @@

pkgname=thunar-archive-plugin
pkgver=0.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="Thunar archive plugin."
url="http://www.foo-projects.org/~benny/projects/thunar-archive-plugin/"
makedepends=('intltool')
-depends=('thunar>=0.5.0rc2' 'xarchiver>=0.4.6')
-options=('scriptlet')
+depends=('thunar>=0.8.0' 'squeeze>=0.2.1')
+_F_gnome_iconcache="y"
+Finclude gnome-scriptlet
groups=('xfce4-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url | grep released -m1 | sed 's/.*in \(.*\) r.*/\1/'"
+source=(http://download.berlios.de/xfce-goodies/$pkgname-$pkgver.tar.bz2)
sha1sums=('3dca5ce069f68a5ae732b81529051beb1d93726c')

# optimization OK
From priyank at frugalware.org  Mon Oct 15 16:26:47 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct 15 16:26:50 2007
Subject: [Frugalware-git] frugalware-current: squeeze-0.2.1-3-i686
Message-ID: <20071015142647.BD07313A4023@genesis.frugalware.org>

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

commit 0c34d8342c90f404c0ff28925cb920544382b7dc
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 19:53:06 2007 +0530

squeeze-0.2.1-3-i686
* added missing _F_gnome_desktop=y

diff --git a/source/xfce4-extra/squeeze/FrugalBuild b/source/xfce4-extra/squeeze/FrugalBuild
index 4a6c1e6..75f2add 100644
--- a/source/xfce4-extra/squeeze/FrugalBuild
+++ b/source/xfce4-extra/squeeze/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=squeeze
pkgver=0.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="A modern and advanced archive manager for Xfce4."
url="http://squeeze.xfce.org/"
makedepends=('intltool' 'pkgconfig')
@@ -11,6 +11,7 @@ depends=('gtk+2' 'thunar>=0.8.0' 'dbus-glib>=0.71')
groups=('xfce4-extra')
archs=('i686' 'x86_64')
_F_gnome_iconcache="y"
+_F_gnome_desktop="y"
Finclude gnome-scriptlet
up2date="lynx -dump $url/download | grep -m1 tar.bz2 | Flasttarbz2"
source=($url/downloads/$pkgname-$pkgver.tar.bz2)
From priyank at frugalware.org  Mon Oct 15 16:41:00 2007
From: priyank at frugalware.org (Priyank)
Date: Mon Oct 15 16:41:02 2007
Subject: [Frugalware-git] 
	frugalware-current: gnome-compiz-manager-0.10.4-1-i686
Message-ID: <20071015144100.674EC13A4023@genesis.frugalware.org>

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

commit 3702204e0e6bc73fdbb1a95c41d56185e0a93198
Author: Priyank <priyank@frugalware.org>
Date:   Mon Oct 15 20:07:15 2007 +0530

gnome-compiz-manager-0.10.4-1-i686
* New package / Initial import

diff --git a/source/gnome-extra/gnome-compiz-manager/FrugalBuild b/source/gnome-extra/gnome-compiz-manager/FrugalBuild
new file mode 100644
index 0000000..d7c3621
--- /dev/null
+++ b/source/gnome-extra/gnome-compiz-manager/FrugalBuild
@@ -0,0 +1,20 @@
+# Compiling Time: 0.23 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=gnome-compiz-manager
+pkgver=0.10.4
+pkgrel=1
+pkgdesc="A small utility which manages GL Desktop configuration on XGL/AiGLX."
+url="http://gandalfn.wordpress.com/gnome-compiz-manager/"
+depends=('compiz-gnome>=0.6.0-3' 'gnome-desktop>=2.20.0' 'librsvg' 'libwnck')
+makedepends=('gob2' 'perl-xml')
+groups=('gnome-extra')
+archs=('i686')
+up2date="lynx -dump http://download.gna.org/gcm/$pkgname/?M=A | grep tar.gz | Flasttar"
+source=(http://download.gna.org/gcm/$pkgname/$pkgname-$pkgver.tar.gz)
+Fconfopts="${Fconfopts[@]} --enable-gnome-session"
+_F_gnome_schemas=('etc/gconf/schemas/gnome-compiz-preferences.schemas')
+Finclude gnome-scriptlet
+sha1sums=('5b4e7877ad69020a287bec1c49d19e2fcb792d35')
+
+# optimization OK
From crazy at frugalware.org  Mon Oct 15 17:21:33 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 17:21:33 2007
Subject: [Frugalware-git] ssl_f: gnupg2-2.0.7-2-i686
Message-ID: <20071015152133.01AC413A4023@genesis.frugalware.org>

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

commit a0ce85bae5349e4b536527f639eeaf3483377f0d
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 17:16:50 2007 +0200

gnupg2-2.0.7-2-i686
* rebuild with openssl

diff --git a/source/apps/gnupg2/FrugalBuild b/source/apps/gnupg2/FrugalBuild
index 911d6a9..310540a 100644
--- a/source/apps/gnupg2/FrugalBuild
+++ b/source/apps/gnupg2/FrugalBuild
@@ -4,11 +4,11 @@
pkgname=gnupg2
origname=gnupg
pkgver=2.0.7
-pkgrel=1
+pkgrel=2
pkgdesc="GnuPG2 is the new modularized version of GnuPG supporting OpenPGP and S/MIME"
url="http://www.gnupg.org/"
## libldap
-depends=('openssl' 'bzip2' 'curl' 'pth' 'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
+depends=('openssl>=0.9.8-10' 'bzip2' 'curl' 'pth' 'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
makedepends=('libassuan>=0.9.3')
groups=('apps')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Mon Oct 15 18:37:14 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 18:37:16 2007
Subject: [Frugalware-git] frugalware-current: gnome-user-docs-2.20.1-1-i686
Message-ID: <20071015163714.29D7A13A4023@genesis.frugalware.org>

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

commit c67d6fd478ff3467b8a374681881633b6b68e1e0
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 18:24:14 2007 +0200

gnome-user-docs-2.20.1-1-i686
* Version bump

diff --git a/source/gnome/gnome-user-docs/FrugalBuild b/source/gnome/gnome-user-docs/FrugalBuild
index 26bc3f9..e86684c 100644
--- a/source/gnome/gnome-user-docs/FrugalBuild
+++ b/source/gnome/gnome-user-docs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme <alex@alex-smith.me.uk>

pkgname=gnome-user-docs
-pkgver=2.20.0
+pkgver=2.20.1
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=('caec3eabd48b730fbd7044745f631b4e368c2b02')
+sha1sums=('4c22c4e1076be68cc0686cc750889d06c0711e9c')
From crazy at frugalware.org  Mon Oct 15 18:37:14 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 18:37:19 2007
Subject: [Frugalware-git] frugalware-current: libtheora-1.0beta2-1-i686
Message-ID: <20071015163714.3B94F13A4024@genesis.frugalware.org>

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

commit 4bef0ec9350ec84b2c04b4c0358dbcff51775637
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 18:28:33 2007 +0200

libtheora-1.0beta2-1-i686
* Version bump

diff --git a/source/lib/libtheora/FrugalBuild b/source/lib/libtheora/FrugalBuild
index 79857ae..c830dd4 100644
--- a/source/lib/libtheora/FrugalBuild
+++ b/source/lib/libtheora/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Laszlo Dvornik <dvornik@gnome.hu>

pkgname=libtheora
-pkgver=1.0beta1
+pkgver=1.0beta2
pkgrel=1
pkgdesc="An open video codec developed by the Xiph.org."
url="http://www.theora.org/"
@@ -13,6 +13,6 @@ depends=('libogg')
makedepends=('libvorbis' 'doxygen' 'sdl')
up2date="lynx -dump http://www.theora.org/downloads/|grep -m1 'libtheora-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'"
source=(http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2)
-sha1sums=('82191ca3ee49b75a5c4a3c0f30efaa95d50dc66b')
+sha1sums=('d58490cc507e1840fbdb432a1dd12433644cc04b')

# optimization OK
From crazy at frugalware.org  Mon Oct 15 19:21:31 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 19:21:33 2007
Subject: [Frugalware-git] frugalware-current: libwpd-0.8.12-1-i686
Message-ID: <20071015172131.7382213A4023@genesis.frugalware.org>

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

commit e580f1ae00aeca618d1ab02b51a47a38e149ec88
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 19:16:57 2007 +0200

libwpd-0.8.12-1-i686
* Version bump
* html docs have an own subpackage now

diff --git a/source/xlib/libwpd/FrugalBuild b/source/xlib/libwpd/FrugalBuild
index 747cf04..7215394 100644
--- a/source/xlib/libwpd/FrugalBuild
+++ b/source/xlib/libwpd/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=libwpd
-pkgver=0.8.11
+pkgver=0.8.12
pkgrel=1
pkgdesc="libwpd is a C++ library designed to help process WordPerfect documents."
url="http://libwpd.sourceforge.net/"
@@ -12,6 +12,19 @@ _F_sourceforge_prefix='libwpd-'
Finclude sourceforge
groups=('xlib')
archs=('i686' 'x86_64')
-sha1sums=('135c7c9b91ec2284616c2dce24401e2f9d7554c6')
+sha1sums=('964485d98b11a430aff60888ec96a2273aaad073')

+subpkgs=("$pkgname-docs")
+subdescs=("Libwpd Documentation")
+subdepends=()
+subgroups=('xlib-extra')
+subarchs=('i686 x86_64')
+
+build()
+{
+	Fbuild
+	Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver/html
+	Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver/$pkgname.*
+}
+
# optimization OK
From voroskoi at frugalware.org  Mon Oct 15 19:43:50 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 19:43:53 2007
Subject: [Frugalware-git] frugalware-current: root-tail-1.2-4-i686
Message-ID: <20071015174350.7941113A4023@genesis.frugalware.org>

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

commit 4280b6e3dfd2d37839c9144ead68fb0ef157ac8f
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 19:26:43 2007 +0200

root-tail-1.2-4-i686
rebuilt to place files to /usr
fixed makedepends() and build()
closes #2474 in -current

diff --git a/source/xapps-extra/root-tail/FrugalBuild b/source/xapps-extra/root-tail/FrugalBuild
index 8f702ad..ed3df55 100644
--- a/source/xapps-extra/root-tail/FrugalBuild
+++ b/source/xapps-extra/root-tail/FrugalBuild
@@ -1,13 +1,13 @@
-# Compiling Time: ~0.05 SBU
+# Compiling Time: 0.01 SBU
# Maintainer: voroskoi <voroskoi@freemail.hu>

pkgname=root-tail
pkgver=1.2
-pkgrel=3
+pkgrel=4
pkgdesc="root-tail displays logfiles in different colours"
url="http://www.goof.com/pcg/marc/root-tail.html"
depends=('libxext')
-makedepends=('imake' 'rman' 'xproto')
+makedepends=('imake' 'rman' 'gccmakedep')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep root-tail.*tar |sed -n 's/.*-tail-\(.*\)\.t.*/\1/;1 p'"
@@ -17,9 +17,8 @@ sha1sums=('1f40a0dcb837906deda1d84d1902c27eb6377e91')
build()
{
Fcd
-
-	xmkmf -a
-	make || return 1
-	make DESTDIR=$Fdestdir install || return 1
-	make DESTDIR=$Fdestdir install.man || return 1
+	xmkmf -a || Fdie
+	Fmake
+	make DESTDIR=$Fdestdir install || Fdie
+	make DESTDIR=$Fdestdir install.man || Fdie
}
From crazy at frugalware.org  Mon Oct 15 20:03:34 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 20:03:37 2007
Subject: [Frugalware-git] frugalware-current: graphicsmagick-1.1.10-1-i686
Message-ID: <20071015180334.D160D13A4023@genesis.frugalware.org>

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

commit ca6ad621e8ab3b8fa0c0924a8ab01e7538e9e9f5
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 19:57:57 2007 +0200

graphicsmagick-1.1.10-1-i686
* Version bump

diff --git a/source/xapps-extra/graphicsmagick/FrugalBuild b/source/xapps-extra/graphicsmagick/FrugalBuild
index 5205d83..c6aa96c 100644
--- a/source/xapps-extra/graphicsmagick/FrugalBuild
+++ b/source/xapps-extra/graphicsmagick/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=graphicsmagick
-pkgver=1.1.8
+pkgver=1.1.10
pkgrel=1
pkgdesc="A collection of tools and libraries for many image formats"
depends=('libxext' 'libsm' 'lcms' 'freetype2' 'libxml2' 'bzip2' 'jasper>=1.900.0' 'libpng' 'perl' 'urw-fonts' 'xespgs')
@@ -14,11 +14,13 @@ _F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.graphicsmagick.org/"
_F_cd_path="GraphicsMagick-$pkgver"
-sha1sums=('fdd10d47f208d278f66b9f0ff69f814c67fbeab3')
+sha1sums=('52027fd146a648b0d80c11a444b6038a29269454')
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+export CFLAGS="$CFLAGS -fno-strict-aliasing"

subpkgs=("$pkgname-docs")
subdescs=('GraphicsMagick Documentation')
-subdepends=("$pkgname=$pkgver")
+subdepends=('')
subgroups=('xapps-extra')
subarchs=('i686 x86_64')
From crazy at frugalware.org  Mon Oct 15 20:09:05 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 20:09:07 2007
Subject: [Frugalware-git] frugalware-current: libsoup-2.2.102-1-i686
Message-ID: <20071015180905.D272013A4023@genesis.frugalware.org>

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

commit df1d6ff7d56ea77eff28ae9e87802a2f1871d6ba
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 20:05:00 2007 +0200

libsoup-2.2.102-1-i686
* Version bump

diff --git a/source/gnome/libsoup/FrugalBuild b/source/gnome/libsoup/FrugalBuild
index 62673a0..6b90130 100644
--- a/source/gnome/libsoup/FrugalBuild
+++ b/source/gnome/libsoup/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=libsoup
-pkgver=2.2.101
+pkgver=2.2.102
pkgrel=1
pkgdesc="An HTTP library implementation in C"
url="http://www.gnome.org/"
@@ -10,7 +10,7 @@ depends=('glib2>=2.14.1' 'gnutls>=2.0.1-2' 'libxml2' 'libgcrypt')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
-sha1sums=('3feaeea68cb5515e96933e3ff2da4c5d51ab3476')
+sha1sums=('f219ff2c578d9d422078b2e70d672a803ed2cd6f')
Fconfopts="$Fconfopts --enable-ssl --enable-libgpg-error"

# optimization OK
From voroskoi at frugalware.org  Mon Oct 15 20:16:58 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 20:17:00 2007
Subject: [Frugalware-git] frugalware-0.7: root-tail-1.2-4sayshell1-i686
Message-ID: <20071015181658.44D1C13A4023@genesis.frugalware.org>

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

commit 6fde0e89922d600e99816366718582bb40ba2651
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 19:58:27 2007 +0200

root-tail-1.2-4sayshell1-i686
backported fixes from -current
closes #2474

diff --git a/source/xapps-extra/root-tail/FrugalBuild b/source/xapps-extra/root-tail/FrugalBuild
index 8f702ad..baca626 100644
--- a/source/xapps-extra/root-tail/FrugalBuild
+++ b/source/xapps-extra/root-tail/FrugalBuild
@@ -1,13 +1,13 @@
-# Compiling Time: ~0.05 SBU
+# Compiling Time: 0.01 SBU
# Maintainer: voroskoi <voroskoi@freemail.hu>

pkgname=root-tail
pkgver=1.2
-pkgrel=3
+pkgrel=4sayshell1
pkgdesc="root-tail displays logfiles in different colours"
url="http://www.goof.com/pcg/marc/root-tail.html"
depends=('libxext')
-makedepends=('imake' 'rman' 'xproto')
+makedepends=('imake' 'rman' 'gccmakedep')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep root-tail.*tar |sed -n 's/.*-tail-\(.*\)\.t.*/\1/;1 p'"
@@ -17,9 +17,8 @@ sha1sums=('1f40a0dcb837906deda1d84d1902c27eb6377e91')
build()
{
Fcd
-
-	xmkmf -a
-	make || return 1
-	make DESTDIR=$Fdestdir install || return 1
-	make DESTDIR=$Fdestdir install.man || return 1
+	xmkmf -a || Fdie
+	Fmake
+	make DESTDIR=$Fdestdir install || Fdie
+	make DESTDIR=$Fdestdir install.man || Fdie
}
From voroskoi at frugalware.org  Mon Oct 15 20:24:39 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 20:24:41 2007
Subject: [Frugalware-git] pacman-tools: fblint-sayshell_fix
Message-ID: <20071015182439.164A713A4023@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=1027ef0f6e24788d59a8e284927081e46472e0e9

commit 1027ef0f6e24788d59a8e284927081e46472e0e9
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 20:07:24 2007 +0200

fblint-sayshell_fix
added 0.7 release name to pkgdesc check

diff --git a/fblint b/fblint
index 32a09b5..ea7cbef 100755
--- a/fblint
+++ b/fblint
@@ -172,7 +172,7 @@ if [ ! -z "$subpkgs" ]; then
fi

if [ "`get_root`" = "stable" ]; then
-	check "unchanged pkgrel" "echo $pkgrel | grep -q '\(siwenna\|terminus\)'"
+	check "unchanged pkgrel" "echo $pkgrel | grep -q '\(siwenna\|terminus\|sayshell\)'"
fi

[ "$_fblint_verbose" ] && echo "done: $_fblint_done, failed $_fblint_failed"
From crazy at frugalware.org  Mon Oct 15 20:26:23 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 20:26:24 2007
Subject: [Frugalware-git] frugalware-current: orbit2-2.14.10-1-i686
Message-ID: <20071015182623.2E27C13A4023@genesis.frugalware.org>

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

commit 3f95bced080b26f85785b03f05ec6e5a15994834
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 20:22:08 2007 +0200

orbit2-2.14.10-1-i686
* Version bump

diff --git a/source/gnome/orbit2/FrugalBuild b/source/gnome/orbit2/FrugalBuild
index 62dc53c..827e528 100644
--- a/source/gnome/orbit2/FrugalBuild
+++ b/source/gnome/orbit2/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=orbit2
_F_gnome_name=ORBit2
-pkgver=2.14.9
+pkgver=2.14.10
pkgrel=1
pkgdesc="A high-performance CORBA Object Request Broker"
url="http://www.gnome.org/"
@@ -16,6 +16,7 @@ options=('scriptlet')
_F_cd_path="ORBit2-$pkgver"
Fconfopts="$Fconfopts --enable-gtk-doc"
unset MAKEFLAGS
-sha1sums=('92a95fcdb43bc22f9f2ad85e1ba24cde2c8b855a')
+export CFLAGS="$CFLAGS -fno-strict-aliasing"
+sha1sums=('f5d7bbe36562b5daad48b92cc5b17afa12d211ee')

# optimization OK
From crazy at frugalware.org  Mon Oct 15 20:32:54 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 20:32:56 2007
Subject: [Frugalware-git] frugalware-current: libbonobo-2.20.1-1-i686
Message-ID: <20071015183254.5306813A4023@genesis.frugalware.org>

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

commit 8866fcd76bb43ac808e357b1cc30e5d67638b671
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 20:28:29 2007 +0200

libbonobo-2.20.1-1-i686
* Version bump

diff --git a/source/gnome/libbonobo/FrugalBuild b/source/gnome/libbonobo/FrugalBuild
index a68fa01..fccaeb8 100644
--- a/source/gnome/libbonobo/FrugalBuild
+++ b/source/gnome/libbonobo/FrugalBuild
@@ -2,18 +2,18 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=libbonobo
-pkgver=2.20.0
+pkgver=2.20.1
pkgrel=1
pkgdesc="GNOME CORBA framework"
url="http://www.gnome.org/"
-depends=('orbit2>=2.14.9' 'libxml2' 'perl')
+depends=('orbit2>=2.14.10' 'libxml2' 'perl')
makedepends=('intltool' 'gtk-doc>=1.8-2' 'popt' 'sgml-common')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
install=$pkgname.install
Finclude gnome
source=(${source[@]} libbonobo-search-path-fix.patch)
-sha1sums=('a39faafb68428a12e651a51edf726060f96b664c' \
+sha1sums=('9d81eb1b604f3428cc718f6337882cb56ebbd9e2' \
'f716a5b855c71edba7e1d77096ee8cc45b85c108')
Fconfopts="$Fconfopts --enable-gtk-doc"
From voroskoi at frugalware.org  Mon Oct 15 20:35:07 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 20:35:09 2007
Subject: [Frugalware-git] frugalware-current: ratpoison-1.4.2-1-i686
Message-ID: <20071015183507.3F17A13A4023@genesis.frugalware.org>

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

commit 20a128348804d4c65e58036e41c865bd37dab6de
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 20:15:44 2007 +0200

ratpoison-1.4.2-1-i686
version bump
updated depends()
updated xinitrc.ratpoison

diff --git a/source/x11-extra/ratpoison/FrugalBuild b/source/x11-extra/ratpoison/FrugalBuild
index cd5fbad..8d5cc56 100644
--- a/source/x11-extra/ratpoison/FrugalBuild
+++ b/source/x11-extra/ratpoison/FrugalBuild
@@ -1,29 +1,28 @@
-# Compiling Time: 0.01 SBU
+# Compiling Time: 0.05 SBU
# Contributor: Peter BARABAS <z0d@artifact.hu>
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=ratpoison
-pkgver=1.4.1
+pkgver=1.4.2
pkgrel=1
-pkgdesc="Simple window manager with no fat library dependencies"
+pkgdesc="Simple window manager with no fat library dependencies."
url="http://savannah.nongnu.org/projects/ratpoison"
-depends=('libxcb' 'libxtst' 'libxinerama' 'readline')
+depends=('libxtst' 'libxinerama' 'readline')
makedepends=('inputproto' 'libxt')
rodepends=('xorg-server')
groups=('x11-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.nongnu.org/ratpoison/|grep tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'"
source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz xinitrc.$pkgname $pkgname.desktop)
-sha1sums=('d2fae111250d6f455063776676663703e4da51aa' \
-	  '48a39f519f7e7694ad3e2c7aaca8d7514acdd137' \
-	  '357af1d355426cdc50792b272e239a0682088821')
+sha1sums=('5a2c096e159421fc9aa964c24cbea54cf74be003' \
+          '5a44277cabe8d7884689c9ecfe03e4609b701a08' \
+          '357af1d355426cdc50792b272e239a0682088821')
options=('nodocs')

build() {
Fcd
Facu
-	Fmake
-	Fmakeinstall
+	Fbuild
Fmkdir /etc/X11/{sessions,xinit}
Ffile /etc/X11/sessions/$pkgname.desktop
Fexe /etc/X11/xinit/xinitrc.$pkgname
diff --git a/source/x11-extra/ratpoison/xinitrc.ratpoison b/source/x11-extra/ratpoison/xinitrc.ratpoison
index 9db450c..527bd19 100644
--- a/source/x11-extra/ratpoison/xinitrc.ratpoison
+++ b/source/x11-extra/ratpoison/xinitrc.ratpoison
@@ -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 vmiklos at frugalware.org  Mon Oct 15 20:36:00 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Oct 15 20:36:03 2007
Subject: [Frugalware-git] frugalware-0.7: root-tail-1.2-4sayshell1-i686
Message-ID: <20071015183600.F15F813A4023@genesis.frugalware.org>

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

commit c1fa92580cc9280127ede66a774063532aa7d2b2
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Mon Oct 15 20:35:55 2007 +0200

root-tail-1.2-4sayshell1-i686
cosmetics, just to test synchook (it should now allow -stable from git)

diff --git a/source/xapps-extra/root-tail/FrugalBuild b/source/xapps-extra/root-tail/FrugalBuild
index baca626..412b6b0 100644
--- a/source/xapps-extra/root-tail/FrugalBuild
+++ b/source/xapps-extra/root-tail/FrugalBuild
@@ -10,7 +10,7 @@ depends=('libxext')
makedepends=('imake' 'rman' 'gccmakedep')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump $url |grep root-tail.*tar |sed -n 's/.*-tail-\(.*\)\.t.*/\1/;1 p'"
+up2date="lynx -dump $url | grep root-tail.*tar | sed -n 's/.*-tail-\(.*\)\.t.*/\1/;1 p'"
source=(http://www.goof.com/pcg/marc/data/$pkgname-$pkgver.tar.gz)
sha1sums=('1f40a0dcb837906deda1d84d1902c27eb6377e91')
From crazy at frugalware.org  Mon Oct 15 20:46:11 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 20:46:13 2007
Subject: [Frugalware-git] frugalware-current: gnome-keyring-2.20.1-1-i686
Message-ID: <20071015184611.0753813A4023@genesis.frugalware.org>

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

commit 7578f5fc2fb5fa0f98ff9fd1d008063b16df07c2
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 20:40:47 2007 +0200

gnome-keyring-2.20.1-1-i686
* Version bump

diff --git a/source/gnome/gnome-keyring/FrugalBuild b/source/gnome/gnome-keyring/FrugalBuild
index f68dcee..7c6a34b 100644
--- a/source/gnome/gnome-keyring/FrugalBuild
+++ b/source/gnome/gnome-keyring/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=gnome-keyring
-pkgver=2.20.0
+pkgver=2.20.1
pkgrel=1
pkgdesc="Password and keyring managing daemon for GNOME"
url="http://www.gnome.org/"
@@ -13,5 +13,5 @@ archs=('i686' 'x86_64')
Finclude gnome
Fconfopts="$Fconfopts --enable-gtk-doc"

-sha1sums=('2d0089848d21d78303c19dd32fb5a1505275c5a5')
+sha1sums=('7026d22cd457c99bb0c973a79b7bc0d08430e739')
# optimization OK
From voroskoi at frugalware.org  Mon Oct 15 20:56:35 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 20:56:38 2007
Subject: [Frugalware-git] frugalware-current: sqlite3-3.5.1-1-i686
Message-ID: <20071015185635.C474E13A4023@genesis.frugalware.org>

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

commit 6bca069cca85ded12efe6399b5b144f8917ee164
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 20:35:10 2007 +0200

sqlite3-3.5.1-1-i686
version bump

diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild
index a3b1a72..c517317 100644
--- a/source/lib/sqlite3/FrugalBuild
+++ b/source/lib/sqlite3/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=sqlite3
-pkgver=3.4.2
+pkgver=3.5.1
pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
url="http://www.sqlite.org/"
@@ -27,6 +27,6 @@ build()
Fexerel /usr/bin/lemon
Ffilerel /usr/share/man/man1/$pkgname.1
}
-sha1sums=('1ab282719c7c2708536341db5b20f39ab27a654d')
+sha1sums=('47de0a04d43baddf8ccb450c6e2adee74325e117')

# optimization OK
From voroskoi at frugalware.org  Mon Oct 15 21:49:42 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 21:49:44 2007
Subject: [Frugalware-git] frugalware-current: e16-0.16.8.10-1-i686
Message-ID: <20071015194942.EFF1B13A4023@genesis.frugalware.org>

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

commit 00fa1ba4ea3b52fcdeb5dfc64ce511f41244b718
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 21:32:11 2007 +0200

e16-0.16.8.10-1-i686
version bump
updated PATHs in xinitrc.e16

diff --git a/source/x11-extra/e16/FrugalBuild b/source/x11-extra/e16/FrugalBuild
index 25bc8f3..f8d35fb 100644
--- a/source/x11-extra/e16/FrugalBuild
+++ b/source/x11-extra/e16/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=e16
-pkgver=0.16.8.9
+pkgver=0.16.8.10
pkgrel=1
pkgdesc="A fast, flexible, and very extensible Window Manager"
pkgdesc_localized=('hu_HU Egy gyors, rugalmas, könnyen kiterjeszthető ablakkezelő.')
@@ -25,8 +25,8 @@ build() {
Fexe /etc/X11/xinit/xinitrc.$pkgname
Frm /usr/etc
}
-sha1sums=('ec1160113b184aadd054227e6f806c86ab38e64a' \
-          '180fba94369c2126cd4759325112656b9d0eec3b' \
+sha1sums=('1b4b803a50c9d539baed27d3656439b19b38c328' \
+          '776d5b787b57a08d6ae41780532365c8e211645f' \
'1c1356fd99c4e29b85379ad52103f8b161378e65')

# optimization OK
diff --git a/source/x11-extra/e16/xinitrc.e16 b/source/x11-extra/e16/xinitrc.e16
index 8356e56..d3eedda 100644
--- a/source/x11-extra/e16/xinitrc.e16
+++ b/source/x11-extra/e16/xinitrc.e16
@@ -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 voroskoi at frugalware.org  Mon Oct 15 21:59:48 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 21:59:51 2007
Subject: [Frugalware-git] frugalware-current: openssl-0.9.8-10-i686
Message-ID: <20071015195948.6942513A4023@genesis.frugalware.org>

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

commit b7aab729624becc17c6cb7a2420a5189eb1870fa
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 13:29:42 2007 +0200

openssl-0.9.8-10-i686
bump to patchlevel f
closes #2488 in -current

diff --git a/source/lib/openssl/CVE-2007-5135.diff b/source/lib/openssl/CVE-2007-5135.diff
deleted file mode 100644
index 130b262..0000000
--- a/source/lib/openssl/CVE-2007-5135.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -aur openssl-0.9.8e/ssl/ssl_lib.c fw_openssl-0.9.8e/ssl/ssl_lib.c
---- openssl-0.9.8e/ssl/ssl_lib.c	2006-11-29 21:47:15.000000000 +0100
-+++ fw_openssl-0.9.8e/ssl/ssl_lib.c	2007-10-05 12:12:10.000000000 +0200
-@@ -1201,7 +1201,6 @@
- char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
- 	{
- 	char *p;
--	const char *cp;
- 	STACK_OF(SSL_CIPHER) *sk;
- 	SSL_CIPHER *c;
- 	int i;
-@@ -1214,20 +1213,21 @@
- 	sk=s->session->ciphers;
- 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
- 		{
--		/* Decrement for either the ':' or a '\0' */
--		len--;
-+		int n;
-+
- 		c=sk_SSL_CIPHER_value(sk,i);
--		for (cp=c->name; *cp; )
-+		n=strlen(c->name);
-+		if (n+1 > len)
- 			{
--			if (len-- <= 0)
--				{
--				*p='\0';
--				return(buf);
--				}
--			else
--				*(p++)= *(cp++);
-+			if (p != buf)
-+				--p;
-+			*p='\0';
-+			return buf;
- 			}
-+		strcpy(p,c->name);
-+		p+=n;
- 		*(p++)=':';
-+		len-=n+1;
- 		}
- 	p[-1]='\0';
- 	return(buf);
diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild
index 14c829b..3834e73 100644
--- a/source/lib/openssl/FrugalBuild
+++ b/source/lib/openssl/FrugalBuild
@@ -4,8 +4,8 @@

pkgname=openssl
pkgver=0.9.8
-pkgextraver=e
-pkgrel=9
+pkgextraver=f
+pkgrel=10
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
url="http://www.openssl.org/source/"
groups=('lib' 'chroot-core')
@@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('glibc')
makedepends=('util-linux')
up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'"
-source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff key-length.diff CVE-2007-5135.diff bn_mont.c.diff openssl-0.9.8e-gcc42.patch)
-signatures=("$source.asc" '' '' '' '' '')
+source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff)
+signatures=("$source.asc" '')

build()
{
diff --git a/source/lib/openssl/bn_mont.c.diff b/source/lib/openssl/bn_mont.c.diff
deleted file mode 100644
index a09b56e..0000000
--- a/source/lib/openssl/bn_mont.c.diff
+++ /dev/null
@@ -1,114 +0,0 @@
---- openssl-0.9.8c.orig/crypto/bn/bn_mont.c
-+++ openssl-0.9.8c/crypto/bn/bn_mont.c
-@@ -176,7 +176,6 @@
-
- 	max=(nl+al+1); /* allow for overflow (no?) XXX */
- 	if (bn_wexpand(r,max) == NULL) goto err;
--	if (bn_wexpand(ret,max) == NULL) goto err;
-
- 	r->neg=a->neg^n->neg;
- 	np=n->d;
-@@ -228,19 +227,70 @@
- 		}
- 	bn_correct_top(r);
-
--	/* mont->ri will be a multiple of the word size */
--#if 0
--	BN_rshift(ret,r,mont->ri);
--#else
--	ret->neg = r->neg;
--	x=ri;
-+	/* mont->ri will be a multiple of the word size and below code
-+	 * is kind of BN_rshift(ret,r,mont->ri) equivalent */
-+	if (r->top <= ri)
-+		{
-+		ret->top=0;
-+		retn=1;
-+		goto err;
-+		}
-+	al=r->top-ri;
-+
-+# define BRANCH_FREE 1
-+# if BRANCH_FREE
-+	if (bn_wexpand(ret,ri) == NULL) goto err;
-+	x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
-+	ret->top=x=(ri&~x)|(al&x);	/* min(ri,al) */
-+	ret->neg=r->neg;
-+
- 	rp=ret->d;
--	ap= &(r->d[x]);
--	if (r->top < x)
--		al=0;
--	else
--		al=r->top-x;
-+	ap=&(r->d[ri]);
-+
-+	{
-+	size_t m1,m2;
-+
-+	v=bn_sub_words(rp,ap,np,ri);
-+	/* this ----------------^^ works even in al<ri case
-+	 * thanks to zealous zeroing of top of the vector in the
-+	 * beginning. */
-+
-+	/* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
-+	/* in other words if subtraction result is real, then
-+	 * trick unconditional memcpy below to perform in-place
-+	 * "refresh" instead of actual copy. */
-+	m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);	/* al<ri */
-+	m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);	/* al>ri */
-+	m1|=m2;			/* (al!=ri) */
-+	m1|=(0-(size_t)v);	/* (al!=ri || v) */
-+	m1&=~m2;		/* (al!=ri || v) && !al>ri */
-+	nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
-+	}
-+
-+	/* 'i<ri' is chosen to eliminate dependency on input data, even
-+	 * though it results in redundant copy in al<ri case. */
-+	for (i=0,ri-=4; i<ri; i+=4)
-+		{
-+		BN_ULONG t1,t2,t3,t4;
-+
-+		t1=nrp[i+0];
-+		t2=nrp[i+1];
-+		t3=nrp[i+2];	ap[i+0]=0;
-+		t4=nrp[i+3];	ap[i+1]=0;
-+		rp[i+0]=t1;	ap[i+2]=0;
-+		rp[i+1]=t2;	ap[i+3]=0;
-+		rp[i+2]=t3;
-+		rp[i+3]=t4;
-+		}
-+	for (ri+=4; i<ri; i++)
-+		rp[i]=nrp[i], ap[i]=0;
-+# else
-+	if (bn_wexpand(ret,al) == NULL) goto err;
- 	ret->top=al;
-+	ret->neg=r->neg;
-+
-+	rp=ret->d;
-+	ap=&(r->d[ri]);
- 	al-=4;
- 	for (i=0; i<al; i+=4)
- 		{
-@@ -258,7 +308,7 @@
- 	al+=4;
- 	for (; i<al; i++)
- 		rp[i]=ap[i];
--#endif
-+# endif
- #else /* !MONT_WORD */
- 	BIGNUM *t1,*t2;
-
-@@ -278,10 +328,12 @@
- 	if (!BN_rshift(ret,t2,mont->ri)) goto err;
- #endif /* MONT_WORD */
-
-+#if !defined(BRANCH_FREE) || BRANCH_FREE==0
- 	if (BN_ucmp(ret, &(mont->N)) >= 0)
- 		{
- 		if (!BN_usub(ret,ret,&(mont->N))) goto err;
- 		}
-+#endif
- 	retn=1;
- 	bn_check_top(ret);
-  err:
diff --git a/source/lib/openssl/key-length.diff b/source/lib/openssl/key-length.diff
deleted file mode 100644
index 1e3a9a4..0000000
--- a/source/lib/openssl/key-length.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/evp/evp_lib.c	2006/11/29 20:47:13	1.10.2.1
-+++ crypto/evp/evp_lib.c	2007/02/27 18:42:52	1.10.2.2
-@@ -225,7 +225,7 @@
-
- int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
- 	{
--	return ctx->cipher->key_len;
-+	return ctx->key_len;
- 	}
-
- int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
diff --git a/source/lib/openssl/openssl-0.9.8e-gcc42.patch b/source/lib/openssl/openssl-0.9.8e-gcc42.patch
deleted file mode 100644
index 191cf22..0000000
--- a/source/lib/openssl/openssl-0.9.8e-gcc42.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Index: openssl/crypto/asn1/asn1.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/asn1/asn1.h,v
-retrieving revision 1.1.1.8
-diff -u -r1.1.1.8 asn1.h
---- openssl/crypto/asn1/asn1.h	29 Jul 2006 19:10:16 -0000	1.1.1.8
-+++ openssl/crypto/asn1/asn1.h	20 May 2007 05:01:40 -0000
-@@ -903,22 +903,22 @@
- /* Used to implement other functions */
- void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
- #define ASN1_dup_of(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
- #define ASN1_dup_of_const(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
-
- void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
- #ifndef OPENSSL_NO_FP_API
- void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
- #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
--	((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
-+	((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
- void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
- int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
- #define ASN1_i2d_fp_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
- #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
--	((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
- int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
- int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
- #endif
-@@ -928,13 +928,13 @@
- #ifndef OPENSSL_NO_BIO
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
- #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
--	((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
-+	((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
- void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
- int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
- #define ASN1_i2d_bio_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
- #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
--	((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
- int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
- int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
- int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
-@@ -978,7 +978,7 @@
- ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
- 			      ASN1_OCTET_STRING **oct);
- #define ASN1_pack_string_of(type,obj,i2d,oct) \
--	((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
-+    	(ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct)))
- ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
-
- void ASN1_STRING_set_default_mask(unsigned long mask);
-Index: openssl/crypto/ocsp/ocsp.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/ocsp/ocsp.h,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 ocsp.h
---- openssl/crypto/ocsp/ocsp.h	29 Jul 2006 19:10:18 -0000	1.1.1.2
-+++ openssl/crypto/ocsp/ocsp.h	20 May 2007 05:13:06 -0000
-@@ -469,7 +469,7 @@
- ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
- 				void *data, STACK_OF(ASN1_OBJECT) *sk);
- #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
--((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
-+(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk)))
-
- X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
-
-Index: openssl/crypto/pem/pem.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/pem/pem.h,v
-retrieving revision 1.1.1.7
-diff -u -r1.1.1.7 pem.h
---- openssl/crypto/pem/pem.h	15 Mar 2007 20:03:01 -0000	1.1.1.7
-+++ openssl/crypto/pem/pem.h	20 May 2007 06:02:41 -0000
-@@ -220,19 +220,20 @@
- #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
- type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
--}
-+return((type *)PEM_ASN1_read( \
-+	(d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \
-+}
-
- #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-@@ -240,7 +241,7 @@
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
- 		  void *u) \
- 	{ \
--	return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-@@ -248,7 +249,7 @@
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
- 		  void *u) \
- 	{ \
--	return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #endif
-@@ -256,33 +257,34 @@
- #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
- type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \
-+return((type *)PEM_ASN1_read_bio( \
-+	(d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- 	{ \
--	return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- 	{ \
--	return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
-
- #define IMPLEMENT_PEM_write(name, type, str, asn1) \
-@@ -546,12 +548,12 @@
- void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
- 			  void **x, pem_password_cb *cb, void *u);
- #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
--((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
-+((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u))
- int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
- 			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
- 			   pem_password_cb *cb, void *u);
- #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
--	((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)
-+	(PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u)
-
- STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
- int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
From crazy at frugalware.org  Mon Oct 15 21:59:48 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 21:59:54 2007
Subject: [Frugalware-git] frugalware-current: gnupg2-2.0.7-2-i686
Message-ID: <20071015195948.9D2DD13A4025@genesis.frugalware.org>

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

commit a0ce85bae5349e4b536527f639eeaf3483377f0d
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 17:16:50 2007 +0200

gnupg2-2.0.7-2-i686
* rebuild with openssl

diff --git a/source/apps/gnupg2/FrugalBuild b/source/apps/gnupg2/FrugalBuild
index 911d6a9..310540a 100644
--- a/source/apps/gnupg2/FrugalBuild
+++ b/source/apps/gnupg2/FrugalBuild
@@ -4,11 +4,11 @@
pkgname=gnupg2
origname=gnupg
pkgver=2.0.7
-pkgrel=1
+pkgrel=2
pkgdesc="GnuPG2 is the new modularized version of GnuPG supporting OpenPGP and S/MIME"
url="http://www.gnupg.org/"
## libldap
-depends=('openssl' 'bzip2' 'curl' 'pth' 'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
+depends=('openssl>=0.9.8-10' 'bzip2' 'curl' 'pth' 'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
makedepends=('libassuan>=0.9.3')
groups=('apps')
archs=('i686' 'x86_64')
From voroskoi at frugalware.org  Mon Oct 15 21:59:48 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 21:59:55 2007
Subject: [Frugalware-git] frugalware-current: openssh-4.7p1-2-i686
Message-ID: <20071015195948.8271113A4024@genesis.frugalware.org>

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

commit 5dd568534a5556d27622a129986aa1f6fee13e64
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 13:52:14 2007 +0200

openssh-4.7p1-2-i686
rebuilt with new openssl

diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild
index f236994..5bcdacc 100644
--- a/source/network/openssh/FrugalBuild
+++ b/source/network/openssh/FrugalBuild
@@ -4,11 +4,11 @@

pkgname=openssh
pkgver=4.7p1
-pkgrel=1
+pkgrel=2
pkgdesc='Secure Shell daemon and clients'
url="http://www.openssh.com/"
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/sysconfig/tunnel')
-depends=('openssl=0.9.8' 'zlib')
+depends=('openssl>=0.9.8-10' 'zlib')
makedepends=('tcp_wrappers')
groups=('network')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Mon Oct 15 23:14:23 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 23:14:25 2007
Subject: [Frugalware-git] frugalware-current: libgnome-2.20.1-1-i686
Message-ID: <20071015211423.94EE213A4023@genesis.frugalware.org>

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

commit 19af4f53a3cfe312acfd19caf1844524654564db
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 23:09:52 2007 +0200

libgnome-2.20.1-1-i686
* Version bump
* fixed copy & paste typos in _F_gnome_schemas* ( /me slaps krix )
* reworked default patch

diff --git a/source/gnome/libgnome/FrugalBuild b/source/gnome/libgnome/FrugalBuild
index 4bee3fc..ace182e 100644
--- a/source/gnome/libgnome/FrugalBuild
+++ b/source/gnome/libgnome/FrugalBuild
@@ -2,18 +2,18 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=libgnome
-pkgver=2.20.0
-pkgrel=3
+pkgver=2.20.1
+pkgrel=1
pkgdesc="Common libraries for GNOME"
url="http://www.gnome.org/"
-depends=('esd' 'gnome-vfs>=2.20.0' 'gtk+2-engines>=2.12.1' 'libbonobo>=2.20.0' 'gnome-frugalware>=0.7.2' 'dbus-x11')
+depends=('esd' 'gnome-vfs>=2.20.0' 'gtk+2-engines>=2.12.1' 'libbonobo>=2.20.1' 'gnome-frugalware>=0.7.2' 'dbus-x11')
makedepends=('intltool' 'gtk-doc')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
_F_gnome_schemas=('/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas'
'/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas'
-	'/etc/gconf/schemas/desktop_gnome_applications_at_mobility.schemas.in'
-	'/etc/gconf/schemas/desktop_gnome_applications_at_visual.schemas.in'
+	'/etc/gconf/schemas/desktop_gnome_applications_at_mobility.schemas'
+	'/etc/gconf/schemas/desktop_gnome_applications_at_visual.schemas'
'/etc/gconf/schemas/desktop_gnome_applications_browser.schemas'
'/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas'
'/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas'
@@ -28,9 +28,10 @@ _F_gnome_schemas=('/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schem
'/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas'
'/etc/gconf/schemas/desktop_gnome_typing_break.schemas')
Finclude gnome gnome-scriptlet
-source=(${source[@]} libgnome-2.20.0-frugalware_defaults.patch)
-sha1sums=('cce82899c1c8dd4d602948e64196b00346db67a0' \
-          'f1a3f305b3dad9bf01d500d5fbc45c0e9f51d8c5')
+source=(${source[@]} $pkgname-$pkgver-frugalware_defaults.patch)
+sha1sums=('ab6d6d472847c1e96b6b67c3ccad8ca2354b9c58' \
+          'ac252bcb878f42ef19872425799b9e1c2712783d')
Fconfopts="$Fconfopts --enable-gtk-doc"
+export CFLAGS="$CFLAGS -fno-strict-aliasing"

# optimization OK
diff --git a/source/gnome/libgnome/libgnome-2.20.0-frugalware_defaults.patch b/source/gnome/libgnome/libgnome-2.20.0-frugalware_defaults.patch
deleted file mode 100644
index dbc9ff0..0000000
--- a/source/gnome/libgnome/libgnome-2.20.0-frugalware_defaults.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_applications_browser.schemas libgnome-2.20.0/schemas/desktop_gnome_applications_browser.schemas
---- libgnome-2.20.0.orig/schemas/desktop_gnome_applications_browser.schemas	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_applications_browser.schemas	2007-10-05 16:47:50.000000000 +0100
-@@ -6,7 +6,7 @@
-       <applyto>/desktop/gnome/applications/browser/exec</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>mozilla</default>
-+      <default>firefox</default>
-       <locale name="C">
-         <short>Default browser</short>
-         <long>Default browser for all URLs</long>
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_applications_browser.schemas.in libgnome-2.20.0/schemas/desktop_gnome_applications_browser.schemas.in
---- libgnome-2.20.0.orig/schemas/desktop_gnome_applications_browser.schemas.in	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_applications_browser.schemas.in	2007-10-05 16:47:50.000000000 +0100
-@@ -6,7 +6,7 @@
-       <applyto>/desktop/gnome/applications/browser/exec</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>mozilla</default>
-+      <default>firefox</default>
-       <locale name="C">
-         <short>Default browser</short>
-         <long>Default browser for all URLs</long>
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas libgnome-2.20.0/schemas/desktop_gnome_background.schemas
---- libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas	2007-10-05 16:47:50.000000000 +0100
-@@ -381,7 +381,7 @@
-         <applyto>/desktop/gnome/background/picture_options</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--        <default>zoom</default>
-+        <default>stretched</default>
-         <locale name="C">
-         <short>Picture Options</short>
-         <long>Determines how the image set by wallpaper_filename is
-@@ -780,7 +780,7 @@
-         <applyto>/desktop/gnome/background/picture_filename</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--	<default>/usr/share/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>/usr/share/pixmaps/backgrounds/gnome/frugalware/frugalware.png</default>
-         <locale name="C">
-         <short>Picture Filename</short>
-         <long>File to use for the background image</long>
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas.in libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in
---- libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas.in	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in	2007-10-05 16:47:50.000000000 +0100
-@@ -16,7 +16,7 @@
-         <applyto>/desktop/gnome/background/picture_options</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--        <default>zoom</default>
-+        <default>stretched</default>
-         <locale name="C">
-         <short>Picture Options</short>
-         <long>Determines how the image set by wallpaper_filename is
-@@ -29,7 +29,7 @@
-         <applyto>/desktop/gnome/background/picture_filename</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--	<default>/usr/share/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>/usr/share/pixmaps/backgrounds/gnome/frugalware/frugalware.png</default>
-         <locale name="C">
-         <short>Picture Filename</short>
-         <long>File to use for the background image</long>
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in
---- libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas.in.in	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in	2007-10-05 16:47:50.000000000 +0100
-@@ -16,7 +16,7 @@
-         <applyto>/desktop/gnome/background/picture_options</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--        <default>zoom</default>
-+        <default>stretched</default>
-         <locale name="C">
-         <short>Picture Options</short>
-         <long>Determines how the image set by wallpaper_filename is
-@@ -29,7 +29,7 @@
-         <applyto>/desktop/gnome/background/picture_filename</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>@datadir@/pixmaps/backgrounds/gnome/frugalware/frugalware.png</default>
-         <locale name="C">
-         <short>Picture Filename</short>
-         <long>File to use for the background image</long>
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas libgnome-2.20.0/schemas/desktop_gnome_interface.schemas
---- libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_interface.schemas	2007-10-05 16:47:50.000000000 +0100
-@@ -4134,7 +4134,7 @@
-       <applyto>/desktop/gnome/interface/icon_theme</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>gnome</default>
-+      <default>Mist</default>
-       <locale name="C">
-         <short>Icon Theme</short>
-         <long>Icon theme to use for the panel, nautilus etc.</long>
-@@ -5307,7 +5307,7 @@
-       <applyto>/desktop/gnome/interface/font_name</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Sans 10</default>
-+      <default>DejaVu Sans 13</default>
-       <locale name="C">
- 	<short>Default font</short>
- 	<long>Name of the default font used by gtk+.</long>
-@@ -6430,7 +6430,7 @@
-       <key>/schemas/desktop/gnome/interface/document_font_name</key>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Sans 10</default>
-+      <default>DejaVu Sans 13</default>
-       <locale name="C">
- 	<short>Document font</short>
- 	<long>Name of the default font used for reading documents</long>
-@@ -6761,7 +6761,7 @@
-       <key>/schemas/desktop/gnome/interface/monospace_font_name</key>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Monospace 10</default>
-+      <default>Monospace 13</default>
-       <locale name="C">
- 	<short>Monospace font</short>
- 	<long>Name of a monospaced (fixed-width) font for use
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas.in libgnome-2.20.0/schemas/desktop_gnome_interface.schemas.in
---- libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas.in	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_interface.schemas.in	2007-10-05 16:47:50.000000000 +0100
-@@ -130,7 +130,7 @@
-       <applyto>/desktop/gnome/interface/icon_theme</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>gnome</default>
-+      <default>Mist</default>
-       <locale name="C">
-         <short>Icon Theme</short>
-         <long>Icon theme to use for the panel, nautilus etc.</long>
-@@ -163,7 +163,7 @@
-       <applyto>/desktop/gnome/interface/font_name</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Sans 10</default>
-+      <default>DejaVu Sans 13</default>
-       <locale name="C">
- 	<short>Default font</short>
- 	<long>Name of the default font used by gtk+.</long>
-@@ -196,7 +196,7 @@
-       <key>/schemas/desktop/gnome/interface/document_font_name</key>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Sans 10</default>
-+      <default>DejaVu Sans 13</default>
-       <locale name="C">
- 	<short>Document font</short>
- 	<long>Name of the default font used for reading documents</long>
-@@ -207,7 +207,7 @@
-       <key>/schemas/desktop/gnome/interface/monospace_font_name</key>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Monospace 10</default>
-+      <default>Monospace 13</default>
-       <locale name="C">
- 	<short>Monospace font</short>
- 	<long>Name of a monospaced (fixed-width) font for use
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas.in.in libgnome-2.20.0/schemas/desktop_gnome_interface.schemas.in.in
---- libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas.in.in	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_interface.schemas.in.in	2007-10-05 16:48:25.000000000 +0100
-@@ -6,7 +6,7 @@
-       <applyto>/desktop/gnome/interface/accessibility</applyto>
-       <owner>gnome</owner>
-       <type>bool</type>
--      <default>@A11Y_ENABLED@</default>
-+      <default>false</default>
-       <locale name="C">
-         <short>Enable Accessibility</short>
-         <long>Whether Applications should have accessibility support</long>
-@@ -130,7 +130,7 @@
-       <applyto>/desktop/gnome/interface/icon_theme</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>gnome</default>
-+      <default>Mist</default>
-       <locale name="C">
-         <short>Icon Theme</short>
-         <long>Icon theme to use for the panel, nautilus etc.</long>
-@@ -141,7 +141,7 @@
-       <applyto>/desktop/gnome/interface/gtk_theme</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Clearlooks</default>
-+      <default>Frugalware</default>
-       <locale name="C">
- 	<short>Gtk+ Theme</short>
- 	<long>Basename of the default theme used by gtk+.</long>
-@@ -163,7 +163,7 @@
-       <applyto>/desktop/gnome/interface/font_name</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Sans 10</default>
-+      <default>DejaVu Sans 13</default>
-       <locale name="C">
- 	<short>Default font</short>
- 	<long>Name of the default font used by gtk+.</long>
-@@ -196,7 +196,7 @@
-       <key>/schemas/desktop/gnome/interface/document_font_name</key>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Sans 10</default>
-+      <default>DejaVu Sans 13</default>
-       <locale name="C">
- 	<short>Document font</short>
- 	<long>Name of the default font used for reading documents</long>
-@@ -207,7 +207,7 @@
-       <key>/schemas/desktop/gnome/interface/monospace_font_name</key>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Monospace 10</default>
-+      <default>Monospace 13</default>
-       <locale name="C">
- 	<short>Monospace font</short>
- 	<long>Name of a monospaced (fixed-width) font for use
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_sound.schemas libgnome-2.20.0/schemas/desktop_gnome_sound.schemas
---- libgnome-2.20.0.orig/schemas/desktop_gnome_sound.schemas	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_sound.schemas	2007-10-05 16:47:51.000000000 +0100
-@@ -504,7 +504,7 @@
-       <applyto>/desktop/gnome/sound/enable_esd</applyto>
-       <owner>gnome</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-         <short>Enable ESD</short>
-         <long>Enable sound server startup.</long>
-diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_sound.schemas.in libgnome-2.20.0/schemas/desktop_gnome_sound.schemas.in
---- libgnome-2.20.0.orig/schemas/desktop_gnome_sound.schemas.in	2007-10-05 16:47:44.000000000 +0100
-+++ libgnome-2.20.0/schemas/desktop_gnome_sound.schemas.in	2007-10-05 16:47:51.000000000 +0100
-@@ -29,7 +29,7 @@
-       <applyto>/desktop/gnome/sound/enable_esd</applyto>
-       <owner>gnome</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-         <short>Enable ESD</short>
-         <long>Enable sound server startup.</long>
diff --git a/source/gnome/libgnome/libgnome-2.20.1-frugalware_defaults.patch b/source/gnome/libgnome/libgnome-2.20.1-frugalware_defaults.patch
new file mode 100644
index 0000000..3c5b22b
--- /dev/null
+++ b/source/gnome/libgnome/libgnome-2.20.1-frugalware_defaults.patch
@@ -0,0 +1,102 @@
+diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_applications_browser.schemas.in libgnome-2.20.0/schemas/desktop_gnome_applications_browser.schemas.in
+--- libgnome-2.20.0.orig/schemas/desktop_gnome_applications_browser.schemas.in	2007-10-05 16:47:44.000000000 +0100
++++ libgnome-2.20.0/schemas/desktop_gnome_applications_browser.schemas.in	2007-10-05 16:47:50.000000000 +0100
+@@ -6,7 +6,7 @@
+       <applyto>/desktop/gnome/applications/browser/exec</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>mozilla</default>
++      <default>firefox</default>
+       <locale name="C">
+         <short>Default browser</short>
+         <long>Default browser for all URLs</long>
+diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in
+--- libgnome-2.20.0.orig/schemas/desktop_gnome_background.schemas.in.in	2007-10-05 16:47:44.000000000 +0100
++++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in	2007-10-05 16:47:50.000000000 +0100
+@@ -16,7 +16,7 @@
+         <applyto>/desktop/gnome/background/picture_options</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+-        <default>zoom</default>
++        <default>stretched</default>
+         <locale name="C">
+         <short>Picture Options</short>
+         <long>Determines how the image set by wallpaper_filename is
+@@ -29,7 +29,7 @@
+         <applyto>/desktop/gnome/background/picture_filename</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+-	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
++	<default>@datadir@/pixmaps/backgrounds/gnome/frugalware/frugalware.png</default>
+         <locale name="C">
+         <short>Picture Filename</short>
+         <long>File to use for the background image</long>
+diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas.in.in libgnome-2.20.0/schemas/desktop_gnome_interface.schemas.in.in
+--- libgnome-2.20.0.orig/schemas/desktop_gnome_interface.schemas.in.in	2007-10-05 16:47:44.000000000 +0100
++++ libgnome-2.20.0/schemas/desktop_gnome_interface.schemas.in.in	2007-10-05 16:48:25.000000000 +0100
+@@ -6,7 +6,7 @@
+       <applyto>/desktop/gnome/interface/accessibility</applyto>
+       <owner>gnome</owner>
+       <type>bool</type>
+-      <default>@A11Y_ENABLED@</default>
++      <default>false</default>
+       <locale name="C">
+         <short>Enable Accessibility</short>
+         <long>Whether Applications should have accessibility support</long>
+@@ -130,7 +130,7 @@
+       <applyto>/desktop/gnome/interface/icon_theme</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>gnome</default>
++      <default>Mist</default>
+       <locale name="C">
+         <short>Icon Theme</short>
+         <long>Icon theme to use for the panel, nautilus etc.</long>
+@@ -141,7 +141,7 @@
+       <applyto>/desktop/gnome/interface/gtk_theme</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>Clearlooks</default>
++      <default>Frugalware</default>
+       <locale name="C">
+ 	<short>Gtk+ Theme</short>
+ 	<long>Basename of the default theme used by gtk+.</long>
+@@ -163,7 +163,7 @@
+       <applyto>/desktop/gnome/interface/font_name</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>Sans 10</default>
++      <default>DejaVu Sans 13</default>
+       <locale name="C">
+ 	<short>Default font</short>
+ 	<long>Name of the default font used by gtk+.</long>
+@@ -196,7 +196,7 @@
+       <key>/schemas/desktop/gnome/interface/document_font_name</key>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>Sans 10</default>
++      <default>DejaVu Sans 13</default>
+       <locale name="C">
+ 	<short>Document font</short>
+ 	<long>Name of the default font used for reading documents</long>
+@@ -207,7 +207,7 @@
+       <key>/schemas/desktop/gnome/interface/monospace_font_name</key>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>Monospace 10</default>
++      <default>Monospace 13</default>
+       <locale name="C">
+ 	<short>Monospace font</short>
+ 	<long>Name of a monospaced (fixed-width) font for use
+diff -urN libgnome-2.20.0.orig/schemas/desktop_gnome_sound.schemas.in libgnome-2.20.0/schemas/desktop_gnome_sound.schemas.in
+--- libgnome-2.20.0.orig/schemas/desktop_gnome_sound.schemas.in	2007-10-05 16:47:44.000000000 +0100
++++ libgnome-2.20.0/schemas/desktop_gnome_sound.schemas.in	2007-10-05 16:47:51.000000000 +0100
+@@ -29,7 +29,7 @@
+       <applyto>/desktop/gnome/sound/enable_esd</applyto>
+       <owner>gnome</owner>
+       <type>bool</type>
+-      <default>false</default>
++      <default>true</default>
+       <locale name="C">
+         <short>Enable ESD</short>
+         <long>Enable sound server startup.</long>
From crazy at frugalware.org  Mon Oct 15 23:26:06 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 23:26:09 2007
Subject: [Frugalware-git] frugalware-current: gconf-2.20.1-1-i686
Message-ID: <20071015212606.A4F9313A4023@genesis.frugalware.org>

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

commit a604690ddeaa92b7d9b4e60b9eea043f4754cba8
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 23:21:30 2007 +0200

gconf-2.20.1-1-i686
* Version bump

diff --git a/source/gnome/gconf/FrugalBuild b/source/gnome/gconf/FrugalBuild
index 091de95..792a77a 100644
--- a/source/gnome/gconf/FrugalBuild
+++ b/source/gnome/gconf/FrugalBuild
@@ -3,17 +3,17 @@

pkgname=gconf
_F_gnome_name=GConf
-pkgver=2.20.0
+pkgver=2.20.1
pkgrel=1
pkgdesc="A configuration database system for GNOME"
url="http://www.gnome.org/"
-depends=('orbit2>=2.14.9' 'gtk+2>=2.12.0' 'libxml2')
+depends=('orbit2>=2.14.10' 'gtk+2>=2.12.0' 'libxml2')
makedepends=('indent' 'gtk-doc>=1.8-2' 'openldap' 'perl-xml')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
source=(${source[@]} gconf-2.16.0-reload.patch)
-sha1sums=('4f0b8e308470ffd95742e0221c1867d62d7bcef6' \
+sha1sums=('c628e2645a91b15749f1ebacc62ea685cbfa681c' \
'c51bd437b495af6b25aff143a45c0b93a4afc236')

subpkgs=('gconf-ldap')
From crazy at frugalware.org  Mon Oct 15 23:32:36 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 23:32:39 2007
Subject: [Frugalware-git] frugalware-current: gail-1.20.1-1-i686
Message-ID: <20071015213236.455D813A4023@genesis.frugalware.org>

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

commit a7c50ed45e3f49a3e73a9df33e8a46086f96136b
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 23:28:26 2007 +0200

gail-1.20.1-1-i686
* Version bump

diff --git a/source/gnome/gail/FrugalBuild b/source/gnome/gail/FrugalBuild
index ef1fd94..a440770 100644
--- a/source/gnome/gail/FrugalBuild
+++ b/source/gnome/gail/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=gail
-pkgver=1.20.0
+pkgver=1.20.1
pkgrel=1
pkgdesc="Accessibility support for GTK+2 and libgnomecanvas"
url="http://developer.gnome.org/projects/gap"
@@ -12,6 +12,7 @@ groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
Fconfopts="$Fconfopts --enable-gtk-doc"
-sha1sums=('57d6304a0927c747490dda365b56de9339234a5f')
+sha1sums=('cb9767641d89da64c1f0ca405319bcece907fbfb')
+export CFLAGS="$CFLAGS -fno-strict-aliasing"

# optimization OK
From crazy at frugalware.org  Mon Oct 15 23:37:56 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 23:37:59 2007
Subject: [Frugalware-git] frugalware-current: libgnomecanvas-2.20.1-1-i686
Message-ID: <20071015213756.B6D0B13A4023@genesis.frugalware.org>

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

commit e1b184458954768d79fbfb899787f22535448d55
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 23:33:47 2007 +0200

libgnomecanvas-2.20.1-1-i686
* Version bump

diff --git a/source/gnome/libgnomecanvas/FrugalBuild b/source/gnome/libgnomecanvas/FrugalBuild
index 70e385c..d7394dc 100644
--- a/source/gnome/libgnomecanvas/FrugalBuild
+++ b/source/gnome/libgnomecanvas/FrugalBuild
@@ -2,16 +2,16 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=libgnomecanvas
-pkgver=2.20.0
+pkgver=2.20.1
pkgrel=1
pkgdesc="GNOME canvas"
url="http://www.gnome.org/"
-depends=('libglade>=2.6.2-2' 'gail>=1.20.0' 'libart_lgpl')
+depends=('libglade>=2.6.2-2' 'gail>=1.20.1' 'libart_lgpl')
makedepends=('gtk-doc>=1.8-2' 'perl-xml')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
-sha1sums=('1afd7ef7636373f60d6ac7c7eec9cd6fd8ec0326')
+sha1sums=('c375c045b22a5e5675f60f2ba17b76308249af27')
Fconfopts="$Fconfopts --enable-gtk-doc"

# optimization OK
From crazy at frugalware.org  Mon Oct 15 23:45:32 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 23:45:33 2007
Subject: [Frugalware-git] frugalware-current: at-spi-1.20.1-1-i686
Message-ID: <20071015214532.319DA13A4023@genesis.frugalware.org>

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

commit 84f4e989d8b8ec0397172c8802598fa881693c21
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 23:41:16 2007 +0200

at-spi-1.20.1-1-i686
* Version bump

diff --git a/source/gnome/at-spi/FrugalBuild b/source/gnome/at-spi/FrugalBuild
index f0d6497..6a1b3d0 100644
--- a/source/gnome/at-spi/FrugalBuild
+++ b/source/gnome/at-spi/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=at-spi
-pkgver=1.20.0
+pkgver=1.20.1
pkgrel=1
pkgdesc="The Gnome Accessibility Toolkit"
url="http://developer.gnome.org/projects/gap/"
-depends=('gtk+2>=2.12.0' 'gail>=1.20.0' 'libbonobo>=2.20.0' 'libxtst' \
+depends=('gtk+2>=2.12.0' 'gail>=1.20.1' 'libbonobo>=2.20.1' 'libxtst' \
'libxevie')
makedepends=('gtk-doc' 'perl-xml')
groups=('gnome')
@@ -14,5 +14,5 @@ archs=('i686' 'x86_64')
Finclude gnome
Fconfopts="$Fconfopts --enable-gtk-doc"

-sha1sums=('a4a305d0a7a7b5d693ef555935cfde2a3d05ffef')
+sha1sums=('5ad1ecf8c299dcfc82ec4cf3db4c6fd5874676bc')
# optimization OK
From voroskoi at frugalware.org  Mon Oct 15 23:50:03 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 23:50:05 2007
Subject: [Frugalware-git] frugalware-current: fluxbox-1.0.0-1-i686
Message-ID: <20071015215003.8C0D913A4023@genesis.frugalware.org>

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

commit 4f009ca6e437375383df9f82a17c1cf797314816
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 23:30:25 2007 +0200

fluxbox-1.0.0-1-i686
version bump
added xft support
updates in xinitrc file

diff --git a/source/x11-extra/fluxbox/FrugalBuild b/source/x11-extra/fluxbox/FrugalBuild
index 2f2af44..dc8c56a 100644
--- a/source/x11-extra/fluxbox/FrugalBuild
+++ b/source/x11-extra/fluxbox/FrugalBuild
@@ -1,15 +1,15 @@
-# Compiling Time: 0.50 SBU
+# Compiling Time: 0.93 SBU
# Maintainer: voroskoi <voroskoi@frugalware.org>
# Contributor: Shrift <shrift@frugalware.org>

pkgname=fluxbox
-pkgver=1.0rc3
+pkgver=1.0.0
pkgrel=1
pkgdesc="A lightweight wm, based on the code of blackbox"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.fluxbox.org"
-depends=('libxcb' 'libice' 'libx11' 'imlib2' 'libgcc' 'libstdc++' 'libxpm')
+depends=('libxft' 'libxpm' 'imlib2' 'libstdc++')
rodepends=('xorg-server')
groups=('x11-extra')
archs=('i686' 'x86_64')
@@ -17,14 +17,14 @@ up2date="lynx -dump $url |grep LATEST |sed -e 's/.*(v\(.*\))/\1/'"
source=($source $pkgname.desktop xinitrc.$pkgname)

build() {
-        Fcd
+	Fcd
Fautoconfize
-        Fbuild --enable-imlib2 --enable-nls
+	Fbuild --enable-nls
Fexe /etc/X11/xinit/xinitrc.$pkgname
Ffile /etc/X11/sessions/$pkgname.desktop
}
-sha1sums=('4524960e3e9702b61e29c5e1dfae8c050abaaf7f'\
-          '10a60edec5f8bcf0c4e1209074b3a5c7bf19388a'\
-          '51351a641b785755dd4c2163b22fc4052553c75c')
+sha1sums=('7985e35fbb170fda24b9e04610690cd04c7a8748' \
+          '10a60edec5f8bcf0c4e1209074b3a5c7bf19388a' \
+          'c8c291ed229a37b0cd4d15a7aa2c3c3a1fee6e17')

# optimization OK
diff --git a/source/x11-extra/fluxbox/xinitrc.fluxbox b/source/x11-extra/fluxbox/xinitrc.fluxbox
index f77f23d..3c7b28f 100644
--- a/source/x11-extra/fluxbox/xinitrc.fluxbox
+++ b/source/x11-extra/fluxbox/xinitrc.fluxbox
@@ -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 voroskoi at frugalware.org  Mon Oct 15 23:55:15 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Mon Oct 15 23:55:18 2007
Subject: [Frugalware-git] frugalware-current: fbdesk-1.4.1-1-i686
Message-ID: <20071015215515.A50C713A4023@genesis.frugalware.org>

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

commit d5d9aeb9d8e783fc4ff6f48c9885f5b895b7ed77
Author: voroskoi <voroskoi@frugalware.org>
Date:   Mon Oct 15 23:38:56 2007 +0200

fbdesk-1.4.1-1-i686
version bump
updated depends()

diff --git a/source/x11-extra/fbdesk/FrugalBuild b/source/x11-extra/fbdesk/FrugalBuild
index d45710e..d950eab 100644
--- a/source/x11-extra/fbdesk/FrugalBuild
+++ b/source/x11-extra/fbdesk/FrugalBuild
@@ -1,18 +1,18 @@
-# Compiling Time: 0.10 SBU
+# Compiling Time: 0.22 SBU
# Contributor: Shrift <shrift@frugalware.org>
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=fbdesk
-pkgver=1.4.0
+pkgver=1.4.1
pkgrel=1
pkgdesc="FbDesk is a fluxbox-util application that creates and manage icons on your Fluxbox desktop."
url="http://www.fluxbox.org/fbdesk/"
-depends=('imlib2' 'expat' 'libstdc++' 'libxft' 'libxpm')
+depends=('libxpm' 'libxft' 'imlib2' 'libstdc++')
makedepends=('xextproto' 'inputproto')
groups=('x11-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump 'http://www.fluxbox.org/fbdesk/'|grep tar.gz$|sed -ne 's/.*k-\(.*\)\.t.*/\1/;1 p'"
source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz)
-sha1sums=('2f5ead00dbcd4c5b2d8cebce4ca6c52aa5d13cbe')
+sha1sums=('b5a2f446fa27406d9adb9a9608f1dc3c638d37ff')

-# optimalization OK
+# optimization OK
From crazy at frugalware.org  Mon Oct 15 23:59:12 2007
From: crazy at frugalware.org (crazy)
Date: Mon Oct 15 23:59:15 2007
Subject: [Frugalware-git] frugalware-current: libgnomeui-2.20.1-1-i686
Message-ID: <20071015215912.8144913A4023@genesis.frugalware.org>

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

commit 969628a8f6ed764a3d864eff7a16e0c5abc405b3
Author: crazy <crazy@frugalware.org>
Date:   Mon Oct 15 23:54:28 2007 +0200

libgnomeui-2.20.1-1-i686
* Version bump

diff --git a/source/gnome/libgnomeui/FrugalBuild b/source/gnome/libgnomeui/FrugalBuild
index 9e10ddd..6d9ebdc 100644
--- a/source/gnome/libgnomeui/FrugalBuild
+++ b/source/gnome/libgnomeui/FrugalBuild
@@ -2,16 +2,16 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=libgnomeui
-pkgver=2.20.0
+pkgver=2.20.1
pkgrel=1
pkgdesc="User Interface library for GNOME"
url="http://www.gnome.org/"
-depends=('libbonoboui>=2.20.0' 'gnome-keyring>=2.20.0' 'gtk+2>=2.12.0' 'libbonobo>=2.20.0')
+depends=('libbonoboui>=2.20.0' 'gnome-keyring>=2.20.1' 'gtk+2>=2.12.0' 'libbonobo>=2.20.1')
makedepends=('gtk-doc>=1.8-2' 'perl-xml')
groups=('gnome' 'gnome-core')
archs=('i686' 'x86_64')
Finclude gnome
Fconfopts="$Fconfopts --enable-gtk-doc"
-sha1sums=('acbeb273845b6d528d060c6fc09f591b87399870')
+sha1sums=('150d997ea792e025747f2cb008540694e8655bc5')

# optimization OK
From crazy at frugalware.org  Tue Oct 16 00:56:10 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:14 2007
Subject: [Frugalware-git] frugalware-current: dbus-qt3-20060814-1-i686
Message-ID: <20071015225610.CB83513A4024@genesis.frugalware.org>

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

commit 0212b3cf24faac880e3e596940cbf7e548cc3b7f
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:43:49 2007 +0200

dbus-qt3-20060814-1-i686
* s/kde-core/kde-minimal/

diff --git a/source/kde/dbus-qt3/FrugalBuild b/source/kde/dbus-qt3/FrugalBuild
index 1754698..c413c38 100644
--- a/source/kde/dbus-qt3/FrugalBuild
+++ b/source/kde/dbus-qt3/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Qt3 bindings for D-BUS"
url="http://www.freedesktop.org/wiki/Software_2fDBusBindings"
depends=('dbus>=0.93' 'qt')
-groups=('kde' 'kde-core')
+groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
Finclude kde
options=('scriptlet')
From crazy at frugalware.org  Tue Oct 16 00:56:10 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:16 2007
Subject: [Frugalware-git] frugalware-current: kdebase-3.5.7-3-i686
Message-ID: <20071015225610.BCB9D13A4023@genesis.frugalware.org>

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

commit 0f2d617951434ebaec59bb25a85ed1eec0a7a4a4
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:41:43 2007 +0200

kdebase-3.5.7-3-i686
* removed pmount from depends
* not needed anymore

diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index e88577c..0b9b0fa 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -6,7 +6,7 @@ pkgver=3.5.7
pkgrel=3
pkgdesc="KDE Base Programs."
depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.7-3' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \
-   	'pmount' 'xscreensaver-data' 'bdftopcf' 'lmsensors' 'libxxf86misc' 'libfontenc' \
+   	 'xscreensaver-data' 'bdftopcf' 'lmsensors' 'libxxf86misc' 'libfontenc' \
'setxkbmap' 'dbus-qt3>=20060814' 'libsmbclient>=3.0.24-2' 'xkeyboard-config' 'cyrus-sasl>=2.1.22-8' 'libldap')
makedepends=('samba' 'imake' 'doxygen' 'qt-docs' 'graphviz' 'openldap')
rodepends=('xorg-server>=1.2.0' 'kde-frugalware>=0.6.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop')
From crazy at frugalware.org  Tue Oct 16 00:56:11 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:17 2007
Subject: [Frugalware-git] frugalware-current: qt-3.3.8-5-i686
Message-ID: <20071015225611.21FBC13A4026@genesis.frugalware.org>

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

commit 456c69356eff94760822ef99be7b3c1f9ab04252
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:48:19 2007 +0200

qt-3.3.8-5-i686
* s/kde-core/kde-minimal/
* removed kde-lib does not make any sense
* it is a 'xlib' and is where I'll move it soon
* same story for gtk+2. Qt is not KDE , GTK not GNOME that is..

diff --git a/source/kde/qt/FrugalBuild b/source/kde/qt/FrugalBuild
index 5789cbf..7d8ca93 100644
--- a/source/kde/qt/FrugalBuild
+++ b/source/kde/qt/FrugalBuild
@@ -10,7 +10,7 @@ pkgdesc="The QT GUI toolkit."
url="http://www.trolltech.com/products/qt"
depends=('libxrandr' 'mesa' 'libxft>=2.1.11-3' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'libsm' 'imake' 'libpng' 'libxtst')
makedepends=('mysql>=5.0.15' 'postgresql>=8.2' 'sqlite3' 'cups' 'bison')
-groups=('kde' 'kde-lib' 'kde-core')
+groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
options=('nodocs' 'scriptlet')
removes=('usr/lib/qt/mkspecs/default')
From crazy at frugalware.org  Tue Oct 16 00:56:11 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:18 2007
Subject: [Frugalware-git] frugalware-current: kde-frugalware-0.7.0-1-i686
Message-ID: <20071015225611.4732A13A4023@genesis.frugalware.org>

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

commit edf5d77af4034125b88fb04578acb58d7b45c648
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:49:27 2007 +0200

kde-frugalware-0.7.0-1-i686
* s/kde-core/kde-minimal/

diff --git a/source/kde/kde-frugalware/FrugalBuild b/source/kde/kde-frugalware/FrugalBuild
index 3c77bd2..626eff6 100644
--- a/source/kde/kde-frugalware/FrugalBuild
+++ b/source/kde/kde-frugalware/FrugalBuild
@@ -10,7 +10,7 @@ depends=()
backup=('usr/share/config/kdm/kdmrc')
rodepends=('sed' 'kde-theme-qtcurve' 'crystal' 'qtcurve-gtk2' 'gtk-qt-engine>=0.7-4' 'nuvola>=1.0-3' 'knemo>=0.4.6-3')
options=('nodocs')
-groups=('kde' 'kde-core')
+groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
up2date="$pkgver"
source=(http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/$pkgname-$pkgver.tar.bz2)
From crazy at frugalware.org  Tue Oct 16 00:56:11 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:18 2007
Subject: [Frugalware-git] frugalware-current: arts-1.5.7-1-i686
Message-ID: <20071015225611.0F7F113A4025@genesis.frugalware.org>

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

commit d64477116b021d9b361b86ff104b84ccab1fdbcc
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:45:05 2007 +0200

arts-1.5.7-1-i686
* s/kde-core/kde-minimal/

diff --git a/source/kde/arts/FrugalBuild b/source/kde/arts/FrugalBuild
index 3aac4c1..e221e1d 100644
--- a/source/kde/arts/FrugalBuild
+++ b/source/kde/arts/FrugalBuild
@@ -6,7 +6,7 @@ pkgname=arts
pkgver=1.5.7
pkgrel=1
pkgdesc="Analog realtime synthesizer"
-groups=('kde' 'kde-core')
+groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
depends=('libstdc++' 'qt>=3.3.8-3' 'libvorbis' 'libmad' 'glib2' 'jack' 'alsa-lib' 'audiofile')
Finclude kde
From crazy at frugalware.org  Tue Oct 16 00:56:11 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:19 2007
Subject: [Frugalware-git] frugalware-current: kdelibs-3.5.7-3-i686
Message-ID: <20071015225611.7933313A4023@genesis.frugalware.org>

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

commit 1b9e793451c23d152488079a58ee2c1ecc7fba48
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:51:01 2007 +0200

kdelibs-3.5.7-3-i686
* s/kde-core/kde-minimal/

diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 62fb7e9..a69c8dd 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -12,7 +12,7 @@ depends=('arts>=1.5.7' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif' 'openss
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')
-groups=('kde' 'kde-core')
+groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
_F_kde_reconf=1
Finclude kde
From crazy at frugalware.org  Tue Oct 16 00:56:11 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 00:56:20 2007
Subject: [Frugalware-git] frugalware-current: kdebase-3.5.7-3-i686
Message-ID: <20071015225611.9406A13A4023@genesis.frugalware.org>

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

commit 75b386031dc5e032147253c2a29bd56ede780d37
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 00:52:05 2007 +0200

kdebase-3.5.7-3-i686
* s/kde-core/kde-minimal/

diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index 0b9b0fa..f3c2127 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -10,7 +10,7 @@ depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.7-3' 'libraw1394' 'hal>=0
'setxkbmap' 'dbus-qt3>=20060814' 'libsmbclient>=3.0.24-2' 'xkeyboard-config' 'cyrus-sasl>=2.1.22-8' 'libldap')
makedepends=('samba' 'imake' 'doxygen' 'qt-docs' 'graphviz' 'openldap')
rodepends=('xorg-server>=1.2.0' 'kde-frugalware>=0.6.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop')
-groups=('kde' 'kde-core')
+groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
conflicts=('ksplash-engine-moodin')
options=('nodocs')
From vmiklos at frugalware.org  Tue Oct 16 09:40:31 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 09:40:33 2007
Subject: [Frugalware-git] frugalware-current: xscreensaver-5.03-3-i686
Message-ID: <20071016074031.11AB213A4023@genesis.frugalware.org>

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

commit 04b3d6a0fde69372875c08a6484a4c742941e069
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 09:40:09 2007 +0200

xscreensaver-5.03-3-i686
rebuild, -data subpkgs was corrupted

diff --git a/source/xlib/xscreensaver/FrugalBuild b/source/xlib/xscreensaver/FrugalBuild
index 5ca896a..b101221 100644
--- a/source/xlib/xscreensaver/FrugalBuild
+++ b/source/xlib/xscreensaver/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=xscreensaver
pkgver=5.03
-pkgrel=2
+pkgrel=3
pkgdesc="A screen saver and locker for the X Window System."
url="http://www.jwz.org/xscreensaver"
rodepends=('xscreensaver-data')
From vmiklos at frugalware.org  Tue Oct 16 10:34:09 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 10:34:12 2007
Subject: [Frugalware-git] frugalware-current: db-4.6.21-1-x86_64
Message-ID: <20071016083409.38C0013A4023@genesis.frugalware.org>

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

commit 79b14ae869256a986b6de1b89230e17771901b27
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 10:32:47 2007 +0200

db-4.6.21-1-x86_64
version bump

diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild
index 79a3937..4a7c34e 100644
--- a/source/base/db/FrugalBuild
+++ b/source/base/db/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=db
-pkgver=4.6.19
+pkgver=4.6.21
pkgrel=1
pkgdesc="The Berkeley DB embedded database system"
url="http://www.sleepycat.com"
@@ -18,7 +18,7 @@ archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.oracle.com/technology/software/products/berkeley-db/index.html|grep '\]Berkeley DB'|sed 's/.*DB \([^ ]*\) .*/\1/;q'"
source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz \
db-4.5.20-java-gcj.patch)
-sha1sums=('8980f4319ebf7d16c06cf01068b51c78affad07e' \
+sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \
'c8063bb1e85f0a8d4ed420d43f2e165e6ba625fe')
[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --with-mutex=x86/gcc-assembly"
[ "$ENABLE_JAVA" = "1" ] && Fconfopts="$Fconfopts --enable-java"
From vmiklos at frugalware.org  Tue Oct 16 10:37:00 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 10:37:02 2007
Subject: [Frugalware-git] frugalware-current: pciutils-2.2.7-1-x86_64
Message-ID: <20071016083700.E53EA13A4023@genesis.frugalware.org>

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

commit 3678d9cd6bd6a5b807997573e0fb08b041230129
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 10:36:57 2007 +0200

pciutils-2.2.7-1-x86_64
version bump

diff --git a/source/base/pciutils/FrugalBuild b/source/base/pciutils/FrugalBuild
index 90dc90b..006f534 100644
--- a/source/base/pciutils/FrugalBuild
+++ b/source/base/pciutils/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=pciutils
-pkgver=2.2.6
+pkgver=2.2.7
pkgrel=1
pkgdesc="PCI utilities"
url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
From vmiklos at frugalware.org  Tue Oct 16 10:55:55 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 10:55:58 2007
Subject: [Frugalware-git] frugalware-current: mplayer-1.0rc2-1-i686
Message-ID: <20071016085555.3777613A4023@genesis.frugalware.org>

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

commit 05f6fa12c97b6ef330913e6372d1061c288938d2
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 10:55:31 2007 +0200

mplayer-1.0rc2-1-i686
version bump
removed lzo2 and desktop patch

diff --git a/source/xapps/mplayer/01-mplayer.desktop.patch b/source/xapps/mplayer/01-mplayer.desktop.patch
deleted file mode 100644
index c257d5d..0000000
--- a/source/xapps/mplayer/01-mplayer.desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- MPlayer-1.0pre8/etc/mplayer.desktop.orig	2006-06-12 01:57:45.000000000 +0200
-+++ MPlayer-1.0pre8/etc/mplayer.desktop	2006-06-12 01:58:48.000000000 +0200
-@@ -3,10 +3,16 @@
- Encoding=UTF-8
- Name=MPlayer
- GenericName=Multimedia player
-+GenericName[de]=Multimedia Player
-+GenericName[es]=Reproductor multimedia
-+GenericName[fr]=Lecteur multimedia
-+GenericName[hu]=MultimĂŠdia-lejĂĄtszĂł
-+GenericName[it]=Lettore multimediale
- Comment=Multimedia player
- Comment[de]=Multimedia-Player
- Comment[es]=Reproductor multimedia
- Comment[fr]=Lecteur multimedia
-+Comment[hu]=MultimĂŠdia-lejĂĄtszĂł
- Comment[it]=Lettore multimediale
- Icon=mplayer.xpm
- TryExec=gmplayer
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 6fb3e15..dbec575 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=mplayer
-pkgver=1.0rc1
+pkgver=1.0rc2
pkgextraver=
-pkgrel=8
+pkgrel=1
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/"
depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
@@ -19,31 +19,21 @@ options=('scriptlet')
up2date="lynx -dump http://www.mplayerhq.hu/MPlayer/releases/|grep -v snapshot |Flasttarbz2"
source=(http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver$pkgextraver.tar.bz2 \
00-$pkgname.conf.patch \
-	01-$pkgname.desktop.patch \
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
-	http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip}
-	$pkgname-1.0pre7-lzo2.patch.bz2 \
-	http://www.mplayerhq.hu/MPlayer/patches/asmrules_fix_20061231.diff \
-	DMO_VideoDecoder.diff \
-	CVE-2007-2948.diff)
-sha1sums=('a450c0b0749c343a8496ba7810363c9d46dfa73c' \
+	http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip})
+sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \
'f7492d46afc72678435b70fa4326dbbf32795ba9' \
-          '7135e8bf05cee6b123b81fa2a2c6ab18a27af615' \
'45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
'2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
'b22dbe895991c23fad446c3c4ff7b6db12673778' \
-          '9ca910295c2888fba95a98da83762a22aaf34651' \
-          '45c4adbe6ab3063b68938c813966948aebf15ce3' \
-          '84412f4bd85d64a92586ca4db7e8585d16cd1acd' \
-          'e629aafe8e07ddae6db93009715295e6a9d8ed45' \
-          '977fad7f0e8ec616d4b7a6cd2aa5aebcde99f7e1')
+          '9ca910295c2888fba95a98da83762a22aaf34651')

# To add v4l support.
# mknod -m 660 /dev/video0 c 81 0
@@ -53,17 +43,16 @@ build()
unset CFLAGS
Fcd MPlayer-$pkgver$pkgextraver
Fpatchall
-	mkdir libavcodec/amr_float
+	mkdir -p libavcodec/amr_float
cd libavcodec/amr_float
-	unzip -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
+	unzip -o -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
cd -
-	mkdir libavcodec/amrwb_float
+	mkdir -p libavcodec/amrwb_float
cd libavcodec/amrwb_float
-	unzip -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
+	unzip -o -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
cd -
Fmake --confdir=/etc/mplayer --enable-gui --language=all \
--enable-runtime-cpudetection --enable-liblzo \
-		--enable-live --with-livelibdir=/usr/lib/live \
--enable-largefiles --enable-mga --enable-xmga \
--enable-tdfxfb --disable-vidix-internal
make DESTDIR=$Fdestdir install || Fdie
diff --git a/source/xapps/mplayer/mplayer-1.0pre7-lzo2.patch.bz2 b/source/xapps/mplayer/mplayer-1.0pre7-lzo2.patch.bz2
deleted file mode 100644
index ce765af..0000000
Binary files a/source/xapps/mplayer/mplayer-1.0pre7-lzo2.patch.bz2 and /dev/null differ
From voroskoi at frugalware.org  Tue Oct 16 11:03:51 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 11:03:55 2007
Subject: [Frugalware-git] homepage-ng: news.xml-terminus_eol
Message-ID: <20071016090351.DDB8913A4023@genesis.frugalware.org>

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

commit 1f8fadcbb6c0961a6c0e814b4a2129e6d633dfcc
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 10:46:27 2007 +0200

news.xml-terminus_eol
First try of the EOL message of Terminus

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index df0b1de..82aa3cf 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -17,6 +17,27 @@

<news>
<post>
+		<id>77</id>
+		<title>Terminus: End of life</title>
+		<date>Tue Oct 16 10:59:34 CEST 2007</date>
+		<author>voroskoi</author>
+		<hidden>1</hidden>
+		<content><![CDATA[
+			With Sayshell release Terminus support is over. It's highly recommended to upgrade to our new stable release as there will be no more security- and bugfixes for Terminus.<br /><br />
+			We have released FSA135-FSA295 for this release. That means 161 security fix during a half year.<br />
+			When you update to Sayshell that will also fix the following vulnerabilities:<br />
+			<ul>
+				<li><a href="http://bugs.frugalware.org/task/2055">#2055 - MySQL</a></li>
+				<li><a href="http://bugs.frugalware.org/task/2291">#2291 - mldonkey</a></li>
+				<li><a href="http://bugs.frugalware.org/task/2409">#2409 - QGit</a></li>
+				<li><a href="http://bugs.frugalware.org/task/2424">#2424 - OpenOffice</a></li>
+				<li><a href="http://bugs.frugalware.org/task/2429">#2429 - VMware</a></li>
+				<li><a href="http://bugs.frugalware.org/task/2456">#2456 - ImageMagick</a></li>
+			</ul>
+			]]>
+		</content>
+	</post>
+	<post>
<id>76</id>
<title>Frugalware 0.7 (Sayshell) for i686 and x86_64 released</title>
<date>Sat Oct 13 02:58:26 CEST 2007</date>
From voroskoi at frugalware.org  Tue Oct 16 11:03:55 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 11:03:59 2007
Subject: [Frugalware-git] frugalware-current: cups-1.3.3-1-i686
Message-ID: <20071016090355.E4E8113A4024@genesis.frugalware.org>

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

commit 6445155fac23207e8240d4b45657607e73b2fbea
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 10:43:01 2007 +0200

cups-1.3.3-1-i686
version bump

diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild
index edbb78d..88422ce 100644
--- a/source/apps/cups/FrugalBuild
+++ b/source/apps/cups/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=cups
-pkgver=1.3.2
+pkgver=1.3.3
pkgrel=1
pkgdesc="The CUPS Printing System"
url="http://www.cups.org/"
@@ -49,7 +49,7 @@ build() {

Fsplit libcups usr/lib/libcups.so*
}
-sha1sums=('6915f4499ac258a59afc5b3541b17f56b3bfb66f' \
+sha1sums=('9603e9ddba78a6103c48a9f917ea35ebd05ef7e0' \
'ad90c43de181d362f6c507f366904472d01ae585' \
'f19bb889e3535e1284d0b93606da48aa61089c8a' \
'03197abb98eff18d3ede3000a61c7783b8c1ad92')
From voroskoi at frugalware.org  Tue Oct 16 11:25:16 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 11:25:19 2007
Subject: [Frugalware-git] homepage-ng: news.xml-fixed_terminus_eol
Message-ID: <20071016092516.6BAD113A4023@genesis.frugalware.org>

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

commit 268c7adb61b638e9503402531fd992c4c5afb691
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 11:09:14 2007 +0200

news.xml-fixed_terminus_eol
Fixes from LGee, thx
now it is public

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 82aa3cf..38178e3 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -21,11 +21,11 @@
<title>Terminus: End of life</title>
<date>Tue Oct 16 10:59:34 CEST 2007</date>
<author>voroskoi</author>
-		<hidden>1</hidden>
+		<hidden>0</hidden>
<content><![CDATA[
-			With Sayshell release Terminus support is over. It's highly recommended to upgrade to our new stable release as there will be no more security- and bugfixes for Terminus.<br /><br />
-			We have released FSA135-FSA295 for this release. That means 161 security fix during a half year.<br />
-			When you update to Sayshell that will also fix the following vulnerabilities:<br />
+			With the release of Sayshell, the support for Terminus is discontinued. It is highly recommended to upgrade to our new stable release, as there will be no more security and bug fixes for Terminus.<br /><br />
+			We have released FSA135 to FSA295 for Terminus. That means 161 security problems were issued in half a year.<br />
+			If you update to Sayshell, it will also fix the following vulnerabilities:<br />
<ul>
<li><a href="http://bugs.frugalware.org/task/2055">#2055 - MySQL</a></li>
<li><a href="http://bugs.frugalware.org/task/2291">#2291 - mldonkey</a></li>
From voroskoi at frugalware.org  Tue Oct 16 11:28:50 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 11:28:52 2007
Subject: [Frugalware-git] frugalware-current: cupsddk-1.2.3-1-i686
Message-ID: <20071016092850.AC62F13A4023@genesis.frugalware.org>

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

commit 616c9027611bafeecd191aee236e6054289bf5a0
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 11:12:37 2007 +0200

cupsddk-1.2.3-1-i686
version bump

diff --git a/source/apps-extra/cupsddk/FrugalBuild b/source/apps-extra/cupsddk/FrugalBuild
index 4517d44..a5ff509 100644
--- a/source/apps-extra/cupsddk/FrugalBuild
+++ b/source/apps-extra/cupsddk/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=cupsddk
-pkgver=1.2.0
+pkgver=1.2.3
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/"
@@ -12,7 +12,7 @@ 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.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2)
-sha1sums=('41999fd24f13afe6915ab6beb3235136909697b0')
+sha1sums=('b8fa8925fb8be441a6063cca83e640000ad2c942')

build() {
Fmake
From vmiklos at frugalware.org  Tue Oct 16 11:40:45 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 11:40:46 2007
Subject: [Frugalware-git] frugalware-current: j2me-2.5.2-1-i686
Message-ID: <20071016094045.0A78813A4023@genesis.frugalware.org>

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

commit e407dc418276f02f5e271aea963d5bddbf36bb10
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 11:40:24 2007 +0200

j2me-2.5.2-1-i686
version bump

diff --git a/source/apps-extra/j2me/FrugalBuild b/source/apps-extra/j2me/FrugalBuild
index 3160c7a..7a64eee 100644
--- a/source/apps-extra/j2me/FrugalBuild
+++ b/source/apps-extra/j2me/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=j2me
-pkgver=2.5.1
+pkgver=2.5.2
basever=`echo ${pkgver} | sed 's/\./_/g'`
pkgrel=1
pkgdesc="Java 2 Micro Edition Wireless Toolkit for developing wireless applications."
@@ -12,7 +12,7 @@ groups=('apps-extra')
archs=('i686')
up2date="lynx -dump http://java.sun.com/javame/downloads/index.jsp|grep \
'Wireless Toolkit'|grep -m1 CLDC|sed 's/.* \([0-9][^ ]*\) f.*/\1/;q'"
-# download the source from http://java.sun.com/products/sjwtoolkit/download-2_5_1.html
+# download the source from http://java.sun.com/products/sjwtoolkit/download.html
source=(sun_java_wireless_toolkit-${basever}-linux.bin \
wtk.png)
_F_desktop_name="Sun Java Wireless Toolkit"
@@ -20,7 +20,7 @@ _F_desktop_exec="/usr/bin/ktoolbar"
_F_desktop_icon="wtk.png"
_F_desktop_categories="GNOME;GTK;Development;"
options=('nobuild')
-sha1sums=('8d760054543e8fc8139df90b5d6157ebb15dfcba' \
+sha1sums=('2e6e2d83f613c275f44d104b78c7546ba120d5c7' \
'801e415fb2f19ce0c5902f9192a4e8838a117d24')

build()
@@ -28,7 +28,7 @@ build()
dd bs=2048 if=sun_java_wireless_toolkit-${basever}-linux.bin of=j2me.zip skip=10
unzip -qqo j2me.zip
Fmkdir /usr/{bin,lib/j2me}
-	cp -a appdb bin lib wtklib $Fdestdir/usr/lib/j2me
+	cp -a j2mewtk_template bin lib wtklib $Fdestdir/usr/lib/j2me
chmod 755 $Fdestdir/usr/lib/j2me/bin/*
chmod 644 $Fdestdir/usr/lib/j2me/bin/*.jar
Fdocrel *.html docs
From hermier at frugalware.org  Tue Oct 16 11:52:16 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Oct 16 11:52:18 2007
Subject: [Frugalware-git] homepage-ng: news: fr translation.
Message-ID: <20071016095216.B455913A4023@genesis.frugalware.org>

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

commit 9b2f515ad24c776423d68f4736e50805e294ceb9
Author: Michel Hermier <hermier@frugalware.org>
Date:   Tue Oct 16 11:51:57 2007 +0200

news: fr translation.

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index 2f74540..1fa817c 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -17,6 +17,27 @@

<news>
<post>
+		<id>77</id>
+		<title>Terminus: Fin de vie</title>
+		<date>Tue Oct 16 10:59:34 CEST 2007</date>
+		<author>hermier</author>
+		<hidden>0</hidden>
+		<content><![CDATA[
+				Avec la sortie de Sayshell, le support de Terminus est arrĂŠtĂŠ. Il est grandement recommandĂŠ de se mettre Ă  jour vers notre nouvelle version stable, comme il n'y aura plus de changement de sĂŠcuritĂŠ et de bugs pour Terminus.<br /><br />
+				Nous avons publiÊ les FSA135 à FSA295 pour Terminus. Cela signifie que 161 problèmes de sÊcuritÊ on ÊtÊ dÊcouvert en la moitiÊ d'une annÊe.<br />
+				  Si vous mettez Ă  jour vers Sayshell, cela rĂŠsoudra aussi les vulnĂŠrabilitĂŠs suivante:<br />
+				  <ul>
+					  <li><a href="http://bugs.frugalware.org/task/2055">#2055 - MySQL</a></li>
+					  <li><a href="http://bugs.frugalware.org/task/2291">#2291 - mldonkey</a></li>
+					  <li><a href="http://bugs.frugalware.org/task/2409">#2409 - QGit</a></li>
+					  <li><a href="http://bugs.frugalware.org/task/2424">#2424 - OpenOffice</a></li>
+					  <li><a href="http://bugs.frugalware.org/task/2429">#2429 - VMware</a></li>
+					  <li><a href="http://bugs.frugalware.org/task/2456">#2456 - ImageMagick</a></li>
+				</ul>
+				]]>
+			</content>
+	</post>
+	<post>
<id>76</id>
<title>Frugalware 0.7 (Sayshell) for i686 and x86_64 released</title>
<date>Sat Oct 13 02:58:26 CEST 2007</date>
From janny at frugalware.org  Tue Oct 16 12:07:12 2007
From: janny at frugalware.org (janny)
Date: Tue Oct 16 12:07:15 2007
Subject: [Frugalware-git] frugalware-current: transcode-1.0.4-1-i686
Message-ID: <20071016100712.D3BB213A4023@genesis.frugalware.org>

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

commit 7238929f3cc61f623434e10022a81c3cb6dbea92
Author: janny <janny@frugalware.org>
Date:   Tue Oct 16 12:05:15 2007 +0200

transcode-1.0.4-1-i686
version bump

diff --git a/source/xapps-extra/transcode/FrugalBuild b/source/xapps-extra/transcode/FrugalBuild
index acb6af9..422c4cc 100644
--- a/source/xapps-extra/transcode/FrugalBuild
+++ b/source/xapps-extra/transcode/FrugalBuild
@@ -2,38 +2,60 @@
# Maintainer: Janny <janny@frugalware.org>

pkgname=transcode
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=1
pkgdesc="A suite of command line utilities for transcoding various video, audio, and container formats."
url="http://www.transcoding.org/cgi-bin/transcode"
-depends=('mjpegtools>=1.9.0rc2' 'mpeg2dec' 'imagemagick' 'ffmpeg>=20070422' 'libdvdread' 'libxv' 'libtheora')
+depends=('mjpegtools>=1.9.0rc2' 'mpeg2dec' 'imagemagick' 'ffmpeg>=20070422' 'libdvdread' 'libxv' 'libtheora' 'libfame')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url|grep released|sed 1q|cut -d ' ' -f12"
source=(http://fromani.exit1.org/$pkgname-$pkgver.tar.bz2)
license="GPL"
options=('scriptlet')
-sha1sums=('80617acac039bbab66ae36f6e11469e3f759d59e')
+sha1sums=('2ff8ddf6b63a184d61fd0f840d647aad707aa970')

build()
{
Fcd
#	Fpatchall
Fautoreconf
-	Fmake \
+	Fmake --enable-netstream \
+		--enable-v4l \
--enable-lame \
+		--enable-oss \
+		--enable-libpostproc \
+		--enable-freetype2 \
+		--disable-avifile \
--enable-ogg \
--enable-vorbis \
--enable-theora \
+		--disable-pvm3 \
--enable-libdv \
-		--enable-a52-default-decoder \
+		--enable-libquicktime \
+		--enable-a52 \
+		--disable-libmpeg3 \
--enable-libxml2 \
-		--enable-imagemagick \
-		--enable-libjpeg \
--enable-mjpegtools \
--enable-sdl \
-		--enable-freetype2 \
-		--enable-a52
+		--enable-libfame \
+		--enable-imagemagick \
+		--enable-a52-default-decoder
+
+#		--enable-lame \
+#		--enable-ogg \
+#		--enable-vorbis \
+#		--enable-theora \
+#		--enable-libdv \
+#		--enable-a52-default-decoder \
+#		--enable-libxml2 \
+#		--enable-imagemagick \
+#		--with-imagemagick-lib=/usr/lib/ImageMagick-6.3.5 \
+#		--enable-libjpeg \
+#		--enable-mjpegtools \
+#		--enable-sdl \
+#		--enable-freetype2 \
+#		--enable-a52
Fmakeinstall
}
From janny at frugalware.org  Tue Oct 16 12:07:13 2007
From: janny at frugalware.org (janny)
Date: Tue Oct 16 12:07:17 2007
Subject: [Frugalware-git] frugalware-current: transcode-1.0.4-1-i686
Message-ID: <20071016100713.0742013A4024@genesis.frugalware.org>

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

commit 966918e27bbb3a4dd82f196e60bd1d794b96da5c
Author: janny <janny@frugalware.org>
Date:   Tue Oct 16 12:06:20 2007 +0200

transcode-1.0.4-1-i686
delete not used options

diff --git a/source/xapps-extra/transcode/FrugalBuild b/source/xapps-extra/transcode/FrugalBuild
index 422c4cc..68102e0 100644
--- a/source/xapps-extra/transcode/FrugalBuild
+++ b/source/xapps-extra/transcode/FrugalBuild
@@ -41,21 +41,6 @@ build()
--enable-libfame \
--enable-imagemagick \
--enable-a52-default-decoder
-
-#		--enable-lame \
-#		--enable-ogg \
-#		--enable-vorbis \
-#		--enable-theora \
-#		--enable-libdv \
-#		--enable-a52-default-decoder \
-#		--enable-libxml2 \
-#		--enable-imagemagick \
-#		--with-imagemagick-lib=/usr/lib/ImageMagick-6.3.5 \
-#		--enable-libjpeg \
-#		--enable-mjpegtools \
-#		--enable-sdl \
-#		--enable-freetype2 \
-#		--enable-a52
Fmakeinstall
}
From vmiklos at frugalware.org  Tue Oct 16 12:32:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 12:32:40 2007
Subject: [Frugalware-git] frugalware-current: ltp-20070930-1-i686
Message-ID: <20071016103237.979FC13A4023@genesis.frugalware.org>

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

commit 6722b22bee0e3c8951d8aa03fd745bd556bc126c
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 12:32:16 2007 +0200

ltp-20070930-1-i686
version bump

diff --git a/source/apps-extra/ltp/FrugalBuild b/source/apps-extra/ltp/FrugalBuild
index f5c1000..6ef536e 100644
--- a/source/apps-extra/ltp/FrugalBuild
+++ b/source/apps-extra/ltp/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos <vmiklos@frugalware.org>

pkgname=ltp
-pkgver=20070831
+pkgver=20070930
# sometimes != $pkgver
realver=$pkgver
pkgrel=1
@@ -27,7 +27,7 @@ build() {
cp runltp runalltests.sh $Fdestdir/usr/bin/ || Fdie
}

-sha1sums=('59c4408a708e6f0c703c6c1cee87e57753d05332' \
+sha1sums=('2416c7695aa5c77d8d298269a4280717b4f1330b' \
'c7a2132257cf1c430a9692009952084746722c40' \
'e9ff5dbafdd07ebe796b2f064066d7dbb7c7b6c5' \
'0a6f6665340d6745904936484c42e6e874a0fc2d')
From voroskoi at frugalware.org  Tue Oct 16 12:34:03 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 12:34:06 2007
Subject: [Frugalware-git] frugalware-current: hplip-2.7.9-1-i686
Message-ID: <20071016103403.8CC1413A4024@genesis.frugalware.org>

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

commit bfed89fef24e239d6bce74250bfb2b6d4be75e86
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 12:01:39 2007 +0200

hplip-2.7.9-1-i686
version bump
added CVE-2007-5208.diff (based on ubuntu patch), closes #2496
removed empty-line-removal-bug.patch

diff --git a/source/apps-extra/hplip/CVE-2007-5208.diff b/source/apps-extra/hplip/CVE-2007-5208.diff
new file mode 100644
index 0000000..457e372
--- /dev/null
+++ b/source/apps-extra/hplip/CVE-2007-5208.diff
@@ -0,0 +1,50 @@
+diff -aur hplip-2.7.9/hpssd.py fw_hplip-2.7.9/hpssd.py
+--- hplip-2.7.9/hpssd.py	2007-08-14 22:42:47.000000000 +0200
++++ fw_hplip-2.7.9/hpssd.py	2007-10-16 11:42:59.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ # Std Lib
+ import sys, socket, os, os.path, signal, getopt, time, select
+-import popen2, threading, tempfile
++import subprocess, popen2, threading, tempfile
+
+ from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
+      ENOTCONN, ESHUTDOWN, EINTR, EISCONN
+@@ -560,21 +560,23 @@
+
+         if sendmail:
+             sendmail = os.path.join(sendmail, 'sendmail')
+-            sendmail += ' -t -r %s' % self.from_address
++	    cmd = [sendmail,'-t','-r',self.from_address]
+
+-            log.debug(sendmail)
+-            std_out, std_in, std_err = popen2.popen3(sendmail)
+-            log.debug(repr(self.message))
+-            std_in.write(self.message)
+-            std_in.close()
+-
+-            r, w, e = select.select([std_err], [], [], 2.0)
+-
+-            if r:
+-                err = std_err.read()
+-                if err:
+-                    log.error(repr(err))
+-                    self.result = ERROR_TEST_EMAIL_FAILED
++            log.debug(repr(cmd))
++            err = None
++            try:
++                sp = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
++                std_out, std_err = sp.communicate(self.message)
++                log.debug(repr(self.message))
++                if std_err != '':
++                    err = std_err
++
++            except OSError, e:
++                err = str(e)
++
++            if err:
++                log.error(repr(err))
++                self.result = ERROR_TEST_EMAIL_FAILED
+
+         else:
+             log.error("Mail send failed. sendmail not found.")
diff --git a/source/apps-extra/hplip/FrugalBuild b/source/apps-extra/hplip/FrugalBuild
index 3442c26..ae14884 100644
--- a/source/apps-extra/hplip/FrugalBuild
+++ b/source/apps-extra/hplip/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=hplip
-pkgver=2.7.7
+pkgver=2.7.9
pkgrel=1
pkgextraver=
_F_sourceforge_ext=$pkgextraver.tar.gz
@@ -17,7 +17,9 @@ provides=('hpijs')
groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep version |sed -e 's/.*ion \(.*\)/\1/' -e s/$pkgextraver//"
-sha1sums=('5b80ba8a62035985cbc4a0ae656df8a1779dbbdb')
+source=($source CVE-2007-5208.diff)
+sha1sums=('1ac491fd2b49f8a5a658532fd44e2aa0b008e072' \
+          '424224999218d744c27621ea8202ea57762a8097')

build() {
Fbuild --enable-doc-build --enable-foomatic-ppd-install \
diff --git a/source/apps-extra/hplip/empty-line-removal-bug.patch b/source/apps-extra/hplip/empty-line-removal-bug.patch
deleted file mode 100644
index 8f903d4..0000000
--- a/source/apps-extra/hplip/empty-line-removal-bug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur hplip-2.7.6.orig/prnt/hpijs/djgenericvip.h hplip-2.7.6.new/prnt/hpijs/djgenericvip.h
---- hplip-2.7.6.orig/prnt/hpijs/djgenericvip.h	2007-07-06 17:44:26.000000000 +0200
-+++ hplip-2.7.6.new/prnt/hpijs/djgenericvip.h	2007-07-06 17:45:36.000000000 +0200
-@@ -52,7 +52,7 @@
-     virtual PHOTOTRAY_STATE PhotoTrayEngaged (BOOL bQueryPrinter);
-     //! Returns TRUE if a hagaki feed is present in printer.
-     virtual BOOL HagakiFeedPresent(BOOL bQueryPrinter);
--
-+    virtual DATA_FORMAT GetDataFormat() { return RASTER_STRIP; }
- #ifdef APDK_AUTODUPLEX
-     //!Returns TRUE if duplexer and hagaki feed (combined) unit is present in printer.
-
From voroskoi at frugalware.org  Tue Oct 16 12:46:28 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 12:46:32 2007
Subject: [Frugalware-git] frugalware-current: pyrex-0.9.6.2-1-i686
Message-ID: <20071016104628.9058F13A4023@genesis.frugalware.org>

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

commit fdc044e5c3806597a7ae99b4c6d2575942f0ffd1
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 12:29:21 2007 +0200

pyrex-0.9.6.2-1-i686
version bump

diff --git a/source/devel/pyrex/FrugalBuild b/source/devel/pyrex/FrugalBuild
index e99f78c..2c172be 100644
--- a/source/devel/pyrex/FrugalBuild
+++ b/source/devel/pyrex/FrugalBuild
@@ -3,15 +3,15 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=pyrex
-pkgver=0.9.5.1
-pkgrel=2
-pkgextraver=a
+pkgver=0.9.6.2
+pkgrel=1
+pkgextraver=
pkgdesc="A language for writing Python extension modules"
url="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/"
depends=('python')
groups=('devel')
archs=('i686' 'x86_64')
-up2date="lynx -dump $url |grep tar |sed -ne 's/.*-\(.*\).ta.*/\1/;1p'|sed s/$pkgextraver//"
+up2date="lynx -dump $url |grep tar |sed -ne 's/.*-\(.*\).ta.*/\1/;1p' -e s/$pkgextraver//"
source=($url/Pyrex-$pkgver$pkgextraver.tar.gz)

build()
@@ -20,4 +20,4 @@ build()
rm Makefile || Fdie
Fbuild
}
-sha1sums=('ea8b6e5981ec2d05306a8fc42bb1c429bd3f5966')
+sha1sums=('b4b6b3ae090aa0f7622446fe6b3e915dca378c41')
From voroskoi at frugalware.org  Tue Oct 16 13:05:32 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 13:05:39 2007
Subject: [Frugalware-git] frugalware-current: libraw1394-1.3.0-1-i686
Message-ID: <20071016110532.4BD9713A4023@genesis.frugalware.org>

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

commit d4c8782c7ecda8603323c153ea2c39182d8b11ee
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 12:49:20 2007 +0200

libraw1394-1.3.0-1-i686
version bump

diff --git a/source/lib/libraw1394/FrugalBuild b/source/lib/libraw1394/FrugalBuild
index f58b4cb..acc80ca 100644
--- a/source/lib/libraw1394/FrugalBuild
+++ b/source/lib/libraw1394/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=libraw1394
-pkgver=1.2.1
+pkgver=1.3.0
pkgrel=1
pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
url="http://www.linux1394.org/"
@@ -12,6 +12,6 @@ groups=('lib')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.linux1394.org/|grep -m1 Latest|sed 's/.*]v\(.*\) .*(.*)/\1/'"
source=(http://www.linux1394.org/dl/libraw1394-${pkgver}.tar.gz)
-sha1sums=('f15ec4c69eaf0f1c73961cc60b325e9d1ef6bdd5')
+sha1sums=('30e8e4a4a1ebec5fe6462639bc3fdb75a9000b05')

# optimization OK
From vmiklos at frugalware.org  Tue Oct 16 13:07:47 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 13:07:49 2007
Subject: [Frugalware-git] frugalware-current: cryptsetup-luks-1.0.4-2-i686
Message-ID: <20071016110747.784AE13A4023@genesis.frugalware.org>

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

commit cb1a5ccadef5c48a19cd718efd59e90a69191434
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 13:06:15 2007 +0200

cryptsetup-luks-1.0.4-2-i686
improve README.Frugalware
From: Héder Balázs <balazs@rainstorm.org>

diff --git a/source/apps-extra/cryptsetup-luks/FrugalBuild b/source/apps-extra/cryptsetup-luks/FrugalBuild
index 003e73b..ed675ce 100644
--- a/source/apps-extra/cryptsetup-luks/FrugalBuild
+++ b/source/apps-extra/cryptsetup-luks/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=cryptsetup-luks
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="cryptsetup-luks is intended as a complete replacement for the original cryptsetup."
url="http://luks.endorphin.org/dm-crypt"
depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs')
@@ -13,11 +13,4 @@ up2date="lynx -dump 'http://luks.endorphin.org/source/?C=M;O=D'|grep 'luks-[0-9\
source=(http://luks.endorphin.org/source/cryptsetup-luks-$pkgver.tar.bz2 \
README.Frugalware)
signatures=($source.asc '')
-
-build()
-{
-	Fbuild
-	Fdoc README.Frugalware
-}
-
# optimization OK
diff --git a/source/apps-extra/cryptsetup-luks/README.Frugalware b/source/apps-extra/cryptsetup-luks/README.Frugalware
index 0099afa..25b36f9 100644
--- a/source/apps-extra/cryptsetup-luks/README.Frugalware
+++ b/source/apps-extra/cryptsetup-luks/README.Frugalware
@@ -1,31 +1,113 @@
Follow these steps to when using `cryptsetup-luks`:

-Creating
-~~~~~~~~
+=== Creating

----
-cryptsetup luksFormat /dev/partition
-cryptsetup luksOpen /dev/partition label
-mke2fs -j /dev/mapper/label
-mount /dev/mapper/label /mnt/label
+# cryptsetup luksFormat /dev/partition
+# cryptsetup luksOpen /dev/partition label
+# mke2fs -j /dev/mapper/label
+# mount /dev/mapper/label /mnt/label
----

-Mounting
-~~~~~~~~
+=== Mounting

Of course later you don't have to use `luksFormat` and `mke2fs`:

----
-cryptsetup luksOpen /dev/partition label
-mount /dev/mapper/label /mnt/label
+# cryptsetup luksOpen /dev/partition label
+# mount /dev/mapper/label /mnt/label
----

-Umounting
-~~~~~~~~~
+=== Umounting

----
-umount /mnt/label
-cryptsetup luksClose label
+# umount /mnt/label
+# cryptsetup luksClose label
----

-Really simple :-)
+=== Encrypting your home partition
+
+NOTE: You have need to install the `sharutils` package to do the followings!
+
+* List these modules in `/etc/sysconfig/modules`:
+
+----
+aes
+aes-i586
+sha256
+dm-crypt
+----
+
+* Move all data from `/home` to a secure place (in this example
+`/media/sda1/home`)
+
+----
+# cp -arvx /home /media/sda1/
+----
+
+* Umount `/home` (in this example `/dev/hda6`) and fill it with random
+numbers:
+
+----
+# umount /home
+# dd if=/dev/urandom of=/dev/hda6
+----
+
+* Create the encrypted partition:
+
+----
+# cryptsetup -y luksFormat /dev/hda6
+----
+
+Here we will be asked for a password which will be necessary to access `/home`
+at boot time.
+
+* Open the encrypted partition and create its file system (`ext3` in this
+example):
+
+----
+# cryptsetup luksOpen /dev/hda6 home
+# mkfs.ext3 /dev/mapper/home
+----
+
+* Mount the home partition and copy the contents of original home:
+
+----
+# mount /dev/mapper/home /home
+# cp -arvx /media/sda1/home /home
+----
+
+* Edit the home related line in `/etc/fstab`:
+
+----
+/dev/mapper/home	/home	ext3	noatime	0	0
+----
+
+* Create `/etc/rc.d/rc.crypt` script with the following content:
+
+----
+#!/bin/sh
+
+/usr/sbin/cryptsetup luksOpen /dev/hda6 home
+/bin/mount /dev/mapper/home /home
+----
+
+* Enable it:
+
+----
+# ln -s /etc/rc.d/rc.crypt /etc/rc.d/rcS.d/S15rc.crypt
+----
+
+You have to delay the splash screen, so that you can type your password before
+the splash appears:
+
+----
+# mv /etc/rc.d/rcS.d/S03rc.splash /etc/rc.d/rcS.d/S15rc.splash
+----
+
+(It will ask the password between the lvm and the splash service.)
+
+Now the system can be restarted and the password will be asked to access home
+partition boot-time.
+
+NOTE: The English keyboard map will be used at that point of the boot process.
From voroskoi at frugalware.org  Tue Oct 16 13:29:02 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 13:29:04 2007
Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.6_2-1-i686
Message-ID: <20071016112902.BFA4A13A4023@genesis.frugalware.org>

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

commit 9b4288e89183f2e29235306a36794a20b3f661c7
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 13:26:27 2007 +0200

imagemagick-6.3.6_2-1-i686
version bump

diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild
index 3b9e29b..9b1f557 100644
--- a/source/xapps/imagemagick/FrugalBuild
+++ b/source/xapps/imagemagick/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=imagemagick
-pkgver=6.3.5_9
+pkgver=6.3.6_2
pkgrel=1
pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files"
url="http://www.imagemagick.org"
@@ -17,7 +17,7 @@ options=('scriptlet')
up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'"
source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \
libpng_mmx_patch_x86_64.patch)
-sha1sums=('71de22d770a4cb3de94c1925a03fba6d16e71513' \
+sha1sums=('012e2592ec6982501cb5174efb570366d3cae816' \
'e42f3acbe85b6098af75c5cecc9a254baaa0482c')

build() {
From voroskoi at frugalware.org  Tue Oct 16 13:52:11 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 13:52:15 2007
Subject: [Frugalware-git] frugalware-current: hpijs-2.7.9-1-i686
Message-ID: <20071016115211.8A90C13A4023@genesis.frugalware.org>

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

commit 43990f8ad72963074a7fd8b44d6d26141690662e
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 13:24:10 2007 +0200

hpijs-2.7.9-1-i686
version bump

diff --git a/source/apps-extra/hpijs/FrugalBuild b/source/apps-extra/hpijs/FrugalBuild
index dd4c870..abf423a 100644
--- a/source/apps-extra/hpijs/FrugalBuild
+++ b/source/apps-extra/hpijs/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=hpijs
-pkgver=2.7.7
+pkgver=2.7.9
pkgrel=1
Finclude sourceforge
pkgdesc="Hewlett-Packard inkjet drivers for Foomatic."
@@ -14,8 +14,8 @@ conflicts=('foomatic-filters-ppds')
groups=('apps-extra')
archs=('i686' 'x86_64')
source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/hplip/hplip-$pkgver.tar.gz)
-up2date="lynx -dump $url/release_notes.html |grep HPIJS |sed -ne 's/.*HPIJS \(.*\) which.*/\1/;1p'"
-sha1sums=('5b80ba8a62035985cbc4a0ae656df8a1779dbbdb')
+up2date="lynx -dump $url/release_notes.html |grep HPIJS |sed -ne 's/.*HPIJS \(.*\) which.*/\1/;2p'"
+sha1sums=('1ac491fd2b49f8a5a658532fd44e2aa0b008e072')

build() {
Fcd hplip-$pkgver
From voroskoi at frugalware.org  Tue Oct 16 14:37:27 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 14:37:29 2007
Subject: [Frugalware-git] frugalware-current: qca-1.0-2-i686
Message-ID: <20071016123727.08F5F13A4001@genesis.frugalware.org>

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

commit 20594fb3341a784ed9b64b4917f67bcdf5c8d3e2
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 14:19:56 2007 +0200

qca-1.0-2-i686
fixed up2date

diff --git a/source/xlib-extra/qca/FrugalBuild b/source/xlib-extra/qca/FrugalBuild
index 3673b30..6eabaeb 100644
--- a/source/xlib-extra/qca/FrugalBuild
+++ b/source/xlib-extra/qca/FrugalBuild
@@ -12,7 +12,7 @@ archs=('i686' 'x86_64')
license="LGPL"
depends=('qt')
source=(http://delta.affinix.com/download/qca/$pkgname-$pkgver.tar.bz2)
-up2date="lynx -dump http://delta.affinix.com/qca/ |grep qca.*.tar.bz2 |sed -n 's/.*a-\(.*\).t.*/\1/;1 p'"
+up2date="lynx -dump http://delta.affinix.com/download/qca/ |Flasttarbz2"
options=('scriptlet')
sha1sums=('b4b166f9dbbe222ebaf5287582a0ba29ddbc1391')
From crazy at frugalware.org  Tue Oct 16 14:48:34 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 14:48:39 2007
Subject: [Frugalware-git] kde358: kde.sh
Message-ID: <20071016124834.E9EAC13A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=41bda31527b6f8575a4505418a4cfa0398efbb09

commit 41bda31527b6f8575a4505418a4cfa0398efbb09
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 14:26:30 2007 +0200

kde.sh
* bump version to 3.5.8

diff --git a/source/include/kde.sh b/source/include/kde.sh
index 480451e..5e07727 100644
--- a/source/include/kde.sh
+++ b/source/include/kde.sh
@@ -66,7 +66,7 @@ fi
## TODO: add mirror option
if [ "$_F_kde_defaults" -eq 1 ]; then
url="http://www.kde.org"
-	_F_kde_ver=3.5.7
+	_F_kde_ver=3.5.8
pkgurl="ftp://ftp.solnet.ch/mirror/KDE/stable/$_F_kde_ver/src"
up2date="lynx -dump http://www.kde.org/download/|grep '$_F_kde_name'|sed -n '1 p'|sed 's/.*-\([^ ]*\) .*/\1/'"
source=($pkgurl/$_F_kde_name-$pkgver.tar.bz2)
From crazy at frugalware.org  Tue Oct 16 14:48:35 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 14:48:39 2007
Subject: [Frugalware-git] kde358: pyqt-3.17.3-1-i686
Message-ID: <20071016124835.1999713A4023@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=1406ca1c7b47350820df10dcbe2b05f9b0aebd3f

commit 1406ca1c7b47350820df10dcbe2b05f9b0aebd3f
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 14:29:28 2007 +0200

pyqt-3.17.3-1-i686
* moved to 'xlib'

diff --git a/source/kde/pyqt/FrugalBuild b/source/kde/pyqt/FrugalBuild
deleted file mode 100644
index 65bce20..0000000
--- a/source/kde/pyqt/FrugalBuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Compiling Time: ~3.04 SBU
-# Maintainer: voroskoi <voroskoi@frugalware.org>
-
-pkgname=pyqt
-origname=PyQt
-pkgver=3.17.3
-pkgrel=1
-pkgdesc="PyQt is a set of Python bindings for the Qt toolkit."
-url="http://www.riverbankcomputing.co.uk/pyqt/index.php"
-# sip,qscintilla: see BTS-278
-depends=('qt' 'sip>=4.7' 'qscintilla>=1.71')
-up2date="lynx -dump http://www.riverbankcomputing.co.uk/pyqt/download.php |grep 'PyQt-x11-gpl-3' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'"
-source=(http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/$origname-x11-gpl-$pkgver.tar.gz)
-#up2date="lynx -dump http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt3/|Flasttar"
-#source=(http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt3/$origname-x11-gpl-3-snapshot-$pkgver.tar.gz)
-license="GPL"
-groups=('kde')
-archs=('i686' 'x86_64')
-options=('scriptlet')
-
-build() {
-	Fcd $origname-x11-gpl-$pkgver
-	Fsed "sipcfg.version_to_string" "sipconfig.version_to_string" configure.py
-	echo "yes" | python configure.py -j 8 || Fdie
-	Fmake
-	Fmakeinstall
-}
-sha1sums=('ab74c9090564a09e90c57148f9193843b37fd53f')
-
-# optimization OK
diff --git a/source/xlib/pyqt/FrugalBuild b/source/xlib/pyqt/FrugalBuild
new file mode 100644
index 0000000..6464c32
--- /dev/null
+++ b/source/xlib/pyqt/FrugalBuild
@@ -0,0 +1,30 @@
+# Compiling Time: ~3.04 SBU
+# Maintainer: voroskoi <voroskoi@frugalware.org>
+
+pkgname=pyqt
+origname=PyQt
+pkgver=3.17.3
+pkgrel=1
+pkgdesc="PyQt is a set of Python bindings for the Qt toolkit."
+url="http://www.riverbankcomputing.co.uk/pyqt/index.php"
+# sip,qscintilla: see BTS-278
+depends=('qt' 'sip>=4.7' 'qscintilla>=1.71')
+up2date="lynx -dump http://www.riverbankcomputing.co.uk/pyqt/download.php |grep 'PyQt-x11-gpl-3' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'"
+source=(http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/$origname-x11-gpl-$pkgver.tar.gz)
+#up2date="lynx -dump http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt3/|Flasttar"
+#source=(http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt3/$origname-x11-gpl-3-snapshot-$pkgver.tar.gz)
+license="GPL"
+groups=('xlib')
+archs=('i686' 'x86_64')
+options=('scriptlet')
+
+build() {
+	Fcd $origname-x11-gpl-$pkgver
+	Fsed "sipcfg.version_to_string" "sipconfig.version_to_string" configure.py
+	echo "yes" | python configure.py -j 8 || Fdie
+	Fmake
+	Fmakeinstall
+}
+sha1sums=('ab74c9090564a09e90c57148f9193843b37fd53f')
+
+# optimization OK
From crazy at frugalware.org  Tue Oct 16 14:48:35 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 14:48:40 2007
Subject: [Frugalware-git] kde358: qt-3.3.8-5-i686
Message-ID: <20071016124835.4D92313A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=349cb269948cfdc26f373e97aadf1026b28dfd01

commit 349cb269948cfdc26f373e97aadf1026b28dfd01
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 14:35:35 2007 +0200

qt-3.3.8-5-i686
* move to xlib
* fixed docs depends ( eg : '' ) you don't need
* qt installed to read the docs
* removed all kde* from groups that's not needed while
* all kde-core packages depends on it
* you may wonder but this fixes the pacman -R kde* not working while
* some install packages just depending on qt ( GTK *wink* same for you soon :D )

diff --git a/source/kde/qt/01-qt-gcc4.patch b/source/kde/qt/01-qt-gcc4.patch
deleted file mode 100644
index 61abfc6..0000000
--- a/source/kde/qt/01-qt-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-x11-free-3.3.5/src/kernel/qsizepolicy.h	2005-09-02 14:43:02.000000000 +0200
-+++ qt-x11-free-3.3.5-patched/src/kernel/qsizepolicy.h	2005-09-29 01:09:28.000000000 +0200
-@@ -88,7 +88,7 @@
-     }
-
-     void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
--    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) |
-+    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) |
- 					   (d << HSize); }
-
-     void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) )
diff --git a/source/kde/qt/02-qt-rpath+FW.patch b/source/kde/qt/02-qt-rpath+FW.patch
deleted file mode 100644
index 6ff56e0..0000000
--- a/source/kde/qt/02-qt-rpath+FW.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur qt-x11-free-3.3.5/configure qt-x11-free-3.3.5-kill-off-sed/configure
---- qt-x11-free-3.3.5/configure	2005-08-22 11:31:26.000000000 +0200
-+++ qt-x11-free-3.3.5-kill-off-sed/configure	2006-02-22 13:11:22.000000000 +0100
-@@ -2351,7 +2351,7 @@
- 	else
- 	    echo "Do you accept the terms of $affix license? \c"
- 	fi
--	read acceptance
-+	acceptance=yes
- 	echo
- 	if [ "$acceptance" = "yes" ]; then
- 	    break
-@@ -2395,7 +2395,7 @@
- 	else
- 	    echo "Do you accept the terms of the license? \c"
- 	fi
--	read acceptance
-+	acceptance=yes
- 	echo
- 	if [ "$acceptance" = "yes" ]; then
- 	    break
-@@ -2476,7 +2476,7 @@
- 	else
- 	    echo "Do you accept the terms of the $Platform License? \c"
- 	fi
--	read acceptance
-+	acceptance=yes
- 	echo
- 	if [ "$acceptance" = "yes" ]; then
- 	    break
-diff -Naur qt-x11-free-3.3.5/Makefile qt-x11-free-3.3.5-kill-off-sed/Makefile
---- qt-x11-free-3.3.5/Makefile	2005-01-03 17:08:00.000000000 +0100
-+++ qt-x11-free-3.3.5-kill-off-sed/Makefile	2006-02-22 13:11:22.000000000 +0100
-@@ -11,7 +11,7 @@
- install: FORCE
- 	@$(MAKE) qt.install
-
--all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
-+all: symlinks src-qmake src-moc sub-src sub-tools
- 	@echo
- 	@echo "The Qt library is now built in ./lib"
- 	@echo "The Qt examples are built in the directories in ./examples"
-diff -Naur qt-x11-free-3.3.5/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.5-kill-off-sed/mkspecs/linux-g++/qmake.conf
---- qt-x11-free-3.3.5/mkspecs/linux-g++/qmake.conf	2005-09-02 14:43:37.000000000 +0200
-+++ qt-x11-free-3.3.5-kill-off-sed/mkspecs/linux-g++/qmake.conf	2006-02-22 13:15:35.000000000 +0100
-@@ -21,7 +21,7 @@
- QMAKE_CFLAGS_DEPS	= -M
- QMAKE_CFLAGS_WARN_ON	= -Wall -W
- QMAKE_CFLAGS_WARN_OFF	= -w
--QMAKE_CFLAGS_RELEASE	= -O2
-+QMAKE_CFLAGS_RELEASE	= DUMMY -fPIC
- QMAKE_CFLAGS_DEBUG	= -g
- QMAKE_CFLAGS_SHLIB	= -fPIC
- QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-@@ -56,7 +56,7 @@
- QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME	= -Wl,-soname,
- QMAKE_LFLAGS_THREAD	=
--QMAKE_RPATH		= -Wl,-rpath,
-+QMAKE_RPATH		=
-
- QMAKE_LIBS		=
- QMAKE_LIBS_DYNLOAD	= -ldl
-diff -Naur qt-x11-free-3.3.5/qmake/Makefile.unix qt-x11-free-3.3.5-kill-off-sed/qmake/Makefile.unix
---- qt-x11-free-3.3.5/qmake/Makefile.unix	2004-09-13 20:24:42.000000000 +0200
-+++ qt-x11-free-3.3.5-kill-off-sed/qmake/Makefile.unix	2006-02-22 13:14:00.000000000 +0100
-@@ -48,8 +48,7 @@
- 	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@
- 	-cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@
- 	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
--	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
--	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
-+
-
- clean::
- 	rm -f $(OBJS) $(QOBJS)
diff --git a/source/kde/qt/03-qt-uic.patch b/source/kde/qt/03-qt-uic.patch
deleted file mode 100644
index cb17b0f..0000000
--- a/source/kde/qt/03-qt-uic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur qt-x11-free-3.3.5/tools/designer/uic/form.cpp qt-x11-free-3.3.5-patched/tools/designer/uic/form.cpp
---- qt-x11-free-3.3.5/tools/designer/uic/form.cpp	2005-08-31 12:13:47.000000000 +0200
-+++ qt-x11-free-3.3.5-patched/tools/designer/uic/form.cpp	2005-09-28 20:40:09.000000000 +0200
-@@ -731,6 +731,13 @@
-             while ( !n2.isNull() ) {
-                 if ( n2.tagName() == "includehint" ) {
-                     QString file = n2.firstChild().toText().data();
-+                    int colons = file.find("::");
-+
-+                    if (colons != -1)
-+                    {
-+                        file = file.right(file.length() - colons - 2);
-+                    }
-+
-                     localIncludes += file;
-                 }
-                 n2 = n2.nextSibling().toElement();
diff --git a/source/kde/qt/04-qt-visibility.patch b/source/kde/qt/04-qt-visibility.patch
deleted file mode 100644
index ae2e140..0000000
--- a/source/kde/qt/04-qt-visibility.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Naur qt-x11-free-3.3.5/include/qglobal.h qt-x11-free-3.3.5-patched/include/qglobal.h
---- qt-x11-free-3.3.5/include/qglobal.h	2005-09-02 14:42:53.000000000 +0200
-+++ qt-x11-free-3.3.5-patched/include/qglobal.h	2005-09-29 00:55:30.000000000 +0200
-@@ -865,6 +865,10 @@
- #    define Q_TEMPLATE_EXTERN
- #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
- #  endif
-+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-+#    define Q_EXPORT __attribute__((visibility("default")))
-+#    undef QT_MAKEDLL		/* ignore these for other platforms */
-+#    undef QT_DLL
- #else
- #  undef QT_MAKEDLL		/* ignore these for other platforms */
- #  undef QT_DLL
-diff -Naur qt-x11-free-3.3.5/include/qgplugin.h qt-x11-free-3.3.5-patched/include/qgplugin.h
---- qt-x11-free-3.3.5/include/qgplugin.h	2005-09-02 14:43:05.000000000 +0200
-+++ qt-x11-free-3.3.5-patched/include/qgplugin.h	2005-09-29 00:52:27.000000000 +0200
-@@ -90,35 +90,19 @@
- 	    return i->iface(); \
- 	}
-
--#    ifdef Q_WS_WIN
--#	ifdef Q_CC_BOR
--#	    define Q_EXPORT_PLUGIN(PLUGIN) \
--	        Q_PLUGIN_VERIFICATION_DATA \
--		Q_EXTERN_C __declspec(dllexport) \
--                const char * __stdcall qt_ucm_query_verification_data() \
--                { return qt_ucm_verification_data; } \
--		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
--                __stdcall ucm_instantiate() \
--		Q_PLUGIN_INSTANTIATE( PLUGIN )
--#	else
--#	    define Q_EXPORT_PLUGIN(PLUGIN) \
--	        Q_PLUGIN_VERIFICATION_DATA \
--		Q_EXTERN_C __declspec(dllexport) \
--                const char *qt_ucm_query_verification_data() \
--                { return qt_ucm_verification_data; } \
--		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
--		Q_PLUGIN_INSTANTIATE( PLUGIN )
--#	endif
--#    else
--#	define Q_EXPORT_PLUGIN(PLUGIN) \
--	    Q_PLUGIN_VERIFICATION_DATA \
--	    Q_EXTERN_C \
--            const char *qt_ucm_query_verification_data() \
-+#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
-+#   define Q_STDCALL __stdcall
-+#else
-+#   define Q_STDCALL
-+#endif
-+
-+#define Q_EXPORT_PLUGIN(PLUGIN) \
-+ 	     Q_PLUGIN_VERIFICATION_DATA \
-+	     Q_EXTERN_C Q_EXPORT \
-+	     const char * Q_STDCALL qt_ucm_query_verification_data() \
-             { return qt_ucm_verification_data; } \
--	    Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
-+	    Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
-             Q_PLUGIN_INSTANTIATE( PLUGIN )
--#    endif
--
- #endif
-
- struct QUnknownInterface;
-diff -Naur qt-x11-free-3.3.5/src/kernel/qgplugin.h qt-x11-free-3.3.5-patched/src/kernel/qgplugin.h
---- qt-x11-free-3.3.5/src/kernel/qgplugin.h	2005-09-02 14:43:05.000000000 +0200
-+++ qt-x11-free-3.3.5-patched/src/kernel/qgplugin.h	2005-09-29 00:52:27.000000000 +0200
-@@ -90,35 +90,19 @@
- 	    return i->iface(); \
- 	}
-
--#    ifdef Q_WS_WIN
--#	ifdef Q_CC_BOR
--#	    define Q_EXPORT_PLUGIN(PLUGIN) \
--	        Q_PLUGIN_VERIFICATION_DATA \
--		Q_EXTERN_C __declspec(dllexport) \
--                const char * __stdcall qt_ucm_query_verification_data() \
--                { return qt_ucm_verification_data; } \
--		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
--                __stdcall ucm_instantiate() \
--		Q_PLUGIN_INSTANTIATE( PLUGIN )
--#	else
--#	    define Q_EXPORT_PLUGIN(PLUGIN) \
--	        Q_PLUGIN_VERIFICATION_DATA \
--		Q_EXTERN_C __declspec(dllexport) \
--                const char *qt_ucm_query_verification_data() \
--                { return qt_ucm_verification_data; } \
--		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
--		Q_PLUGIN_INSTANTIATE( PLUGIN )
--#	endif
--#    else
--#	define Q_EXPORT_PLUGIN(PLUGIN) \
--	    Q_PLUGIN_VERIFICATION_DATA \
--	    Q_EXTERN_C \
--            const char *qt_ucm_query_verification_data() \
-+#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
-+#   define Q_STDCALL __stdcall
-+#else
-+#   define Q_STDCALL
-+#endif
-+
-+#define Q_EXPORT_PLUGIN(PLUGIN) \
-+ 	     Q_PLUGIN_VERIFICATION_DATA \
-+	     Q_EXTERN_C Q_EXPORT \
-+	     const char * Q_STDCALL qt_ucm_query_verification_data() \
-             { return qt_ucm_verification_data; } \
--	    Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
-+	    Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
-             Q_PLUGIN_INSTANTIATE( PLUGIN )
--#    endif
--
- #endif
-
- struct QUnknownInterface;
-diff -Naur qt-x11-free-3.3.5/src/tools/qglobal.h qt-x11-free-3.3.5-patched/src/tools/qglobal.h
---- qt-x11-free-3.3.5/src/tools/qglobal.h	2005-09-02 14:42:53.000000000 +0200
-+++ qt-x11-free-3.3.5-patched/src/tools/qglobal.h	2005-09-29 00:55:30.000000000 +0200
-@@ -865,6 +865,10 @@
- #    define Q_TEMPLATE_EXTERN
- #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
- #  endif
-+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-+#    define Q_EXPORT __attribute__((visibility("default")))
-+#    undef QT_MAKEDLL		/* ignore these for other platforms */
-+#    undef QT_DLL
- #else
- #  undef QT_MAKEDLL		/* ignore these for other platforms */
- #  undef QT_DLL
diff --git a/source/kde/qt/CVE-2007-3388.patch b/source/kde/qt/CVE-2007-3388.patch
deleted file mode 100644
index 97210c7..0000000
--- a/source/kde/qt/CVE-2007-3388.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -Naurp qt-x11-free-3.3.8/src/sql/qdatatable.cpp qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp
---- qt-x11-free-3.3.8/src/sql/qdatatable.cpp	2007-01-11 14:46:33.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -1043,8 +1043,8 @@ bool QDataTable::insertCurrent()
- 	return FALSE;
-     if ( !sqlCursor()->canInsert() ) {
- #ifdef QT_CHECK_RANGE
--	qWarning("QDataTable::insertCurrent: insert not allowed for " +
--		 sqlCursor()->name() );
-+	qWarning("QDataTable::insertCurrent: insert not allowed for %s",
-+		 sqlCursor()->name().latin1() );
- #endif
- 	endInsert();
- 	return FALSE;
-@@ -1117,16 +1117,16 @@ bool QDataTable::updateCurrent()
- 	return FALSE;
-     if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
--	qWarning("QDataTable::updateCurrent: no primary index for " +
--		 sqlCursor()->name() );
-+	qWarning("QDataTable::updateCurrent: no primary index for %s",
-+		 sqlCursor()->name().latin1() );
- #endif
- 	endUpdate();
- 	return FALSE;
-     }
-     if ( !sqlCursor()->canUpdate() ) {
- #ifdef QT_CHECK_RANGE
--	qWarning("QDataTable::updateCurrent: updates not allowed for " +
--		 sqlCursor()->name() );
-+	qWarning("QDataTable::updateCurrent: updates not allowed for %s",
-+		 sqlCursor()->name().latin1() );
- #endif
- 	endUpdate();
- 	return FALSE;
-@@ -1191,8 +1191,8 @@ bool QDataTable::deleteCurrent()
- 	return FALSE;
-     if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
--	qWarning("QDataTable::deleteCurrent: no primary index " +
--		 sqlCursor()->name() );
-+	qWarning("QDataTable::deleteCurrent: no primary index %s",
-+		 sqlCursor()->name().latin1() );
- #endif
- 	return FALSE;
-     }
-diff -Naurp qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp
---- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp	2007-01-11 16:03:02.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -234,7 +234,8 @@ QSqlDatabase* QSqlDatabaseManager::datab
- 	db->open();
- #ifdef QT_CHECK_RANGE
- 	if ( !db->isOpen() )
--	    qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
-+	    qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
-+                    db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
- #endif
-     }
-     return db;
-@@ -686,7 +687,7 @@ void QSqlDatabase::init( const QString&
-     if ( !d->driver ) {
- #ifdef QT_CHECK_RANGE
- 	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
--	qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
-+	qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
- #endif
- 	d->driver = new QNullDriver();
- 	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
-diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlindex.cpp qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp
---- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp	2007-01-11 14:46:35.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -273,7 +273,7 @@ QSqlIndex QSqlIndex::fromStringList( con
- 	if ( field )
- 	    newSort.append( *field, desc );
- 	else
--	    qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
-+	    qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
-     }
-     return newSort;
- }
-diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp
---- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp	2007-01-11 14:46:35.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -298,7 +298,7 @@ int QSqlRecord::position( const QString&
- 	    return i;
-     }
- #ifdef QT_CHECK_RANGE
--    qWarning( "QSqlRecord::position: unable to find field " + name );
-+    qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
- #endif
-     return -1;
- }
-@@ -313,7 +313,7 @@ QSqlField* QSqlRecord::field( int i )
-     checkDetach();
-     if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
--	qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+	qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif
- 	return 0;
-     }
-@@ -344,7 +344,7 @@ const QSqlField* QSqlRecord::field( int
- {
-     if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
--	qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+	qWarning( "QSqlRecord::field: index out of range: %d", i  );
- #endif // QT_CHECK_RANGE
- 	return 0;
-     }
-diff -Naurp qt-x11-free-3.3.8/src/tools/qglobal.cpp qt-x11-free-3.3.8-p/src/tools/qglobal.cpp
---- qt-x11-free-3.3.8/src/tools/qglobal.cpp	2007-02-02 15:01:06.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/tools/qglobal.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -680,7 +680,7 @@ void qSystemWarning( const char* msg, in
-     if ( code != -1 )
- 	qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
-     else
--	qWarning( msg );
-+	qWarning( "%s", msg );
- #endif
- #else
-     Q_UNUSED( msg );
-diff -Naurp qt-x11-free-3.3.8/src/widgets/qtextedit.cpp qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp
---- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp	2007-02-02 15:01:23.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -6349,7 +6349,7 @@ void QTextEdit::optimParseTags( QString
- 		    cur = tag->prev;
- 		    if ( !cur ) {
- #ifdef QT_CHECK_RANGE
--			qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
-+			qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
- #endif
- 			return; // something is wrong - give up
- 		    }
-@@ -6372,7 +6372,7 @@ void QTextEdit::optimParseTags( QString
- 				    break;
- 				} else if ( !cur->leftTag ) {
- #ifdef QT_CHECK_RANGE
--				    qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
-+				    qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
- #endif
- 				    return; // something is amiss - give up
- 				}
-diff -Naurp qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp
---- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp	2007-02-02 15:01:03.000000000 +0100
-+++ qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp	2007-08-03 14:39:11.000000000 +0200
-@@ -978,7 +978,7 @@ bool QSvgDevice::play( const QDomNode &n
- 		// ### catch references to embedded .svg files
- 		QPixmap pix;
- 		if ( !pix.load( href ) ) {
--		    qWarning( "QSvgDevice::play: Couldn't load image "+href );
-+		    qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
- 		    break;
- 		}
- 		pt->drawPixmap( QRect( x1, y1, w, h ), pix );
-@@ -1024,8 +1024,8 @@ bool QSvgDevice::play( const QDomNode &n
-                 break;
- 	    }
- 	case InvalidElement:
--	    qWarning( "QSvgDevice::play: unknown element type " +
--		      node.nodeName() );
-+	    qWarning( "QSvgDevice::play: unknown element type %s",
-+		      node.nodeName().latin1() );
- 	    break;
- 	};
-
-@@ -1111,7 +1111,7 @@ double QSvgDevice::parseLen( const QStri
- {
-     QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
-     if ( reg.search( str ) == -1 ) {
--	qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
-+	qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
- 	if ( ok )
- 	    *ok = FALSE;
- 	return 0.0;
-@@ -1140,7 +1140,7 @@ double QSvgDevice::parseLen( const QStri
- 	else if ( u == "pc" )
- 	    dbl *= m.logicalDpiX() / 6.0;
- 	else
--	    qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
-+	    qWarning( "QSvgDevice::parseLen: Unknown unit %s",  u.latin1() );
-     }
-     if ( ok )
- 	*ok = TRUE;
diff --git a/source/kde/qt/CVE-2007-4137.patch b/source/kde/qt/CVE-2007-4137.patch
deleted file mode 100644
index 9fda267..0000000
--- a/source/kde/qt/CVE-2007-4137.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -165,7 +165,7 @@ public:
-     QString toUnicode(const char* chars, int len)
-     {
- 	QString result;
--	result.setLength( len ); // worst case
-+	result.setLength( len + 1 ); // worst case
- 	QChar *qch = (QChar *)result.unicode();
- 	uchar ch;
-         int error = -1;
diff --git a/source/kde/qt/FrugalBuild b/source/kde/qt/FrugalBuild
deleted file mode 100644
index 7d8ca93..0000000
--- a/source/kde/qt/FrugalBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Compiling Time: 4.49 SBU
-# Maintainer: crazy <crazy@frugalware.org>
-# Contributor: Kapolnasi Tamas <ktamas@tdc.hu>
-
-pkgname=qt
-pkgver=3.3.8
-pkgrel=5
-pkgmore=x11-free
-pkgdesc="The QT GUI toolkit."
-url="http://www.trolltech.com/products/qt"
-depends=('libxrandr' 'mesa' 'libxft>=2.1.11-3' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'libsm' 'imake' 'libpng' 'libxtst')
-makedepends=('mysql>=5.0.15' 'postgresql>=8.2' 'sqlite3' 'cups' 'bison')
-groups=('kde' 'kde-minimal')
-archs=('i686' 'x86_64')
-options=('nodocs' 'scriptlet')
-removes=('usr/lib/qt/mkspecs/default')
-up2date="lynx -dump ftp://ftp.trolltech.com/qt/source|grep '.tar.bz2$'|grep 'qt-x11-free-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'"
-source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \
-	http://ftp.frugalware.org/pub/other/qt/patches-510500.tar.bz2 \
-	qt.sh apply_patches \
-	01-qt-gcc4.patch \
-	02-qt-rpath+FW.patch \
-	03-qt-uic.patch \
-	04-qt-visibility.patch \
-	Qt-3.3.8-UTF-8-fix.diff \
-	CVE-2007-3388.patch \
-	CVE-2007-4137.patch)
-
-export QTDIR=$startdir/src/$pkgname-$pkgmore-$pkgver
-export PATH=${QTDIR}/bin:${PATH}
-export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-export YACC='yacc -d'
-
-subpkgs=('qt-docs')
-subdescs=('QT Documentation')
-subdepends=("$pkgname=$pkgver")
-subgroups=('kde-extra kde-docs')
-subarchs=('i686 x86_64')
-
-build()
-{
-	unset MAKEFLAGS
-	Fcd $pkgname-$pkgmore-$pkgver
-	Fpatchall
-        Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing" mkspecs/linux-g++/qmake.conf
-        mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$pkgname-$pkgmore-$pkgver
-        chmod +x apply_patches
-	echo "0007" >> patches/DISABLED
-        ./apply_patches || return 1
-        ./configure -v -platform linux-g++ -prefix /usr/lib/qt  -release -shared \
-              -qt-gif -system-libpng -system-libjpeg -system-libmng -system-zlib \
-              -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \
-              -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \
-              -thread  -stl -no-g++-exceptions \
-              -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \
-              -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \
-	      -I /usr/include -L /usr/lib || return 1
-        Fmkdir /usr/lib/qt/mkspecs
-        cp -r mkspecs/linux-g++ $Fdestdir/usr/lib/qt/mkspecs/linux-g++
-        ##Fixme need patch##
-        cd $Fsrcdir/$pkgname-$pkgmore-$pkgver/plugins/src/sqldrivers/mysql
-        qmake -o Makefile "INCLUDEPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-
-        cd $Fsrcdir/$pkgname-$pkgmore-$pkgver/plugins/src/sqldrivers/psql
-        qmake -o Makefile "INCLUDEPATH+=/usr/include/postgresql/server /usr/include" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-        cd $Fsrcdir/$pkgname-$pkgmore-$pkgver
-        make || return 1
-        make INSTALL_ROOT=$Fdestdir install || return 1
-        Fmkdir /usr/lib/$pkgname/man
-        cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man
-        Fsed "-L$startdir/src/$pkgname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/$pkgname/lib/*.prl
-        Fexe /etc/profile.d/qt.sh
-        (cd $Fdestdir/usr/lib/qt/mkspecs; ln -sf linux-g++ default)
-        Fmkdir /usr/lib/pkgconfig
-        Fcp /usr/lib/qt/lib/pkgconfig/* /usr/lib/pkgconfig
-        (cd $Fdestdir/usr/lib/pkgconfig; ln -sf qt-mt.pc qt.pc)
-	if [ "$CARCH" == "x86_64" ]; then
-		Fln /usr/lib/qt/lib /usr/lib/qt/lib64
-	fi
-	# symlinks for who don't care about ld.so.conf (OpenOffice.org)
-	Fln qt3/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3
-	Fln qt3/lib/libqui.so.1 /usr/lib/libqui.so.1
-	Fsplit qt-docs usr/lib/qt/phrasebooks
-	Fsplit qt-docs usr/lib/qt/templates
-	Fsplit qt-docs usr/lib/qt/doc
-}
-
-sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \
-          '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \
-          '0464d40d9bd518fe8d139b1306136089349a4cdf' \
-          '7562323175ec47483dcb45c2857519f6276e0a51' \
-          '54d37e3988c4b195ae960ef2c59e678151115211' \
-          '0d5fcbe569723792700bad3c82abe34d5e5163c4' \
-          'dba54b91b2b00c1d052ac512d824b29d31aefb89' \
-          '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \
-          '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \
-          'f7634fb0419bda723053adb885facd270ccb10ec' \
-          '12c6e2c9091c710ebd031c5e82ff33f02fe7e210')
-# optimization OK
diff --git a/source/kde/qt/Qt-3.3.8-UTF-8-fix.diff b/source/kde/qt/Qt-3.3.8-UTF-8-fix.diff
deleted file mode 100644
index 914496f..0000000
--- a/source/kde/qt/Qt-3.3.8-UTF-8-fix.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-http://www.trolltech.com/developer/download/Qt-3.3.8-UTF-8-fix.diff
---- a/src/codecs/qutfcodec.cpp	Fri Mar 30 06:08:57 2007
-+++ b/src/codecs/qutfcodec.cpp	Fri Mar 30 06:08:57 2007
-@@ -154,6 +154,7 @@
-
- class QUtf8Decoder : public QTextDecoder {
-     uint uc;
-+    uint min_uc;
-     int need;
-     bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- 	result.setLength( len ); // worst case
- 	QChar *qch = (QChar *)result.unicode();
- 	uchar ch;
-+        int error = -1;
- 	for (int i=0; i<len; i++) {
--	    ch = *chars++;
-+	    ch = chars[i];
- 	    if (need) {
- 		if ( (ch&0xc0) == 0x80 ) {
- 		    uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- 			    *qch++ = QChar(high);
- 			    *qch++ = QChar(low);
- 			    headerDone = TRUE;
-+			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                            *qch++ = QChar::replacement;
- 			} else {
- 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
- 				*qch++ = uc;
-@@ -190,6 +194,7 @@
- 		    }
- 		} else {
- 		    // error
-+                    i = error;
- 		    *qch++ = QChar::replacement;
- 		    need = 0;
- 		}
-@@ -200,13 +205,22 @@
- 		} else if ((ch & 0xe0) == 0xc0) {
- 		    uc = ch & 0x1f;
- 		    need = 1;
-+                    error = i;
-+		    min_uc = 0x80;
- 		} else if ((ch & 0xf0) == 0xe0) {
- 		    uc = ch & 0x0f;
- 		    need = 2;
-+                    error = i;
-+		    min_uc = 0x800;
- 		} else if ((ch&0xf8) == 0xf0) {
- 		    uc = ch & 0x07;
- 		    need = 3;
--		}
-+                    error = i;
-+                    min_uc = 0x10000;
-+                } else {
-+                    // error
-+                    *qch++ = QChar::replacement;
-+                }
- 	    }
- 	}
- 	result.truncate( qch - result.unicode() );
-
---- a/src/tools/qstring.cpp	Fri Mar 30 06:08:57 2007
-+++ b/src/tools/qstring.cpp	Fri Mar 30 06:08:57 2007
-@@ -5805,6 +5805,7 @@
-     result.setLength( len ); // worst case
-     QChar *qch = (QChar *)result.unicode();
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -5822,7 +5823,13 @@
- 			unsigned short low = uc%0x400 + 0xdc00;
- 			*qch++ = QChar(high);
- 			*qch++ = QChar(low);
--		    } else {
-+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = QChar(0xdbff);
-+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
-+                    } else {
- 			*qch++ = uc;
- 		    }
- 		}
-@@ -5844,14 +5851,17 @@
- 		uc = ch & 0x1f;
- 		need = 1;
- 		error = i;
-+		min_uc = 0x80;
- 	    } else if ((ch & 0xf0) == 0xe0) {
- 		uc = ch & 0x0f;
- 		need = 2;
- 		error = i;
-+		min_uc = 0x800;
- 	    } else if ((ch&0xf8) == 0xf0) {
- 		uc = ch & 0x07;
- 		need = 3;
- 		error = i;
-+		min_uc = 0x10000;
- 	    } else {
- 	        // Error
-                 qch = addOne(qch, result);
diff --git a/source/kde/qt/apply_patches b/source/kde/qt/apply_patches
deleted file mode 100644
index c64f75a..0000000
--- a/source/kde/qt/apply_patches
+++ /dev/null
@@ -1,149 +0,0 @@
-#! /usr/bin/env bash
-# Script to apply patches from qt-copy/patches/.
-# See README.qt-copy for details.
-#
-# Lubos Lunak <l.lunak@kde.org>
-# Oswald Buddenhagen <ossi@kde.org>
-#
-
-if ! test -d patches; then
-    echo "No patches directory found."
-    exit 1
-fi
-
-revert=false reverse=
-clever=false
-verbose=true silent=
-for i; do
-    case $i in
-        -r|-R|--reverse) revert=true; reverse=--reverse;;
-        -c|--clever) clever=true;;
-        -s|--silent|-q|--quiet) verbose=false; silent=--silent;;
-        *) echo "Unknown option '$i'." >&2; exit 1;;
-    esac
-done
-
-b=../.${PWD##*/}
-
-if $clever; then
-    if ! $revert; then
-        pdir=$b.patched
-        odir=$b.cvs
-    else
-        pdir=$b.cvs
-        odir=$b.patched
-    fi
-    $verbose && echo -n "Creating temporary copy ... "
-    tdir=$b.temp
-    test -d $tdir || { rm -rf $tdir.t; cp -al . $tdir.t && mv $tdir.t $tdir; } || exit
-    $verbose && echo "done."
-fi
-
-plist=.applied_patches
-wlist=$plist.work
-test -f $wlist -o ! -f $plist || cp $plist $wlist || exit
-patches=`cd patches/ >/dev/null && ls [0-9]*-* $reverse`
-applied=
-already=
-skipped=
-disabled=
-for file in $patches; do
-    # skip files that aren't *.diff or *.patch
-    test "${file%.patch}" = "$file" -a "${file%.diff}" = "$file" && continue
-    pnum=${file%%-*}
-    if ! $revert || ! test -f $plist; then
-        # skip those having 'applied: yes' in the header
-        if head -n 5 patches/$file | grep -iq '^[\t ]*applied[\t ]*:[\t ]*yes[\t ]*$'; then
-            already="$already $file\n"
-            continue;
-        fi
-        # skip disabled
-        if grep -q "^[\\t ]*$pnum[\\t ]*\$" patches/DISABLED; then
-            disabled="$disabled $file\n"
-            continue;
-        fi
-    fi
-    if test -f $plist; then
-        grep -q $pnum $wlist && listed=true || listed=false
-        if test $listed != $revert; then
-            skipped="$skipped $file\n"
-            continue;
-        fi
-    fi
-    $verbose && echo -e "\nApplying: $file"
-    if $clever; then
-        if ! patch -b -z .touched $silent $reverse -p0 < patches/$file; then
-            echo -e "\n\nPatch $file failed!"
-            while :; do
-                read -p "[A]bort, [c]ontinue, or [r]ollback all? " sel
-                case $sel in
-                    a) exit 1;;
-                    c) continue 2;;
-                    r)
-                        $verbose && echo -ne "Deleting working directory ... "
-                        rm -rf $PWD/*
-                        rm -f $wlist
-                        $verbose && echo -ne "done.\nSubstituting with temporary directory ... "
-                        mv $tdir/* $PWD
-                        rm -rf $tdir
-                        $verbose && echo "done."
-                        exit 2;;
-                esac
-            done
-        fi
-    else
-        if ! patch $silent $reverse -p0 < patches/$file; then
-            echo -e "\n\nPatch $file failed!"
-            while :; do
-                read -p "[A]bort or [c]ontinue? " sel
-                case $sel in
-                    a) exit 1;;
-                    c) continue 2;;
-                esac
-            done
-        fi
-    fi
-    if ! $revert; then
-        echo $pnum >> $wlist
-    elif test -f $wlist; then
-        grep -v $pnum $wlist > $wlist.new
-        mv $wlist.new $wlist
-    fi
-    applied="$applied $file\n"
-done
-touch $wlist
-mv $wlist $plist
-
-$verbose && echo -e "\n\n\nDone.\n
-Applied patches:\n$applied
-Previously applied patches:\n$skipped
-Disabled patches:\n$disabled
-Already merged patches:\n$already"
-
-if $clever; then
-    $verbose && echo -n "Creating backup ... "
-    test -f $odir/.cleanme && rm -rf $odir
-    for j in $(find -name \*.touched); do
-        rj=${j%.touched}
-        if ! test -f "$odir/$rj"; then
-            mkdir -p "$odir/${rj%/*}" || exit
-            ln "$tdir/$rj" "$odir/$rj" || exit
-        fi
-        rm "$j"
-    done
-    $verbose && echo -ne "done.\nDeleting temporary directory ... "
-    mv $tdir $tdir.t && rm -rf $tdir.t
-    if test -d $pdir; then
-        $verbose && echo -ne "done.\nRestoring previous backup ... "
-        for j in $(find $pdir -type f); do
-            rj=${j#"$pdir/"}
-            cmp -s "$j" "$rj" && { mv "$j" "$rj" || exit; }
-        done
-        $verbose && echo -ne "done.\nCleaning previous backup ... "
-        find $pdir -type d | sort -r | xargs -r rmdir 2> /dev/null
-        touch $pdir/.cleanme 2> /dev/null
-    fi
-    $verbose && echo "done."
-fi
-
-exit 0
diff --git a/source/kde/qt/qt.install b/source/kde/qt/qt.install
deleted file mode 100644
index f229975..0000000
--- a/source/kde/qt/qt.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install()
-{
-	if ! [ `grep '/usr/lib/qt/lib' etc/ld.so.conf` ]; then
-		echo "/usr/lib/qt/lib" >>etc/ld.so.conf
-		sbin/ldconfig -r .
-	fi
-}
-
-pre_remove()
-{
-	cat etc/ld.so.conf | grep -v '/usr/lib/qt/lib' >/tmp/ld.so.conf.new
-	mv /tmp/ld.so.conf.new etc/ld.so.conf
-	chmod 644 etc/ld.so.conf
-	sbin/ldconfig -r .
-}
-
-op=$1
-shift
-
-$op $*
-
-# vim: ft=sh
diff --git a/source/kde/qt/qt.sh b/source/kde/qt/qt.sh
deleted file mode 100644
index a01f80e..0000000
--- a/source/kde/qt/qt.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-export QTDIR=/usr/lib/qt
-export PATH=$PATH:$QTDIR/bin
-export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-export UIC_PATH=$QTDIR/bin/uic
-export QT_XFT=true
-export MANPATH=$MANPATH:$QTDIR/man
-if [ -z "$PKG_CONFIG_PATH" ]; then
-	export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig
-else
-	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/lib/pkgconfig
-fi
-
diff --git a/source/xlib/qt/01-qt-gcc4.patch b/source/xlib/qt/01-qt-gcc4.patch
new file mode 100644
index 0000000..61abfc6
--- /dev/null
+++ b/source/xlib/qt/01-qt-gcc4.patch
@@ -0,0 +1,11 @@
+--- qt-x11-free-3.3.5/src/kernel/qsizepolicy.h	2005-09-02 14:43:02.000000000 +0200
++++ qt-x11-free-3.3.5-patched/src/kernel/qsizepolicy.h	2005-09-29 01:09:28.000000000 +0200
+@@ -88,7 +88,7 @@
+     }
+
+     void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
+-    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) |
++    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) |
+ 					   (d << HSize); }
+
+     void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) )
diff --git a/source/xlib/qt/02-qt-rpath+FW.patch b/source/xlib/qt/02-qt-rpath+FW.patch
new file mode 100644
index 0000000..6ff56e0
--- /dev/null
+++ b/source/xlib/qt/02-qt-rpath+FW.patch
@@ -0,0 +1,76 @@
+diff -Naur qt-x11-free-3.3.5/configure qt-x11-free-3.3.5-kill-off-sed/configure
+--- qt-x11-free-3.3.5/configure	2005-08-22 11:31:26.000000000 +0200
++++ qt-x11-free-3.3.5-kill-off-sed/configure	2006-02-22 13:11:22.000000000 +0100
+@@ -2351,7 +2351,7 @@
+ 	else
+ 	    echo "Do you accept the terms of $affix license? \c"
+ 	fi
+-	read acceptance
++	acceptance=yes
+ 	echo
+ 	if [ "$acceptance" = "yes" ]; then
+ 	    break
+@@ -2395,7 +2395,7 @@
+ 	else
+ 	    echo "Do you accept the terms of the license? \c"
+ 	fi
+-	read acceptance
++	acceptance=yes
+ 	echo
+ 	if [ "$acceptance" = "yes" ]; then
+ 	    break
+@@ -2476,7 +2476,7 @@
+ 	else
+ 	    echo "Do you accept the terms of the $Platform License? \c"
+ 	fi
+-	read acceptance
++	acceptance=yes
+ 	echo
+ 	if [ "$acceptance" = "yes" ]; then
+ 	    break
+diff -Naur qt-x11-free-3.3.5/Makefile qt-x11-free-3.3.5-kill-off-sed/Makefile
+--- qt-x11-free-3.3.5/Makefile	2005-01-03 17:08:00.000000000 +0100
++++ qt-x11-free-3.3.5-kill-off-sed/Makefile	2006-02-22 13:11:22.000000000 +0100
+@@ -11,7 +11,7 @@
+ install: FORCE
+ 	@$(MAKE) qt.install
+
+-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
++all: symlinks src-qmake src-moc sub-src sub-tools
+ 	@echo
+ 	@echo "The Qt library is now built in ./lib"
+ 	@echo "The Qt examples are built in the directories in ./examples"
+diff -Naur qt-x11-free-3.3.5/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.5-kill-off-sed/mkspecs/linux-g++/qmake.conf
+--- qt-x11-free-3.3.5/mkspecs/linux-g++/qmake.conf	2005-09-02 14:43:37.000000000 +0200
++++ qt-x11-free-3.3.5-kill-off-sed/mkspecs/linux-g++/qmake.conf	2006-02-22 13:15:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
+-QMAKE_CFLAGS_RELEASE	= -O2
++QMAKE_CFLAGS_RELEASE	= DUMMY -fPIC
+ QMAKE_CFLAGS_DEBUG	= -g
+ QMAKE_CFLAGS_SHLIB	= -fPIC
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+@@ -56,7 +56,7 @@
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
+diff -Naur qt-x11-free-3.3.5/qmake/Makefile.unix qt-x11-free-3.3.5-kill-off-sed/qmake/Makefile.unix
+--- qt-x11-free-3.3.5/qmake/Makefile.unix	2004-09-13 20:24:42.000000000 +0200
++++ qt-x11-free-3.3.5-kill-off-sed/qmake/Makefile.unix	2006-02-22 13:14:00.000000000 +0100
+@@ -48,8 +48,7 @@
+ 	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@
+ 	-cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@
+ 	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
+-	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
+-	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
++
+
+ clean::
+ 	rm -f $(OBJS) $(QOBJS)
diff --git a/source/xlib/qt/03-qt-uic.patch b/source/xlib/qt/03-qt-uic.patch
new file mode 100644
index 0000000..cb17b0f
--- /dev/null
+++ b/source/xlib/qt/03-qt-uic.patch
@@ -0,0 +1,17 @@
+diff -Naur qt-x11-free-3.3.5/tools/designer/uic/form.cpp qt-x11-free-3.3.5-patched/tools/designer/uic/form.cpp
+--- qt-x11-free-3.3.5/tools/designer/uic/form.cpp	2005-08-31 12:13:47.000000000 +0200
++++ qt-x11-free-3.3.5-patched/tools/designer/uic/form.cpp	2005-09-28 20:40:09.000000000 +0200
+@@ -731,6 +731,13 @@
+             while ( !n2.isNull() ) {
+                 if ( n2.tagName() == "includehint" ) {
+                     QString file = n2.firstChild().toText().data();
++                    int colons = file.find("::");
++
++                    if (colons != -1)
++                    {
++                        file = file.right(file.length() - colons - 2);
++                    }
++
+                     localIncludes += file;
+                 }
+                 n2 = n2.nextSibling().toElement();
diff --git a/source/xlib/qt/04-qt-visibility.patch b/source/xlib/qt/04-qt-visibility.patch
new file mode 100644
index 0000000..ae2e140
--- /dev/null
+++ b/source/xlib/qt/04-qt-visibility.patch
@@ -0,0 +1,128 @@
+diff -Naur qt-x11-free-3.3.5/include/qglobal.h qt-x11-free-3.3.5-patched/include/qglobal.h
+--- qt-x11-free-3.3.5/include/qglobal.h	2005-09-02 14:42:53.000000000 +0200
++++ qt-x11-free-3.3.5-patched/include/qglobal.h	2005-09-29 00:55:30.000000000 +0200
+@@ -865,6 +865,10 @@
+ #    define Q_TEMPLATE_EXTERN
+ #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
+ #  endif
++#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
++#    define Q_EXPORT __attribute__((visibility("default")))
++#    undef QT_MAKEDLL		/* ignore these for other platforms */
++#    undef QT_DLL
+ #else
+ #  undef QT_MAKEDLL		/* ignore these for other platforms */
+ #  undef QT_DLL
+diff -Naur qt-x11-free-3.3.5/include/qgplugin.h qt-x11-free-3.3.5-patched/include/qgplugin.h
+--- qt-x11-free-3.3.5/include/qgplugin.h	2005-09-02 14:43:05.000000000 +0200
++++ qt-x11-free-3.3.5-patched/include/qgplugin.h	2005-09-29 00:52:27.000000000 +0200
+@@ -90,35 +90,19 @@
+ 	    return i->iface(); \
+ 	}
+
+-#    ifdef Q_WS_WIN
+-#	ifdef Q_CC_BOR
+-#	    define Q_EXPORT_PLUGIN(PLUGIN) \
+-	        Q_PLUGIN_VERIFICATION_DATA \
+-		Q_EXTERN_C __declspec(dllexport) \
+-                const char * __stdcall qt_ucm_query_verification_data() \
+-                { return qt_ucm_verification_data; } \
+-		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
+-                __stdcall ucm_instantiate() \
+-		Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#	else
+-#	    define Q_EXPORT_PLUGIN(PLUGIN) \
+-	        Q_PLUGIN_VERIFICATION_DATA \
+-		Q_EXTERN_C __declspec(dllexport) \
+-                const char *qt_ucm_query_verification_data() \
+-                { return qt_ucm_verification_data; } \
+-		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
+-		Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#	endif
+-#    else
+-#	define Q_EXPORT_PLUGIN(PLUGIN) \
+-	    Q_PLUGIN_VERIFICATION_DATA \
+-	    Q_EXTERN_C \
+-            const char *qt_ucm_query_verification_data() \
++#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
++#   define Q_STDCALL __stdcall
++#else
++#   define Q_STDCALL
++#endif
++
++#define Q_EXPORT_PLUGIN(PLUGIN) \
++ 	     Q_PLUGIN_VERIFICATION_DATA \
++	     Q_EXTERN_C Q_EXPORT \
++	     const char * Q_STDCALL qt_ucm_query_verification_data() \
+             { return qt_ucm_verification_data; } \
+-	    Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
++	    Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
+             Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#    endif
+-
+ #endif
+
+ struct QUnknownInterface;
+diff -Naur qt-x11-free-3.3.5/src/kernel/qgplugin.h qt-x11-free-3.3.5-patched/src/kernel/qgplugin.h
+--- qt-x11-free-3.3.5/src/kernel/qgplugin.h	2005-09-02 14:43:05.000000000 +0200
++++ qt-x11-free-3.3.5-patched/src/kernel/qgplugin.h	2005-09-29 00:52:27.000000000 +0200
+@@ -90,35 +90,19 @@
+ 	    return i->iface(); \
+ 	}
+
+-#    ifdef Q_WS_WIN
+-#	ifdef Q_CC_BOR
+-#	    define Q_EXPORT_PLUGIN(PLUGIN) \
+-	        Q_PLUGIN_VERIFICATION_DATA \
+-		Q_EXTERN_C __declspec(dllexport) \
+-                const char * __stdcall qt_ucm_query_verification_data() \
+-                { return qt_ucm_verification_data; } \
+-		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
+-                __stdcall ucm_instantiate() \
+-		Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#	else
+-#	    define Q_EXPORT_PLUGIN(PLUGIN) \
+-	        Q_PLUGIN_VERIFICATION_DATA \
+-		Q_EXTERN_C __declspec(dllexport) \
+-                const char *qt_ucm_query_verification_data() \
+-                { return qt_ucm_verification_data; } \
+-		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
+-		Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#	endif
+-#    else
+-#	define Q_EXPORT_PLUGIN(PLUGIN) \
+-	    Q_PLUGIN_VERIFICATION_DATA \
+-	    Q_EXTERN_C \
+-            const char *qt_ucm_query_verification_data() \
++#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
++#   define Q_STDCALL __stdcall
++#else
++#   define Q_STDCALL
++#endif
++
++#define Q_EXPORT_PLUGIN(PLUGIN) \
++ 	     Q_PLUGIN_VERIFICATION_DATA \
++	     Q_EXTERN_C Q_EXPORT \
++	     const char * Q_STDCALL qt_ucm_query_verification_data() \
+             { return qt_ucm_verification_data; } \
+-	    Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
++	    Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
+             Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#    endif
+-
+ #endif
+
+ struct QUnknownInterface;
+diff -Naur qt-x11-free-3.3.5/src/tools/qglobal.h qt-x11-free-3.3.5-patched/src/tools/qglobal.h
+--- qt-x11-free-3.3.5/src/tools/qglobal.h	2005-09-02 14:42:53.000000000 +0200
++++ qt-x11-free-3.3.5-patched/src/tools/qglobal.h	2005-09-29 00:55:30.000000000 +0200
+@@ -865,6 +865,10 @@
+ #    define Q_TEMPLATE_EXTERN
+ #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
+ #  endif
++#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
++#    define Q_EXPORT __attribute__((visibility("default")))
++#    undef QT_MAKEDLL		/* ignore these for other platforms */
++#    undef QT_DLL
+ #else
+ #  undef QT_MAKEDLL		/* ignore these for other platforms */
+ #  undef QT_DLL
diff --git a/source/xlib/qt/CVE-2007-3388.patch b/source/xlib/qt/CVE-2007-3388.patch
new file mode 100644
index 0000000..97210c7
--- /dev/null
+++ b/source/xlib/qt/CVE-2007-3388.patch
@@ -0,0 +1,184 @@
+diff -Naurp qt-x11-free-3.3.8/src/sql/qdatatable.cpp qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp
+--- qt-x11-free-3.3.8/src/sql/qdatatable.cpp	2007-01-11 14:46:33.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qdatatable.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -1043,8 +1043,8 @@ bool QDataTable::insertCurrent()
+ 	return FALSE;
+     if ( !sqlCursor()->canInsert() ) {
+ #ifdef QT_CHECK_RANGE
+-	qWarning("QDataTable::insertCurrent: insert not allowed for " +
+-		 sqlCursor()->name() );
++	qWarning("QDataTable::insertCurrent: insert not allowed for %s",
++		 sqlCursor()->name().latin1() );
+ #endif
+ 	endInsert();
+ 	return FALSE;
+@@ -1117,16 +1117,16 @@ bool QDataTable::updateCurrent()
+ 	return FALSE;
+     if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+-	qWarning("QDataTable::updateCurrent: no primary index for " +
+-		 sqlCursor()->name() );
++	qWarning("QDataTable::updateCurrent: no primary index for %s",
++		 sqlCursor()->name().latin1() );
+ #endif
+ 	endUpdate();
+ 	return FALSE;
+     }
+     if ( !sqlCursor()->canUpdate() ) {
+ #ifdef QT_CHECK_RANGE
+-	qWarning("QDataTable::updateCurrent: updates not allowed for " +
+-		 sqlCursor()->name() );
++	qWarning("QDataTable::updateCurrent: updates not allowed for %s",
++		 sqlCursor()->name().latin1() );
+ #endif
+ 	endUpdate();
+ 	return FALSE;
+@@ -1191,8 +1191,8 @@ bool QDataTable::deleteCurrent()
+ 	return FALSE;
+     if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+-	qWarning("QDataTable::deleteCurrent: no primary index " +
+-		 sqlCursor()->name() );
++	qWarning("QDataTable::deleteCurrent: no primary index %s",
++		 sqlCursor()->name().latin1() );
+ #endif
+ 	return FALSE;
+     }
+diff -Naurp qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp
+--- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp	2007-01-11 16:03:02.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qsqldatabase.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -234,7 +234,8 @@ QSqlDatabase* QSqlDatabaseManager::datab
+ 	db->open();
+ #ifdef QT_CHECK_RANGE
+ 	if ( !db->isOpen() )
+-	    qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
++	    qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
++                    db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
+ #endif
+     }
+     return db;
+@@ -686,7 +687,7 @@ void QSqlDatabase::init( const QString&
+     if ( !d->driver ) {
+ #ifdef QT_CHECK_RANGE
+ 	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+-	qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
++	qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+ #endif
+ 	d->driver = new QNullDriver();
+ 	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
+diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlindex.cpp qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp
+--- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp	2007-01-11 14:46:35.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qsqlindex.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -273,7 +273,7 @@ QSqlIndex QSqlIndex::fromStringList( con
+ 	if ( field )
+ 	    newSort.append( *field, desc );
+ 	else
+-	    qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
++	    qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+     }
+     return newSort;
+ }
+diff -Naurp qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp
+--- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp	2007-01-11 14:46:35.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/sql/qsqlrecord.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -298,7 +298,7 @@ int QSqlRecord::position( const QString&
+ 	    return i;
+     }
+ #ifdef QT_CHECK_RANGE
+-    qWarning( "QSqlRecord::position: unable to find field " + name );
++    qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
+ #endif
+     return -1;
+ }
+@@ -313,7 +313,7 @@ QSqlField* QSqlRecord::field( int i )
+     checkDetach();
+     if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+-	qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++	qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif
+ 	return 0;
+     }
+@@ -344,7 +344,7 @@ const QSqlField* QSqlRecord::field( int
+ {
+     if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+-	qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++	qWarning( "QSqlRecord::field: index out of range: %d", i  );
+ #endif // QT_CHECK_RANGE
+ 	return 0;
+     }
+diff -Naurp qt-x11-free-3.3.8/src/tools/qglobal.cpp qt-x11-free-3.3.8-p/src/tools/qglobal.cpp
+--- qt-x11-free-3.3.8/src/tools/qglobal.cpp	2007-02-02 15:01:06.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/tools/qglobal.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -680,7 +680,7 @@ void qSystemWarning( const char* msg, in
+     if ( code != -1 )
+ 	qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
+     else
+-	qWarning( msg );
++	qWarning( "%s", msg );
+ #endif
+ #else
+     Q_UNUSED( msg );
+diff -Naurp qt-x11-free-3.3.8/src/widgets/qtextedit.cpp qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp
+--- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp	2007-02-02 15:01:23.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/widgets/qtextedit.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -6349,7 +6349,7 @@ void QTextEdit::optimParseTags( QString
+ 		    cur = tag->prev;
+ 		    if ( !cur ) {
+ #ifdef QT_CHECK_RANGE
+-			qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
++			qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
+ #endif
+ 			return; // something is wrong - give up
+ 		    }
+@@ -6372,7 +6372,7 @@ void QTextEdit::optimParseTags( QString
+ 				    break;
+ 				} else if ( !cur->leftTag ) {
+ #ifdef QT_CHECK_RANGE
+-				    qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
++				    qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
+ #endif
+ 				    return; // something is amiss - give up
+ 				}
+diff -Naurp qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp
+--- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp	2007-02-02 15:01:03.000000000 +0100
++++ qt-x11-free-3.3.8-p/src/xml/qsvgdevice.cpp	2007-08-03 14:39:11.000000000 +0200
+@@ -978,7 +978,7 @@ bool QSvgDevice::play( const QDomNode &n
+ 		// ### catch references to embedded .svg files
+ 		QPixmap pix;
+ 		if ( !pix.load( href ) ) {
+-		    qWarning( "QSvgDevice::play: Couldn't load image "+href );
++		    qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
+ 		    break;
+ 		}
+ 		pt->drawPixmap( QRect( x1, y1, w, h ), pix );
+@@ -1024,8 +1024,8 @@ bool QSvgDevice::play( const QDomNode &n
+                 break;
+ 	    }
+ 	case InvalidElement:
+-	    qWarning( "QSvgDevice::play: unknown element type " +
+-		      node.nodeName() );
++	    qWarning( "QSvgDevice::play: unknown element type %s",
++		      node.nodeName().latin1() );
+ 	    break;
+ 	};
+
+@@ -1111,7 +1111,7 @@ double QSvgDevice::parseLen( const QStri
+ {
+     QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
+     if ( reg.search( str ) == -1 ) {
+-	qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
++	qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
+ 	if ( ok )
+ 	    *ok = FALSE;
+ 	return 0.0;
+@@ -1140,7 +1140,7 @@ double QSvgDevice::parseLen( const QStri
+ 	else if ( u == "pc" )
+ 	    dbl *= m.logicalDpiX() / 6.0;
+ 	else
+-	    qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
++	    qWarning( "QSvgDevice::parseLen: Unknown unit %s",  u.latin1() );
+     }
+     if ( ok )
+ 	*ok = TRUE;
diff --git a/source/xlib/qt/CVE-2007-4137.patch b/source/xlib/qt/CVE-2007-4137.patch
new file mode 100644
index 0000000..9fda267
--- /dev/null
+++ b/source/xlib/qt/CVE-2007-4137.patch
@@ -0,0 +1,11 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -165,7 +165,7 @@ public:
+     QString toUnicode(const char* chars, int len)
+     {
+ 	QString result;
+-	result.setLength( len ); // worst case
++	result.setLength( len + 1 ); // worst case
+ 	QChar *qch = (QChar *)result.unicode();
+ 	uchar ch;
+         int error = -1;
diff --git a/source/xlib/qt/FrugalBuild b/source/xlib/qt/FrugalBuild
new file mode 100644
index 0000000..a0d4beb
--- /dev/null
+++ b/source/xlib/qt/FrugalBuild
@@ -0,0 +1,100 @@
+# Compiling Time: 4.49 SBU
+# Maintainer: crazy <crazy@frugalware.org>
+# Contributor: Kapolnasi Tamas <ktamas@tdc.hu>
+
+pkgname=qt
+pkgver=3.3.8
+pkgrel=5
+pkgmore=x11-free
+pkgdesc="The QT GUI toolkit."
+url="http://www.trolltech.com/products/qt"
+depends=('libxrandr' 'mesa' 'libxft>=2.1.11-3' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'libsm' 'imake' 'libpng' 'libxtst')
+makedepends=('mysql>=5.0.15' 'postgresql>=8.2' 'sqlite3' 'cups' 'bison')
+groups=('xlib')
+archs=('i686' 'x86_64')
+options=('nodocs' 'scriptlet')
+removes=('usr/lib/qt/mkspecs/default')
+up2date="lynx -dump ftp://ftp.trolltech.com/qt/source|grep '.tar.bz2$'|grep 'qt-x11-free-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'"
+source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \
+	http://ftp.frugalware.org/pub/other/qt/patches-510500.tar.bz2 \
+	qt.sh apply_patches \
+	01-qt-gcc4.patch \
+	02-qt-rpath+FW.patch \
+	03-qt-uic.patch \
+	04-qt-visibility.patch \
+	Qt-3.3.8-UTF-8-fix.diff \
+	CVE-2007-3388.patch \
+	CVE-2007-4137.patch)
+
+export QTDIR=$startdir/src/$pkgname-$pkgmore-$pkgver
+export PATH=${QTDIR}/bin:${PATH}
+export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+export YACC='yacc -d'
+
+subpkgs=('qt-docs')
+subdescs=('QT Documentation')
+subdepends=('')
+subgroups=('xlib-extra')
+subarchs=('i686 x86_64')
+
+build()
+{
+	unset MAKEFLAGS
+	Fcd $pkgname-$pkgmore-$pkgver
+	Fpatchall
+        Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing" mkspecs/linux-g++/qmake.conf
+        mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$pkgname-$pkgmore-$pkgver
+        chmod +x apply_patches
+	echo "0007" >> patches/DISABLED
+        ./apply_patches || return 1
+        ./configure -v -platform linux-g++ -prefix /usr/lib/qt  -release -shared \
+              -qt-gif -system-libpng -system-libjpeg -system-libmng -system-zlib \
+              -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \
+              -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \
+              -thread  -stl -no-g++-exceptions \
+              -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \
+              -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \
+	      -I /usr/include -L /usr/lib || return 1
+        Fmkdir /usr/lib/qt/mkspecs
+        cp -r mkspecs/linux-g++ $Fdestdir/usr/lib/qt/mkspecs/linux-g++
+        ##Fixme need patch##
+        cd $Fsrcdir/$pkgname-$pkgmore-$pkgver/plugins/src/sqldrivers/mysql
+        qmake -o Makefile "INCLUDEPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+
+        cd $Fsrcdir/$pkgname-$pkgmore-$pkgver/plugins/src/sqldrivers/psql
+        qmake -o Makefile "INCLUDEPATH+=/usr/include/postgresql/server /usr/include" "LIBS+=-L/usr/lib -lpq" psql.pro
+
+        cd $Fsrcdir/$pkgname-$pkgmore-$pkgver
+        make || return 1
+        make INSTALL_ROOT=$Fdestdir install || return 1
+        Fmkdir /usr/lib/$pkgname/man
+        cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man
+        Fsed "-L$startdir/src/$pkgname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/$pkgname/lib/*.prl
+        Fexe /etc/profile.d/qt.sh
+        (cd $Fdestdir/usr/lib/qt/mkspecs; ln -sf linux-g++ default)
+        Fmkdir /usr/lib/pkgconfig
+        Fcp /usr/lib/qt/lib/pkgconfig/* /usr/lib/pkgconfig
+        (cd $Fdestdir/usr/lib/pkgconfig; ln -sf qt-mt.pc qt.pc)
+	if [ "$CARCH" == "x86_64" ]; then
+		Fln /usr/lib/qt/lib /usr/lib/qt/lib64
+	fi
+	# symlinks for who don't care about ld.so.conf (OpenOffice.org)
+	Fln qt3/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3
+	Fln qt3/lib/libqui.so.1 /usr/lib/libqui.so.1
+	Fsplit qt-docs usr/lib/qt/phrasebooks
+	Fsplit qt-docs usr/lib/qt/templates
+	Fsplit qt-docs usr/lib/qt/doc
+}
+
+sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \
+          '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \
+          '0464d40d9bd518fe8d139b1306136089349a4cdf' \
+          '7562323175ec47483dcb45c2857519f6276e0a51' \
+          '54d37e3988c4b195ae960ef2c59e678151115211' \
+          '0d5fcbe569723792700bad3c82abe34d5e5163c4' \
+          'dba54b91b2b00c1d052ac512d824b29d31aefb89' \
+          '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \
+          '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \
+          'f7634fb0419bda723053adb885facd270ccb10ec' \
+          '12c6e2c9091c710ebd031c5e82ff33f02fe7e210')
+# optimization OK
diff --git a/source/xlib/qt/Qt-3.3.8-UTF-8-fix.diff b/source/xlib/qt/Qt-3.3.8-UTF-8-fix.diff
new file mode 100644
index 0000000..914496f
--- /dev/null
+++ b/source/xlib/qt/Qt-3.3.8-UTF-8-fix.diff
@@ -0,0 +1,107 @@
+http://www.trolltech.com/developer/download/Qt-3.3.8-UTF-8-fix.diff
+--- a/src/codecs/qutfcodec.cpp	Fri Mar 30 06:08:57 2007
++++ b/src/codecs/qutfcodec.cpp	Fri Mar 30 06:08:57 2007
+@@ -154,6 +154,7 @@
+
+ class QUtf8Decoder : public QTextDecoder {
+     uint uc;
++    uint min_uc;
+     int need;
+     bool headerDone;
+ public:
+@@ -167,8 +168,9 @@
+ 	result.setLength( len ); // worst case
+ 	QChar *qch = (QChar *)result.unicode();
+ 	uchar ch;
++        int error = -1;
+ 	for (int i=0; i<len; i++) {
+-	    ch = *chars++;
++	    ch = chars[i];
+ 	    if (need) {
+ 		if ( (ch&0xc0) == 0x80 ) {
+ 		    uc = (uc << 6) | (ch & 0x3f);
+@@ -182,6 +184,8 @@
+ 			    *qch++ = QChar(high);
+ 			    *qch++ = QChar(low);
+ 			    headerDone = TRUE;
++			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                            *qch++ = QChar::replacement;
+ 			} else {
+ 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
+ 				*qch++ = uc;
+@@ -190,6 +194,7 @@
+ 		    }
+ 		} else {
+ 		    // error
++                    i = error;
+ 		    *qch++ = QChar::replacement;
+ 		    need = 0;
+ 		}
+@@ -200,13 +205,22 @@
+ 		} else if ((ch & 0xe0) == 0xc0) {
+ 		    uc = ch & 0x1f;
+ 		    need = 1;
++                    error = i;
++		    min_uc = 0x80;
+ 		} else if ((ch & 0xf0) == 0xe0) {
+ 		    uc = ch & 0x0f;
+ 		    need = 2;
++                    error = i;
++		    min_uc = 0x800;
+ 		} else if ((ch&0xf8) == 0xf0) {
+ 		    uc = ch & 0x07;
+ 		    need = 3;
+-		}
++                    error = i;
++                    min_uc = 0x10000;
++                } else {
++                    // error
++                    *qch++ = QChar::replacement;
++                }
+ 	    }
+ 	}
+ 	result.truncate( qch - result.unicode() );
+
+--- a/src/tools/qstring.cpp	Fri Mar 30 06:08:57 2007
++++ b/src/tools/qstring.cpp	Fri Mar 30 06:08:57 2007
+@@ -5805,6 +5805,7 @@
+     result.setLength( len ); // worst case
+     QChar *qch = (QChar *)result.unicode();
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -5822,7 +5823,13 @@
+ 			unsigned short low = uc%0x400 + 0xdc00;
+ 			*qch++ = QChar(high);
+ 			*qch++ = QChar(low);
+-		    } else {
++		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++			// overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = QChar(0xdbff);
++                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
++                    } else {
+ 			*qch++ = uc;
+ 		    }
+ 		}
+@@ -5844,14 +5851,17 @@
+ 		uc = ch & 0x1f;
+ 		need = 1;
+ 		error = i;
++		min_uc = 0x80;
+ 	    } else if ((ch & 0xf0) == 0xe0) {
+ 		uc = ch & 0x0f;
+ 		need = 2;
+ 		error = i;
++		min_uc = 0x800;
+ 	    } else if ((ch&0xf8) == 0xf0) {
+ 		uc = ch & 0x07;
+ 		need = 3;
+ 		error = i;
++		min_uc = 0x10000;
+ 	    } else {
+ 	        // Error
+                 qch = addOne(qch, result);
diff --git a/source/xlib/qt/apply_patches b/source/xlib/qt/apply_patches
new file mode 100644
index 0000000..c64f75a
--- /dev/null
+++ b/source/xlib/qt/apply_patches
@@ -0,0 +1,149 @@
+#! /usr/bin/env bash
+# Script to apply patches from qt-copy/patches/.
+# See README.qt-copy for details.
+#
+# Lubos Lunak <l.lunak@kde.org>
+# Oswald Buddenhagen <ossi@kde.org>
+#
+
+if ! test -d patches; then
+    echo "No patches directory found."
+    exit 1
+fi
+
+revert=false reverse=
+clever=false
+verbose=true silent=
+for i; do
+    case $i in
+        -r|-R|--reverse) revert=true; reverse=--reverse;;
+        -c|--clever) clever=true;;
+        -s|--silent|-q|--quiet) verbose=false; silent=--silent;;
+        *) echo "Unknown option '$i'." >&2; exit 1;;
+    esac
+done
+
+b=../.${PWD##*/}
+
+if $clever; then
+    if ! $revert; then
+        pdir=$b.patched
+        odir=$b.cvs
+    else
+        pdir=$b.cvs
+        odir=$b.patched
+    fi
+    $verbose && echo -n "Creating temporary copy ... "
+    tdir=$b.temp
+    test -d $tdir || { rm -rf $tdir.t; cp -al . $tdir.t && mv $tdir.t $tdir; } || exit
+    $verbose && echo "done."
+fi
+
+plist=.applied_patches
+wlist=$plist.work
+test -f $wlist -o ! -f $plist || cp $plist $wlist || exit
+patches=`cd patches/ >/dev/null && ls [0-9]*-* $reverse`
+applied=
+already=
+skipped=
+disabled=
+for file in $patches; do
+    # skip files that aren't *.diff or *.patch
+    test "${file%.patch}" = "$file" -a "${file%.diff}" = "$file" && continue
+    pnum=${file%%-*}
+    if ! $revert || ! test -f $plist; then
+        # skip those having 'applied: yes' in the header
+        if head -n 5 patches/$file | grep -iq '^[\t ]*applied[\t ]*:[\t ]*yes[\t ]*$'; then
+            already="$already $file\n"
+            continue;
+        fi
+        # skip disabled
+        if grep -q "^[\\t ]*$pnum[\\t ]*\$" patches/DISABLED; then
+            disabled="$disabled $file\n"
+            continue;
+        fi
+    fi
+    if test -f $plist; then
+        grep -q $pnum $wlist && listed=true || listed=false
+        if test $listed != $revert; then
+            skipped="$skipped $file\n"
+            continue;
+        fi
+    fi
+    $verbose && echo -e "\nApplying: $file"
+    if $clever; then
+        if ! patch -b -z .touched $silent $reverse -p0 < patches/$file; then
+            echo -e "\n\nPatch $file failed!"
+            while :; do
+                read -p "[A]bort, [c]ontinue, or [r]ollback all? " sel
+                case $sel in
+                    a) exit 1;;
+                    c) continue 2;;
+                    r)
+                        $verbose && echo -ne "Deleting working directory ... "
+                        rm -rf $PWD/*
+                        rm -f $wlist
+                        $verbose && echo -ne "done.\nSubstituting with temporary directory ... "
+                        mv $tdir/* $PWD
+                        rm -rf $tdir
+                        $verbose && echo "done."
+                        exit 2;;
+                esac
+            done
+        fi
+    else
+        if ! patch $silent $reverse -p0 < patches/$file; then
+            echo -e "\n\nPatch $file failed!"
+            while :; do
+                read -p "[A]bort or [c]ontinue? " sel
+                case $sel in
+                    a) exit 1;;
+                    c) continue 2;;
+                esac
+            done
+        fi
+    fi
+    if ! $revert; then
+        echo $pnum >> $wlist
+    elif test -f $wlist; then
+        grep -v $pnum $wlist > $wlist.new
+        mv $wlist.new $wlist
+    fi
+    applied="$applied $file\n"
+done
+touch $wlist
+mv $wlist $plist
+
+$verbose && echo -e "\n\n\nDone.\n
+Applied patches:\n$applied
+Previously applied patches:\n$skipped
+Disabled patches:\n$disabled
+Already merged patches:\n$already"
+
+if $clever; then
+    $verbose && echo -n "Creating backup ... "
+    test -f $odir/.cleanme && rm -rf $odir
+    for j in $(find -name \*.touched); do
+        rj=${j%.touched}
+        if ! test -f "$odir/$rj"; then
+            mkdir -p "$odir/${rj%/*}" || exit
+            ln "$tdir/$rj" "$odir/$rj" || exit
+        fi
+        rm "$j"
+    done
+    $verbose && echo -ne "done.\nDeleting temporary directory ... "
+    mv $tdir $tdir.t && rm -rf $tdir.t
+    if test -d $pdir; then
+        $verbose && echo -ne "done.\nRestoring previous backup ... "
+        for j in $(find $pdir -type f); do
+            rj=${j#"$pdir/"}
+            cmp -s "$j" "$rj" && { mv "$j" "$rj" || exit; }
+        done
+        $verbose && echo -ne "done.\nCleaning previous backup ... "
+        find $pdir -type d | sort -r | xargs -r rmdir 2> /dev/null
+        touch $pdir/.cleanme 2> /dev/null
+    fi
+    $verbose && echo "done."
+fi
+
+exit 0
diff --git a/source/xlib/qt/qt.install b/source/xlib/qt/qt.install
new file mode 100644
index 0000000..f229975
--- /dev/null
+++ b/source/xlib/qt/qt.install
@@ -0,0 +1,22 @@
+post_install()
+{
+	if ! [ `grep '/usr/lib/qt/lib' etc/ld.so.conf` ]; then
+		echo "/usr/lib/qt/lib" >>etc/ld.so.conf
+		sbin/ldconfig -r .
+	fi
+}
+
+pre_remove()
+{
+	cat etc/ld.so.conf | grep -v '/usr/lib/qt/lib' >/tmp/ld.so.conf.new
+	mv /tmp/ld.so.conf.new etc/ld.so.conf
+	chmod 644 etc/ld.so.conf
+	sbin/ldconfig -r .
+}
+
+op=$1
+shift
+
+$op $*
+
+# vim: ft=sh
diff --git a/source/xlib/qt/qt.sh b/source/xlib/qt/qt.sh
new file mode 100644
index 0000000..a01f80e
--- /dev/null
+++ b/source/xlib/qt/qt.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+export QTDIR=/usr/lib/qt
+export PATH=$PATH:$QTDIR/bin
+export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+export UIC_PATH=$QTDIR/bin/uic
+export QT_XFT=true
+export MANPATH=$MANPATH:$QTDIR/man
+if [ -z "$PKG_CONFIG_PATH" ]; then
+	export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig
+else
+	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/lib/pkgconfig
+fi
+
From crazy at frugalware.org  Tue Oct 16 14:48:35 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 14:48:41 2007
Subject: [Frugalware-git] kde358: krusader-1.80.0-1-i686
Message-ID: <20071016124835.6860E13A4023@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=10cc6f8edd1c4188657e9066af5063f142e0d085

commit 10cc6f8edd1c4188657e9066af5063f142e0d085
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 14:39:19 2007 +0200

krusader-1.80.0-1-i686
* move away from 'kde' group

diff --git a/source/kde-extra/krusader/FrugalBuild b/source/kde-extra/krusader/FrugalBuild
new file mode 100644
index 0000000..d5fe568
--- /dev/null
+++ b/source/kde-extra/krusader/FrugalBuild
@@ -0,0 +1,18 @@
+# Compiling Time: 0.90 SBU
+# Maintainer: Janny <janny@frugalware.org>
+# Contributor: VMiklos <vmiklos@frugalware.org>
+
+pkgname=krusader
+pkgver=1.80.0
+pkgrel=1
+pkgdesc="Twin Panel File Manager For Your Desktop"
+Finclude sourceforge
+url="http://krusader.sourceforge.net"
+depends=('kdebindings>=3.2.0')
+groups=('kde-extra')
+archs=('i686' 'x86_64')
+up2date="lynx -dump $url/downloads.php|grep '^version'|sed 's/.* \(.*\)/\1/;q'"
+options=('scriptlet')
+sha1sums=('8e9ef3798be6fdb245db79664c1753f0b4e5d184')
+
+# optimization ok
diff --git a/source/kde/krusader/FrugalBuild b/source/kde/krusader/FrugalBuild
deleted file mode 100644
index 4453c03..0000000
--- a/source/kde/krusader/FrugalBuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Compiling Time: 0.90 SBU
-# Maintainer: Janny <janny@frugalware.org>
-# Contributor: VMiklos <vmiklos@frugalware.org>
-
-pkgname=krusader
-pkgver=1.80.0
-pkgrel=1
-pkgdesc="Twin Panel File Manager For Your Desktop"
-Finclude sourceforge
-url="http://krusader.sourceforge.net"
-depends=('kdebindings>=3.2.0')
-groups=('kde' 'kde-apps')
-archs=('i686' 'x86_64')
-up2date="lynx -dump $url/downloads.php|grep '^version'|sed 's/.* \(.*\)/\1/;q'"
-options=('scriptlet')
-sha1sums=('8e9ef3798be6fdb245db79664c1753f0b4e5d184')
-
-# optimization ok
From crazy at frugalware.org  Tue Oct 16 14:48:35 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 14:48:42 2007
Subject: [Frugalware-git] kde358: kdebindings-3.5.7-1-i686
Message-ID: <20071016124835.8F0C513A4024@genesis.frugalware.org>

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

commit cb8960327a6868786397741f625b0093db29f1f9
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 14:42:07 2007 +0200

kdebindings-3.5.7-1-i686
* moved to kde-extra
* the reason was still in kde was 'krusader'

diff --git a/source/kde-extra/kdebindings/FrugalBuild b/source/kde-extra/kdebindings/FrugalBuild
new file mode 100644
index 0000000..b1390ee
--- /dev/null
+++ b/source/kde-extra/kdebindings/FrugalBuild
@@ -0,0 +1,39 @@
+# Compiling Time: 15.22 SBU
+# Maintainer: crazy <crazy@frugalware.org>
+
+pkgname=kdebindings
+pkgver=3.5.7
+pkgrel=1
+pkgdesc="KDE Bindings."
+groups=('kde-extra')
+archs=('i686' 'x86_64')
+makedepends=('java-gcj-compat' 'gcc-gcj' 'gtk+' 'ruby')
+depends=('kdebase>=3.5.7' 'qscintilla')
+_F_kde_reconf=1
+Finclude kde
+source=($source kdebindings-3.5.4-java.diff)
+
+subpkgs=("$pkgname-docs")
+subdescs=("Kdebindings Documentation")
+subdepends=("$pkgname=$pkgver")
+subgroups=('kde-extra kde-docs')
+subarchs=('i686 x86_64')
+
+build()
+{
+	unset MAKEFLAGS
+	Fbuild_kde_reconf
+        Fconf \
+		DO_NOT_COMPILE="python" \
+	        --enable-qscintilla=yes \
+		--with-java=/usr/
+	make || Fdie
+	Fmakeinstall
+        Frm /usr/lib/perl5/5*/$CARCH-linux-thread-multi/perllocal.pod
+        Frm /usr/lib/perl5/5*/$CARCH-linux/perllocal.pod
+	Fsplit $pkgname-docs usr/share/doc
+}
+
+sha1sums=('9ce5399fead3cdc17b4c1b5086dcff7bf26d42d2'\
+          '9393dda544127cbcca72fff4d9e1aad2fe7e8c7f')
+# optimization OK
diff --git a/source/kde-extra/kdebindings/kdebindings-3.5.4-java.diff b/source/kde-extra/kdebindings/kdebindings-3.5.4-java.diff
new file mode 100644
index 0000000..673d4d6
--- /dev/null
+++ b/source/kde-extra/kdebindings/kdebindings-3.5.4-java.diff
@@ -0,0 +1,46 @@
+Fixes the following compile error:
+CLASSPATH=../../..:./../../..:$CLASSPATH  -d ../../..  -classpath ./../../.. QtUtils.java (...) QXmlDeclHandlerInterface.java
+/bin/sh: line 2: -d: command not found
+make[6]: *** [classnoinst.stamp] Error 127
+make[6]: Leaving directory `/var/tmp/fst/src/kdebindings-3.5.4/qtjava/javalib/org/kde/qt'
+--- kdebindings-3.5.4/qtjava/javalib/org/kde/qt/Makefile.am.orig	2006-09-30 00:50:38.000000000 +0200
++++ kdebindings-3.5.4/qtjava/javalib/org/kde/qt/Makefile.am	2006-09-30 00:52:20.000000000 +0200
+@@ -13,5 +13,5 @@
+ JAVAROOT = ../../..
+ CLASSPATH = $(srcdir)/../../..
+ JAVACFLAGS = -classpath $(CLASSPATH)
+-# Prevent stupid automake from putting JAVAC=javac in Makefile.in
+-JAVAC = @JAVAC@
++JAVAC = gcj -C
++JAR = jar
+--- kdebindings-3.5.4/qtjava/javalib/Makefile.am.orig	2006-09-30 02:35:56.000000000 +0200
++++ kdebindings-3.5.4/qtjava/javalib/Makefile.am	2006-09-30 02:36:14.000000000 +0200
+@@ -20,6 +20,7 @@
+ data_DATA = qtjava.jar
+ datadir = $(kde_libraries)/java
+
++JAR = jar
+ qtjava.jar: org/kde/qt/classnoinst.stamp
+ 	$(JAR) cf qtjava.jar org/kde/qt/*.class
+
+--- kdebindings-3.5.4/kdejava/koala/org/kde/koala/Makefile.am.orig	2006-09-30 03:29:35.000000000 +0200
++++ kdebindings-3.5.4/kdejava/koala/org/kde/koala/Makefile.am	2006-09-30 03:32:20.000000000 +0200
+@@ -12,6 +12,5 @@
+
+ JAVAROOT = ../../..
+ CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
+-JAVACFLAGS = -classpath $(CLASSPATH)
+-# Prevent stupid automake from putting JAVAC=javac in Makefile.in
+-JAVAC = @JAVAC@
++JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
++JAVAC = gcj -C
+--- kdebindings-3.5.4/kdejava/koala/Makefile.am.orig	2006-09-30 11:39:58.000000000 +0200
++++ kdebindings-3.5.4/kdejava/koala/Makefile.am	2006-09-30 11:40:28.000000000 +0200
+@@ -27,6 +27,7 @@
+ data_DATA = koala.jar
+ datadir = $(kde_libraries)/java
+
++JAR = jar
+ koala.jar: org/kde/koala/classnoinst.stamp
+ 	$(JAR) cf koala.jar org/kde/koala/*.class
+
diff --git a/source/kde/kdebindings/FrugalBuild b/source/kde/kdebindings/FrugalBuild
deleted file mode 100644
index abf83e3..0000000
--- a/source/kde/kdebindings/FrugalBuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Compiling Time: 15.22 SBU
-# Maintainer: crazy <crazy@frugalware.org>
-
-pkgname=kdebindings
-pkgver=3.5.7
-pkgrel=1
-pkgdesc="KDE Bindings."
-groups=('kde')
-archs=('i686' 'x86_64')
-makedepends=('java-gcj-compat' 'gcc-gcj' 'gtk+' 'ruby')
-depends=('kdebase>=3.5.7' 'qscintilla')
-_F_kde_reconf=1
-Finclude kde
-source=($source kdebindings-3.5.4-java.diff)
-
-subpkgs=("$pkgname-docs")
-subdescs=("Kdebindings Documentation")
-subdepends=("$pkgname=$pkgver")
-subgroups=('kde-extra kde-docs')
-subarchs=('i686 x86_64')
-
-build()
-{
-	unset MAKEFLAGS
-	Fbuild_kde_reconf
-        Fconf \
-		DO_NOT_COMPILE="python" \
-	        --enable-qscintilla=yes \
-		--with-java=/usr/
-	make || Fdie
-	Fmakeinstall
-        Frm /usr/lib/perl5/5*/$CARCH-linux-thread-multi/perllocal.pod
-        Frm /usr/lib/perl5/5*/$CARCH-linux/perllocal.pod
-	Fsplit $pkgname-docs usr/share/doc
-}
-
-sha1sums=('9ce5399fead3cdc17b4c1b5086dcff7bf26d42d2'\
-          '9393dda544127cbcca72fff4d9e1aad2fe7e8c7f')
-# optimization OK
diff --git a/source/kde/kdebindings/kdebindings-3.5.4-java.diff b/source/kde/kdebindings/kdebindings-3.5.4-java.diff
deleted file mode 100644
index 673d4d6..0000000
--- a/source/kde/kdebindings/kdebindings-3.5.4-java.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Fixes the following compile error:
-CLASSPATH=../../..:./../../..:$CLASSPATH  -d ../../..  -classpath ./../../.. QtUtils.java (...) QXmlDeclHandlerInterface.java
-/bin/sh: line 2: -d: command not found
-make[6]: *** [classnoinst.stamp] Error 127
-make[6]: Leaving directory `/var/tmp/fst/src/kdebindings-3.5.4/qtjava/javalib/org/kde/qt'
---- kdebindings-3.5.4/qtjava/javalib/org/kde/qt/Makefile.am.orig	2006-09-30 00:50:38.000000000 +0200
-+++ kdebindings-3.5.4/qtjava/javalib/org/kde/qt/Makefile.am	2006-09-30 00:52:20.000000000 +0200
-@@ -13,5 +13,5 @@
- JAVAROOT = ../../..
- CLASSPATH = $(srcdir)/../../..
- JAVACFLAGS = -classpath $(CLASSPATH)
--# Prevent stupid automake from putting JAVAC=javac in Makefile.in
--JAVAC = @JAVAC@
-+JAVAC = gcj -C
-+JAR = jar
---- kdebindings-3.5.4/qtjava/javalib/Makefile.am.orig	2006-09-30 02:35:56.000000000 +0200
-+++ kdebindings-3.5.4/qtjava/javalib/Makefile.am	2006-09-30 02:36:14.000000000 +0200
-@@ -20,6 +20,7 @@
- data_DATA = qtjava.jar
- datadir = $(kde_libraries)/java
-
-+JAR = jar
- qtjava.jar: org/kde/qt/classnoinst.stamp
- 	$(JAR) cf qtjava.jar org/kde/qt/*.class
-
---- kdebindings-3.5.4/kdejava/koala/org/kde/koala/Makefile.am.orig	2006-09-30 03:29:35.000000000 +0200
-+++ kdebindings-3.5.4/kdejava/koala/org/kde/koala/Makefile.am	2006-09-30 03:32:20.000000000 +0200
-@@ -12,6 +12,5 @@
-
- JAVAROOT = ../../..
- CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
--JAVACFLAGS = -classpath $(CLASSPATH)
--# Prevent stupid automake from putting JAVAC=javac in Makefile.in
--JAVAC = @JAVAC@
-+JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
-+JAVAC = gcj -C
---- kdebindings-3.5.4/kdejava/koala/Makefile.am.orig	2006-09-30 11:39:58.000000000 +0200
-+++ kdebindings-3.5.4/kdejava/koala/Makefile.am	2006-09-30 11:40:28.000000000 +0200
-@@ -27,6 +27,7 @@
- data_DATA = koala.jar
- datadir = $(kde_libraries)/java
-
-+JAR = jar
- koala.jar: org/kde/koala/classnoinst.stamp
- 	$(JAR) cf koala.jar org/kde/koala/*.class
-
From crazy at frugalware.org  Tue Oct 16 14:54:00 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 14:54:01 2007
Subject: [Frugalware-git] kde358: kdeartwork-3.5.7-1-i686
Message-ID: <20071016125400.6D4DD13A4001@genesis.frugalware.org>

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

commit 4ee13398763043d47270f2cea69c3f8693f514a9
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 14:49:52 2007 +0200

kdeartwork-3.5.7-1-i686
* moved to kde-extra we don't need it by default

diff --git a/source/kde-extra/kdeartwork/FrugalBuild b/source/kde-extra/kdeartwork/FrugalBuild
new file mode 100644
index 0000000..a7869fc
--- /dev/null
+++ b/source/kde-extra/kdeartwork/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0.84 SBU
+# Maintainer: crazy <crazy@frugalware.org>
+
+pkgname=kdeartwork
+pkgver=3.5.7
+pkgrel=1
+pkgdesc="Additional artwork for KDE."
+groups=('kde-extra')
+archs=('i686' 'x86_64')
+depends=('kdebase>=3.5.7')
+Finclude kde
+Fconfopts="$Fconfopts --with-dpms --disable-warnings"
+sha1sums=('3de5816c971df9a83251ca3a090c654bd7b1c0aa')
+
+# optimization OK
diff --git a/source/kde/kdeartwork/FrugalBuild b/source/kde/kdeartwork/FrugalBuild
deleted file mode 100644
index ca5c5cd..0000000
--- a/source/kde/kdeartwork/FrugalBuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Compiling Time: 0.84 SBU
-# Maintainer: crazy <crazy@frugalware.org>
-
-pkgname=kdeartwork
-pkgver=3.5.7
-pkgrel=1
-pkgdesc="Additional artwork for KDE."
-groups=('kde')
-archs=('i686' 'x86_64')
-depends=('kdebase>=3.5.7')
-Finclude kde
-Fconfopts="$Fconfopts --with-dpms --disable-warnings"
-sha1sums=('3de5816c971df9a83251ca3a090c654bd7b1c0aa')
-
-# optimization OK
From voroskoi at frugalware.org  Tue Oct 16 14:58:45 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 14:58:47 2007
Subject: [Frugalware-git] frugalware-current: nginx-0.5.32-1-i686
Message-ID: <20071016125845.CB83713A4001@genesis.frugalware.org>

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

commit 1b1e83d602b474d18b2d18c33b8e16d72eb32d05
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 14:39:06 2007 +0200

nginx-0.5.32-1-i686
version bump

diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild
index df4da04..6e6e78b 100644
--- a/source/network-extra/nginx/FrugalBuild
+++ b/source/network-extra/nginx/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=nginx
-pkgver=0.5.31
+pkgver=0.5.32
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=('c58076b3e1f3f4cb59afe5143fc0a893d3a4f0ba' \
+sha1sums=('3cb4bc097675e5c1a90e59bf51f4a24b985a6dfa' \
'e8cc09710ba365eb932d1710f4aac629e49452ff' \
'da58d8a74dbb081c3dfb69317999e10f1ebf991e' \
'3a4cc4564ce610400e012d7c391107f33a258f1e')
From crazy at frugalware.org  Tue Oct 16 15:11:46 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 15:11:48 2007
Subject: [Frugalware-git] kde358: arts-1.5.8-1-i686
Message-ID: <20071016131146.6734913A4001@genesis.frugalware.org>

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

commit a0419c6bcd5101b2cb4137b3516a2b2594007651
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 15:07:00 2007 +0200

arts-1.5.8-1-i686
* Version bump

diff --git a/source/kde/arts/FrugalBuild b/source/kde/arts/FrugalBuild
index e221e1d..164c062 100644
--- a/source/kde/arts/FrugalBuild
+++ b/source/kde/arts/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Kapolnasi Tamas <ktamas@tdc.hu>

pkgname=arts
-pkgver=1.5.7
+pkgver=1.5.8
pkgrel=1
pkgdesc="Analog realtime synthesizer"
groups=('kde' 'kde-minimal')
@@ -11,7 +11,7 @@ archs=('i686' 'x86_64')
depends=('libstdc++' 'qt>=3.3.8-3' 'libvorbis' 'libmad' 'glib2' 'jack' 'alsa-lib' 'audiofile')
Finclude kde
Fconfopts="$Fconfopts --with-alsa --without-esd --with-jack --with-audiofile"
-sha1sums=('e02f5e34d567571becd15ae1b2e5752b24d52766')
+sha1sums=('190162c2075ee4ebaac569c61b161147c3505690')


# optimization OK
From voroskoi at frugalware.org  Tue Oct 16 16:12:26 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 16:12:30 2007
Subject: [Frugalware-git] frugalware-current: eclipse-3.3.1-1-i686
Message-ID: <20071016141226.CD31C13A4001@genesis.frugalware.org>

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

commit d50915b7f1c268a63f8b241d37982e17baef49c1
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 13:19:19 2007 +0200

eclipse-3.3.1-1-i686
version bump, closes #2241
updated depends() nad build()
patch from Daniel "DeX77" Exner

diff --git a/source/xapps-extra/eclipse/FrugalBuild b/source/xapps-extra/eclipse/FrugalBuild
index 626c8f4..0413672 100644
--- a/source/xapps-extra/eclipse/FrugalBuild
+++ b/source/xapps-extra/eclipse/FrugalBuild
@@ -3,17 +3,19 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=eclipse
-pkgver=3.2.2
+pkgver=3.3.1
pkgrel=1
pkgdesc="A kind of universal tool platform - an open extensible IDE."
url="http://eclipse.org/"
-depends=('gtk+2' 'atk' 'freetype2' 'libxcb' 'pango' 'cairo' 'glib2')
+depends=('gtk+2' 'libxdamage')
makedepends=('apache-ant' 'j2sdk' 'ecj')
rodepends=('j2re')
groups=('xapps-extra')
archs=('i686' '!x86_64')
up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'"
-source=(http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-$pkgver-200702121330/eclipse-sourceBuild-srcIncluded-$pkgver.zip eclipse.sh)
+source=(http://eclipse.gabriel.co.hu/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-sourceBuild-srcIncluded-$pkgver.zip \
+eclipse.sh)
+options=('scriptlet')

[ "$CARCH" == "x86_64" ] && EARCH=$CARCH

@@ -21,8 +23,10 @@ echo "$CARCH" |grep -q 'i.86' && EARCH=x86

build()
{
-	Fcd ""
-	./build -os linux -ws gtk -arch $EARCH -java5home /usr/lib/java -bc /usr/share/java/libgcj-4.1.1.jar || Fdie
+	export JAVA_HOME=/usr/lib/java
+	export J2SDKDIR=/usr/lib/java
+	export CLASSPATH=:/usr/lib/java/jre/lib:/usr/lib/java/lib
+	./build -os linux -ws gtk -arch $EARCH || Fdie
Fmkdir /usr/lib/
Ffile result/linux-gtk-$EARCH-sdk.tar.gz /usr/lib/
cd $Fdestdir/usr/lib || Fdie
@@ -32,5 +36,6 @@ build()
Frm /usr/lib/eclipse/readme
Fexe /etc/profile.d/$pkgname.sh
}
-sha1sums=('9efd9705c1dd4c22e2830a05d3cd291c00d844e9'\
+
+sha1sums=('3b71a193673001fad7c64d40b1d8eddd9b70e678' \
'd8387b2fc89f59b7854500fce3211a8982472937')
From voroskoi at frugalware.org  Tue Oct 16 16:42:36 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 16:42:38 2007
Subject: [Frugalware-git] frugalware-current: eclipse-cdt-4.0.1-1-i686
Message-ID: <20071016144236.E2AD513A4001@genesis.frugalware.org>

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

commit 58015903c0864b6788e8e774f8ce5607ee1a0e19
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 16:40:15 2007 +0200

eclipse-cdt-4.0.1-1-i686
version bump, closes #2242
patch from Daniel "DeX77" Exner

diff --git a/source/xapps-extra/eclipse-cdt/FrugalBuild b/source/xapps-extra/eclipse-cdt/FrugalBuild
index b510ec0..4353ad2 100644
--- a/source/xapps-extra/eclipse-cdt/FrugalBuild
+++ b/source/xapps-extra/eclipse-cdt/FrugalBuild
@@ -2,21 +2,21 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=eclipse-cdt
-pkgver=3.1.2
+pkgver=4.0.1
pkgrel=1
pkgdesc="Eclipse C/C++ Development Tooling - CDT SDK Feature"
url="http://eclipse.org/cdt/"
depends=()
-rodepends=('eclipse')
+rodepends=('eclipse>=3.3')
groups=('xapps-extra')
archs=('i686')
-up2date="lynx -dump http://www.eclipse.org/cdt/downloads.php |grep resolve |sed -ne 's/.*in \(.*\)/\1/;1p'"
-source=(http://eclipse.gabriel.co.hu/tools/cdt/releases/callisto/dist/$pkgver/org.eclipse.cdt.sdk-$pkgver-linux.x86.tar.gz)
+up2date="lynx -dump http://download.eclipse.org/tools/cdt/releases/europa | grep master- | tail -n1 | sed 's/.*cdt-master-\(.*\).zip/\1/'"
+source=(http://eclipse.gabriel.co.hu/tools/cdt/releases/europa/dist/cdt-master-$pkgver.zip)
+sha1sums=('e6953967ef8b0b3a523293654c07ffef1aa94475')
+
ECLIPSE_DIR=/usr/lib/eclipse

build() {
-	Fcd eclipse
Fmkdir $ECLIPSE_DIR
mv plugins features $Fdestdir/$ECLIPSE_DIR || Fdie
}
-sha1sums=('ee4187de74f06241e9c55677e4d394f007fbb646')
From priyank at frugalware.org  Tue Oct 16 16:53:48 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct 16 16:53:50 2007
Subject: [Frugalware-git] frugalware-current: ristretto-0.0.9-1-i686
Message-ID: <20071016145348.B992F13A4001@genesis.frugalware.org>

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

commit e343a3f6379013d9f6e467aafb647a513e5ab94d
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 16 20:20:21 2007 +0530

ristretto-0.0.9-1-i686
* Version bump

diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild
index fa18d72..b8f80f1 100644
--- a/source/xfce4/ristretto/FrugalBuild
+++ b/source/xfce4/ristretto/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=ristretto
-pkgver=0.0.8
+pkgver=0.0.9
pkgrel=1
pkgdesc="A fast and lightweight picture viewer for Xfce."
makedepends=('intltool')
@@ -13,6 +13,6 @@ _F_gnome_iconcache="y"
_F_xfce_goodies_ext=".tar.gz"
Finclude xfce4 gnome-scriptlet
url="http://goodies.xfce.org/projects/applications/ristretto"
-sha1sums=('ac17624fa7b0d5ea2f182468527d739300ce85fb')
+sha1sums=('b3c99b73eca3567b8ce30156497c2e4262afb2af')

# optimization OK
From crazy at frugalware.org  Tue Oct 16 17:36:02 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 17:36:05 2007
Subject: [Frugalware-git] kde358: kdelibs-3.5.8-1-i686
Message-ID: <20071016153602.8DB5013A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=1519270d7709d0cce461ababc788d661a96f7600

commit 1519270d7709d0cce461ababc788d661a96f7600
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 17:16:35 2007 +0200

kdelibs-3.5.8-1-i686
* Version bump
* removed any 'subdepends' from API package

diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index a69c8dd..35c2714 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -3,10 +3,10 @@
# Contributor: Kapolnasi Tamas <ktamas@tdc.hu>

pkgname=kdelibs
-pkgver=3.5.7
-pkgrel=3
+pkgver=3.5.8
+pkgrel=1
pkgdesc="KDE Core Libraries."
-depends=('arts>=1.5.7' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif' 'openssl' 'libart_lgpl' 'gamin'  'bzip2' \
+depends=('arts>=1.5.8' '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>=1.0' 'rgb' 'qt>=3.3.8-3' 'libdrm' 'libxrender' 'libxcb')
makedepends=('cups>=1.2.3' 'openldap' 'sane-backends' 'hspell' 'flex' 'opensp' \
@@ -17,7 +17,6 @@ archs=('i686' 'x86_64')
_F_kde_reconf=1
Finclude kde
source=(${source[@]} kde.sh \
-	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff \
kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch \
fix-warning.patch \
x-mplayer2.desktop \
@@ -32,7 +31,7 @@ source=(${source[@]} kde.sh \

subpkgs=('kde-apidox')
subdescs=('KDE API Documentation')
-subdepends=("$pkgname>=$pkgver doxygen qt-docs>=3.3.8-3")
+subdepends=('')
subgroups=('kde-extra kde-docs')
subarchs=('i686 x86_64')

@@ -61,9 +60,8 @@ build()
Ffile /usr/share/mimelnk/application/x-mplayer2.desktop
}

-sha1sums=('45f278311f20d2eb317f2175259f861c0bcf17a9' \
+sha1sums=('b524a5d9969e7319bb5ffb926a39fd6afb39b2ed' \
'b67afb54be3b2ac24ba9a491cb38a871a27a6316' \
-          '2952806f4ad8a31b82cd2795cad95b73822a663b' \
'916c2a2c5e28f4d72720d37348f9c813114adabf' \
'538d8f2076e360f1d733e79b7c35b5326edb41af' \
'e45f5f357859f243e627cfaa7bd9682ac49c2eab' \
From vmiklos at frugalware.org  Tue Oct 16 17:53:17 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 17:53:19 2007
Subject: [Frugalware-git] frugalware-current: libbtctl-0.9.0-2-i686
Message-ID: <20071016155317.B62DC13A4001@genesis.frugalware.org>

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

commit 645f8031bd17ec345169bf19c6b3f98d6148ef8f
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 17:52:17 2007 +0200

libbtctl-0.9.0-2-i686
use Finclude python

diff --git a/source/gnome-extra/libbtctl/FrugalBuild b/source/gnome-extra/libbtctl/FrugalBuild
index 0073645..bb26a19 100644
--- a/source/gnome-extra/libbtctl/FrugalBuild
+++ b/source/gnome-extra/libbtctl/FrugalBuild
@@ -11,7 +11,7 @@ makedepends=('pkgconfig' 'intltool' 'mono' 'gtk2-sharp')
groups=('gnome-extra')
archs=('i686' 'x86_64')
_F_gnome_devel="y"
-Finclude gnome mono
+Finclude gnome mono python
sha1sums=('0bbeac7ac22dff5b352e2fb4944cf0c679ffdd74')

subpkgs=("$pkgname-mono" "$pkgname-python")
@@ -27,7 +27,7 @@ build() {
Fmonocleanup
Fsplit $pkgname-mono usr/lib/mono
Fsplit $pkgname-mono usr/lib/pkgconfig/libbtctl-sharp.pc
-	Fsplit $pkgname-python usr/lib/python2.5
+	Fsplit $pkgname-python usr/lib/python$_F_python_ver
}

# optimization OK
From crazy at frugalware.org  Tue Oct 16 17:57:41 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 17:57:43 2007
Subject: [Frugalware-git] frugalware-current: glib2-2.14.2-1-i686
Message-ID: <20071016155741.5199013A4001@genesis.frugalware.org>

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

commit d46bdba6d90602d6bba8eadb6f935f9d474104c5
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 17:52:14 2007 +0200

glib2-2.14.2-1-i686
* Version bump
* removed some patches are upstream now

diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild
index 381e4ce..a28a7bf 100644
--- a/source/base/glib2/FrugalBuild
+++ b/source/base/glib2/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Christian Hamar alias krix <krics@linuxforum.hu>

pkgname=glib2
-pkgver=2.14.1
-pkgrel=5
+pkgver=2.14.2
+pkgrel=1
pkgdesc="Common C routines used by GTK+2 and other libraries"
url="http://www.gtk.org/"
depends=('glibc')
@@ -15,15 +15,11 @@ _F_gnome_name="glib"
_F_gnome_devel="n"
Finclude gnome
source=($source \
-	glib2-bug476849.patch \
-	glib2-bug478459.patch \
glib2-bug479724.patch \
glib-cast.patch)
_F_cd_path="glib-$pkgver"
## DON'T remove nor change the debug level or it breaks again ..
-sha1sums=('ef9ff562aa7766b0081d37e3ce685843e796c0f8' \
-          '0c6723a3af0c19c735014071d59751ca138d28f8' \
-          'd5294900ed3ee713ee0472a8f05fd9286d2a5690' \
+sha1sums=('0711f1e8abf6a052aa298bcb1350bcf2195da6e4' \
'8aa98ec8c7a8aad90d27e6c81a7fee1c686914fe' \
'a78a870e933a317148e11bffdf5d19c8fe4ac2bd')
# Don't touch that
diff --git a/source/base/glib2/glib2-bug476849.patch b/source/base/glib2/glib2-bug476849.patch
deleted file mode 100644
index 140ada9..0000000
--- a/source/base/glib2/glib2-bug476849.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/glib/ghook.c	2005/11/01 18:10:31	4320
-+++ trunk/glib/ghook.c	2007/09/19 20:36:53	5776
-@@ -130,7 +130,8 @@
-   g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
-   g_return_if_fail (!G_HOOK_IN_CALL (hook));
-
--  hook_list->finalize_hook (hook_list, hook);
-+  if(hook_list->finalize_hook != NULL)
-+      hook_list->finalize_hook (hook_list, hook);
-   g_slice_free1 (hook_list->hook_size, hook);
- }
diff --git a/source/base/glib2/glib2-bug478459.patch b/source/base/glib2/glib2-bug478459.patch
deleted file mode 100644
index 712c38a..0000000
--- a/source/base/glib2/glib2-bug478459.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- trunk/gobject/gtypemodule.h	2006/12/29 06:12:11	5179
-+++ trunk/gobject/gtypemodule.h	2007/09/20 10:56:34	5777
-@@ -86,6 +86,7 @@
- static void \
- type_name##_register_type (GTypeModule *type_module) \
- { \
-+  GType g_define_type_id; \
-   const GTypeInfo g_define_type_info = { \
-     sizeof (TypeName##Class), \
-     (GBaseInitFunc) NULL, \
-@@ -103,6 +104,7 @@
- 						     #TypeName, \
- 						     &g_define_type_info, \
- 						     (GTypeFlags) flags); \
-+  g_define_type_id = type_name##_type_id; \
-   { CODE ; } \
- }
From vmiklos at frugalware.org  Tue Oct 16 17:58:25 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 17:58:25 2007
Subject: [Frugalware-git] frugalware-current: gawk-3.1.5-2-i686
Message-ID: <20071016155825.3590913A4001@genesis.frugalware.org>

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

commit af768e2e8507c9a107674edef06e89716ea083fa
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 17:58:03 2007 +0200

gawk-3.1.5-2-i686
url and up2date fix

diff --git a/source/base/gawk/FrugalBuild b/source/base/gawk/FrugalBuild
index bf8ed34..f153bf7 100644
--- a/source/base/gawk/FrugalBuild
+++ b/source/base/gawk/FrugalBuild
@@ -5,11 +5,11 @@ pkgname=gawk
pkgver=3.1.5
pkgrel=2
pkgdesc="Gnu version of awk"
-url="http://www.gnu.org/directory/GNU/gawk.html"
+url="http://www.gnu.org/software/gawk/"
depends=('glibc')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
-up2date="lynx -dump $url |grep stable|sed 's/.*n \(.*\) (.*/\1/'"
+up2date="lynx -dump http://ftp.gnu.org/gnu/gawk/|grep -- 'gawk-[0-9.]\+'|Flasttar"
source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
sha1sums=('6cb385b4bc33780a5a4288b787523cbd4a30a900')
From voroskoi at frugalware.org  Tue Oct 16 18:01:43 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 18:01:45 2007
Subject: [Frugalware-git] frugalware-current: fluxbox-1.0.0-1-i686
Message-ID: <20071016160143.B6A8E13A4001@genesis.frugalware.org>

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

commit 58968a6a4a569bf7f18f7f21eb7a3610a4bb7f8e
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 17:44:02 2007 +0200

fluxbox-1.0.0-1-i686
feh goes to rodepends(), closes #2306

diff --git a/source/x11-extra/fluxbox/FrugalBuild b/source/x11-extra/fluxbox/FrugalBuild
index dc8c56a..937a30e 100644
--- a/source/x11-extra/fluxbox/FrugalBuild
+++ b/source/x11-extra/fluxbox/FrugalBuild
@@ -10,7 +10,7 @@ _F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.fluxbox.org"
depends=('libxft' 'libxpm' 'imlib2' 'libstdc++')
-rodepends=('xorg-server')
+rodepends=('xorg-server' 'feh')
groups=('x11-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep LATEST |sed -e 's/.*(v\(.*\))/\1/'"
From vmiklos at frugalware.org  Tue Oct 16 18:11:09 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Oct 16 18:11:12 2007
Subject: [Frugalware-git] frugalware-current: star-1.5a86-1-i686
Message-ID: <20071016161109.92DFF13A4001@genesis.frugalware.org>

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

commit 6b30f38271e2e473dab435cf324abeb9a7e33024
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Tue Oct 16 18:03:45 2007 +0200

star-1.5a86-1-i686
version bump

diff --git a/source/apps-extra/star/FrugalBuild b/source/apps-extra/star/FrugalBuild
index 7d1fbbc..b568652 100644
--- a/source/apps-extra/star/FrugalBuild
+++ b/source/apps-extra/star/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Michael Surette <msurette@laframboise.net>

pkgname=star
-pkgver=1.5a85
+pkgver=1.5a86
pkgrel=1
pkgdesc="very fast and Posix 1003.1 compliant tar"
url="http://cdrecord.berlios.de/old/private/star.html"
@@ -13,7 +13,7 @@ groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="elinks -dump ftp://ftp.berlios.de/pub/star/alpha |grep [0-9].tar.bz2|tail -n1|sed -e 's/.*star-//' -e 's/.tar.bz2//'"
source=("ftp://ftp.berlios.de/pub/$pkgname/alpha/$pkgname-$pkgver.tar.bz2")
-sha1sums=('c47dc2b6068776dacf2f968dace976ee13b36b1c')
+sha1sums=('a59ba08231cb1cc26d2bcc02ec26177c5dd54236')

build()
{
From voroskoi at frugalware.org  Tue Oct 16 19:12:48 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 19:12:50 2007
Subject: [Frugalware-git] frugalware-current: zinf_remove
Message-ID: <20071016171248.C97AD13A4001@genesis.frugalware.org>

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

commit 0ae343f5817b45d37707c860e58d2f38db54fc10
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 18:56:28 2007 +0200

zinf_remove
old, useless, unmaintained

diff --git a/source/xmultimedia-extra/zinf/FrugalBuild b/source/xmultimedia-extra/zinf/FrugalBuild
deleted file mode 100644
index cb317b0..0000000
--- a/source/xmultimedia-extra/zinf/FrugalBuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Compiling Time: 1.46 SBU
-# Maintainer: voroskoi <voroskoi@frugalware.org>
-
-pkgname=zinf
-pkgver=2.2.5
-pkgrel=3
-pkgdesc="The Zinf audio player is a simple, but powerful audio player for Linux."
-depends=('esd' 'gtk+2' 'gdbm' 'ncurses' 'libmusicbrainz' 'arts' 'id3lib' 'libx11')
-groups=('xmultimedia-extra')
-archs=('i686' 'x86_64')
-Finclude sourceforge
-options=('scriptlet')
-url="http://www.zinf.org"
-up2date="lynx -dump http://www.zinf.org/download.php |grep zinf.*.tar.gz |sed -ne 's/.*f-\(.*\)\.t.*/\1/;1 p'"
-source=(${source[@]} zinf_gcc4.patch zinf-ds.patch sem_fix.diff)
-sha1sums=('5ef056e476fa3bfedcb2d0f7de7859b97a22ca6b' \
-          '73eeafe8c3f46386878e95e4ad7ebae5e62a0a8b' \
-          'd1ade23f5ac9496146c122c825518d52f2492d3a' \
-          'e5dc31d63a4a043cdaf790d8f795d6f3e952b19f')
-
-build() {
-	Fpatchall
-	Fmake --enable-x86opts \
-		--enable-alsa \
-		--enable-arts
-	Fmakeinstall
-}
-
-# optimization OK
diff --git a/source/xmultimedia-extra/zinf/sem_fix.diff b/source/xmultimedia-extra/zinf/sem_fix.diff
deleted file mode 100644
index 1e8a9c0..0000000
--- a/source/xmultimedia-extra/zinf/sem_fix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -NruBb zinf-2.2.5ori/base/unix/src/bootstrap.cpp zinf-2.2.5/base/unix/src/bootstrap.cpp
---- zinf-2.2.5ori/base/unix/src/bootstrap.cpp	2003-11-21 01:21:58.000000000 +0100
-+++ zinf-2.2.5/base/unix/src/bootstrap.cpp	2005-05-19 16:57:50.000000000 +0200
-@@ -149,7 +149,9 @@
-                         ResolvePath(path);
-
-                     strncpy(pPtr, path.c_str(),path.length());
--                    pPtr += strlen(pPtr) + 1;
-+
-+		    pPtr[path.length()]='\0';
-+		    pPtr += path.length() + 1;
-                 }
-                 *pPtr = 0;
-
diff --git a/source/xmultimedia-extra/zinf/zinf-ds.patch b/source/xmultimedia-extra/zinf/zinf-ds.patch
deleted file mode 100644
index 4e4b839..0000000
--- a/source/xmultimedia-extra/zinf/zinf-ds.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -dPNur zinf-2.2.5/plm/metadata/id3lib/id3lib.cpp zinf-2.2.5-new/plm/metadata/id3lib/id3lib.cpp
---- zinf-2.2.5/plm/metadata/id3lib/id3lib.cpp	2004-01-30 13:06:02.000000000 +0100
-+++ zinf-2.2.5-new/plm/metadata/id3lib/id3lib.cpp	2005-07-19 23:37:11.000000000 +0200
-@@ -304,10 +304,45 @@
- }
-
-
-+static int rccGetCurrentEncoding(char *result, unsigned int n) {
-+    unsigned int i;
-+    char *l;
-+
-+    if ((!result)||(!n)) return -1;
-+
-+	l = getenv("CHARSET");
-+#ifdef HAVE_CODESET
-+	if (!l) l = nl_langinfo(CODESET);
-+#endif
-+	if (l) {
-+	    if (strlen(l)>=n) return -1;
-+	    strcpy(result, l);
-+	    return 0;
-+	}
-+
-+	l = setlocale(LC_CTYPE, NULL);
-+	if (!l) return -1;
-+
-+    for (i=0;((l[i])&&(l[i]!='.')&&(l[i]!='_'));i++);
-+    if (i>=n) return -1;
-+
-+    l = strrchr(l, '.');
-+    if (!l) return -1;
-+
-+    for (i=0;((l[i])&&(l[i]!='@'));i++);
-+    if (i>=n) return -1;
-+
-+    strncpy(result,l+1,i-1);
-+    result[i]=0;
-+
-+    return 0;
-+}
-+
- static
- bool getTag(ID3_Tag&tag, ID3_FrameID frameid, string &result)
- {
--    static char buffer[1024];
-+    int err;
-+    static char buffer[1024], locale[64];
- #ifdef HAVE_GLIB
-     gchar *utfbuffer;
- #endif
-@@ -326,7 +361,8 @@
- 	    return true;
- 	  }
- 	  else {
--	    utfbuffer=g_convert(buffer, sizeof buffer, "UTF-8", charset.c_str(), NULL, NULL, NULL);
-+	    err = rccGetCurrentEncoding(locale, 64);
-+	    utfbuffer=g_convert(buffer, sizeof buffer, "UTF-8", err?charset.c_str():locale, NULL, NULL, NULL);
- 	    result=utfbuffer;
- 	    g_free(utfbuffer);
- 	    return true;
-diff -dPNur zinf-2.2.5/ui/ncurses/Makefile.am zinf-2.2.5-new/ui/ncurses/Makefile.am
---- zinf-2.2.5/ui/ncurses/Makefile.am	2003-09-16 19:35:31.000000000 +0200
-+++ zinf-2.2.5-new/ui/ncurses/Makefile.am	2005-07-19 23:51:02.000000000 +0200
-@@ -3,11 +3,11 @@
- plugin_LTLIBRARIES = ncurses-ui.la
-
- ncurses_ui_la_SOURCES = ncursesUI.cpp
--ncurses_ui_la_LIBADD = $(NCURSES_LIBS)
-+ncurses_ui_la_LIBADD = $(NCURSES_LIBS) $(GLIB_LIBS)
- ncurses_ui_la_LDFLAGS = $(plugin_ldflags)
-
- noinst_HEADERS = ncursesUI.h
-
--AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes)
-+AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) $(GLIB_CFLAGS)
-
- # arch-tag: 19b44c0b-0802-4cfc-9d47-519f9049c888
-diff -dPNur zinf-2.2.5/ui/ncurses/Makefile.in zinf-2.2.5-new/ui/ncurses/Makefile.in
---- zinf-2.2.5/ui/ncurses/Makefile.in	2004-02-09 01:48:25.000000000 +0100
-+++ zinf-2.2.5-new/ui/ncurses/Makefile.in	2005-07-20 00:23:03.823574339 +0200
-@@ -231,7 +231,7 @@
-
- noinst_HEADERS = ncursesUI.h
-
--AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes)
-+AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) $(GLIB_CFLAGS)
- subdir = ui/ncurses
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-diff -dPNur zinf-2.2.5/ui/ncurses/ncursesUI.cpp zinf-2.2.5-new/ui/ncurses/ncursesUI.cpp
---- zinf-2.2.5/ui/ncurses/ncursesUI.cpp	2003-09-16 19:35:31.000000000 +0200
-+++ zinf-2.2.5-new/ui/ncurses/ncursesUI.cpp	2005-07-20 00:03:31.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <termios.h>
- #include <signal.h>
-
-+
- using namespace std;
- #include "config.h"
- #include "i18n.h"
-@@ -41,6 +42,10 @@
- #include "thread.h"
- #include "eventdata.h"
-
-+#ifdef HAVE_GLIB
-+#include <glib.h>
-+#endif
-+
- #define stdinfd 0
-
- extern "C" {
-@@ -262,6 +267,40 @@
-
- }
-
-+static int rccGetCurrentEncoding(char *result, unsigned int n) {
-+    unsigned int i;
-+    char *l;
-+
-+    if ((!result)||(!n)) return -1;
-+
-+	l = getenv("CHARSET");
-+#ifdef HAVE_CODESET
-+	if (!l) l = nl_langinfo(CODESET);
-+#endif
-+	if (l) {
-+	    if (strlen(l)>=n) return -1;
-+	    strcpy(result, l);
-+	    return 0;
-+	}
-+
-+	l = setlocale(LC_CTYPE, NULL);
-+	if (!l) return -1;
-+
-+    for (i=0;((l[i])&&(l[i]!='.')&&(l[i]!='_'));i++);
-+    if (i>=n) return -1;
-+
-+    l = strrchr(l, '.');
-+    if (!l) return -1;
-+
-+    for (i=0;((l[i])&&(l[i]!='@'));i++);
-+    if (i>=n) return -1;
-+
-+    strncpy(result,l+1,i-1);
-+    result[i]=0;
-+
-+    return 0;
-+}
-+
- Error ncursesUI::AcceptEvent(Event *e) {
-     if (e) {
-         switch (e->Type()) {
-@@ -342,36 +381,69 @@
-                     break;
-                 md = pItem->GetMetaData();
-
-+		char *recoded;
-+		char locale[64];
-+#ifdef HAVE_GLIB
-+		if (rccGetCurrentEncoding(locale, 64)) strcpy(locale, "UTF-8");
-+#else
-+		recoded = NULL;
-+#endif
-+
-+
-                 clear();
-                 move(0,0);
-                 showInfo();
-                 move(2, 0);
-                 addstr(_("Title  : "));
--                if (md.Title().c_str()[0] != '\0')
--                    addstr((char *)md.Title().c_str());
--                else
-+                if (md.Title().c_str()[0] != '\0') {
-+#ifdef HAVE_GLIB
-+		    recoded = g_convert(md.Title().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
-+#endif
-+                    addstr(recoded?recoded:(char *)md.Title().c_str());
-+                } else
-                     addstr(pmvi->m_filename.c_str());
-+
-+#ifdef HAVE_GLIB
-+		if (recoded) free(recoded);
-+		recoded = g_convert(md.Artist().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
-+#endif
-                 addstr(_("\nArtist : "));
--                addstr((char *)md.Artist().c_str());
-+                addstr(recoded?recoded:(char *)md.Artist().c_str());
-+#ifdef HAVE_GLIB
-+		if (recoded) free(recoded);
-+		recoded = g_convert(md.Album().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
-+#endif
-                 addstr(_("\nAlbum  : "));
--                addstr((char *)md.Album().c_str());
-+                addstr(recoded?recoded:(char *)md.Album().c_str());
-                 addstr(_("\nYear   : "));
-                 if (md.Year() != 0)
-                 {
-                     sprintf(buf, "%d", md.Year());
-                     addstr(buf);
-                 }
-+#ifdef HAVE_GLIB
-+		if (recoded) free(recoded);
-+		recoded = g_convert(md.Genre().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
-+#endif
-                 addstr(_("\nGenre  : "));
--                addstr((char *)md.Genre().c_str());
-+                addstr(recoded?recoded:(char *)md.Genre().c_str());
-                 addstr(_("\nTrack  : "));
-                 if (md.Track() != 0)
-                 {
-                     sprintf(buf, "%d", md.Track());
-                     addstr(buf);
-                 }
-+#ifdef HAVE_GLIB
-+		if (recoded) free(recoded);
-+		recoded = g_convert(md.Comment().c_str(), -1, locale, "UTF-8", NULL, NULL, NULL);
-+#endif
-                 addstr(_("\nComment: "));
--                addstr((char *)md.Comment().c_str());
-+                addstr(recoded?recoded:(char *)md.Comment().c_str());
-                 addstr("\n");
-+
-+#ifdef HAVE_GLIB
-+		if (recoded) free(recoded);
-+#endif
-                 refresh();
-
-                 counter = 0;
diff --git a/source/xmultimedia-extra/zinf/zinf_gcc4.patch b/source/xmultimedia-extra/zinf/zinf_gcc4.patch
deleted file mode 100644
index 5c62707..0000000
--- a/source/xmultimedia-extra/zinf/zinf_gcc4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- zinf-2.2.5.orig/base/include/player.h	2004-02-02 23:09:35.000000000 +0530
-+++ zinf-2.2.5/base/include/player.h	2006-09-09 14:48:13.000000000 +0530
-@@ -155,13 +155,13 @@
-
-     #define _EQUALIZER_ENABLE_
-     #ifdef  _EQUALIZER_ENABLE_
--    void Player::SetEQData(Event *pEvent);
-+    void SetEQData(Event *pEvent);
-     #endif // _EQUALIZER_ENABLE_
-     #undef  _EQUALIZER_ENABLE_
-
-     #define _VISUAL_ENABLE_
-     #ifdef  _VISUAL_ENABLE_
--    void Player::SendVisBuf(Event *pEvent);
-+    void SendVisBuf(Event *pEvent);
-     #endif // _VISUAL_ENABLE_
-     #undef  _VISUAL_ENABLE_
-
---- zinf-2.2.5.orig/base/include/queue.h
-+++ zinf-2.2.5/base/include/queue.h
-@@ -24,6 +24,8 @@
- #ifndef INCLUDED_QUEUE_H_
- #define INCLUDED_QUEUE_H_
-
-+#include <cassert>
-+
- #include "config.h"
- #include "mutex.h"
\ No newline at end of file
From voroskoi at frugalware.org  Tue Oct 16 19:29:35 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 19:29:38 2007
Subject: [Frugalware-git] frugalware-current: cracklib-2.8.12-1-i686
Message-ID: <20071016172935.3B14A13A4001@genesis.frugalware.org>

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

commit c9eb32f03e715c7355a39fc2e0b64f9e5cc4cdad
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 19:13:11 2007 +0200

cracklib-2.8.12-1-i686
version bump

diff --git a/source/lib-extra/cracklib/FrugalBuild b/source/lib-extra/cracklib/FrugalBuild
index 376ea26..1f7d71d 100644
--- a/source/lib-extra/cracklib/FrugalBuild
+++ b/source/lib-extra/cracklib/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=cracklib
-pkgver=2.8.10
+pkgver=2.8.12
pkgrel=1
pkgdesc="Next generation version of libCrack password checking library."
depends=('glibc')
@@ -14,6 +14,6 @@ build() {
Fbuild --with-default-dict='$(libdir)/cracklib_dict'
Ffilerel dicts/cracklib-small /usr/share/dict/cracklib-small
}
-sha1sums=('e2c5bf7863d9da2cd0fdaeff8b78b5450aece8e0')
+sha1sums=('0a77b21366cfbad675e6e44642026c89b87f41ce')

# optimization OK
From voroskoi at frugalware.org  Tue Oct 16 20:10:46 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 20:10:48 2007
Subject: [Frugalware-git] frugalware-current: swt-3.3-1-i686
Message-ID: <20071016181046.870C513A4001@genesis.frugalware.org>

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

commit 68ab4d6b7779edabb71578bf7b9b4e572cf21962
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 19:54:55 2007 +0200

swt-3.3-1-i686
fixed up2date, new m8r
ok with vmiklos@

diff --git a/source/xlib-extra/swt/FrugalBuild b/source/xlib-extra/swt/FrugalBuild
index 47bb25c..621cf22 100644
--- a/source/xlib-extra/swt/FrugalBuild
+++ b/source/xlib-extra/swt/FrugalBuild
@@ -1,17 +1,18 @@
# Compiling Time: 0.09 SBU
-# Maintainer: VMiklos <vmiklos@frugalware.org>
+# Contributor: VMiklos <vmiklos@frugalware.org>
+# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=swt
pkgver=3.3
date=200706251500
pkgrel=1
-pkgdesc="GTK based SWT Library"
-url="http://www.eclipse.org/"
+pkgdesc="SWT is an open source widget toolkit for Java designed to provide efficient, portable access to the user-interface."
+url="http://www.eclipse.org/swt"
depends=('j2re' 'gtk+2' 'atk' 'libxtst' 'libstdc++' 'freetype2' 'pango' 'cairo')
makedepends=('j2sdk' 'apache-ant')
groups=('xlib-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'"
+up2date="lynx -dump http://www.eclipse.org/swt/ |grep Final |sed -e 's/.*\([0-9]..*\) Final.*/\1/'"
source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/swt-$pkgver-gtk-linux-x86.zip \
build.xml)
sha1sums=('020983352a606ad24738cdaf47360b897efbc856'\
From priyank at frugalware.org  Tue Oct 16 20:28:51 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct 16 20:28:53 2007
Subject: [Frugalware-git] frugalware-current: tea-17.3.3-1-i686
Message-ID: <20071016182851.8E70313A4001@genesis.frugalware.org>

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

commit 989b20bffacf3a4fea14905df039f0592818c973
Author: Priyank <priyank@frugalware.org>
Date:   Tue Oct 16 23:54:49 2007 +0530

tea-17.3.3-1-i686
* Version bump

diff --git a/source/gnome-extra/tea/FrugalBuild b/source/gnome-extra/tea/FrugalBuild
index d5bbeb4..ef17bb6 100644
--- a/source/gnome-extra/tea/FrugalBuild
+++ b/source/gnome-extra/tea/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyankmg@gmail.com>

pkgname=tea
-pkgver=17.3.0
+pkgver=17.3.3
pkgrel=1
pkgdesc="TEA is a GTK2-based text editor for Linux and *BSD."
_F_sourceforge_name="tea"
@@ -20,7 +20,7 @@ _F_desktop_name=Tea
_F_desktop_icon=tea.png
_F_desktop_categories="Utility;Editor;"
_F_cd_path="$pkgname-$pkgver"
-sha1sums=('85646a24cc1e1a16215d3b00acefda6f903f4396')
+sha1sums=('62038ad4f2870fefc5b84d5e07bbf5c3efaed70a')

build()
{
From voroskoi at frugalware.org  Tue Oct 16 20:29:20 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 20:29:22 2007
Subject: [Frugalware-git] frugalware-current: mediawiki-1.11.0-1-i686
Message-ID: <20071016182920.A94C713A4001@genesis.frugalware.org>

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

commit b9a6fe8416d365a7bdf504b447d28eb9cf2f3f0c
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 20:04:35 2007 +0200

mediawiki-1.11.0-1-i686
version bump

diff --git a/source/network-extra/mediawiki/FrugalBuild b/source/network-extra/mediawiki/FrugalBuild
index 040041e..3f92305 100644
--- a/source/network-extra/mediawiki/FrugalBuild
+++ b/source/network-extra/mediawiki/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=mediawiki
-pkgver=1.10.2
+pkgver=1.11.0
pkgrel=1
pkgdesc="The collaborative editing software that runs Wikipedia"
_F_sourceforge_dirname="wikipedia"
@@ -12,7 +12,7 @@ rodepends=('webappconfig' 'apache' 'php>=5.1' 'mysql>=4.0')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url/wiki/Download |grep tar.gz |sed -ne 's/.*i-\(.*\).t.*/\1/;1 p'"
-source=(http://download.wikimedia.org/mediawiki/1.10/mediawiki-$pkgver.tar.gz \
+source=(http://download.wikimedia.org/mediawiki/1.11/mediawiki-$pkgver.tar.gz \
README.Frugalware mediawikisetup)
options=('stick')

@@ -25,6 +25,6 @@ build()
Fexe /usr/bin/mediawikisetup
}
# php code, no need of optimalization
-sha1sums=('4d936849a23a5f4db58a06fef4d33e2d64e4de76' \
+sha1sums=('754ddbbff80b1f76ca5022a0e70253cc1c45a2b1' \
'2c70930c46b8a5d87e830f64dc2761c5506ce967' \
'b9810ea6531b4f61e41778b76f7601f2c4f9b0e2')
From priyank at frugalware.org  Tue Oct 16 20:37:01 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct 16 20:37:03 2007
Subject: [Frugalware-git] frugalware-current: irssi-0.8.12-1-i686
Message-ID: <20071016183701.BE89D13A4001@genesis.frugalware.org>

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

commit 5c821e6a70fbfaf0c21cf45591910df9c071ff52
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 17 00:02:19 2007 +0530

irssi-0.8.12-1-i686
* Version bump

diff --git a/source/network/irssi/FrugalBuild b/source/network/irssi/FrugalBuild
index 18b0382..d69e265 100644
--- a/source/network/irssi/FrugalBuild
+++ b/source/network/irssi/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Zsolt Szalai <xbit.lists@chello.hu>

pkgname=irssi
-pkgver=0.8.11
+pkgver=0.8.12
pkgexver=
pkgrel=1
pkgdesc="Irssi is a modular IRC client for UNIX that currently has only text mode user interface"
@@ -13,6 +13,6 @@ depends=('openssl' 'glib2' 'ncurses')
makedepends=('perl=5.8.8')
up2date="lynx -dump $url/download |grep Latest|sed 's/.*: //;s/$pkgexver//;q'"
source=(http://irssi.org/files/irssi-$pkgver.tar.bz2)
-sha1sums=('e6433e6d622a1ed09be4323105174433fd72516f')
+sha1sums=('00ecca04766c51feef057b2327f67166be473fa3')
Fconfopts="$Fconfopts --with-proxy --enable-ipv6 --with-bot"
# optimization OK
From voroskoi at frugalware.org  Tue Oct 16 20:39:36 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 20:39:38 2007
Subject: [Frugalware-git] frugalware-current: gaupol-0.12.1-1-i686
Message-ID: <20071016183936.9870B13A4001@genesis.frugalware.org>

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

commit 524073002dd12003b3886f29c2b4ce277f6976e6
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 20:22:04 2007 +0200

gaupol-0.12.1-1-i686
version bump

diff --git a/source/gnome-extra/gaupol/FrugalBuild b/source/gnome-extra/gaupol/FrugalBuild
index eca55d7..39b7087 100644
--- a/source/gnome-extra/gaupol/FrugalBuild
+++ b/source/gnome-extra/gaupol/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=gaupol
-pkgver=0.11
+pkgver=0.12.1
pkgrel=1
pkgdesc="Gaupol is a subtitle editor for text-based subtitles."
url="http://home.gna.org/gaupol/"
@@ -13,7 +13,7 @@ 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/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('f84c40aac974fab45f174994562e9c9b420c88e9')
+source=(http://download.gna.org/gaupol/0.12/$pkgname-$pkgver.tar.gz)
+sha1sums=('ee257aab611c50c5e69ac6bd234a04f95e6be33b')

# optimization OK - noarch
From priyank at frugalware.org  Tue Oct 16 20:50:39 2007
From: priyank at frugalware.org (Priyank)
Date: Tue Oct 16 20:50:41 2007
Subject: [Frugalware-git] 
	frugalware-current: libgtksourceviewmm-1.9.3-1-i686
Message-ID: <20071016185039.3B34F13A4001@genesis.frugalware.org>

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

commit d65c03e40ffc882d76dae4ab6ee15936dd9cbd0a
Author: Priyank <priyank@frugalware.org>
Date:   Wed Oct 17 00:17:07 2007 +0530

libgtksourceviewmm-1.9.3-1-i686
* New package / Initial import

diff --git a/source/gnome-extra/libgtksourceviewmm/FrugalBuild b/source/gnome-extra/libgtksourceviewmm/FrugalBuild
new file mode 100644
index 0000000..c7b6a80
--- /dev/null
+++ b/source/gnome-extra/libgtksourceviewmm/FrugalBuild
@@ -0,0 +1,17 @@
+# Compiling Time: 0.15 SBU
+# Maintainer: Priyank Gosalia <priyankmg@gmail.com>
+
+pkgname=libgtksourceviewmm
+pkgver=1.9.3
+pkgrel=1
+pkgdesc="A C++ wrapper for the gtksourceview widget library"
+_F_gnome_devel=y
+Finclude gnome
+url="http://home.gna.org/gtksourceviewmm"
+depends=('glibmm' 'gtkmm' 'gtksourceview>=2.0.0')
+makedepends=('doxygen')
+groups=('gnome-extra')
+archs=('i686' 'x86_64')
+sha1sums=('60bb5f8e37f0c1b2b92abb54a29160df2dea9732')
+
+# optimization OK
From boobaa at frugalware.org  Tue Oct 16 20:56:38 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Tue Oct 16 20:56:38 2007
Subject: [Frugalware-git] frugalware-current: phpmyadmin-2.11.1.1-1-i686
Message-ID: <20071016185638.085B413A4001@genesis.frugalware.org>

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

commit 977916ff57a7b30975e86ccaa0cde5cad7a39ad6
Author: CSÉCSY László <boobaa@frugalware.org>
Date:   Tue Oct 16 20:56:28 2007 +0200

phpmyadmin-2.11.1.1-1-i686
version bump
closes #2489 in -current

diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild
index 859488f..5606aa0 100644
--- a/source/network-extra/phpmyadmin/FrugalBuild
+++ b/source/network-extra/phpmyadmin/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: CSÉCSY László <boobaa@frugalware.org>

pkgname=phpmyadmin
-pkgver=2.11.1
+pkgver=2.11.1.1
pkgrel=1
pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW."
_F_sourceforge_ext="-all-languages.tar.bz2"
@@ -29,4 +29,4 @@ build()
Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2
}

-sha1sums=('a2126442726b7bf7ad7805aa24d7696dcc0a0839')
+sha1sums=('6ad5b1f373e18cceb760792c200d59220e807fac')
From crazy at frugalware.org  Tue Oct 16 21:10:20 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 21:10:24 2007
Subject: [Frugalware-git] kde358: kdebase-3.5.8-1-i686
Message-ID: <20071016191020.49B7813A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=373235a95f857f9f86d57f1b4f88dd8ed7f58b78

commit 373235a95f857f9f86d57f1b4f88dd8ed7f58b78
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 20:55:47 2007 +0200

kdebase-3.5.8-1-i686
* Version bump

diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index f3c2127..0e19516 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -2,14 +2,14 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kdebase
-pkgver=3.5.7
-pkgrel=3
+pkgver=3.5.8
+pkgrel=1
pkgdesc="KDE Base Programs."
-depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.7-3' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \
+depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.8' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \
'xscreensaver-data' 'bdftopcf' 'lmsensors' 'libxxf86misc' 'libfontenc' \
'setxkbmap' 'dbus-qt3>=20060814' 'libsmbclient>=3.0.24-2' 'xkeyboard-config' 'cyrus-sasl>=2.1.22-8' 'libldap')
makedepends=('samba' 'imake' 'doxygen' 'qt-docs' 'graphviz' 'openldap')
-rodepends=('xorg-server>=1.2.0' 'kde-frugalware>=0.6.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop')
+rodepends=('xorg-server>=1.2.0' 'kde-frugalware>=0.7.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop')
groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
conflicts=('ksplash-engine-moodin')
@@ -17,7 +17,6 @@ options=('nodocs')
_F_kde_reconf=1
Finclude kde
source=(${source[@]} \
-	post-3.5.7-kdebase-konqueror.diff \
kde.desktop \
xinitrc.kde \
preloadkde \
@@ -30,11 +29,9 @@ source=(${source[@]} \
media_unmount.desktop.patch \
no-fast-malloc.patch \
lowdiskspace.patch \
-	usb.ids.patch \
clock.patch \
media_ntfs3g.patch \
-	kdebase-3.5.6-konsole_url.diff \
-	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-kdm.diff)
+	kdebase-3.5.6-konsole_url.diff)
## NOTE: if someone change fw-default-dejavu-font.patch its _NEED_ be in sync with
##       fw-default-dejavu-font.patch from kdelibs and both pkgs _NEED_ be recompiled!
##       DO NOT REMOVE or CHANGE fw-default-startkde.patch without permission from m8r!  - crazy -
@@ -42,7 +39,7 @@ source=(${source[@]} \

subpkgs=("$pkgname-docs")
subdescs=("Kdebase Documentation")
-subdepends=("$pkgname=$pkgver")
+subdepends=('')
subgroups=('kde-extra kde-docs')
subarchs=('i686 x86_64')

@@ -81,8 +78,7 @@ build()
Fsplit $pkgname-docs usr/share/doc
}

-sha1sums=('833a35e4bbec2852f0f5267e680590be0c986594' \
-          '3868392701ebe9fce14567a1f52d458d00f31287' \
+sha1sums=('07f2e33aef101e97237676719ef2bf8418d894b2' \
'e1f706c984fc81633663c662e674b6f2c64d2f83' \
'81092d3c9cfc08de1ac63c8318f0f1391501fb8d' \
'47f17c8b39c11496cb13a25db4bf796444f895de' \
@@ -95,9 +91,7 @@ sha1sums=('833a35e4bbec2852f0f5267e680590be0c986594' \
'8c23593b38a050cb38c135209daee85f46a7ee2a' \
'da0d7ef890d5788cfa31ccd1e4812ba17894eb73' \
'a184a44d85b999d3072b5ede35b8b6947f2947f4' \
-          '59b570e137fa6bb622eeb3da1237ca5ec6dbf5a3' \
'1233baad88df6a7a5347db7392a3afa7f21812fd' \
'afff70bdd816bfbff5fb3fd6e612c648ef901858' \
-          '82367166851f1f95037cf00e767bc76135371358' \
-          'b270a1d5b3980f49a274308bec7fc649be1bd315')
+          '82367166851f1f95037cf00e767bc76135371358')
# optimization OK
diff --git a/source/kde/kdebase/usb.ids.patch b/source/kde/kdebase/usb.ids.patch
deleted file mode 100644
index e6828c6..0000000
--- a/source/kde/kdebase/usb.ids.patch
+++ /dev/null
@@ -1,1022 +0,0 @@
-diff -Naurp kdebase-3.5.5/kcontrol/usbview/usb.ids kdebase-3.5.5-p/kcontrol/usbview/usb.ids
---- kdebase-3.5.5/kcontrol/usbview/usb.ids	2005-09-10 10:25:04.000000000 +0200
-+++ kdebase-3.5.5-p/kcontrol/usbview/usb.ids	2006-10-27 20:42:24.000000000 +0200
-@@ -6,7 +6,7 @@
- #	The latest version can be obtained from
- #		http://www.linux-usb.org/usb.ids
- #
--# $Id: usb.ids 436430 2005-07-19 18:52:38Z deller $
-+# $Id: usb.ids,v 1.225 2006/07/13 04:18:02 dbrownell Exp $
- #
-
- # Vendors, devices and interfaces. Please keep sorted.
-@@ -29,7 +29,17 @@
- 03ea  Data Broadcasting Corp.
- 03eb  Atmel Corp.
- 	2002  Mass Storage Device
--	3301  4-port Hub
-+	2015  at90usbkey sample firmware (HID keyboard)
-+	2018  at90usbkey sample firmware (CDC ACM)
-+	2019  stk525 sample firmware (microphone)
-+	201c  at90usbkey sample firmware (HID mouse)
-+	201d  at90usbkey sample firmware (HID generic)
-+	2022  at90usbkey sample firmware (composite device)
-+	2103  JTAG ICE mkII
-+	2ffb  at90usb AVR DFU bootloader
-+	2ffd  at89c5130/c5131 DFU bootloader
-+	2fff  at89c5132/c51snd1c DFU bootloader
-+	3301  at43301 4-port Hub
- 	3312  4-port Hub
- 	5601  at76c510 Prism-II 802.11b Access Point
- 	5603  Cisco 7920 WiFi IP Phone
-@@ -85,7 +95,7 @@
- 	0904  DeskJet 845c
- 	1004  DeskJet 970c/970cse
- 	1005  ScanJet 5400c
--	1016  Jornada 548 Pocket PC
-+	1016  Jornada 548 / iPAQ HW6515 Pocket PC
- 	1104  DeskJet 959c
- 	1105  ScanJet 5470c
- 	1116  Jornada 568 Pocket PC
-@@ -99,6 +109,7 @@
- 	1904  DeskJet 3820
- 	1c17  Color LaserJet 2550l
- 	1e11  PSC-950
-+	2002  Hub
- 	2004  DeskJet 640c
- 	2005  ScanJet 3570c
- 	2104  DeskJet 630c
-@@ -159,9 +170,11 @@
- 	1001  Mustek BearPaw 2400 Scanner
- 0401  National Registry, Inc.
- 0402  ALi Corp.
-+	5462  M5462 IDE Controller
- 	5603  USB 2.0 Q-tec Webcam 300
- 	5621  USB 2.0 Storage Device
- 	5632  USB 2.0 Host-to-Host Link
-+	5637  M5637 IDE Controller
- 0403  Future Technology Devices International, Ltd
- 	0000  H4SMK 7 Port Hub
- 	6001  8-bit FIFO
-@@ -241,7 +254,9 @@
- 	0574  CX6200
- 	0575  DX6490
- 	0576  DX4530
-+	057c  CX7530
- 	057f  DX7590
-+	5010  Wireless Adapter
- 040b  Weltrend Semiconductor
- 	6510  Weltrend Bar Code Reader
- 	6520  XBOX Xploder
-@@ -278,13 +293,13 @@
- 041b  d'TV
- 041d  S3, Inc.
- 041e  Creative Technology, Ltd
--	1002  Nomad II MP3 Player
-+	1002  Nomad II
- 	1003  Blaster GamePad Cobra
- 	1050  GamePad Cobra
- 	3010  SoundBlaster MP3+
- 	3020  SoundBlaster Audigy 2 NX
- 	4003  VideoBlaster WebCam Go Plus [W9967CF]
--	4004  Nomad II MG MP3 Player
-+	4004  Nomad II MG
- 	4005  WebCam Blaster Go ES
- 	400a  PC-Cam 300
- 	400b  PC-Cam 600
-@@ -299,24 +314,32 @@
- 	401d  WebCam NX Ultra
- 	401e  WebCam NX Pro
- 	401f  Webcam Notebook
--	4036  Webcam Live
-+	4036  Webcam Live!/Live! Pro
- 	403a  WebCam NX Pro 2
- 	403c  WebCam Live! Ultra
--	4100  Nomad Jukebox 2 MP3 player
--	4101  Nomad Jukebox 3 MP3 player
--	4106  Nomad MuVo MP3 Player
--	4108  Nomad Jukebox Zen MP3 player
--	4109  Nomad Jukebox Zen NX MP3 player
--	410b  Nomad Jukebox Zen USB 2.0 MP3 player
--	410c  Nomad MuVo NX MP3 Player
--	4110  Nomad Jukebox Zen Xtra MP3 player
-+	403d  WebCam Notebook Ultra
-+	4100  Nomad Jukebox 2
-+	4101  Nomad Jukebox 3
-+	4106  Nomad MuVo
-+	4108  Nomad Jukebox Zen
-+	4109  Nomad Jukebox Zen NX
-+	410b  Nomad Jukebox Zen USB 2.0
-+	410c  Nomad MuVo NX
-+	4110  Nomad Jukebox Zen Xtra
- 	4111  Dell Digital Jukebox
--	4116  MuVo^2 MP3 Player
-+	4116  MuVo^2
- 	4117  Nomad MuVo TX
--	411b  Nomad Jukebox Zen Touch MP3 player
--	411e  Nomad Jukebox Zen Micro MP3 player
-+	411b  Zen Touch
-+	411d  Zen
-+	411e  Zen Micro
- 	4123  Zen Portable Media Center
--	412b  MuVo N200 MP3 player with FM radio
-+	4126  Dell DJ (2nd gen)
-+	4127  Dell DJ
-+	412b  MuVo N200 with FM radio
-+	4134  Zen Neeon
-+	4136  Zen Sleek
-+	4139  Zen Nano Plus
-+	413c  Zen MicroPhoto
- 041f  LCS Telegraphics
- 0420  Chips and Technologies
- 0421  Nokia Mobile Phones
-@@ -326,6 +349,9 @@
- 	040f  6230 GSM Phone
- 	0410  6630 Imaging Smartphone
- 	0415  9300 GSM Smartphone
-+	041a  9500 GSM Communicator (RNDIS)
-+	041b  9300 GSM Smartphone (RNDIS)
-+	0429  6230i Camera Phone
- 	0800  Connectivity Cable DKU-5
- 0422  ADI Systems, Inc.
- 0423  Computer Access Technology Corp.
-@@ -337,6 +363,7 @@
- 	20fc  6-in-1 Card Reader
- 	223a  8-in-1 Card Reader
- 0425  Motorola Semiconductors HK, Ltd
-+	0101  G-Tech Wireless Mouse & Keyboard
- 0426  Integrated Device Technology, Inc.
- 0427  Motorola Electronics Taiwan, Ltd
- 0428  Advanced Gravis Computer Tech, Ltd
-@@ -415,6 +442,7 @@
- 	2046  TUSB2046 Hub
- 	2077  TUSB2077 Hub
- 	3410  TUSB3410 Microcontroller
-+	5409  Frontier Labs NEX IA+ Digital Audio Player
- 	6000  AU5 ADSL Modem (pre-reenum)
- 	6001  AU5 ADSL Modem
- 	e001  GraphLink
-@@ -429,12 +457,14 @@
- 0456  Analog Devices, Inc.
- 0457  Silicon Integrated Systems Corp.
- 	0150  Super Talent 1GB Flash Drive
-+	0151  Super Flash 1GB Flash Drive
- 0458  KYE Systems Corp. (Mouse Systems)
- 	0001  Mouse
- 	0002  Genius NetMouse Pro
- 	0003  Genius NetScroll+
- 	000e  VideoCAM Web
- 	001a  Genius WebScroll+
-+	004c  Slimstar Pro Keyboard
- 	0100  EasyPen Tablet
- 	0101  CueCat
- 	1003  Genius VideoCam
-@@ -448,6 +478,7 @@
- 	2013  ColorPage-HR7 Scanner
- 	2015  ColorPage-HR7LE Scanner
- 	2016  ColorPage-HR6X Scanner
-+	301d  Genius MaxFire MiniPad
- 	7004  VideoCAM Express
- 	7007  VideoCAM Web
- 	7012  WebCAM USB2.0
-@@ -455,6 +486,7 @@
- 045a  SONICblue, Inc.
- 	0b4a  SupraMax 2890 56K Modem [Lucent Atlas]
- 	0b68  SupraMax 56K Modem
-+	5210  Rio Karma Music Player
- 	5220  Rio Nitrus MP3 Player
- 045b  Hitachi, Ltd
- 045d  Nortel Networks, Ltd
-@@ -488,9 +520,11 @@
- 	006e  MN510 802.11b Adapter
- 	007d  Notebook Optical Mouse
- 	007e  Wireless Transceiver for Bluetooth
-+	0083  Basic Optical Mouse
- 	008a  Wireless Keyboard and Mouse
- 	008c  Wireless Intellimouse Explorer 2.0
- 	00b9  Wireless Optical Mouse 3.0
-+	00bd  Fingerprint Reader
- 	0284  Xbox DVD Playback Kit
- 	0288  Xbox Controller S Hub
- 	0289  Xbox Controller S
-@@ -535,6 +569,7 @@
- 	0001  My3000 Keyboard
- 	0003  My3000 Hub
- 	0005  XX33 SmartCard Reader Keyboard
-+	0023  Cymotion Master Linux Keyboard
- 046b  American Megatrends, Inc.
- 046c  Toshiba Corp., Digital Media Equipment
- 046d  Logitech, Inc.
-@@ -550,17 +585,21 @@
- 	0870  QuickCam Express
- 	0890  QuickCam Traveler
- 	08a0  QuickCam IM
-+	08a2  Labtec WebCam Pro
- 	08b0  QuickCam 3000 Pro [pwc]
- 	08b1  QuickCam Notebook Pro
- 	08b2  QuickCam Pro 4000
- 	08b3  QuickCam Zoom
- 	08b4  QuickCam Zoom
-+	08f0  QuickCam Messenger
- 	0900  ClickSmart 310
- 	0901  ClickSmart 510
- 	0903  ClickSmart 820
- 	0905  ClickSmart 820
- 	0920  QuickCam Express
- 	0921  Labtec WebCam
-+	0928  Quickcam Express
-+	092a  QuickCam for Notebooks
- 	0950  Pocket Camera
- 	0960  ClickSmart 420
- 	0970  Pocket750
-@@ -570,13 +609,15 @@
- 	c004  WingMan Gaming Mouse
- 	c00b  MouseMan Wheel
- 	c00c  Optical Wheel Mouse
--	c00e  Optical Mouse
-+	c00e  M-BJ69 Optical Wheel Mouse
- 	c012  Optical Mouse
--	c016  Optical Mouse
-+	c016  M-UV69a Optical Wheel Mouse
- 	c01b  MX310 Optical Mouse
-+	c01e  MX518 Optical Mouse
- 	c025  MX500 Optical Mouse
- 	c030  iFeel Mouse
- 	c032  MouseMan iFeel
-+	c03e  Premium Optical Wheel Mouse
- 	c202  WingMan Formula
- 	c207  WingMan Extreme Digital 3D
- 	c208  WingMan Gamepad Extreme
-@@ -584,6 +625,7 @@
- 	c20a  WingMan RumblePad
- 	c20c  WingMan Precision
- 	c211  iTouch Cordless Reciever
-+	c216  Dual Action Gamepad
- 	c281  WingMan Force
- 	c283  WingMan Force 3D
- 	c285  WingMan Strike Force 3D
-@@ -603,6 +645,7 @@
- 	c504  Cordless Mouse+Keyboard Receiver
- 	c505  Cordless Mouse+Keyboard Receiver
- 	c506  MX-700 Cordless Mouse Receiver
-+	c50b  Cordless Desktop Optical
- 	c50e  MX-1000 Cordless Mouse Receiver
- 	d001  QuickCam Pro
- 046e  Behavior Tech. Computer Corp.
-@@ -651,6 +694,7 @@
- 	1003  Orbit TrackBall
- 	1005  TurboBall
- 	1009  Orbit TrackBall for Mac
-+	101f  PocketMouse Pro
- 	2010  Wireless Presentation Remote
- 	4005  Gravis Eliminator GamePad Pro
- 	4006  Gravis Eliminator AfterShock
-@@ -668,6 +712,7 @@
- 0483  SGS Thomson Microelectronics
- 	1307  Cytronix 6in1 card reader
- 	163d  Cool Icam Digi-MP3
-+	2016  Fingerprint Reader
- 	2017  Biometric Smart Card Reader
- 	7554  56k SoftModem
- 0484  Specialix
-@@ -704,6 +749,7 @@
- 	001a  S4 100 Scanner
- 	0021  S200 Scanner
- 	0033  801.11b Adapter [orinoco]
-+	0051  KU-0133 Easy Access Interner Keyboard
- 	505a  SA-11x0 based Linux Device, or Itsy (experimental)
- 	8511  iPAQ Networking 10/100 Ethernet [pegasus2]
- 04a0  Digital Equipment Corp.
-@@ -754,6 +800,7 @@
- 	1072  I850 Printer
- 	1073  I550 Printer
- 	1074  S330 Printer
-+	1094  PIXMA iP3000x Printer
- 	2201  CanoScan FB320U
- 	2202  CanoScan FB620U
- 	2204  CanoScan FB630U
-@@ -836,6 +883,8 @@
- 	30bf  Digital IXUS 40
- 	30eb  EOS 20D
- 	30ec  EOS 20D (ptp)
-+	30ee  EOS 350D
-+	30ef  EOS 350D (ptp)
- 04aa  DaeWoo Telecom, Ltd
- 04ab  Chromatic Research
- 04ac  Micro Audiometrics Corp.
-@@ -863,6 +912,8 @@
- 	0119  Coolpix 5400 (ptp)
- 	011d  Coolpix 3700 (ptp)
- 	012c  Coolpix 4100 (storage)
-+	0136  Coolpix 7900 (storage)
-+	0137  Coolpix 7900 (ptp)
- 	0202  Coolpix SQ (ptp)
- 	0205  Coolpix 5200 (storage)
- 	0206  Coolpix 5200 (ptp)
-@@ -878,6 +929,7 @@
- 	3100  NetVista Mouse
- 	3103  ScrollPoint Pro Mouse
- 	3107  ThinkPad 800dpi Optical Travel Mouse
-+	3108  800dpi Optical Mouse w/ Scroll Point
- 	3109  Optical ScrollPoint Pro Mouse
- 	310b  Red Wheel Mouse
- 	4427  Portable CD ROM
-@@ -896,6 +948,7 @@
- 	5500  HID->COM RS232 Adapter
- 	6560  CY7C65640 USB-2.0 "TetraHub"
- 	6830  USB-2.0 IDE Adapter
-+	7417  Wireless PC Lock
- 	8613  CY7C68013 EZ-USB FX2 USB 2.0 Development Kit
- 	d5d5  CY7C63x0x Zoltrix Z-Boxer GamePad
- 	f000  CY30700 Licorice evaluation board
-@@ -1054,10 +1107,12 @@
- 04e7  Elo TouchSystems
- 	0001  TouchScreen
- 04e8  Samsung Electronics Co., Ltd
-+	0110  Connect3D Flash Drive
- 	0111  Connect3D Flash Drive
- 	1003  MP3 Player and Recorder
- 	300c  ML-1210 Printer
- 	324c  ML-1740 Printer
-+	3260  CLP-510 Color Laser Printer
- 	5a03  Yepp MP3 Player
- 	6601  Z100 Mobile Phone
- 04e9  PC-Tel, Inc.
-@@ -1077,6 +1132,7 @@
- 	0002  NT68P81 Keyboard
- 	0110  KU-2971 Keyboard
- 	0112  KU-8933 Keyboard with PS/2 Mouse port
-+	0116  KU-2971 German Keyboard
- 04f3  Elan Microelectronics Corp.
- 04f4  Harting Elektronik, Inc.
- 04f5  Fujitsu-ICL Systems, Inc.
-@@ -1129,6 +1185,7 @@
- 050c  InnoMedia, Inc.
- 050d  Belkin Components
- 	0103  F5U103 Serial Adapter [etek]
-+	0108  F1DE108B KVM
- 	0109  F5U109/F5U409 PDA Adapter
- 	0115  SCSI Adapter
- 	0121  F5D5050 100Mbps Ethernet
-@@ -1138,6 +1195,7 @@
- 	0803  Nostromo 1745 GamePad
- 	0805  Nostromo N50 GamePad
- 	1203  F5U120-PC Serial Port
-+	7050  F5D7050 ver 1000 WiFi
- 050e  Neon Technology, Inc.
- 050f  KC Technology, Inc.
- 	0003  KC82C160S Hub
-@@ -1260,8 +1318,10 @@
- 	008b  Micro Vault 64M Mass Storage
- 	0099  Clie NR70 PDA Mass Storage
- 	009a  Clie NR70 PDA Serial
-+	00c0  Handycam DCR-30
- 	00c8  MZ-N710 Minidisc Walkman
- 	00ca  MZ-DN430 Minidisc Walkman
-+	00cb  MSAC-US20 Memory Stick Reader
- 	0105  Micro Vault Hub
- 	0107  VCC-U01 Visual Communication Camera
- 	0144  Clie PEG-TH55 PDA
-@@ -1269,6 +1329,9 @@
- 	014d  Memory Stick Reader/Writer
- 	0169  Clie PEG-TJ35 PDA Serial
- 	016a  Clie PEG-TJ35 PDA Mass Storage
-+	01c3  NW-E55 Network Walkman
-+	01d0  DVD+RW External Drive DRU-700A
-+	023b  DVD+RW External Drive DRU-800UL
- 054d  Try Corp.
- 054e  Proside Corp.
- 054f  WYSE Technology Taiwan
-@@ -1358,6 +1421,7 @@
- 	0023  Intuos 12x12
- 	0024  Intuos 12x18
- 	0031  PL500
-+	0042  Intuos 2 6x8
- 	0043  Intuos 2
- 056b  Decicon, Inc.
- 056c  eTEK Labs
-@@ -1372,6 +1436,7 @@
- 056f  Korea Data Systems Co., Ltd
- 0570  Epson America
- 0571  Interex, Inc.
-+	0002  echoFX InterView Lite
- 0572  Conexant Systems (Rockwell), Inc.
- 	0001  Ezcam II WebCam
- 	0002  Ezcam II WebCam
-@@ -1388,6 +1453,7 @@
- 	2d00  Osprey 50
- 	2d01  Hauppauge USB-Live Model 600
- 	4100  USB-TV FM (NTSC)
-+	4110  PNY USB-TV (NTSC) FM
- 	4450  PixelView PlayTv-USB PRO (PAL) FM
- 	4550  ZTV ZT-721 2.4GHz USB A/V Receiver
- 	4d00  Hauppauge WinTV-USB USA
-@@ -1401,16 +1467,18 @@
- 	4d21  Hauppauge WinTV-USB II (PAL)
- 	4d22  Hauppauge WinTV-USB II (PAL) Model 566
- 	4d23  Hauppauge WinTV-USB France 4D23
-+	4d25  Hauppauge WinTV-USB Model 40209 rev B234
- 	4d26  Hauppauge WinTV-USB Model 40209 rev B243
--	4d28  Hauppauge WinTv-USB Model 40204 rev B283
--	4d29  Hauppauge WinTv-USB Model 40205 rev B298
-+	4d27  Hauppauge WinTV-USB Model 40204 Rev B281
-+	4d28  Hauppauge WinTV-USB Model 40204 rev B283
-+	4d29  Hauppauge WinTV-USB Model 40205 rev B298
- 	4d2a  Hauppague WinTV-USB Model 602 Rev B285
- 	4d2b  Hauppague WinTV-USB Model 602 Rev B282
--	4d30  Hauppauge WinTV-USB with FM USA radio Model 602
-+	4d30  Hauppauge WinTV-USB FM Model 40211 Rev B123
- 	4d31  Hauppauge WinTV-USB III (PAL) with FM radio Model 568
- 	4d32  Hauppauge WinTV-USB III (PAL) FM Model 573
- 	4d35  Hauppauge WinTV-USB III (PAL) FM Model 597
--	4d37  Hauppauge WinTv-USB Model 40219 rev E189
-+	4d37  Hauppauge WinTV-USB Model 40219 rev E189
- 0574  City University of Hong Kong
- 0575  Philips Creative Display Solutions
- 0576  BAFO/Quality Computer Accessories
-@@ -1502,6 +1570,7 @@
- 059d  Advanced Input Devices
- 059e  Intelligent Instrumentation
- 059f  LaCie, Ltd
-+	0211  PocketDrive
- 	0212  PocketDrive
- 	a601  HardDrive
- 05a0  Vetronix Corp.
-@@ -1540,6 +1609,7 @@
- 	1002  Apple Extended Keyboard Hub [Mitsumi]
- 	1101  Speakers
- 	1201  3G iPod
-+	1300  iPod Shuffle
- 	8202  HCF V.90 Data/Fax Modem
- 	8203  Bluetooth HCI
- 05ad  Y.C. Cable U.S.A., Inc.
-@@ -1580,6 +1650,7 @@
- 	0101  RDC-5300 Camera
- 	2201  RDC-7 Camera
- 	2205  Caplio RR30 / Medion MD 6126 Camera
-+	2212  Caplio R1v Camera
- 05cb  PowerVision Technologies, Inc.
- 	1483  PV8630 interface (scanners, webcams)
- 05cc  ELSA AG
-@@ -1648,11 +1719,14 @@
- 	0300  GLUSB98PT Parallel Port
- 	0406  Hub
- 	0502  GL620USB GeneLink USB-USB Bridge
-+	0604  USB 1.1 Hub
-+	0605  USB 2.0 Hub [ednet]
- 	0660  USB 2.0 Hub
- 	0700  SIIG US2256 CompactFlash Card Reader
- 	0701  USB 2.0 IDE Adapter
- 	0702  USB 2.0 IDE Adapter
- 	0703  Card Reader
-+	0710  USB 2.0 33-in-1 Card Reader
- 	0760  Card Reader
- 	07A0  Pen Flash
- 	1205  Afilias Optical Mouse H3003
-@@ -1679,6 +1753,7 @@
- 	0081  Kinesis Integrated Hub
- 	020b  PS2 Adapter
- 	0232  X-Keys Switch Interface, Programming Mode
-+	0261  X-Keys Switch Interface, SPLAT Mode
- 	0264  X-Keys Switch Interface, Composite Mode
- 05f5  Unixtar Technology, Inc.
- 05f6  AOC International
-@@ -1836,9 +1911,12 @@
- 066d  Entrega, Inc.
- 066e  Acer Semiconductor America, Inc.
- 066f  SigmaTel, Inc.
-+	004b  A-Max PA11 MP3 Player
- 	3400  STMP3400 D-Major MP3 Player
- 	3410  STMP3410 D-Major MP3 Player
- 	4200  STIr4200 IrDA Bridge
-+	4210  STIr4210 IrDA Bridge
-+	8004  MSCNMMC MP3 Player
- 	8202  Jens of Sweden / I-BEAD 150M/150H MP3 player
- 0672  Labtec, Inc.
- 	1041  LCS1040 Speaker System
-@@ -1864,6 +1942,7 @@
- 	2501  PL2501 USB-USB Bridge (USB 2.0)
- 	2515  Flash Disk Embedded Hub
- 	2517  Flash Disk Mass Storage Device
-+	3507  PL3507 ATAPI6 Bridge
- 067c  Efficient Networks, Inc.
- 	1001  Siemens SpeedStream 100MBps Ethernet
- 	1022  Siemens SpeedStream 1022 802.11b Adapter
-@@ -2105,6 +2184,7 @@
- 	0240  PS/2 to USB Converter
- 	0300  BAY-3U1S1P Parallel Port
- 	0302  Parallel Port
-+	0900  SVGA Adapter
- 0713  Interval Research Corp.
- 0714  NewMotion, Inc.
- 	0003  ADB to USB convertor
-@@ -2216,7 +2296,8 @@
- 	0810  SDDR-75 ImageMate CF-SM Reader
- 	0830  ImageMate CF/MMC/SD Reader
- 	5150  SDCZ2 Cruzer Mini Flash Drive (thin)
--	5151  Cruzer Micro 512MB Flash Drive
-+	5151  Cruzer Micro 256/512MB Flash Drive
-+	7104  Cruzer Micro Mini 256MB Flash Drive
- 	7112  Cruzer Micro 128MB Flash Drive
- 	7113  Cruzer Micro 256MB Flash Drive
- 	8185  SDCZ2 Cruzer Mini Flash Drive (older, thick)
-@@ -2266,6 +2347,7 @@
- 	0001  Ether USB-T Ethernet [klsi]
- 	0004  FEther USB-TX Ethernet [pegasus]
- 	0012  Stick-11 802.11b Adapter
-+	7613  Stick-11 V2 802.11b Adapter
- 07ab  Freecom Technologies
- 	fc01  IDE bridge
- 	fc03  USB2-IDE IDE bridge
-@@ -2294,7 +2376,8 @@
- 07b4  Olympus Optical Co., Ltd
- 	0100  Camedia C-2100/C-3000 Ultra Zoom Camera
- 	0102  Camedia E-10/C-220/C-50 Camera
--	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/D-560 Zoom Camera
-+	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560 Zoom Camera
-+	0112  MAUSB-100 xD Card Reader
- 	0114  C-350Z Camera
- 	0203  Digital Voice Recorder DW-90
- 	0206  Digital Voice Recorder DS-330
-@@ -2376,6 +2459,8 @@
- 07ea  Iwatsu Electric Co., Ltd
- 07eb  Double-H Technology Co., Ltd
- 07ec  Taiyo Electric Wire & Cable Co., Ltd
-+07ee  Torex Retail (formerly Logware)
-+	0002  Cash Drawer I/F
- 07f6  Circuit Assembly Corp.
- 07f7  Century Corp.
- 07f9  Dotop Technology, Inc.
-@@ -2389,6 +2474,11 @@
- 	9700  2986L FaxModem
- 0809  Genicom Technology, Inc.
- 080a  Evermuch Technology Co., Ltd
-+080c  Datalogic S.p.A.
-+	0300  Gryphon D120 Barcode Scanner
-+	0400  Gryphon D120 Barcode Scanner
-+	0500  Gryphon D120 Barcode Scanner
-+	0600  Gryphon M100 Barcode Scanner
- 080d  Teco Image Systems Co., Ltd
- 	0102  Hercules Scan@home 48
- 0810  Personal Communication Systems, Inc.
-@@ -2436,7 +2526,13 @@
- 0844  Welland Industrial Co., Ltd
- 0846  NetGear, Inc.
- 	1001  EA101 Ethernet [klsi]
-+	4110  MA111 WiFi (v1)
-+	4200  WG121 WiFi (v1)
-+	4210  WG121 WiFi (v2)
-+	4220  WG111 WiFi (v1)
- 	4230  MA111 WiFi
-+	4240  WG111 WiFi (v2)
-+	6a00  WG111 WiFi (v2)
- 084d  Minton Optic Industry Co., Inc.
- 	0003  S-Cam F5 Digital Camera
- 	0011  Argus DC3500 Digital Camera
-@@ -2461,11 +2557,15 @@
- 	000b  Portstation Dual PS/2 Port
- 	0299  Colorvision, Inc. Monitor Spyder
- 	8027  PGSDB9 Serial Port
-+085c  ColorVision, Inc.
-+	0200  Monitor Spyder
- 0862  Teletrol Systems, Inc.
- 0863  Filanet Corp.
- 0864  NetGear, Inc.
- 	4100  MA101 802.11b Adapter
- 	4102  MA101 802.11b Adapter
-+0867  Data Translation, Inc.
-+	9812  ECON Data acquisition unit
- 086a  Emagic Soft-und Hardware GmbH
- 086c  DeTeWe - Deutsche Telephonwerke AG & Co.
- 	1001  Eumex 504PC ISDN TA
-@@ -2599,7 +2699,7 @@
- 0919  Tiger Electronics
- 	0100  Fast Flicks Digital Camera
- 091e  Garmin International
--	0003  GPSmap 60C / GPS 18 / Vista C
-+	0003  GPSmap (various models)
- 0920  Echelon Co.
- 0921  GoHubs, Inc.
- 0922  Dymo-CoStar Corp.
-@@ -2619,6 +2719,7 @@
- 092a  Toshiba Information & Industrial Sys. And Services
- 092b  Sena Technologies, Inc.
- 0930  Toshiba Corp.
-+	6519  Kingston DataTraveler 2.0 USB Stick
- 	6533  512M USB Stick
- 0931  Harmonic Data Systems, Ltd
- 0932  Crescentec Corp.
-@@ -2626,7 +2727,9 @@
- 0934  Netcom Systems
- 0939  Lumberg, Inc.
- 093a  Pixart Imaging, Inc.
-+	2468  Easy Snap Snake Eye WebCam
- 093b  Plextor Corp.
-+	0042  PX-712UF DVD RW
- 093c  Intrepid Control Systems, Inc.
- 	0601  ValueCAN
- 093d  InnoSync, Inc.
-@@ -2696,7 +2799,8 @@
- 09a8  Lin Shiung Enterprise Co., Ltd
- 09a9  Smart Card Technologies Co., Ltd
- 09aa  Intersil Corp.
--	3642  Prism2.x 802.11b Adapter
-+	1000  Prism GT 802.11b/g Adapter
-+	3642  Prism 2.x 802.11b Adapter
- 09ae  Tripp Lite
- 09b2  Franklin Electronic Publishers, Inc.
- 	0001  eBookman Palm Computer
-@@ -2776,6 +2880,7 @@
- 	0004  Pentax Optio 330
- 	0006  Pentax Optio S
- 	0007  Pentax Optio 550
-+	003d  Pentax Optio S55
- 0a18  Heidelberger Druckmaschinen AG
- 0a19  Hua Geng Technologies, Inc.
- 0a21  Medtronic Physio Control Corp.
-@@ -2797,6 +2902,8 @@
- 0a4c  Computex Co., Ltd
- 0a4d  Evolution Electronics, Ltd
- 	008e  MK-249C MIDI Keyboard
-+	00a3  MK-461C MIDI Keyboard
-+	00f5  UC-33e MIDI Controller
- 0a4e  Steinberg Soft-und Hardware GmbH
- 0a4f  Litton Systems, Inc.
- 0a50  Mimaki Engineering Co., Ltd
-@@ -2853,6 +2960,14 @@
- 0aa6  Perception Digital, Ltd
- 	0101  Hercules Jukebox
- 0aa7  Wincor Nixdorf GmbH & Co KG
-+	0200  POS Display BA63
-+	0201  POS Display BA66
-+	0300  POS Printer TH210
-+	0302  POS Printer TH220
-+	0305  Lottery Printer XiPrintPlus
-+	0306  POS Printer TH320
-+	0308  POS Printer TH420
-+	4304  Banking Printer TP07
- 0aa8  TriGem Computer, Inc.
- 0aa9  Baromtec Co.
- 	f01b  Medion MD 6242 MP3 Player
-@@ -2875,6 +2990,7 @@
- 0ac8  Z-Star Microelectronics Corp.
- 	0302  ZC0302 WebCam
- 	301b  ZC0301 WebCam
-+	303b  ZC0303 WebCam
- 0ac9  Micro Solutions, Inc.
- 	0000  Backpack CD-ReWriter
- 	0011  Backpack 40GB Hard Drive
-@@ -2911,6 +3027,8 @@
- 0afe  Cummins Engine Co.
- 0aff  Jump Zone Network Products, Inc.
- 0b05  ASUSTek Computer, Inc.
-+0b0c  Todos Data System AB
-+	0009 Todos Argos Mini II Smart Card Reader
- 0b0e  GN Netcom
- 0b0f  AVID Technology
- 0b10  Pcally
-@@ -2953,6 +3071,8 @@
- 	0100  D'music MP3 Player
- 0b4e  Musical Electronics, Ltd
- 0b50  Dumpries Co., Ltd
-+0b51  Comfort Keyboard Co.
-+	0020  Comfort Keyboard
- 0b52  Colorado MicroDisplay, Inc.
- 0b54  Sinbon Electronics Co., Ltd
- 0b56  TYI Systems, Ltd
-@@ -2998,6 +3118,7 @@
- 0b9f  Chippo Technologies
- 0baf  U.S. Robotics
- 	00eb  USR1120 802.11b Adapter
-+	0118  U5 802.11g Adapter
- 	6112  FaxModem Model 5633
- 0bb0  Concord Camera Corp.
- 0bb1  Infinilink Corp.
-@@ -3006,6 +3127,7 @@
- 0bb3  Ofuji Technology
- 0bb4  High Tech Computer Corp.
- 	00ce  mmO2 XDA GSM/GPRS Pocket PC
-+	00cf  SPV C500 Smart Phone
- 	0a02  Himalaya GSM/GPRS Pocket PC
- 	0a51  SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC
- 0bb5  Murata Manufacturing Co., Ltd
-@@ -3098,6 +3220,7 @@
- 	6005  Sweex Mini WebCam
- 	6029  Triplex i-mini PC Camera
- 	602a  Meade ETX-105EC Camera
-+	602c  Clas Ohlson TWC-30XOP WebCam
- 0c46  WaveRider Communications, Inc.
- 0c4b  Reiner SCT Kartensysteme GmbH
- 	0100  cyberJack e-com/pinpad
-@@ -3152,6 +3275,9 @@
- 0cad  Motorola CGISS
- 0cae  Ascom Business Systems, Ltd
- 0caf  Buslink
-+	2515  Flash Disk Embedded Hub
-+	2516  Flash Disk Security Device
-+	2517  Flash Disk Mass Storage Device
- 	3a00  Hard Drive
- 0cb0  Flying Pig Systems
- 0cb1  Innovonics, Inc.
-@@ -3187,6 +3313,7 @@
- 0cde  Z-Com
- 	0002  XI-725/726 Prism2.5 802.11b Adapter
- 	0005  XI-735 Prism3 802.11b Adapter
-+	0006  Medion 40900 802.11b Adapter
- 0cf1  e-Conn Electronic Co., Ltd
- 0cf2  ENE Technology, Inc.
- 0cf3  Atheros Communications, Inc.
-@@ -3225,6 +3352,11 @@
- 0d40  Ascor, Inc.
- 0d41  Ta Yun Terminals Industrial Co., Ltd
- 0d42  Full Der Co., Ltd
-+0d46  Kobil Systems GmbH
-+	3003  mIDentity Light / KAAN SIM III
-+	4000  mIDentity (mass storage)
-+	4001  mIDentity Basic/Classic (composite device)
-+	4081  mIDentity Basic/Classic (installationless)
- 0d49  Maxtor
- 0d4a  NF Corp.
- 0d4b  Grape Systems, Inc.
-@@ -3251,6 +3383,7 @@
- 0d63  Fritz Gegauf AG
- 0d64  DXG Technology Corp.
- 	0107  Horus MT-409 Camera
-+	0303  DXG-305V Camera
- 0d65  KMJP Co., Ltd
- 0d66  TMT
- 0d67  Advanet, Inc.
-@@ -3277,6 +3410,7 @@
- 	1300  Flash Disk
- 	1320  PS2031 Flash Disk
- 	1420  PS2044 Pen Drive
-+	1470  Vosonic X's-Drive II+ VP2160
- 0d7e  American Computer & Digital Components
- 0d7f  Essential Reality LLC
- 0d80  H.R. Silvine Electronics, Inc.
-@@ -3286,6 +3420,7 @@
- 0d8a  King Jim Co., Ltd
- 0d8b  Ascom Telecommunications, Ltd
- 0d8c  C-Media Electronics, Inc.
-+	000c  Audio Adapter
- 0d8d  Promotion & Display Technology, Ltd
- 0d8e  Global Sun Technology, Inc.
- 	7100  802.11b Adapter
-@@ -3314,11 +3449,14 @@
- 0da3  Nippon Electro-Sensory Devices Corp.
- 0da4  Polar Electro OY
- 0da7  IOGear, Inc.
-+0da8  softDSP Co., Ltd
-+	0001  SDS 200A Oscilloscope
- 0dab  Cubig Group
- 	0100  DVR/CVR-M140 MP3 Player
- 0dad  Westover Scientific
- 0db0  Micro Star International
- 	1967  Bluetooth Dongle
-+	4011  Medion Flash XL V2.0 Card Reader
- 	697a  Bluetooth Dongle
- 	6982  Medion Flash XL V2.7A Card Reader
- 0db1  Wen Te Electronics Co., Ltd
-@@ -3567,6 +3705,7 @@
- 0fca  Research In Motion, Ltd.
- 	0001  Blackberry Handheld
- 0fce  Sony Ericsson Mobile Communications AB
-+	d017  K608i Phone
- 0fcf  Dynastream Innovations, Inc.
- 0fd0  Tulip Computers B.V.
- 0fd4  Tenovis GmbH & Co., KG
-@@ -3678,7 +3817,7 @@
- 10a9  SK Teletech Co., Ltd
- 10aa  Cables To Go
- 10ab  USI Co., Ltd
--	10c5  Sony-Ericsson datacable
-+	10c5  Sony-Ericsson / Samsung DataCable
- 10ac  Honeywell, Inc.
- 10ae  Princeton Technology Corp.
- 10b5  Comodo (PLX?)
-@@ -3712,6 +3851,7 @@
- 10d5  Uni Class Technology Co., Ltd
- 10d6  Actions Semiconductor Co., Ltd
- 	1000  MP3 Player
-+	1100  MPMan MP-Ki 128 MP3 Player/Recorder
- 10de  Authenex, Inc.
- 10df  In-Win Development, Inc.
- 10e0  Post-Op Video, Inc.
-@@ -3779,6 +3919,8 @@
- 119a  ZHAN QI Technology Co., Ltd
- 119b  ruwido austria GmbH
- 	0400  Infrared Keyboard V2.01
-+11a0  Chipcon AS
-+	eb11 CC2400EB 2.0 ZigBee Sniffer
- 11a3  Technovas Co., Ltd
- 11aa  GlobalMedia Group, LLC
- 11ab  Exito Electronics Co., Ltd
-@@ -3803,6 +3945,8 @@
- 	1177  F8E842-DL Mouse
- 124a  AirVast
- 	4017  PC-Chips 802.11b Adapter
-+124b  Nyko (Honey Bee)
-+	4d01  Airflo EX Joystick
- 1267  Logic3 / SpectraVideo plc
- 	0201  A4Tech SWOP-3 Mouse
- 	a001  JP260 PC Game Pad
-@@ -3838,6 +3982,7 @@
- 	0013  Dimage X31 Camera
- 	0015  Dimage G530 Camera
- 	0017  Dimage Z3 Camera
-+	0019  Dimage A200 Camera
- 	0021  Dimage Z5 Camera
- 1342  Mobility
- 	0200  EasiDock 200 Hub
-@@ -3851,17 +3996,25 @@
- 	2103  USB 2.0 Storage Device
- 13b0  Alesis
- 	000a  Photon X25 MIDI Controller
-+13b1  Linksys
-+	000b  WUSB11 v4.0 802.11b Adapter
-+	0011  WUSB54GP v4.0 802.11g Adapter
-+	0018  USB200M 10/100 Ethernet Adapter
- 13d2  Shark Multimedia
- 	0400  Pocket Ethernet [klsi]
- 13d3  IMC Networks
- 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
- 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
-+1453  Radio Shack
-+	4026  26-183 Serial Cable
- 1462  Micro Star International
- 	5512  MegaStick-1 Flash Stick
- 147a  Formosa Industrial Computing, Inc.
- 1484  Elsa AG [hex]
- 	1746  Ecomo 19H99 Monitor
- 	7616  Elsa Hub
-+148f  Ralink Technology, Corp.
-+	2570  802.11g WiFi
- 14aa  AVerMedia (again) or C&E
- 	0001  Avermedia AverTV DVBT USB1.1 (cold)
- 	0002  Avermedia AverTV DVBT USB1.1 (warm)
-@@ -3932,6 +4085,9 @@
- 1706  BlueView Technologies, Inc.
- 1733  Cellink Technology Co., Ltd
- 	0101  RF Wireless Optical Mouse OP-701
-+17b3  Grey Innovation
-+	0004  Linux-USB Midi Gadget
-+17eb  Cornice, Inc.
- 1822  Twinhan
- 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
- 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
-@@ -3943,10 +4099,17 @@
- 	5641  TSAM-004 Presentation Remote
- 1977  T-Logic
- 	0111  TL203 MP3 Player and Voice Recorder
-+1995  Trillium Technology Pty. Ltd.
-+	3202  REC-ADPT-USB (recorder)
-+	3203  REC-A-ADPT-USB (recorder)
- 1ebb  NuCORE Technology, Inc.
- 2001  D-Link Corp. [hex]
- 	3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
- 	3700  DWL-122 802.11b
-+	3701  DWL-G120 Spinnaker 802.11b
-+	3703  DWL-122 802.11b
-+	3704  DWL-G122 802.11g rev. A2
-+	3c00  DWL-G122 802.11g rev. B1 [ralink]
- 	4000  DSB-650C Ethernet [klsi]
- 	4001  DSB-650TX Ethernet [pegasus]
- 	4002  DSB-650TX Ethernet [pegasus]
-@@ -3957,6 +4120,8 @@
- 2040  Hauppauge
- 	9300  Hauppauge WinTV NOVA-T USB2 (cold)
- 	9301  Hauppauge WinTV NOVA-T USB2 (warm)
-+2101  ActionStar
-+	0201  SIIG 4-to-2 Printer Switch
- 2162  Creative (?)
- 	500c  DE5771 Modem Blaster
- 2222  MacAlly
-@@ -4011,12 +4176,14 @@
- 	f110  Security Key
- 3538  Power Quotient International Co., Ltd
- 	0001  Travel Flash
-+	0042  Cool Drive U339 Flash Disk
- 3579  DIVA
- 	6901  Media Reader
- 3636  InVibro
- 3838  WEM
- 	0001  5-in-1 Card Reader
- 3923  National Instruments Corp.
-+	703c  USB-485 RS485 Cable
- 4102  iRiver, Ltd.
- 	1001  iFP-100 series mp3 player
- 	1003  iFP-300 series mp3 player
-@@ -4038,13 +4205,15 @@
- 	4002  Axim X3
- 	4003  Axim X30
- 	8100  TrueMobile 1180 802.11b Adapter
-+	8103  Wireless 350 Bluetooth
- 	a001  Hub
- 	a700  Hub (in 1905FP LCD Monitor)
- 4242  USB Design by Example
- 	4201  Buttons and Lights HID device
- 	4220  Echo 1 Camera
--4146  Iomega (?)
--	9281  Micro Mini 128MB Flash Drive
-+4146  USBest Technology
-+	9281  Iomega Micro Mini 128MB Flash Drive
-+	ba01  Intuix Flash Drive
- 4572  Shuttle, Inc.
- 	4572  Shuttle PN31 Remote
- 4586  Panram
-@@ -4056,6 +4225,8 @@
- 	0bb9  Grandtec USB1.1 DVB-T (warm)
- 	0fa0  Grandtec USB1.1 DVB-T (cold)
- 	0fa1  Grandtec USB1.1 DVB-T (warm)
-+5041  Linksys (?)
-+	2234  WUSB54G 802.11g Adapter
- 544d  Transmeta Corp.
- 5543  UC-Logic Technology Corp.
- 	0002  SuperPen WP3325U Tablet
-@@ -4063,6 +4234,7 @@
- 55aa  OnSpec Electronic, Inc.
- 	1234  ATAPI Bridge
- 	a103  Sandisk SDDR-55 SmartMedia Card Reader
-+	b012  Mitsumi FA402M 8-in-2 Card Reader
- 636c  CoreLogic, Inc.
- 6666  Prototype product Vendor ID
- 	0667  Smart Joy PSX, PS-PC Smart JoyPad
-@@ -4080,13 +4252,15 @@
- 	c013  Wireless HID Station
- 8341  EGO Systems, Inc.
- 	2000  Flashdisk
--9710  Noname
-+9710  MosChip Semiconductor
-+	7705  Printer cable
- 	7715  Printer cable
- c251  Keil Software, Inc.
- 	2710  ULink
- eb1a  eMPIA Technology, Inc.
- 	17de  KWorld V-Stream XPERT DTV - DVB-T USB cold
- 	17df  KWorld V-Stream XPERT DTV - DVB-T USB warm
-+	2710  SilverCrest WebCam
- 	2800  Terratec Cinergy 200
- 	2801  GrabBeeX+ Video Encoder
-
-@@ -4162,9 +4336,10 @@ C 08  Mass Storage
- 		50  Bulk (Zip)
- C 09  Hub
- 	00  Unused
-+		00  Full speed hub
- 		01  Single TT
- 		02  TT per port
--C 0a  Data
-+C 0a  CDC Data
- 	00  Unused
- 		30  I.430 ISDN BRI
- 		31  HDLC
-@@ -4193,18 +4368,26 @@ C e0  Wireless
- 	01  Radio Frequency
- 		01  Bluetooth
- 		02  Ultra WideBand Radio Control
-+		03  RNDIS
- 	02  Wireless USB Wire Adapter
- 		01  Host Wire Adapter Control/Data Streaming
- 		02  Device Wire Adapter Control/Data Streaming
- 		03  Device Wire Adapter Isochronous Streaming
- C ef  Miscellaneous Device
-+	01  ?
-+		01  Microsoft ActiveSync
-+		02  Palm Sync
- 	02  Common Class
- 		01  Interface Association
- 		02  Wire Adapter Multifunction Peripheral
-+	03  ?
-+		01  Cable Based Association
- C fe  Application Specific Interface
- 	01  Device Firmware Update
- 	02  IRDA Bridge
- 	03  Test and Measurement
-+		01  TMC
-+		02  USB488
- C ff  Vendor Specific Class
- 	ff  Vendor Specific Subclass
- 		ff  Vendor Specific Protocol
-@@ -5755,3 +5938,22 @@ HCC 32  UK
- HCC 33  US
- HCC 34  Yugoslavia
- HCC 35  Turkish-F
-+
-+# List of Video Class Terminal Types
-+
-+# Syntax:
-+# VT terminal_type  terminal_type_name
-+
-+VT 0100  USB Vendor Specific
-+VT 0101  USB Streaming
-+VT 0200  Input Vendor Specific
-+VT 0201  Camera Sensor
-+VT 0202  Sequential Media
-+VT 0300  Output Vendor Specific
-+VT 0301  Generic Display
-+VT 0302  Sequential Media
-+VT 0400  External Vendor Specific
-+VT 0401  Composite Video
-+VT 0402  S-Video
-+VT 0403  Component Video
-+
From voroskoi at frugalware.org  Tue Oct 16 21:12:39 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Oct 16 21:12:40 2007
Subject: [Frugalware-git] frugalware-current: commoncpp2-1.5.9-1-i686
Message-ID: <20071016191239.DA04213A4001@genesis.frugalware.org>

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

commit 3c58dda44cecf3dde3789fc528f55ec3461b89b8
Author: voroskoi <voroskoi@frugalware.org>
Date:   Tue Oct 16 20:54:46 2007 +0200

commoncpp2-1.5.9-1-i686
version bump
updated atomicity patch

diff --git a/source/lib-extra/commoncpp2/FrugalBuild b/source/lib-extra/commoncpp2/FrugalBuild
index abdb31c..ca609c8 100644
--- a/source/lib-extra/commoncpp2/FrugalBuild
+++ b/source/lib-extra/commoncpp2/FrugalBuild
@@ -2,18 +2,18 @@
# Maintainer: voroskoi <voroskoi@frugalware.org>

pkgname=commoncpp2
-pkgver=1.5.7
+pkgver=1.5.9
pkgrel=1
url="http://wiki.gnutelephony.org/index.php/GNU_Common_CPP_Framework"
pkgdesc="GNU Common C++ is a portable and highly optimized class framework for writing C++ applications."
-depends=('glibc' 'openssl' 'zlib' 'libgcc' 'libstdc++')
+depends=('libstdc++' 'openssl' 'zlib')
groups=('lib-extra')
archs=('i686' 'x86_64')
Fconfopts="$Fconfopts --with-openssl"
up2date="lynx -dump http://ftp.gnu.org/pub/gnu/commoncpp/|Flasttar"
source=(http://ftp.gnu.org/pub/gnu/commoncpp/commoncpp2-$pkgver.tar.gz gcc42-atomicity.diff)
-sha1sums=('f0d522bbbba279c2c5520fa411c78ea7b4814846'\
-          '334c86720f25f0dafd7e26984a48cd172d6bc537')
+sha1sums=('adca5e5a4eef5d891354cc54c9671d01d14286b4' \
+          '75f8a9464b3a414eba6743ea8f3acffdea3f13e9')

build() {
Fsed "bits/atomicity.h" "ext/atomicity.h" configure
diff --git a/source/lib-extra/commoncpp2/gcc42-atomicity.diff b/source/lib-extra/commoncpp2/gcc42-atomicity.diff
index 475b070..907286c 100644
--- a/source/lib-extra/commoncpp2/gcc42-atomicity.diff
+++ b/source/lib-extra/commoncpp2/gcc42-atomicity.diff
@@ -1,6 +1,6 @@
diff -aur commoncpp2-1.5.6/include/config.h.in fw-commoncpp2-1.5.6/include/config.h.in
---- commoncpp2-1.5.6/include/config.h.in	2007-05-26 14:17:39.000000000 +0200
-+++ fw-commoncpp2-1.5.6/include/config.h.in	2007-05-26 15:17:04.000000000 +0200
+--- commoncpp2-1.5.6/config.h.in	2007-05-26 14:17:39.000000000 +0200
++++ fw-commoncpp2-1.5.6/config.h.in	2007-05-26 15:17:04.000000000 +0200
@@ -1082,9 +1082,17 @@
#endif
#endif
From crazy at frugalware.org  Tue Oct 16 22:41:43 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 22:41:45 2007
Subject: [Frugalware-git] kde358: kdeutils-3.5.8-1-i686
Message-ID: <20071016204143.340FB13A4001@genesis.frugalware.org>

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

commit 0b900c772c89cbdce6c2904f0f29df617e1f0911
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 22:36:13 2007 +0200

kdeutils-3.5.8-1-i686
* Version bump
* moved superkaramba subpackage to kde-extra

diff --git a/source/kde/kdeutils/FrugalBuild b/source/kde/kdeutils/FrugalBuild
index 2b54394..1ed71b9 100644
--- a/source/kde/kdeutils/FrugalBuild
+++ b/source/kde/kdeutils/FrugalBuild
@@ -2,22 +2,20 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kdeutils
-pkgver=3.5.7
-pkgrel=2
+pkgver=3.5.8
+pkgrel=1
pkgdesc="KDE General Utilities."
groups=('kde')
archs=('i686' 'x86_64')
-depends=('kdebase>=3.5.7' 'gmp' 'libxtst')
+depends=('kdebase>=3.5.8' 'gmp' 'libxtst')
makedepends=('gnupg' 'doxygen')
Finclude kde
-source=($source fix-copy_and_paste_shit.patch)
-sha1sums=('8e5ba582de84851ed153998f93c8a3789e8df6bd'\
-          '4c6fcde4d6108cb2fe6b72011bc138b0aeaaac13')
+sha1sums=('55aac5ecb90ee8a9854603eb2415adb2da6f249c')

subpkgs=("superkaramba")
subdescs=("SuperKaramba is a tool that allows you to easily create interactive eye-candy on your KDE desktop.")
subdepends=("kdelibs=$pkgver python>=2.5")
-subgroups=('kde')
+subgroups=('kde-extra')
subarchs=('i686 x86_64')

build()
@@ -28,11 +26,11 @@ build()
Fconf \
--without-xmms \
DO_NOT_COMPILE="superkaramba"
-	cd superkaramba
+	cd superkaramba || Fdie
make || Fdie
Fmakeinstall
Fsplit superkaramba /usr
-	cd ..
+	cd .. || Fdie
make || Fdie
Fmakeinstall
chmod 6755 $Fdestdir/usr/bin/klaptop_acpi_helper
From crazy at frugalware.org  Tue Oct 16 22:53:11 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 22:53:12 2007
Subject: [Frugalware-git] kde358: kdeadmin-3.5.8-1-i686
Message-ID: <20071016205311.802C213A4001@genesis.frugalware.org>

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

commit fe8bb0e7572fdc84dfd1141f7b72bb1bd6d06faf
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 22:48:26 2007 +0200

kdeadmin-3.5.8-1-i686
* Version bump

diff --git a/source/kde/kdeadmin/FrugalBuild b/source/kde/kdeadmin/FrugalBuild
index 18f0ab4..04719e8 100644
--- a/source/kde/kdeadmin/FrugalBuild
+++ b/source/kde/kdeadmin/FrugalBuild
@@ -2,21 +2,21 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kdeadmin
-pkgver=3.5.7
+pkgver=3.5.8
pkgrel=1
pkgdesc="KDE Administration Programs."
groups=('kde')
archs=('i686' 'x86_64')
-depends=('kdebase>=3.5.7')
+depends=('kdebase>=3.5.8')
_F_kde_do_not_compile="knetworkconf lilo-config ksysv"
_F_kde_split_docs=1
Finclude kde
Fconfopts="$Fconfopts --with-shadow --without-rpm"
-sha1sums=('6b5a42925af11edc91a4dd2446a0967c232a56e2')
+sha1sums=('089252e5cd7890199130272614538c02364d90e8')

subpkgs=("$pkgname-docs")
subdescs=("Kdeadmin Documentation")
-subdepends=("$pkgname=$pkgver")
+subdepends=('')
subgroups=('kde-extra kde-docs')
subarchs=('i686 x86_64')
From crazy at frugalware.org  Tue Oct 16 23:01:18 2007
From: crazy at frugalware.org (crazy)
Date: Tue Oct 16 23:01:18 2007
Subject: [Frugalware-git] frugalware-current: desktop-file-utils-0.14-2-i686
Message-ID: <20071016210118.108D713A4001@genesis.frugalware.org>

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

commit a74463ab0cc2a12366658946c8906d48a688c68e
Author: crazy <crazy@frugalware.org>
Date:   Tue Oct 16 22:57:01 2007 +0200

desktop-file-utils-0.14-2-i686
* move away from gnome , brr

diff --git a/source/apps/desktop-file-utils/FrugalBuild b/source/apps/desktop-file-utils/FrugalBuild
new file mode 100644
index 0000000..4187493
--- /dev/null
+++ b/source/apps/desktop-file-utils/FrugalBuild
@@ -0,0 +1,16 @@
+# Compiling Time: 0.05 SBU
+# Maintainer: AlexExtreme <alex@alex-smith.me.uk>
+
+pkgname=desktop-file-utils
+pkgver=0.14
+pkgrel=2
+pkgdesc="Utilities for manipulating desktop files"
+url="http://freedesktop.org/wiki/Software/desktop-file-utils"
+depends=('glib2>=2.14.1' 'popt')
+groups=('apps')
+archs=('i686' 'x86_64')
+up2date="lynx -dump 'http://freedesktop.org/software/desktop-file-utils/releases/?C=M;O=D'|grep tar.gz$|sed -n 's/.*-\(.*\).t.*/\1/;1 p'"
+source=(http://freedesktop.org/software/desktop-file-utils/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('2329e2329649f8010e07de0b1181177d7031b23e')
+
+# optimization OK
diff --git a/source/gnome/desktop-file-utils/FrugalBuild b/source/gnome/desktop-file-utils/FrugalBuild
deleted file mode 100644
index ec1fa1d..0000000
--- a/source/gnome/desktop-file-utils/FrugalBuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Compiling Time: 0.05 SBU
-# Maintainer: AlexExtreme <alex@alex-smith.me.uk>
-
-pkgname=desktop-file-utils
-pkgver=0.14
-pkgrel=2
-pkgdesc="Utilities for manipulating desktop files"
-url="http://freedesktop.org/wiki/Software/desktop-file-utils"
-depends=('glib2>=2.14.1' 'popt')
-groups=('gnome')
-archs=('i686' 'x86_64')
-up2date="lynx -dump 'http://freedesktop.org/software/desktop-file-utils/releases/?C=M;O=D'|grep tar.gz$|sed -n 's/.*-\(.*\).t.*/\1/;1 p'"
-source=(http://freedesktop.org/software/desktop-file-utils/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('2329e2329649f8010e07de0b1181177d7031b23e')
-
-# optimization OK
From vmiklos at frugalware.org  Wed Oct 17 01:11:42 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Oct 17 01:11:44 2007
Subject: [Frugalware-git] bitlbee-skype: use the new imcb_chat_topic()
	function
Message-ID: <20071016231142.D64E413A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=425c86905075ca2cc6d988ea31e7ad202ea81b39

commit 425c86905075ca2cc6d988ea31e7ad202ea81b39
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Wed Oct 17 01:09:09 2007 +0200

use the new imcb_chat_topic() function
WARNING: this is not yet in the bitlbee release branch, i'll update the docs
when it'll be there

diff --git a/skype.c b/skype.c
index 3f272e1..e540331 100644
--- a/skype.c
+++ b/skype.c
@@ -338,7 +338,7 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
else if(!strcmp(sd->type, "SETTOPIC"))
{
if(gc)
-									imcb_log(ic, "%s changed the topic of %s to: %s", sd->handle, gc->title, sd->body);
+									imcb_chat_topic(gc, sd->handle, sd->body);
}
else if(!strcmp(sd->type, "LEFT"))
{
@@ -461,6 +461,13 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(gc)
gc->data = (void*)FALSE;
}
+					else if(!strncmp(info, "TOPIC ", 6))
+					{
+						info += 6;
+						struct groupchat *gc = skype_chat_by_name(ic, id);
+						if(gc)
+							imcb_chat_topic(gc, NULL, info);
+					}
else if(!strncmp(info, "ACTIVEMEMBERS ", 14))
{
info += 14;
From vmiklos at frugalware.org  Wed Oct 17 01:11:43 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Oct 17 01:11:47 2007
Subject: [Frugalware-git] bitlbee-skype: implement skype_chat_topic()
Message-ID: <20071016231143.0307A13A4023@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=81c0109193792109565477307c0db6c03aa0bc98

commit 81c0109193792109565477307c0db6c03aa0bc98
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Wed Oct 17 01:09:22 2007 +0200

implement skype_chat_topic()

diff --git a/skype.c b/skype.c
index e540331..4d6dc7b 100644
--- a/skype.c
+++ b/skype.c
@@ -681,6 +681,15 @@ void skype_chat_invite(struct groupchat *gc, char *who, char *message)
g_free(nick);
}

+void skype_chat_topic(struct groupchat *gc, char *message)
+{
+	struct im_connection *ic = gc->ic;
+	char *buf;
+	buf = g_strdup_printf("ALTER CHAT %s SETTOPIC %s\n", gc->title, message);
+	skype_write( ic, buf, strlen( buf ) );
+	g_free(buf);
+}
+
struct groupchat *skype_chat_with(struct im_connection *ic, char *who)
{
struct skype_data *sd = ic->proto_data;
@@ -715,5 +724,6 @@ void init_plugin(void)
ret->chat_invite = skype_chat_invite;
ret->chat_with = skype_chat_with;
ret->handle_cmp = g_strcasecmp;
+	ret->chat_topic = skype_chat_topic;
register_protocol( ret );
}
From crazy at frugalware.org  Wed Oct 17 01:24:40 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct 17 01:24:42 2007
Subject: [Frugalware-git] kde358: kdegraphics-3.5.8-1-i686
Message-ID: <20071016232440.9551713A4001@genesis.frugalware.org>

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

commit 0c0eb2dc6e3262b9bcb501e18d7c5a6b259dd013
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 17 01:16:50 2007 +0200

kdegraphics-3.5.8-1-i686
* Version bump

diff --git a/source/kde/kdegraphics/FrugalBuild b/source/kde/kdegraphics/FrugalBuild
index c6cca24..477024f 100644
--- a/source/kde/kdegraphics/FrugalBuild
+++ b/source/kde/kdegraphics/FrugalBuild
@@ -2,29 +2,26 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kdegraphics
-pkgver=3.5.7
-pkgrel=2
+pkgver=3.5.8
+pkgrel=1
pkgdesc="KDE Graphics Programs"
groups=('kde')
archs=('i686' 'x86_64')
-depends=('kdebase>=3.5.7' 'imlib' 'freeglut' 'lcms' 'sane-backends' 't1lib' 'libgphoto2' \
+depends=('kdebase>=3.5.8' 'imlib' 'freeglut' 'lcms' 'sane-backends' 't1lib' 'libgphoto2' \
'fribidi' 'poppler-qt' 'xespgs' 'xpdf>=3.02-3' 'urw-fonts' 'openexr>=1.4.0a-2')
makedepends=('doxygen' 'qt-docs')
rodepends=('ocrad')
_F_kde_split_docs=1
Finclude kde
-source=($source \
-	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdegraphics-CVE-2007-3387.diff)
Fconfopts="$Fconfopts --disable-kpdf-drm --with-openexr --with-gphoto2-libraries=/usr/lib \
--with-gphoto2-includes=/usr/include/gphoto2 --with-imlib-config=/usr/bin \
--with-jpeg=/usr/lib --with-tiff=/usr/lib --with-poppler"

subpkgs=("$pkgname-docs")
subdescs=("Kdegraphics  Documentation")
-subdepends=("$pkgname=$pkgver")
+subdepends=('')
subgroups=('kde-extra kde-docs')
subarchs=('i686 x86_64')

-sha1sums=('2b6ca2c27f565b5ca4a40d461db7b4038658b5f3' \
-          '64b9823af4c8f975011862e3fb15ef724a6253df')
+sha1sums=('2f7b0aeefffd1d10128f1f1edd7e4c11e0329f35')
# optimization OK
From crazy at frugalware.org  Wed Oct 17 02:22:09 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct 17 02:22:12 2007
Subject: [Frugalware-git] kde358: kdemultimedia-3.5.8-1-i686
Message-ID: <20071017002209.B560B13A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=8f15e900dbcbd95d06e8f54bbad7be8808a5afb6

commit 8f15e900dbcbd95d06e8f54bbad7be8808a5afb6
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 17 02:14:24 2007 +0200

kdemultimedia-3.5.8-1-i686
* Version bump

diff --git a/source/kde/kdemultimedia/FrugalBuild b/source/kde/kdemultimedia/FrugalBuild
index 720a07d..a01353a 100644
--- a/source/kde/kdemultimedia/FrugalBuild
+++ b/source/kde/kdemultimedia/FrugalBuild
@@ -3,12 +3,12 @@
# Contributor: Kapolnasi Tamas <ktamas@tdc.hu>

pkgname=kdemultimedia
-pkgver=3.5.7
+pkgver=3.5.8
pkgrel=1
pkgdesc="KDE Multimedia Programs."
groups=('kde')
archs=('i686' 'x86_64')
-depends=('libxv' 'kdebase>=3.5.7' 'cdparanoia>=9.8-4' 'lame>=3.97-3' 'speex' 'taglib' 'xine-lib>=1.1.6' \
+depends=('libxv' 'kdebase>=3.5.8' 'cdparanoia>=9.8-4' 'lame>=3.97-3' 'speex' 'taglib' 'xine-lib>=1.1.6' \
'akode>=2.0.2' 'libxml2' 'libxxf86dga' 'flac>=1.1.4' 'audiofile' 'gstreamer')
_F_kde_reconf=1
_F_kde_split_docs=1
@@ -19,10 +19,10 @@ Fconfopts="$Fconfopts --with-lame --with-cdparanoia --with-alsa --without-esd --

subpkgs=("$pkgname-docs")
subdescs=("Kdemultimedia Documentation")
-subdepends=("$pkgname=$pkgver")
+subdepends=('')
subgroups=('kde-extra kde-docs')
subarchs=('i686 x86_64')

-sha1sums=('4b3d45403aed404c5c06d03fdb095400aed75f2c'\
+sha1sums=('fd70cf7f7378653e92c03fa0b9d9a5368451632c' \
'600d3c4f929aac29803a4866c8132aff52ac10b5')
# optimization OK
From vmiklos at frugalware.org  Wed Oct 17 02:49:11 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Oct 17 02:49:12 2007
Subject: [Frugalware-git] bitlbee-skype: show topic if it was set before join
Message-ID: <20071017004911.8C8BD13A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=2c254deb01726a63f7e8200857379286f91c3f18

commit 2c254deb01726a63f7e8200857379286f91c3f18
Author: Miklos Vajna <vmiklos@frugalware.org>
Date:   Wed Oct 17 02:46:38 2007 +0200

show topic if it was set before join

diff --git a/skype.c b/skype.c
index 4d6dc7b..4ad6cdb 100644
--- a/skype.c
+++ b/skype.c
@@ -75,6 +75,8 @@ struct skype_data
/* Using /j #nick we want to have a groupchat with two people. Usually
* not (default). */
char* groupchat_with;
+	/* The user who invited us to the chat. */
+	char* adder;
};

struct skype_away_state
@@ -437,6 +439,10 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(!strcmp(info, "STATUS MULTI_SUBSCRIBED"))
{
imcb_chat_new( ic, id );
+						g_snprintf(buf, 1024, "GET CHAT %s ADDER\n", id);
+						skype_write(ic, buf, strlen(buf));
+						g_snprintf(buf, 1024, "GET CHAT %s TOPIC\n", id);
+						skype_write(ic, buf, strlen(buf));
}
else if(!strcmp(info, "STATUS DIALOG") && sd->groupchat_with)
{
@@ -454,6 +460,10 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
imcb_chat_add_buddy(gc, sd->username);
g_free(sd->groupchat_with);
sd->groupchat_with = NULL;
+						g_snprintf(buf, 1024, "GET CHAT %s ADDER\n", id);
+						skype_write(ic, buf, strlen(buf));
+						g_snprintf(buf, 1024, "GET CHAT %s TOPIC\n", id);
+						skype_write(ic, buf, strlen(buf));
}
else if(!strcmp(info, "STATUS UNSUBSCRIBED"))
{
@@ -461,12 +471,22 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c
if(gc)
gc->data = (void*)FALSE;
}
+					else if(!strncmp(info, "ADDER ", 6))
+					{
+						info += 6;
+						g_free(sd->adder);
+						sd->adder = g_strdup_printf("%s@skype.com", info);
+					}
else if(!strncmp(info, "TOPIC ", 6))
{
info += 6;
struct groupchat *gc = skype_chat_by_name(ic, id);
-						if(gc)
-							imcb_chat_topic(gc, NULL, info);
+						if(gc && sd->adder)
+						{
+							imcb_chat_topic(gc, sd->adder, info);
+							g_free(sd->adder);
+							sd->adder = NULL;
+						}
}
else if(!strncmp(info, "ACTIVEMEMBERS ", 14))
{
From crazy at frugalware.org  Wed Oct 17 03:37:33 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct 17 03:37:34 2007
Subject: [Frugalware-git] kde358: kdenetwork-3.5.8-1-i686
Message-ID: <20071017013733.33A5E13A4001@genesis.frugalware.org>

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

commit 6fe9e7dbbaf19ac5bee35dd01222cf6a18042508
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 17 03:28:47 2007 +0200

kdenetwork-3.5.8-1-i686
* Version bump

diff --git a/source/kde/kdenetwork/FrugalBuild b/source/kde/kdenetwork/FrugalBuild
index 5fa8683..4cc871e 100644
--- a/source/kde/kdenetwork/FrugalBuild
+++ b/source/kde/kdenetwork/FrugalBuild
@@ -2,18 +2,18 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kdenetwork
-pkgver=3.5.7
+pkgver=3.5.8
pkgrel=1
pkgdesc="KDE Networking Programs."
groups=('kde')
archs=('i686' 'x86_64')
-depends=('libxtst' 'kdebase>=3.5.7' 'ppp' 'wireless_tools' 'openslp' 'libidn')
+depends=('libxtst' 'kdebase>=3.5.8' 'ppp' 'wireless_tools' 'openslp' 'libidn')
makedepends=('ortp=0.7.1' 'expat' 'meanwhile' 'speex' 'gnutls' 'perl-io-socket-ssl' 'qca-tls' 'ilbc' 'qt-docs' 'doxygen')
Finclude kde

subpkgs=("$pkgname-docs" 'kopete')
subdescs=("Kdenetwork Documentation" "Kopete is a multi-protocol instant messenger for the KDE Desktop.")
-subdepends=("$pkgname=$pkgver" \
+subdepends=('' \
"ortp=0.7.1 expat libxscrnsaver $pkgname=$pkgver meanwhile speex gnutls perl-io-socket-ssl libidn qca-tls ilbc")
subgroups=('kde-extra kde-docs' 'kde')
subarchs=('i686 x86_64' 'i686 x86_64')
@@ -26,16 +26,16 @@ build()
--enable-meanwhile \
--with-speex=/usr \
DO_NOT_COMPILE="kopete"
-	cd kopete
+	cd kopete || Fdie
make || Fdie
Fmakeinstall
Fsplit kopete /usr
-	cd ..
+	cd .. || Fdie
make || Fdie
Fmakeinstall
Fsplit $pkgname-docs usr/share/doc
}


-sha1sums=('f5585acd047a85fb512652decd7876a780dc269a')
+sha1sums=('ad96484b0fce4d224195407ffdef3b040e5069cc')
# optimization OK
From crazy at frugalware.org  Wed Oct 17 04:11:40 2007
From: crazy at frugalware.org (crazy)
Date: Wed Oct 17 04:11:41 2007
Subject: [Frugalware-git] kde358: kdegames-3.5.8-1-i686
Message-ID: <20071017021140.3D1A413A4001@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde358.git;a=commitdiff;h=91537761115a78597b3e809fde165b048616e590

commit 91537761115a78597b3e809fde165b048616e590
Author: crazy <crazy@frugalware.org>
Date:   Wed Oct 17 04:03:32 2007 +0200

kdegames-3.5.8-1-i686
* Version bump

diff --git a/source/kde/kdegames/FrugalBuild b/source/kde/kdegames/FrugalBuild
index 9ba580c..bdf1b24 100644
--- a/source/kde/kdegames/FrugalBuild
+++ b/source/kde/kdegames/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: crazy <crazy@frugalware.org>

pkgname=kdegames
-pkgver=3.5.7
-pkgrel=2
+pkgver=3.5.8
+pkgrel=1
pkgdesc="Games for KDE."
groups=('kde')
archs=('i686' 'x86_64')
-depends=('kdebase>=3.5.7' 'dbus>=0.93' 'libssp')
+depends=('kdebase>=3.5.8' 'dbus>=0.93' 'libssp')
makedepends=('doxygen' 'qt-docs')
Finclude kde
-sha1sums=('8bc3d74ad3bdf02142974bc86ed39a560bb69e54')
+sha1sums=('8094228dd488524