From e3c14b289b1ffb4d886227bbd00295afb23eb51b Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 6 Oct 2015 07:04:05 +0000 Subject: main/freeradius: upgrade to 3.0.10 --- main/freeradius/APKBUILD | 14 +++++--------- main/freeradius/fix-strerror_r.patch | 34 ---------------------------------- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 main/freeradius/fix-strerror_r.patch (limited to 'main/freeradius') diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD index 7e6a749fb1..aa81554ba0 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -4,8 +4,8 @@ # Maintainer: Leonardo Arena pkgname=freeradius _realname=freeradius -pkgver=3.0.9 -pkgrel=3 +pkgver=3.0.10 +pkgrel=0 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="http://freeradius.org/" arch="all" @@ -31,7 +31,6 @@ source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz musl-fix-headers.patch disable-cert-generation.patch freeradius-305-default-config.patch - fix-strerror_r.patch fix-scopeid.patch " @@ -293,27 +292,24 @@ redis() { || return 1 } -md5sums="e366e23ed0f674ba349a920a5cce43df freeradius-server-3.0.9.tar.gz +md5sums="b34a8b99beb2f225511f5a645dc8cc40 freeradius-server-3.0.10.tar.gz fc6693f3df5a0694610110287a28568a freeradius.confd e27f11a11fa167b5185d3e11de79d3bc freeradius.initd d86558365a1deea4914ed139797805b0 musl-fix-headers.patch ecd9ecfba4cf86a203de6faf8398c44a disable-cert-generation.patch f8a7b00835f2108acc06af212cede16e freeradius-305-default-config.patch -cb234be726652873899aa38aa7abc208 fix-strerror_r.patch 5171fca6629baeb274a9b17e02683163 fix-scopeid.patch" -sha256sums="75bf2820e04723101a8fe39fb84022251d24436cc287c36d696e32ea8b17e5ce freeradius-server-3.0.9.tar.gz +sha256sums="e8825518bde1d9787f7f9ea1e9fec7ae5282af9c3362d2fa360f60c4db6f77ec freeradius-server-3.0.10.tar.gz 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd a5208f13420c28446b85dfc48cb9193a4651c994d15cc2c9b0bc43734c66e8f0 freeradius.initd 872aaebf86a663f819460d98924a9dc1f3e428facac6930dc98d1e442df1633f musl-fix-headers.patch 008fa3a4da7b3c01df238bf492a8ccda4077289c02c553a60ad8f4439ec136a2 disable-cert-generation.patch 02cad546ffaf3f9be531cb45b96c7fb31f83c717e40ece4ff28a73c86f921f33 freeradius-305-default-config.patch -dd4e861381d30920e7cfeae8edde518760d271eda02100bded3a9f79104e491c fix-strerror_r.patch aad4796f06a5891b3d48d6ded926ffeb7b9fa84cc1c4a1f1be76bced02694023 fix-scopeid.patch" -sha512sums="67e2727a44513fb4dc655b2b2ff8b3b0f39233e8cac570b9a20565ffa655225dad95af23c06bb23d124b2a2358aa3e80964c95826e9e64138830b1dd33223145 freeradius-server-3.0.9.tar.gz +sha512sums="7546d54ca9ae1189f17fa97a8c6f6e15486d61dda8819b15f883ba48fbd6629f4728ba41490b51cb08eb1399090c16eca1b559c22ee19f3a770f1ce7ce23a8d5 freeradius-server-3.0.10.tar.gz e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd ba3c424d4eabb147c7aa3e31575a87ddb26b6a792d2a8714e73d8763e07854326a03a83991a7420246ca06bf0b93d0a6f23ec198f5e48647f9d25b40067e852a freeradius.initd c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch 09b78c6baa992f82ab81c43aad6792536a4708d460170f0a373e242a5fafe8db10662dc7fcef99a966b828ed91fa7fe38567c961c938de9a447f1ee03aebb142 disable-cert-generation.patch b69b899da6f80dbdb7422847536e37461315ba587a07fedc1eee28b96be7d16993b758ccd34e3a271ce2937d72c6ddff878aec61a3a4c0750deaaa959d10ed5e freeradius-305-default-config.patch -3751a5e55801c983f552f5983a2ff1206b53a39a31f5547e1a2c688ecd6a20895912233d40b16ba5a2285b9484f982ce149b1a345ff3ec1af953e1caf9e8292d fix-strerror_r.patch 41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234 fix-scopeid.patch" diff --git a/main/freeradius/fix-strerror_r.patch b/main/freeradius/fix-strerror_r.patch deleted file mode 100644 index 4efbc455a7..0000000000 --- a/main/freeradius/fix-strerror_r.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b3cf5084f2f7592c6f2821f55f9bf55ea223f569 Mon Sep 17 00:00:00 2001 -From: Arran Cudbard-Bell -Date: Thu, 10 Sep 2015 09:46:15 +0100 -Subject: [PATCH] Check we're building with GLIBC before assuming the GNU - version of strerror_r is present Closes #1222 - ---- - src/lib/log.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/lib/log.c b/src/lib/log.c -index 8f55061..49b3103 100644 ---- a/src/lib/log.c -+++ b/src/lib/log.c -@@ -169,8 +169,8 @@ char const *fr_syserror(int num) - /* - * XSI-Compliant version - */ --#if !defined(HAVE_FEATURES_H) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 500) && ! _GNU_SOURCE) -- if ((ret = strerror_r(num, buffer, (size_t) FR_STRERROR_BUFSIZE) != 0)) { -+#if !defined(HAVE_FEATURES_H) || !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 500) && ! _GNU_SOURCE) -+ if ((ret = strerror_r(num, buffer, (size_t)FR_STRERROR_BUFSIZE) != 0)) { - # ifndef NDEBUG - fprintf(stderr, "strerror_r() failed to write error for errno %i to buffer %p (%zu bytes), " - "returned %i: %s\n", num, buffer, (size_t) FR_STRERROR_BUFSIZE, ret, strerror(ret)); -@@ -187,7 +187,7 @@ char const *fr_syserror(int num) - #else - { - char const *p; -- p = strerror_r(num, buffer, (size_t) FR_STRERROR_BUFSIZE); -+ p = strerror_r(num, buffer, (size_t)FR_STRERROR_BUFSIZE); - if (!p) { - # ifndef NDEBUG - fprintf(stderr, "strerror_r() failed to write error for errno %i to buffer %p " -- cgit v1.2.3