rpms/jabberd/devel jabberd.glibc.open.patch, NONE, 1.1 jabberd.spec, 1.18, 1.19

Adrian Reber (adrian) fedora-extras-commits at redhat.com
Thu Aug 30 08:25:39 UTC 2007


Author: adrian

Update of /cvs/extras/rpms/jabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7691

Modified Files:
	jabberd.spec 
Added Files:
	jabberd.glibc.open.patch 
Log Message:
* Mon Aug 27 2007 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.14
- applied patch to fix bz #175219
- removed config flag for startup script
- updated License
- added patch for new glibc open macro


jabberd.glibc.open.patch:

--- NEW FILE jabberd.glibc.open.patch ---
diff -ur jabberd-2.0s11.orig/c2s/authreg_db.c jabberd-2.0s11/c2s/authreg_db.c
--- jabberd-2.0s11.orig/c2s/authreg_db.c	2005-01-07 12:40:53.000000000 +0100
+++ jabberd-2.0s11/c2s/authreg_db.c	2007-08-30 10:18:55.000000000 +0200
@@ -82,7 +82,7 @@
         return NULL;
     }
 
-    err = db->open(db, NULL, "authreg.db", realm, DB_HASH, DB_CREATE, 0);
+    err = (db->open)(db, NULL, "authreg.db", realm, DB_HASH, DB_CREATE, 0);
     if(err != 0)
     {
         log_write(ar->c2s->log, LOG_ERR, "db: couldn't open db for realm '%s': %s", realm, db_strerror(err));
@@ -360,7 +360,7 @@
         return 1;
     }
 
-    err = env->open(env, path, DB_INIT_LOCK | DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_TXN | DB_CREATE, 0);
+    err = (env->open)(env, path, DB_INIT_LOCK | DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_TXN | DB_CREATE, 0);
     if(err != 0)
     {
         log_write(ar->c2s->log, LOG_ERR, "db: couldn't open environment: %s", db_strerror(err));
diff -ur jabberd-2.0s11.orig/sm/storage_db.c jabberd-2.0s11/sm/storage_db.c
--- jabberd-2.0s11.orig/sm/storage_db.c	2005-03-23 20:59:01.000000000 +0100
+++ jabberd-2.0s11/sm/storage_db.c	2007-08-30 10:18:55.000000000 +0200
@@ -89,7 +89,7 @@
         return st_FAILED;
     }
 
-    if((err = dbd->db->open(dbd->db, NULL, "sm.db", type, DB_HASH, DB_AUTO_COMMIT | DB_CREATE, 0)) != 0) {
+    if((err = (dbd->db->open)(dbd->db, NULL, "sm.db", type, DB_HASH, DB_AUTO_COMMIT | DB_CREATE, 0)) != 0) {
         log_write(drv->st->sm->log, LOG_ERR, "db: couldn't open storage db: %s", db_strerror(err));
         dbd->db->close(dbd->db, 0);
         free(dbd);
@@ -546,7 +546,7 @@
     /* store the log context in case we panic */
     env->app_private = drv->st->sm->log;
 
-    if((err = env->open(env, path, DB_INIT_LOCK | DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_TXN | DB_CREATE, 0)) != 0) {
+    if((err = (env->open)(env, path, DB_INIT_LOCK | DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_TXN | DB_CREATE, 0)) != 0) {
         log_write(drv->st->sm->log, LOG_ERR, "db: couldn't open environment: %s", db_strerror(err));
         env->close(env, 0);
         return st_FAILED;


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jabberd.spec	27 Aug 2007 14:01:56 -0000	1.18
+++ jabberd.spec	30 Aug 2007 08:25:06 -0000	1.19
@@ -7,6 +7,7 @@
 Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
+Patch: jabberd.glibc.open.patch
 URL: http://jabberd.jabberstudio.org/2/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel libidn-devel
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}s11
+%patch -p1
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -185,6 +187,7 @@
 - applied patch to fix bz #175219
 - removed config flag for startup script
 - updated License
+- added patch for new glibc open macro
 
 * Thu Jun 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis.info> - 2.0-0.s11.13
 - rebuilt on behalf of Adrian




More information about the fedora-extras-commits mailing list