From ffc86da754dae7e5237505b0e6e500bfe81d0e21 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Fri, 7 Feb 2020 12:37:36 +0300 Subject: [PATCH 1/4] freerdp 2.0.0_rc4 --- network/misc/freerdp/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/network/misc/freerdp/pspec.xml b/network/misc/freerdp/pspec.xml index 832a9241c5..08d289e359 100644 --- a/network/misc/freerdp/pspec.xml +++ b/network/misc/freerdp/pspec.xml @@ -12,7 +12,7 @@ app:console A Remote Desktop Implementation FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under Apacle License. - https://github.com/FreeRDP/FreeRDP/archive/782039c6aab533f27f5bbe1fee0b733d98606780/FreeRDP-782039c6aab533f27f5bbe1fee0b733d98606780.tar.gz + https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc4.tar.gz cups-devel ffmpeg-devel @@ -82,6 +82,13 @@ + + 2020-02-07 + 2.0.0_rc4 + Version bump + Pisi Linux Community + admin@pisilinux.org + 2019-10-25 2.0_20180426 From 478d0b6767e137c9722c9c0293c190e52f80e0d5 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Fri, 7 Feb 2020 12:43:23 +0300 Subject: [PATCH 2/4] sqlcipher 4.3.0 --- server/database/sqlcipher/actions.py | 1 + server/database/sqlcipher/pspec.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/database/sqlcipher/actions.py b/server/database/sqlcipher/actions.py index 47433338f2..d4b27bbd7a 100644 --- a/server/database/sqlcipher/actions.py +++ b/server/database/sqlcipher/actions.py @@ -16,6 +16,7 @@ def setup(): --enable-tempstore=yes \ --enable-readline \ --enable-threadsafe \ + --disable-editline \ --enable-cross-thread-connections \ --enable-releasemode \ --disable-static \ diff --git a/server/database/sqlcipher/pspec.xml b/server/database/sqlcipher/pspec.xml index 18f7ee7b89..2a9b7ce744 100644 --- a/server/database/sqlcipher/pspec.xml +++ b/server/database/sqlcipher/pspec.xml @@ -10,6 +10,7 @@ data SQLite extension that provides transparent 256-bit AES encryption of database files SQLCipher is an SQLite extension that provides transparent 256-bit AES encryption of database files. Pages are encrypted before being written to disk and are decrypted when read back. Due to the small footprint and great performance it’s ideal for protecting embedded application databases and is well suited for mobile development. + https://github.com/sqlcipher/sqlcipher/archive/v4.3.0.tar.gz readline-devel tcl-devel @@ -17,7 +18,6 @@ sqlite-devel ncurses-devel - https://github.com/sqlcipher/sqlcipher/archive/v4.0.1.tar.gz @@ -51,6 +51,13 @@ + + 2020-02-07 + 4.3.0 + Version bump. + İdris Kalp + idriskalp@gmail.com + 2019-04-26 4.0.1 From b06814d3c3b6c7fd4ea08de0d07a80d8665e7b0a Mon Sep 17 00:00:00 2001 From: idriskalp Date: Fri, 7 Feb 2020 13:00:25 +0300 Subject: [PATCH 3/4] iputils s20190709 --- network/misc/iputils/actions.py | 12 ++++- .../iputils/files/fix-setuid-redeclared.patch | 48 +++++++++++++++++++ network/misc/iputils/pspec.xml | 16 +++++-- 3 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 network/misc/iputils/files/fix-setuid-redeclared.patch diff --git a/network/misc/iputils/actions.py b/network/misc/iputils/actions.py index 35449cd16b..5ff1d05e96 100644 --- a/network/misc/iputils/actions.py +++ b/network/misc/iputils/actions.py @@ -5,14 +5,22 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get +def setup(): + mesontools.configure("-DBUILD_RARPD=true \ + -DBUILD_MANS=false \ + -DBUILD_HTML_MANS=false \ + -DBUILD_TRACEROUTE6=true") + def build(): - autotools.make("USE_NETTLE=no USE_GNUTLS=no CCOPT='%s -fpie' CC=%s" % (get.CFLAGS(), get.CC())) + mesontools.build() def install(): + shelltools.cd("build") pisitools.dobin("ping") for app in ["clockdiff", "rarpd", "tftpd", "arping", "rdisc", "tracepath", "traceroute6"]: @@ -22,4 +30,4 @@ def install(): shelltools.chmod("%s/usr/bin/ping" % get.installDIR(), 04711) #shelltools.chmod("%s/usr/bin/ping6" % get.installDIR(), 04711) - pisitools.dodoc("RELNOTES*") + pisitools.dodoc("../README.md") diff --git a/network/misc/iputils/files/fix-setuid-redeclared.patch b/network/misc/iputils/files/fix-setuid-redeclared.patch new file mode 100644 index 0000000000..21f697a329 --- /dev/null +++ b/network/misc/iputils/files/fix-setuid-redeclared.patch @@ -0,0 +1,48 @@ +From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001 +From: Sami Kerola +Date: Sat, 28 Dec 2019 17:16:27 +0000 +Subject: [PATCH] ninfod: change variable name to avoid colliding with function + name + +The sys/capability.h header has 'extern int cap_setuid(uid_t uid);' +function prototype. + +Addresses: https://github.com/iputils/iputils/issues/246 +Signed-off-by: Sami Kerola +--- + ninfod/ninfod.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c +index 26112d0..95583de 100644 +--- a/ninfod/ninfod.c ++++ b/ninfod/ninfod.c +@@ -455,7 +455,7 @@ static void do_daemonize(void) + /* --------- */ + #ifdef HAVE_LIBCAP + static const cap_value_t cap_net_raw = CAP_NET_RAW; +-static const cap_value_t cap_setuid = CAP_SETUID; ++static const cap_value_t cap_setuserid = CAP_SETUID; + static cap_flag_value_t cap_ok; + #else + static uid_t euid; +@@ -487,7 +487,7 @@ static void limit_capabilities(void) + + cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); + if (cap_ok != CAP_CLEAR) +- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); ++ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); + + if (cap_set_proc(cap_p) < 0) { + DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); +@@ -520,8 +520,8 @@ static void drop_capabilities(void) + + /* setuid / setuid */ + if (cap_ok != CAP_CLEAR) { +- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); +- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); ++ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); ++ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); + + if (cap_set_proc(cap_p) < 0) { + DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); diff --git a/network/misc/iputils/pspec.xml b/network/misc/iputils/pspec.xml index cfe338c647..e3bf399cf3 100644 --- a/network/misc/iputils/pspec.xml +++ b/network/misc/iputils/pspec.xml @@ -12,15 +12,16 @@ app:console Network monitoring tools including ping and ping6 iputils contains network monitoring tools including ping and ping6. - https://github.com/iputils/iputils/archive/s20180629.tar.gz + https://github.com/iputils/iputils/archive/s20190709.tar.gz openssl-devel libidn2-devel libcap-devel - + docbook-xsl + + fix-setuid-redeclared.patch + @@ -58,6 +59,13 @@ + + 2020-02-07 + 20190709 + Version bump. + İdris Kalp + idriskalp@gmail.com + 2018-08-13 20180629 From 61d8c62106d05e14e360103ef48a22b1dea74d3d Mon Sep 17 00:00:00 2001 From: idriskalp Date: Fri, 7 Feb 2020 13:01:18 +0300 Subject: [PATCH 4/4] iputils fix dep --- network/misc/iputils/pspec.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/network/misc/iputils/pspec.xml b/network/misc/iputils/pspec.xml index e3bf399cf3..7d06e13477 100644 --- a/network/misc/iputils/pspec.xml +++ b/network/misc/iputils/pspec.xml @@ -17,7 +17,8 @@ openssl-devel libidn2-devel libcap-devel - docbook-xsl + meson + ninja fix-setuid-redeclared.patch