January 2006 - crux-commits

r547 - crux-2.1/ports/opt
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: viper Date: 2006-01-12 19:05:30 +0100 (Thu, 12 Jan 2006) New Revision: 547 Added: crux-2.1/ports/opt/9base/ Log: Initial import of 9base.

1 0

r546 - crux-2.1/ports/opt/wmii
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: viper Date: 2006-01-12 19:03:50 +0100 (Thu, 12 Jan 2006) New Revision: 546 Added: crux-2.1/ports/opt/wmii/README crux-2.1/ports/opt/wmii/wmii-2.5.patch Removed: crux-2.1/ports/opt/wmii/wmii-2.patch Modified: crux-2.1/ports/opt/wmii/.footprint crux-2.1/ports/opt/wmii/.md5sum crux-2.1/ports/opt/wmii/Pkgfile Log: Upgraded wmii to 2.5. Modified: crux-2.1/ports/opt/wmii/.footprint =================================================================== --- crux-2.1/ports/opt/wmii/.footprint 2006-01-12 17:31:17 UTC (rev 545) +++ crux-2.1/ports/opt/wmii/.footprint 2006-01-12 18:03:50 UTC (rev 546) @@ -1,76 +1,28 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmibar --rwxr-xr-x root/root usr/bin/wmifs -rwxr-xr-x root/root usr/bin/wmii +-rwxr-xr-x root/root usr/bin/wmiibar +-rwxr-xr-x root/root usr/bin/wmiifs +-rwxr-xr-x root/root usr/bin/wmiikeys +-rwxr-xr-x root/root usr/bin/wmiimenu +-rwxr-xr-x root/root usr/bin/wmiiplumb +-rwxr-xr-x root/root usr/bin/wmiir +-rwxr-xr-x root/root usr/bin/wmiiwarp -rwxr-xr-x root/root usr/bin/wmiiwm --rwxr-xr-x root/root usr/bin/wmikeys --rwxr-xr-x root/root usr/bin/wmimenu --rwxr-xr-x root/root usr/bin/wmiplumb --rwxr-xr-x root/root usr/bin/wmir --rwxr-xr-x root/root usr/bin/wmira --rwxr-xr-x root/root usr/bin/wmirefcard --rwxr-xr-x root/root usr/bin/wmiwarp drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/wmii/ -drwxr-xr-x root/root usr/etc/wmii/action/ --rwxr-xr-x root/root usr/etc/wmii/action/actions --rwxr-xr-x root/root usr/etc/wmii/action/attach --rwxr-xr-x root/root usr/etc/wmii/action/border --rwxr-xr-x root/root usr/etc/wmii/action/clientupdate --rwxr-xr-x root/root usr/etc/wmii/action/close --rwxr-xr-x root/root usr/etc/wmii/action/cnext --rwxr-xr-x root/root usr/etc/wmii/action/cprev --rwxr-xr-x root/root usr/etc/wmii/action/detach --rwxr-xr-x root/root usr/etc/wmii/action/fnext --rwxr-xr-x root/root usr/etc/wmii/action/fprev --rwxr-xr-x root/root usr/etc/wmii/action/fresize --rwxr-xr-x root/root usr/etc/wmii/action/ftoggle --rwxr-xr-x root/root usr/etc/wmii/action/icons --rwxr-xr-x root/root usr/etc/wmii/action/kbare --rwxr-xr-x root/root usr/etc/wmii/action/kmove --rwxr-xr-x root/root usr/etc/wmii/action/knorm --rwxr-xr-x root/root usr/etc/wmii/action/kresize --rwxr-xr-x root/root usr/etc/wmii/action/lfloat --rwxr-xr-x root/root usr/etc/wmii/action/lgrid --rwxr-xr-x root/root usr/etc/wmii/action/lmax --rwxr-xr-x root/root usr/etc/wmii/action/lock --rwxr-xr-x root/root usr/etc/wmii/action/ltiled --rwxr-xr-x root/root usr/etc/wmii/action/lvsplit --rwxr-xr-x root/root usr/etc/wmii/action/max --rwxr-xr-x root/root usr/etc/wmii/action/mouse --rwxr-xr-x root/root usr/etc/wmii/action/p --rwxr-xr-x root/root usr/etc/wmii/action/pager --rwxr-xr-x root/root usr/etc/wmii/action/pageupdate --rwxr-xr-x root/root usr/etc/wmii/action/plumbgoogle --rwxr-xr-x root/root usr/etc/wmii/action/plumburl --rwxr-xr-x root/root usr/etc/wmii/action/pnew --rwxr-xr-x root/root usr/etc/wmii/action/pnext --rwxr-xr-x root/root usr/etc/wmii/action/pprev --rwxr-xr-x root/root usr/etc/wmii/action/premove --rwxr-xr-x root/root usr/etc/wmii/action/presize --rwxr-xr-x root/root usr/etc/wmii/action/programs --rwxr-xr-x root/root usr/etc/wmii/action/ptoggle --rwxr-xr-x root/root usr/etc/wmii/action/quit --rwxr-xr-x root/root usr/etc/wmii/action/scr --rwxr-xr-x root/root usr/etc/wmii/action/tab --rwxr-xr-x root/root usr/etc/wmii/action/term --rwxr-xr-x root/root usr/etc/wmii/action/www --rwxr-xr-x root/root usr/etc/wmii/action/zoom --rw-r--r-- root/root usr/etc/wmii/bar --rw-r--r-- root/root usr/etc/wmii/keys --rw-r--r-- root/root usr/etc/wmii/menu --rwxr-xr-x root/root usr/etc/wmii/rc --rw-r--r-- root/root usr/etc/wmii/rc.conf --rwxr-xr-x root/root usr/etc/wmii/status.sh --rw-r--r-- root/root usr/etc/wmii/wm +drwxr-xr-x root/root usr/etc/wmii-2.5/ +-rwxr-xr-x root/root usr/etc/wmii-2.5/extern +-rwxr-xr-x root/root usr/etc/wmii-2.5/kmode +-rwxr-xr-x root/root usr/etc/wmii-2.5/quit +-rwxr-xr-x root/root usr/etc/wmii-2.5/status +-rwxr-xr-x root/root usr/etc/wmii-2.5/welcome +-rwxr-xr-x root/root usr/etc/wmii-2.5/wmiirc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/wmibar.1.gz --rw-r--r-- root/root usr/man/man1/wmifs.1.gz --rw-r--r-- root/root usr/man/man1/wmii.1.gz --rw-r--r-- root/root usr/man/man1/wmikeys.1.gz --rw-r--r-- root/root usr/man/man1/wmimenu.1.gz --rw-r--r-- root/root usr/man/man1/wmir.1.gz -drwxr-xr-x root/root usr/man/man5/ --rw-r--r-- root/root usr/man/man5/wmii.rc.5.gz +-r--r--r-- root/root usr/man/man1/wmii.1.gz +-r--r--r-- root/root usr/man/man1/wmiibar.1.gz +-r--r--r-- root/root usr/man/man1/wmiifs.1.gz +-r--r--r-- root/root usr/man/man1/wmiikeys.1.gz +-r--r--r-- root/root usr/man/man1/wmiimenu.1.gz +-r--r--r-- root/root usr/man/man1/wmiir.1.gz +-r--r--r-- root/root usr/man/man1/wmiiwm.1.gz Modified: crux-2.1/ports/opt/wmii/.md5sum =================================================================== --- crux-2.1/ports/opt/wmii/.md5sum 2006-01-12 17:31:17 UTC (rev 545) +++ crux-2.1/ports/opt/wmii/.md5sum 2006-01-12 18:03:50 UTC (rev 546) @@ -1,2 +1,2 @@ -da1357ab780930cefe5daf675be5851a wmii-2.patch -e03379bb991260f11aab7f7c4d761dd3 wmii-2.tar.gz +847e449f4afe14a26e997c29fe4c4d58 wmii-2.5.patch +c8815f468d462ab23494deb1d16ee023 wmii-2.5.tar.gz Modified: crux-2.1/ports/opt/wmii/Pkgfile =================================================================== --- crux-2.1/ports/opt/wmii/Pkgfile 2006-01-12 17:31:17 UTC (rev 545) +++ crux-2.1/ports/opt/wmii/Pkgfile 2006-01-12 18:03:50 UTC (rev 546) @@ -1,9 +1,10 @@ # Description: The next generation of WMI # URL: http://wmii.de/ # Maintainer: Simon Glo�ner, viper at hometux dot de +# Depends on: 9base name=wmii -version=2 +version=2.5 release=2 source=(http://wmii.de/download/$name-$version.tar.gz $name-$version.patch) @@ -13,12 +14,9 @@ # disable annoying mouse warping patch -p1 < ../$name-$version.patch - make \ - PREFIX=/usr \ - MANPREFIX=/usr/man \ - DESTDIR=$PKG install - - chmod 644 $PKG/usr/man/man?/* + sed -i 's|^PREFIX.*|PREFIX=/usr|' config.mk + sed -i 's|^MANPREFIX.*|MANPREFIX=/usr/man|' config.mk + sed -i 's|^9PREFIX.*|9PREFIX=/usr/share/9base|' config.mk - rm -r $PKG/usr/share/ + make DESTDIR=$PKG clean install } Added: crux-2.1/ports/opt/wmii/README =================================================================== --- crux-2.1/ports/opt/wmii/README 2006-01-12 17:31:17 UTC (rev 545) +++ crux-2.1/ports/opt/wmii/README 2006-01-12 18:03:50 UTC (rev 546) @@ -0,0 +1,19 @@ + +REQUIREMENTS + + The wmii configuration scripts now rely on the 9base package which + contains ports of various Plan 9 standard tools, in particular the + rc shell. I've created a port of it. + +PRE-INSTALL + +POST-INSTALL + +PRECAUTION + + The developer of wmii changed the configuration format again. You + have to manually convert your old configuration to use it in this + new version. The configuration paths also have been changed. + + ~/.wmii-2.5 + /etc/wmii-2.5 Added: crux-2.1/ports/opt/wmii/wmii-2.5.patch =================================================================== --- crux-2.1/ports/opt/wmii/wmii-2.5.patch 2006-01-12 17:31:17 UTC (rev 545) +++ crux-2.1/ports/opt/wmii/wmii-2.5.patch 2006-01-12 18:03:50 UTC (rev 546) @@ -0,0 +1,15 @@ +*** wmii-2.5/cmd/wm/page.c 2006-01-12 18:44:44.000000000 +0100 +--- wmii-2.5/cmd/wm/page.c 2006-01-12 18:44:58.000000000 +0100 +*************** +*** 273,282 **** + XTranslateCoordinates(dpy, f->win, root, wex, wey, &ex, &ey, &dummy); + if (blitz_ispointinrect(ex, ey, r)) + return; +- /* suppress EnterNotify's while mouse warping */ +- XSync(dpy, False); +- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, r->width / 2, r->height / 2); +- XSync(dpy, True); + } + + static void +--- 273,278 ---- Deleted: crux-2.1/ports/opt/wmii/wmii-2.patch =================================================================== --- crux-2.1/ports/opt/wmii/wmii-2.patch 2006-01-12 17:31:17 UTC (rev 545) +++ crux-2.1/ports/opt/wmii/wmii-2.patch 2006-01-12 18:03:50 UTC (rev 546) @@ -1,38 +0,0 @@ -*** wmii-2/base/page.c 2005-07-31 00:14:00.000000000 +0200 ---- wmii-2/base/page.c 2005-09-10 18:46:16.000000000 +0200 -*************** -*** 287,295 **** - focus_frame(f, 1, 1, 1); - /* suppress all EnterNotifs */ - XSelectInput(dpy, root, ROOT_MASK & ~StructureNotifyMask); -- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, -- atoi(f->files[F_BORDER_W]->content), -- atoi(f->files[F_BORDER_W]->content)); - XSelectInput(dpy, root, ROOT_MASK); - if(old) - draw_frame(old); ---- 287,292 ---- -*************** -*** 460,468 **** - focus_frame(f, 1, 0, 1); - if(is_managed_frame(f) && p->layout) - p->layout->manage(f); -- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, -- atoi(f->files[F_BORDER_W]->content), -- atoi(f->files[F_BORDER_W]->content)); - XSelectInput(dpy, root, ROOT_MASK); - if(old) - draw_frame(old); ---- 457,462 ---- -*************** -*** 504,512 **** - fr = get_selected(p); - if(fr) { - XSelectInput(dpy, root, ROOT_MASK & ~StructureNotifyMask); -- XWarpPointer(dpy, None, fr->win, 0, 0, 0, 0, -- atoi(fr->files[F_BORDER_W]->content), -- atoi(fr->files[F_BORDER_W]->content)); - XSelectInput(dpy, root, ROOT_MASK); - draw_frame(fr); - } ---- 498,503 ----

