Attachment 699453 Details for Bug 912675 – .spec patch

[patch] .spec patch

0001-bitlbee-3.2-912675.patch (text/plain), 17.71 KB, created by Rex Dieter on 2013-02-19 13:19:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rex Dieter

Created: 2013-02-19 13:19:36 UTC

Size: 17.71 KB

patch

obsolete

>From bb094df7afdd23725ced6b2f20340d7f035e9c13 Mon Sep 17 00:00:00 2001
>From: Rex Dieter <rdieter@math.unl.edu>
>Date: Tue, 19 Feb 2013 07:16:51 -0600
>Subject: [PATCH] bitlbee-3.2 (#912675)
>
>---
> bitlbee-3.0.5-installP.patch          |  35 ---
> bitlbee-3.0.5-ssl_nss-implement.patch | 506 ----------------------------------
> bitlbee-syslibdirs.patch              |  11 -
> bitlbee.spec                          |  25 +-
> 4 files changed, 7 insertions(+), 570 deletions(-)
> delete mode 100644 bitlbee-3.0.5-installP.patch
> delete mode 100644 bitlbee-3.0.5-ssl_nss-implement.patch
> delete mode 100644 bitlbee-syslibdirs.patch
>
>diff --git a/bitlbee-3.0.5-installP.patch b/bitlbee-3.0.5-installP.patch
>deleted file mode 100644
>index e77130a..0000000
>--- a/bitlbee-3.0.5-installP.patch
>+++ /dev/null
>@@ -1,35 +0,0 @@
>---- a/configure
>-+++ b/configure
>-@@ -132,6 +132,8 @@ TARGET=$target
>- ARCH=$arch
>- CPU=$cpu
>- 
>-+INSTALL=install -p
>-+
>- DESTDIR=
>- LFLAGS=
>- EFLAGS=
>---- a/doc/Makefile
>-+++ b/doc/Makefile
>-@@ -9,8 +9,8 @@ all:
>- 
>- install:
>- 	mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/
>--	install -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
>--	install -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
>-+	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
>-+	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
>- 	$(MAKE) -C user-guide $@
>- 
>- uninstall:
>---- a/doc/user-guide/Makefile
>-+++ b/doc/user-guide/Makefile
>-@@ -41,7 +41,7 @@ install:
>- 	mkdir -p $(DESTDIR)$(DATADIR)
>- 	chmod 0755 $(DESTDIR)$(DATADIR)
>- 	rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions
>--	install -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt
>-+	$(INSTALL) -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt
>- 
>- uninstall:
>- 	rm -f $(DESTDIR)$(DATADIR)/help.txt
>diff --git a/bitlbee-3.0.5-ssl_nss-implement.patch b/bitlbee-3.0.5-ssl_nss-implement.patch
>deleted file mode 100644
>index af6263e..0000000
>--- a/bitlbee-3.0.5-ssl_nss-implement.patch
>+++ /dev/null
>@@ -1,506 +0,0 @@
>-From 828371c632ac8f9362591b515124234b7dff918d Mon Sep 17 00:00:00 2001
>-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>-Date: Mon, 22 Nov 2010 01:36:24 +0100
>-Subject: [PATCH] NSS-based implementation of SSL-related operations.
>-MIME-Version: 1.0
>-Content-Type: text/plain; charset=UTF-8
>-Content-Transfer-Encoding: 8bit
>-
>- * no verification support
>- * ssl_des3_encrypt implemented and functional.
>-
>-Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>----
>- .gitignore    |    7 ++
>- configure     |    6 +-
>- lib/ssl_nss.c |  330 ++++++++++++++++++++++++++++++++++++++++++---------------
>- 3 files changed, 257 insertions(+), 86 deletions(-)
>- create mode 100644 .gitignore
>-
>-diff --git a/.gitignore b/.gitignore
>-new file mode 100644
>-index 0000000..1899086
>---- /dev/null
>-+++ b/.gitignore
>-@@ -0,0 +1,7 @@
>-+*~
>-+*.o
>-+.depend/
>-+Makefile.settings
>-+bitlbee
>-+bitlbee.pc
>-+config.h
>-diff --git a/configure b/configure
>-index 697a33b..c0d3735 100755
>---- a/configure
>-+++ b/configure
>-@@ -453,10 +453,10 @@ if [ "$ret" = "0" ]; then
>- 	exit 1
>- fi;
>- 
>--if [ "$msn" = "1" -a "$ssl" != "openssl" -a "$ssl" != "gnutls" ]; then
>--	# Needed for MSN only. OpenSSL exports nice cipher functions already,
>-+if [ "$msn" = "1" -a "$ssl" != "openssl" -a "$ssl" != "gnutls" -a "$ssl" != "nss" ]; then
>-+	# Needed for MSN only. OpenSSL and NSS export nice cipher functions already,
>- 	# in case of GnuTLS we should be able to use gcrypt. Otherwise, use
>--	# built-in stuff. (Since right now those are the only two supported
>-+	# built-in stuff. (Since right now those are the only three supported
>- 	# SSL modules anyway, this is mostly unnecessary.)
>- 	echo 'DES=des.o' >> Makefile.settings
>- fi
>-diff --git a/lib/ssl_nss.c b/lib/ssl_nss.c
>-index d50620d..4e7a79d 100644
>---- a/lib/ssl_nss.c
>-+++ b/lib/ssl_nss.c
>-@@ -39,39 +39,46 @@
>- #include <seccomon.h>
>- #include <secerr.h>
>- #include <sslerr.h>
>-+#include <assert.h>
>-+#include <unistd.h>
>- 
>- int ssl_errno = 0;
>- 
>- static gboolean initialized = FALSE;
>- 
>--struct scd
>--{
>-+#define SSLDEBUG 0
>-+
>-+struct scd {
>- 	ssl_input_function func;
>- 	gpointer data;
>- 	int fd;
>-+	char *hostname;
>- 	PRFileDesc *prfd;
>- 	gboolean established;
>- 	gboolean verify;
>- };
>- 
>--static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
>--static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition cond );
>-+static gboolean ssl_connected(gpointer data, gint source,
>-+			      b_input_condition cond);
>-+static gboolean ssl_starttls_real(gpointer data, gint source,
>-+				  b_input_condition cond);
>- 
>--
>--static SECStatus nss_auth_cert (void *arg, PRFileDesc *socket, PRBool checksig, PRBool isserver)
>-+static SECStatus nss_auth_cert(void *arg, PRFileDesc * socket, PRBool checksig,
>-+			       PRBool isserver)
>- {
>- 	return SECSuccess;
>- }
>- 
>--static SECStatus nss_bad_cert (void *arg, PRFileDesc *socket) 
>-+static SECStatus nss_bad_cert(void *arg, PRFileDesc * socket)
>- {
>- 	PRErrorCode err;
>- 
>--	if(!arg) return SECFailure;
>-+	if (!arg)
>-+		return SECFailure;
>- 
>--	*(PRErrorCode *)arg = err = PORT_GetError();
>-+	*(PRErrorCode *) arg = err = PORT_GetError();
>- 
>--	switch(err) {
>-+	switch (err) {
>- 	case SEC_ERROR_INVALID_AVA:
>- 	case SEC_ERROR_INVALID_TIME:
>- 	case SEC_ERROR_BAD_SIGNATURE:
>-@@ -93,52 +100,63 @@ static SECStatus nss_bad_cert (void *arg, PRFileDesc *socket)
>- 	}
>- }
>- 
>--
>--void ssl_init( void )
>-+void ssl_init(void)
>- {
>--	PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
>-+	PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
>-+	// https://www.mozilla.org/projects/security/pki/nss/ref/ssl/sslfnc.html#1234224
>-+	// This NSS function is not intended for use with SSL, which
>-+	// requires that the certificate and key database files be
>-+	// opened. Relates to whole non-verification of servers for now.
>- 	NSS_NoDB_Init(NULL);
>- 	NSS_SetDomesticPolicy();
>- 	initialized = TRUE;
>- }
>- 
>--void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
>-+void *ssl_connect(char *host, int port, gboolean verify,
>-+		  ssl_input_function func, gpointer data)
>- {
>--	struct scd *conn = g_new0( struct scd, 1 );
>--	
>--	conn->fd = proxy_connect( host, port, ssl_connected, conn );
>-+	struct scd *conn = g_new0(struct scd, 1);
>-+
>-+	conn->fd = proxy_connect(host, port, ssl_connected, conn);
>- 	conn->func = func;
>- 	conn->data = data;
>--	
>--	if( conn->fd < 0 )
>--	{
>--		g_free( conn );
>--		return( NULL );
>-+	conn->hostname = g_strdup(host);
>-+
>-+	if (conn->fd < 0) {
>-+		g_free(conn->hostname);
>-+		g_free(conn);
>-+		return (NULL);
>- 	}
>--	
>--	if( !initialized )
>--	{
>-+
>-+	if (!initialized) {
>- 		ssl_init();
>- 	}
>- 
>--	
>--	return( conn );
>-+	return (conn);
>- }
>- 
>--static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition cond )
>-+static gboolean ssl_starttls_real(gpointer data, gint source,
>-+				  b_input_condition cond)
>- {
>- 	struct scd *conn = data;
>- 
>--	return ssl_connected( conn, conn->fd, B_EV_IO_WRITE );
>-+	return ssl_connected(conn, conn->fd, B_EV_IO_WRITE);
>- }
>- 
>--void *ssl_starttls( int fd, char *hostname, gboolean verify, ssl_input_function func, gpointer data )
>-+void *ssl_starttls(int fd, char *hostname, gboolean verify,
>-+		   ssl_input_function func, gpointer data)
>- {
>--	struct scd *conn = g_new0( struct scd, 1 );
>-+	struct scd *conn = g_new0(struct scd, 1);
>- 
>- 	conn->fd = fd;
>- 	conn->func = func;
>- 	conn->data = data;
>-+	conn->hostname = hostname;
>-+
>-+	/* For now, SSL verification is globally enabled by setting the cafile
>-+	   setting in bitlbee.conf. Commented out by default because probably
>-+	   not everyone has this file in the same place and plenty of folks
>-+	   may not have the cert of their private Jabber server in it. */
>- 	conn->verify = verify && global.conf->cafile;
>- 
>- 	/* This function should be called via a (short) timeout instead of
>-@@ -150,108 +168,254 @@ void *ssl_starttls( int fd, char *hostname, gboolean verify, ssl_input_function
>- 	   In short, doing things like this makes the rest of the code a lot
>- 	   simpler. */
>- 
>--	b_timeout_add( 1, ssl_starttls_real, conn );
>-+	b_timeout_add(1, ssl_starttls_real, conn);
>- 
>- 	return conn;
>- }
>- 
>--static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
>-+static gboolean ssl_connected(gpointer data, gint source,
>-+			      b_input_condition cond)
>- {
>- 	struct scd *conn = data;
>--	
>-+
>- 	/* Right now we don't have any verification functionality for NSS. */
>- 
>--	if( conn->verify )
>--	{
>--		conn->func( conn->data, 1, NULL, cond );
>--		if( source >= 0 ) closesocket( source );
>--		g_free( conn );
>-+	if (conn->verify) {
>-+		conn->func(conn->data, 1, NULL, cond);
>-+		if (source >= 0)
>-+			closesocket(source);
>-+		g_free(conn->hostname);
>-+		g_free(conn);
>- 
>- 		return FALSE;
>- 	}
>--	
>--	if( source == -1 )
>-+
>-+	if (source == -1)
>- 		goto ssl_connected_failure;
>--	
>-+
>- 	/* Until we find out how to handle non-blocking I/O with NSS... */
>--	sock_make_blocking( conn->fd );
>--	
>-+	sock_make_blocking(conn->fd);
>-+
>- 	conn->prfd = SSL_ImportFD(NULL, PR_ImportTCPSocket(source));
>-+	if (!conn->prfd)
>-+		goto ssl_connected_failure;
>- 	SSL_OptionSet(conn->prfd, SSL_SECURITY, PR_TRUE);
>- 	SSL_OptionSet(conn->prfd, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE);
>--	SSL_BadCertHook(conn->prfd, (SSLBadCertHandler)nss_bad_cert, NULL);
>--	SSL_AuthCertificateHook(conn->prfd, (SSLAuthCertificate)nss_auth_cert, (void *)CERT_GetDefaultCertDB());
>-+	SSL_BadCertHook(conn->prfd, (SSLBadCertHandler) nss_bad_cert, NULL);
>-+	SSL_AuthCertificateHook(conn->prfd, (SSLAuthCertificate) nss_auth_cert,
>-+				(void *)CERT_GetDefaultCertDB());
>-+	SSL_SetURL(conn->prfd, conn->hostname);
>- 	SSL_ResetHandshake(conn->prfd, PR_FALSE);
>- 
>- 	if (SSL_ForceHandshake(conn->prfd)) {
>- 		goto ssl_connected_failure;
>- 	}
>--	
>--	
>-+
>- 	conn->established = TRUE;
>--	conn->func( conn->data, 0, conn, cond );
>-+	conn->func(conn->data, 0, conn, cond);
>- 	return FALSE;
>--	
>--	ssl_connected_failure:
>--	
>--	conn->func( conn->data, 0, NULL, cond );
>--	
>--	PR_Close( conn -> prfd );
>--	if( source >= 0 ) closesocket( source );
>--	g_free( conn );
>--	
>-+
>-+ ssl_connected_failure:
>-+
>-+	conn->func(conn->data, 0, NULL, cond);
>-+
>-+	if (conn->prfd)
>-+		PR_Close(conn->prfd);
>-+	if (source >= 0)
>-+		closesocket(source);
>-+	g_free(conn->hostname);
>-+	g_free(conn);
>-+
>- 	return FALSE;
>- }
>- 
>--int ssl_read( void *conn, char *buf, int len )
>-+int ssl_read(void *conn, char *buf, int len)
>- {
>--	if( !((struct scd*)conn)->established )
>--		return( 0 );
>--	
>--	return( PR_Read( ((struct scd*)conn)->prfd, buf, len ) );
>-+	int st;
>-+	PRErrorCode PR_err;
>-+
>-+	if (!((struct scd *)conn)->established) {
>-+		ssl_errno = SSL_NOHANDSHAKE;
>-+		return -1;
>-+	}
>-+
>-+	st = PR_Read(((struct scd *)conn)->prfd, buf, len);
>-+	PR_err = PR_GetError();
>-+
>-+	ssl_errno = SSL_OK;
>-+	if (PR_err == PR_WOULD_BLOCK_ERROR)
>-+		ssl_errno = SSL_AGAIN;
>-+
>-+	if (SSLDEBUG && getenv("BITLBEE_DEBUG") && st > 0)
>-+		len = write(STDERR_FILENO, buf, st);
>-+
>-+	return st;
>- }
>- 
>--int ssl_write( void *conn, const char *buf, int len )
>-+int ssl_write(void *conn, const char *buf, int len)
>- {
>--	if( !((struct scd*)conn)->established )
>--		return( 0 );
>--	
>--	return( PR_Write ( ((struct scd*)conn)->prfd, buf, len ) );
>-+	int st;
>-+	PRErrorCode PR_err;
>-+
>-+	if (!((struct scd *)conn)->established) {
>-+		ssl_errno = SSL_NOHANDSHAKE;
>-+		return -1;
>-+	}
>-+	st = PR_Write(((struct scd *)conn)->prfd, buf, len);
>-+
>-+	ssl_errno = SSL_OK;
>-+	if (PR_err == PR_WOULD_BLOCK_ERROR)
>-+		ssl_errno = SSL_AGAIN;
>-+
>-+	if (SSLDEBUG && getenv("BITLBEE_DEBUG") && st > 0)
>-+		len = write(2, buf, st);
>-+
>-+	return st;
>- }
>- 
>--int ssl_pending( void *conn )
>-+int ssl_pending(void *conn)
>- {
>--	struct scd *c = (struct scd *) conn;
>-+	struct scd *c = (struct scd *)conn;
>- 
>--	if( c == NULL ) {
>-+	if (c == NULL) {
>- 		return 0;
>- 	}
>- 
>--	return ( c->established && SSL_DataPending( c->prfd ) > 0 );
>-+	return (c->established && SSL_DataPending(c->prfd) > 0);
>- }
>- 
>--void ssl_disconnect( void *conn_ )
>-+void ssl_disconnect(void *conn_)
>- {
>- 	struct scd *conn = conn_;
>--	
>--	PR_Close( conn->prfd );
>--	closesocket( conn->fd );
>--	
>--	g_free( conn );
>-+
>-+	// When we swich to NSS_Init, we should have here
>-+	// NSS_Shutdown();
>-+
>-+	if (conn->prfd)
>-+		PR_Close(conn->prfd);
>-+
>-+        g_free(conn->hostname);
>-+	g_free(conn);
>- }
>- 
>--int ssl_getfd( void *conn )
>-+int ssl_getfd(void *conn)
>- {
>--	return( ((struct scd*)conn)->fd );
>-+	return (((struct scd *)conn)->fd);
>- }
>- 
>--b_input_condition ssl_getdirection( void *conn )
>-+b_input_condition ssl_getdirection(void *conn)
>- {
>- 	/* Just in case someone calls us, let's return the most likely case: */
>- 	return B_EV_IO_READ;
>- }
>- 
>--char *ssl_verify_strerror( int code )
>-+char *ssl_verify_strerror(int code)
>-+{
>-+	return
>-+	    g_strdup
>-+	    ("SSL certificate verification not supported by BitlBee NSS code.");
>-+}
>-+
>-+size_t ssl_des3_encrypt(const unsigned char *key, size_t key_len,
>-+			const unsigned char *input, size_t input_len,
>-+			const unsigned char *iv, unsigned char **res)
>- {
>--	return g_strdup( "SSL certificate verification not supported by BitlBee NSS code." );
>-+#define CIPHER_MECH CKM_DES3_CBC
>-+#define MAX_OUTPUT_LEN 72
>-+
>-+	int len1;
>-+	unsigned int len2;
>-+
>-+	PK11Context *ctx = NULL;
>-+	PK11SlotInfo *slot = NULL;
>-+	SECItem keyItem;
>-+	SECItem ivItem;
>-+	SECItem *secParam = NULL;
>-+	PK11SymKey *symKey = NULL;
>-+
>-+	size_t rc;
>-+	SECStatus rv;
>-+
>-+	if (!initialized) {
>-+		ssl_init();
>-+	}
>-+
>-+	keyItem.data = (unsigned char *)key;
>-+	keyItem.len = key_len;
>-+
>-+	slot = PK11_GetBestSlot(CIPHER_MECH, NULL);
>-+	if (slot == NULL) {
>-+		fprintf(stderr, "PK11_GetBestSlot failed (err %d)\n",
>-+			PR_GetError());
>-+		rc = 0;
>-+		goto out;
>-+	}
>-+
>-+	symKey =
>-+	    PK11_ImportSymKey(slot, CIPHER_MECH, PK11_OriginUnwrap, CKA_ENCRYPT,
>-+			      &keyItem, NULL);
>-+	if (symKey == NULL) {
>-+		fprintf(stderr, "PK11_ImportSymKey failed (err %d)\n",
>-+			PR_GetError());
>-+		rc = 0;
>-+		goto out;
>-+	}
>-+
>-+	ivItem.data = (unsigned char *)iv;
>-+	/* See msn_soap_passport_sso_handle_response in protocols/msn/soap.c */
>-+	ivItem.len = 8;
>-+
>-+	secParam = PK11_ParamFromIV(CIPHER_MECH, &ivItem);
>-+	if (secParam == NULL) {
>-+		fprintf(stderr, "PK11_ParamFromIV failed (err %d)\n",
>-+			PR_GetError());
>-+		rc = 0;
>-+		goto out;
>-+	}
>-+
>-+	ctx =
>-+	    PK11_CreateContextBySymKey(CIPHER_MECH, CKA_ENCRYPT, symKey,
>-+				       secParam);
>-+	if (ctx == NULL) {
>-+		fprintf(stderr, "PK11_CreateContextBySymKey failed (err %d)\n",
>-+			PR_GetError());
>-+		rc = 0;
>-+		goto out;
>-+	}
>-+
>-+	*res = g_new0(unsigned char, MAX_OUTPUT_LEN);
>-+
>-+	rv = PK11_CipherOp(ctx, *res, &len1, MAX_OUTPUT_LEN,
>-+			   (unsigned char *)input, input_len);
>-+	if (rv != SECSuccess) {
>-+		fprintf(stderr, "PK11_CipherOp failed (err %d)\n",
>-+			PR_GetError());
>-+		rc = 0;
>-+		goto out;
>-+	}
>-+
>-+	assert(len1 <= MAX_OUTPUT_LEN);
>-+
>-+	rv = PK11_DigestFinal(ctx, *res + len1, &len2,
>-+			      (unsigned int)MAX_OUTPUT_LEN - len1);
>-+	if (rv != SECSuccess) {
>-+		fprintf(stderr, "PK11_DigestFinal failed (err %d)\n",
>-+			PR_GetError());
>-+		rc = 0;
>-+		goto out;
>-+	}
>-+
>-+	rc = len1 + len2;
>-+
>-+ out:
>-+	if (ctx)
>-+		PK11_DestroyContext(ctx, PR_TRUE);
>-+	if (symKey)
>-+		PK11_FreeSymKey(symKey);
>-+	if (secParam)
>-+		SECITEM_FreeItem(secParam, PR_TRUE);
>-+	if (slot)
>-+		PK11_FreeSlot(slot);
>-+
>-+	return rc;
>- }
>--- 
>-1.7.10.2
>-
>diff --git a/bitlbee-syslibdirs.patch b/bitlbee-syslibdirs.patch
>deleted file mode 100644
>index 1454454..0000000
>--- a/bitlbee-syslibdirs.patch
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- a/configure
>-+++ b/configure
>-@@ -21,7 +21,7 @@ libevent='/usr/'
>- pidfile='/var/run/bitlbee.pid'
>- ipcsocket=''
>- pcdir='$prefix/lib/pkgconfig'
>--systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
>-+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
>- 
>- msn=1
>- jabber=1
>diff --git a/bitlbee.spec b/bitlbee.spec
>index 13f2aef..d1b1239 100644
>--- a/bitlbee.spec
>+++ b/bitlbee.spec
>@@ -12,27 +12,17 @@
> 
> Summary:           IRC to other chat networks gateway
> Name:              bitlbee
>-Version:           3.0.5
>-Release:           5%{?dist}
>+Version:           3.2
>+Release:           1%{?dist}
> License:           GPLv2+ and MIT
> Group:             System Environment/Daemons
> URL:               http://www.bitlbee.org/
> Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
> Source1:           bitlbee.xinetd
> Source2:           bitlbee-wrapper.h
>-# The following two patches were accepted upstream
>-# (http://bugs.bitlbee.org/bitlbee/changeset/devel%2C909)
>-# it will be available in the next release after 3.0.5
>-#
>-# 64bit directories should go before 32bit ones.
>-Patch0:            bitlbee-syslibdirs.patch
>-# use install -p instead of plain install ... we should protect time stamps
>-Patch1:            bitlbee-3.0.5-installP.patch
>+
> # support for old glibc (EL-4, EL-5) which doesn't have ns_initparse and its friends
> Patch2:            bitlbee-libresolv.patch
>-# Completion of NSS-based SSL implementation. Sent upstream. #714
>-# (combined with two tiny fixes from RHBZ #666022)
>-Patch4:            bitlbee-3.0.5-ssl_nss-implement.patch
> # When the above patches will  be consolidated upstream, this should merge
> # with Patch1 or Patch2 or something like that
> Patch5:            bitlbee-forkdaemon.patch
>@@ -85,15 +75,11 @@ completely stable and not 100% foolproof so use at your own risk.
> echo With OTR %with_otr
> echo With systemd %with_systemd
> %setup -q
>-%patch0 -p1
>-%patch1 -p1
> 
> %if 0%{?rhel} == 5
> %patch2 -p1
> %endif
> 
>-%patch4 -p1
>-
> %if %{with systemd}
> %patch5 -p1
> %patch6 -p1
>@@ -215,6 +201,9 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> 
> %changelog
>+* Tue Feb 19 2013 Rex Dieter <rdieter@fedoraproject.org> 3.2-1
>+- bitlbee-3.2 (#912675)
>+
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.5-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 912675: 699453