cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Icinga 1.7.1; various minor fixes

Browse Source
This commit is contained in:
sthen 2012-06-19 10:01:52 +00:00
parent 5a01675bf3
commit 0af7923032
6 changed files with 29 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/icinga/Makefile.inc
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.10 2012/05/17 11:05:40 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.11 2012/06/19 10:01:52 sthen Exp $
V ?= 1.7.0
V ?= 1.7.1
CATEGORIES+= net net/icinga

4
net/icinga/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2012/06/07 10:22:28 sthen Exp $
# $OpenBSD: Makefile,v 1.30 2012/06/19 10:01:52 sthen Exp $
COMMENT-main = network monitoring system (improved fork of Nagios)
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)
@ -6,8 +6,6 @@ COMMENT-ido = store Icinga configuration and events in a database
DISTNAME = icinga-$V
PKGNAME-main = icinga-$V
REVISION = 4
REVISION-cgi = 5
PKGNAME-cgi = icinga-cgi-$V
PKGNAME-ido = icinga-idoutils-$V

10
net/icinga/core/distinfo
View File

@ -1,5 +1,5 @@
MD5 (icinga-1.7.0.tar.gz) = R2PnbwTi/OPJzYMjSpPWkA==
RMD160 (icinga-1.7.0.tar.gz) = Rl7a/AgMFnThfa8kos6Nq8ID2uc=
SHA1 (icinga-1.7.0.tar.gz) = PPG9eVcWakSx/BBggtGgS7+heZ4=
SHA256 (icinga-1.7.0.tar.gz) = 4NAz43vTxPtqNRUcyUquTKjnMFENkVbqdVJFco+Ky4s=
SIZE (icinga-1.7.0.tar.gz) = 12939198
MD5 (icinga-1.7.1.tar.gz) = 6WWC0P4/7YlFH7vs+LgwBA==
RMD160 (icinga-1.7.1.tar.gz) = X28pT5+axFOTib6BHNN1kJEpnEg=
SHA1 (icinga-1.7.1.tar.gz) = Bqv94rfBeFEz0VAfY1+Uzgme5so=
SHA256 (icinga-1.7.1.tar.gz) = hmYhePrmo2GDQLLQsPrVAzQ5VWZJ95IUqaIzHBDCyrY=
SIZE (icinga-1.7.1.tar.gz) = 12938365

50
net/icinga/core/patches/patch-configure
View File

@ -1,41 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2012/05/17 11:05:40 sthen Exp $
--- configure.orig Tue May 15 14:00:56 2012
+++ configure Thu May 17 10:19:15 2012
@@ -4859,20 +4859,20 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5
$as_echo "$ac_cv_lib_cma_pthread_create" >&6; }
if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
- THREADLIBS="$THREADLIBS -lpthread"
+ THREADLIBS="$THREADLIBS -pthread"
fi
if test $ac_cv_lib_cma_pthread_create = yes; then
have_pthreads="yes"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4903,7 +4903,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
- THREADLIBS="$THREADLIBS -lpthread"
+ THREADLIBS="$THREADLIBS -pthread"
fi
if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -5194,7 +5194,7 @@ cat >>confdefs.h <<_ACEOF
$OpenBSD: patch-configure,v 1.6 2012/06/19 10:01:52 sthen Exp $
--- configure.orig Fri Jun 15 18:26:09 2012
+++ configure Mon Jun 18 18:28:02 2012
@@ -5186,7 +5186,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
_ACEOF
@ -44,7 +10,7 @@ $OpenBSD: patch-configure,v 1.5 2012/05/17 11:05:40 sthen Exp $
@@ -5215,7 +5215,7 @@ fi
@@ -5207,7 +5207,7 @@ fi
@ -53,7 +19,7 @@ $OpenBSD: patch-configure,v 1.5 2012/05/17 11:05:40 sthen Exp $
@@ -5819,7 +5819,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
@@ -5811,7 +5811,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
@ -62,7 +28,7 @@ $OpenBSD: patch-configure,v 1.5 2012/05/17 11:05:40 sthen Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5850,7 +5850,7 @@ fi
@@ -5842,7 +5842,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
@ -71,7 +37,7 @@ $OpenBSD: patch-configure,v 1.5 2012/05/17 11:05:40 sthen Exp $
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7117,7 +7117,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
@@ -7109,7 +7109,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
found_ssl=no
for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do
ssllibdir="$dir"