1 0

r545 - crux-2.1/ports/opt/libusb
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: jue Date: 2006-01-12 18:31:17 +0100 (Thu, 12 Jan 2006) New Revision: 545 Modified: crux-2.1/ports/opt/libusb/.footprint crux-2.1/ports/opt/libusb/Pkgfile Log: libusb: moved libraries to /lib, as suggested by danm Modified: crux-2.1/ports/opt/libusb/.footprint =================================================================== --- crux-2.1/ports/opt/libusb/.footprint 2006-01-12 17:29:01 UTC (rev 544) +++ crux-2.1/ports/opt/libusb/.footprint 2006-01-12 17:31:17 UTC (rev 545) @@ -1,3 +1,8 @@ +drwxr-xr-x root/root lib/ +lrwxrwxrwx root/root lib/libusb-0.1.so.4 -> libusb-0.1.so.4.4.2 +-rwxr-xr-x root/root lib/libusb-0.1.so.4.4.2 +lrwxrwxrwx root/root lib/libusbpp-0.1.so.4 -> libusbpp-0.1.so.4.4.2 +-rwxr-xr-x root/root lib/libusbpp-0.1.so.4.4.2 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/libusb-config @@ -6,12 +11,12 @@ -rw-r--r-- root/root usr/include/usbpp.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libusb-0.1.so.4 -> libusb-0.1.so.4.4.2 --rwxr-xr-x root/root usr/lib/libusb-0.1.so.4.4.2 +lrwxrwxrwx root/root usr/lib/libusb-0.1.so.4.4.2 -> ../../lib/libusb-0.1.so.4.4.2 -rw-r--r-- root/root usr/lib/libusb.a -rwxr-xr-x root/root usr/lib/libusb.la lrwxrwxrwx root/root usr/lib/libusb.so -> libusb-0.1.so.4.4.2 lrwxrwxrwx root/root usr/lib/libusbpp-0.1.so.4 -> libusbpp-0.1.so.4.4.2 --rwxr-xr-x root/root usr/lib/libusbpp-0.1.so.4.4.2 +lrwxrwxrwx root/root usr/lib/libusbpp-0.1.so.4.4.2 -> ../../lib/libusbpp-0.1.so.4.4.2 -rw-r--r-- root/root usr/lib/libusbpp.a -rwxr-xr-x root/root usr/lib/libusbpp.la lrwxrwxrwx root/root usr/lib/libusbpp.so -> libusbpp-0.1.so.4.4.2 Modified: crux-2.1/ports/opt/libusb/Pkgfile =================================================================== --- crux-2.1/ports/opt/libusb/Pkgfile 2006-01-12 17:29:01 UTC (rev 544) +++ crux-2.1/ports/opt/libusb/Pkgfile 2006-01-12 17:31:17 UTC (rev 545) @@ -1,11 +1,10 @@ # Description: Library giving userland programs access to USB devices # URL: http://libusb.sourceforge.net/ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de -# Packager: Arnaud Mazin, arnaud dot mazin at free dot fr name=libusb version=0.1.10a -release=1 +release=2 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz) build () { @@ -16,4 +15,12 @@ --disable-build-docs make make DESTDIR=$PKG install + + mkdir $PKG/lib + local file libfiles=$PKG/usr/lib/lib*-*.so.*.*.* + for file in $libfiles; do + mv $file $PKG/lib/ + ln -sf ../../lib/${file##*/} $PKG/usr/lib/${file##*/} + done + ldconfig -nN $PKG/lib }

