Kernel update in -current: WARNING for Intel users

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 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 @@ + 281 + 2007-10-01 + voroskoi + sylpheed + 2.3.1-1 + 2.3.1-2terminus1 + http://bugs.frugalware.org/task/2378 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2958 + 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. + + 280 2007-09-24 vmiklos 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 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 @@ + 282 + 2007-10-01 + voroskoi + claws-mail + 2.8.1-1 + 2.8.1-2terminus1 + http://bugs.frugalware.org/task/2378 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2958 + 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. + + 281 2007-10-01 voroskoi 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 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 @@ + 283 + 2007-10-01 + voroskoi + qt4 + 4.2.3-2terminus1 + 4.2.3-2terminus2 + http://bugs.frugalware.org/task/2422 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4137 + 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. + + 282 2007-10-01 voroskoi 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 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 +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 +--- + +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 +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 +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 +Signed-off-by: Karel Zak +--- + +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 +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 +--- + +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 ++- added to identify FIFO ++ + -------------------------------------------------------------*/ + + #include +@@ -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 +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 +Signed-off-by: Matthias Koenig +Signed-off-by: Karel Zak +--- + +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 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 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 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 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 -# 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 +# 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 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 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 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 Destination directory." - echo " --help This help." - echo " -s The mirror server you want to use" - echo " -v 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 :: + Coma separated list of architectures you want to mirror. If you want to + mirror the sources, too then use the special 'source' arch. + +-d :: + Destination directory. + +--help:: + This help. + +-s :: + The mirror server you want to use. + +-v :: + 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 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 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 [] [] + +== OPTIONS + +--help:: + Display this manpage. + +--pecl:: + Use this option when 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 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 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 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 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 - - -=head1 AUTHOR - - Zsolt Szalai - -=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 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 and/or -C 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) 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 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()} <= 5.006; - print $h <) { - $has_pod = 1, last if /^=(pod|head1)/; - } - } - print $h <= 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 <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 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 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 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 @@ -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 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 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 '' - echo '' -} - -footer() -{ - echo '' -} - -# $1: msgid -# $2: pkgname -# $3: state (can be f, u, or t - defaults to u) -genmsgentry() -{ - echo -e "\t" - echo -e "\t\t$1" - echo -e "\t\t" - echo -e "\t" -} - -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 '' + echo '' +} + +footer() +{ + echo '' +} + +# $1: msgid +# $2: pkgname +# $3: state (can be f, u, or t - defaults to u) +genmsgentry() +{ + echo -e "\t" + echo -e "\t\t$1" + echo -e "\t\t" + echo -e "\t" +} + +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 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 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 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 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 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 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 @@ + + + + + + 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 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 @@ - - - - - - -]> + - - - GTK_WIN_POS_CENTER - 780 - 600 - - - - True - - - True - - - True - _Gfpm - True - - - - - True - E_xit - True - - - - True - gtk-quit - 1 - - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Options - Options - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - clear package cache - _Clear package cache - True - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - optimize your package database to improve performance - _Optimize package database - True - - - - - - - - - - - - True - _Help - True - - - - - True - About Gfpm - _About Gfpm - True - - - True - gtk-about - 1 - - - - - - - - - - - False - - - - - True - GTK_TOOLBAR_BOTH - - - True - Apply Changes - Apply - gfpm-apply - - - False - - - - - True - Refresh the package lists - Synchronize - True - gtk-refresh - - - False - - - - - True - Refresh the package lists - Install from file - True - gfpm-instfromfile - - - - False - - - - - True - Help - True - gtk-help - - - False - - - - - True - - - 20 - True - - - - - False - False - - - - - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Search packages - - - - - True - True - - - 1 - - - - - - - False - False - - - - - True - - - True - 10 - 3 - gfpm-search - - - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Quit - gtk-quit - - - - False - - - - - False - 1 - - - - - True - 170 - - - True - - - True - 4 - 0 - GTK_SHADOW_IN - - - True - 5 - 5 - 5 - 5 - - - True - - - True - - - - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - 2 - False - True - - - - - 2 - 1 - - - - - - - - - - - False - True - - - - - True - 250 - - - True - 5 - 0 - GTK_SHADOW_IN - - - True - 5 - 5 - 5 - 5 - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - - - - - - - - - True - Packages - True - - - label_item - - - - - False - True - - - - - True - 5 - 0 - GTK_SHADOW_IN - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - 5 - 2 - 5 - 5 - - - True - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - False - True - - - - - - - True - Details - - - tab - False - - - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - False - False - - - - - 1 - - - - - True - Files - - - tab - 1 - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - False - False - - - - - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Changelog - - - tab - 2 - False - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - GTK_BUTTONBOX_END - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - gtk-add - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Install - - - 1 - - - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - gtk-remove - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove - - - 1 - - - - - - - 1 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - gtk-redo - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Upgrade - - - 1 - - - - - - - 2 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - gtk-info - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - View Readme - - - 1 - - - - - - - 3 - - - - - - - False - 3 - 1 - - - - - - - True - Information - True - - - label_item - - - - - True - True - - - - - True - True - - - - - 3 - - - - - True - 5 - - - False - GTK_PACK_END - 2 - - - - - - - window1 - False - GTK_WIN_POS_CENTER_ALWAYS - True - True - True - False - GDK_GRAVITY_CENTER - - - True - - - True - splash.png - - - False - False - - - - - - - - - - Gfpm - True - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - True - - - True - 8 - - - True - - - True - 0 - Please wait... - - - False - False - 4 - - - - - True - 0.10000000149011612 - - - False - False - 4 - 1 - - - - - False - - - - - 330 - True - True - 0.10000000149 - - - - False - False - 3 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Transfer Rate: - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - False - 1 - - - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - False - 2 - - - - - False - 4 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - 1 - False - - - - - False - 3 - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Close this dialog when the operation is finished - 0 - True - - - False - 2 - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Details - True - 0 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - 0 - - - 1 - - - - - False - 5 - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove old packages from cache - 0 - True - True - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove all packages from cache - 0 - True - True - rem_old_opt - - - False - 1 - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_EDGE - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-apply - True - 0 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - 0 - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Install package from file - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Force install - 0 - True - - - False - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Upgrade existing - 0 - True - - - False - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Skip dependency checks - 0 - True - - - False - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_EDGE - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - gtk-apply - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Install - - - 1 - - - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - 0 - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - GTK_WIN_POS_CENTER_ON_PARENT - 350 - GDK_WINDOW_TYPE_HINT_DIALOG - mainwindow - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - The following operations will be performed - - - False - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Install packages: - True - - - False - - - - - 110 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_OUT - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 4 - Total size: - - - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Skip dependency checks - 0 - True - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Download only (do not install/upgrade) - 0 - True - - - 1 - - - - - 3 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 2 - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Remove packages: - True - - - False - - - - - 110 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_OUT - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 3 - Total size: - - - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Skip dependency checks - 0 - True - - - - - - - - - - - 3 - - - - - 3 - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - - - - - - - False - GTK_PACK_END - - - - - - - 400 - 150 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - False - GTK_WIN_POS_CENTER_ON_PARENT - 400 - 150 - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Optimize package database - True - PANGO_ELLIPSIZE_END - - - False - 7 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Status : - True - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - 1 - - - - - False - 7 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - False - 3 - 2 - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_EDGE - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Optimize - 0 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Close - 0 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 475 - 400 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - gtk-info - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - False - 1 - - - - - False - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - 0 - - - - - - False - 2 - 2 - - - - - - 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 @@ + + + +

