From: Michael Tremer Date: Tue, 2 Dec 2008 20:01:48 +0000 (+0100) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x X-Git-Tag: v2.5-beta1~247 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=05fa01ffb75e2dea21985a870940a09015753095;hp=1ec1ec89e611a843e8279d23302da3c05e2bb93d Merge branch 'master' of git://git.ipfire.org/ipfire-2.x --- diff --git a/config/backup/includes/fetchmail b/config/backup/includes/fetchmail new file mode 100644 index 0000000000..6a69cd0daa --- /dev/null +++ b/config/backup/includes/fetchmail @@ -0,0 +1 @@ +/root/.fetchmailrc diff --git a/config/backup/includes/mldonkey b/config/backup/includes/mldonkey new file mode 100644 index 0000000000..a6dfee81e2 --- /dev/null +++ b/config/backup/includes/mldonkey @@ -0,0 +1 @@ +/opt/mldonkey/.mldonkey/ diff --git a/config/rootfiles/packages/fetchmail b/config/rootfiles/packages/fetchmail index 0ce1002e84..f78418a071 100644 --- a/config/rootfiles/packages/fetchmail +++ b/config/rootfiles/packages/fetchmail @@ -7,3 +7,4 @@ usr/bin/fetchmail #usr/lib/python2.4/site-packages/fetchmailconf.pyo #usr/share/man/man1/fetchmail.1 #usr/share/man/man1/fetchmailconf.1 +var/ipfire/backup/addons/includes/fetchmail diff --git a/config/rootfiles/packages/hostapd b/config/rootfiles/packages/hostapd index 85d4e24867..1c04d76116 100644 --- a/config/rootfiles/packages/hostapd +++ b/config/rootfiles/packages/hostapd @@ -1,6 +1,9 @@ srv/web/ipfire/cgi-bin/wlanap.cgi var/ipfire/menu.d/EX-wlanap.menu etc/init.d/hostapd +etc/hostapd.accept +etc/hostapd.conf +etc/hostapd.deny usr/local/bin/wlanapctrl etc/hostapd.conf usr/bin/hostapd diff --git a/config/rootfiles/common/libtool b/config/rootfiles/packages/libtool similarity index 93% rename from config/rootfiles/common/libtool rename to config/rootfiles/packages/libtool index 14909b8b4f..528eac775b 100644 --- a/config/rootfiles/common/libtool +++ b/config/rootfiles/packages/libtool @@ -3,9 +3,9 @@ #usr/include/ltdl.h #usr/lib/libltdl.a #usr/lib/libltdl.la -#usr/lib/libltdl.so -#usr/lib/libltdl.so.3 -#usr/lib/libltdl.so.3.1.4 +usr/lib/libltdl.so +usr/lib/libltdl.so.3 +usr/lib/libltdl.so.3.1.4 #usr/share/aclocal/libtool.m4 #usr/share/aclocal/ltdl.m4 #usr/share/info/libtool.info diff --git a/config/rootfiles/packages/mldonkey b/config/rootfiles/packages/mldonkey index d04864198d..2df3ee0f01 100644 --- a/config/rootfiles/packages/mldonkey +++ b/config/rootfiles/packages/mldonkey @@ -1,3 +1,4 @@ +var/ipfire/backup/addons/includes/mldonkey etc/init.d/mldonkey #opt/mldonkey opt/mldonkey/.mldonkey diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios index ef0ccc2366..453db35d86 100644 --- a/config/rootfiles/packages/nagios +++ b/config/rootfiles/packages/nagios @@ -1,6 +1,86 @@ +#etc/nagios +etc/nagios/cgi.cfg +etc/nagios/nagios.cfg +#etc/nagios/objects +etc/nagios/objects/commands.cfg +etc/nagios/objects/contacts.cfg +etc/nagios/objects/localhost.cfg +etc/nagios/objects/printer.cfg +etc/nagios/objects/switch.cfg +etc/nagios/objects/templates.cfg +etc/nagios/objects/timeperiods.cfg +etc/nagios/objects/windows.cfg +etc/nagios/resource.cfg +etc/rc.d/init.d/nagios usr/bin/nagios usr/bin/nagiostats usr/bin/p1.pl +usr/lib/nagios +#usr/lib/nagios/check_apt +#usr/lib/nagios/check_breeze +#usr/lib/nagios/check_by_ssh +#usr/lib/nagios/check_clamd +#usr/lib/nagios/check_cluster +#usr/lib/nagios/check_dhcp +#usr/lib/nagios/check_dig +#usr/lib/nagios/check_disk +#usr/lib/nagios/check_disk_smb +#usr/lib/nagios/check_dns +#usr/lib/nagios/check_dummy +#usr/lib/nagios/check_file_age +#usr/lib/nagios/check_flexlm +#usr/lib/nagios/check_ftp +#usr/lib/nagios/check_http +#usr/lib/nagios/check_icmp +#usr/lib/nagios/check_ide_smart +#usr/lib/nagios/check_ifoperstatus +#usr/lib/nagios/check_ifstatus +#usr/lib/nagios/check_imap +#usr/lib/nagios/check_ircd +#usr/lib/nagios/check_jabber +#usr/lib/nagios/check_ldap +#usr/lib/nagios/check_ldaps +#usr/lib/nagios/check_load +#usr/lib/nagios/check_log +#usr/lib/nagios/check_mailq +#usr/lib/nagios/check_mrtg +#usr/lib/nagios/check_mrtgtraf +#usr/lib/nagios/check_mysql +#usr/lib/nagios/check_mysql_query +#usr/lib/nagios/check_nagios +#usr/lib/nagios/check_nntp +#usr/lib/nagios/check_nntps +#usr/lib/nagios/check_nt +#usr/lib/nagios/check_ntp +#usr/lib/nagios/check_ntp_peer +#usr/lib/nagios/check_ntp_time +#usr/lib/nagios/check_nwstat +#usr/lib/nagios/check_oracle +#usr/lib/nagios/check_overcr +#usr/lib/nagios/check_ping +#usr/lib/nagios/check_pop +#usr/lib/nagios/check_procs +#usr/lib/nagios/check_real +#usr/lib/nagios/check_rpc +#usr/lib/nagios/check_sensors +#usr/lib/nagios/check_simap +#usr/lib/nagios/check_smtp +#usr/lib/nagios/check_spop +#usr/lib/nagios/check_ssh +#usr/lib/nagios/check_ssmtp +#usr/lib/nagios/check_swap +#usr/lib/nagios/check_tcp +#usr/lib/nagios/check_time +#usr/lib/nagios/check_udp +#usr/lib/nagios/check_ups +#usr/lib/nagios/check_users +#usr/lib/nagios/check_wave +#usr/lib/nagios/negate +#usr/lib/nagios/urlize +#usr/lib/nagios/utils.pm +#usr/lib/nagios/utils.sh +usr/share/locale/de/LC_MESSAGES/nagios-plugins.mo +#usr/share/locale/fr/LC_MESSAGES/nagios-plugins.mo usr/share/nagios #usr/share/nagios/cgi-bin #usr/share/nagios/cgi-bin/avail.cgi @@ -17,9 +97,9 @@ usr/share/nagios #usr/share/nagios/cgi-bin/statuswml.cgi #usr/share/nagios/cgi-bin/statuswrl.cgi #usr/share/nagios/cgi-bin/summary.cgi -#usr/share/nagios/cgi-bin/tac.cgi# +#usr/share/nagios/cgi-bin/tac.cgi #usr/share/nagios/cgi-bin/trends.cgi -usr/share/nagios/contexthelp +#usr/share/nagios/contexthelp #usr/share/nagios/contexthelp/A1.html #usr/share/nagios/contexthelp/A2.html #usr/share/nagios/contexthelp/A3.html @@ -83,7 +163,7 @@ usr/share/nagios/contexthelp #usr/share/nagios/contexthelp/N5.html #usr/share/nagios/contexthelp/N6.html #usr/share/nagios/contexthelp/N7.html -usr/share/nagios/docs +#usr/share/nagios/docs #usr/share/nagios/docs/about.html #usr/share/nagios/docs/activechecks.html #usr/share/nagios/docs/adaptive.html @@ -93,6 +173,7 @@ usr/share/nagios/docs #usr/share/nagios/docs/cgiauth.html #usr/share/nagios/docs/cgiincludes.html #usr/share/nagios/docs/cgis.html +#usr/share/nagios/docs/cgisecurity.html #usr/share/nagios/docs/checkscheduling.html #usr/share/nagios/docs/clusters.html #usr/share/nagios/docs/config.html @@ -337,9 +418,6 @@ usr/share/nagios/images usr/share/nagios/index.html usr/share/nagios/main.html usr/share/nagios/media -#usr/share/nagios/media/critical.wav -#usr/share/nagios/media/hostdown.wav -#usr/share/nagios/media/warning.wav #usr/share/nagios/robots.txt #usr/share/nagios/side.html usr/share/nagios/ssi @@ -362,4 +440,5 @@ usr/share/nagios/stylesheets #usr/share/nagios/stylesheets/tac.css #usr/share/nagios/stylesheets/trends.css var/archives +var/rw var/spool/checkresults diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 25678aca7c..69c9d179d9 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -93,7 +93,7 @@ * fbset-2.1 * fcron-3.0.1 * feedparser-4.1 -* fetchmail-6.3.8 +* fetchmail-6.3.9 * ffmpeg-export-2008-04-13 * file-4.17 * findutils-4.2.27 @@ -205,7 +205,7 @@ * mtd-CVS-20070507 * mtools-3.9.10 * mysql-5.0.24a -* nagios-3.0 +* nagios-3.0.5 * nano-1.2.5 * nasm-0.98.39 * ncftp-3.2.1-src @@ -253,7 +253,7 @@ * rssdler-0.4.0a * rsync-2.6.9 * rtorrent-0.7.9 -* samba-3.2.4 +* samba-3.2.5 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 diff --git a/lfs/fetchmail b/lfs/fetchmail index 46863bc018..dbab16f362 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -24,7 +24,7 @@ include Config -VER = 6.3.8 +VER = 6.3.9 THISAPP = fetchmail-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fetchmail -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 66b97500b0a1e3c0916b3b5314f597f5 +$(DL_FILE)_MD5 = 72c20ad2b9629f1a109668b05a84d823 install : $(TARGET) @@ -87,5 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo "#poll SERVERNAME :" >> ~/.fetchmailrc echo "# user pass ;" >> ~/.fetchmailrc echo "# mda "/usr/bin/procmail -f %F -d %T";" >> ~/.fetchmailrc + install -v -m 644 $(DIR_SRC)/config/backup/includes/fetchmail /var/ipfire/backup/addons/includes/fetchmail @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libtool b/lfs/libtool index faca6d1031..333f958291 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -32,6 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libtool +PAK_VER = 1 +DEPS = "" + ############################################################################### # Top-level Rules ############################################################################### @@ -63,6 +67,9 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) +dist: + @$(PAK) + ############################################################################### # Installation Details ############################################################################### diff --git a/lfs/mldonkey b/lfs/mldonkey index a2733b894e..62375841a4 100644 --- a/lfs/mldonkey +++ b/lfs/mldonkey @@ -89,5 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -p /var/log/mldonkey/{incoming,temp} -mkdir -p /var/log/mldonkey/incoming/{directories,files} chown -Rv mldonkey.mldonkey /var/log/mldonkey/{incoming,temp} + install -v -m 644 $(DIR_SRC)/config/backup/includes/mldonkey \ + /var/ipfire/backup/addons/includes/mldonkey @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nagios b/lfs/nagios index 577451bd26..0365b6a7ce 100644 --- a/lfs/nagios +++ b/lfs/nagios @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = nagios PAK_VER = 2 -DEPS = "glib traceroute" +DEPS = "glib traceroute libtool" ############################################################################### # Top-level Rules diff --git a/lfs/samba b/lfs/samba index d026fd5088..71df43f8eb 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.2.4 +VER = 3.2.5 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 9 +PAK_VER = 10 DEPS = "cups cyrus-sasl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7870a6bb3a025c6081cd56688acd494a +$(DL_FILE)_MD5 = 0f7539e09803ae60a2912e70adf1c747 install : $(TARGET) diff --git a/lfs/streamripper b/lfs/streamripper index 55efd40066..050e8a9835 100644 --- a/lfs/streamripper +++ b/lfs/streamripper @@ -77,7 +77,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/paks/mldonkey/uninstall.sh b/src/paks/mldonkey/uninstall.sh index 5a2936a00e..fc183a3d5d 100644 --- a/src/paks/mldonkey/uninstall.sh +++ b/src/paks/mldonkey/uninstall.sh @@ -23,5 +23,9 @@ # . /opt/pakfire/lib/functions.sh /etc/init.d/mldonkey stop +if [ ! -e /var/ipfire/backup/addons/includes/mldonkey ]; then + echo /opt/mldonkey/.mldonkey > /var/ipfire/backup/addons/includes/mldonkey +fi +make_backup ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*mldonkey