diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2017-07-09 17:44:27 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2017-07-09 17:44:39 +0200 |
| commit | e33f0540847722a2653a6f78ac384c2c9e52ecdc (patch) | |
| tree | f1c9cfb1cd22ab060651dcf45248f99fa7d06946 | |
| parent | dd38965f91dd502931f0e3443371ff83c81e306d (diff) | |
| download | opt-e33f0540847722a2653a6f78ac384c2c9e52ecdc.tar.gz opt-e33f0540847722a2653a6f78ac384c2c9e52ecdc.tar.xz | |
portdbc: added patch for https
| -rw-r--r-- | portdbc/.md5sum | 2 | ||||
| -rw-r--r-- | portdbc/.signature | 6 | ||||
| -rw-r--r-- | portdbc/Pkgfile | 6 | ||||
| -rw-r--r-- | portdbc/fixups.patch | 23 | ||||
| -rw-r--r-- | portdbc/follow_redirect_302.patch | 13 |
5 files changed, 30 insertions, 20 deletions
diff --git a/portdbc/.md5sum b/portdbc/.md5sum index 10c10313f..0c73676eb 100644 --- a/portdbc/.md5sum +++ b/portdbc/.md5sum @@ -1,2 +1,2 @@ -d4705e5a31efad03059220151bac8315 follow_redirect_302.patch +6d369134e2aa07120bf99a215015c8e7 fixups.patch 1d90fa7f09cf5b89bac0c86e866066f0 portdbc-1.1.tar.bz2 diff --git a/portdbc/.signature b/portdbc/.signature index fce809e8d..cbd60b726 100644 --- a/portdbc/.signature +++ b/portdbc/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YRolyhqO+VG02KVKiy6VfncngQ5O2gKllkpvSlpdg1KIykOcgt3NNNVVxvfJXbTrDpi3E7c+4V3+hKhlY3FIwc= -SHA256 (Pkgfile) = ae643f8d11d0a2687b8d18ebe84882a9b2841b24e0781161b3f72156ccfd2c53 +RWSE3ohX2g5d/RQ5oS0kgH5x31+1/Wet1GIV/XOeLGQpc33fhXHgBVrRwz0NIsJZqdFcC80B6YiNVQzVTsdXbBPUe5GHDDxx6w8= +SHA256 (Pkgfile) = 66519e4a4bcc68b11f3dfe26ca84d80f8587544e1bb4d090d07af0e20a1190af SHA256 (.footprint) = 579fe0bf42746aa53ee020277ac7ecc861e0ff4c19afd8d35fb90e4469ab878f SHA256 (portdbc-1.1.tar.bz2) = a141b35e7f7c4cf24cb9f4629c13f1accf901331ed23871f2a4ef1b3d991abc2 -SHA256 (follow_redirect_302.patch) = e956d387d7c9f716da884b8be1e38c143a39a9354b73dda973d74227387b1722 +SHA256 (fixups.patch) = f29f701321a8fc75d7a769002ca0e6e9d4c55afdd939d98a7d63f6c1f83d129e diff --git a/portdbc/Pkgfile b/portdbc/Pkgfile index 566ecd383..f617ea7a5 100644 --- a/portdbc/Pkgfile +++ b/portdbc/Pkgfile @@ -6,13 +6,13 @@ name=portdbc version=1.1 -release=4 -source=(https://crux.nu/files/$name-$version.tar.bz2 follow_redirect_302.patch) +release=5 +source=(https://crux.nu/files/$name-$version.tar.bz2 fixups.patch) build() { cd $name-$version - patch -p1 < $SRC/follow_redirect_302.patch + patch -p1 < $SRC/fixups.patch make make DESTDIR=$PKG MANDIR=/usr/share/man install } diff --git a/portdbc/fixups.patch b/portdbc/fixups.patch new file mode 100644 index 000000000..c554eb6e2 --- /dev/null +++ b/portdbc/fixups.patch @@ -0,0 +1,23 @@ +Binary files portdbc-1.1-orig/portdbc and portdbc-1.1/portdbc differ +diff -rupN portdbc-1.1-orig/portdbc.c portdbc-1.1/portdbc.c +--- portdbc-1.1-orig/portdbc.c 2011-07-13 18:04:19.000000000 +0200 ++++ portdbc-1.1/portdbc.c 2017-07-09 17:41:44.244318646 +0200 +@@ -44,6 +44,9 @@ int printHttpFile(char *url) + /* send all data to this function */ + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writeCallback); + ++ /* 302 http -> https */ ++ curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1L); ++ + /* get it! */ + curl_easy_perform(curl_handle); + +@@ -254,7 +257,7 @@ int main(int argc, char** argv) + xmlNode *r_node = NULL; + + char *url = NULL; +- char *portdb_url = "http://crux.nu/portdb/"; ++ char *portdb_url = "https://crux.nu/portdb/"; + char *tmpfile = "/tmp/.portdbc.xml"; + + // use HOME directory when available diff --git a/portdbc/follow_redirect_302.patch b/portdbc/follow_redirect_302.patch deleted file mode 100644 index 3f7363f62..000000000 --- a/portdbc/follow_redirect_302.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u portdbc-1.1.orig/portdbc.c portdbc-1.1.new/portdbc.c ---- portdbc-1.1.orig/portdbc.c 2011-07-13 19:04:19.000000000 +0300 -+++ portdbc-1.1.new/portdbc.c 2017-05-04 20:06:34.753471227 +0300 -@@ -44,6 +44,9 @@ - /* send all data to this function */ - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writeCallback); - -+ /* 302 http -> https */ -+ curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1L); -+ - /* get it! */ - curl_easy_perform(curl_handle); - |