* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8fd9a68ee5d74b28e7861e43918824605fa5f31e
@ 2016-03-29 14:17 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-03-29 14:17 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6598 bytes --]
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 8fd9a68ee5d74b28e7861e43918824605fa5f31e (commit)
via ea1cffd50d30e0e85a5cf1ca437896f652f0e361 (commit)
via a365d9d04b47efd48b832f8bf86d223e2c0fe958 (commit)
via dcea7ef891e037c916d57bb33b34ea4f12ce7782 (commit)
from 046894ab7fbe281c24e460ac48841e8d5e9f5328 (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 8fd9a68ee5d74b28e7861e43918824605fa5f31e
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 17:13:38 2016 +0100
bump ebtables version number
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ea1cffd50d30e0e85a5cf1ca437896f652f0e361
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 11:13:16 2016 +0100
build ebtables with the new patch (nothing go into usr local)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a365d9d04b47efd48b832f8bf86d223e2c0fe958
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 11:13:15 2016 +0100
add a patch for ebtables (to fix the problem with usr local)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dcea7ef891e037c916d57bb33b34ea4f12ce7782
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 24 20:29:08 2016 +0100
nano: Update to 2.5.3
Contains several bugfixes and improvements, for details see:
http://www.nano-editor.org/dist/v2.5/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/ebtables | 9 ++++---
lfs/ebtables | 3 ++-
lfs/nano | 16 +++++++++----
...ables-should-install-nothing-in-usr-local.patch | 28 ++++++++++++++++++++++
4 files changed, 45 insertions(+), 11 deletions(-)
create mode 100644 src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
Difference in files:
diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
index 7e10eee..8eab1f6 100644
--- a/config/rootfiles/packages/ebtables
+++ b/config/rootfiles/packages/ebtables
@@ -23,8 +23,7 @@ usr/lib/libebtable_broute.so
usr/lib/libebtable_filter.so
usr/lib/libebtable_nat.so
usr/lib/libebtc.so
-#usr/local/man/man8
-#usr/local/man/man8/ebtables.8
-usr/local/sbin/ebtables
-usr/local/sbin/ebtables-restore
-usr/local/sbin/ebtables-save
+#usr/man/man8/ebtables.8
+usr/sbin/ebtables
+usr/sbin/ebtables-restore
+usr/sbin/ebtables-save
diff --git a/lfs/ebtables b/lfs/ebtables
index 0c55a21..0fe9731 100644
--- a/lfs/ebtables
+++ b/lfs/ebtables
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ebtables
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/nano b/lfs/nano
index 0d92c6b..70991d2 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 2.5.1
+VER = 2.5.3
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 8
+PAK_VER = 9
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f25c7da9813ae5f1df7e5dd1072de4ce
+$(DL_FILE)_MD5 = a04d77611422ab4b6a7b489650c7a793
install : $(TARGET)
@@ -77,8 +77,14 @@ $(subst %,%_MD5,$(objects)) :
$(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 --sysconfdir=/etc/nano \
- --enable-color --enable-multibuffer --enable-nanorc --disable-nls
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/nano \
+ --enable-color \
+ --enable-multibuffer \
+ --enable-nanorc \
+ --disable-nls
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m644 -D doc/nanorc.sample /etc/nano/nanorc.sample
diff --git a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
new file mode 100644
index 0000000..2cccb90
--- /dev/null
+++ b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
@@ -0,0 +1,28 @@
+From 373fb7d2d22fcf3328702e719793526e215822ca Mon Sep 17 00:00:00 2001
+From: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+Date: Thu, 24 Mar 2016 18:35:51 +0100
+Subject: [PATCH] ebtables should install nothing in usr local
+
+Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1106a4..b5f4447 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,8 +10,8 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/\(.*\)\/.*/\1/')/
+
+ # default paths
+ LIBDIR:=/usr/lib
+-MANDIR:=/usr/local/man
+-BINDIR:=/usr/local/sbin
++MANDIR:=/usr/man
++BINDIR:=/usr/sbin
+ ETCDIR:=/etc
+ INITDIR:=/etc/rc.d/init.d
+ SYSCONFIGDIR:=/etc/sysconfig
+--
+2.1.4
+
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-29 14:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-29 14:17 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8fd9a68ee5d74b28e7861e43918824605fa5f31e git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox