This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via e93a0b06fe1c55c41ce24c33449f16f4ce5e5c53 (commit) via a1a05a444ffa2064bc15533165a3d3bac369a887 (commit) via cdd422b561fcd8d2fa3bd229ae4f78def24a6df5 (commit) from e5158aea0a6ea2be4e4da3b3b7b02bf78e13be48 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e93a0b06fe1c55c41ce24c33449f16f4ce5e5c53 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sat May 7 16:16:35 2016 +0200
Replace portmap with rpcbind
Portmap is not maintained anymore that's why it is replaced by rpcbind. Rpcbind provides also rpcinfo which is quite useful for debugging.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a1a05a444ffa2064bc15533165a3d3bac369a887 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sat May 7 16:16:34 2016 +0200
New package libtirpc
libtirpc is a dependency of rpcbind
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cdd422b561fcd8d2fa3bd229ae4f78def24a6df5 Author: Marcel Lorenz marcel.lorenz@ipfire.org Date: Fri May 13 17:50:57 2016 +0200
7zip: update to 15.14.1
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/packages/7zip | 1 + config/rootfiles/packages/libtirpc | 61 ++++++++++++++++ config/rootfiles/packages/portmap | 7 -- config/rootfiles/packages/rpcbind | 5 ++ lfs/7zip | 6 +- lfs/{nmap => libtirpc} | 12 +-- lfs/nfs | 2 +- lfs/portmap | 85 ---------------------- lfs/{spice-protocol => rpcbind} | 17 +++-- make.sh | 3 +- src/initscripts/init.d/portmap | 38 ---------- src/initscripts/init.d/{stunnel => rpcbind} | 25 ++++--- src/paks/portmap/install.sh | 29 -------- src/paks/portmap/uninstall.sh | 27 ------- src/paks/{default => rpcbind}/install.sh | 8 +- src/paks/{cups => rpcbind}/uninstall.sh | 2 +- src/paks/{portmap => rpcbind}/update.sh | 0 .../rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch | 48 ++++++++++++ 21 files changed, 163 insertions(+), 219 deletions(-) create mode 100644 config/rootfiles/packages/libtirpc delete mode 100644 config/rootfiles/packages/portmap create mode 100644 config/rootfiles/packages/rpcbind copy lfs/{nmap => libtirpc} (92%) delete mode 100644 lfs/portmap copy lfs/{spice-protocol => rpcbind} (85%) delete mode 100644 src/initscripts/init.d/portmap copy src/initscripts/init.d/{stunnel => rpcbind} (50%) delete mode 100644 src/paks/portmap/install.sh delete mode 100644 src/paks/portmap/uninstall.sh copy src/paks/{default => rpcbind}/install.sh (85%) copy src/paks/{cups => rpcbind}/uninstall.sh (98%) rename src/paks/{portmap => rpcbind}/update.sh (100%) create mode 100644 src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch
Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index b827b1c..bc253c0 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -103,13 +103,13 @@ etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools etc/rc.d/init.d/partresize -#etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd +#etc/rc.d/init.d/rpcbind #etc/rc.d/init.d/rtpproxy #etc/rc.d/init.d/samba #etc/rc.d/init.d/sane diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 0976fe5..f1024a2 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -104,13 +104,13 @@ etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools etc/rc.d/init.d/partresize -#etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd +#etc/rc.d/init.d/rpcbind #etc/rc.d/init.d/rtpproxy #etc/rc.d/init.d/samba #etc/rc.d/init.d/sane diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 0976fe5..f1024a2 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -104,13 +104,13 @@ etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools etc/rc.d/init.d/partresize -#etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd +#etc/rc.d/init.d/rpcbind #etc/rc.d/init.d/rtpproxy #etc/rc.d/init.d/samba #etc/rc.d/init.d/sane diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index 15d9515..a49dee7 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -3,6 +3,7 @@ usr/local/lib/p7zip #usr/local/lib/p7zip/7z #usr/local/lib/p7zip/7z.so #usr/local/lib/p7zip/Codecs +usr/local/lib/p7zip/Codecs/Rar.so #usr/local/lib/p7zip/Codecs/Rar29.so #usr/local/man/man1/7z.1 #usr/local/man/man1/7za.1 diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/packages/libtirpc new file mode 100644 index 0000000..e197563 --- /dev/null +++ b/config/rootfiles/packages/libtirpc @@ -0,0 +1,61 @@ +etc/netconfig +#usr/include/tirpc +#usr/include/tirpc/netconfig.h +#usr/include/tirpc/rpc +#usr/include/tirpc/rpc/auth.h +#usr/include/tirpc/rpc/auth_des.h +#usr/include/tirpc/rpc/auth_unix.h +#usr/include/tirpc/rpc/clnt.h +#usr/include/tirpc/rpc/clnt_soc.h +#usr/include/tirpc/rpc/clnt_stat.h +#usr/include/tirpc/rpc/des.h +#usr/include/tirpc/rpc/des_crypt.h +#usr/include/tirpc/rpc/key_prot.h +#usr/include/tirpc/rpc/nettype.h +#usr/include/tirpc/rpc/pmap_clnt.h +#usr/include/tirpc/rpc/pmap_prot.h +#usr/include/tirpc/rpc/pmap_rmt.h +#usr/include/tirpc/rpc/raw.h +#usr/include/tirpc/rpc/rpc.h +#usr/include/tirpc/rpc/rpc_com.h +#usr/include/tirpc/rpc/rpc_msg.h +#usr/include/tirpc/rpc/rpcb_clnt.h +#usr/include/tirpc/rpc/rpcb_prot.h +#usr/include/tirpc/rpc/rpcb_prot.x +#usr/include/tirpc/rpc/rpcent.h +#usr/include/tirpc/rpc/svc.h +#usr/include/tirpc/rpc/svc_auth.h +#usr/include/tirpc/rpc/svc_dg.h +#usr/include/tirpc/rpc/svc_mt.h +#usr/include/tirpc/rpc/svc_soc.h +#usr/include/tirpc/rpc/types.h +#usr/include/tirpc/rpc/xdr.h +#usr/include/tirpc/rpcsvc +#usr/include/tirpc/rpcsvc/crypt.h +#usr/include/tirpc/rpcsvc/crypt.x +#usr/lib/libtirpc.a +#usr/lib/libtirpc.la +#usr/lib/libtirpc.so +usr/lib/libtirpc.so.3 +usr/lib/libtirpc.so.3.0.0 +#usr/lib/pkgconfig/libtirpc.pc +#usr/share/man/man3/bindresvport.3t +#usr/share/man/man3/des_crypt.3t +#usr/share/man/man3/getnetconfig.3t +#usr/share/man/man3/getnetpath.3t +#usr/share/man/man3/getrpcent.3t +#usr/share/man/man3/getrpcport.3t +#usr/share/man/man3/rpc.3t +#usr/share/man/man3/rpc_clnt_auth.3t +#usr/share/man/man3/rpc_clnt_calls.3t +#usr/share/man/man3/rpc_clnt_create.3t +#usr/share/man/man3/rpc_secure.3t +#usr/share/man/man3/rpc_soc.3t +#usr/share/man/man3/rpc_svc_calls.3t +#usr/share/man/man3/rpc_svc_create.3t +#usr/share/man/man3/rpc_svc_err.3t +#usr/share/man/man3/rpc_svc_reg.3t +#usr/share/man/man3/rpc_xdr.3t +#usr/share/man/man3/rpcbind.3t +#usr/share/man/man3/rtime.3t +#usr/share/man/man5/netconfig.5 diff --git a/config/rootfiles/packages/portmap b/config/rootfiles/packages/portmap deleted file mode 100644 index 4b60d64..0000000 --- a/config/rootfiles/packages/portmap +++ /dev/null @@ -1,7 +0,0 @@ -etc/rc.d/init.d/portmap -sbin/portmap -#sbin/pmap_dump -#sbin/pmap_set -#usr/share/man/man8/pmap_dump.8 -#usr/share/man/man8/pmap_set.8 -#usr/share/man/man8/portmap.8 diff --git a/config/rootfiles/packages/rpcbind b/config/rootfiles/packages/rpcbind new file mode 100644 index 0000000..5270207 --- /dev/null +++ b/config/rootfiles/packages/rpcbind @@ -0,0 +1,5 @@ +etc/rc.d/init.d/rpcbind +sbin/rpcbind +sbin/rpcinfo +#usr/share/man/man8/rpcbind.8 +#usr/share/man/man8/rpcinfo.8 diff --git a/lfs/7zip b/lfs/7zip index f8ac672..e3ac3b3 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -24,7 +24,7 @@
include Config
-VER = 9.38.1 +VER = 15.14.1
THISAPP = p7zip_$(VER) DL_FILE = $(THISAPP)_src_all.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 4 +PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6cba8402ccab2370d3b70c5e28b3d651 +$(DL_FILE)_MD5 = 92cca093312b5a71a7be7dc7d1d32509
install : $(TARGET)
diff --git a/lfs/libtirpc b/lfs/libtirpc new file mode 100644 index 0000000..382d7e5 --- /dev/null +++ b/lfs/libtirpc @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2016 IPFire Team info@ipfire.org # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.1 + +THISAPP = libtirpc-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libtirpc +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 36ce1c0ff80863bb0839d54aa0b94014 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6 + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/nfs b/lfs/nfs index b6cef7b..ee9b3a0 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs PAK_VER = 7
-DEPS = "portmap" +DEPS = "rpcbind"
LIBNFSIDMAP = 0.25
diff --git a/lfs/portmap b/lfs/portmap deleted file mode 100644 index c903547..0000000 --- a/lfs/portmap +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 6.0 - -THISAPP = portmap_$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = portmap -PAK_VER = 2 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ac108ab68bf0f34477f8317791aaf1ff - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvfz $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/portmap-5beta-compilation_fixes-3.patch -# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/portmap-5beta-glibc_errno_fix-1.patch - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/rpcbind b/lfs/rpcbind new file mode 100644 index 0000000..d9e2885 --- /dev/null +++ b/lfs/rpcbind @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2016 IPFire Team info@ipfire.org # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.2.3 + +THISAPP = rpcbind-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = rpcbind +PAK_VER = 1 + +DEPS = "libtirpc" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c8875246b2688a1adfbd6ad43480278d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch + cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6 + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index fee4edd..3293fd8 100755 --- a/make.sh +++ b/make.sh @@ -678,7 +678,8 @@ buildipfire() { ipfiremake tcpwrapper ipfiremake libevent ipfiremake libevent2 - ipfiremake portmap + ipfiremake libtirpc + ipfiremake rpcbind ipfiremake nfs ipfiremake gnu-netcat ipfiremake ncat diff --git a/src/initscripts/init.d/portmap b/src/initscripts/init.d/portmap deleted file mode 100644 index 00516a2..0000000 --- a/src/initscripts/init.d/portmap +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/portmap - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting RPC Portmap" - loadproc /sbin/portmap - ;; - - stop) - boot_mesg "Stopping Portmap" - killproc /sbin/portmap - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /sbin/portmap - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; - -esac - -# End $rc_base/init.d/portmap diff --git a/src/initscripts/init.d/rpcbind b/src/initscripts/init.d/rpcbind new file mode 100644 index 0000000..7216acd --- /dev/null +++ b/src/initscripts/init.d/rpcbind @@ -0,0 +1,46 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/rpcbind +# +# Description : rpcbind init script +# +# Authors : Jonatan Schlag jonatan.schlag@ipfire.org +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting rpcbind" + loadproc /sbin/rpcbind + ;; + + stop) + boot_mesg "Stopping rpcbind" + killproc /sbin/rpcbind + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /sbin/rpcbind + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; + +esac + +# End $rc_base/init.d/rpcbind diff --git a/src/paks/portmap/install.sh b/src/paks/portmap/install.sh deleted file mode 100644 index 6c391d6..0000000 --- a/src/paks/portmap/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 info@ipfire.org. # -# # -############################################################################ -# -. /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 deleted file mode 100644 index 12ecada..0000000 --- a/src/paks/portmap/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 info@ipfire.org. # -# # -############################################################################ -# -. /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 deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/portmap/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/rpcbind/install.sh b/src/paks/rpcbind/install.sh new file mode 100644 index 0000000..e523183 --- /dev/null +++ b/src/paks/rpcbind/install.sh @@ -0,0 +1,33 @@ +#!/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 info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +# remove portmap +/etc/init.d/portmap stop +rm -rf /etc/rc.d/rc*.d/*portmap /sbin/portmap /etc/rc.d/init.d/portmap +# install rpcbind +extract_files +start_service --background ${NAME} +ln -sf ../init.d/rpcbind /etc/rc.d/rc0.d/K49rpcbind +ln -sf ../init.d/rpcbind /etc/rc.d/rc3.d/S22rpcbind +ln -sf ../init.d/rpcbind /etc/rc.d/rc6.d/K49rpcbind diff --git a/src/paks/rpcbind/uninstall.sh b/src/paks/rpcbind/uninstall.sh new file mode 100644 index 0000000..e705c8c --- /dev/null +++ b/src/paks/rpcbind/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 info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*rpcbind diff --git a/src/paks/rpcbind/update.sh b/src/paks/rpcbind/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/rpcbind/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 info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch b/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch new file mode 100644 index 0000000..bdf73a3 --- /dev/null +++ b/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch @@ -0,0 +1,48 @@ +Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> +Date: 2015-11-29 +Initial Package Version: 0.2.3 +Upstream Status: Already in upstream git repository +Origin: Upstream +Description: This patch fixes rpcbind to be able to build with + recent tirpc versions. + +From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 +From: Steve Dickson steved@redhat.com +Date: Mon, 2 Nov 2015 17:05:18 -0500 +Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly + +In the latest libtirpc version to access the xp_auth +one must use the SVC_XP_AUTH macro. To be backwards +compatible a couple ifdefs were added to use the +macro when it exists. + +Signed-off-by: Steve Dickson steved@redhat.com +--- + src/rpcb_svc_com.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 4ae93f1..22d6c84 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) + a.rmt_localvers = fi->versnum; + + xprt_set_caller(xprt, fi); ++#if defined(SVC_XP_AUTH) ++ SVC_XP_AUTH(xprt) = svc_auth_none; ++#else + xprt->xp_auth = &svc_auth_none; ++#endif + svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); ++#if !defined(SVC_XP_AUTH) + SVCAUTH_DESTROY(xprt->xp_auth); + xprt->xp_auth = NULL; ++#endif ++ + done: + if (buffer) + free(buffer); +-- +1.8.2.1 +
hooks/post-receive -- IPFire 2.x development tree