Attachment 163875 Details for Bug 205039 – use poll(2) and copy strchrnul(3) from 10.x, v1.1

[patch] use poll(2) and copy strchrnul(3) from 10.x, v1.1

no_ppoll_strchrnul.diff (text/plain), 3.97 KB, created by Jan Beich on 2015-12-05 18:57:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-12-05 18:57:27 UTC

Size: 3.97 KB

patch

obsolete

>Index: sysutils/pesign/Makefile
>===================================================================
>--- sysutils/pesign/Makefile	(revision 402854)
>+++ sysutils/pesign/Makefile	(working copy)
>@@ -23,12 +23,9 @@ GH_ACCOUNT=	rhinstaller
> USES=		gmake pkgconfig
> USE_LDCONFIG=	yes
> 
>-.include <bsd.port.pre.mk>
>+EXTRA_PATCHES=	${EXTRA_PATCHES_${OPSYS}_${OSREL:R}}
>+EXTRA_PATCHES_FreeBSD_9=	${FILESDIR}/extra-patch-src_client.c
> 
>-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001505
>-BROKEN=		This port requires ppoll(2) system call
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults
> 
>@@ -43,4 +40,4 @@ do-install:
> 	${INSTALL_MAN} ${WRKSRC}/src/pesign-client.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
> 	${INSTALL_MAN} ${WRKSRC}/src/pesign.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: sysutils/pesign/files/extra-patch-src_client.c
>===================================================================
>--- sysutils/pesign/files/extra-patch-src_client.c	(nonexistent)
>+++ sysutils/pesign/files/extra-patch-src_client.c	(working copy)
>@@ -0,0 +1,52 @@
>+--- src/client.c.orig	2014-10-24 19:51:06 UTC
>++++ src/client.c
>+@@ -47,6 +47,49 @@ static struct {
>+ 	{FLAG_LIST_END, NULL},
>+ };
>+ 
>++#if defined(__FreeBSD__) && __FreeBSD__ < 10
>++/*-
>++ * Copyright (c) 2013 Niclas Zeising
>++ * All rights reserved.
>++ *
>++ * Redistribution and use in source and binary forms, with or without
>++ * modification, are permitted provided that the following conditions
>++ * are met:
>++ * 1. Redistributions of source code must retain the above copyright
>++ *    notice, this list of conditions and the following disclaimer.
>++ * 2. Redistributions in binary form must reproduce the above copyright
>++ *    notice, this list of conditions and the following disclaimer in the
>++ *    documentation and/or other materials provided with the distribution.
>++ *
>++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
>++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
>++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
>++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
>++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
>++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
>++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
>++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>++ * SUCH DAMAGE.
>++ *
>++ * $FreeBSD: head/lib/libc/string/strchrnul.c 288004 2015-09-20 03:51:15Z rodrigc
>++ */
>++
>++static char *
>++strchrnul(const char *p, int ch)
>++{
>++	char c;
>++
>++	c = ch;
>++	for (;; ++p) {
>++		if (*p == c || *p == '\0')
>++			return ((char *)p);
>++	}
>++	/* NOTREACHED */
>++}
>++#endif
>++
>+ static void
>+ print_flag_name(FILE *f, int flag)
>+ {
>
>Property changes on: sysutils/pesign/files/extra-patch-src_client.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/pesign/files/patch-src-daemon.c
>===================================================================
>--- sysutils/pesign/files/patch-src-daemon.c	(revision 402854)
>+++ sysutils/pesign/files/patch-src-daemon.c	(working copy)
>@@ -8,6 +8,15 @@
>  #include <sys/types.h>
>  #include <sys/socket.h>
>  #include <sys/stat.h>
>+@@ -839,7 +838,7 @@ shutdown:
>+ 			do_shutdown(ctx, nsockets, pollfds);
>+ 			return 0;
>+ 		}
>+-		rc = ppoll(pollfds, nsockets, NULL, NULL);
>++		rc = poll(pollfds, nsockets, INFTIM);
>+ 		if (should_exit != 0)
>+ 			goto shutdown;
>+ 		if (rc < 0) {
> @@ -864,8 +863,8 @@ shutdown:
>  
>  			struct sockaddr_un remote;

Actions: View | Diff

Attachments on bug 205039: 163870 | 163875