diff options
| author | Andreas Enge <andreas@enge.fr> | 2013-08-05 14:59:46 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2013-08-05 15:12:50 +0200 |
| commit | 2b24faa295972e839d0ec540375eb74955264feb (patch) | |
| tree | f3a793081821054c87d52c7281ba807322cc963d /gnu/packages/patches/libapr-skip-getservbyname-test.patch | |
| parent | 75c6fd43ed7d6658aa4a04e92250a88e2bddda47 (diff) | |
| download | guix-2b24faa295972e839d0ec540375eb74955264feb.tar.gz | |
gnu: Rename "libapr" to "apr" and "libaprutil" to "apr-util".
* gnu/packages/apr.scm: Rename file from libapr.scm.
* gnu/packages/patches/apr-skip-getservbyname-test.patch: Rename file
from libapr-skip-getservbyname-test.patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Rename module libapr to apr.
* gnu-system.am (dist_patch_DATA): Rename patch file.
* gnu/packages/apr.scm (apr): Rename from libapr.
* gnu/packages/apr.scm (apr-util): Rename from libaprutil, change
input name.
* gnu/packages/version-control.scm (subversion): Change input name.
Diffstat (limited to 'gnu/packages/patches/libapr-skip-getservbyname-test.patch')
| -rw-r--r-- | gnu/packages/patches/libapr-skip-getservbyname-test.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gnu/packages/patches/libapr-skip-getservbyname-test.patch b/gnu/packages/patches/libapr-skip-getservbyname-test.patch deleted file mode 100644 index e12a8eb56c..0000000000 --- a/gnu/packages/patches/libapr-skip-getservbyname-test.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- test/testsock.c 2013-01-24 06:57:21.000000000 +0100 -+++ test/testsock.c 2013-01-24 17:24:54.000000000 +0100 -@@ -90,16 +90,22 @@ - rv = apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, p); - APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); - -+ /* /etc/services is not available while compiling, so apr_getservbyname -+ * will always return APR_ENOENT. */ -+#if 0 - rv = apr_getservbyname(sa, "ftp"); - APR_ASSERT_SUCCESS(tc, "Problem getting ftp service", rv); - ABTS_INT_EQUAL(tc, 21, sa->port); -+#endif - - rv = apr_getservbyname(sa, "complete_and_utter_rubbish"); - APR_ASSERT_SUCCESS(tc, "Problem getting non-existent service", !rv); - -+#if 0 - rv = apr_getservbyname(sa, "telnet"); - APR_ASSERT_SUCCESS(tc, "Problem getting telnet service", rv); - ABTS_INT_EQUAL(tc, 23, sa->port); -+#endif - } - - static apr_socket_t *setup_socket(abts_case *tc) |