rpm/csync2
SHA256
1
0
Fork 0
forked from pool/csync2
Code Pull Requests Activity

- Add fix-csync2_ssl_cert-filename.patch

Browse Source 
- Remove csync2-1.34-pure-gnutls-r2.patch
- Remove fix-missing-sentinels.diff

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=22
This commit is contained in:
Tim Serong 2013-09-02 06:59:37 +00:00 committed by Git OBS Bridge
parent 05580bbff0
commit e6d553c7b2
4 changed files with 25 additions and 5242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5227
csync2-1.34-pure-gnutls-r2.patch
View File

File diff suppressed because it is too large Load Diff

6
csync2.spec
View File

@ -35,6 +35,7 @@ Patch3: force-debug-stderr-off-inetd.patch
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch4: bind-to-local-hostname.patch
Patch10: add-ac_prog_cpp.patch
Patch11: fix-csync2_ssl_cert-filename.patch
Requires: openssl
Requires: sqlite3
@ -71,8 +72,8 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms.
#%patch3 -p1
# patch4 needs rewriting, presumably
#%patch4 -p1
#%patch10 -p1
install -p -m 644 %{SOURCE1} README.quickstart
%patch10 -p1
%patch11 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pgsql"
@ -87,6 +88,7 @@ make all
%makeinstall
mkdir -p %{buildroot}%{_localstatedir}/lib/csync2
install -p -D -m 644 csync2.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/csync2
install -p -m 644 %{SOURCE1} %{_docdir}/%{name}/README.quickstart
install -p -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/csync2-rm-ssl-cert
# We need these empty files to be able to %%ghost them
touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_key.pem

21
fix-csync2_ssl_cert-filename.patch Normal file
View File

@ -0,0 +1,21 @@
commit 456732b
Author: Tim Serong <tserong@suse.com>
Date: Mon Sep 2 16:50:27 2013 +1000
Fix typo in csync2_ssl_cert.pem filename
Signed-off-by: Tim Serong <tserong@suse.com>
diff --git a/conn.c b/conn.c
index 2b3611d..5e54693 100644
--- a/conn.c
+++ b/conn.c
@@ -281,7 +281,7 @@ int conn_activate_ssl(int server_role)
return 0;
ASPRINTF(&ssl_keyfile, "%s/csync2_ssl_key.pem", systemdir);
- ASPRINTF(&ssl_certfile, "%s/csync_ssl_cert.pem", systemdir);
+ ASPRINTF(&ssl_certfile, "%s/csync2_ssl_cert.pem", systemdir);
gnutls_global_init();
gnutls_global_set_log_function(ssl_log);

13
fix-missing-sentinels.diff
View File

@ -1,13 +0,0 @@
Index: action.c
===================================================================
--- csync2-1.34/action.c 2007-07-25 05:04:18.000000000 +0800
+++ csync2-1.34/action.c 2009-12-04 17:51:47.000000000 +0800
@@ -107,7 +107,7 @@
/* 1 */ open(logfile_clr, O_WRONLY|O_CREAT|O_APPEND, 0666);
/* 2 */ open(logfile_clr, O_WRONLY|O_CREAT|O_APPEND, 0666);
- execl("/bin/sh", "sh", "-c", real_command, 0);
+ execl("/bin/sh", "sh", "-c", real_command, NULL);
_exit(127);
}