[SM-Commit] GIT changes to master grimoire by Andraž Levstik (f9367618a24899541fd76c7159c5e5bab02889da)

Andraž Levstik scm at sourcemage.org
Fri Jan 2 13:30:11 EST 2009


GIT changes to master grimoire by Andraž Levstik <ruskie at codemages.net>:

 ChangeLog                          |    3 +++
 chat-im/ejabberd/BUILD             |    3 ++-
 chat-im/ejabberd/DETAILS           |    2 +-
 chat-im/ejabberd/HISTORY           |    5 +++++
 chat-im/ejabberd/Makefile.in.patch |   19 -------------------
 chat-im/ejabberd/PRE_BUILD         |    3 ---
 security/pam-imap/BUILD            |    2 ++
 security/pam-imap/DEPENDS          |    2 ++
 security/pam-imap/DETAILS          |   15 +++++++++++++++
 security/pam-imap/HISTORY          |    5 +++++
 security/pam-imap/INSTALL          |    6 ++++++
 security/pam-imap/check_user.pam   |    6 ++++++
 12 files changed, 47 insertions(+), 24 deletions(-)

New commits:
commit f9367618a24899541fd76c7159c5e5bab02889da
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    pam-imap: new spell, pam auth against an imap server(s)

commit 6764eadc5a94b2fb2c4a18278b9b08814f2b17d2
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    ejabberd: updated to 2.0.2, fixup of paths

diff --git a/ChangeLog b/ChangeLog
index 90a684b..f0a0db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-01-02 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* security/pam-imap: new spell, auth against imap server with pam
+
 2009-01-01 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* libs/udns: new spell, dns reslovre stub library
 
diff --git a/chat-im/ejabberd/BUILD b/chat-im/ejabberd/BUILD
index 6fcaca7..ef25ce8 100755
--- a/chat-im/ejabberd/BUILD
+++ b/chat-im/ejabberd/BUILD
@@ -1,3 +1,4 @@
-OPTS="$EJABBERD_OPTS $OPTS" &&
+OPTS="--sysconfdir=$INSTALL_ROOT/etc --prefix=$INSTALL_ROOT/ \
+      --exec-prefix=$INSTALL_ROOT/usr $EJABBERD_OPTS $OPTS"  &&
 cd $SOURCE_DIRECTORY/src &&
 default_build
diff --git a/chat-im/ejabberd/DETAILS b/chat-im/ejabberd/DETAILS
index 42852c6..53c48e6 100755
--- a/chat-im/ejabberd/DETAILS
+++ b/chat-im/ejabberd/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ejabberd
-         VERSION=2.0.0
+         VERSION=2.0.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://www.process-one.net/downloads/${SPELL}/${VERSION}/${SOURCE}
diff --git a/chat-im/ejabberd/HISTORY b/chat-im/ejabberd/HISTORY
index b42a06b..2134f2e 100644
--- a/chat-im/ejabberd/HISTORY
+++ b/chat-im/ejabberd/HISTORY
@@ -1,3 +1,8 @@
+2009-01-02 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: updated spell to 2.0.2
+	* BUILD: use --prefix as / and --exec-prefix as /usr to
+	  fix all paths easily
+
 2008-03-31 Justin Boffemmyer <flux at sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, INSTALL, HISTORY: spell created
 
diff --git a/chat-im/ejabberd/Makefile.in.patch b/chat-im/ejabberd/Makefile.in.patch
deleted file mode 100644
index 9916469..0000000
--- a/chat-im/ejabberd/Makefile.in.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	2008-03-31 14:26:33.000000000 -0500
-+++ Makefile.in	2008-03-31 14:32:28.000000000 -0500
-@@ -50,13 +50,13 @@
- 
- DESTDIR =
- 
--EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd
-+EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
- BEAMDIR = $(EJABBERDDIR)/ebin
- PRIVDIR = $(EJABBERDDIR)/priv
- SODIR = $(PRIVDIR)/lib
- MSGSDIR = $(PRIVDIR)/msgs
--LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
--ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
-+LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
-+ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
- SBINDIR = $(DESTDIR)@prefix@/sbin
- 
- ifeq ($(shell uname),Darwin)
diff --git a/chat-im/ejabberd/PRE_BUILD b/chat-im/ejabberd/PRE_BUILD
deleted file mode 100755
index 6a2a84a..0000000
--- a/chat-im/ejabberd/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/src &&
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.in.patch
diff --git a/security/pam-imap/BUILD b/security/pam-imap/BUILD
new file mode 100755
index 0000000..3d5409b
--- /dev/null
+++ b/security/pam-imap/BUILD
@@ -0,0 +1,2 @@
+default_build  &&
+make check_user
diff --git a/security/pam-imap/DEPENDS b/security/pam-imap/DEPENDS
new file mode 100755
index 0000000..bbbdac8
--- /dev/null
+++ b/security/pam-imap/DEPENDS
@@ -0,0 +1,2 @@
+depends linux-pam &&
+depends openssl 
diff --git a/security/pam-imap/DETAILS b/security/pam-imap/DETAILS
new file mode 100755
index 0000000..cdc35a1
--- /dev/null
+++ b/security/pam-imap/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=pam-imap
+         VERSION=0.3.7
+          SOURCE="pam_imap-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:347624d20d02aa2603ffb5a206290076c30d04614d2ac93d9b49845cb95e3d34f116a809dbb56582bcf06ab9dd0504f004ce64bc4b136d28acb03d8c51772335
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/pam_imap-${VERSION}"
+        WEB_SITE="http://pam-imap.sf.net "
+      LICENSE[0]=GPL
+         ENTERED=20090102
+           SHORT="A PAM module that authenticates against an IMAP server."
+cat << EOF
+pam_imap is a PAM module that authenticates against a remote IMAP or IMAPS
+server. It supports multiple servers, SSL, password caching, user blacklists
+(for admin users), and many configuration abilities.
+EOF
diff --git a/security/pam-imap/HISTORY b/security/pam-imap/HISTORY
new file mode 100644
index 0000000..b36229e
--- /dev/null
+++ b/security/pam-imap/HISTORY
@@ -0,0 +1,5 @@
+2009-01-02 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS, DETAILS, BUILD, INSTALL: spell created
+	* check_user.pam: added my own example since I had issues
+	  getting it to work with the provided ones
+
diff --git a/security/pam-imap/INSTALL b/security/pam-imap/INSTALL
new file mode 100755
index 0000000..253c07e
--- /dev/null
+++ b/security/pam-imap/INSTALL
@@ -0,0 +1,6 @@
+default_install  &&
+cp -v check_user $INSTALL_ROOT/usr/bin/  &&
+# since all the examples are a bit outdated I'm adding what I needed
+# to get it to work
+cp -v $SPELL_DIRECTORY/check_user.pam \
+      $INSTALL_ROOT/usr/share/doc/$SPELL/conf/check_user.pam
diff --git a/security/pam-imap/check_user.pam b/security/pam-imap/check_user.pam
new file mode 100755
index 0000000..a825013
--- /dev/null
+++ b/security/pam-imap/check_user.pam
@@ -0,0 +1,6 @@
+auth    sufficient pam_imap.so conf=/etc/pam.d/pam_imap.conf
+auth    required pam_deny.so
+session optional pam_permit.so
+account optional pam_permit.so
+session optional pam_permit.so
+



More information about the SM-Commit mailing list