From b232fe43d9e3142549742740f9cd07c04b09dbec Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Jun 19 2010 04:01:12 +0000 Subject: - New upstream version 5.1.7 --- diff --git a/.cvsignore b/.cvsignore index a73f6da..6a149c3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bdii-5.1.5.tar.gz +bdii-5.1.7.tar.gz diff --git a/bdii-init.patch b/bdii-init.patch index 2268df4..7962ffa 100644 --- a/bdii-init.patch +++ b/bdii-init.patch @@ -29,112 +29,3 @@ diff -ur bdii-5.1.5.orig/etc/init.d/bdii bdii-5.1.5/etc/init.d/bdii prog=bdii lockfile=/var/lock/subsys/$prog -@@ -95,7 +107,7 @@ - sudo -u ${BDII_USER} cp ${DB_CONFIG} ${SLAPD_DB_DIR}/stats/ - sudo -u ${BDII_USER} cp ${DB_CONFIG} ${SLAPD_DB_DIR}/glue2/ - -- echo -n "Starting SLAPD: " -+ echo -n "Starting BDII slapd: " - COMMAND="${SLAPD} -f ${SLAPD_CONF} -h ldap://$(hostname -f):${SLAPD_PORT} -u ${BDII_USER}" - ${COMMAND} - touch ${SLAPD_LOCK_FILE} -@@ -111,7 +123,7 @@ - fi - - if [ ${RETVAL} -gt 0 ]; then -- echo -n "SLAPD failed to start" 1>&2 -+ echo -n "BDII slapd failed to start" 1>&2 - - rm -f ${SLAPD_LOCK_FILE} - eval log_failure_msg -@@ -139,9 +151,9 @@ - RETVAL=1 - fi - -- echo -n "Starting update process: " -+ echo -n "Starting BDII update process: " - if [ ${RETVAL} -gt 0 ]; then -- echo -n "Update process failed to start" 1>&2 -+ echo -n "BDII update process failed to start" 1>&2 - rm -f ${UPDATE_LOCK_FILE} - eval log_failure_msg - return 1 -@@ -158,18 +170,18 @@ - if [ ! -f "${SLAPD_LOCK_FILE}" ] && [ ! -f "${UPDATE_LOCK_FILE}" ]; then - echo -n "Stopping BDII: " - result=$($0 status) -- if [ $? -gt 0 ]; then -+ if [ $? -gt 0 -a $? -ne 3 ]; then - echo ${result} 1>&2 - return 1 - else -- echo "BDII Already stopped" -+ echo "BDII already stopped" - return 0 - fi - fi - - RETVAL=0 - -- echo -n "Stopping update process: " -+ echo -n "Stopping BDII update process: " - - if [ -f "${UPDATE_PID_FILE}" ]; then - UPDATE_PID=$(cat ${UPDATE_PID_FILE}) -@@ -186,7 +198,7 @@ - sleep 2 - ps ${UPDATE_PID} >/dev/null 2>&1 - if [ $? = 0 ]; then -- echo -n "Could not kill update process ${UPDATE_PID}" 1>&2 -+ echo -n "Could not kill BDII update process ${UPDATE_PID}" 1>&2 - RETVAL=1 - fi - fi -@@ -201,7 +213,7 @@ - eval log_failure_msg - fi - -- echo -n "Stopping SLAPD: " -+ echo -n "Stopping BDII slapd: " - - if [ -f "${SLAPD_PID_FILE}" ]; then - SLAPD_PID=$(cat ${SLAPD_PID_FILE}) -@@ -218,7 +230,7 @@ - sleep 2 - ps ${SLAPD_PID} >/dev/null 2>&1 - if [ $? = 0 ]; then -- echo -n "Could not kill slapd process ${SLAPD_PID}" 1>&2 -+ echo -n "Could not kill BDII slapd process ${SLAPD_PID}" 1>&2 - RETVAL=2 - else - rm -f {SLAPD_PID_FILE} -@@ -253,12 +265,12 @@ - if [ -f ${SLAPD_PID_FILE} ]; then - ps $(cat ${SLAPD_PID_FILE}) >/dev/null 2>&1 - if [ ! $? = 0 ]; then -- echo -n "SLAPD PID file exists but the process died" 1>&2 -+ echo -n "BDII slapd PID file exists but the process died" 1>&2 - eval log_failure_msg - return 1 - fi - else -- echo -n "SLAPD PID file ${SLAPD_PID_FILE} does not exist" 1>&2 -+ echo -n "BDII slapd PID file ${SLAPD_PID_FILE} does not exist" 1>&2 - eval log_failure_msg - return 1 - fi -@@ -266,12 +278,12 @@ - if [ -f ${UPDATE_PID_FILE} ]; then - ps $(cat ${UPDATE_PID_FILE}) >/dev/null 2>&1 - if [ ! $? = 0 ]; then -- echo -n "Update process died" 1>&2 -+ echo -n "BDII update process died" 1>&2 - eval log_failure_msg - return 1 - fi - else -- echo -n "Update process failed to start" 1>&2 -+ echo -n "BDII update process failed to start" 1>&2 - eval log_failure_msg - return 1 - fi diff --git a/bdii.spec b/bdii.spec index 9c1a355..b9e2901 100644 --- a/bdii.spec +++ b/bdii.spec @@ -1,5 +1,5 @@ Name: bdii -Version: 5.1.5 +Version: 5.1.7 Release: 1%{?dist} Summary: The Berkeley Database Information Index (BDII) @@ -7,8 +7,8 @@ Group: System Environment/Daemons License: ASL 2.0 URL: https://twiki.cern.ch/twiki/bin/view/EGEE/BDII # The source tarball is created from a svn checkout: -# svn co http://svnweb.cern.ch/guest/gridinfo/bdii/tags/R_5_1_5 bdii-5.1.5 -# tar -z -c --exclude .svn -f bdii-5.1.5.tar.gz bdii-5.1.5 +# svn co http://svnweb.cern.ch/guest/gridinfo/bdii/tags/R_5_1_7 bdii-5.1.7 +# tar -z -c --exclude .svn -f bdii-5.1.7.tar.gz bdii-5.1.7 Source: %{name}-%{version}.tar.gz Patch0: %{name}-init.patch BuildArch: noarch @@ -49,8 +49,8 @@ differences. This is then used to update the database. %patch0 -p1 # Fix install paths -sed 's!/opt/glite/etc!/var/lib/bdii!g' -i Makefile -sed 's!/opt/glite/etc!/var/lib/bdii!g' -i etc/bdii.conf +sed -e 's!/opt/glite/etc!/var/lib/bdii!g' -e 's!/opt/bdii/etc!/etc/bdii!' \ + -i Makefile etc/bdii.conf etc/init.d/bdii etc/cron.d/bdii-proxy %build # Nothing to build @@ -126,6 +126,9 @@ fi %doc copyright %changelog +* Fri Jun 18 2010 Mattias Ellert - 5.1.7-1 +- New upstream version 5.1.7 + * Sun May 23 2010 Mattias Ellert - 5.1.5-1 - New upstream release 5.1.5 - Get rid of lsb initscript dependency diff --git a/import.log b/import.log index 0adf915..b75d738 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ bdii-5_1_5-1_fc12:F-12:bdii-5.1.5-1.fc12.src.rpm:1275126471 +bdii-5_1_7-1_fc12:F-12:bdii-5.1.7-1.fc12.src.rpm:1276920055 diff --git a/sources b/sources index b05b016..745572d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afcb5450c5615c19514841fb4283b27a bdii-5.1.5.tar.gz +b284240a3c3fc70f4e45ef53b18f98ee bdii-5.1.7.tar.gz