diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-01 19:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-01 19:40:13 +0100 |
| commit | eb10ac0e97c1e5e98ce73a1966c97a7cedb9d086 (patch) | |
| tree | f25892b4f15ef322487a2b00d674c255d148539c /package | |
| parent | b3a54c520195f3cab1109cb90de8179e4dff433f (diff) | |
use pkill for startup scripts
- seems to solve the issue, that the same init script
get killed otherwise
- fine tune dansguardian, squid and iptables package
- add default firewall config file (from freewrt)
- add an example for transparent proxy via an ethernet bridge
Diffstat (limited to 'package')
88 files changed, 90 insertions, 508 deletions
diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init index bc11e0b4c..61572bf0f 100644 --- a/package/axtls/files/axhttpd.init +++ b/package/axtls/files/axhttpd.init @@ -17,7 +17,7 @@ start) /usr/sbin/axhttpd >>/var/log/axhttpd.access ;; stop) - killall axhttpd + pkill axhttpd ;; restart) sh $0 stop diff --git a/package/bind/files/named.init b/package/bind/files/named.init index ce0c0abfa..b2052c1d3 100644 --- a/package/bind/files/named.init +++ b/package/bind/files/named.init @@ -15,7 +15,7 @@ autostop) ;; fi ;; stop) - killall named + pkill named ;; restart) sh $0 stop diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init index 1ff40c754..491b741c7 100644 --- a/package/bitlbee/files/bitlbee.init +++ b/package/bitlbee/files/bitlbee.init @@ -14,7 +14,7 @@ start) bitlbee -D ;; stop) - killall bitlbee + pkill bitlbee ;; restart) sh $0 stop diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init index 6a61d38cd..477013d9f 100644 --- a/package/bluez/files/bluez.init +++ b/package/bluez/files/bluez.init @@ -13,7 +13,7 @@ start) bluetoothd ;; stop) - killall bluetoothd + pkill bluetoothd ;; restart) sh $0 stop diff --git a/package/busybox/files/inetd.init b/package/busybox/files/inetd.init index ff041aed4..093e81f01 100644 --- a/package/busybox/files/inetd.init +++ b/package/busybox/files/inetd.init @@ -14,7 +14,7 @@ start) autostop) ;; stop) - killall inetd + pkill inetd ;; restart) sh $0 stop diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init index 9552dfe0a..cbf0165c9 100644 --- a/package/busybox/files/syslog.init +++ b/package/busybox/files/syslog.init @@ -14,8 +14,8 @@ start) klogd ;; stop) - killall klogd - killall syslogd + pkill klogd + pkill syslogd ;; restart) sh $0 stop diff --git a/package/chillispot/files/chillispot.init b/package/chillispot/files/chillispot.init index 308668fca..8a09a3d35 100644 --- a/package/chillispot/files/chillispot.init +++ b/package/chillispot/files/chillispot.init @@ -13,7 +13,7 @@ start) chilli ;; stop) - killall chilli + pkill chilli ;; restart) sh $0 stop diff --git a/package/collectd/files/collectd.init b/package/collectd/files/collectd.init index 601dd53d4..468c6fa11 100644 --- a/package/collectd/files/collectd.init +++ b/package/collectd/files/collectd.init @@ -14,7 +14,7 @@ start) collectd ;; stop) - killall collectd + pkill collectd ;; restart) sh $0 stop diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init index 03be3300f..49c37b24f 100644 --- a/package/cups/files/cupsd.init +++ b/package/cups/files/cupsd.init @@ -16,7 +16,7 @@ start) /usr/sbin/cupsd -c /etc/cups/cupsd.conf ;; stop) - killall cupsd + pkill cupsd ;; restart) sh $0 stop diff --git a/package/dansguardian/files/dansguardian.init b/package/dansguardian/files/dansguardian.init index 8c883d4bf..2f2547f12 100644 --- a/package/dansguardian/files/dansguardian.init +++ b/package/dansguardian/files/dansguardian.init @@ -11,10 +11,14 @@ autostart) exec sh $0 start ;; start) + if [ ! -f /var/log/dansguardian-access.log ];then + touch /var/log/dansguardian-access.log + chown proxy:proxy /var/log/dansguardian-access.log + fi dansguardian ;; stop) - killall dansguardian + pkill dansguardian ;; restart) sh $0 stop diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init index 3484c4522..0f7367f38 100644 --- a/package/dbus/files/dbus.init +++ b/package/dbus/files/dbus.init @@ -14,7 +14,7 @@ start) dbus-daemon --config-file=/etc/dbus-1/system.conf ;; stop) - killall dbus-daemon + pkill dbus-daemon ;; restart) sh $0 stop diff --git a/package/dhcp-forwarder/files/dhcp-fwd.init b/package/dhcp-forwarder/files/dhcp-fwd.init index 8e6cda234..1a193f2ae 100644 --- a/package/dhcp-forwarder/files/dhcp-fwd.init +++ b/package/dhcp-forwarder/files/dhcp-fwd.init @@ -13,7 +13,7 @@ start) dhcp-fwd ;; stop) - killall dhcp-fwd + pkill dhcp-fwd ;; restart) sh $0 stop diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init index 6ba76df9f..acdfc501f 100644 --- a/package/dhcp/files/dhcpd.init +++ b/package/dhcp/files/dhcpd.init @@ -14,7 +14,7 @@ start) dhcpd $dhcpd_flags ;; autostop|stop) - killall dhcpd + pkill dhcpd ;; restart) sh $0 stop diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index be9218bcb..01ca2cca6 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -14,7 +14,7 @@ start) /usr/sbin/dnsmasq ;; stop) - killall dnsmasq + pkill dnsmasq ;; restart) sh $0 stop diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index 09eea25e4..1c4c33745 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -30,7 +30,7 @@ start) /usr/sbin/dropbear $dropbear_flags ;; stop) - killall dropbear + pkill dropbear ;; restart) sh $0 stop diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init index 0f60c59e5..fd2ebf877 100644 --- a/package/esound/files/esd.init +++ b/package/esound/files/esd.init @@ -12,7 +12,7 @@ start) esd -d /dev/sound/dsp -public -tcp -nobeeps ;; stop) - killall esd + pkill esd ;; restart) sh $0 stop diff --git a/package/ez-ipupdate/files/ez-ipupdate.init b/package/ez-ipupdate/files/ez-ipupdate.init index c6fbfc39e..ea784481c 100644 --- a/package/ez-ipupdate/files/ez-ipupdate.init +++ b/package/ez-ipupdate/files/ez-ipupdate.init @@ -13,7 +13,7 @@ start) /usr/sbin/ez-ipupdate -c /etc/ez-ipupdate.conf -d ;; stop) - killall ez-ipupdate + pkill ez-ipupdate ;; restart) sh $0 stop diff --git a/package/fakeidentd/files/fakeidentd.init b/package/fakeidentd/files/fakeidentd.init index d145a6906..652ee02df 100644 --- a/package/fakeidentd/files/fakeidentd.init +++ b/package/fakeidentd/files/fakeidentd.init @@ -13,7 +13,7 @@ start) fakeidentd ${fakeidentd_flags} ;; stop) - killall fakeidentd + pkill fakeidentd ;; restart) sh $0 stop diff --git a/package/freeradius-server/files/radiusd.init b/package/freeradius-server/files/radiusd.init index 818f803ff..e43c5f94e 100644 --- a/package/freeradius-server/files/radiusd.init +++ b/package/freeradius-server/files/radiusd.init @@ -14,7 +14,7 @@ start) radiusd ;; stop) - killall radiusd + pkill radiusd ;; restart) sh $0 stop diff --git a/package/frickin/files/frickin.init b/package/frickin/files/frickin.init index 4e63232c0..baf5d9c18 100644 --- a/package/frickin/files/frickin.init +++ b/package/frickin/files/frickin.init @@ -13,7 +13,7 @@ start) frickin ${frickin_flags} ;; stop) - killall frickin + pkill frickin ;; restart) sh $0 stop diff --git a/package/gkrellmd/files/gkrellmd.init b/package/gkrellmd/files/gkrellmd.init index dfbf7dc5f..79b998713 100644 --- a/package/gkrellmd/files/gkrellmd.init +++ b/package/gkrellmd/files/gkrellmd.init @@ -13,7 +13,7 @@ start) gkrellmd -d ;; stop) - killall gkrellmd + pkill gkrellmd ;; restart) sh $0 stop diff --git a/package/gmediaserver/files/gmediaserver.init b/package/gmediaserver/files/gmediaserver.init index 81deeb899..1c67e5f40 100644 --- a/package/gmediaserver/files/gmediaserver.init +++ b/package/gmediaserver/files/gmediaserver.init @@ -13,7 +13,7 @@ autostop) ;; gmediaserver $gmediaserver_flags ;; stop) - killall gmediaserver + pkill gmediaserver ;; restart) sh $0 stop diff --git a/package/heimdal/files/heimdal.init b/package/heimdal/files/heimdal.init index 2e87f4932..33692f111 100644 --- a/package/heimdal/files/heimdal.init +++ b/package/heimdal/files/heimdal.init @@ -15,9 +15,9 @@ start) /usr/sbin/kpasswdd & ;; stop) - killall kdc - killall kadmind - killall kpasswdd + pkill kdc + pkill kadmind + pkill kpasswdd ;; restart) sh $0 stop diff --git a/package/htpdate/files/htpdate.init b/package/htpdate/files/htpdate.init index 4457e4391..0b3f34ad6 100644 --- a/package/htpdate/files/htpdate.init +++ b/package/htpdate/files/htpdate.init @@ -14,7 +14,7 @@ start) htpdate -l -s -t $htpdate_flags && htpdate -D $htpdate_flags ;; stop) - killall htpdate + pkill htpdate ;; restart) sh $0 stop diff --git a/package/iptables/Makefile b/package/iptables/Makefile index b8e1df9c2..0548aad57 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables PKG_VERSION:= 1.4.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 44f13990132c20299c1994cd6f425140 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= net @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk #include ${LINUX_DIR}/.config $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu @@ -32,21 +31,16 @@ CONFIGURE_ARGS+= --enable-devel BUILD_STYLE:= auto INSTALL_STYLE:= auto -SUB_INSTALL-${ADK_PACKAGE_IPTABLES_UTILS}+= iptables-utils-install SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+= ip6tables-install post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y} - ${INSTALL_DIR} ${IDIR_IPTABLES}/usr/lib - ${INSTALL_DIR} ${IDIR_IPTABLES}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptables ${IDIR_IPTABLES}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} + ${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc + ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/ ${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib -iptables-utils-install: - ${INSTALL_DIR} ${IDIR_IPTABLES_UTILS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptables-{save,restore} ${IDIR_IPTABLES_UTILS}/usr/sbin/ - ip6tables-install: ${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/lib ${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/sbin diff --git a/package/iptables/files/iptables.postinst b/package/iptables/files/iptables.postinst index fd2865a31..89b0af164 100644 --- a/package/iptables/files/iptables.postinst +++ b/package/iptables/files/iptables.postinst @@ -1,7 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -if [ -f $IPKG_INSTROOT/etc/init.d/S45firewall ]; then - add_rcconf iptables firewall NO -fi - +add_rcconf iptables firewall NO diff --git a/package/iptables/files/l7/aim.pat b/package/iptables/files/l7/aim.pat deleted file mode 100644 index 9768dbbdc..000000000 --- a/package/iptables/files/l7/aim.pat +++ /dev/null @@ -1,27 +0,0 @@ -# AIM - AOL instant messenger (OSCAR and TOC) -# Pattern quality: good notsofast -# Usually runs on port 5190 -# -# This may also match ICQ traffic. -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -aim -# See http://gridley.acns.carleton.edu/~straitm/final (and various other places) -# The first bit matches OSCAR signon and data commands, but not sure what -# \x03\x0b matches, but it works apparently. -# The next three bits match various parts of the TOC signon process. -# The third one is the magic number "*", then 0x01 for "signon", then up to four -# bytes ("up to" because l7-filter strips out nulls) which contain a sequence -# number (2 bytes) the data length (2 more) and 3 nulls (which don't count), -# then 0x01 for the version number (not sure if there ever has been another -# version) -# The fourth one is a command string, followed by some stuff, then the -# beginning of the "roasted" password - -# This pattern is too slow! - -^(\*[\x01\x02].*\x03\x0b|\*\x01.?.?.?.?\x01)|flapon|toc_signon.*0x diff --git a/package/iptables/files/l7/bittorrent.pat b/package/iptables/files/l7/bittorrent.pat deleted file mode 100644 index c1804ee4b..000000000 --- a/package/iptables/files/l7/bittorrent.pat +++ /dev/null @@ -1,14 +0,0 @@ -# Bittorrent - P2P filesharing / publishing tool - http://www.bittorrent.com -# Pattern quality: great veryfast -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers -bittorrent - -# Does not attempt to match the HTTP download of the tracker -# 0x13 is the length of "bittorrent protocol" -# Second two bits match UDP wierdness, commented out until it's tested -#^(\x13bittorrent protocol|d1:ad2:id20:|\x08'7P\)[RP]) -^\x13bittorrent protocol diff --git a/package/iptables/files/l7/edonkey-dl.pat b/package/iptables/files/l7/edonkey-dl.pat deleted file mode 100644 index d344d169d..000000000 --- a/package/iptables/files/l7/edonkey-dl.pat +++ /dev/null @@ -1,8 +0,0 @@ -# eDonkey2000 - P2P filesharing (download part) - http://edonkey2000.com -# Pattern quality: good veryfast overmatch usepacket - -edonkey-dl - -^[\xe3\xe4\xc5\xe5\xd4](....)?[\x01\x0a\x0e\x0f\x10\x18\x19\x1b\x1c\x47\x4a\x4f\x51\x53\x54\x58\x60\x81\x90\x96\x9a\x9c\xa2] - - diff --git a/package/iptables/files/l7/edonkey.pat b/package/iptables/files/l7/edonkey.pat deleted file mode 100644 index efbc3f361..000000000 --- a/package/iptables/files/l7/edonkey.pat +++ /dev/null @@ -1,29 +0,0 @@ -# eDonkey2000 - P2P filesharing - http://edonkey2000.com -# Pattern quality: good veryfast overmatch -# -# Please post to l7-filter-developers@lists.sf.net as to whether this pattern -# works for you or not. If you believe it could be improved please post your -# suggestions to that list as well. You may subscribe to this list at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -# Thanks to Matt Skidmore <fox AT woozle.org> - -edonkey - -# http://gd.tuwien.ac.at/opsys/linux/sf/p/pdonkey/eDonkey-protocol-0.6 -# -# In addition to \xe3, \xc5 and \xd4, I see a lot of \xe5 -# -# God this is a mess. What an irritating protocol. -# This will match about 1% of streams with random data in them! - -^[\xe3\xc5\xe5\xd4](....)?([\x01\x02\x05\x14\x15\x16\x18\x19\x1a\x1b\x1c\x20\x21\x32\x33\x34\x35\x36\x38\x40\x41\x42\x43\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x5b\x5c\x60\x81\x82\x90\x91\x93\x96\x97\x98\x99\x9a\x9b\x9c\x9e\xa0\xa1\xa2\xa3\xa4]|\x59................?[ -~]|\x96....$) - -# matches everything and too much -# ^(\xe3|\xc5|\xd4) - -# ipp2p essentially uses "\xe3....\x47", which doesn't seem at all right to me. - -# bandwidtharbitrator uses -# e0.*@.*6[a-z].*p$|e0.*@.*[a-z]6[a-z].*p0$|e.*@.*[0-9]6.*p$|emule|edonkey -# no comments to explain what all the mush is, of course... diff --git a/package/iptables/files/l7/fasttrack.pat b/package/iptables/files/l7/fasttrack.pat deleted file mode 100644 index 46295c6bb..000000000 --- a/package/iptables/files/l7/fasttrack.pat +++ /dev/null @@ -1,25 +0,0 @@ -# FastTrack - P2P filesharing (Kazaa, Morpheus, iMesh, Grokster, etc) -# Pattern quality: good notsofast -# -# Tested with Kazaa Lite Resurrection 0.0.7.6F -# -# This appears to match the download connections well, but not the search -# connections (I think they are encrypted :-( ). -# -# Please post to l7-filter-developers@lists.sf.net as to whether it works -# for you or not. If you believe it could be improved please post your -# suggestions to that list as well. You may subscribe to this list at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -fasttrack -# while this is a valid http request, this will be caught because -# the http pattern matches the response (and therefore the next packet) -# Even so, it's best to put this match earlier in the chain. -# http://cvs.berlios.de/cgi-bin/viewcvs.cgi/gift-fasttrack/giFT-FastTrack/PROTOCOL?rev=HEAD&content-type=text/vnd.viewcvs-markup - -# This pattern is kinda slow, but not too bad. -^get (/.download/[ -~]*|/.supernode[ -~]|/.status[ -~]|/.network[ -~]*|/.files|/.hash=[0-9a-f]*/[ -~]*) http/1.1|user-agent: kazaa|x-kazaa(-username|-network|-ip|-supernodeip|-xferid|-xferuid|tag)|^give [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]?[0-9]?[0-9]? - -# This isn't much faster: -#^get (/.download/.*|/.supernode.|/.status.|/.network.*|/.files|/.hash=[0-9a-f]*/.*) http/1.1|user-agent: kazaa|x-kazaa(-username|-network|-ip|-supernodeip|-xferid|-xferuid|tag)|^give [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]?[0-9]?[0-9]? - diff --git a/package/iptables/files/l7/ftp.pat b/package/iptables/files/l7/ftp.pat deleted file mode 100644 index 9593ffd1b..000000000 --- a/package/iptables/files/l7/ftp.pat +++ /dev/null @@ -1,34 +0,0 @@ -# FTP - File Transfer Protocol - RFC 959 -# Pattern quality: great fast -# -# Usually runs on port 21. Note that the data stream is on a dynamically -# assigned port, which means that you will need the FTP connection -# tracking module in your kernel to usefully match FTP data transfers. -# -# This pattern is well tested. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers -# -# Matches the first two things a server should say. Most servers say -# something after 220, even though they don't have to, and it usually -# includes the string "ftp" (l7-filter is case insensitive). -# This includes proftpd, vsftpd, wuftpd, warftpd, pureftpd, Bulletproof -# FTP Server, and whatever ftp.microsoft.com uses. Just in case, the next -# thing the server sends is a 331. All the above servers also send -# something including "password" after this code. -ftp -# actually, let's just do the first for now, it's faster -^220[\x09-\x0d -~]*ftp - -# This is ~10x faster if the stream starts with "220" -#^220.*ftp - -# This will match more, but much slower -#^220[\x09-\x0d -~]*ftp|331[\x09-\x0d -~]*password - -# This pattern is more precise, but takes longer to match. (3 packets vs. 1) -#^220[\x09-\x0d -~]*\x0d\x0aUSER[\x09-\x0d -~]*\x0d\x0a331 - -# same as above, but slightly less precise and only takes 2 packets. -#^220[\x09-\x0d -~]*\x0d\x0aUSER[\x09-\x0d -~]*\x0d\x0a diff --git a/package/iptables/files/l7/gnutella.pat b/package/iptables/files/l7/gnutella.pat deleted file mode 100644 index ebbd5c621..000000000 --- a/package/iptables/files/l7/gnutella.pat +++ /dev/null @@ -1,36 +0,0 @@ -# Gnutella - P2P filesharing -# Pattern quality: good fast -# -# This should match both Gnutella and "Gnutella2" ("Mike's protocol") -# -# Various clients use this protocol including Mactella, Shareaza, -# GTK-gnutella, Gnucleus, Gnotella, LimeWire, BearShare, and iMesh. -# -# This is tested with gtk-gnutella and Shareaza. -# -# Please report on how this pattern works for you at -# l7-filter-developers@lists.sf.net . If you can improve on this -# pattern, please also post to that list. You may subscribe at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -# http://www.gnutella2.com/tiki-index.php?page=UDP%20Transceiver -# http://rfc-gnutella.sf.net/ -# http://www.gnutella2.com/tiki-index.php?page=Gnutella2%20Specification -# http://en.wikipedia.org/wiki/Shareaza - -gnutella - -# The first part matches UDP messages - All start with "GND", then have -# a flag byte which is either \x00, \x01 or \x02, then two sequence bytes -# that can be anything, then a fragment number, which must start at 1. -# The rest matches TCP first client message or first server message (in case -# we can't see client messages). Some parts of this are empirical rather than -# document based. Assumes version is between 0.0 and 2.9. (usually is -# 0.4 or 0.6). I'm guessing at many of the user-agents. -# The last bit is emprical and probably only matches Limewire. -^(gnd[\x01\x02]?.?.?\x01|gnutella connect/[012]\.[0-9]\x0d\x0a|get /uri-res/n2r\?urn:sha1:|get /.*user-agent: (gtk-gnutella|bearshare|mactella|gnucleus|gnotella|limewire|imesh)|get /.*content-type: application/x-gnutella-packets|giv [0-9]*:[0-9a-f]*/|queue [0-9a-f]* [1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?:[1-9][0-9]?[0-9]?[0-9]?|gnutella.*content-type: application/x-gnutella|..................lime) - -# Needlessly precise, at the expense of time -#^(gnd[\x01\x02]?.?.?\x01|gnutella connect/[012]\.[0-9]\x0d\x0a|get /uri-res/n2r\?urn:sha1:|get /[\x09-\x0d -~]*user-agent: (gtk-gnutella|bearshare|mactella|gnucleus|gnotella|limewire|imesh)|get /[\x09-\x0d -~]*content-type: application/x-gnutella-packets|giv [0-9]*:[0-9a-f]*/|queue [0-9a-f]* [1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?:[1-9][0-9]?[0-9]?[0-9]?|gnutella[\x09-\x0d -~]*content-type: application/x-gnutella|..................lime) - - diff --git a/package/iptables/files/l7/http.pat b/package/iptables/files/l7/http.pat deleted file mode 100644 index 520e7fe21..000000000 --- a/package/iptables/files/l7/http.pat +++ /dev/null @@ -1,28 +0,0 @@ -# HTTP - HyperText Transfer Protocol - RFC 2616 -# Pattern quality: great notsofast -# Usually runs on port 80 -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers -# -# this intentionally catches the response from the server -# rather than the request so that other protocols which use -# http (like kazaa) can be caught based on specific http requests -# regardless of the ordering of filters... -# also matches posts - -# Sites that serve really long cookies may break this by pushing the -# server response too far away from the beginning of the connection. To -# fix this, increase the kernel's data buffer length. - -http -# Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF (rfc 2616) -# As specified in rfc 2616 a status code is preceeded and followed by a -# space. -http/(0\.9|1\.0|1\.1) [1-5][0-9][0-9] [\x09-\x0d -~]*(connection:|content-type:|content-length:|date:)|post [\x09-\x0d -~]* http/[01]\.[019] -# A slightly faster version that might be good enough: -#http/(0\.9|1\.0|1\.1) [1-5][0-9][0-9]|post [\x09-\x0d -~]* http/[01]\.[019] -# old pattern(s): -#(http[\x09-\x0d -~]*(200 ok|302 |304 )[\x09-\x0d -~]*(connection:|content-type:|content-length:))|^(post [\x09-\x0d -~]* http/) diff --git a/package/iptables/files/l7/ident.pat b/package/iptables/files/l7/ident.pat deleted file mode 100644 index 672b0753c..000000000 --- a/package/iptables/files/l7/ident.pat +++ /dev/null @@ -1,14 +0,0 @@ -# Ident - Identification Protocol - RFC 1413 -# Pattern quality: good veryfast -# Usually runs on port 113 -# -# This pattern is believed to work. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -ident -# "number , numberCRLF" possibly without the CR and/or LF. -# ^$ is appropriate because the first packet should never have anything -# else in it. -^[1-9][0-9]?[0-9]?[0-9]?[0-9]?[\x09-\x0d]*,[\x09-\x0d]*[1-9][0-9]?[0-9]?[0-9]?[0-9]?(\x0d\x0a|[\x0d\x0a])?$ diff --git a/package/iptables/files/l7/irc.pat b/package/iptables/files/l7/irc.pat deleted file mode 100644 index 6643f6c2f..000000000 --- a/package/iptables/files/l7/irc.pat +++ /dev/null @@ -1,20 +0,0 @@ -# IRC - Internet Relay Chat - RFC 1459 -# Pattern quality: good veryfast -# -# Usually runs on port 6666 or 6667 -# Note that chat traffic runs on these ports, but IRC-DCC traffic (which -# can use much more bandwidth) uses a dynamically assigned port, so you -# must have the IRC connection tracking module in your kernel to classify -# this. -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -irc -# First thing that happens is that the client sends NICK and USER, in -# either order. This allows MIRC color codes (\x02-\x0d instead of -# \x09-\x0d). -^(nick[\x09-\x0d -~]*user[\x09-\x0d -~]*:|user[\x09-\x0d -~]*:[\x02-\x0d -~]*nick[\x09-\x0d -~]*\x0d\x0a) - diff --git a/package/iptables/files/l7/jabber.pat b/package/iptables/files/l7/jabber.pat deleted file mode 100644 index 7a0c6840e..000000000 --- a/package/iptables/files/l7/jabber.pat +++ /dev/null @@ -1,24 +0,0 @@ -# Jabber (XMPP) - an open instant messenger protocol - http://jabber.org -# Pattern quality: good fast -# -# This pattern has been tested with Gaim and Gabber. It is only tested -# with non-SSL mode Jabber with no proxies. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -# Thanks to Jan Hudec for some improvements. - -# Jabber seems to take a long time to set up a connection. I'm -# connecting with Gabber 0.8.8 to 12jabber.org and the first 8 packets -# is this: -# <stream:stream to='12jabber.com' xmlns='jabber:client' -# xmlns:stream='http://etherx.jabber.org/streams'><?xml -# version='1.0'?><stream:stream -# xmlns:stream='http://etherx.jabber.org/streams' id='3f73e951' -# xmlns='jabber:client' from='12jabber.com'> -# -# No mention of my username or password yet, you'll note. - -jabber -<stream:stream[\x09-\x0d ][ -~]*[\x09-\x0d ]xmlns=['"]jabber diff --git a/package/iptables/files/l7/msnmessenger.pat b/package/iptables/files/l7/msnmessenger.pat deleted file mode 100644 index e07f71f31..000000000 --- a/package/iptables/files/l7/msnmessenger.pat +++ /dev/null @@ -1,15 +0,0 @@ -# MSN Messenger - Microsoft Network chat client -# Pattern quality: good veryfast -# -# Usually uses port 1863 -# http://www.hypothetic.org/docs/msn/index.php -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -msnmessenger -# ver: allow versions up to 99. -# usr (in case ver didn't work): -^(ver [0-9]+ msnp[1-9][0-9]? [\x09-\x0d -~]* cvr|usr md5 i [ -~]*) diff --git a/package/iptables/files/l7/ntp.pat b/package/iptables/files/l7/ntp.pat deleted file mode 100644 index b7e443e21..000000000 --- a/package/iptables/files/l7/ntp.pat +++ /dev/null @@ -1,17 +0,0 @@ -# (S)NTP - (Simple) Network Time Protocol - RFCs 1305 and 2030 -# Pattern quality: good veryfast overmatch -# -# This pattern is tested and is believed to work. If this does not work -# for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . Subscribe at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -# client|server -# Requires the server's timestamp to be in the present or future (of 2005). -# Tested with ntpdate on Linux. -# Assumes version 2, 3 or 4. - -# Note that ntp packets are always 48 bytes, so you should match on that too. - -ntp -^([\x13\x1b\x23\xd3\xdb\xe3]|[\x14\x1c$].......?.?.?.?.?.?.?.?.?[\xc6-\xff]) diff --git a/package/iptables/files/l7/pop3.pat b/package/iptables/files/l7/pop3.pat deleted file mode 100644 index f6bb63061..000000000 --- a/package/iptables/files/l7/pop3.pat +++ /dev/null @@ -1,50 +0,0 @@ -# POP3 - Post Office Protocol version 3 (popular e-mail protocol) - RFC 1939 -# Pattern quality: good veryfast -# -# This pattern has been tested somewhat. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -# this is a difficult protocol to match because of the relative lack of -# distinguishing information. Read on. -pop3 - -# this the most conservative pattern. It should definitely work. -#^(\+ok|-err) - -# this pattern assumes that the server says _something_ after +ok or -err -# I think this is probably the way to go. -^(\+ok |-err ) - -# more that 90% of servers seem to say "pop" after "+ok", but not all. -#^(\+ok .*pop) - -# Here's another tack. I think this is my second favorite. -#^(\+ok [\x09-\x0d -~]*(ready|hello|pop|starting)|-err [\x09-\x0d -~]*(invalid|unknown|unimplemented|unrecognized|command)) - -# this matches the server saying "you have N messages that are M bytes", -# which the client probably asks for early in the session (not tested) -#\+ok [0-9]+ [0-9]+ - -# some sample servers: -# RFC example: +OK POP3 server ready <1896.697170952@dbc.mtview.ca.us> -# mail.dreamhost.com: +OK Hello there. -# pop.carleton.edu: +OK POP3D(*) Server PMDFV6.2.2 at Fri, 12 Sep 2003 19:28:10 -0500 (CDT) (APOP disabled) -# mail.earthlink.net: +OK NGPopper vEL_4_38 at earthlink.net ready <25509.1063412951@falcon> -# *.email.umn.edu: +OK Cubic Circle's v1.22 1998/04/11 POP3 ready <7d1e0000da67623f@aquamarine.tc.umn.edu> -# mail.yale.edu: +OK POP3 pantheon-po01 v2002.81 server ready -# mail.gustavus.edu: +OK POP3 solen v2001.78 server ready -# mail.reed.edu: +OK POP3 letra.reed.edu v2002.81 server ready -# mail.bowdoin.edu: +OK mail.bowdoin.edu POP3 service (iPlanet Messaging Server 5.2 HotFix 1.15 (built Apr 28 2003)) -# pop.colby.edu: +OK Qpopper (version 4.0.5) at basalt starting. -# mail.mac.com: +OK Netscape Messaging Multiplexor ready - -# various error strings: -#-ERR Invalid command. -#-ERR invalid command -#-ERR unimplemented -#-ERR Invalid command, try one of: USER name, PASS string, QUIT -#-ERR Unknown AUTHORIZATION state command -#-ERR Unrecognized command -#-ERR Unknown command: "sadf'". diff --git a/package/iptables/files/l7/smtp.pat b/package/iptables/files/l7/smtp.pat deleted file mode 100644 index 1bab7a1df..000000000 --- a/package/iptables/files/l7/smtp.pat +++ /dev/null @@ -1,39 +0,0 @@ -# SMTP - Simple Mail Transfer Protocol - RFC 2821 (See also RFC 1869) -# Pattern quality: great fast -# usually runs on port 25 -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -smtp -# As usual, no text is required after "220", but all known servers have some -# there. It (almost?) always has string "smtp" in it. The RFC examples -# does not, so we match those too, just in case anyone has copied them -# literally. -^220[\x09-\x0d -~]* (e?smtp|simple mail) - -# This is ~3x faster if the stream starts with "220" -#^220.* (e?smtp|simple mail) - -# Some examples: -# 220 mail.stalker.com ESMTP CommuniGate Pro 4.1.3 -# 220 mail.vieodata.com ESMTP Merak 6.1.0; Mon, 15 Sep 2003 13:48:11 -0400 -# 220 mail.ut.caldera.com ESMTP -# 220 persephone.pmail.gen.nz ESMTP server ready. -# 220 smtp1.superb.net ESMTP -# 220 mail.kerio.com Kerio MailServer 5.6.7 ESMTP ready -# 220-mail.deerfield.com ESMTP VisNetic.MailServer.v6.0.9.0; Mon, 15 Sep 2003 13:4 -# 220 altn.com ESMTP MDaemon 6.8.5; Mon, 15 Sep 2003 12:46:42 -0500 -# 220 X1 NT-ESMTP Server ipsmin0165atl2.interland.net (IMail 6.06 73062-3) -# 220 mail.icewarp.com ESMTP Merak 6.1.1; Mon, 15 Sep 2003 19:43:23 +0200 -# 220-mail.email-scan.com ESMTP -# 220 smaug.dreamhost.com ESMTP -# 220 kona.carleton.edu -- Server ESMTP (PMDF V6.2#30648) -# 220 letra.reed.edu ESMTP Sendmail 8.12.9/8.12.9; Mon, 15 Sep 2003 10:35:57 -0700 (PDT) -# 220-swan.mail.pas.earthlink.net ESMTP Exim 3.33 #1 Mon, 15 Sep 2003 10:32:15 -0700 -# -# RFC examples: -# 220 xyz.com Simple Mail Transfer Service Ready (RFC example) -# 220 dbc.mtview.ca.us SMTP service ready diff --git a/package/iptables/files/l7/ssl.pat b/package/iptables/files/l7/ssl.pat deleted file mode 100644 index ab5f62caa..000000000 --- a/package/iptables/files/l7/ssl.pat +++ /dev/null @@ -1,15 +0,0 @@ -# SSL and TLS - Secure Socket Layer / Transport Layer Security - RFC 2246 -# Pattern quality: good fast -# Usually runs on port 443 -# -# This is a superset validcertssl. For it to match, it must be first. -# -# This pattern has been tested and is believed to work well. If it does not -# work for you, or you believe it could be improved, please post to -# l7-filter-developers@lists.sf.net . This list may be subscribed to at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers - -ssl -# Client Hello | Server Hello with certificate -# This allows SSL 3.X, which includes TLS 1.0, known internally as SSL 3.1 -^(.?.?\x16\x03.*\x16\x03|.?.?\x01\x03\x01?.*\x0b) diff --git a/package/iptables/files/l7/vnc.pat b/package/iptables/files/l7/vnc.pat deleted file mode 100644 index 35bfbd4ba..000000000 --- a/package/iptables/files/l7/vnc.pat +++ /dev/null @@ -1,23 +0,0 @@ -# VNC - Virtual Network Computing. Also known as RFB - Remote Frame Buffer -# Pattern quality: good fast -# http://www.realvnc.com/documentation.html -# -# This pattern has been verified with vnc v3.3.7 on WinXP and Linux -# Please report on how this pattern works for you at -# l7-filter-developers@lists.sf.net . If you can improve on this pattern, -# please also post to that list. You may subscribe at -# http://lists.sourceforge.net/lists/listinfo/l7-filter-developers -# -# Thanks to Trevor Paskett <tpaskett AT cymphonix.com> for this pattern. - -vnc -# Assumes single digit major and minor version numbers -# This message should be all alone in the first packet, so ^$ is appropriate -^rfb 00[1-9]\.00[0-9]\x0a$ - -# This is a more restrictive version which assumes the version numbers -# are ones actually in existance at the time of this writing, i.e. 3.3, -# 3.7 and 3.8 (with some clients wrongly reporting 3.5). It should be -# slightly faster, but probably not worth the extra maintenance. -# ^rfb 003\.00[3578]\x0a$ - diff --git a/package/krb5/files/krb5.init b/package/krb5/files/krb5.init index f91d0427b..259c03651 100644 --- a/package/krb5/files/krb5.init +++ b/package/krb5/files/krb5.init @@ -14,8 +14,8 @@ start) /usr/sbin/kadmind & ;; stop) - killall krb5kdc - killall kadmind + pkill krb5kdc + pkill kadmind ;; restart) sh $0 stop diff --git a/package/lighttpd/files/lighttpd.init b/package/lighttpd/files/lighttpd.init index cdfd3183d..37b543fd2 100644 --- a/package/lighttpd/files/lighttpd.init +++ b/package/lighttpd/files/lighttpd.init @@ -14,7 +14,7 @@ start) lighttpd $lighttpd_flags ;; stop) - killall lighttpd + pkill lighttpd ;; restart) sh $0 stop diff --git a/package/maradns/files/maradns.init b/package/maradns/files/maradns.init index 960ae15e0..ca256f517 100644 --- a/package/maradns/files/maradns.init +++ b/package/maradns/files/maradns.init @@ -16,7 +16,7 @@ start) maradns & ;; stop) - killall maradns + pkill maradns ;; restart) sh $0 stop diff --git a/package/mini_httpd/files/mini_httpd.init b/package/mini_httpd/files/mini_httpd.init index 9cf60b3ee..53411d41c 100644 --- a/package/mini_httpd/files/mini_httpd.init +++ b/package/mini_httpd/files/mini_httpd.init @@ -14,7 +14,7 @@ start) mini_httpd $mini_httpd_flags ;; stop) - killall mini_httpd + pkill mini_httpd ;; restart) sh $0 stop diff --git a/package/miredo/files/miredo-server.init b/package/miredo/files/miredo-server.init index 6231573a4..b77e62af6 100644 --- a/package/miredo/files/miredo-server.init +++ b/package/miredo/files/miredo-server.init @@ -14,7 +14,7 @@ start) miredo-server ;; stop) - killall miredo-server + pkill miredo-server ;; restart) sh $0 stop diff --git a/package/miredo/files/miredo.init b/package/miredo/files/miredo.init index d1e846ad7..23285fb86 100644 --- a/package/miredo/files/miredo.init +++ b/package/miredo/files/miredo.init @@ -14,7 +14,7 @@ start) miredo ;; stop) - killall miredo + pkill miredo ;; restart) sh $0 stop diff --git a/package/monit/files/monit.init b/package/monit/files/monit.init index 712e7899b..d4d914f95 100644 --- a/package/monit/files/monit.init +++ b/package/monit/files/monit.init @@ -14,7 +14,7 @@ start) monit $monit_flags ;; stop) - killall monit + pkill monit ;; restart) sh $0 stop diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf index 4e3725119..10b1e6918 100644 --- a/package/mpd/files/mpd.conf +++ b/package/mpd/files/mpd.conf @@ -3,6 +3,7 @@ user "mpd" music_directory "~/music" playlist_directory "~/.mpd/playlists" db_file "~/.mpd/database" +pid_file "/var/run/mpd/mpd.pid" log_file "~/.mpd/log" error_file "~/.mpd/error-log" # An example of an ALSA output diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init index 97b883a11..29482b365 100644 --- a/package/mpd/files/mpd.init +++ b/package/mpd/files/mpd.init @@ -17,6 +17,10 @@ start) echo "mpd user must be in group audio." exit 1 fi + if [ ! -d /var/run/mpd ];then + mkdir -p /var/run/mpd + chown mpd:mpd /var/run/mpd + fi mpd ;; stop) diff --git a/package/mpd/files/mpd.postinst b/package/mpd/files/mpd.postinst index 361adeec0..957d973cb 100644 --- a/package/mpd/files/mpd.postinst +++ b/package/mpd/files/mpd.postinst @@ -2,5 +2,5 @@ . $IPKG_INSTROOT/etc/functions.sh gid=$(get_next_gid) add_group mpd $gid -add_user mpd $(get_next_uid) $gid /mnt +add_user mpd $(get_next_uid) $gid /mnt/media add_rcconf mpd diff --git a/package/mrd6/files/mrd6.init b/package/mrd6/files/mrd6.init index 710cde814..da6b5eea3 100644 --- a/package/mrd6/files/mrd6.init +++ b/package/mrd6/files/mrd6.init @@ -14,7 +14,7 @@ start) /usr/sbin/mrd6 -f /etc/mrd6.conf -D ;; stop) - killall mrd6 + pkill mrd6 ;; restart) sh $0 stop diff --git a/package/mt-daapd/files/mt-daapd.init b/package/mt-daapd/files/mt-daapd.init index 84ab61d11..a7632388a 100644 --- a/package/mt-daapd/files/mt-daapd.init +++ b/package/mt-daapd/files/mt-daapd.init @@ -14,7 +14,7 @@ start) mt-daapd ;; stop) - killall mt-daapd + pkill mt-daapd ;; restart) sh $0 stop diff --git a/package/net-snmp/files/snmpd.init b/package/net-snmp/files/snmpd.init index 4a3d2671f..a1c4503ac 100644 --- a/package/net-snmp/files/snmpd.init +++ b/package/net-snmp/files/snmpd.init @@ -15,7 +15,7 @@ start) snmpd $snmpd_flags ;; stop) - killall snmpd + pkill snmpd ;; restart) sh $0 stop diff --git a/package/netperf/files/netserver.init b/package/netperf/files/netserver.init index e5fe31a51..eea806a67 100644 --- a/package/netperf/files/netserver.init +++ b/package/netperf/files/netserver.init @@ -14,7 +14,7 @@ start) netserver ;; stop) - killall netserver + pkill netserver ;; restart) sh $0 stop diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init index af8a4b94a..9379d6a39 100644 --- a/package/nfs-utils/files/nfsd.init +++ b/package/nfs-utils/files/nfsd.init @@ -30,12 +30,12 @@ start) fi ;; stop) - killall nfsd - killall mountd - killall statd + pkill nfsd + pkill mountd + pkill statd if [ ${nfs_server_version} -eq 4 ];then - killall idmapd - killall svcgssd + pkill idmapd + pkill svcgssd fi ;; restart) diff --git a/package/nut/files/upsd.init b/package/nut/files/upsd.init index a65d1ad81..edd023eff 100644 --- a/package/nut/files/upsd.init +++ b/package/nut/files/upsd.init @@ -16,7 +16,7 @@ start) /usr/sbin/upsd || exit 2 ;; stop) - /usr/sbin/upsd -c stop || killall upsd + /usr/sbin/upsd -c stop || pkill upsd /usr/bin/upsdrvctl stop ;; restart) diff --git a/package/opensips/files/opensips.init b/package/opensips/files/opensips.init index 389bb7f64..3f60f8be6 100644 --- a/package/opensips/files/opensips.init +++ b/package/opensips/files/opensips.init @@ -14,7 +14,7 @@ start) /usr/sbin/opensips ;; stop) - killall opensips + pkill opensips ;; restart) sh $0 stop diff --git a/package/openvpn/files/openvpn.init b/package/openvpn/files/openvpn.init index 4c147b4bd..9998742e2 100644 --- a/package/openvpn/files/openvpn.init +++ b/package/openvpn/files/openvpn.init @@ -16,7 +16,7 @@ start) done ;; stop) - killall openvpn + pkill openvpn ;; restart) sh $0 stop diff --git a/package/osiris/files/osirisd.init b/package/osiris/files/osirisd.init index 6d6b4d443..1b1106967 100644 --- a/package/osiris/files/osirisd.init +++ b/package/osiris/files/osirisd.init @@ -15,7 +15,7 @@ start) osirisd ;; stop) - killall osirisd + pkill osirisd ;; restart) sh $0 stop diff --git a/package/p910nd/files/p910nd.init b/package/p910nd/files/p910nd.init index 9d0c227a7..5107579bc 100644 --- a/package/p910nd/files/p910nd.init +++ b/package/p910nd/files/p910nd.init @@ -14,7 +14,7 @@ start) p910nd $p910nd_flags ;; stop) - killall p910nd + pkill p910nd ;; restart) sh $0 stop diff --git a/package/parprouted/files/parprouted.init b/package/parprouted/files/parprouted.init index 98a901408..a0c82d1a1 100644 --- a/package/parprouted/files/parprouted.init +++ b/package/parprouted/files/parprouted.init @@ -14,7 +14,7 @@ start) parprouted ${parprouted_flags} ;; stop) - killall parprouted + pkill parprouted ;; restart) sh $0 stop diff --git a/package/php/files/php.init b/package/php/files/php.init index 63a91d4c7..3d404ac79 100644 --- a/package/php/files/php.init +++ b/package/php/files/php.init @@ -16,7 +16,7 @@ start) php ${php_flags} & ;; stop) - killall php + pkill php ;; restart) sh $0 stop diff --git a/package/pmacct/files/nfacctd.init b/package/pmacct/files/nfacctd.init index 3e768474d..911184d21 100644 --- a/package/pmacct/files/nfacctd.init +++ b/package/pmacct/files/nfacctd.init @@ -14,7 +14,7 @@ autostop) ;; nfacctd $nfaccd_flags ;; stop) - killall nfacctd + pkill nfacctd ;; restart) sh $0 stop diff --git a/package/pmacct/files/pmacctd.init b/package/pmacct/files/pmacctd.init index 2e9a01dd1..5a44474c0 100644 --- a/package/pmacct/files/pmacctd.init +++ b/package/pmacct/files/pmacctd.init @@ -14,7 +14,7 @@ autostop) ;; pmacctd $pmacctd_flags ;; stop) - killall pmacctd + pkill pmacctd ;; restart) sh $0 stop diff --git a/package/pptpd/files/pptpd.init b/package/pptpd/files/pptpd.init index f4f37613f..e26b1f072 100644 --- a/package/pptpd/files/pptpd.init +++ b/package/pptpd/files/pptpd.init @@ -14,7 +14,7 @@ start) pptpd ;; stop) - killall pptpd + pkill pptpd ;; restart) sh $0 stop diff --git a/package/radvd/files/radvd.init b/package/radvd/files/radvd.init index c6722a29e..cfb4125bc 100644 --- a/package/radvd/files/radvd.init +++ b/package/radvd/files/radvd.init @@ -16,7 +16,7 @@ start) ;; stop) - killall radvd + pkill radvd echo 0 > /proc/sys/net/ipv6/conf/all/forwarding ;; diff --git a/package/rarpd/files/rarpd.init b/package/rarpd/files/rarpd.init index 7af906b46..2b8e0f876 100644 --- a/package/rarpd/files/rarpd.init +++ b/package/rarpd/files/rarpd.init @@ -14,7 +14,7 @@ start) rarpd $rarpd_flags ;; stop) - killall rarpd + pkill rarpd ;; restart) sh $0 stop diff --git a/package/reaim/files/reaim.init b/package/reaim/files/reaim.init index 7450b7e08..71a1336b0 100644 --- a/package/reaim/files/reaim.init +++ b/package/reaim/files/reaim.init @@ -21,7 +21,7 @@ start) reaim ;; stop) - killall reaim + pkill reaim ;; restart) sh $0 stop diff --git a/package/rp-pppoe/files/pppoe-relay.init b/package/rp-pppoe/files/pppoe-relay.init index 5998b5291..458a47eaf 100644 --- a/package/rp-pppoe/files/pppoe-relay.init +++ b/package/rp-pppoe/files/pppoe-relay.init @@ -14,7 +14,7 @@ start) pppoe-relay $pppoe_relay_flags ;; stop) - killall pppoe-relay + pkill pppoe-relay ;; restart) sh $0 stop diff --git a/package/rp-pppoe/files/pppoe-server.init b/package/rp-pppoe/files/pppoe-server.init index f8c7c7fd5..b078110a0 100644 --- a/package/rp-pppoe/files/pppoe-server.init +++ b/package/rp-pppoe/files/pppoe-server.init @@ -14,7 +14,7 @@ start) pppoe-server ;; stop) - killall pppoe-server + pkill pppoe-server ;; restart) sh $0 stop diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init index 0f9d00ab1..5c83ae013 100644 --- a/package/rrdcollect/files/rrdcollect.init +++ b/package/rrdcollect/files/rrdcollect.init @@ -22,7 +22,7 @@ start) rrdcollect ;; stop) - killall rrdcollect + pkill rrdcollect ;; restart) sh $0 stop diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init index 862a63515..a8279e366 100644 --- a/package/samba/files/samba.init +++ b/package/samba/files/samba.init @@ -17,8 +17,8 @@ start) smbd -D ;; stop) - killall nmbd - killall smbd + pkill nmbd + pkill smbd ;; restart) sh $0 stop diff --git a/package/scanlogd/files/scanlogd.init b/package/scanlogd/files/scanlogd.init index cd4279e4c..696ee8d77 100644 --- a/package/scanlogd/files/scanlogd.init +++ b/package/scanlogd/files/scanlogd.init @@ -15,7 +15,7 @@ start) scanlogd $scanlogd_flags ;; stop) - killall scanlogd + pkill scanlogd ;; restart) sh $0 stop diff --git a/package/siproxd/files/siproxd.init b/package/siproxd/files/siproxd.init index f29921f52..e186ec934 100644 --- a/package/siproxd/files/siproxd.init +++ b/package/siproxd/files/siproxd.init @@ -14,7 +14,7 @@ autostop) ;; siproxd ;; stop) - killall siproxd + pkill siproxd ;; restart) sh $0 stop diff --git a/package/snort-wireless/files/snort-wireless.init b/package/snort-wireless/files/snort-wireless.init index 3d7376bbe..1a07d1be2 100644 --- a/package/snort-wireless/files/snort-wireless.init +++ b/package/snort-wireless/files/snort-wireless.init @@ -15,7 +15,7 @@ start) snort ${snort_wireless_flags} ;; stop) - killall snort + pkill snort ;; restart) sh $0 stop diff --git a/package/snort/files/snort.init b/package/snort/files/snort.init index 6228cc13e..b426a9fe7 100644 --- a/package/snort/files/snort.init +++ b/package/snort/files/snort.init @@ -14,7 +14,7 @@ start) snort $snort_flags ;; stop) - killall snort + pkill snort ;; *) echo "usage: $0 {start | stop | restart}" diff --git a/package/srelay/files/srelay.init b/package/srelay/files/srelay.init index 5cae3c161..d7aa908f5 100644 --- a/package/srelay/files/srelay.init +++ b/package/srelay/files/srelay.init @@ -15,7 +15,7 @@ start) srelay ${srelay_flags} ;; stop) - killall srelay + pkill srelay ;; restart) sh $0 stop diff --git a/package/subversion/files/svnserve.init b/package/subversion/files/svnserve.init index a52fdb43a..1cfb1e0dd 100644 --- a/package/subversion/files/svnserve.init +++ b/package/subversion/files/svnserve.init @@ -25,7 +25,7 @@ start) /usr/bin/svnserve -d -r $svnserve_path ;; stop) - killall svnserve + pkill svnserve ;; restart) sh $0 stop diff --git a/package/syslog-ng/files/syslog-ng.init b/package/syslog-ng/files/syslog-ng.init index a613e8e9b..2cc6ab8b6 100644 --- a/package/syslog-ng/files/syslog-ng.init +++ b/package/syslog-ng/files/syslog-ng.init @@ -18,7 +18,7 @@ start) [ -x /usr/sbin/syslog-ng ] && /usr/sbin/syslog-ng ;; stop) - killall syslog-ng + pkill syslog-ng ;; restart) sh $0 stop diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init index 8cf6fbb6a..26bd7c0df 100644 --- a/package/tinyproxy/files/tinyproxy.init +++ b/package/tinyproxy/files/tinyproxy.init @@ -14,7 +14,7 @@ start) tinyproxy ;; stop) - killall tinyproxy + pkill tinyproxy ;; restart) sh $0 stop diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init index dd3759252..fcc8c144b 100644 --- a/package/tor/files/tor.init +++ b/package/tor/files/tor.init @@ -15,7 +15,7 @@ start) tor ;; stop) - killall tor + pkill tor ;; restart) sh $0 stop diff --git a/package/vrrpd/files/vrrpd.init b/package/vrrpd/files/vrrpd.init index cbac88074..9e8170643 100644 --- a/package/vrrpd/files/vrrpd.init +++ b/package/vrrpd/files/vrrpd.init @@ -14,7 +14,7 @@ autostop) ;; vrrpd $vrrpd_flags ;; stop) - killall vrrpd + pkill vrrpd ;; restart) sh $0 stop diff --git a/package/vsftpd/files/vsftpd.init b/package/vsftpd/files/vsftpd.init index 7d5e5cccb..7bc01c965 100644 --- a/package/vsftpd/files/vsftpd.init +++ b/package/vsftpd/files/vsftpd.init @@ -15,7 +15,7 @@ start) vsftpd ;; stop) - killall vsftpd + pkill vsftpd ;; restart) sh $0 stop diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init index c5be0f768..5c3351d6b 100644 --- a/package/watchdog/files/watchdog.init +++ b/package/watchdog/files/watchdog.init @@ -14,7 +14,7 @@ start) /usr/sbin/watchdog ;; stop) - killall watchdog + pkill watchdog ;; restart) sh $0 stop diff --git a/package/xinetd/files/xinetd.init b/package/xinetd/files/xinetd.init index d0b8c0517..a7a7db8d5 100644 --- a/package/xinetd/files/xinetd.init +++ b/package/xinetd/files/xinetd.init @@ -14,7 +14,7 @@ start) xinetd ;; stop) - killall xinetd + pkill xinetd ;; restart) sh $0 stop |