Skip to content

Commit 8269881

Browse files
authored
Merge pull request #218 from jeremyd2019/gfw-libcrypt-removal
Migrate libcrypt -> libxcrypt.
2 parents c70c979 + 18ed9ef commit 8269881

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

curl/PKGBUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
pkgbase=curl
44
pkgname=('curl' 'libcurl' 'libcurl-devel')
55
pkgver=8.12.1
6-
pkgrel=1
6+
pkgrel=2
77
pkgdesc="Multi-protocol file transfer utility"
88
arch=('i686' 'x86_64')
99
url="https://curl.se/"
1010
license=('spdx:MIT')
1111
depends=('ca-certificates')
12-
makedepends=('heimdal-devel' 'libcrypt-devel' 'libidn2-devel'
12+
makedepends=('heimdal-devel' 'libxcrypt-devel' 'libidn2-devel'
1313
'libnghttp2-devel' 'libpsl-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel') # 'libcares-devel'
1414
options=('!libtool' 'strip' '!debug')
1515
source=("https://github.com/curl/curl/releases/download/${pkgbase}-${pkgver//./_}/${pkgbase}-${pkgver}.tar.bz2"{,.asc}
@@ -53,7 +53,7 @@ build() {
5353
}
5454

5555
package_curl() {
56-
depends=('ca-certificates' 'libcurl' 'libcrypt'
56+
depends=('ca-certificates' 'libcurl' 'libxcrypt'
5757
'libnghttp2' 'libpsl' 'openssl' 'zlib')
5858
groups=('base')
5959

@@ -67,7 +67,7 @@ package_curl() {
6767

6868
package_libcurl() {
6969
pkgdesc="Multi-protocol file transfer library (runtime)"
70-
depends=('ca-certificates' 'heimdal-libs' 'libcrypt' 'libidn2'
70+
depends=('ca-certificates' 'heimdal-libs' 'libxcrypt' 'libidn2'
7171
'libnghttp2' 'libpsl' 'libssh2' 'openssl' 'zlib') #'libcares'
7272
groups=('libraries')
7373

@@ -77,7 +77,7 @@ package_libcurl() {
7777

7878
package_libcurl-devel() {
7979
pkgdesc="Libcurl headers and libraries"
80-
depends=("libcurl=${pkgver}" 'heimdal-devel' 'libcrypt-devel' 'libidn2-devel'
80+
depends=("libcurl=${pkgver}" 'heimdal-devel' 'libxcrypt-devel' 'libidn2-devel'
8181
'libnghttp2-devel' 'libpsl-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel') #'libcares-devel'
8282
options=('staticlibs')
8383
groups=('development')

heimdal/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
pkgbase=heimdal
44
pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
55
pkgver=7.8.0
6-
pkgrel=4
6+
pkgrel=5
77
pkgdesc="Implementation of Kerberos V5 libraries"
88
arch=('i686' 'x86_64')
99
url="https://www.h5l.org/"
1010
license=('custom')
11-
makedepends=('libcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel') #libldap-devel
11+
makedepends=('libxcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel') #libldap-devel
1212
options=('!libtool' '!emptydirs' 'staticlibs')
1313
groups=('net-utils')
1414
source=(https://github.com/heimdal/heimdal/releases/download/heimdal-${pkgver}/heimdal-${pkgver}.tar.gz{,.sig}
@@ -134,7 +134,7 @@ package_heimdal() {
134134
}
135135

136136
package_heimdal-libs() {
137-
depends=('libcrypt' 'libedit' 'libsqlite' 'libopenssl')
137+
depends=('libxcrypt' 'libedit' 'libsqlite' 'libopenssl')
138138
groups=('libraries')
139139

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

149149
mkdir -p ${pkgdir}/usr
150150

openssh/PKGBUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
pkgname=openssh
44
pkgver=9.9p1
5-
pkgrel=1
5+
pkgrel=2
66
pkgdesc='Free version of the SSH connectivity tools'
77
url='http://www.openssh.org/portable.html'
88
license=('custom:BSD')
99
arch=('i686' 'x86_64')
1010
groups=('net-utils')
11-
depends=('libfido2' 'heimdal' 'libedit' 'libcrypt' 'openssl')
12-
makedepends=('libfido2-devel' 'libcbor-devel' 'heimdal-devel' 'libedit-devel' 'libcrypt-devel' 'openssl-devel')
11+
depends=('libfido2' 'heimdal' 'libedit' 'libxcrypt' 'openssl')
12+
makedepends=('libfido2-devel' 'libcbor-devel' 'heimdal-devel' 'libedit-devel' 'libxcrypt-devel' 'openssl-devel')
1313
source=("https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
1414
0001-Forward-port-MSys2-patches.patch
1515
0002-openssh-work-around-Cygwin-declaring-setkey.patch

perl-Clone/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
_realname=Clone
44
pkgname=perl-${_realname}
55
pkgver=0.46
6-
pkgrel=1
6+
pkgrel=2
77
pkgdesc='Recursive copy of nested objects.'
88
arch=('i686' 'x86_64')
99
url='https://search.cpan.org/~RDF/Clone'
1010
groups=('perl-modules')
1111
license=('GPL' 'PerlArtistic')
1212
depends=('perl')
13-
makedepends=('libcrypt-devel' 'gcc' 'make')
13+
makedepends=('libxcrypt-devel' 'gcc' 'make')
1414
options=('!emptydirs')
1515
source=("https://search.cpan.org/CPAN/authors/id/G/GA/GARU/${_realname}-${pkgver}.tar.gz")
1616
sha512sums=('f8bb1010364e94c7cc8bba25681cd9fd737ec2935a8be960ac53099359729fc679190a115dd082fccd239b35762dee2b3be3adbddce37e4ceae6fe934fbad545')

perl-HTML-Parser/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
_realname=HTML-Parser
44
pkgname=perl-${_realname}
55
pkgver=3.81
6-
pkgrel=1
6+
pkgrel=2
77
pkgdesc="Perl HTML parser class"
88
arch=('i686' 'x86_64')
99
license=('PerlArtistic')
1010
url="http://search.cpan.org/dist/HTML-Parser/"
1111
groups=('perl-modules')
1212
depends=('perl-HTML-Tagset' 'perl')
13-
makedepends=('libcrypt-devel')
13+
makedepends=('libxcrypt-devel')
1414
checkdepends=('perl-Test-Pod')
1515
options=('!emptydirs')
1616
source=(https://www.cpan.org/authors/id/O/OA/OALDERS/${_realname}-${pkgver}.tar.gz)

perl-Locale-Gettext/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
_realname=Locale-Gettext
44
pkgname=perl-${_realname}
55
pkgver=1.07
6-
pkgrel=7
6+
pkgrel=8
77
groups=('perl-modules')
88
pkgdesc="Permits access from Perl to the gettext() family of functions"
99
arch=('i686' 'x86_64')
1010
license=('GPL' 'PerlArtistic')
1111
url="http://search.cpan.org/dist/${_realname}/"
1212
depends=('gettext' 'perl')
13-
makedepends=('libcrypt-devel')
13+
makedepends=('libxcrypt-devel')
1414
options=(!emptydirs)
1515
source=(${_realname}-${pkgver}.tar.gz::"https://www.cpan.org/authors/id/P/PV/PVANDRY/Locale-gettext-${pkgver}.tar.gz")
1616
sha256sums=('909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15')

perl-Net-SSLeay/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
_realname=Net-SSLeay
44
pkgname=perl-${_realname}
55
pkgver=1.92
6-
pkgrel=3
6+
pkgrel=4
77
pkgdesc="Perl extension for using OpenSSL"
88
arch=('i686' 'x86_64')
99
license=('custom:BSD')
1010
url="http://search.cpan.org/dist/${_realname}/"
1111
groups=('perl-modules')
12-
makedepends=('openssl-devel' 'libcrypt-devel')
12+
makedepends=('openssl-devel' 'libxcrypt-devel')
1313
depends=('openssl')
1414
options=(!emptydirs)
1515
replaces=('net-ssleay')

perl-TermReadKey/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
_realname=TermReadKey
44
pkgname=perl-${_realname}
55
pkgver=2.38
6-
pkgrel=8
6+
pkgrel=9
77
pkgdesc="Provides simple control over terminal driver modes"
88
arch=('i686' 'x86_64')
99
license=('custom')
1010
depends=('perl')
11-
makedepends=('libcrypt-devel')
11+
makedepends=('libxcrypt-devel')
1212
url="http://search.cpan.org/~jstowe/${_realname}/"
1313
groups=('perl-modules')
1414
options=('!emptydirs')

perl-XML-Parser/PKGBUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
_realname=XML-Parser
44
pkgname=perl-${_realname}
55
pkgver=2.46
6-
pkgrel=7
6+
pkgrel=8
77
pkgdesc="Expat-based XML parser module for perl"
88
arch=('i686' 'x86_64')
99
license=('GPL' 'PerlArtistic')
1010
url="http://search.cpan.org/dist/${_realname}/"
1111
groups=('perl-modules')
12-
depends=('perl' 'libexpat' 'libcrypt')
13-
makedepends=('libexpat-devel' 'libcrypt-devel')
12+
depends=('perl' 'libexpat' 'libxcrypt')
13+
makedepends=('libexpat-devel' 'libxcrypt-devel')
1414
replaces=('perlxml')
1515
provides=("perlxml=${pkgver}")
1616
options=('!emptydirs')

perl-YAML-Syck/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
_realname=YAML-Syck
44
pkgname=perl-YAML-Syck
55
pkgver=1.34
6-
pkgrel=3
6+
pkgrel=4
77
pkgdesc="Fast, lightweight YAML loader and dumper"
88
arch=('i686' 'x86_64')
99
url="http://search.cpan.org/dist/YAML-Syck/"
1010
license=('BSD' 'custom')
1111
depends=('perl')
12-
makedepends=('libcrypt-devel')
12+
makedepends=('libxcrypt-devel')
1313
groups=('perl-modules')
1414
options=('!emptydirs')
1515
source=(https://www.cpan.org/authors/id/T/TO/TODDR/YAML-Syck-${pkgver}.tar.gz

0 commit comments

Comments
 (0)