Update mldonkey openssh openssl ntfs-3g nfs and hdparm

Change samba default config
Some fixes for mpfire

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@998 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/mpfire/mpd.db b/config/mpfire/mpd.db
new file mode 100644 (file)
index 0000000..5ebeb74
--- /dev/null
+++ b/config/mpfire/mpd.db
@@ -0,0 +1,6 @@
+info_begin
+mpd_version: 0.13.0
+fs_charset: UTF-8
+info_end
+songList begin
+songList end

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 57884c6af511b9e7de3b11e3b35fb5c3b94a0ffa..a484f41225daeb565f258383512ec0fae99f2827 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -3,7 +3,7 @@ var/ipfire/addon-lang
 #var/ipfire/alcatelusb
 var/ipfire/auth
 #var/ipfire/auth/users
-var/ipfire/backup
+#var/ipfire/backup
 var/ipfire/ca
 var/ipfire/certs
 #var/ipfire/certs/index.txt

diff --git a/config/samba/default.global b/config/samba/default.global
index 0efa7cb45911aed319e543495462efc184c4dc33..03b237d17e9d3233bf776c68e389c05aca925c2a 100644 (file)
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -1,37 +1,37 @@
-# global.settings by IPFire Project\r
-\r
-[global]\r
-netbios name = ipfire\r
-server string = Samba\r
-workgroup = homeip.net\r
-\r
-keep alive = 30\r
-os level = 33\r
-fstype = NTFS\r
-\r
-kernel oplocks = false\r
-map to guest = false\r
-smb ports = 445 139\r
-unix charset = CP850\r
-\r
-security = user\r
-encrypt passwords = yes\r
-guest account = samba\r
-unix password sync = false\r
-null passwords = yes\r
-\r
-bind interfaces only = true\r
-interfaces =  eth0\r
-socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE\r
-\r
-username level = 1\r
-wins support = true\r
-\r
-log file       = /var/log/samba/samba-log.%m\r
-lock directory = /var/lock/samba\r
-pid directory = /var/run/\r
-log level = 3 passdb:5 auth:5 winbind:2\r
-\r
-preferred master = false\r
-domain master = false\r
-local master = false\r
+# global.settings by IPFire Project
+
+[global]
+netbios name = ipfire
+server string = Samba
+workgroup = homeip.net
+
+keep alive = 30
+os level = 33
+fstype = NTFS
+
+kernel oplocks = false
+map to guest = false
+smb ports = 445 139
+unix charset = CP850
+
+security = user
+encrypt passwords = yes
+guest account = samba
+unix password sync = false
+null passwords = yes
+
+bind interfaces only = true
+interfaces =  green0 127.0.0.1
+socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
+
+username level = 1
+wins support = true
+
+log file       = /var/log/samba/samba-log.%m
+lock directory = /var/lock/samba
+pid directory = /var/run/
+log level = 3 passdb:5 auth:5 winbind:2
+
+preferred master = false
+domain master = false
+local master = false

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index a61bd5cf74881bf1d95d6b05706cac326e92881a..0392f782866a0b81d8d47ade6e878f837180123b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -97,7 +97,7 @@
 * guardian-ipfire
 * gzip-1.3.5
 * hddtemp-0.3-beta14
-* hdparm-6.6
+* hdparm-7.7
 * htop-0.6.2
 * httpd-2.2.2
 * hwdata
@@ -163,7 +163,7 @@
 * misc-progs
 * mkinitcpio-0.5.9
 * mktemp-1.5
-* mldonkey-2.9.1
+* mldonkey-2.9.2
 * module-init-tools-3.2.2
 * mpc-0.12.1
 * mpd-0.13.0
@@ -179,17 +179,17 @@
 * ncurses-5.5
 * net-tools-1.60
 * newt-0.51.6
-* nfs-utils-1.0.8
+* nfs-utils-1.1.1
 * nmap-4.03
 * noip_updater_v1.6
-* ntfs-3g-1.810
+* ntfs-3g-1.1004
 * ntp-4.2.2
 * ocaml-3.09.2
 * oinkmaster-2.0
 * openldap-2.3.20
 * openmailadmin-1.0.0
-* openssh-4.3p2
-* openssl-0.9.8d
+* openssh-4.7p1
+* openssl-0.9.8g
 * openswan-2.4.9
 * openvpn-2.0.9
 * pam_mysql-0.7RC1

diff --git a/lfs/hdparm b/lfs/hdparm
index de642d7d349e712a512f5a6bb5338fe0d1c0a3a7..d1ce07bf136bc31ac6d3da01207483f66c6c6545 100644 (file)
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.6
+VER        = 7.7
 
 THISAPP    = hdparm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ecea69f775396e4ab6112dcf9066239f
+$(DL_FILE)_MD5 = 0d96f03155fe5c119ca338a51ad1eaa7
 
 install : $(TARGET)
 

diff --git a/lfs/mldonkey b/lfs/mldonkey
index 6f319ff79ea68111dc9c42e0a7f26dc29d1d7c10..9a3216a333e73bfceac884b93b36cb53b3a2309d 100644 (file)
--- a/lfs/mldonkey
+++ b/lfs/mldonkey
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.1
+VER        = 2.9.2
 
 THISAPP    = mldonkey-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f8882bd0bf343b0565e21e59b252b16
