aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-05-23 20:57:14 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-05-23 20:58:08 -0300
commitc1b5e5cdfcdba05da1ad5b6a02a52536de07aa23 (patch)
tree428af8ecd6ae1fd59f75734f98073c82ffd6e376
parent2ccb2372dc862d3a05fbd5e0a665b5e6b0d1b440 (diff)
downloadaports-c1b5e5cdfcdba05da1ad5b6a02a52536de07aa23.tar.gz
aports-c1b5e5cdfcdba05da1ad5b6a02a52536de07aa23.tar.bz2
aports-c1b5e5cdfcdba05da1ad5b6a02a52536de07aa23.tar.xz
testing/*: remove stale patches
-rw-r--r--testing/ossec-hids/makefile.patch24
-rw-r--r--testing/ossec-hids/musl_lack_of_a_out_h.patch13
-rw-r--r--testing/py3-pymeeus/relax-dep-requirements.patch41
-rw-r--r--testing/user-managerd/fix-build.patch17
-rw-r--r--testing/w_scan2/musl-build-time-h-fix.patch12
5 files changed, 0 insertions, 107 deletions
diff --git a/testing/ossec-hids/makefile.patch b/testing/ossec-hids/makefile.patch
deleted file mode 100644
index e6fb7046fe..0000000000
--- a/testing/ossec-hids/makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index b684b82..3414312 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -12,7 +12,7 @@ LUA_ENABLE?=no
- MAXAGENTS?=2048
- REUSE_ID?=no
- # XXX Becareful NO EXTRA Spaces here
--PREFIX?=/var/ossec
-+PREFIX=$(DESTDIR)/var/ossec
- PG_CONFIG?=pg_config
- MY_CONFIG?=mysql_config
- PRELUDE_CONFIG?=libprelude-config
-@@ -22,8 +22,8 @@ OSSEC_USER_MAIL?=ossecm
- OSSEC_USER_REM?=ossecr
-
- INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
--INSTALL_LOCALTIME?=yes
--INSTALL_RESOLVCONF?=yes
-+INSTALL_LOCALTIME=no
-+INSTALL_RESOLVCONF=no
-
- USE_PRELUDE?=no
- USE_ZEROMQ?=no
diff --git a/testing/ossec-hids/musl_lack_of_a_out_h.patch b/testing/ossec-hids/musl_lack_of_a_out_h.patch
deleted file mode 100644
index a4d2b12a61..0000000000
--- a/testing/ossec-hids/musl_lack_of_a_out_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/rootcheck/os_string.c b/src/rootcheck/os_string.c
-index e7ca284..85b6d9b 100644
---- a/src/rootcheck/os_string.c
-+++ b/src/rootcheck/os_string.c
-@@ -44,7 +44,7 @@
-
- #ifdef SOLARIS
- #include <sys/exechdr.h>
--#elif defined Darwin || defined HPUX
-+#elif defined Darwin || defined HPUX || defined linux
-
- /* For some reason darwin does not have that */
- struct exec {
diff --git a/testing/py3-pymeeus/relax-dep-requirements.patch b/testing/py3-pymeeus/relax-dep-requirements.patch
deleted file mode 100644
index 3aa6adac0d..0000000000
--- a/testing/py3-pymeeus/relax-dep-requirements.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/requirements.txt b/requirements.txt
-index a104833..952532a 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,18 +1,18 @@
--atomicwrites==1.2.1
--attrs==18.2.0
--configparser==3.5.0
--coverage==4.5.2
--enum34==1.1.6
--flake8==3.6.0
--funcsigs==1.0.2
--mccabe==0.6.1
--more-itertools==4.3.0
--pathlib2==2.3.2
--pluggy==0.8.0
--py==1.7.0
--pycodestyle==2.4.0
--pyflakes==2.0.0
--pytest==4.0.1
--pytest-cov==2.6.0
--scandir==1.9.0
--six==1.11.0
-+atomicwrites>=1.2.1
-+attrs>=18.2.0
-+configparser>=3.5.0
-+coverage>=4.5.2
-+enum34>=1.1.6
-+flake8>=3.6.0
-+funcsigs>=1.0.2
-+mccabe>=0.6.1
-+more-itertools>=4.3.0
-+pathlib2>=2.3.2
-+pluggy>=0.8.0
-+py>=1.7.0
-+pycodestyle>=2.4.0
-+pyflakes>=2.0.0
-+pytest>=4.0.1
-+pytest-cov>=2.6.0
-+scandir>=1.9.0
-+six>=1.11.0
diff --git a/testing/user-managerd/fix-build.patch b/testing/user-managerd/fix-build.patch
deleted file mode 100644
index 1c40eb8e1f..0000000000
--- a/testing/user-managerd/fix-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream merge-request: https://github.com/sailfishos/user-managerd/pull/10
-
-diff --git a/sailfishusermanager.h b/sailfishusermanager.h
-index 93cd3df..cd723f8 100644
---- a/sailfishusermanager.h
-+++ b/sailfishusermanager.h
-@@ -10,6 +10,10 @@
- #ifndef SAILFISHUSERMANAGER_H
- #define SAILFISHUSERMANAGER_H
-
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-+
- #include "sailfishusermanagerinterface.h"
- #include "systemdmanager.h"
- #include <QDBusContext>
diff --git a/testing/w_scan2/musl-build-time-h-fix.patch b/testing/w_scan2/musl-build-time-h-fix.patch
deleted file mode 100644
index 467897c72c..0000000000
--- a/testing/w_scan2/musl-build-time-h-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Upstreamed: yes. Already merged into master.
-
---- a/src/descriptors.h
-+++ b/src/descriptors.h
-@@ -23,6 +23,7 @@
- #define __DESCRIPTORS_H__
-
- #include "extended_frontend.h"
-+#include "time.h"
-
- /******************************************************************************
- * descriptor ids as defined by standards.