+ 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 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 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 #include -#include #include #include @@ -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 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 -#include #include #include @@ -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 #include -#include #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 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 #include -#include #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 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 -# Maintainer: CS�CSY L�szl� +# Maintainer: voroskoi 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 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 @@ + 284 + 2007-10-04 + voroskoi + wordpress + 2.2.2-1terminus1 + 2.2.3-1terminus1 + http://bugs.frugalware.org/task/2398 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4893 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4894 + 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. + + 283 2007-10-01 voroskoi 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 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 @@ + 285 + 2007-10-04 + voroskoi + mediawiki + 1.9.3-1 + 1.9.4-1terminus1 + http://bugs.frugalware.org/task/2412 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4828 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4883 + 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. + + 284 2007-10-04 voroskoi 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 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 @@ + 286 + 2007-10-04 + voroskoi + firefox + 2.0.0.6-1terminus1 + 2.0.0.7-1terminus1 + http://bugs.frugalware.org/task/2423 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4965 + 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. + + 285 2007-10-04 voroskoi 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 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 @@ + 287 + 2007-10-04 + voroskoi + inotify-tools + 3.8-1 + 3.8-2terminus1 + http://bugs.frugalware.org/task/2425 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5037 + 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. + + 286 2007-10-04 voroskoi 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 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 @@ + 288 + 2007-10-04 + voroskoi + libsndfile + 1.0.17-2 + 1.0.17-3terminus1 + http://bugs.frugalware.org/task/2431 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4974 + 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. + + 287 2007-10-04 voroskoi 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 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 @@ + 289 + 2007-10-04 + voroskoi + elinks + 0.11.2-2terminus1 + 0.11.2-2terminus2 + http://bugs.frugalware.org/task/2457 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5034 + 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. + + 288 2007-10-04 voroskoi 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 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 - -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 + +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 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 @@ + + 75 + Kernel update in -current: WARNING for Intel users + Thu Oct 4 15:08:53 UTC 2007 + VMiklos + 1 + this bugreport for more details. So after upgrading using pacman -Syu, you need to: +

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.
Edit /etc/fstab: change all occurrences of /etc/hd to /etc/sd.
Edit /boot/grub/menu.lst: change all occurrences of /etc/hd to /etc/sd in the Frugalware entry.
Reboot.

