diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2024-08-30 17:52:19 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2024-08-30 20:49:55 +0200 |
| commit | e1b9937c8186bc0a3dc5a0bf2add8e734b407695 (patch) | |
| tree | f3ccf9fe232825da499bf5cff4af13cd3bf5222b /source | |
| parent | a6ff7bb1190960b4dcde336853d68e857ed8aba7 (diff) | |
| download | current-e1b9937c8186bc0a3dc5a0bf2add8e734b407695.tar.gz current-e1b9937c8186bc0a3dc5a0bf2add8e734b407695.tar.xz | |
Fri Aug 30 17:52:19 UTC 202420240830175219
a/aaa_glibc-solibs-2.40-x86_64-5.txz: Rebuilt.
a/kernel-firmware-20240828_335a1de-noarch-1.txz: Upgraded.
a/kernel-generic-6.10.7-x86_64-1.txz: Upgraded.
a/kernel-huge-6.10.7-x86_64-1.txz: Upgraded.
a/kernel-modules-6.10.7-x86_64-1.txz: Upgraded.
a/userspace-rcu-0.14.1-x86_64-1.txz: Upgraded.
ap/man-db-2.13.0-x86_64-1.txz: Upgraded.
ap/screen-5.0.0-x86_64-1.txz: Upgraded.
ap/vim-9.1.0702-x86_64-1.txz: Upgraded.
d/cmake-3.30.3-x86_64-1.txz: Upgraded.
d/gcc-14.2.0-x86_64-2.txz: Rebuilt.
Merge in parts of alienBOB's multilib build script, generalize the script
to work with both --enable-multilib and --disable-multilib, and otherwise
clean things up. Go ahead and build it multilib on 64-bit, because why not?
It's worth the bit of bloat to no longer have this package need to be
maintained separately and kept in sync. Thanks to alienBOB.
d/gcc-g++-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-gdc-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-gfortran-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-gm2-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-gnat-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-go-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-objc-14.2.0-x86_64-2.txz: Rebuilt.
d/gcc-rust-14.2.0-x86_64-2.txz: Rebuilt.
d/kernel-headers-6.10.7-x86-1.txz: Upgraded.
d/python-setuptools-73.0.1-x86_64-1.txz: Rebuilt.
Reverted due to regression: breaks g-ir-scanner
k/kernel-source-6.10.7-noarch-1.txz: Upgraded.
l/glibc-2.40-x86_64-5.txz: Rebuilt.
Enable multilib on 64-bit. Thanks to alienBOB.
Note that Slackware 64-bit can now run a 32-bit "Hello World!" but there
are no immediate plans to add additional multilib support by default.
Maybe down the road when bare metal 32-bit support goes away.
l/glibc-i18n-2.40-x86_64-5.txz: Rebuilt.
l/glibc-profile-2.40-x86_64-5.txz: Rebuilt.
l/gtk4-4.15.6-x86_64-1.txz: Upgraded.
l/libssh-0.11.1-x86_64-1.txz: Upgraded.
l/protobuf-28.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/python-certifi-2024.8.30-x86_64-1.txz: Upgraded.
l/qt6-6.7.2_20240610_3f005f1e-x86_64-6.txz: Rebuilt.
Recompiled against protobuf-28.0.
n/ca-certificates-20240830-noarch-1.txz: Upgraded.
This update provides the latest CA certificates to check for the
authenticity of SSL connections.
n/mosh-1.4.0-x86_64-4.txz: Rebuilt.
Recompiled against protobuf-28.0.
n/php-8.3.11-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.php.net/ChangeLog-8.php#8.3.11
x/mesa-24.2.1-x86_64-1.txz: Upgraded.
Thanks to lucabon for the rust-bindgen patch.
xap/vim-gvim-9.1.0702-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
26 files changed, 1194 insertions, 658 deletions
diff --git a/source/a/userspace-rcu/userspace-rcu.SlackBuild b/source/a/userspace-rcu/userspace-rcu.SlackBuild index b255163a4..5f15d7914 100755 --- a/source/a/userspace-rcu/userspace-rcu.SlackBuild +++ b/source/a/userspace-rcu/userspace-rcu.SlackBuild @@ -24,12 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=userspace-rcu VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild index 7868dfe40..cd6f46fa0 100755 --- a/source/ap/man-db/man-db.SlackBuild +++ b/source/ap/man-db/man-db.SlackBuild @@ -62,7 +62,7 @@ MAN2HTML=${MAN2HTML:-20180101} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -82,21 +82,12 @@ OUTPUT=${OUTPUT:-$TMP} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/ap/screen/26source_encoding.patch b/source/ap/screen/26source_encoding.patch deleted file mode 100644 index 1094ac518..000000000 --- a/source/ap/screen/26source_encoding.patch +++ /dev/null @@ -1,353 +0,0 @@ -Author: Ben Finney <ben@benfinney.id.au> -Description: Replace the composed characters with their respective description. ---- a/process.c -+++ b/process.c -@@ -250,177 +250,177 @@ - - /* digraph table taken from old vim and rfc1345 */ - static struct digraph digraphs[MAX_DIGRAPH + 1] = { -- {{' ', ' '}, 160}, /* */ -- {{'N', 'S'}, 160}, /* */ -- {{'~', '!'}, 161}, /* */ -- {{'!', '!'}, 161}, /* */ -- {{'!', 'I'}, 161}, /* */ -- {{'c', '|'}, 162}, /* */ -- {{'c', 't'}, 162}, /* */ -- {{'$', '$'}, 163}, /* */ -- {{'P', 'd'}, 163}, /* */ -- {{'o', 'x'}, 164}, /* */ -- {{'C', 'u'}, 164}, /* */ -- {{'C', 'u'}, 164}, /* */ -- {{'E', 'u'}, 164}, /* */ -- {{'Y', '-'}, 165}, /* */ -- {{'Y', 'e'}, 165}, /* */ -- {{'|', '|'}, 166}, /* */ -- {{'B', 'B'}, 166}, /* */ -- {{'p', 'a'}, 167}, /* */ -- {{'S', 'E'}, 167}, /* */ -- {{'"', '"'}, 168}, /* */ -- {{'\'', ':'}, 168}, /* */ -- {{'c', 'O'}, 169}, /* */ -- {{'C', 'o'}, 169}, /* */ -- {{'a', '-'}, 170}, /* */ -- {{'<', '<'}, 171}, /* */ -- {{'-', ','}, 172}, /* */ -- {{'N', 'O'}, 172}, /* */ -- {{'-', '-'}, 173}, /* */ -- {{'r', 'O'}, 174}, /* */ -- {{'R', 'g'}, 174}, /* */ -- {{'-', '='}, 175}, /* */ -- {{'\'', 'm'}, 175}, /* */ -- {{'~', 'o'}, 176}, /* */ -- {{'D', 'G'}, 176}, /* */ -- {{'+', '-'}, 177}, /* */ -- {{'2', '2'}, 178}, /* */ -- {{'2', 'S'}, 178}, /* */ -- {{'3', '3'}, 179}, /* */ -- {{'3', 'S'}, 179}, /* */ -- {{'\'', '\''}, 180}, /* */ -- {{'j', 'u'}, 181}, /* */ -- {{'M', 'y'}, 181}, /* */ -- {{'p', 'p'}, 182}, /* */ -- {{'P', 'I'}, 182}, /* */ -- {{'~', '.'}, 183}, /* */ -- {{'.', 'M'}, 183}, /* */ -- {{',', ','}, 184}, /* */ -- {{'\'', ','}, 184}, /* */ -- {{'1', '1'}, 185}, /* */ -- {{'1', 'S'}, 185}, /* */ -- {{'o', '-'}, 186}, /* */ -- {{'>', '>'}, 187}, /* */ -- {{'1', '4'}, 188}, /* */ -- {{'1', '2'}, 189}, /* */ -- {{'3', '4'}, 190}, /* */ -- {{'~', '?'}, 191}, /* */ -- {{'?', '?'}, 191}, /* */ -- {{'?', 'I'}, 191}, /* */ -- {{'A', '`'}, 192}, /* */ -- {{'A', '!'}, 192}, /* */ -- {{'A', '\''}, 193}, /* */ -- {{'A', '^'}, 194}, /* */ -- {{'A', '>'}, 194}, /* */ -- {{'A', '~'}, 195}, /* */ -- {{'A', '?'}, 195}, /* */ -- {{'A', '"'}, 196}, /* */ -- {{'A', ':'}, 196}, /* */ -- {{'A', '@'}, 197}, /* */ -- {{'A', 'A'}, 197}, /* */ -- {{'A', 'E'}, 198}, /* */ -- {{'C', ','}, 199}, /* */ -- {{'E', '`'}, 200}, /* */ -- {{'E', '!'}, 200}, /* */ -- {{'E', '\''}, 201}, /* */ -- {{'E', '^'}, 202}, /* */ -- {{'E', '>'}, 202}, /* */ -- {{'E', '"'}, 203}, /* */ -- {{'E', ':'}, 203}, /* */ -- {{'I', '`'}, 204}, /* */ -- {{'I', '!'}, 204}, /* */ -- {{'I', '\''}, 205}, /* */ -- {{'I', '^'}, 206}, /* */ -- {{'I', '>'}, 206}, /* */ -- {{'I', '"'}, 207}, /* */ -- {{'I', ':'}, 207}, /* */ -- {{'D', '-'}, 208}, /* */ -- {{'N', '~'}, 209}, /* */ -- {{'N', '?'}, 209}, /* */ -- {{'O', '`'}, 210}, /* */ -- {{'O', '!'}, 210}, /* */ -- {{'O', '\''}, 211}, /* */ -- {{'O', '^'}, 212}, /* */ -- {{'O', '>'}, 212}, /* */ -- {{'O', '~'}, 213}, /* */ -- {{'O', '?'}, 213}, /* */ -- {{'O', '"'}, 214}, /* */ -- {{'O', ':'}, 214}, /* */ -- {{'/', '\\'}, 215}, /* */ -- {{'*', 'x'}, 215}, /* */ -- {{'O', '/'}, 216}, /* */ -- {{'U', '`'}, 217}, /* */ -- {{'U', '!'}, 217}, /* */ -- {{'U', '\''}, 218}, /* */ -- {{'U', '^'}, 219}, /* */ -- {{'U', '>'}, 219}, /* */ -- {{'U', '"'}, 220}, /* */ -- {{'U', ':'}, 220}, /* */ -- {{'Y', '\''}, 221}, /* */ -- {{'I', 'p'}, 222}, /* */ -- {{'T', 'H'}, 222}, /* */ -- {{'s', 's'}, 223}, /* */ -- {{'s', '"'}, 223}, /* */ -- {{'a', '`'}, 224}, /* */ -- {{'a', '!'}, 224}, /* */ -- {{'a', '\''}, 225}, /* */ -- {{'a', '^'}, 226}, /* */ -- {{'a', '>'}, 226}, /* */ -- {{'a', '~'}, 227}, /* */ -- {{'a', '?'}, 227}, /* */ -- {{'a', '"'}, 228}, /* */ -- {{'a', ':'}, 228}, /* */ -- {{'a', 'a'}, 229}, /* */ -- {{'a', 'e'}, 230}, /* */ -- {{'c', ','}, 231}, /* */ -- {{'e', '`'}, 232}, /* */ -- {{'e', '!'}, 232}, /* */ -- {{'e', '\''}, 233}, /* */ -- {{'e', '^'}, 234}, /* */ -- {{'e', '>'}, 234}, /* */ -- {{'e', '"'}, 235}, /* */ -- {{'e', ':'}, 235}, /* */ -- {{'i', '`'}, 236}, /* */ -- {{'i', '!'}, 236}, /* */ -- {{'i', '\''}, 237}, /* */ -- {{'i', '^'}, 238}, /* */ -- {{'i', '>'}, 238}, /* */ -- {{'i', '"'}, 239}, /* */ -- {{'i', ':'}, 239}, /* */ -- {{'d', '-'}, 240}, /* */ -- {{'n', '~'}, 241}, /* */ -- {{'n', '?'}, 241}, /* */ -- {{'o', '`'}, 242}, /* */ -- {{'o', '!'}, 242}, /* */ -- {{'o', '\''}, 243}, /* */ -- {{'o', '^'}, 244}, /* */ -- {{'o', '>'}, 244}, /* */ -- {{'o', '~'}, 245}, /* */ -- {{'o', '?'}, 245}, /* */ -- {{'o', '"'}, 246}, /* */ -- {{'o', ':'}, 246}, /* */ -- {{':', '-'}, 247}, /* */ -- {{'o', '/'}, 248}, /* */ -- {{'u', '`'}, 249}, /* */ -- {{'u', '!'}, 249}, /* */ -- {{'u', '\''}, 250}, /* */ -- {{'u', '^'}, 251}, /* */ -- {{'u', '>'}, 251}, /* */ -- {{'u', '"'}, 252}, /* */ -- {{'u', ':'}, 252}, /* */ -- {{'y', '\''}, 253}, /* */ -- {{'i', 'p'}, 254}, /* */ -- {{'t', 'h'}, 254}, /* */ -- {{'y', '"'}, 255}, /* */ -- {{'y', ':'}, 255}, /* */ -- {{'"', '['}, 196}, /* */ -- {{'"', '\\'}, 214}, /* */ -- {{'"', ']'}, 220}, /* */ -- {{'"', '{'}, 228}, /* */ -- {{'"', '|'}, 246}, /* */ -- {{'"', '}'}, 252}, /* */ -- {{'"', '~'}, 223} /* */ -+ {{' ', ' '}, 0x00a0}, /* NO-BREAK SPACE */ -+ {{'N', 'S'}, 0x00a0}, /* NO-BREAK SPACE */ -+ {{'~', '!'}, 0x00a1}, /* INVERTED EXCLAMATION MARK */ -+ {{'!', '!'}, 0x00a1}, /* INVERTED EXCLAMATION MARK */ -+ {{'!', 'I'}, 0x00a1}, /* INVERTED EXCLAMATION MARK */ -+ {{'c', '|'}, 0x00a2}, /* CENT SIGN */ -+ {{'c', 't'}, 0x00a2}, /* CENT SIGN */ -+ {{'$', '$'}, 0x00a3}, /* POUND SIGN */ -+ {{'P', 'd'}, 0x00a3}, /* POUND SIGN */ -+ {{'o', 'x'}, 0x00a4}, /* CURRENCY SIGN */ -+ {{'C', 'u'}, 0x00a4}, /* CURRENCY SIGN */ -+ {{'C', 'u'}, 0x00a4}, /* CURRENCY SIGN */ -+ {{'E', 'u'}, 0x00a4}, /* CURRENCY SIGN */ -+ {{'Y', '-'}, 0x00a5}, /* YEN SIGN */ -+ {{'Y', 'e'}, 0x00a5}, /* YEN SIGN */ -+ {{'|', '|'}, 0x00a6}, /* BROKEN BAR */ -+ {{'B', 'B'}, 0x00a6}, /* BROKEN BAR */ -+ {{'p', 'a'}, 0x00a7}, /* SECTION SIGN */ -+ {{'S', 'E'}, 0x00a7}, /* SECTION SIGN */ -+ {{'"', '"'}, 0x00a8}, /* DIAERESIS */ -+ {{'\'', ':'}, 0x00a8}, /* DIAERESIS */ -+ {{'c', 'O'}, 0x00a9}, /* COPYRIGHT SIGN */ -+ {{'C', 'o'}, 0x00a9}, /* COPYRIGHT SIGN */ -+ {{'-', 'a'}, 0x00aa}, /* FEMININE ORDINAL INDICATOR */ -+ {{'<', '<'}, 0x00ab}, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ -+ {{'-', ','}, 0x00ac}, /* NOT SIGN */ -+ {{'N', 'O'}, 0x00ac}, /* NOT SIGN */ -+ {{'-', '-'}, 0x00ad}, /* SOFT HYPHEN */ -+ {{'r', 'O'}, 0x00ae}, /* REGISTERED SIGN */ -+ {{'R', 'g'}, 0x00ae}, /* REGISTERED SIGN */ -+ {{'-', '='}, 0x00af}, /* MACRON */ -+ {{'\'', 'm'}, 0x00af}, /* MACRON */ -+ {{'~', 'o'}, 0x00b0}, /* DEGREE SIGN */ -+ {{'D', 'G'}, 0x00b0}, /* DEGREE SIGN */ -+ {{'+', '-'}, 0x00b1}, /* PLUS-MINUS SIGN */ -+ {{'2', '2'}, 0x00b2}, /* SUPERSCRIPT TWO */ -+ {{'2', 'S'}, 0x00b2}, /* SUPERSCRIPT TWO */ -+ {{'3', '3'}, 0x00b3}, /* SUPERSCRIPT THREE */ -+ {{'3', 'S'}, 0x00b3}, /* SUPERSCRIPT THREE */ -+ {{'\'', '\''}, 0x00b4}, /* ACUTE ACCENT */ -+ {{'j', 'u'}, 0x00b5}, /* MICRO SIGN */ -+ {{'M', 'y'}, 0x00b5}, /* MICRO SIGN */ -+ {{'p', 'p'}, 0x00b6}, /* PILCROW SIGN */ -+ {{'P', 'I'}, 0x00b6}, /* PILCROW SIGN */ -+ {{'~', '.'}, 0x00b7}, /* MIDDLE DOT */ -+ {{'.', 'M'}, 0x00b7}, /* MIDDLE DOT */ -+ {{',', ','}, 0x00b8}, /* CEDILLA */ -+ {{'\'', ','}, 0x00b8}, /* CEDILLA */ -+ {{'1', '1'}, 0x00b9}, /* SUPERSCRIPT ONE */ -+ {{'1', 'S'}, 0x00b9}, /* SUPERSCRIPT ONE */ -+ {{'-', 'o'}, 0x00ba}, /* MASCULINE ORDINAL INDICATOR */ -+ {{'>', '>'}, 0x00bb}, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ -+ {{'1', '4'}, 0x00bc}, /* VULGAR FRACTION ONE QUARTER */ -+ {{'1', '2'}, 0x00bd}, /* VULGAR FRACTION ONE HALF */ -+ {{'3', '4'}, 0x00be}, /* VULGAR FRACTION THREE QUARTERS */ -+ {{'~', '?'}, 0x00bf}, /* INVERTED QUESTION MARK */ -+ {{'?', '?'}, 0x00bf}, /* INVERTED QUESTION MARK */ -+ {{'?', 'I'}, 0x00bf}, /* INVERTED QUESTION MARK */ -+ {{'A', '`'}, 0x00c0}, /* LATIN CAPITAL LETTER A WITH GRAVE */ -+ {{'A', '!'}, 0x00c0}, /* LATIN CAPITAL LETTER A WITH GRAVE */ -+ {{'A', '\''}, 0x00c1}, /* LATIN CAPITAL LETTER A WITH ACUTE */ -+ {{'A', '^'}, 0x00c2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ -+ {{'A', '>'}, 0x00c2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ -+ {{'A', '~'}, 0x00c3}, /* LATIN CAPITAL LETTER A WITH TILDE */ -+ {{'A', '?'}, 0x00c3}, /* LATIN CAPITAL LETTER A WITH TILDE */ -+ {{'A', '"'}, 0x00c4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */ -+ {{'A', ':'}, 0x00c4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */ -+ {{'A', '@'}, 0x00c5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */ -+ {{'A', 'A'}, 0x00c5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */ -+ {{'A', 'E'}, 0x00c6}, /* LATIN CAPITAL LETTER AE */ -+ {{'C', ','}, 0x00c7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */ -+ {{'E', '`'}, 0x00c8}, /* LATIN CAPITAL LETTER E WITH GRAVE */ -+ {{'E', '!'}, 0x00c8}, /* LATIN CAPITAL LETTER E WITH GRAVE */ -+ {{'E', '\''}, 0x00c9}, /* LATIN CAPITAL LETTER E WITH ACUTE */ -+ {{'E', '^'}, 0x00ca}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ -+ {{'E', '>'}, 0x00ca}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ -+ {{'E', '"'}, 0x00cb}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */ -+ {{'E', ':'}, 0x00cb}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */ -+ {{'I', '`'}, 0x00cc}, /* LATIN CAPITAL LETTER I WITH GRAVE */ -+ {{'I', '!'}, 0x00cc}, /* LATIN CAPITAL LETTER I WITH GRAVE */ -+ {{'I', '\''}, 0x00cd}, /* LATIN CAPITAL LETTER I WITH ACUTE */ -+ {{'I', '^'}, 0x00ce}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ -+ {{'I', '>'}, 0x00ce}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ -+ {{'I', '"'}, 0x00cf}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */ -+ {{'I', ':'}, 0x00cf}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */ -+ {{'D', '-'}, 0x00d0}, /* LATIN CAPITAL LETTER ETH */ -+ {{'N', '~'}, 0x00d1}, /* LATIN CAPITAL LETTER N WITH TILDE */ -+ {{'N', '?'}, 0x00d1}, /* LATIN CAPITAL LETTER N WITH TILDE */ -+ {{'O', '`'}, 0x00d2}, /* LATIN CAPITAL LETTER O WITH GRAVE */ -+ {{'O', '!'}, 0x00d2}, /* LATIN CAPITAL LETTER O WITH GRAVE */ -+ {{'O', '\''}, 0x00d3}, /* LATIN CAPITAL LETTER O WITH ACUTE */ -+ {{'O', '^'}, 0x00d4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ -+ {{'O', '>'}, 0x00d4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ -+ {{'O', '~'}, 0x00d5}, /* LATIN CAPITAL LETTER O WITH TILDE */ -+ {{'O', '?'}, 0x00d5}, /* LATIN CAPITAL LETTER O WITH TILDE */ -+ {{'O', '"'}, 0x00d6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */ -+ {{'O', ':'}, 0x00d6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */ -+ {{'/', '\\'}, 0x00d7}, /* MULTIPLICATION SIGN */ -+ {{'*', 'x'}, 0x00d7}, /* MULTIPLICATION SIGN */ -+ {{'O', '/'}, 0x00d8}, /* LATIN CAPITAL LETTER O WITH STROKE */ -+ {{'U', '`'}, 0x00d9}, /* LATIN CAPITAL LETTER U WITH GRAVE */ -+ {{'U', '!'}, 0x00d9}, /* LATIN CAPITAL LETTER U WITH GRAVE */ -+ {{'U', '\''}, 0x00da}, /* LATIN CAPITAL LETTER U WITH ACUTE */ -+ {{'U', '^'}, 0x00db}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ -+ {{'U', '>'}, 0x00db}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ -+ {{'U', '"'}, 0x00dc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */ -+ {{'U', ':'}, 0x00dc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */ -+ {{'Y', '\''}, 0x00dd}, /* LATIN CAPITAL LETTER Y WITH ACUTE */ -+ {{'I', 'p'}, 0x00de}, /* LATIN CAPITAL LETTER THORN */ -+ {{'T', 'H'}, 0x00de}, /* LATIN CAPITAL LETTER THORN */ -+ {{'s', 's'}, 0x00df}, /* LATIN SMALL LETTER SHARP S */ -+ {{'s', '"'}, 0x00df}, /* LATIN SMALL LETTER SHARP S */ -+ {{'a', '`'}, 0x00e0}, /* LATIN SMALL LETTER A WITH GRAVE */ -+ {{'a', '!'}, 0x00e0}, /* LATIN SMALL LETTER A WITH GRAVE */ -+ {{'a', '\''}, 0x00e1}, /* LATIN SMALL LETTER A WITH ACUTE */ -+ {{'a', '^'}, 0x00e2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ -+ {{'a', '>'}, 0x00e2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ -+ {{'a', '~'}, 0x00e3}, /* LATIN SMALL LETTER A WITH TILDE */ -+ {{'a', '?'}, 0x00e3}, /* LATIN SMALL LETTER A WITH TILDE */ -+ {{'a', '"'}, 0x00e4}, /* LATIN SMALL LETTER A WITH DIAERESIS */ -+ {{'a', ':'}, 0x00e4}, /* LATIN SMALL LETTER A WITH DIAERESIS */ -+ {{'a', 'a'}, 0x00e5}, /* LATIN SMALL LETTER A WITH RING ABOVE */ -+ {{'a', 'e'}, 0x00e6}, /* LATIN SMALL LETTER AE */ -+ {{'c', ','}, 0x00e7}, /* LATIN SMALL LETTER C WITH CEDILLA */ -+ {{'e', '`'}, 0x00e8}, /* LATIN SMALL LETTER E WITH GRAVE */ -+ {{'e', '!'}, 0x00e8}, /* LATIN SMALL LETTER E WITH GRAVE */ -+ {{'e', '\''}, 0x00e9}, /* LATIN SMALL LETTER E WITH ACUTE */ -+ {{'e', '^'}, 0x00ea}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ -+ {{'e', '>'}, 0x00ea}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ -+ {{'e', '"'}, 0x00eb}, /* LATIN SMALL LETTER E WITH DIAERESIS */ -+ {{'e', ':'}, 0x00eb}, /* LATIN SMALL LETTER E WITH DIAERESIS */ -+ {{'i', '`'}, 0x00ec}, /* LATIN SMALL LETTER I WITH GRAVE */ -+ {{'i', '!'}, 0x00ec}, /* LATIN SMALL LETTER I WITH GRAVE */ -+ {{'i', '\''}, 0x00ed}, /* LATIN SMALL LETTER I WITH ACUTE */ -+ {{'i', '^'}, 0x00ee}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ -+ {{'i', '>'}, 0x00ee}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ -+ {{'i', '"'}, 0x00ef}, /* LATIN SMALL LETTER I WITH DIAERESIS */ -+ {{'i', ':'}, 0x00ef}, /* LATIN SMALL LETTER I WITH DIAERESIS */ -+ {{'d', '-'}, 0x00f0}, /* LATIN SMALL LETTER ETH */ -+ {{'n', '~'}, 0x00f1}, /* LATIN SMALL LETTER N WITH TILDE */ -+ {{'n', '?'}, 0x00f1}, /* LATIN SMALL LETTER N WITH TILDE */ -+ {{'o', '`'}, 0x00f2}, /* LATIN SMALL LETTER O WITH GRAVE */ -+ {{'o', '!'}, 0x00f2}, /* LATIN SMALL LETTER O WITH GRAVE */ -+ {{'o', '\''}, 0x00f3}, /* LATIN SMALL LETTER O WITH ACUTE */ -+ {{'o', '^'}, 0x00f4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ -+ {{'o', '>'}, 0x00f4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ -+ {{'o', '~'}, 0x00f5}, /* LATIN SMALL LETTER O WITH TILDE */ -+ {{'o', '?'}, 0x00f5}, /* LATIN SMALL LETTER O WITH TILDE */ -+ {{'o', '"'}, 0x00f6}, /* LATIN SMALL LETTER O WITH DIAERESIS */ -+ {{'o', ':'}, 0x00f6}, /* LATIN SMALL LETTER O WITH DIAERESIS */ -+ {{'-', ':'}, 0x00f7}, /* DIVISION SIGN */ -+ {{'o', '/'}, 0x00f8}, /* LATIN SMALL LETTER O WITH STROKE */ -+ {{'u', '`'}, 0x00f9}, /* LATIN SMALL LETTER U WITH GRAVE */ -+ {{'u', '!'}, 0x00f9}, /* LATIN SMALL LETTER U WITH GRAVE */ -+ {{'u', '\''}, 0x00fa}, /* LATIN SMALL LETTER U WITH ACUTE */ -+ {{'u', '^'}, 0x00fb}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ -+ {{'u', '>'}, 0x00fb}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ -+ {{'u', '"'}, 0x00fc}, /* LATIN SMALL LETTER U WITH DIAERESIS */ -+ {{'u', ':'}, 0x00fc}, /* LATIN SMALL LETTER U WITH DIAERESIS */ -+ {{'y', '\''}, 0x00fd}, /* LATIN SMALL LETTER Y WITH ACUTE */ -+ {{'i', 'p'}, 0x00fe}, /* LATIN SMALL LETTER THORN */ -+ {{'t', 'h'}, 0x00fe}, /* LATIN SMALL LETTER THORN */ -+ {{'y', '"'}, 0x00ff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */ -+ {{'y', ':'}, 0x00ff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */ -+ {{'"', '['}, 0x00c4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */ -+ {{'"', '\\'}, 0x00d6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */ -+ {{'"', ']'}, 0x00dc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */ -+ {{'"', '{'}, 0x00e4}, /* LATIN SMALL LETTER A WITH DIAERESIS */ -+ {{'"', '|'}, 0x00f6}, /* LATIN SMALL LETTER O WITH DIAERESIS */ -+ {{'"', '}'}, 0x00fc}, /* LATIN SMALL LETTER U WITH DIAERESIS */ -+ {{'"', '~'}, 0x00df}, /* LATIN SMALL LETTER SHARP S */ - }; - - #define RESIZE_FLAG_H 1 diff --git a/source/ap/screen/45suppress_remap.patch b/source/ap/screen/45suppress_remap.patch deleted file mode 100644 index 85109a2ef..000000000 --- a/source/ap/screen/45suppress_remap.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Loic Minier <lool@dooz.org> -Description: Unbreak several useful keybindings. ---- a/termcap.c -+++ b/termcap.c -@@ -552,8 +552,6 @@ - else - break; - } -- if (n < KMAP_KEYS) -- domap = 1; - if (map == 0 && domap) - return 0; - if (map && !domap) diff --git a/source/ap/screen/52fix_screen_utf8_nfd.patch b/source/ap/screen/52fix_screen_utf8_nfd.patch deleted file mode 100644 index 0aa72d5ed..000000000 --- a/source/ap/screen/52fix_screen_utf8_nfd.patch +++ /dev/null @@ -1,41 +0,0 @@ -## 52fix_screen_utf8_nfd.dpatch by Nobuhiro Iwamatsu <iwamatsu@debian.org> -## -## DP: screen outputs screen "ÿ" after a connected character. -## DP: This is a character without the need. -## DP: This happens in UTF-8 environment. -## DP: Before : screen$ ruby1.9.1 -e 'puts "\u304b\u3099.."' -## DP: がÿ... -## DP: patch applied : screen $ ruby1.9.1 -e 'puts "\u304b\u3099.."' -## DP: が.. -## DP: Report from http://d.hatena.ne.jp/mrkn/20101014/fix_screen_utf8_nfd_bug -## DP: Copyright Kenta Murata (mrkn) <mrkn@ruby-lang.org> -## DP: Modified by Nobuhiro Iwamatsu <iwamatsu@debian.org> - -Index: screen/ansi.c -=================================================================== ---- screen.orig/ansi.c 2012-03-20 22:15:02.000000000 +0100 -+++ screen/ansi.c 2012-03-20 22:41:45.000000000 +0100 -@@ -725,6 +725,10 @@ - LPutChar(&curr->w_layer, &omc, ox, oy); - LGotoPos(&curr->w_layer, curr->w_x, curr->w_y); - } -+ if (curr->w_mbcs) -+ { -+ curr->w_rend.mbcs = curr->w_mbcs = 0; -+ } - break; - } - font = curr->w_rend.font; -Index: screen/display.c -=================================================================== ---- screen.orig/display.c 2012-03-20 22:41:28.000000000 +0100 -+++ screen/display.c 2012-03-20 22:41:45.000000000 +0100 -@@ -603,7 +603,7 @@ - D_x += D_AM ? 1 : -1; - D_mbcs = 0; - } -- else if (utf8_isdouble(c)) -+ else if (utf8_isdouble(c) || (c >= 0xd800 && c < 0xe000)) - { - D_mbcs = c; - D_x++; diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild index b781023dc..3353606c8 100755 --- a/source/ap/screen/screen.SlackBuild +++ b/source/ap/screen/screen.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2022, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=screen VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,14 +44,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -78,10 +75,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Apply patches taken from Debian: +# Apply patches^H^H taken from Debian: for pf in \ - 26source_encoding.patch.gz \ - 45suppress_remap.patch.gz \ 52fix_screen_utf8_nfd.patch.gz \ ; do zcat $CWD/$pf | patch --verbose -p1 || exit 1 done diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index d82701655..ec9d0d1d1 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -98,7 +98,6 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ - --with-python3-stable-abi=no \ --with-compiledby="<volkerdi@slackware.com>" \ --build=$ARCH-slackware-linux || exit 1 } diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index c66d3a08b..ff6e8de6e 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -141,7 +141,6 @@ CFLAGS="$SLKCFLAGS" \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ - --with-python3-stable-abi=no \ --with-compiledby="<volkerdi@slackware.com>" \ --build=$ARCH-slackware-linux || exit 1 } diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url index 4b1a6372a..e5f61a141 100644 --- a/source/d/cmake/cmake.url +++ b/source/d/cmake/cmake.url @@ -1,2 +1,2 @@ https://github.com/Kitware/CMake/releases -https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2.tar.gz +https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3.tar.gz diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index 24b1d9e0f..e23853e0c 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -2,7 +2,7 @@ # GCC package build script (written by volkerdi@slackware.com) # # Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -52,12 +52,29 @@ # efficient on modern CPUs running in 32-bit mode than the alternate i586 # instructions. No need to throw i586 CPUs under the bus (yet). +# Some more notes, Wed Aug 28 19:41:13 UTC 2024: +# +# Time to throw i586 CPUs and any others that lack SSE2 under the bus. +# Sorry, but upstream projects have begun to ignore -march= enough that there +# just isn't enough upside to try to keep things even at -march=i686 as a +# baseline. Might as well get some SIMD enhancement and quit killing +# performance in a futile attempt to support computers that are in landfills. + cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +# Which compilers do we want to build? +LANGS=${LANGS:-'ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust'} + +# An optional tag for after the version number in the package's filename: +#VERTAG=_multilib + +# An optional tag for after the build number in the package's filename: +#TAG=alien # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -73,19 +90,28 @@ if [ -z "$ARCH" ]; then export ARCH fi +# Try to figure out if we want multilib (or set MULTILIB= manually). +# BTW, --disable-multilib is only ever used on x86_64. +# Using it elsewhere will break the build. +if [ "$ARCH" = "x86_64" -a ! -L /lib/ld-linux.so.2 ]; then + MULTILIB=${MULTILIB:-"--disable-multilib"} +else + MULTILIB=${MULTILIB:-"--enable-multilib"} +fi + # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "gcc-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-g++-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-gfortran-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-gnat-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-objc-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-go-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-gdc-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-gm2-$VERSION-$ARCH-$BUILD.txz" - echo "gcc-rust-$VERSION-$ARCH-$BUILD.txz" + echo "gcc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-g++-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-gfortran-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-gnat-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-objc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-go-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-gdc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-gm2-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "gcc-rust-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" exit 0 fi @@ -329,17 +355,10 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 ( mkdir gcc.build.lnx cd gcc.build.lnx - # I think it's incorrect to include this option (as it'll end up set - # to i586 on x86 platforms), and we want to tune the binary structure - # for i686, as that's where almost all of the optimization speedups - # are to be found. - # Correct me if my take on this is wrong. - # --with-cpu=$ARCH - - if [ "$ARCH" != "x86_64" ]; then - GCC_ARCHOPTS="--with-arch=$ARCH" + if [ "$ARCH" = "x86_64" ]; then + GCC_ARCHOPTS="--with-arch=x86-64" else - GCC_ARCHOPTS="--disable-multilib" + GCC_ARCHOPTS="--with-arch=$ARCH" fi CFLAGS="$SLKCFLAGS" \ @@ -350,10 +369,9 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 --infodir=/usr/info \ --enable-shared \ --enable-bootstrap \ - --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust \ + --enable-languages=${LANGS} \ --enable-threads=posix \ --enable-checking=release \ - --enable-objc-gc \ --with-system-zlib \ --enable-libstdcxx-dual-abi \ --with-default-libstdcxx-abi=new \ @@ -361,6 +379,7 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 --disable-libunwind-exceptions \ --enable-__cxa_atexit \ --disable-libssp \ + --enable-gnu-indirect-function \ --enable-gnu-unique-object \ --enable-plugin \ --enable-lto \ @@ -373,6 +392,7 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 --disable-gtktest \ --enable-clocale=gnu \ $GCC_ARCHOPTS \ + $MULTILIB \ --target=${TARGET} \ --build=${TARGET} \ --host=${TARGET} || exit 1 @@ -410,8 +430,9 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs fi - # Make our 64bit gcc look for 32bit gcc binaries in ./32 subdirectory: - if [ "$ARCH" = "x86_64" ]; then + # Make our 64bit gcc look for 32bit gcc binaries in ./32 subdirectory. + # This is needed only for x86_64 + --disable-multilib. + if [ "$ARCH" = "x86_64" -a "$MULTILIB" = "--disable-multilib" ]; then sed -i 's#;.\(:../lib !m64 m32;\)$#;32\1#' \ $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs fi @@ -477,17 +498,8 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 # keep a log: ) 2>&1 | tee gcc.build.log -# Filter all .la files (thanks much to Mark Post for the sed script): -( cd $PKG1 - for file in $(find . -type f -name "*.la") ; do - cat $file | sed -e 's%-L/gcc-[[:graph:]]* % %g' > $TMP/tmp-la-file - cat $TMP/tmp-la-file > $file - done - rm $TMP/tmp-la-file -) - -# Don't ship .la files in /{,usr/}lib${LIBDIRSUFFIX}: -rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Don't ship any .la files: +find $PKG1 -name "*.la" -exec rm -f "{}" \; # Strip bloated binaries and libraries: ( cd $PKG1 @@ -499,6 +511,13 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) +# Will we need to install multilib files? +if [ "$ARCH" = "x86_64" -a "$MULTILIB" = "--enable-multilib" ]; then + INSTALL_MULTILIB="YES" +else + INSTALL_MULTILIB="NO" +fi + # OK, time to split the big package where needed: # gcc-g++: @@ -507,8 +526,6 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la mv $PKG1/usr/bin/*++* usr/bin mkdir -p usr/include mv $PKG1/usr/include/c++ usr/include - mkdir -p usr/lib${LIBDIRSUFFIX} - mv $PKG1/usr/lib${LIBDIRSUFFIX}/*++* usr/lib${LIBDIRSUFFIX} mkdir -p usr/libexec/gcc/$TARGET/$VERSION mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1plus usr/libexec/gcc/$TARGET/$VERSION/cc1plus mkdir -p usr/man/man1 @@ -521,6 +538,13 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la # This symlink will ease the headaches associated with changing our target: ln -sf i686-slackware-linux $PKG2/usr/include/c++/$VERSION/i586-slackware-linux fi + # Libraries: + mkdir -p usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/*++* usr/lib${LIBDIRSUFFIX} + if [ "$INSTALL_MULTILIB" = "YES" ]; then + mkdir -p usr/lib + mv $PKG1/usr/lib/*++* usr/lib + fi ) # gcc-gfortran: @@ -533,16 +557,24 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la ( cd usr/bin ; ln -sf gfortran-gcc-${VERSION} fortran ) mkdir -p usr/info mv $PKG1/usr/info/gfortran* usr/info - mkdir -p usr/lib${LIBDIRSUFFIX} - mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgfortran* usr/lib${LIBDIRSUFFIX} - mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION - mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/finclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION - mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION mkdir -p usr/libexec/gcc/$TARGET/$VERSION mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/f951 usr/libexec/gcc/$TARGET/$VERSION/f951 mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/libgfortran* usr/libexec/gcc/$TARGET/$VERSION mkdir -p usr/man/man1 mv $PKG1/usr/man/man1/gfortran* usr/man/man1 + # Libraries: + mkdir -p usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgfortran* usr/lib${LIBDIRSUFFIX} + mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION + mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/finclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION + mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION + if [ "$INSTALL_MULTILIB" = "YES" ]; then + mkdir -p usr/lib + mv $PKG1/usr/lib/libgfortran* usr/lib + mkdir -p usr/lib/gcc/$TARGET/$VERSION + mv $PKG1/usr/lib/gcc/$TARGET/$VERSION/finclude usr/lib/gcc/$TARGET/$VERSION + mv $PKG1/usr/lib/gcc/$TARGET/$VERSION/libgfortran* usr/lib/gcc/$TARGET/$VERSION + fi ) # gcc-gnat: @@ -554,31 +586,41 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la mv $PKG1/usr/info/gnat* usr/info mkdir -p usr/libexec/gcc/$TARGET/$VERSION mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/gnat1 usr/libexec/gcc/$TARGET/$VERSION + # Libraries: mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adainclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adalib usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION + if [ "$INSTALL_MULTILIB" = "YES" ]; then + mkdir -p usr/lib/gcc/$TARGET/$VERSION + mkdir -p usr/lib64/gcc/$TARGET/$VERSION/32 + mv $PKG1/usr/lib64/gcc/$TARGET/$VERSION/32/adainclude usr/lib/gcc/$TARGET/$VERSION + ln -sf /usr/lib/gcc/$TARGET/$VERSION/adainclude usr/lib64/gcc/$TARGET/$VERSION/32/adainclude + mv $PKG1/usr/lib64/gcc/$TARGET/$VERSION/32/adalib usr/lib/gcc/$TARGET/$VERSION + ln -sf /usr/lib/gcc/$TARGET/$VERSION/adalib usr/lib64/gcc/$TARGET/$VERSION/32/adalib + fi ) # gcc-objc: ( cd $PKG6 - mkdir -p usr/lib${LIBDIRSUFFIX} - mv $PKG1/usr/lib${LIBDIRSUFFIX}/libobjc* usr/lib${LIBDIRSUFFIX} mkdir -p usr/libexec/gcc/$TARGET/$VERSION mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1obj usr/libexec/gcc/$TARGET/$VERSION mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1objplus usr/libexec/gcc/$TARGET/$VERSION mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/objc usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/cc1objplus usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include + # Libraries: + # As a rule, we don't package static libraries. + rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libobjc.a + mkdir -p usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/libobjc* usr/lib${LIBDIRSUFFIX} + if [ "$INSTALL_MULTILIB" = "YES" ]; then + # As a rule, we don't package static libraries. + rm -f $PKG1/usr/lib/libobjc.a + mkdir -p usr/lib + mv $PKG1/usr/lib/libobjc* usr/lib + fi ) -## NOTE: Thought about this, because the precompiled headers are so large. -## Probably easier to keep everything together, though. -## gcc-g++-gch (precompiled c++ headers) -#( cd $PKG7 -# mkdir -p usr/include/c++/$VERSION/$TARGET/bits -# mv $PKG2/usr/include/c++/$VERSION/$TARGET/bits/stdc++.h.gch usr/include/c++/$VERSION/$TARGET/bits -#) - # gcc-go: ( cd $PKG8 mkdir -p usr/bin @@ -588,47 +630,71 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/{cgo,go1} usr/libexec/gcc/$TARGET/$VERSION mkdir -p usr/info mv $PKG1/usr/info/gccgo.info.gz usr/info + mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/go.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/gofmt.1.gz usr/man/man1 + # Libraries: mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX} - if [ -r $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.la ]; then - mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.la usr/lib${LIBDIRSUFFIX} - fi mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.so*,libgobegin.a,libgolibbegin.a} usr/lib${LIBDIRSUFFIX} || exit 1 # Don't package the (bloated) libgo.a. As a rule, we don't package static libraries. rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.a - mkdir -p usr/man/man1 - mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1 - mv $PKG1/usr/man/man1/go.1.gz usr/man/man1 - mv $PKG1/usr/man/man1/gofmt.1.gz usr/man/man1 + if [ "$INSTALL_MULTILIB" = "YES" ]; then + mkdir -p usr/lib + mv $PKG1/usr/lib/go usr/lib + mv $PKG1/usr/lib/{libgo.so*,libgobegin.a,libgolibbegin.a} usr/lib || exit 1 + # Don't package the (bloated) libgo.a. As a rule, we don't package static libraries. + rm -f $PKG1/usr/lib/libgo.a + fi ) || exit 1 # gcc-gdc: ( cd $PKG10 mkdir -p usr/bin mv $PKG1/usr/bin/gdc $PKG1/usr/bin/*-gdc usr/bin + mkdir -p usr/libexec/gcc/$TARGET/$VERSION + mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/d21 usr/libexec/gcc/$TARGET/$VERSION + mkdir -p usr/info + mv $PKG1/usr/info/gdc.info.gz usr/info + mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/gdc.1.gz usr/man/man1 + # Libraries: mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgdruntime* usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgphobos* usr/lib${LIBDIRSUFFIX} + mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include + mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/d usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include ## COMMENTED OUT: defaults to static linking and that default does not ## seem to be easlity changed... ## Don't package the (bloated) libgphobos.a or libgdruntime.a. ## As a rule, we don't package static libraries. #rm -f usr/lib${LIBDIRSUFFIX}/libgphobos.a #rm -f usr/lib${LIBDIRSUFFIX}/libgdruntime.a - mkdir -p usr/libexec/gcc/$TARGET/$VERSION - mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/d21 usr/libexec/gcc/$TARGET/$VERSION - mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include - mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/d usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include - mkdir -p usr/info - mv $PKG1/usr/info/gdc.info.gz usr/info - mkdir -p usr/man/man1 - mv $PKG1/usr/man/man1/gdc.1.gz usr/man/man1 -) || exit 1 + if [ "$INSTALL_MULTILIB" = "YES" ]; then + mkdir -p usr/lib + mv $PKG1/usr/lib/libgdruntime* usr/lib + mv $PKG1/usr/lib/libgphobos* usr/lib + mkdir -p usr/lib/gcc/$TARGET/$VERSION/include + mv $PKG1/usr/lib/gcc/$TARGET/$VERSION/include/d usr/lib/gcc/$TARGET/$VERSION/include + ## COMMENTED OUT: defaults to static linking and that default does not + ## seem to be easlity changed... + ## Don't package the (bloated) libgphobos.a or libgdruntime.a. + ## As a rule, we don't package static libraries. + #rm -f usr/lib/libgphobos.a + #rm -f usr/lib/libgdruntime.a + fi +) # gcc-gm2: ( cd $PKG11 mkdir -p usr/bin mv $PKG1/usr/bin/gm2 $PKG1/usr/bin/*-gm2 usr/bin + mkdir -p usr/libexec/gcc/$TARGET/$VERSION + mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1gm2 usr/libexec/gcc/$TARGET/$VERSION + mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/gm2.1.gz usr/man/man1 + # Libraries: mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/plugin mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/m2 usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/plugin/m2* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/plugin @@ -639,11 +705,19 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la rm -f $(basename $library .so).a done ) - mkdir -p usr/libexec/gcc/$TARGET/$VERSION - mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1gm2 usr/libexec/gcc/$TARGET/$VERSION - mkdir -p usr/man/man1 - mv $PKG1/usr/man/man1/gm2.1.gz usr/man/man1 -) || exit 1 + if [ "$INSTALL_MULTILIB" = "YES" ]; then + mkdir -p usr/lib/gcc/$TARGET/$VERSION/plugin + mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/m2 usr/lib/gcc/$TARGET/$VERSION + mv $PKG1/usr/lib/gcc/$TARGET/$VERSION/plugin/m2* usr/lib/gcc/$TARGET/$VERSION/plugin + mv $PKG1/usr/lib/libm2* usr/lib + # As a rule, we don't package static libraries: + ( cd usr/lib + for library in libm2*.so ; do + rm -f $(basename $library .so).a + done + ) + fi +) # gcc-rust: ( cd $PKG12 @@ -655,23 +729,23 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la # Generate packages: ( cd $PKG1 - makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG2 - makepkg -l y -c n $TMP/gcc-g++-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-g++-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG3 - makepkg -l y -c n $TMP/gcc-gfortran-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-gfortran-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG4 - makepkg -l y -c n $TMP/gcc-gnat-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-gnat-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG6 - makepkg -l y -c n $TMP/gcc-objc-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-objc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG8 - makepkg -l y -c n $TMP/gcc-go-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-go-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG10 - makepkg -l y -c n $TMP/gcc-gdc-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-gdc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG11 - makepkg -l y -c n $TMP/gcc-gm2-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-gm2-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) ( cd $PKG12 - makepkg -l y -c n $TMP/gcc-rust-$VERSION-$ARCH-$BUILD.txz ) + makepkg -l y -c n $TMP/gcc-rust-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz ) echo echo "Slackware GCC package build complete!" diff --git a/source/d/gcc/libgccjit.SlackBuild b/source/d/gcc/libgccjit.SlackBuild index 85bf29a16..f1c8c0917 100755 --- a/source/d/gcc/libgccjit.SlackBuild +++ b/source/d/gcc/libgccjit.SlackBuild @@ -164,7 +164,7 @@ fi --infodir=/usr/info \ --enable-shared \ --enable-host-shared \ - --enable-bootstrap \ + --disable-bootstrap \ --enable-languages=jit \ --enable-threads=posix \ --enable-checking=release \ @@ -192,12 +192,12 @@ fi --build=${TARGET} \ --host=${TARGET} || exit 1 - make $NUMJOBS bootstrap || exit 1 + make $NUMJOBS || exit 1 make -C gcc DESTDIR=$PKG jit.install-common jit.install-info || exit 1 ) || exit 1 -# Don't ship .la files in /{,usr/}lib${LIBDIRSUFFIX}: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Don't ship any .la files: +find $PKG1 -name "*.la" -exec rm -f "{}" \; # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/d/gcc/slack-desc.gcc b/source/d/gcc/slack-desc.gcc index 34902fb24..7f22056be 100644 --- a/source/d/gcc/slack-desc.gcc +++ b/source/d/gcc/slack-desc.gcc @@ -12,7 +12,7 @@ gcc: GCC is the GNU Compiler Collection. gcc: gcc: This package contains those parts of the compiler collection needed to gcc: compile C code. Other packages add Ada, C++, D, Fortran, Go, Modula-2, -gcc: and Objective-C/C++ support to the compiler core. +gcc: Objective-C/C++, and Rust support to the compiler core. gcc: gcc: gcc: diff --git a/source/k/kernel-configs/config-6.10.6-generic.ia32 b/source/k/kernel-configs/config-6.10.7-generic.ia32 index 3bf54a729..46b488de0 100644 --- a/source/k/kernel-configs/config-6.10.6-generic.ia32 +++ b/source/k/kernel-configs/config-6.10.7-generic.ia32 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.10.6 Kernel Configuration +# Linux/x86 6.10.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -288,7 +288,6 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y diff --git a/source/k/kernel-configs/config-6.10.6-generic.x64 b/source/k/kernel-configs/config-6.10.7-generic.x64 index 73a10a87d..53a3c8c9d 100644 --- a/source/k/kernel-configs/config-6.10.6-generic.x64 +++ b/source/k/kernel-configs/config-6.10.7-generic.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.10.6 Kernel Configuration +# Linux/x86 6.10.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -297,7 +297,6 @@ CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y diff --git a/source/k/kernel-configs/config-6.10.6-huge.ia32 b/source/k/kernel-configs/config-6.10.7-huge.ia32 index 9442f3f50..659c36485 100644 --- a/source/k/kernel-configs/config-6.10.6-huge.ia32 +++ b/source/k/kernel-configs/config-6.10.7-huge.ia32 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.10.6 Kernel Configuration +# Linux/x86 6.10.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -288,7 +288,6 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y diff --git a/source/k/kernel-configs/config-6.10.6-huge.x64 b/source/k/kernel-configs/config-6.10.7-huge.x64 index f91c873a4..f44bfb5bc 100644 --- a/source/k/kernel-configs/config-6.10.6-huge.x64 +++ b/source/k/kernel-configs/config-6.10.7-huge.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.10.6 Kernel Configuration +# Linux/x86 6.10.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -297,7 +297,6 @@ CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index e509d1abe..38d11fc27 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -20,12 +20,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Extended to build 32-bit compatibility libraries on x86_64, +# by Fred Emmott <mail@fredemmott.co.uk>. No copyright claim. +# Simplified to produce combined packages (no separate compat-32), +# by Eric Hameleers <alien@slackware.com> +# Merged into main glibc.SlackBuild and adjusted to be capable of +# building as pure 64-bit, pure 32-bit, or multilib +# by Patrick Volkerding <volkerdi@slackware.com> + cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} + +# An optional tag for after the version number in the package's filename: +#VERTAG=_multilib + +# An optional tag for after the build number in the package's filename: +#TAG=alien # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -40,18 +54,26 @@ if [ -z "$ARCH" ]; then esac fi +# Try to figure out if we want multilib (or set MULTILIB= manually): +if [ "$ARCH" = "x86_64" -a -f /usr/lib/libgcc_s.so ]; then + MULTILIB=${MULTILIB:-"--enable-multilib"} +else + MULTILIB=${MULTILIB:-"--disable-multilib"} +fi + # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "glibc-$VERSION-$ARCH-$BUILD.txz" - echo "glibc-i18n-$VERSION-$ARCH-$BUILD.txz" - echo "glibc-profile-$VERSION-$ARCH-$BUILD.txz" - echo "aaa_glibc-solibs-$VERSION-$ARCH-$BUILD.txz" + echo "glibc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "glibc-i18n-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "glibc-profile-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "aaa_glibc-solibs-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" exit 0 fi -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +# How many jobs to run in parallel: +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} # Work around -Werror failure with gcc-10.2.0. # NOTE: Until the next glibc release takes care of this issue, this will @@ -64,41 +86,36 @@ if [ "$(gcc -dumpversion)" = "10.2.0" ]; then fi fi +# Define the build flags for both 64-bit and 32-bit x86 before using them +# below. We'll possibly need them both later on... +# -mstackrealign is needed for compatibilty with legacy binaries that +# keep 4-byte stack alignment. +# -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer are required by +# both nouveau and the nvidia driver to prevent crashes and hangs. +# We could also possibly add these: +# -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize +# But since we're already requiring at least a pentium4, I'm not sure +# what the benefit would be, so we won't do this yet. +X86FLAGS32="-O3 -march=pentium4 -mtune=generic -mstackrealign -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +X86FLAGS64="-O3 -march=x86-64 -mtune=generic -fPIC" + # I'll break this out as an option for fun :-) case $ARCH in - i586) - OPTIMIZ="-O3 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" - ;; i686) - # -mstackrealign is needed for compatibilty with legacy binaries that - # keep 4-byte stack alignment. - # -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer are required by - # both nouveau and the nvidia driver to prevent crashes and hangs. - # We could also possibly add these: - # -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize - # But since we're already requiring at least a pentium4, I'm not sure - # what the benefit would be, so we won't do this yet. - OPTIMIZ="-O3 -march=pentium4 -mtune=generic -mstackrealign -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" + OPTIMIZ="${X86FLAGS32}" LIBDIRSUFFIX="" + TARGET=${TARGET:-i686} ;; x86_64) - OPTIMIZ="-O3 -march=x86-64 -mtune=generic -fPIC" + OPTIMIZ="${X86FLAGS64}" LIBDIRSUFFIX="64" + TARGET=${TARGET:-x86_64} + TARGET32=${TARGET32:-i686} ;; *) OPTIMIZ="-O3" LIBDIRSUFFIX="" - ;; -esac - -case $ARCH in - x86_64) - TARGET=${TARGET:-x86_64} - ;; - i686) - # This should be i686 for all 32-bit x86 arch: - TARGET=${TARGET:-i686} + TARGET=${TARGET:-"$ARCH"} ;; esac @@ -119,19 +136,27 @@ mkdir -p $TMP # This function fixes a doinst.sh file for x86_64. # With thanks to Fred Emmott. fix_doinst() { - if [ "x$LIBDIRSUFFIX" = "x" ]; then + if [ "$LIBDIRSUFFIX" = "" ]; then return; fi; + if [ "$MULTILIB" = "--enable-multilib" ]; then + # Save a copy of this to append the 32-bit links later. + cp -a install/doinst.sh install/doinst32.sh + fi # Fix "( cd usr/lib ;" occurrences sed -i "s#lib ;#lib${LIBDIRSUFFIX} ;#" install/doinst.sh # Fix "lib/" occurrences sed -i "s#lib/#lib${LIBDIRSUFFIX}/#g" install/doinst.sh # Fix "( cd lib" occurrences sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh - if [ "$SLACKWARE_ARCH" = "x86_64" ]; then sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh fi + if [ "$MULTILIB" = "--enable-multilib" ]; then + echo "# Add 32-bit library links for multilib:" >> install/doinst.sh + cat install/doinst32.sh | grep -e '^( cd lib ' -e '^( cd usr/lib ' >> install/doinst.sh + rm -f install/doinst32.sh + fi } # This is a patch function to put all glibc patches in the build script @@ -181,6 +206,10 @@ mkdir -p $PKG/usr/man mkdir -p $PKG/usr/share mkdir -p $PKG/var/db/nscd mkdir -p $PKG/var/run/nscd +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p $PKG/lib + mkdir -p $PKG/usr/lib +fi # Begin extract/compile: cd $TMP @@ -207,41 +236,69 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Make build directory: -mkdir build-glibc-$VERSION -cd build-glibc-$VERSION || exit 1 +# Main function to build glibc: +build_glibc() { + CFLAGS="-g $OPTIMIZ" \ + CXXFLAGS="-g $OPTIMIZ" \ + ../configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-kernel=4.4 \ + --with-headers=/usr/include \ + --enable-add-ons \ + --enable-multi-arch \ + --enable-profile \ + $DISABLE_NSCD \ + $WERROR \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --with-tls \ + --with-__thread \ + --without-cvs \ + $TARGET-slackware-linux || exit 1 + make $NUMJOBS || exit 1 + make $NUMJOBS install install_root=$PKG || exit 1 + # Don't use this, as it makes the i18n package WAY bigger: + #make localedata/install-locale-files DESTDIR=$PKG || exit 1 + # This is ugly run in parallel, and seems to hang at the end. But it actually + # completes much faster. :) + make $NUMJOBS localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1 +} + +# If this is a multilib build, then build the 32-bit binaries first so that the +# 64-bit stuff will overwrite it later where appropriate: +if [ "$MULTILIB" = "--enable-multilib" ]; then + echo "BUILDING DAS 32-BiT NPTL GLIBC" + ( + MYRET=0 + mkdir build-glibc-compat32-$VERSION + cd build-glibc-compat32-$VERSION || exit 1 + export BUILD_ARCH=$TARGET + export TARGET=$TARGET32 + export LIBDIRSUFFIX= + export CC="gcc -m32" + export CXX="g++ -m32" + export OPTIMIZ="${X86FLAGS32}" + build_glibc || exit 1 + MYRET=$(( $MYRET + $? )) + # Build and install libxcrypt: + pushd $CWD + ARCH=$TARGET LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build || exit 1 + MYRET=$(( $MYRET + $? )) + popd + exit $MYRET + ) || exit $? +fi +# Now do the main build: +mkdir build-glibc-$VERSION +cd build-glibc-$VERSION echo "BUILDING DAS NPTL GLIBC" -CFLAGS="-g $OPTIMIZ" \ -CXXFLAGS="-g $OPTIMIZ" \ -../configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-kernel=4.4 \ - --with-headers=/usr/include \ - --enable-add-ons \ - --enable-multi-arch \ - --enable-profile \ - $DISABLE_NSCD \ - $WERROR \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --with-tls \ - --with-__thread \ - --without-cvs \ - $TARGET-slackware-linux - -make $NUMJOBS || exit 1 -make $NUMJOBS install install_root=$PKG || exit 1 -# Don't use this, as it makes the i18n package WAY bigger: -#make localedata/install-locale-files DESTDIR=$PKG || exit 1 -# This is ugly run in parallel, and seems to hang at the end. But it actually -# completes much faster. :) -make $NUMJOBS localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1 +build_glibc || exit 1 # Build and install libxcrypt: pushd $CWD -ARCH=$SLACKWARE_ARCH LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build +ARCH=$SLACKWARE_ARCH LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build || exit 1 popd # We've always had an sln symlink in /bin, so let's make sure it @@ -249,20 +306,6 @@ popd mkdir -p $PKG/bin ( cd $PKG/bin ; ln -sf /sbin/sln sln ) -# This bit was mostly copped from Fedora Rawhide's .spec file. I'm not -# entirely sure how important it is, since I'm not aware of anything -# we ship trying to link libpthread as static. What it does is make sure -# that anything linking libpthread static includes all of the functions -# so that the resulting binary doesn't rely on parts of the library that -# were not linked in. Optimizing actually working over binary size, so -# to speak. -( cd $PKG/usr/lib${LIBDIRSUFFIX} - gcc -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a - rm libpthread.a - ar rcs libpthread.a libpthread.o - rm libpthread.o -) - # The prevailing standard seems to be putting unstripped libraries in # /usr/lib/debug/ and stripping the debugging symbols from all the other # libraries. @@ -271,18 +314,25 @@ cp -a $PKG/lib${LIBDIRSUFFIX}/l*.so* $PKG/usr/lib${LIBDIRSUFFIX}/debug cp -a $PKG/usr/lib${LIBDIRSUFFIX}/*.a $PKG/usr/lib${LIBDIRSUFFIX}/debug # Don't need debug+profile: ( cd $PKG/usr/lib${LIBDIRSUFFIX}/debug ; rm -f *_p.* ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p $PKG/usr/lib/debug + cp -a $PKG/lib/l*.so* $PKG/usr/lib/debug + cp -a $PKG/usr/lib/*.a $PKG/usr/lib/debug + # Don't need debug+profile: + ( cd $PKG/usr/lib/debug ; rm -f *_p.* ) +fi # NOTE: Is there really a reason for the glibc-debug package? # If you're debugging glibc, you can also compile it, right? - ## COMMENTED OUT: There's no reason for profile libs to include -g information. ## Put back unstripped profiling libraries: #mv $PKG/usr/lib${LIBDIRSUFFIX}/debug/*_p.a $PKG/usr/lib${LIBDIRSUFFIX} # It might be best to put the unstripped and profiling libraries in glibc-debug and glibc-profile. # I don't think "strip -g" causes the pthread problems. It's --strip-unneeded that does. -strip -g $PKG/lib${LIBDIRSUFFIX}/l*.so* -strip -g $PKG/usr/lib${LIBDIRSUFFIX}/l*.so* strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a +if [ "$MULTILIB" = "--enable-multilib" ]; then + strip -g $PKG/usr/lib/lib*.a +fi # Remove the rquota.x and rquota.h include files, as they are provided by # the quota package: @@ -310,20 +360,6 @@ if [ -r NEWS ]; then touch -r NEWS $DOCSDIR/NEWS fi -# OK, there are some very old Linux standards that say that any binaries in a /bin or -# /sbin directory (and the directories themselves) should be group bin rather than -# group root, unless a specific group is really needed for some reason. -# -# I can't find any mention of this in more recent standards docs, and always thought -# that it was pretty cosmetic anyway (hey, if there's a reason -- fill me in!), so -# it's possible that this ownership change won't be followed in the near future -# (it's a PITA, and causes many bug reports when the perms change is occasionally -# forgotten). -# -# But, it's hard to get me to break old habits, so we'll continue the tradition here: -# -# No, no we won't. You know how we love to break traditions. - # Strip most binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null @@ -345,8 +381,10 @@ if [ -d $PKG/usr/info ]; then ) fi -# This is junk +# This is junk: rm $PKG/etc/ld.so.cache + +# Remove any stray .orig files: ( cd $PKG find . -name "*.orig" -exec rm {} \+ ) @@ -360,11 +398,17 @@ cd $PPROFILE mkdir -p usr/lib${LIBDIRSUFFIX} # Might as well just grab these with 'mv' to simplify things later: mv $PKG/usr/lib${LIBDIRSUFFIX}/lib*_p.a usr/lib${LIBDIRSUFFIX} -# Profile libs should be stripped. Use the debug libs to debug... +# Profile libs should be stripped. Use the debug libs to debug... ( cd usr/lib${LIBDIRSUFFIX} ; strip -g *.a ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + # Might as well just grab these with 'mv' to simplify things later: + mv $PKG/usr/lib/lib*_p.a usr/lib + # Profile libs should be stripped. Use the debug libs to debug... + ( cd usr/lib ; strip -g *.a ) +fi mkdir install cp -a $CWD/slack-desc.glibc-profile install/slack-desc -makepkg -l y -c n $TMP/glibc-profile-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +makepkg -l y -c n $TMP/glibc-profile-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # THIS IS NO LONGER PACKAGED (or is it? might be better to let it be made, and then ship it or not...) # glibc-debug: @@ -374,25 +418,36 @@ mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX} mkdir install cp -a $CWD/slack-desc.glibc-debug install/slack-desc +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p usr/lib + # Might as well just grab these with 'mv' to simplify things later: + mv $PKG/usr/lib/debug usr/lib +fi ## Don't package this: -#makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +#makepkg -l y -c n $TMP/glibc-debug-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz ## INSTEAD, NUKE THESE LIBS #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug # glibc-i18n: cd $PI18N -mkdir -p usr/lib${LIBDIRSUFFIX}/locale -mv $PKG/usr/lib${LIBDIRSUFFIX}/locale/* usr/lib${LIBDIRSUFFIX}/locale mkdir -p usr/share/{i18n,locale} mv $PKG/usr/share/i18n/* usr/share/i18n mv $PKG/usr/share/locale/* usr/share/locale +mkdir -p usr/lib${LIBDIRSUFFIX}/locale +mv $PKG/usr/lib${LIBDIRSUFFIX}/locale/* usr/lib${LIBDIRSUFFIX}/locale # Leave copies of the C, POSIX, and en_US locales in the main glibc package: cp -a usr/lib${LIBDIRSUFFIX}/locale/{C,en_US}* $PKG/usr/lib${LIBDIRSUFFIX}/locale mkdir -p $PKG/usr/share/i18n/locales cp -a usr/share/i18n/locales/{C,POSIX,en_US} $PKG/usr/share/i18n/locales +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p usr/lib/locale + mv $PKG/usr/lib/locale/* usr/lib/locale + # Leave copies of the C, POSIX, and en_US locales in the main glibc package: + cp -a usr/lib/locale/{C,en_US}* $PKG/usr/lib/locale +fi mkdir install cp -a $CWD/slack-desc.glibc-i18n install/slack-desc -makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +makepkg -l y -c n $TMP/glibc-i18n-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # aaa_glibc-solibs: cd $PSOLIBS @@ -429,6 +484,20 @@ cp -a $PKG/lib${LIBDIRSUFFIX}/* lib${LIBDIRSUFFIX} # format: mv ld-linux*-${VERSION}.so ld-${VERSION}.so ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + # We don't need to use an incoming directory here. + mkdir -p lib + cp -a $PKG/lib/* lib + ( cd lib + for cryptlib in libcrypt.so.* ; do + CRYPTSO=$(echo $cryptlib | cut -f 3 -d .) + mv $cryptlib libcrypt${CRYPTSO}-${VERSION}.so + done + for library in *.so.* ; do + mv $library $(echo $library | cut -f 1 -d .)-${VERSION}.so + done + ) +fi mkdir -p usr cp -a $PKG/usr/bin usr mv usr/bin/ldd . @@ -438,6 +507,10 @@ mkdir -p usr/lib${LIBDIRSUFFIX} # The gconv directory has a lot of stuff, but including it here will save some problems. # Seems standard elsewhere. cp -a $PKG/usr/lib${LIBDIRSUFFIX}/gconv usr/lib${LIBDIRSUFFIX} +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p usr/lib + cp -a $PKG/usr/lib/gconv usr/lib +fi mkdir -p usr/libexec cp -a $PKG/usr/libexec/pt_chown usr/libexec # Same usr.bin deal: @@ -457,8 +530,11 @@ sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh fix_doinst # Only scrub the links in /lib{,64} that will be created by ldconfig: find lib${LIBDIRSUFFIX} -type l -exec rm {} \+ +if [ "$MULTILIB" = "--enable-multilib" ]; then + find lib -type l -exec rm {} \+ +fi # Build the package: -makepkg -l y -c n $TMP/aaa_glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +makepkg -l y -c n $TMP/aaa_glibc-solibs-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # And finally, the complete "all-in-one" glibc package is created # from whatever was leftover: @@ -470,6 +546,9 @@ chown -R root:root etc chmod 755 etc/profile.d/* # Only scrub the links in /lib{,64} that will be created by ldconfig: find lib${LIBDIRSUFFIX} -type l -exec rm {} \+ +if [ "$MULTILIB" = "--enable-multilib" ]; then + find lib -type l -exec rm {} \+ +fi mkdir install cp -a $CWD/slack-desc.glibc install/slack-desc cp -a $CWD/doinst.sh-glibc install/doinst.sh @@ -507,8 +586,22 @@ fix_doinst # format: mv ld-linux*-${VERSION}.so ld-${VERSION}.so ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + # We don't need to use an incoming directory here. + mkdir -p lib + cp -a $PKG/lib/* lib + ( cd lib + for cryptlib in libcrypt.so.* ; do + CRYPTSO=$(echo $cryptlib | cut -f 3 -d .) + mv $cryptlib libcrypt${CRYPTSO}-${VERSION}.so + done + for library in *.so.* ; do + mv $library $(echo $library | cut -f 1 -d .)-${VERSION}.so + done + ) +fi # Build the package: -/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/glibc-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # Done! echo diff --git a/source/l/gtk4/gtk4.url b/source/l/gtk4/gtk4.url new file mode 100644 index 000000000..ef65d10eb --- /dev/null +++ b/source/l/gtk4/gtk4.url @@ -0,0 +1 @@ +https://gitlab.gnome.org/GNOME/gtk/-/archive/4.15.6/gtk-4.15.6.tar.gz diff --git a/source/l/libssh/libssh.SlackBuild b/source/l/libssh/libssh.SlackBuild index aee2c26a4..5e9655ba3 100755 --- a/source/l/libssh/libssh.SlackBuild +++ b/source/l/libssh/libssh.SlackBuild @@ -92,7 +92,7 @@ cd build -DWITH_SERVER=1 \ -DWITH_STATIC_LIB=0 \ .. || exit 1 - make $NUMJOBS VERBOSE=1 || make || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - diff --git a/source/l/python-certifi/python-certifi.SlackBuild b/source/l/python-certifi/python-certifi.SlackBuild index a104dbc93..a06770ddf 100755 --- a/source/l/python-certifi/python-certifi.SlackBuild +++ b/source/l/python-certifi/python-certifi.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=certifi if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index fbec8cac9..37795252c 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt6 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) @@ -58,8 +58,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# Since this could be needed twice... +OPTS32="-O2 -march=pentium4 -mtune=generic" + if [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" + SLKCFLAGS="$OPTS32" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -85,7 +88,7 @@ esac # For cross-compiling from x86_64: if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then ARCH=i686 - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mfpmath=sse -msse -msse2 -fcf-protection=none" + SLKCFLAGS="$OPTS32" SLKLDFLAGS="" LIBDIRSUFFIX="" fi diff --git a/source/n/ca-certificates/certdata-20240703.txt b/source/n/ca-certificates/certdata-20240830.txt index d58e9eded..110a81471 100644 --- a/source/n/ca-certificates/certdata-20240703.txt +++ b/source/n/ca-certificates/certdata-20240830.txt @@ -3645,7 +3645,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\006\040\006\005\026\160\002 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -7252,7 +7252,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\010\136\303\267\246\103\177\244\340 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -25489,3 +25489,761 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +# +# Certificate "TWCA CYBER Root CA" +# +# Issuer: CN=TWCA CYBER Root CA,OU=Root CA,O=TAIWAN-CA,C=TW +# Serial Number:40:01:34:8c:c2:00:00:00:00:00:00:00:01:3c:f2:c6 +# Subject: CN=TWCA CYBER Root CA,OU=Root CA,O=TAIWAN-CA,C=TW +# Not Valid Before: Tue Nov 22 06:54:29 2022 +# Not Valid After : Fri Nov 22 15:59:59 2047 +# Fingerprint (SHA-256): 3F:63:BB:28:14:BE:17:4E:C8:B6:43:9C:F0:8D:6D:56:F0:B7:C4:05:88:3A:56:48:A3:34:42:4D:6B:3E:C5:58 +# Fingerprint (SHA1): F6:B1:1C:1A:83:38:E9:7B:DB:B3:A8:C8:33:24:E0:2D:9C:7F:26:66 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "TWCA CYBER Root CA" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\120\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022 +\124\127\103\101\040\103\131\102\105\122\040\122\157\157\164\040 +\103\101 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\120\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022 +\124\127\103\101\040\103\131\102\105\122\040\122\157\157\164\040 +\103\101 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\100\001\064\214\302\000\000\000\000\000\000\000\001\074 +\362\306 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\215\060\202\003\165\240\003\002\001\002\002\020\100 +\001\064\214\302\000\000\000\000\000\000\000\001\074\362\306\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\120 +\061\013\060\011\006\003\125\004\006\023\002\124\127\061\022\060 +\020\006\003\125\004\012\023\011\124\101\111\127\101\116\055\103 +\101\061\020\060\016\006\003\125\004\013\023\007\122\157\157\164 +\040\103\101\061\033\060\031\006\003\125\004\003\023\022\124\127 +\103\101\040\103\131\102\105\122\040\122\157\157\164\040\103\101 +\060\036\027\015\062\062\061\061\062\062\060\066\065\064\062\071 +\132\027\015\064\067\061\061\062\062\061\065\065\071\065\071\132 +\060\120\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022 +\124\127\103\101\040\103\131\102\105\122\040\122\157\157\164\040 +\103\101\060\202\002\042\060\015\006\011\052\206\110\206\367\015 +\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 +\002\001\000\306\370\312\036\331\011\040\176\035\154\116\316\217 +\343\107\063\104\234\307\311\151\252\072\133\170\356\160\322\222 +\370\004\263\122\122\035\147\162\050\241\337\213\135\225\012\376 +\352\315\355\367\051\316\360\157\177\254\315\075\357\263\034\105 +\152\367\050\220\361\141\127\305\014\304\243\120\135\336\324\265 +\313\031\312\200\271\165\316\051\316\322\205\042\354\002\143\314 +\104\060\040\332\352\221\133\126\346\035\034\325\235\146\307\077 +\337\206\312\113\123\304\331\215\262\035\352\370\334\047\123\243 +\107\341\141\314\175\265\260\370\356\163\221\305\316\163\157\316 +\356\020\037\032\006\317\351\047\140\305\117\031\344\353\316\042 +\046\105\327\140\231\335\316\117\067\340\177\347\143\255\260\270 +\131\270\320\006\150\065\140\323\066\256\161\103\004\361\151\145 +\170\174\363\037\363\312\050\237\132\040\225\146\264\315\267\356 +\217\170\244\105\030\351\046\057\215\233\051\050\261\244\267\072 +\155\271\324\034\070\162\105\130\261\136\353\360\050\233\267\202 +\312\375\317\326\063\017\237\373\227\236\261\034\234\236\352\137 +\136\333\252\335\124\351\060\041\050\155\216\171\363\165\222\214 +\046\376\334\305\366\303\260\337\104\131\103\243\266\003\050\366 +\010\060\252\015\063\341\357\234\251\007\042\343\131\133\100\217 +\332\210\267\151\010\250\267\043\056\104\011\131\067\133\307\343 +\027\362\042\353\156\071\122\305\336\124\247\230\311\113\040\225 +\334\106\211\137\264\022\371\205\051\216\353\310\047\025\040\300 +\113\324\314\174\014\154\064\014\046\233\046\061\246\074\247\366 +\331\320\113\242\144\377\073\231\101\162\301\340\160\227\361\044 +\273\053\304\164\042\261\254\153\042\062\044\323\170\052\300\300 +\241\057\361\122\005\311\077\357\166\146\342\105\330\015\075\255 +\225\310\307\211\046\310\017\256\247\003\056\373\301\137\372\040 +\341\160\255\260\145\040\067\063\140\260\325\257\327\014\034\302 +\220\160\327\112\030\274\176\001\260\260\353\025\036\104\006\315 +\244\117\350\014\321\303\040\020\341\124\145\236\266\121\320\032 +\166\153\102\132\130\166\064\352\267\067\031\256\056\165\371\226 +\345\301\131\367\224\127\051\045\215\072\114\253\115\232\101\320 +\137\046\003\002\003\001\000\001\243\143\060\141\060\016\006\003 +\125\035\017\001\001\377\004\004\003\002\001\006\060\017\006\003 +\125\035\023\001\001\377\004\005\060\003\001\001\377\060\037\006 +\003\125\035\043\004\030\060\026\200\024\235\205\141\024\174\301 +\142\157\227\150\344\117\067\100\341\255\340\015\126\067\060\035 +\006\003\125\035\016\004\026\004\024\235\205\141\024\174\301\142 +\157\227\150\344\117\067\100\341\255\340\015\126\067\060\015\006 +\011\052\206\110\206\367\015\001\001\014\005\000\003\202\002\001 +\000\144\217\172\304\142\016\265\210\314\270\307\206\016\241\112 +\026\315\160\013\267\247\205\013\263\166\266\017\247\377\010\213 +\013\045\317\250\324\203\165\052\270\226\210\266\373\337\055\055 +\264\151\123\041\065\127\326\211\115\163\277\151\217\160\243\141 +\314\232\333\036\232\340\040\370\154\273\233\042\235\135\204\061 +\232\054\212\335\152\241\327\050\151\312\376\166\125\172\106\147 +\353\314\103\210\026\242\003\326\271\027\370\031\154\155\043\002 +\177\361\137\320\012\051\043\073\321\252\012\355\251\027\046\124 +\012\115\302\245\115\370\305\375\270\201\317\053\054\170\243\147 +\114\251\007\232\363\337\136\373\174\365\211\315\164\227\141\020 +\152\007\053\201\132\322\216\267\347\040\321\040\156\044\250\204 +\047\241\127\254\252\125\130\057\334\331\312\372\150\004\236\355 +\104\044\371\164\100\073\043\063\253\203\132\030\046\102\266\155 +\124\265\026\140\060\154\261\240\370\270\101\240\135\111\111\322 +\145\005\072\352\376\235\141\274\206\331\277\336\323\272\072\261 +\177\176\222\064\216\311\000\156\334\230\275\334\354\200\005\255 +\002\075\337\145\355\013\003\367\367\026\204\004\061\272\223\224 +\330\362\022\370\212\343\277\102\257\247\324\315\021\027\026\310 +\102\035\024\250\102\366\322\100\206\240\117\043\312\226\105\126 +\140\006\315\267\125\001\246\001\224\145\376\156\005\011\272\264 +\244\252\342\357\130\276\275\047\126\330\357\163\161\133\104\063 +\362\232\162\352\260\136\076\156\251\122\133\354\160\155\265\207 +\217\067\136\074\214\234\316\344\360\316\014\147\101\314\316\366 +\200\253\116\314\114\126\365\301\141\131\223\264\076\246\332\270 +\067\022\237\052\062\343\213\270\041\354\303\053\145\014\357\042 +\336\210\051\073\114\327\372\376\267\341\107\276\234\076\076\203 +\373\121\135\365\150\367\056\041\205\334\277\361\132\342\174\327 +\305\344\203\301\152\353\272\200\132\336\134\055\160\166\370\310 +\345\207\207\312\240\235\241\345\042\022\047\017\104\075\035\154 +\352\324\302\213\057\157\171\253\177\120\246\304\031\247\241\172 +\267\226\371\301\037\142\132\242\103\007\100\136\046\306\254\355 +\256\160\026\305\252\312\162\212\115\260\317\001\213\003\077\156 +\327 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "TWCA CYBER Root CA" +# Issuer: CN=TWCA CYBER Root CA,OU=Root CA,O=TAIWAN-CA,C=TW +# Serial Number:40:01:34:8c:c2:00:00:00:00:00:00:00:01:3c:f2:c6 +# Subject: CN=TWCA CYBER Root CA,OU=Root CA,O=TAIWAN-CA,C=TW +# Not Valid Before: Tue Nov 22 06:54:29 2022 +# Not Valid After : Fri Nov 22 15:59:59 2047 +# Fingerprint (SHA-256): 3F:63:BB:28:14:BE:17:4E:C8:B6:43:9C:F0:8D:6D:56:F0:B7:C4:05:88:3A:56:48:A3:34:42:4D:6B:3E:C5:58 +# Fingerprint (SHA1): F6:B1:1C:1A:83:38:E9:7B:DB:B3:A8:C8:33:24:E0:2D:9C:7F:26:66 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "TWCA CYBER Root CA" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\366\261\034\032\203\070\351\173\333\263\250\310\063\044\340\055 +\234\177\046\146 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\013\063\240\227\122\225\324\251\375\273\333\156\243\125\133\121 +END +CKA_ISSUER MULTILINE_OCTAL +\060\120\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022 +\124\127\103\101\040\103\131\102\105\122\040\122\157\157\164\040 +\103\101 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\100\001\064\214\302\000\000\000\000\000\000\000\001\074 +\362\306 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "TWCA Global Root CA G2" +# +# Issuer: CN=TWCA Global Root CA G2,OU=Root CA,O=TAIWAN-CA,C=TW +# Serial Number:40:01:34:8c:c2:00:00:00:00:00:00:00:01:97:58:f4 +# Subject: CN=TWCA Global Root CA G2,OU=Root CA,O=TAIWAN-CA,C=TW +# Not Valid Before: Tue Nov 22 06:42:21 2022 +# Not Valid After : Fri Nov 22 15:59:59 2047 +# Fingerprint (SHA-256): 3A:00:72:D4:9F:FC:04:E9:96:C5:9A:EB:75:99:1D:3C:34:0F:36:15:D6:FD:4D:CE:90:AC:0B:3D:88:EA:D4:F4 +# Fingerprint (SHA1): 73:FE:92:2F:83:63:91:FF:C8:C6:C4:DA:D6:20:2F:6B:07:2E:7F:1B +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "TWCA Global Root CA G2" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\124\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\037\060\035\006\003\125\004\003\023\026 +\124\127\103\101\040\107\154\157\142\141\154\040\122\157\157\164 +\040\103\101\040\107\062 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\124\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\037\060\035\006\003\125\004\003\023\026 +\124\127\103\101\040\107\154\157\142\141\154\040\122\157\157\164 +\040\103\101\040\107\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\100\001\064\214\302\000\000\000\000\000\000\000\001\227 +\130\364 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\225\060\202\003\175\240\003\002\001\002\002\020\100 +\001\064\214\302\000\000\000\000\000\000\000\001\227\130\364\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\124 +\061\013\060\011\006\003\125\004\006\023\002\124\127\061\022\060 +\020\006\003\125\004\012\023\011\124\101\111\127\101\116\055\103 +\101\061\020\060\016\006\003\125\004\013\023\007\122\157\157\164 +\040\103\101\061\037\060\035\006\003\125\004\003\023\026\124\127 +\103\101\040\107\154\157\142\141\154\040\122\157\157\164\040\103 +\101\040\107\062\060\036\027\015\062\062\061\061\062\062\060\066 +\064\062\062\061\132\027\015\064\067\061\061\062\062\061\065\065 +\071\065\071\132\060\124\061\013\060\011\006\003\125\004\006\023 +\002\124\127\061\022\060\020\006\003\125\004\012\023\011\124\101 +\111\127\101\116\055\103\101\061\020\060\016\006\003\125\004\013 +\023\007\122\157\157\164\040\103\101\061\037\060\035\006\003\125 +\004\003\023\026\124\127\103\101\040\107\154\157\142\141\154\040 +\122\157\157\164\040\103\101\040\107\062\060\202\002\042\060\015 +\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002 +\017\000\060\202\002\012\002\202\002\001\000\252\016\325\040\222 +\001\255\202\371\014\010\221\064\153\212\026\320\106\026\377\003 +\270\330\215\352\223\064\373\377\053\275\375\156\252\334\233\362 +\206\201\125\365\211\034\304\215\165\152\130\170\221\023\036\002 +\023\160\075\357\276\012\347\000\217\270\061\345\164\305\060\276 +\377\175\326\231\345\302\102\243\317\041\326\263\010\177\221\325 +\141\346\242\225\020\015\357\136\227\013\111\070\325\042\260\327 +\213\131\157\237\065\233\177\322\221\314\172\177\273\240\237\336 +\125\063\366\113\215\012\352\175\011\300\171\334\275\104\342\376 +\034\347\144\041\050\317\004\112\342\264\277\206\171\052\273\016 +\223\311\217\136\254\060\071\122\220\007\271\352\234\046\102\024 +\304\147\106\376\321\032\150\241\076\120\031\243\046\012\047\051 +\220\302\366\264\353\163\232\170\036\341\230\364\145\014\065\041 +\006\370\013\336\142\345\115\301\263\135\331\271\372\141\227\052 +\343\352\307\104\125\044\222\376\022\247\077\304\167\340\055\002 +\201\007\325\373\175\346\020\236\072\264\250\357\354\373\120\352 +\065\317\314\176\273\102\271\104\154\122\351\277\052\162\037\077 +\336\233\160\351\334\132\305\073\273\277\360\131\205\257\057\301 +\260\024\171\005\254\165\237\045\365\021\047\006\140\041\307\155 +\145\276\250\211\234\345\254\106\337\370\135\104\003\215\140\275 +\367\261\015\314\057\357\101\124\057\356\153\225\271\116\174\064 +\337\073\371\167\235\175\315\007\075\034\006\063\022\200\354\162 +\234\362\055\202\332\325\073\304\307\371\004\303\144\002\174\365 +\065\140\247\264\106\051\056\033\357\245\130\200\056\172\211\121 +\070\066\074\375\241\167\270\200\060\320\212\336\215\247\064\046 +\354\043\273\030\125\030\066\105\356\355\001\006\252\115\277\144 +\014\312\230\227\032\061\002\146\370\170\150\133\210\337\011\250 +\347\233\372\064\155\160\034\041\255\010\213\362\241\266\254\166 +\152\277\361\200\045\000\276\074\036\115\256\271\074\266\225\143 +\275\153\176\107\022\220\125\105\021\215\354\027\037\301\276\047 +\201\223\127\143\151\000\046\167\213\303\131\345\173\321\015\104 +\362\250\360\367\205\232\005\367\302\056\160\232\223\205\330\225 +\220\061\220\124\246\354\013\237\067\105\017\002\003\001\000\001 +\243\143\060\141\060\016\006\003\125\035\017\001\001\377\004\004 +\003\002\001\006\060\017\006\003\125\035\023\001\001\377\004\005 +\060\003\001\001\377\060\037\006\003\125\035\043\004\030\060\026 +\200\024\222\214\324\066\321\133\107\123\304\161\015\204\335\144 +\052\365\066\144\100\347\060\035\006\003\125\035\016\004\026\004 +\024\222\214\324\066\321\133\107\123\304\161\015\204\335\144\052 +\365\066\144\100\347\060\015\006\011\052\206\110\206\367\015\001 +\001\014\005\000\003\202\002\001\000\045\374\113\332\220\264\332 +\165\347\101\072\201\321\246\376\240\152\363\030\161\142\152\044 +\010\213\251\172\115\311\125\316\317\020\050\056\004\031\226\005 +\317\135\002\040\052\073\263\125\077\001\315\102\315\262\167\355 +\377\165\363\174\167\333\226\245\317\214\147\006\364\244\233\162 +\366\041\111\011\230\243\062\136\167\132\143\011\357\142\103\227 +\002\070\265\352\074\030\120\150\374\131\133\331\171\324\361\344 +\126\110\023\126\330\323\161\013\136\170\224\070\021\105\372\005 +\027\365\016\165\036\142\122\141\106\272\056\031\255\206\264\210 +\017\261\120\346\100\000\064\032\225\235\223\340\121\371\324\125 +\106\351\225\074\045\206\056\227\327\001\061\030\104\354\034\140 +\351\175\151\257\062\370\227\100\045\044\266\215\032\125\074\305 +\267\367\274\006\122\073\161\060\160\076\161\027\176\361\146\004 +\136\135\274\212\061\103\246\222\035\173\124\322\245\066\213\157 +\215\326\136\332\324\303\056\035\337\071\125\140\202\060\236\047 +\377\216\200\335\143\114\246\125\065\330\320\063\251\200\155\076 +\136\235\314\250\147\200\146\372\231\127\014\122\312\031\165\260 +\070\065\125\052\201\305\214\036\126\327\137\220\362\040\330\332 +\340\146\161\351\262\170\253\147\271\044\156\153\066\162\374\157 +\215\375\177\162\071\050\147\122\221\005\037\127\145\322\243\247 +\015\141\372\241\347\325\065\106\225\311\006\207\366\060\354\062 +\121\251\254\126\300\041\116\243\024\164\005\072\274\343\277\155 +\075\116\077\136\245\244\155\051\277\204\121\165\123\216\206\032 +\365\121\160\052\015\034\116\100\341\375\243\343\245\053\147\220 +\222\307\154\256\205\277\072\233\027\025\312\234\052\223\324\115 +\071\015\274\040\010\243\215\210\154\011\015\214\256\104\041\115 +\311\161\354\330\046\327\027\236\055\021\030\074\243\042\175\270 +\047\124\277\150\310\073\102\314\217\136\116\347\334\302\305\372 +\152\104\017\215\126\210\172\337\211\204\154\240\263\076\075\361 +\145\000\011\210\352\052\353\100\316\263\135\254\062\027\256\301 +\233\351\320\301\365\111\224\335\247\316\174\132\007\353\256\040 +\234\027\060\222\151\223\162\363\232\133\161\233\376\152\337\172 +\060\151\216\263\056\333\017\054\335 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "TWCA Global Root CA G2" +# Issuer: CN=TWCA Global Root CA G2,OU=Root CA,O=TAIWAN-CA,C=TW +# Serial Number:40:01:34:8c:c2:00:00:00:00:00:00:00:01:97:58:f4 +# Subject: CN=TWCA Global Root CA G2,OU=Root CA,O=TAIWAN-CA,C=TW +# Not Valid Before: Tue Nov 22 06:42:21 2022 +# Not Valid After : Fri Nov 22 15:59:59 2047 +# Fingerprint (SHA-256): 3A:00:72:D4:9F:FC:04:E9:96:C5:9A:EB:75:99:1D:3C:34:0F:36:15:D6:FD:4D:CE:90:AC:0B:3D:88:EA:D4:F4 +# Fingerprint (SHA1): 73:FE:92:2F:83:63:91:FF:C8:C6:C4:DA:D6:20:2F:6B:07:2E:7F:1B +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "TWCA Global Root CA G2" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\163\376\222\057\203\143\221\377\310\306\304\332\326\040\057\153 +\007\056\177\033 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\023\215\135\372\031\265\346\253\144\173\020\164\160\032\043\056 +END +CKA_ISSUER MULTILINE_OCTAL +\060\124\061\013\060\011\006\003\125\004\006\023\002\124\127\061 +\022\060\020\006\003\125\004\012\023\011\124\101\111\127\101\116 +\055\103\101\061\020\060\016\006\003\125\004\013\023\007\122\157 +\157\164\040\103\101\061\037\060\035\006\003\125\004\003\023\026 +\124\127\103\101\040\107\154\157\142\141\154\040\122\157\157\164 +\040\103\101\040\107\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\100\001\064\214\302\000\000\000\000\000\000\000\001\227 +\130\364 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "SecureSign Root CA12" +# +# Issuer: CN=SecureSign Root CA12,O="Cybertrust Japan Co., Ltd.",C=JP +# Serial Number:66:f9:c7:c1:af:ec:c2:51:b4:ed:53:97:e6:e6:82:c3:2b:1c:90:16 +# Subject: CN=SecureSign Root CA12,O="Cybertrust Japan Co., Ltd.",C=JP +# Not Valid Before: Wed Apr 08 05:36:46 2020 +# Not Valid After : Sun Apr 08 05:36:46 2040 +# Fingerprint (SHA-256): 3F:03:4B:B5:70:4D:44:B2:D0:85:45:A0:20:57:DE:93:EB:F3:90:5F:CE:72:1A:CB:C7:30:C0:6D:DA:EE:90:4E +# Fingerprint (SHA1): 7A:22:1E:3D:DE:1B:06:AC:9E:C8:47:70:16:8E:3C:E5:F7:6B:06:F4 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "SecureSign Root CA12" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\062 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\146\371\307\301\257\354\302\121\264\355\123\227\346\346 +\202\303\053\034\220\026 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\162\060\202\002\132\240\003\002\001\002\002\024\146 +\371\307\301\257\354\302\121\264\355\123\227\346\346\202\303\053 +\034\220\026\060\015\006\011\052\206\110\206\367\015\001\001\013 +\005\000\060\121\061\013\060\011\006\003\125\004\006\023\002\112 +\120\061\043\060\041\006\003\125\004\012\023\032\103\171\142\145 +\162\164\162\165\163\164\040\112\141\160\141\156\040\103\157\056 +\054\040\114\164\144\056\061\035\060\033\006\003\125\004\003\023 +\024\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164 +\040\103\101\061\062\060\036\027\015\062\060\060\064\060\070\060 +\065\063\066\064\066\132\027\015\064\060\060\064\060\070\060\065 +\063\066\064\066\132\060\121\061\013\060\011\006\003\125\004\006 +\023\002\112\120\061\043\060\041\006\003\125\004\012\023\032\103 +\171\142\145\162\164\162\165\163\164\040\112\141\160\141\156\040 +\103\157\056\054\040\114\164\144\056\061\035\060\033\006\003\125 +\004\003\023\024\123\145\143\165\162\145\123\151\147\156\040\122 +\157\157\164\040\103\101\061\062\060\202\001\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000 +\060\202\001\012\002\202\001\001\000\272\071\301\067\172\150\105 +\053\024\264\353\344\023\353\127\165\043\115\217\044\055\026\350 +\256\216\311\175\244\127\073\052\166\045\063\203\154\352\062\212 +\224\233\116\074\226\344\375\121\277\231\311\223\176\277\371\255 +\247\262\110\053\007\034\047\365\114\274\160\022\167\244\205\124 +\265\375\220\172\344\243\344\121\130\003\315\020\171\171\356\153 +\223\037\144\216\153\144\253\243\023\343\161\376\175\253\234\335 +\047\123\067\263\252\030\302\131\046\354\133\037\322\346\145\174 +\357\223\275\330\130\134\013\300\343\145\157\074\307\312\131\343 +\376\156\137\254\203\276\375\135\045\116\052\051\073\326\013\253 +\027\062\170\244\341\076\224\106\276\142\156\233\336\106\250\261 +\026\347\205\156\364\010\100\105\021\240\236\124\104\204\367\330 +\066\316\365\120\107\334\054\060\233\356\300\365\226\322\376\011 +\206\307\006\131\256\117\256\216\021\230\173\363\013\122\252\142 +\046\252\041\337\216\045\063\171\227\026\111\215\365\076\325\107 +\237\067\061\111\063\162\005\115\014\266\125\214\361\127\217\212 +\207\321\255\305\021\022\071\240\255\002\003\001\000\001\243\102 +\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003 +\002\001\006\060\035\006\003\125\035\016\004\026\004\024\127\064 +\363\164\317\004\113\325\045\346\361\100\266\054\114\331\055\351 +\240\255\060\015\006\011\052\206\110\206\367\015\001\001\013\005 +\000\003\202\001\001\000\076\273\333\027\026\322\362\024\001\040 +\054\070\203\113\255\276\312\205\172\232\266\233\153\246\341\374 +\245\072\254\255\264\050\072\257\327\001\203\111\053\143\242\335 +\232\144\016\230\134\157\335\216\273\212\124\042\055\112\023\363 +\256\100\103\333\117\221\267\206\032\354\000\264\101\201\244\117 +\372\152\213\210\263\166\010\162\052\111\100\303\323\303\205\211 +\230\020\245\235\157\031\267\273\317\172\145\125\333\067\353\074 +\212\162\062\227\036\232\051\076\255\215\346\243\033\155\365\165 +\032\346\260\150\271\133\242\356\151\107\047\065\241\206\231\200 +\363\063\113\341\153\244\046\303\357\164\131\154\172\242\144\266 +\036\104\303\120\340\017\071\075\251\063\361\245\363\322\275\142 +\204\254\216\034\251\315\132\275\067\073\156\012\042\264\364\025 +\347\221\130\305\072\104\323\225\050\331\300\145\351\162\312\320 +\017\275\037\263\025\331\251\343\244\107\011\236\340\313\067\373 +\375\275\227\325\276\030\032\151\242\071\201\331\032\365\253\177 +\310\343\342\147\013\235\364\014\352\124\337\322\262\257\261\042 +\361\040\337\274\104\034 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "SecureSign Root CA12" +# Issuer: CN=SecureSign Root CA12,O="Cybertrust Japan Co., Ltd.",C=JP +# Serial Number:66:f9:c7:c1:af:ec:c2:51:b4:ed:53:97:e6:e6:82:c3:2b:1c:90:16 +# Subject: CN=SecureSign Root CA12,O="Cybertrust Japan Co., Ltd.",C=JP +# Not Valid Before: Wed Apr 08 05:36:46 2020 +# Not Valid After : Sun Apr 08 05:36:46 2040 +# Fingerprint (SHA-256): 3F:03:4B:B5:70:4D:44:B2:D0:85:45:A0:20:57:DE:93:EB:F3:90:5F:CE:72:1A:CB:C7:30:C0:6D:DA:EE:90:4E +# Fingerprint (SHA1): 7A:22:1E:3D:DE:1B:06:AC:9E:C8:47:70:16:8E:3C:E5:F7:6B:06:F4 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "SecureSign Root CA12" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\172\042\036\075\336\033\006\254\236\310\107\160\026\216\074\345 +\367\153\006\364 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\306\211\312\144\102\233\142\010\111\013\036\177\351\007\075\350 +END +CKA_ISSUER MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\146\371\307\301\257\354\302\121\264\355\123\227\346\346 +\202\303\053\034\220\026 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "SecureSign Root CA14" +# +# Issuer: CN=SecureSign Root CA14,O="Cybertrust Japan Co., Ltd.",C=JP +# Serial Number:64:db:5a:0c:20:4e:e8:d7:29:77:c8:50:27:a2:5a:27:dd:2d:f2:cb +# Subject: CN=SecureSign Root CA14,O="Cybertrust Japan Co., Ltd.",C=JP +# Not Valid Before: Wed Apr 08 07:06:19 2020 +# Not Valid After : Sat Apr 08 07:06:19 2045 +# Fingerprint (SHA-256): 4B:00:9C:10:34:49:4F:9A:B5:6B:BA:3B:A1:D6:27:31:FC:4D:20:D8:95:5A:DC:EC:10:A9:25:60:72:61:E3:38 +# Fingerprint (SHA1): DD:50:C0:F7:79:B3:64:2E:74:A2:B8:9D:9F:D3:40:DD:BB:F0:F2:4F +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "SecureSign Root CA14" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\064 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\064 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\144\333\132\014\040\116\350\327\051\167\310\120\047\242 +\132\047\335\055\362\313 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\162\060\202\003\132\240\003\002\001\002\002\024\144 +\333\132\014\040\116\350\327\051\167\310\120\047\242\132\047\335 +\055\362\313\060\015\006\011\052\206\110\206\367\015\001\001\014 +\005\000\060\121\061\013\060\011\006\003\125\004\006\023\002\112 +\120\061\043\060\041\006\003\125\004\012\023\032\103\171\142\145 +\162\164\162\165\163\164\040\112\141\160\141\156\040\103\157\056 +\054\040\114\164\144\056\061\035\060\033\006\003\125\004\003\023 +\024\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164 +\040\103\101\061\064\060\036\027\015\062\060\060\064\060\070\060 +\067\060\066\061\071\132\027\015\064\065\060\064\060\070\060\067 +\060\066\061\071\132\060\121\061\013\060\011\006\003\125\004\006 +\023\002\112\120\061\043\060\041\006\003\125\004\012\023\032\103 +\171\142\145\162\164\162\165\163\164\040\112\141\160\141\156\040 +\103\157\056\054\040\114\164\144\056\061\035\060\033\006\003\125 +\004\003\023\024\123\145\143\165\162\145\123\151\147\156\040\122 +\157\157\164\040\103\101\061\064\060\202\002\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000 +\060\202\002\012\002\202\002\001\000\305\322\172\241\326\212\277 +\026\061\320\230\321\072\224\374\132\270\156\042\301\142\367\247 +\012\047\357\120\366\056\261\236\150\022\360\154\044\143\071\361 +\360\337\020\306\336\267\122\040\325\122\133\102\231\236\363\240 +\276\122\037\137\314\147\155\247\056\120\242\301\227\215\266\370 +\225\365\260\272\334\235\340\276\313\337\367\070\362\107\365\246 +\232\222\225\052\142\131\120\013\242\261\065\347\145\262\141\262 +\352\222\161\151\344\051\360\117\201\201\004\074\262\245\133\324 +\305\250\131\147\173\125\034\111\253\172\235\302\347\163\115\357 +\315\011\302\304\127\022\333\001\016\043\171\011\007\073\242\350 +\374\212\317\217\300\106\044\234\070\047\340\203\235\033\240\277 +\170\025\020\353\206\116\012\132\375\337\332\054\202\176\356\312 +\366\051\341\372\161\241\367\210\150\234\234\360\215\276\017\111 +\221\330\352\072\371\375\320\150\161\333\351\265\053\116\202\222 +\157\146\037\340\360\334\114\354\312\321\352\272\164\006\371\263 +\204\220\224\321\137\216\163\031\020\135\002\345\160\245\300\020 +\320\020\174\157\305\130\111\264\260\156\232\332\175\225\365\314 +\332\002\257\270\054\175\171\217\276\103\361\371\050\050\215\011 +\103\370\010\335\153\310\213\054\044\261\215\122\007\275\170\233 +\313\312\150\262\244\335\014\114\171\140\306\231\321\223\361\060 +\032\007\323\256\042\302\352\316\361\204\011\314\340\024\156\177 +\077\176\322\202\205\254\334\251\026\116\205\240\140\313\366\234 +\327\310\263\216\355\306\233\230\165\015\125\350\137\345\225\213 +\002\244\256\103\051\050\021\244\346\022\060\001\113\165\153\036 +\146\235\171\057\245\166\057\035\100\264\155\311\175\171\010\354 +\321\152\266\135\052\262\245\146\275\153\205\364\164\126\303\365 +\347\165\122\050\054\245\377\146\107\245\324\376\376\236\124\277 +\145\176\001\326\060\217\245\066\234\242\120\034\356\070\200\001 +\110\306\307\164\364\306\254\303\100\111\026\141\164\054\257\214 +\157\065\355\173\030\000\133\066\074\234\120\015\312\222\063\020 +\361\046\111\155\337\165\044\067\202\042\327\350\226\375\025\113 +\002\226\076\007\162\225\176\253\075\114\056\327\312\360\337\340 +\130\077\055\057\004\232\070\243\001\002\003\001\000\001\243\102 +\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003 +\002\001\006\060\035\006\003\125\035\016\004\026\004\024\006\223 +\243\012\136\050\151\067\252\141\035\353\353\374\055\157\043\344 +\363\240\060\015\006\011\052\206\110\206\367\015\001\001\014\005 +\000\003\202\002\001\000\226\200\162\011\006\176\234\314\223\004 +\026\273\240\072\215\222\116\267\021\032\012\161\161\020\315\004 +\255\177\245\105\120\020\146\116\112\101\242\003\331\021\117\172 +\067\271\113\342\306\217\062\146\165\045\373\353\316\077\003\051 +\046\215\270\026\035\366\037\063\156\110\346\350\370\127\262\033 +\171\337\073\207\012\342\144\272\000\312\154\357\176\320\043\353 +\170\217\377\144\233\064\067\237\065\145\242\244\000\075\022\043 +\226\130\135\312\143\207\306\243\007\210\115\347\151\166\212\123 +\315\361\117\354\102\362\223\343\231\244\067\074\207\270\142\333 +\360\354\037\067\077\067\137\103\314\121\235\265\360\227\302\267 +\205\152\150\013\104\036\345\121\356\223\316\113\156\206\301\322 +\014\044\131\066\032\237\054\221\217\343\030\333\224\225\012\355 +\221\252\016\231\334\226\123\343\141\203\306\026\272\043\272\334 +\335\176\032\306\173\102\266\331\132\005\334\232\137\325\337\270 +\332\107\175\332\070\333\254\071\325\036\153\154\052\027\214\141 +\315\261\155\162\001\303\303\040\000\142\150\026\061\325\166\252 +\206\273\016\252\236\306\371\360\331\370\015\041\002\344\305\050 +\026\131\021\271\331\151\163\052\222\170\270\222\127\233\010\362 +\072\345\057\225\260\130\267\153\040\024\155\024\357\012\274\176 +\330\125\330\210\332\057\372\031\245\373\213\340\177\071\365\162 +\053\205\304\054\254\357\031\105\222\114\263\141\007\334\115\037 +\156\322\201\023\134\232\363\022\147\203\317\233\077\213\237\235 +\244\271\250\226\003\172\305\356\040\336\063\332\057\236\032\172 +\164\036\341\356\314\132\072\004\335\263\032\004\250\024\143\254 +\267\107\022\203\232\154\365\346\351\025\025\221\032\204\031\016 +\224\104\347\022\216\045\133\200\147\031\334\143\223\020\013\145 +\056\212\372\011\232\116\332\206\050\175\252\141\065\330\016\247 +\050\032\273\122\340\170\370\154\272\154\260\156\271\207\136\351 +\231\065\067\361\075\144\053\251\240\064\223\317\143\057\325\201 +\337\256\143\047\245\036\116\215\334\051\170\131\370\371\241\040 +\214\247\046\100\156\202\162\315\170\262\310\217\074\036\163\347 +\301\037\277\317\316\245\052\233\333\104\144\062\240\273\177\134 +\045\023\110\265\177\222 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "SecureSign Root CA14" +# Issuer: CN=SecureSign Root CA14,O="Cybertrust Japan Co., Ltd.",C=JP +# Serial Number:64:db:5a:0c:20:4e:e8:d7:29:77:c8:50:27:a2:5a:27:dd:2d:f2:cb +# Subject: CN=SecureSign Root CA14,O="Cybertrust Japan Co., Ltd.",C=JP +# Not Valid Before: Wed Apr 08 07:06:19 2020 +# Not Valid After : Sat Apr 08 07:06:19 2045 +# Fingerprint (SHA-256): 4B:00:9C:10:34:49:4F:9A:B5:6B:BA:3B:A1:D6:27:31:FC:4D:20:D8:95:5A:DC:EC:10:A9:25:60:72:61:E3:38 +# Fingerprint (SHA1): DD:50:C0:F7:79:B3:64:2E:74:A2:B8:9D:9F:D3:40:DD:BB:F0:F2:4F +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "SecureSign Root CA14" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\335\120\300\367\171\263\144\056\164\242\270\235\237\323\100\335 +\273\360\362\117 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\161\015\162\372\222\031\145\136\211\004\254\026\063\360\274\325 +END +CKA_ISSUER MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\064 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\144\333\132\014\040\116\350\327\051\167\310\120\047\242 +\132\047\335\055\362\313 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "SecureSign Root CA15" +# +# Issuer: CN=SecureSign Root CA15,O="Cybertrust Japan Co., Ltd.",C=JP +# Serial Number:16:15:c7:c3:d8:49:a7:be:69:0c:8a:88:ed:f0:70:f9:dd:b7:3e:87 +# Subject: CN=SecureSign Root CA15,O="Cybertrust Japan Co., Ltd.",C=JP +# Not Valid Before: Wed Apr 08 08:32:56 2020 +# Not Valid After : Sat Apr 08 08:32:56 2045 +# Fingerprint (SHA-256): E7:78:F0:F0:95:FE:84:37:29:CD:1A:00:82:17:9E:53:14:A9:C2:91:44:28:05:E1:FB:1D:8F:B6:B8:88:6C:3A +# Fingerprint (SHA1): CB:BA:83:C8:C1:5A:5D:F1:F9:73:6F:CA:D7:EF:28:13:06:4A:07:7D +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "SecureSign Root CA15" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\065 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\026\025\307\303\330\111\247\276\151\014\212\210\355\360 +\160\371\335\267\076\207 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\043\060\202\001\251\240\003\002\001\002\002\024\026 +\025\307\303\330\111\247\276\151\014\212\210\355\360\160\371\335 +\267\076\207\060\012\006\010\052\206\110\316\075\004\003\003\060 +\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061\043 +\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164\162 +\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040\114 +\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123\145 +\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103\101 +\061\065\060\036\027\015\062\060\060\064\060\070\060\070\063\062 +\065\066\132\027\015\064\065\060\064\060\070\060\070\063\062\065 +\066\132\060\121\061\013\060\011\006\003\125\004\006\023\002\112 +\120\061\043\060\041\006\003\125\004\012\023\032\103\171\142\145 +\162\164\162\165\163\164\040\112\141\160\141\156\040\103\157\056 +\054\040\114\164\144\056\061\035\060\033\006\003\125\004\003\023 +\024\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164 +\040\103\101\061\065\060\166\060\020\006\007\052\206\110\316\075 +\002\001\006\005\053\201\004\000\042\003\142\000\004\013\120\164 +\215\144\062\231\231\263\322\140\010\270\042\216\106\164\054\170 +\300\053\104\055\155\137\035\311\256\113\122\040\203\075\270\024 +\155\123\207\140\236\137\154\205\333\006\024\225\340\307\050\377 +\235\137\344\252\361\263\213\155\355\117\057\113\311\112\224\221 +\144\165\376\001\354\301\330\353\172\224\170\126\030\103\137\153 +\201\313\366\274\332\264\014\266\051\223\010\151\217\243\102\060 +\100\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002 +\001\006\060\035\006\003\125\035\016\004\026\004\024\353\101\310 +\256\374\325\236\121\110\365\275\213\364\207\040\223\101\053\323 +\364\060\012\006\010\052\206\110\316\075\004\003\003\003\150\000 +\060\145\002\061\000\331\056\211\176\136\116\244\021\007\275\131 +\302\007\336\253\062\070\123\052\106\104\006\027\172\316\121\351 +\340\377\146\055\011\116\340\117\364\005\321\205\366\065\140\334 +\365\162\263\106\175\002\060\104\230\106\032\202\205\036\141\151 +\211\113\007\113\146\265\236\252\272\240\036\101\331\001\164\072 +\156\105\072\211\200\031\173\062\230\125\143\253\353\143\156\223 +\155\253\033\011\140\061\116 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "SecureSign Root CA15" +# Issuer: CN=SecureSign Root CA15,O="Cybertrust Japan Co., Ltd.",C=JP +# Serial Number:16:15:c7:c3:d8:49:a7:be:69:0c:8a:88:ed:f0:70:f9:dd:b7:3e:87 +# Subject: CN=SecureSign Root CA15,O="Cybertrust Japan Co., Ltd.",C=JP +# Not Valid Before: Wed Apr 08 08:32:56 2020 +# Not Valid After : Sat Apr 08 08:32:56 2045 +# Fingerprint (SHA-256): E7:78:F0:F0:95:FE:84:37:29:CD:1A:00:82:17:9E:53:14:A9:C2:91:44:28:05:E1:FB:1D:8F:B6:B8:88:6C:3A +# Fingerprint (SHA1): CB:BA:83:C8:C1:5A:5D:F1:F9:73:6F:CA:D7:EF:28:13:06:4A:07:7D +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "SecureSign Root CA15" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\313\272\203\310\301\132\135\361\371\163\157\312\327\357\050\023 +\006\112\007\175 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\023\060\374\304\142\246\251\336\265\301\150\257\265\322\061\107 +END +CKA_ISSUER MULTILINE_OCTAL +\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061 +\043\060\041\006\003\125\004\012\023\032\103\171\142\145\162\164 +\162\165\163\164\040\112\141\160\141\156\040\103\157\056\054\040 +\114\164\144\056\061\035\060\033\006\003\125\004\003\023\024\123 +\145\143\165\162\145\123\151\147\156\040\122\157\157\164\040\103 +\101\061\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\026\025\307\303\330\111\247\276\151\014\212\210\355\360 +\160\371\335\267\076\207 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/source/n/mosh/mosh.SlackBuild b/source/n/mosh/mosh.SlackBuild index fa2b0754a..a0c8cfdbe 100755 --- a/source/n/mosh/mosh.SlackBuild +++ b/source/n/mosh/mosh.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mosh VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index 137910f82..4f4e95206 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-8.3.10.tar.xz.asc -lftpget http://us.php.net/distributions/php-8.3.10.tar.xz +lftpget http://us.php.net/distributions/php-8.3.11.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.3.11.tar.xz diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index ad6a20f4b..970492c78 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} AMBERVERS=${AMBERVERS:-21.3.9} DEMOVERS=${DEMOVERS:-8.5.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} BUILD_AMBER=${BUILD_AMBER:-YES} BUILD_DEMOS=${BUILD_DEMOS:-YES} CODECS=${CODECS:-h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec} diff --git a/source/x/mesa/patches/30710.patch b/source/x/mesa/patches/30710.patch new file mode 100644 index 000000000..fb01363b1 --- /dev/null +++ b/source/x/mesa/patches/30710.patch @@ -0,0 +1,43 @@ +From 93e96da9458c9d0348f2390dc0bea67cf140b1a0 Mon Sep 17 00:00:00 2001 +From: Karol Herbst <kherbst@redhat.com> +Date: Sun, 18 Aug 2024 00:08:50 +0200 +Subject: [PATCH] rusticl: do not use CL vector types in bindings and code + +Bindgen seems to miscompile them and I kinda thought I've done this +already in the past, but apparently not. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11722 +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30710> +--- + src/gallium/frontends/rusticl/api/device.rs | 2 +- + src/gallium/frontends/rusticl/meson.build | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gallium/frontends/rusticl/api/device.rs b/src/gallium/frontends/rusticl/api/device.rs +index 9793092db5ad4..c1cb7902e0371 100644 +--- a/src/gallium/frontends/rusticl/api/device.rs ++++ b/src/gallium/frontends/rusticl/api/device.rs +@@ -196,7 +196,7 @@ impl CLInfo<cl_device_info> for cl_device_id { + // TODO proper retrival from devices + CL_DEVICE_MEM_BASE_ADDR_ALIGN => cl_prop::<cl_uint>(0x1000), + CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE => { +- cl_prop::<cl_uint>(size_of::<cl_ulong16>() as cl_uint) ++ cl_prop::<cl_uint>(16 * size_of::<cl_ulong>() as cl_uint) + } + CL_DEVICE_NAME => cl_prop::<&str>(&dev.screen().name()), + CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR => cl_prop::<cl_uint>(1), +diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build +index 612e47bfe88e1..1fe75a611444d 100644 +--- a/src/gallium/frontends/rusticl/meson.build ++++ b/src/gallium/frontends/rusticl/meson.build +@@ -146,6 +146,7 @@ rusticl_opencl_bindings_rs = rust.bindgen( + '--raw-line', 'unsafe impl std::marker::Send for _cl_image_desc {}', + '--raw-line', 'unsafe impl std::marker::Sync for _cl_image_desc {}', + '--allowlist-type', 'cl_.*', ++ '--blocklist-type', '(__)?cl_.*[2348(16)]', + '--allowlist-type', 'cl.*_fn', + '--allowlist-var', 'CL_.*', + # needed for gl_sharing extension +-- +GitLab + |