[rpms/ejabberd] f45: PAM support

[rpms/ejabberd] f45: PAM support

[Peter Lemenkov]

A new commit has been pushed.

Repo   : rpms/ejabberd
Branch : f45
Commit : ddc001a450f0cb8751fecf0903862be6aa2f41b5
Author : Peter Lemenkov <peter@fedoraproject.org>
Date   : 2008-08-10T06:56:56+00:00
Stats  : +28/-5 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ejabberd/c/ddc001a450f0cb8751fecf0903862be6aa2f41b5?branch=f45

Log:
PAM support

---
diff --git a/ejabberd-ejabberd_cfg_pam_name.diff b/ejabberd-ejabberd_cfg_pam_name.diff
new file mode 100644
index 0000000..7c0d519
--- /dev/null
+++ b/ejabberd-ejabberd_cfg_pam_name.diff
@@ -0,0 +1,11 @@
+--- src/ejabberd.cfg.example~	2008-08-01 16:34:28.000000000 +0400
++++ src/ejabberd.cfg.example	2008-08-09 21:09:07.000000000 +0400
+@@ -214,7 +214,7 @@
+ %% Authentication using PAM
+ %%
+ %%{auth_method, pam}.
+-%%{pam_service, "pamservicename"}.
++%%{pam_service, "ejabberd"}.
+ 
+ %%
+ %% Authentication using LDAP

diff --git a/ejabberd.pam b/ejabberd.pam
new file mode 100644
index 0000000..2f9b69c
--- /dev/null
+++ b/ejabberd.pam
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth       include      system-auth
+account    include      system-auth
+

diff --git a/ejabberd.spec b/ejabberd.spec
index 68b6a30..98fc108 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.2
-Release:        0.2.beta1%{?dist}
+Release:        0.3.beta1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -17,15 +17,16 @@ Source4:        https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/
 Source5:        ejabberd_auth_ad.erl
 Source6:        mod_shared_roster_ad.erl
 Source7:        mod_vcard_ad.erl
-#
-#Source8:        ejabberdctl
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
+Source11:      ejabberd.pam
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
 # BZ# 439583, 452326, 451554
 Patch2: ejabberd-ejabberdctl_fix.diff
+# Use ejabberd as an example for PAM service name
+Patch3: ejabberd-ejabberd_cfg_pam_name.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -106,6 +107,7 @@ fi
 %setup -q -n %{name}-%{version}-beta1
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
+%patch3 -p0 -b .pam_name
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -115,7 +117,7 @@ cp %{S:7} src
 
 %build
 pushd src
-%configure --enable-odbc --enable-debug
+%configure --enable-odbc --enable-debug --enable-pam
 # doesn't builds on SMP currently
 make
 popd
@@ -141,9 +143,9 @@ mkdir -p %{buildroot}/var/lib/ejabberd/spool
 
 mkdir -p %{buildroot}%{_bindir}
 ln -s consolehelper %{buildroot}%{_bindir}/ejabberdctl
-#install -D -p -m 0755 %{S:8} %{buildroot}%{_sbindir}/ejabberdctl
 install -D -p -m 0644 %{S:9} %{buildroot}%{_sysconfdir}/pam.d/ejabberdctl
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
+install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
 mkdir -p %{buildroot}%{_initrddir}
 install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
@@ -173,6 +175,7 @@ rm -rf %{buildroot}
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
 
+%config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
 %{_bindir}/ejabberdctl
@@ -182,6 +185,7 @@ rm -rf %{buildroot}
 %dir %{_libdir}/%{name}/ebin
 %dir %{_libdir}/%{name}/priv
 %dir %{_libdir}/%{name}/priv/bin
+%attr(4750,root,ejabberd)    %{_libdir}/%{name}/priv/bin/epam
 %dir %{_libdir}/%{name}/priv/lib
 %dir %{_libdir}/%{name}/priv/msgs
 
@@ -203,6 +207,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.3.beta1
+- PAM support (BZ# 452803)
+
 * Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.2.beta1
 - Fix build with --fuzz=0
 

diff --git a/import.log b/import.log
index aa9e2f9..a459927 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 ejabberd-2_0_1-3_fc9:HEAD:ejabberd-2.0.1-3.fc9.src.rpm:1214150816
 ejabberd-2_0_1-4_fc9:HEAD:ejabberd-2.0.1-4.fc9.src.rpm:1214160895
 ejabberd-2_0_2-0_1_beta1_fc9:HEAD:ejabberd-2.0.2-0.1.beta1.fc9.src.rpm:1218295749
+ejabberd-2_0_2-0_3_beta1_fc9:HEAD:ejabberd-2.0.2-0.3.beta1.fc9.src.rpm:1218350775