+ Thanks for your understandings! + ]]> + + 74 Frugalware 0.7rc2 (Sayshell) released Tue Oct 2 11:08:42 CEST 2007 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 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 @@ - 75 Kernel update in -current: WARNING for Intel users Thu Oct 4 15:08:53 UTC 2007 VMiklos - 1 + 0 this bugreport for more details. So after upgrading using pacman -Syu, you need to:

Frugalware 0.7rc2 (Sayshell) released

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 @@

Edit /boot/grub/menu.lst: change all occurrences of /etc/hd to /etc/sd in the Frugalware entry.

Reboot.

- Thanks for your understandings! + Thanks for your understanding! ]]> 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 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 this bugreport for more details. So after upgrading using pacman -Syu, you need to:

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.
Edit /etc/fstab: change all occurrences of /etc/hd to /etc/sd.
Edit /boot/grub/menu.lst: change all occurrences of /etc/hd to /etc/sd in the Frugalware entry.
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.
Reboot.

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 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! ]]> - + 74 Frugalware 0.7rc2 (Sayshell) released Tue Oct 2 11:08:42 CEST 2007 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 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 -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 +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 -Signed-off-by: Steve French --- + 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 @@ 75 - Kernel update in -current: WARNING for Intel users + Kernel update in -current: WARNING for Intel users with IDE controllers Thu Oct 4 15:08:53 UTC 2007 VMiklos 0 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 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 @@ ]> + 75 + Kernel frissítés a -currentben: FIGYELMEZTETÉS az Intel IDE verérlőt használóknak + Thu Oct 4 15:08:53 UTC 2007 + VMiklos + 0 + Ez a hibajegy ad további információt a problémával kapcsolatban. Tehát miután frissített a pacman -Syu használatával: +

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.
Szerkessze a /etc/fstab-ot: cserélje az összes /dev/hd-t /dev/sd-re.
Szerkessze a /boot/grub/menu.lst-t: cserélje az összes /dev/hd-t /dev/sd-re a Frugalware bejegyzésben.
Indítsa újra a számítógépet.

