diff options
author | felics | 2018-12-02 23:22:51 +0100 |
---|---|---|
committer | felics | 2018-12-02 23:22:51 +0100 |
commit | ea66d500ed882f9f0d0fc9e8e81e61c6716d56c8 (patch) | |
tree | f42321d5a1eb90a614bd8bf6f11a8b0cc7b44e75 | |
parent | 75500820ee9c47a3beb18a61f9327c707f576d1e (diff) | |
download | aur-ea66d500ed882f9f0d0fc9e8e81e61c6716d56c8.tar.gz |
Upstream fixed some issues, patch no longer needed.
Bump to new SVN revision.
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | certificates.c.diff | 69 |
3 files changed, 12 insertions, 89 deletions
@@ -1,7 +1,7 @@ pkgbase = wwwoffle-svn pkgdesc = Simple caching proxy server with special features (request, recursive fetch, subscription, modify HTML, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd. - pkgver = 2.9j+svn2242 - pkgrel = 4 + pkgver = 2.9j+svn2249 + pkgrel = 1 epoch = 1 url = http://www.gedanken.org.uk/software/wwwoffle/ install = wwwoffle.install @@ -13,30 +13,28 @@ pkgbase = wwwoffle-svn depends = zlib depends = gnutls depends = libgcrypt - provides = wwwoffle=2.9j+svn2242 - provides = wwwoffle-sysvinit=2.9j+svn2242 - provides = wwwoffle-openrc=2.9j+svn2242 - provides = wwwoffle-systemd=2.9j+svn2242 + provides = wwwoffle=2.9j+svn2249 + provides = wwwoffle-sysvinit=2.9j+svn2249 + provides = wwwoffle-openrc=2.9j+svn2249 + provides = wwwoffle-systemd=2.9j+svn2249 conflicts = wwwoffle conflicts = wwwoffle-sysvinit conflicts = wwwoffle-openrc conflicts = wwwoffle-systemd - replaces = wwwoffle<=2.9j+svn2242 - replaces = wwwoffle-sysvinit<=2.9j+svn2242 - replaces = wwwoffle-openrc<=2.9j+svn2242 - replaces = wwwoffle-systemd<=2.9j+svn2242 + replaces = wwwoffle<=2.9j+svn2249 + replaces = wwwoffle-sysvinit<=2.9j+svn2249 + replaces = wwwoffle-openrc<=2.9j+svn2249 + replaces = wwwoffle-systemd<=2.9j+svn2249 options = emptydirs backup = etc/conf.d/wwwoffle backup = etc/wwwoffle/wwwoffle.conf source = wwwoffle::svn+http://gedanken.org.uk/svn/wwwoffle/trunk - source = certificates.c.diff source = conf_d_wwwoffle source = initscript_openrc source = initscript_systemd source = initscript_sysvinit source = wwwoffle.install sha256sums = SKIP - sha256sums = aadd6ded716dff0210040f57bcb92c8f71df8a45b6183d2148ba0f89a65b8c3c sha256sums = 5491ffc23ae113db4b46167883594b5bcb6f1bbd0ce11432bc45047efbd635d2 sha256sums = d9451db92f979a6573cecbab23c26b6ca8ea026ef61b22ec4b61c0c9051142e9 sha256sums = 03bebce87a0da1b383666ab7a95b9810e15f2a024c0954f09c959d342c5d9c87 @@ -6,8 +6,8 @@ _pkgname=wwwoffle pkgname="${_pkgname}-svn" # _pkgver=2.9j epoch=1 -pkgver=2.9j+svn2242 -pkgrel=4 +pkgver=2.9j+svn2249 +pkgrel=1 pkgdesc="Simple caching proxy server with special features (request, recursive fetch, subscription, modify HTML, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd." arch=('i686' 'x86_64' 'arm' 'arm64') url="http://www.gedanken.org.uk/software/wwwoffle/" @@ -47,7 +47,6 @@ _svnurl="http://gedanken.org.uk/svn/wwwoffle/trunk" source=( # "http://www.gedanken.org.uk/software/wwwoffle/download/${_pkgname}-${_pkgver}.tgz" "${_pkgname}::svn+${_svnurl}" - 'certificates.c.diff' 'conf_d_wwwoffle' 'initscript_openrc' 'initscript_systemd' @@ -58,7 +57,6 @@ source=( sha256sums=( # 'e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae' # Main source, release 'SKIP' # Main source, SVN - 'aadd6ded716dff0210040f57bcb92c8f71df8a45b6183d2148ba0f89a65b8c3c' # certificates.c.diff '5491ffc23ae113db4b46167883594b5bcb6f1bbd0ce11432bc45047efbd635d2' # conf_d_wwwoffle 'd9451db92f979a6573cecbab23c26b6ca8ea026ef61b22ec4b61c0c9051142e9' # initscript_openrc '03bebce87a0da1b383666ab7a95b9810e15f2a024c0954f09c959d342c5d9c87' # initscript_systemd @@ -134,10 +132,6 @@ prepare() { cd "${_unpackeddir}" - ### Apply patches. - msg2 "Applying a patch to handle certificate related problems ..." - patch -N -p0 --follow-symlinks --verbose -i "${srcdir}/certificates.c.diff" - ### Update version.h to the actual version. _ver="$(_pgmver)" _rev="$(_svnrelease)" diff --git a/certificates.c.diff b/certificates.c.diff deleted file mode 100644 index 648976a08c47..000000000000 --- a/certificates.c.diff +++ /dev/null @@ -1,69 +0,0 @@ -Index: src/certificates.c -=================================================================== ---- src/certificates.c (revision 2241) -+++ src/certificates.c (working copy) -@@ -805,8 +805,12 @@ - - if(stat(keyfilename,&buf) || buf.st_size==0) - { -- if(CreatePrivateKey(keyfilename)) -- {PrintMessage(Warning,"Could not create the WWWOFFLE private key file '%s'.",keyfilename);goto finished;} -+ err=CreatePrivateKey(keyfilename); -+ -+ if(err<0) -+ {PrintMessage(Warning,"Could not create the WWWOFFLE private key file '%s'; already exists, using it.",keyfilename); goto readagain;} -+ else if(err>0) -+ {PrintMessage(Warning,"Could not create the WWWOFFLE private key file '%s'.",keyfilename); goto finished;} - } - - if(stat(keyfilename,&buf) || buf.st_size==0) -@@ -838,8 +842,10 @@ - else - err=CreateCertificate(crtfilename,hostname,NULL,privkey); - -- if(err) -- {PrintMessage(Warning,"Could not create the WWWOFFLE certificate file '%s'.",crtfilename);goto finished;} -+ if(err<0) -+ {PrintMessage(Warning,"Could not create the WWWOFFLE certificate file '%s'; already exists, using it.",crtfilename); goto readagain;} -+ else if(err>0) -+ {PrintMessage(Warning,"Could not create the WWWOFFLE certificate file '%s'.",crtfilename); goto finished;} - } - - if(stat(crtfilename,&buf) || buf.st_size==0) -@@ -896,8 +902,17 @@ - - err=gnutls_certificate_set_x509_key(cred,&crt,1,privkey); - if(err!=GNUTLS_E_SUCCESS) -- {PrintMessage(Warning,"Could not set private key for %s credentials for '%s' [%s].",server?"server":"fake",hostname,gnutls_strerror(err));gnutls_certificate_free_credentials(cred);goto finished;} -+ { -+ gnutls_certificate_free_credentials(cred); - -+ PrintMessage(Warning,"Could not set private key for %s credentials for '%s' [%s].",server?"server":"fake",hostname,gnutls_strerror(err)); -+ -+ if(unlink(crtfilename)) -+ {PrintMessage(Warning,"Cannot delete the invalid WWWOFFLE %s certificate file for '%s'.",server?"server":"fake",hostname); goto finished;} -+ -+ goto readagain; -+ } -+ - if(dh_params) - gnutls_certificate_set_dh_params(cred,dh_params); - -@@ -946,7 +961,7 @@ - - /* Create the file for the certificate. */ - -- fd=open(filename,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ fd=open(filename,O_WRONLY|O_CREAT|O_EXCL|O_BINARY,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); - if(fd<0) - {PrintMessage(Warning,"Could not open certificate file '%s' for writing [%!s].",filename);return(-1);} - close(fd); -@@ -1102,7 +1117,7 @@ - - /* Create the file for the certificate. */ - -- fd=open(filename,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY,S_IRUSR|S_IWUSR); -+ fd=open(filename,O_WRONLY|O_CREAT|O_EXCL|O_BINARY,S_IRUSR|S_IWUSR); - if(fd<0) - {PrintMessage(Warning,"Could not open private key file '%s' for writing [%!s].",filename);return(-1);} - close(fd); |