rpms/ircd-hybrid/FC-3 ircd-hybrid-7.1.3-openssl.diff, NONE, 1.1 ircd-hybrid.spec, 1.2, 1.3

Eric Tanguy (tanguy) fedora-extras-commits at redhat.com
Fri Nov 18 21:42:35 UTC 2005


Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4057/FC-3

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.1.3-10 on branch FC-3 from ircd-hybrid-7.1.3-10.src.rpm

ircd-hybrid-7.1.3-openssl.diff:

--- NEW FILE ircd-hybrid-7.1.3-openssl.diff ---
diff -Nur old/configure new/configure
--- old/configure	2005-10-09 19:40:23.000000000 +0200
+++ new/configure	2005-11-13 12:27:07.000000000 +0100
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for ircd-hybrid 7.1.
 #
-# $Id: configure,v 7.265.2.3 2005/10/09 17:40:23 michael Exp $
+# $Id: configure,v 7.265.2.4 2005/11/13 11:27:07 michael Exp $
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -995,7 +995,7 @@
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-$Id: configure,v 7.265.2.3 2005/10/09 17:40:23 michael Exp $
+$Id: configure,v 7.265.2.4 2005/11/13 11:27:07 michael Exp $
 _ACEOF
   exit 0
 fi
@@ -7531,7 +7531,7 @@
 int
 main ()
 {
-if ( (OPENSSL_VERSION_NUMBER & 0x00906000) == 0x00906000)
+if (OPENSSL_VERSION_NUMBER >= 0x00906000)
 		exit(0); else exit(1);
   ;
   return 0;
diff -Nur old/configure.ac new/configure.ac
--- old/configure.ac	2005-10-09 19:40:24.000000000 +0200
+++ new/configure.ac	2005-11-13 12:27:08.000000000 +0100
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 7.97.2.3 2005/10/09 17:40:24 michael Exp $
+dnl $Id: configure.ac,v 7.97.2.4 2005/11/13 11:27:08 michael Exp $
 dnl Process this file with autoconf to produce a configure script.
 
 dnl TODO: clean up all the OpenSSL and shared module checking stuff;
@@ -8,7 +8,7 @@
 AC_PREREQ(2.57)
 
 dnl Sneaky way to get an Id tag into the configure script
-AC_COPYRIGHT([$Id: configure.ac,v 7.97.2.3 2005/10/09 17:40:24 michael Exp $])
+AC_COPYRIGHT([$Id: configure.ac,v 7.97.2.4 2005/11/13 11:27:08 michael Exp $])
 
 AC_INIT([ircd-hybrid],[7.1])
 
@@ -529,7 +529,7 @@
 		AC_LANG_PROGRAM(
 	    	[#include <openssl/opensslv.h>
 		#include <stdlib.h>],
-		[[if ( (OPENSSL_VERSION_NUMBER & 0x00906000) == 0x00906000)
+		[[if (OPENSSL_VERSION_NUMBER >= 0x00906000)
 		exit(0); else exit(1);]]),
 	cf_openssl_version_ok=yes,
 	cf_openssl_version_ok=no,


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ircd-hybrid.spec	17 Nov 2005 18:54:50 -0000	1.2
+++ ircd-hybrid.spec	18 Nov 2005 21:42:33 -0000	1.3
@@ -10,15 +10,15 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.1.3
-Release: 8%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
-BuildRequires: dos2unix
 Requires(pre): fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -33,7 +33,8 @@
 
 %prep
 %setup -q
-dos2unix %{_builddir}/%{name}-%{version}/doc/Tao-of-IRC.940110
+%patch0 -p1
+sed -i 's?\r??' %{_builddir}/%{name}-%{version}/doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
@@ -81,7 +82,7 @@
 chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
 
 # Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/
+%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
 %{__mv}      %{buildroot}%{_prefix}/modules/ \
              %{buildroot}%{_libdir}/ircd/modules/
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
@@ -129,6 +130,13 @@
 
 
 %changelog
+* Fri Nov 18 2005 Eric Tanguy 7.1.3-10
+- modify %{__mkdir_p} for devel
+
+* Wed Nov 16 2005 Eric Tanguy 7.1.3-9
+- Patch to support openssl >= 0.9.6
+- Use of sed in place of dos2unix
+
 * Wed Nov 16 2005 Eric Tanguy 7.1.3-8
 - Modify source for x86_64 support
 




More information about the fedora-extras-commits mailing list