summaryrefslogtreecommitdiff
path: root/package/corosync
diff options
context:
space:
mode:
Diffstat (limited to 'package/corosync')
-rw-r--r--package/corosync/Makefile20
-rw-r--r--package/corosync/patches/patch-Makefile_in11
-rw-r--r--package/corosync/patches/patch-common_lib_Makefile_in16
-rw-r--r--package/corosync/patches/patch-include_corosync_coroipc_ipc_h11
-rw-r--r--package/corosync/patches/patch-tools_corosync-keygen_c26
5 files changed, 28 insertions, 56 deletions
diff --git a/package/corosync/Makefile b/package/corosync/Makefile
index eb5ae8197..25d0edccf 100644
--- a/package/corosync/Makefile
+++ b/package/corosync/Makefile
@@ -4,14 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= corosync
-PKG_VERSION:= 1.4.1
+PKG_VERSION:= 2.0.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 66231146af210637393748add091021d
+PKG_MD5SUM:= 9e23f3f5594676455ff39ff363658155
PKG_DESCR:= Cluster Engine
PKG_SECTION:= ha
-PKG_DEPENDS:= cluster-glue
+PKG_BUILDDEP:= libqb nss
+PKG_DEPENDS:= cluster-glue libqb nss
PKG_URL:= http://www.corosync.org/
-PKG_SITES:= ftp://ftp:downloads@ftp.corosync.org/downloads/corosync-1.4.1/
+PKG_SITES:= ftp://ftp:downloads@corosync.org/downloads/corosync-2.0.1/
PKG_CFLINE_COROSYNC:= select ADK_KERNEL_IP_MULTICAST
@@ -19,7 +20,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,COROSYNC,corosync,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ARGS+= --disable-nss
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/nss \
+ -I$(STAGING_DIR)/usr/include/nspr
+TARGET_LDFLAGS+= -lssl3 -lsmime3 -lnss3 -lnssutil3
CONFIGURE_ENV+= ac_cv_func_fnmatch_works=yes
corosync-install:
@@ -31,8 +35,8 @@ corosync-install:
$(INSTALL_DIR) $(IDIR_COROSYNC)/usr/sbin
$(CP) $(WRKINST)/usr/sbin/* \
$(IDIR_COROSYNC)/usr/sbin
- $(INSTALL_DIR) $(IDIR_COROSYNC)/usr/libexec
- $(CP) $(WRKINST)/usr/libexec/* \
- $(IDIR_COROSYNC)/usr/libexec
+ $(INSTALL_DIR) $(IDIR_COROSYNC)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/* \
+ $(IDIR_COROSYNC)/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in
deleted file mode 100644
index 38cf13b7c..000000000
--- a/package/corosync/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- corosync-1.4.1.orig/Makefile.in 2011-07-26 10:13:38.000000000 +0200
-+++ corosync-1.4.1/Makefile.in 2011-10-12 06:02:03.291467847 +0200
-@@ -323,7 +323,7 @@ corosysconf_DATA = conf/corosync.conf.ex
- conf/corosync.conf.example.udpu
-
- SUBDIRS = include lcr lib exec services tools test pkgconfig \
-- man init conf
-+ init conf
-
- RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
- --define "_specdir $(abs_builddir)" \
diff --git a/package/corosync/patches/patch-common_lib_Makefile_in b/package/corosync/patches/patch-common_lib_Makefile_in
new file mode 100644
index 000000000..ec3eb70d7
--- /dev/null
+++ b/package/corosync/patches/patch-common_lib_Makefile_in
@@ -0,0 +1,16 @@
+--- corosync-2.0.1.orig/common_lib/Makefile.in 2012-05-22 08:52:57.000000000 +0200
++++ corosync-2.0.1/common_lib/Makefile.in 2012-08-01 10:17:04.000000000 +0200
+@@ -336,13 +336,6 @@ install-libLIBRARIES: $(lib_LIBRARIES)
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
+ @$(POST_INSTALL)
+ @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+- for p in $$list; do \
+- if test -f $$p; then \
+- $(am__strip_dir) \
+- echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
+- ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
+- else :; fi; \
+- done
+
+ uninstall-libLIBRARIES:
+ @$(NORMAL_UNINSTALL)
diff --git a/package/corosync/patches/patch-include_corosync_coroipc_ipc_h b/package/corosync/patches/patch-include_corosync_coroipc_ipc_h
deleted file mode 100644
index 82c9514b3..000000000
--- a/package/corosync/patches/patch-include_corosync_coroipc_ipc_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- corosync-1.3.1.orig/include/corosync/coroipc_ipc.h 2011-04-25 04:37:30.000000000 +0200
-+++ corosync-1.3.1/include/corosync/coroipc_ipc.h 2011-06-26 18:49:29.245183024 +0200
-@@ -44,7 +44,7 @@
- * Darwin claims to support process shared synchronization
- * but it really does not. The unistd.h header file is wrong.
- */
--#if defined(COROSYNC_DARWIN) || defined(__UCLIBC__)
-+#if defined(COROSYNC_DARWIN)
- #undef _POSIX_THREAD_PROCESS_SHARED
- #define _POSIX_THREAD_PROCESS_SHARED -1
- #endif
diff --git a/package/corosync/patches/patch-tools_corosync-keygen_c b/package/corosync/patches/patch-tools_corosync-keygen_c
deleted file mode 100644
index eecf92026..000000000
--- a/package/corosync/patches/patch-tools_corosync-keygen_c
+++ /dev/null
@@ -1,26 +0,0 @@
---- corosync-1.4.1.orig/tools/corosync-keygen.c 2011-07-26 10:08:43.000000000 +0200
-+++ corosync-1.4.1/tools/corosync-keygen.c 2011-10-04 21:03:05.000000000 +0200
-@@ -65,11 +65,11 @@ int main (void) {
- }
- }
-
-- printf ("Gathering %lu bits for key from /dev/random.\n", (unsigned long)(sizeof (key) * 8));
-+ printf ("Gathering %lu bits for key from /dev/urandom.\n", (unsigned long)(sizeof (key) * 8));
- printf ("Press keys on your keyboard to generate entropy.\n");
-- random_fd = open ("/dev/random", O_RDONLY);
-+ random_fd = open ("/dev/urandom", O_RDONLY);
- if (random_fd == -1) {
-- perror ("Is /dev/random present? Opening /dev/random");
-+ perror ("Is /dev/urandom present? Opening /dev/urandom");
- exit (errno);
- }
-
-@@ -81,7 +81,7 @@ int main (void) {
- retry_read:
- res = read (random_fd, &key[bytes_read], sizeof (key) - bytes_read);
- if (res == -1) {
-- perror ("Could not read /dev/random");
-+ perror ("Could not read /dev/urandom");
- exit (errno);
- }
- bytes_read += res;