From aa6b549ce807c5584e5f5cd6d52bb818084f3e85 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Fri, 9 Aug 2013 15:32:11 +0200 Subject: [PATCH] pgbouncer: added patch to not include The reason for removing from getting included is that musl explicitely tells to correct the code when is included, changing it to include only as the standard documents suggest! ref: http://pubs.opengroup.org/onlinepubs/000095399/basedefs/poll.h.html --- database/pgbouncer/pgbouncer-sys_poll.h.patch | 51 +++++++++++++++++++ database/pgbouncer/pgbouncer.conf | 15 ++++++ 2 files changed, 66 insertions(+) create mode 100644 database/pgbouncer/pgbouncer-sys_poll.h.patch create mode 100644 database/pgbouncer/pgbouncer.conf diff --git a/database/pgbouncer/pgbouncer-sys_poll.h.patch b/database/pgbouncer/pgbouncer-sys_poll.h.patch new file mode 100644 index 000000000..3427ff1b6 --- /dev/null +++ b/database/pgbouncer/pgbouncer-sys_poll.h.patch @@ -0,0 +1,51 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../pgbouncer/pgbouncer-sys_poll.h.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +The standard is clearly defining that only needs to be included. + +http://pubs.opengroup.org/onlinepubs/000095399/basedefs/poll.h.html + +--- a/lib/m4/usual.m4 2013-08-09 15:16:56.716600440 +0200 ++++ b/lib/m4/usual.m4 2013-08-09 15:17:07.488877797 +0200 +@@ -165,7 +165,7 @@ + dnl AC_USUAL_HEADER_CHECK: Basic headers + dnl + AC_DEFUN([AC_USUAL_HEADER_CHECK], [ +-AC_CHECK_HEADERS([sys/socket.h poll.h sys/poll.h sys/un.h]) ++AC_CHECK_HEADERS([sys/socket.h poll.h sys/un.h]) + AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/tcp.h]) + AC_CHECK_HEADERS([sys/param.h sys/uio.h pwd.h grp.h]) + AC_CHECK_HEADERS([sys/wait.h sys/mman.h syslog.h netdb.h dlfcn.h]) +--- a/lib/usual/socket.h 2013-08-09 15:10:58.444331854 +0200 ++++ b/lib/usual/socket.h 2013-08-09 15:14:24.957124489 +0200 +@@ -22,7 +22,6 @@ + * - win32: + * - win32: + * - +- * - + * - + * - + * - +@@ -50,9 +49,6 @@ + #ifdef HAVE_POLL_H + #include + #endif +-#ifdef HAVE_SYS_POLL_H +-#include +-#endif + #ifdef HAVE_SYS_UIO_H + #include + #endif diff --git a/database/pgbouncer/pgbouncer.conf b/database/pgbouncer/pgbouncer.conf new file mode 100644 index 000000000..5fc7f3162 --- /dev/null +++ b/database/pgbouncer/pgbouncer.conf @@ -0,0 +1,15 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../pgbouncer/pgbouncer.conf +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +autogen=1