Attachment 226123 Details for Bug 256896 – gamin-0.1.10_10.patch

[patch] gamin-0.1.10_10.patch

gamin-0.1.10_10.patch (text/plain), 13.39 KB, created by takefu on 2021-06-30 00:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2021-06-30 00:57:32 UTC

Size: 13.39 KB

patch

obsolete

>--- /usr/ports/devel/gamin/Makefile	2021-04-09 10:50:42.162505000 +0000
>+++ Makefile	2021-06-29 06:42:16.724732000 +0000
>@@ -3,61 +3,44 @@
> 
> PORTNAME=	gamin
> PORTVERSION=	0.1.10
>-PORTREVISION?=	10
>-CATEGORIES?=	devel
>+PORTREVISION=	10
>+CATEGORIES=	devel
> MASTER_SITES=	http://people.gnome.org/~veillard/gamin/sources/
> 
>-MAINTAINER?=	ports@FreeBSD.org
>-COMMENT?=	File and directory monitoring system
>+MAINTAINER=	ports@FreeBSD.org
>+COMMENT=	File and directory monitoring system
> 
>-USES+=		gettext gnome libtool pathfix pkgconfig
>-USE_GNOME?=	glib20
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+USES=		gettext gnome libtool localbase pathfix pkgconfig
>+USE_GNOME=	glib20
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
>+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
> 		--without-python
>-CPPFLAGS+=	-DHAVE_LINUX -I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>+CPPFLAGS+=	-DHAVE_LINUX
> 
> CONFLICTS=	fam-[0-9]*
> 
>-.if !defined(GAMIN_SLAVE)
>-OPTIONS_DEFINE=	GAM_POLLER LIBINOTIFY RUN_AS_EUID
>-OPTIONS_DEFAULT=RUN_AS_EUID
>-GAM_POLLER_DESC=Use gamin's poller instead of kqueue's
>-LIBINOTIFY_DESC=Use libinotify as the FAM backend
>-RUN_AS_EUID_DESC=Drop privileges to effective user
>-.endif
>-
>-.include <bsd.port.options.mk>
>-
>-.if !defined(GAMIN_SLAVE)
>-.if ${PORT_OPTIONS:MGAM_POLLER}
>-CPPFLAGS+=	-DUSE_GAMIN_POLLER=1
>-.endif
>-
>-.if ${PORT_OPTIONS:MLIBINOTIFY}
>-CONFIGURE_ARGS+=--enable-inotify
>-LIBS+=		-linotify
>-LIB_DEPENDS+=	libinotify.so:devel/libinotify
>-.else
>-CONFIGURE_ARGS+=--disable-inotify
>-.endif
>-.endif
>-
>-.if ${PORT_OPTIONS:MRUN_AS_EUID}
>-CPPFLAGS+=	-DRUN_AS_EUID=1
>-.endif
>+OPTIONS_DEFINE=		GAM_POLLER LIBINOTIFY RUN_AS_EUID
>+OPTIONS_DEFAULT=	RUN_AS_EUID
>+GAM_POLLER_DESC=	Use gamin's poller instead of kqueue's
>+LIBINOTIFY_DESC=	Use libinotify as the FAM backend
>+RUN_AS_EUID_DESC=	Drop privileges to effective user
>+GAM_POLLER_VARS=	CPPFLAGS+=-DUSE_GAMIN_POLLER=1
>+LIBINOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
>+LIBINOTIFY_CONFIGURE_ENABLE=	inotify
>+LIBINOTIFY_VARS=	LIBS+=-linotify
>+RUN_AS_EUID_VARS=	CPPFLAGS+=-DRUN_AS_EUID=1
> 
> post-patch:
> 	@${REINPLACE_CMD} "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/server/gam_conf.c
> 
>-.if !defined(GAMIN_SLAVE)
> regression-test: build
> 	@${ECHO_MSG} "===> Running gamin regression tests"
> 	@(cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
> 		Makefile ${MAKE_ARGS} tests)
>-.endif
> 
> .include <bsd.port.mk>
>--- /usr/ports/devel/gamin/files/patch-libgamin_gam_api.c	2021-04-09 10:50:42.163370000 +0000
>+++ files/patch-libgamin_gam__api.c	2021-06-29 04:02:07.289682000 +0000
>@@ -1,5 +1,5 @@
>---- libgamin/gam_api.c.orig	2007-08-27 03:21:03.000000000 -0700
>-+++ libgamin/gam_api.c	2013-02-16 15:51:11.927100135 -0800
>+--- libgamin/gam_api.c.orig	2007-08-27 10:21:03 UTC
>++++ libgamin/gam_api.c
> @@ -14,6 +14,7 @@
>  #include <sys/socket.h>
>  #include <sys/un.h>
>@@ -8,7 +8,7 @@
>  #include "fam.h"
>  #include "gam_protocol.h"
>  #include "gam_data.h"
>-@@ -117,7 +118,11 @@
>+@@ -117,7 +118,11 @@ gamin_get_user_name(void)
>      if (user_name[0] != 0)
>          return (user_name);
>  
>@@ -20,7 +20,7 @@
>  
>      if (pw != NULL) {
>  	strncpy(user_name, pw->pw_name, 99);
>-@@ -224,7 +229,11 @@
>+@@ -224,7 +229,11 @@ gamin_check_secure_dir(void)
>  	free(dir);
>  	return(0);
>      }
>@@ -32,7 +32,7 @@
>  	gam_error(DEBUG_INFO,
>  		  "Socket directory %s has different owner\n",
>  		  dir);
>-@@ -301,7 +310,11 @@
>+@@ -301,7 +310,11 @@ gamin_check_secure_path(const char *path
>      if (ret < 0)
>  	return(0);
>      
>@@ -44,7 +44,7 @@
>  	gam_error(DEBUG_INFO,
>  		  "Socket %s has different owner\n",
>  		  path);
>-@@ -428,10 +441,10 @@
>+@@ -428,10 +441,10 @@ gamin_write_credential_byte(int fd)
>  {
>      char data[2] = { 0, 0 };
>      int written;
>@@ -58,7 +58,7 @@
>      } cmsg;
>      struct iovec iov;
>      struct msghdr msg;
>-@@ -443,16 +456,16 @@
>+@@ -443,16 +456,16 @@ gamin_write_credential_byte(int fd)
>      msg.msg_iov = &iov;
>      msg.msg_iovlen = 1;
>  
>@@ -79,7 +79,7 @@
>      written = sendmsg(fd, &msg, 0);
>  #else
>      written = write(fd, &data[0], 1);
>-@@ -654,15 +667,20 @@
>+@@ -654,15 +667,20 @@ gamin_check_cred(GAMDataPtr conn, int fd
>      gid_t c_gid;
>  
>  #ifdef HAVE_CMSGCRED
>@@ -103,7 +103,7 @@
>      /* Set the socket to receive credentials on the next message */
>      {
>          int on = 1;
>-@@ -683,8 +701,8 @@
>+@@ -683,8 +701,8 @@ gamin_check_cred(GAMDataPtr conn, int fd
>  
>  #ifdef HAVE_CMSGCRED
>      memset(&cmsg, 0, sizeof(cmsg));
>@@ -114,7 +114,7 @@
>  #endif
>  
>  retry:
>-@@ -701,7 +719,7 @@
>+@@ -701,7 +719,7 @@ retry:
>          goto failed;
>      }
>  #ifdef HAVE_CMSGCRED
>@@ -123,7 +123,7 @@
>          GAM_DEBUG(DEBUG_INFO,
>                    "Message from recvmsg() was not SCM_CREDS\n");
>          goto failed;
>-@@ -727,9 +745,10 @@
>+@@ -727,9 +745,10 @@ retry:
>              goto failed;
>          }
>  #elif defined(HAVE_CMSGCRED)
>@@ -137,7 +137,7 @@
>  #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
>          GAM_DEBUG(DEBUG_INFO,
>                    "Socket credentials not supported on this OS\n");
>-@@ -1288,14 +1307,17 @@
>+@@ -1288,14 +1307,17 @@ FAMNextEvent(FAMConnection * fc, FAMEven
>  
>      // FIXME: drop and reacquire lock while blocked?
>      gamin_data_lock(conn);
>--- /usr/ports/devel/gamin/files/patch-libgamin_gam_fork.c	2021-04-09 10:50:42.163741000 +0000
>+++ files/patch-libgamin_gam__fork.c	2021-06-29 04:02:07.291726000 +0000
>@@ -1,6 +1,6 @@
>---- libgamin/gam_fork.c.orig	2007-07-04 06:36:48.000000000 -0700
>-+++ libgamin/gam_fork.c	2013-02-16 20:37:31.298176973 -0800
>-@@ -42,6 +42,78 @@
>+--- libgamin/gam_fork.c.orig	2007-07-04 13:36:48 UTC
>++++ libgamin/gam_fork.c
>+@@ -42,6 +42,78 @@ gamin_find_server_path(void)
>      return NULL;
>  }
>  
>@@ -79,7 +79,7 @@
>  /**
>   * gamin_fork_server:
>   * @fam_client_id: the client ID string to use
>-@@ -71,6 +143,13 @@
>+@@ -71,6 +143,13 @@ gamin_fork_server(const char *fam_client
>          long open_max;
>  	long i;
>  
>--- /usr/ports/devel/gamin/files/patch-libgamin_gam_fork.h	2021-04-09 10:50:42.163990000 +0000
>+++ files/patch-libgamin_gam__fork.h	2021-06-29 04:02:07.293704000 +0000
>@@ -1,6 +1,6 @@
>---- libgamin/gam_fork.h.orig	2007-07-04 06:36:48.000000000 -0700
>-+++ libgamin/gam_fork.h	2013-02-16 20:38:00.328594608 -0800
>-@@ -32,6 +32,9 @@
>+--- libgamin/gam_fork.h.orig	2007-07-04 13:36:48 UTC
>++++ libgamin/gam_fork.h
>+@@ -32,6 +32,9 @@ extern "C" {
>  #endif
>  
>  int		gamin_fork_server	(const char *fam_client_id);
>--- /usr/ports/devel/gamin/files/patch-python_Makefile.in	2021-04-09 10:50:42.164219000 +0000
>+++ files/patch-python_Makefile.in	2021-06-29 04:07:53.499039000 +0000
>@@ -1,5 +1,5 @@
>---- python/Makefile.in.orig	2008-11-26 01:42:29.000000000 -0500
>-+++ python/Makefile.in	2008-11-26 01:43:26.000000000 -0500
>+--- python/Makefile.in.orig	2008-11-24 15:25:07 UTC
>++++ python/Makefile.in
> @@ -53,7 +53,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
>  am__installdirs = "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"
>  pythonLTLIBRARIES_INSTALL = $(INSTALL)
>--- /usr/ports/devel/gamin/files/patch-server__gam_node.h	2021-04-09 10:50:42.164449000 +0000
>+++ files/patch-server__gam_node.h	2021-06-29 04:02:07.307735000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_node.h.orig	2011-09-17 11:19:43.000000000 +0200
>-+++ server/gam_node.h	2011-09-17 11:20:13.000000000 +0200
>+--- server/gam_node.h.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_node.h
> @@ -58,7 +58,7 @@ gboolean              gam_node_is_dir   
>  void                  gam_node_set_is_dir          (GamNode         *node,
>  						   gboolean        is_dir);
>--- /usr/ports/devel/gamin/files/patch-server__gam_subscription.c	2021-04-09 10:50:42.164749000 +0000
>+++ files/patch-server__gam_subscription.c	2021-06-29 04:02:07.314184000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_subscription.c.orig	2011-09-17 11:17:22.000000000 +0200
>-+++ server/gam_subscription.c	2011-09-17 11:17:44.000000000 +0200
>+--- server/gam_subscription.c.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_subscription.c
> @@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription
>   * @param sub the GamSubscription
>   * @returns The path being monitored.  It should not be freed.
>--- /usr/ports/devel/gamin/files/patch-server__gam_subscription.h	2021-04-09 10:50:42.165065000 +0000
>+++ files/patch-server__gam_subscription.h	2021-06-29 04:02:07.316257000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_subscription.h.orig	2011-09-17 11:15:00.000000000 +0200
>-+++ server/gam_subscription.h	2011-09-17 11:15:18.000000000 +0200
>+--- server/gam_subscription.h.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_subscription.h
> @@ -21,7 +21,7 @@ int                  gam_subscription_pa
>  
>  int                  gam_subscription_get_reqno    (GamSubscription *sub);
>--- /usr/ports/devel/gamin/files/patch-server_gam_channel.c	2021-04-09 10:50:42.165564000 +0000
>+++ files/patch-server_gam__channel.c	2021-06-29 04:02:07.297754000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_channel.c.orig	Tue Aug  9 12:17:39 2005
>-+++ server/gam_channel.c	Fri Feb 10 01:22:46 2006
>+--- server/gam_channel.c.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_channel.c
> @@ -7,6 +7,7 @@
>  #include <sys/stat.h>
>  #include <sys/un.h>
>@@ -97,7 +97,7 @@
>  #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
>          GAM_DEBUG(DEBUG_INFO,
>                    "Socket credentials not supported on this OS\n");
>-@@ -620,6 +621,7 @@ gam_listen_unix_socket(const char *path)
>+@@ -620,6 +623,7 @@ gam_listen_unix_socket(const char *path)
>  {
>      int fd;
>      struct sockaddr_un addr;
>@@ -105,7 +105,7 @@
>  
>      fd = socket(PF_UNIX, SOCK_STREAM, 0);
>      if (fd < 0) {
>-@@ -640,8 +642,18 @@ gam_listen_unix_socket(const char *path)
>+@@ -640,9 +644,19 @@ gam_listen_unix_socket(const char *path)
>       * some extra protection checks. Also make sure the socket is created
>       * with restricted mode
>       */
>@@ -113,7 +113,7 @@
> +    if (!gam_check_secure_dir()) {
> +	close(fd);
>  	return (-1);
>-+    }
>+     }
> +
> +    if (stat(path, &st) == 0) {
> +        /* bind() will fail if the socket already exists */
>@@ -122,6 +122,7 @@
> +            close(fd);
> +            return (-1);
> +        }
>-     }
>++    }
>      strncpy(&addr.sun_path[0], path, (sizeof(addr) - 4) - 1);
>      umask(0077);
>+ #endif
>--- /usr/ports/devel/gamin/files/patch-server_gam_eq.c	2021-04-09 10:50:42.165826000 +0000
>+++ files/patch-server_gam__eq.c	2021-06-29 04:02:07.299759000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_eq.c.orig	2012-05-13 19:42:20.257794534 +0400
>-+++ server/gam_eq.c	2012-05-13 19:44:41.228799909 +0400
>+--- server/gam_eq.c.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_eq.c
> @@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP
>  {
>  	gboolean done_work = FALSE;
>--- /usr/ports/devel/gamin/files/patch-server_gam_fs.c	2021-04-09 10:50:42.166209000 +0000
>+++ files/patch-server_gam__fs.c	2021-06-29 04:02:07.301760000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_fs.c.orig	2007-07-04 09:36:49.000000000 -0400
>-+++ server/gam_fs.c	2007-08-10 15:05:41.000000000 -0400
>+--- server/gam_fs.c.orig	2008-11-12 20:45:28 UTC
>++++ server/gam_fs.c
> @@ -7,6 +7,11 @@
>  #include <string.h>
>  #include <errno.h>
>--- /usr/ports/devel/gamin/files/patch-server_gam_kqueue.c	2021-04-09 10:50:42.167582000 +0000
>+++ files/patch-server_gam__kqueue.c	2021-06-29 04:02:07.303751000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_kqueue.c.orig	2007-07-04 09:50:41.000000000 -0400
>-+++ server/gam_kqueue.c	2009-06-03 13:43:38.000000000 -0400
>+--- server/gam_kqueue.c.orig	2007-07-04 13:50:41 UTC
>++++ server/gam_kqueue.c
> @@ -5,7 +5,8 @@
>   *
>   *     * http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=bks&fname=/SGI_Developer/books/IIDsktp_IG/sgi_html/ch08.html
>--- /usr/ports/devel/gamin/files/patch-server_gam_node.c	2021-04-09 10:50:42.167781000 +0000
>+++ files/patch-server_gam__node.c	2021-06-29 04:02:07.305737000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_node.c.orig	2007-07-04 15:36:49.000000000 +0200
>-+++ server/gam_node.c	2011-09-17 11:19:10.000000000 +0200
>+--- server/gam_node.c.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_node.c
> @@ -23,6 +23,7 @@
>  #include "gam_event.h"
>  #include "gam_node.h"
>--- /usr/ports/devel/gamin/files/patch-server_gam_poll_basic.c	2021-04-09 10:50:42.167934000 +0000
>+++ files/patch-server_gam__poll__basic.c	2021-06-29 04:02:07.309716000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_poll_basic.c.orig	2007-08-10 15:12:29.000000000 -0400
>-+++ server/gam_poll_basic.c	2007-08-10 15:16:07.000000000 -0400
>+--- server/gam_poll_basic.c.orig	2007-07-04 13:46:29 UTC
>++++ server/gam_poll_basic.c
> @@ -345,7 +345,7 @@ gam_poll_basic_poll_file(GamNode * node)
>  #ifdef ST_MTIM_NSEC
>  		GAM_DEBUG(DEBUG_INFO, "%d %d : %d %d\n", node->sbuf.st_mtim.tv_sec, node->sbuf.st_mtim.tv_nsec, sbuf.st_mtim.tv_sec, sbuf.st_mtim.tv_nsec);
>--- /usr/ports/devel/gamin/files/patch-server_gam_server.c	2021-04-09 10:50:42.168098000 +0000
>+++ files/patch-server_gam__server.c	2021-06-29 04:02:07.312105000 +0000
>@@ -1,5 +1,5 @@
>---- server/gam_server.c.orig	2007-07-04 09:36:49.000000000 -0400
>-+++ server/gam_server.c	2009-05-01 20:25:41.000000000 -0400
>+--- server/gam_server.c.orig	2007-07-04 13:36:49 UTC
>++++ server/gam_server.c
> @@ -32,7 +32,7 @@
>  #include "gam_server.h"
>  #include "gam_channel.h"
>--- /usr/ports/devel/gamin/files/patch-tests_testing.c	2021-04-09 10:50:42.168262000 +0000
>+++ files/patch-tests_testing.c	2021-06-29 04:02:07.318280000 +0000
>@@ -1,5 +1,5 @@
>---- tests/testing.c.orig	Thu Oct 27 10:51:03 2005
>-+++ tests/testing.c	Tue Feb 14 17:46:01 2006
>+--- tests/testing.c.orig	2007-07-04 13:36:49 UTC
>++++ tests/testing.c
> @@ -376,11 +376,11 @@ processCommand(char *line, int no)
>          }
>          printf("chmod %s to %s\n", arg, arg2);

Actions: View | Diff

Attachments on bug 256896: 226123