+ Köszönjük megértését! + ]]> + + + 74 Megjelent a Frugalware 0.7rc2 (Sayshell) Tue Oct 2 12:28:34 CEST 2007 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 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 -# (c) Patrick J. Volkerding, -# rc.quota for FrugalWare +# (c) 2007 CS�CSY L�szl� +# 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 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 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 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 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 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 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� 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� 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 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 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 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 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 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 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 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 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 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 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; iname; *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 alri) 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>(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)); ++ } ++ ++ /* 'itop=al; ++ ret->neg=r->neg; ++ ++ rp=ret->d; ++ ap=&(r->d[ri]); + al-=4; + for (i=0; iri)) 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 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 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; iname; *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 alri) 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>(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)); -+ } -+ -+ /* 'itop=al; -+ ret->neg=r->neg; -+ -+ rp=ret->d; -+ ap=&(r->d[ri]); - al-=4; - for (i=0; iri)) 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 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 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 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 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; iname; *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 alri) 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>(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)); ++ } ++ ++ /* 'itop=al; ++ ret->neg=r->neg; ++ ++ rp=ret->d; ++ ap=&(r->d[ri]); + al-=4; + for (i=0; iri)) 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ó 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 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 @@ VMiklos 0 this bugreport 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 this bugreport for more details. So after upgrading using pacman -Syu, you need to:

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.
Edit /etc/fstab: change all occurrences of /dev/hd to /dev/sd.

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� 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 +# Maintainer: CS�CSY L�szl� +# Contributor: Karoly CZOVEK 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� 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� +# Maintainer: CS�CSY L�szl� # Contributor: Karoly CZOVEK 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� 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 +# Maintainer: CS�CSY L�szl� +# Contributor: Karoly CZOVEK 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ó 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 +# Maintainer: CS�CSY L�szl� +# Contributor: Karoly CZOVEK 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ó 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� +# Maintainer: CS�CSY L�szl� # Contributor: Karoly CZOVEK 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ó 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 +# Maintainer: CS�CSY L�szl� +# Contributor: Karoly CZOVEK 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ó 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 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 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ó 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ó 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ó 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 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 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 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 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 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 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 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 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 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 @@ + 290 + 2007-10-06 + voroskoi + t1lib + 5.1.1-1 + 5.1.1-2terminus1 + http://bugs.frugalware.org/task/2297 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4033 + 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. + + 289 2007-10-04 voroskoi 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 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 @@ + 291 + 2007-10-06 + voroskoi + ruby + 1.8.5-4terminus1 + 1.8.5-4terminus2 + http://bugs.frugalware.org/task/2459 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5162 + 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. + + 290 2007-10-06 voroskoi 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 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 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 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 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 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 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 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 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 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 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 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 +# Compiling Time: 1.22 SBU +# Maintainer: Priyank Gosalia 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 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 - #include - #include - #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 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 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 +# Compiling Time: 0.30 SBU +# Maintainer: Priyank Gosalia 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 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 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 #include #include +#include #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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 @@ + 292 + 2007-10-07 + voroskoi + openssl + 0.9.8-6 + 0.9.8-7terminus1 + http://bugs.frugalware.org/task/2466 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3108 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5135 + 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. + + 291 2007-10-06 voroskoi 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 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 @@ + 293 + 2007-10-07 + voroskoi + xfs + 1.0.4-1 + 1.0.4-2terminus1 + http://bugs.frugalware.org/task/2458 + 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 + 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. + + 292 2007-10-07 voroskoi 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 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 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 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 Translators =========== +da_DK - Carl Andersen +fr_FR - Michel Hermier +hu_HU - Vajna Miklos 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 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 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 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 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 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 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 + #include + #include ++#include + + #include + #include +@@ -346,8 +347,20 @@ + + void hi_module_init(void) + { +- moreinfo = +- g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); ++ if (!g_file_test("/usr/share/misc/pci.ids", G_FILE_TEST_EXISTS)) { ++ static SyncEntry se[] = { ++ { ++ .fancy_name = "Update PCI ID listing", ++ .name = "GetPCIIds", ++ .save_to = "pci.ids", ++ .get_data = NULL ++ } ++ }; ++ ++ sync_manager_add_entry(&se[0]); ++ } ++ ++ moreinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + __init_memory_labels(); + } + +Index: hardinfo2/arch/linux/common/sensors.h +=================================================================== +--- hardinfo2/arch/linux/common/sensors.h (Revision 149) ++++ hardinfo2/arch/linux/common/sensors.h (Revision 160) +@@ -254,7 +254,7 @@ + + if ((tz = g_dir_open(path_tz, 0, NULL))) { + const gchar *entry; +- gchar *temp = ""; ++ gchar *temp = g_strdup(""); + + + while ((entry = g_dir_read_name(tz))) { +Index: hardinfo2/arch/linux/common/storage.h +=================================================================== +--- hardinfo2/arch/linux/common/storage.h (Revision 149) ++++ hardinfo2/arch/linux/common/storage.h (Revision 160) +@@ -335,7 +335,7 @@ + g_hash_table_insert(moreinfo, devid, strhash); + + g_free(model); +- model = ""; ++ model = g_strdup(""); + } else + g_free(device); + +Index: hardinfo2/arch/linux/common/pci.h +=================================================================== +--- hardinfo2/arch/linux/common/pci.h (Revision 149) ++++ hardinfo2/arch/linux/common/pci.h (Revision 160) +@@ -21,16 +21,32 @@ + { + FILE *lspci; + gchar buffer[256], *buf, *strhash = NULL, *strdevice = NULL; +- gchar *category = NULL, *name = NULL; +- gint n = 0; ++ gchar *category = NULL, *name = NULL, *icon; ++ gint n = 0, x = 0; + +- if (!(lspci = popen(LSPCI, "r"))) { +- goto pci_error; ++ buf = g_build_filename(g_get_home_dir(), ".hardinfo", "pci.ids", NULL); ++ if (!g_file_test(buf, G_FILE_TEST_EXISTS)) { ++ DEBUG("using system-provided PCI IDs"); ++ g_free(buf); ++ if (!(lspci = popen(LSPCI, "r"))) { ++ goto pci_error; ++ } ++ } else { ++ gchar *tmp; ++ ++ tmp = g_strdup_printf("%s -i '%s'", LSPCI, buf); ++ g_free(buf); ++ buf = tmp; ++ ++ DEBUG("using updated PCI IDs (from %s)", buf); ++ if (!(lspci = popen(tmp, "r"))) { ++ g_free(buf); ++ goto pci_error; ++ } else { ++ g_free(buf); ++ } + } + +- gchar *icon; +- +- int x = 0; /* unique Memory, Capability and I/O port */ + while (fgets(buffer, 256, lspci)) { + buf = g_strstrip(buffer); + +Index: hardinfo2/arch/linux/common/alsa.h +=================================================================== +--- hardinfo2/arch/linux/common/alsa.h (Revision 149) ++++ hardinfo2/arch/linux/common/alsa.h (Revision 160) +@@ -20,16 +20,15 @@ + computer_get_alsacards(Computer * computer) + { + GSList *p; +- gchar *tmp = ""; ++ gchar *tmp = g_strdup(""); + gint n = 0; + + if (computer->alsa) { + for (p = computer->alsa->cards; p; p = p->next) { + AlsaCard *ac = (AlsaCard *) p->data; + +- tmp = +- g_strdup_printf("Audio Adapter#%d=%s\n%s", ++n, +- ac->friendly_name, tmp); ++ tmp = h_strdup_cprintf("Audio Adapter#%d=%s\n", ++ tmp, ++n, ac->friendly_name); + } + } + +Index: hardinfo2/arch/linux/common/os.h +=================================================================== +--- hardinfo2/arch/linux/common/os.h (Revision 149) ++++ hardinfo2/arch/linux/common/os.h (Revision 160) +@@ -185,6 +185,15 @@ + os->distro = g_strdup(buf); + } + } ++ ++ if (g_str_equal(distro_db[i].codename, "ppy")) { ++ gchar *tmp; ++ ++ tmp = g_strdup_printf("Puppy Linux %.2f", atof(os->distro) / 100.0); ++ g_free(os->distro); ++ os->distro = tmp; ++ } ++ + os->distrocode = g_strdup(distro_db[i].codename); + + break; +Index: hardinfo2/shell.c +=================================================================== +--- hardinfo2/shell.c (Revision 149) ++++ hardinfo2/shell.c (Revision 160) +@@ -544,6 +544,8 @@ + shell->info = info_tree_new(FALSE); + shell->moreinfo = info_tree_new(TRUE); + shell->loadgraph = load_graph_new(75); ++ update_tbl = g_hash_table_new_full(g_str_hash, g_str_equal, ++ g_free, g_free); + + gtk_paned_pack1(GTK_PANED(shell->hpaned), shell->tree->scroll, + SHELL_PACK_RESIZE, SHELL_PACK_SHRINK); +@@ -585,8 +587,14 @@ + + static gboolean update_field(gpointer data) + { +- ShellFieldUpdate *fu = (ShellFieldUpdate *) data; +- GtkTreeIter *iter = g_hash_table_lookup(update_tbl, fu->field_name); ++ ShellFieldUpdate *fu; ++ GtkTreeIter *iter; ++ ++ fu = (ShellFieldUpdate *) data; ++ g_return_val_if_fail(fu != NULL, FALSE); ++ ++ iter = g_hash_table_lookup(update_tbl, fu->field_name); ++ g_return_val_if_fail(iter != NULL, FALSE); + + /* if the entry is still selected, update it */ + if (iter && fu->entry->selected && fu->entry->fieldfunc) { +@@ -1002,9 +1010,8 @@ + module_selected_show_info(ShellModuleEntry * entry, gboolean reload) + { + GKeyFile *key_file = g_key_file_new(); +- gchar *key_data; +- gchar **groups; + GtkTreeStore *store; ++ gchar *key_data, **groups; + gint i; + gsize ngroups; + +@@ -1016,16 +1023,9 @@ + + /* recreate the iter hash table */ + if (!reload) { +- if (update_tbl) { +- g_hash_table_foreach_remove(update_tbl, (GHRFunc) gtk_true, +- NULL); +- } else { +- update_tbl = +- g_hash_table_new_full(g_str_hash, g_str_equal, g_free, +- g_free); +- } ++ h_hash_table_remove_all(update_tbl); + } +- ++ + if (update_sfusrc) { + GSList *sfusrc; + +@@ -1123,23 +1123,19 @@ + GtkTreeIter parent; + ShellModuleEntry *entry; + static ShellModuleEntry *current = NULL; +- static gboolean updating = FALSE; + +- if (updating) +- return; +- +- updating = TRUE; +- + /* Gets the currently selected item on the left-side TreeView; if there is no + selection, silently return */ + if (!gtk_tree_selection_get_selected +- (shelltree->selection, &model, &parent)) ++ (shelltree->selection, &model, &parent)) { + return; ++ } + + /* Mark the currently selected module as "unselected"; this is used to kill the + update timeout. */ +- if (current) ++ if (current) { + current->selected = FALSE; ++ } + + /* Get the current selection and shows its related info */ + gtk_tree_model_get(model, &parent, TREE_COL_DATA, &entry, -1); +@@ -1190,7 +1186,6 @@ + } + + current = entry; +- updating = FALSE; + } + + static void info_selected(GtkTreeSelection * ts, gpointer data) +Index: hardinfo2/report.c +=================================================================== +--- hardinfo2/report.c (Revision 149) ++++ hardinfo2/report.c (Revision 160) +@@ -366,7 +366,7 @@ + GTK_RESPONSE_ACCEPT, NULL); + + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), +- "hardinfo report"); ++ "hardinfo_report"); + + file_chooser_add_filters(dialog, file_types); + file_chooser_open_expander(dialog); +Index: hardinfo2/iconcache.c +=================================================================== +--- hardinfo2/iconcache.c (Revision 149) ++++ hardinfo2/iconcache.c (Revision 160) +@@ -48,7 +48,9 @@ + g_free(path); + } + +- g_object_ref(icon); ++ if (icon) { ++ g_object_ref(icon); ++ } + + return icon; + } +@@ -81,7 +83,9 @@ + g_free(path); + } + +- g_object_ref(icon); ++ if (icon) { ++ g_object_ref(icon); ++ } + + return icon; + } +Index: hardinfo2/vendor.c +=================================================================== +--- hardinfo2/vendor.c (Revision 149) ++++ hardinfo2/vendor.c (Revision 160) +@@ -57,6 +57,7 @@ + {"Logitech", "Logitech International SA", "www.logitech.com"}, + {"FUJITSU", "Fujitsu", "www.fujitsu.com"}, + {"CDU", "Sony", "www.sony.com"}, ++ {"SanDisk", "SanDisk", "www.sandisk.com"}, + {NULL, NULL, NULL}, + }; + 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 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 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 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 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 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 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 /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 /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 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@