aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Castro <lucas@gnuabordo.com.br>2024-01-11 00:08:02 -0300
committerLucas de Castro Borges <lucas@gnuabordo.com.br>2024-06-05 13:23:31 -0300
commitcb543ae9d1347c32fa9ca44c18774fe5197f58f9 (patch)
tree83946af15c285fad346b8acde4e16ea2b2dc0045
parentee145648da8dff8f262b0dfc8b164349c113154b (diff)
Patches removed due upstream merged them
The patched previus applied during build process aren't required anymore Most of them was merged into upstream therefore removed from debian patches.
-rw-r--r--debian/patches/fix_misspell.patch29
-rw-r--r--debian/patches/hardening_improve.patch50
-rw-r--r--debian/patches/install_target.patch59
-rw-r--r--debian/patches/series4
-rw-r--r--debian/patches/source_relative_path.patch109
5 files changed, 0 insertions, 251 deletions
diff --git a/debian/patches/fix_misspell.patch b/debian/patches/fix_misspell.patch
deleted file mode 100644
index 8b5a0eb..0000000
--- a/debian/patches/fix_misspell.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fixed misspelled words in source code.
-Author: Lucas de Castro Borges <lucascastroborges@gmail.com>
-Last-Update: 2016-07-21
-Index: lsm-1.0.4/lsm.c
-===================================================================
---- lsm-1.0.4.orig/lsm.c
-+++ lsm-1.0.4/lsm.c
-@@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
-
- /*
- Create the handler for child signals. This will clean up
-- any forked child after an event has occured.
-+ any forked child after an event has occurred.
- */
- create_sigchld_hdl();
-
-Index: lsm-1.0.4/config.c
-===================================================================
---- lsm-1.0.4.orig/config.c
-+++ lsm-1.0.4/config.c
-@@ -164,7 +164,7 @@ void init_config(void)
-
- defaults.long_down_email = NULL;
-
-- /* by default don't execute notify script on unkown to up event */
-+ /* by default don't execute notify script on unknown to up event */
- defaults.unknown_up_notify = 0;
-
- /* by default no accelerated startup */
diff --git a/debian/patches/hardening_improve.patch b/debian/patches/hardening_improve.patch
deleted file mode 100644
index 757e64f..0000000
--- a/debian/patches/hardening_improve.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Deleted not needed sets, make already do built-in.
-Author: Lucas de Castro Borges <lucascastroborges@gmail.com>
-Last-Update: 2016-05-19
-Forwarded: yes
-Index: lsm-1.0.4/Makefile
-===================================================================
---- lsm-1.0.4.orig/Makefile
-+++ lsm-1.0.4/Makefile
-@@ -14,8 +14,6 @@ override CFLAGS += -Wall -O2 -DLSM_VERSI
- #override CFLAGS += -D NO_PLUGIN_EXPORT_MUNIN
- #override CFLAGS += -D NO_PLUGIN_EXPORT_STATUS
-
--LDFLAGS =
--
- PREFIX ?= /usr/local
- DESTDIR ?=
- BINDIR ?= $(PREFIX)/sbin
-@@ -34,14 +32,10 @@ override CFLAGS += -DSCRIPTDIR=\"$(SCRIP
-
- all: $(PROGS)
-
--%.o: %.c
-- $(CC) $(CFLAGS) -c -o $@ $<
--
- lsm: lsm.o icmp_t.o icmp6_t.o config.o globals.o cksum.o forkexec.o signal_handler.o timecalc.o plugin_export.o save_statuses.o pidfile.o cmdline.o usage.o
-- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-
- clean distclean:
-- rm -rf *~ .*~ *.o $(PROGS) Makefile.depend debugfiles.list debuglinks.list debugsources.list *.orig
-+ rm -rf *~ .*~ *.o $(PROGS) debugfiles.list debuglinks.list debugsources.list *.orig
-
- tar: distclean
- tar zcvf ../$(PKG)-$(VERSION).tar.gz \
-@@ -56,9 +50,6 @@ rpm: tar
- cp $(PKG).spec ~/rpmbuild/SPECS
- rpmbuild -ba ~/rpmbuild/SPECS/$(PKG).spec
-
--Makefile.depend: *.c *.h Makefile
-- $(CC) -MM *.c > $@
--
- install: all
- install -d $(DESTDIR)$(EXAMPLEDIR)
- install -d $(DESTDIR)$(SCRIPTDIR)
-@@ -68,6 +59,4 @@ install: all
- install -m0644 $(DOCFILES) $(DESTDIR)$(EXAMPLEDIR)
- install -m0755 $(SCRIPTS) $(DESTDIR)$(SCRIPTDIR)
-
---include Makefile.depend
--
- #
diff --git a/debian/patches/install_target.patch b/debian/patches/install_target.patch
deleted file mode 100644
index 38120b1..0000000
--- a/debian/patches/install_target.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Made target up to PREFIX and pass path to binary at compiling.
-Author: Lucas de Castro Borges <lucascastroborges@gmail.com>
-Last-Update: 2016-05-09
-Forwarded: yes
-Index: lsm-1.0.4/Makefile
-===================================================================
---- lsm-1.0.4.orig/Makefile
-+++ lsm-1.0.4/Makefile
-@@ -16,12 +16,20 @@ override CFLAGS += -Wall -O2 -DLSM_VERSI
-
- LDFLAGS =
-
--INITDDIR ?= /etc/init.d
--DOCDIR ?= /usr/share/doc/lsm
-+PREFIX ?= /usr/local
-+DESTDIR ?=
-+BINDIR ?= $(PREFIX)/sbin
-+ETCDIR ?= /etc/lsm
-+DOCDIR ?= $(PREFIX)/share/doc/lsm
-+EXAMPLEDIR ?= $(DOCDIR)/examples
-+SCRIPTDIR ?= $(PREFIX)/share/lsm
-
- DOCFILES = README lsm.conf.sample default_script.sample rsyslog-lsm.conf.sample
- SCRIPTS = shorewall_script shorewall6_script default_script group_script
-
-+override CFLAGS += -DETCDIR=\"$(ETCDIR)\"
-+override CFLAGS += -DSCRIPTDIR=\"$(SCRIPTDIR)\"
-+
- .PHONY: all clean distclean tar rpm
-
- all: $(PROGS)
-@@ -52,20 +60,13 @@ Makefile.depend: *.c *.h Makefile
- $(CC) -MM *.c > $@
-
- install: all
-- mkdir -p $(DESTDIR)/etc/lsm
-- mkdir -p $(DESTDIR)$(INITDDIR)
-- mkdir -p $(DESTDIR)/usr/sbin
-- mkdir -p $(DESTDIR)$(DOCDIR)
-- mkdir -p $(DESTDIR)/usr/share/lsm
-- mkdir -p $(DESTDIR)/usr/libexec/lsm
-- mkdir -p $(DESTDIR)/var/lib/lsm
-- install -m0644 lsm.conf $(DESTDIR)/etc/lsm
-- install -m0755 lsm.init $(DESTDIR)$(INITDDIR)/lsm
-- install -m0755 lsm $(DESTDIR)/usr/sbin
-- install -m0644 $(DOCFILES) $(DESTDIR)$(DOCDIR)
-- install -m0755 $(SCRIPTS) $(DESTDIR)/usr/libexec/lsm
-- ln -sf ../../libexec/lsm/default_script $(DESTDIR)/usr/share/lsm/default_script
-- ln -sf ../../libexec/lsm/shorewall_script $(DESTDIR)/usr/share/lsm/shorewall_script
-+ install -d $(DESTDIR)$(EXAMPLEDIR)
-+ install -d $(DESTDIR)$(SCRIPTDIR)
-+ install -d $(DESTDIR)/var/lib/lsm
-+ install -D -m0644 lsm.conf $(DESTDIR)$(ETCDIR)/lsm.conf
-+ install -D -m0755 lsm $(DESTDIR)$(BINDIR)/lsm
-+ install -m0644 $(DOCFILES) $(DESTDIR)$(EXAMPLEDIR)
-+ install -m0755 $(SCRIPTS) $(DESTDIR)$(SCRIPTDIR)
-
- -include Makefile.depend
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 51c2c8c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-fix_misspell.patch
-source_relative_path.patch
-install_target.patch
-hardening_improve.patch
diff --git a/debian/patches/source_relative_path.patch b/debian/patches/source_relative_path.patch
deleted file mode 100644
index 27413d2..0000000
--- a/debian/patches/source_relative_path.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Description: Changed to relative path, informed by compiler at compiling time.
-Author: Lucas de Castro Borges <lucascastroborges@gmail.com>
-Last-Update: 2016-05-20
-Forwarded: yes
-Index: lsm-1.0.4/config.c
-===================================================================
---- lsm-1.0.4.orig/config.c
-+++ lsm-1.0.4/config.c
-@@ -23,6 +23,8 @@ License: GPLv2
- #include "config.h"
- #include "defs.h"
-
-+#define DEFAULT_SCRIPT_FILE SCRIPTDIR "/default_script"
-+
- static CONFIG defaults;
- static int errors = 0;
-
-@@ -144,7 +146,7 @@ void init_config(void)
- defaults.name = strdup("defaults");
- defaults.checkip = strdup("127.0.0.1");
- defaults.eventscript = NULL;
-- defaults.notifyscript = strdup("/usr/libexec/lsm/default_script");
-+ defaults.notifyscript = strdup(DEFAULT_SCRIPT_FILE);
- defaults.max_packet_loss = 15;
- defaults.max_successive_pkts_lost = 7;
- defaults.min_packet_loss = 5;
-Index: lsm-1.0.4/globals.c
-===================================================================
---- lsm-1.0.4.orig/globals.c
-+++ lsm-1.0.4/globals.c
-@@ -12,13 +12,15 @@ License: GPLv2
- #include "globals.h"
- #include "defs.h"
-
-+#define LSM_CONFIG_FILE ETCDIR "/lsm.conf"
-+
- static char *prog = NULL;
- static int cont = TRUE;
- static int dump = FALSE;
- static int ident = 0;
- static int reload_cfg = FALSE;
- static int dump_if_list = FALSE;
--static char *configfile = "/etc/lsm/lsm.conf";
-+static char *configfile = LSM_CONFIG_FILE;
- static char *pidfile = "/var/run/lsm.pid";
- static int nodaemon = 0;
- static char *status_str[] = { "down", "up", "unknown", "long_down" };
-Index: lsm-1.0.4/lsm.conf
-===================================================================
---- lsm-1.0.4.orig/lsm.conf
-+++ lsm-1.0.4/lsm.conf
-@@ -20,7 +20,7 @@
- # name=defaults
- # checkip=127.0.0.1
- # eventscript=
--# notifyscript=/usr/libexec/lsm/default_script
-+# notifyscript=/usr/share/lsm/default_script
- # max_packet_loss=15
- # max_successive_pkts_lost=7
- # min_packet_loss=5
-Index: lsm-1.0.4/lsm.conf.sample
-===================================================================
---- lsm-1.0.4.orig/lsm.conf.sample
-+++ lsm-1.0.4/lsm.conf.sample
-@@ -18,7 +18,7 @@ debug=8
- defaults {
- name=defaults
- checkip=127.0.0.1
-- eventscript=/usr/libexec/lsm/default_script
-+ eventscript=/usr/share/lsm/default_script
- max_packet_loss=15
- max_successive_pkts_lost=7
- min_packet_loss=5
-@@ -45,7 +45,7 @@ defaults {
- # connection {
- # name=connection-1
- # checkip=127.108.68.69
--# eventscript=/usr/libexec/lsm/conn1
-+# eventscript=/usr/share/lsm/conn1
- # max_packet_loss=15
- # max_successive_pkts_lost=7
- # min_packet_loss=5
-@@ -62,7 +62,7 @@ defaults {
- # connection {
- # name=connection-2
- # checkip=127.108.68.65
--# eventscript=/usr/libexec/lsm/conn2
-+# eventscript=/usr/share/lsm/conn2
- # max_packet_loss=15
- # max_successive_pkts_lost=7
- # min_packet_loss=5
-@@ -79,7 +79,7 @@ defaults {
- # connection {
- # name=connection-3
- # checkip=127.108.68.68
--# eventscript=/usr/libexec/lsm/conn3
-+# eventscript=/usr/share/lsm/conn3
- # max_packet_loss=15
- # max_successive_pkts_lost=7
- # min_packet_loss=5
-@@ -131,7 +131,7 @@ defaults {
- #
- # group {
- # name=conn-group-a
--# eventscript=/usr/libexec/lsm/default_script
-+# eventscript=/usr/share/lsm/default_script
- # warn_email=root@some.domain.tld
- # # logic between member connetion statuses
- # # logic=0 == or