10
net/icinga/web/distinfo
View File

@ -1,5 +1,5 @@
MD5 (icinga-web-1.7.0.tar.gz) = rQDYjoaSIJM5TSZQdrH0+A==
RMD160 (icinga-web-1.7.0.tar.gz) = 2hfzwA3uL4irvCmIU6T1tlyljAY=
SHA1 (icinga-web-1.7.0.tar.gz) = 653fTNPCyVILYaIoJtq0697+UhQ=
SHA256 (icinga-web-1.7.0.tar.gz) = ACVPfYitYLR3jA1rBdpJerdh8prqPY9nsVxhc5nEzIY=
SIZE (icinga-web-1.7.0.tar.gz) = 14553856
MD5 (icinga-web-1.7.1.tar.gz) = 5KZM792EcQ1vYZKbutQtCw==
RMD160 (icinga-web-1.7.1.tar.gz) = KmGkfsSTwkJNAJO0FU9+B1jGM/I=
SHA1 (icinga-web-1.7.1.tar.gz) = cK5PLGkV68gU2CrJ0dPVfdsOKkk=
SHA256 (icinga-web-1.7.1.tar.gz) = a1hfJDriR8bKAY1KncPcl2IJ9cSJFmZDwIY/qRidVe8=
SIZE (icinga-web-1.7.1.tar.gz) = 14551987

9
net/icinga/web/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2012/05/17 11:06:33 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2012/06/19 10:01:52 sthen Exp $
@conflict icinga-api-*
@pkgpath net/icinga/core,-api
app/
@ -67,6 +67,8 @@ app/data/i18n/mo/ja.json
app/data/i18n/mo/ja.mo
app/data/i18n/mo/lb.json
app/data/i18n/mo/lb.mo
app/data/i18n/mo/mn.json
app/data/i18n/mo/mn.mo
app/data/i18n/mo/nb.json
app/data/i18n/mo/nb.mo
app/data/i18n/mo/nl.json
@ -85,6 +87,8 @@ app/data/i18n/mo/ru.json
app/data/i18n/mo/ru.mo
app/data/i18n/mo/sk.json
app/data/i18n/mo/sk.mo
app/data/i18n/mo/sl.json
app/data/i18n/mo/sl.mo
app/data/i18n/mo/sv.json
app/data/i18n/mo/sv.mo
app/data/i18n/mo/tr.json
@ -1498,6 +1502,7 @@ etc/schema/updates/mysql_v1-4_to_v1-5.sql
etc/schema/updates/mysql_v1-5_to_v1-6.sql
etc/schema/updates/mysql_v1-6-2_to_v1-7.sql
etc/schema/updates/mysql_v1-6_to_v1-6-2.sql
etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
etc/schema/updates/oracle_v1-0-3_to_v1-2.sql
etc/schema/updates/oracle_v1-2_to_1-3.sql
etc/schema/updates/oracle_v1-3_to_1-4.sql
@ -1505,6 +1510,7 @@ etc/schema/updates/oracle_v1-4_to_v1-5.sql
etc/schema/updates/oracle_v1-5_to_v1-6.sql
etc/schema/updates/oracle_v1-6-2_to_v1-7.sql
etc/schema/updates/oracle_v1-6_to_v1-6-2.sql
etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
etc/schema/updates/pgsql_v1-0-3_to_v1-2.sql
etc/schema/updates/pgsql_v1-2_to_v1-3.sql
etc/schema/updates/pgsql_v1-3_to_1-4.sql
@ -1512,6 +1518,7 @@ etc/schema/updates/pgsql_v1-4_to_v1-5.sql
etc/schema/updates/pgsql_v1-5_to_v1-6.sql
etc/schema/updates/pgsql_v1-6-2_to_v1-7.sql
etc/schema/updates/pgsql_v1-6_to_v1-6-2.sql
etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
lib/
lib/agavi/
lib/agavi/src/