diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-01-08 19:38:57 +0100 |
|---|---|---|
| committer | ng0 <ng0@infotropique.org> | 2017-08-22 16:07:52 +0000 |
| commit | 20f7f90142ebc0d63886e0879839edcd1d84b4e6 (patch) | |
| tree | f9778469f078254ca8f82f0b874a15205a73aca9 /packages | |
| parent | 6046dfb161d309010150f913a47c108ac97c5538 (diff) | |
| download | gnurl-20f7f90142ebc0d63886e0879839edcd1d84b4e6.tar.gz gnurl-20f7f90142ebc0d63886e0879839edcd1d84b4e6.tar.bz2 gnurl-20f7f90142ebc0d63886e0879839edcd1d84b4e6.zip | |
Patchset for gnURL microfork:gnurl-7_55_1-1
* Patches to rename libcurl to libgnurl by Christian
* Updated for latest curl using git cherry-pick by Jeff, Florian, ng0
* Patches to fix the testsuite (deleted tests/data/test1139, renamed
reference from libcurl.* to libgnurl.*) by ng0
* Added guix-gnurl.scm which can be used to build this with guix prior
to installing it. (author: ng0)
* Further adjustments by ng0
* 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a916379aa4f26f1c45fe370b282 from upstream master.
* 7.55.1: Renamed include/curl to include/gnurl, a partial fix of https://gnunet.org/bugs/view.php?id=5122
Signed-off-by: ng0 <ng0@infotropique.org>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/EPM/curl.list.in | 10 | ||||
| -rw-r--r-- | packages/OS400/initscript.sh | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/EPM/curl.list.in b/packages/EPM/curl.list.in index 3a2028b80..0311bc726 100644 --- a/packages/EPM/curl.list.in +++ b/packages/EPM/curl.list.in @@ -52,9 +52,9 @@ f 0755 cowo pppusers ${libdir}/libcurl.la ./lib/.libs/libcurl.la f 0644 cowo pppusers ${libdir}/libcurl.a ./lib/.libs/libcurl.a f 0755 cowo pppusers ${bindir}/curl ./src/curl f 0755 cowo pppusers ${bindir}/curl ./src/.libs/curl -f 0644 cowo pppusers ${includedir}/curl/curl.h ./include/curl/curl.h -f 0644 cowo pppusers ${includedir}/curl/easy.h ./include/curl/easy.h -f 0644 cowo pppusers ${includedir}/curl/mprintf.h ./include/curl/mprintf.h -f 0644 cowo pppusers ${includedir}/curl/stdcheaders.h ./include/curl/stdcheaders.h -f 0644 cowo pppusers ${includedir}/curl/types.h ./include/curl/types.h +f 0644 cowo pppusers ${includedir}/gnurl/curl.h ./include/gnurl/curl.h +f 0644 cowo pppusers ${includedir}/gnurl/easy.h ./include/gnurl/easy.h +f 0644 cowo pppusers ${includedir}/gnurl/mprintf.h ./include/gnurl/mprintf.h +f 0644 cowo pppusers ${includedir}/gnurl/stdcheaders.h ./include/gnurl/stdcheaders.h +f 0644 cowo pppusers ${includedir}/gnurl/types.h ./include/gnurl/types.h f 0755 cowo pppusers ${bindir}/curl-config ./curl-config diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh index a13d651bc..c9932c49b 100644 --- a/packages/OS400/initscript.sh +++ b/packages/OS400/initscript.sh @@ -73,22 +73,22 @@ setenv LIBSSH2_BNDDIR 'LIBSSH2_A' # LIBSSH2 binding directory. # Need to get the version definitions. LIBCURL_VERSION=`grep '^#define *LIBCURL_VERSION ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/.*"\(.*\)".*/\1/'` LIBCURL_VERSION_MAJOR=`grep '^#define *LIBCURL_VERSION_MAJOR ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_MAJOR *\([^ ]*\).*/\1/'` LIBCURL_VERSION_MINOR=`grep '^#define *LIBCURL_VERSION_MINOR ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_MINOR *\([^ ]*\).*/\1/'` LIBCURL_VERSION_PATCH=`grep '^#define *LIBCURL_VERSION_PATCH ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_PATCH *\([^ ]*\).*/\1/'` LIBCURL_VERSION_NUM=`grep '^#define *LIBCURL_VERSION_NUM ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_NUM *0x\([^ ]*\).*/\1/'` LIBCURL_TIMESTAMP=`grep '^#define *LIBCURL_TIMESTAMP ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/.*"\(.*\)".*/\1/'` export LIBCURL_VERSION export LIBCURL_VERSION_MAJOR LIBCURL_VERSION_MINOR LIBCURL_VERSION_PATCH @@ -190,7 +190,7 @@ make_module() CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)" CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)" CMD="${CMD} INCDIR('/qibm/proddata/qadrt/include'" - CMD="${CMD} '${TOPDIR}/include/curl' '${TOPDIR}/include' '${SRCDIR}'" + CMD="${CMD} '${TOPDIR}/include/gnurl' '${TOPDIR}/include' '${SRCDIR}'" CMD="${CMD} '${TOPDIR}/packages/OS400'" if [ "${WITH_ZLIB}" != "0" ] |