From 490ecce5767e18a61c91e6d1728a053b6826e5a5 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Tue, 24 Mar 2009 22:39:11 +0100 Subject: [PATCH] Fixed miau and vsftpd bugs --- config/backup/includes/miau | 2 +- config/backup/includes/vsftpd | 4 ++-- config/vsftpd/vsftpd.conf | 1 + doc/packages-list.txt | 17 +++++++++++++++++ lfs/miau | 4 ++-- lfs/vsftpd | 2 +- src/initscripts/init.d/miau | 4 +++- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/config/backup/includes/miau b/config/backup/includes/miau index d9ed39d9e8..e93353affc 100644 --- a/config/backup/includes/miau +++ b/config/backup/includes/miau @@ -1 +1 @@ -opt/miau/config/miaurc +/opt/miau/config/miaurc diff --git a/config/backup/includes/vsftpd b/config/backup/includes/vsftpd index 9631c1ba42..876ea300c4 100644 --- a/config/backup/includes/vsftpd +++ b/config/backup/includes/vsftpd @@ -1,2 +1,2 @@ -etc/vsftpd.conf -etc/vsftpd.user_list +/etc/vsftpd.conf +/etc/vsftpd.user_list diff --git a/config/vsftpd/vsftpd.conf b/config/vsftpd/vsftpd.conf index 984a30fbb7..e7206ee80a 100644 --- a/config/vsftpd/vsftpd.conf +++ b/config/vsftpd/vsftpd.conf @@ -38,6 +38,7 @@ chroot_local_user=YES secure_chroot_dir=/var/ftp/empty # ls_recurse_enable=YES +require_ssl_reuse=NO # #ssl_enable=YES #force_local_data_ssl=NO diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 2e96b8a063..947ad674f1 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -33,6 +33,8 @@ * URI-1.35 * Unix-Syslog-0.100 * XML-Parser-2.34 +* alsa-lib-1.0.17 +* alsa-lib-1.0.17-kmod-2.6.25.20 * alsa-lib-1.0.19 * alsa-lib-1.0.19-kmod-2.6.27.20 * amavisd-new-2.5.2 @@ -40,6 +42,8 @@ * applejuice-0.31 * arping-2.05 * as86-0.16.17 +* asterisk-1.4.18 +* atl2-2.0.5-kmod-2.6.25.20 * atl2-2.0.5-kmod-2.6.27.20 * autoconf-2.59 * automake-1.9.6 @@ -59,6 +63,7 @@ * calamaris-2.59 * capi4k-utils-2005-07-18 * ccache-2.4 +* cdrtools-2.01 * cdrtools-2.01.01 * centerim-4.22.1 * clamav-0.94.2 @@ -136,6 +141,7 @@ * iperf-2.0.4 * ipfireseeder-1.00 * iproute2-2.6.16-060323 +* iptables-1.4.1.1 * iptables-1.4.2 * iptstate-2.1 * iputils-ss020927 @@ -143,8 +149,10 @@ * jpegsrc.v6b * kbd-1.12 * klibc-1.5.14 +* kqemu-1.4.0pre1-kmod-2.6.25.20 * kqemu-1.4.0pre1-kmod-2.6.27.20 * kudzu-1.2.64 +* l7-protocols-2008-04-23 * l7-protocols-2008-12-18 * lame-3.97 * lcd4linux-0.10.1-RC2 @@ -165,6 +173,7 @@ * libshout-2.2.2 * libsigc++-2.0.17 * libtool-1.5.22 +* libtorrent-0.12.2 * libtorrent-0.12.4 * libupnp-1.6.6 * libusb-0.1.12 @@ -172,9 +181,11 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 +* linux-2.6.25.20 * linux-2.6.27.20 * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 +* linux-libc-headers-2.6.12.0_rootfile * lm_sensors-3.0.3 * logrotate-3.7.1 * logwatch-7.3.6 @@ -183,6 +194,8 @@ * lzo-2.02 * m4-1.4.4 * mISDNuser-20090322 +* mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01 +* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.25.20 * madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.20 * make-3.81 * man-db-2.4.3 @@ -246,6 +259,7 @@ * procps-3.2.6 * psmisc-22.2 * qemu-0.10.0 +* qemu-0.10.1 * readline-5.1 * reiser4progs-1.0.5 * reiserfsprogs-3.6.19 @@ -253,6 +267,7 @@ * rrdtool-1.2.15 * rssdler-0.4.0a * rsync-3.0.4 +* rtorrent-0.8.2 * rtorrent-0.8.4 * samba-3.2.8 * sane-1.0.19 @@ -300,6 +315,7 @@ * urlgrabber-3.1.0 * usbutils-0.72 * util-linux-2.12r +* v4l-dvb-e9a442d3b53a-kmod-2.6.25.20 * v4l-dvb-e9a442d3b53a-kmod-2.6.27.20 * vdr-1.6.0 * vdradmin-am-3.6.4 @@ -314,6 +330,7 @@ * whatmask-1.2 * which-2.16 * wireless_tools.30.pre6 +* wpa_supplicant-0.5.11 * wpa_supplicant-0.6.8 * xfsprogs-2.9.4 * xvidcore-1.2.1 diff --git a/lfs/miau b/lfs/miau index 11d1e9ec49..c3ca754bea 100644 --- a/lfs/miau +++ b/lfs/miau @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = miau -PAK_VER = 1 +PAK_VER = 2 CFLAGS = CXXFLAGS = @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install mkdir /opt/miau/config - install -v -m 644 $(DIR_SRC)/config/miau/miaurc \ + install -v -m 640 $(DIR_SRC)/config/miau/miaurc \ /opt/miau/config/miaurc ln -sf ../init.d/miau /etc/rc.d/rc3.d/S60miau ln -sf ../init.d/miau /etc/rc.d/rc0.d/K01miau diff --git a/lfs/vsftpd b/lfs/vsftpd index 26d60be191..33fc1dafda 100644 --- a/lfs/vsftpd +++ b/lfs/vsftpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vsftpd -PAK_VER = 3 +PAK_VER = 4 DEPS = "" diff --git a/src/initscripts/init.d/miau b/src/initscripts/init.d/miau index 4e083ae53a..6de7ebdb8f 100755 --- a/src/initscripts/init.d/miau +++ b/src/initscripts/init.d/miau @@ -18,7 +18,9 @@ case "${1}" in start) boot_mesg "Starting miau - another IRC-bouncer/proxy..." - loadproc /opt/miau/bin/miau -d /opt/miau/config + chown -R nobody.nobody /opt/miau + loadproc sudo -u nobody /opt/miau/bin/miau -d /opt/miau/config | head -n 0 + evaluate_retval ;; stop) -- 2.39.5