From 2b47cc27e3fbb6478a8729bc3c8fcffa7df3538a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 Jul 2016 13:33:21 +0200 Subject: [PATCH 1/3] bump package version of corrupted paks. I had uploaded the wrong arch of this paks so bump version to fix this in pakfire. Signed-off-by: Arne Fitzenreiter --- lfs/clamav | 2 +- lfs/hostapd | 2 +- lfs/mc | 2 +- lfs/nfs | 2 +- lfs/rpcbind | 2 +- lfs/tor | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lfs/clamav b/lfs/clamav index 891161919..0625ecf93 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 33 +PAK_VER = 34 DEPS = "" diff --git a/lfs/hostapd b/lfs/hostapd index 7d193d977..a4fe99a92 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 36 +PAK_VER = 37 DEPS = "" diff --git a/lfs/mc b/lfs/mc index 945d604a5..b682d645e 100644 --- a/lfs/mc +++ b/lfs/mc @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 12 +PAK_VER = 13 DEPS = "" diff --git a/lfs/nfs b/lfs/nfs index 42ac5b586..23a17739e 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 8 +PAK_VER = 9 DEPS = "rpcbind" diff --git a/lfs/rpcbind b/lfs/rpcbind index d9e28854e..e7f9eff08 100644 --- a/lfs/rpcbind +++ b/lfs/rpcbind @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rpcbind -PAK_VER = 1 +PAK_VER = 2 DEPS = "libtirpc" diff --git a/lfs/tor b/lfs/tor index 4cecf2399..a00ff2596 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 16 +PAK_VER = 17 DEPS = "" From 2493a758239e07c9af39510c0745ad9bf38aa688 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 6 Aug 2016 12:21:42 +0200 Subject: [PATCH 2/3] set version to core104 Signed-off-by: Arne Fitzenreiter --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index fdda3e5da..ff12307fb 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number CORE="104" # Core Level (Filename) -PAKFIRE_CORE="103" # Core Level (PAKFIRE) +PAKFIRE_CORE="104" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir From 40607f812638f5abd7b4b2313e7e6c1e61502f33 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 7 Aug 2016 17:08:44 +0200 Subject: [PATCH 3/3] core104: revert adding customservices. simply adding may use id's twice if the user has added other services so we don't update this files. Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/104/update.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh index 3988a9dab..0223923d2 100644 --- a/config/rootfiles/core/104/update.sh +++ b/config/rootfiles/core/104/update.sh @@ -139,11 +139,6 @@ esac # Extract files tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / -# Update customservices -cp /var/ipfire/fwhosts/customservices /var/ipfire/fwhosts/customservices.old -echo 35,Submission (TCP),587,TCP,BLANK,0 >> /var/ipfire/fwhosts/customservices -echo 36,SSMTP,465,TCP,BLANK,0 >> /var/ipfire/fwhosts/customservices - # Remove some old files rm -f /bin/groups /lib/libshadow.so.0*