From 071e69ccf63c35b52258b0644b4b005c3398e3ba Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 27 Dec 2007 02:07:57 +0000 Subject: [PATCH] Core Update 3: Fixed NFS and portmap. git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1130 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/tcpwrapper | 6 ++-- config/rootfiles/core/3/files | 3 ++ config/rootfiles/core/3/meta | 1 + config/rootfiles/core/3/update.sh | 3 ++ config/rootfiles/packages/nfs | 2 ++ config/rootfiles/{common => packages}/portmap | 3 +- doc/language_issues.de | 3 ++ doc/language_issues.en | 3 ++ doc/packages-list.txt | 16 ++++++---- lfs/nfs | 4 ++- lfs/portmap | 4 ++- src/initscripts/init.d/nfs-server | 2 +- src/paks/nfs/install.sh | 31 +++++++++++++++++++ src/paks/nfs/uninstall.sh | 28 +++++++++++++++++ src/paks/nfs/update.sh | 26 ++++++++++++++++ src/paks/portmap/install.sh | 29 +++++++++++++++++ src/paks/portmap/uninstall.sh | 27 ++++++++++++++++ src/paks/portmap/update.sh | 26 ++++++++++++++++ 18 files changed, 204 insertions(+), 13 deletions(-) create mode 100644 config/rootfiles/core/3/files create mode 100644 config/rootfiles/core/3/meta create mode 100644 config/rootfiles/core/3/update.sh rename config/rootfiles/{common => packages}/portmap (80%) create mode 100644 src/paks/nfs/install.sh create mode 100644 src/paks/nfs/uninstall.sh create mode 100644 src/paks/nfs/update.sh create mode 100644 src/paks/portmap/install.sh create mode 100644 src/paks/portmap/uninstall.sh create mode 100644 src/paks/portmap/update.sh diff --git a/config/rootfiles/common/tcpwrapper b/config/rootfiles/common/tcpwrapper index d4eaa176f..febe49722 100644 --- a/config/rootfiles/common/tcpwrapper +++ b/config/rootfiles/common/tcpwrapper @@ -1,8 +1,8 @@ #usr/include/tcpd.h #usr/lib/libwrap.a -#usr/lib/libwrap.so -#usr/lib/libwrap.so.0 -#usr/lib/libwrap.so.0.7.6 +usr/lib/libwrap.so +usr/lib/libwrap.so.0 +usr/lib/libwrap.so.0.7.6 #usr/sbin/safe_finger #usr/sbin/tcpd #usr/sbin/tcpdchk diff --git a/config/rootfiles/core/3/files b/config/rootfiles/core/3/files new file mode 100644 index 000000000..2f94b69ef --- /dev/null +++ b/config/rootfiles/core/3/files @@ -0,0 +1,3 @@ +usr/lib/libwrap.so +usr/lib/libwrap.so.0 +usr/lib/libwrap.so.0.7.6 diff --git a/config/rootfiles/core/3/meta b/config/rootfiles/core/3/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/3/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/3/update.sh b/config/rootfiles/core/3/update.sh new file mode 100644 index 000000000..0eba4bc92 --- /dev/null +++ b/config/rootfiles/core/3/update.sh @@ -0,0 +1,3 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh +extract_files diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index a7b57be85..2e549afdd 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -1,3 +1,4 @@ +etc/init.d/nfs-server #usr/man/man5/exports.5 #usr/man/man7/nfsd.7 #usr/man/man8/exportfs.8 @@ -23,6 +24,7 @@ usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/sbin/rpc.statd usr/sbin/showmount +var/ipfire/nfs/nfs-server #var/lib/nfs var/lib/nfs/etab var/lib/nfs/rmtab diff --git a/config/rootfiles/common/portmap b/config/rootfiles/packages/portmap similarity index 80% rename from config/rootfiles/common/portmap rename to config/rootfiles/packages/portmap index 2a51c73c8..a00823e19 100644 --- a/config/rootfiles/common/portmap +++ b/config/rootfiles/packages/portmap @@ -1,4 +1,5 @@ -#sbin/portmap +etc/init.d/portmap +sbin/portmap #usr/sbin/pmap_dump #usr/sbin/pmap_set #usr/share/man/man8/pmap_dump.8 diff --git a/doc/language_issues.de b/doc/language_issues.de index 02d51de5f..fe91cbcb2 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -377,9 +377,12 @@ WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username WARNING: translation string unused: uptime and users +WARNING: translation string unused: urlfilter background image +WARNING: translation string unused: urlfilter background text WARNING: translation string unused: urlfilter update information WARNING: translation string unused: urlfilter update notification WARNING: translation string unused: urlfilter update results +WARNING: translation string unused: urlfilter upload background WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod diff --git a/doc/language_issues.en b/doc/language_issues.en index 515634b99..a912343a1 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -410,9 +410,12 @@ WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username WARNING: translation string unused: uptime and users +WARNING: translation string unused: urlfilter background image +WARNING: translation string unused: urlfilter background text WARNING: translation string unused: urlfilter update information WARNING: translation string unused: urlfilter update notification WARNING: translation string unused: urlfilter update results +WARNING: translation string unused: urlfilter upload background WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 44cf88f37..5cfb5dea0 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -29,7 +29,7 @@ * URI-1.35 * Unix-Syslog-0.100 * XML-Parser-2.34 -* alsa-lib-1.0.15 +* alsa-lib-1.0.13 * amavisd-new-2.5.2 * applejuice-0.30 * arping-2.05 @@ -56,7 +56,6 @@ * coreutils-5.96 * cpio-2.6 * cups-1.2.12 -* cups-1.3.5 * curl-7.15.3 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 @@ -100,6 +99,7 @@ * hddtemp-0.3-beta14 * hdparm-7.7 * hplip-2.7.10 +* htop-0.6.2 * htop-0.7 * httpd-2.2.6 * hwdata @@ -139,10 +139,11 @@ * libshout-2.2.2 * libsigc++-2.0.17 * libtool-1.5.22 +* libtorrent-0.11.6 * libtorrent-0.11.9 * libupnp-1.3.1 * libusb-0.1.12 -* libvorbis-1.2.0 +* libvorbis-1.1.2 * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 @@ -202,6 +203,7 @@ * php-5.2.4 * pkg-config-0.20 * popt-1.10.4 +* portmap * portmap_5beta * postfix-2.4.6 * ppp-2.4.4 @@ -213,8 +215,8 @@ * rp-pppoe-3.8 * rrdtool-1.2.15 * rsync-2.6.9 -* rtorrent-0.7.9 -* samba-3.0.28 +* rtorrent-0.7.6 +* samba-3.0.27a * screen-4.0.3 * sdparm-1.01 * sed-4.1.5 @@ -227,9 +229,11 @@ * spandsp-0.0.3pre24 * squashfs3.2-r2 * squid-2.6.STABLE16 -* squid-3.0.STABLE1 * squid-graph-3.2 +* squidGuard-1.2.0 * squidGuard-1.3 +* squidclam-0.23 +* subversion-1.4.4 * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.4.1 diff --git a/lfs/nfs b/lfs/nfs index e76ae4698..e56df07c3 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -32,7 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 1 +PAK_VER = 2 + +DEPS = "portmap" ############################################################################### # Top-level Rules diff --git a/lfs/portmap b/lfs/portmap index c9cf7296c..d6c869e3e 100644 --- a/lfs/portmap +++ b/lfs/portmap @@ -32,7 +32,9 @@ DL_FROM = ftp://ftp.porcupine.org/pub/security DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = portmap -PAK_VER = ipfire-beta1 +PAK_VER = 1 + +DEPS = "" ############################################################################### # Top-level Rules diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-server index 5e044286c..397722c1c 100644 --- a/src/initscripts/init.d/nfs-server +++ b/src/initscripts/init.d/nfs-server @@ -9,7 +9,7 @@ . /etc/sysconfig/rc . $rc_functions -. /etc/sysconfig/nfs-server +. /var/ipfire/nfs/nfs-server case "$1" in start) diff --git a/src/paks/nfs/install.sh b/src/paks/nfs/install.sh new file mode 100644 index 000000000..14e39e393 --- /dev/null +++ b/src/paks/nfs/install.sh @@ -0,0 +1,31 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} +touch /etc/exports +ln -sf ../init.d/nfs-server /etc/rc.d/rc0.d/K48nfs-server +ln -sf ../init.d/nfs-server /etc/rc.d/rc3.d/S24nfs-server +ln -sf ../init.d/nfs-server /etc/rc.d/rc6.d/K48nfs-server diff --git a/src/paks/nfs/uninstall.sh b/src/paks/nfs/uninstall.sh new file mode 100644 index 000000000..fe6e84bda --- /dev/null +++ b/src/paks/nfs/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*nfs-server diff --git a/src/paks/nfs/update.sh b/src/paks/nfs/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/nfs/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/paks/portmap/install.sh b/src/paks/portmap/install.sh new file mode 100644 index 000000000..6c391d671 --- /dev/null +++ b/src/paks/portmap/install.sh @@ -0,0 +1,29 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +start_service --background ${NAME} +ln -sf ../init.d/portmap /etc/rc.d/rc0.d/K49portmap +ln -sf ../init.d/portmap /etc/rc.d/rc3.d/S22portmap +ln -sf ../init.d/portmap /etc/rc.d/rc6.d/K49portmap diff --git a/src/paks/portmap/uninstall.sh b/src/paks/portmap/uninstall.sh new file mode 100644 index 000000000..12ecada88 --- /dev/null +++ b/src/paks/portmap/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*portmap diff --git a/src/paks/portmap/update.sh b/src/paks/portmap/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/portmap/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh -- 2.39.2