From 2b24faa295972e839d0ec540375eb74955264feb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 5 Aug 2013 14:59:46 +0200 Subject: 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. --- .../patches/apr-skip-getservbyname-test.patch | 25 ++++++++++++++++++++++ .../patches/libapr-skip-getservbyname-test.patch | 25 ---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 gnu/packages/patches/apr-skip-getservbyname-test.patch delete mode 100644 gnu/packages/patches/libapr-skip-getservbyname-test.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/apr-skip-getservbyname-test.patch b/gnu/packages/patches/apr-skip-getservbyname-test.patch new file mode 100644 index 0000000000..e12a8eb56c --- /dev/null +++ b/gnu/packages/patches/apr-skip-getservbyname-test.patch @@ -0,0 +1,25 @@ +--- 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) 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) -- cgit v1.2.3 ssions....Tobias Geerinckx-Rice 2023-07-02gnu: brlaser: Update to 6-2.2a49e32....Tobias Geerinckx-Rice 2023-07-09gnu: cups: Don't set #:tests? to #:true....Efraim Flashner 2023-07-02gnu: cups: Replace with 2.4.6 [fixes CVE-2023-34241]....Tobias Geerinckx-Rice 2023-04-14gnu: hplip: Update to 3.23.3....Maxim Cournoyer 2023-04-14gnu: hplip: Remove input labels....Maxim Cournoyer 2023-04-14gnu: hplip: Use gexps....Maxim Cournoyer 2023-04-14gnu: hplip: Re-order fields....Maxim Cournoyer 2023-04-14gnu: hplip: Update to 3.22.10....Maxim Cournoyer 2023-04-14gnu: cups-minimal: Add config to native inputs unconditionally....Maxim Cournoyer 2023-04-14Merge branch 'master' into core-updates....Maxim Cournoyer 2023-04-10gnu: cups-minimal: Fix cross-building to riscv64-linux....Efraim Flashner 2023-03-02Merge remote-tracking branch 'savannah/master' into core-updates...Christopher Baines 2023-02-19gnu: epson-inkjet-printer-escpr: Update to 1.7.24....Tobias Geerinckx-Rice 2023-02-19gnu: hplip-next: Simplify the fix-more-hard-coded-file-names phase....Maxim Cournoyer 2023-02-18gnu: hplip-next: Update to 3.22.10....Maxim Cournoyer 2023-02-18gnu: Add hplip-next....Maxim Cournoyer 2023-01-30Merge remote-tracking branch 'origin/master' into core-updates...Efraim Flashner