diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-08-21 06:44:09 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-09-04 11:01:37 +0000 |
| commit | 231870b4091ad9acd44a4037e4d9b0518f2e0990 (patch) | |
| tree | 254dc2ef4718a33cceb87d056e0fbbfd8d76548f | |
| parent | ca4f6c95687b3488df4cc5c2f5f93c774fcb8367 (diff) | |
| download | aports-231870b4091ad9acd44a4037e4d9b0518f2e0990.tar.bz2 aports-231870b4091ad9acd44a4037e4d9b0518f2e0990.tar.xz | |
main/freeradius3: fix ssl version check
only check 'staus' field of version. This is what upstream does.
(cherry picked from commit 5ebcbe5cd95b35b35a5eab9fa62baaceceb58b62)
| -rw-r--r-- | main/freeradius3/APKBUILD | 8 | ||||
| -rw-r--r-- | main/freeradius3/freeradius-fix-openssl-version-check.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/freeradius3/APKBUILD b/main/freeradius3/APKBUILD index 58f747efa4..afbc6328a3 100644 --- a/main/freeradius3/APKBUILD +++ b/main/freeradius3/APKBUILD @@ -3,7 +3,7 @@ pkgname=freeradius3 _realname=freeradius pkgver=3.0.3 -pkgrel=8 +pkgrel=9 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="http://freeradius.org/" arch="all" @@ -238,7 +238,7 @@ fc6693f3df5a0694610110287a28568a freeradius3.confd d332a0c1fcbab07f50461ae887279df2 freeradius3-301-default-config.patch 7097584dba2b344caf5c32475bf8da16 disable-cert-generation.patch b3f62ccbba7aab3e7c009767372d71ed freeradius3-303-main-log-include.patch -2d3b4abed4010105d734d51de3123db0 freeradius-fix-openssl-version-check.patch +07e9bf8a42f253b599f86f34c93390b6 freeradius-fix-openssl-version-check.patch 6551bee903625e5b91b89f997b7029ca freeradius3-3.0.3-rlm_linelog-1.patch be0aefbf2b6cae4c12b1b68012a3af87 freeradius3-3.0.3-rlm_linelog-2.patch" sha256sums="57e9932e5401670d0f0000080b942aee2cd6ca80422f76acd21f13a4be46335e freeradius-server-3.0.3.tar.gz @@ -247,7 +247,7 @@ e173cce3b8a4c2ed4d1fdd58fff8ec21e9166f011ec052f5f4c01712493e72b3 freeradius3.in edde20a808ad4c589d456ccf9e693a8ee9922e75366b1187994f0b982e856021 freeradius3-301-default-config.patch a72a0454f047bbbf258ffa90bd496e48cdfd95bc03a3863ab01750382ce566e3 disable-cert-generation.patch 37b3a67a9fe5a34d82fd6274b95732298561f19a0e7c81faf5ad0bf9a8f7874a freeradius3-303-main-log-include.patch -4f4bbe57f77cd16c5451dc6f29070508e665285ad889fc1bbfdf6146e4f19ede freeradius-fix-openssl-version-check.patch +d0191479423aa8b91e98693c8ee0c962a463736f79fa58af92d291d7c7aff3e1 freeradius-fix-openssl-version-check.patch 62f9a1ee01720a3cb7b055e089fb3041c4f9ba5f9f48c858868e1b3e6abb81d2 freeradius3-3.0.3-rlm_linelog-1.patch 6608476d89b2fa4be087507a2cbcc1979c76ff56155ab08cdf036835747b4af3 freeradius3-3.0.3-rlm_linelog-2.patch" sha512sums="a4fbb0a19f5946182c0cac6d62270db378674e48350c7c3b8f7d8a2a1b16c95c9b205af8d7ed22009b6392d4ab7cb251694d2593a39d9e4efc8eec9ff736bd01 freeradius-server-3.0.3.tar.gz @@ -256,6 +256,6 @@ b29bf9090a2be7af77a3e104346a23024baf78a343e7f2fd6f6ddb02c223ac66d9b77c80d02b2cb2 f32ca8fbd0d082f962c5e42c78742f7b099d2e518ee246003a7860c6d69bad745dcad974b2fb98f8e51ddecb78222f88bc778dd2f33efdb02b3f8e4298ea3e79 freeradius3-301-default-config.patch d027627ac302c39de9342f5f97d2b44752e33d0def311aa5e140e9365b6a501cd5e4f311b1751d5efa3aa63666f07fc58bc222f95bba0a478a7828c6aea07770 disable-cert-generation.patch 1bf8587bfbf6109cfe8b34ffb4e3100d1d06be24678d9358c0cccc84e84e277822c01117bd4a038b11da35fcb86110588f5bd54177cbd632036977db3a53376d freeradius3-303-main-log-include.patch -4b6c7d55ef4a404a8cdc4117caa5f5ec9ba3079b2be1c69b4cc5500ea81f2f09fa7cce45d0bf52f262242a6519a722212628384d8c82af244bac1a381fce6c52 freeradius-fix-openssl-version-check.patch +98db9464b5915ef3bcff4d0767817013a83d23e23362539f2a5620306831a1f6b864377b4979db6ef99db18261a11aba13eb74bc8de121e9612ae65d2ad3f333 freeradius-fix-openssl-version-check.patch 78621dacbc3d6d798a94fe1e860cbe39340ae6cab9de722aad2d4f32c35e85db1bf67759c785911f59468731c79857ffc14ea7f1247ce8d08fd6cc9d8d289aac freeradius3-3.0.3-rlm_linelog-1.patch 4c2fe2011fd338b9762e3c6de79da1b83af0ab99c73e8ebe0693b66dc00b638a5b4824caab29cf4db9c2bc4135d1a85a7141f2b4838c29da01b5d00ac24fdcbe freeradius3-3.0.3-rlm_linelog-2.patch" diff --git a/main/freeradius3/freeradius-fix-openssl-version-check.patch b/main/freeradius3/freeradius-fix-openssl-version-check.patch index e694c51805..1cf92cb01a 100644 --- a/main/freeradius3/freeradius-fix-openssl-version-check.patch +++ b/main/freeradius3/freeradius-fix-openssl-version-check.patch @@ -5,7 +5,7 @@ ssl_linked = SSLeay(); - if (ssl_linked != ssl_built) { -+ if (((ssl_linked >> 8) != (ssl_built >> 8)) || (ssl_linked < ssl_built)) { ++ if ((ssl_linked & 0x0000000f) != (ssl_built & 0x0000000f)) { ERROR("libssl version mismatch. built: %lx linked: %lx", (unsigned long) ssl_built, (unsigned long) ssl_linked); |