New diff with rcscript request by abieber@
Comments? Ok?
Cheers.-
On Thu, May 02, 2013 at 11:30:42AM -0300, Gonzalo L. R. wrote:
; Anyone?
;
; :)
;
; ----- Forwarded message from "Gonzalo L. R." <gonz...@x61.com.ar> -----
;
; From: "Gonzalo L. R." <gonz...@x61.com.ar>
; To: ports@openbsd.org
; Cc: vic...@gmail.com
; Date: Mon, 22 Apr 2013 15:19:01 -0300
; Subject: UPDATE: Ejabberd-2.1.12
;
; Hi,
;
; Update for Ejabberd to 2.1.12:
;
; Mostly bugfixes
;
;
https://github.com/processone/ejabberd/blob/master/doc/release_notes_2.1.12.txt
;
; Comments? Ok?
;
; Thanks.-
;
; --
; Sending from my iFart...
;
; Index: Makefile
; ===================================================================
; RCS file: /cvs/ports/net/ejabberd/Makefile,v
; retrieving revision 1.30
; diff -u -p -r1.30 Makefile
; --- Makefile 11 Mar 2013 11:35:46 -0000 1.30
; +++ Makefile 22 Apr 2013 18:12:04 -0000
; @@ -2,7 +2,7 @@
;
; COMMENT= jabber server written in Erlang
;
; -V= 2.1.11
; +V= 2.1.12
; DISTNAME= ejabberd-$V
;
; CATEGORIES= net
; @@ -79,4 +79,3 @@ post-install:
; @find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \;
;
; .include <bsd.port.mk>
; -
; Index: distinfo
; ===================================================================
; RCS file: /cvs/ports/net/ejabberd/distinfo,v
; retrieving revision 1.12
; diff -u -p -r1.12 distinfo
; --- distinfo 26 Jun 2012 20:23:29 -0000 1.12
; +++ distinfo 22 Apr 2013 18:12:04 -0000
; @@ -1,5 +1,2 @@
; -MD5 (ejabberd-2.1.11.tgz) = pwsEDE52AvR3GMiv6HgNUA==
; -RMD160 (ejabberd-2.1.11.tgz) = 1xSqdE9xgbjJbyKHh+ShwyWUvj8=
; -SHA1 (ejabberd-2.1.11.tgz) = rixSHV6T+9W8gmBSxVJLUiLc+uY=
; -SHA256 (ejabberd-2.1.11.tgz) = kdXBDmT5+qYMNFxoMEdG9JPXH4JyMwKVXUDWYZ49h94=
; -SIZE (ejabberd-2.1.11.tgz) = 2014232
; +SHA256 (ejabberd-2.1.12.tgz) = OPCCU0Z3PADIWmazNYbHXy0ZHR6w7Yrgn6FzaNbd/Rk=
; +SIZE (ejabberd-2.1.12.tgz) = 1999224
; Index: patches/patch-src_ejabberdctl_template
; ===================================================================
; RCS file: /cvs/ports/net/ejabberd/patches/patch-src_ejabberdctl_template,v
; retrieving revision 1.5
; diff -u -p -r1.5 patch-src_ejabberdctl_template
; --- patches/patch-src_ejabberdctl_template 23 Jan 2012 10:54:47 -0000
1.5
; +++ patches/patch-src_ejabberdctl_template 22 Apr 2013 18:12:04 -0000
; @@ -1,6 +1,6 @@
; $OpenBSD: patch-src_ejabberdctl_template,v 1.5 2012/01/23 10:54:47 ajacoutot
Exp $
; ---- src/ejabberdctl.template.orig Fri Dec 23 12:27:30 2011
; -+++ src/ejabberdctl.template Sun Jan 22 20:11:03 2012
; +--- src/ejabberdctl.template.orig Tue Feb 5 09:22:34 2013
; ++++ src/ejabberdctl.template Mon Apr 22 12:03:23 2013
; @@ -1,7 +1,7 @@
; #!/bin/sh
;
; @@ -72,7 +72,7 @@ $OpenBSD: patch-src_ejabberdctl_template
;
; # Change to a directory readable by INSTALLUSER to
; # prevent "File operation error: eacces." messages
; -@@ -244,7 +244,7 @@ ctl ()
; +@@ -250,7 +250,7 @@ ctl ()
; # using flock if available. Expects a linux-style
; # flock that can lock a file descriptor.
; MAXCONNID=100
; Index: pkg/PLIST
; ===================================================================
; RCS file: /cvs/ports/net/ejabberd/pkg/PLIST,v
; retrieving revision 1.12
; diff -u -p -r1.12 PLIST
; --- pkg/PLIST 26 Jun 2012 20:23:29 -0000 1.12
; +++ pkg/PLIST 22 Apr 2013 18:12:04 -0000
; @@ -82,9 +82,7 @@ lib/ejabberd/ebin/jd2ejd.beam
; lib/ejabberd/ebin/jlib.beam
; lib/ejabberd/ebin/mod_adhoc.beam
; lib/ejabberd/ebin/mod_announce.beam
; -lib/ejabberd/ebin/mod_announce_odbc.beam
; lib/ejabberd/ebin/mod_blocking.beam
; -lib/ejabberd/ebin/mod_blocking_odbc.beam
; lib/ejabberd/ebin/mod_caps.beam
; lib/ejabberd/ebin/mod_configure.beam
; lib/ejabberd/ebin/mod_configure2.beam
; @@ -95,21 +93,15 @@ lib/ejabberd/ebin/mod_http_fileserver.be
; lib/ejabberd/ebin/mod_ip_blacklist.beam
; lib/ejabberd/ebin/mod_irc.beam
; lib/ejabberd/ebin/mod_irc_connection.beam
; -lib/ejabberd/ebin/mod_irc_odbc.beam
; lib/ejabberd/ebin/mod_last.beam
; -lib/ejabberd/ebin/mod_last_odbc.beam
; lib/ejabberd/ebin/mod_muc.beam
; lib/ejabberd/ebin/mod_muc_log.beam
; -lib/ejabberd/ebin/mod_muc_odbc.beam
; lib/ejabberd/ebin/mod_muc_room.beam
; lib/ejabberd/ebin/mod_offline.beam
; -lib/ejabberd/ebin/mod_offline_odbc.beam
; lib/ejabberd/ebin/mod_ping.beam
; lib/ejabberd/ebin/mod_pres_counter.beam
; lib/ejabberd/ebin/mod_privacy.beam
; -lib/ejabberd/ebin/mod_privacy_odbc.beam
; lib/ejabberd/ebin/mod_private.beam
; -lib/ejabberd/ebin/mod_private_odbc.beam
; lib/ejabberd/ebin/mod_proxy65.beam
; lib/ejabberd/ebin/mod_proxy65_lib.beam
; lib/ejabberd/ebin/mod_proxy65_service.beam
; @@ -120,19 +112,15 @@ lib/ejabberd/ebin/mod_pubsub_odbc.beam
; lib/ejabberd/ebin/mod_register.beam
; lib/ejabberd/ebin/mod_register_web.beam
; lib/ejabberd/ebin/mod_roster.beam
; -lib/ejabberd/ebin/mod_roster_odbc.beam
; lib/ejabberd/ebin/mod_service_log.beam
; lib/ejabberd/ebin/mod_shared_roster.beam
; lib/ejabberd/ebin/mod_shared_roster_ldap.beam
; -lib/ejabberd/ebin/mod_shared_roster_odbc.beam
; lib/ejabberd/ebin/mod_sic.beam
; lib/ejabberd/ebin/mod_stats.beam
; lib/ejabberd/ebin/mod_time.beam
; lib/ejabberd/ebin/mod_vcard.beam
; lib/ejabberd/ebin/mod_vcard_ldap.beam
; -lib/ejabberd/ebin/mod_vcard_odbc.beam
; lib/ejabberd/ebin/mod_vcard_xupdate.beam
; -lib/ejabberd/ebin/mod_vcard_xupdate_odbc.beam
; lib/ejabberd/ebin/mod_version.beam
; lib/ejabberd/ebin/node_buddy.beam
; lib/ejabberd/ebin/node_club.beam
; @@ -209,6 +197,7 @@ lib/ejabberd/priv/msgs/eo.msg
; lib/ejabberd/priv/msgs/es.msg
; lib/ejabberd/priv/msgs/fr.msg
; lib/ejabberd/priv/msgs/gl.msg
; +lib/ejabberd/priv/msgs/he.msg
; lib/ejabberd/priv/msgs/id.msg
; lib/ejabberd/priv/msgs/it.msg
; lib/ejabberd/priv/msgs/ja.msg
;
;
; ----- End forwarded message -----
;
; --
; Sending from my iFart...
;
--
Sending from my iFart...
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ejabberd/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 11 Mar 2013 11:35:46 -0000 1.30
+++ Makefile 2 May 2013 18:20:37 -0000
@@ -2,7 +2,7 @@
COMMENT= jabber server written in Erlang
-V= 2.1.11
+V= 2.1.12
DISTNAME= ejabberd-$V
CATEGORIES= net
@@ -79,4 +79,3 @@ post-install:
@find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \;
.include <bsd.port.mk>
-
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ejabberd/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 26 Jun 2012 20:23:29 -0000 1.12
+++ distinfo 2 May 2013 18:20:37 -0000
@@ -1,5 +1,2 @@
-MD5 (ejabberd-2.1.11.tgz) = pwsEDE52AvR3GMiv6HgNUA==
-RMD160 (ejabberd-2.1.11.tgz) = 1xSqdE9xgbjJbyKHh+ShwyWUvj8=
-SHA1 (ejabberd-2.1.11.tgz) = rixSHV6T+9W8gmBSxVJLUiLc+uY=
-SHA256 (ejabberd-2.1.11.tgz) = kdXBDmT5+qYMNFxoMEdG9JPXH4JyMwKVXUDWYZ49h94=
-SIZE (ejabberd-2.1.11.tgz) = 2014232
+SHA256 (ejabberd-2.1.12.tgz) = OPCCU0Z3PADIWmazNYbHXy0ZHR6w7Yrgn6FzaNbd/Rk=
+SIZE (ejabberd-2.1.12.tgz) = 1999224
Index: patches/patch-src_ejabberdctl_template
===================================================================
RCS file: /cvs/ports/net/ejabberd/patches/patch-src_ejabberdctl_template,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_ejabberdctl_template
--- patches/patch-src_ejabberdctl_template 23 Jan 2012 10:54:47 -0000
1.5
+++ patches/patch-src_ejabberdctl_template 2 May 2013 18:20:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_ejabberdctl_template,v 1.5 2012/01/23 10:54:47 ajacoutot
Exp $
---- src/ejabberdctl.template.orig Fri Dec 23 12:27:30 2011
-+++ src/ejabberdctl.template Sun Jan 22 20:11:03 2012
+--- src/ejabberdctl.template.orig Tue Feb 5 09:22:34 2013
++++ src/ejabberdctl.template Mon Apr 22 12:03:23 2013
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -72,7 +72,7 @@ $OpenBSD: patch-src_ejabberdctl_template
# Change to a directory readable by INSTALLUSER to
# prevent "File operation error: eacces." messages
-@@ -244,7 +244,7 @@ ctl ()
+@@ -250,7 +250,7 @@ ctl ()
# using flock if available. Expects a linux-style
# flock that can lock a file descriptor.
MAXCONNID=100
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ejabberd/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 26 Jun 2012 20:23:29 -0000 1.12
+++ pkg/PLIST 2 May 2013 18:20:37 -0000
@@ -82,9 +82,7 @@ lib/ejabberd/ebin/jd2ejd.beam
lib/ejabberd/ebin/jlib.beam
lib/ejabberd/ebin/mod_adhoc.beam
lib/ejabberd/ebin/mod_announce.beam
-lib/ejabberd/ebin/mod_announce_odbc.beam
lib/ejabberd/ebin/mod_blocking.beam
-lib/ejabberd/ebin/mod_blocking_odbc.beam
lib/ejabberd/ebin/mod_caps.beam
lib/ejabberd/ebin/mod_configure.beam
lib/ejabberd/ebin/mod_configure2.beam
@@ -95,21 +93,15 @@ lib/ejabberd/ebin/mod_http_fileserver.be
lib/ejabberd/ebin/mod_ip_blacklist.beam
lib/ejabberd/ebin/mod_irc.beam
lib/ejabberd/ebin/mod_irc_connection.beam
-lib/ejabberd/ebin/mod_irc_odbc.beam
lib/ejabberd/ebin/mod_last.beam
-lib/ejabberd/ebin/mod_last_odbc.beam
lib/ejabberd/ebin/mod_muc.beam
lib/ejabberd/ebin/mod_muc_log.beam
-lib/ejabberd/ebin/mod_muc_odbc.beam
lib/ejabberd/ebin/mod_muc_room.beam
lib/ejabberd/ebin/mod_offline.beam
-lib/ejabberd/ebin/mod_offline_odbc.beam
lib/ejabberd/ebin/mod_ping.beam
lib/ejabberd/ebin/mod_pres_counter.beam
lib/ejabberd/ebin/mod_privacy.beam
-lib/ejabberd/ebin/mod_privacy_odbc.beam
lib/ejabberd/ebin/mod_private.beam
-lib/ejabberd/ebin/mod_private_odbc.beam
lib/ejabberd/ebin/mod_proxy65.beam
lib/ejabberd/ebin/mod_proxy65_lib.beam
lib/ejabberd/ebin/mod_proxy65_service.beam
@@ -120,19 +112,15 @@ lib/ejabberd/ebin/mod_pubsub_odbc.beam
lib/ejabberd/ebin/mod_register.beam
lib/ejabberd/ebin/mod_register_web.beam
lib/ejabberd/ebin/mod_roster.beam
-lib/ejabberd/ebin/mod_roster_odbc.beam
lib/ejabberd/ebin/mod_service_log.beam
lib/ejabberd/ebin/mod_shared_roster.beam
lib/ejabberd/ebin/mod_shared_roster_ldap.beam
-lib/ejabberd/ebin/mod_shared_roster_odbc.beam
lib/ejabberd/ebin/mod_sic.beam
lib/ejabberd/ebin/mod_stats.beam
lib/ejabberd/ebin/mod_time.beam
lib/ejabberd/ebin/mod_vcard.beam
lib/ejabberd/ebin/mod_vcard_ldap.beam
-lib/ejabberd/ebin/mod_vcard_odbc.beam
lib/ejabberd/ebin/mod_vcard_xupdate.beam
-lib/ejabberd/ebin/mod_vcard_xupdate_odbc.beam
lib/ejabberd/ebin/mod_version.beam
lib/ejabberd/ebin/node_buddy.beam
lib/ejabberd/ebin/node_club.beam
@@ -209,6 +197,7 @@ lib/ejabberd/priv/msgs/eo.msg
lib/ejabberd/priv/msgs/es.msg
lib/ejabberd/priv/msgs/fr.msg
lib/ejabberd/priv/msgs/gl.msg
+lib/ejabberd/priv/msgs/he.msg
lib/ejabberd/priv/msgs/id.msg
lib/ejabberd/priv/msgs/it.msg
lib/ejabberd/priv/msgs/ja.msg
@@ -279,3 +268,6 @@ share/examples/ejabberd/transport-config
@sample /var/log/ejabberd/
@mode 0750
@sample /var/db/ejabberd/
+@owner
+@group
+@rcscript ${RCDIR}/ejabberd
Index: pkg/ejabberd.rc
===================================================================
RCS file: pkg/ejabberd.rc
diff -N pkg/ejabberd.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/ejabberd.rc 2 May 2013 18:20:37 -0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/ejabberdctl"
+
+. /etc/rc.d/rc.subr
+
+rc_start() {
+ ${rcexec} "${daemon} start"
+}
+
+rc_restart() {
+ ${rcexec} "${daemon} restart"
+}
+
+rc_stop() {
+ ${rcexec} "${daemon} stop"
+}
+
+rc_check() {
+ ${rcexec} "${daemon} status"
+}
+
+rc_reload=NO
+
+rc_cmd $1
