[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5b94fc7c11e0584a5f6ca5a333a921b6b9fa7a23
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 3.x development tree".
The branch, master has been updated via 5b94fc7c11e0584a5f6ca5a333a921b6b9fa7a23 (commit) via d8280960a6da2bffffe5245d91d565b7d815bcb4 (commit) via 73931d3232e98adc6d4c21b758a0350abe036f36 (commit) via cce7cdfec694199f26e051013817e2e0d5495ada (commit) via 6a949b44ef276f3cfc2bea191a692569143b69bb (commit) via 08ef79ebef0a02bdbdde9f4060e148e72e94d86f (commit) from ff3197e609a51d0e493c649f26a2b64f0083fc94 (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 5b94fc7c11e0584a5f6ca5a333a921b6b9fa7a23 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 14 13:59:18 2023 +0000
doxygen: Update to 1.9.6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d8280960a6da2bffffe5245d91d565b7d815bcb4 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 14 00:08:51 2023 +0000
help2man: Update to 1.49.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 73931d3232e98adc6d4c21b758a0350abe036f36 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 14 00:01:26 2023 +0000
netplug: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cce7cdfec694199f26e051013817e2e0d5495ada Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 13 23:42:57 2023 +0000
open-vm-tools: Drop package
We don't need this.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6a949b44ef276f3cfc2bea191a692569143b69bb Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 13 23:41:33 2023 +0000
lsof: Update to 4.98.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 08ef79ebef0a02bdbdde9f4060e148e72e94d86f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 13 23:35:33 2023 +0000
fuse: Update to 3.13.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doxygen/doxygen.nm | 26 ++- doxygen/patches/doxygen-1.4.8-endless-loop.patch | 27 --- ...ygen-1.8.1.1-html_timestamp_default_false.patch | 12 -- doxygen/patches/doxygen-1.8.3-multilib.patch | 43 ----- doxygen/patches/doxygen-1.8.4-config.patch | 95 ---------- fuse/fuse.nm | 31 ++-- .../fuse-2.9.2-namespace-conflict-fix.patch | 21 --- help2man/help2man.nm | 6 +- lsof/lsof.nm | 23 +-- netplug/netplug.nm | 47 ----- netplug/patches/netplug-1.2.9.1-execshield.patch | 203 --------------------- netplug/systemd/netplug.service | 8 - open-vm-tools/open-vm-tools.nm | 56 ------ 13 files changed, 41 insertions(+), 557 deletions(-) delete mode 100644 doxygen/patches/doxygen-1.4.8-endless-loop.patch delete mode 100644 doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch delete mode 100644 doxygen/patches/doxygen-1.8.3-multilib.patch delete mode 100644 doxygen/patches/doxygen-1.8.4-config.patch delete mode 100644 fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch delete mode 100644 netplug/netplug.nm delete mode 100644 netplug/patches/netplug-1.2.9.1-execshield.patch delete mode 100644 netplug/systemd/netplug.service delete mode 100644 open-vm-tools/open-vm-tools.nm
Difference in files: diff --git a/doxygen/doxygen.nm b/doxygen/doxygen.nm index 19ba1b285..4e21e115a 100644 --- a/doxygen/doxygen.nm +++ b/doxygen/doxygen.nm @@ -4,37 +4,35 @@ ###############################################################################
name = doxygen -version = 1.8.4 -release = 2 +version = 1.9.6 +release = 1
groups = Development/Tools -url = http://www.stack.nl/~dimitri/doxygen/index.html +url = https://www.doxygen.nl license = GPL+ -summary = A documentation system for C/C++. +summary = A documentation system for C/C++
description Doxygen can generate an online class browser (in HTML) and/or a reference manual (in LaTeX) from a set of documented source files. end
-source_dl = ftp://ftp.stack.nl/pub/users/dimitri/ -sources = %{name}-%{version}.src.tar.gz +source_dl = https://www.doxygen.nl/files/ +sources = %{name}-%{version}.src.tar.gz
build requires - /usr/bin/perl bison + cmake flex + perl end
- # Not autoconf-based, so we cannot use our default configure macro. - configure_options = \ - --prefix %{prefix} \ - --shared \ - --release + build + %{cmake} .
- # Use our CFLAGS and LDFLAGS - make_build_targets += CFLAGS="%{CFLAGS}" LFLAGS="%{LDFLAGS}" + make %{PARALLELISMFLAGS} + end end
packages diff --git a/doxygen/patches/doxygen-1.4.8-endless-loop.patch b/doxygen/patches/doxygen-1.4.8-endless-loop.patch deleted file mode 100644 index a62428b94..000000000 --- a/doxygen/patches/doxygen-1.4.8-endless-loop.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 5e056236c9ef3b3675d014cab43480700027d60b -Author: Dimitri van Heesch dimitri@stack.nl -Date: Thu May 30 20:01:15 2013 +0200 - - Bug 701295 - Doxygen 1.8.4 goes into an endless loop - -diff --git a/src/util.cpp b/src/util.cpp -index 0d70d43..0c36fc0 100644 ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name) - ++templateDepth; - pos=nextOpenPos-1; - } -- else -+ else if (nextClosePos!=-1) - { - --templateDepth; - pos=nextClosePos-1; - } -+ else // more >'s than <'s, see bug701295 -+ { -+ return -1; -+ } - } - else - { diff --git a/doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch b/doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch deleted file mode 100644 index 9c01fec66..000000000 --- a/doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up doxygen-1.8.1.1/src/configoptions.cpp.html_timestamp_off.patch doxygen-1.8.1.1/src/configoptions.cpp ---- doxygen-1.8.1.1/src/configoptions.cpp.html_timestamp_off.patch 2012-06-09 06:41:04.000000000 -0500 -+++ doxygen-1.8.1.1/src/configoptions.cpp 2012-06-13 13:31:15.291500215 -0500 -@@ -1270,7 +1270,7 @@ void addConfigOptions(Config *cfg) - "If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML\n" - "page will contain the date and time when the page was generated. Setting\n" - "this to NO can help when comparing the output of multiple runs.", -- TRUE -+ FALSE - ); - cb->addDependency("GENERATE_HTML"); - //---- diff --git a/doxygen/patches/doxygen-1.8.3-multilib.patch b/doxygen/patches/doxygen-1.8.3-multilib.patch deleted file mode 100644 index 7cb1c9255..000000000 --- a/doxygen/patches/doxygen-1.8.3-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up doxygen-1.8.3/src/htmlgen.cpp.multilib doxygen-1.8.3/src/htmlgen.cpp ---- doxygen-1.8.3/src/htmlgen.cpp.multilib 2012-12-25 11:27:52.000000000 +0100 -+++ doxygen-1.8.3/src/htmlgen.cpp 2013-01-02 17:08:57.559028518 +0100 -@@ -125,6 +125,17 @@ static unsigned char tab_b_png[36] = - 205, 207, 209, 211, 213, 217, 219, 206, 188 - }; - -+static unsigned char nav_g_png[95] = { -+0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -+0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, -+0x08, 0x06, 0x00, 0x00, 0x00, 0x02, 0x10, 0xf4, 0x31, 0x00, 0x00, 0x00, -+0x26, 0x49, 0x44, 0x41, 0x54, 0x78, 0x01, 0xed, 0xdd, 0x31, 0x0d, 0x00, -+0x00, 0x08, 0x03, 0xc1, 0x4f, 0x48, 0x17, 0x66, 0x84, 0xe1, 0x5f, 0x0d, -+0x2d, 0x3e, 0x7e, 0xb8, 0xe5, 0x4d, 0x20, 0x69, 0xcb, 0x4d, 0xe8, 0xc0, -+0x83, 0x07, 0x07, 0x0f, 0x53, 0x00, 0xbd, 0xfc, 0x82, 0x3c, 0x05, 0x00, -+0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -+}; -+ - // hovering tab background luma - static unsigned char tab_h_png[36] = - { -@@ -824,6 +835,7 @@ static ColoredImgDataItem colored_tab_da - { "tab_s.png", 1, 36, tab_s_png, 0 }, - { "nav_h.png", 1, 12, header_png, 0 }, - { "nav_f.png", 1, 56, func_header_png, 0 }, -+ { "nav_g.png", 1, 6, nav_g_png, 0 }, - { "bc_s.png", 8, 30, bc_s_png, bc_s_a_png }, - { "doxygen.png", 104,31, doxygen_png, doxygen_a_png }, - { "closed.png", 9, 9, closed_png, closed_a_png }, -@@ -1502,13 +1514,6 @@ void HtmlGenerator::writeTabData() - Doxygen::indexList->addStyleSheetFile("tabs.css"); - QCString dname=Config_getString("HTML_OUTPUT"); - writeColoredImgData(dname,colored_tab_data); -- -- { -- unsigned char shadow[6] = { 5, 5, 5, 5, 5, 5 }; -- unsigned char shadow_alpha[6] = { 80, 60, 40, 20, 10, 0 }; -- ColoredImage img(1,6,shadow,shadow_alpha,0,0,100); -- img.save(dname+"/nav_g.png"); -- } - } - - void HtmlGenerator::writeSearchData(const char *dir) diff --git a/doxygen/patches/doxygen-1.8.4-config.patch b/doxygen/patches/doxygen-1.8.4-config.patch deleted file mode 100644 index 5c789beff..000000000 --- a/doxygen/patches/doxygen-1.8.4-config.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/doxywizard/Makefile.in ---- doxygen-1.8.4/addon/doxywizard/Makefile.in.config 2013-01-05 16:35:52.000000000 +0100 -+++ doxygen-1.8.4/addon/doxywizard/Makefile.in 2013-05-21 12:22:49.689166894 +0200 -@@ -10,8 +10,6 @@ - # See the GNU General Public License for more details. - # - --QMAKE=qmake $(MKSPECS) -- - all: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard - -@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard - $(RM) Makefile.doxywizard - - install: -- $(INSTTOOL) -d $(INSTALL)/bin -- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin -- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) -+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin -+ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin -+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR) - cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 -- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 -+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1 - rm doxywizard.1 - - FORCE: -diff -up doxygen-1.8.4/configure.config doxygen-1.8.4/configure ---- doxygen-1.8.4/configure.config 2013-05-19 12:05:39.000000000 +0200 -+++ doxygen-1.8.4/configure 2013-05-21 12:25:43.570743493 +0200 -@@ -296,9 +296,10 @@ if test "$f_wizard" = YES; then - if test -z "$QTDIR"; then - echo " QTDIR environment variable not set!" - printf " Checking for Qt..." -- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do -+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - if test -x "$d/bin/qmake"; then - QTDIR=$d -+ QMAKE=$d/bin/qmake - fi - done - else -@@ -606,6 +607,8 @@ INSTTOOL = $f_insttool - DOXYDOCS = .. - DOCDIR = $f_docdir - QTDIR = $QTDIR -+QMAKE = $QMAKE -+MAN1DIR = share/man/man1 - EOF - - if test "$f_dot" != NO; then -diff -up doxygen-1.8.4/Makefile.in.config doxygen-1.8.4/Makefile.in ---- doxygen-1.8.4/Makefile.in.config 2013-04-25 21:38:39.000000000 +0200 -+++ doxygen-1.8.4/Makefile.in 2013-05-21 12:22:49.689166894 +0200 -@@ -53,8 +53,6 @@ distclean: clean - - DATE=$(shell date "+%B %Y") - --MAN1DIR = man/man1 -- - install: doxywizard_install doxysearch_install - $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin - $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin -diff -up doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100 -+++ doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf 2013-05-21 12:22:49.689166894 +0200 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe - TMAKE_CFLAGS_WARN_ON = -Wall -W - TMAKE_CFLAGS_WARN_OFF = --TMAKE_CFLAGS_RELEASE = -O2 -+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS) - TMAKE_CFLAGS_DEBUG = -g - TMAKE_CFLAGS_SHLIB = -fPIC - TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC - - TMAKE_INCDIR = - TMAKE_LIBDIR = --TMAKE_INCDIR_X11 = /usr/X11R6/include --TMAKE_LIBDIR_X11 = /usr/X11R6/lib --TMAKE_INCDIR_QT = $(QTDIR)/include --TMAKE_LIBDIR_QT = $(QTDIR)/lib --TMAKE_INCDIR_OPENGL = /usr/X11R6/include --TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+TMAKE_INCDIR_X11 = -+TMAKE_LIBDIR_X11 = -+TMAKE_INCDIR_QT = -+TMAKE_LIBDIR_QT = -+TMAKE_INCDIR_OPENGL = -+TMAKE_LIBDIR_OPENGL = - - TMAKE_LINK = g++ - TMAKE_LINK_SHLIB = g++ diff --git a/fuse/fuse.nm b/fuse/fuse.nm index 37dbd2031..2482e1c7f 100644 --- a/fuse/fuse.nm +++ b/fuse/fuse.nm @@ -4,13 +4,14 @@ ###############################################################################
name = fuse -version = 2.9.7 -release = 2 +version = 3.13.1 +release = 1
groups = System/Filesystems -url = http://fuse.sf.net/ +url = https://github.com/libfuse/libfuse license = GPL+ -summary = File System in Userspace (FUSE) utilities. +summary = File System in Userspace (FUSE) utilities +
description With FUSE it is possible to implement a fully functional @@ -19,18 +20,24 @@ description end
source_dl = https://github.com/libfuse/libfuse/releases/download/%%7Bthisapp%7D/ +sources = %{thisapp}.tar.xz
build - configure_options += \ - --disable-static \ - --disable-rpath + requires + meson + ninja + systemd-devel + end
- install_cmds - # Remove old sysvinit directory. - rm -vrf %{BUILDROOT}/etc/init.d + build + %{meson} \ + -Dinitscriptdir= \ + -Duseroot=false + %{meson_build} + end
- # Remove /dev/fuse which cannot be packaged. - rm -rvf %{BUILDROOT}/dev + install + %{meson_install} end end
diff --git a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch deleted file mode 100644 index ae67e7d45..000000000 --- a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h ---- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400 -+++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400 -@@ -88,12 +88,16 @@ - #ifndef _LINUX_FUSE_H - #define _LINUX_FUSE_H - --#include <sys/types.h> -+#ifdef __linux__ -+#include <linux/types.h> -+#else -+#include <stdint.h> - #define __u64 uint64_t - #define __s64 int64_t - #define __u32 uint32_t - #define __s32 int32_t - #define __u16 uint16_t -+#endif - - /* - * Version negotiation: diff --git a/help2man/help2man.nm b/help2man/help2man.nm index 1bb5cd25f..7462bf4b7 100644 --- a/help2man/help2man.nm +++ b/help2man/help2man.nm @@ -4,12 +4,12 @@ ###############################################################################
name = help2man -version = 1.47.3 +version = 1.49.3 release = 1 arch = noarch
groups = Development/Tools -url = http://www.gnu.org/software/help2man +url = https://www.gnu.org/software/help2man license = GPLv3+ summary = Create simple man pages from --help output.
@@ -22,7 +22,7 @@ description still providing some useful information. end
-source_dl = ftp://ftp.gnu.org/gnu/%{name}/ +source_dl = https://ftp.gnu.org/gnu/help2man/ sources = %{thisapp}.tar.xz
build diff --git a/lsof/lsof.nm b/lsof/lsof.nm index 6ee976494..0963f42ad 100644 --- a/lsof/lsof.nm +++ b/lsof/lsof.nm @@ -4,13 +4,13 @@ ###############################################################################
name = lsof -version = 4.89 +version = 4.98.0 release = 1
groups = Development/Debuggers -url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ +url = https://github.com/lsof-org/lsof license = zlib -summary = A utility which lists open files on a Linux/UNIX system. +summary = A utility which lists open files on a Linux/UNIX system
description Lsof stands for LiSt Open Files, and it does just that: @@ -18,21 +18,12 @@ description processes running on a system. end
-thisapp = %{name}_%{version}_src +source_dl = https://github.com/lsof-org/lsof/releases/download/%%7Bversion%7D/
build - export LSOF_CFGL = %{CFLAGS} %{LDFLAGS} - - build - ./Configure -n linux - make %{PARALLELISMFLAGS} - end - - install - mkdir -pv %{BUILDROOT}%{sbindir} - install -m 755 lsof %{BUILDROOT}%{sbindir} - mkdir -pv %{BUILDROOT}%{mandir}/man8 - cp -vf lsof.8 %{BUILDROOT}%{mandir}/man8 + requires + groff + libtirpc-devel end end
diff --git a/netplug/netplug.nm b/netplug/netplug.nm deleted file mode 100644 index 8c76e0a13..000000000 --- a/netplug/netplug.nm +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = netplug -version = 1.2.9.1 -release = 1 - -groups = Networking/Tools -url = http://www.red-bean.com/~bos/ -license = GPLv2 -summary = A daemon that manages network interfaces in response to \ - network cables being plugged in and out. - -description - Netplug is a Linux daemon that manages network interfaces in response - to network cables being plugged in and out. If you're familiar with - Windows XP, which just does the Right Thing when you plug an ethernet - cable into a laptop, netplug will need no further explanation. -end - -source_dl = -sources = %{thisapp}.tar.bz2 - -build - prepare_cmds - # Remove debugging flags from CFLAGS. - sed -i Makefile -e "s/-ggdb3 -O3//g" - end - - build - make CC="gcc" - end - - install_cmds - rm -rfv %{BUILDROOT}/etc/rc.d - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/netplug/patches/netplug-1.2.9.1-execshield.patch b/netplug/patches/netplug-1.2.9.1-execshield.patch deleted file mode 100644 index b9809f110..000000000 --- a/netplug/patches/netplug-1.2.9.1-execshield.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -up netplug-1.2.9.1/if_info.c.execshield netplug-1.2.9.1/if_info.c ---- netplug-1.2.9.1/if_info.c.execshield 2008-12-23 00:36:23.000000000 +0100 -+++ netplug-1.2.9.1/if_info.c 2009-09-09 10:02:12.000000000 +0200 -@@ -95,15 +95,16 @@ flags_str(char *buf, unsigned int fl) - return buf; - } - --void --for_each_iface(int (*func)(struct if_info *)) -+struct if_info * -+for_each_iface(int (*func)(struct if_info *, long), long param) - { - for(int i = 0; i < INFOHASHSZ; i++) { - for(struct if_info *info = if_info[i]; info != NULL; info = info->next) { -- if ((*func)(info)) -- return; -+ if ((*func)(info, param)) -+ return info; - } - } -+ return NULL; - } - - /* Reevaluate the state machine based on the current state and flag settings */ -@@ -285,22 +286,20 @@ ifsm_flagchange(struct if_info *info, un - } - - /* handle a script termination and update the state accordingly */ -+int find_pid(struct if_info *i, long param) { -+ if (i->worker == param) { -+ return 1; -+ } -+ return 0; -+} -+ - void ifsm_scriptdone(pid_t pid, int exitstatus) - { - int exitok = WIFEXITED(exitstatus) && WEXITSTATUS(exitstatus) == 0; - struct if_info *info; - assert(WIFEXITED(exitstatus) || WIFSIGNALED(exitstatus)); - -- int find_pid(struct if_info *i) { -- if (i->worker == pid) { -- info = i; -- return 1; -- } -- return 0; -- } -- -- info = NULL; -- for_each_iface(find_pid); -+ info = for_each_iface(find_pid, pid); - - if (info == NULL) { - do_log(LOG_INFO, "Unexpected child %d exited with status %d", -diff -up netplug-1.2.9.1/main.c.execshield netplug-1.2.9.1/main.c ---- netplug-1.2.9.1/main.c.execshield 2008-12-23 00:36:23.000000000 +0100 -+++ netplug-1.2.9.1/main.c 2009-09-09 10:02:12.000000000 +0200 -@@ -161,11 +161,28 @@ child_handler(int sig, siginfo_t *info, - ce.pid = info->si_pid; - ret = waitpid(info->si_pid, &ce.status, 0); - if (ret == info->si_pid) -- write(child_handler_pipe[1], &ce, sizeof(ce)); -+ (void)write(child_handler_pipe[1], &ce, sizeof(ce)); - } - - /* Poll the existing interface state, so we can catch any state - changes for which we may not have neen a netlink message. */ -+static int pollflags(struct if_info *info, long param) { -+ struct ifreq ifr; -+ -+ if (!if_match(info->name)) -+ return 0; -+ -+ memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name)); -+ if (ioctl(param, SIOCGIFFLAGS, &ifr) < 0) -+ do_log(LOG_ERR, "%s: can't get flags: %m", info->name); -+ else { -+ ifsm_flagchange(info, ifr.ifr_flags); -+ ifsm_flagpoll(info); -+ } -+ -+ return 0; -+} -+ - static void - poll_interfaces(void) - { -@@ -180,24 +197,13 @@ poll_interfaces(void) - close_on_exec(sockfd); - } - -- int pollflags(struct if_info *info) { -- struct ifreq ifr; -- -- if (!if_match(info->name)) -- return 0; -- -- memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name)); -- if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) -- do_log(LOG_ERR, "%s: can't get flags: %m", info->name); -- else { -- ifsm_flagchange(info, ifr.ifr_flags); -- ifsm_flagpoll(info); -- } -- -- return 0; -- } -+ for_each_iface(pollflags, sockfd); -+} - -- for_each_iface(pollflags); -+static int poll_flags(struct if_info *i, long param) { -+ if (if_match(i->name)) -+ ifsm_flagpoll(i); -+ return 0; - } - - int debug = 0; -@@ -331,17 +337,11 @@ main(int argc, char *argv[]) - { child_handler_pipe[0], POLLIN, 0 }, - }; - -- { -- /* Run over each of the interfaces we know and care about, and -- make sure the state machine has done the appropriate thing -- for their current state. */ -- int poll_flags(struct if_info *i) { -- if (if_match(i->name)) -- ifsm_flagpoll(i); -- return 0; -- } -- for_each_iface(poll_flags); -- } -+ /* Run over each of the interfaces we know and care about, and -+ make sure the state machine has done the appropriate thing -+ for their current state. */ -+ for_each_iface(poll_flags, 0); -+ - - for(;;) { - int ret; -diff -up netplug-1.2.9.1/Makefile.execshield netplug-1.2.9.1/Makefile ---- netplug-1.2.9.1/Makefile.execshield 2008-12-23 00:41:38.000000000 +0100 -+++ netplug-1.2.9.1/Makefile 2009-09-09 10:02:12.000000000 +0200 -@@ -4,15 +4,15 @@ DESTDIR ?= - - prefix ?= - bindir ?= $(prefix)/sbin --etcdir ?= $(prefix)/etc/netplug -+etcdir ?= $(prefix)/etc/netplug.d - initdir ?= $(prefix)/etc/rc.d/init.d - scriptdir ?= $(prefix)/etc/netplug.d - mandir ?= $(prefix)/usr/share/man - - install_opts := - --CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \ -- -DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"' -+CFLAGS += -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \ -+ -DNP_SCRIPT_DIR='"$(scriptdir)"' -DNP_VERSION='"$(version)"' - - netplugd: config.o netlink.o lib.o if_info.o main.o - $(CC) $(LDFLAGS) -o $@ $^ -@@ -30,10 +30,12 @@ install: - install $(install_opts) -m 755 scripts/rc.netplugd $(DESTDIR)/$(initdir)/netplugd - install $(install_opts) -m 444 man/man8/netplugd.8 $(DESTDIR)/$(mandir)/man8 - --hg_root := $(shell hg root) -+#hg_root := $(shell hg root) -+hg_root := $(shell) - tar_root := netplug-$(version) - tar_file := $(hg_root)/$(tar_root).tar.bz2 --files := $(shell hg manifest) -+#files := $(shell hg manifest) -+files := $(shell) - - tarball: $(tar_file) - -diff -up netplug-1.2.9.1/man/man8/netplugd.8.execshield netplug-1.2.9.1/man/man8/netplugd.8 ---- netplug-1.2.9.1/man/man8/netplugd.8.execshield 2008-12-23 00:36:23.000000000 +0100 -+++ netplug-1.2.9.1/man/man8/netplugd.8 2009-09-09 10:07:33.000000000 +0200 -@@ -134,7 +134,7 @@ to run in the foreground, this option is - ." - .Sh FILES - .Bl -tag -width Ds --.It Pa /etc/netplug/netplugd.conf -+.It Pa /etc/netplug.d/netplugd.conf - Default config file to read, if none is specified on the command line. - The config file format is one pattern per line, with white space, - empty lines, and comments starting with a -diff -up netplug-1.2.9.1/netplug.h.execshield netplug-1.2.9.1/netplug.h ---- netplug-1.2.9.1/netplug.h.execshield 2008-12-23 00:36:23.000000000 +0100 -+++ netplug-1.2.9.1/netplug.h 2009-09-09 10:02:12.000000000 +0200 -@@ -83,7 +83,7 @@ struct if_info *if_info_update_interface - struct rtattr *attrs[]); - int if_info_save_interface(struct nlmsghdr *hdr, void *arg); - void parse_rtattrs(struct rtattr *tb[], int max, struct rtattr *rta, int len); --void for_each_iface(int (*func)(struct if_info *)); -+struct if_info *for_each_iface(int (*func)(struct if_info *, long), long param); - - void ifsm_flagpoll(struct if_info *info); - void ifsm_flagchange(struct if_info *info, unsigned int newflags); diff --git a/netplug/systemd/netplug.service b/netplug/systemd/netplug.service deleted file mode 100644 index ad3e6b5cb..000000000 --- a/netplug/systemd/netplug.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=netplug Daemon - -[Service] -ExecStart=/sbin/netplugd -F - -[Install] -WantedBy=multi-user.target diff --git a/open-vm-tools/open-vm-tools.nm b/open-vm-tools/open-vm-tools.nm deleted file mode 100644 index 644452eeb..000000000 --- a/open-vm-tools/open-vm-tools.nm +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = open-vm-tools -version = 2011.09.23-491607 -release = 2 -sup_arches = x86_64 i686 - -groups = Virtualization/Applications -url = http://open-vm-tools.sourceforge.net/ -license = GPLv2 -summary = Open source implementation of VMware Tools. - -description - The open Virtual Machine Tools (open-vm-tools) are the open \ - source implementation of VMware Tools. They are a set of guest \ - operation system virtualization components that enhance \ - performance and user experience of virtual machines. -end - -source_dl = http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/2011.09.23... - -build - requires - glib2-devel - end - - configure_options += \ - --sysconfdir=/etc \ - --without-kernel-modules \ - --without-x \ - --without-procps \ - --without-dnet \ - --without-icu \ - --without-pam \ - - prepare_cmds - sed -e "s/-Werror//g" -i configure - end - - install_cmds - rm -vf %{BUILDROOT}/sbin/mount.vmhgfs - rm -vf %{BUILDROOT}/usr/sbin/mount.vmhgfs - end - -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer