Author: walluck
Date: Thu Oct 26 08:39:44 2006
New Revision: 72930
Added:
packages/cooker/dante/current/SOURCES/dante-1.1.12-pre1-pam-syslog.patch
packages/cooker/dante/current/SOURCES/dante-1.1.14-wait.patch
Removed:
packages/cooker/dante/current/SOURCES/dante-1.1.12-pre1-pam-syslog.patch.bz2
packages/cooker/dante/current/SOURCES/dante-1.1.14-wait.patch.bz2
Modified:
packages/cooker/dante/current/SPECS/dante.spec
Log:
bunzip2 patches
Added: packages/cooker/dante/current/SOURCES/dante-1.1.12-pre1-pam-syslog.patch
==============================================================================
--- (empty file)
+++ packages/cooker/dante/current/SOURCES/dante-1.1.12-pre1-pam-syslog.patch
Thu Oct 26 08:39:44 2006
@@ -0,0 +1,42 @@
+--- dante-1.1.12/sockd/auth_pam.c.orig Tue Feb 5 11:40:52 2002
++++ dante-1.1.12/sockd/auth_pam.c Fri Mar 8 23:15:31 2002
+@@ -58,6 +58,10 @@
+ static int
+ _pam_conversation(int num_msg, const struct pam_message **msgs,
+ struct pam_response **rsps, void *priv_data);
++static int
++_real_pam_passwordcheck( int s, const struct sockaddr *src,
++const struct sockaddr *dst, const struct authmethod_pam_t *auth,
++char *emsg, size_t emsgsize);
+
+ typedef struct
+ {
+@@ -72,8 +76,28 @@
+
+ __END_DECLS
+
++/*
++ * At least one known PAM implementation reopens syslog internally
++ * that messes up logging inside of dante
++ * Very simple workaround is to reopen syslog after calling PAM
++ */
+ int
+ pam_passwordcheck(s, src, dst, auth, emsg, emsgsize)
++ int s;
++ const struct sockaddr *src, *dst;
++ const struct authmethod_pam_t *auth;
++ char *emsg;
++ size_t emsgsize;
++{
++ int ret;
++
++ ret = _real_pam_passwordcheck(s,src,dst,auth,emsg,emsgsize);
++ newprocinit();
++ return ret;
++}
++
++static int
++_real_pam_passwordcheck(s, src, dst, auth, emsg, emsgsize)
+ int s;
+ const struct sockaddr *src, *dst;
+ const struct authmethod_pam_t *auth;
Added: packages/cooker/dante/current/SOURCES/dante-1.1.14-wait.patch
==============================================================================
--- (empty file)
+++ packages/cooker/dante/current/SOURCES/dante-1.1.14-wait.patch Thu Oct
26 08:39:44 2006
@@ -0,0 +1,18 @@
+--- dante-1.1.14/include/common.h.wait 2003-07-02 14:13:31.000000000 +0200
++++ dante-1.1.14/include/common.h 2004-07-02 11:38:24.993994965 +0200
+@@ -108,7 +108,15 @@
+ #ifdef SOCKS_DLIB_OSF
+ #define __DECC
+ #endif /* SOCKS_DLIB_OSF */
++#ifdef __GNUC__
++#undef __GNUC__
++#define __GNUC__ 3
+ #include <sys/wait.h>
++#undef __GNUC__
++#define __GNUC__ 0
++#else
++#include <sys/wait.h>
++#endif /* __GNUC__ */
+ #include <netinet/in.h>
+ #if HAVE_NETINET_IP_H
+ #include <netinet/ip.h>
Modified: packages/cooker/dante/current/SPECS/dante.spec
==============================================================================
--- packages/cooker/dante/current/SPECS/dante.spec (original)
+++ packages/cooker/dante/current/SPECS/dante.spec Thu Oct 26 08:39:44 2006
@@ -1,6 +1,6 @@
%define name dante
%define version 1.1.19
-%define release %mkrel 3
+%define release %mkrel 4
%define major 0
%define libname_orig lib%{name}
%define libname %mklibname %{name} %{major}
@@ -18,8 +18,8 @@
Buildrequires: perl-base pam-devel tcp_wrappers-devel
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-sockd.init
-Patch0: %{name}-1.1.14-wait.patch.bz2
-Patch1: %{name}-1.1.12-pre1-pam-syslog.patch.bz2
+Patch0: %{name}-1.1.14-wait.patch
+Patch1: %{name}-1.1.12-pre1-pam-syslog.patch
Requires: %{libname} = %{version}
%description
@@ -124,7 +124,7 @@
%{_sbindir}/sockd
%{_mandir}/man5/sockd.conf.5*
%{_mandir}/man8/*
-%config(noreplace) %{_initrddir}/sockd
+%attr(0755,root,root) %{_initrddir}/sockd
%config(noreplace) %{_sysconfdir}/sockd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/sockd
