* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c52cffd5cfbf2e4a8fdddf3ab13b74f0e4659413
@ 2021-05-11 16:58 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-05-11 16:58 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 31319 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 c52cffd5cfbf2e4a8fdddf3ab13b74f0e4659413 (commit)
via 7300386babf8304c28ac5937a95f39555e647226 (commit)
via 33db882f4947f3ee2cca390a24f32014483674b8 (commit)
from aef8d2a708c0bc14728bf9405ab724114b614b95 (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 c52cffd5cfbf2e4a8fdddf3ab13b74f0e4659413
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Mar 27 22:14:50 2021 +0100
libcdada: New addon - dependency for pmacct
- This package is required for its library which is a dependency for pmacct
- url for developer is https://msune.github.io/libcdada/
- No change for this patch compared to the V1 version
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7300386babf8304c28ac5937a95f39555e647226
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Mar 27 22:14:49 2021 +0100
pmacct: New addon
- What is it?
pmacct is a monitoring tool for network management tasks. Data collected
can be used for analysis and troubleshooting purposes to maintain the
health of the network. pmacct can collect, replicate and export network
information. It can cache in memory tables, store persistently to SQLite3
and output to flat-files like CSV, formatted, and JSON.
- Why is it needed?
To monitor data usage (IP-based or MAC-based data accounting) down to the
client level. Net-Traffic will monitor traffic for the entire RED, GREEN,
etc. networks, but it cannot pinpoint which client is using lots of data.
Connections will take a snapshot but not show day by day sums. pmacct can
help admins keep tabs on users that use too much data.
- What are the use cases?
An ISP may implement data caps and if the limit is over-run then you have
to pay for every additional xxGB of data used. Typical charges can be
around $10 per 50GB. With pmacct you can identify the high users and take
action, hopefully before the limit is breached.
- This is being introduced as a command line only tool. However, at a later
date, if it is useful to enough additional users a WUI page could be
developed as discussed in the development mailing list
https://lists.ipfire.org/pipermail/development/2021-January/009174.html
- Changes in V2 version
- Initscript is using IPFire template and installed with IPFire method.
- All other daemons except pmacct and pmacctd have been removed from the install.
- Example conf files have been removed from /etc/pmacct
Both example conf files are described in the pmacct wiki draft.
Tested-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33db882f4947f3ee2cca390a24f32014483674b8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 11 16:39:44 2021 +0000
dnsdist: Update to 1.6.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/pmacct | 2 +
config/pmacct/pmacct.conf | 24 +++++
config/rootfiles/packages/libcdada | 28 ++++++
config/rootfiles/packages/pmacct | 109 +++++++++++++++++++++
lfs/dnsdist | 6 +-
lfs/{taglib => libcdada} | 28 +++---
lfs/{bacula => pmacct} | 46 ++++-----
make.sh | 2 +
src/initscripts/packages/pmacct | 33 +++++++
src/paks/{asterisk => pmacct}/install.sh | 9 ++
src/paks/{amazon-ssm-agent => pmacct}/uninstall.sh | 7 +-
src/paks/{bacula => pmacct}/update.sh | 0
...ared-library-for-tests-and-examples-build.patch | 56 +++++++++++
13 files changed, 305 insertions(+), 45 deletions(-)
create mode 100644 config/backup/includes/pmacct
create mode 100644 config/pmacct/pmacct.conf
create mode 100644 config/rootfiles/packages/libcdada
create mode 100644 config/rootfiles/packages/pmacct
copy lfs/{taglib => libcdada} (86%)
copy lfs/{bacula => pmacct} (79%)
create mode 100644 src/initscripts/packages/pmacct
copy src/paks/{asterisk => pmacct}/install.sh (89%)
mode change 100644 => 100755
copy src/paks/{amazon-ssm-agent => pmacct}/uninstall.sh (96%)
mode change 100644 => 100755
copy src/paks/{bacula => pmacct}/update.sh (100%)
create mode 100644 src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
Difference in files:
diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct
new file mode 100644
index 000000000..4359067ad
--- /dev/null
+++ b/config/backup/includes/pmacct
@@ -0,0 +1,2 @@
+/etc/pmacct/
+/var/spool/pmacct/
diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf
new file mode 100644
index 000000000..3c1d47efa
--- /dev/null
+++ b/config/pmacct/pmacct.conf
@@ -0,0 +1,24 @@
+!
+! Pmacctd configuration file for IPFire environment
+!
+
+syslog: daemon
+daemonize: true
+debug: false
+promisc: true
+interface: green0
+
+
+!
+! "plugin1" plugin configuration
+!
+plugins: memory[plugin1]
+
+plugin_buffer_size[plugin1]: 102400
+plugin_pipe_size[plugin1]: 10240000
+
+imt_mem_pools_number: 256
+imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe
+
+aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto
+aggregate_filter[plugin1]: ip
\ No newline at end of file
diff --git a/config/rootfiles/packages/libcdada b/config/rootfiles/packages/libcdada
new file mode 100644
index 000000000..b3b1b99b1
--- /dev/null
+++ b/config/rootfiles/packages/libcdada
@@ -0,0 +1,28 @@
+#usr/bin/cdada-gen
+#usr/include/cdada
+#usr/include/cdada.h
+#usr/include/cdada/__common_internal.h
+#usr/include/cdada/__list_internal.h
+#usr/include/cdada/__map_internal.h
+#usr/include/cdada/__queue_internal.h
+#usr/include/cdada/__set_internal.h
+#usr/include/cdada/__stack_internal.h
+#usr/include/cdada/bbitmap.h
+#usr/include/cdada/list.h
+#usr/include/cdada/list_custom_cc.h
+#usr/include/cdada/map.h
+#usr/include/cdada/map_custom_cc.h
+#usr/include/cdada/queue.h
+#usr/include/cdada/queue_custom_cc.h
+#usr/include/cdada/set.h
+#usr/include/cdada/set_custom_cc.h
+#usr/include/cdada/stack.h
+#usr/include/cdada/stack_custom_cc.h
+#usr/include/cdada/str.h
+#usr/include/cdada/utils.h
+#usr/include/cdada/version.h
+#usr/lib/libcdada.a
+#usr/lib/libcdada.la
+#usr/lib/libcdada.so
+usr/lib/libcdada.so.0
+usr/lib/libcdada.so.0.0.0
diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct
new file mode 100644
index 000000000..e73a9b8a7
--- /dev/null
+++ b/config/rootfiles/packages/pmacct
@@ -0,0 +1,109 @@
+etc/pmacct
+etc/pmacct/pmacct.conf
+etc/rc.d/init.d/pmacct
+usr/bin/pmacct
+#usr/lib/pmacct
+#usr/lib/pmacct/examples
+#usr/lib/pmacct/examples/custom
+#usr/lib/pmacct/examples/custom/libcustom.la
+#usr/lib/pmacct/examples/lg
+#usr/lib/pmacct/examples/lg/pmbgp
+#usr/sbin/nfacctd
+usr/sbin/pmacctd
+#usr/sbin/pmbgpd
+#usr/sbin/pmbmpd
+#usr/sbin/pmtelemetryd
+#usr/sbin/sfacctd
+#usr/share/pmacct
+#usr/share/pmacct/CONFIG-KEYS
+#usr/share/pmacct/FAQS
+#usr/share/pmacct/QUICKSTART
+#usr/share/pmacct/UPGRADE
+#usr/share/pmacct/docs
+#usr/share/pmacct/docs/IPFIX
+#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT
+#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS
+#usr/share/pmacct/docs/SIGNALS
+#usr/share/pmacct/docs/TRIGGER_VARS
+#usr/share/pmacct/examples
+usr/share/pmacct/examples/allow.lst.example
+#usr/share/pmacct/examples/amqp
+usr/share/pmacct/examples/amqp/amqp_receiver.py
+#usr/share/pmacct/examples/avro
+usr/share/pmacct/examples/avro/avro_file_decoder.py
+usr/share/pmacct/examples/bgp_agent.map.example
+usr/share/pmacct/examples/bgp_md5.lst.example
+usr/share/pmacct/examples/bgp_xconnects.map.example
+usr/share/pmacct/examples/flow_to_rd.map.example
+#usr/share/pmacct/examples/kafka
+usr/share/pmacct/examples/kafka/kafka_consumer.py
+#usr/share/pmacct/examples/lg
+usr/share/pmacct/examples/lg/pmbgp.py
+usr/share/pmacct/examples/networks.lst.example
+usr/share/pmacct/examples/nfacctd-sql.conf.example
+usr/share/pmacct/examples/pcap_interfaces.map.example
+usr/share/pmacct/examples/peers.map.example
+usr/share/pmacct/examples/pmacctd-imt.conf.example
+usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example
+usr/share/pmacct/examples/pmacctd-sql.conf.example
+usr/share/pmacct/examples/pmacctd-sqlite3.conf.example
+usr/share/pmacct/examples/ports.lst.example
+usr/share/pmacct/examples/pretag.map.example
+usr/share/pmacct/examples/primitives.lst.example
+usr/share/pmacct/examples/probe_netflow.conf.example
+usr/share/pmacct/examples/probe_sflow.conf.example
+usr/share/pmacct/examples/sampling.map.example
+usr/share/pmacct/examples/tee_receivers.lst.example
+#usr/share/pmacct/sql
+#usr/share/pmacct/sql/README.64bit
+#usr/share/pmacct/sql/README.GeoIP
+#usr/share/pmacct/sql/README.IPv6
+#usr/share/pmacct/sql/README.cos
+#usr/share/pmacct/sql/README.custom_primitives
+#usr/share/pmacct/sql/README.etype
+#usr/share/pmacct/sql/README.export_proto
+#usr/share/pmacct/sql/README.iface
+#usr/share/pmacct/sql/README.label
+#usr/share/pmacct/sql/README.mask
+#usr/share/pmacct/sql/README.mpls
+#usr/share/pmacct/sql/README.mysql
+#usr/share/pmacct/sql/README.nat
+#usr/share/pmacct/sql/README.pgsql
+#usr/share/pmacct/sql/README.sampling
+usr/share/pmacct/sql/README.sqlite3
+#usr/share/pmacct/sql/README.tag2
+#usr/share/pmacct/sql/README.timestamp
+#usr/share/pmacct/sql/README.tunnel
+#usr/share/pmacct/sql/pmacct-create-db.pgsql
+#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v1.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v2.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v3.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v4.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v5.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v6.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v7.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v8.mysql
+#usr/share/pmacct/sql/pmacct-create-db_v9.mysql
+#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql
+usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3
+usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3
+#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql
+usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3
+#usr/share/pmacct/sql/pmacct-grant-db.mysql
+var/ipfire/backup/addons/includes/pmacct
+var/spool/pmacct
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 19261d680..aaebeec0d 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
include Config
-VER = 1.5.1
+VER = 1.6.0
THISAPP = dnsdist-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 i586
PROG = dnsdist
-PAK_VER = 7
+PAK_VER = 8
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0c52d34e4807abe6be3b03f8e2c1b700
+$(DL_FILE)_MD5 = c15a95b19c6d9f39d89dae6995173ab3
install : $(TARGET)
diff --git a/lfs/libcdada b/lfs/libcdada
new file mode 100644
index 000000000..7a7b208ef
--- /dev/null
+++ b/lfs/libcdada
@@ -0,0 +1,87 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2019 IPFire Team <info(a)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.3.4
+
+THISAPP = libcdada-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libcdada
+PAK_VER = 1
+
+DEPS =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f5067835014e02d221af9754df8b140b
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
+ cd $(DIR_APP) && ./autogen.sh
+ cd $(DIR_APP)/build && ../configure \
+ --prefix=/usr \
+ --disable-static
+ cd $(DIR_APP)/build && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/pmacct b/lfs/pmacct
new file mode 100644
index 000000000..30c6c47e1
--- /dev/null
+++ b/lfs/pmacct
@@ -0,0 +1,100 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2019 IPFire Team <info(a)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.7.6
+
+THISAPP = pmacct-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = pmacct
+PAK_VER = 1
+
+DEPS = libcdada
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./autogen.sh
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/pmacct \
+ --enable-sqlite3 \
+ --enable-l2 \
+ --enable-jansson
+ # Add directory for plugins and pipes
+ -mkdir -v /var/spool/pmacct
+ # Add configuration folder and copy conf file to it
+ -mkdir -v /etc/pmacct
+ cp -vf $(DIR_CONF)/pmacct/pmacct.conf /etc/pmacct
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,pmacct)
+ # Install backup definition
+ install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \
+ /var/ipfire/backup/addons/includes/pmacct
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 514f1e4ef..25616cc4e 100755
--- a/make.sh
+++ b/make.sh
@@ -1639,6 +1639,8 @@ buildipfire() {
lfsmake2 ncdu
lfsmake2 lshw
lfsmake2 socat
+ lfsmake2 libcdada
+ lfsmake2 pmacct
}
buildinstaller() {
diff --git a/src/initscripts/packages/pmacct b/src/initscripts/packages/pmacct
new file mode 100644
index 000000000..45d4c336a
--- /dev/null
+++ b/src/initscripts/packages/pmacct
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Begin $rc_base/init.d/pmacct
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case "$1" in
+ start)
+ boot_mesg "Starting the pmacctd daemon..."
+ loadproc /usr/sbin/pmacctd -f /etc/pmacct/pmacct.conf
+ ;;
+ stop)
+ boot_mesg "Stopping the pmacctd daemon..."
+ killproc /usr/sbin/pmacctd
+ ;;
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+ status)
+ statusproc /usr/sbin/pmacctd
+ ;;
+ *)
+ echo "Usage: $0 (start|stop|restart|status)"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/pmacct
+
diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh
new file mode 100755
index 000000000..11b16f6c1
--- /dev/null
+++ b/src/paks/pmacct/install.sh
@@ -0,0 +1,36 @@
+#!/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(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+restore_backup ${NAME}
+
+# Add symlinks for runlevels
+ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME}
+ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME}
+ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME}
+start_service ${NAME}
+
+
+# EOF
diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh
new file mode 100755
index 000000000..51631e8c1
--- /dev/null
+++ b/src/paks/pmacct/uninstall.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(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
+
+# Delete symlinks
+rm -rfv /etc/rc.d/rc?.d/???${NAME}
+
+# EOF
diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh
new file mode 100644
index 000000000..89c40d0d7
--- /dev/null
+++ b/src/paks/pmacct/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(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
diff --git a/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
new file mode 100644
index 000000000..adb06ad9d
--- /dev/null
+++ b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
@@ -0,0 +1,56 @@
+diff -ruN libcdada-0.3.4.orig/examples/Makefile.am libcdada-0.3.4/examples/Makefile.am
+--- libcdada-0.3.4.orig/examples/Makefile.am 2021-01-15 00:01:59.000000000 +0100
++++ libcdada-0.3.4/examples/Makefile.am 2021-02-28 15:41:13.940082099 +0100
+@@ -11,32 +11,32 @@
+
+ list_u32_SOURCES = list_u32.c
+ list_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-list_u32_LDADD = ../src/.libs/libcdada.a -lstdc++
++list_u32_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ map_struct_SOURCES = map_struct.c
+ map_struct_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-map_struct_LDADD = ../src/.libs/libcdada.a -lstdc++
++map_struct_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ custom_gen_SOURCES = custom-gen/my_program_gen.c custom-gen/cdada.cc
+ custom_gen_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-custom_gen_LDADD = ../src/.libs/libcdada.a -lstdc++
++custom_gen_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ custom_macro_SOURCES = custom-macro/my_program.c custom-macro/cdada.cc
+ custom_macro_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-custom_macro_LDADD = ../src/.libs/libcdada.a -lstdc++
++custom_macro_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ str_SOURCES = str.c
+ str_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-str_LDADD = ../src/.libs/libcdada.a -lstdc++
++str_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ bbitmap_SOURCES = bbitmap.c
+ bbitmap_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-bbitmap_LDADD = ../src/.libs/libcdada.a -lstdc++
++bbitmap_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ queue_u32_SOURCES = queue_u32.c
+ queue_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-queue_u32_LDADD = ../src/.libs/libcdada.a -lstdc++
++queue_u32_LDADD = ../src/.libs/libcdada.so -lstdc++
+
+ stack_u32_SOURCES = stack_u32.c
+ stack_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-stack_u32_LDADD = ../src/.libs/libcdada.a -lstdc++
++stack_u32_LDADD = ../src/.libs/libcdada.so -lstdc++
+diff -ruN libcdada-0.3.4.orig/test/Makefile.am libcdada-0.3.4/test/Makefile.am
+--- libcdada-0.3.4.orig/test/Makefile.am 2021-01-15 00:01:59.000000000 +0100
++++ libcdada-0.3.4/test/Makefile.am 2021-02-28 15:40:37.458117227 +0100
+@@ -63,7 +63,7 @@
+ benchmark_SOURCES= benchmark.cc
+ benchmark_CXXFLAGS= -O3
+ benchmark_CPPFLAGS= -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+-benchmark_LDADD= -lpthread ../src/.libs/libcdada.a
++benchmark_LDADD= -lpthread ../src/.libs/libcdada.so
+
+ #Valgrind
+ if VALGRIND_ENABLED
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-11 16:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-11 16:58 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c52cffd5cfbf2e4a8fdddf3ab13b74f0e4659413 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox