diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-07-08 11:58:50 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-07-08 11:58:50 +0000 |
| commit | 63d58d755bdd12f8ddf427216f7732fba19ba44c (patch) | |
| tree | eb3c6868156ed421a76ce72a3d4dec10780ea98f /sysutils/pam_mount | |
| parent | 688ad744d90a99cd468b6f3146981c2e682bf1e6 (diff) | |
| download | ports-63d58d755bdd12f8ddf427216f7732fba19ba44c.tar.gz ports-63d58d755bdd12f8ddf427216f7732fba19ba44c.zip | |
- Fix build with newer libHX
- Remove shlib version from LIB_DEPENDS [1]
- Trim Makefile Header
Reported by: bapt [1]
Notes
Notes:
svn path=/head/; revision=322498
Diffstat (limited to 'sysutils/pam_mount')
| -rw-r--r-- | sysutils/pam_mount/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/pam_mount/files/patch-src_mtab.c | 11 | ||||
| -rw-r--r-- | sysutils/pam_mount/files/patch-src_pmvarrun.c | 11 |
3 files changed, 25 insertions, 8 deletions
diff --git a/sysutils/pam_mount/Makefile b/sysutils/pam_mount/Makefile index 630add447f58..85b9aba36302 100644 --- a/sysutils/pam_mount/Makefile +++ b/sysutils/pam_mount/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection Makefile for: pam_mount -# Date created: 14 October 2010 -# Whom: gahr -# +# Created by: gahr # $FreeBSD$ -# PORTNAME= pam_mount PORTVERSION= 2.12 @@ -14,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME:S/_/-/}/${PORTNAME}/${PORTVERSION}/ MAINTAINER= gahr@FreeBSD.org COMMENT= A PAM that can mount volumes for a user session -LIB_DEPENDS= HX.27:${PORTSDIR}/lang/libhx +LIB_DEPENDS= HX:${PORTSDIR}/lang/libhx USE_GNOME= pkgconfig libxml2 USE_PERL5= yes @@ -28,11 +23,11 @@ CONFIGURE_ARGS+=--localstatedir=/var \ --with-ssbindir=${PREFIX}/sbin post-patch: - ${REINPLACE_CMD} -e '11172s|yes|no|' ${WRKSRC}/${CONFIGURE_SCRIPT} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/pam_mount.c ${REINPLACE_CMD} -e '/dist_security_DATA/s|\.xml$$|.xml.sample|' \ ${WRKSRC}/config/Makefile.am ${WRKSRC}/config/Makefile.in ${MV} ${WRKSRC}/config/pam_mount.conf.xml ${WRKSRC}/config/pam_mount.conf.xml.sample + ${FIND} ${WRKSRC} -name "*.c" -exec ${REINPLACE_CMD} -e 's|HXformat2_aprintf|HXformat_aprintf|g' {} \; MAN5= pam_mount.conf.5 MAN8= mount.crypt.8 mount.crypt_LUKS.8 mount.crypto_LUKS.8 \ diff --git a/sysutils/pam_mount/files/patch-src_mtab.c b/sysutils/pam_mount/files/patch-src_mtab.c new file mode 100644 index 000000000000..fa277ce4d213 --- /dev/null +++ b/sysutils/pam_mount/files/patch-src_mtab.c @@ -0,0 +1,11 @@ +--- src/mtab.c.orig 2012-12-03 17:20:15.000000000 +0100 ++++ src/mtab.c 2012-12-03 17:20:28.000000000 +0100 +@@ -138,7 +138,7 @@ + l0g("HX_dirname: %s\n", strerror(errno)); + return -errno; + } +- ret = HX_mkdir(dirname); ++ ret = HX_mkdir(dirname, S_IRWXUGO); + free(dirname); + if (ret < 0) { + l0g("HX_mkdir: %s\n", strerror(-ret)); diff --git a/sysutils/pam_mount/files/patch-src_pmvarrun.c b/sysutils/pam_mount/files/patch-src_pmvarrun.c new file mode 100644 index 000000000000..ac010a7e40c4 --- /dev/null +++ b/sysutils/pam_mount/files/patch-src_pmvarrun.c @@ -0,0 +1,11 @@ +--- src/pmvarrun.c.orig 2012-12-03 17:30:58.000000000 +0100 ++++ src/pmvarrun.c 2012-12-03 17:31:19.000000000 +0100 +@@ -299,7 +299,7 @@ + int ret; + + w4rn("creating " VAR_RUN_PMT); +- if (HX_mkdir(VAR_RUN_PMT) < 0) { ++ if (HX_mkdir(VAR_RUN_PMT, S_IRWXU | S_IRXG | S_IRXO) < 0) { + ret = -errno; + l0g("unable to create " VAR_RUN_PMT ": %s\n", strerror(errno)); + return ret; |