1 0

r544 - crux-2.1/ports/opt/xsane
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: jue Date: 2006-01-12 18:29:01 +0100 (Thu, 12 Jan 2006) New Revision: 544 Modified: crux-2.1/ports/opt/xsane/.md5sum crux-2.1/ports/opt/xsane/Pkgfile Log: xsane: update 0.99 Modified: crux-2.1/ports/opt/xsane/.md5sum =================================================================== --- crux-2.1/ports/opt/xsane/.md5sum 2006-01-12 17:28:29 UTC (rev 543) +++ crux-2.1/ports/opt/xsane/.md5sum 2006-01-12 17:29:01 UTC (rev 544) @@ -1 +1 @@ -6efcdc02047c4971b042180844e90e72 xsane-0.98b.tar.gz +c850be334dcd36d426d5d85c7334275a xsane-0.99.tar.gz Modified: crux-2.1/ports/opt/xsane/Pkgfile =================================================================== --- crux-2.1/ports/opt/xsane/Pkgfile 2006-01-12 17:28:29 UTC (rev 543) +++ crux-2.1/ports/opt/xsane/Pkgfile 2006-01-12 17:29:01 UTC (rev 544) @@ -4,7 +4,7 @@ # Depends on: gimp, sane name=xsane -version=0.98b +version=0.99 release=1 source=(http://www.xsane.org/download/$name-$version.tar.gz)

1 0

