diff options
author | Ashish SHUKLA <ashish@FreeBSD.org> | 2011-05-10 16:44:25 +0000 |
---|---|---|
committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2011-05-10 16:44:25 +0000 |
commit | a9c5e00be32d2c3182130d4b0c1b78d62f2b31b5 (patch) | |
tree | e698898ec33d85b36293b67cd0e1c1e8a993e690 /net-im/ejabberd | |
parent | 33a8d8d5671eee772865aa4f407de468a5e0d82e (diff) | |
download | ports-a9c5e00be32d2c3182130d4b0c1b78d62f2b31b5.tar.gz ports-a9c5e00be32d2c3182130d4b0c1b78d62f2b31b5.zip |
- Update to 2.1.6
- Cleanup pkg-plist
- Switch to USERS/GROUPS knobs instead of manual creating
- Remove support for unsupported FreeBSD versions
- Add PAM support[1]
PR: ports/156850
Submitted by: Ruslan Mahmatkhanov <cvs-src@yandex.ru>, lstewart[1] (via private email)
Notes
Notes:
svn path=/head/; revision=273916
Diffstat (limited to 'net-im/ejabberd')
-rw-r--r-- | net-im/ejabberd/Makefile | 31 | ||||
-rw-r--r-- | net-im/ejabberd/distinfo | 4 | ||||
-rw-r--r-- | net-im/ejabberd/files/pam_ejabberd | 6 | ||||
-rw-r--r-- | net-im/ejabberd/files/pkg-install.in | 30 | ||||
-rw-r--r-- | net-im/ejabberd/pkg-deinstall | 14 | ||||
-rw-r--r-- | net-im/ejabberd/pkg-plist | 48 |
6 files changed, 63 insertions, 70 deletions
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index e3f239d737b9..144ccdc8884e 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ejabberd -PORTVERSION= 2.1.5 +PORTVERSION= 2.1.6 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ @@ -17,21 +17,26 @@ BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +USERS= ejabberd +GROUPS= ${USERS} + GNU_CONFIGURE= yes USE_GMAKE= yes USE_ICONV= yes USE_RC_SUBR= ${PORTNAME} NOPRECIOUSMAKEVARS= yes -OPTIONS= ODBC "Enable ODBC support" off +OPTIONS= ODBC "Enable ODBC support" off \ + PAM "Enable setuid PAM auth support" off MAKE_ENV= PORTVERSION=${PORTVERSION} -CONFIGURE_ARGS+=--localstatedir=/var +CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE} PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PLIST_SUB= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} SUB_FILES= pkg-message pkg-install -SUB_LIST= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} +SUB_LIST= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \ + USERS=${USERS} GROUPS=${GROUPS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src LICENSE= GPLv2 @@ -41,11 +46,6 @@ LICENSE_FILE= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING USE_OPENSSL= yes -.if ${OSVERSION} < 700000 -BROKEN= does not compile -WITH_OPENSSL_PORT= yes -CONFIGURE_ARGS+=--with-openssl=${LOCALBASE} -.endif .include "${PORTSDIR}/Mk/bsd.openssl.mk" .if defined(WITH_ODBC) @@ -55,6 +55,13 @@ PLIST_SUB+= ODBC="" PLIST_SUB+= ODBC="@comment " .endif +.if defined(WITH_PAM) +CONFIGURE_ARGS+=--enable-pam +PLIST_SUB+= PAM="" +.else +PLIST_SUB+= PAM="@comment " +.endif + .if defined(NOPORTDOCS) MAKE_ARGS+= NOPORTDOCS=${NOPORTDOCS} .endif @@ -67,6 +74,12 @@ post-install: ${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE} ${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP} +.if defined(WITH_PAM) + ${CHMOD} 4750 ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam + ${CHOWN} root:ejabberd ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam + ${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${PREFIX}/etc/pam.d/ejabberd +.endif + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo index 0a94c40e4256..7e1cae3a7dd9 100644 --- a/net-im/ejabberd/distinfo +++ b/net-im/ejabberd/distinfo @@ -1,2 +1,2 @@ -SHA256 (ejabberd-2.1.5.tar.gz) = 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d -SIZE (ejabberd-2.1.5.tar.gz) = 2278008 +SHA256 (ejabberd-2.1.6.tar.gz) = b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544 +SIZE (ejabberd-2.1.6.tar.gz) = 2874967 diff --git a/net-im/ejabberd/files/pam_ejabberd b/net-im/ejabberd/files/pam_ejabberd new file mode 100644 index 000000000000..4f0b70ec8f27 --- /dev/null +++ b/net-im/ejabberd/files/pam_ejabberd @@ -0,0 +1,6 @@ +# +# PAM configuration for the "ejabberd" service +# + +# auth +auth required pam_unix.so no_warn try_first_pass diff --git a/net-im/ejabberd/files/pkg-install.in b/net-im/ejabberd/files/pkg-install.in index ca83f6f813fc..18d704bed7de 100644 --- a/net-im/ejabberd/files/pkg-install.in +++ b/net-im/ejabberd/files/pkg-install.in @@ -4,35 +4,11 @@ if [ x"$2" != x"POST-INSTALL" ]; then exit 0 fi -USER=ejabberd -GROUP=${USER} -UID=543 -GID=${UID} USERS_HOME="/var/spool/ejabberd" -if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if ! pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s "/bin/sh" -d ${USERS_HOME} -c "ejabberd pseudo user"; \ - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -fi - -install -d -m 750 -o ${USER} -g ${GROUP} ${USERS_HOME} /var/log/ejabberd +install -d -m 750 -o %%USERS%% -g %%GROUPS%% ${USERS_HOME} /var/log/ejabberd -chown -R ${USER}:${GROUP} %%PREFIX%%/etc/%%PORTNAME%% -chown -R ${USER}:${GROUP} %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% +chown -R %%USERS%%:%%GROUPS%% %%PREFIX%%/etc/%%PORTNAME%% +chown -R %%USERS%%:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% exit 0 diff --git a/net-im/ejabberd/pkg-deinstall b/net-im/ejabberd/pkg-deinstall index b00350d14ca8..d4a67b304993 100644 --- a/net-im/ejabberd/pkg-deinstall +++ b/net-im/ejabberd/pkg-deinstall @@ -4,20 +4,6 @@ if [ x"$2" != x"POST-DEINSTALL" ]; then exit 0 fi -USER=ejabberd - -echo "" - -if pw usershow "${USER}" 2>/dev/null 1>&2; then - echo "To delete ejabberd user permanently, use 'pw userdel ${USER}'." -fi - -if pw groupshow "${USER}" 2>/dev/null 1>&2; then - echo "To delete ejabberd group permanently, use 'pw groupdel ${USER}'." -fi - -rm -Rf /var/run/ejabberd - cat <<EOF If you wish to delete ejabberd data and log files, remove "/var/spool/ejabberd" and "/var/log/ejabberd" directories. diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index bff32ba91ad2..3c075fb74740 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -1,10 +1,9 @@ -etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example -etc/%%PORTNAME%%/%%PORTNAME%%ctl.cfg.example -etc/%%PORTNAME%%/inetrc.example -@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; fi -@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; fi -@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; fi -@exec [ ! -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc ] && cp %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc +%%ETCDIR%%/%%PORTNAME%%.cfg.example +%%ETCDIR%%/%%PORTNAME%%ctl.cfg.example +%%ETCDIR%%/inetrc.example +@unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.defaults.example %D/%%ETCDIR%%/%%PORTNAME%%.defaults; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.defaults; fi +@unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; fi +@exec [ ! -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc ] && cp %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam @@ -58,11 +57,16 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_zlib.beam %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam +%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/epam.beam +%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam +%%PAM%%etc/pam.d/%%PORTNAME%% +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab_sup.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_captcha.beam -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_commands.beam -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_piefxis.beam -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_stun.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_captcha.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_commands.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_piefxis.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter.beam @@ -110,10 +114,12 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_stream.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register_web.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_service_log.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_ldap.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sic.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stats.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_time.beam @@ -141,6 +147,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_fsm.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mnesia.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pg2_backport.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_db_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription.beam @@ -159,10 +166,10 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/XmppAddr.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/adhoc.hrl -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd.hrl -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_commands.hrl -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_config.hrl -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_ctl.hrl +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%.hrl +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_commands.hrl +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_config.hrl +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_ctl.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/eldap/ELDAPv3.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/eldap/eldap.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/jlib.hrl @@ -171,8 +178,8 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_privacy.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_proxy65/mod_proxy65.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_pubsub/pubsub.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_roster.hrl -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_http.hrl -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_web_admin.hrl +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_http.hrl +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_web_admin.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/http_bind.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/captcha.sh lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so @@ -212,6 +219,10 @@ sbin/%%PORTNAME%%ctl %%PORTDOCS%%%%DOCSDIR%%/guide.html %%PORTDOCS%%%%DOCSDIR%%/guide.pdf %%PORTDOCS%%%%DOCSDIR%%/logo.png +%%PORTDOCS%%%%DOCSDIR%%/msrl-dit-deep.png +%%PORTDOCS%%%%DOCSDIR%%/msrl-dit-flat.png +%%PORTDOCS%%%%DOCSDIR%%/msrl-roster-deep.png +%%PORTDOCS%%%%DOCSDIR%%/msrl-roster-flat.png %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt @@ -233,11 +244,11 @@ sbin/%%PORTNAME%%ctl %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.3.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.4.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.5.txt +%%PORTDOCS%%%%DOCSDIR%%/release_notes_%%PORTVERSION%%.txt %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry etc/%%PORTNAME%% @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin @@ -250,3 +261,4 @@ sbin/%%PORTNAME%%ctl @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% +@dirrmtry %%ETCDIR%% |