Skip to content

Commit

Permalink
Fix build on SunOS. Fix pkglint warnings while at it.
Browse files Browse the repository at this point in the history
Problem isolated and solution provided by @Kurlon
  TritonDataCenter/pkgsrc#350
  • Loading branch information
fhajny committed Apr 12, 2016
1 parent 69284be commit 03a2912
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
5 changes: 3 additions & 2 deletions security/pam-radius/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# $NetBSD: Makefile,v 1.6 2015/09/26 20:58:06 bsiegert Exp $
# $NetBSD: Makefile,v 1.7 2016/04/12 13:15:14 fhajny Exp $

PKGNAME= ${DISTNAME:S/_/-/}
DISTNAME= pam_radius-1.4.0
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= security
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.freeradius.org/pam_radius_auth/
COMMENT= PAM module for authentication against a RADIUS server
LICENSE= gnu-gpl-v2

USE_TOOLS+= gmake
GNU_CONFIGURE= yes
Expand Down
4 changes: 2 additions & 2 deletions security/pam-radius/distinfo
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.6 2015/12/24 23:40:27 dholland Exp $
$NetBSD: distinfo,v 1.7 2016/04/12 13:15:14 fhajny Exp $

SHA1 (pam_radius-1.4.0.tar.gz) = 161af24355b79736bb63ba1cf9e627f9ca6e1671
RMD160 (pam_radius-1.4.0.tar.gz) = 765bf1d81243504b6fccbab4032baba424dd8d33
SHA512 (pam_radius-1.4.0.tar.gz) = 3505e3de6777c4129a36d2dbd1ae1dbdc5fe46d752c58a6f2a325f77d6f41f7bd999b886f830c0631e51112f756a16e699f29daa428c2befc79cfab5e5b58624
Size (pam_radius-1.4.0.tar.gz) = 179458 bytes
SHA1 (patch-configure) = 50cdf0f778d3b48e8c06f9871dcf3ef0efa4cdee
SHA1 (patch-configure) = 88f71bec092c9f9df95fe9de665ba4b37a440af0
SHA1 (patch-src_pam__radius__auth.h) = e17931e1789636f6bccf80e51d2f875d36ed7681
23 changes: 20 additions & 3 deletions security/pam-radius/patches/patch-configure
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
$NetBSD: patch-configure,v 1.1 2015/12/24 23:40:27 dholland Exp $
$NetBSD: patch-configure,v 1.2 2016/04/12 13:15:15 fhajny Exp $

Fix shell conditional.
Backport SunOS fix from upstream:
https://github.com/FreeRADIUS/pam_radius/commit/f6e2fb9a2dd04e23e7ca16350e6c3a8ccbd52d33

--- configure~ 2014-12-17 22:00:59.000000000 +0000
--- configure.orig 2014-12-17 22:00:59.000000000 +0000
+++ configure
@@ -5261,7 +5261,7 @@ fi
@@ -4540,7 +4540,13 @@ done
for ac_header in security/pam_modules.h pam/pam_modules.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+ #ifdef HAVE_SECURITY_PAM_APPL_H
+ # include <security/pam_appl.h>
+ #endif
+
+
+"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -5261,7 +5267,7 @@ fi
HOSTINFO=$host


Expand Down

0 comments on commit 03a2912

Please sign in to comment.