r543 - crux-2.1/ports/opt/vsftpd
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: jue Date: 2006-01-12 18:28:29 +0100 (Thu, 12 Jan 2006) New Revision: 543 Added: crux-2.1/ports/opt/vsftpd/vsftpd-2.0.4.patch Removed: crux-2.1/ports/opt/vsftpd/vsftpd-2.0.3.patch Modified: crux-2.1/ports/opt/vsftpd/.md5sum crux-2.1/ports/opt/vsftpd/Pkgfile Log: vsftpd: update to 2.0.4 Modified: crux-2.1/ports/opt/vsftpd/.md5sum =================================================================== --- crux-2.1/ports/opt/vsftpd/.md5sum 2006-01-12 17:27:13 UTC (rev 542) +++ crux-2.1/ports/opt/vsftpd/.md5sum 2006-01-12 17:28:29 UTC (rev 543) @@ -1,3 +1,3 @@ 80bebc382e1cc9ee34dabb117f86b9e4 vsftpd -37d112c326ae41d8c74dce2cb6b49319 vsftpd-2.0.3.patch -74936cbd8e8251deb1cd99c5fb18b6f8 vsftpd-2.0.3.tar.gz +59ad6f663e9a51d8a6ca1d07118dddaa vsftpd-2.0.4.patch +c0bf8c7b8e15ab15827172786fc56115 vsftpd-2.0.4.tar.gz Modified: crux-2.1/ports/opt/vsftpd/Pkgfile =================================================================== --- crux-2.1/ports/opt/vsftpd/Pkgfile 2006-01-12 17:27:13 UTC (rev 542) +++ crux-2.1/ports/opt/vsftpd/Pkgfile 2006-01-12 17:28:29 UTC (rev 543) @@ -4,8 +4,8 @@ # Depends on: openssl name=vsftpd -version=2.0.3 -release=3 +version=2.0.4 +release=1 source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \ $name-$version.patch vsftpd) Deleted: crux-2.1/ports/opt/vsftpd/vsftpd-2.0.3.patch =================================================================== --- crux-2.1/ports/opt/vsftpd/vsftpd-2.0.3.patch 2006-01-12 17:27:13 UTC (rev 542) +++ crux-2.1/ports/opt/vsftpd/vsftpd-2.0.3.patch 2006-01-12 17:28:29 UTC (rev 543) @@ -1,123 +0,0 @@ -diff -Nru vsftpd-2.0.3.orig/Makefile vsftpd-2.0.3/Makefile ---- vsftpd-2.0.3.orig/Makefile 2005-08-06 19:04:37.000000000 +0200 -+++ vsftpd-2.0.3/Makefile 2005-08-06 19:20:31.000000000 +0200 -@@ -3,7 +3,7 @@ - INSTALL = install - IFLAGS = -idirafter dummyinc - #CFLAGS = -g --CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion -+CFLAGS += -Wall -W -Wshadow #-pedantic -Werror -Wconversion - - LIBS = `./vsf_findlibs.sh` - LINK = -Wl,-s -@@ -24,21 +24,10 @@ - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) - - install: -- if [ -x /usr/local/sbin ]; then \ -- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \ -- else \ -- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi -- if [ -x /usr/local/man ]; then \ -- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ -- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ -- elif [ -x /usr/share/man ]; then \ -- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ -- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ -- else \ -- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \ -- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi -- if [ -x /etc/xinetd.d ]; then \ -- $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi -+ $(INSTALL) -D -m 755 vsftpd $(DESTDIR)/usr/sbin/vsftpd -+ $(INSTALL) -D -m 644 vsftpd.8 $(DESTDIR)/usr/man/man8/vsftpd.8 -+ $(INSTALL) -D -m 644 vsftpd.conf.5 $(DESTDIR)/usr/man/man5/vsftpd.conf.5 -+ $(INSTALL) -D -m 600 vsftpd.conf $(DESTDIR)/etc/vsftpd.conf - - clean: - rm -f *.o *.swp vsftpd -diff -Nru vsftpd-2.0.3.orig/builddefs.h vsftpd-2.0.3/builddefs.h ---- vsftpd-2.0.3.orig/builddefs.h 2005-08-06 19:04:37.000000000 +0200 -+++ vsftpd-2.0.3/builddefs.h 2005-08-06 19:05:36.000000000 +0200 -@@ -1,9 +1,9 @@ - #ifndef VSF_BUILDDEFS_H - #define VSF_BUILDDEFS_H - --#undef VSF_BUILD_TCPWRAPPERS --#define VSF_BUILD_PAM --#undef VSF_BUILD_SSL -+#define VSF_BUILD_TCPWRAPPERS -+#undef VSF_BUILD_PAM -+#define VSF_BUILD_SSL - - #endif /* VSF_BUILDDEFS_H */ - -diff -Nru vsftpd-2.0.3.orig/tunables.c vsftpd-2.0.3/tunables.c ---- vsftpd-2.0.3.orig/tunables.c 2005-08-06 19:04:37.000000000 +0200 -+++ vsftpd-2.0.3/tunables.c 2005-08-06 21:33:19.000000000 +0200 -@@ -89,7 +89,7 @@ - unsigned int tunable_max_per_ip = 0; - unsigned int tunable_trans_chunk_size = 0; - --const char* tunable_secure_chroot_dir = "/usr/share/empty"; -+const char* tunable_secure_chroot_dir = "/var/empty"; - const char* tunable_ftp_username = "ftp"; - const char* tunable_chown_username = "root"; - const char* tunable_xferlog_file = "/var/log/xferlog"; -@@ -114,7 +114,7 @@ - const char* tunable_deny_file = 0; - const char* tunable_user_sub_token = 0; - const char* tunable_email_password_file = "/etc/vsftpd.email_passwords"; --const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem"; -+const char* tunable_rsa_cert_file = "/etc/ssl/certs/vsftpd.pem"; - const char* tunable_dsa_cert_file = 0; - const char* tunable_ssl_ciphers = "DES-CBC3-SHA"; - const char* tunable_rsa_private_key_file = 0; -diff -Nru vsftpd-2.0.3.orig/vsftpd.conf vsftpd-2.0.3/vsftpd.conf ---- vsftpd-2.0.3.orig/vsftpd.conf 2005-08-06 19:04:37.000000000 +0200 -+++ vsftpd-2.0.3/vsftpd.conf 2005-08-08 10:41:47.000000000 +0200 -@@ -8,11 +8,23 @@ - # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's - # capabilities. - # -+# -+# Run standalone -+listen=YES -+# -+# Use tcp_wrappers library -+tcp_wrappers=YES -+# -+# Enable SSL support -+ssl_enable=YES -+ssl_sslv3=YES -+# - # Allow anonymous FTP? (Beware - allowed by default if you comment this out). - anonymous_enable=YES - # - # Uncomment this to allow local users to log in. - #local_enable=YES -+#force_local_logins_ssl=YES - # - # Uncomment this to enable any form of FTP write command. - #write_enable=YES -diff -Nru vsftpd-2.0.3.orig/vsftpd.conf.5 vsftpd-2.0.3/vsftpd.conf.5 ---- vsftpd-2.0.3.orig/vsftpd.conf.5 2005-08-06 19:04:37.000000000 +0200 -+++ vsftpd-2.0.3/vsftpd.conf.5 2005-08-06 21:33:50.000000000 +0200 -@@ -820,7 +820,7 @@ - This option specifies the location of the RSA certificate to use for SSL - encrypted connections. - --Default: /usr/share/ssl/certs/vsftpd.pem -+Default: /etc/ssl/certs/vsftpd.pem - .TP - .B rsa_private_key_file - This option specifies the location of the RSA private key to use for SSL -@@ -834,7 +834,7 @@ - directory should not be writable by the ftp user. This directory is used - as a secure chroot() jail at times vsftpd does not require filesystem access. - --Default: /usr/share/empty -+Default: /var/empty - .TP - .B ssl_ciphers - This option can be used to select which SSL ciphers vsftpd will allow for Added: crux-2.1/ports/opt/vsftpd/vsftpd-2.0.4.patch =================================================================== --- crux-2.1/ports/opt/vsftpd/vsftpd-2.0.4.patch 2006-01-12 17:27:13 UTC (rev 542) +++ crux-2.1/ports/opt/vsftpd/vsftpd-2.0.4.patch 2006-01-12 17:28:29 UTC (rev 543) @@ -0,0 +1,123 @@ +diff -Nru vsftpd-2.0.4.orig/Makefile vsftpd-2.0.4/Makefile +--- vsftpd-2.0.4.orig/Makefile 2006-01-10 19:25:18.000000000 +0100 ++++ vsftpd-2.0.4/Makefile 2006-01-10 19:25:36.000000000 +0100 +@@ -3,7 +3,7 @@ + INSTALL = install + IFLAGS = -idirafter dummyinc + #CFLAGS = -g +-CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion ++CFLAGS += -Wall -W -Wshadow #-pedantic -Werror -Wconversion + + LIBS = `./vsf_findlibs.sh` + LINK = -Wl,-s +@@ -24,21 +24,10 @@ + $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) + + install: +- if [ -x /usr/local/sbin ]; then \ +- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \ +- else \ +- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi +- if [ -x /usr/local/man ]; then \ +- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ +- elif [ -x /usr/share/man ]; then \ +- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ +- else \ +- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi +- if [ -x /etc/xinetd.d ]; then \ +- $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi ++ $(INSTALL) -D -m 755 vsftpd $(DESTDIR)/usr/sbin/vsftpd ++ $(INSTALL) -D -m 644 vsftpd.8 $(DESTDIR)/usr/man/man8/vsftpd.8 ++ $(INSTALL) -D -m 644 vsftpd.conf.5 $(DESTDIR)/usr/man/man5/vsftpd.conf.5 ++ $(INSTALL) -D -m 600 vsftpd.conf $(DESTDIR)/etc/vsftpd.conf + + clean: + rm -f *.o *.swp vsftpd +diff -Nru vsftpd-2.0.4.orig/builddefs.h vsftpd-2.0.4/builddefs.h +--- vsftpd-2.0.4.orig/builddefs.h 2006-01-10 19:25:18.000000000 +0100 ++++ vsftpd-2.0.4/builddefs.h 2006-01-10 19:25:36.000000000 +0100 +@@ -1,9 +1,9 @@ + #ifndef VSF_BUILDDEFS_H + #define VSF_BUILDDEFS_H + +-#undef VSF_BUILD_TCPWRAPPERS +-#define VSF_BUILD_PAM +-#undef VSF_BUILD_SSL ++#define VSF_BUILD_TCPWRAPPERS ++#undef VSF_BUILD_PAM ++#define VSF_BUILD_SSL + + #endif /* VSF_BUILDDEFS_H */ + +diff -Nru vsftpd-2.0.4.orig/tunables.c vsftpd-2.0.4/tunables.c +--- vsftpd-2.0.4.orig/tunables.c 2006-01-10 19:25:18.000000000 +0100 ++++ vsftpd-2.0.4/tunables.c 2006-01-10 19:25:36.000000000 +0100 +@@ -92,7 +92,7 @@ + unsigned int tunable_max_per_ip = 0; + unsigned int tunable_trans_chunk_size = 0; + +-const char* tunable_secure_chroot_dir = "/usr/share/empty"; ++const char* tunable_secure_chroot_dir = "/var/empty"; + const char* tunable_ftp_username = "ftp"; + const char* tunable_chown_username = "root"; + const char* tunable_xferlog_file = "/var/log/xferlog"; +@@ -117,7 +117,7 @@ + const char* tunable_deny_file = 0; + const char* tunable_user_sub_token = 0; + const char* tunable_email_password_file = "/etc/vsftpd.email_passwords"; +-const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem"; ++const char* tunable_rsa_cert_file = "/etc/ssl/certs/vsftpd.pem"; + const char* tunable_dsa_cert_file = 0; + const char* tunable_ssl_ciphers = "DES-CBC3-SHA"; + const char* tunable_rsa_private_key_file = 0; +diff -Nru vsftpd-2.0.4.orig/vsftpd.conf vsftpd-2.0.4/vsftpd.conf +--- vsftpd-2.0.4.orig/vsftpd.conf 2006-01-10 19:25:18.000000000 +0100 ++++ vsftpd-2.0.4/vsftpd.conf 2006-01-10 19:25:36.000000000 +0100 +@@ -8,11 +8,23 @@ + # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's + # capabilities. + # ++# ++# Run standalone ++listen=YES ++# ++# Use tcp_wrappers library ++tcp_wrappers=YES ++# ++# Enable SSL support ++ssl_enable=YES ++ssl_sslv3=YES ++# + # Allow anonymous FTP? (Beware - allowed by default if you comment this out). + anonymous_enable=YES + # + # Uncomment this to allow local users to log in. + #local_enable=YES ++#force_local_logins_ssl=YES + # + # Uncomment this to enable any form of FTP write command. + #write_enable=YES +diff -Nru vsftpd-2.0.4.orig/vsftpd.conf.5 vsftpd-2.0.4/vsftpd.conf.5 +--- vsftpd-2.0.4.orig/vsftpd.conf.5 2006-01-10 19:25:18.000000000 +0100 ++++ vsftpd-2.0.4/vsftpd.conf.5 2006-01-10 19:25:36.000000000 +0100 +@@ -844,7 +844,7 @@ + This option specifies the location of the RSA certificate to use for SSL + encrypted connections. + +-Default: /usr/share/ssl/certs/vsftpd.pem ++Default: /etc/ssl/certs/vsftpd.pem + .TP + .B rsa_private_key_file + This option specifies the location of the RSA private key to use for SSL +@@ -858,7 +858,7 @@ + directory should not be writable by the ftp user. This directory is used + as a secure chroot() jail at times vsftpd does not require filesystem access. + +-Default: /usr/share/empty ++Default: /var/empty + .TP + .B ssl_ciphers + This option can be used to select which SSL ciphers vsftpd will allow for

