Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1595 from Rmys/master

Browse Source 
libcap, libgcrypt, libgpg-error ver. bump
This commit is contained in:
Rmys
2023-04-12 15:27:39 +03:00
committed by GitHub
parent a0d655d30b 592d1a3844
commit 7f88678b8f
5 changed files with 90 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/libcap/actions.py
+14 -33
View File
@@ -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")
system/base/libcap/pspec.xml
+58 -69
View File
@@ -1,131 +1,120 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libcap</Name>
<Homepage>http://www.kernel.org/pub/linux/libs/security/linux-privs/</Homepage>
<Name>libpcap</Name>
<Homepage>http://www.tcpdump.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>BSD</License>
<IsA>library</IsA>
<Summary>POSIX 1003.1e capabilities library</Summary>
<Description>libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.</Description>
<Archive sha1sum="a18f18bd99201821e686cd7a980348b7e01d71d5" type="tarxz">https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.67.tar.xz</Archive>
<Summary>A system-independent library for user-level network packet capture</Summary>
<Description>libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc.</Description>
<Archive sha1sum="818cbe70179c73eebfe1038854665f33aac64245" type="targz">http://www.tcpdump.org/release/libpcap-1.10.4.tar.gz</Archive>
<BuildDependencies>
<Dependency>attr-devel</Dependency>
<Dependency>pam-devel</Dependency>
<Dependency>bluez-libs-devel</Dependency>
<!--<Dependency>libnl-devel</Dependency>-->
<!--<Dependency>libusb-devel</Dependency>-->
<!--<Dependency>dbus-devel</Dependency>-->
</BuildDependencies>
<Patches>
<!--<Patch>libpcap-1.1-cross-linux.patch</Patch>-->
<!--<Patch level="1">libpcap-1.1.1-ignore-ENODEV.patch</Patch>-->
<!--<Patch level="1">libpcap-1.8.1-enable_bluetooth-1.patch</Patch>-->
<!--<Patch>disable-remote.diff</Patch>-->
</Patches>
</Source>
<Package>
<Name>libcap</Name>
<Name>libpcap</Name>
<RuntimeDependencies>
<Dependency>pam</Dependency>
<Dependency>attr</Dependency>
<!--<Dependency>bluez</Dependency>-->
<!--<Dependency>libnl</Dependency>-->
<!--<Dependency>dbus</Dependency>-->
<!--<Dependency>libusb</Dependency>-->
</RuntimeDependencies>
<Files>
<Path fileType="executable">/sbin</Path>
<Path fileType="library">/lib</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="config">/etc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>libcap-devel</Name>
<PartOf>system.devel</PartOf>
<Summary>Development files for libcap</Summary>
<Name>libpcap-devel</Name>
<Summary>Development files for libpcap</Summary>
<RuntimeDependencies>
<Dependency release="current">libcap</Dependency>
<Dependency release="current">libpcap</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pcap-config</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<Package>
<Name>libcap-32bit</Name>
<PartOf>emul32</PartOf>
<Summary>32-bit shared libraries for libcap</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>attr-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>attr-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<History>
<Update release="9">
<Date>2023-02-05</Date>
<Version>2.67</Version>
<Date>2023-04-08</Date>
<Version>1.10.4</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2022-08-02</Date>
<Version>2.65</Version>
<Date>2023-01-13</Date>
<Version>1.10.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2021-06-16</Date>
<Version>2.27</Version>
<Comment>Rebuild</Comment>
<Date>2021-07-02</Date>
<Version>1.10.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2020-12-09</Date>
<Version>2.27</Version>
<Comment>Rebuild</Comment>
<Date>2020-02-01</Date>
<Version>1.9.1</Version>
<Comment>Version bump.</Comment>
<Name>Blue DeviL</Name>
<Email>bluedevil@sctzine.com</Email>
</Update>
<Update release="5">
<Date>2018-08-13</Date>
<Version>1.8.1</Version>
<Comment>Rebuild New T.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2019-2-25</Date>
<Version>2.27</Version>
<Comment>Version bump</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-15</Date>
<Version>2.25</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
<Date>2017-05-15</Date>
<Version>1.8.1</Version>
<Comment>Release Bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2017-09-20</Date>
<Version>2.25</Version>
<Comment>Rebuild.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
<Date>2016-06-09</Date>
<Version>1.8.1</Version>
<Comment>Version Bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-27</Date>
<Version>2.25</Version>
<Date>2016-06-09</Date>
<Version>1.7.4</Version>
<Comment>Release Bump</Comment>
<Name>PisiLinux Community</Name>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-03-02</Date>
<Version>2.25</Version>
<Date>2016-03-25</Date>
<Version>1.7.4</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
system/base/libgcrypt/actions.py
+1 -1
View File
@@ -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)
system/base/libgcrypt/pspec.xml
+9 -2
View File
@@ -12,9 +12,9 @@
<IsA>library</IsA>
<Summary>General purpose crypto library</Summary>
<Description>Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard.</Description>
<Archive sha1sum="6b18f453fee677078586279d96fb88e5df7b3f35" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.3.tar.bz2</Archive>
<Archive sha1sum="0b9555960d84a09ea14e52360808f2e02e9c12d2" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency versionFrom="1.36">libgpg-error-devel</Dependency>
<Dependency versionFrom="1.47">libgpg-error-devel</Dependency>
</BuildDependencies>
</Source>
@@ -70,6 +70,13 @@
</Package>
<History>
<Update release="11">
<Date>2023-04-08</Date>
<Version>1.10.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10">
<Date>2021-05-28</Date>
<Version>1.9.3</Version>
system/base/libgpg-error/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Library for error values used by GnuPG components</Summary>
<Description>libgpg-error is a library that defines common error values for all GnuPG components.</Description>
<Archive sha1sum="a6e5efdd72e848aab4064e5ef4c6835ba344bcf1" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2</Archive>
<Archive sha1sum="94668233fd7bd8e7c0ec5e363134cd53c575da60" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2</Archive>
</Source>
<Package>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="12">
<Date>2023-04-08</Date>
<Version>1.47</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2022-12-20</Date>
<Version>1.46</Version>