+$(DL_FILE)_MD5 = d7b92ae3e8782a3c4adeb0e7870c07dc
 
 install : $(TARGET)
 

diff --git a/lfs/mpfire b/lfs/mpfire
index b108a64dbe198501da52f60e363de0e0f60f2934..2d878d188fb668d592b3c4430713e1d3ff6914e8 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -59,10 +59,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        -mkdir -p /var/ipfire/mpfire/{bin,db}
        touch /var/ipfire/mpfire/{settings,playlist.m3u}
-       touch /var/ipfire/mpfire/db/mpd.db
        install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin
        install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
        install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/
+       install -v -m 644 $(DIR_SRC)/config/mpfire/mpd.db /var/ipfire/mpfire/db/mpd.db
        chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u}
        chown nobody.nobody /var/ipfire/mpfire/{settings,webradio}
        chown root.nobody /var/ipfire/mpfire/db/mpd.db

diff --git a/lfs/nfs b/lfs/nfs
index 4f53c293d0a5822f92dae0c701f73abe43856e79..e76ae46988a53740528a5ebf8008781a5d344706 100644 (file)
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.8
+VER        = 1.1.1
 
 THISAPP    = nfs-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 74fc2dd04b40c9d619ca41d3787ef8db
+$(DL_FILE)_MD5 = 407785488241f9db67b1874e3f36370e
 
 install : $(TARGET)
 

diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g
index 68c9e76d34f10ebe75a4ad61d847abfd94187bf3..9a0fc761d4cb2e1457d0d883c1c52919ce297fbb 100644 (file)
--- a/lfs/ntfs-3g
+++ b/lfs/ntfs-3g
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.810
+VER        = 1.1004
 
 THISAPP    = ntfs-3g-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2f15ff23994d0680287e93eee93a483
+$(DL_FILE)_MD5 = 7630c7dc2879078df06ceff680cc04f5
 
 install : $(TARGET)
 

diff --git a/lfs/openssh b/lfs/openssh
index 1245b57d9c1b594c12f89a38040c514108b3d5c2..7ce9c63e6fc2cb33dee3eec80cbdf268e0139baa 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.3p2
+VER        = 4.7p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7e9880ac20a9b9db0d3fea30a9ff3d46
+$(DL_FILE)_MD5 = 50a800fd2c6def9e9a53068837e87b91
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index 5f4ced5d8456f24d551ef881781dc10cf79b6605..9aaf62ac0c14959318adea8888b3de8d52858d9a 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8d
+VER        = 0.9.8g
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
+$(DL_FILE)_MD5 = acf70a16359bf3658bdfb74bda1c4419
 
 install : $(TARGET)
 

diff --git a/src/paks/default/update.sh b/src/paks/default/update.sh
index ba3239df67a47fe913dc72f160143e57979d43c3..800bd919cb44e10e70389650aed54e592afd1452 100644 (file)
--- a/src/paks/default/update.sh
+++ b/src/paks/default/update.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
 
+stop_service ${NAME}
 make_backup ${NAME}
 extract_files
 restore_backup ${NAME}
+start_service --delay 60 --background ${NAME}

diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh
index 1b8e1df8bbe3723e0576b463fc4261836670277c..ecaacc390c58a45a90f24c7a1ddb5aaa73a1352b 100644 (file)
--- a/src/paks/mpfire/install.sh
+++ b/src/paks/mpfire/install.sh
@@ -9,4 +9,5 @@ ln -svf  /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
 ln -svf  /var/ipfire/mpfire/mpd.conf /etc/mpd.conf
 touch /var/log/mpd.error.log
 touch /var/log/mpd.log
-restore_backup mpfire
+restore_backup ${NAME}
+start_service --delay 60 --background ${NAME}

diff --git a/src/paks/mpfire/uninstall.sh b/src/paks/mpfire/uninstall.sh
index 28dcea518b3755cf145973021d2d9ba11a7d919f..e355241dee9b13b60be9689d994b14b4c1fd56f5 100644 (file)
--- a/src/paks/mpfire/uninstall.sh
+++ b/src/paks/mpfire/uninstall.sh
@@ -1,4 +1,14 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
 
-make_backup mpfire
+stop_service ${NAME}
+make_backup ${NAME}
+rm /etc/rc.d/rc3.d/S65mpd
+rm /etc/rc.d/rc0.d/K35mpd
+rm /etc/rc.d/rc6.d/K35mpd
+rm /etc/init.d/mpd
+rm /var/ipfire/mpfire/mpd.conf
+rm /etc/mpd.conf
+rm /var/log/mpd.error.log
+rm /var/log/mpd.log
+

diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh
index 82a5403f58ff626d56e5898583aa425c51013e75..800bd919cb44e10e70389650aed54e592afd1452 100644 (file)
--- a/src/paks/mpfire/update.sh
+++ b/src/paks/mpfire/update.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
 
-make_backup mpfire
-restore_backup mpfire
+stop_service ${NAME}
+make_backup ${NAME}
+extract_files
+restore_backup ${NAME}
+start_service --delay 60 --background ${NAME}