1 0

r542 - crux-2.1/ports/opt/mod_php
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: jue Date: 2006-01-12 18:27:13 +0100 (Thu, 12 Jan 2006) New Revision: 542 Modified: crux-2.1/ports/opt/mod_php/.footprint crux-2.1/ports/opt/mod_php/.md5sum crux-2.1/ports/opt/mod_php/Pkgfile Log: [security] mod_php: update to 5.1.2, http://www.php.net/release_5_1_2.php Modified: crux-2.1/ports/opt/mod_php/.footprint =================================================================== --- crux-2.1/ports/opt/mod_php/.footprint 2006-01-12 05:27:53 UTC (rev 541) +++ crux-2.1/ports/opt/mod_php/.footprint 2006-01-12 17:27:13 UTC (rev 542) @@ -61,7 +61,6 @@ -rw-r--r-- root/root usr/include/php/Zend/zend_operators.h -rw-r--r-- root/root usr/include/php/Zend/zend_ptr_stack.h -rw-r--r-- root/root usr/include/php/Zend/zend_qsort.h --rw-r--r-- root/root usr/include/php/Zend/zend_reflection_api.h -rw-r--r-- root/root usr/include/php/Zend/zend_stack.h -rw-r--r-- root/root usr/include/php/Zend/zend_static_allocator.h -rw-r--r-- root/root usr/include/php/Zend/zend_stream.h @@ -82,6 +81,19 @@ -rw-r--r-- root/root usr/include/php/ext/date/php_date.h drwxr-xr-x root/root usr/include/php/ext/dom/ -rw-r--r-- root/root usr/include/php/ext/dom/xml_common.h +drwxr-xr-x root/root usr/include/php/ext/hash/ +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_adler32.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_crc32.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_gost.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_haval.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_md.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_ripemd.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_sha.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_snefru.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_tiger.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_types.h +-rw-r--r-- root/root usr/include/php/ext/hash/php_hash_whirlpool.h drwxr-xr-x root/root usr/include/php/ext/iconv/ -rw-r--r-- root/root usr/include/php/ext/iconv/php_have_bsd_iconv.h -rw-r--r-- root/root usr/include/php/ext/iconv/php_have_glibc_iconv.h @@ -159,7 +171,6 @@ -rw-r--r-- root/root usr/include/php/ext/standard/php_smart_str_public.h -rw-r--r-- root/root usr/include/php/ext/standard/php_standard.h -rw-r--r-- root/root usr/include/php/ext/standard/php_string.h --rw-r--r-- root/root usr/include/php/ext/standard/php_sunfuncs.h -rw-r--r-- root/root usr/include/php/ext/standard/php_type.h -rw-r--r-- root/root usr/include/php/ext/standard/php_uuencode.h -rw-r--r-- root/root usr/include/php/ext/standard/php_var.h Modified: crux-2.1/ports/opt/mod_php/.md5sum =================================================================== --- crux-2.1/ports/opt/mod_php/.md5sum 2006-01-12 05:27:53 UTC (rev 541) +++ crux-2.1/ports/opt/mod_php/.md5sum 2006-01-12 17:27:13 UTC (rev 542) @@ -1 +1 @@ -70a7c90de182d1a1901c390b844153c7 php-5.1.1.tar.bz2 +79cee17e9db85be878000a2a4198378e php-5.1.2.tar.bz2 Modified: crux-2.1/ports/opt/mod_php/Pkgfile =================================================================== --- crux-2.1/ports/opt/mod_php/Pkgfile 2006-01-12 05:27:53 UTC (rev 541) +++ crux-2.1/ports/opt/mod_php/Pkgfile 2006-01-12 17:27:13 UTC (rev 542) @@ -5,7 +5,7 @@ # Group: apache name=mod_php -version=5.1.1 +version=5.1.2 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

