Fixed ca-certificates package
This commit is contained in:
		
							parent
							
								
									cdacf16826
								
							
						
					
					
						commit
						ba4f0f2500
					
				
					 2 changed files with 36 additions and 15 deletions
				
			
		|  | @ -5,22 +5,26 @@ pkgrel=2 | ||||||
| fetch(){ | fetch(){ | ||||||
|         curl http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20200601~deb10u2.tar.xz -o $pkgname-$pkgver.tar.gz |         curl http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20200601~deb10u2.tar.xz -o $pkgname-$pkgver.tar.gz | ||||||
|         tar -xf $pkgname-$pkgver.tar.gz |         tar -xf $pkgname-$pkgver.tar.gz | ||||||
|  |         mv work $pkgname-$pkgver | ||||||
|  |         cd $pkgname-$pkgver | ||||||
|  |         patch -p1 < ../../libressl-update-rehash.patch | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| build() { | build() { | ||||||
| 	cd work | 	cd $pkgname-$pkgver | ||||||
| 	make | 	gmake | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| package() { | package() { | ||||||
| 	mkdir build | 	cd $pkgname-$pkgver | ||||||
| 	mkdir -p build/usr/bin | 	mkdir -p $pkgdir/usr/bin | ||||||
| 	mkdir -p build/usr/sbin | 	mkdir -p $pkgdir/usr/sbin | ||||||
| 	mkdir -p build/etc/ssl/ | 	mkdir -p $pkgdir/etc/ssl/ | ||||||
| 	mkdir -p build/usr/share/ca-certificates | 	mkdir -p $pkgdir/etc/ca-certificates/update.d | ||||||
|  | 	mkdir -p $pkgdir/usr/share/ca-certificates/ | ||||||
| 	 | 	 | ||||||
| 	make install DESTDIR="$pkgdir/build" | 	gmake install DESTDIR="$pkgdir" | ||||||
| 
 | 
 | ||||||
| 	( | 	( | ||||||
| 		echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" | 		echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" | ||||||
|  | @ -28,15 +32,18 @@ package() { | ||||||
| 		echo "# Do not edit." | 		echo "# Do not edit." | ||||||
| 		cd "$pkgdir"/usr/share/ca-certificates | 		cd "$pkgdir"/usr/share/ca-certificates | ||||||
| 		find . -name '*.crt' | sort | cut -b3- | 		find . -name '*.crt' | sort | cut -b3- | ||||||
| 	) > "$pkgdir/build"/etc/ca-certificates.conf | 	) > "$pkgdir"/etc/ca-certificates.conf | ||||||
| 
 | 
 | ||||||
| 	cat > "$pkgdir/build"/etc/ca-certificates/update.d/certhash <<-EOF | 	cat > "$pkgdir"/etc/ca-certificates/update.d/certhash <<-EOF | ||||||
| 		#!/bin/sh | 		#!/bin/sh | ||||||
| 		exec /usr/bin/c_rehash /etc/ssl/certs | 		exec openssl certhash /etc/ssl/certs | ||||||
| 	EOF | 	EOF | ||||||
| 	 | 	 | ||||||
| 	cat "$pkgdir/build"/usr/share/ca-certificates/mozilla/*.crt > $pkgdir/build/etc/ssl/cert.pem | 	cat "$pkgdir"/usr/share/ca-certificates/mozilla/*.crt > $pkgdir/etc/ssl/cert.pem | ||||||
| 	chmod +x "$pkgdir/build"/etc/ca-certificates/update.d/certhash | 	chmod +x "$pkgdir"/etc/ca-certificates/update.d/certhash | ||||||
| 	mv -v ${pkgdir}/build/usr/sbin/* ${pkgdir}/build/usr/bin/ | } | ||||||
| 	rm -rf ${pkgdir}/build/usr/sbin | 
 | ||||||
|  | license() { | ||||||
|  | 	cd $pkgname-$pkgver | ||||||
|  | 	cat debian/copyright | ||||||
| } | } | ||||||
|  |  | ||||||
							
								
								
									
										14
									
								
								pkgs/ca-certificates/libressl-update-rehash.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								pkgs/ca-certificates/libressl-update-rehash.patch
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,14 @@ | ||||||
|  | --- a/sbin/update-ca-certificates
 | ||||||
|  | +++ b/sbin/update-ca-certificates
 | ||||||
|  | @@ -183,9 +183,9 @@
 | ||||||
|  |    done | ||||||
|  |    if [ "$verbose" = 0 ] | ||||||
|  |    then | ||||||
|  | -    openssl rehash . > /dev/null
 | ||||||
|  | +    openssl certhash . > /dev/null
 | ||||||
|  |    else | ||||||
|  | -    openssl rehash -v .
 | ||||||
|  | +    openssl certhash -v .
 | ||||||
|  |    fi | ||||||
|  |  fi | ||||||
|  |   | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue