Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -1782,8 +1782,8 @@ libid3.so id3lib-3.8.3_7
libid3-3.8.so.3 id3lib-3.8.3_7
libgirara-gtk3.so.3 girara-0.2.8_1
libjq.so.1 jq-1.6_2
libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
libssl.so.1.1 libssl1.1-1.1.1f_1
libcrypto.so.3 libcrypto3.1-3.1.2_1
libssl.so.3 libssl3.1-3.1.2_1
libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
libportmidi.so portmidi-217_1
libWildMidi.so.2 libwildmidi-0.4.3_1
Expand Down
2 changes: 0 additions & 2 deletions srcpkgs/composer8.0/files/composer8.0

This file was deleted.

27 changes: 0 additions & 27 deletions srcpkgs/composer8.0/template

This file was deleted.

8 changes: 6 additions & 2 deletions srcpkgs/git-brws/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'git-brws'
pkgname=git-brws
version=0.11.12
revision=3
revision=4
build_style=cargo
hostmakedepends="pkg-config"
makedepends="openssl-devel"
Expand All @@ -14,12 +14,16 @@ checksum=3a4bbf93f0b16562260ca66c2b60c655d5bfc690d0229d11757be76d95cb81c5
# Tests require git checkout and partially also GitHub tokens
make_check=no

pre_build() {
post_patch() {
# fixes an indexmap error when cross compiling
cargo update --package autocfg:1.0.1 --precise 1.1.0

# fixes compilation on Rust 1.64 and higher
cargo update --package socket2:0.3.15 --precise 0.3.16

# required for openssl3 compat
cargo update --package openssl-sys:0.9.58 --precise 0.9.80
cargo update --package openssl:0.10.30 --precise 0.10.45
}

post_install() {
Expand Down
13 changes: 10 additions & 3 deletions srcpkgs/git-crypt/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'git-crypt'
pkgname=git-crypt
version=0.6.0
revision=8
version=0.7.0
revision=1
build_style=gnu-makefile
make_use_env=yes
make_build_args="ENABLE_MAN=yes"
Expand All @@ -13,7 +13,14 @@ maintainer="Andy Cobaugh <andrewcobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.agwa.name/projects/git-crypt/"
distfiles="https://github.com/AGWA/git-crypt/archive/${version}.tar.gz"
checksum=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
checksum=2210a89588169ae9a54988c7fdd9717333f0c6053ff704d335631a387bd3bcff

do_build() {
make \
PREFIX=/usr prefix=/usr \
CXXFLAGS="$CXXFLAGS -DOPENSSL_API_COMPAT=0x30000000L" \
${makejobs} ${make_build_args} ${make_build_target}
}

post_install() {
vdoc README
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/git-series/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'git-series'
pkgname=git-series
version=0.9.1
revision=16
revision=17
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
Expand All @@ -16,7 +16,7 @@ checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
post_extract() {
cargo update --package libc@0.2.17 --precise 0.2.55
cargo update --package url@1.2.3 --precise 1.7.2
cargo update --package openssl-sys@0.9.1 --precise 0.9.60
cargo update --package openssl-sys@0.9.1 --precise 0.9.91
}

pre_build() {
Expand Down
File renamed without changes.
File renamed without changes.
25 changes: 0 additions & 25 deletions srcpkgs/openssl/patches/ppc-auxv.patch

This file was deleted.

96 changes: 0 additions & 96 deletions srcpkgs/openssl/patches/ppc64.patch

This file was deleted.

53 changes: 0 additions & 53 deletions srcpkgs/openssl/patches/xxx-ppcle.patch

This file was deleted.

25 changes: 10 additions & 15 deletions srcpkgs/openssl/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'openssl'
pkgname=openssl
version=1.1.1t
revision=2
version=3.1.2
revision=1
bootstrap=yes
build_style=configure
configure_script="./Configure"
Expand All @@ -14,14 +14,14 @@ make_check_target=test
make_install_args="MANSUFFIX=ssl"
short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
maintainer="John <me@johnnynator.dev>"
license="OpenSSL"
license="Apache-2.0"
homepage="https://www.openssl.org"
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
checksum=a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539
conf_files="/etc/ssl/openssl.cnf"
replaces="libressl>=0"

CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
# CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"

build_options=asm

Expand All @@ -30,7 +30,7 @@ if [ "$CHROOT_READY" ]; then
build_options_default="asm"
else
# openssl-c_rehash depends on perl, ignore on bootstrap
subpackages="libcrypto1.1 libssl1.1 openssl-devel"
subpackages="libcrypto3.1 libssl3.1 openssl-devel"
fi

case $XBPS_TARGET_MACHINE in
Expand All @@ -54,26 +54,21 @@ pre_build() {
make ${makejobs} depend
}

pre_check() {
# developer test, fails due to different nm output
rm -f test/recipes/01-test_symbol_presence.t
}

post_install() {
if [ ! "$CHROOT_READY" ]; then
rm -f "${DESTDIR}/usr/bin/c_rehash"
fi
}

libcrypto1.1_package() {
libcrypto3.1_package() {
short_desc+=" - crypto library"
pkg_install() {
vmove "usr/lib/libcrypto.so.*"
vmove usr/lib/engines-1.1
vmove usr/lib/engines-3
}
}

libssl1.1_package() {
libssl3.1_package() {
short_desc+=" - SSL/TLS library"
pkg_install() {
vmove "usr/lib/libssl.so.*"
Expand All @@ -89,7 +84,7 @@ openssl-c_rehash_package() {
}

openssl-devel_package() {
depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
depends="${sourcepkg}>=${version}_${revision} libssl3.1>=${version}_${revision} libcrypto3.1>=${version}_${revision}"
replaces="libressl-devel>=0"
short_desc+=" - development files"
pkg_install() {
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/php8.0-apache

This file was deleted.

3 changes: 0 additions & 3 deletions srcpkgs/php8.0-apcu/INSTALL.msg

This file was deleted.

Loading