[beanstalkd/el6] change daemonization in init script to account for beanstalk removing -d flag
by jjh
commit dc6db7a99af761d208ae2cac2e212f885501873d
Author: Jeremy Hinegardner <jeremy(a)hinegardner.org>
Date: Mon Sep 30 17:33:00 2013 -0600
change daemonization in init script to account for beanstalk removing -d flag
beanstalkd.init | 4 ++--
beanstalkd.spec | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/beanstalkd.init b/beanstalkd.init
index de399a3..250338b 100644
--- a/beanstalkd.init
+++ b/beanstalkd.init
@@ -41,7 +41,7 @@ start() {
[ -x $exec ] || exit 5
echo -n $"Starting $prog: "
# if not running, start it up here, usually something like "daemon $exec"
- options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
+ options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT}"
if [ "${BEANSTALKD_MAX_JOB_SIZE}" != "" ]; then
options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
fi
@@ -62,7 +62,7 @@ start() {
fi
fi
- daemon $exec -d $options
+ daemon /usr/sbin/daemonize -u ${BEANSTALKD_USER} $exec $options
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
diff --git a/beanstalkd.spec b/beanstalkd.spec
index 1e665ba..7266dde 100644
--- a/beanstalkd.spec
+++ b/beanstalkd.spec
@@ -6,7 +6,7 @@
Name: beanstalkd
Version: 1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A simple, fast work-queue service
Group: System Environment/Daemons
@@ -18,6 +18,7 @@ Source2: %{name}.sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: daemonize
Requires(pre): shadow-utils
Requires(pre): %{_sbindir}/groupadd
Requires(post): chkconfig
@@ -101,6 +102,9 @@ fi
%changelog
+* Mon Sep 30 2013 Jeremy Hinegardner <jeremy(a)hinegardner.org> - 1.9-2
+- Change initscript to use daemonize(1) as beanstalk does not self daemonize anymore
+
* Mon Sep 30 2013 Jeremy Hinegardner <jeremy(a)hinegardner.org> - 1.9-1
- update to latest upstream 1.9
9Â years, 11Â months
[gdl] Add patch to fix gsl usage
by Orion Poplawski
commit 90d9e9f6d579e9e23571e4feb5b359990c709c20
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Sep 30 17:10:11 2013 -0600
Add patch to fix gsl usage
gdl-gsl.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gdl.spec | 5 +++++
2 files changed, 58 insertions(+), 0 deletions(-)
---
diff --git a/gdl-gsl.patch b/gdl-gsl.patch
new file mode 100644
index 0000000..5d5932b
--- /dev/null
+++ b/gdl-gsl.patch
@@ -0,0 +1,53 @@
+diff -up gdl-0.9.4/src/gsl_matrix.cpp.gsl gdl-0.9.4/src/gsl_matrix.cpp
+--- gdl-0.9.4/src/gsl_matrix.cpp.gsl 2013-09-20 10:10:02.000000000 -0600
++++ gdl-0.9.4/src/gsl_matrix.cpp 2013-09-30 16:57:24.762141411 -0600
+@@ -41,10 +41,11 @@ namespace lib {
+ const int szdbl=sizeof(DDouble);
+ const int szflt=sizeof(DFloat);
+ const int szlng=sizeof(DLong);
++ const int szlng64=sizeof(DLong64);
+
+ void ludc_pro( EnvT* e)
+ {
+- // cout << szdbl << " " <<szflt << " " << szlng << endl;
++ // cout << szdbl << " " <<szflt << " " << szlng << " " szlng64 << endl;
+
+ SizeT nParam=e->NParam(1);
+ // if( nParam == 0)
+@@ -120,9 +121,15 @@ namespace lib {
+ dimension dim1(&n, (SizeT) 1);
+ BaseGDL** p1D = &e->GetPar( 1);
+ GDLDelete((*p1D));
+- *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
+- memcpy(&(*(DLongGDL*) *p1D)[0], p->data,
+- p0->Dim(0)*szlng);
++ if (sizeof(size_t) == szlng) {
++ *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
++ memcpy(&(*(DLongGDL*) *p1D)[0], p->data,
++ p0->Dim(0)*szlng);
++ } else {
++ *p1D = new DLong64GDL(dim1, BaseGDL::NOZERO);
++ memcpy(&(*(DLong64GDL*) *p1D)[0], p->data,
++ p0->Dim(0)*szlng64);
++ }
+
+ // gsl_matrix_free(mat);
+ // gsl_permutation_free(p);
+@@ -189,10 +196,15 @@ namespace lib {
+ GDLGuard<gsl_matrix> g1(mat,gsl_matrix_free);
+ memcpy(mat->data, &(*p0D)[0], nEl*szdbl);
+
+- DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
+ gsl_permutation *p = gsl_permutation_alloc (nEl1);
++ if (sizeof(size_t) == szlng) {
++ DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
++ memcpy(p->data, &(*p1L)[0], nEl1*szlng);
++ } else {
++ DLong64GDL* p1L =e->GetParAs<DLong64GDL>(1);
++ memcpy(p->data, &(*p1L)[0], nEl1*szlng64);
++ }
+ GDLGuard<gsl_permutation> g2(p,gsl_permutation_free);
+- memcpy(p->data, &(*p1L)[0], nEl1*szlng);
+
+ DDoubleGDL *p2D = e->GetParAs<DDoubleGDL>(2);
+ gsl_vector *b = gsl_vector_alloc(nEl2);
diff --git a/gdl.spec b/gdl.spec
index 86ffd11..3a2142f 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -25,6 +25,9 @@ Patch4: gdl-plwidth.patch
# Fix python build
# https://sourceforge.net/p/gnudatalanguage/bugs/552/
Patch5: gdl-python.patch
+# Fix datatype for use with gsl's permutation type
+# https://sourceforge.net/p/gnudatalanguage/bugs/570/
+Patch6: gdl-gsl.patch
Patch13: gdl-0.9-antlr-cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,6 +115,7 @@ popd
%patch3 -p1 -b .build
%patch4 -p1 -b .plwidth
%patch5 -p1 -b .python
+%patch6 -p1 -b .gsl
%global cmake_opts \\\
-DWXWIDGETS=ON \\\
@@ -193,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT
- Update to 0.9.4
- Update build patch - drop automake components
- New python patch to fix python build
+- Add patch to fix gsl usage
* Tue Aug 27 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.3-10.cvs20130804
- Add patch to support new width() method in plplot
9Â years, 11Â months
[beanstalkd/el6] Update to latest upstream
by jjh
commit d0224637c262f20fb82f60c8ae9f4d4d02938f4d
Author: Jeremy Hinegardner <jeremy(a)hinegardner.org>
Date: Mon Sep 30 17:01:22 2013 -0600
Update to latest upstream
beanstalkd.spec | 31 ++++++++++++++++---------------
sources | 2 +-
2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/beanstalkd.spec b/beanstalkd.spec
index 3b65e6f..1e665ba 100644
--- a/beanstalkd.spec
+++ b/beanstalkd.spec
@@ -5,19 +5,18 @@
%define beanstalkd_binlogdir %{beanstalkd_home}/binlog
Name: beanstalkd
-Version: 1.4.6
-Release: 2%{?dist}
+Version: 1.9
+Release: 1%{?dist}
Summary: A simple, fast work-queue service
Group: System Environment/Daemons
-License: GPLv3+
-URL: http://xph.us/software/%{name}/
-Source0: http://xph.us/dist/%{name}/%{name}-%{version}.tar.gz
+License: MIT
+URL: http://kr.github.io/%{name}/
+Source0: https://github.com/kr/%{name}/archive/v%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libevent-devel
Requires(pre): shadow-utils
Requires(pre): %{_sbindir}/groupadd
@@ -36,24 +35,23 @@ asynchronously.
%prep
%setup -q
-if [ ! -e configure ]; then
- sh autogen.sh
-fi
-
%build
-%configure --disable-rpath
-make %{?_smp_mflags}
+make LDFLAGS="%{?__global_ldflags}" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%check
+make check
%install
rm -rf $RPM_BUILD_ROOT
-make install-man1 DESTDIR=$RPM_BUILD_ROOT
-make install-exec-am DESTDIR=$RPM_BUILD_ROOT
+make install PREFIX=%{buildroot}%{_prefix}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -d -m 0755 %{buildroot}%{beanstalkd_home}
%{__install} -d -m 0755 %{buildroot}%{beanstalkd_binlogdir}
+%{__install} -d -m 0755 %{buildroot}%{_mandir}/man1
+%{__gzip} doc/%{name}.1
+%{__install} -p -m 0644 doc/%{name}.1.gz %{buildroot}%{_mandir}/man1/
%clean
@@ -93,7 +91,7 @@ fi
%files
%defattr(-,root,root,-)
-%doc README README-DEVELOPERS README-TESTS COPYING doc/protocol.txt
+%doc README LICENSE doc/protocol.txt
%{_initrddir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
@@ -103,6 +101,9 @@ fi
%changelog
+* Mon Sep 30 2013 Jeremy Hinegardner <jeremy(a)hinegardner.org> - 1.9-1
+- update to latest upstream 1.9
+
* Sun Feb 19 2012 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.6-2
- fix user creation bug #795159
diff --git a/sources b/sources
index 91f19ea..1c422ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3dbbb64a6528efaaaa841ea83b30768e beanstalkd-1.4.6.tar.gz
+37dd1bc580c77745c26239033f910ec5 v1.9.tar.gz
9Â years, 11Â months