r541 - crux-2.1/ports/opt/scribus
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: sten Date: 2006-01-12 06:27:53 +0100 (Thu, 12 Jan 2006) New Revision: 541 Modified: crux-2.1/ports/opt/scribus/.footprint crux-2.1/ports/opt/scribus/.md5sum crux-2.1/ports/opt/scribus/Pkgfile Log: scribus: update to 1.2.4.1 Modified: crux-2.1/ports/opt/scribus/.footprint =================================================================== --- crux-2.1/ports/opt/scribus/.footprint 2006-01-12 00:11:38 UTC (rev 540) +++ crux-2.1/ports/opt/scribus/.footprint 2006-01-12 05:27:53 UTC (rev 541) @@ -102,6 +102,7 @@ -rw-r--r-- root/root usr/lib/scribus/dicts/hyph_it.dic -rw-r--r-- root/root usr/lib/scribus/dicts/hyph_lt.dic -rw-r--r-- root/root usr/lib/scribus/dicts/hyph_nl.dic +-rw-r--r-- root/root usr/lib/scribus/dicts/hyph_nn.dic -rw-r--r-- root/root usr/lib/scribus/dicts/hyph_pl.dic -rw-r--r-- root/root usr/lib/scribus/dicts/hyph_pt.dic -rw-r--r-- root/root usr/lib/scribus/dicts/hyph_pt_BR.dic @@ -241,6 +242,7 @@ -rw-r--r-- root/root usr/lib/scribus/scribus.sl.qm -rw-r--r-- root/root usr/lib/scribus/scribus.sq.qm -rw-r--r-- root/root usr/lib/scribus/scribus.sr.qm +-rw-r--r-- root/root usr/lib/scribus/scribus.th_TH.qm -rw-r--r-- root/root usr/lib/scribus/scribus.tr.qm -rw-r--r-- root/root usr/lib/scribus/scribus.uk.qm -rw-r--r-- root/root usr/lib/scribus/scribus.zh.qm Modified: crux-2.1/ports/opt/scribus/.md5sum =================================================================== --- crux-2.1/ports/opt/scribus/.md5sum 2006-01-12 00:11:38 UTC (rev 540) +++ crux-2.1/ports/opt/scribus/.md5sum 2006-01-12 05:27:53 UTC (rev 541) @@ -1 +1 @@ -ced1e74d4be30482b48bd04d52e47d46 scribus-1.2.3.tar.bz2 +d72ffe72b1d9ba1230557692af803927 scribus-1.2.4.1.tar.bz2 Modified: crux-2.1/ports/opt/scribus/Pkgfile =================================================================== --- crux-2.1/ports/opt/scribus/Pkgfile 2006-01-12 00:11:38 UTC (rev 540) +++ crux-2.1/ports/opt/scribus/Pkgfile 2006-01-12 05:27:53 UTC (rev 541) @@ -5,9 +5,9 @@ # Depends on: qt3, cups, python name=scribus -version=1.2.3 +version=1.2.4.1 release=1 -source=(http://www.$name.org.uk/downloads/$version/$name-$version.tar.bz2) +source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2) build() { cd $name-$version

1 0

r540 - in crux-2.1/ports/opt: kdeaddons kdeadmin kdeartwork kdebindings kdegames kdelibs kdemultimedia kdenetwork kdetoys kdeutils
by crux＠crux.nu 12 Jan '06

12 Jan '06

Author: sten Date: 2006-01-12 01:11:38 +0100 (Thu, 12 Jan 2006) New Revision: 540 Added: crux-2.1/ports/opt/kdeaddons/.md5sum crux-2.1/ports/opt/kdeadmin/.md5sum crux-2.1/ports/opt/kdeartwork/.md5sum crux-2.1/ports/opt/kdebindings/.md5sum crux-2.1/ports/opt/kdegames/.md5sum crux-2.1/ports/opt/kdelibs/.md5sum crux-2.1/ports/opt/kdemultimedia/.md5sum crux-2.1/ports/opt/kdenetwork/.md5sum crux-2.1/ports/opt/kdetoys/.md5sum crux-2.1/ports/opt/kdeutils/.md5sum Log: KDE: .md5sums were under version control, but with status of '?'. Added: crux-2.1/ports/opt/kdeaddons/.md5sum =================================================================== --- crux-2.1/ports/opt/kdeaddons/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdeaddons/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +a61bcb10580208c3abb8c47aed198597 kdeaddons-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdeadmin/.md5sum =================================================================== --- crux-2.1/ports/opt/kdeadmin/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdeadmin/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +9d0f914d2d0d3fbef8ed51cfdab36d40 kdeadmin-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdeartwork/.md5sum =================================================================== --- crux-2.1/ports/opt/kdeartwork/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdeartwork/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +052c736c9c12defbb2e7de04ff0b2ae6 kdeartwork-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdebindings/.md5sum =================================================================== --- crux-2.1/ports/opt/kdebindings/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdebindings/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +137924318ff5fc49cee3c82ee0ce5cf5 kdebindings-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdegames/.md5sum =================================================================== --- crux-2.1/ports/opt/kdegames/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdegames/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +ba86fe9280ca57698ce3be0e0242b140 kdegames-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdelibs/.md5sum =================================================================== --- crux-2.1/ports/opt/kdelibs/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdelibs/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1,2 @@ +d5fcdb478e741831e6ce992f670eba1e 10888-bt.tar.gz +2b11d654e2ea1a3cd16dcfdcbb7d1915 kdelibs-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdemultimedia/.md5sum =================================================================== --- crux-2.1/ports/opt/kdemultimedia/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdemultimedia/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +dd0ba9ccb2f522508c6543cd24e54c98 kdemultimedia-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdenetwork/.md5sum =================================================================== --- crux-2.1/ports/opt/kdenetwork/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdenetwork/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1,2 @@ +c83dce8cc496b6ec8773483df1c85119 kdenetwork-3.5.0.tar.bz2 +f5e55f7b4b8a4c28854510bb2be8d07a lisa Added: crux-2.1/ports/opt/kdetoys/.md5sum =================================================================== --- crux-2.1/ports/opt/kdetoys/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdetoys/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1 @@ +aebe4a9586728b37543bd515d35e76e1 kdetoys-3.5.0.tar.bz2 Added: crux-2.1/ports/opt/kdeutils/.md5sum =================================================================== --- crux-2.1/ports/opt/kdeutils/.md5sum 2006-01-11 23:29:59 UTC (rev 539) +++ crux-2.1/ports/opt/kdeutils/.md5sum 2006-01-12 00:11:38 UTC (rev 540) @@ -0,0 +1,2 @@ +d6b2cbe8b7d15166eff261f20ece2718 kdeutils-3.5.0.tar.bz2 +8298ccfb7ed1e2a35a7d287afbed3d5c shredder.desktop

