From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.neuhaus.de ([62.109.85.115]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YO4B8-0000jO-Rh for ptxdist@pengutronix.de; Wed, 18 Feb 2015 13:56:35 +0100 Received: from [172.23.1.40] (port=38943 helo=reddoxx.neuhaus.local) by mail.neuhaus.de with esmtp (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1YO4B6-0002ok-0w for ptxdist@pengutronix.de; Wed, 18 Feb 2015 13:56:32 +0100 In-Reply-To: <1424257249-19944-2-git-send-email-oliver.graute@neuhaus.de> References: <1424257249-19944-1-git-send-email-oliver.graute@neuhaus.de> <1424257249-19944-2-git-send-email-oliver.graute@neuhaus.de> Message-ID: From: Oliver.Graute@neuhaus.de Date: Wed, 18 Feb 2015 13:56:21 +0100 MIME-Version: 1.0 Subject: [ptxdist] Antwort: [PATCHv2 2/2] apache2: added patches to compile 2.4.12 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0540799656==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: Oliver Graute Cc: ptxdist@pengutronix.de This is an S/MIME signed message --===============0540799656== Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha1"; boundary="----D6E71A27E188BFBC1A24A5F96E96C412" This is an S/MIME signed message ------D6E71A27E188BFBC1A24A5F96E96C412 MIME-Version: 1.0 Content-type: multipart/alternative; Boundary="0__=4EBBF763DFD508678f9e8a93df938690918c4EBBF763DFD50867" Content-Disposition: inline --0__=4EBBF763DFD508678f9e8a93df938690918c4EBBF763DFD50867 Content-type: text/plain; charset=US-ASCII > diff --git a/patches/httpd-2.4.12/0007-workaround-for- > exports_errors.patch b/patches/httpd-2.4.12/0007-workaround-for- > exports_errors.patch > new file mode 100644 > index 0000000..160f27a > --- /dev/null > +++ b/patches/httpd-2.4.12/0007-workaround-for-exports_errors.patch > @@ -0,0 +1,8318 @@ > +diff -rupN AQ/server/exports.c AR/server/exports.c > +--- AQ/server/exports.c 1970-01-01 01:00:00.000000000 +0100 > ++++ AR/server/exports.c 2015-02-18 08:35:53.700805309 +0100 > +@@ -0,0 +1,8272 @@ > ++/* > ++ * THIS FILE WAS AUTOGENERATED BY make_exports.awk > ++ * > ++ * This is an ugly hack that needs to be here, so > ++ * that libtool will link all of the APR functions > ++ * into server regardless of whether the base server > ++ * uses them. > ++ */ the make_exports.awk rewrite the httpd-2.4.12/server/exports.c during the build, then the build fails: exports.c:4117:55: error: 'apr_hash_this_key' undeclared here (not in a function) exports.c:4121:59: error: 'apr_hash_this_key_len' undeclared here (not in a function) exports.c:4125:55: error: 'apr_hash_this_val' undeclared here (not in a function) exports.c:4568:62: error: 'apr_sockaddr_is_wildcard' undeclared here (not in a function) exports.c:5307:55: error: 'apr_shm_create_ex' undeclared here (not in a function) exports.c:5323:55: error: 'apr_shm_attach_ex' undeclared here (not in a function) if I manually overwrite the pachted exports.c after a first failed build it compiles... the solution with manually patching the exports.c file is the dirty way here. Can somebody explain me how i adapt the make_exports.awk to generate a prober exports.c? --0__=4EBBF763DFD508678f9e8a93df938690918c4EBBF763DFD50867 Content-type: text/html; charset=US-ASCII Content-Disposition: inline


> diff --git a/patches/httpd-2.4.12/0007-workaround-for-
> exports_errors.patch b/patches/httpd-2.4.12/0007-workaround-for-
> exports_errors.patch
> new file mode 100644
> index 0000000..160f27a
> --- /dev/null
> +++ b/patches/httpd-2.4.12/0007-workaround-for-exports_errors.patch
> @@ -0,0 +1,8318 @@
> +diff -rupN AQ/server/exports.c AR/server/exports.c
> +--- AQ/server/exports.c   1970-01-01 01:00:00.000000000 +0100
> ++++ AR/server/exports.c   2015-02-18 08:35:53.700805309 +0100
> +@@ -0,0 +1,8272 @@
> ++/*
> ++ * THIS FILE WAS AUTOGENERATED BY make_exports.awk
> ++ *
> ++ * This is an ugly hack that needs to be here, so
> ++ * that libtool will link all of the APR functions
> ++ * into server regardless of whether the base server
> ++ * uses them.
> ++ */

the make_exports.awk rewrite the httpd-2.4.12/server/exports.c
during the build, then the build fails:

exports.c:4117:55: error: 'apr_hash_this_key' undeclared here (not in a function)
exports.c:4121:59: error: 'apr_hash_this_key_len' undeclared here (not in a function)
exports.c:4125:55: error: 'apr_hash_this_val' undeclared here (not in a function)
exports.c:4568:62: error: 'apr_sockaddr_is_wildcard' undeclared here (not in a function)
exports.c:5307:55: error: 'apr_shm_create_ex' undeclared here (not in a function)
exports.c:5323:55: error: 'apr_shm_attach_ex' undeclared here (not in a function)

if I manually overwrite the pachted exports.c after a first failed build it compiles...
the solution with manually patching the exports.c file is the dirty way here.

Can somebody explain me how i adapt the make_exports.awk to generate a prober exports.c? --0__=4EBBF763DFD508678f9e8a93df938690918c4EBBF763DFD50867-- ------D6E71A27E188BFBC1A24A5F96E96C412 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" MIIJigYJKoZIhvcNAQcCoIIJezCCCXcCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3 DQEHAaCCB2QwggO7MIICo6ADAgECAhRTTkX+umlHGjEnbVuCyKf7ZDxsAzANBgkq hkiG9w0BAQUFADBlMRgwFgYDVQQDEw9mdzF0Lm5ldWhhdXMuZGUxEDAOBgNVBAsT B0dhdGV3YXkxKjAoBgNVBAoTIURyIE5ldWhhdXMgVGVsZWtvbW11bmlrYXRpb24g R21iSDELMAkGA1UEBhMCZGUwHhcNMDcwMzE5MTYyOTI5WhcNMjcwMzE0MTYyOTI5 WjBlMRgwFgYDVQQDEw9mdzF0Lm5ldWhhdXMuZGUxEDAOBgNVBAsTB0dhdGV3YXkx KjAoBgNVBAoTIURyIE5ldWhhdXMgVGVsZWtvbW11bmlrYXRpb24gR21iSDELMAkG A1UEBhMCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDO/vqAga4J 46o9WABfVwTFOYiUyA7GMnRK5Nck4InVoQYyBd3kZGANQhSFocmiBd0ptwVaJ5Cd ZivSe1K/FzhNVygo5UyL2C85uqrb51H7pVFV93yuB399V6sMnZnMYkoQpfbGdFfe Qx2YlopLkvvJPQK8I9qbpK/XqjxHcnQh21d4D890UWUAWGIDk4iwwyII75k32HJO 2D+fiygjzfoT0azyEfoYH9jUSA3tk3wQX3N3tCLxsCKta1TIaAyb7eUvXlk3rbrW h5UYVuUMaCo8tEC6mLvoG+gJbAhKePOV4DMMOpplBXCw/bj2CXK7q/3TbJ507jO5 6EBt/q+7+nqpAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD AgEGMB0GA1UdDgQWBBTs+JXPYwn0sdl6NX256a/JcW9YoDAfBgNVHSMEGDAWgBTs +JXPYwn0sdl6NX256a/JcW9YoDANBgkqhkiG9w0BAQUFAAOCAQEARW5yvbZw9SgS KfhT+ty1dS3DSdMZdEs4BL2q7lGq/kWM5WecF2U4ygvUd/H2Bw4S7n566gTgMxar h0v3cxw36HqDlT1/ZNsPD1653WLDAVNe1/quRrTMRrXwABa/G9W7T4eOBjcjsX/i d5NR3y9UPbbAkozx0TRSO16puxd8tMcAW/p2zzueErvCJU5OwhGvbDgjhp0eXRKk ifkyCeC9ETda8+FaZhKI9Wsq3FW0fONnYhQui4lIHNPbkLJuL3a10pRSgZamkjy/ gTCeiNj2JyrpMD9SrSe/gxguAElQ5Z2xGlpNvfWmJ8HR4vZBvGvfBq/1c5gjsHiC HVq9sHNdajCCA6EwggKJoAMCAQICBFMqmyQwDQYJKoZIhvcNAQEFBQAwZTEYMBYG A1UEAxMPZncxdC5uZXVoYXVzLmRlMRAwDgYDVQQLEwdHYXRld2F5MSowKAYDVQQK EyFEciBOZXVoYXVzIFRlbGVrb21tdW5pa2F0aW9uIEdtYkgxCzAJBgNVBAYTAmRl MB4XDTE0MDMyMDA3MzkxNloXDTM0MDMxNTA3MzkxNlowgYwxCzAJBgNVBAYTAmRl MSowKAYDVQQKEyFEciBOZXVoYXVzIFRlbGVrb21tdW5pa2F0aW9uIEdtYkgxEDAO BgNVBAsTB0dhdGV3YXkxFjAUBgNVBAMTDU9saXZlciBHcmF1dGUxJzAlBgkqhkiG 9w0BCQEWGE9saXZlci5HcmF1dGVAbmV1aGF1cy5kZTCBnzANBgkqhkiG9w0BAQEF AAOBjQAwgYkCgYEA2cA1OPXmWVqiA/k9LmpBl+jwWl5AIxY7hFwKK1fkbw6tNH5u KUp2HKWohFtvYn15hsGCuHBEgnCTr3pkHc3R4mGThYddqsFdTHYIqou5HKZNIZmw iFZGRFRdRVznTrsnjEvT/jIKPj5Tuz5LtX/1uZCoHZaT6J/by0rpwYSl0g8CAwEA AaOBtDCBsTAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIEsDAsBglghkgBhvhC AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFDmu l84LnAlwk+Dm+1kn3o23RSApMB8GA1UdIwQYMBaAFOz4lc9jCfSx2Xo1fbnpr8lx b1igMCMGA1UdEQQcMBqBGE9saXZlci5HcmF1dGVAbmV1aGF1cy5kZTANBgkqhkiG 9w0BAQUFAAOCAQEAczTZdpx+ts4BrR/V74cT3jS9loTnGARQ9w5pMJ7pZ27ecrc4 YAYgCcd9DXfRcoNbX/DZdjsShLArwiQZE3s8lj+hnbXiZwGswFr+gHaLe6GFX0lv EblxGcbJjXQGmQVhqD/ol31gj7geOEoIOn9gHYxuyWmFT8PDxzfSpL9Q5jMLkjHh DI3+orrKQae8kBXYrXbQhiI7c7xbhOl2WgXRkxS0TFOkOAWAVB0u0NtoxXMDPHPW eedw3q5/5h3gHxHPoffGfgSXlNiTI8Jj9LQ3RMF4VWKHynOHuDzxip9kxD2awhJI IISXkGksMdvABoFXlweOSu9tc7tGc7nq2Zn3BzGCAe4wggHqAgEBMG0wZTEYMBYG A1UEAxMPZncxdC5uZXVoYXVzLmRlMRAwDgYDVQQLEwdHYXRld2F5MSowKAYDVQQK EyFEciBOZXVoYXVzIFRlbGVrb21tdW5pa2F0aW9uIEdtYkgxCzAJBgNVBAYTAmRl AgRTKpskMAkGBSsOAwIaBQCggdgwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc BgkqhkiG9w0BCQUxDxcNMTUwMjE4MTI1NjM0WjAjBgkqhkiG9w0BCQQxFgQUBYN5 3O+ShF6bNvwcQEPxBWuoVbkweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASow CwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJ KoZIhvcNAQEBBQAEgYBy4QVb7oVPEiarRYn8v0YxZumD0t577GoGk7hsqYmv+SFa /K+ohh/1Tl7Koh7E5hp1O/oUbK6dpgE41X9pzWHxxgEwYvNiIgNuIuCuvJlh7yYo pdJe290AcJ/pqz4gzocA/4kIYtC096MUXpqix3UDwl+QZVdyyHE9sOD9RIn05A== ------D6E71A27E188BFBC1A24A5F96E96C412-- --===============0540799656== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0540799656==--