Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (1be6443c28e342cfb1ddaccb48091cc4db7a7c1c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (1be6443c28e342cfb1ddaccb48091cc4db7a7c1c)
  • Date: Tue, 4 Oct 2016 00:27:17 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
net/ferm/DEPENDS | 4 +++-
net/ferm/DETAILS | 3 ++-
net/ferm/HISTORY | 9 +++++++++
net/ferm/PRE_BUILD | 6 ++++++
net/ferm/ferm-2.3.tar.gz.sig |binary
net/ferm/no-systemd.patch | 15 +++++++++++++++
7 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit 1be6443c28e342cfb1ddaccb48091cc4db7a7c1c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ferm: optionally install systemd service

(cherry picked from commit ffec352439e7733f995fe3a8f2b7fdd0a2967e00)

commit 9112aa0d607a3b71ad5a776f2e441cda86eb7fdb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ferm: => 2.3

(cherry picked from commit de4858860d1f0c00d702eefd4b736b1101a0fe5d)

diff --git a/net/ferm/DEPENDS b/net/ferm/DEPENDS
index a47a141..cb35cd7 100755
--- a/net/ferm/DEPENDS
+++ b/net/ferm/DEPENDS
@@ -1,2 +1,4 @@
runtime_depends perl &&
-runtime_depends iptables
+runtime_depends iptables &&
+
+suggest_depends systemd "" "" "to install systemd service"
diff --git a/net/ferm/DETAILS b/net/ferm/DETAILS
index 067915e..a641757 100755
--- a/net/ferm/DETAILS
+++ b/net/ferm/DETAILS
@@ -1,5 +1,6 @@
SPELL=ferm
- VERSION=2.2
+ VERSION=2.3
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://ferm.foo-projects.org/download/${BRANCH}/$SOURCE
diff --git a/net/ferm/HISTORY b/net/ferm/HISTORY
index db30ed5..abc48f3 100644
--- a/net/ferm/HISTORY
+++ b/net/ferm/HISTORY
@@ -1,3 +1,12 @@
+2016-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * DEPENDS: added suggest dep -- systemd
+ * PRE_BUILD: added, to apply patch
+ * no-systemd.patch: added, to install the service file optionally
+
+2016-05-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.3
+
2013-07-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2

diff --git a/net/ferm/PRE_BUILD b/net/ferm/PRE_BUILD
new file mode 100755
index 0000000..5e84c74
--- /dev/null
+++ b/net/ferm/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if ! is_depends_enabled ${SPELL} systemd; then
+ patch -p0 < "${SPELL_DIRECTORY}/no-systemd.patch"
+fi
diff --git a/net/ferm/ferm-2.2.tar.gz.sig b/net/ferm/ferm-2.2.tar.gz.sig
deleted file mode 100644
index 02328b8..0000000
Binary files a/net/ferm/ferm-2.2.tar.gz.sig and /dev/null differ
diff --git a/net/ferm/ferm-2.3.tar.gz.sig b/net/ferm/ferm-2.3.tar.gz.sig
new file mode 100644
index 0000000..aff21b1
Binary files /dev/null and b/net/ferm/ferm-2.3.tar.gz.sig differ
diff --git a/net/ferm/no-systemd.patch b/net/ferm/no-systemd.patch
new file mode 100644
index 0000000..da12920
--- /dev/null
+++ b/net/ferm/no-systemd.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2016-03-30 08:16:02.000000000 -0400
++++ Makefile 2016-10-03 20:01:28.914713926 -0400
+@@ -137,11 +137,10 @@
+ .PHONY: install uninstall
+
+ install: all
+- install -d -m 755 $(DOCDIR)/examples $(PREFIX)/sbin $(SERVICEDIR)
++ install -d -m 755 $(DOCDIR)/examples $(PREFIX)/sbin
+ install -m 644 AUTHORS COPYING NEWS README TODO $(DOCDIR)
+ install -m 644 examples/*.ferm $(DOCDIR)/examples
+ install -m 755 src/ferm src/import-ferm $(PREFIX)/sbin/
+- install -m 644 ferm.service $(SERVICEDIR)
+
+ install -d -m 755 $(DOCDIR) $(MANDIR)
+ install -m 644 doc/ferm.txt doc/ferm.html $(DOCDIR)



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (1be6443c28e342cfb1ddaccb48091cc4db7a7c1c), Vlad Glagolev, 10/03/2016

Archive powered by MHonArc 2.6.24.

Top of Page