Skip to content

Commit

Permalink
Merge pull request #3887 from lazka/move-to-libxcrypt-part1
Browse files Browse the repository at this point in the history
Move some packages from libcrypt to libxcrypt
  • Loading branch information
lazka authored Jul 13, 2023
2 parents 74a71f4 + 4e39722 commit 609d1de
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions apr/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

pkgname=('apr' 'apr-devel')
pkgver=1.7.4
pkgrel=1
pkgrel=2
pkgdesc="The Apache Portable Runtime"
arch=('i686' 'x86_64')
url="https://apr.apache.org/"
makedepends=('libcrypt-devel' 'libuuid-devel' 'autotools' 'gcc')
makedepends=('libxcrypt-devel' 'libuuid-devel' 'autotools' 'gcc')
options=('!libtool')
license=('spdx:Apache-2.0')
source=(https://archive.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
Expand Down Expand Up @@ -41,7 +41,7 @@ check() {
}

package_apr() {
depends=('libcrypt' 'libuuid')
depends=('libxcrypt' 'libuuid')
groups=('libraries')

mkdir -p ${pkgdir}/usr/{bin,share}
Expand All @@ -51,7 +51,7 @@ package_apr() {
package_apr-devel() {
pkgdesc="Libapr headers and libraries"
groups=('development')
depends=("apr=${pkgver}" "libcrypt-devel" "libuuid-devel")
depends=("apr=${pkgver}" "libxcrypt-devel" "libuuid-devel")
options=('staticlibs')

mkdir -p ${pkgdir}/usr/{bin,share}
Expand Down
8 changes: 4 additions & 4 deletions cyrus-sasl/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
pkgname=(cyrus-sasl libsasl libsasl-devel)
_basever=2.1.28
pkgver=${_basever}
pkgrel=2
pkgrel=3
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="https://www.cyrusimap.org/sasl/"
license=('custom')
groups=('sys-utils')
makedepends=('heimdal-devel' 'openssl-devel' 'libsqlite-devel' 'libcrypt-devel' 'libserf-devel' 'autotools' 'gcc')
makedepends=('heimdal-devel' 'openssl-devel' 'libsqlite-devel' 'libxcrypt-devel' 'libserf-devel' 'autotools' 'gcc')
options=('emptydirs' 'strip' '!makeflags')
source=(https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz{,.sig}
03-fix-plugins.patch
Expand Down Expand Up @@ -67,7 +67,7 @@ package_libsasl() {
groups=('libraries')
options=('emptydirs' 'strip' 'libtool')
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
depends=('libcrypt' 'libopenssl' 'heimdal-libs' 'libsqlite')
depends=('libxcrypt' 'libopenssl' 'heimdal-libs' 'libsqlite')

cd cyrus-sasl-${_basever}
for dir in include lib sasldb plugins utils; do
Expand All @@ -87,7 +87,7 @@ package_libsasl() {
package_libsasl-devel() {
pkgdesc="Libsasl headers and libraries"
groups=('development')
depends=("libsasl=${pkgver}" 'heimdal-devel' 'openssl-devel' 'libsqlite-devel' 'libcrypt-devel')
depends=("libsasl=${pkgver}" 'heimdal-devel' 'openssl-devel' 'libsqlite-devel' 'libxcrypt-devel')
options=('strip' 'libtool')

cd cyrus-sasl-${_basever}
Expand Down
8 changes: 4 additions & 4 deletions heimdal/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
pkgbase=heimdal
pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
pkgver=7.8.0
pkgrel=3
pkgrel=4
pkgdesc="Implementation of Kerberos V5 libraries"
arch=('i686' 'x86_64')
url="https://www.h5l.org/"
license=('custom')
makedepends=('libdb-devel' 'libcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel' 'perl-JSON' 'python' 'autotools' 'gcc') #libldap-devel
makedepends=('libdb-devel' 'libxcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel' 'perl-JSON' 'python' 'autotools' 'gcc') #libldap-devel
options=('!libtool' '!emptydirs' 'staticlibs')
groups=('net-utils')
source=(https://github.com/heimdal/heimdal/releases/download/heimdal-${pkgver}/heimdal-${pkgver}.tar.gz{,.sig}
Expand Down Expand Up @@ -134,7 +134,7 @@ package_heimdal() {
}

package_heimdal-libs() {
depends=('libdb' 'libcrypt' 'libedit' 'libsqlite' 'libopenssl')
depends=('libdb' 'libxcrypt' 'libedit' 'libsqlite' 'libopenssl')
groups=('libraries')

mkdir -p ${pkgdir}/usr/bin
Expand All @@ -144,7 +144,7 @@ package_heimdal-libs() {
package_heimdal-devel() {
pkgdesc="Heimdal headers and libraries"
groups=('development')
depends=('heimdal-libs' 'libcrypt-devel' 'libedit-devel' 'libdb-devel' 'libsqlite-devel')
depends=('heimdal-libs' 'libxcrypt-devel' 'libedit-devel' 'libdb-devel' 'libsqlite-devel')

mkdir -p ${pkgdir}/usr

Expand Down
8 changes: 4 additions & 4 deletions perl/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
pkgbase=perl
pkgname=('perl' 'perl-doc' 'perl-devel')
pkgver=5.36.1
pkgrel=1
pkgrel=2
pkgdesc="A highly capable, feature-rich programming language"
arch=(i686 x86_64)
license=('GPL')
url="https://www.perl.org/"
makedepends=('libdb-devel' 'libgdbm-devel' 'libcrypt-devel' 'gcc' 'make' 'groff')
makedepends=('libdb-devel' 'libgdbm-devel' 'libxcrypt-devel' 'gcc' 'make' 'groff')
source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz
perlbin.sh
perlbin.csh
Expand Down Expand Up @@ -183,7 +183,7 @@ _find_doc_files() {
}

package_perl() {
depends=('db' 'gdbm' 'libcrypt' 'coreutils' 'sh')
depends=('db' 'gdbm' 'libxcrypt' 'coreutils' 'sh')
# NOTE: This array is automatically generated by `./patchprov`.
# If you want to add entries, do so in the next array.
# NOTE2: './patchprov' expects this provides= to be hard left
Expand Down Expand Up @@ -326,5 +326,5 @@ package_perl-doc() {

package_perl-devel() {
pkgdesc="Perl headers and dev dependencies"
depends=("perl=${pkgver}" 'libcrypt-devel')
depends=("perl=${pkgver}" 'libxcrypt-devel')
}

0 comments on commit 609d1de

Please sign in to comment.