1 0

r539 - crux-2.1/ports/opt/kdepim
by crux＠crux.nu 11 Jan '06

11 Jan '06

Author: sten Date: 2006-01-12 00:29:59 +0100 (Thu, 12 Jan 2006) New Revision: 539 Added: crux-2.1/ports/opt/kdepim/.md5sum crux-2.1/ports/opt/kdepim/kmail-113730.diff Modified: crux-2.1/ports/opt/kdepim/Pkgfile Log: kdepim: fix IMAP + SpamAssasin crash, as reported in http://bugs.kde.org/show_bug.cgi?id=113730 Added: crux-2.1/ports/opt/kdepim/.md5sum =================================================================== --- crux-2.1/ports/opt/kdepim/.md5sum 2006-01-10 16:40:37 UTC (rev 538) +++ crux-2.1/ports/opt/kdepim/.md5sum 2006-01-11 23:29:59 UTC (rev 539) @@ -0,0 +1,2 @@ +e19a2a40e422ecd483884ce6e9ac8925 kdepim-3.5.0.tar.bz2 +d15928f485e12b33358a3b23174a97fb kmail-113730.diff Modified: crux-2.1/ports/opt/kdepim/Pkgfile =================================================================== --- crux-2.1/ports/opt/kdepim/Pkgfile 2006-01-10 16:40:37 UTC (rev 538) +++ crux-2.1/ports/opt/kdepim/Pkgfile 2006-01-11 23:29:59 UTC (rev 539) @@ -6,16 +6,21 @@ name=kdepim version=3.5.0 -release=1 -source=(http://download.kde.org/stable/3.5/src/$name-$version.tar.bz2) +release=2 +source=(http://download.kde.org/stable/3.5/src/$name-$version.tar.bz2 \ + kmail-113730.diff) build() { - cd $name-$version - ./configure --prefix=/usr \ - --disable-debug \ - --disable-dependency-tracking \ - --enable-final - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/doc + cd $name-$version + ( + cd kmail + patch -p0 < $SRC/kmail-113730.diff + ) + ./configure --prefix=/usr \ + --disable-debug \ + --disable-dependency-tracking \ + --enable-final + make + make DESTDIR=$PKG install + rm -rf $PKG/usr/share/doc } Added: crux-2.1/ports/opt/kdepim/kmail-113730.diff =================================================================== --- crux-2.1/ports/opt/kdepim/kmail-113730.diff 2006-01-10 16:40:37 UTC (rev 538) +++ crux-2.1/ports/opt/kdepim/kmail-113730.diff 2006-01-11 23:29:59 UTC (rev 539) @@ -0,0 +1,211 @@ +Index: kmcommands.cpp +=================================================================== +--- kmcommands.cpp (Revision 487211) ++++ kmcommands.cpp (Arbeitskopie) +@@ -1496,30 +1496,30 @@ + + void KMMetaFilterActionCommand::start() + { +-#if 0 // use action scheduler +- KMFilterMgr::FilterSet set = KMFilterMgr::All; +- QPtrList<KMFilter> filters; +- filters.append( mFilter ); +- ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders ); +- scheduler->setAlwaysMatch( true ); +- scheduler->setAutoDestruct( true ); ++ if (ActionScheduler::isEnabled() ) { ++ // use action scheduler ++ KMFilterMgr::FilterSet set = KMFilterMgr::All; ++ QValueList<KMFilter*> filters; ++ filters.append( mFilter ); ++ ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders ); ++ scheduler->setAlwaysMatch( true ); ++ scheduler->setAutoDestruct( true ); + +- int contentX, contentY; +- HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY ); +- QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true); +- mHeaders->finalizeMove( nextItem, contentX, contentY ); ++ int contentX, contentY; ++ HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY ); ++ QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true); ++ mHeaders->finalizeMove( nextItem, contentX, contentY ); + +- +- for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next()) +- scheduler->execFilters( msg ); +-#else +- KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget, +- *mHeaders->selectedMsgs(), mFilter); +- filterCommand->start(); +- int contentX, contentY; +- HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY ); +- mHeaders->finalizeMove( item, contentX, contentY ); +-#endif ++ for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next()) ++ scheduler->execFilters( msg ); ++ } else { ++ KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget, ++ *mHeaders->selectedMsgs(), mFilter); ++ filterCommand->start(); ++ int contentX, contentY; ++ HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY ); ++ mHeaders->finalizeMove( item, contentX, contentY ); ++ } + } + + FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget, +Index: kmkernel.cpp +=================================================================== +--- kmkernel.cpp (Revision 487211) ++++ kmkernel.cpp (Arbeitskopie) +@@ -1432,11 +1432,11 @@ + the_msgIndex = 0; + #endif + +-#if 0 ++//#if 0 + the_weaver = new KPIM::ThreadWeaver::Weaver( this ); + the_weaverLogger = new KPIM::ThreadWeaver::WeaverThreadLogger(this); + the_weaverLogger->attach (the_weaver); +-#endif ++//#endif + + connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ), + this, SIGNAL( folderRemoved(KMFolder*) ) ); +Index: kmfilteraction.cpp +=================================================================== +--- kmfilteraction.cpp (Revision 487211) ++++ kmfilteraction.cpp (Arbeitskopie) +@@ -1617,6 +1617,9 @@ + FILE *p; + QByteArray ba; + ++ // backup the serial number in case the header gets lost ++ QString origSerNum = mMsg->headerField( "X-KMail-Filtered" ); ++ + p = popen(QFile::encodeName(mCmd), "r"); + int len =100; + char buffer[100]; +@@ -1630,7 +1633,20 @@ + pclose(p); + if ( !ba.isEmpty() ) { + KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", QString(ba).latin1() ); ++ KMFolder *filterFolder = mMsg->parent(); ++ ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() ); ++ + mMsg->fromByteArray( ba ); ++ if ( !origSerNum.isEmpty() ) ++ mMsg->setHeaderField( "X-KMail-Filtered", origSerNum ); ++ if ( filterFolder && handler ) { ++ bool oldStatus = handler->ignoreChanges( true ); ++ filterFolder->take( filterFolder->find( mMsg ) ); ++ filterFolder->addMsg( mMsg ); ++ handler->ignoreChanges( oldStatus ); ++ } else { ++ kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl; ++ } + } + + KPIM::ThreadWeaver::debug (1, "PipeJob::run: done.\n" ); +Index: actionscheduler.h +=================================================================== +--- actionscheduler.h (Revision 487211) ++++ actionscheduler.h (Arbeitskopie) +@@ -77,10 +77,10 @@ + of messages left to process is empty */ + void setFilterList( QValueList<KMFilter*> filters ); + +- /* Set the id of the account associated with this scheduler */ ++ /** Set the id of the account associated with this scheduler */ + void setAccountId( uint id ) { mAccountId = id; mAccount = true; } + +- /* Clear the id of the account associated with this scheduler */ ++ /** Clear the id of the account associated with this scheduler */ + void clearAccountId() { mAccountId = 0; mAccount = false; } + + /** Queue a message for filtering */ +@@ -88,9 +88,16 @@ + void execFilters(const QPtrList<KMMsgBase> msgList); + void execFilters(KMMsgBase* msgBase); + void execFilters(Q_UINT32 serNum); ++ + static QString debug(); + static bool isEnabled(); + ++ /** Allow or deny manipulations on the message to be filtered. ++ This is needed when using pipe-through filters, because the ++ changes made by the filter have to be written back. ++ The old value before applying the new value is returned. */ ++ bool ignoreChanges( bool ignore ); ++ + signals: + /** Emitted when filtering is completed */ + void result(ReturnCode); +Index: actionscheduler.cpp +=================================================================== +--- actionscheduler.cpp (Revision 487211) ++++ actionscheduler.cpp (Arbeitskopie) +@@ -570,7 +570,7 @@ + (!mAccount || + (mAccount && (*mFilterIt).applyOnAccount(mAccountId)))) || + ((mSet & KMFilterMgr::Explicit) && (*mFilterIt).applyOnExplicit())) { +- ++ + // filter is applicable + if ( FilterLog::instance()->isLogging() ) { + QString logText( i18n( "<b>Evaluating filter rules:</b> " ) ); +@@ -646,8 +646,11 @@ + if (!orgMsg || !orgMsg->parent()) { + // Original message is gone, no point filtering it anymore + mSrcFolder->removeMsg( mSrcFolder->find( msg ) ); ++ kdDebug(5006) << "The original serial number is missing. " ++ << "Cannot complete the filtering." << endl; + mExecutingLock = false; + processMessageTimer->start( 0, true ); ++ return; + } else { + if (!folder) // no filter folder specified leave in current place + folder = orgMsg->parent(); +@@ -659,7 +662,7 @@ + mSrcFolder->addMsg( msg ); + mIgnore = false; + +- if (msg && kmkernel->folderIsTrash( folder )) ++ if (msg && folder && kmkernel->folderIsTrash( folder )) + KMFilterAction::sendMDN( msg, KMime::MDN::Deleted ); + + timeOutTime = QTime::currentTime(); +@@ -722,8 +725,6 @@ + + void ActionScheduler::copyMessageFinished( KMCommand *command ) + { +- // FIXME remove the debug output +- kdDebug(5006) << "##### ActionScheduler::copyMessageFinished( KMCommand *command )" << endl; + if ( command->result() != KMCommand::OK ) + actionMessage( KMFilterAction::ErrorButGoOn ); + else +@@ -803,4 +804,11 @@ + return sEnabled; + } + ++bool ActionScheduler::ignoreChanges( bool ignore ) ++{ ++ bool oldValue = mIgnore; ++ mIgnore = ignore; ++ return oldValue; ++} ++ + #include "actionscheduler.moc" +Index: kmversion.h +=================================================================== +--- kmversion.h (Revision 487211) ++++ kmversion.h (Arbeitskopie) +@@ -3,6 +3,6 @@ + #ifndef kmversion_h + #define kmversion_h + +-#define KMAIL_VERSION "1.9" ++#define KMAIL_VERSION "1.9.1" + + #endif /*kmversion_h*/

