Attachment 192985 Details for Bug 225472 – patch zabbix34-server 3.4.8

[patch] patch zabbix34-server 3.4.8

patch-zabbix34-server (text/plain), 6.64 KB, created by TAO ZHOU on 2018-05-02 03:44:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TAO ZHOU

Created: 2018-05-02 03:44:57 UTC

Size: 6.64 KB

patch

obsolete

>diff -u -Nr zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 zabbix34-server/files/patch-m4-ax__lib__mysql.m4
>--- zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4	1970-01-01 10:00:00.000000000 +1000
>+++ zabbix34-server/files/patch-m4-ax__lib__mysql.m4	2018-05-02 11:07:10.711107000 +1000
>@@ -0,0 +1,77 @@
>+--- m4/ax_lib_mysql.m4.orig	2018-04-03 21:15:54.000000000 +1000
>++++ m4/ax_lib_mysql.m4	2018-05-02 11:02:38.434851000 +1000
>+@@ -78,48 +78,53 @@
>+
>+     if test "$want_mysql" = "yes"; then
>+
>+-        AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)
>++        AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])
>+
>+         if test -x "$MYSQL_CONFIG"; then
>+             MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
>+             _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
>++            _all_libmysql_libs=""
>+
>+-             _save_mysql_ldflags="${LDFLAGS}"
>+-            _save_mysql_cflags="${CFLAGS}"
>+-            LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"
>+-            CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
>+
>+             for i in $_full_libmysql_libs; do
>+                 case $i in
>+-                    -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb)
>+-
>+-                        _lib_name="`echo "$i" | cut -b3-`"
>+-                        AC_CHECK_LIB($_lib_name, main, [
>+-                        	MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"
>+-                        	],[
>+-                        	AC_MSG_ERROR([Not found $_lib_name library])
>+-                        	])
>+-                ;;
>+                     -L*)
>+
>+                         MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
>+                 ;;
>+                     -l*)
>+-
>+-                        _lib_name="`echo "$i" | cut -b3-`"
>+-                        AC_CHECK_LIB($_lib_name, main, [
>+-                        	MYSQL_LIBS="${MYSQL_LIBS} ${i}"
>+-                        	],[
>+-                        	AC_MSG_ERROR([Not found $i library])
>+-                        	])
>++                        _all_libmysql_libs="${_all_libmysql_libs} $i"
>+                 ;;
>+                 esac
>+             done
>++            _save_mysql_ldflags="${LDFLAGS}"
>++            _save_mysql_cflags="${CFLAGS}"
>++            LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
>++            CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
>++            for i in $_all_libmysql_libs; do
>++                _client_lib_name="`echo "$i" | cut -b3-`"
>++                if test "x$enable_static" != "xyes"; then
>++                    AC_CHECK_LIB([$_client_lib_name], [mysql_error], [
>++                    MYSQL_LIBS="${i} ${MYSQL_LIBS}"
>++                 ])
>++                else
>++                    AC_CHECK_LIB([$_client_lib_name], [mysql_error], [
>++                    MYSQL_LIBS="${_all_libmysql_libs} ${MYSQL_LIBS}"
>++                 ])
>++                fi
>++            done
>++
>++            if test -z "$MYSQL_LIBS"; then
>++                 AC_MSG_ERROR([Could not find MySQL client library])
>++            fi
>+
>+             LDFLAGS="${_save_mysql_ldflags}"
>  1 diff -u -Nr zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 zabbix34-server/files/patch-m4-ax__lib__mysql.m4
>  2 --- zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4    1970-01-01 10:00:00.000000000 +1000
>  3 +++ zabbix34-server/files/patch-m4-ax__lib__mysql.m4    2018-05-02 11:07:10.711107000 +1000
>  4 @@ -0,0 +1,77 @@
>  5 +--- m4/ax_lib_mysql.m4.orig    2018-04-03 21:15:54.000000000 +1000
>  6 ++++ m4/ax_lib_mysql.m4 2018-05-02 11:02:38.434851000 +1000
>  7 +@@ -78,48 +78,53 @@
>  8 +
>  9 +     if test "$want_mysql" = "yes"; then
> 10 +
> 11 +-        AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)
> 12 ++        AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])
> 13 +
> 14 +         if test -x "$MYSQL_CONFIG"; then
> 15 +             MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
> 16 +             _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
> 17 ++            _all_libmysql_libs=""
> 18 +
> 19 +-             _save_mysql_ldflags="${LDFLAGS}"
> 20 +-            _save_mysql_cflags="${CFLAGS}"
> 21 +-            LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"
> 22 +-            CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
> 23 +
> 24 +             for i in $_full_libmysql_libs; do
> 25 +                 case $i in
> 26 +-                    -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb)
> 27 +-
> 28 +-                        _lib_name="`echo "$i" | cut -b3-`"
> 29 +-                        AC_CHECK_LIB($_lib_name, main, [
> 30 +-                          MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"
> 31 +-                          ],[
> 32 +-                          AC_MSG_ERROR([Not found $_lib_name library])
> 33 +-                          ])
> 34 +-                ;;
> 35 +                     -L*)
> 36 +
> 37 +                         MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
> 38 +                 ;;
> 39 +                     -l*)
> 40 +-
> 41 +-                        _lib_name="`echo "$i" | cut -b3-`"
> 42 +-                        AC_CHECK_LIB($_lib_name, main, [
> 43 +-                          MYSQL_LIBS="${MYSQL_LIBS} ${i}"
> 44 +-                          ],[
> 45 +-                          AC_MSG_ERROR([Not found $i library])
>+             CFLAGS="${_save_mysql_cflags}"
>+             unset _save_mysql_ldflags
>+             unset _save_mysql_cflags
>++            unset _full_libmysql_libs
>++            unset _all_libmysql_libs
>++            unset _client_lib_name
>+
>+             MYSQL_VERSION=`$MYSQL_CONFIG --version`
>+
>diff -u -Nr zabbix34-server.org/Makefile zabbix34-server/Makefile
>--- zabbix34-server.org/Makefile	2018-05-02 05:03:18.000000000 +1000
>+++ zabbix34-server/Makefile	2018-05-02 11:08:59.747774000 +1000
>@@ -34,7 +34,7 @@
> USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
> .endif
>
>-USES=		pkgconfig iconv
>+USES=		autoreconf iconv pkgconfig
>
> USERS=		zabbix
> GROUPS=		zabbix
>@@ -189,9 +189,6 @@
> 		${WRKSRC}/database/${d}/data.sql
> .  endfor
> .endif
>-	@${REINPLACE_CMD} \
>-		-Ee 's|(@sysconfdir@/(\$$$[A-Z]*_CONFIG$))" ([|][|] cp "../../conf/\$$$[A-Z]*_CONFIG$" "\$$$DESTDIR$@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
>-		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
> 	@${FIND} ${WRKSRC} -type f $ -name '*.bak' -or -name '*.orig' $ \
> 		-exec ${RM} {} +
>
>@@ -209,6 +206,11 @@
> 	(cd ${WRKSRC}/database/ && \
> 		${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \
> 		${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
>+	${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \
>+	    ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample
>+.else
>+	${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \
>+		${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample
> .endif
> .else # frontend
> .include <bsd.port.pre.mk>

Actions: View | Diff

Attachments on bug 225472: 191046 | 192985