From c602840d00fe25e8c4ce3c5bb4350ffba8b64e7d Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 12 Apr 2023 15:25:47 +0300 Subject: [PATCH] libcap, libgcrypt, libgpg-error ver. bump --- system/base/libcap/actions.py | 47 ++++------- system/base/libcap/pspec.xml | 127 +++++++++++++---------------- system/base/libgcrypt/actions.py | 2 +- system/base/libgcrypt/pspec.xml | 11 ++- system/base/libgpg-error/pspec.xml | 9 +- 5 files changed, 90 insertions(+), 106 deletions(-) diff --git a/system/base/libcap/actions.py b/system/base/libcap/actions.py index 3a01948a..aaa97ec0 100644 --- a/system/base/libcap/actions.py +++ b/system/base/libcap/actions.py @@ -4,48 +4,29 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools - - - -pam = "no" if get.buildTYPE() == "emul32" else "yes" - -cc = "'gcc -m32'" if get.buildTYPE() == "emul32" else "'gcc'" - -pisitools.cflags.add("-D_LARGEFILE64_SOURCE", "-D_FILE_OFFSET_BITS=64") +from pisi.actionsapi import get def setup(): - # fix linkage - pisitools.dosed("pam_cap/Makefile", "(.*<\s\$\(LDLIBS\))", r"\1 -lpam") - # no static libs - #pisitools.dosed("libcap/Makefile", "install.*STALIBNAME", deleteLine=True) - shelltools.system("sed -i '/install -m.*STA/d' libcap/Makefile") - # change shared libs mode - #pisitools.dosed("libcap/Makefile", "(.*?install -m) 0644 (.*?MINLIBNAME.*)", r"\1 0755 \2") - # use pisilinux flags - #pisitools.dosed("Make.Rules", "^(CC|CFLAGS|LD)\s:=.*", deleteLine=True) - - pisitools.dosed("Make.Rules", "^(PAM_CAP\s:=).*", r"\1 %s" % ("no" if get.buildTYPE() == "emul32" else "yes")) - - + shelltools.export("CFLAGS", "%s -fPIC" % get.CFLAGS()) + autotools.autoreconf("-vfi") + autotools.configure("--prefix=/usr \ + --enable-ipv6 \ + --enable-bluetooth") def build(): - autotools.make("prefix=/usr lib=lib%s PAM_CAP=%s CC=%s" % ("32" if get.buildTYPE() == "emul32" else "", pam, cc)) - -#def check(): - #autotools.make("test -k CC=%s PAM_CAP=%s" % (cc, pam)) + autotools.make("all") + autotools.make("shared") def install(): - if get.buildTYPE() == "emul32": - autotools.rawInstall("DESTDIR=%s prefix=/usr lib=lib32 SBINDIR=/_emul32 MANDIR=/_emul32 RAISE_SETFCAP=no PAM_CAP=no" % get.installDIR()) - pisitools.removeDir("/_emul32") - return + autotools.rawInstall('DESTDIR="%s"' % get.installDIR()) - autotools.rawInstall("prefix=/usr DESTDIR=%s SBINDIR=/sbin RAISE_SETFCAP=no" % (get.installDIR())) + # No static libs + pisitools.remove("/usr/lib/*.a") - pisitools.insinto("/etc/security", "pam_cap/capability.conf") + # it is needed for ppd etc. + pisitools.insinto("/usr/include", "pcap-int.h") - pisitools.dodoc("CHANGELOG", "License", "README", "doc/capability.notes") + pisitools.dodoc("CHANGES", "CREDITS", "README*", "VERSION", "TODO") diff --git a/system/base/libcap/pspec.xml b/system/base/libcap/pspec.xml index 534b6438..b450a52b 100644 --- a/system/base/libcap/pspec.xml +++ b/system/base/libcap/pspec.xml @@ -1,131 +1,120 @@ - + - libcap - http://www.kernel.org/pub/linux/libs/security/linux-privs/ + libpcap + http://www.tcpdump.org/ PisiLinux Community admins@pisilinux.org - GPLv2 BSD library - POSIX 1003.1e capabilities library - libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. - https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.67.tar.xz + A system-independent library for user-level network packet capture + libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc. + http://www.tcpdump.org/release/libpcap-1.10.4.tar.gz - attr-devel - pam-devel + bluez-libs-devel + + + + + + + + + - libcap + libpcap - pam - attr + + + + - /sbin - /lib /usr/lib - /usr/share/man /usr/share/doc - /etc + /usr/share/man - libcap-devel - system.devel - Development files for libcap + libpcap-devel + Development files for libpcap - libcap + libpcap + /usr/bin/pcap-config /usr/include - /usr/lib/pkgconfig /usr/share/man/man3 - - libcap-32bit - emul32 - 32-bit shared libraries for libcap - emul32 - - attr-32bit - - - attr-32bit - - - /usr/lib32 - - - - 2023-02-05 - 2.67 + 2023-04-08 + 1.10.4 Version bump. Mustafa Cinasal muscnsl@gmail.com - 2022-08-02 - 2.65 + 2023-01-13 + 1.10.3 Version bump. Mustafa Cinasal muscnsl@gmail.com - 2021-06-16 - 2.27 - Rebuild + 2021-07-02 + 1.10.1 + Version bump. Mustafa Cinasal muscnsl@gmail.com - 2020-12-09 - 2.27 - Rebuild + 2020-02-01 + 1.9.1 + Version bump. + Blue DeviL + bluedevil@sctzine.com + + + 2018-08-13 + 1.8.1 + Rebuild New T. Mustafa Cinasal muscnsl@gmail.com - - 2019-2-25 - 2.27 - Version bump - Idris Kalp - idriskalp@gmail.com - - 2018-07-15 - 2.25 - Rebuild - Ertuğrul Erata - ertugrulerata@gmail.com + 2017-05-15 + 1.8.1 + Release Bump + Kamil Atlı + suvari@pisilinux.org - 2017-09-20 - 2.25 - Rebuild. - Ertuğrul Erata - ertugrulerata@gmail.com + 2016-06-09 + 1.8.1 + Version Bump + Kamil Atlı + suvari@pisilinux.org - 2016-04-27 - 2.25 + 2016-06-09 + 1.7.4 Release Bump - PisiLinux Community + Pisi Linux Community admin@pisilinux.org - 2016-03-02 - 2.25 + 2016-03-25 + 1.7.4 First release Ertuğrul Erata ertugrulerata@gmail.com diff --git a/system/base/libgcrypt/actions.py b/system/base/libgcrypt/actions.py index 184a83f3..6ad989e7 100644 --- a/system/base/libgcrypt/actions.py +++ b/system/base/libgcrypt/actions.py @@ -25,7 +25,7 @@ def setup(): options += " --libdir=/usr/lib32 --bindir=/usr/bin32" # Use 32-bit assembler, another option is to use --disable-asm option - #pisitools.dosed("mpi/config.links", "path=\"amd64\"", "path=\"i586 i386\"") + pisitools.dosed("mpi/config.links", "path=\"amd64\"", "path=\"i586 i386\"") autotools.configure(options) diff --git a/system/base/libgcrypt/pspec.xml b/system/base/libgcrypt/pspec.xml index fa9f5d52..bf43884e 100644 --- a/system/base/libgcrypt/pspec.xml +++ b/system/base/libgcrypt/pspec.xml @@ -12,9 +12,9 @@ library General purpose crypto library Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard. - https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.3.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.2.tar.bz2 - libgpg-error-devel + libgpg-error-devel @@ -70,6 +70,13 @@ + + 2023-04-08 + 1.10.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-05-28 1.9.3 diff --git a/system/base/libgpg-error/pspec.xml b/system/base/libgpg-error/pspec.xml index 2d9a1eba..61ffb9c1 100644 --- a/system/base/libgpg-error/pspec.xml +++ b/system/base/libgpg-error/pspec.xml @@ -13,7 +13,7 @@ library Library for error values used by GnuPG components libgpg-error is a library that defines common error values for all GnuPG components. - https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2 @@ -61,6 +61,13 @@ + + 2023-04-08 + 1.47 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-12-20 1.46