Merge pull request #7882 from IdrisKalp/master

some packages
This commit is contained in:
Idris Kalp
2020-02-07 16:01:46 +03:00
committed by GitHub
6 changed files with 88 additions and 8 deletions
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>A Remote Desktop Implementation</Summary>
<Description>FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under Apacle License.</Description>
<Archive sha1sum="2525334cdb298a6e6cea8a4b04666ffdddb3bc74" type="targz">https://github.com/FreeRDP/FreeRDP/archive/782039c6aab533f27f5bbe1fee0b733d98606780/FreeRDP-782039c6aab533f27f5bbe1fee0b733d98606780.tar.gz</Archive>
<Archive sha1sum="bd50ce9d8807499e14884a3019e9f42b40f3480b" type="targz">https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc4.tar.gz</Archive>
<BuildDependencies>
<Dependency>cups-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
@@ -82,6 +82,13 @@
</Package>
<History>
<Update release="8">
<Date>2020-02-07</Date>
<Version>2.0.0_rc4</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2019-10-25</Date>
<Version>2.0_20180426</Version>
+10 -2
View File
@@ -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")
@@ -0,0 +1,48 @@
From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
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 <kerolasa@iki.fi>
---
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));
+13 -4
View File
@@ -12,15 +12,17 @@
<IsA>app:console</IsA>
<Summary>Network monitoring tools including ping and ping6</Summary>
<Description>iputils contains network monitoring tools including ping and ping6.</Description>
<Archive sha1sum="353df20691bf027ad35fcaaf6894b122c39d8f2d" type="targz">https://github.com/iputils/iputils/archive/s20180629.tar.gz</Archive>
<Archive sha1sum="9a2d85a6b2656ed3669f49e737588e3262f02ff8" type="targz">https://github.com/iputils/iputils/archive/s20190709.tar.gz</Archive>
<BuildDependencies>
<Dependency>openssl-devel</Dependency>
<Dependency>libidn2-devel</Dependency>
<Dependency>libcap-devel</Dependency>
<!-- needed for generating man pages, see below
<Dependency>docbook-utils</Dependency>
-->
<Dependency>meson</Dependency>
<Dependency>ninja</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">fix-setuid-redeclared.patch</Patch>
</Patches>
</Source>
<Package>
@@ -58,6 +60,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-02-07</Date>
<Version>20190709</Version>
<Comment>Version bump.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-08-13</Date>
<Version>20180629</Version>
+1
View File
@@ -16,6 +16,7 @@ def setup():
--enable-tempstore=yes \
--enable-readline \
--enable-threadsafe \
--disable-editline \
--enable-cross-thread-connections \
--enable-releasemode \
--disable-static \
+8 -1
View File
@@ -10,6 +10,7 @@
<IsA>data</IsA>
<Summary>SQLite extension that provides transparent 256-bit AES encryption of database files</Summary>
<Description>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 its ideal for protecting embedded application databases and is well suited for mobile development.</Description>
<Archive sha1sum="c08cb872bd543008d770fba7ea8c34d8c59340eb" type="targz">https://github.com/sqlcipher/sqlcipher/archive/v4.3.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>readline-devel</Dependency>
<Dependency>tcl-devel</Dependency>
@@ -17,7 +18,6 @@
<Dependency>sqlite-devel</Dependency>
<Dependency>ncurses-devel</Dependency>
</BuildDependencies>
<Archive sha1sum="4f5545c607f7b0b9695a3dd25d2d5fa66fa634a8" type="targz">https://github.com/sqlcipher/sqlcipher/archive/v4.0.1.tar.gz</Archive>
</Source>
<Package>
@@ -51,6 +51,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-02-07</Date>
<Version>4.3.0</Version>
<Comment>Version bump.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2019-04-26</Date>
<Version>4.0.1</Version>