1 0

r538 - crux-2.1/ports/opt/yapo
by crux＠crux.nu 10 Jan '06

10 Jan '06

Author: jue Date: 2006-01-10 17:40:37 +0100 (Tue, 10 Jan 2006) New Revision: 538 Modified: crux-2.1/ports/opt/yapo/.footprint crux-2.1/ports/opt/yapo/.md5sum crux-2.1/ports/opt/yapo/Pkgfile Log: yapo: update to 0.3.0 Modified: crux-2.1/ports/opt/yapo/.footprint =================================================================== --- crux-2.1/ports/opt/yapo/.footprint 2006-01-09 19:55:09 UTC (rev 537) +++ crux-2.1/ports/opt/yapo/.footprint 2006-01-10 16:40:37 UTC (rev 538) @@ -1,6 +1,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/yapo +drwxr-xr-x root/root usr/etc/ +-rw-r--r-- root/root usr/etc/yapo.conf drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/yapo.8.gz Modified: crux-2.1/ports/opt/yapo/.md5sum =================================================================== --- crux-2.1/ports/opt/yapo/.md5sum 2006-01-09 19:55:09 UTC (rev 537) +++ crux-2.1/ports/opt/yapo/.md5sum 2006-01-10 16:40:37 UTC (rev 538) @@ -1 +1 @@ -37ade627932274d31c3599bef1e979dc yapo-0.2.7.tar.gz +39c04c0c1f78c4bf920c938a50ac735f yapo-0.3.0.tar.gz Modified: crux-2.1/ports/opt/yapo/Pkgfile =================================================================== --- crux-2.1/ports/opt/yapo/Pkgfile 2006-01-09 19:55:09 UTC (rev 537) +++ crux-2.1/ports/opt/yapo/Pkgfile 2006-01-10 16:40:37 UTC (rev 538) @@ -4,7 +4,7 @@ # Depends on: prt-get, ncurses-ruby name=yapo -version=0.2.7 +version=0.3.0 release=1 source=(http://jue.li/crux/$name/$name-$version.tar.gz)

1 0