From 453b418b46fa87dcac9df976372c5484fa05756a Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 30 Sep 2007 20:47:59 +0000 Subject: [PATCH] Clamav- und MySQL-Paket gefixt. Cyrus-SASL aktiviert sich automatisch. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@932 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cyrusimap/cyrus.conf | 4 ++-- config/rootfiles/packages/clamav | 2 +- config/rootfiles/packages/ctorrent | 1 - config/rootfiles/packages/mysql | 7 ++----- doc/packages-list.txt | 1 + make.sh | 7 ++++++- src/paks/cyrus-sasl/install.sh | 10 ++++++++++ src/paks/cyrus-sasl/uninstall.sh | 5 +++++ src/paks/cyrus-sasl/update.sh | 4 ++++ 9 files changed, 31 insertions(+), 10 deletions(-) delete mode 100644 config/rootfiles/packages/ctorrent create mode 100644 src/paks/cyrus-sasl/install.sh create mode 100644 src/paks/cyrus-sasl/uninstall.sh create mode 100644 src/paks/cyrus-sasl/update.sh diff --git a/config/cyrusimap/cyrus.conf b/config/cyrusimap/cyrus.conf index 306808b35b..df83bd00b9 100644 --- a/config/cyrusimap/cyrus.conf +++ b/config/cyrusimap/cyrus.conf @@ -13,11 +13,11 @@ SERVICES { imaps cmd="imapd -s" listen="imaps" prefork=0 pop3 cmd="pop3d" listen="pop3" prefork=0 pop3s cmd="pop3d -s" listen="pop3s" prefork=0 - sieve cmd="timsieved" listen="127.0.0.1:2000" prefork=0 + #sieve cmd="timsieved" listen="127.0.0.1:2000" prefork=0 # at least one LMTP is required for delivery #lmtp cmd="lmtpd" listen="127.0.0.1:24" prefork=0 - #lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0 + lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0 # this is only necessary if using notifications notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1 diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index cad39c6fcb..665ea216a9 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -12,7 +12,7 @@ usr/lib/libclamav.so.2 usr/lib/libclamav.so.2.0.7 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd -#usr/share/clamav +usr/share/clamav usr/share/clamav/daily.cvd usr/share/clamav/main.cvd #usr/share/man/man1/clamconf.1 diff --git a/config/rootfiles/packages/ctorrent b/config/rootfiles/packages/ctorrent deleted file mode 100644 index d2859d6cfd..0000000000 --- a/config/rootfiles/packages/ctorrent +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ctorrent diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql index 804eafc5d8..d214c08b46 100644 --- a/config/rootfiles/packages/mysql +++ b/config/rootfiles/packages/mysql @@ -1,10 +1,7 @@ etc/my.cnf etc/rc.d/init.d/mysql -#srv/mysql -srv/mysql/mysql -#srv/mysql/mysql-bin.000001 -#srv/mysql/mysql-bin.000002 -#srv/mysql/mysql-bin.index +srv/mysql +#srv/mysql/mysql #srv/mysql/mysql/columns_priv.MYD #srv/mysql/mysql/columns_priv.MYI #srv/mysql/mysql/columns_priv.frm diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 8a71369d1e..c7417e38ed 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -128,6 +128,7 @@ * libart_lgpl-2.3.17 * libcap-1.10 * libid3tag-0.15.1b +* libidn-0.6.14 * libmad-0.15.1b * libnet-1.1.2.1 * libogg-1.1.3 diff --git a/make.sh b/make.sh index 10dec87441..d1942b0187 100755 --- a/make.sh +++ b/make.sh @@ -626,7 +626,12 @@ buildpackages() { ipfirepackages() { ipfiremake core-updates for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do - [ -e $BASEDIR/lfs/$i ] && ipfiredist $i + if [ -e $BASEDIR/lfs/$i ]; then + ipfiredist $i + else + echo -n $i + beautify message SKIP + fi done test -d $BASEDIR/packages || mkdir $BASEDIR/packages mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1 diff --git a/src/paks/cyrus-sasl/install.sh b/src/paks/cyrus-sasl/install.sh new file mode 100644 index 0000000000..7a3ce24558 --- /dev/null +++ b/src/paks/cyrus-sasl/install.sh @@ -0,0 +1,10 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files + +ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl +ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl +ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl + +/etc/init.d/cyrus-sasl start diff --git a/src/paks/cyrus-sasl/uninstall.sh b/src/paks/cyrus-sasl/uninstall.sh new file mode 100644 index 0000000000..967b58ac42 --- /dev/null +++ b/src/paks/cyrus-sasl/uninstall.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +/etc/init.d/cyrus-sasl stop + +rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl diff --git a/src/paks/cyrus-sasl/update.sh b/src/paks/cyrus-sasl/update.sh new file mode 100644 index 0000000000..a47a7831dc --- /dev/null +++ b/src/paks/cyrus-sasl/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files -- 2.39.2